odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] 

bzr revid: mra@mra-laptop-20100617071519-u4kb74yay8v55q08
bzr revid: mra@mra-laptop-20100617103236-ac03zl97wcvuu7bu
bzr revid: mra@mra-laptop-20100617131201-lorh9maj58oagbnh
This commit is contained in:
Mustufa Rangwala 2010-06-17 18:42:01 +05:30
parent 18d91e942d e4de4fc6ac
commit ec23bbbe73
66 changed files with 217 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/account_analytic_analysis/account_analytic_analysis_menu.xml
View File

@ -1,8 +1,8 @@
<openerp>
<data>
<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
<menuitem id="next_id_71" name="Financial Project Management" parent="base.menu_main_pm" groups="account.group_account_invoice" sequence="20"/>
<menuitem id="menu_invoicing" name="Billing" parent="next_id_71" sequence="20"/>
<!-- <menuitem id="next_id_71" name="Financial Project Management" parent="base.menu_main_pm" groups="account.group_account_invoice" sequence="20"/>-->
<menuitem id="menu_invoicing" name="Billing" parent="base.menu_main_pm" sequence="4"/>
<record id="action_hr_tree_invoiced_all" model="ir.actions.act_window">
<field name="name">All Uninvoiced Entries</field>
@ -23,7 +23,7 @@
<field name="search_view_id" ref="account.view_account_analytic_account_search"/>
<field name="domain">[]</field>
</record>
<menuitem name="Analytic Accounts" action="action_account_analytic_all" id="menu_action_account_analytic_all" parent="next_id_71"/>
<!-- <menuitem name="Analytic Accounts" action="action_account_analytic_all" id="menu_action_account_analytic_all" parent="next_id_71"/>-->
<record id="action_account_analytic_managed_overpassed" model="ir.actions.act_window">
<field name="name">Overpassed Accounts</field>

2
addons/base_calendar/base_calendar_view.xml
View File

@ -138,7 +138,7 @@
<!-- Calenadar's menu -->
<menuitem id="base.menu_calendar_configuration" name="Calendar"
parent="base.menu_base_config" sequence="15" />
parent="base.menu_config_address_book" sequence="15" />
<!-- Invitation menu -->

12
addons/base_contact/base_contact_view.xml
View File

@ -122,6 +122,18 @@
<field name="search_view_id" ref="view_partner_contact_search"/>
</record>
<menuitem name="Contacts" id="menu_partner_contact_form" action="action_partner_contact_form" parent = "base.menu_address_book" sequence="2"/>
<!--
Contacts for Suppliers
-->
<menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases"
sequence="7"/>
<menuitem id="base.menu_procurement_management_supplier" name="Address Book"
parent="base.menu_purchase_root" sequence="3"/>
<menuitem id="base.menu_procurement_management_supplier_name" name="Suppliers"
parent="base.menu_procurement_management_supplier" action="base.action_partner_supplier_form" sequence="1"/>
<menuitem name="Contacts" id="menu_purchases_partner_contact_form" action="action_partner_contact_form"
parent = "base.menu_procurement_management_supplier" sequence="2"/>
<!-- Views for Partners Form View -->

6
addons/crm/crm_opportunity_view.xml
View File

@ -15,7 +15,7 @@
<menuitem action="crm_opportunity_categ_action"
id="menu_crm_case_opportunity-act" name="Categories"
parent="menu_crm_config_opportunity" />
parent="menu_crm_config_opportunity" sequence="1"/>
<!-- Opportunity Stages Form View-->
@ -30,7 +30,7 @@
<menuitem action="crm_opportunity_stage_act"
id="menu_crm_opportunity_stage_act" name="Stages"
parent="menu_crm_config_opportunity" />
parent="menu_crm_config_opportunity" sequence="2"/>
<!-- Opportunity Resource Type Form View -->
@ -45,7 +45,7 @@
<menuitem action="crm_opportunity_resource_act"
id="menu_crm_opportunity_resource_act" name="Resource"
parent="menu_crm_config_opportunity" />
parent="menu_crm_config_opportunity" sequence="3"/>
<!-- Opportunities Form View -->

2
addons/crm/crm_phonecall_menu.xml
View File

@ -48,7 +48,7 @@
<menuitem name="Phone Calls" id="menu_crm_case_phone"
groups="base.group_extended"
parent="base.menu_base_partner" sequence="5" />
parent="base.menu_base_partner" sequence="4" />
<record model="ir.actions.act_window" id="crm_case_categ_phone_incoming0">
<field name="name">Inbound</field>

6
addons/crm/crm_view.xml
View File

@ -17,7 +17,7 @@
parent="base.menu_base_config" sequence="5" groups="base.group_extended"/>
<menuitem id="base.next_id_64" name="Reporting"
parent="base.menu_base_partner" sequence="8" />
parent="base.menu_base_partner" sequence="11" />
<!-- Case Sections Form View -->
@ -169,7 +169,7 @@
<menuitem action="crm_case_section_act"
id="menu_crm_case_section_act" sequence="4"
parent="base.menu_crm_config_sales" />
parent="menu_crm_config_opportunity" />
@ -354,7 +354,7 @@
<menuitem action="crm_segmentation_tree-act"
id="menu_crm_segmentation-act"
groups="base.group_extended" sequence="5"
parent="base.menu_crm_config_sales" />
parent="menu_crm_config_opportunity" />
<record model="ir.ui.view" id="view_users_form_simple_modif_inherited1">
<field name="name">view.users.form.crm.modif.inherited1</field>

4
addons/crm/report/crm_lead_report_view.xml
View File

@ -232,10 +232,10 @@
</record>
<menuitem name="Leads Analysis" id="menu_report_crm_leads_tree"
parent="base.next_id_64" action="action_report_crm_lead" />
parent="base.next_id_64" action="action_report_crm_lead" sequence="3"/>
<menuitem name="Opportunities Analysis" id="menu_report_crm_opportunities_tree"
parent="base.next_id_64" action="action_report_crm_opportunity" />
parent="base.next_id_64" action="action_report_crm_opportunity" sequence="4"/>
</data>
</openerp>

2
addons/crm/report/crm_phonecall_report_view.xml
View File

@ -189,7 +189,7 @@
<menuitem name="Phone Calls Analysis"
action="action_report_crm_phonecall"
id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" />
id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" sequence="5"/>
</data>
</openerp>

4
addons/crm_claim/crm_claim_menu.xml
View File

@ -4,7 +4,7 @@
<menuitem id="base.menu_aftersale" name="After-Sale Services"
groups="base.group_extended"
parent="base.menu_base_partner" sequence="6" />
parent="base.menu_base_partner" sequence="7" />
<!-- Claims Menu -->
@ -47,7 +47,7 @@
</record>
<menuitem name="Claims" id="menu_crm_case_claims"
parent="base.menu_aftersale" action="crm_case_categ_claim0" />
parent="base.menu_aftersale" action="crm_case_categ_claim0" sequence="1"/>
</data>
</openerp>

