From 6228e0641bd81f45349dbeca3ab6583b080e5b87 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Wed, 8 Oct 2008 19:56:04 +0530 Subject: [PATCH 1/5] define actions in process bzr revid: solanki.priyesh@gmail.com-20081008142604-up8dif1m6ghngwqh --- addons/account/process/invoice_process.xml | 13 ++++- addons/account/process/statement_process.xml | 11 ++++ .../process/hr_timesheet_project_process.xml | 2 +- .../process/hr_timesheet_sheet_process.xml | 33 +++++++++++ addons/mrp/process/procurement_process.xml | 11 ++++ addons/project/process/task_process.xml | 39 +++++++++++++ addons/purchase/process/purchase_process.xml | 56 ++++++++++++++++++- addons/purchase/purchase.py | 2 +- 8 files changed, 163 insertions(+), 4 deletions(-) diff --git a/addons/account/process/invoice_process.xml b/addons/account/process/invoice_process.xml index 5fb1c522be1..66c5b6aef55 100644 --- a/addons/account/process/invoice_process.xml +++ b/addons/account/process/invoice_process.xml @@ -104,7 +104,7 @@ @@ -169,6 +169,17 @@ + + + + + + + + + diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml index 57cfe332531..09caa7f72f2 100644 --- a/addons/account/process/statement_process.xml +++ b/addons/account/process/statement_process.xml @@ -130,6 +130,17 @@ + + + + + + + + + \ 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..3b818bd82ec 100644 --- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml +++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml @@ -222,5 +222,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index 583de318410..a6125811143 100644 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -298,5 +298,16 @@ + + + + + + + + + \ No newline at end of file diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml index 6be52bd3490..03b8281072d 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/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml index d100c4a772c..96da7cbb8cd 100644 --- a/addons/purchase/process/purchase_process.xml +++ b/addons/purchase/process/purchase_process.xml @@ -105,7 +105,7 @@ - + @@ -150,6 +150,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + . + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 84074b0a0ae..440bc3859d3 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -231,7 +231,7 @@ class purchase_order(osv.osv): part,property_pref=['property_product_pricelist_purchase']).get('property_product_pricelist_purchase',False) 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 From fe5356f7d57698d897e0a4d0cb2012aa123d3d97 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Fri, 10 Oct 2008 15:55:04 +0530 Subject: [PATCH 2/5] define actions in process bzr revid: solanki.priyesh@gmail.com-20081010102504-m47thbbqdv4kyrlw --- addons/account/process/invoice_process.xml | 4 +- addons/account/process/statement_process.xml | 2 +- .../process/hr_timesheet_sheet_process.xml | 8 +- addons/mrp/process/procurement_process.xml | 87 ++++++++- addons/product/process/product_process.xml | 2 +- addons/project/process/task_process.xml | 10 +- .../process/project_mrp_process.xml | 25 +++ addons/purchase/process/purchase_process.xml | 25 +-- addons/sale/process/sale_process.xml | 179 +++++++++--------- 9 files changed, 214 insertions(+), 128 deletions(-) diff --git a/addons/account/process/invoice_process.xml b/addons/account/process/invoice_process.xml index 66c5b6aef55..aeb2b786137 100644 --- a/addons/account/process/invoice_process.xml +++ b/addons/account/process/invoice_process.xml @@ -13,7 +13,7 @@ @@ -177,7 +177,7 @@ - + diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml index 09caa7f72f2..3a153fab546 100644 --- a/addons/account/process/statement_process.xml +++ b/addons/account/process/statement_process.xml @@ -138,7 +138,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 3b818bd82ec..8033c06ee3f 100644 --- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml +++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml @@ -229,28 +229,28 @@ - + - + - + - + diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index a6125811143..136ae9a86ea 100644 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -13,7 +13,7 @@ @@ -169,7 +169,7 @@ @@ -298,6 +298,24 @@ + + + + + + + + + + + + + + + + @@ -305,9 +323,72 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 03b8281072d..9ba6a39b9dc 100644 --- a/addons/project/process/task_process.xml +++ b/addons/project/process/task_process.xml @@ -119,35 +119,35 @@ - + - + - + - + - + diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml index 0c856b7a96d..2dd89b84add 100644 --- a/addons/project_mrp/process/project_mrp_process.xml +++ b/addons/project_mrp/process/project_mrp_process.xml @@ -80,5 +80,30 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml index 96da7cbb8cd..56b3b8d1180 100644 --- a/addons/purchase/process/purchase_process.xml +++ b/addons/purchase/process/purchase_process.xml @@ -158,52 +158,37 @@ - + - + - + - + . - + - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml index e6b7c1a3c52..829fcc61bf7 100644 --- a/addons/sale/process/sale_process.xml +++ b/addons/sale/process/sale_process.xml @@ -118,6 +118,18 @@ + + + + + + + + + + + + @@ -125,22 +137,9 @@ + - - - - - - - - - - - - - - @@ -148,28 +147,7 @@ - - - - - - - - - - - - - - - - - - - - - - + @@ -178,52 +156,15 @@ - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - @@ -249,25 +190,79 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + From 92ab49dee4ba559f55131caa5c924a9904d183f8 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Fri, 10 Oct 2008 18:13:41 +0530 Subject: [PATCH 3/5] define roles in process wherever necessary bzr revid: solanki.priyesh@gmail.com-20081010124341-g0ddcgjepuhp5131 --- addons/account/process/invoice_process.xml | 9 +++++++++ addons/account/process/statement_process.xml | 4 ++-- .../process/hr_timesheet_sheet_process.xml | 9 +++++++++ addons/mrp/process/procurement_process.xml | 13 ++++++++++++- .../project_mrp/process/project_mrp_process.xml | 1 + addons/purchase/process/purchase_process.xml | 16 +++++++++++++++- 6 files changed, 48 insertions(+), 4 deletions(-) diff --git a/addons/account/process/invoice_process.xml b/addons/account/process/invoice_process.xml index aeb2b786137..37575e9b653 100644 --- a/addons/account/process/invoice_process.xml +++ b/addons/account/process/invoice_process.xml @@ -106,6 +106,14 @@ + + + + + + + + @@ -123,6 +131,7 @@ + diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml index 3a153fab546..df5a544a293 100644 --- a/addons/account/process/statement_process.xml +++ b/addons/account/process/statement_process.xml @@ -85,8 +85,8 @@ - - + + 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 8033c06ee3f..f21378fee04 100644 --- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml +++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml @@ -140,6 +140,14 @@ + + + + + + + + @@ -166,6 +174,7 @@ + diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index 136ae9a86ea..38fdbeecaea 100644 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -170,7 +170,15 @@ + --> + + + + + + + + @@ -215,6 +223,7 @@ + @@ -251,6 +260,7 @@ + @@ -260,6 +270,7 @@ + diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml index 2dd89b84add..b9c07b7bf6d 100644 --- a/addons/project_mrp/process/project_mrp_process.xml +++ b/addons/project_mrp/process/project_mrp_process.xml @@ -78,6 +78,7 @@ + - + + + + + + + + + + + + + @@ -104,6 +116,7 @@ + @@ -122,6 +135,7 @@ + From eab27019cc0993b5c71fe88e83159567b9386252 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Mon, 13 Oct 2008 19:00:37 +0530 Subject: [PATCH 4/5] minor changes in process bzr revid: solanki.priyesh@gmail.com-20081013133037-tp7enmbx9vf8ocpy --- addons/account/__terp__.py | 2 +- addons/account/process/invoice_process.xml | 6 ++++-- addons/account/process/statement_process.xml | 12 +++++++++++- addons/document/__terp__.py | 4 +++- .../process/hr_timesheet_sheet_process.xml | 1 + addons/mrp/mrp.py | 2 +- addons/mrp/process/procurement_process.xml | 6 +++++- addons/project_mrp/process/project_mrp_process.xml | 4 +++- addons/purchase/process/purchase_process.xml | 3 +++ addons/sale/process/sale_process.xml | 10 +++++++--- 10 files changed, 39 insertions(+), 11 deletions(-) diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py index 01d9f9e499f..7c0ac20d005 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 37575e9b653..9d39c9e8be8 100644 --- a/addons/account/process/invoice_process.xml +++ b/addons/account/process/invoice_process.xml @@ -23,6 +23,7 @@ + @@ -62,10 +63,11 @@ - + + @@ -102,7 +104,7 @@ - + diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml index df5a544a293..3ee13ace8d5 100644 --- a/addons/account/process/statement_process.xml +++ b/addons/account/process/statement_process.xml @@ -78,10 +78,11 @@ + - + @@ -131,6 +132,15 @@ + + + + + + + + + diff --git a/addons/document/__terp__.py b/addons/document/__terp__.py index 0e1c845cff6..a270736bb5c 100644 --- a/addons/document/__terp__.py +++ b/addons/document/__terp__.py @@ -14,7 +14,9 @@ """, "depends" : ["base", "process"], "init_xml" : ["document_data.xml"], - "update_xml" : ["document_view.xml"], + "update_xml" : ["document_view.xml", +# "process/document_process.xml" + ], "demo_xml" : ["document_demo.xml"], "active": False, "installable": True 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 f21378fee04..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 @@ + diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 95ac6df6f63..58f2dc7850c 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -858,7 +858,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 38fdbeecaea..241a135868e 100644 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -1,4 +1,3 @@ - @@ -43,6 +42,7 @@ + @@ -54,6 +54,7 @@ + @@ -109,6 +110,7 @@ + @@ -153,6 +155,7 @@ + @@ -164,6 +167,7 @@ + diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml index b9c07b7bf6d..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 @@ + diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml index 182812efe16..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 @@ + diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml index 829fcc61bf7..9f5716734cf 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 @@ - + + @@ -123,7 +127,7 @@ - + From 9cd8272f7669ba84e689a7a16ff58d2982b18ce8 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Wed, 15 Oct 2008 14:33:37 +0530 Subject: [PATCH 5/5] minor changes in process bzr revid: solanki.priyesh@gmail.com-20081015090337-78q7a2lov5cdqkd8 --- addons/mrp/process/procurement_process.xml | 6 +++--- addons/sale/process/sale_process.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index 241a135868e..866ad784349 100644 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -130,7 +130,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -164,7 +164,7 @@ - + diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml index 9f5716734cf..d91109ae331 100644 --- a/addons/sale/process/sale_process.xml +++ b/addons/sale/process/sale_process.xml @@ -127,7 +127,7 @@ - +