From 5d5ab9c9f99a3dd80401bd850de82ad3aaa6ebca Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Mon, 11 Jun 2012 17:49:40 +0530 Subject: [PATCH 01/31] [FIX]stock : add value to the field year & month bzr revid: cha@tinyerp.com-20120611121940-ynw03liych1gj2df --- addons/stock/report/report_stock_move.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py index afd6bd4d1f4..894d82534a2 100644 --- a/addons/stock/report/report_stock_move.py +++ b/addons/stock/report/report_stock_move.py @@ -153,7 +153,7 @@ class report_stock_inventory(osv.osv): 'date': fields.datetime('Date', readonly=True), 'year': fields.char('Year', size=4, readonly=True), 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), - ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September')]), + ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September')],'Month'), 'partner_id':fields.many2one('res.partner', 'Partner', readonly=True), 'product_id':fields.many2one('product.product', 'Product', readonly=True), 'product_categ_id':fields.many2one('product.category', 'Product Category', readonly=True), @@ -173,6 +173,8 @@ class report_stock_inventory(osv.osv): CREATE OR REPLACE view report_stock_inventory AS ( (SELECT min(m.id) as id, m.date as date, + to_char(m.date, 'YYYY') as year, + to_char(m.date, 'MM') as month, m.partner_id as partner_id, m.location_id as location_id, m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type, m.company_id, @@ -195,6 +197,8 @@ CREATE OR REPLACE view report_stock_inventory AS ( ) UNION ALL ( SELECT -m.id as id, m.date as date, + to_char(m.date, 'YYYY') as year, + to_char(m.date, 'MM') as month, m.partner_id as partner_id, m.location_dest_id as location_id, m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type, m.company_id, From 449e9ee6fa629a66baeb2473c92bfdde3d3ad826 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Thu, 21 Jun 2012 12:08:00 +0530 Subject: [PATCH 02/31] [FIX]Journal entry for rule which is not in payslip lines is created. bzr revid: kbh@tinyerp.com-20120621063800-0nhf399uaf1nbdmw --- addons/hr_payroll_account/hr_payroll_account.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py index a022cac05b1..cfd35c7ea2b 100644 --- a/addons/hr_payroll_account/hr_payroll_account.py +++ b/addons/hr_payroll_account/hr_payroll_account.py @@ -107,7 +107,7 @@ class hr_payslip(osv.osv): 'journal_id': slip.journal_id.id, 'period_id': period_id, } - for line in slip.line_ids: + for line in slip.details_by_salary_rule_category: amt = slip.credit_note and -line.total or line.total partner_id = False debit_account_id = line.salary_rule_id.account_debit.id From 56150b1aef230cd7a7fb4cd8f44dd8884934d716 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Fri, 22 Jun 2012 17:02:37 +0530 Subject: [PATCH 03/31] [FIX] Purchase: set value for field expected_date in purchase.order lp bug: https://launchpad.net/bugs/1016372 fixed bzr revid: cha@tinyerp.com-20120622113237-88laaa8603jr0k73 --- addons/purchase/report/purchase_report.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py index f7d73bfb739..ec8f7d5cba5 100644 --- a/addons/purchase/report/purchase_report.py +++ b/addons/purchase/report/purchase_report.py @@ -79,7 +79,7 @@ class purchase_report(osv.osv): to_char(s.date_order, 'YYYY-MM-DD') as day, s.state, s.date_approve, - date_trunc('day',s.minimum_planned_date) as expected_date, + s.minimum_planned_date as expected_date, s.dest_address_id, s.pricelist_id, s.validator, @@ -118,7 +118,7 @@ class purchase_report(osv.osv): s.date_approve, l.date_planned, l.product_uom, - date_trunc('day',s.minimum_planned_date), + s.minimum_planned_date, s.pricelist_id, s.validator, s.dest_address_id, From 9c54520f3669262490223f5c1ce68b136ff65e36 Mon Sep 17 00:00:00 2001 From: "Pinakin Nayi (OpenERP)" Date: Wed, 4 Jul 2012 14:46:13 +0530 Subject: [PATCH 04/31] [IMP]server-log-warning bzr revid: pna@tinyerp.com-20120704091613-i7vxzgq8hgmv20s5 --- addons/l10n_uk/demo/demo.xml | 4 ++-- addons/mail/mail_thread.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/addons/l10n_uk/demo/demo.xml b/addons/l10n_uk/demo/demo.xml index 1184828df50..f1d5088c825 100644 --- a/addons/l10n_uk/demo/demo.xml +++ b/addons/l10n_uk/demo/demo.xml @@ -1,6 +1,6 @@ - + UK OpenERP Partner smartmode http://www.smartmode.co.uk @@ -12,7 +12,7 @@ Vadim Chobanu HA4 7JW Ruislip - + vadim@smartmode.co.uk +44 (0) 8456434548 diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index 5668709af17..3d65f1313a6 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -202,7 +202,6 @@ class mail_thread(osv.Model): def message_create_get_notification_user_ids(self, cr, uid, thread_ids, new_msg_vals, context=None): if context is None: context = {} - notif_user_ids = [] body = new_msg_vals.get('body_html', '') if new_msg_vals.get('subtype', 'plain') == 'html' else new_msg_vals.get('body_text', '') for thread_id in thread_ids: @@ -880,7 +879,7 @@ class mail_thread(osv.Model): """ When creating a new message, set as unread if uid is not the object responsible. """ for obj in self.browse(cr, uid, ids, context=context): - if obj.message_state and hasattr(obj, 'user_id') and (not obj.user_id or obj.user_id.id != uid): + if obj.message_state and ('user_id' in obj._columns.keys()) and (not obj.user_id or obj.user_id.id != uid) : self.message_mark_as_unread(cr, uid, [obj.id], context=context) def message_check_and_set_unread(self, cr, uid, ids, context=None): From afa84101cf25b9439cae3688bb5a9ceee7ae9a48 Mon Sep 17 00:00:00 2001 From: "Bharat Devnani (OpenERP)" Date: Tue, 14 Aug 2012 14:16:40 +0530 Subject: [PATCH 05/31] [REM] removed done button from Order Lines to Invoice bzr revid: bde@tinyerp.com-20120814084640-6b25ehh0s29giwsn --- addons/sale/sale.py | 7 ------- addons/sale/sale_view.xml | 3 +-- addons/sale/wizard/sale_line_invoice.py | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 722b22ba602..68b17149917 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -1260,13 +1260,6 @@ class sale_order_line(osv.osv): def button_confirm(self, cr, uid, ids, context=None): return self.write(cr, uid, ids, {'state': 'confirmed'}) - def button_done(self, cr, uid, ids, context=None): - wf_service = netsvc.LocalService("workflow") - res = self.write(cr, uid, ids, {'state': 'done'}) - for line in self.browse(cr, uid, ids, context=context): - wf_service.trg_write(uid, 'sale.order', line.order_id.id, cr) - return res - def uos_change(self, cr, uid, ids, product_uos, product_uos_qty=0, product_id=None): product_obj = self.pool.get('product.product') if not product_id: diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 2257240dd10..cf49c154827 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -508,8 +508,7 @@
diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py index 613b07039d5..e5b81fb5bc4 100644 --- a/addons/sale/wizard/sale_line_invoice.py +++ b/addons/sale/wizard/sale_line_invoice.py @@ -89,7 +89,7 @@ class sale_order_line_make_invoice(osv.osv_memory): for lid in line_id: invoices[line.order_id.id].append((line, lid)) sales_order_line_obj.write(cr, uid, [line.id], - {'invoiced': True}) + {'invoiced': True, 'state': 'done'}) for result in invoices.values(): order = result[0][0].order_id il = map(lambda x: x[1], result) From 2d8559b6266b2873199a534c0aeccf7d8a436712 Mon Sep 17 00:00:00 2001 From: Alexandre <> Date: Tue, 14 Aug 2012 18:42:11 +0530 Subject: [PATCH 06/31] [FIX] product : Fixes the impossible to get a seller delay of 0 lp bug: https://launchpad.net/bugs/1034799 fixed bzr revid: amb@tinyerp.com-20120814131211-b385ixr3z75hfjpe --- addons/product/product.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/product/product.py b/addons/product/product.py index 2a62d9c2531..b81ff6c78b4 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -484,7 +484,7 @@ class product_product(osv.osv): main_supplier = self._get_main_product_supplier(cr, uid, product, context=context) result[product.id] = { 'seller_info_id': main_supplier and main_supplier.id or False, - 'seller_delay': main_supplier and main_supplier.delay or 1, + 'seller_delay': main_supplier.delay if main_supplier else 1, 'seller_qty': main_supplier and main_supplier.qty or 0.0, 'seller_id': main_supplier and main_supplier.name.id or False } From dd0376920ad9a453ebfd59ce08537ec60a863dc0 Mon Sep 17 00:00:00 2001 From: "Bharat Devnani (OpenERP)" Date: Fri, 17 Aug 2012 13:01:41 +0530 Subject: [PATCH 07/31] [IMP] improved the ordering of buttons on Interview Requests form of hr_evaluation module bzr revid: bde@tinyerp.com-20120817073141-0j19yflcdeej84ln --- addons/hr_evaluation/hr_evaluation_view.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml index 47b0c323622..12c5dc0af6d 100644 --- a/addons/hr_evaluation/hr_evaluation_view.xml +++ b/addons/hr_evaluation/hr_evaluation_view.xml @@ -267,16 +267,16 @@
-
-
From 4d4678014aa3cbb0e8c5215890df5accf1ec5572 Mon Sep 17 00:00:00 2001 From: "Amit (OpenERP)" Date: Mon, 20 Aug 2012 11:56:41 +0530 Subject: [PATCH 08/31] [FIX] crm : Fixes the on_chnage partner method lp bug: https://launchpad.net/bugs/1038173 fixed bzr revid: amp@tinyerp.com-20120820062641-jxnrfk8ecz0avev7 --- addons/crm/crm_lead.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 146417a7abb..f83bdb626f5 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -291,16 +291,17 @@ class crm_lead(base_stage, osv.osv): def on_change_partner(self, cr, uid, ids, partner_id, context=None): result = {} + values={} if partner_id: partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context) - values = { + values = values.update({ 'partner_name' : partner.name, 'street' : partner.street, 'street2' : partner.street2, 'city' : partner.city, 'state_id' : partner.state_id and partner.state_id.id or False, 'country_id' : partner.country_id and partner.country_id.id or False, - } + }) return {'value' : values} From 25917cf9b1a28a9915a1b4c633ba2c7695b99d34 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Tue, 21 Aug 2012 13:10:51 +0530 Subject: [PATCH 09/31] [IMP] stock: add remaining months in selection of month and add group by month & year in search bzr revid: cha@tinyerp.com-20120821074051-vz24ihn7d9u87usb --- addons/stock/report/report_stock_move.py | 7 ++++--- addons/stock/report/report_stock_move_view.xml | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py index 894d82534a2..aeb34d4265e 100644 --- a/addons/stock/report/report_stock_move.py +++ b/addons/stock/report/report_stock_move.py @@ -153,7 +153,8 @@ class report_stock_inventory(osv.osv): 'date': fields.datetime('Date', readonly=True), 'year': fields.char('Year', size=4, readonly=True), 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), - ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September')],'Month'), + ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), + ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True), 'partner_id':fields.many2one('res.partner', 'Partner', readonly=True), 'product_id':fields.many2one('product.product', 'Product', readonly=True), 'product_categ_id':fields.many2one('product.category', 'Product Category', readonly=True), @@ -193,7 +194,7 @@ CREATE OR REPLACE view report_stock_inventory AS ( LEFT JOIN stock_location l ON (m.location_id=l.id) GROUP BY m.id, m.product_id, m.product_uom, pt.categ_id, m.partner_id, m.location_id, m.location_dest_id, - m.prodlot_id, m.date, m.state, l.usage, m.company_id, pt.uom_id + m.prodlot_id, m.date, m.state, l.usage, m.company_id, pt.uom_id, to_char(m.date, 'YYYY'), to_char(m.date, 'MM') ) UNION ALL ( SELECT -m.id as id, m.date as date, @@ -216,7 +217,7 @@ CREATE OR REPLACE view report_stock_inventory AS ( LEFT JOIN stock_location l ON (m.location_dest_id=l.id) GROUP BY m.id, m.product_id, m.product_uom, pt.categ_id, m.partner_id, m.location_id, m.location_dest_id, - m.prodlot_id, m.date, m.state, l.usage, m.company_id, pt.uom_id + m.prodlot_id, m.date, m.state, l.usage, m.company_id, pt.uom_id, to_char(m.date, 'YYYY'), to_char(m.date, 'MM') ) ); """) diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml index a0227788d97..e95cb9e0e42 100644 --- a/addons/stock/report/report_stock_move_view.xml +++ b/addons/stock/report/report_stock_move_view.xml @@ -163,8 +163,10 @@ - + + + From b2af1abc5e380263244e1ec60fe091b69cb96f64 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Tue, 21 Aug 2012 14:17:22 +0530 Subject: [PATCH 10/31] [IMP] stock: remove unwanted code bzr revid: cha@tinyerp.com-20120821084722-9aml07fk8fs2lxd6 --- addons/stock/report/report_stock_move_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml index e95cb9e0e42..a78a506cefe 100644 --- a/addons/stock/report/report_stock_move_view.xml +++ b/addons/stock/report/report_stock_move_view.xml @@ -165,8 +165,8 @@ - - + + From a69baa4d9c211f802621713c079e472cde811e4a Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Wed, 22 Aug 2012 18:58:05 +0530 Subject: [PATCH 11/31] [IMP]header as input box. bzr revid: vme@tinyerp.com-20120822132805-nmesgyvh29m5gnr9 --- addons/board/static/src/css/dashboard.css | 7 +++++ addons/board/static/src/css/dashboard.sass | 5 ++++ addons/board/static/src/js/dashboard.js | 31 ++++++++++++++++++++-- addons/board/static/src/xml/board.xml | 4 ++- 4 files changed, 44 insertions(+), 3 deletions(-) diff --git a/addons/board/static/src/css/dashboard.css b/addons/board/static/src/css/dashboard.css index f3d300add2e..6907b4271a0 100644 --- a/addons/board/static/src/css/dashboard.css +++ b/addons/board/static/src/css/dashboard.css @@ -50,6 +50,13 @@ content: "+"; margin-left: 4px; } +.openerp .oe_dashboard .oe_action .oe_header .oe_header_text { + visibility: hidden; + cursor: text; +} +.openerp .oe_dashboard .oe_action .oe_header span { + cursor: pointer; +} .openerp .oe_dashboard .oe_action .oe_header_empty { padding-top: 0; padding-bottom: 2px; diff --git a/addons/board/static/src/css/dashboard.sass b/addons/board/static/src/css/dashboard.sass index dd4d144e918..4bacc7bd892 100644 --- a/addons/board/static/src/css/dashboard.sass +++ b/addons/board/static/src/css/dashboard.sass @@ -49,6 +49,11 @@ .oe_maximize:after content: "+" margin-left: 4px + .oe_header_text + visibility: hidden + cursor: text + span + cursor: pointer .oe_header_empty padding-top: 0 padding-bottom: 2px diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js index b9df81bf868..02f6afba442 100644 --- a/addons/board/static/src/js/dashboard.js +++ b/addons/board/static/src/js/dashboard.js @@ -22,12 +22,15 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ connectWith: '.oe_dashboard_column', handle: '.oe_header', scroll: false - }).disableSelection().bind('sortstop', self.do_save_dashboard); + }).bind('sortstop', self.do_save_dashboard); // Events this.$element.find('.oe_dashboard_link_reset').click(this.on_reset); this.$element.find('.oe_dashboard_link_change_layout').click(this.on_change_layout); - + this.$element.find('h2.oe_header span:first').click(function(ev){ + if(ev.target === ev.currentTarget) + self.on_header_string($(ev.target).parent()); + }); this.$element.delegate('.oe_dashboard_column .oe_fold', 'click', this.on_fold_action); this.$element.delegate('.oe_dashboard_column .oe_close', 'click', this.on_close_action); @@ -46,6 +49,30 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ }); }); }, + on_header_string:function(h2){ + var self = this; + var span = h2.find('span:first').hide(); + var input = h2.find('.oe_header_text').css('visibility','visible'); + var attr = h2.closest(".oe_action").data('action_attrs'); + var change_string = function(new_name){ + attr['string'] = new_name; + span.text(new_name).show(); + input.css('visibility','hidden'); + self.do_save_dashboard(); + } + input.unbind() + .val(span.text()) + .change(function(event){ + change_string($(this).val()); + }) + .keyup(function(event){ + if(event.keyCode == 27){ + //esc key to cancel changes + input.css('visibility','hidden'); + span.show(); + } + }); + }, on_reset: function() { this.rpc('/web/view/undo_custom', { view_id: this.view.fields_view.view_id, diff --git a/addons/board/static/src/xml/board.xml b/addons/board/static/src/xml/board.xml index 13d81d11f8d..caa20ce8a3f 100644 --- a/addons/board/static/src/xml/board.xml +++ b/addons/board/static/src/xml/board.xml @@ -23,13 +23,15 @@

- + + &nbsp;

+
From 5d0b45b95846e3793136b4e60a0f077ce1561582 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Wed, 22 Aug 2012 19:12:49 +0530 Subject: [PATCH 12/31] [FIX]get all span text of header. bzr revid: vme@tinyerp.com-20120822134249-e398qom83ur322ub --- addons/board/static/src/js/dashboard.js | 2 +- addons/board/static/src/xml/board.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js index 02f6afba442..c1561ac6e16 100644 --- a/addons/board/static/src/js/dashboard.js +++ b/addons/board/static/src/js/dashboard.js @@ -27,7 +27,7 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ // Events this.$element.find('.oe_dashboard_link_reset').click(this.on_reset); this.$element.find('.oe_dashboard_link_change_layout').click(this.on_change_layout); - this.$element.find('h2.oe_header span:first').click(function(ev){ + this.$element.find('h2.oe_header span.oe_header_txt').click(function(ev){ if(ev.target === ev.currentTarget) self.on_header_string($(ev.target).parent()); }); diff --git a/addons/board/static/src/xml/board.xml b/addons/board/static/src/xml/board.xml index caa20ce8a3f..63abebf4bc6 100644 --- a/addons/board/static/src/xml/board.xml +++ b/addons/board/static/src/xml/board.xml @@ -23,7 +23,7 @@

- + &nbsp; From 60d23d96cd4f798e90dfcac99867a3fa241a1268 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Wed, 22 Aug 2012 19:14:30 +0530 Subject: [PATCH 13/31] [FIX] remove . bzr revid: vme@tinyerp.com-20120822134430-5493lvfv98c3lhy6 --- addons/board/static/src/xml/board.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/board/static/src/xml/board.xml b/addons/board/static/src/xml/board.xml index 63abebf4bc6..b2363cafd53 100644 --- a/addons/board/static/src/xml/board.xml +++ b/addons/board/static/src/xml/board.xml @@ -23,7 +23,7 @@

- + &nbsp; From cece6655af45886898f10a85154df060b9ef30b5 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Thu, 23 Aug 2012 11:40:22 +0530 Subject: [PATCH 14/31] [IMP]make changes in ir act window's name. bzr revid: vme@tinyerp.com-20120823061022-fti5xixis5ffak1k --- addons/board/static/src/js/dashboard.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js index c1561ac6e16..54fda76e2b4 100644 --- a/addons/board/static/src/js/dashboard.js +++ b/addons/board/static/src/js/dashboard.js @@ -54,11 +54,17 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ var span = h2.find('span:first').hide(); var input = h2.find('.oe_header_text').css('visibility','visible'); var attr = h2.closest(".oe_action").data('action_attrs'); + var ir_act_window = new instance.web.Model("ir.actions.act_window"); var change_string = function(new_name){ attr['string'] = new_name; - span.text(new_name).show(); - input.css('visibility','hidden'); - self.do_save_dashboard(); + ir_act_window.call("write",[[parseInt(attr['name'])],{'name':new_name}]) + .done(function(res){ + if(!res)return; + span.text(new_name).show(); + input.css('visibility','hidden'); + self.do_save_dashboard(); + }) + } input.unbind() .val(span.text()) From 77bbe04bfc88b1500d6fdd2f81f8defef8471bcc Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Thu, 23 Aug 2012 12:50:10 +0530 Subject: [PATCH 15/31] [REV] Revert last changes. bzr revid: jra@tinyerp.com-20120823072010-wsx6sgy02luxa2wo --- addons/board/static/src/js/dashboard.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js index 54fda76e2b4..c1561ac6e16 100644 --- a/addons/board/static/src/js/dashboard.js +++ b/addons/board/static/src/js/dashboard.js @@ -54,17 +54,11 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ var span = h2.find('span:first').hide(); var input = h2.find('.oe_header_text').css('visibility','visible'); var attr = h2.closest(".oe_action").data('action_attrs'); - var ir_act_window = new instance.web.Model("ir.actions.act_window"); var change_string = function(new_name){ attr['string'] = new_name; - ir_act_window.call("write",[[parseInt(attr['name'])],{'name':new_name}]) - .done(function(res){ - if(!res)return; - span.text(new_name).show(); - input.css('visibility','hidden'); - self.do_save_dashboard(); - }) - + span.text(new_name).show(); + input.css('visibility','hidden'); + self.do_save_dashboard(); } input.unbind() .val(span.text()) From 7fe9ca1ed6d8017b4fb0cdb6b50fe15b0ae5aaef Mon Sep 17 00:00:00 2001 From: "Bharat Devnani(OpenERP)" <> Date: Thu, 23 Aug 2012 14:21:30 +0530 Subject: [PATCH 16/31] [IMP] Added label for sale order line selection on create invoice wizard bzr revid: pso@tinyerp.com-20120823085130-eczt22j1oozyni7v --- addons/sale/wizard/sale_make_invoice_advance.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml index 5bb7d231e94..eceaadc89d0 100644 --- a/addons/sale/wizard/sale_make_invoice_advance.xml +++ b/addons/sale/wizard/sale_make_invoice_advance.xml @@ -23,6 +23,7 @@

+

+
+ +