2
addons/crm_claim/crm_claim_view.xml
View File

@ -4,7 +4,7 @@
<menuitem id="menu_config_claim" name="Claim"
groups="base.group_extended"
parent="base.menu_base_config" sequence="8" />
parent="base.menu_base_config" sequence="6" />
<!-- Claims categories -->

2
addons/crm_claim/report/crm_claim_report_view.xml
View File

@ -213,7 +213,7 @@
<menuitem name="Claims" id="menu_report_crm_claim_tree"
groups="base.group_extended"
action="action_report_crm_claim" parent="base.next_id_64" />
action="action_report_crm_claim" parent="base.next_id_64" sequence="6"/>
</data>

2
addons/crm_fundraising/crm_fundraising_menu.xml
View File

@ -6,7 +6,7 @@
<menuitem id="base.menu_fundrising" name="Fund Raising"
groups="base.group_extended"
parent="base.menu_base_partner" sequence="7" />
parent="base.menu_base_partner" sequence="8" />
<record model="ir.actions.act_window" id="crm_case_category_act_fund_all1">
<field name="name">Funds</field>

2
addons/crm_fundraising/crm_fundraising_view.xml
View File

@ -4,7 +4,7 @@
<!-- Fund Raising Configuration Menu -->
<menuitem id="menu_config_fundrising" name="Fund Raising"
groups="base.group_extended"
parent="base.menu_base_config" sequence="7" />
parent="base.menu_base_config" sequence="8" />
<!-- Fund Raising Categories Form View -->

2
addons/crm_fundraising/report/crm_fundraising_report_view.xml
View File

@ -201,7 +201,7 @@
<menuitem name="Fundraising"
action="action_report_crm_fundraising"
groups="base.group_extended"
id="menu_report_crm_fundraising_tree" parent="base.next_id_64" />
id="menu_report_crm_fundraising_tree" parent="base.next_id_64" sequence="20"/>
</data>
</openerp>

4
addons/crm_helpdesk/crm_helpdesk_menu.xml
View File

@ -2,7 +2,7 @@
<openerp>
<data noupdate="1">
<menuitem id="base.menu_aftersale" name="After-Sale Services"
parent="base.menu_base_partner" sequence="6" />
parent="base.menu_base_partner" sequence="7" />
<!-- Help Desk (menu) -->
@ -37,7 +37,7 @@
</record>
<menuitem name="Helpdesk and Support" id="menu_help_support_main"
parent="base.menu_aftersale" action="crm_case_helpdesk_act111" />
parent="base.menu_aftersale" action="crm_case_helpdesk_act111" sequence="2"/>
</data>
</openerp>

2
addons/crm_helpdesk/crm_helpdesk_view.xml
View File

@ -4,7 +4,7 @@
<!-- Helpdesk Support Categories Configuration Menu-->
<menuitem id="menu_config_helpdesk" name="Helpdesk"
groups="base.group_extended"
parent="base.menu_base_config" sequence="8" />
parent="base.menu_base_config" sequence="7" />
<!-- Helpdesk Support Categories Form View -->

2
addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
View File

@ -181,7 +181,7 @@
<menuitem name="Helpdesk" action="action_report_crm_helpdesk"
groups="base.group_extended"
id="menu_report_crm_helpdesks_tree" parent="base.next_id_64" />
id="menu_report_crm_helpdesks_tree" parent="base.next_id_64" sequence="7"/>
</data>
</openerp>

10
addons/hr/hr_view.xml
View File

@ -9,7 +9,7 @@
<menuitem
id="menu_hr_main"
parent="menu_hr_root"
name="Human Resources"
name="Human Resources Management"
sequence="0"/>
<menuitem
id="menu_hr_configuration"
@ -18,8 +18,14 @@
groups="group_hr_manager"
sequence="50" />
<menuitem
id="menu_view_employee_category_configuration_form"
id="menu_hr_management"
name="Human Resources Management"
parent="hr.menu_hr_configuration"
groups="group_hr_manager"
sequence="1" />
<menuitem
id="menu_view_employee_category_configuration_form"
parent="hr.menu_hr_management"
name="Employees"
sequence="1"/>

4
addons/hr_attendance/hr_attendance_view.xml
View File

@ -77,9 +77,9 @@
<menuitem
id="menu_hr_time_tracking"
name="Time Tracking"
parent="hr.menu_hr_root" sequence="7"/>
parent="hr.menu_hr_root" sequence="3"/>
<menuitem action="open_view_attendance" id="menu_open_view_attendance"
parent="menu_hr_time_tracking" groups="hr.group_hr_manager"/>
parent="menu_hr_time_tracking" groups="hr.group_hr_manager" sequence="3"/>
<record id="edit_attendance_reason" model="ir.ui.view">
<field name="name">hr.action.reason.form</field>

2
addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
View File

@ -46,7 +46,7 @@
<menuitem action="action_hr_attendance_sigh_in_out"
id="menu_hr_attendance_sigh_in_out"
parent="menu_hr_time_tracking"/>
parent="menu_hr_time_tracking" sequence="4"/>
<record id="view_hr_attendance_so_ask" model="ir.ui.view">
<field name="name">hr.sign.in.out.ask.form</field>

2
addons/hr_contract/hr_contract_view.xml
View File

@ -48,7 +48,7 @@
<field name="domain">[]</field>
</record>
<menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_configuration" sequence="5"/>
<menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_management" sequence="5"/>
<menuitem action="action_hr_contract_wage_type" id="hr_menu_contract_wage_type" parent="next_id_56"/>

2
addons/hr_evaluation/hr_evaluation_view.xml
View File

@ -64,7 +64,7 @@
<menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="6"/>
<menuitem
name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="3"/>
name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4"/>
<menuitem
parent="menu_eval_hr_config"
id="menu_open_view_hr_evaluation_plan_tree"

2
addons/hr_expense/hr_expense_view.xml
View File

@ -171,7 +171,7 @@
<field name="search_view_id" ref="view_hr_expense_filter"/>
</record>
<menuitem id="next_id_49" name="Expenses" sequence="8"
<menuitem id="next_id_49" name="Expenses" sequence="4"
parent="hr.menu_hr_root"/>
<menuitem action="expense_all" id="menu_expense_all" name="Expenses"

2
addons/hr_expense/report/hr_expense_report_view.xml
View File

@ -134,7 +134,7 @@
</record>
<menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/>
<menuitem action="action_hr_expense_report_all" id="menu_hr_expense_report_all" parent="hr.menu_hr_reporting" sequence="1"/>
<menuitem action="action_hr_expense_report_all" id="menu_hr_expense_report_all" parent="hr.menu_hr_reporting" sequence="2"/>
</data>
</openerp>

