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 @@ @@ -23,6 +23,7 @@ + @@ -62,10 +63,11 @@ - + + @@ -102,10 +104,18 @@ - + + + + + + + + + @@ -123,6 +133,7 @@ + @@ -169,6 +180,17 @@ + + + + + + + + + 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 @@ + - + - - + + @@ -130,6 +131,26 @@ + + + + + + + + + + + + + + + + + + \ 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 @@ - + 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 @@ + @@ -140,6 +141,14 @@ + + + + + + + + @@ -166,6 +175,7 @@ + @@ -222,5 +232,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 @@ - @@ -13,7 +12,7 @@ @@ -43,6 +42,7 @@ + @@ -54,6 +54,7 @@ + @@ -109,6 +110,7 @@ + @@ -128,7 +130,7 @@ - + @@ -139,7 +141,7 @@ - + @@ -153,6 +155,7 @@ + @@ -161,16 +164,25 @@ - + + + Process Transition + --> + + + + + + + + @@ -215,6 +227,7 @@ + @@ -251,6 +264,7 @@ + @@ -260,6 +274,7 @@ + @@ -298,5 +313,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 @@ 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 @@ - + + @@ -35,6 +36,7 @@ + @@ -78,6 +80,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ + @@ -67,6 +68,7 @@ + @@ -89,6 +91,7 @@ + @@ -96,7 +99,19 @@ - + + + + + + + + + + + + + @@ -104,8 +119,9 @@ + - + @@ -122,6 +138,7 @@ + @@ -150,6 +167,45 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + . + + + + + + + + \ 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 @@ + @@ -34,6 +35,7 @@ + @@ -85,10 +87,11 @@ - + + @@ -96,10 +99,11 @@ - + + @@ -118,6 +122,18 @@ + + + + + + + + + + + + @@ -125,22 +141,9 @@ + - - - - - - - - - - - - - - @@ -148,28 +151,7 @@ - - - - - - - - - - - - - - - - - - - - - - + @@ -178,52 +160,15 @@ - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - @@ -249,25 +194,79 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + +