From 03e0e088d9a5f6b60800c1b86a33fcc1e4a6d077 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Mon, 8 Dec 2008 17:39:40 +0530 Subject: [PATCH 1/9] minor changed in hr_attendance bzr revid: solanki.priyesh@gmail.com-20081208120940-tcyki05qw4c3u86o --- addons/hr_attendance/hr_attendance.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py index dfa1e3a7635..68561933b0a 100644 --- a/addons/hr_attendance/hr_attendance.py +++ b/addons/hr_attendance/hr_attendance.py @@ -71,7 +71,8 @@ class hr_attendance(osv.osv): ''' % (id, id) cr.execute(sql) atts = cr.fetchall() - if not ((len(atts)==1 and atts[0][0] == 'sign_in') or (atts[0][0] != atts[1][0] and atts[0][1] != atts[1][1])): + print "ATTS", atts + if not ((len(atts)==1 and atts[0][0] == 'sign_in')) or (atts[0][0] != atts[1][0] and atts[0][1] != atts[1][1]): return False return True From 124bf12c4558934d1fd375965ff1d4679ff7aac0 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Wed, 10 Dec 2008 18:16:03 +0530 Subject: [PATCH 2/9] minor change bzr revid: solanki.priyesh@gmail.com-20081210124603-6suh2uqyh4931jq4 --- addons/product/__terp__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/product/__terp__.py b/addons/product/__terp__.py index f345a77ede4..79c07240395 100644 --- a/addons/product/__terp__.py +++ b/addons/product/__terp__.py @@ -48,7 +48,8 @@ "update_xml" : [ "security/product_security.xml", "security/ir.model.access.csv", - "product_data.xml","product_report.xml", + "product_data.xml", + "product_report.xml", "product_view.xml", "pricelist_view.xml", "partner_view.xml", "product_wizard.xml", "process/product_process.xml" From ac68d17cc5c8b0063bc781a2dca1a495baf6f153 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Thu, 11 Dec 2008 17:20:52 +0530 Subject: [PATCH 3/9] minor change bzr revid: solanki.priyesh@gmail.com-20081211115052-oi8314q6m9kr5v8r --- addons/hr_attendance/hr_attendance.py | 3 +-- addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py index 68561933b0a..dfa1e3a7635 100644 --- a/addons/hr_attendance/hr_attendance.py +++ b/addons/hr_attendance/hr_attendance.py @@ -71,8 +71,7 @@ class hr_attendance(osv.osv): ''' % (id, id) cr.execute(sql) atts = cr.fetchall() - print "ATTS", atts - if not ((len(atts)==1 and atts[0][0] == 'sign_in')) or (atts[0][0] != atts[1][0] and atts[0][1] != atts[1][1]): + if not ((len(atts)==1 and atts[0][0] == 'sign_in') or (atts[0][0] != atts[1][0] and atts[0][1] != atts[1][1])): return False return True diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py index 114a4a72997..4c522f0c3e3 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py @@ -635,7 +635,7 @@ class hr_timesheet_sheet_sheet_account(osv.osv): 'sheet_id': fields.many2one('hr_timesheet_sheet.sheet', 'Sheet', readonly=True), 'total': fields.float('Total Time', digits=(16,2), readonly=True), 'invoice_rate': fields.many2one('hr_timesheet_invoice.factor', 'Invoice rate', readonly=True), - } + } def init(self, cr): cr.execute("""create or replace view hr_timesheet_sheet_sheet_account as ( From 098d05d60e178ec6173a62ee14415ae2b4310121 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Fri, 12 Dec 2008 12:49:17 +0530 Subject: [PATCH 4/9] minor change bzr revid: solanki.priyesh@gmail.com-20081212071917-xsy9rn0m77h57uyr --- addons/project/project_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 32c7ed49c27..0159e019572 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -329,7 +329,7 @@ calendar - + From 5dfc867c763b0533ad98f2858cc83083ba1199d3 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Wed, 17 Dec 2008 10:42:28 +0530 Subject: [PATCH 5/9] minor changes bzr revid: solanki.priyesh@gmail.com-20081217051228-wlc5dm63ewbr114o --- addons/base_module_publish/wizard/module_zip.py | 4 ++-- addons/base_module_publish/wizard/wizard_module_export.py | 2 +- addons/project/project.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/base_module_publish/wizard/module_zip.py b/addons/base_module_publish/wizard/module_zip.py index 4014927bf99..a6e64845988 100644 --- a/addons/base_module_publish/wizard/module_zip.py +++ b/addons/base_module_publish/wizard/module_zip.py @@ -42,7 +42,7 @@ def _zippy(archive, fromurl, path, src=True): else: exclude = ['py','pyo','pyc'] if (path.split('.')[-1] not in exclude) or (os.path.basename(path)=='__terp__.py'): - archive.write(os.path.join(fromurl, path), path) + archive.write(os.path.join(fromurl, path).encode(), path.encode()) return True def createzip(cr, uid, moduleid, context, b64enc=True, src=True): @@ -59,7 +59,7 @@ def createzip(cr, uid, moduleid, context, b64enc=True, src=True): if os.path.isdir(os.path.join(ad, module.name)): archname = StringIO.StringIO('wb') archive = PyZipFile(archname, "w", ZIP_DEFLATED) - archive.writepy(os.path.join(ad, module.name)) + archive.writepy(os.path.join(ad, module.name).encode()) _zippy(archive, ad, module.name, src=src) archive.close() val =archname.getvalue() diff --git a/addons/base_module_publish/wizard/wizard_module_export.py b/addons/base_module_publish/wizard/wizard_module_export.py index 0c8bf2f0266..64195741759 100644 --- a/addons/base_module_publish/wizard/wizard_module_export.py +++ b/addons/base_module_publish/wizard/wizard_module_export.py @@ -52,7 +52,7 @@ finish_fields = { class move_module_wizard(wizard.interface): def createzip(self, cr, uid, data, context): - return module_zip.createzip(cr, uid, data['id'], context, src=data['form']['include_src']) + return module_zip.createzip(cr, uid, data['id'], context, src=data['form']['include_src']) states = { 'init': { diff --git a/addons/project/project.py b/addons/project/project.py index 41e6750ecc3..d5d6f1ecd86 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -410,12 +410,12 @@ class project_work(osv.osv): _order = "date desc" def create(self, cr, uid, vals, *args, **kwargs): if 'task_id' in vals: - cr.execute('update project_task set remaining_hours=remaining_hours+%.2f where id=%s', (-vals.get('hours',0.0), vals['task_id'])) + cr.execute('update project_task set remaining_hours=remaining_hours+%.2s where id=%s', (-vals.get('hours',0.0), vals['task_id'])) return super(project_work,self).create(cr, uid, vals, *args, **kwargs) def write(self, cr, uid, ids,vals,context={}): for work in self.browse(cr, uid, ids, context): - cr.execute('update project_task set remaining_hours=remaining_hours+%.2f+(%.2f) where id=%s', (-vals.get('hours',0.0), work.hours, work.task_id.id)) + cr.execute('update project_task set remaining_hours=remaining_hours+%.2f+(%.2s) where id=%s', (-vals.get('hours',0.0), work.hours, work.task_id.id)) return super(project_work,self).write(cr, uid, ids, vals, context) def unlink(self, cr, uid, ids, *args, **kwargs): From 576216e8464e600cb498ae6413e101bbbc7690aa Mon Sep 17 00:00:00 2001 From: Priyesh Date: Wed, 17 Dec 2008 19:09:33 +0530 Subject: [PATCH 6/9] change in process bzr revid: solanki.priyesh@gmail.com-20081217133933-hfhl08mxoug5nnx7 --- .../process/customer_invoice_process.xml | 2 +- addons/account/process/statement_process.xml | 9 ++++--- .../process/supplier_invoice_process.xml | 2 +- .../board_crm_view.xml | 10 ++++---- addons/crm/crm.py | 1 + .../process/hr_timesheet_project_process.xml | 2 +- .../process/hr_timesheet_sheet_process.xml | 4 +-- addons/mrp/process/procurement_process.xml | 3 ++- addons/project/process/task_process.xml | 2 +- .../process/project_mrp_process.xml | 2 +- addons/purchase/process/purchase_process.xml | 25 +++++++++++++++++-- addons/sale/process/sale_process.xml | 1 + addons/sale_crm/process/sale_crm_process.xml | 1 + addons/stock/process/stock_process.xml | 24 ++---------------- 14 files changed, 47 insertions(+), 41 deletions(-) diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml index be50089cc9d..581ca083ac9 100755 --- a/addons/account/process/customer_invoice_process.xml +++ b/addons/account/process/customer_invoice_process.xml @@ -60,7 +60,7 @@ - + diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml index 9fa1bf6becb..d0105f76e03 100755 --- a/addons/account/process/statement_process.xml +++ b/addons/account/process/statement_process.xml @@ -16,7 +16,7 @@ --> - + @@ -27,7 +27,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -65,6 +65,7 @@ + diff --git a/addons/account/process/supplier_invoice_process.xml b/addons/account/process/supplier_invoice_process.xml index ef335146fa9..be4892c0da9 100755 --- a/addons/account/process/supplier_invoice_process.xml +++ b/addons/account/process/supplier_invoice_process.xml @@ -38,7 +38,7 @@ - + diff --git a/addons/board_crm_configuration/board_crm_view.xml b/addons/board_crm_configuration/board_crm_view.xml index 6672e13b2b1..2508f15e1ef 100644 --- a/addons/board_crm_configuration/board_crm_view.xml +++ b/addons/board_crm_configuration/board_crm_view.xml @@ -22,7 +22,7 @@ form tree,form - [('section_id', '=', 'Leads'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')] + [('section_id.name', '=', 'Leads'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')] @@ -30,7 +30,7 @@ form tree,form - [('section_id', '=', 'Meetings'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')] + [('section_id.name', '=', 'Meetings'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')] form graph,tree,form - [('section_id', '=', 'Leads'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')] + [('section_id.name', '=', 'Leads'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')] @@ -53,7 +53,7 @@ form graph,tree,form - [('section_id', '=', 'Opportunities'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')] + [('section_id.name', '=', 'Opportunities'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')] @@ -61,7 +61,7 @@ form graph,tree,form - [('section_id','=','Jobs'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')] + [('section_id.name','=','Jobs'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')] diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 7ba7c6d0337..b1451e7b90a 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -181,6 +181,7 @@ class crm_case_section(osv.osv): 'object': True }) return True + def name_get(self, cr, uid, ids, context={}): if not len(ids): return [] 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 c07d8deffcf..53dbc32e056 100755 --- a/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml +++ b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml @@ -10,7 +10,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 1f467a1c2e2..f7fdf41a5cd 100755 --- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml +++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml @@ -41,8 +41,9 @@ - + + @@ -72,7 +73,6 @@ - diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index 9724c5c28f1..4818f33d5da 100755 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -154,6 +154,7 @@ + @@ -171,7 +172,7 @@ - + diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml index 945db0e3498..675437c8d81 100755 --- a/addons/project/process/task_process.xml +++ b/addons/project/process/task_process.xml @@ -64,7 +64,7 @@ - + diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml index d4d44f374e3..d187d5f3f37 100755 --- a/addons/project_mrp/process/project_mrp_process.xml +++ b/addons/project_mrp/process/project_mrp_process.xml @@ -22,7 +22,7 @@ - + diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml index dae58ba269a..3dfbbf4cb83 100755 --- a/addons/purchase/process/purchase_process.xml +++ b/addons/purchase/process/purchase_process.xml @@ -14,6 +14,18 @@ + + + + + + + + + + + + @@ -78,7 +90,7 @@ - + @@ -101,7 +113,7 @@ - + @@ -205,6 +217,15 @@ + + + + + + + + + diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml index d371081d2c3..553c46bade6 100755 --- a/addons/sale/process/sale_process.xml +++ b/addons/sale/process/sale_process.xml @@ -66,6 +66,7 @@ + diff --git a/addons/sale_crm/process/sale_crm_process.xml b/addons/sale_crm/process/sale_crm_process.xml index 6ea2f7e3ede..861d21672ac 100755 --- a/addons/sale_crm/process/sale_crm_process.xml +++ b/addons/sale_crm/process/sale_crm_process.xml @@ -22,6 +22,7 @@ + diff --git a/addons/stock/process/stock_process.xml b/addons/stock/process/stock_process.xml index 8dce029be20..aade7ce555a 100755 --- a/addons/stock/process/stock_process.xml +++ b/addons/stock/process/stock_process.xml @@ -1,23 +1,12 @@ - - - - - - - - - - - - + - + @@ -33,15 +22,6 @@ - - - - - - - - - \ No newline at end of file From cb7ab929d3a3782d00efcf649f3bb777217ae3f5 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Fri, 19 Dec 2008 10:33:35 +0530 Subject: [PATCH 7/9] changes in process bzr revid: solanki.priyesh@gmail.com-20081219050335-kcfiq14hpsmvopyw --- .../process/customer_invoice_process.xml | 3 +- .../process/supplier_invoice_process.xml | 22 ++++++- addons/hr/process/hr_process.xml | 18 ------ .../process/hr_timesheet_project_process.xml | 2 +- .../process/hr_timesheet_sheet_process.xml | 7 +- addons/mrp/process/procurement_process.xml | 64 +++++++++---------- addons/project/process/task_process.xml | 2 +- .../process/project_mrp_process.xml | 54 ++++++++-------- addons/purchase/process/purchase_process.xml | 30 +++++++-- addons/sale/process/sale_process.xml | 7 +- addons/stock/__terp__.py | 1 - addons/stock/process/stock_process.xml | 27 -------- 12 files changed, 115 insertions(+), 122 deletions(-) delete mode 100755 addons/stock/process/stock_process.xml diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml index 581ca083ac9..c3fedd1826e 100755 --- a/addons/account/process/customer_invoice_process.xml +++ b/addons/account/process/customer_invoice_process.xml @@ -18,11 +18,10 @@ - + - diff --git a/addons/account/process/supplier_invoice_process.xml b/addons/account/process/supplier_invoice_process.xml index be4892c0da9..613aaaa4005 100755 --- a/addons/account/process/supplier_invoice_process.xml +++ b/addons/account/process/supplier_invoice_process.xml @@ -15,6 +15,17 @@ Process Node --> + + + + + + + + + + + @@ -45,7 +56,7 @@ - + @@ -95,6 +106,15 @@ Process Transition --> + + + + + + + + + diff --git a/addons/hr/process/hr_process.xml b/addons/hr/process/hr_process.xml index c1d85525b79..42c9fd022ab 100755 --- a/addons/hr/process/hr_process.xml +++ b/addons/hr/process/hr_process.xml @@ -15,15 +15,6 @@ Process Node --> - - - - - - - - - @@ -67,15 +58,6 @@ - - - - - - - - - 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 53dbc32e056..390e572c52b 100755 --- a/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml +++ b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml @@ -66,7 +66,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 f7fdf41a5cd..a664be5e1ee 100755 --- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml +++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml @@ -129,9 +129,10 @@ - + + @@ -149,7 +150,7 @@ - + @@ -158,7 +159,7 @@ - + diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index 4818f33d5da..39e599c27e2 100755 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -29,7 +29,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -79,8 +79,8 @@ - - + + @@ -91,18 +91,18 @@ - + - + - + @@ -113,7 +113,7 @@ - + @@ -125,10 +125,10 @@ - + - + @@ -136,7 +136,7 @@ - + @@ -216,7 +216,7 @@ - + @@ -229,67 +229,67 @@ - + - - + + - + - - + + - + - + - + - + - + - - + + - + - - + + - + - - + + diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml index 675437c8d81..8dfc3a340d3 100755 --- a/addons/project/process/task_process.xml +++ b/addons/project/process/task_process.xml @@ -65,7 +65,7 @@ - + diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml index d187d5f3f37..21c641dd8e4 100755 --- a/addons/project_mrp/process/project_mrp_process.xml +++ b/addons/project_mrp/process/project_mrp_process.xml @@ -21,15 +21,16 @@ - + - + + - + @@ -54,7 +55,6 @@ - @@ -63,39 +63,37 @@ - - - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml index 3dfbbf4cb83..38a2fce7460 100755 --- a/addons/purchase/process/purchase_process.xml +++ b/addons/purchase/process/purchase_process.xml @@ -18,10 +18,9 @@ - + - @@ -43,7 +42,7 @@ - + @@ -53,8 +52,8 @@ - - + + @@ -118,6 +117,18 @@ + + + + + + + + + + + + @@ -151,6 +162,15 @@ + + + + + + + + + diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml index 553c46bade6..46e13d1d6d2 100755 --- a/addons/sale/process/sale_process.xml +++ b/addons/sale/process/sale_process.xml @@ -33,6 +33,7 @@ + @@ -42,7 +43,7 @@ - + @@ -53,8 +54,8 @@ - - + + diff --git a/addons/stock/__terp__.py b/addons/stock/__terp__.py index dc09385b09f..1d012329503 100644 --- a/addons/stock/__terp__.py +++ b/addons/stock/__terp__.py @@ -42,7 +42,6 @@ "report_stock_view.xml", "security/stock_security.xml", "security/ir.model.access.csv", - "process/stock_process.xml" ], "active": False, "installable": True diff --git a/addons/stock/process/stock_process.xml b/addons/stock/process/stock_process.xml deleted file mode 100755 index aade7ce555a..00000000000 --- a/addons/stock/process/stock_process.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From cd49af64f17b4dc5248a22925042eb45ff3b6d10 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Fri, 19 Dec 2008 14:42:29 +0530 Subject: [PATCH 8/9] improvement in procurement process bzr revid: solanki.priyesh@gmail.com-20081219091229-eodw12wdqm9pa1hu --- addons/.project | 17 ++ addons/.pydevproject | 6 + addons/mrp/__terp__.py | 2 + addons/mrp/process/procurement_process.xml | 150 +----------------- .../mrp/process/service_product_process.xml | 95 +++++++++++ .../mrp/process/stockable_product_process.xml | 115 ++++++++++++++ .../process/project_mrp_process.xml | 2 +- 7 files changed, 241 insertions(+), 146 deletions(-) create mode 100644 addons/.project create mode 100644 addons/.pydevproject create mode 100644 addons/mrp/process/service_product_process.xml create mode 100644 addons/mrp/process/stockable_product_process.xml diff --git a/addons/.project b/addons/.project new file mode 100644 index 00000000000..ada2ccca54d --- /dev/null +++ b/addons/.project @@ -0,0 +1,17 @@ + + + addons-pso-process + + + + + + org.python.pydev.PyDevBuilder + + + + + + org.python.pydev.pythonNature + + diff --git a/addons/.pydevproject b/addons/.pydevproject new file mode 100644 index 00000000000..78259a9c3db --- /dev/null +++ b/addons/.pydevproject @@ -0,0 +1,6 @@ + + + + +python 2.4 + diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py index 5ea266c3a0d..b8cb6a2d3da 100644 --- a/addons/mrp/__terp__.py +++ b/addons/mrp/__terp__.py @@ -64,6 +64,8 @@ "mrp_wizard.xml", "mrp_report.xml", "company_view.xml", + "process/stockable_product_process.xml", + "process/service_product_process.xml", "process/procurement_process.xml", ], "active": False, diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index 39e599c27e2..a1c2429f917 100755 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -18,7 +18,7 @@ - + @@ -50,9 +50,10 @@ - + + @@ -61,93 +62,15 @@ - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -229,69 +152,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/addons/mrp/process/service_product_process.xml b/addons/mrp/process/service_product_process.xml new file mode 100644 index 00000000000..abaa418331e --- /dev/null +++ b/addons/mrp/process/service_product_process.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/mrp/process/stockable_product_process.xml b/addons/mrp/process/stockable_product_process.xml new file mode 100644 index 00000000000..9c885d51942 --- /dev/null +++ b/addons/mrp/process/stockable_product_process.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 21c641dd8e4..7082deef237 100755 --- a/addons/project_mrp/process/project_mrp_process.xml +++ b/addons/project_mrp/process/project_mrp_process.xml @@ -36,7 +36,7 @@ - + From 50839dcb9338d184c8a0c34e1c23e13035790523 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Mon, 22 Dec 2008 11:54:53 +0530 Subject: [PATCH 9/9] minor changes bzr revid: solanki.priyesh@gmail.com-20081222062453-tl19d4oiu1huu0xm --- addons/product/report/product_label.xsl | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/product/report/product_label.xsl b/addons/product/report/product_label.xsl index 2df7e8d3e2c..fcfe1d6e56f 100644 --- a/addons/product/report/product_label.xsl +++ b/addons/product/report/product_label.xsl @@ -70,7 +70,6 @@ - ,