From b8690e58e9267520313eaf764c00ac34be46409c Mon Sep 17 00:00:00 2001 From: Mohammed Shekha Date: Tue, 19 Mar 2013 12:32:48 +0530 Subject: [PATCH 001/221] [FIX]Fixed the issue of database list retuns blank when there is name with unicode character in postgres, due to this web-client redirects user to create database screen as there is no database comes in response of db_list. bzr revid: msh@openerp.com-20130319070248-57cp7drh0ry0vjz7 --- openerp/service/web_services.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py index ea905d91a4b..9cef2fa762d 100644 --- a/openerp/service/web_services.py +++ b/openerp/service/web_services.py @@ -371,7 +371,7 @@ class db(netsvc.ExportService): cr.execute("select datname from pg_database where datdba=(select usesysid from pg_user where usename=%s) and datname not in %s order by datname", (db_user, templates_list)) else: cr.execute("select datname from pg_database where datname not in %s order by datname", (templates_list,)) - res = [str(name) for (name,) in cr.fetchall()] + res = [tools.ustr(name) for (name,) in cr.fetchall()] except Exception: res = [] finally: From f537a58f4892bd003c44b16165063c171b602fa9 Mon Sep 17 00:00:00 2001 From: "Ravi Gohil (OpenERP)" Date: Wed, 10 Apr 2013 22:31:03 +0530 Subject: [PATCH 002/221] [FIX] l10n_multilang: Translated terms for 'Account Tax' names were created with wrong 'Record ID' value. (Maintenance Case: 589913) bzr revid: rgo@tinyerp.com-20130410170103-bptugu705353akyf --- addons/l10n_multilang/l10n_multilang.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/l10n_multilang/l10n_multilang.py b/addons/l10n_multilang/l10n_multilang.py index 9596b292ff3..615bad8cb68 100644 --- a/addons/l10n_multilang/l10n_multilang.py +++ b/addons/l10n_multilang/l10n_multilang.py @@ -139,7 +139,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): def _process_taxes_translations(self, cr, uid, obj_multi, company_id, langs, field, context=None): obj_tax_template = self.pool.get('account.tax.template') obj_tax = self.pool.get('account.tax') - in_ids = sorted([x.id for x in obj_multi.chart_template_id.tax_template_ids]) + in_ids = [x.id for x in obj_multi.chart_template_id.tax_template_ids] out_ids = obj_tax.search(cr, uid, [('company_id', '=', company_id)], order='id') return self.process_translations(cr, uid, langs, obj_tax_template, field, in_ids, obj_tax, out_ids, force_write=False, context=context) From b8946be24e067d45eda14320fb1a3d0b640cecca Mon Sep 17 00:00:00 2001 From: "Ravish (Open ERP)" Date: Mon, 29 Apr 2013 16:28:59 +0530 Subject: [PATCH 003/221] division by Zero error on product_margin bzr revid: rmu@tinyerp.com-20130429105859-ud19ak4j6df8hdct --- addons/product_margin/product_margin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/product_margin/product_margin.py b/addons/product_margin/product_margin.py index f9187647f35..fe6f133b3e2 100644 --- a/addons/product_margin/product_margin.py +++ b/addons/product_margin/product_margin.py @@ -53,9 +53,9 @@ class product_product(osv.osv): states = ('draft', 'open', 'paid') sqlstr="""select - sum(l.price_unit * l.quantity)/sum(l.quantity) as avg_unit_price, + sum(l.price_unit * l.quantity)/sum(nullif(l.quantity,0)) as avg_unit_price, sum(l.quantity) as num_qty, - sum(l.quantity * (l.price_subtotal/l.quantity)) as total, + sum(l.quantity * (l.price_subtotal/(nullif(l.quantity,0)))) as total, sum(l.quantity * pt.list_price) as sale_expected, sum(l.quantity * pt.standard_price) as normal_cost from account_invoice_line l From 5db1c8333de2daa1f57cf0ea08ba067a9e45ec7a Mon Sep 17 00:00:00 2001 From: "Dhruti Shastri (OpenERP)" Date: Thu, 2 May 2013 17:32:07 +0530 Subject: [PATCH 004/221] [sale]:Invoice/Deliever Address are not fileterd based on selected Customer(partner) (Case:592166) bzr revid: dhs@tinyerp.com-20130502120207-a7he9qqty54h1xaz --- addons/sale/sale.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 2518a801eb2..cf75591be9a 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -207,8 +207,8 @@ class sale_order(osv.osv): 'date_confirm': fields.date('Confirmation Date', readonly=True, select=True, help="Date on which sales order is confirmed."), 'user_id': fields.many2one('res.users', 'Salesperson', states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, select=True, track_visibility='onchange'), 'partner_id': fields.many2one('res.partner', 'Customer', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, required=True, change_default=True, select=True, track_visibility='always'), - 'partner_invoice_id': fields.many2one('res.partner', 'Invoice Address', readonly=True, required=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Invoice address for current sales order."), - 'partner_shipping_id': fields.many2one('res.partner', 'Delivery Address', readonly=True, required=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Delivery address for current sales order."), + 'partner_invoice_id': fields.many2one('res.partner', 'Invoice Address', domain="[('parent_id','=',partner_id)]", readonly=True, required=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Invoice address for current sales order."), + 'partner_shipping_id': fields.many2one('res.partner', 'Delivery Address', domain="[('parent_id','=',partner_id)]", readonly=True, required=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Delivery address for current sales order."), 'order_policy': fields.selection([ ('manual', 'On Demand'), ], 'Create Invoice', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, From c01e2fe122ed1d3d4447b046b8c75a8f30d3567d Mon Sep 17 00:00:00 2001 From: Date: Mon, 20 May 2013 14:31:11 +0530 Subject: [PATCH 005/221] [FIX]ir_property: If we add a property on a many2one field with multicompany the value of main company is replaced in all companies value bzr revid: ado@tinyerp.com-20130520090111-h20jboltev763mj6 --- openerp/osv/fields.py | 78 ++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 41 deletions(-) diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py index 34968a662fb..64275fafca8 100644 --- a/openerp/osv/fields.py +++ b/openerp/osv/fields.py @@ -1380,50 +1380,46 @@ class property(function): return res def _get_by_id(self, obj, cr, uid, prop_name, ids, context=None): - prop = obj.pool.get('ir.property') - vids = [obj._name + ',' + str(oid) for oid in ids] - - domain = [('fields_id.model', '=', obj._name), ('fields_id.name', 'in', prop_name)] - #domain = prop._get_domain(cr, uid, prop_name, obj._name, context) - if vids: - domain = [('res_id', 'in', vids)] + domain - return prop.search(cr, uid, domain, context=context) + property_pool = obj.pool.get('ir.property') + company_pool = obj.pool.get('res.company') + reference = [obj._name + ',' + str(oid) for oid in ids] + def_id = self._field_get(cr, uid, obj._name, prop_name) + company_id = company_pool._company_default_get(cr, uid, obj._name, def_id, context=context) + #match the prop value on current user company to match + #property get and write based on current user company, + domain = [('fields_id.model', '=', obj._name), + ('fields_id.name', '=', prop_name), + ('company_id', '=', company_id)] + #add reference for more accurate property result, if any. + if reference: + domain.extend([('res_id', 'in', reference)]) + return property_pool.search(cr, uid, domain, context=context) + + def _create_property(self, obj, cr, uid, id, prop_name, id_val, old_ids, context): + company_pool = obj.pool.get('res.company') + property_pool = obj.pool.get('ir.property') + if old_ids: + property_pool.unlink(cr, uid, old_ids, context) + def_id = self._field_get(cr, uid, obj._name, prop_name) + company_id = company_pool._company_default_get(cr, uid, obj._name, def_id, context=context) + property_field = obj.pool.get('ir.model.fields').browse(cr, uid, def_id, context=context) + return property_pool.create(cr, uid, { + 'name': property_field.name, + 'value': id_val, + 'res_id': obj._name+','+str(id), + 'company_id': company_id, + 'fields_id': def_id, + 'type': self._type, + }, context=context) # TODO: to rewrite more clean def _fnct_write(self, obj, cr, uid, id, prop_name, id_val, obj_dest, context=None): - if context is None: - context = {} - - nids = self._get_by_id(obj, cr, uid, [prop_name], [id], context) - if nids: - cr.execute('DELETE FROM ir_property WHERE id IN %s', (tuple(nids),)) - - default_val = self._get_default(obj, cr, uid, prop_name, context) - - property_create = False - if isinstance(default_val, openerp.osv.orm.browse_record): - if default_val.id != id_val: - property_create = True - elif default_val != id_val: - property_create = True - - if property_create: - def_id = self._field_get(cr, uid, obj._name, prop_name) - company = obj.pool.get('res.company') - cid = company._company_default_get(cr, uid, obj._name, def_id, - context=context) - propdef = obj.pool.get('ir.model.fields').browse(cr, uid, def_id, - context=context) - prop = obj.pool.get('ir.property') - return prop.create(cr, uid, { - 'name': propdef.name, - 'value': id_val, - 'res_id': obj._name+','+str(id), - 'company_id': cid, - 'fields_id': def_id, - 'type': self._type, - }, context=context) - return False + #check the result of ir.property.get() for existing prop field value + default_val = self._get_defaults(obj, cr, uid, [prop_name], context=None)[prop_name] + #if values found same skip the unlinking the creation and creation of new records + if (isinstance(default_val, openerp.osv.orm.browse_record) and default_val.id != id_val) or (default_val != id_val): + old_ids = self._get_by_id(obj, cr, uid, prop_name, [id], context) + return self._create_property(obj, cr, uid, id, prop_name, id_val, old_ids, context) def _fnct_read(self, obj, cr, uid, ids, prop_names, obj_dest, context=None): prop = obj.pool.get('ir.property') From 266cdb3c7ec30d68b797729ecff7854297b58a28 Mon Sep 17 00:00:00 2001 From: Amit Dodiya Date: Fri, 31 May 2013 15:16:43 +0530 Subject: [PATCH 006/221] [IMP]: trml2pdf: change the fontface of pagecount text same as companies header footer text fontface bzr revid: ado@tinyerp.com-20130531094643-oyn5nx9dv0bv0ohx --- openerp/report/render/rml2pdf/trml2pdf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openerp/report/render/rml2pdf/trml2pdf.py b/openerp/report/render/rml2pdf/trml2pdf.py index 243cc02a0b3..66ba28a07c9 100644 --- a/openerp/report/render/rml2pdf/trml2pdf.py +++ b/openerp/report/render/rml2pdf/trml2pdf.py @@ -110,7 +110,7 @@ class NumberedCanvas(canvas.Canvas): if not self.pages.get(key,False): while not self.pages.get(key,False): key += 1 - self.setFont("Helvetica", 8) + self.setFont("DejaVu Sans", 8) self.drawRightString((self._pagesize[0]-30), (self._pagesize[1]-40), " %(this)i / %(total)i" % { 'this': self._pageNumber+1, @@ -137,7 +137,7 @@ class PageCount(platypus.Flowable): def draw(self): self.canv.beginForm("pageCount%d" % self.story_count) - self.canv.setFont("Helvetica", utils.unit_get(str(8))) + self.canv.setFont("DejaVu Sans", utils.unit_get(str(8))) self.canv.drawString(0, 0, str(self.canv.getPageNumber())) self.canv.endForm() From 799590426f5edec59717562539150c3e2b2ab305 Mon Sep 17 00:00:00 2001 From: Lionel Sausin Date: Tue, 11 Jun 2013 14:43:38 +0200 Subject: [PATCH 007/221] [FIX] propagate context through stock.move.action_cancel() bzr revid: ls@numerigraphe.fr-20130611124338-644rre13nhmnesvv --- addons/stock/stock.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index b632101208f..92b378fe315 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1962,15 +1962,15 @@ class stock_move(osv.osv): if move.picking_id: pickings[move.picking_id.id] = True if move.move_dest_id and move.move_dest_id.state == 'waiting': - self.write(cr, uid, [move.move_dest_id.id], {'state': 'assigned'}) + self.write(cr, uid, [move.move_dest_id.id], {'state': 'assigned'}, context=context) if context.get('call_unlink',False) and move.move_dest_id.picking_id: wf_service = netsvc.LocalService("workflow") wf_service.trg_write(uid, 'stock.picking', move.move_dest_id.picking_id.id, cr) - self.write(cr, uid, ids, {'state': 'cancel', 'move_dest_id': False}) + self.write(cr, uid, ids, {'state': 'cancel', 'move_dest_id': False}, context=context) if not context.get('call_unlink',False): for pick in self.pool.get('stock.picking').browse(cr, uid, pickings.keys()): if all(move.state == 'cancel' for move in pick.move_lines): - self.pool.get('stock.picking').write(cr, uid, [pick.id], {'state': 'cancel'}) + self.pool.get('stock.picking').write(cr, uid, [pick.id], {'state': 'cancel'}, context=context) wf_service = netsvc.LocalService("workflow") for id in ids: From 7a9ca47e214d662360e8e5f3a00bb21a10e375d2 Mon Sep 17 00:00:00 2001 From: Mohammed Shekha Date: Tue, 18 Jun 2013 17:31:54 +0530 Subject: [PATCH 008/221] [FIX]Fixed the issue of save selected fields list in export. bzr revid: msh@openerp.com-20130618120154-o0cj17snpn00mh38 --- addons/web/static/src/js/data_export.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js index fb5e391effd..31a750e787e 100644 --- a/addons/web/static/src/js/data_export.js +++ b/addons/web/static/src/js/data_export.js @@ -101,6 +101,7 @@ instance.web.DataExport = instance.web.Dialog.extend({ if (select_exp.val()) { self.exports.unlink([parseInt(select_exp.val(), 10)]); select_exp.remove(); + self.$el.find("#fields_list option").remove(); if (self.$el.find('#saved_export_list option').length <= 1) { self.$el.find('#ExistsExportList').hide(); } @@ -148,18 +149,17 @@ instance.web.DataExport = instance.web.Dialog.extend({ export_fields: _(fields).map(function (field) { return [0, 0, {name: field}]; }) - }, function (export_list_id) { - if (!export_list_id.result) { + }).then(function (export_list_id) { + if (!export_list_id) { return; } - self.$el.find("#saved_export_list").append( - new Option(value, export_list_id.result)); - if (self.$el.find("#saved_export_list").is(":hidden")) { + if (!self.$el.find("#saved_export_list").length || self.$el.find("#saved_export_list").is(":hidden")) { self.show_exports_list(); } + self.$el.find("#saved_export_list").append( + new Option(value, export_list_id)); }); this.on_show_save_list(); - this.$el.find("#fields_list option").remove(); }, on_click: function(id, record) { var self = this; From 126b49075d595e954e7ce18400aaaa243cc7a343 Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Wed, 26 Jun 2013 15:58:42 +0200 Subject: [PATCH 009/221] [FIX] Export creates xml id based on wrong table name lp bug: https://launchpad.net/bugs/1194893 fixed bzr revid: stefan@therp.nl-20130626135842-sdbvopuen0s7liv9 --- openerp/osv/orm.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index 499a21f8555..6aafd05e0bf 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -1106,7 +1106,7 @@ class BaseModel(object): def _get_xml_id(self, cr, uid, r): model_data = self.pool.get('ir.model.data') - data_ids = model_data.search(cr, uid, [('model', '=', r._table_name), ('res_id', '=', r['id'])]) + data_ids = model_data.search(cr, uid, [('model', '=', r._model._table), ('res_id', '=', r['id'])]) if len(data_ids): d = model_data.read(cr, uid, data_ids, ['name', 'module'])[0] if d['module']: @@ -1116,13 +1116,13 @@ class BaseModel(object): else: postfix = 0 while True: - n = self._table+'_'+str(r['id']) + (postfix and ('_'+str(postfix)) or '' ) + n = r._model._table+'_'+str(r['id']) + (postfix and ('_'+str(postfix)) or '' ) if not model_data.search(cr, uid, [('name', '=', n)]): break postfix += 1 model_data.create(cr, SUPERUSER_ID, { 'name': n, - 'model': self._name, + 'model': r._model._name, 'res_id': r['id'], 'module': '__export__', }) From 216f4d5e66452168b542f88adb703561c510f399 Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Wed, 26 Jun 2013 16:04:39 +0200 Subject: [PATCH 010/221] [FIX] Do not search for model = table name in previous commit bzr revid: stefan@therp.nl-20130626140439-3emprb4ewc2xlcsy --- openerp/osv/orm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index 6aafd05e0bf..cfd811a80dc 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -1106,7 +1106,7 @@ class BaseModel(object): def _get_xml_id(self, cr, uid, r): model_data = self.pool.get('ir.model.data') - data_ids = model_data.search(cr, uid, [('model', '=', r._model._table), ('res_id', '=', r['id'])]) + data_ids = model_data.search(cr, uid, [('model', '=', r._model._name), ('res_id', '=', r['id'])]) if len(data_ids): d = model_data.read(cr, uid, data_ids, ['name', 'module'])[0] if d['module']: From d5d8558f640b5d0d4313631efefd40f377061097 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Tue, 1 Oct 2013 15:20:55 +0530 Subject: [PATCH 011/221] [IMP] Display account field in purchase reciept when no supplier define bzr revid: fka@tinyerp.com-20131001095055-n9vfq76k9tzzgpwd --- addons/account_voucher/voucher_sales_purchase_view.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml index dc732129803..37a92b5a1fb 100644 --- a/addons/account_voucher/voucher_sales_purchase_view.xml +++ b/addons/account_voucher/voucher_sales_purchase_view.xml @@ -224,7 +224,6 @@

- @@ -285,6 +284,9 @@ + + + From 20a57cc0734e2c56e56b5168624f294e1d912076 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Wed, 9 Oct 2013 16:31:08 +0530 Subject: [PATCH 012/221] [FIX] the tracebck when create recurrent event from Sales > Configuration > Calendar > Events menu. bzr revid: fka@tinyerp.com-20131009110108-7htob9yoj5hlao75 --- addons/base_calendar/base_calendar_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml index 92ffad4be9a..74c60194aba 100644 --- a/addons/base_calendar/base_calendar_view.xml +++ b/addons/base_calendar/base_calendar_view.xml @@ -162,7 +162,7 @@ + attrs="{'required': [('recurrency','==',True)]}"/> From 88cff57e9576bff0c064611f713168e3a1d6f4a1 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Thu, 10 Oct 2013 12:07:40 +0530 Subject: [PATCH 013/221] [IMP] assign 'rel_date' variable in _set_recurrency_end_date() bzr revid: fka@tinyerp.com-20131010063740-vngt52ivsu3fc3sh --- addons/base_calendar/base_calendar.py | 5 ++++- addons/base_calendar/base_calendar_view.xml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index 5db1662b70c..4433495f791 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -1588,6 +1588,7 @@ rule or repeating pattern of time to exclude from the recurring rule."), def _set_recurrency_end_date(self, data, context=None): end_date = data.get('end_date') + rel_date = False if data.get('recurrency') and data.get('end_type') in ('count', unicode('count')): data_date_deadline = datetime.strptime(data.get('date_deadline'), '%Y-%m-%d %H:%M:%S') if data.get('rrule_type') in ('daily', unicode('count')): @@ -1598,7 +1599,9 @@ rule or repeating pattern of time to exclude from the recurring rule."), rel_date = relativedelta(months=data.get('count')+1) elif data.get('rrule_type') in ('yearly', unicode('yearly')): rel_date = relativedelta(years=data.get('count')+1) - end_date = data_date_deadline + rel_date + end_date = data_date_deadline + if rel_date: + end_date += rel_date return end_date def create(self, cr, uid, vals, context=None): diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml index 74c60194aba..98bf9edb09c 100644 --- a/addons/base_calendar/base_calendar_view.xml +++ b/addons/base_calendar/base_calendar_view.xml @@ -162,7 +162,7 @@ + attrs="{'readonly': [('recurrency','=',True)]}"/> From e578e2af784cb3af11ceae7d07cc07c7036a85e9 Mon Sep 17 00:00:00 2001 From: "Mohammed Shekha (OpenERP)" Date: Thu, 17 Oct 2013 18:32:17 +0530 Subject: [PATCH 014/221] [FIX]Fix the issue of page navigation when all records of current page are deleted, currently it does not go to previous page instead displays blank list, expected behavior: it should navigated to previous page when all records of the current page deleted. bzr revid: msh@openerp.com-20131017130217-dtpukpq27fdmsvd9 --- addons/web/static/src/js/view_list.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index 74c2fc47aee..dd8b62ae619 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -593,7 +593,13 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi _(ids).each(function (id) { self.records.remove(self.records.get(id)); }); - self.configure_pager(self.dataset); + if (self.records.length == 0 && self.page > 0) { + //Trigger previous manually to navigate to previous page, + //If all records are deleted on current page. + self.$pager.find('ul li:first a').trigger('click'); + } else { + self.configure_pager(self.dataset); + } self.compute_aggregates(); }); }, From 62ea0bb3831cd5b5c60b69d4ee8d93e3bd679415 Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Thu, 24 Oct 2013 23:47:35 +0200 Subject: [PATCH 015/221] [FIX] Update test for external id bzr revid: stefan@therp.nl-20131024214735-emciqtcm6vrs9xda --- openerp/tests/addons/test_impex/tests/test_export.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openerp/tests/addons/test_impex/tests/test_export.py b/openerp/tests/addons/test_impex/tests/test_export.py index 26219b36d3b..995d69471d6 100644 --- a/openerp/tests/addons/test_impex/tests/test_export.py +++ b/openerp/tests/addons/test_impex/tests/test_export.py @@ -309,8 +309,9 @@ class test_m2o(CreatorCase): def test_external_id(self): integer_id = self.registry('export.integer').create( self.cr, openerp.SUPERUSER_ID, {'value': 42}) - # __export__.$class.$id - external_id = u'__export__.export_many2one_%d' % integer_id + # Expecting the m2o target model name in the external id, + # not this model's name + external_id = u'__export__.export_integer_%d' % integer_id self.assertEqual( self.export(integer_id, fields=['value/id']), [[external_id]]) From c95b53c6bdad719cedffd8aa19cdbc9c99e35235 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Fri, 13 Dec 2013 18:45:50 +0530 Subject: [PATCH 016/221] [IMP] improve domain bzr revid: fka@tinyerp.com-20131213131550-9jqg5zj4hpjgxhrw --- addons/account_voucher/voucher_sales_purchase_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml index ff6774e7d5b..f56cc1296a5 100644 --- a/addons/account_voucher/voucher_sales_purchase_view.xml +++ b/addons/account_voucher/voucher_sales_purchase_view.xml @@ -285,7 +285,7 @@ - + From 19a334c1d7db9b9fb6c96d76be8af8236eb3f9aa Mon Sep 17 00:00:00 2001 From: "Chandni Machchhar (OpenERP)" Date: Mon, 16 Dec 2013 12:53:28 +0530 Subject: [PATCH 017/221] [IMP] [membership] : Membership End Date in demo data. bzr revid: cac@openerp.com-20131216072328-q6fobmqf9xqpj5ps --- addons/membership/membership_demo.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/membership/membership_demo.xml b/addons/membership/membership_demo.xml index 49863bb1f4c..063c9c47dc6 100644 --- a/addons/membership/membership_demo.xml +++ b/addons/membership/membership_demo.xml @@ -6,7 +6,7 @@ True - + Golden Membership 180 @@ -16,7 +16,7 @@ True - + Silver Membership 80 @@ -26,7 +26,7 @@ True - + Basic Membership 40 From bc33f2f609a3c530486f4a451a0d90db5add3c1e Mon Sep 17 00:00:00 2001 From: "Chandni Machchhar (OpenERP)" Date: Mon, 16 Dec 2013 13:09:41 +0530 Subject: [PATCH 018/221] [IMP] [membership] : Membership End Date in demo data. bzr revid: cac@openerp.com-20131216073941-klkxlxm5adtk2uo9 --- addons/membership/membership_demo.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/membership/membership_demo.xml b/addons/membership/membership_demo.xml index 063c9c47dc6..8d82f12ffd6 100644 --- a/addons/membership/membership_demo.xml +++ b/addons/membership/membership_demo.xml @@ -26,7 +26,7 @@ True - + Basic Membership 40 From 99400fe122a84cd348d7f0dc3ea11579ebbba16d Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Tue, 31 Dec 2013 15:17:40 +0530 Subject: [PATCH 019/221] [IMP] remove % sign showing when creating a payment term based on percent bzr revid: fka@tinyerp.com-20131231094740-eoiszcwmtfw45sab --- addons/account/account_view.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 16ba8f4a8dd..4fb219df67b 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1588,7 +1588,6 @@