From de90ef25dc393dc19d4b32e97f2e64b1cfeb8db4 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Fri, 22 Jun 2012 17:33:53 +0530 Subject: [PATCH 001/158] [IMP]Manufacturing orders view change bzr revid: kjo@tinyerp.com-20120622120353-poglhhjdz17vbegi --- addons/mrp/mrp.py | 8 ++-- addons/mrp/mrp_view.xml | 40 +++++++++++-------- addons/mrp_operations/mrp_operations_view.xml | 4 +- addons/sale_mrp/sale_mrp.py | 4 +- addons/sale_mrp/sale_mrp_view.xml | 6 ++- 5 files changed, 35 insertions(+), 27 deletions(-) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 3214cad5a5c..e22bc286e0a 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -472,9 +472,9 @@ class mrp_production(osv.osv): 'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)], readonly=True, states={'draft':[('readonly',False)]}), 'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', readonly=True, states={'draft':[('readonly',False)]}, help="The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production plannification."), - 'picking_id': fields.many2one('stock.picking', 'Picking list', readonly=True, ondelete="restrict", + 'picking_id': fields.many2one('stock.picking', 'Picking List', readonly=True, ondelete="restrict", help="This is the Internal Picking List that brings the finished product to the production plan"), - 'move_prod_id': fields.many2one('stock.move', 'Move product', readonly=True), + 'move_prod_id': fields.many2one('stock.move', 'Product Move', readonly=True), 'move_lines': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Products to Consume', domain=[('state','not in', ('done', 'cancel'))], states={'done':[('readonly',True)]}), 'move_lines2': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Consumed Products', domain=[('state','in', ('done', 'cancel'))]), 'move_created_ids': fields.one2many('stock.move', 'production_id', 'Products to Produce', domain=[('state','not in', ('done', 'cancel'))], states={'done':[('readonly',True)]}), @@ -1112,9 +1112,9 @@ class mrp_production_product_line(osv.osv): _columns = { 'name': fields.char('Name', size=64, required=True), 'product_id': fields.many2one('product.product', 'Product', required=True), - 'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product Unit of Measure'), required=True), + 'product_qty': fields.float('Product Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True), 'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True), - 'product_uos_qty': fields.float('Product UOS Qty'), + 'product_uos_qty': fields.float('Product UOS Quantity'), 'product_uos': fields.many2one('product.uom', 'Product UOS'), 'production_id': fields.many2one('mrp.production', 'Production Order', select=True), } diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 8559a679beb..456cd5cbed8 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -642,17 +642,19 @@ + + + - - - + + - + @@ -671,10 +673,11 @@ states="draft,waiting,confirmed,assigned"/> + - + @@ -686,14 +689,13 @@ states="done,cancel"/> - - - + + - + + /
Date: Tue, 17 Jul 2012 17:55:39 +0200 Subject: [PATCH 100/158] [FIX] web_dashboard: allow columns without actions bzr revid: chs@openerp.com-20120717155539-dludvgbvhzfpsx83 --- addons/web_dashboard/static/src/js/dashboard.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index 0754bfd7e2b..a19151af33c 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -37,11 +37,12 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ delete(action.attrs.width); delete(action.attrs.height); delete(action.attrs.colspan); - self.rpc('/web/action/load', { - action_id: parseInt(action.attrs.name, 10) - }, function(result) { - self.on_load_action(result, column_index + '_' + action_index, action.attrs); - }); + var action_id = _.str.toNumber(action.attrs.name); + if (!_.isNaN(action_id)) { + self.rpc('/web/action/load', {action_id: action_id}, function(result) { + self.on_load_action(result, column_index + '_' + action_index, action.attrs); + }); + } }); }); }, From c1d7f61d1fef37609179edee3d5e0374c9f25ca7 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Tue, 17 Jul 2012 17:56:11 +0200 Subject: [PATCH 101/158] [FIX] web_dashboard: generate a valid view bzr revid: chs@openerp.com-20120717155611-ns8w0u1u0niq1q30 --- addons/web_dashboard/static/src/xml/web_dashboard.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_dashboard/static/src/xml/web_dashboard.xml b/addons/web_dashboard/static/src/xml/web_dashboard.xml index 5ca2551255c..68dda7d7f67 100644 --- a/addons/web_dashboard/static/src/xml/web_dashboard.xml +++ b/addons/web_dashboard/static/src/xml/web_dashboard.xml @@ -48,7 +48,7 @@
-
+ From 2b59d63699aea495dfb747a3b90b527db2f81409 Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Tue, 17 Jul 2012 18:25:28 +0200 Subject: [PATCH 102/158] [IMP] give higher sequence numbers (with wider gaps) to top menu items it should now be easier to insert new elements wherever we want in the main menu bzr revid: abo@openerp.com-20120717162528-0kkk32mjeoyda9c4 --- addons/account/account_menuitem.xml | 2 +- addons/base_tools/tools_view.xml | 4 ++- addons/event/event_view.xml | 33 ++++++++++---------- addons/hr/hr_view.xml | 14 ++++----- addons/knowledge/knowledge_view.xml | 2 +- addons/mail/mail_thread_view.xml | 4 +-- addons/marketing/marketing_view.xml | 5 ++- addons/membership/membership_view.xml | 8 ++--- addons/mrp/mrp_view.xml | 6 ++-- addons/point_of_sale/point_of_sale_view.xml | 34 ++++++++++++--------- addons/project/project_view.xml | 15 ++++----- addons/purchase/purchase_view.xml | 4 +-- addons/sale/sale_view.xml | 4 +-- addons/stock/stock_view.xml | 12 ++++---- addons/survey/survey_view.xml | 24 ++++++++------- 15 files changed, 90 insertions(+), 81 deletions(-) diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml index c2275c0e461..401f77c9f94 100644 --- a/addons/account/account_menuitem.xml +++ b/addons/account/account_menuitem.xml @@ -2,7 +2,7 @@ - diff --git a/addons/base_tools/tools_view.xml b/addons/base_tools/tools_view.xml index eb51e000c1b..0541e452620 100644 --- a/addons/base_tools/tools_view.xml +++ b/addons/base_tools/tools_view.xml @@ -1,9 +1,11 @@ + + diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 1b1b5daa9a9..11e2322a0d8 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -1,7 +1,7 @@ - - - - + + - + + + Event type event.type @@ -52,7 +53,7 @@ - + @@ -111,7 +112,7 @@
+

