From 21344cbb70814c41c7570dff844707a386398722 Mon Sep 17 00:00:00 2001 From: "stefan@therp.nl" <> Date: Thu, 24 Mar 2011 17:42:00 +0100 Subject: [PATCH 001/147] [FIX] Cash and Bank journals are unintendedly created as refund journals lp bug: https://launchpad.net/bugs/741863 fixed bzr revid: stefan@therp.nl-20110324164200-npm4eo8ed2my838y --- addons/account/account.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/account/account.py b/addons/account/account.py index df27fc2e6bc..ed61da05cbe 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2946,6 +2946,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): analitical_bank_ids = analytic_journal_obj.search(cr,uid,[('type','=','situation')]) analitical_journal_bank = analitical_bank_ids and analitical_bank_ids[0] or False + vals_journal = {} vals_journal['name']= vals['name'] vals_journal['code']= _('BNK') + str(current_num) vals_journal['sequence_id'] = seq_id From a3f4cb4df31e362f10181b26995056b2d670b9eb Mon Sep 17 00:00:00 2001 From: "Jay Vora (OpenERP)" Date: Wed, 20 Apr 2011 13:17:05 +0530 Subject: [PATCH 002/147] [FIX] Chained locations: processing first move does not copy prod.lot in chained moves lp bug: https://launchpad.net/bugs/763437 fixed bzr revid: jvo@tinyerp.com-20110420074705-a6fmsamg7xzstk5m --- addons/stock/stock.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index a728e06fb01..a9e19670d7e 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -2125,6 +2125,8 @@ class stock_move(osv.osv): self.write(cr, uid, [move.id], {'move_history_ids': [(4, move.move_dest_id.id)]}) #cr.execute('insert into stock_move_history_ids (parent_id,child_id) values (%s,%s)', (move.id, move.move_dest_id.id)) if move.move_dest_id.state in ('waiting', 'confirmed'): + if move.prodlot_id.id: + self.write(cr, uid, [move.move_dest_id.id], {'prodlot_id':move.prodlot_id.id}) self.force_assign(cr, uid, [move.move_dest_id.id], context=context) if move.move_dest_id.picking_id: wf_service.trg_write(uid, 'stock.picking', move.move_dest_id.picking_id.id, cr) From 0a7a91b22592eb100b07975425253b82d112d224 Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Wed, 27 Apr 2011 15:50:56 +0530 Subject: [PATCH 003/147] [FIX] 4635 create project from template and project duplication fixed bzr revid: tta@openerp.com-20110427102056-wndhpylsnzgdoxtv --- addons/project_long_term/project_long_term.py | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index c2bc55db212..96811927c12 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -581,6 +581,37 @@ def Project_%d(): context = {} allocation = {} return allocation + def copy(self, cr, uid, id, default=None, context=None): + if context is None: + context = {} + if default is None: + default = {} + pool_task = self.pool.get('project.task') + pool_phase = self.pool.get('project.phase') + proj = self.browse(cr, uid, id, context=context) + map_phase = {} #maintains a dictionary of old to new phase + map_tasks = {} #maintains a dictionary of tasks either orphan to related to any phase + #Creating a list of new phases + for phase in proj.phase_ids: + map_phase[phase.id] = pool_phase.copy(cr, uid, phase.id, default={}, context=context) + list_phases = map_phase.keys() + map_phase.values() + + for phase_id in map_phase.values(): + for task in pool_phase.browse(cr, uid, phase_id, context).task_ids: + map_tasks[task.id] = phase_id + + #Creating a list of tasks which are not linked to phases + for task in proj.tasks: + if (not task.phase_id.id) or (task.phase_id.id and task.phase_id.id not in list_phases) or (task.phase_id.id and task.phase_id.id in list_phases and not task.active): + #Copy of Real tasks (without Phase) and inactive template tasks + default_phase = task.phase_id.id and {'phase_id' : map_phase.get(task.phase_id.id,False)} or {} + map_tasks[pool_task.copy(cr, uid, task.id, default_phase, context=context)] = map_phase.get(task.phase_id.id,False) + + default.update({'tasks':[(6,0, map_tasks.keys())]}) + default.update({'phase_ids':[(6,0, map_phase.values())]}) + + return super(project, self).copy(cr, uid, id, default, context) + def schedule_tasks(self, cr, uid, ids, context=None): """ From 8fd72aff40eb757013eaee6a0c182c9e1acee7c5 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 5 May 2011 18:12:21 +0200 Subject: [PATCH 004/147] [FIX] share: avoid crash in web addon with empty share filter bzr revid: odo@openerp.com-20110505161221-d4k3y8v81qz2wbrp --- addons/share/web/controllers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/share/web/controllers.py b/addons/share/web/controllers.py index aa689019259..1b57d960e99 100644 --- a/addons/share/web/controllers.py +++ b/addons/share/web/controllers.py @@ -13,7 +13,7 @@ class ShareWizardController(openerp.controllers.SecuredController): _cp_path = "/share" @expose() - def index(self, domain, search_domain, context, view_id, action_id=None): + def index(self, domain, context, view_id, search_domain='[]', action_id=None): context = ast.literal_eval(context) if not action_id: From ef4c13fad553cbdae08cc82a8f07991f4539f1b6 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 5 May 2011 18:14:26 +0200 Subject: [PATCH 005/147] [FIX] share: hide Share button when user does not belong to Sharing group bzr revid: odo@openerp.com-20110505161426-c4ocuy98mgbceq5w --- addons/share/web/editors.py | 14 ++++++++++---- addons/share/wizard/share_wizard.py | 12 ++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/addons/share/web/editors.py b/addons/share/web/editors.py index fd6199a4fd6..1928b644073 100644 --- a/addons/share/web/editors.py +++ b/addons/share/web/editors.py @@ -11,8 +11,13 @@ class ShareActionEditor(openobject.templating.TemplateEditor): share_opener_insertion = output.index( '\n', output.index(self.ADD_SHARE_SECTION)) + 1 - return output[:share_opener_insertion] + \ - '''

${_("Sharing")}

