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/138] [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 19:30:02 +0200 Subject: [PATCH 095/138] improved task kanban view bzr revid: mit@openerp.com-20120717173002-0m3f3uicefpmcu2l --- addons/project/project_view.xml | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 9e4f3c44a27..a70bc504299 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -517,22 +517,16 @@
- i + í
+
- -
- -
+
-
-
- - - - -
+ +
+ + + + 7 + 7 +
From 005f7a3180f03ee03075cb7e5bb46910a8994644 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Tue, 17 Jul 2012 19:30:27 +0200 Subject: [PATCH 096/138] improved task kanban view bzr revid: mit@openerp.com-20120717173027-tnpri7yd1jclnufs --- addons/web_kanban/static/src/css/kanban.css | 11 +++++++---- addons/web_kanban/static/src/css/kanban.sass | 5 +++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 868fa9783fd..36dbab57559 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -402,16 +402,19 @@ top: 2px; } .openerp .oe_kanban_view .oe_kanban_status { + position: relative; + top: 4px; display: inline-block; height: 12px; width: 12px; - margin: 4px auto; -moz-border-radius: 6px; -webkit-border-radius: 6px; border-radius: 6px; - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6); - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6); - -box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6); + background-position: center center; + background-image: -webkit-radial-gradient(circle, #eeeeee 0%, #cccccc 40%, #bbbbbb 100%); + background-image: -moz-radial-gradient(#eeeeee 0%, #cccccc 40%, #bbbbbb 100%); + background-image: -ms-radial-gradient(#eeeeee 0%, #cccccc 40%, #bbbbbb 100%); + background-image: radial-gradient(#eeeeee 0%, #cccccc 40%, #bbbbbb 100%); } .openerp .oe_kanban_view .oe_kanban_status_green { background: green; diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index fb5bdc9dcbb..f4c13cc7bd2 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -338,12 +338,13 @@ top: 2px .oe_kanban_status + position: relative + top: 4px display: inline-block height: 12px width: 12px - margin: 4px auto @include radius(6px) - @include box-shadow(0 1px 3px rgba(0,0,0,0.6)) + @include radial-gradient((#eee 0%, #ccc 40%, #bbb 100%)) .oe_kanban_status_green background: green @include radial-gradient((#55dd55 0%, #44aa44 40%, #339933 100%)) From afd02c77dc20cfcbfe23c5d8edeeb1c6f11dbb75 Mon Sep 17 00:00:00 2001 From: "Atul Patel (OpenERP)" Date: Wed, 18 Jul 2012 12:24:44 +0530 Subject: [PATCH 097/138] [FIX]: Payment_rate_Currency_id field in account_voucher bzr revid: atp@tinyerp.com-20120718065444-d13waj4x9x0quin3 --- addons/account_voucher/account_voucher_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml index 09fe0d23842..552e2e5a1f0 100644 --- a/addons/account_voucher/account_voucher_view.xml +++ b/addons/account_voucher/account_voucher_view.xml @@ -52,6 +52,7 @@ + From c11281fddd42101951980250022d5329771cfa77 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Wed, 18 Jul 2012 12:11:17 +0200 Subject: [PATCH 098/138] [FIX] l10n_be_invoice_bba: fixed the algorithm missing argument correctly bzr revid: qdp-launchpad@openerp.com-20120718101117-oekq03q72j90avp0 --- addons/l10n_be_invoice_bba/account_invoice_view.xml | 3 +-- addons/l10n_be_invoice_bba/invoice.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/l10n_be_invoice_bba/account_invoice_view.xml b/addons/l10n_be_invoice_bba/account_invoice_view.xml index 2d3ebbd4cd2..924cc0fcd48 100644 --- a/addons/l10n_be_invoice_bba/account_invoice_view.xml +++ b/addons/l10n_be_invoice_bba/account_invoice_view.xml @@ -11,9 +11,8 @@ - + on_change="generate_bbacomm(type,reference_type, partner_id.out_inv_comm_algorithm, partner_id,reference)" colspan="1"/> diff --git a/addons/l10n_be_invoice_bba/invoice.py b/addons/l10n_be_invoice_bba/invoice.py index 0cf55e5be64..93f9f22b1fa 100644 --- a/addons/l10n_be_invoice_bba/invoice.py +++ b/addons/l10n_be_invoice_bba/invoice.py @@ -85,7 +85,7 @@ class account_invoice(osv.osv): } result['value'].update(res_update) return result -#algorithm is not defined as field in any account related modules.so pass it as false argument. + def generate_bbacomm(self, cr, uid, ids, type, reference_type, algorithm, partner_id, reference): partner_obj = self.pool.get('res.partner') reference = reference or '' From e4c1ca04a11db2da818cbec650b241f6febbc674 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Wed, 18 Jul 2012 12:13:39 +0200 Subject: [PATCH 099/138] [FIX] account: date_stop is required on account.period, there is no need to check if it's filled\! bzr revid: qdp-launchpad@openerp.com-20120718101339-qe7sfe5ql370fn8j --- addons/account/account_view.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index e1cf268115b..8ed796eebd7 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -107,10 +107,9 @@ - From 0f74f43fdf3372adc582f559a9dc787402371f12 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Wed, 18 Jul 2012 12:15:07 +0200 Subject: [PATCH 100/138] [FIX] account: bad merge had duplicated some fields\! bzr revid: qdp-launchpad@openerp.com-20120718101507-lj66v0k3lm2tt5av --- addons/account/account_view.xml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 8ed796eebd7..0172fa7429a 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -627,13 +627,8 @@
- - + @@ -1441,7 +1435,7 @@ - + From 87d0d213ea061e90f041993eea5bec138763f808 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Wed, 18 Jul 2012 12:16:26 +0200 Subject: [PATCH 101/138] [FIX] account: bad parameters during string formatting\!\!\! bzr revid: qdp-launchpad@openerp.com-20120718101626-4h0z8qyq8mx1jg5h --- addons/account/wizard/account_move_journal.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py index 5986bfc3bd3..66f634bd59f 100644 --- a/addons/account/wizard/account_move_journal.py +++ b/addons/account/wizard/account_move_journal.py @@ -115,7 +115,7 @@ class account_move_journal(osv.osv_memory): or From 803220f3b7c893824cecb09763155a99436a1524 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Wed, 18 Jul 2012 12:21:09 +0200 Subject: [PATCH 108/138] [IMP] account: usability, review of form views bzr revid: qdp-launchpad@openerp.com-20120718102109-prtl3sb28xehgnlh --- addons/account/account_view.xml | 7 ++++--- addons/account/wizard/account_chart_view.xml | 5 ++--- addons/account/wizard/account_report_common_view.xml | 2 +- addons/account/wizard/account_use_model_view.xml | 4 ++-- addons/account_voucher/account_voucher_view.xml | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 0172fa7429a..ecdcdaf4924 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -2603,20 +2603,21 @@ action = pool.get('res.config').next(cr, uid, [], context)
+
+
+ + - - + @@ -116,20 +116,20 @@ + + - - - - -