From to

@@ -151,7 +152,7 @@ - + @@ -222,7 +223,7 @@ - + event.event.kanban event.event kanban @@ -286,7 +287,7 @@ - + event.event.calendar @@ -316,7 +317,7 @@ - + Events @@ -362,7 +363,7 @@ - + Events ir.actions.act_window event.event @@ -371,9 +372,9 @@ {"search_default_upcoming":1} Event is the low level object used by meeting and others documents that should be synchronized with mobile devices or calendar applications through caldav. Most of the users should work in the Calendar menu, and not in the list of events. - + - - + - + diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 54ced534880..6e798449fba 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -2,7 +2,7 @@ - @@ -20,7 +20,7 @@ - +
- + @@ -748,10 +749,15 @@ pos.ui + - Point of Sale - - + Point of Sale + 160 + @@ -842,12 +848,12 @@ - + domain="[('config_id', '=', active_id)]" /> Point of Sales @@ -864,8 +870,8 @@ id="menu_pos_config_pos" groups="group_pos_manager"/> - pos.session form - +
-
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index e7420edb910..c1a8ea22d8b 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -1,6 +1,6 @@ - + @@ -197,7 +197,7 @@ diff --git a/addons/sale/wizard/sale_make_invoice.py b/addons/sale/wizard/sale_make_invoice.py index 5265afb9bff..b4b3772a91a 100644 --- a/addons/sale/wizard/sale_make_invoice.py +++ b/addons/sale/wizard/sale_make_invoice.py @@ -68,4 +68,4 @@ class sale_make_invoice(osv.osv_memory): sale_make_invoice() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 5510ee74b2f97959d129aa4e45933bd65bd42981 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Wed, 18 Jul 2012 16:11:12 +0200 Subject: [PATCH 139/158] [IMP] sale: in customer form, move action 'Quotations and Sales' from contextual menu to button bzr revid: rco@openerp.com-20120718141112-tdw4vb1c2am6rwl3 --- addons/sale/res_partner_view.xml | 34 +++++++++++++++++++++++++++++++- addons/sale/sale_view.xml | 8 -------- 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml index bb5695eac39..9c557620e75 100644 --- a/addons/sale/res_partner_view.xml +++ b/addons/sale/res_partner_view.xml @@ -1,7 +1,24 @@ - + + Quotations and Sales + sale.order + form + tree,form,graph + {'search_default_partner_id': active_id} + + + This customer has no quotation or sale order. + Click here to create a new quotation. + <p> + The "Quotation" is the first step of the Sales flow. Manage your sales from quotation to invoice. + <p> + You will be able to sell products (manage deliveries) as well as services (create projects). + + + + res.partner.kanban.saleorder.inherit res.partner @@ -18,6 +35,21 @@ + + + res.partner.view.buttons + res.partner + form + + + +