From 2acec2af84b74ff5d6d67488d3fecdf3e11498f9 Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Wed, 5 Dec 2012 15:36:35 +0530 Subject: [PATCH 01/64] [IMP] Improved leads can be group by country bzr revid: ggh@tinyerp.com-20121205100635-yoqd44rrucp34913 --- addons/crm/crm_lead_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index c552b1835f2..92feeac845c 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -378,6 +378,7 @@ + From 2e36d1073513f29d9bda30e6655f77bf1dcc101f Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Fri, 7 Dec 2012 17:43:41 +0530 Subject: [PATCH 02/64] [IMP]Improved the code for attachment and more button bzr revid: ggh@tinyerp.com-20121207121341-355dcg79vncs7ny0 --- addons/web/static/src/css/base.css | 5 ++++- addons/web/static/src/css/base.sass | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 0a4e2ad322f..d2f413db494 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -652,7 +652,7 @@ cursor: pointer; } .openerp .oe_dropdown_toggle { - color: #4c4c4c; + color: #2b2b2b; font-weight: normal; } .openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened { @@ -1352,6 +1352,9 @@ margin: 0px auto; text-align: center; } +.openerp .oe_view_manager table.oe_view_manager_header .oe_view_manager_sidebar .oe_dropdown_arrow:after { + opacity: 0.9; +} .openerp .oe_view_manager table.oe_view_manager_header td { line-height: 26px; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e1789b0524c..4296e04d745 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -564,7 +564,7 @@ $sheet-padding: 16px position: relative cursor: pointer .oe_dropdown_toggle - color: #4C4C4C + color: #2B2B2B font-weight: normal .oe_dropdown_hover:hover .oe_dropdown_menu, .oe_dropdown_menu.oe_opened display: block @@ -1099,6 +1099,8 @@ $sheet-padding: 16px .oe_view_manager_sidebar margin: 0px auto text-align: center + .oe_dropdown_arrow:after + opacity: 0.9 td line-height: 26px h2 From 2ad6f7e1ea201f35a96b92e2569db6734a6046c6 Mon Sep 17 00:00:00 2001 From: "Hiral Patel (OpenERP)" Date: Tue, 11 Dec 2012 11:52:06 +0530 Subject: [PATCH 03/64] [IMP] Add user_id('Responsible') fiend above 'Type of Event' field bzr revid: hip@tinyerp.com-20121211062206-mf0xu6bwd9albx0i --- addons/event/event_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index efdbf1be3b2..6411c70a612 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -93,6 +93,7 @@ + From bacf6ef1a32af7fcb0ab603e61fb28dab02f3416 Mon Sep 17 00:00:00 2001 From: "RGA(OpenERP)" <> Date: Tue, 11 Dec 2012 16:53:01 +0530 Subject: [PATCH 04/64] [IMP] hr_holidays: Request should stay in To Approve until it's been approved a first time, then it should go to Second Approval bzr revid: rgaopenerp-20121211112301-9w2uly6qus3vywb3 --- addons/hr_holidays/hr_holidays_workflow.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/hr_holidays/hr_holidays_workflow.xml b/addons/hr_holidays/hr_holidays_workflow.xml index a2e1d54f96c..b729ea54a30 100644 --- a/addons/hr_holidays/hr_holidays_workflow.xml +++ b/addons/hr_holidays/hr_holidays_workflow.xml @@ -77,6 +77,7 @@ + validate double_validation From b41bf22384b89b5a798a92721023592abc559212 Mon Sep 17 00:00:00 2001 From: "RGA(OpenERP)" <> Date: Tue, 11 Dec 2012 18:00:17 +0530 Subject: [PATCH 05/64] [IMP] If default filter on task: click on kanban view Tasks, you see the tasks with even for projects that do not contain this task due to default filter dominating bzr revid: rgaopenerp-20121211123017-mon1wi9fcl6cuf57 --- 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 853dac4e20c..5b9645bd203 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -16,7 +16,7 @@ form Tasks kanban,tree,form,calendar,graph - {'search_default_project_id': [active_id], 'default_project_id': active_id} + [('project_id','=',active_id)] From 9909e8c9b15efed58953dddde58d24360bda1332 Mon Sep 17 00:00:00 2001 From: "Anand Patel (OpenERP)" Date: Thu, 13 Dec 2012 16:36:11 +0530 Subject: [PATCH 06/64] [FIX]fixed the issue of fetch emails creates a message but special characters are not well parsed. here if from field contains the special characters then problem occurs bzr revid: pan@tinyerp.com-20121213110611-nw3mi1389lz78mw2 --- addons/mail/mail_thread.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index e706ad66a33..4a3eba1ff95 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -591,7 +591,7 @@ class mail_thread(osv.AbstractModel): if author_ids: msg_dict['author_id'] = author_ids[0] else: - msg_dict['email_from'] = message.get('from') + msg_dict['email_from'] = decode(message.get('from')) partner_ids = self._message_find_partners(cr, uid, message, ['From', 'To', 'Cc'], context=context) msg_dict['partner_ids'] = [(4, partner_id) for partner_id in partner_ids] From ef72f482fbeaa1998a5d857d1081d21b9e759ddd Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Thu, 13 Dec 2012 17:36:57 +0530 Subject: [PATCH 07/64] [IMP]Make validation on payable amount field.In that user can enter only number and a single dot in input box. bzr revid: vme@tinyerp.com-20121213120657-yez2wi7j05lgtziw --- addons/point_of_sale/static/src/js/widgets.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js index 135c00f198d..fb8eead4d86 100644 --- a/addons/point_of_sale/static/src/js/widgets.js +++ b/addons/point_of_sale/static/src/js/widgets.js @@ -308,11 +308,21 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa if (this.amount !== this.payment_line.get_amount()) this.renderElement(); }, + checkAmount:function(e){ + if (e.which !== 0 && e.charCode !== 0) { + if(isNaN(String.fromCharCode(e.charCode))){ + return (String.fromCharCode(e.charCode) === "." && e.currentTarget.value.toString().split(".").length < 2)?true:false; + } + } + return true + }, renderElement: function() { var self = this; this.name = this.payment_line.get_cashregister().get('journal_id')[1]; this._super(); - this.$('input').keyup(_.bind(this.changeAmount, this)); + this.$('input') + .keypress(_.bind(this.checkAmount, this)) + .keyup(_.bind(this.changeAmount, this)); this.$('.delete-payment-line').click(function() { self.trigger('delete_payment_line', self); }); From 72a75850533fb1b8a45130852fef568e2aaff740 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Thu, 13 Dec 2012 18:10:38 +0530 Subject: [PATCH 08/64] [IMP]title don't interpret html tag,now showing html tags value to title. bzr revid: vme@tinyerp.com-20121213124038-03gbycz7kjbksza7 --- addons/web/static/src/js/views.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index c949762a5f6..ad61a716512 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -153,7 +153,8 @@ instance.web.ActionManager = instance.web.Widget.extend({ tit = [tit]; } for (var j = 0; j < tit.length; j += 1) { - var label = _.escape(tit[j]); + var remove_html_tag = String(tit[j]).replace(/<\/?[^>]+>/g, ''); + var label = _.escape(remove_html_tag); if (i === this.breadcrumbs.length - 1 && j === tit.length - 1) { titles.push(_.str.sprintf('%s', label)); } else { From 2b607385a99535486a37bd346f54dc1af583120f Mon Sep 17 00:00:00 2001 From: "RGA(OpenERP)" <> Date: Fri, 14 Dec 2012 16:10:42 +0530 Subject: [PATCH 09/64] [FIX] SO -> with a popup to select a product, if you save & close the popup, its not possible to edit this quantity afterwards because of state field is readonly and it's not save in buffer dataset of o2m field in web bzr revid: rgaopenerp-20121214104042-j8yjcfbiisz2pbu6 --- addons/sale/sale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 8bab265ae3b..030cd873846 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -732,7 +732,7 @@ class sale_order_line(osv.osv): 'product_uos': fields.many2one('product.uom', 'Product UoS'), 'discount': fields.float('Discount (%)', digits_compute= dp.get_precision('Discount'), readonly=True, states={'draft': [('readonly', False)]}), 'th_weight': fields.float('Weight', readonly=True, states={'draft': [('readonly', False)]}), - 'state': fields.selection([('cancel', 'Cancelled'),('draft', 'Draft'),('confirmed', 'Confirmed'),('exception', 'Exception'),('done', 'Done')], 'Status', required=True, readonly=True, + 'state': fields.selection([('cancel', 'Cancelled'),('draft', 'Draft'),('confirmed', 'Confirmed'),('exception', 'Exception'),('done', 'Done')], 'Status', required=True, help='* The \'Draft\' status is set when the related sales order in draft status. \ \n* The \'Confirmed\' status is set when the related sales order is confirmed. \ \n* The \'Exception\' status is set when the related sales order is set as exception. \ From 0a75f29308f1294d169d81b5881fff567b6ba5c1 Mon Sep 17 00:00:00 2001 From: "RGA(OpenERP)" <> Date: Fri, 14 Dec 2012 18:52:18 +0530 Subject: [PATCH 10/64] revert last commit, commited in wronge branch bzr revid: rgaopenerp-20121214132218-a11pf698y1g4yqjj --- addons/sale/sale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 030cd873846..8bab265ae3b 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -732,7 +732,7 @@ class sale_order_line(osv.osv): 'product_uos': fields.many2one('product.uom', 'Product UoS'), 'discount': fields.float('Discount (%)', digits_compute= dp.get_precision('Discount'), readonly=True, states={'draft': [('readonly', False)]}), 'th_weight': fields.float('Weight', readonly=True, states={'draft': [('readonly', False)]}), - 'state': fields.selection([('cancel', 'Cancelled'),('draft', 'Draft'),('confirmed', 'Confirmed'),('exception', 'Exception'),('done', 'Done')], 'Status', required=True, + 'state': fields.selection([('cancel', 'Cancelled'),('draft', 'Draft'),('confirmed', 'Confirmed'),('exception', 'Exception'),('done', 'Done')], 'Status', required=True, readonly=True, help='* The \'Draft\' status is set when the related sales order in draft status. \ \n* The \'Confirmed\' status is set when the related sales order is confirmed. \ \n* The \'Exception\' status is set when the related sales order is set as exception. \ From 95a7300a501655f289739e422639ca863afe59a7 Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Tue, 5 Feb 2013 18:33:47 +0530 Subject: [PATCH 11/64] [IMP]set tag in hr_applicant kanban bzr revid: ggh@tinyerp.com-20130205130347-g0vzm8ektalk3gc5 --- addons/hr_recruitment/hr_recruitment_view.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index f709a224a45..6401ebfd68b 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -235,6 +235,7 @@ +