From 87691f05d329211f063bf3e231424b6e491cb1f6 Mon Sep 17 00:00:00 2001 From: "Vir (Open ERP)" Date: Wed, 10 Feb 2010 17:06:26 +0530 Subject: [PATCH 01/17] [IMP] Product : Main menu added, in configuration Unit of measuers, Product categories are added. Sale : sequence value changed for shop menu bzr revid: vir@tinyerp.com-20100210113626-sf5raglkj2y95dzm --- addons/product/product_view.xml | 8 ++++++-- addons/sale/sale_view.xml | 10 +++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index e0b2cc714f6..f8cc276f7e3 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -188,6 +188,8 @@ + + @@ -253,6 +255,7 @@ + @@ -312,7 +315,8 @@ form - + + product.uom.categ.form @@ -331,7 +335,7 @@ form tree,form - + product.ul.form.view diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 8160b129b93..9c375ee62d1 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -45,7 +45,7 @@ tree,form - + sale.order.calendar @@ -239,7 +239,7 @@ - + @@ -247,7 +247,7 @@ - + @@ -415,8 +415,8 @@ - - + + From 8bad37f8da086a402630e5f8c0cbc0e31c2df065 Mon Sep 17 00:00:00 2001 From: "RCH(OpenERP)" <> Date: Wed, 10 Feb 2010 18:03:47 +0530 Subject: [PATCH 02/17] [MOD] point of sale : menu changed bzr revid: vir@tinyerp.com-20100210123347-3j5qlny9f12d9877 --- addons/point_of_sale/statement_data.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/point_of_sale/statement_data.xml b/addons/point_of_sale/statement_data.xml index 7da96075fab..641cb8e52cf 100644 --- a/addons/point_of_sale/statement_data.xml +++ b/addons/point_of_sale/statement_data.xml @@ -33,7 +33,7 @@ - + From 208896b8780f5eaa991b4e5ad9e36832bce96c6c Mon Sep 17 00:00:00 2001 From: "Vir (Open ERP)" Date: Thu, 11 Feb 2010 16:42:34 +0530 Subject: [PATCH 03/17] [IMP] Added important menus bzr revid: vir@tinyerp.com-20100211111234-lefz4v42ai3fnlio --- addons/crm_profiling/crm_profiling_view.xml | 8 ++++---- addons/event/event_view.xml | 2 +- addons/hr_timesheet/hr_timesheet_view.xml | 6 +++--- addons/mrp_operations/mrp_operations_view.xml | 2 +- addons/point_of_sale/posrule_data.xml | 10 +++++----- addons/point_of_sale/posrule_data2.xml | 10 +++++----- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/addons/crm_profiling/crm_profiling_view.xml b/addons/crm_profiling/crm_profiling_view.xml index e2ac5c4d1fc..592797ada84 100644 --- a/addons/crm_profiling/crm_profiling_view.xml +++ b/addons/crm_profiling/crm_profiling_view.xml @@ -22,8 +22,8 @@ form tree,form - - + @@ -32,8 +32,8 @@ form tree,form - - + + diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml index 9144d3b0ca3..d08bc9a0b48 100644 --- a/addons/hr_timesheet/hr_timesheet_view.xml +++ b/addons/hr_timesheet/hr_timesheet_view.xml @@ -62,7 +62,7 @@ - + My Working Hours @@ -83,11 +83,11 @@ tree,form - + groups="hr.group_hr_manager"/> hr.timesheet.employee.extd_form diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml index 9f891b480ec..37328547a77 100644 --- a/addons/mrp_operations/mrp_operations_view.xml +++ b/addons/mrp_operations/mrp_operations_view.xml @@ -217,7 +217,7 @@ - + diff --git a/addons/point_of_sale/posrule_data.xml b/addons/point_of_sale/posrule_data.xml index e27334a1657..05313a72d51 100644 --- a/addons/point_of_sale/posrule_data.xml +++ b/addons/point_of_sale/posrule_data.xml @@ -575,11 +575,11 @@ id="stock.next_id_61" name="Reporting" parent="stock.menu_stock_root" groups="base.group_user"/> - - + + + + + diff --git a/addons/point_of_sale/posrule_data2.xml b/addons/point_of_sale/posrule_data2.xml index c6d11632e72..680ae25d7b7 100644 --- a/addons/point_of_sale/posrule_data2.xml +++ b/addons/point_of_sale/posrule_data2.xml @@ -579,11 +579,11 @@ id="stock.next_id_61" name="Reporting" parent="stock.menu_stock_root" groups="base.group_user"/> - - + + + + + From 8adbc46643932e57136a714c1b6d1abbb92dbf9a Mon Sep 17 00:00:00 2001 From: "Vir (Open ERP)" Date: Thu, 11 Feb 2010 17:18:18 +0530 Subject: [PATCH 04/17] [ADD] Product packaging menu addec bzr revid: vir@tinyerp.com-20100211114818-roa9r9r6ahlpnkzu --- addons/product/product_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index f8cc276f7e3..d035c23556c 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -367,6 +367,7 @@ tree,form + product.packaging.tree.view From cb81308354cddb37cb94e316a54d1f6b8d98b6a9 Mon Sep 17 00:00:00 2001 From: "Vir (Open ERP)" Date: Mon, 15 Feb 2010 14:44:04 +0530 Subject: [PATCH 05/17] [IMP] Arrange the product configuration menu in more proper way bzr revid: vir@tinyerp.com-20100215091404-58qodaq3h0gasx89 --- addons/product/pricelist_view.xml | 2 +- addons/product/product_view.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml index f1ef28aa81a..8045cc6cf22 100644 --- a/addons/product/pricelist_view.xml +++ b/addons/product/pricelist_view.xml @@ -2,7 +2,7 @@ - + product.pricelist.version.form diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index d035c23556c..aec4be43284 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -8,7 +8,7 @@ - + product.search.form product.product @@ -255,7 +255,7 @@ - + @@ -315,7 +315,7 @@ form - + @@ -367,7 +367,7 @@ tree,form - + product.packaging.tree.view From cdbcf1b5e5c6e19844ead37a179f74db365eff78 Mon Sep 17 00:00:00 2001 From: "Vir (Open ERP)" Date: Mon, 15 Feb 2010 16:06:48 +0530 Subject: [PATCH 06/17] [ADD] Event : Events by Category menu added bzr revid: vir@tinyerp.com-20100215103648-9bpkt0kz6yv2pxzr --- addons/event/event_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index f242295394a..5ebd7750c53 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -45,7 +45,7 @@ tree - + From 9d0cf55fda2974566a60581c4d0b89e27024ef3b Mon Sep 17 00:00:00 2001 From: "Vir (Open ERP)" Date: Mon, 15 Feb 2010 16:08:22 +0530 Subject: [PATCH 07/17] [ADD] Project : Project Structure menu added bzr revid: vir@tinyerp.com-20100215103822-7fxadk0p5ty4vp22 --- addons/project/project_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index adfec910870..ee7a888f559 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -207,10 +207,10 @@ [('parent_id','=',False)] - + parent="menu_project_management" sequence="20"/> From df59ede0a29b5fddb658d18f9432b3f85185f21c Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Wed, 17 Feb 2010 17:58:27 +0530 Subject: [PATCH 08/17] [IMP]: mrp: Added late button in search view + group by routing bzr revid: rpa@openerp.co.in-20100217122827-bw40ga8y1rtyr5eu --- addons/mrp/mrp_view.xml | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index b79a62719f7..98caa2f9e8f 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -545,19 +545,28 @@ search - - - + + + + + - + - + + @@ -767,6 +776,9 @@ + From 2ece4a9516739500399e93d1c0191e9655d69fb6 Mon Sep 17 00:00:00 2001 From: "Harry (Open ERP)" Date: Wed, 17 Feb 2010 18:18:30 +0530 Subject: [PATCH 09/17] [FIX] mrp: late means current_date>schedule_date and state in draft,confirm bzr revid: hmo@tinyerp.com-20100217124830-fk4f3073apmto5ro --- addons/mrp/mrp_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 98caa2f9e8f..f85c5ace21b 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -777,7 +777,7 @@ From 72d713c8cf95a4f8a5c125b3ffd79a1a71b0d5ce Mon Sep 17 00:00:00 2001 From: "KSA (OpenERP)" <> Date: Wed, 17 Feb 2010 18:49:40 +0530 Subject: [PATCH 10/17] [IMP]: crm, sale: Put proper names in view, change in sale reporting menu bzr revid: rpa@openerp.co.in-20100217131940-7jia1dccwracioef --- addons/crm/crm_claims_view.xml | 9 +++++---- addons/crm/crm_helpdesk_view.xml | 6 +++--- addons/sale/report_sale_view.xml | 17 ++++++++++------- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml index b693545654f..e97221f081b 100644 --- a/addons/crm/crm_claims_view.xml +++ b/addons/crm/crm_claims_view.xml @@ -32,11 +32,13 @@ crm.claim tree - + - + + + @@ -52,7 +54,6 @@ - @@ -215,7 +216,7 @@ /> - + diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml index 70b14fb4a12..b1c85683e8f 100644 --- a/addons/crm/crm_helpdesk_view.xml +++ b/addons/crm/crm_helpdesk_view.xml @@ -124,9 +124,9 @@ - + - + @@ -174,7 +174,7 @@ - + diff --git a/addons/sale/report_sale_view.xml b/addons/sale/report_sale_view.xml index 6d9f4ec931b..28749e8b672 100644 --- a/addons/sale/report_sale_view.xml +++ b/addons/sale/report_sale_view.xml @@ -24,13 +24,13 @@ Sale Orders By Partner sale.order form - tree,graph + graph,tree {'report':True} [('date_order','>=',time.strftime('%Y-%m-01')),('state','<>','draft'),('state','<>','cancel')] - + tree @@ -67,28 +67,31 @@ Sale Orders by Product sale.order.line form - tree,graph + graph,tree {'report':True} [('product_uom_qty','!=','0')] - + tree - + graph - + + + + - + \ No newline at end of file From cd17ce51cded499d816c0163d2b6bf42805e485c Mon Sep 17 00:00:00 2001 From: "UCO (OpenERP)" <> Date: Wed, 17 Feb 2010 19:10:45 +0530 Subject: [PATCH 11/17] [FIX]: base_action_rule: Minor fix bzr revid: rpa@openerp.co.in-20100217134045-64u8i1hh4nazxlev --- addons/base_action_rule/base_action_rule.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index 554f7a9edf3..0672b28ba33 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -61,7 +61,7 @@ class base_action_rule(osv.osv): 'partner': hasattr(obj, 'partner_id') and (obj.partner_id and obj.partner_id.name) or '/', 'partner_email': hasattr(obj, 'partner_address_id') and (obj.partner_address_id and obj.partner_address_id.email) or '/', } - return format_body(body % data) + return self.format_body(body % data) def email_send(self, cr, uid, obj, emails, body, emailfrom=tools.config.get('email_from',False), context={}): body = self.format_mail(obj, body) From d95103af72b4bf377fd61feefbb943bb88feca62 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Wed, 17 Feb 2010 16:16:52 +0100 Subject: [PATCH 12/17] [IMP] stock: Change the layouts of some objects bzr revid: stephane@openerp.com-20100217151652-smdkqj3fruskyrzr --- addons/stock/stock.py | 6 +-- addons/stock/stock_view.xml | 90 ++++++++++++------------------------- 2 files changed, 32 insertions(+), 64 deletions(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 28fe9842361..b7e43705fd1 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -451,7 +451,7 @@ class stock_picking(osv.osv): _columns = { 'name': fields.char('Reference', size=64, select=True), - 'origin': fields.char('Source document', size=64, help="Reference of the document that produced this picking."), + 'origin': fields.char('Origin', size=64, help="Reference of the document that produced this picking."), 'backorder_id': fields.many2one('stock.picking', 'Back Order', help="If the picking is splitted then the picking id in available state of move for this picking is stored in Backorder."), 'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."), 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the picking without removing it."), @@ -476,7 +476,7 @@ class stock_picking(osv.osv): \n* The \'Waiting\' state is used in MTO moves when a movement is waiting for another one.'), 'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date", method=True, store=True, type='datetime', string='Planned Date', select=1, help="Planned date for Picking. Default it takes current date"), - 'date': fields.datetime('Date Order', help="Date of Order"), + 'date': fields.datetime('Order Date', help="Date of Order"), 'date_done': fields.datetime('Date Done', help="Date of completion"), 'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date", method=True, store=True, type='datetime', string='Max. Planned Date', select=2), @@ -1090,7 +1090,7 @@ class stock_move(osv.osv): 'company_id': fields.many2one('res.company', 'Company', required=True,select=1), 'partner_id': fields.related('picking_id','address_id','partner_id',type='many2one', relation="res.partner", string="Partner"), 'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Orders"), - 'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Source document"), + 'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Origin"), 'move_stock_return_history': fields.many2many('stock.move', 'stock_move_return_history', 'move_id', 'return_move_id', 'Move Return History',readonly=True), } _constraints = [ diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 140ecb1a461..6d1c0cec690 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -8,9 +8,6 @@ - ============================= - Inventory Line - ============================= stock.inventory.line.tree stock.inventory.line @@ -41,9 +38,6 @@ - ============================= - Inventory - ============================= stock.inventory.tree stock.inventory @@ -119,10 +113,6 @@ - ============================= - Lot - ============================= - stock.tracking.form stock.tracking @@ -347,11 +337,6 @@ - - - ============================= - Location - ============================= stock.location.form stock.location @@ -430,9 +415,6 @@ - ============================= - Warehouse - ============================= stock.warehouse stock.warehouse @@ -472,9 +454,6 @@ - ============================== - Wizard to Fill From Unreceived Products - =============================== stock.picking.move.wizard.form stock.picking.move.wizard @@ -504,9 +483,6 @@ - ============================= - Picking - ============================= Split Production Lots stock.split.production.lots @@ -664,20 +640,16 @@ - + - - - + + + - # - # Delivery Orders - # - stock.picking.delivery.tree stock.picking @@ -790,13 +762,13 @@ - + - - - + + + @@ -995,15 +967,17 @@ stock.picking tree - + - + +