+ return output[:share_opener_insertion] + ''' + <% + if 'has_share' not in cp.session: + cp.session['has_share'] = rpc.RPCProxy('share.wizard').has_share() + %> + % if cp.session['has_share']: +

${_("Sharing")}

  • ${_("Share")} @@ -33,8 +38,9 @@ class ShareActionEditor(openobject.templating.TemplateEditor): }); }); - \n''' + \ - output[share_opener_insertion:] + \n + % endif +''' + output[share_opener_insertion:] def edit(self, template, template_text): return self.insert_share_link( diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py index 48243c57dda..755e4777eca 100644 --- a/addons/share/wizard/share_wizard.py +++ b/addons/share/wizard/share_wizard.py @@ -50,6 +50,18 @@ class share_create(osv.osv_memory): _name = 'share.wizard' _description = 'Share Wizard' + def has_group(self, cr, uid, module, group_xml_id, context=None): + """Returns True if current user is a member of the group identified by the module, group_xml_id pair.""" + # if the group was deleted or does not exist, we say NO (better safe than sorry) + try: + model, group_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, module, group_xml_id) + except ValueError: + return False + return group_id in self.pool.get('res.users').read(cr, uid, uid, ['groups_id'], context=context)['groups_id'] + + def has_share(self, cr, uid, context=None): + return self.has_group(cr, uid, module='share', group_xml_id='group_share_user', context=context) + _columns = { 'action_id': fields.many2one('ir.actions.act_window', 'Action to share', required=True, help="The action that opens the screen containing the data you wish to share."), From fe6bc5db26b55b8bc20a49036d30ac6aa0b98170 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 5 May 2011 18:15:39 +0200 Subject: [PATCH 006/147] [FIX] share: bumped up module version after changes to web addon This will notify the web clients to refresh the web addon. bzr revid: odo@openerp.com-20110505161539-cp21x19ii81wr3o6 --- addons/share/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py index 7a68936970d..9b1b331abb2 100644 --- a/addons/share/__openerp__.py +++ b/addons/share/__openerp__.py @@ -22,7 +22,7 @@ { "name" : "Sharing Tools", - "version" : "1.3", + "version" : "1.3.1", "depends" : ["base"], "author" : "OpenERP SA", "category": 'Generic Modules', From b26d354d34054eb102196f02bf79e2c8a956e6ce Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 5 May 2011 18:18:53 +0200 Subject: [PATCH 007/147] [FIX] share: share users with multi-shares should keep same home action Previously they were assigned the generic menu as home action but that is not very relevant because it does not contain their shortcuts most of the time, and also this breaks the web client in v6.0 as it does not support the Menu as home action. bzr revid: odo@openerp.com-20110505161853-y1gc21wdn6k2wg41 --- addons/share/wizard/share_wizard.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py index 755e4777eca..cae12ddbfe7 100644 --- a/addons/share/wizard/share_wizard.py +++ b/addons/share/wizard/share_wizard.py @@ -156,7 +156,6 @@ class share_create(osv.osv_memory): def _setup_action_and_shortcut(self, cr, uid, wizard_data, user_ids, new_users, context=None): user_obj = self.pool.get('res.users') - menu_action_id = user_obj._get_menu(cr, uid, context=context) values = { 'name': (_('%s (Shared)') % wizard_data.action_id.name)[:64], 'domain': wizard_data.domain, @@ -169,9 +168,11 @@ class share_create(osv.osv_memory): for user_id in user_ids: action_id = self._create_shortcut(cr, user_id, values) if new_users: + # We do this only for new share users, as existing ones already have their initial home + # action. Resetting to the default menu does not work well as the menu is rather empty + # and does not contain the shortcuts in most cases. user_obj.write(cr, 1, [user_id], {'action_id': action_id}) - else: - user_obj.write(cr, 1, [user_id], {'action_id': menu_action_id}) + def _get_recursive_relations(self, cr, uid, model, ttypes, relation_fields=None, suffix=None, context=None): """Returns list of tuples representing recursive relationships of type ``ttypes`` starting from From b1bcc6b036674f674ee3ef9f2568743faddfc4ee Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 5 May 2011 18:22:31 +0200 Subject: [PATCH 008/147] [FIX] share: use empty domain for shared actions, as ir.rules do enforce the filtering. We must not use a normal domain for the shared action, because it may be constructed with records the user may not see (e.g. sharing tasks from a certain project does not give right to see the project itself.) Evaluating the domain of an action requires rights that the user will not have. Moreover, this is useless because ir.rules are created with each share access to filter appropriately the records, and they are evaluated as root user without risk of failed access right. bzr revid: odo@openerp.com-20110505162231-vbkh4vqrtk93yg1q --- addons/share/wizard/share_wizard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py index cae12ddbfe7..f153f26f4d4 100644 --- a/addons/share/wizard/share_wizard.py +++ b/addons/share/wizard/share_wizard.py @@ -158,7 +158,7 @@ class share_create(osv.osv_memory): user_obj = self.pool.get('res.users') values = { 'name': (_('%s (Shared)') % wizard_data.action_id.name)[:64], - 'domain': wizard_data.domain, + 'domain': '[]', 'context': wizard_data.action_id.context, 'res_model': wizard_data.action_id.res_model, 'view_mode': wizard_data.action_id.view_mode, From 4d9ce4260f820a762095f97ea307859bc782d038 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 5 May 2011 18:25:08 +0200 Subject: [PATCH 009/147] [FIX] share: current user restrictions were not properly copied This could lead to security issues, because shared users could have more access rights than the user sharing the data. The mechanism was working to copy them, but unfortunately not working. bzr revid: odo@openerp.com-20110505162508-3r12bl7rg1hpyzps --- addons/share/wizard/share_wizard.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py index f153f26f4d4..364e4127b93 100644 --- a/addons/share/wizard/share_wizard.py +++ b/addons/share/wizard/share_wizard.py @@ -271,21 +271,21 @@ class share_create(osv.osv_memory): user_obj = self.pool.get('res.users') rule_obj = self.pool.get('ir.rule') current_user = user_obj.browse(cr, uid, uid, context=context) - completed_models = set() + rules_done = set() for group in current_user.groups_id: for dummy, model in fields_relations: - if model.id in completed_models: - continue - completed_models.add(model.id) for rule in group.rule_groups: - if rule.model_id == model.id: + if rule.id in rules_done: + continue + rules_done.add(rule.id) + if rule.model_id.id == model.id: if 'user.' in rule.domain_force: # Above pattern means there is likely a condition # specific to current user, so we must copy the rule using # the evaluated version of the domain. # And it's better to copy one time too much than too few rule_obj.copy(cr, 1, rule.id, default={ - 'name': '%s (%s)' %(rule.name, _('(Copy for sharing)')), + 'name': '%s %s' %(rule.name, _('(Copy for sharing)')), 'groups': [(6,0,[group_id])], 'domain_force': rule.domain, # evaluated version! }) From 6d512bb2da7b113e7dd08b91f4c55adbfc167b24 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 5 May 2011 18:27:01 +0200 Subject: [PATCH 010/147] [FIX] share: multi-sharing with an empty filter was not working An empty share filter should be translated as a dummy ir.rule to make sure it is properly combined with other rules after multiple shared access are granted to the same user. bzr revid: odo@openerp.com-20110505162701-eq02jb3c0942x3bt --- addons/share/wizard/share_wizard.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py index 364e4127b93..c22be871b60 100644 --- a/addons/share/wizard/share_wizard.py +++ b/addons/share/wizard/share_wizard.py @@ -31,6 +31,9 @@ from tools.safe_eval import safe_eval FULL_ACCESS = ('perm_read', 'perm_write', 'perm_create', 'perm_unlink') READ_ONLY_ACCESS = ('perm_read',) +# Pseudo-domain to represent an empty filter, constructed using +# osv.expression's DUMMY_LEAF +DOMAIN_ALL = [(1, '=', 1)] RANDOM_PASS_CHARACTERS = [chr(x) for x in range(48, 58) + range(97, 123) + range(65, 91)] RANDOM_PASS_CHARACTERS.remove('l') #lowercase l, easily mistaken as one or capital i @@ -427,11 +430,12 @@ class share_create(osv.osv_memory): # to uid, and it must be replaced correctly) rule_obj = self.pool.get('ir.rule') # A. + main_domain = wizard_data.domain if wizard_data.domain != '[]' else DOMAIN_ALL rule_obj.create(cr, 1, { 'name': _('Sharing filter created by user %s (%s) for group %s') % \ (current_user.name, current_user.login, group_id), 'model_id': model.id, - 'domain_force': wizard_data.domain, + 'domain_force': main_domain, 'groups': [(4,group_id)] }) # B. From 7928a00024def2ff1f31ef4c1c7544b6e473477d Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 5 May 2011 18:55:30 +0200 Subject: [PATCH 011/147] [FIX] share: form view should share current record only Version bumped to force web addons updates bzr revid: odo@openerp.com-20110505165530-jnfglbocvzku6rkb --- addons/share/__openerp__.py | 2 +- addons/share/web/editors.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py index 9b1b331abb2..9a71412523a 100644 --- a/addons/share/__openerp__.py +++ b/addons/share/__openerp__.py @@ -22,7 +22,7 @@ { "name" : "Sharing Tools", - "version" : "1.3.1", + "version" : "1.3.2", "depends" : ["base"], "author" : "OpenERP SA", "category": 'Generic Modules', diff --git a/addons/share/web/editors.py b/addons/share/web/editors.py index 1928b644073..1e1573b05af 100644 --- a/addons/share/web/editors.py +++ b/addons/share/web/editors.py @@ -33,7 +33,9 @@ class ShareActionEditor(openobject.templating.TemplateEditor): domain: jQuery("#_terp_domain").val(), view_id: jQuery("#_terp_view_id").val(), action_id: jQuery("#_terp_action_id").val(), - search_domain: jQuery("#_terp_search_domain").val(), + search_domain: jQuery("#_terp_view_type").val() == "form" ? + ("[('id','=',"+jQuery("#_terp_id").val()+")]") : + jQuery("#_terp_search_domain").val(), })); }); }); From 1d746d88e1a7bdbaec5153fafcdb5d3598d6e1f4 Mon Sep 17 00:00:00 2001 From: "Anup (OpenERP)" Date: Mon, 16 May 2011 17:38:18 +0530 Subject: [PATCH 012/147] [FIX] base : Record Rules being ended in a single group now lp bug: https://launchpad.net/bugs/766982 fixed bzr revid: ach@tinyerp.com-20110516120818-56d17xau3bwo26lt --- bin/addons/base/ir/ir_rule.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/addons/base/ir/ir_rule.py b/bin/addons/base/ir/ir_rule.py index befa47e25b0..9eacce9c6fd 100644 --- a/bin/addons/base/ir/ir_rule.py +++ b/bin/addons/base/ir/ir_rule.py @@ -126,10 +126,11 @@ class ir_rule(osv.osv): if group_domain: group_domains += group_domain count += 1 - if count and global_domain: - return ['&'] + global_domain + ['|'] * (count-1) + group_domains if count: - return ['|'] * (count-1) + group_domains + dom = ['&'] * (count-1) + group_domains + if global_domain: + return ['&'] + global_domain + dom + return dom return global_domain return [] From 8666a526152cd2033ca2c11d74d64bfe7b07bd2c Mon Sep 17 00:00:00 2001 From: Leonardo Pistone Date: Wed, 18 May 2011 12:03:56 +0200 Subject: [PATCH 013/147] [FIX] use only current company to choose a default account_id for a non-product invoice line lp bug: https://launchpad.net/bugs/784499 fixed bzr revid: leonardo.pistone@domsense.com-20110518100356-cs9gwtn663w85bpa --- addons/account_invoice_layout/account_invoice_layout.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/account_invoice_layout/account_invoice_layout.py b/addons/account_invoice_layout/account_invoice_layout.py index 3337710420f..1690ac4319e 100644 --- a/addons/account_invoice_layout/account_invoice_layout.py +++ b/addons/account_invoice_layout/account_invoice_layout.py @@ -165,7 +165,8 @@ class account_invoice_line(osv.osv): } def _default_account(self, cr, uid, context=None): - cr.execute("select id from account_account where parent_id IS NULL LIMIT 1") + current_company = self.pool.get('res.users').browse(cr,uid,uid).company_id.id + cr.execute("select id from account_account where company_id = %s and parent_id IS NULL LIMIT 1", [current_company]) res = cr.fetchone() return res[0] From bcb7982ec8e607c878d5ec83685beb70e062752b Mon Sep 17 00:00:00 2001 From: "Anup (OpenERP)" Date: Thu, 19 May 2011 11:28:55 +0530 Subject: [PATCH 014/147] [FIX] report_webkit : Webkit reports now getting translated(setLang and formatLang fixed. Maintenance Case:5770) lp bug: https://launchpad.net/bugs/710061 fixed bzr revid: ach@tinyerp.com-20110519055855-nnblkst14g3vwvu0 --- addons/report_webkit/webkit_report.py | 2 + addons/report_webkit_sample/i18n/bg.po | 40 +++++++++---------- addons/report_webkit_sample/i18n/ca.po | 40 +++++++++---------- addons/report_webkit_sample/i18n/de.po | 40 +++++++++---------- addons/report_webkit_sample/i18n/es.po | 40 +++++++++---------- addons/report_webkit_sample/i18n/fr.po | 40 +++++++++---------- addons/report_webkit_sample/i18n/hu.po | 40 +++++++++---------- addons/report_webkit_sample/i18n/it.po | 40 +++++++++---------- addons/report_webkit_sample/i18n/nl.po | 40 +++++++++---------- addons/report_webkit_sample/i18n/pt.po | 40 +++++++++---------- addons/report_webkit_sample/i18n/pt_BR.po | 40 +++++++++---------- .../i18n/report_webkit_sample.pot | 40 +++++++++---------- 12 files changed, 222 insertions(+), 220 deletions(-) diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py index 406013cef12..d4eabf13da7 100644 --- a/addons/report_webkit/webkit_report.py +++ b/addons/report_webkit/webkit_report.py @@ -294,6 +294,8 @@ class WebKitParser(report_sxw): #default_filters=['unicode', 'entity'] can be used to set global filter body_mako_tpl = mako_template(template) helper = WebKitHelper(cursor, uid, report_xml.id, context) + self.parser_instance.localcontext.update({'setLang':self.setLang}) + self.parser_instance.localcontext.update({'formatLang':self.formatLang}) try : html = body_mako_tpl.render( helper=helper, css=css, diff --git a/addons/report_webkit_sample/i18n/bg.po b/addons/report_webkit_sample/i18n/bg.po index 728abf1702a..f7d839acb72 100644 --- a/addons/report_webkit_sample/i18n/bg.po +++ b/addons/report_webkit_sample/i18n/bg.po @@ -23,12 +23,12 @@ msgid "WebKit invoice" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35 +#: report:report.webkitaccount.invoice:35 msgid "Supplier Invoice" msgstr "Фактура към доставчик" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Unit Price" msgstr "Единична цена" @@ -53,91 +53,91 @@ msgid "Webkit Report Samples" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Disc.(%)" msgstr "Отстъпка (%)" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22 +#: report:report.webkitaccount.invoice:22 msgid "Fax" msgstr "Факс" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Document" msgstr "Документ" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Description" msgstr "Описание" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Price" msgstr "Цена" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Invoice Date" msgstr "Дата на фактура" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "QTY" msgstr "КОЛ." #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64 +#: report:report.webkitaccount.invoice:64 msgid "Base" msgstr "База" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Partner Ref." msgstr "Отпратка към контрагент" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Taxes" msgstr "Данъци" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64 +#: report:report.webkitaccount.invoice:64 msgid "Amount" msgstr "Количество" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28 +#: report:report.webkitaccount.invoice:28 msgid "VAT" msgstr "ДДС" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37 +#: report:report.webkitaccount.invoice:37 msgid "Refund" msgstr "Обезщетение" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19 +#: report:report.webkitaccount.invoice:19 msgid "Tel" msgstr "Тел" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25 +#: report:report.webkitaccount.invoice:25 msgid "E-mail" msgstr "Имейл" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33 +#: report:report.webkitaccount.invoice:33 msgid "Invoice" msgstr "Фактура" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39 +#: report:report.webkitaccount.invoice:39 msgid "Supplier Refund" msgstr "Обезщетение на доставчик" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76 +#: report:report.webkitaccount.invoice:76 msgid "Total" msgstr "Общо" diff --git a/addons/report_webkit_sample/i18n/ca.po b/addons/report_webkit_sample/i18n/ca.po index 96b73c3b6e7..d704661e1a0 100644 --- a/addons/report_webkit_sample/i18n/ca.po +++ b/addons/report_webkit_sample/i18n/ca.po @@ -23,12 +23,12 @@ msgid "WebKit invoice" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35 +#: report:report.webkitaccount.invoice:35 msgid "Supplier Invoice" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Unit Price" msgstr "" @@ -53,91 +53,91 @@ msgid "Webkit Report Samples" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Disc.(%)" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22 +#: report:report.webkitaccount.invoice:22 msgid "Fax" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Document" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Description" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Price" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Invoice Date" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "QTY" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64 +#: report:report.webkitaccount.invoice:64 msgid "Base" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Partner Ref." msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Taxes" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64 +#: report:report.webkitaccount.invoice:64 msgid "Amount" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28 +#: report:report.webkitaccount.invoice:28 msgid "VAT" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37 +#: report:report.webkitaccount.invoice:37 msgid "Refund" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19 +#: report:report.webkitaccount.invoice:19 msgid "Tel" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25 +#: report:report.webkitaccount.invoice:25 msgid "E-mail" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33 +#: report:report.webkitaccount.invoice:33 msgid "Invoice" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39 +#: report:report.webkitaccount.invoice:39 msgid "Supplier Refund" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76 +#: report:report.webkitaccount.invoice:76 msgid "Total" msgstr "" diff --git a/addons/report_webkit_sample/i18n/de.po b/addons/report_webkit_sample/i18n/de.po index ea8491535fe..4b4e6e10e02 100644 --- a/addons/report_webkit_sample/i18n/de.po +++ b/addons/report_webkit_sample/i18n/de.po @@ -24,12 +24,12 @@ msgid "WebKit invoice" msgstr "Webkit Rechnung" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35 +#: report:report.webkitaccount.invoice:35 msgid "Supplier Invoice" msgstr "Lieferanten Rechnung" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Unit Price" msgstr "Preis/ME" @@ -65,91 +65,91 @@ msgid "Webkit Report Samples" msgstr "Beispiele Webkit Reports" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Disc.(%)" msgstr "Rabatt (%)" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22 +#: report:report.webkitaccount.invoice:22 msgid "Fax" msgstr "Fax" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Document" msgstr "Dokument" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Description" msgstr "Beschreibung" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Price" msgstr "Preis" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Invoice Date" msgstr "Datum Rechnung" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "QTY" msgstr "Anz." #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64 +#: report:report.webkitaccount.invoice:64 msgid "Base" msgstr "Steuergrundbetrag" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Partner Ref." msgstr "Partner Ref." #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Taxes" msgstr "Steuern" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64 +#: report:report.webkitaccount.invoice:64 msgid "Amount" msgstr "Betrag" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28 +#: report:report.webkitaccount.invoice:28 msgid "VAT" msgstr "USt." #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37 +#: report:report.webkitaccount.invoice:37 msgid "Refund" msgstr "Gutschrift" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19 +#: report:report.webkitaccount.invoice:19 msgid "Tel" msgstr "Tel." #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25 +#: report:report.webkitaccount.invoice:25 msgid "E-mail" msgstr "E-Mail" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33 +#: report:report.webkitaccount.invoice:33 msgid "Invoice" msgstr "Rechnung" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39 +#: report:report.webkitaccount.invoice:39 msgid "Supplier Refund" msgstr "Lieferanten Gutschrift" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76 +#: report:report.webkitaccount.invoice:76 msgid "Total" msgstr "Summe" diff --git a/addons/report_webkit_sample/i18n/es.po b/addons/report_webkit_sample/i18n/es.po index c10ffa7ecaf..5affb1ab26f 100644 --- a/addons/report_webkit_sample/i18n/es.po +++ b/addons/report_webkit_sample/i18n/es.po @@ -24,12 +24,12 @@ msgid "WebKit invoice" msgstr "Factura Webkit" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35 +#: report:report.webkitaccount.invoice:35 msgid "Supplier Invoice" msgstr "Factura de Proveedor" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Unit Price" msgstr "Precio unitario" @@ -65,91 +65,91 @@ msgid "Webkit Report Samples" msgstr "Informes Webkit de ejemplo" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Disc.(%)" msgstr "Desc.(%)" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22 +#: report:report.webkitaccount.invoice:22 msgid "Fax" msgstr "Fax" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Document" msgstr "Documento" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Description" msgstr "Descripción" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Price" msgstr "Precio" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Invoice Date" msgstr "Fecha factura" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "QTY" msgstr "CTDAD" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64 +#: report:report.webkitaccount.invoice:64 msgid "Base" msgstr "Base" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Partner Ref." msgstr "Ref. empresa" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Taxes" msgstr "Impuestos" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64 +#: report:report.webkitaccount.invoice:64 msgid "Amount" msgstr "Importe" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28 +#: report:report.webkitaccount.invoice:28 msgid "VAT" msgstr "CIF/NIF" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37 +#: report:report.webkitaccount.invoice:37 msgid "Refund" msgstr "Reembolso" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19 +#: report:report.webkitaccount.invoice:19 msgid "Tel" msgstr "Tel" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25 +#: report:report.webkitaccount.invoice:25 msgid "E-mail" msgstr "E-mail" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33 +#: report:report.webkitaccount.invoice:33 msgid "Invoice" msgstr "Factura" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39 +#: report:report.webkitaccount.invoice:39 msgid "Supplier Refund" msgstr "Factura rectificativa (abono) de proveedor" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76 +#: report:report.webkitaccount.invoice:76 msgid "Total" msgstr "Total" diff --git a/addons/report_webkit_sample/i18n/fr.po b/addons/report_webkit_sample/i18n/fr.po index 47046c1d142..5a4dee89fed 100644 --- a/addons/report_webkit_sample/i18n/fr.po +++ b/addons/report_webkit_sample/i18n/fr.po @@ -23,12 +23,12 @@ msgid "WebKit invoice" msgstr "facture WebKit" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35 +#: report:report.webkitaccount.invoice:35 msgid "Supplier Invoice" msgstr "Facture fournisseur" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Unit Price" msgstr "Prix unitaire" @@ -63,91 +63,91 @@ msgid "Webkit Report Samples" msgstr "Exemples de rapports Webkit" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Disc.(%)" msgstr "Disc.(%)" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22 +#: report:report.webkitaccount.invoice:22 msgid "Fax" msgstr "Fax" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Document" msgstr "Ref. document" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Description" msgstr "Description" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Price" msgstr "Prix" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Invoice Date" msgstr "Date de la facture" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "QTY" msgstr "QTÉ" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64 +#: report:report.webkitaccount.invoice:64 msgid "Base" msgstr "Base" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Partner Ref." msgstr "Réf. partenaire" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Taxes" msgstr "Impôts" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64 +#: report:report.webkitaccount.invoice:64 msgid "Amount" msgstr "Montant" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28 +#: report:report.webkitaccount.invoice:28 msgid "VAT" msgstr "TVA" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37 +#: report:report.webkitaccount.invoice:37 msgid "Refund" msgstr "Remboursement" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19 +#: report:report.webkitaccount.invoice:19 msgid "Tel" msgstr "Tél" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25 +#: report:report.webkitaccount.invoice:25 msgid "E-mail" msgstr "Courriel" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33 +#: report:report.webkitaccount.invoice:33 msgid "Invoice" msgstr "Facture" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39 +#: report:report.webkitaccount.invoice:39 msgid "Supplier Refund" msgstr "Remboursement fournisseur" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76 +#: report:report.webkitaccount.invoice:76 msgid "Total" msgstr "Total" diff --git a/addons/report_webkit_sample/i18n/hu.po b/addons/report_webkit_sample/i18n/hu.po index f46d685afe8..6515766772c 100644 --- a/addons/report_webkit_sample/i18n/hu.po +++ b/addons/report_webkit_sample/i18n/hu.po @@ -22,12 +22,12 @@ msgid "WebKit invoice" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35 +#: report:report.webkitaccount.invoice:35 msgid "Supplier Invoice" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Unit Price" msgstr "" @@ -52,91 +52,91 @@ msgid "Webkit Report Samples" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Disc.(%)" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22 +#: report:report.webkitaccount.invoice:22 msgid "Fax" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Document" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Description" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Price" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Invoice Date" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "QTY" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64 +#: report:report.webkitaccount.invoice:64 msgid "Base" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Partner Ref." msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Taxes" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64 +#: report:report.webkitaccount.invoice:64 msgid "Amount" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28 +#: report:report.webkitaccount.invoice:28 msgid "VAT" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37 +#: report:report.webkitaccount.invoice:37 msgid "Refund" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19 +#: report:report.webkitaccount.invoice:19 msgid "Tel" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25 +#: report:report.webkitaccount.invoice:25 msgid "E-mail" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33 +#: report:report.webkitaccount.invoice:33 msgid "Invoice" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39 +#: report:report.webkitaccount.invoice:39 msgid "Supplier Refund" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76 +#: report:report.webkitaccount.invoice:76 msgid "Total" msgstr "" diff --git a/addons/report_webkit_sample/i18n/it.po b/addons/report_webkit_sample/i18n/it.po index 876de152b4d..93dfbf37ca2 100644 --- a/addons/report_webkit_sample/i18n/it.po +++ b/addons/report_webkit_sample/i18n/it.po @@ -23,12 +23,12 @@ msgid "WebKit invoice" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35 +#: report:report.webkitaccount.invoice:35 msgid "Supplier Invoice" msgstr "Fattura Fornitore" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Unit Price" msgstr "Prezzo unitario" @@ -53,91 +53,91 @@ msgid "Webkit Report Samples" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Disc.(%)" msgstr "Sconto (%)" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22 +#: report:report.webkitaccount.invoice:22 msgid "Fax" msgstr "Fax" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Document" msgstr "Documento" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Description" msgstr "Descrizione" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Price" msgstr "Prezzo" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Invoice Date" msgstr "Data fattura" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "QTY" msgstr "Q.ta" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64 +#: report:report.webkitaccount.invoice:64 msgid "Base" msgstr "Base" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Partner Ref." msgstr "Rif. Partner" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Taxes" msgstr "Tasse" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64 +#: report:report.webkitaccount.invoice:64 msgid "Amount" msgstr "Importo" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28 +#: report:report.webkitaccount.invoice:28 msgid "VAT" msgstr "IVA" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37 +#: report:report.webkitaccount.invoice:37 msgid "Refund" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19 +#: report:report.webkitaccount.invoice:19 msgid "Tel" msgstr "Tel." #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25 +#: report:report.webkitaccount.invoice:25 msgid "E-mail" msgstr "Email" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33 +#: report:report.webkitaccount.invoice:33 msgid "Invoice" msgstr "Fattura" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39 +#: report:report.webkitaccount.invoice:39 msgid "Supplier Refund" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76 +#: report:report.webkitaccount.invoice:76 msgid "Total" msgstr "Totale" diff --git a/addons/report_webkit_sample/i18n/nl.po b/addons/report_webkit_sample/i18n/nl.po index 4268d174904..7db14897851 100644 --- a/addons/report_webkit_sample/i18n/nl.po +++ b/addons/report_webkit_sample/i18n/nl.po @@ -23,12 +23,12 @@ msgid "WebKit invoice" msgstr "WebKit factuur" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35 +#: report:report.webkitaccount.invoice:35 msgid "Supplier Invoice" msgstr "Inkoopfactuur" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Unit Price" msgstr "Stuksprijs" @@ -64,91 +64,91 @@ msgid "Webkit Report Samples" msgstr "Webkit overzicht voorbeelden" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Disc.(%)" msgstr "Krt. (%)" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22 +#: report:report.webkitaccount.invoice:22 msgid "Fax" msgstr "Fax" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Document" msgstr "Document" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Description" msgstr "Omschrijving" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Price" msgstr "Prijs" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Invoice Date" msgstr "Factuurdatum" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "QTY" msgstr "AANT" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64 +#: report:report.webkitaccount.invoice:64 msgid "Base" msgstr "Basis" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Partner Ref." msgstr "Relatie ref." #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Taxes" msgstr "BTW" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64 +#: report:report.webkitaccount.invoice:64 msgid "Amount" msgstr "Bedrag" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28 +#: report:report.webkitaccount.invoice:28 msgid "VAT" msgstr "BTW" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37 +#: report:report.webkitaccount.invoice:37 msgid "Refund" msgstr "Creditnota" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19 +#: report:report.webkitaccount.invoice:19 msgid "Tel" msgstr "Tel" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25 +#: report:report.webkitaccount.invoice:25 msgid "E-mail" msgstr "E-mail" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33 +#: report:report.webkitaccount.invoice:33 msgid "Invoice" msgstr "Factuur" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39 +#: report:report.webkitaccount.invoice:39 msgid "Supplier Refund" msgstr "Creditfactuur inkoop" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76 +#: report:report.webkitaccount.invoice:76 msgid "Total" msgstr "Totaal" diff --git a/addons/report_webkit_sample/i18n/pt.po b/addons/report_webkit_sample/i18n/pt.po index 256566369c5..da64345f81c 100644 --- a/addons/report_webkit_sample/i18n/pt.po +++ b/addons/report_webkit_sample/i18n/pt.po @@ -23,12 +23,12 @@ msgid "WebKit invoice" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35 +#: report:report.webkitaccount.invoice:35 msgid "Supplier Invoice" msgstr "Factura de fornecedor" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Unit Price" msgstr "Preço unitário" @@ -53,91 +53,91 @@ msgid "Webkit Report Samples" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Disc.(%)" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22 +#: report:report.webkitaccount.invoice:22 msgid "Fax" msgstr "Fax" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Document" msgstr "Documento" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Description" msgstr "Descrição" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Price" msgstr "Preço" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Invoice Date" msgstr "Data da fatura" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "QTY" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64 +#: report:report.webkitaccount.invoice:64 msgid "Base" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Partner Ref." msgstr "Ref. do parceiro" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Taxes" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64 +#: report:report.webkitaccount.invoice:64 msgid "Amount" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28 +#: report:report.webkitaccount.invoice:28 msgid "VAT" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37 +#: report:report.webkitaccount.invoice:37 msgid "Refund" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19 +#: report:report.webkitaccount.invoice:19 msgid "Tel" msgstr "Telefone" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25 +#: report:report.webkitaccount.invoice:25 msgid "E-mail" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33 +#: report:report.webkitaccount.invoice:33 msgid "Invoice" msgstr "Fatura" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39 +#: report:report.webkitaccount.invoice:39 msgid "Supplier Refund" msgstr "Reembolso de Fornecedor" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76 +#: report:report.webkitaccount.invoice:76 msgid "Total" msgstr "Total" diff --git a/addons/report_webkit_sample/i18n/pt_BR.po b/addons/report_webkit_sample/i18n/pt_BR.po index febd7c23bf8..46e3797de2e 100644 --- a/addons/report_webkit_sample/i18n/pt_BR.po +++ b/addons/report_webkit_sample/i18n/pt_BR.po @@ -23,12 +23,12 @@ msgid "WebKit invoice" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35 +#: report:report.webkitaccount.invoice:35 msgid "Supplier Invoice" msgstr "Fatura de Fornecedor" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Unit Price" msgstr "Preço Unitário" @@ -53,91 +53,91 @@ msgid "Webkit Report Samples" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Disc.(%)" msgstr "Desc.(%)" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22 +#: report:report.webkitaccount.invoice:22 msgid "Fax" msgstr "Fax" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Document" msgstr "Documento" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Description" msgstr "Descrição" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Price" msgstr "Preço" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Invoice Date" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "QTY" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64 +#: report:report.webkitaccount.invoice:64 msgid "Base" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Partner Ref." msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Taxes" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64 +#: report:report.webkitaccount.invoice:64 msgid "Amount" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28 +#: report:report.webkitaccount.invoice:28 msgid "VAT" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37 +#: report:report.webkitaccount.invoice:37 msgid "Refund" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19 +#: report:report.webkitaccount.invoice:19 msgid "Tel" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25 +#: report:report.webkitaccount.invoice:25 msgid "E-mail" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33 +#: report:report.webkitaccount.invoice:33 msgid "Invoice" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39 +#: report:report.webkitaccount.invoice:39 msgid "Supplier Refund" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76 +#: report:report.webkitaccount.invoice:76 msgid "Total" msgstr "" diff --git a/addons/report_webkit_sample/i18n/report_webkit_sample.pot b/addons/report_webkit_sample/i18n/report_webkit_sample.pot index c7e056003b8..a6acd48d0f7 100644 --- a/addons/report_webkit_sample/i18n/report_webkit_sample.pot +++ b/addons/report_webkit_sample/i18n/report_webkit_sample.pot @@ -21,12 +21,12 @@ msgid "WebKit invoice" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35 +#: report:report.webkitaccount.invoice:35 msgid "Supplier Invoice" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Unit Price" msgstr "" @@ -48,92 +48,92 @@ msgid "Webkit Report Samples" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Disc.(%)" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22 +#: report:report.webkitaccount.invoice:22 msgid "Fax" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Document" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Description" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Price" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Invoice Date" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "QTY" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64 +#: report:report.webkitaccount.invoice:64 msgid "Base" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44 +#: report:report.webkitaccount.invoice:44 msgid "Partner Ref." msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49 +#: report:report.webkitaccount.invoice:49 msgid "Taxes" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64 +#: report:report.webkitaccount.invoice:64 msgid "Amount" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28 +#: report:report.webkitaccount.invoice:28 msgid "VAT" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37 +#: report:report.webkitaccount.invoice:37 msgid "Refund" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19 +#: report:report.webkitaccount.invoice:19 msgid "Tel" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25 +#: report:report.webkitaccount.invoice:25 msgid "E-mail" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33 +#: report:report.webkitaccount.invoice:33 msgid "Invoice" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39 +#: report:report.webkitaccount.invoice:39 msgid "Supplier Refund" msgstr "" #. module: report_webkit_sample -#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76 +#: report:report.webkitaccount.invoice:76 msgid "Total" msgstr "" From a1135313a6a2c97cb64bfa6111b6453bae65f385 Mon Sep 17 00:00:00 2001 From: skh Date: Fri, 20 May 2011 13:05:20 +0530 Subject: [PATCH 015/147] [FIX] Product: name_search() corrected while duplicating ids in sale_order_line (Ref : Case 5861) bzr revid: skh@tinyerp.com-20110520073520-5abu4xp34x74dhxu --- addons/product/product.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/product/product.py b/addons/product/product.py index f82e5791fd7..b566ac681e9 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -563,8 +563,7 @@ class product_product(osv.osv): if not len(ids): ids = self.search(cr, user, [('ean13','=',name)]+ args, limit=limit, context=context) if not len(ids): - ids = self.search(cr, user, [('default_code',operator,name)]+ args, limit=limit, context=context) - ids += self.search(cr, user, [('name',operator,name)]+ args, limit=limit, context=context) + ids = self.search(cr, user, ['|',('name',operator,name),('default_code',operator,name)] + args, limit=limit, context=context) if not len(ids): ptrn=re.compile('(\[(.*?)\])') res = ptrn.search(name) From e9581423e2410a070d28baa1f702a439219036b8 Mon Sep 17 00:00:00 2001 From: "Ravi Gohil (Open ERP)" Date: Mon, 23 May 2011 15:07:11 +0530 Subject: [PATCH 016/147] [FIX] stock : lambda missing with dates in _defaults fixed lp bug: https://launchpad.net/bugs/761460 fixed bzr revid: rgo@tinyerp.com-20110523093711-wjujxn7kf7qm9goy --- addons/stock/stock.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 5591b0e6333..99ee5e4de7f 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -440,7 +440,7 @@ class stock_location(osv.osv): total = 0.0 results2 = 0.0 - + for r in results: amount = pool_uom._compute_qty(cr, uid, r['product_uom'], r['product_qty'], context.get('uom', False)) results2 += amount @@ -494,7 +494,7 @@ class stock_tracking(osv.osv): _defaults = { 'active': 1, 'name': make_sscc, - 'date': time.strftime('%Y-%m-%d %H:%M:%S'), + 'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), } def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100): @@ -657,7 +657,7 @@ class stock_picking(osv.osv): 'move_type': 'direct', 'type': 'in', 'invoice_state': 'none', - 'date': time.strftime('%Y-%m-%d %H:%M:%S'), + 'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), 'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.picking', context=c) } def action_process(self, cr, uid, ids, context=None): @@ -1413,7 +1413,7 @@ class stock_production_lot(osv.osv): 'move_ids': fields.one2many('stock.move', 'prodlot_id', 'Moves for this production lot', readonly=True), } _defaults = { - 'date': time.strftime('%Y-%m-%d %H:%M:%S'), + 'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), 'name': lambda x, y, z, c: x.pool.get('ir.sequence').get(y, z, 'stock.lot.serial'), 'product_id': lambda x, y, z, c: c.get('product_id', False), } @@ -1449,7 +1449,7 @@ class stock_production_lot_revision(osv.osv): _defaults = { 'author_id': lambda x, y, z, c: z, - 'date': time.strftime('%Y-%m-%d'), + 'date': lambda *a: time.strftime('%Y-%m-%d'), } stock_production_lot_revision() @@ -1614,9 +1614,9 @@ class stock_move(osv.osv): 'priority': '1', 'product_qty': 1.0, 'scrapped' : False, - 'date': time.strftime('%Y-%m-%d %H:%M:%S'), + 'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.move', context=c), - 'date_expected': time.strftime('%Y-%m-%d %H:%M:%S'), + 'date_expected': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), } def write(self, cr, uid, ids, vals, context=None): @@ -2257,7 +2257,7 @@ class stock_move(osv.osv): new_move = self.copy(cr, uid, move.id, default_val) res += [new_move] - + for (id, name) in product_obj.name_get(cr, uid, [move.product_id.id]): self.log(cr, uid, move.id, "%s x %s %s" % (move.product_qty, name, _("were scrapped"))) @@ -2527,7 +2527,7 @@ class stock_inventory(osv.osv): } _defaults = { - 'date': time.strftime('%Y-%m-%d %H:%M:%S'), + 'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), 'state': 'draft', 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.inventory', context=c) } From fe75955b1c30bc8f9e6c48849518667f71f87b6d Mon Sep 17 00:00:00 2001 From: "Ravi Gohil (Open ERP)" Date: Mon, 23 May 2011 15:19:40 +0530 Subject: [PATCH 017/147] [FIX] crm : missing partner information while schedule phone call is fixed lp bug: https://launchpad.net/bugs/777347 fixed bzr revid: rgo@tinyerp.com-20110523094940-q1p8amsjr05qup4t --- addons/crm/crm_phonecall_menu.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml index f223ee16be9..cfaf5720cb1 100644 --- a/addons/crm/crm_phonecall_menu.xml +++ b/addons/crm/crm_phonecall_menu.xml @@ -9,6 +9,7 @@ src_model="res.partner" view_mode="calendar,tree,form" context="{'search_default_partner_id': [active_id], 'default_duration': 1.0}" + domain="[('partner_id', '=', active_id)]" groups="base.group_extended" /> From ac86286670637e1af8e2702cf39eb81099d8aa8e Mon Sep 17 00:00:00 2001 From: "Ravi Gohil (Open ERP)" Date: Mon, 23 May 2011 15:43:58 +0530 Subject: [PATCH 018/147] [FIX] stock : correct value in field creation date of stock_inventory object lp bug: https://launchpad.net/bugs/783361 fixed bzr revid: rgo@tinyerp.com-20110523101358-1z9az90dqss9weye --- addons/stock/stock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 5591b0e6333..f97d7d202af 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -2527,7 +2527,7 @@ class stock_inventory(osv.osv): } _defaults = { - 'date': time.strftime('%Y-%m-%d %H:%M:%S'), + 'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), 'state': 'draft', 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.inventory', context=c) } From d3b701d97cc8dc0f2dcc83f28ad862d8b516df87 Mon Sep 17 00:00:00 2001 From: skh Date: Wed, 25 May 2011 17:21:33 +0530 Subject: [PATCH 019/147] [FIX]: Change in data[] and init_xml[] in the stable 6.0 addons (Ref : Case 5661) bzr revid: skh@tinyerp.com-20110525115133-nif4bdakz2rd222i --- addons/auction/auction_data.xml | 2 +- addons/base_iban/base_iban_data.xml | 2 +- addons/base_report_designer/wizard/base_report_design_view.xml | 2 +- addons/crm/__openerp__.py | 1 - addons/document_ics/document_data.xml | 2 +- addons/hr_timesheet/hr_timesheet_data.xml | 2 +- addons/l10n_ch/dta_data.xml | 2 +- addons/l10n_ch/journal_data.xml | 2 +- addons/l10n_ch/sterchi_chart/fiscal_position.xml | 2 +- addons/l10n_cn/base_data.xml | 2 +- addons/l10n_es/taxes_data.xml | 2 +- addons/project_timesheet/project_timesheet_data.xml | 2 +- addons/survey/survey_data.xml | 2 +- 13 files changed, 12 insertions(+), 13 deletions(-) diff --git a/addons/auction/auction_data.xml b/addons/auction/auction_data.xml index d1f3f94a510..632219b80a5 100644 --- a/addons/auction/auction_data.xml +++ b/addons/auction/auction_data.xml @@ -1,6 +1,6 @@ - + diff --git a/addons/base_iban/base_iban_data.xml b/addons/base_iban/base_iban_data.xml index dae3999505e..e4c03b63996 100644 --- a/addons/base_iban/base_iban_data.xml +++ b/addons/base_iban/base_iban_data.xml @@ -1,6 +1,6 @@ - + diff --git a/addons/l10n_cn/base_data.xml b/addons/l10n_cn/base_data.xml index 252a04feb18..8ef15a80ca8 100644 --- a/addons/l10n_cn/base_data.xml +++ b/addons/l10n_cn/base_data.xml @@ -1,6 +1,6 @@ - + diff --git a/addons/l10n_es/taxes_data.xml b/addons/l10n_es/taxes_data.xml index 1c6e7e00a3a..09759e033e7 100644 --- a/addons/l10n_es/taxes_data.xml +++ b/addons/l10n_es/taxes_data.xml @@ -1,6 +1,6 @@ - + + + + + + + notify.message.search From ba16e35fef39c9aafba708c38e98fac99da85f0e Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Mon, 13 Jun 2011 16:47:47 +0530 Subject: [PATCH 063/147] [FIX] webkit: User friendly popup error message displayed when webkit report's path does not exist. lp bug: https://launchpad.net/bugs/747284 fixed bzr revid: rch@tinyerp.com-20110613111747-nh9j1t8kfss2o8vu --- addons/report_webkit/webkit_report.py | 44 +++++++++++++-------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py index 406013cef12..226c27f59bf 100644 --- a/addons/report_webkit/webkit_report.py +++ b/addons/report_webkit/webkit_report.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ############################################################################## # -# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) +# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) # All Right Reserved # # Author : Nicolas Bessi (Camptocamp) @@ -60,12 +60,12 @@ class WebKitParser(report_sxw): """Custom class that use webkit to render HTML reports Code partially taken from report openoffice. Thanks guys :) """ - - def __init__(self, name, table, rml=False, parser=False, + + def __init__(self, name, table, rml=False, parser=False, header=True, store=False): self.parser_instance = False self.localcontext={} - report_sxw.__init__(self, name, table, rml, parser, + report_sxw.__init__(self, name, table, rml, parser, header, store) def get_lib(self, cursor, uid, company) : @@ -81,7 +81,7 @@ class WebKitParser(report_sxw): ' http://code.google.com/p/wkhtmltopdf/downloads/list and set the'+ ' path to the executable on the Company form.'+ 'Minimal version is 0.9.9') - ) + ) if os.path.isabs(path) : if (os.path.exists(path) and os.access(path, os.X_OK)\ and os.path.basename(path).startswith('wkhtmltopdf')): @@ -118,7 +118,7 @@ class WebKitParser(report_sxw): head_file = file( os.path.join( tmp_dir, str(time.time()) + '.head.html' - ), + ), 'w' ) head_file.write(header) @@ -129,14 +129,14 @@ class WebKitParser(report_sxw): foot_file = file( os.path.join( tmp_dir, str(time.time()) + '.foot.html' - ), + ), 'w' ) foot_file.write(footer) foot_file.close() file_to_del.append(foot_file.name) command.extend(['--footer-html', foot_file.name]) - + if webkit_header.margin_top : command.extend(['--margin-top', str(webkit_header.margin_top).replace(',', '.')]) if webkit_header.margin_bottom : @@ -163,7 +163,7 @@ class WebKitParser(report_sxw): status = subprocess.call(command, stderr=subprocess.PIPE) # ignore stderr if status : raise except_osv( - _('Webkit raise an error' ), + _('Webkit raise an error' ), status ) except Exception: @@ -176,8 +176,8 @@ class WebKitParser(report_sxw): os.unlink(out) return pdf - - + + def setLang(self, lang): if not lang: lang = 'en_US' @@ -189,8 +189,8 @@ class WebKitParser(report_sxw): res = ir_translation._get_source(self.parser_instance.cr, self.parser_instance.uid, self.name, 'report', self.localcontext.get('lang', 'en_US'), src) if not res : return src - return res - + return res + def formatLang(self, value, digits=None, date=False, date_time=False, grouping=True, monetary=False): """format using the know cursor, language from localcontext""" if digits is None: @@ -199,7 +199,7 @@ class WebKitParser(report_sxw): return '' pool_lang = self.pool.get('res.lang') lang = self.localcontext['lang'] - + lang_ids = pool_lang.search(self.parser_instance.cr, self.parser_instance.uid, [('code','=',lang)])[0] lang_obj = pool_lang.browse(self.parser_instance.cr, self.parser_instance.uid, lang_ids) @@ -225,7 +225,7 @@ class WebKitParser(report_sxw): # override needed to keep the attachments' storing procedure def create_single_pdf(self, cursor, uid, ids, data, report_xml, context=None): """generate the PDF""" - + if context is None: context={} @@ -247,7 +247,7 @@ class WebKitParser(report_sxw): if report_xml.report_file : path = addons.get_module_resource(report_xml.report_file) - if os.path.exists(path) : + if path and os.path.exists(path) : template = file(path).read() if not template and report_xml.report_webkit_data : template = report_xml.report_webkit_data @@ -266,7 +266,7 @@ class WebKitParser(report_sxw): - - + diff --git a/addons/base/static/src/js/base.js b/addons/base/static/src/js/base.js index c0c1f9131d9..28022f8b764 100644 --- a/addons/base/static/src/js/base.js +++ b/addons/base/static/src/js/base.js @@ -72,9 +72,6 @@ openerp.base = function(instance) { if (openerp.base.list) { openerp.base.list(instance); } - if (openerp.base.tree) { - openerp.base.tree(instance); - } if (openerp.base. m2o) { openerp.base.m2o(instance); } @@ -87,6 +84,9 @@ openerp.base = function(instance) { if (openerp.web_mobile) { openerp.web_mobile(instance); } + if (openerp.base.view_tree) { + openerp.base.view_tree(instance); + } }; // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax: diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js index 74dfb650f1f..33aa311e9a2 100644 --- a/addons/base/static/src/js/chrome.js +++ b/addons/base/static/src/js/chrome.js @@ -467,6 +467,9 @@ openerp.base.Controller = openerp.base.BasicController.extend( /** @lends opener */ rpc: function(url, data, success, error) { return this.session.rpc(url, data, success, error); + }, + do_action: function(action, on_finished) { + return this.parent.do_action(action, on_finished); } }); diff --git a/addons/base/static/src/js/view_help.js b/addons/base/static/src/js/view_help.js new file mode 100644 index 00000000000..704c982eb3a --- /dev/null +++ b/addons/base/static/src/js/view_help.js @@ -0,0 +1,15 @@ +/*--------------------------------------------------------- + * OpenERP base library + *---------------------------------------------------------*/ + +openerp.base.view_help = function(openerp) { + +openerp.base.ProcessView = openerp.base.Controller.extend({ +}); + +openerp.base.HelpView = openerp.base.Controller.extend({ +}); + +}; + +// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax: diff --git a/addons/base/static/src/js/tree.js b/addons/base/static/src/js/view_tree.js similarity index 93% rename from addons/base/static/src/js/tree.js rename to addons/base/static/src/js/view_tree.js index e333c295473..ceb5478a4a7 100644 --- a/addons/base/static/src/js/tree.js +++ b/addons/base/static/src/js/view_tree.js @@ -2,7 +2,7 @@ * OpenERP base library *---------------------------------------------------------*/ -openerp.base.tree = function(openerp) { +openerp.base.view_tree = function(openerp) { openerp.base.views.add('tree', 'openerp.base.TreeView'); openerp.base.TreeView = openerp.base.Controller.extend({ diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js index f76ecc52c71..1c8b7487cd2 100644 --- a/addons/base/static/src/js/views.js +++ b/addons/base/static/src/js/views.js @@ -81,6 +81,19 @@ openerp.base.ActionManager = openerp.base.Controller.extend({ } }); +openerp.base.ActionDialog = openerp.base.Dialog.extend({ + identifier_prefix: 'action_dialog', + stop: function() { + this._super(this, arguments); + if (this.close_callback) { + this.close_callback(); + } + if (this.viewmanager) { + this.viewmanager.stop(); + } + } +}); + openerp.base.ViewManager = openerp.base.Controller.extend({ init: function(parent, element_id, dataset, views) { this._super(parent, element_id); @@ -333,19 +346,6 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({ } }); -openerp.base.ActionDialog = openerp.base.Dialog.extend({ - identifier_prefix: 'action_dialog', - stop: function() { - this._super(this, arguments); - if (this.close_callback) { - this.close_callback(); - } - if (this.viewmanager) { - this.viewmanager.stop(); - } - } -}); - openerp.base.Sidebar = openerp.base.BaseWidget.extend({ template: "ViewManager.sidebar", init: function(parent, view_manager) { @@ -490,12 +490,6 @@ openerp.base.View = openerp.base.Controller.extend({ */ openerp.base.views = new openerp.base.Registry(); -openerp.base.ProcessView = openerp.base.Controller.extend({ -}); - -openerp.base.HelpView = openerp.base.Controller.extend({ -}); - openerp.base.json_node_to_xml = function(node, single_quote, indent) { // For debugging purpose, this function will convert a json node back to xml // Maybe usefull for xml view editor From f59a0b6025c26d5dacda277fbbfc89a29c6475a5 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Tue, 19 Jul 2011 14:28:02 +0200 Subject: [PATCH 138/147] [MERGE] import: support for comma-separated ids in one2many, actually link the records. - not a real merge, as I just recovered the diff. original code by tfr. bzr revid: vmt@openerp.com-20110719122802-64jxm0h5uftsf94k --- openerp/osv/orm.py | 45 +++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index ff0d17af47a..48d66f30e32 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -1091,7 +1091,20 @@ class orm_template(object): if line[i] and skip: return False continue + + #set the mode for m2o, o2m, m2m : xml_id/id/name + if len(field) == len(prefix)+1: + mode = False + else: + mode = field[len(prefix)+1] + # TODO: improve this by using csv.csv_reader + def many_ids(line, relation, current_module, mode): + res = [] + for db_id in line.split(config.get('csv_internal_sep')): + res.append(_get_id(relation, db_id, current_module, mode)) + return [(6,0,res)] + # ID of the record using a XML ID if field[len(prefix)]=='id': try: @@ -1111,10 +1124,13 @@ class orm_template(object): if field[len(prefix)] in done: continue done[field[len(prefix)]] = True - relation_obj = self.pool.get(fields_def[field[len(prefix)]]['relation']) + relation = fields_def[field[len(prefix)]]['relation'] + relation_obj = self.pool.get(relation) newfd = relation_obj.fields_get( cr, uid, context=context ) pos = position - res = [] + + res = many_ids(line[i], relation, current_module, mode) + first = 0 while pos < len(datas): res2 = process_liness(self, datas, prefix + [field[len(prefix)]], current_module, relation_obj._name, newfd, pos, first) @@ -1124,30 +1140,23 @@ class orm_template(object): nbrmax = max(nbrmax, pos) warning += w2 first += 1 + + if data_res_id2: + res.append((4, data_res_id2)) + if (not newrow) or not reduce(lambda x, y: x or y, newrow.values(), 0): break + res.append( (data_res_id2 and 1 or 0, data_res_id2 or 0, newrow) ) + elif fields_def[field[len(prefix)]]['type']=='many2one': relation = fields_def[field[len(prefix)]]['relation'] - if len(field) == len(prefix)+1: - mode = False - else: - mode = field[len(prefix)+1] res = _get_id(relation, line[i], current_module, mode) elif fields_def[field[len(prefix)]]['type']=='many2many': relation = fields_def[field[len(prefix)]]['relation'] - if len(field) == len(prefix)+1: - mode = False - else: - mode = field[len(prefix)+1] - - # TODO: improve this by using csv.csv_reader - res = [] - for db_id in line[i].split(config.get('csv_internal_sep')): - res.append( _get_id(relation, db_id, current_module, mode) ) - res = [(6,0,res)] + res = many_ids(line[i], relation, current_module, mode) elif fields_def[field[len(prefix)]]['type'] == 'integer': res = line[i] and int(line[i]) or 0 @@ -1168,7 +1177,7 @@ class orm_template(object): else: res = line[i] - + row[field[len(prefix)]] = res or False result = (row, nbrmax, warning, data_res_id, xml_id) @@ -1182,7 +1191,7 @@ class orm_template(object): position = 0 while position Date: Wed, 20 Jul 2011 10:14:15 +0200 Subject: [PATCH 139/147] [FIX] initial loading of graph after view switches: fields argument to DataSet.read_slice has to be an array of strings providing an object does not work bzr revid: xmo@openerp.com-20110720081415-5fsk44p04x6i6et7 --- addons/base_graph/static/src/js/graph.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base_graph/static/src/js/graph.js b/addons/base_graph/static/src/js/graph.js index 3e45d3f70a5..b9115e79088 100644 --- a/addons/base_graph/static/src/js/graph.js +++ b/addons/base_graph/static/src/js/graph.js @@ -89,7 +89,7 @@ openerp.base_graph.GraphView = openerp.base.View.extend({ } this.dataset.domain = domain; this.dataset.context = this.view_manager.dataset.context; - this.dataset.read_slice(this.fields, 0, false, function(res) { + this.dataset.read_slice(_(this.fields).keys(), 0, false, function(res) { self.schedule_chart(res); }); } From 9a6c3ca614f80671820362c5636e6f6b1d180489 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 20 Jul 2011 10:15:18 +0200 Subject: [PATCH 140/147] [REM] graph title from within the graph itself, titling is provided by whatever structure lives outside the graph view itself bzr revid: xmo@openerp.com-20110720081518-1xitkhodpr2na8jt --- addons/base_graph/static/src/xml/base_graph.xml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/addons/base_graph/static/src/xml/base_graph.xml b/addons/base_graph/static/src/xml/base_graph.xml index f8dee0a91c6..449d64e9355 100644 --- a/addons/base_graph/static/src/xml/base_graph.xml +++ b/addons/base_graph/static/src/xml/base_graph.xml @@ -1,6 +1,4 @@ \ No newline at end of file +
    + From 3a6863298b36dabc4c1d78867cee08f72a7d5ee1 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Wed, 20 Jul 2011 11:25:57 +0200 Subject: [PATCH 141/147] [FIX] list test for sidebar bzr revid: al@openerp.com-20110720092557-uz4n4ayl33q8eptc --- addons/base/static/src/js/list.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js index 6812d4fac09..6bed26ce692 100644 --- a/addons/base/static/src/js/list.js +++ b/addons/base/static/src/js/list.js @@ -391,7 +391,8 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi this.groups.apoptosis().render()); this.hidden = false; } - this.view_manager.sidebar.do_refresh(true); + if(this.view_manager.sidebar) + this.view_manager.sidebar.do_refresh(true); }, do_hide: function () { this.$element.hide(); From addd4cbb9e5ef9d7fc509b554a148b6d74b428fa Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 20 Jul 2011 11:33:17 +0200 Subject: [PATCH 142/147] [fix] small problem in select create popup. bzr revid: nicolas.vanhoren@openerp.com-20110720093317-ko9efux2mo8lh0pt --- addons/base/static/src/js/form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index b304fca8d64..634aac006b4 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -1918,7 +1918,7 @@ openerp.base.form.SelectCreatePopup = openerp.base.BaseWidget.extend({ $sbutton.click(function() { self.on_select_elements(self.selected_ids); }); - self.view_list = new openerp.base.form.SelectCreateListView(this, + self.view_list = new openerp.base.form.SelectCreateListView(self, self.element_id + "_view_list", self.dataset, false, {'deletable': false}); self.view_list.popup = self; From b63f8f934a596135ae616645ad1669d465aeb3ad Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 20 Jul 2011 11:34:54 +0200 Subject: [PATCH 143/147] [imp] cosmetic improvement in m2o bzr revid: nicolas.vanhoren@openerp.com-20110720093454-llijpau6l3zvpfc3 --- addons/base/static/src/xml/base.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index c5e3614ca4a..1f15796acbb 100644 --- a/addons/base/static/src/xml/base.xml +++ b/addons/base/static/src/xml/base.xml @@ -521,7 +521,7 @@
    From a5a925d47221617644874fc536aa91b58fbb58f9 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Wed, 20 Jul 2011 12:39:41 +0200 Subject: [PATCH 144/147] [FIX] nullviewmanager temp fix bzr revid: al@openerp.com-20110720103941-octo8p2mzv0vtngo --- addons/base/static/src/js/form.js | 2 +- addons/base/static/src/js/views.js | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index 634aac006b4..e28e42385ec 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -1784,7 +1784,7 @@ openerp.base.form.FieldMany2Many = openerp.base.form.Field.extend({ self.on_ui_change(); }); - this.list_view = new openerp.base.form.Many2ManyListView(this.view.view_manager, this.list_id, this.dataset, false, { + this.list_view = new openerp.base.form.Many2ManyListView(new openerp.base.NullViewManager(this), this.list_id, this.dataset, false, { 'addable': 'Add', 'selectable': self.multi_selection }); diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js index 1c8b7487cd2..d14fdcbc12f 100644 --- a/addons/base/static/src/js/views.js +++ b/addons/base/static/src/js/views.js @@ -255,8 +255,10 @@ openerp.base.ViewManager = openerp.base.Controller.extend({ }); openerp.base.NullViewManager = openerp.base.generate_null_object_class(openerp.base.ViewManager, { - init: function() { - this._super(); + init: function(parent) { + this._super(parent); + if(parent) + this.session = parent.session; this.action = {flags: {}}; this.sidebar = new openerp.base.NullSidebar(); } From 7dda46b6056cbd7c0bc3305f81e7878ced000733 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 20 Jul 2011 13:01:34 +0200 Subject: [PATCH 145/147] [FIX] validation of float fields bzr revid: xmo@openerp.com-20110720110134-fi1zczzf5m579l12 --- addons/base/static/src/js/search.js | 38 +++++++++++++++++------------ 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js index fcf4a175b3c..e6df3767f4a 100644 --- a/addons/base/static/src/js/search.js +++ b/addons/base/static/src/js/search.js @@ -593,32 +593,40 @@ openerp.base.search.BooleanField = openerp.base.search.Field.extend({ } } }); -openerp.base.search.IntegerField = openerp.base.search.Field.extend({ +openerp.base.search.NumberField = openerp.base.search.Field.extend(/** @lends openerp.base.search.NumberField# */{ get_value: function () { if (!this.$element.val()) { return null; } - var val = parseInt(this.$element.val()); - var check = Number(this.$element.val()); - if (isNaN(check) || val !== check) { + var val = this.parse(this.$element.val()), + check = Number(this.$element.val()); + if (isNaN(val) || val !== check) { this.$element.addClass('error'); throw new openerp.base.search.Invalid( - this.attrs.name, this.$element.val(), "not a valid integer"); + this.attrs.name, this.$element.val(), this.error_message); } this.$element.removeClass('error'); return val; } }); -openerp.base.search.FloatField = openerp.base.search.Field.extend({ - get_value: function () { - var val = Number(this.$element.val()); - if (isNaN(val)) { - this.$element.addClass('error'); - throw new openerp.base.search.Invalid( - this.attrs.name, this.$element.val(), "not a valid number"); - } - this.$element.removeClass('error'); - return val; +/** + * @class + * @extends openerp.base.search.NumberField + */ +openerp.base.search.IntegerField = openerp.base.search.NumberField.extend(/** @lends openerp.base.search.IntegerField# */{ + error_message: "not a valid integer", + parse: function (value) { + return parseInt(value, 10); + } +}); +/** + * @class + * @extends openerp.base.search.NumberField + */ +openerp.base.search.FloatField = openerp.base.search.NumberField.extend(/** @lends openerp.base.search.FloatField# */{ + error_message: "not a valid number", + parse: function (value) { + return parseFloat(value); } }); openerp.base.search.SelectionField = openerp.base.search.Field.extend({ From 3b19c459fab04bb15570a3f1c34d6c9176608f46 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Wed, 20 Jul 2011 13:23:42 +0200 Subject: [PATCH 146/147] [IMP] header add db and login bzr revid: al@openerp.com-20110720112342-tnr6o3la3zikc7c8 --- addons/base/static/src/xml/base.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index 1f15796acbb..04841a2e297 100644 --- a/addons/base/static/src/xml/base.xml +++ b/addons/base/static/src/xml/base.xml @@ -143,8 +143,8 @@