From 923835229cb92dad0a71a867c0bd0bf9993b1bf0 Mon Sep 17 00:00:00 2001 From: "pso (tiny)" Date: Fri, 26 Dec 2008 16:54:10 +0530 Subject: [PATCH 1/4] 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 @@ + From df689dad23a05d272ecce06271cb04b757caff84 Mon Sep 17 00:00:00 2001 From: "pso (tiny)" Date: Mon, 29 Dec 2008 10:40:22 +0530 Subject: [PATCH 2/4] minor change bzr revid: pso@tinyerp.com-20081229051022-elqclazvlc1ib28p --- addons/auction/report/huissier.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/auction/report/huissier.py b/addons/auction/report/huissier.py index e01063ba9c0..c97f0569e0f 100644 --- a/addons/auction/report/huissier.py +++ b/addons/auction/report/huissier.py @@ -49,7 +49,7 @@ class report_custom(report_rml): for l in lots: # l['id_cont'] = str(i) if l['obj_price']==0: - price_french = 'retiré' + price_french = 'retir�' else: price_french = int_to_text(int(l['obj_price'] or 0.0))+' eur' i+=1 From a16111269bf6bfd2ed9562a0fbc3fd3a786c1b75 Mon Sep 17 00:00:00 2001 From: "pso (tiny)" Date: Mon, 29 Dec 2008 11:10:16 +0530 Subject: [PATCH 3/4] minor change bzr revid: pso@tinyerp.com-20081229054016-azbat260fjvs5mpn --- addons/process/process.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/process/process.py b/addons/process/process.py index 8f88b0b92c5..ab4bf724da0 100644 --- a/addons/process/process.py +++ b/addons/process/process.py @@ -84,8 +84,6 @@ 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) From a4a6343ac7909446576ada24bd63262a2f53222e Mon Sep 17 00:00:00 2001 From: "pso (tiny)" Date: Mon, 29 Dec 2008 15:39:33 +0530 Subject: [PATCH 4/4] Add mrp operation process bzr revid: pso@tinyerp.com-20081229100933-p6rcs3zojcso0hxo --- addons/mrp_operations/__terp__.py | 3 +- addons/mrp_operations/mrp_operations.py | 4 +- .../process/mrp_operation_process.xml | 116 ++++++++++++++++++ 3 files changed, 120 insertions(+), 3 deletions(-) create mode 100644 addons/mrp_operations/process/mrp_operation_process.xml diff --git a/addons/mrp_operations/__terp__.py b/addons/mrp_operations/__terp__.py index 9d3a61fac38..8044ecc2e26 100755 --- a/addons/mrp_operations/__terp__.py +++ b/addons/mrp_operations/__terp__.py @@ -55,7 +55,8 @@ "demo_xml" : ["mrp_operation_data.xml"], "update_xml" : [ "security/ir.model.access.csv", - "mrp_operations_workflow.xml","mrp_operations_view.xml","mrp_operations_report.xml" + "mrp_operations_workflow.xml","mrp_operations_view.xml","mrp_operations_report.xml", + "process/mrp_operation_process.xml" ], "active": False, "installable": True diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py index 72316aca8bd..0de73bad7e5 100755 --- a/addons/mrp_operations/mrp_operations.py +++ b/addons/mrp_operations/mrp_operations.py @@ -47,14 +47,14 @@ class mrp_production_workcenter_line(osv.osv): 'date_planned': fields.related('production_id', 'date_planned', type='datetime', string='Date Planned'), 'date_start': fields.datetime('Start Date'), 'date_finnished': fields.datetime('End Date'), - 'delay': fields.float('Delay',size=128,help="This is delay between operation start and stop in this workcenter",readonly=True), + 'delay': fields.char('Delay',size=128,help="This is delay between operation start and stop in this workcenter",readonly=True), 'product':fields.related('production_id','product_id',type='many2one',relation='product.product',string='Product'), 'qty':fields.related('production_id','product_qty',type='float',string='Qty'), 'uom':fields.related('production_id','product_uom',type='many2one',relation='product.uom',string='UOM'), } _defaults = { 'state': lambda *a: 'draft', - 'delay': lambda *a: 0.0 + 'delay': lambda *a: '0 Days 0 hrs and 0 mins' } def modify_production_order_state(self,cr,uid,ids,action): diff --git a/addons/mrp_operations/process/mrp_operation_process.xml b/addons/mrp_operations/process/mrp_operation_process.xml new file mode 100644 index 00000000000..013a629d3a7 --- /dev/null +++ b/addons/mrp_operations/process/mrp_operation_process.xml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file