4
addons/hr_holidays/hr_holidays_view.xml
View File

@ -245,7 +245,7 @@
name="Holidays Management"
parent="hr.menu_hr_root"
id="menu_open_ask_holidays"
sequence="9"/>
sequence="5"/>
<record model="ir.actions.act_window" id="open_ask_holidays">
<field name="name">Leave Requests</field>
@ -362,7 +362,7 @@
<field name="view_mode">tree,form</field>
</record>
<menuitem sequence="9" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
<menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
<menuitem name="Leave Status"
action="open_view_holiday_status"
id="menu_open_view_holiday_status"

22
addons/hr_recruitment/hr_recruitment_view.xml
View File

@ -1,12 +1,16 @@
<?xml version="1.0"?>
<openerp>
<data>
<menuitem
id="menu_hr_config_applicant"
name="Applicant"
parent="hr.menu_hr_configuration"
/>
<menuitem
id="menu_hr_recruitment_recruitment"
name="Recruitment"
parent="hr.menu_hr_configuration"
sequence="2"/>
<menuitem
id="menu_hr_config_applicant"
name="Applicant"
parent="menu_hr_recruitment_recruitment"
sequence="2"/>
# ------------------------------------------------------
# Job Categories
@ -316,12 +320,6 @@
<field name="view_id" ref="hr_recruitment_stage_tree"/>
</record>
<menuitem
id="menu_hr_recruitment_recruitment"
name="Recruitment"
parent="hr.menu_hr_configuration"
/>
<menuitem
id="menu_hr_recruitment_stage"
name="Stages"

2
addons/hr_recruitment/report/hr_recruitment_report_view.xml
View File

@ -129,7 +129,7 @@
<field name="search_view_id" ref="view_hr_recruitment_report_search"/>
</record>
<menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/>
<menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="2"/>
<menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="1"/>
</data>
</openerp>

2
addons/hr_timesheet/hr_timesheet_report.xml
View File

@ -10,7 +10,7 @@
id="menu_hr_reporting_timesheet"
name="Timesheet"
parent="hr.menu_hr_reporting"
sequence="4" />
sequence="5" />
<report auto="False" id="report_user_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee timesheet" xsl="hr_timesheet/report/user_timesheet.xsl"/>
<!--<wizard id="wizard_hr_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee Timesheet"/>

8
addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
View File

@ -16,7 +16,7 @@
</group>
<group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-yes" string="Print" name="print_report" type="object"/>
<button icon="STOCK_PRINT" string="Print" name="print_report" type="object"/>
</group>
</form>
</field>
@ -34,7 +34,7 @@
<menuitem action="action_hr_timesheet_employee"
id="menu_hr_timesheet_employee"
parent="menu_hr_reporting_timesheet"
groups="base.group_extended"/>
groups="base.group_extended" sequence="2" icon="STOCK_PRINT"/>
<!-- Print My Timesheet -->
@ -50,7 +50,7 @@
</group>
<group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-yes" string="Print" name="print_report" type="object"/>
<button icon="STOCK_PRINT" string="Print" name="print_report" type="object"/>
</group>
</form>
</field>
@ -68,7 +68,7 @@
<menuitem action="action_hr_timesheet_my"
id="menu_hr_timesheet_my"
parent="menu_hr_reporting_timesheet"
groups="hr.group_hr_user" />
groups="hr.group_hr_user" sequence="4" icon="STOCK_PRINT"/>
</data>
</openerp>

4
addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
View File

@ -16,7 +16,7 @@
</group>
<group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-yes" string="Print" name="print_report" type="object"/>
<button icon="STOCK_PRINT" string="Print" name="print_report" type="object"/>
</group>
</form>
</field>
@ -34,7 +34,7 @@
<menuitem action="action_hr_timesheet_users"
id="menu_hr_timesheet_users"
parent="menu_hr_reporting_timesheet"
groups="hr.group_hr_manager" />
groups="hr.group_hr_manager" sequence="3" icon="STOCK_PRINT"/>
</data>

2
addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
View File

@ -54,7 +54,7 @@
id="menu_hr_timesheet_sign_in"
groups="base.group_extended"
parent="hr_attendance.menu_hr_time_tracking"
/>
sequence="5" />
<record id="view_hr_timesheet_sign_out" model="ir.ui.view">
<field name="name">hr.sign.out.project.form</field>

10
addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
View File

@ -6,11 +6,11 @@
name="Reporting"
parent="hr.menu_hr_root"
sequence="10" />
<menuitem
id="menu_hr_reporting_timesheet_invoice"
name="Timesheet Invoice"
parent="hr.menu_hr_reporting"
sequence="5" />
<!-- <menuitem-->
<!-- id="menu_hr_reporting_timesheet_invoice"-->
<!-- name="Timesheet Invoice"-->
<!-- parent="hr.menu_hr_reporting"-->
<!-- sequence="5" />-->
<report auto="False" id="account_analytic_account_cost_ledger" menu="False" model="account.analytic.account" name="hr.timesheet.invoice.account.analytic.account.cost_ledger" rml="account/project/report/cost_ledger.rml" string="Cost Ledger"/>
<!--<wizard id="account_analytic_account_cost_ledger_report" keyword="client_print_multi" model="account.analytic.account" name="hr.timesheet.invoice.account.analytic.account.cost_ledger.report" string="Cost Ledger"/>-->

2
addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
View File

@ -512,6 +512,6 @@
id="menu_hr_action_random_timesheet_lines_board"
name="Working Hours"
parent="hr_attendance.menu_hr_time_tracking"
groups="hr.group_hr_manager"/>
groups="hr.group_hr_manager" sequence="2"/>
</data>
</openerp>

4
addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
View File

@ -17,7 +17,7 @@
<separator colspan="4"/>
<group col="2" colspan="4">
<button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-yes"/>
<button name="print_report" string="Print" colspan="1" type="object" icon="STOCK_PRINT"/>
</group>
</form>
</field>
@ -34,7 +34,7 @@
<menuitem action="action_hr_timesheet_analytic_profit"
id="menu_hr_timesheet_analytic_profit"
parent="menu_hr_reporting_timesheet_invoice" groups="base.group_extended"/>
parent="hr_timesheet.menu_hr_reporting_timesheet" groups="base.group_extended" icon="STOCK_PRINT"/>
</data>
</openerp>

2
addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml
View File

@ -15,7 +15,7 @@
<separator colspan="4"/>
<group col="2" colspan="4">
<button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-yes"/>
<button name="print_report" string="Print" colspan="1" type="object" icon="STOCK_PRINT"/>
</group>
</form>
</field>

4
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
View File

