diff options
| author | Amit Mendapara <ame@tinyerp.com> | 2008-10-21 13:54:17 +0530 |
|---|---|---|
| committer | Amit Mendapara <ame@tinyerp.com> | 2008-10-21 13:54:17 +0530 |
| commit | ff2b9529ff74d49c0ba705ebef01e45b84f89905 (patch) | |
| tree | f106dcf21aa105271111ba06c405a65990528e25 /addons | |
| parent | 313a7b00a540de8796e3273429353b9884b49e5e (diff) | |
| parent | 325609d6f33de2d5ca74dd05b11d4f7420e489b7 (diff) | |
Merged Process branch.
bzr revid: ame@tinyerp.com-20081021082417-jttn3kimbn2afnvv
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/account/__terp__.py | 2 | ||||
| -rw-r--r-- | addons/account/process/invoice_process.xml | 30 | ||||
| -rw-r--r-- | addons/account/process/statement_process.xml | 27 | ||||
| -rw-r--r-- | addons/hr_timesheet_project/process/hr_timesheet_project_process.xml | 2 | ||||
| -rw-r--r-- | addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml | 43 | ||||
| -rw-r--r-- | addons/mrp/mrp.py | 2 | ||||
| -rw-r--r-- | addons/mrp/process/procurement_process.xml | 121 | ||||
| -rw-r--r-- | addons/product/process/product_process.xml | 2 | ||||
| -rw-r--r-- | addons/project/process/task_process.xml | 39 | ||||
| -rw-r--r-- | addons/project_mrp/process/project_mrp_process.xml | 30 | ||||
| -rw-r--r-- | addons/purchase/process/purchase_process.xml | 62 | ||||
| -rw-r--r-- | addons/purchase/purchase.py | 2 | ||||
| -rw-r--r-- | addons/sale/process/sale_process.xml | 159 |
13 files changed, 418 insertions, 103 deletions
diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py index 5084b6e2318..e8f25d84ad4 100644 --- a/addons/account/__terp__.py +++ b/addons/account/__terp__.py @@ -67,7 +67,7 @@ "product_view.xml", "account_assert_test.xml", "process/invoice_process.xml", - "process/statement_process.xml" + "process/statement_process.xml", ], "translations" : { "fr": "i18n/french_fr.csv" diff --git a/addons/account/process/invoice_process.xml b/addons/account/process/invoice_process.xml index 5fb1c522be1..9d39c9e8be8 100644 --- a/addons/account/process/invoice_process.xml +++ b/addons/account/process/invoice_process.xml @@ -13,7 +13,7 @@ </record> <!-- - Process Node + Process Node --> <record id="process_node_analytic0" model="process.node"> @@ -23,6 +23,7 @@ <field eval=""""Analytic"""" name="name"/> <field eval=""""From analytic accounts, It creates invoice."""" name="note"/> <field name="process_id" ref="process_process_invoiceworkflow0"/> + <field name="subflow_id" ref="process_process_invoiceworkflow0"/> <field eval=""""object.state in ('draft', 'open', 'pending', 'close')"""" name="model_states"/> <field eval="1" name="flow_start"/> </record> @@ -62,10 +63,11 @@ <record id="process_node_bankstatement0" model="process.node"> <field name="menu_id" ref="account.menu_bank_statement_tree2"/> <field name="model_id" ref="account.model_account_bank_statement"/> - <field eval=""""subflow"""" name="kind"/> + <field eval=""""state"""" name="kind"/> <field eval=""""Bank Statement"""" name="name"/> <field eval=""""Statement encoding produces payment entries"""" name="note"/> <field name="process_id" ref="process_process_invoiceworkflow0"/> +<!-- <field name="subflow_id" ref="process_process_statementworkflow0"/>--> <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="1" name="flow_start"/> </record> @@ -102,10 +104,18 @@ <field eval=""""object.state=='paid'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> - + <!-- - Process Transition + Process Transition --> + + <record id="res_roles_invoice0" model="res.roles"> + <field eval=""""Invoice"""" name="name"/> + </record> + + <record id="account.t5" model="workflow.transition"> + <field name="role_id" ref="res_roles_invoice0"/> + </record> <record id="process_transition_analyticinvoice0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> @@ -123,6 +133,7 @@ <field eval=""""Number of entries are generated"""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_invoiceinvoice0"/> <field model="process.node" name="source_node_id" ref="process_node_draftinvoices0"/> + <field eval="[(6,0,[ref('account.t5')])]" name="transition_ids"/> </record> <record id="process_transition_validentries0" model="process.transition"> @@ -169,6 +180,17 @@ <field model="process.node" name="target_node_id" ref="process_node_paidinvoice0"/> <field model="process.node" name="source_node_id" ref="process_node_reconciliation0"/> </record> + + <!-- + Process Action + --> + + <record id="process_transition_action_createentries0" model="process.transition.action"> + <field eval=""""action_move_create"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Create entry"""" name="name"/> + <field name="transition_id" ref="process_transition_customerinvoice0"/> + </record> </data> </openerp> diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml index 57cfe332531..3ee13ace8d5 100644 --- a/addons/account/process/statement_process.xml +++ b/addons/account/process/statement_process.xml @@ -78,15 +78,16 @@ <field eval=""""Reconciliation of Entries"""" name="name"/> <field eval=""""Reconcilation of the entries with invoice."""" name="note"/> <field name="process_id" ref="process_process_statementworkflow0"/> + <field name="subflow_id" ref="account.process_process_invoiceworkflow0"/> <field eval=""""object.state=='valid'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> - + <!-- Process Transition --> - - <record id="process_transition_filestatement0" model="process.transition"> + + <record id="process_transition_filestatement0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> <field eval=""""File statement"""" name="name"/> @@ -130,6 +131,26 @@ <field model="process.node" name="target_node_id" ref="process_node_reconciliationofentries0"/> <field model="process.node" name="source_node_id" ref="process_node_accountingstatemententries0"/> </record> + + <record id="process_transition_statemententries0" model="process.transition"> + <field eval="[(6,0,[])]" name="role_ids"/> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Statement Entries"""" name="name"/> + <field eval=""""From statement, create entries"""" name="note"/> + <field model="process.node" name="target_node_id" ref="process_node_paymententries0"/> + <field model="process.node" name="source_node_id" ref="process_node_bankstatement0"/> + </record> + + <!-- + Process Action + --> + + <record id="process_transition_action_draftconfirmstatement0" model="process.transition.action"> + <field eval=""""button_confirm"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Confirm"""" name="name"/> + <field name="transition_id" ref="process_transition_confirmstatementfromdraft0"/> + </record> </data> </openerp>
\ No newline at end of file diff --git a/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml index d514b14bf17..0cc7032602d 100644 --- a/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml +++ b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml @@ -58,7 +58,7 @@ <field eval=""""Task encoding"""" name="name"/> <field eval=""""Encode how much time u spent on your task"""" name="note"/> <field model="process.node" name="target_node_id" ref="hr_timesheet_sheet.process_node_timesheetline0"/> - <field model="process.node" name="source_node_id" ref="project.process_node_taskwork0"/> + <field model="process.node" name="source_node_id" ref="process_node_taskwork0"/> </record> <record id="process_transition_tasktimesheet0" model="process.transition"> diff --git a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml index 24374c2a810..6917812bedb 100644 --- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml +++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml @@ -89,6 +89,7 @@ <field eval=""""Timesheet"""" name="name"/> <field eval=""""Defines the task work entry into timesheet line"""" name="note"/> <field name="process_id" ref="process_process_hrtimesheetworkflow0"/> + <field name="subflow_id" ref="hr_timesheet.process_process_timesheetworkflow0"/> <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> @@ -140,6 +141,14 @@ <!-- Process Transition --> + + <record id="res_roles_hr0" model="res.roles"> + <field eval=""""HR"""" name="name"/> + </record> + + <record id="hr_timesheet_sheet.t1" model="workflow.transition"> + <field name="role_id" ref="res_roles_hr0"/> + </record> <record id="process_transition_attendance0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> @@ -166,6 +175,7 @@ <field eval=""""timesheet is confirmed at the end of the week / month"""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_confirmedtimesheet0"/> <field model="process.node" name="source_node_id" ref="process_node_drafttimesheetsheet0"/> + <field eval="[(6,0,[ref('hr_timesheet_sheet.t1')])]" name="transition_ids"/> </record> <record id="process_transition_validatetimesheet0" model="process.transition"> @@ -222,5 +232,38 @@ <field model="process.node" name="source_node_id" ref="process_node_review0"/> </record> + <!-- + Process Action + --> + + <record id="process_transition_action_draftconfirmtimesheet0" model="process.transition.action"> + <field eval=""""button_confirm"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Confirm"""" name="name"/> + <field name="transition_id" ref="process_transition_confirmtimesheet0"/> + </record> + + <record id="process_transition_action_validatetimesheet0" model="process.transition.action"> + <field eval=""""write({'state':'done'})"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Validate"""" name="name"/> + <field name="transition_id" ref="process_transition_validatetimesheet0"/> + </record> + + <record id="process_transition_action_refusetimesheet0" model="process.transition.action"> + <field eval=""""write({'state':'draft'})"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Refuse"""" name="name"/> + <field name="transition_id" ref="process_transition_validatetimesheet0"/> + </record> + + <record id="process_transition_action_reviewtimesheet0" model="process.transition.action"> + <field eval=""""button_confirm"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Review"""" name="name"/> + <field name="transition_id" ref="process_transition_confirmtimesheetsheet0"/> + </record> + + </data> </openerp>
\ No newline at end of file diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 342a4ff7d4e..ca8d0a6bcd0 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -890,7 +890,7 @@ class mrp_procurement(osv.osv): return True return False - def action_confirm(self, cr, uid, ids): + def action_confirm(self, cr, uid, ids, context={}): for procurement in self.browse(cr, uid, ids): if procurement.product_id.type in ('product', 'consu'): if not procurement.move_id: diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index 583de318410..866ad784349 100644 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -1,4 +1,3 @@ -<?xml version="1.0" ?> <openerp> <data> @@ -13,7 +12,7 @@ </record> <!-- - Process Node + Process Node --> <record id="process_node_minimumstockrule0" model="process.node"> @@ -43,6 +42,7 @@ <field eval=""""Procurements"""" name="name"/> <field eval=""""Procurement Orders"""" name="note"/> <field name="process_id" ref="purchase.process_process_purchaseworkflow0"/> + <field name="subflow_id" ref="process_process_procurementworkflow0"/> <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting') """" name="model_states"/> <field eval="1" name="flow_start"/> </record> @@ -54,6 +54,7 @@ <field eval=""""Production order"""" name="name"/> <field eval=""""Procurement for raw materials"""" name="note"/> <field name="process_id" ref="process_process_procurementworkflow0"/> + <field name="subflow_id" ref="process_process_procurementworkflow0"/> <field eval=""""object.state in ('draft', 'picking_except', 'confirmed', 'ready', 'in_production', 'cancel', 'done')"""" name="model_states"/> <field eval="1" name="flow_start"/> </record> @@ -109,6 +110,7 @@ <field eval=""""Subcontracting"""" name="name"/> <field eval=""""Procure method is purchase"""" name="note"/> <field name="process_id" ref="process_process_procurementworkflow0"/> + <field name="subflow_id" ref="purchase.process_process_purchaseworkflow0"/> <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> @@ -128,7 +130,7 @@ <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=""""Stockable make to stock"""" name="name"/> + <field eval=""""Stockable stock"""" name="name"/> <field eval=""""Wait for available products for reservation"""" name="note"/> <field name="process_id" ref="process_process_procurementworkflow0"/> <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting') """" name="model_states"/> @@ -139,7 +141,7 @@ <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=""""Stockable make to order"""" name="name"/> + <field eval=""""Stockable order"""" name="name"/> <field eval=""""If Procurement is make to order"""" name="note"/> <field name="process_id" ref="process_process_procurementworkflow0"/> <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting') """" name="model_states"/> @@ -153,6 +155,7 @@ <field eval=""""Stockable request"""" name="name"/> <field eval=""""If procure method is purchase"""" name="note"/> <field name="process_id" ref="process_process_procurementworkflow0"/> + <field name="subflow_id" ref="purchase.process_process_purchaseworkflow0"/> <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> @@ -161,16 +164,25 @@ <field name="menu_id" ref="mrp.menu_mrp_production_action"/> <field name="model_id" ref="mrp.model_mrp_production"/> <field eval=""""subflow"""" name="kind"/> - <field eval=""""Stockable production"""" name="name"/> + <field eval=""""Stock produce"""" name="name"/> <field eval=""""If procure method is produce"""" name="note"/> <field name="process_id" ref="process_process_procurementworkflow0"/> + <field name="subflow_id" ref="process_process_procurementworkflow0"/> <field eval=""""object.state=='confirmed'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> <!-- - Process Transition - --> + Process Transition + --> + + <record id="res_roles_mrp0" model="res.roles"> + <field eval=""""Mrp"""" name="name"/> + </record> + + <record id="mrp.trans_draft_confirm" model="workflow.transition"> + <field name="role_id" ref="res_roles_mrp0"/> + </record> <record id="process_transition_productionprocurement0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> @@ -215,6 +227,7 @@ <field eval=""""If procure method is Make to order and supply method is buy"""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_subcontracting0"/> <field model="process.node" name="source_node_id" ref="process_node_maketoorder0"/> + <field eval="[(6,0,[ref('mrp.trans_draft_confirm')])]" name="transition_ids"/> </record> <record id="process_transition_procurementstockable0" model="process.transition"> @@ -251,6 +264,7 @@ <field eval=""""If Procure method is Make to order and supply method is buy"""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_stockablerequest0"/> <field model="process.node" name="source_node_id" ref="process_node_stockablemaketoorder0"/> + <field eval="[(6,0,[ref('mrp.trans_draft_confirm')])]" name="transition_ids"/> </record> <record id="process_transition_stockableorderproduction0" model="process.transition"> @@ -260,6 +274,7 @@ <field eval=""""If Procure method is Make to order and supply method is produce"""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_stockableproduction0"/> <field model="process.node" name="source_node_id" ref="process_node_stockablemaketoorder0"/> + <field eval="[(6,0,[ref('mrp.trans_draft_confirm')])]" name="transition_ids"/> </record> <record id="process_transition_procurementtopurchase0" model="process.transition"> @@ -298,5 +313,97 @@ <field model="process.node" name="source_node_id" ref="process_node_billofmaterial0"/> </record> + <!-- + Process Condition + --> + + <record id="process_condition_serviceprocure0" model="process.condition"> + <field name="model_id" ref="model_mrp_procurement"/> + <field name="node_id" ref="process_node_serviceproduct0"/> + <field eval=""""object.product_id.type=='service'"""" name="model_states"/> + <field eval=""""Condition_service_procure"""" name="name"/> + </record> + + <record id="process_condition_stockableprocure0" model="process.condition"> + <field name="model_id" ref="model_mrp_procurement"/> + <field name="node_id" ref="process_node_stockableproduct0"/> + <field eval=""""object.product_id.type=='product'"""" name="model_states"/> + <field eval=""""Condition_stockable_procure"""" name="name"/> + </record> + + <!-- + Process Action + --> + + <record id="process_transition_action_procurementpurchaseorder0" model="process.transition.action"> + <field eval=""""action_po_assign"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Purchase"""" name="name"/> + <field name="transition_id" ref="process_transition_procurementtopurchase0"/> + </record> + + <record id="process_transition_action_orderconfirmsubcontracting0" model="process.transition.action"> + <field eval=""""action_confirm"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Confirm"""" name="name"/> + <field name="transition_id" ref="process_transition_ordersubcontracting0"/> + </record> + + <record id="process_transition_action_ordercancelsubcontracting0" model="process.transition.action"> + <field eval=""""action_cancel"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Cancel"""" name="name"/> + <field name="transition_id" ref="process_transition_ordersubcontracting0"/> + </record> + + <record id="process_transition_action_runprocurement0" model="process.transition.action"> + <field eval=""""write({'state':'exception'})"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Run Procurement"""" name="name"/> + <field name="transition_id" ref="process_transition_ordersubcontracting0"/> + </record> + + <record id="process_transition_action_stockableconfirmrequest0" model="process.transition.action"> + <field eval=""""action_confirm"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Confirm"""" name="name"/> + <field name="transition_id" ref="process_transition_stockableorderrequest0"/> + </record> + + <record id="process_transition_action_stockablecancelrequest0" model="process.transition.action"> + <field eval=""""action_cancel"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Cancel"""" name="name"/> + <field name="transition_id" ref="process_transition_stockableorderrequest0"/> + </record> + + <record id="process_transition_action_requestrunprocurement0" model="process.transition.action"> + <field eval=""""write({'state':'exception'})"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Run Procurement"""" name="name"/> + <field name="transition_id" ref="process_transition_stockableorderrequest0"/> + </record> + + <record id="process_transition_action_stockableconfirmproduction0" model="process.transition.action"> + <field eval=""""action_confirm"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Confirm"""" name="name"/> + <field name="transition_id" ref="process_transition_stockableorderproduction0"/> + </record> + + <record id="process_transition_action_stockablecancelproduction0" model="process.transition.action"> + <field eval=""""action_cancel"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Cancel"""" name="name"/> + <field name="transition_id" ref="process_transition_stockableorderproduction0"/> + </record> + + <record id="process_transition_action_productionrunprocurement0" model="process.transition.action"> + <field eval=""""write({'state':'exception'})"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Run Procurement"""" name="name"/> + <field name="transition_id" ref="process_transition_stockableorderproduction0"/> + </record> + </data> </openerp>
\ No newline at end of file diff --git a/addons/product/process/product_process.xml b/addons/product/process/product_process.xml index 9b675a11a84..d7e985eca7d 100644 --- a/addons/product/process/product_process.xml +++ b/addons/product/process/product_process.xml @@ -13,7 +13,7 @@ </record> <!-- - Process Node + Process Node --> <record id="process_node_product0" model="process.node"> diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml index 6be52bd3490..9ba6a39b9dc 100644 --- a/addons/project/process/task_process.xml +++ b/addons/project/process/task_process.xml @@ -112,5 +112,44 @@ <field model="process.node" name="source_node_id" ref="process_node_donetask0"/> </record> + <!-- + Process Action + --> + + <record id="process_transition_action_draftopentask0" model="process.transition.action"> + <field eval=""""do_open"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Open"""" name="name"/> + <field name="transition_id" ref="process_transition_draftopentask0"/> + </record> + + <record id="process_transition_action_draftcanceltask0" model="process.transition.action"> + <field eval=""""do_cancel"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Cancel"""" name="name"/> + <field name="transition_id" ref="process_transition_draftopentask0"/> + </record> + + <record id="process_transition_action_openpendingtask0" model="process.transition.action"> + <field eval=""""do_pending"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Set pending"""" name="name"/> + <field name="transition_id" ref="process_transition_opendonetask0"/> + </record> + + <record id="process_transition_action_opendrafttask0" model="process.transition.action"> + <field eval=""""do_draft"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Draft"""" name="name"/> + <field name="transition_id" ref="process_transition_opendonetask0"/> + </record> + + <record id="process_transition_action_opencanceltask0" model="process.transition.action"> + <field eval=""""do_cancel"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Cancel"""" name="name"/> + <field name="transition_id" ref="process_transition_opendonetask0"/> + </record> + </data> </openerp>
\ No newline at end of file diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml index 0c856b7a96d..125d325f223 100644 --- a/addons/project_mrp/process/project_mrp_process.xml +++ b/addons/project_mrp/process/project_mrp_process.xml @@ -9,10 +9,11 @@ <record id="process_node_tasks0" model="process.node"> <field name="menu_id" ref="project.menu_action_view_task"/> <field name="model_id" ref="project.model_project_task"/> - <field eval=""""state"""" name="kind"/> + <field eval=""""subflow"""" name="kind"/> <field eval=""""Tasks"""" name="name"/> <field eval=""""In case you sell services on sale order (task subflow)"""" name="note"/> <field name="process_id" ref="sale.process_process_salesworkflow0"/> + <field name="subflow_id" ref="project.process_process_tasksworkflow0"/> <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> @@ -35,6 +36,7 @@ <field eval=""""Procure task"""" name="name"/> <field eval=""""If Procure method is produce"""" name="note"/> <field name="process_id" ref="mrp.process_process_procurementworkflow0"/> + <field name="subflow_id" ref="project.process_process_tasksworkflow0"/> <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> @@ -78,6 +80,32 @@ <field eval=""""If procure method is Make to order and supply method is produce"""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_procuretask0"/> <field model="process.node" name="source_node_id" ref="mrp.process_node_maketoorder0"/> + <field eval="[(6,0,[ref('mrp.trans_draft_confirm')])]" name="transition_ids"/> + </record> + + <!-- + Process Action + --> + + <record id="process_transition_action_orderconfirmtask0" model="process.transition.action"> + <field eval=""""action_confirm"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Confirm"""" name="name"/> + <field name="transition_id" ref="process_transition_ordertask0"/> + </record> + + <record id="process_transition_action_ordercanceltask0" model="process.transition.action"> + <field eval=""""action_cancel"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Cancel"""" name="name"/> + <field name="transition_id" ref="process_transition_ordertask0"/> + </record> + + <record id="process_transition_action_taskrunprocurement0" model="process.transition.action"> + <field eval=""""write({'state':'exception'})"""" name="action"/> + <field eval=""""object"""" name="state"/> + <field eval=""""Run Procurement"""" name="name"/> + <field name="transition_id" ref="process_transition_ordertask0"/> </record> </data> diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml index d100c4a772c..23891fda515 100644 --- a/addons/purchase/process/purchase_process.xml +++ b/addons/purchase/process/purchase_process.xml @@ -23,6 +23,7 @@ <field eval=""""Purchase Order"""" name="name"/> <field eval=""""After confirming purchase order, it is approved by supplier."""" name="note"/> <field name="process_id" ref="account.process_process_invoiceworkflow0"/> + <field name="subflow_id" ref="process_process_purchaseworkflow0"/> <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="1" name="flow_start"/> </record> @@ -67,6 +68,7 @@ <field eval=""""Invoice Control"""" name="name"/> <field eval=""""Draft invoices are pre-generated for control."""" name="note"/> <field name="process_id" ref="process_process_purchaseworkflow0"/> + <field name="subflow_id" ref="account.process_process_invoiceworkflow0"/> <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> @@ -89,6 +91,7 @@ <field eval=""""Invoice after packing"""" name="name"/> <field eval=""""In case you control based on delivery"""" name="note"/> <field name="process_id" ref="process_process_purchaseworkflow0"/> + <field name="subflow_id" ref="account.process_process_invoiceworkflow0"/> <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> @@ -96,7 +99,19 @@ <!-- 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_confirmingpurchaseorder0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> @@ -104,8 +119,9 @@ <field eval=""""Confirm Purchase order from Request for quotation"""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_confirmpurchaseorder0"/> <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_approvingpurchaseorder0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> @@ -122,6 +138,7 @@ <field eval=""""After approved purchase order , it comes into the supplier invoice"""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_invoicecontrol0"/> <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"> @@ -150,6 +167,45 @@ <field model="process.node" name="target_node_id" ref="account.process_node_draftinvoices0"/> <field model="process.node" name="source_node_id" ref="process_node_purchaseorder0"/> </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.py b/addons/purchase/purchase.py index 170bf2d764b..2e05c1f62b1 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -231,7 +231,7 @@ class purchase_order(osv.osv): pricelist = part.property_product_pricelist_purchase.id return {'value':{'partner_address_id': addr['default'], 'pricelist_id': pricelist}} - def wkf_approve_order(self, cr, uid, ids): + def wkf_approve_order(self, cr, uid, ids, context={}): self.write(cr, uid, ids, {'state': 'approved', 'date_approve': time.strftime('%Y-%m-%d')}) return True diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml index e6b7c1a3c52..d91109ae331 100644 --- a/addons/sale/process/sale_process.xml +++ b/addons/sale/process/sale_process.xml @@ -23,6 +23,7 @@ <field eval=""""Order"""" name="name"/> <field eval=""""After confirming order, Create the invoice."""" name="note"/> <field name="process_id" ref="account.process_process_invoiceworkflow0"/> + <field name="subflow_id" ref="process_process_salesworkflow0"/> <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="1" name="flow_start"/> </record> @@ -34,6 +35,7 @@ <field eval=""""Sale Order Procurement"""" name="name"/> <field eval=""""Procurement for each line"""" name="note"/> <field name="process_id" ref="mrp.process_process_procurementworkflow0"/> + <field name="subflow_id" ref="process_process_salesworkflow0"/> <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> @@ -85,10 +87,11 @@ <record id="process_node_invoice0" model="process.node"> <field name="menu_id" ref="account.menu_invoice_draft"/> <field name="model_id" ref="account.model_account_invoice"/> - <field eval=""""state"""" name="kind"/> + <field eval=""""subflow"""" name="kind"/> <field eval=""""Invoice"""" name="name"/> <field eval=""""In case you invoice based on sale order."""" name="note"/> <field name="process_id" ref="process_process_salesworkflow0"/> + <field name="subflow_id" ref="account.process_process_invoiceworkflow0"/> <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> @@ -96,10 +99,11 @@ <record id="process_node_invoiceafterdelivery0" model="process.node"> <field name="menu_id" ref="account.menu_invoice_draft"/> <field name="model_id" ref="account.model_account_invoice"/> - <field eval=""""state"""" name="kind"/> + <field eval=""""subflow"""" name="kind"/> <field eval=""""Invoice after delivery"""" name="name"/> <field eval=""""In case you invoice based on deliveries (subflow)"""" name="note"/> <field name="process_id" ref="process_process_salesworkflow0"/> + <field name="subflow_id" ref="account.process_process_invoiceworkflow0"/> <field eval=""""object.state=='draft'"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> @@ -118,6 +122,18 @@ <!-- 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"/> @@ -125,8 +141,64 @@ <field eval=""""Whenever confirm button is clicked, the draft state is moved to manual. that is, quotation is moved to sale order."""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_saleorder0"/> <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_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 model="process.node" name="target_node_id" ref="process_node_packinglist0"/> + <field model="process.node" name="source_node_id" ref="process_node_saleorder0"/> + </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 model="process.node" name="target_node_id" ref="process_node_deliveryorder0"/> + <field model="process.node" name="source_node_id" ref="process_node_packinglist0"/> </record> + <record id="process_transition_invoice0" model="process.transition"> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Invoice"""" name="name"/> + <field eval=""""Invoice is created when 'Create Invoice' is being clicked after confirming the sale order. This transaction moves the sale order to invoices."""" name="note"/> + <field model="process.node" name="target_node_id" ref="process_node_invoice0"/> + <field model="process.node" name="source_node_id" ref="process_node_saleorder0"/> + <field eval="[(6,0,[ref('sale.trans_wait_invoice_invoice_manual')])]" name="transition_ids"/> + </record> + + <record id="process_transition_invoiceafterdelivery0" model="process.transition"> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Invoice after delivery"""" name="name"/> + <field eval=""""When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it will automatic create after delivery."""" name="note"/> + <field model="process.node" name="target_node_id" ref="process_node_invoiceafterdelivery0"/> + <field model="process.node" name="source_node_id" ref="process_node_deliveryorder0"/> + </record> + + <record id="process_transition_saleprocurement0" model="process.transition"> + <field eval="[(6,0,[])]" name="role_ids"/> + <field eval="[(6,0,[])]" name="transition_ids"/> + <field eval=""""Sale Procurement"""" name="name"/> + <field eval=""""In sale order , procuerement for each line and it comes into the procurement order"""" name="note"/> + <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"/> + <field eval=""""Sale Invoice"""" name="name"/> + <field eval=""""Confirm sale order and 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_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"/> @@ -140,15 +212,7 @@ <field eval=""""Cancel"""" name="name"/> <field name="transition_id" ref="process_transition_confirmquotation0"/> </record> - - <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 model="process.node" name="target_node_id" ref="process_node_packinglist0"/> - <field model="process.node" name="source_node_id" ref="process_node_saleorder0"/> - </record> - + <record id="process_transition_action_assign0" model="process.transition.action"> <field eval=""""action_assign"""" name="action"/> <field eval=""""object"""" name="state"/> @@ -169,15 +233,7 @@ <field eval=""""Cancel"""" name="name"/> <field name="transition_id" ref="process_transition_packing0"/> </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 model="process.node" name="target_node_id" ref="process_node_deliveryorder0"/> - <field model="process.node" name="source_node_id" ref="process_node_packinglist0"/> - </record> - + <record id="process_transition_action_cancelassignation0" model="process.transition.action"> <field eval=""""cancel_assign"""" name="action"/> <field eval=""""object"""" name="state"/> @@ -198,77 +254,20 @@ <field eval=""""Cancel"""" name="name"/> <field name="transition_id" ref="process_transition_deliver0"/> </record> - - <record id="process_transition_invoice0" model="process.transition"> - <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Invoice"""" name="name"/> - <field model="process.node" name="target_node_id" ref="process_node_invoice0"/> - <field model="process.node" name="source_node_id" ref="process_node_saleorder0"/> - </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"> + + <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> - <record id="process_transition_invoice0" model="process.transition"> - <field eval=""""Invoice is created when 'Create Invoice' is being clicked after confirming the sale order. This transaction moves the sale order to invoices."""" name="note"/> - </record> - - <record id="process_transition_invoiceafterdelivery0" model="process.transition"> - <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Invoice after delivery"""" name="name"/> - <field eval=""""When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it will automatic create after delivery."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_invoiceafterdelivery0"/> - <field model="process.node" name="source_node_id" ref="process_node_deliveryorder0"/> - </record> - - <record id="process_transition_saleprocurement0" model="process.transition"> - <field eval="[(6,0,[])]" name="role_ids"/> - <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Sale Procurement"""" name="name"/> - <field eval=""""In sale order , procuerement for each line and it comes into the procurement order"""" name="note"/> - <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"/> - <field eval=""""Sale Invoice"""" name="name"/> - <field eval=""""Confirm sale order and 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_order0"/> - </record> - - <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="process_transition_confirmquotation0" model="process.transition"> - <field eval="[(6,0,[ref('sale.trans_draft_router')])]" name="transition_ids"/> - </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_invoice0" model="process.transition"> - <field eval="[(6,0,[ref('sale.trans_wait_invoice_invoice_manual')])]" name="transition_ids"/> - </record> - </data> </openerp> |
