diff options
| author | kum (Open ERP) <kum@tinyerp.co.in> | 2009-11-23 19:17:57 +0530 |
|---|---|---|
| committer | kum (Open ERP) <kum@tinyerp.co.in> | 2009-11-23 19:17:57 +0530 |
| commit | 237263e89c7bd54e0450dfb24d85f10a296bf87e (patch) | |
| tree | 65d5ff44d66f1a0ef06b58a40218e9a46ea6ed8b | |
| parent | 0576b8c667142da58bf2430eda2b8a28db23365a (diff) | |
changes in xml
bzr revid: kum@tinyerp.co.in-20091123134757-eauk0167vvjegnvf
22 files changed, 332 insertions, 330 deletions
diff --git a/addons/account/account_assert_test.xml b/addons/account/account_assert_test.xml index a7ff8e236ae..585c6bda124 100644 --- a/addons/account/account_assert_test.xml +++ b/addons/account/account_assert_test.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> - <assert model="account.move" search="[]" string="For all account moves, the state is valid implies that the sum of credits equals the sum of debits"> + <assert model="account.move" search="[]" string="For all Ledger Postings, the state is valid implies that the sum of credits equals the sum of debits"> <test expr="not len(line_id) or line_id[0].state != 'valid' or (sum([l.debit - l.credit for l in line_id]) <= 0.00001)"/> </assert> diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 40991fa0320..de94f9d08e5 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -345,7 +345,7 @@ <field name="view_mode">tree,form,calendar,graph</field> <field name="view_id" ref="invoice_tree"/> <field name="context">{'type':'out_invoice'}</field> - <field name="search_view_id" ref="view_account_invoice_filter"/> + <field name="search_view_id" ref="view_account_invoice_filter"/> </record> <record id="action_invoice_tree_view1" model="ir.actions.act_window.view"> <field eval="1" name="sequence"/> @@ -368,7 +368,7 @@ <field eval="False" name="view_id"/> <field name="domain">[('type','=','out_invoice')]</field> <field name="context">{'type':'out_invoice'}</field> - <field name="search_view_id" ref="view_account_invoice_filter"/> + <field name="search_view_id" ref="view_account_invoice_filter"/> </record> <record id="action_invoice_tree1_view1" model="ir.actions.act_window.view"> <field eval="1" name="sequence"/> @@ -401,7 +401,7 @@ <field eval="False" name="view_id"/> <field name="domain">[('type','=','in_invoice')]</field> <field name="context">{'type':'in_invoice'}</field> - <field name="search_view_id" ref="view_account_invoice_filter"/> + <field name="search_view_id" ref="view_account_invoice_filter"/> </record> <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="account.menu_finance_invoice"/> <record id="action_invoice_tree2_new" model="ir.actions.act_window"> @@ -423,7 +423,7 @@ <field eval="False" name="view_id"/> <field name="domain">[('type','=','out_refund')]</field> <field name="context">{'type':'out_refund'}</field> - <field name="search_view_id" ref="view_account_invoice_filter"/> + <field name="search_view_id" ref="view_account_invoice_filter"/> </record> <menuitem action="action_invoice_tree3" id="menu_action_invoice_tree3" parent="account.menu_finance_invoice"/> @@ -446,7 +446,7 @@ <field eval="False" name="view_id"/> <field name="domain">[('type','=','in_refund')]</field> <field name="context">{'type':'in_refund'}</field> - <field name="search_view_id" ref="view_account_invoice_filter"/> + <field name="search_view_id" ref="view_account_invoice_filter"/> </record> <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="account.menu_finance_invoice"/> @@ -470,7 +470,7 @@ <field name="domain">[('state','=','draft'),('type','=','out_invoice')]</field> <field name="context">{'type':'out_invoice'}</field> <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_account_invoice_filter"/> + <field name="search_view_id" ref="view_account_invoice_filter"/> </record> <record id="action_invoice_tree5_view1" model="ir.actions.act_window.view"> <field eval="1" name="sequence"/> @@ -484,7 +484,7 @@ <field name="act_window_id" ref="action_invoice_tree5"/> </record> - <menuitem action="action_invoice_tree5" id="menu_invoice_draft" parent="menu_action_invoice_tree1" groups="base.group_extended_menu"/> + <menuitem action="action_invoice_tree5" id="menu_invoice_draft" parent="menu_action_invoice_tree1" groups="base.group_useability_extended"/> <record id="action_invoice_tree6" model="ir.actions.act_window"> <field name="name">PRO-FORMA Customer Invoices</field> @@ -494,7 +494,7 @@ <field name="domain">[('state','=','proforma2'),('type','=','out_invoice')]</field> <field name="context">{'type':'out_invoice'}</field> <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_account_invoice_filter"/> + <field name="search_view_id" ref="view_account_invoice_filter"/> </record> <record id="action_invoice_tree6_view1" model="ir.actions.act_window.view"> <field eval="1" name="sequence"/> @@ -508,7 +508,7 @@ <field name="act_window_id" ref="action_invoice_tree6"/> </record> - <menuitem action="action_invoice_tree6" id="menu_action_invoice_tree6" parent="menu_action_invoice_tree1" groups="base.group_extended_menu"/> + <menuitem action="action_invoice_tree6" id="menu_action_invoice_tree6" parent="menu_action_invoice_tree1" groups="base.group_useability_extended"/> <record id="action_invoice_tree7" model="ir.actions.act_window"> <field name="name">Unpaid Customer Invoices</field> @@ -518,7 +518,7 @@ <field name="domain">[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','out_invoice')]</field> <field name="context">{'type':'out_invoice'}</field> <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_account_invoice_filter"/> + <field name="search_view_id" ref="view_account_invoice_filter"/> </record> <record id="action_invoice_tree7_view1" model="ir.actions.act_window.view"> <field eval="1" name="sequence"/> @@ -532,7 +532,7 @@ <field name="act_window_id" ref="action_invoice_tree7"/> </record> - <menuitem action="action_invoice_tree7" id="menu_action_invoice_tree7" parent="menu_action_invoice_tree1" groups="base.group_extended_menu"/> + <menuitem action="action_invoice_tree7" id="menu_action_invoice_tree7" parent="menu_action_invoice_tree1" groups="base.group_useability_extended"/> <record id="action_invoice_tree8" model="ir.actions.act_window"> <field name="name">Draft Supplier Invoices</field> @@ -542,7 +542,7 @@ <field name="domain">[('state','=','draft'),('type','=','in_invoice')]</field> <field name="context">{'type':'in_invoice'}</field> <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_account_invoice_filter"/> + <field name="search_view_id" ref="view_account_invoice_filter"/> </record> <record id="action_invoice_tree8_view1" model="ir.actions.act_window.view"> <field eval="1" name="sequence"/> @@ -556,7 +556,7 @@ <field name="act_window_id" ref="action_invoice_tree8"/> </record> - <menuitem action="action_invoice_tree8" id="menu_action_invoice_tree8" parent="menu_action_invoice_tree2" groups="base.group_extended_menu"/> + <menuitem action="action_invoice_tree8" id="menu_action_invoice_tree8" parent="menu_action_invoice_tree2" groups="base.group_useability_extended"/> <record id="action_invoice_tree9" model="ir.actions.act_window"> <field name="name">Unpaid Supplier Invoices</field> @@ -566,7 +566,7 @@ <field name="domain">[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','in_invoice')]</field> <field name="context">{'type':'in_invoice'}</field> <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_account_invoice_filter"/> + <field name="search_view_id" ref="view_account_invoice_filter"/> </record> <record id="action_invoice_tree9_view1" model="ir.actions.act_window.view"> <field eval="1" name="sequence"/> @@ -580,7 +580,7 @@ <field name="act_window_id" ref="action_invoice_tree9"/> </record> - <menuitem action="action_invoice_tree9" id="menu_action_invoice_tree9" parent="menu_action_invoice_tree2" groups="base.group_extended_menu"/> + <menuitem action="action_invoice_tree9" id="menu_action_invoice_tree9" parent="menu_action_invoice_tree2" groups="base.group_useability_extended"/> <record id="action_invoice_tree10" model="ir.actions.act_window"> <field name="name">Draft Customer Refunds</field> @@ -590,7 +590,7 @@ <field name="domain">[('state','=','draft'),('type','=','out_refund')]</field> <field name="context">{'type':'out_refund'}</field> <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_account_invoice_filter"/> + <field name="search_view_id" ref="view_account_invoice_filter"/> </record> <record id="action_invoice_tree10_view1" model="ir.actions.act_window.view"> <field eval="1" name="sequence"/> @@ -604,7 +604,7 @@ <field name="act_window_id" ref="action_invoice_tree10"/> </record> - <menuitem action="action_invoice_tree10" id="menu_action_invoice_tree10" parent="menu_action_invoice_tree3" groups="base.group_extended_menu"/> + <menuitem action="action_invoice_tree10" id="menu_action_invoice_tree10" parent="menu_action_invoice_tree3" groups="base.group_useability_extended"/> <record id="action_invoice_tree11" model="ir.actions.act_window"> <field name="name">Unpaid Customer Refunds</field> @@ -614,7 +614,7 @@ <field name="domain">[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','out_refund')]</field> <field name="context">{'type':'out_refund'}</field> <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_account_invoice_filter"/> + <field name="search_view_id" ref="view_account_invoice_filter"/> </record> <record id="action_invoice_tree11_view1" model="ir.actions.act_window.view"> <field eval="1" name="sequence"/> @@ -628,7 +628,7 @@ <field name="act_window_id" ref="action_invoice_tree11"/> </record> - <menuitem action="action_invoice_tree11" id="menu_action_invoice_tree11" parent="menu_action_invoice_tree3" groups="base.group_extended_menu"/> + <menuitem action="action_invoice_tree11" id="menu_action_invoice_tree11" parent="menu_action_invoice_tree3" groups="base.group_useability_extended"/> <record id="action_invoice_tree12" model="ir.actions.act_window"> <field name="name">Draft Supplier Refunds</field> @@ -638,7 +638,7 @@ <field name="domain">[('state','=','draft'),('type','=','in_refund')]</field> <field name="context">{'type':'in_refund'}</field> <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_account_invoice_filter"/> + <field name="search_view_id" ref="view_account_invoice_filter"/> </record> <record id="action_invoice_tree12_view1" model="ir.actions.act_window.view"> <field eval="1" name="sequence"/> @@ -652,7 +652,7 @@ <field name="act_window_id" ref="action_invoice_tree12"/> </record> - <menuitem action="action_invoice_tree12" id="menu_action_invoice_tree12" parent="menu_action_invoice_tree4" groups="base.group_extended_menu"/> + <menuitem action="action_invoice_tree12" id="menu_action_invoice_tree12" parent="menu_action_invoice_tree4" groups="base.group_useability_extended"/> <record id="action_invoice_tree13" model="ir.actions.act_window"> <field name="name">Unpaid Supplier Refunds</field> @@ -662,7 +662,7 @@ <field name="domain">[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','in_refund')]</field> <field name="context">{'type':'in_refund'}</field> <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_account_invoice_filter"/> + <field name="search_view_id" ref="view_account_invoice_filter"/> </record> <record id="action_invoice_tree13_view1" model="ir.actions.act_window.view"> <field eval="1" name="sequence"/> @@ -676,7 +676,7 @@ <field name="act_window_id" ref="action_invoice_tree13"/> </record> - <menuitem action="action_invoice_tree13" id="menu_action_invoice_tree13" parent="menu_action_invoice_tree4" groups="base.group_extended_menu"/> + <menuitem action="action_invoice_tree13" id="menu_action_invoice_tree13" parent="menu_action_invoice_tree4" groups="base.group_useability_extended"/> <act_window domain="[('partner_id','=',active_id)]" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/> diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml index c0aeac66920..97cf55e4ff4 100644 --- a/addons/account/account_menuitem.xml +++ b/addons/account/account_menuitem.xml @@ -12,7 +12,7 @@ <menuitem id="menu_finance_legal_statement" name="Legal Statements" parent="account.menu_finance" sequence="8"/> <menuitem id="menu_generic_report" name="Generic Reports" parent="account.menu_finance_legal_statement" sequence="8"/> - <menuitem id="menu_finance_entries" name="Entries Encoding" parent="account.menu_finance" sequence="2" + <menuitem id="menu_finance_entries" name="Making Entries" parent="account.menu_finance" sequence="2" groups="group_account_user"/> <menuitem id="account.menu_finance_recurrent_entries" name="Recurrent Entries" parent="account.menu_finance_entries" sequence="15"/> diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index d79ac0fd8ca..487aa866059 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -332,10 +332,11 @@ <page string="Entry encoding"> <field colspan="4" name="line_ids" nolabel="1"> <tree editable="bottom" string="Statement lines"> - <field name="sequence"/> + <field name="sequence"/> <field name="date"/> <field name="ref"/> <field name="name"/> + <field name="account_id"/> <field name="type"/> <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/> <field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/> @@ -346,13 +347,14 @@ <form string="Statement lines"> <field name="date"/> <field name="name"/> + <field name="account_id"/> <field name="type"/> <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/> <field domain="[('journal_id', '=', parent.journal_id), ('type', '<>', 'view')]" name="account_id"/> <field name="amount"/> <field context="{'partner_id':partner_id,'amount':amount,'account_id':account_id,'currency_id': parent.currency,'journal_id':parent.journal_id, 'date':date}" name="reconcile_id"/> <field name="ref"/> - <field name="sequence"/> + <field name="sequence"/> <separator colspan="4" string="Notes"/> <field colspan="4" name="note" nolabel="1"/> </form> @@ -386,9 +388,9 @@ <field name="view_type">form</field> <field name="view_mode">tree,form</field> <field name="domain">[('state','=','draft')]</field> - <field name="filter" eval="True"/> + <field name="filter" eval="True"/> </record> - <menuitem action="action_bank_statement_draft_tree" id="menu_bank_statement_draft_tree" parent="account.menu_bank_statement_tree" groups="base.group_extended_menu"/> + <menuitem action="action_bank_statement_draft_tree" id="menu_bank_statement_draft_tree" parent="account.menu_bank_statement_tree" groups="base.group_useability_extended"/> <record id="action_bank_statement_tree2" model="ir.actions.act_window"> <field name="name">New Statement</field> @@ -454,7 +456,7 @@ <field name="code" select="1"/> <field name="sequence"/> <field name="sign"/> - + <field name="close_method"/> <field name="partner_account"/> </form> @@ -653,7 +655,7 @@ <field eval="True" name="object"/> </record> - <wizard id="action_move_journal_line_form" menu="False" model="account.move.line" name="account.move.journal" string="Entries Encoding by Line"/> + <wizard id="action_move_journal_line_form" menu="False" model="account.move.line" name="account.move.journal" string="Making Entries by Line"/> <menuitem icon="STOCK_JUSTIFY_FILL" action="action_move_journal_line_form" id="menu_action_move_journal_line_form" parent="account.menu_finance_entries" type="wizard" sequence="5"/> <!-- @@ -788,7 +790,7 @@ </form> </field> </record> - + <record id="view_account_move_line_filter" model="ir.ui.view"> <field name="name">account.move.line.select</field> <field name="model">account.move.line</field> @@ -814,9 +816,9 @@ <field name="view_type">form</field> <field name="view_mode">tree,form</field> <field name="view_id" ref="view_move_line_tree"/> - <field name="search_view_id" ref="view_account_move_line_filter"/> + <field name="search_view_id" ref="view_account_move_line_filter"/> </record> - + <record id="action_view_move_line" model="ir.actions.act_window"> <field name="name">Lines to reconcile</field> <field name="res_model">account.move.line</field> @@ -825,7 +827,7 @@ <field name="domain">[('account_id.reconcile', '=', True),('reconcile_id','=',False)]</field> <field eval="False" name="view_id"/> <field eval="True" name="filter"/> - <field name="search_view_id" ref="view_account_move_line_filter"/> + <field name="search_view_id" ref="view_account_move_line_filter"/> </record> <!-- @@ -880,7 +882,7 @@ <field name="debit" select="1"/> <field name="credit" select="1"/> <field name="date" select="1"/> - + <separator colspan="4" string="Optional Information"/> <field name="currency_id"/> <field name="amount_currency"/> @@ -956,12 +958,12 @@ <menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/> <record id="action_move_line_form_encode_by_move" model="ir.actions.act_window"> - <field name="name">Entries Encoding by Move</field> + <field name="name">Making Entries by Move</field> <field name="res_model">account.move</field> <field name="view_type">form</field> <field name="view_mode">tree,form</field> <field name="view_id" ref="view_move_tree"/> - <field name="search_view_id" ref="view_account_move_filter"/> + <field name="search_view_id" ref="view_account_move_filter"/> </record> <menuitem action="action_move_line_form_encode_by_move" id="menu_encode_entries_by_move" parent="menu_finance_entries"/> @@ -1339,9 +1341,9 @@ <field name="view_type">form</field> <field name="view_mode">tree,form</field> <field name="domain">[('state','=','running')]</field> - <field name="filter" eval="True"/> + <field name="filter" eval="True"/> </record> - <menuitem action="action_subscription_form_running" id="menu_action_subscription_form_running" parent="menu_action_subscription_form" groups="base.group_extended_menu"/> + <menuitem action="action_subscription_form_running" id="menu_action_subscription_form_running" parent="menu_action_subscription_form" groups="base.group_useability_extended"/> <record id="action_subscription_form_new" model="ir.actions.act_window"> <field name="name">New Subscription</field> diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml index 9e06d1dd788..2c91c8c53c2 100644 --- a/addons/account/account_wizard.xml +++ b/addons/account/account_wizard.xml @@ -85,10 +85,10 @@ <!-- account.move validate --> - <wizard id="wizard_validate_account_moves" menu="False" model="account.move" name="account.move.validate" string="Validate Account Moves"/> + <wizard id="wizard_validate_account_moves" menu="False" model="account.move" name="account.move.validate" string="Validate Ledger Postings"/> <menuitem action="wizard_validate_account_moves" id="menu_validate_account_moves" parent="account.menu_finance_periodical_processing" type="wizard"/> - <wizard id="wizard_validate_account_moves_line" menu="True" model="account.move.line" name="account.move_line.validate" string="Validate Account Moves"/> + <wizard id="wizard_validate_account_moves_line" menu="True" model="account.move.line" name="account.move_line.validate" string="Validate Ledger Postings"/> <!-- Use Models --> <wizard string="Create Entries From Models" model="account.model" name="account_use_models" menu="False" id="wizard_account_use_model"/> diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml index 84d22552e05..38545886c4d 100755 --- a/addons/account/process/statement_process.xml +++ b/addons/account/process/statement_process.xml @@ -1,21 +1,21 @@ <?xml version="1.0" ?> <openerp> <data> - + <!-- Process --> - + <record id="process_process_statementprocess0" model="process.process"> <field eval="1" name="active"/> <field name="model_id" ref="account.model_account_bank_statement"/> <field eval=""""Statement Process"""" name="name"/> </record> - + <!-- Process Node --> - + <record id="process_node_electronicfile0" model="process.node"> <field name="menu_id" ref="account.menu_bank_statement_tree"/> <field name="model_id" ref="account.model_account_bank_statement"/> @@ -26,7 +26,7 @@ <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="1" name="flow_start"/> </record> - + <record id="process_node_manually0" model="process.node"> <field name="menu_id" ref="account.menu_bank_statement_tree"/> <field name="model_id" ref="account.model_account_bank_statement"/> @@ -37,7 +37,7 @@ <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="1" name="flow_start"/> </record> - + <record id="process_node_importinvoice0" model="process.node"> <field name="menu_id" ref="account.menu_bank_statement_tree"/> <field name="model_id" ref="account.model_account_bank_statement"/> @@ -48,7 +48,7 @@ <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="1" name="flow_start"/> </record> - + <record id="process_node_draftstatement0" model="process.node"> <field name="menu_id" ref="account.menu_bank_statement_tree"/> <field name="model_id" ref="account.model_account_bank_statement"/> @@ -63,7 +63,7 @@ <!-- Process Transition --> - + <record id="process_transition_filestatement0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> @@ -72,16 +72,16 @@ <field model="process.node" name="target_node_id" ref="process_node_draftstatement0"/> <field model="process.node" name="source_node_id" ref="process_node_electronicfile0"/> </record> - + <record id="process_transition_invoicemanually0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Manually statement"""" name="name"/> - <field eval=""""Encode manually statement comes into the draft statement"""" name="note"/> + <field eval=""""A statement with manual entries becomes a draft statement"""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_draftstatement0"/> <field model="process.node" name="source_node_id" ref="process_node_manually0"/> </record> - + <record id="process_transition_invoiceimport0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> @@ -90,6 +90,6 @@ <field model="process.node" name="target_node_id" ref="process_node_draftstatement0"/> <field model="process.node" name="source_node_id" ref="process_node_importinvoice0"/> </record> - + </data> </openerp>
\ No newline at end of file diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 71bb124109d..a615b3d3006 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -80,7 +80,7 @@ </record> <!--<menuitem id="menu_analytic_account" name="Analytic Accounts" parent="account.menu_analytic_accounting"/>--> <menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="account.menu_analytic_accounting"/> - + <record id="act_account_renew_view" model="ir.actions.act_window"> <field name="name">Accounts to Renew</field> <field name="type">ir.actions.act_window</field> @@ -88,7 +88,7 @@ <field name="view_type">form</field> <field name="view_mode">tree,form</field> <field name="domain">[('date','<',time.strftime('%Y-%m-%d %H:%M:%S'))]</field> - <field name="filter" eval="True"/> + <field name="filter" eval="True"/> </record> <record id="action_account_analytic_account_tree2" model="ir.actions.act_window"> @@ -105,10 +105,10 @@ id="account_analytic_def_chart" parent="account_analytic_def_account"/> <!-- <menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart" parent="account.menu_finance_charts"/>--> - + <wizard id="wizard_analytic_account_chart" menu="False" model="account.analytic.account" name="account.analytic.account.chart" string="Analytic Chart of Accounts"/> <menuitem icon="STOCK_INDENT" action="wizard_analytic_account_chart" id="menu_action_analytic_account_tree2" parent="account.menu_finance_charts" type="wizard"/> - + <record id="analytic_account_form" model="ir.actions.act_window"> <field name="name">New Analytic Account</field> <field name="res_model">account.analytic.account</field> @@ -183,7 +183,7 @@ <field name="view_type">form</field> <field name="view_id" ref="view_account_analytic_line_tree"/> </record> - <wizard id="action_account_analytic_line" menu="False" model="account.analytic.line" name="account.analytic.line" string="Entries Encoding by Line"/> + <wizard id="action_account_analytic_line" menu="False" model="account.analytic.line" name="account.analytic.line" string="Making Entries by Line"/> <menuitem id="next_id_41" name="Analytic Entries" parent="account.menu_finance_entries"/> <menuitem type="wizard" icon="STOCK_JUSTIFY_FILL" action="action_account_analytic_line" id="account_entries_analytic_entries" parent="next_id_41"/> diff --git a/addons/board_manufacturing/board_manufacturing_view.xml b/addons/board_manufacturing/board_manufacturing_view.xml index 731a79e09b0..5f9326625af 100644 --- a/addons/board_manufacturing/board_manufacturing_view.xml +++ b/addons/board_manufacturing/board_manufacturing_view.xml @@ -4,7 +4,7 @@ <record id="note_sale_type" model="board.note.type"> <field name="name">Production</field> </record> - + <record id="board_mrp_manager_form" model="ir.ui.view"> <field name="name">board.mrp.manager.form</field> <field name="model">board.board</field> @@ -14,21 +14,21 @@ <hpaned position="100"> <child1> <action colspan="4" height="200" name="%(mrp.mrp_production_action2)d" string="Next production orders" width="510"/> - <action colspan="4" name="%(stock.action_picking_tree2)d" string="Deliveries (Out packing)"/> - <action colspan="4" name="%(mrp.mrp_procurement_action4)d" string="Procurement in Exception"/> + <action colspan="4" name="%(stock.action_picking_tree2)d" string="Deliveries (Out picking)"/> + <action colspan="4" name="%(mrp.mrp_procurement_action4)d" string=" Requisition in Exception"/> </child1> - - + + <child2> - <action colspan="4" name="%(report_mrp.action_report_workcenter_load_tree)d" string="Workcenter futur load"/> - + <action colspan="4" name="%(report_mrp.action_report_workcenter_load_tree)d" string="Workcenter future load"/> + <action colspan="4" name="%(report_mrp.action_report_in_out_picking_tree)d" string="Stock value variation"/> </child2> </hpaned> </form> </field> </record> - + <record id="open_board_manufacturing" model="ir.actions.act_window"> <field name="name">Production Dashboard</field> <field name="res_model">board.board</field> diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml index d05aa480367..50373131d9d 100644 --- a/addons/delivery/delivery_view.xml +++ b/addons/delivery/delivery_view.xml @@ -158,7 +158,7 @@ </record> <record id="action_picking_tree4" model="ir.actions.act_window"> - <field name="name">Packing to be invoiced</field> + <field name="name">Picking to be invoiced</field> <field name="res_model">stock.picking</field> <field name="type">ir.actions.act_window</field> <field name="view_type">form</field> @@ -179,7 +179,7 @@ <field name="domain">[('invoice_state','=','2binvoiced'),('state','=','done'),('type','=','in')]</field> <field name="filter" eval="True"/> <field name="context">{'contact_display': 'partner'}</field> - <field name="search_view_id" ref="stock.view_stock_delivery_filter"/> + <field name="search_view_id" ref="stock.view_stock_delivery_filter"/> </record> <menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="stock.menu_action_picking_tree4" groups="base.group_extended_menu"/> diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index b180dbcb076..1e9a29db9ac 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -518,7 +518,7 @@ </form> </field> </record> - + <record id="view_mrp_production_filter" model="ir.ui.view"> <field name="name">mrp.production.select</field> <field name="model">mrp.production</field> @@ -531,13 +531,13 @@ <separator orientation="vertical"/> <field name="name" select='1'/> <field name="product_id" select='1'/> - <field name="routing_id" select='1'/> + <field name="routing_id" select='1'/> <field name="origin" select='1'/> </group> </search> </field> </record> - + <record id="mrp_production_action" model="ir.actions.act_window"> <field name="name">Production Orders</field> <field name="type">ir.actions.act_window</field> @@ -545,7 +545,7 @@ <field name="view_type">form</field> <field name="view_mode">tree,form,calendar,graph,gantt</field> <field name="view_id" eval="False"/> - <field name="search_view_id" ref="view_mrp_production_filter"/> + <field name="search_view_id" ref="view_mrp_production_filter"/> </record> <menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_root"/> @@ -571,7 +571,7 @@ <field name="view_mode">tree,form,calendar,graph,gantt</field> <field name="domain">[('state','=','ready')]</field> <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_mrp_production_filter"/> + <field name="search_view_id" ref="view_mrp_production_filter"/> </record> <menuitem action="mrp_production_action2" id="menu_production_orders_start" parent="menu_mrp_production_action" groups="base.group_extended_menu" /> <record id="mrp_production_action3" model="ir.actions.act_window"> @@ -582,7 +582,7 @@ <field name="view_mode">tree,form,calendar,graph,gantt</field> <field name="domain">[('state','=','in_production')]</field> <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_mrp_production_filter"/> + <field name="search_view_id" ref="view_mrp_production_filter"/> </record> <menuitem action="mrp_production_action3" id="menu_mrp_production_action3" parent="menu_mrp_production_action" groups="base.group_extended_menu"/> <record id="mrp_production_action4" model="ir.actions.act_window"> @@ -593,7 +593,7 @@ <field name="view_mode">tree,form,calendar,graph,gantt</field> <field name="domain">[('state','=','confirmed')]</field> <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_mrp_production_filter"/> + <field name="search_view_id" ref="view_mrp_production_filter"/> </record> <menuitem action="mrp_production_action4" id="menu_production_orders_waiting4" parent="mrp.menu_mrp_production_action" groups="base.group_extended_menu"/> @@ -759,7 +759,7 @@ <separator orientation="vertical"/> <field name="name" select='1'/> <field name="product_id" select='1'/> - <field name="date_planned" select='1'/> + <field name="date_planned" select='1'/> <field name="state" select='1'/> </group> </search> @@ -786,7 +786,7 @@ <menuitem action="mrp_procurement_action3" id="menu_mrp_procurement_action3" parent="mrp.menu_mrp_procurement_action" groups="base.group_extended_menu"/> <record id="mrp_procurement_action5" model="ir.actions.act_window"> - <field name="name">Exceptions Procurements</field> + <field name="name">Procurement Exceptions</field> <field name="type">ir.actions.act_window</field> <field name="res_model">mrp.procurement</field> <field name="view_type">form</field> @@ -796,7 +796,7 @@ <menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_action5" parent="menu_mrp_reordering" groups="base.group_extended_menu"/> <record id="mrp_procurement_action4" model="ir.actions.act_window"> - <field name="name">Exceptions Procurements to Fix</field> + <field name="name">Procurement Exceptions to Fix</field> <field name="type">ir.actions.act_window</field> <field name="res_model">mrp.procurement</field> <field name="view_type">form</field> @@ -874,7 +874,7 @@ <!-- add product_uom to context to be the default value when adding new orderpoints --> <act_window context="{'product_uom': locals().has_key('uom_id') and uom_id}" - domain="[('product_id', '=', active_id)]" + domain="[('product_id', '=', active_id)]" id="act_product_product_2_stock_warehouse_orderpoint" name="Minimum Stock Rules" res_model="stock.warehouse.orderpoint" diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index eb658f52745..7d8faec82b9 100755 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -1,21 +1,21 @@ <?xml version="1.0" ?> <openerp> <data> - + <!-- Process --> - + <record id="process_process_procurementprocess0" model="process.process"> - <field eval=""""Procurement Process"""" name="name"/> + <field eval="""" Requisition Process"""" name="name"/> <field name="model_id" ref="mrp.model_mrp_procurement"/> <field eval="1" name="active"/> </record> - + <!-- Process Node --> - + <record id="process_node_stockproduct1" model="process.node"> <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> <field name="model_id" ref="mrp.model_mrp_procurement"/> @@ -27,51 +27,51 @@ <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/> <field eval="1" name="flow_start"/> </record> - + <record id="process_node_serviceproduct1" model="process.node"> <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> <field name="model_id" ref="mrp.model_mrp_procurement"/> <field eval=""""subflow"""" name="kind"/> <field eval=""""If Product type is service"""" name="note"/> - <field eval=""""Service Product"""" name="name"/> + <field eval=""""Service"""" name="name"/> <field name="process_id" ref="mrp.process_process_serviceproductprocess0"/> <field name="subflow_id" ref="process_process_procurementprocess0"/> <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/> <field eval="1" name="flow_start"/> </record> - + <record id="process_node_productionorder0" model="process.node"> <field name="menu_id" ref="mrp.menu_mrp_production_action"/> <field name="model_id" ref="mrp.model_mrp_production"/> <field eval=""""state"""" name="kind"/> - <field eval=""""Procurement for raw materials."""" name="note"/> + <field eval="""" Requisition for raw materials."""" name="note"/> <field eval=""""Production Order"""" name="name"/> <field name="process_id" ref="process_process_procurementprocess0"/> <field eval=""""object.state in ('draft', 'picking_except', 'confirmed', 'ready', 'in_production', 'cancel', 'done')"""" name="model_states"/> <field eval="1" name="flow_start"/> </record> - + <record id="process_node_minimumstockrule0" model="process.node"> <field name="menu_id" ref="mrp.menu_action_orderpoint_form"/> <field name="model_id" ref="mrp.model_stock_warehouse_orderpoint"/> <field eval=""""state"""" name="kind"/> - <field eval=""""Procurement is created if the product quantity is lower than the minimum limit."""" name="note"/> + <field eval="""" Requisition is created if the product quantity is lower than the minimum limit."""" name="note"/> <field eval=""""Minimum Stock Rule"""" name="name"/> <field name="process_id" ref="process_process_procurementprocess0"/> <field eval="1" name="flow_start"/> </record> - + <record id="process_node_procureproducts0" model="process.node"> <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> <field name="model_id" ref="mrp.model_mrp_procurement"/> <field eval=""""state"""" name="kind"/> - <field eval=""""Central document to procure products"""" name="note"/> + <field eval=""""Central document to Requisition of products"""" name="note"/> <field eval=""""Procure Products"""" name="name"/> <field name="process_id" ref="process_process_procurementprocess0"/> <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> - + <record id="process_node_stockproduct0" model="process.node"> <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> <field name="model_id" ref="mrp.model_mrp_procurement"/> @@ -83,30 +83,30 @@ <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> - + <record id="process_node_serviceproduct0" model="process.node"> <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> <field name="model_id" ref="mrp.model_mrp_procurement"/> <field eval=""""subflow"""" name="kind"/> <field eval=""""If Product type is service"""" name="note"/> - <field eval=""""Service Product"""" name="name"/> + <field eval=""""Service"""" name="name"/> <field name="subflow_id" ref="process_process_serviceproductprocess0"/> <field name="process_id" ref="process_process_procurementprocess0"/> <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> - + <record id="process_node_purchaseprocure0" model="process.node"> <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> <field name="model_id" ref="mrp.model_mrp_procurement"/> <field eval=""""subflow"""" name="kind"/> - <field eval=""""Procurements"""" name="name"/> - <field eval=""""Procurement orders"""" name="note"/> + <field eval="""" Requisitions"""" name="name"/> + <field eval="""" Requisition orders"""" name="note"/> <field name="subflow_id" ref="process_process_procurementprocess0"/> <field name="process_id" ref="purchase.process_process_purchaseprocess0"/> <field eval="1" name="flow_start"/> </record> - + <record id="process_node_productminimumstockrule0" model="process.node"> <field name="menu_id" ref="mrp.menu_action_orderpoint_form"/> <field name="model_id" ref="mrp.model_stock_warehouse_orderpoint"/> @@ -116,7 +116,7 @@ <field name="process_id" ref="product.process_process_productprocess0"/> <field eval="0" name="flow_start"/> </record> - + <record id="process_node_routing0" model="process.node"> <field name="menu_id" ref="mrp.menu_mrp_routing_action"/> <field name="model_id" ref="mrp.model_mrp_routing"/> @@ -126,7 +126,7 @@ <field name="process_id" ref="product.process_process_productprocess0"/> <field eval="0" name="flow_start"/> </record> - + <record id="process_node_billofmaterial0" model="process.node"> <field name="menu_id" ref="mrp.menu_mrp_bom_form_action"/> <field name="model_id" ref="mrp.model_mrp_bom"/> @@ -136,43 +136,43 @@ <field name="process_id" ref="product.process_process_productprocess0"/> <field eval="0" name="flow_start"/> </record> - + <!-- Process Transition --> - + <record id="process_transition_servicemto0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Serivce Stockable Order"""" name="name"/> - <field eval=""""If product type is service and procure method is Make to order"""" name="note"/> + <field eval=""""If product type is service and requisition method is Make to order"""" name="note"/> <field model="process.node" name="target_node_id" ref="mrp.process_node_serviceonorder0"/> <field model="process.node" name="source_node_id" ref="process_node_serviceproduct1"/> </record> - + <record id="process_transition_servicemts0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Service Make to Stock"""" name="name"/> - <field eval=""""If Product type is service and procure method is Make to stock"""" name="note"/> + <field eval=""""If Product type is service and requisition method is Make to stock"""" name="note"/> <field model="process.node" name="target_node_id" ref="mrp.process_node_servicemts0"/> <field model="process.node" name="source_node_id" ref="process_node_serviceproduct1"/> </record> - + <record id="process_transition_stockmts0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Stockable Make to Stock"""" name="name"/> - <field eval=""""If Product type is Stockable and procure method is make to stock"""" name="note"/> + <field eval=""""If Product type is Stockable and requisition method is make to stock"""" name="note"/> <field model="process.node" name="target_node_id" ref="mrp.process_node_mts0"/> <field model="process.node" name="source_node_id" ref="process_node_stockproduct1"/> </record> - + <record id="process_transition_stockproduct0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Stockable Product Stock"""" name="name"/> - <field eval=""""Product type is Stockable and procure method is make to stock"""" name="note"/> + <field eval=""""Product type is Stockable and Requisition method is make to stock"""" name="note"/> <field model="process.node" name="target_node_id" ref="mrp.process_node_stock0"/> <field model="process.node" name="source_node_id" ref="process_node_stockproduct1"/> </record> @@ -180,12 +180,12 @@ <record id="process_transition_productionprocureproducts0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Production Procure Products"""" name="name"/> + <field eval=""""Production Requisition Products"""" name="name"/> <field eval=""""When any procuere products, it comes into the prpcurement orders"""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_procureproducts0"/> <field model="process.node" name="source_node_id" ref="process_node_productionorder0"/> </record> - + <record id="process_transition_minimumstockprocure0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> @@ -194,7 +194,7 @@ <field model="process.node" name="target_node_id" ref="process_node_procureproducts0"/> <field model="process.node" name="source_node_id" ref="process_node_minimumstockrule0"/> </record> - + <record id="process_transition_procurestockableproduct0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> @@ -203,7 +203,7 @@ <field model="process.node" name="target_node_id" ref="process_node_stockproduct0"/> <field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/> </record> - + <record id="process_transition_procureserviceproduct0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> @@ -212,7 +212,7 @@ <field model="process.node" name="target_node_id" ref="process_node_serviceproduct0"/> <field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/> </record> - + <record id="process_transition_purchaseprocure0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> @@ -221,7 +221,7 @@ <field model="process.node" name="target_node_id" ref="purchase.process_node_draftpurchaseorder0"/> <field model="process.node" name="source_node_id" ref="process_node_purchaseprocure0"/> </record> - + <record id="process_transition_producttostockrules0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> @@ -230,7 +230,7 @@ <field model="process.node" name="target_node_id" ref="process_node_productminimumstockrule0"/> <field model="process.node" name="source_node_id" ref="product.process_node_product0"/> </record> - + <record id="process_transition_billofmaterialrouting0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> @@ -239,7 +239,7 @@ <field model="process.node" name="target_node_id" ref="process_node_routing0"/> <field model="process.node" name="source_node_id" ref="process_node_billofmaterial0"/> </record> - + <record id="process_transition_bom0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> @@ -248,6 +248,6 @@ <field model="process.node" name="target_node_id" ref="process_node_billofmaterial0"/> <field model="process.node" name="source_node_id" ref="product.process_node_product0"/> </record> - + </data> </openerp>
\ No newline at end of file diff --git a/addons/mrp/process/service_product_process.xml b/addons/mrp/process/service_product_process.xml index fe9a32f0ec3..ca73ead6fb0 100644 --- a/addons/mrp/process/service_product_process.xml +++ b/addons/mrp/process/service_product_process.xml @@ -1,21 +1,21 @@ <?xml version="1.0" ?> <openerp> <data> - + <!-- Process --> - + <record id="process_process_serviceproductprocess0" model="process.process"> - <field eval=""""Service Product Process"""" name="name"/> + <field eval=""""Service Process"""" name="name"/> <field name="model_id" ref="mrp.model_mrp_procurement"/> <field eval="1" name="active"/> </record> - + <!-- Process Node --> - + <record id="process_node_serviceonorder0" model="process.node"> <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> <field name="model_id" ref="mrp.model_mrp_procurement"/> @@ -26,7 +26,7 @@ <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> - + <record id="process_node_servicemts0" model="process.node"> <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> <field name="model_id" ref="mrp.model_mrp_procurement"/> @@ -37,7 +37,7 @@ <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> - + <record id="process_node_orderrfq0" model="process.node"> <field name="menu_id" ref="purchase.menu_purchase_form_action"/> <field name="model_id" ref="purchase.model_purchase_order"/> @@ -49,11 +49,11 @@ <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> - + <!-- Process Transition --> - + <record id="process_transition_servicerfq0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> @@ -62,6 +62,6 @@ <field model="process.node" name="target_node_id" ref="process_node_orderrfq0"/> <field model="process.node" name="source_node_id" ref="process_node_serviceonorder0"/> </record> - + </data> </openerp>
\ No newline at end of file diff --git a/addons/mrp/process/stockable_product_process.xml b/addons/mrp/process/stockable_product_process.xml index 34ff93d3228..25e5a117124 100644 --- a/addons/mrp/process/stockable_product_process.xml +++ b/addons/mrp/process/stockable_product_process.xml @@ -1,32 +1,32 @@ <?xml version="1.0" ?> <openerp> <data> - + <!-- Process --> - + <record id="process_process_stockableproductprocess0" model="process.process"> <field eval=""""Stockable Product Process"""" name="name"/> <field name="model_id" ref="mrp.model_mrp_procurement"/> <field eval="1" name="active"/> </record> - + <!-- Process Node --> - + <record id="process_node_mts0" model="process.node"> <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> <field name="model_id" ref="mrp.model_mrp_procurement"/> <field eval=""""state"""" name="kind"/> - <field eval=""""The system waits for requested products in stock."""" name="note"/> + <field eval=""""The systems awaits requests for products in stock."""" name="note"/> <field eval=""""Make to Stock"""" name="name"/> <field name="process_id" ref="process_process_stockableproductprocess0"/> <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> - + <record id="process_node_stock0" model="process.node"> <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> <field name="model_id" ref="mrp.model_mrp_procurement"/> @@ -37,7 +37,7 @@ <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> - + <record id="process_node_rfq0" model="process.node"> <field name="menu_id" ref="purchase.menu_purchase_order_draft"/> <field name="model_id" ref="purchase.model_purchase_order"/> @@ -49,22 +49,22 @@ <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> - + <record id="process_node_production0" model="process.node"> <field name="menu_id" ref="mrp.menu_mrp_production_action"/> <field name="model_id" ref="mrp.model_mrp_production"/> <field eval=""""state"""" name="kind"/> - <field eval=""""Production orders are created for the product manufacturing."""" name="note"/> + <field eval=""""Production orders are created for product manufacturing."""" name="note"/> <field eval=""""Production Order"""" name="name"/> <field name="process_id" ref="process_process_stockableproductprocess0"/> <field eval=""""object.state=='confirmed'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> - + <!-- Process Transition --> - + <record id="process_transition_stockrfq0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> @@ -73,7 +73,7 @@ <field model="process.node" name="target_node_id" ref="process_node_rfq0"/> <field model="process.node" name="source_node_id" ref="process_node_stock0"/> </record> - + <record id="process_transition_stockproduction0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> @@ -82,6 +82,6 @@ <field model="process.node" name="target_node_id" ref="process_node_production0"/> <field model="process.node" name="source_node_id" ref="process_node_stock0"/> </record> - + </data> </openerp>
\ No newline at end of file diff --git a/addons/process/process_demo.xml b/addons/process/process_demo.xml index 05251e6fd22..41a4588fc0f 100644 --- a/addons/process/process_demo.xml +++ b/addons/process/process_demo.xml @@ -52,7 +52,7 @@ </record> <record id="node_packing" model="process.node"> - <field name="name">Packing List</field> + <field name="name">Picking List</field> <field name="note">The workers pack the requested items</field> <field name="model_id" model="ir.model" search="[('name', '=', 'Packing list')]"></field> <field name="menu_id" model="ir.ui.menu" search="[('name', '=', 'Packing to Process')]"></field> @@ -69,7 +69,7 @@ <field name="kind">state</field> <field name="model_states"></field> <field name="process_id" ref="sales_workflow"/> - </record> + </record> <record id="node_invoice_on_delivery" model="process.node"> <field name="name">Invoice</field> @@ -79,7 +79,7 @@ <field name="kind">subflow</field> <field name="model_states"></field> <field name="process_id" ref="sales_workflow"/> - </record> + </record> <!-- Node conditions (Gray nodes) --> @@ -106,7 +106,7 @@ </record> <record id="transition_packing" model="process.transition"> - <field name="name">Packing</field> + <field name="name">Picking</field> <field name="source_node_id" ref="node_sale_order"></field> <field name="target_node_id" ref="node_packing"></field> </record> diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml index d266cb310bd..a7de5ab0958 100755 --- a/addons/purchase/process/purchase_process.xml +++ b/addons/purchase/process/purchase_process.xml @@ -1,32 +1,32 @@ <?xml version="1.0" ?> <openerp> <data> - - <!-- + + <!-- Process --> - + <record id="process_process_purchaseprocess0" model="process.process"> <field eval="1" name="active"/> <field name="model_id" ref="purchase.model_purchase_order"/> <field eval=""""Purchase Process"""" name="name"/> </record> - - <!-- + + <!-- Process Node --> - + <record id="process_node_packinginvoice0" model="process.node"> <field name="menu_id" ref="stock.menu_picking_waiting"/> <field name="model_id" ref="stock.model_stock_picking"/> <field eval=""""state"""" name="kind"/> - <field eval=""""Out Packing"""" name="name"/> + <field eval=""""Out Picking"""" name="name"/> <field eval=""""Invoice based on deliveries"""" name="note"/> <field name="process_id" ref="account.process_process_invoiceprocess0"/> <field eval=""""object.state in ('assigned', 'confirmed')"""" name="model_states"/> <field eval="1" name="flow_start"/> </record> - + <record id="process_node_purchaseorder0" model="process.node"> <field name="menu_id" ref="purchase.menu_purchase_form_action"/> <field name="model_id" ref="purchase.model_purchase_order"/> @@ -38,7 +38,7 @@ <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="1" name="flow_start"/> </record> - + <record id="process_node_draftpurchaseorder0" model="process.node"> <field name="menu_id" ref="purchase.menu_purchase_order_draft"/> <field name="model_id" ref="purchase.model_purchase_order"/> @@ -49,7 +49,7 @@ <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> - + <record id="process_node_draftpurchaseorder1" model="process.node"> <field name="menu_id" ref="purchase.menu_purchase_order_draft"/> <field name="model_id" ref="purchase.model_purchase_order"/> @@ -60,7 +60,7 @@ <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="1" name="flow_start"/> </record> - + <record id="process_node_confirmpurchaseorder0" model="process.node"> <field name="menu_id" ref="purchase.menu_purchase_form_action3"/> <field name="model_id" ref="purchase.model_purchase_order"/> @@ -71,7 +71,7 @@ <field eval=""""object.state=='confirmed'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> - + <record id="process_node_approvepurchaseorder0" model="process.node"> <field name="menu_id" ref="purchase.menu_purchase_form_action4"/> <field name="model_id" ref="purchase.model_purchase_order"/> @@ -82,7 +82,7 @@ <field eval=""""object.state=='approved'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> - + <record id="process_node_invoicecontrol0" model="process.node"> <field name="menu_id" ref="account.menu_action_invoice_tree8"/> <field name="model_id" ref="account.model_account_invoice"/> @@ -94,18 +94,18 @@ <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> - + <record id="process_node_packinglist0" model="process.node"> <field name="menu_id" ref="stock.menu_action_picking_tree4"/> <field name="model_id" ref="stock.model_stock_picking"/> <field eval=""""state"""" name="kind"/> <field eval=""""Incoming Products"""" name="name"/> - <field eval=""""Packing is created for the products reception control."""" name="note"/> + <field eval=""""Picking is created for the products reception control."""" name="note"/> <field name="process_id" ref="process_process_purchaseprocess0"/> <field eval=""""object.state=='assigned'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> - + <record id="process_node_invoiceafterpacking0" model="process.node"> <field name="menu_id" ref="account.menu_finance_invoice"/> <field name="model_id" ref="account.model_account_invoice"/> @@ -117,7 +117,7 @@ <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> - + <record id="process_node_productrecept0" model="process.node"> <field name="menu_id" ref="stock.menu_picking_waiting"/> <field name="model_id" ref="stock.model_stock_picking"/> @@ -129,9 +129,9 @@ <field eval=""""object.state in ('draft', 'open', 'pending', 'close')"""" name="model_states"/> <field eval="1" name="flow_start"/> </record> - - <!-- - Process Condition + + <!-- + Process Condition --> <record id="process_condition_conditionorigin" model="process.condition"> @@ -140,30 +140,30 @@ <field eval=""""object.origin==''"""" name="model_states"/> <field eval=""""condition_origin"""" name="name"/> </record> - + <record id="process_condition_conditioninvoicemanual" model="process.condition"> <field name="model_id" ref="purchase.model_purchase_order"/> <field name="node_id" ref="process_node_invoicecontrol0"/> <field eval=""""object.invoice_method=='manual'"""" name="model_states"/> <field eval=""""condition_invoice_manual"""" name="name"/> </record> - - <!-- + + <!-- Process Transition --> - + <record id="res_roles_purchase0" model="res.roles"> <field eval=""""Purchase"""" name="name"/> </record> - + <record id="purchase.trans_draft_confirmed" model="workflow.transition"> <field name="role_id" ref="res_roles_purchase0"/> </record> - + <record id="purchase.trans_router_invoice" model="workflow.transition"> <field name="role_id" ref="res_roles_purchase0"/> </record> - + <record id="process_transition_productrecept0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> @@ -172,7 +172,7 @@ <field model="process.node" name="target_node_id" ref="account.process_node_supplierdraftinvoices0"/> <field model="process.node" name="source_node_id" ref="process_node_productrecept0"/> </record> - + <record id="process_transition_confirmingpurchaseorder0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> @@ -182,7 +182,7 @@ <field model="process.node" name="source_node_id" ref="process_node_draftpurchaseorder0"/> <field eval="[(6,0,[ref('purchase.trans_draft_confirmed')])]" name="transition_ids"/> </record> - + <record id="process_transition_confirmingpurchaseorder1" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> @@ -191,7 +191,7 @@ <field model="process.node" name="target_node_id" ref="process_node_confirmpurchaseorder0"/> <field model="process.node" name="source_node_id" ref="process_node_draftpurchaseorder1"/> </record> - + <record id="process_transition_approvingpurchaseorder0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> @@ -200,7 +200,7 @@ <field model="process.node" name="target_node_id" ref="process_node_approvepurchaseorder0"/> <field model="process.node" name="source_node_id" ref="process_node_confirmpurchaseorder0" /> </record> - + <record id="process_transition_invoicefrompurchase0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> @@ -210,25 +210,25 @@ <field model="process.node" name="source_node_id" ref="process_node_approvepurchaseorder0"/> <field eval="[(6,0,[ref('purchase.trans_router_invoice')])]" name="transition_ids"/> </record> - + <record id="process_transition_createpackinglist0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Create Packing list"""" name="name"/> - <field eval=""""When purchase order is approved , it creates its packing list."""" name="note"/> + <field eval=""""Create Picking list"""" name="name"/> + <field eval=""""When purchase order is approved , it creates its picking list."""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_packinglist0"/> <field model="process.node" name="source_node_id" ref="process_node_approvepurchaseorder0"/> </record> - + <record id="process_transition_invoicefrompackinglist0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Invoice from Packing list"""" name="name"/> + <field eval=""""Invoice from Picking list"""" name="name"/> <field eval=""""Creates invoice from packin list"""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_invoiceafterpacking0"/> <field model="process.node" name="source_node_id" ref="process_node_packinglist0"/> </record> - + <record id="process_transition_purchaseinvoice0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> @@ -237,54 +237,54 @@ <field model="process.node" name="target_node_id" ref="account.process_node_supplierdraftinvoices0"/> <field model="process.node" name="source_node_id" ref="process_node_purchaseorder0"/> </record> - + <record id="process_transition_packinginvoice0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Packing Invoice"""" name="name"/> - <field eval=""""From Packing list, Create invoice."""" name="note"/> + <field eval=""""Picking Invoice"""" name="name"/> + <field eval=""""From Picking list, Create invoice."""" name="note"/> <field model="process.node" name="target_node_id" ref="account.process_node_draftinvoices0"/> <field model="process.node" name="source_node_id" ref="process_node_packinginvoice0"/> </record> - - <!-- + + <!-- Process Action --> - + <record id="process_transition_action_confirmpurchaseorder0" model="process.transition.action"> <field eval=""""wkf_confirm_order"""" name="action"/> <field eval=""""object"""" name="state"/> <field eval=""""Confirm"""" name="name"/> <field name="transition_id" ref="process_transition_confirmingpurchaseorder0"/> </record> - + <record id="process_transition_action_cancelpurchaseorder0" model="process.transition.action"> <field eval=""""write({'state':'cancel'})"""" name="action"/> <field eval=""""object"""" name="state"/> <field eval=""""Cancel"""" name="name"/> <field name="transition_id" ref="process_transition_confirmingpurchaseorder0"/> </record> - + <record id="process_transition_action_approvingpurchaseorder0" model="process.transition.action"> <field eval=""""wkf_approve_order"""" name="action"/> <field eval=""""object"""" name="state"/> <field eval=""""Approve"""" name="name"/> <field name="transition_id" ref="process_transition_approvingpurchaseorder0"/> </record> - + <record id="process_transition_action_approvingcancelpurchaseorder0" model="process.transition.action"> <field eval=""""write({'state':'cancel'})"""" name="action"/> <field eval=""""object"""" name="state"/> <field eval=""""Cancel"""" name="name"/> <field name="transition_id" ref="process_transition_approvingpurchaseorder0"/> </record>. - + <record id="process_transition_action_invoicefrompurchaseorder0" model="process.transition.action"> <field eval=""""action_invoice_create"""" name="action"/> <field eval=""""object"""" name="state"/> <field eval=""""Create invoice"""" name="name"/> <field name="transition_id" ref="process_transition_invoicefrompurchase0"/> </record> - + </data> </openerp>
\ No newline at end of file diff --git a/addons/purchase/purchase_unit_test.xml b/addons/purchase/purchase_unit_test.xml index ef4ade4724f..aefce270e1c 100644 --- a/addons/purchase/purchase_unit_test.xml +++ b/addons/purchase/purchase_unit_test.xml @@ -11,7 +11,7 @@ 'dest_address_id':fields.many2one('res.partner.address', 'Destination Address', states={'posted':[('readonly',True)]}), 'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', states={'posted':[('readonly',True)]}), 'invoice_method': fields.selection([('manual','Manual'),('order','From order'),('picking','From picking')], 'Invoicing method', required=True), - + Mandatory fields: 'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}), 'partner_id':fields.many2one('res.partner', 'Partner', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, change_default=True), @@ -39,7 +39,7 @@ 'product_uom': fields.many2one('product.uom', 'Product UOM', required=True), 'notes': fields.text('Notes'), 'account_analytic_id':fields.many2one('account.analytic.account', 'Analytic Account',), - + Mandatory fields: 'date_planned': fields.date('Date Promised', required=True), 'product_id': fields.many2one('product.product', 'Product', domain=[('purchase_ok','=',True)], change_default=True), @@ -64,38 +64,38 @@ <field name="price_unit">88</field> <field name="product_qty">3</field> </record> - + <assert model="purchase.order" id="test_purchase_1" string="The amount of Test purchase is correctly computed" severity="error"> <test expr="sum([l.price_subtotal for l in order_line]) == amount_untaxed" /> </assert> - + <workflow model="purchase.order" ref="test_purchase_1" action="purchase_confirm" /> - + <assert model="purchase.order" id="test_purchase_1" string="Test purchase is now confirmed"> <test expr="state">confirmed</test> </assert> - + <workflow model="purchase.order" ref="test_purchase_1" action="purchase_approve" uid="base.user_root" /> - + <assert model="purchase.order" id="test_purchase_1" string="Test purchase is now in progress"> <test expr="state">approved</test> </assert> - + <!-- Treat generated invoice --> <assert model="purchase.order" id="test_purchase_1" string="Test purchase has now a corresponding invoice" severity="fatal"> <test expr="bool(invoice_id)" /> </assert> - + <assert model="purchase.order" id="test_purchase_1" string="Test purchase's invoice has the same amount and is currently a draft" severity="error"> <test expr="invoice_id.amount_untaxed == amount_untaxed" /> <test expr="invoice_id.amount_total == amount_total" /> <test expr="invoice_id.state">draft</test> </assert> - + <workflow model="account.invoice" action="invoice_open"> <value model="purchase.order" eval="obj(ref('test_purchase_1')).invoice_id.id" /> </workflow> - + <function model="account.invoice" name="pay_and_reconcile"> <value model="purchase.order" eval="[obj(ref('test_purchase_1')).invoice_id.id]" /> <value eval="1164" /> @@ -106,36 +106,36 @@ <value eval="ref('account.period_' + str(int(time.strftime('%m'))))" /> <value eval="ref('account.bank_journal')" /> </function> - + <assert model="purchase.order" id="test_purchase_1" string="Test purchase's invoice is now paid" severity="error"> <test expr="invoice_id.state">paid</test> </assert> - + <!-- Treat generated picking --> - <assert model="purchase.order" id="test_purchase_1" string="Test purchase has now a corresponding packing" severity="fatal"> + <assert model="purchase.order" id="test_purchase_1" string="Test purchase has now a corresponding picking" severity="fatal"> <test expr="len(picking_ids) == 1" /> </assert> - - <assert model="purchase.order" id="test_purchase_1" string="Test purchase's packing will be sent to the good address" severity="error"> + + <assert model="purchase.order" id="test_purchase_1" string="Test purchase's picking will be sent to the good address" severity="error"> <test expr="picking_ids[0].address_id == partner_address_id" /> </assert> - + <!-- Do the same as in wizard_partial_picking lines 143-144 --> <function model="stock.picking" name="action_move"> <value model="purchase.order" eval="[obj(ref('test_purchase_1')).picking_ids[0].id]" /> </function> - + <workflow model="stock.picking" action="button_done"> <value model="purchase.order" eval="obj(ref('test_purchase_1')).picking_ids[0].id" /> </workflow> - - <assert model="purchase.order" id="test_purchase_1" string="Test purchase's packing is now done" severity="error"> + + <assert model="purchase.order" id="test_purchase_1" string="Test purchase's picking is now done" severity="error"> <test expr="picking_ids[0].state">done</test> </assert> - + <assert model="purchase.order" id="test_purchase_1" string="Test purchase is now completed" severity="fatal"> <test expr="state">done</test> </assert> </data> </openerp> - + diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index bcda8944bd0..ce4d5718413 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -131,13 +131,13 @@ </search> </field> </record> - + <record id="purchase_form_action" model="ir.actions.act_window"> <field name="name">Purchase Orders</field> <field name="type">ir.actions.act_window</field> <field name="res_model">purchase.order</field> <field name="view_mode">tree,form,calendar,graph</field> - <field name="search_view_id" ref="view_purchase_order_filter"/> + <field name="search_view_id" ref="view_purchase_order_filter"/> </record> <menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="purchase.menu_purchase_root"/> @@ -149,9 +149,9 @@ <field name="view_type">form</field> <field name="view_mode">tree,form,calendar,graph</field> <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_purchase_order_filter"/> + <field name="search_view_id" ref="view_purchase_order_filter"/> </record> - <menuitem action="purchase_form_action2" id="menu_purchase_order_draft" parent="purchase.menu_purchase_form_action" groups="base.group_extended_menu"/> + <menuitem action="purchase_form_action2" id="menu_purchase_order_draft" parent="purchase.menu_purchase_form_action" groups="base.group_useability_extended"/> <record id="purchase_form_action3" model="ir.actions.act_window"> <field name="name">Purchase Order Waiting Approval</field> @@ -161,9 +161,9 @@ <field name="view_mode">tree,form,calendar,graph</field> <field name="domain">[('state','=','confirmed')]</field> <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_purchase_order_filter"/> + <field name="search_view_id" ref="view_purchase_order_filter"/> </record> - <menuitem action="purchase_form_action3" id="menu_purchase_form_action3" parent="purchase.menu_purchase_form_action" groups="base.group_extended_menu"/> + <menuitem action="purchase_form_action3" id="menu_purchase_form_action3" parent="purchase.menu_purchase_form_action" groups="base.group_useability_extended"/> <record id="purchase_form_action4" model="ir.actions.act_window"> <field name="name">Purchase Orders in Progress</field> @@ -173,9 +173,9 @@ <field name="view_mode">tree,form,calendar,graph</field> <field name="domain">[('state','=','approved')]</field> <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_purchase_order_filter"/> + <field name="search_view_id" ref="view_purchase_order_filter"/> </record> - <menuitem action="purchase_form_action4" id="menu_purchase_form_action4" parent="purchase.menu_purchase_form_action" groups="base.group_extended_menu"/> + <menuitem action="purchase_form_action4" id="menu_purchase_form_action4" parent="purchase.menu_purchase_form_action" groups="base.group_useability_extended"/> <record id="purchase_form_action_new" model="ir.actions.act_window"> <field name="name">New Purchase Order</field> @@ -266,11 +266,11 @@ src_model="res.partner"/> <act_window - domain="[('product_id','=',active_id)]" + domain="[('product_id','=',active_id)]" id="action_purchase_line_product_tree" name="Product purchases" - res_model="purchase.order.line" - src_model="product.product"/> - + res_model="purchase.order.line" + src_model="product.product"/> + </data> </openerp> diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml index 83e5b7e3095..867f48f6fe0 100644 --- a/addons/purchase/stock_view.xml +++ b/addons/purchase/stock_view.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> - + <record id="stock_picking_inherit_purchase" model="ir.ui.view"> - <field name="name">Packing list</field> + <field name="name">Picking list</field> <field name="model">stock.picking</field> <field name="type">form</field> <field name="inherit_id" ref="stock.view_picking_form"/> @@ -13,13 +13,13 @@ </field> </field> </record> - + <act_window - domain="[('purchase_id', '=', active_id)]" - id="act_purchase_order_2_stock_picking" - name="Packing" - res_model="stock.picking" + domain="[('purchase_id', '=', active_id)]" + id="act_purchase_order_2_stock_picking" + name="Picking" + res_model="stock.picking" src_model="purchase.order"/> - + </data> </openerp> diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml index eb2d9f65ef3..7ce16903720 100755 --- a/addons/sale/process/sale_process.xml +++ b/addons/sale/process/sale_process.xml @@ -1,21 +1,21 @@ <?xml version="1.0" ?> <openerp> <data> - - <!-- + + <!-- Process --> - + <record id="process_process_salesprocess0" model="process.process"> <field eval="1" name="active"/> <field name="model_id" ref="sale.model_sale_order"/> <field eval=""""Sales Process"""" name="name"/> </record> - - <!-- - Process Node + + <!-- + Process Node --> - + <record id="process_node_order0" model="process.node"> <field name="menu_id" ref="sale.menu_sale_order"/> <field name="model_id" ref="sale.model_sale_order"/> @@ -27,7 +27,7 @@ <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="1" name="flow_start"/> </record> - + <record id="process_node_saleorderprocurement0" model="process.node"> <field name="menu_id" ref="sale.menu_sale_order"/> <field name="model_id" ref="sale.model_sale_order"/> @@ -39,7 +39,7 @@ <field eval=""""object.state in ('draft', 'waiting_date', 'manual', 'progress', 'shipping_except', 'invoice_except', 'done', 'cancel')"""" name="model_states"/> <field eval="1" name="flow_start"/> </record> - + <record id="process_node_quotation0" model="process.node"> <field name="menu_id" ref="sale.menu_action_order_tree10"/> <field name="model_id" ref="sale.model_sale_order"/> @@ -61,7 +61,7 @@ <field eval=""""object.state=='manual'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> - + <record id="process_node_saleprocurement0" model="process.node"> <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> <field name="model_id" ref="mrp.model_mrp_procurement"/> @@ -79,7 +79,7 @@ <field name="model_id" ref="stock.model_stock_picking"/> <field eval=""""state"""" name="kind"/> <field eval=""""Outgoing Products"""" name="name"/> - <field eval=""""Packing OUT is created for stockable products."""" name="note"/> + <field eval=""""Picking OUT is created for stockable products."""" name="note"/> <field name="process_id" ref="process_process_salesprocess0"/> <field eval=""""object.state in ('assigned', 'confirmed')"""" name="model_states"/> <field eval="0" name="flow_start"/> @@ -113,14 +113,14 @@ <field name="model_id" ref="account.model_account_invoice"/> <field eval=""""subflow"""" name="kind"/> <field eval=""""Draft Invoice"""" name="name"/> - <field eval=""""Invoice based on packing lists"""" name="note"/> + <field eval=""""Invoice based on picking lists"""" name="note"/> <field name="process_id" ref="process_process_salesprocess0"/> <field name="subflow_id" ref="account.process_process_invoiceprocess0"/> <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> - - <!-- + + <!-- Process Condition --> @@ -130,23 +130,23 @@ <field eval=""""object.order_policy=='postpaid'"""" name="model_states"/> <field eval=""""condition_after_delivery"""" name="name"/> </record> - - <!-- + + <!-- Process Transition --> - + <record id="res_roles_salesman0" model="res.roles"> <field eval=""""Salesman"""" name="name"/> </record> - + <record id="sale.trans_draft_router" model="workflow.transition"> <field name="role_id" ref="res_roles_salesman0"/> </record> - + <record id="sale.trans_wait_invoice_invoice_manual" model="workflow.transition"> <field name="role_id" ref="res_roles_salesman0"/> </record> - + <record id="process_transition_confirmquotation0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Confirm Quotation"""" name="name"/> @@ -155,7 +155,7 @@ <field model="process.node" name="source_node_id" ref="process_node_quotation0"/> <field eval="[(6,0,[ref('sale.trans_draft_router')])]" name="transition_ids"/> </record> - + <record id="process_transition_saleprocurement0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Sale Procurement"""" name="name"/> @@ -166,16 +166,16 @@ <record id="process_transition_packing0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Packing"""" name="name"/> - <field eval=""""Packing list is created when 'Assign' is being clicked after confirming the sale order. This transaction moves the sale order to packing list."""" name="note"/> + <field eval=""""Picking"""" name="name"/> + <field eval=""""Picking list is created when 'Assign' is being clicked after confirming the sale order. This transaction moves the sale order to picking list."""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_packinglist0"/> <field model="process.node" name="source_node_id" ref="process_node_saleprocurement0"/> </record> - + <record id="process_transition_deliver0" model="process.transition"> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""Deliver"""" name="name"/> - <field eval=""""Confirming the packing list moves them to delivery order. This can be done by clicking on 'Validate' button."""" name="note"/> + <field eval=""""Confirming the picking list moves them to delivery order. This can be done by clicking on 'Validate' button."""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_deliveryorder0"/> <field model="process.node" name="source_node_id" ref="process_node_packinglist0"/> </record> @@ -196,7 +196,7 @@ <field model="process.node" name="target_node_id" ref="process_node_invoiceafterdelivery0"/> <field model="process.node" name="source_node_id" ref="process_node_packinglist0"/> </record> - + <record id="process_transition_saleorderprocurement0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> @@ -205,7 +205,7 @@ <field model="process.node" name="target_node_id" ref="mrp.process_node_procureproducts0"/> <field model="process.node" name="source_node_id" ref="process_node_saleorderprocurement0"/> </record> - + <record id="process_transition_saleinvoice0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> @@ -214,11 +214,11 @@ <field model="process.node" name="target_node_id" ref="account.process_node_draftinvoices0"/> <field model="process.node" name="source_node_id" ref="process_node_order0"/> </record> - - <!-- + + <!-- Process Action --> - + <record id="process_transition_action_confirm0" model="process.transition.action"> <field eval=""""action_wait"""" name="action"/> <field eval=""""object"""" name="state"/> @@ -232,7 +232,7 @@ <field eval=""""Cancel"""" name="name"/> <field name="transition_id" ref="process_transition_confirmquotation0"/> </record> - + <record id="process_transition_action_assign0" model="process.transition.action"> <field eval=""""action_assign"""" name="action"/> <field eval=""""object"""" name="state"/> @@ -253,7 +253,7 @@ <field eval=""""Cancel"""" name="name"/> <field name="transition_id" ref="process_transition_packing0"/> </record> - + <record id="process_transition_action_cancelassignation0" model="process.transition.action"> <field eval=""""cancel_assign"""" name="action"/> <field eval=""""object"""" name="state"/> @@ -274,20 +274,20 @@ <field eval=""""Cancel"""" name="name"/> <field name="transition_id" ref="process_transition_deliver0"/> </record> - + <record id="process_transition_action_createinvoice0" model="process.transition.action"> <field eval=""""action_invoice_create"""" name="action"/> <field eval=""""object"""" name="state"/> <field eval=""""Create Invoice"""" name="name"/> <field name="transition_id" ref="process_transition_invoice0"/> </record> - + <record id="process_transition_action_cancelorder0" model="process.transition.action"> <field eval=""""action_cancel"""" name="action"/> <field eval=""""object"""" name="state"/> <field eval=""""Cancel Order"""" name="name"/> <field name="transition_id" ref="process_transition_invoice0"/> </record> - + </data> </openerp> diff --git a/addons/sale/sale_unit_test.xml b/addons/sale/sale_unit_test.xml index 6f2b9327319..dc507edb4a0 100644 --- a/addons/sale/sale_unit_test.xml +++ b/addons/sale/sale_unit_test.xml @@ -32,38 +32,38 @@ <field name="product_uos_qty">3</field> <field name="type">make_to_stock</field> </record> - + <assert id="test_order_1" model="sale.order" severity="error" string="The amount of the sale order is correctly computed"> <test expr="sum([l.price_subtotal for l in order_line]) == amount_untaxed"/> </assert> - + <workflow action="order_confirm" model="sale.order" ref="test_order_1"/> - + <assert id="test_order_1" model="sale.order" string="the sale order is now in 'Manual in progress' state"> <test expr="state">manual</test> </assert> - + <workflow action="manual_invoice" model="sale.order" ref="test_order_1" uid="base.user_root"/> - + <assert id="test_order_1" model="sale.order" string="the sale order is now in progress"> <test expr="state">progress</test> </assert> - + <!-- Treat generated invoice --> <assert id="test_order_1" model="sale.order" severity="fatal" string="the sale order has now a corresponding invoice"> <test expr="len(invoice_ids) == 1"/> </assert> - + <assert id="test_order_1" model="sale.order" severity="fatal" string="the sale order's has the same amount and is currently a draft"> <test expr="invoice_ids[0].amount_untaxed == amount_untaxed"/> <test expr="invoice_ids[0].amount_total == amount_total"/> <test expr="invoice_ids[0].state">draft</test> </assert> - + <workflow action="invoice_open" model="account.invoice"> <value eval="obj(ref('test_order_1')).invoice_ids[0].id" model="sale.order"/> </workflow> - + <function model="account.invoice" name="pay_and_reconcile"> <value eval="[obj(ref('test_order_1')).invoice_ids[0].id]" model="sale.order"/> <value eval="obj(ref('test_order_1')).amount_total" model="sale.order"/> @@ -74,46 +74,46 @@ <value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/> <value eval="ref('account.bank_journal')"/> </function> - + <assert id="test_order_1" model="sale.order" severity="fatal" string="the sale order's invoice is now paid"> <test expr="invoice_ids[0].state">paid</test> </assert> - + <!-- Treat generated picking --> - <assert id="test_order_1" model="sale.order" severity="fatal" string="the sale order has now a correspending packing"> + <assert id="test_order_1" model="sale.order" severity="fatal" string="the sale order has now a correspending picking"> <test expr="len(picking_ids) == 1"/> </assert> - + <assert id="test_order_1" model="sale.order" severity="error" string="the sale order's picking will be sent to the good address and is already confirmed"> <test expr="picking_ids[0].address_id == partner_shipping_id"/> <!-- test expr="picking_ids[0].state">confirmed</test # Desactivated because of MRP_JIT --> </assert> - + <!-- Here we need to use the function tag because action_assign is a method of stock_picking and not part of the workflow --> <function model="stock.picking" name="action_assign"> <value eval="[obj(ref('test_order_1')).picking_ids[0].id]" model="sale.order"/> </function> - + <assert id="test_order_1" model="sale.order" severity="fatal" string="the sale order's picking is now assigned"> <test expr="picking_ids[0].state">assigned</test> </assert> - + <!-- Do the same as in wizard_partial_picking lines 143-144 --> <function model="stock.picking" name="action_move"> <value eval="[obj(ref('test_order_1')).picking_ids[0].id]" model="sale.order"/> </function> - + <workflow action="button_done" model="stock.picking"> <value eval="obj(ref('test_order_1')).picking_ids[0].id" model="sale.order"/> </workflow> - + <assert id="test_order_1" model="sale.order" string="the sale order's picking is now done"> <test expr="picking_ids[0].state">done</test> </assert> - + <!-- Run all schedulers --> <function model="mrp.procurement" name="run_scheduler"/> - + <assert id="test_order_1" model="sale.order" string="the sale order is now done"> <test expr="state">done</test> </assert> diff --git a/addons/stock/stock_report.xml b/addons/stock/stock_report.xml index ed71ca90635..d72106eead6 100644 --- a/addons/stock/stock_report.xml +++ b/addons/stock/stock_report.xml @@ -5,8 +5,8 @@ <report auto="False" id="report_product_history" model="product.product" name="stock.product.history" string="Future Stock Forecast"/> -<!-- <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Packing list" xml="stock/report/picking.xml" xsl="stock/report/picking.xsl"/>--> - <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Packing list" rml="stock/report/picking.rml"/> +<!-- <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Picking list" xml="stock/report/picking.xml" xsl="stock/report/picking.xsl"/>--> + <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Picking list" rml="stock/report/picking.rml"/> <report id="report_move_labels" model="stock.move" name="stock.move.label" string="Print Item Labels" xml="stock/report/lot_move_label.xml" xsl="stock/report/lot_move_label.xsl"/> <report auto="False" id="report_location_overview" model="stock.location" name="lot.stock.overview" string="Location Overview" rml="stock/report/lot_overview.rml"/> diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index d7962d700a4..adbda773069 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -79,7 +79,7 @@ <field name="res_model">stock.inventory</field> <field name="view_type">form</field> <field name="view_id" ref="view_inventory_tree"/> - <field name="context">{'full':'1'}</field> + <field name="context">{'full':'1'}</field> </record> <menuitem action="action_inventory_form" id="menu_action_inventory_form" parent="menu_stock_root"/> @@ -89,16 +89,16 @@ <field name="res_model">stock.inventory</field> <field name="view_type">form</field> <field name="domain">[('state','=','draft')]</field> - <field name="filter" eval="True"/> + <field name="filter" eval="True"/> </record> - <menuitem action="action_inventory_form_draft" id="menu_action_inventory_form_draft" parent="menu_action_inventory_form" groups="base.group_extended_menu"/> + <menuitem action="action_inventory_form_draft" id="menu_action_inventory_form_draft" parent="menu_action_inventory_form" groups="base.group_useability_extended"/> <record id="action_inventory_form_new" model="ir.actions.act_window"> <field name="name">New Periodical Inventory</field> <field name="type">ir.actions.act_window</field> <field name="res_model">stock.inventory</field> <field name="view_type">form</field> <field name="view_mode">form,tree</field> - <field name="domain">[('state','=','draft')]</field> + <field name="domain">[('state','=','draft')]</field> </record> <menuitem action="action_inventory_form_new" id="menu_action_inventory_form_new" parent="menu_action_inventory_form"/> @@ -225,7 +225,7 @@ <field name="res_model">stock.production.lot</field> <field name="view_type">form</field> <field name="view_id" ref="view_production_lot_tree"/> - <field name="context">{'full':'1'}</field> + <field name="context">{'full':'1'}</field> </record> <menuitem action="action_production_lot_form" id="menu_action_production_lot_form" parent="menu_traceability"/> @@ -388,7 +388,7 @@ <field name="type">ir.actions.act_window</field> <field name="view_type">form</field> <field name="view_id" ref="view_location_tree2"/> - <field name="context">{'full':'1'}</field> + <field name="context">{'full':'1'}</field> </record> <menuitem action="action_location_form" id="menu_action_location_form" parent="menu_stock_configuration"/> @@ -412,7 +412,7 @@ <field name="view_id" ref="view_location_tree"/> </record> <menuitem action="action_location_tree" id="menu_action_location_tree" parent="menu_stock_root"/> - + ============================= Warehouse ============================= @@ -568,7 +568,7 @@ </field> <group col="7" colspan="4"> <label colspan="6"/> - <button name="%(move_split)d" string="Split move lines in two" type="action" icon="gtk-justify-fill"/> + <button name="%(move_split)d" string="Split Entry Lines in two" type="action" icon="gtk-justify-fill"/> </group> <group col="10" colspan="4"> <field name="state" readonly="1"/> @@ -717,7 +717,7 @@ <field name="view_mode">tree,form,calendar</field> <field name="domain">[('type','=','delivery')]</field> <field name="context">{'contact_display': 'partner'}</field> - <field name="search_view_id" ref="view_stock_delivery_filter"/> + <field name="search_view_id" ref="view_stock_delivery_filter"/> </record> <record id="action_picking_tree_delivery_view1" model="ir.actions.act_window.view"> <field eval="1" name="sequence"/> @@ -748,7 +748,7 @@ <field name="domain">[('state','=','assigned'),('type','=','delivery')]</field> <field name="context">{'contact_display': 'partner'}</field> <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_stock_delivery_filter"/> + <field name="search_view_id" ref="view_stock_delivery_filter"/> </record> <record id="action_picking_tree_delivery_view1_toproc" model="ir.actions.act_window.view"> <field eval="1" name="sequence"/> @@ -767,7 +767,7 @@ <field name="view_mode">calendar</field> <field name="act_window_id" ref="action_picking_tree2_delivery"/> </record> - <menuitem action="action_picking_tree2_delivery" id="menu_picking_waiting_delivery" parent="menu_action_picking_tree_delivery" groups="base.group_extended_menu" /> + <menuitem action="action_picking_tree2_delivery" id="menu_picking_waiting_delivery" parent="menu_action_picking_tree_delivery" groups="base.group_useability_extended" /> <record id="action_picking_tree3_delivery" model="ir.actions.act_window"> <field name="name">Future Delivery Orders</field> @@ -778,7 +778,7 @@ <field name="domain">[('state','=','confirmed'),('type','=','delivery')]</field> <field name="context">{'contact_display': 'partner'}</field> <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_stock_delivery_filter"/> + <field name="search_view_id" ref="view_stock_delivery_filter"/> </record> <record id="action_picking_tree_delivery_view1_waiting" model="ir.actions.act_window.view"> <field eval="1" name="sequence"/> @@ -797,7 +797,7 @@ <field name="view_mode">calendar</field> <field name="act_window_id" ref="action_picking_tree3_delivery"/> </record> - <menuitem action="action_picking_tree3_delivery" id="menu_action_picking_tree3_delivery" parent="menu_action_picking_tree_delivery" groups="base.group_extended_menu" /> + <menuitem action="action_picking_tree3_delivery" id="menu_action_picking_tree3_delivery" parent="menu_action_picking_tree_delivery" groups="base.group_useability_extended" /> <record id="action_picking_calendar_delivery" model="ir.actions.act_window"> <field name="name">Calendar of Deliveries</field> @@ -808,7 +808,7 @@ <field name="domain">[('state','=','assigned'),('type','=','delivery')]</field> <field name="context">{'contact_display': 'partner'}</field> </record> - <menuitem action="action_picking_calendar_delivery" id="menu_picking_calendar_delivery" parent="menu_action_picking_tree_delivery" groups="base.group_extended_menu" /> + <menuitem action="action_picking_calendar_delivery" id="menu_picking_calendar_delivery" parent="menu_action_picking_tree_delivery" groups="base.group_useability_extended" /> # # Sending Products @@ -819,7 +819,7 @@ <field name="model">stock.picking</field> <field name="type">tree</field> <field name="arch" type="xml"> - <tree colors="red:state=='cancel';grey:state=='confirmed';blue:state=='done'" string="Packing list"> + <tree colors="red:state=='cancel';grey:state=='confirmed';blue:state=='done'" string="Packing list"> <field name="name"/> <field name="origin"/> <field name="address_id"/> @@ -917,7 +917,7 @@ <field name="domain">[('type','=','out')]</field> <field name="context">{'contact_display': 'partner'}</field> <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_stock_delivery_filter"/> + <field name="search_view_id" ref="view_stock_delivery_filter"/> </record> <record id="action_picking_tree_out_view1_waiting" model="ir.actions.act_window.view"> <field eval="1" name="sequence"/> @@ -947,7 +947,7 @@ <field name="domain">[('state','=','assigned'),('type','=','out')]</field> <field name="context">{'contact_display': 'partner'}</field> <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_stock_delivery_filter"/> + <field name="search_view_id" ref="view_stock_delivery_filter"/> </record> <record id="action_picking_tree2_out_view1" model="ir.actions.act_window.view"> <field eval="1" name="sequence"/> @@ -966,7 +966,7 @@ <field name="view_mode">calendar</field> <field name="act_window_id" ref="action_picking_tree2"/> </record> - <menuitem action="action_picking_tree2" id="menu_picking_waiting" parent="menu_action_picking_tree" groups="base.group_extended_menu"/> + <menuitem action="action_picking_tree2" id="menu_picking_waiting" parent="menu_action_picking_tree" groups="base.group_useability_extended"/> <record id="action_picking_tree3" model="ir.actions.act_window"> <field name="name">Confirmed Packing Waiting Availability</field> @@ -977,7 +977,7 @@ <field name="domain">[('state','=','confirmed'),('type','=','out')]</field> <field name="context">{'contact_display': 'partner'}</field> <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_stock_delivery_filter"/> + <field name="search_view_id" ref="view_stock_delivery_filter"/> </record> <record id="action_picking_tree3_out_view1" model="ir.actions.act_window.view"> <field eval="1" name="sequence"/> @@ -996,7 +996,7 @@ <field name="view_mode">calendar</field> <field name="act_window_id" ref="action_picking_tree3"/> </record> - <menuitem action="action_picking_tree3" id="menu_action_picking_tree3" parent="menu_action_picking_tree" groups="base.group_extended_menu"/> + <menuitem action="action_picking_tree3" id="menu_action_picking_tree3" parent="menu_action_picking_tree" groups="base.group_useability_extended"/> # # Reception of Products @@ -1058,7 +1058,7 @@ <newline/> <newline/> <field groups="base.group_extended" name="product_packaging"/> - <newline/> + <newline/> <field name="prodlot_id" select="1" context="{'location_id':location_id, 'product_id':product_id}" domain="[('product_id','=',product_id)]" @@ -1107,7 +1107,7 @@ <field name="domain">[('type','=','in')]</field> <field name="context">{'contact_display': 'partner'}</field> <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_stock_delivery_filter"/> + <field name="search_view_id" ref="view_stock_delivery_filter"/> </record> <record id="action_invoice_tree5_view1" model="ir.actions.act_window.view"> <field eval="1" name="sequence"/> @@ -1137,7 +1137,7 @@ <field name="domain">[('state','=','assigned'),('type','=','in')]</field> <field name="context">{'contact_display': 'partner'}</field> <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_stock_delivery_filter"/> + <field name="search_view_id" ref="view_stock_delivery_filter"/> </record> <record id="action_invoice_tree6_view1" model="ir.actions.act_window.view"> <field eval="1" name="sequence"/> @@ -1156,7 +1156,7 @@ <field name="view_mode">calendar</field> <field name="act_window_id" ref="action_picking_tree5"/> </record> - <menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="menu_action_picking_tree4" groups="base.group_extended_menu"/> + <menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="menu_action_picking_tree4" groups="base.group_useability_extended"/> <record id="action_picking_form" model="ir.actions.act_window"> <field name="name">New Reception Packing</field> @@ -1195,7 +1195,7 @@ <field name="domain">[('type','=','internal')]</field> <field name="context">{'contact_display': 'partner'}</field> <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_stock_delivery_filter"/> + <field name="search_view_id" ref="view_stock_delivery_filter"/> </record> <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_root" sequence="18"/> @@ -1209,9 +1209,9 @@ <field name="domain">[('state','=','assigned'),('type','=','internal')]</field> <field name="context">{'contact_display': 'partner'}</field> <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_stock_delivery_filter"/> + <field name="search_view_id" ref="view_stock_delivery_filter"/> </record> - <menuitem action="action_picking_tree7" id="menu_action_picking_tree7" parent="menu_action_picking_tree6" groups="base.group_extended_menu"/> + <menuitem action="action_picking_tree7" id="menu_action_picking_tree7" parent="menu_action_picking_tree6" groups="base.group_useability_extended"/> <record id="action_picking_tree8" model="ir.actions.act_window"> <field name="name">Confirmed Packing Waiting Availability</field> @@ -1222,9 +1222,9 @@ <field name="domain">[('state','=','confirmed'),('type','=','internal')]</field> <field name="context">{'contact_display': 'partner'}</field> <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_stock_delivery_filter"/> + <field name="search_view_id" ref="view_stock_delivery_filter"/> </record> - <menuitem action="action_picking_tree8" id="menu_action_picking_tree8" parent="menu_action_picking_tree6" groups="base.group_extended_menu"/> + <menuitem action="action_picking_tree8" id="menu_action_picking_tree8" parent="menu_action_picking_tree6" groups="base.group_useability_extended"/> <record id="action_picking_tree9" model="ir.actions.act_window"> <field name="name">New Internal Packing</field> @@ -1325,9 +1325,9 @@ <field name="view_type">form</field> <field name="domain">[('state','=','draft')]</field> <field name="view_id" ref="view_move_tree"/> - <field name="filter" eval="True"/> + <field name="filter" eval="True"/> </record> - <menuitem action="action_move_form3" id="menu_action_move_form3" parent="menu_action_move_form2" groups="base.group_extended_menu"/> + <menuitem action="action_move_form3" id="menu_action_move_form3" parent="menu_action_move_form2" groups="base.group_useability_extended"/> <record id="action_move_form4" model="ir.actions.act_window"> <field name="name">Available Moves</field> @@ -1336,9 +1336,9 @@ <field name="view_type">form</field> <field name="domain">[('state','=','assigned')]</field> <field name="view_id" ref="view_move_tree"/> - <field name="filter" eval="True"/> + <field name="filter" eval="True"/> </record> - <menuitem action="action_move_form4" id="menu_action_move_form4" parent="menu_action_move_form2" groups="base.group_extended_menu"/> + <menuitem action="action_move_form4" id="menu_action_move_form4" parent="menu_action_move_form2" groups="base.group_useability_extended"/> <record id="action_picking_all" model="ir.actions.act_window"> <field name="name">Packing</field> @@ -1399,14 +1399,14 @@ domain="[('product_id','=',active_id)]" id="act_product_stock_move_open" name="All Stock Moves" - res_model="stock.move" + res_model="stock.move" src_model="product.product"/> <act_window domain="[('move_lines','in',[active_id])]" id="act_relate_picking" name="Related Picking" - res_model="stock.picking" + res_model="stock.picking" src_model="stock.move"/> <act_window @@ -1414,7 +1414,7 @@ domain="[('product_id','=',active_id),('state','in',('waiting','confirmed','assigned'))]" id="act_product_stock_move_futur_open" name="Future Stock Moves" - res_model="stock.move" + res_model="stock.move" src_model="product.product"/> <record id="ir_act_product_location_open" model="ir.values"> |