@ -227,12 +227,12 @@
<menuitem
id="base.menu_project_management_time_tracking"
name="Time Tracking"
parent="base.menu_main_pm" sequence="3"/>
parent="base.menu_main_pm" sequence="5"/>
<menuitem action="hr_timesheet_sheet.act_hr_timesheet_sheet_form" id="menu_act_project_management_timesheet_sheet_form" parent="base.menu_project_management_time_tracking"
groups="hr.group_hr_manager" sequence="5"/>
<!--<menuitem id="next_id_60" name="Timesheets" parent="hr.menu_hr_root"/>-->
<menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_time_tracking"
groups="hr.group_hr_manager"/>
groups="hr.group_hr_manager" sequence="1"/>
<!--
Company inheritancy

3
addons/hr_timesheet_sheet/report/timesheet_report_view.xml
View File

@ -121,6 +121,7 @@
<field name="context">{'search_default_month':1,'search_default_User_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="search_view_id" ref="view_timesheet_report_search"/>
</record>
<menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all" parent="hr.menu_hr_reporting"/>
<menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all"
parent="hr_timesheet.menu_hr_reporting_timesheet" sequence="1"/>
</data>
</openerp>

2
addons/html_view/html_view.xml
View File

@ -36,6 +36,6 @@
<field name="res_model">html.view</field>
<field name="view_type">form</field>
</record>
<menuitem action="action_html_view_form" id="html_form" parent="base.menu_address_book" sequence="20"/>
<menuitem action="action_html_view_form" id="html_form" parent="base.menu_address_book" sequence="40"/>
</data>
</openerp>

5
addons/mail_gateway/mail_gateway_view.xml
View File

@ -165,8 +165,9 @@
<field name="act_window_id" ref="action_view_mailgate_thread"/>
</record>
<menuitem id="menu_mailgate_thread" name="Mailgateway Threads" action="action_view_mailgate_thread"
parent="base.menu_base_config" sequence="100"/>
<menuitem id="base.menu_base_config_mail" name="Mail" parent="base.menu_base_config" sequence="10"/>
<menuitem id="menu_mailgate_thread" name="Mailgateway Threads" action="action_view_mailgate_thread"
parent="base.menu_base_config_mail" sequence="5"/>
<act_window domain="[('partner_id', '=', active_id), ('history', '=', True)]"
id="act_res_partner_emails" name="Emails"

19
addons/mrp/mrp_view.xml
View File

@ -4,7 +4,7 @@
<menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing"
groups="group_mrp_user,group_mrp_manager" sequence="3"/>
<menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4"/>
<menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="5"/>
<menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
<!-- <menuitem name="Control" id="menu_mrp_control" parent="base.menu_mrp_root" sequence="3" />-->
@ -78,7 +78,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem name="Properties"
<menuitem name="Master Bill of Materials"
id="menu_mrp_property"
parent="menu_mrp_configuration"
groups="base.group_extended"
@ -230,8 +230,8 @@
</record>
<!-- <menuitem name="Routings" id="menu_mrp_routing_and_workcenters" parent="mrp.menu_mrp_bom" groups="base.group_extended"
sequence="100" />-->
<menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="mrp.menu_mrp_bom" groups="base.group_extended" sequence="40" />
<menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_bom" groups="base.group_extended" sequence="30"/>
<menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="mrp.menu_mrp_property" groups="base.group_extended" sequence="40" />
<menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_property" groups="base.group_extended" sequence="30"/>
<!--
Bill of Materials
@ -415,11 +415,11 @@
-->
<menuitem action="procurement.procurement_action" id="menu_mrp_procurement_action"
parent="mrp.menu_mrp_manufacturing" sequence="2" />
parent="mrp.menu_mrp_manufacturing" sequence="3" />
<!-- <menuitem action="procurement.procurement_action5" id="menu_mrp_procurement_exception_action"-->
<!-- parent="mrp.menu_mrp_control" sequence="1" />-->
<menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" sequence="4"/>
<menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" sequence="3"/>
<menuitem action="procurement.action_compute_schedulers" id="mrp_Sched_all" parent="mrp.menu_mrp_scheduler" sequence="90"/>
<!--
@ -851,10 +851,11 @@
<menuitem id="menu_pm_resources_mrp" name="Resources" parent="base.menu_mrp_root"
groups="base.group_extended"
sequence="2"/>
sequence="4"/>
<menuitem id="menu_pm_resources_config" name="Resources" parent="menu_mrp_configuration"/>
<menuitem action="resource.action_resource_resource_tree" id="menu_view_resource_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
<menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_mrp_configuration" sequence="1"/>
<menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
<menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_pm_resources_config" sequence="1"/>
<menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_config" sequence="1"/>
</data>
</openerp>

2
addons/mrp_operations/mrp_operations_view.xml
View File

@ -206,7 +206,7 @@
<menuitem name="Work Orders" parent="mrp.menu_mrp_manufacturing"
id="menu_mrp_production_wc_order"
action="mrp_production_wc_action_form"
groups="base.group_extended"/>
groups="base.group_extended" sequence="2"/>
<menuitem name="Work Orders" parent="menu_mrp_planning"
id="menu_mrp_production_wc_action_planning"
action="mrp_production_wc_action_planning"

4
addons/product/product_view.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<menuitem groups="base.group_extended" id="prod_config_main" name="Product" parent="base.menu_base_config" sequence="40"/>
<menuitem groups="base.group_extended" id="prod_config_main" name="Product" parent="base.menu_base_config" sequence="9"/>
<record id="product_search_form_view" model="ir.ui.view">
<field name="name">product.search.form</field>
@ -194,7 +194,7 @@
<field name="search_view_id" ref="product_search_form_view"/>
</record>
<menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="7"/>
<menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
<menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1"/>
<record id="product_normal_action_puchased" model="ir.actions.act_window">

7
addons/project/project_view.xml
View File

@ -507,13 +507,14 @@
</record>
<record id="open_task_type_form" model="ir.actions.act_window">
<field name="name">Task Types</field>
<field name="name">Types</field>
<field name="res_model">project.task.type</field>
<field name="view_type">form</field>
<field name="view_id" ref="task_type_tree"/>
</record>
<menuitem action="open_task_type_form" id="menu_task_types" parent="project.menu_definitions"/>
<menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1"/>
<menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_tasks_config" sequence="1"/>
<act_window domain="[('user_id', '=', active_id)]" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
<act_window

7
addons/project_gtd/project_gtd_view.xml
View File

@ -30,8 +30,9 @@
<field name="res_model">project.gtd.context</field>
</record>
<menuitem name="Time Management" id="menu_open_gtd_time" parent="project.menu_definitions" groups="group_project_getting"/>
<menuitem name="Contexts" id="menu_open_gtd_time_contexts" groups="group_project_getting" parent="menu_open_gtd_time" action="open_gtd_context_tree"/>
<!-- <menuitem name="Time Management" id="menu_open_gtd_time" parent="project.menu_definitions" groups="group_project_getting"/>-->
<menuitem name="Contexts" id="menu_open_gtd_time_contexts" groups="group_project_getting"
parent="project.menu_tasks_config" action="open_gtd_context_tree"/>
<record model="ir.ui.view" id="view_gtd_timebox_tree">
<field name="name">project.gtd.timebox.tree</field>
@ -68,7 +69,7 @@
<field name="view_id" ref="view_gtd_timebox_tree"/>
</record>
<menuitem name="Timeboxes" id="menu_open_gtd_time_timeboxes" parent="menu_open_gtd_time" action="open_gtd_timebox_tree"/>
<menuitem name="Timeboxes" id="menu_open_gtd_time_timeboxes" parent="project.menu_tasks_config" action="open_gtd_timebox_tree"/>
<record model="ir.ui.view" id="project_task_tree">
<field name="name">project.task.tree.timebox</field>
<field name="model">project.task</field>

3
addons/project_issue/project_issue_menu.xml
View File

@ -46,6 +46,7 @@
view_type="form"/>
<!--<menuitem id="menu_aftertask" name="Bug" parent="project.menu_main" visible="False"/>-->
<menuitem name="Issues" id="menu_project_issue_track" parent="project.menu_project_management" action="project_issue_categ_act0"/>
<menuitem name="Issues" id="menu_project_issue_track" parent="project.menu_project_management"
action="project_issue_categ_act0" sequence="3"/>
</data>
</openerp>

2
addons/project_issue/project_issue_view.xml
View File

@ -2,7 +2,7 @@
<openerp>
<data>
<menuitem id="menu_project_confi" name="Project Issue" parent="project.menu_definitions" sequence="1"/>
<menuitem id="menu_project_confi" name="Project Issue" parent="project.menu_definitions" sequence="2"/>
<record id="project_issue_categ_action" model="ir.actions.act_window">
<field name="name">Issue Categories</field>

12
addons/project_long_term/project_long_term_view.xml
View File

@ -2,7 +2,7 @@
<openerp>
<data>
<menuitem id="menu_project_long_term" name="Long Term Planning" parent="base.menu_main_pm" sequence="1"/>
<menuitem id="base.menu_project_long_term" name="Long Term Planning" parent="base.menu_main_pm" sequence="1"/>
# ------------------------------------------------------
# Project Resource Allocation
@ -302,18 +302,18 @@
<menuitem action="act_project_phase"
groups="base.group_extended"
id="menu_project_phase" parent="menu_project_long_term" sequence="4"/>
id="menu_project_phase" parent="base.menu_project_long_term" sequence="1"/>
<menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
name="Resource Allocations" parent="menu_project_long_term" />
name="Resource Allocations" parent="base.menu_project_long_term" sequence="2"/>
<!--<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>-->
<menuitem id="menu_pm_resources_project1"
groups="base.group_extended"
name="Resources" parent="base.menu_main_pm" sequence="2"/>
name="Resources" parent="project.menu_definitions" sequence="3"/>
<menuitem id="menu_phase_schedule" name="Scheduling" parent="menu_project_long_term"/>
<menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_resources_project1" sequence="1"/>
<menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_project_long_term" sequence="4"/>
<menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="project.menu_project_management" sequence="4"/>
<menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_resources_project1" sequence="1"/>
<menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/>

8
addons/project_planning/project_planning_view.xml
View File

@ -217,12 +217,12 @@
<field name="context">{"search_default_user_id":uid}</field>
<field name="search_view_id" ref="account_analytic_planning_view_search"/>
</record>
<menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main_pm" sequence="5"/>
<menuitem id="planning_main" name="Long Term Planning"
parent="base.menu_pm_planning" />
<!-- <menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main_pm" sequence="5"/>-->
<menuitem id="base.menu_project_long_term" name="Long Term Planning"
parent="base.menu_main_pm" />
<menuitem action="action_account_analytic_planning_form"
id="menu_report_account_analytic_planning" parent="planning_main" />
id="menu_report_account_analytic_planning" parent="base.menu_project_long_term" sequence="3"/>
<!--
Planning statistics

3
addons/project_timesheet/report/task_report_view.xml
View File

@ -170,7 +170,8 @@
<field name="context">{"search_default_user_id":uid}</field>
<field name="search_view_id" ref="view_report_timesheet_task_user_search"/>
</record>
<menuitem id="menu_timesheet_task_user" parent="hr.menu_hr_reporting" action="action_report_timesheet_task_user"/>
<menuitem id="menu_timesheet_task_user" parent="hr.menu_hr_reporting"
action="action_report_timesheet_task_user" sequence="4"/>
</data>
</openerp>

35
addons/purchase/purchase_view.xml
View File

@ -7,14 +7,36 @@
groups="group_purchase_user" sequence="7"/>
<menuitem id="menu_procurement_management" name="Purchase Management"
parent="base.menu_purchase_root" sequence="1"/>
<!--supplier addresses action-->
<record id="action_supplier_address_form" model="ir.actions.act_window">
<field name="name">Addresses</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">res.partner.address</field>
<field name="view_type">form</field>
<field name="context">{"search_default_supplier":1}</field>
<field name="search_view_id" ref="base.view_res_partner_address_filter"/>
</record>
<record id="action_supplier_address_form_view1" model="ir.actions.act_window.view">
<field eval="10" name="sequence"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="base.view_partner_address_tree"/>
<field name="act_window_id" ref="action_supplier_address_form"/>
</record>
<record id="action_supplier_address_form_view2" model="ir.actions.act_window.view">
<field eval="20" name="sequence"/>
<field name="view_mode">form</field>
<field name="view_id" ref="base.view_partner_address_form1"/>
<field name="act_window_id" ref="action_supplier_address_form"/>
</record>
<!--supplier menu-->
<menuitem id="base.menu_procurement_management_supplier" name="Suppliers"
<menuitem id="base.menu_procurement_management_supplier" name="Address Book"
parent="base.menu_purchase_root" sequence="3"/>
<menuitem id="menu_procurement_management_supplier_name" name="Suppliers"
<menuitem id="base.menu_procurement_management_supplier_name" name="Suppliers"
parent="base.menu_procurement_management_supplier" action="base.action_partner_supplier_form" sequence="1"/>
<menuitem action="action_supplier_address_form" id="menu_purchases_partner_address_form"
parent="base.menu_procurement_management_supplier" sequence="3"/>
<!--Inventory control-->
<menuitem id="menu_procurement_management_inventory" name="Inventory Control"
@ -27,7 +49,7 @@
<menuitem id="menu_procurement_management_invoice" name="Invoice Control"
parent="base.menu_purchase_root" sequence="6"/>
<menuitem name="Pending Invoices" id="menu_procurement_management_pending_invoice" action="account.action_invoice_tree_pending_invoice"
parent="menu_procurement_management_invoice"/>
parent="menu_procurement_management_invoice" sequence="13"/>
<!--product menu-->
<menuitem id="menu_procurement_management_product" name="Product"
@ -345,7 +367,8 @@
<field name="view_id" ref="purchase_order_line_form"/>
<field name="act_window_id" ref="purchase_line_form_action2"/>
</record>
<menuitem action="purchase_line_form_action2" id="menu_purchase_line_order_draft" parent="menu_procurement_management_invoice"/>
<menuitem action="purchase_line_form_action2" id="menu_purchase_line_order_draft"
parent="menu_procurement_management_invoice" sequence="12"/>
<!--
Procurements

6
addons/report_intrastat/report_intrastat_view.xml
View File

@ -67,7 +67,8 @@
<field name="view_mode">tree,form</field>
</record>
<menuitem action="action_report_intrastat_code_tree" id="menu_report_intrastat_code" parent="base.menu_product"/>
<menuitem action="action_report_intrastat_code_tree" id="menu_report_intrastat_code"
parent="base.menu_config_address_book" sequence="2"/>
<record id="view_report_intrastat_tree" model="ir.ui.view">
@ -119,6 +120,7 @@
<field name="search_view_id" ref="view_report_intrastat_search"/>
</record>
<menuitem action="action_report_intrastat_tree_all" id="menu_report_intrastat_all" parent="stock.next_id_61"/>
<menuitem action="action_report_intrastat_tree_all" id="menu_report_intrastat_all"
parent="stock.next_id_61" sequence="6"/>
</data>
</openerp>

6
addons/sale/report/sale_report_view.xml
View File

@ -125,8 +125,8 @@
<field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
</record>
<menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="8"/>
<menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.next_id_64" sequence="3"/>
<menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="11"/>
<menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.next_id_64" sequence="1"/>
<record id="action_stock_move_report_so" model="ir.actions.act_window">
<field name="name">Shipments Analysis</field>
@ -135,7 +135,7 @@
<field name="view_mode">tree,graph</field>
<field name="context">{'search_default_month':1, 'search_default_group_product':1, 'search_default_group_partner':1, 'search_default_done':1, 'search_default_out': 1, 'group_by':[], 'group_by_no_leaf':1}</field>
</record>
<menuitem action="action_stock_move_report_so" id="menu_action_stock_move_report_so" parent="base.next_id_64" sequence="8"/>
<menuitem action="action_stock_move_report_so" id="menu_action_stock_move_report_so" parent="base.next_id_64" sequence="25"/>
<!--This views used in board_sale module -->

4
addons/sale/sale_view.xml
View File

@ -4,7 +4,7 @@
<menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="sale.group_sale_user"/>
<menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
<menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="4"/>
<menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
<menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1"/>
<record id="view_shop_form" model="ir.ui.view">
@ -507,7 +507,7 @@
<act_window domain="[('product_id','=',active_id)]" id="action_order_line_product_tree" name="Product sales" res_model="sale.order.line" src_model="product.product" groups="base.group_extended"/>
<menuitem id="menu_invoiced" name="Billing" parent="base.menu_base_partner" sequence="6"/>
<menuitem id="menu_invoiced" name="Billing" parent="base.menu_base_partner" sequence="5"/>
<menuitem action="action_order_line_tree2" id="menu_invoicing_sales_order_lines" parent="menu_invoiced" sequence="2"/>
<!-- configartion view -->

6
addons/sale_journal/report/sale_journal_report_view.xml
View File

@ -81,7 +81,8 @@
<field name="context">{'search_default_journal': 1,'group_by_no_leaf':1,'group_by':[]}</field>
</record>
<menuitem name="Sales by Journal" id="menu_sale_journal_report_open_all" parent="base.next_id_64" action="action_sale_journal_report_open_menu_all"/>
<menuitem name="Sales by Journal" id="menu_sale_journal_report_open_all"
parent="base.next_id_64" action="action_sale_journal_report_open_menu_all" sequence="2"/>
<!-- picking by journal and invoice's tree view-->
@ -181,7 +182,8 @@
<field name="context">{'search_default_month':1, 'group_by_no_leaf':1,'group_by':[]}</field>
</record>
<menuitem name="Picking journal" id="menu_invoice_type_picking_stats_open_all" parent="stock.next_id_61" action="action_sale_journal_picking_report_open_menu_all"/>
<menuitem name="Picking journal" id="menu_invoice_type_picking_stats_open_all" parent="stock.next_id_61"
action="action_sale_journal_picking_report_open_menu_all" sequence="8"/>
</data>
</openerp>

4
addons/sale_journal/sale_journal_view.xml
View File

@ -134,7 +134,7 @@
<field name="search_view_id" ref="view_sale_journal_search"/>
</record>
<menuitem id="menu_definition_journal" name="Sales Journals" parent="base.menu_base_config" action="action_definition_journal" sequence="60" />
<menuitem id="menu_definition_journal" name="Sales Journals" parent="product.prod_config_main" action="action_definition_journal" sequence="70" />
<!-- Inherit sales order form view -->
@ -439,7 +439,7 @@
<field name="search_view_id" ref="view_picking_journal_search"/>
</record>
<menuitem name="Picking Journals" id="menu_definition_journal_picking" parent="stock.menu_stock_configuration" action="action_definition_picking_journal"/>
<menuitem name="Picking Journals" id="menu_definition_journal_picking" parent="stock.menu_warehouse_config" action="action_definition_picking_journal"/>
<record model="ir.actions.act_window" id="action_invoice_type_tree">
<field name="name">Picking by invoice_method</field>

8
addons/scrum/scrum_view.xml
View File

@ -4,7 +4,7 @@
<menuitem id="menu_scrum"
name="Scrum"
parent="base.menu_main_pm"/>
parent="base.menu_main_pm" sequence="3"/>
<!-- Scrum Project -->
@ -176,7 +176,7 @@
<menuitem
action="action_product_backlog_form"
id="menu_action_product_backlog_form"
sequence="20"
sequence="10"
parent="menu_scrum"/>
<!--
@ -295,7 +295,7 @@
<field name="search_view_id" ref="view_scrum_sprint_search"/>
</record>
<menuitem
sequence="10"
sequence="30"
action="action_sprint_all_tree" id="menu_action_sprint_all_tree" parent="menu_scrum"/>
<!--
@ -380,7 +380,7 @@
<field name="context">{'search_default_scrum_daily':1}</field>
<field name="search_view_id" ref="view_scrum_meeting_search"/>
</record>
<menuitem sequence="30"
<menuitem sequence="20"
action="action_meeting_form" id="menu_action_meeting_form" parent="menu_scrum"/>
<!--

1
addons/stock/__openerp__.py
View File

@ -69,6 +69,7 @@ Thanks to the double entry management, the inventory controlling is powerful and
"product_view.xml",
"partner_view.xml",
"report/report_stock_move_view.xml",
"report/report_stock_picking_view.xml",
"report/report_stock_view.xml",
"security/stock_security.xml",
"security/ir.model.access.csv",

1
addons/stock/report/__init__.py
View File

@ -26,5 +26,6 @@ import picking
import lot_overview
import lot_overview_all
import report_stock
import report_stock_picking
import report_stock_move

4
addons/stock/report/report_stock_move_view.xml
View File

@ -124,7 +124,7 @@
<field name="search_view_id" ref="view_stock_search"/>
<field name="context">{'contact_display': 'partner', 'search_default_month':1, 'search_default_group_product':1,'search_default_done':1,'group_by':[], 'group_by_no_leaf':1}</field>
</record>
<menuitem action="action_stock_move_report" id="menu_action_stock_move_report" parent="next_id_61" sequence="5"/>
<menuitem action="action_stock_move_report" id="menu_action_stock_move_report" parent="next_id_61" sequence="3"/>
<!-- Inventory Control -->
@ -219,7 +219,7 @@
<field name="search_view_id" eval="False"/>
<field name="context">{'contact_display': 'partner', 'search_default_real':1, 'search_default_location_type_internal':1,'search_default_group_product':1,'search_default_group_location':1,'group_by':[], 'group_by_no_leaf':1}</field>
</record>
<menuitem action="action_stock_inventory_report" id="menu_action_stock_inventory_report" parent="next_id_61" sequence="5"/>
<menuitem action="action_stock_inventory_report" id="menu_action_stock_inventory_report" parent="next_id_61" sequence="4"/>
</data>

3
addons/stock/report/report_stock_picking_view.xml
View File

@ -129,7 +129,8 @@
<field name="act_window_id" ref="action_report_report_stock_picking"/>
</record>
<menuitem name="Picking" action="action_report_report_stock_picking" id="menu_report_report_stock_pickings_tree" parent="next_id_61"/>
<menuitem name="Picking" action="action_report_report_stock_picking"
id="menu_report_report_stock_pickings_tree" parent="stock.next_id_61" sequence="5"/>
</data>
</openerp>

44
addons/stock/stock_view.xml
View File

@ -3,11 +3,12 @@
<data>
<menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse" sequence="2"/>
<menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1"/>
<menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="5"/>
<menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="4"/>
<menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="7"/>
<menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="6"/>
<menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
<menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="15"/>
<menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="3"/>
<menuitem id="menu_warehouse_config" name="Warehouse mangement" parent="menu_stock_configuration" sequence="1"/>
<menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/>
<record id="stock_inventory_line_tree" model="ir.ui.view">
<field name="name">stock.inventory.line.tree</field>
@ -181,7 +182,7 @@
<field name="view_type">form</field>
<field name="view_id" ref="view_tracking_tree"/>
</record>
<menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="2"/>
<menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="3"/>
<menuitem action="action_tracking_form" id="menu_action_tracking_form"
groups="base.group_extended"
parent="menu_traceability"/>
@ -481,7 +482,7 @@
<field name="view_id" ref="view_location_tree2"/>
<field name="context">{'full':1, 'search_default_in_location':1}</field>
</record>
<menuitem action="action_location_form" id="menu_action_location_form" parent="menu_stock_configuration" />
<menuitem action="action_location_form" id="menu_action_location_form" parent="menu_warehouse_config" />
<record id="view_location_tree" model="ir.ui.view">
<field name="name">stock.location.tree</field>
@ -541,7 +542,7 @@
<field name="view_type">form</field>
<field name="view_id" ref="view_warehouse_tree"/>
</record>
<menuitem action="action_warehouse_form" id="menu_action_warehouse_form" parent="menu_stock_configuration"/>
<menuitem action="action_warehouse_form" id="menu_action_warehouse_form" parent="menu_warehouse_config"/>
<record id="stock_picking_move_wizard_form" model="ir.ui.view">
<field name="name">stock.picking.move.wizard.form</field>
@ -680,10 +681,13 @@
<newline/>
<label/>
<button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"
<button name="%(track_line)d" string="Split in production lots"
states="draft,waiting,confirmed,assigned"
type="action" icon="terp-stock_effects-object-colorize"
groups="base.group_extended" />
<button name="%(move_scrap)d" string="Scrap Move Line" type="action" icon="gtk-justify-fill"/>
<button name="%(split_into)d" string="Split Stock Moves" type="action"
states="draft,assigned,confirmed,done"
groups="base.group_extended"
icon="terp-stock_effects-object-colorize" />
<separator colspan="4" string="Move State"/>
@ -797,8 +801,8 @@
<field groups="base.group_extended" name="tracking_id"/>
<button name="%(split_into)d" string="Split Stock Moves" type="action"
icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
groups="base.group_extended"
states="draft,assigned,confirmed,done"/>
states="draft,assigned,confirmed,done"
groups="base.group_extended"/>
<button name="setlast_tracking" string="Set Last Tracking" type="object"
attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
groups="base.group_extended"
@ -846,6 +850,7 @@
<label/>
<button name="%(track_line)d" string="Split in production lots"
groups="base.group_extended"
states="draft,waiting,confirmed,assigned"
type="action" icon="terp-stock_effects-object-colorize"/>
<label/>
<button name="%(split_into)d" string="Split Stock Moves" type="action"
@ -943,7 +948,7 @@
<field name="view_mode">calendar</field>
<field name="act_window_id" ref="action_picking_tree_delivery"/>
</record>
<menuitem action="action_picking_tree_delivery" id="menu_action_picking_tree_delivery" parent="menu_stock_warehouse_mgmt" sequence="20"/>
<menuitem action="action_picking_tree_delivery" id="menu_action_picking_tree_delivery" parent="menu_stock_warehouse_mgmt" sequence="1"/>
#
# Sending Products
@ -998,7 +1003,7 @@
<field name="prodlot_id" groups="base.group_extended"/>
<button name="%(track_line)d" string="Split in production lots" type="action"
icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
states="assigned,confirmed,done"
states="draft,assigned,confirmed,done"
groups="base.group_extended"/>
<field name="tracking_id" groups="base.group_extended"/>
<button name="%(split_into)d" string="Split Stock Moves" type="action"
@ -1040,6 +1045,7 @@
<field groups="base.group_extended" name="tracking_id"/>
<label/>
<button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"
states="draft,assigned,confirmed,done"
groups="base.group_extended"
/>
<label/>
@ -1141,7 +1147,7 @@
<field name="view_mode">calendar</field>
<field name="act_window_id" ref="action_picking_tree"/>
</record>
<menuitem action="action_picking_tree" id="menu_action_picking_tree" parent="menu_stock_warehouse_mgmt" sequence="5"/>
<menuitem action="action_picking_tree" id="menu_action_picking_tree" parent="menu_stock_warehouse_mgmt" sequence="3"/>
<record id="view_picking_in_tree" model="ir.ui.view">
<field name="name">stock.picking.in.tree</field>
@ -1328,7 +1334,7 @@
<field name="view_mode">calendar</field>
<field name="act_window_id" ref="action_picking_tree4"/>
</record>
<menuitem action="action_picking_tree4" id="menu_action_picking_tree4" parent="menu_stock_warehouse_mgmt" sequence="1"/>
<menuitem action="action_picking_tree4" id="menu_action_picking_tree4" parent="menu_stock_warehouse_mgmt" sequence="2"/>
<record id="view_picking_internal_search" model="ir.ui.view">
<field name="name">stock.picking.internal.search</field>
@ -1367,7 +1373,7 @@
<field name="context">{'contact_display': 'partner',"search_default_confirmed":1}</field>
<field name="search_view_id" ref="view_picking_internal_search"/>
</record>
<menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" sequence="2"/>
<menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" sequence="4"/>
<record id="view_move_tree" model="ir.ui.view">
<field name="name">stock.move.tree</field>
@ -1387,7 +1393,7 @@
<field name="prodlot_id" groups="base.group_extended"/>
<button name="%(track_line)d" string="Split in Production Lots" type="action"
icon="gtk-justify-fill"
states="assigned,confirmed"
states="draft,waiting,confirmed,assigned"
groups="base.group_extended"/>
<field groups="base.group_extended" name="tracking_id"/>
<button name="%(split_into)d" string="Split Stock Moves" type="action"
@ -1458,6 +1464,7 @@
<label/>
<button name="%(track_line)d"
groups="base.group_extended"
states="draft,waiting,confirmed,assigned"
string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize" colspan="2" />
<label/>
<button name="%(split_into)d" string="Split Stock Moves" type="action"
@ -1549,7 +1556,7 @@
<field name="prodlot_id" groups="base.group_extended"/>
<button name="%(track_line)d" string="Split in production lots" type="action"
icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
states="assigned,confirmed,done"
states="draft,waiting,confirmed,assigned"
context="{'default_use_exist': picking_id.type=='in'}"
groups="base.group_extended"/>
<field name="tracking_id" groups="base.group_extended"/>
@ -1605,6 +1612,7 @@
<newline/>
<label/>
<button name="%(track_line)d" string="Split in production lots"
states="draft,waiting,confirmed,assigned"
groups="base.group_extended"
type="action" icon="terp-stock_effects-object-colorize"/>
<label/>
@ -1724,7 +1732,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<!-- <menuitem action="action_incoterms_tree" id="menu_action_incoterms_tree" parent="menu_stock_configuration"/>-->
<!-- <menuitem action="action_incoterms_tree" id="menu_action_incoterms_tree" parent="menu_warehouse_config"/>-->
<act_window
context="{'location': active_id}"
@ -1948,7 +1956,7 @@
action="action_stock_journal_form"
id="menu_action_stock_journal_form"
groups="base.group_extended"
parent="menu_stock_configuration" />
parent="menu_warehouse_config" />
</data>
</openerp>

2
addons/stock/wizard/stock_move.py
View File

@ -183,6 +183,8 @@ class split_in_production_lot(osv.osv_memory):
res.update({'product_uom': move.product_uom.id})
if 'qty' in fields:
res.update({'qty': move.product_qty})
if 'use_exist' in fields:
res.update({'use_exist': (move.picking_id and move.picking_id.type=='out' and True) or False})
return res
_columns = {

2
addons/stock/wizard/stock_splitinto.py
View File

@ -62,7 +62,7 @@ class stock_split_into(osv.osv_memory):
move_qty = move.product_qty
uos_qty_rest = move.product_uos_qty
quantity_rest = move_qty - quantity
if quantity_rest == 0:
if (quantity_rest == 0) or (quantity <= 0) :
continue
sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.tracking')
tracking_id = track_obj.create(cr, uid, {'name': sequence}, {'product_id': move.product_id.id})

10
addons/stock_planning/stock_planning_view.xml
View File

@ -3,9 +3,9 @@
<data>
<menuitem id="menu_stock_period_main"
name="Stock and Sales Periods"
parent="base.menu_base_config"/>
parent="base.menu_base_config" sequence="20"/>
<!-- Creating periods section -->
<!-- Creating periods section -->
<record id="view_stock_period_createlines_form" model="ir.ui.view">
<field name="name">stock.period.createlines.form</field>
@ -121,8 +121,8 @@
<field name="target">new</field>
</record>
<menuitem id="menu_stock_sale_forecast" name="Stock and Sales Forecasts" parent="base.menu_base_partner"/>
<menuitem id="menu_stock_sale_forecast" name="Stock and Sales Forecasts"
parent="base.menu_base_partner" sequence="6"/>
<menuitem id="menu_stock_sale_forecast_createlines" name="Create Stock and Sales Forecasts" parent="menu_stock_sale_forecast" action="action_stock_sale_forecast_createlines_form" sequence = "5"/>
<record id="view_stock_sale_forecast_form" model="ir.ui.view">
@ -267,7 +267,7 @@
<!-- Create Planning section -->
<menuitem id="menu_stock_planning_main" name="Stock Planning" parent="stock.menu_stock_root"/>
<menuitem id="menu_stock_planning_main" name="Stock Planning" parent="stock.menu_stock_root" sequence="2"/>
<record id="view_stock_planning_createlines_form" model="ir.ui.view">
<field name="name">stock.planning.createlines.form</field>

3
addons/thunderbird/thunderbird_installer.xml
View File

@ -105,7 +105,8 @@
<field name="target">new</field>
</record>
<menuitem id="menu_base_config_plugins" name="Plugins" parent="base.menu_base_config" sequence="10" />
<menuitem id="base.menu_base_config_mail" name="Mail" parent="base.menu_base_config" sequence="10"/>
<menuitem id="menu_base_config_plugins" name="Plugins" parent="base.menu_base_config_mail" sequence="10" />
<menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_wizard" name="Thunderbird" parent="menu_base_config_plugins" sequence="10" />
</data>

2
addons/wiki_sale_faq/wiki_sale_faq_view.xml
View File

@ -4,7 +4,7 @@
<menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
<menuitem name="Documents"
id="menu_sales" sequence="6"
id="menu_sales" sequence="10"
parent="base.menu_base_partner"/>
<record model="ir.actions.act_window" id="action_document_form">