From 923835229cb92dad0a71a867c0bd0bf9993b1bf0 Mon Sep 17 00:00:00 2001 From: "pso (tiny)" Date: Fri, 26 Dec 2008 16:54:10 +0530 Subject: [PATCH] changes in process bzr revid: pso@tinyerp.com-20081226112410-2r283ngsvoh0a8od --- addons/account/__terp__.py | 2 +- .../process/customer_invoice_process.xml | 28 ++++++++- addons/account/process/statement_process.xml | 44 +------------ .../process/supplier_invoice_process.xml | 4 +- .../process/base_contact_process.xml | 1 + .../process/crm_configuration_process.xml | 5 +- addons/hr/process/hr_process.xml | 1 + .../hr_expense/process/hr_expense_process.xml | 1 + .../process/hr_holidays_process.xml | 1 + .../process/hr_timesheet_process.xml | 1 + .../process/hr_timesheet_sheet_process.xml | 1 + .../membership/process/membership_process.xml | 1 + addons/mrp/process/procurement_process.xml | 63 ++++++++++++++++++- .../mrp/process/service_product_process.xml | 32 +--------- .../mrp/process/stockable_product_process.xml | 30 +-------- addons/process/process.py | 5 +- addons/product/process/product_process.xml | 1 + addons/project/process/task_process.xml | 1 + addons/purchase/process/purchase_process.xml | 1 + addons/sale/process/sale_process.xml | 1 + 20 files changed, 113 insertions(+), 111 deletions(-) diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py index 3d3905ed249..e5f77587fa7 100644 --- a/addons/account/__terp__.py +++ b/addons/account/__terp__.py @@ -59,9 +59,9 @@ "project/project_report.xml", "product_view.xml", "account_assert_test.xml", + "process/statement_process.xml", "process/customer_invoice_process.xml", "process/supplier_invoice_process.xml", - "process/statement_process.xml", ], "translations" : { "fr": "i18n/french_fr.csv" diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml index c3fedd1826e..7af469d142f 100755 --- a/addons/account/process/customer_invoice_process.xml +++ b/addons/account/process/customer_invoice_process.xml @@ -8,6 +8,7 @@ + @@ -61,13 +62,14 @@ - + + - + @@ -101,6 +103,19 @@ + + + + + + + + + + + + + @@ -102,36 +91,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/addons/account/process/supplier_invoice_process.xml b/addons/account/process/supplier_invoice_process.xml index 613aaaa4005..d20548f7eef 100755 --- a/addons/account/process/supplier_invoice_process.xml +++ b/addons/account/process/supplier_invoice_process.xml @@ -8,6 +8,7 @@ + @@ -51,10 +52,11 @@ - + + diff --git a/addons/base_contact/process/base_contact_process.xml b/addons/base_contact/process/base_contact_process.xml index 8f653a90e2f..182eb70ca0e 100755 --- a/addons/base_contact/process/base_contact_process.xml +++ b/addons/base_contact/process/base_contact_process.xml @@ -9,6 +9,7 @@ + - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -115,6 +140,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/mrp/process/service_product_process.xml b/addons/mrp/process/service_product_process.xml index abaa418331e..e7aacaaf044 100644 --- a/addons/mrp/process/service_product_process.xml +++ b/addons/mrp/process/service_product_process.xml @@ -8,6 +8,7 @@ + @@ -15,17 +16,6 @@ Process Node --> - - - - - - - - - - - @@ -41,7 +31,7 @@ - + @@ -64,24 +54,6 @@ Process Transition --> - - - - - - - - - - - - - - - - - - diff --git a/addons/mrp/process/stockable_product_process.xml b/addons/mrp/process/stockable_product_process.xml index 9c885d51942..92da99f635e 100644 --- a/addons/mrp/process/stockable_product_process.xml +++ b/addons/mrp/process/stockable_product_process.xml @@ -8,6 +8,7 @@ + @@ -15,17 +16,6 @@ Process Node --> - - - - - - - - - - - @@ -75,24 +65,6 @@ Process Transition --> - - - - - - - - - - - - - - - - - - diff --git a/addons/process/process.py b/addons/process/process.py index b1a6002dfd9..4eba1a44410 100644 --- a/addons/process/process.py +++ b/addons/process/process.py @@ -73,7 +73,6 @@ class process_process(osv.osv): res = pool.get('process.process').browse(cr, uid, res, context) for process in res: result.append((process.id, process.name)) - return result # else search process nodes @@ -87,7 +86,9 @@ class process_process(osv.osv): return result def graph_get(self, cr, uid, id, res_model, res_id, scale, context): - + if not res_model: + res_model = (self.browse(cr, uid, [id])[0]).model_id.model + pool = pooler.get_pool(cr.dbname) process = pool.get('process.process').browse(cr, uid, [id])[0] diff --git a/addons/product/process/product_process.xml b/addons/product/process/product_process.xml index 4ff800ad0cc..c3564e09b1d 100755 --- a/addons/product/process/product_process.xml +++ b/addons/product/process/product_process.xml @@ -8,6 +8,7 @@ + diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml index 8dfc3a340d3..f713baad82e 100755 --- a/addons/project/process/task_process.xml +++ b/addons/project/process/task_process.xml @@ -8,6 +8,7 @@ + diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml index 38a2fce7460..8893d0b9df8 100755 --- a/addons/purchase/process/purchase_process.xml +++ b/addons/purchase/process/purchase_process.xml @@ -8,6 +8,7 @@ + diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml index 46e13d1d6d2..5c98b95dd48 100755 --- a/addons/sale/process/sale_process.xml +++ b/addons/sale/process/sale_process.xml @@ -8,6 +8,7 @@ +