From c3189af4e9c55418a12982faaf8f12e21d36b10a Mon Sep 17 00:00:00 2001 From: "Niels(Red15)" <> Date: Mon, 5 Oct 2009 18:35:27 +0530 Subject: [PATCH 01/14] [FIX] Project: wrong domain for 'Tasks in Progress' menuitem lp bug: https://launchpad.net/bugs/443069 fixed bzr revid: jvo@tinyerp.com-20091005130527-6q6grbeo0vq2ppvo --- addons/project/project_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 29c67ee640a..029e7c48d9e 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -492,7 +492,7 @@ project.task form tree,form,calendar,graph,gantt - [('state', '=', 'progress')] + [('state','=','open')] From 91c19a813ff688c21daf604041b5ce02312f5ba9 Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Tue, 6 Oct 2009 17:11:00 +0530 Subject: [PATCH 02/14] [FIX] Account :Invoice report had Partner name displayed at wrong position bzr revid: jvo@tinyerp.com-20091006114100-xox6rw1e03dqcwkq --- addons/account/report/invoice.rml | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml index 902a9db3e06..1f29782b7ea 100644 --- a/addons/account/report/invoice.rml +++ b/addons/account/report/invoice.rml @@ -233,7 +233,6 @@ [[ repeatIn(objects,'o') ]] - [[ o.partner_id.name ]] [[ setLang(o.partner_id.lang) ]] From 1996f293d8808e54084380af47cba8458fc21872 Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Wed, 7 Oct 2009 17:34:53 +0530 Subject: [PATCH 03/14] [FIX] Audittrail : Assigned Access Rights to non-admin user. lp bug: https://launchpad.net/bugs/401035 fixed bzr revid: jvo@tinyerp.com-20091007120453-2zp66ob2ria9r9tc --- addons/audittrail/security/ir.model.access.csv | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/audittrail/security/ir.model.access.csv b/addons/audittrail/security/ir.model.access.csv index 90895f202c4..ac367182f26 100644 --- a/addons/audittrail/security/ir.model.access.csv +++ b/addons/audittrail/security/ir.model.access.csv @@ -2,3 +2,6 @@ "access_audittrail_rule_group_system","audittrail rule system","model_audittrail_rule","base.group_system",1,1,1,1 "access_audittrail_log_group_system","audittrail log system","model_audittrail_log","base.group_system",1,1,1,1 "access_audittrail_logline_group_system","audittrail log line system","model_audittrail_log_line","base.group_system",1,1,1,1 +"access_audittrail_rule_all_users","audittrail rule all","model_audittrail_rule","base.group_user",1,0,0,0 +"access_audittrail_log_all_users","audittrail log all","model_audittrail_log","base.group_user",1,0,1,0 +"access_audittrail_log_line_all_users","audittrail log line all","model_audittrail_log_line","base.group_user",1,0,1,0 From 7b6f176319214ceb1070eacb56785abab14371c8 Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Wed, 7 Oct 2009 20:08:23 +0530 Subject: [PATCH 04/14] [FIX] Stock-MRP : Split production wizard made individual to mrp if mrp is not installed lp bug: https://launchpad.net/bugs/383057 fixed bzr revid: jvo@tinyerp.com-20091007143823-l2hx2mjzth33hv1z --- addons/mrp/mrp_wizard.xml | 7 ++ addons/mrp/wizard/__init__.py | 1 + addons/mrp/wizard/wizard_track_line.py | 131 +++++++++++++++++++++++ addons/stock/wizard/wizard_track_line.py | 24 +++-- 4 files changed, 152 insertions(+), 11 deletions(-) create mode 100644 addons/mrp/wizard/wizard_track_line.py diff --git a/addons/mrp/mrp_wizard.xml b/addons/mrp/mrp_wizard.xml index 94d7f663e01..d88ea321ac9 100644 --- a/addons/mrp/mrp_wizard.xml +++ b/addons/mrp/mrp_wizard.xml @@ -27,6 +27,13 @@ name="product.product.procurement" keyword="client_action_multi" id="product_procurement_wizard"/> + + diff --git a/addons/mrp/wizard/__init__.py b/addons/mrp/wizard/__init__.py index 232b4f9f00b..1fcb7406959 100644 --- a/addons/mrp/wizard/__init__.py +++ b/addons/mrp/wizard/__init__.py @@ -28,6 +28,7 @@ import wizard_workcenter_load import wizard_track_prod import wizard_change_production_qty import make_procurement +import wizard_track_line # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/mrp/wizard/wizard_track_line.py b/addons/mrp/wizard/wizard_track_line.py new file mode 100644 index 00000000000..26236c55e13 --- /dev/null +++ b/addons/mrp/wizard/wizard_track_line.py @@ -0,0 +1,131 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). All Rights Reserved +# $Id$ +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +############################################################################## + +import wizard +import netsvc +import pooler + +import time +from osv import osv +from tools.translate import _ + +track_form = ''' +
+ + + + +''' +fields = { + 'tracking_prefix': { + 'string': 'Tracking prefix', + 'type': 'char', + 'size': 64, + }, + 'quantity': { + 'string': 'Quantity per lot', + 'type': 'float', + 'default': 1, + } +} + +def _track_lines(self, cr, uid, data, context): + move_id = data['id'] + + pool = pooler.get_pool(cr.dbname) + prodlot_obj = pool.get('stock.production.lot') + move_obj = pool.get('stock.move') + production_obj = pool.get('mrp.production') + ir_sequence_obj = pool.get('ir.sequence') + + sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial') + if not sequence: + raise wizard.except_wizard(_('Error!'), _('No production sequence defined')) + if data['form']['tracking_prefix']: + sequence=data['form']['tracking_prefix']+'/'+(sequence or '') + + move = move_obj.browse(cr, uid, [move_id])[0] + quantity=data['form']['quantity'] + if quantity <= 0 or move.product_qty == 0: + return {} + uos_qty=quantity/move.product_qty*move.product_uos_qty + + quantity_rest = move.product_qty%quantity + uos_qty_rest = quantity_rest/move.product_qty*move.product_uos_qty + + update_val = { + 'product_qty': quantity, + 'product_uos_qty': uos_qty, + } + new_move = [] + production_ids = [] + for idx in range(int(move.product_qty//quantity)): + if idx: + current_move = move_obj.copy(cr, uid, move.id, {'state': move.state, 'production_id': move.production_id.id}) + new_move.append(current_move) + else: + current_move = move.id + new_prodlot = prodlot_obj.create(cr, uid, {'name': sequence, 'ref': '%d'%idx}, {'product_id': move.product_id.id}) + update_val['prodlot_id'] = new_prodlot + move_obj.write(cr, uid, [current_move], update_val) + production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])]) + + if quantity_rest > 0: + idx = int(move.product_qty//quantity) + update_val['product_qty']=quantity_rest + update_val['product_uos_qty']=uos_qty_rest + if idx: + current_move = move_obj.copy(cr, uid, move.id, {'state': move.state, 'production_id': move.production_id.id}) + current_move = move_obj.copy(cr, uid, move.id, {'state': move.state}) + new_move.append(current_move) + else: + current_move = move.id + new_prodlot = prodlot_obj.create(cr, uid, {'name': sequence, 'ref': '%d'%idx}, {'product_id': move.product_id.id}) + update_val['prodlot_id'] = new_prodlot + move_obj.write(cr, uid, [current_move], update_val) + + products = production_obj.read(cr, uid, production_ids, ['move_lines']) + for p in products: + for new in new_move: + if new not in p['move_lines']: + p['move_lines'].append(new) + production_obj.write(cr, uid, [p['id']], {'move_lines': [(6, 0, p['move_lines'])]}) + + return {} + +class wizard_track_move(wizard.interface): + states = { + 'init': { + 'actions': [], + 'result': {'type': 'form', 'arch': track_form, 'fields': fields, 'state': [('end', 'Cancel', 'gtk-cancel'), ('track', 'Ok', 'gtk-ok')]}, + }, + 'track': { + 'actions': [_track_lines], + 'result': {'type':'state', 'state':'end'} + } + } + +wizard_track_move('mrp.stock.move.track') + + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/stock/wizard/wizard_track_line.py b/addons/stock/wizard/wizard_track_line.py index 1aeeb0ad215..79c105b962b 100644 --- a/addons/stock/wizard/wizard_track_line.py +++ b/addons/stock/wizard/wizard_track_line.py @@ -54,7 +54,7 @@ def _track_lines(self, cr, uid, data, context): pool = pooler.get_pool(cr.dbname) prodlot_obj = pool.get('stock.production.lot') move_obj = pool.get('stock.move') - production_obj = pool.get('mrp.production') +# production_obj = pool.get('mrp.production') ir_sequence_obj = pool.get('ir.sequence') sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial') @@ -77,24 +77,26 @@ def _track_lines(self, cr, uid, data, context): 'product_uos_qty': uos_qty, } new_move = [] - production_ids = [] +# production_ids = [] for idx in range(int(move.product_qty//quantity)): if idx: - current_move = move_obj.copy(cr, uid, move.id, {'state': move.state, 'production_id': move.production_id.id}) +# current_move = move_obj.copy(cr, uid, move.id, {'state': move.state, 'production_id': move.production_id.id}) + current_move = move_obj.copy(cr, uid, move.id, {'state': move.state}) new_move.append(current_move) else: current_move = move.id new_prodlot = prodlot_obj.create(cr, uid, {'name': sequence, 'ref': '%d'%idx}, {'product_id': move.product_id.id}) update_val['prodlot_id'] = new_prodlot move_obj.write(cr, uid, [current_move], update_val) - production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])]) +# production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])]) if quantity_rest > 0: idx = int(move.product_qty//quantity) update_val['product_qty']=quantity_rest update_val['product_uos_qty']=uos_qty_rest if idx: - current_move = move_obj.copy(cr, uid, move.id, {'state': move.state, 'production_id': move.production_id.id}) +# current_move = move_obj.copy(cr, uid, move.id, {'state': move.state, 'production_id': move.production_id.id}) + current_move = move_obj.copy(cr, uid, move.id, {'state': move.state}) new_move.append(current_move) else: current_move = move.id @@ -102,12 +104,12 @@ def _track_lines(self, cr, uid, data, context): update_val['prodlot_id'] = new_prodlot move_obj.write(cr, uid, [current_move], update_val) - products = production_obj.read(cr, uid, production_ids, ['move_lines']) - for p in products: - for new in new_move: - if new not in p['move_lines']: - p['move_lines'].append(new) - production_obj.write(cr, uid, [p['id']], {'move_lines': [(6, 0, p['move_lines'])]}) +# products = production_obj.read(cr, uid, production_ids, ['move_lines']) +# for p in products: +# for new in new_move: +# if new not in p['move_lines']: +# p['move_lines'].append(new) +# production_obj.write(cr, uid, [p['id']], {'move_lines': [(6, 0, p['move_lines'])]}) return {} From 7b7c6250cdb222963f886da6e89b6fbe95882af8 Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Thu, 8 Oct 2009 11:33:06 +0530 Subject: [PATCH 05/14] [FIX] Stock: Picking report correction lp bug: https://launchpad.net/bugs/445547 fixed bzr revid: jvo@tinyerp.com-20091008060306-ppamofraaq3hlr3b --- addons/stock/report/picking.rml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml index 8de93045b84..1540357c590 100644 --- a/addons/stock/report/picking.rml +++ b/addons/stock/report/picking.rml @@ -132,7 +132,9 @@ [[ (picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.title) or '' ]] [[ picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.name ]] - [[ picking.address_id and picking.address_id.street or '' ]][[ picking.address_id and picking.address_id.zip or '' ]] + [[ picking.address_id and picking.address_id.street or '' ]] + [[ picking.address_id and picking.address_id.zip or '' ]] [[ picking.address_id and picking.address_id.city or '']] + @@ -190,7 +192,7 @@ Expected Shipping Date - weight + Weight
From 3de195d3730638334f30e9d665f903ccad28a417 Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Thu, 8 Oct 2009 11:49:24 +0530 Subject: [PATCH 06/14] [FIX] Base_vat : Spanish numbers validation corrected lp bug: https://launchpad.net/bugs/366944 fixed bzr revid: jvo@tinyerp.com-20091008061924-3malnmzjrtc44ryn --- addons/base_vat/partner.py | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/addons/base_vat/partner.py b/addons/base_vat/partner.py index ca91ab33562..e470244e5e4 100644 --- a/addons/base_vat/partner.py +++ b/addons/base_vat/partner.py @@ -378,10 +378,10 @@ class res_partner(osv.osv): 22: 'K', 23: 'E', } - - if vat[0] in ('A', 'B', 'C', 'D', 'E', 'F', 'G', 'H'): + #Legal persons with profit aim + if vat[0] in ('A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'J', 'U', 'V'): try: - int(vat[1:]) + int(vat[1:8]) except: return False sum = mult_add(2, int(vat[1])) + int(vat[2]) + \ @@ -391,10 +391,11 @@ class res_partner(osv.osv): check = 10 - (sum % 10) if check == 10: check = 0 - if check != int(vat[8]): - return False +# if check != int(vat[8]): +# return False return True - elif vat[0] in ('N', 'P', 'Q', 'S'): + #Legal persons with non-profit aim + elif vat[0] in ('N', 'P', 'Q', 'R', 'S', 'W'): try: int(vat[1:8]) except: @@ -408,17 +409,26 @@ class res_partner(osv.osv): if check != vat[8]: return False return True - elif vat[0] in ('K', 'L', 'M', 'X'): + #Foreign natural persons, under age 14 or non-residents + elif vat[0] in ('K', 'L', 'M', 'X', 'Y', 'Z'): + if vat[0] == 'Y': + check_value = '1' + vat[1:8] + elif vat[0] == 'Z': + check_value = '2' + vat[1:8] + else: + check_value = vat[1:8] + try: - int(vat[1:8]) + int(check_value) except: return False - check = 1 + (int(vat[1:8]) % 23) + check = 1 + (int(check_value) % 23) check = conv[check] if check != vat[8]: return False return True + #Spanish natural persons else: try: int(vat[:8]) From bf46b6e10585084c9393c3113afac9b03453c69e Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Thu, 8 Oct 2009 14:20:16 +0530 Subject: [PATCH 07/14] [FIX] Mrp_subproduct : Wrong calculation of QTYs corrected(Product qty,UOS qty) lp bug: https://launchpad.net/bugs/445267 fixed bzr revid: jvo@tinyerp.com-20091008085016-6s9tgo0qejtpxq1q --- addons/mrp_subproduct/mrp_subproduct.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_subproduct/mrp_subproduct.py index b45d3e6424a..92622845818 100644 --- a/addons/mrp_subproduct/mrp_subproduct.py +++ b/addons/mrp_subproduct/mrp_subproduct.py @@ -68,9 +68,9 @@ class mrp_production(osv.osv): qty2 = production.product_uos and production.product_uos_qty or False if sub_product.subproduct_type=='variable': if production.product_qty: - qty1 *= production.product_qty / (sub_product.product_qty or 1.0) + qty1 *= production.product_qty / (production.bom_id.product_qty or 1.0) if production.product_uos_qty: - qty2 *= production.product_uos_qty / (sub_product.product_qty or 1.0) + qty2 *= production.product_uos_qty / (production.bom_id.product_uos_qty or 1.0) data = { 'name':'PROD:'+production.name, 'date_planned': production.date_planned, From f895d6718c6ff02fc98c455011f5af4484913ddc Mon Sep 17 00:00:00 2001 From: "Niels(Red15)" <> Date: Thu, 8 Oct 2009 19:10:36 +0530 Subject: [PATCH 08/14] [FIX] CRM : Mailgate script has host as parameter now onwards lp bug: https://launchpad.net/bugs/446205 fixed bzr revid: jvo@tinyerp.com-20091008134036-7y5iplbsauwp3f0v --- addons/crm/scripts/openerp-mailgate/openerp-mailgate.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py b/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py index 6901fde7a14..f363d6f7df6 100755 --- a/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py +++ b/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py @@ -62,8 +62,8 @@ class rpc_proxy(object): return self.rpc.execute(self.dbname, self.user_id, self.passwd, *request) class email_parser(object): - def __init__(self, uid, password, section, email, email_default, dbname): - self.rpc = rpc_proxy(uid, password, dbname=dbname) + def __init__(self, uid, password, section, email, email_default, dbname, host): + self.rpc = rpc_proxy(uid, password, host=host, dbname=dbname) try: self.section_id = int(section) except: @@ -315,9 +315,11 @@ if __name__ == '__main__': parser.add_option("-s", "--section", dest="section", help="ID or code of the case section", default="support") parser.add_option("-m", "--default", dest="default", help="Default eMail in case of any trouble.", default=None) parser.add_option("-d", "--dbname", dest="dbname", help="Database name (default: terp)", default='terp') + parser.add_option("-h", "--host", dest="host", help="Hostname of the Open ERP Server", default="localhost") + (options, args) = parser.parse_args() - parser = email_parser(options.userid, options.password, options.section, options.email, options.default, dbname=options.dbname) + parser = email_parser(options.userid, options.password, options.section, options.email, options.default, dbname=options.dbname, host=options.host) msg_txt = email.message_from_file(sys.stdin) From 829dee02d85ed51c4d2203a8cdc658e0296323e4 Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Fri, 9 Oct 2009 10:51:00 +0530 Subject: [PATCH 09/14] [FIX] CRM : Mailgate script added option -he was conflicting,improved bzr revid: jvo@tinyerp.com-20091009052100-sh7y0361763v6th8 --- addons/crm/scripts/openerp-mailgate/openerp-mailgate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py b/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py index f363d6f7df6..e0bb8c2eae7 100755 --- a/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py +++ b/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py @@ -315,7 +315,7 @@ if __name__ == '__main__': parser.add_option("-s", "--section", dest="section", help="ID or code of the case section", default="support") parser.add_option("-m", "--default", dest="default", help="Default eMail in case of any trouble.", default=None) parser.add_option("-d", "--dbname", dest="dbname", help="Database name (default: terp)", default='terp') - parser.add_option("-h", "--host", dest="host", help="Hostname of the Open ERP Server", default="localhost") + parser.add_option("--host", dest="host", help="Hostname of the Open ERP Server", default="localhost") (options, args) = parser.parse_args() From 811dea54b48b2830c2d001b0385b03dee4793f92 Mon Sep 17 00:00:00 2001 From: Mantavya Gajjar Date: Fri, 9 Oct 2009 13:12:53 +0530 Subject: [PATCH 10/14] [FIX]: [account_followup] wrong sender for email lp bug: https://launchpad.net/bugs/446520 fixed bzr revid: mga@tinyerp.com-20091009074253-8he22w5jhgx529e0 --- addons/account_followup/wizard/wizard_followup_print.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account_followup/wizard/wizard_followup_print.py b/addons/account_followup/wizard/wizard_followup_print.py index 7729d267365..54e8f4a0eb7 100644 --- a/addons/account_followup/wizard/wizard_followup_print.py +++ b/addons/account_followup/wizard/wizard_followup_print.py @@ -162,7 +162,7 @@ class followup_all_print(wizard.interface): if (not dest) and adr.type=='default': if adr.email: dest = [adr.email] - src = tools.config.options['smtp_user'] + src = tools.config.options['email_from'] if not data['form']['partner_lang']: body = data['form']['email_body'] else: From 58a4fff0dd2af0561fe7c731e2b8d0ed631e995c Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Fri, 9 Oct 2009 14:29:36 +0530 Subject: [PATCH 11/14] [FIX] Account : Refund wuzard malfunctioned with modify invoice option lp bug: https://launchpad.net/bugs/446681 fixed bzr revid: jvo@tinyerp.com-20091009085936-dn97fmq2jpw9zhdi --- addons/account/wizard/wizard_refund.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/wizard/wizard_refund.py b/addons/account/wizard/wizard_refund.py index 39d92b58a35..2f93b0e3459 100644 --- a/addons/account/wizard/wizard_refund.py +++ b/addons/account/wizard/wizard_refund.py @@ -152,10 +152,10 @@ class wiz_refund(wizard.interface): invoice = invoice[0] del invoice['id'] invoice_lines = pool.get('account.invoice.line').read(cr, uid, invoice['invoice_line']) - invoice_lines = pool.get('account.invoice')._refund_cleanup_lines(invoice_lines) + invoice_lines = pool.get('account.invoice')._refund_cleanup_lines(cr, uid, invoice_lines) tax_lines = pool.get('account.invoice.tax').read( cr, uid, invoice['tax_line']) - tax_lines = pool.get('account.invoice')._refund_cleanup_lines(tax_lines) + tax_lines = pool.get('account.invoice')._refund_cleanup_lines(cr, uid, tax_lines) invoice.update({ 'type': inv.type, From 25f727dd7b2d3e4917a3bc1816fa5e131c88890f Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Fri, 9 Oct 2009 13:49:00 +0200 Subject: [PATCH 12/14] [FIX] Specify the name of the argument for the context, to avoir a critical bug bzr revid: stephane@openerp.com-20091009114900-r4j49l7dmmw5sze5 --- addons/account/project/report/account_journal.py | 2 +- addons/account/project/report/analytic_balance.py | 2 +- addons/account/project/report/analytic_check.py | 2 +- addons/account/project/report/analytic_journal.py | 2 +- addons/account/project/report/cost_ledger.py | 2 +- addons/account/project/report/inverted_analytic_balance.py | 2 +- addons/account/project/report/quantity_cost_ledger.py | 3 +-- addons/account/report/account_balance.py | 2 +- addons/account/report/account_journal.py | 2 +- addons/account/report/account_tax_code.py | 2 +- addons/account/report/aged_trial_balance.py | 2 +- addons/account/report/central_journal.py | 2 +- addons/account/report/general_journal.py | 2 +- addons/account/report/general_ledger.py | 2 +- addons/account/report/general_ledger_landscape.py | 2 +- addons/account/report/invoice.py | 2 +- addons/account/report/partner_balance.py | 2 +- addons/account/report/rml_parse.py | 2 +- addons/account/report/tax_report.py | 2 +- addons/account/report/third_party_ledger.py | 2 +- addons/account_analytic_plans/report/crossovered_analytic.py | 2 +- addons/account_balance/report/account_balance.py | 2 +- addons/account_balance/report/account_balance_landscape.py | 2 +- addons/account_balance/report/rml_parse.py | 2 +- .../account_budget/report/analytic_account_budget_report.py | 2 +- addons/account_budget/report/budget_report.py | 2 +- addons/account_budget/report/crossovered_budget_report.py | 2 +- addons/account_followup/report/report_followup_print.py | 2 +- .../report/report_account_invoice_layout.py | 2 +- .../account_invoice_layout/report/special_message_invoice.py | 2 +- addons/account_payment/report/payment_order.py | 2 +- addons/account_report/report/accounting_report.py | 2 +- addons/account_report/report/print_indicator.py | 2 +- addons/account_reporting/report/account_report_bs.py | 2 +- addons/account_voucher/report/report_voucher.py | 2 +- addons/account_voucher/report/report_voucher_amount.py | 4 ++-- addons/account_voucher/report/rml_parse.py | 2 +- addons/auction/report/auction_artists.py | 2 +- addons/auction/report/auction_bids.py | 2 +- addons/auction/report/auction_buyer_result.py | 2 +- addons/auction/report/auction_catelog.py | 2 +- addons/auction/report/auction_objects.py | 2 +- addons/auction/report/auction_result.py | 2 +- addons/auction/report/auction_total_rml.py | 2 +- addons/auction/report/bids_lots.py | 2 +- addons/auction/report/bids_phones_details.py | 2 +- addons/auction/report/buyer_form_report.py | 2 +- addons/auction/report/buyer_list.py | 2 +- addons/auction/report/catelogwithpictures.py | 2 +- addons/auction/report/deposit_seller.py | 2 +- addons/auction/report/lots_list.py | 2 +- addons/auction/report/lots_list_inventory.py | 2 +- addons/auction/report/lots_list_landscape.py | 2 +- addons/auction/report/report_lot_bar_code.py | 2 +- addons/auction/report/seller_form_report.py | 2 +- addons/hr_attendance/report/attendance_errors.py | 2 +- addons/hr_expense/report/expense.py | 2 +- addons/hr_timesheet_invoice/report/account_analytic_profit.py | 2 +- addons/hr_timesheet_invoice/report/cost_ledger.py | 2 +- addons/l10n_ch/report/bvr.py | 2 +- addons/l10n_fr/report/base_report.py | 2 +- addons/mrp/report/order.py | 2 +- addons/mrp_operations/report/mrp_code_barcode.py | 2 +- addons/mrp_operations/report/mrp_wc_barcode.py | 2 +- addons/mrp_repair/report/order.py | 2 +- addons/point_of_sale/report/pos_details.py | 2 +- addons/point_of_sale/report/pos_details_summary.py | 2 +- addons/point_of_sale/report/pos_invoice.py | 2 +- addons/point_of_sale/report/pos_lines.py | 2 +- addons/point_of_sale/report/pos_receipt.py | 2 +- addons/product/report/product_pricelist.py | 2 +- addons/purchase/report/order.py | 2 +- addons/purchase/report/request_quotation.py | 2 +- addons/report_intrastat/report/invoice.py | 2 +- addons/sale/report/order.py | 2 +- addons/sale/report/sale_prepare_allot.py | 2 +- addons/sale_delivery_report/report/shipping.py | 2 +- addons/stock/report/lot_location.py | 2 +- addons/stock/report/lot_overview.py | 2 +- addons/stock/report/lot_overview_all.py | 2 +- addons/stock/report/picking.py | 2 +- 81 files changed, 82 insertions(+), 83 deletions(-) diff --git a/addons/account/project/report/account_journal.py b/addons/account/project/report/account_journal.py index 2f46abaceda..a732c88a969 100644 --- a/addons/account/project/report/account_journal.py +++ b/addons/account/project/report/account_journal.py @@ -37,7 +37,7 @@ class journal_print(report_sxw.rml_parse): self.cr.execute('select sum(amount) from account_analytic_line where journal_id=%s', (journal_id,)) return self.cr.fetchone()[0] or 0.0 def __init__(self, cr, uid, name, context): - super(journal_print, self).__init__(cr, uid, name, context) + super(journal_print, self).__init__(cr, uid, name, context=context) self.localcontext = { 'time': time, 'lines': self.lines, diff --git a/addons/account/project/report/analytic_balance.py b/addons/account/project/report/analytic_balance.py index 0c7b0cda761..9e96dfdd1bd 100644 --- a/addons/account/project/report/analytic_balance.py +++ b/addons/account/project/report/analytic_balance.py @@ -27,7 +27,7 @@ from report import report_sxw class account_analytic_balance(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(account_analytic_balance, self).__init__(cr, uid, name, context) + super(account_analytic_balance, self).__init__(cr, uid, name, context=context) self.localcontext.update( { 'time': time, 'get_objects': self._get_objects, diff --git a/addons/account/project/report/analytic_check.py b/addons/account/project/report/analytic_check.py index 6e794b35d87..5a300966840 100644 --- a/addons/account/project/report/analytic_check.py +++ b/addons/account/project/report/analytic_check.py @@ -26,7 +26,7 @@ from report import report_sxw class account_analytic_analytic_check(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(account_analytic_analytic_check, self).__init__(cr, uid, name, context) + super(account_analytic_analytic_check, self).__init__(cr, uid, name, context=context) self.sum_gen_deb = 0.0 self.sum_gen_cred = 0.0 self.sum_ana_deb = 0.0 diff --git a/addons/account/project/report/analytic_journal.py b/addons/account/project/report/analytic_journal.py index 30faa18fecc..621d6139ab5 100644 --- a/addons/account/project/report/analytic_journal.py +++ b/addons/account/project/report/analytic_journal.py @@ -28,7 +28,7 @@ from report import report_sxw # class account_analytic_journal(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(account_analytic_journal, self).__init__(cr, uid, name, context) + super(account_analytic_journal, self).__init__(cr, uid, name, context=context) self.localcontext.update( { 'time': time, 'lines': self._lines, diff --git a/addons/account/project/report/cost_ledger.py b/addons/account/project/report/cost_ledger.py index 0641cfe2ba3..5c18b51d113 100644 --- a/addons/account/project/report/cost_ledger.py +++ b/addons/account/project/report/cost_ledger.py @@ -26,7 +26,7 @@ from report import report_sxw class account_analytic_cost_ledger(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(account_analytic_cost_ledger, self).__init__(cr, uid, name, context) + super(account_analytic_cost_ledger, self).__init__(cr, uid, name, context=context) self.localcontext.update( { 'time': time, 'lines_g': self._lines_g, diff --git a/addons/account/project/report/inverted_analytic_balance.py b/addons/account/project/report/inverted_analytic_balance.py index 345f60619d0..ada30ef567e 100644 --- a/addons/account/project/report/inverted_analytic_balance.py +++ b/addons/account/project/report/inverted_analytic_balance.py @@ -26,7 +26,7 @@ from report import report_sxw class account_inverted_analytic_balance(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(account_inverted_analytic_balance, self).__init__(cr, uid, name, context) + super(account_inverted_analytic_balance, self).__init__(cr, uid, name, context=context) self.localcontext.update( { 'time': time, 'lines_g': self._lines_g, diff --git a/addons/account/project/report/quantity_cost_ledger.py b/addons/account/project/report/quantity_cost_ledger.py index 5e79e16c1ed..9942bb96b26 100644 --- a/addons/account/project/report/quantity_cost_ledger.py +++ b/addons/account/project/report/quantity_cost_ledger.py @@ -26,8 +26,7 @@ from report import report_sxw class account_analytic_quantity_cost_ledger(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(account_analytic_quantity_cost_ledger, self).__init__(cr, uid, - name, context) + super(account_analytic_quantity_cost_ledger, self).__init__(cr, uid, name, context=context) self.localcontext.update( { 'time': time, 'lines_g': self._lines_g, diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py index ebf12dd9b08..49910b086a9 100644 --- a/addons/account/report/account_balance.py +++ b/addons/account/report/account_balance.py @@ -30,7 +30,7 @@ from report import report_sxw class account_balance(report_sxw.rml_parse): _name = 'report.account.account.balance' def __init__(self, cr, uid, name, context): - super(account_balance, self).__init__(cr, uid, name, context) + super(account_balance, self).__init__(cr, uid, name, context=context) self.sum_debit = 0.00 self.sum_credit = 0.00 self.date_lst = [] diff --git a/addons/account/report/account_journal.py b/addons/account/report/account_journal.py index f3c87ca1603..869b04b5dfd 100644 --- a/addons/account/report/account_journal.py +++ b/addons/account/report/account_journal.py @@ -29,7 +29,7 @@ from report import report_sxw # class journal_print(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(journal_print, self).__init__(cr, uid, name, context) + super(journal_print, self).__init__(cr, uid, name, context=context) self.localcontext.update( { 'time': time, 'lines': self.lines, diff --git a/addons/account/report/account_tax_code.py b/addons/account/report/account_tax_code.py index 773e9541d79..f3c3fb75e47 100644 --- a/addons/account/report/account_tax_code.py +++ b/addons/account/report/account_tax_code.py @@ -30,7 +30,7 @@ class account_tax_code_report(rml_parse.rml_parse): #_name = 'report.account.tax.code.entries' def __init__(self, cr, uid, name, context): - super(account_tax_code_report, self).__init__(cr, uid, name, context) + super(account_tax_code_report, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, 'get_line':self.get_line, diff --git a/addons/account/report/aged_trial_balance.py b/addons/account/report/aged_trial_balance.py index 652929e187d..4477e2a1561 100644 --- a/addons/account/report/aged_trial_balance.py +++ b/addons/account/report/aged_trial_balance.py @@ -28,7 +28,7 @@ from report import report_sxw class aged_trial_report(rml_parse.rml_parse): def __init__(self, cr, uid, name, context): - super(aged_trial_report, self).__init__(cr, uid, name, context) + super(aged_trial_report, self).__init__(cr, uid, name, context=context) self.line_query = '' self.total_account = [] diff --git a/addons/account/report/central_journal.py b/addons/account/report/central_journal.py index 2db5c6fe971..762282a3f90 100644 --- a/addons/account/report/central_journal.py +++ b/addons/account/report/central_journal.py @@ -28,7 +28,7 @@ from report import report_sxw # class journal_print(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(journal_print, self).__init__(cr, uid, name, context) + super(journal_print, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, 'lines': self.lines, diff --git a/addons/account/report/general_journal.py b/addons/account/report/general_journal.py index 926c3603e49..eb330134873 100644 --- a/addons/account/report/general_journal.py +++ b/addons/account/report/general_journal.py @@ -29,7 +29,7 @@ from report import report_sxw # class journal_print(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(journal_print, self).__init__(cr, uid, name, context) + super(journal_print, self).__init__(cr, uid, name, context=context) self.localcontext.update( { 'time': time, 'lines': self.lines, diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py index 534b4d52e67..f8712ea4863 100644 --- a/addons/account/report/general_ledger.py +++ b/addons/account/report/general_ledger.py @@ -53,7 +53,7 @@ class general_ledger(rml_parse.rml_parse): super(general_ledger, self).set_context(objects, data, new_ids, report_type) def __init__(self, cr, uid, name, context): - super(general_ledger, self).__init__(cr, uid, name, context) + super(general_ledger, self).__init__(cr, uid, name, context=context) self.date_borne = {} self.query = "" self.child_ids = "" diff --git a/addons/account/report/general_ledger_landscape.py b/addons/account/report/general_ledger_landscape.py index c63c4281173..0879a464f26 100644 --- a/addons/account/report/general_ledger_landscape.py +++ b/addons/account/report/general_ledger_landscape.py @@ -52,7 +52,7 @@ class general_ledger_landscape(rml_parse.rml_parse): super(general_ledger_landscape, self).set_context(objects, data, new_ids,report_type) def __init__(self, cr, uid, name, context): - super(general_ledger_landscape, self).__init__(cr, uid, name, context) + super(general_ledger_landscape, self).__init__(cr, uid, name, context=context) self.date_borne = {} self.query = "" self.child_ids = "" diff --git a/addons/account/report/invoice.py b/addons/account/report/invoice.py index 3ca850a148b..f125ab47b8b 100644 --- a/addons/account/report/invoice.py +++ b/addons/account/report/invoice.py @@ -25,7 +25,7 @@ from report import report_sxw class account_invoice(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(account_invoice, self).__init__(cr, uid, name, context) + super(account_invoice, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, }) diff --git a/addons/account/report/partner_balance.py b/addons/account/report/partner_balance.py index ddd6ad1ecb4..78067a3346a 100755 --- a/addons/account/report/partner_balance.py +++ b/addons/account/report/partner_balance.py @@ -28,7 +28,7 @@ from report import report_sxw class partner_balance(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(partner_balance, self).__init__(cr, uid, name, context) + super(partner_balance, self).__init__(cr, uid, name, context=context) self.date_lst = [] self.date_lst_string = '' self.account_ids = '' diff --git a/addons/account/report/rml_parse.py b/addons/account/report/rml_parse.py index e0c41e8f286..02a5a266236 100644 --- a/addons/account/report/rml_parse.py +++ b/addons/account/report/rml_parse.py @@ -32,7 +32,7 @@ import sys class rml_parse(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(rml_parse, self).__init__(cr, uid, name, context=None) + super(rml_parse, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'comma_me': self.comma_me, 'format_date': self._get_and_change_date_format_for_swiss, diff --git a/addons/account/report/tax_report.py b/addons/account/report/tax_report.py index 1f0332d2906..c4f8fdeb1f3 100644 --- a/addons/account/report/tax_report.py +++ b/addons/account/report/tax_report.py @@ -31,7 +31,7 @@ import re class tax_report(rml_parse.rml_parse): _name = 'report.account.vat.declaration' def __init__(self, cr, uid, name, context): - super(tax_report, self).__init__(cr, uid, name, context) + super(tax_report, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, 'get_period': self._get_period, diff --git a/addons/account/report/third_party_ledger.py b/addons/account/report/third_party_ledger.py index 9828fdfbd63..47407a31392 100644 --- a/addons/account/report/third_party_ledger.py +++ b/addons/account/report/third_party_ledger.py @@ -31,7 +31,7 @@ class third_party_ledger(rml_parse.rml_parse): def __init__(self, cr, uid, name, context): self.date_lst = [] self.date_lst_string = '' - super(third_party_ledger, self).__init__(cr, uid, name, context) + super(third_party_ledger, self).__init__(cr, uid, name, context=context) self.localcontext.update( { 'time': time, 'lines': self.lines, diff --git a/addons/account_analytic_plans/report/crossovered_analytic.py b/addons/account_analytic_plans/report/crossovered_analytic.py index 2fab914fb64..951e147d7a8 100644 --- a/addons/account_analytic_plans/report/crossovered_analytic.py +++ b/addons/account_analytic_plans/report/crossovered_analytic.py @@ -26,7 +26,7 @@ from report import report_sxw class crossovered_analytic(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(crossovered_analytic, self).__init__(cr, uid, name, context) + super(crossovered_analytic, self).__init__(cr, uid, name, context=context) self.localcontext.update( { 'time': time, 'lines': self._lines, diff --git a/addons/account_balance/report/account_balance.py b/addons/account_balance/report/account_balance.py index 4fe498ac147..d67efab75a2 100644 --- a/addons/account_balance/report/account_balance.py +++ b/addons/account_balance/report/account_balance.py @@ -35,7 +35,7 @@ parents = { class account_balance(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(account_balance, self).__init__(cr, uid, name, context) + super(account_balance, self).__init__(cr, uid, name, context=context) self.flag=1 self.dr_total= 0.00 self.cr_total= 0.00 diff --git a/addons/account_balance/report/account_balance_landscape.py b/addons/account_balance/report/account_balance_landscape.py index 372fdf2c441..925494f6021 100644 --- a/addons/account_balance/report/account_balance_landscape.py +++ b/addons/account_balance/report/account_balance_landscape.py @@ -36,7 +36,7 @@ parents = { class account_balance_landscape(rml_parse.rml_parse): def __init__(self, cr, uid, name, context): - super(account_balance_landscape, self).__init__(cr, uid, name, context) + super(account_balance_landscape, self).__init__(cr, uid, name, context=context) self.flag=1 self.dr_total= 0.00 self.cr_total= 0.00 diff --git a/addons/account_balance/report/rml_parse.py b/addons/account_balance/report/rml_parse.py index c5eceb5bcd1..37bb0add89e 100644 --- a/addons/account_balance/report/rml_parse.py +++ b/addons/account_balance/report/rml_parse.py @@ -32,7 +32,7 @@ import sys class rml_parse(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(rml_parse, self).__init__(cr, uid, name, context=None) + super(rml_parse, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'comma_me': self.comma_me, 'format_date': self._get_and_change_date_format_for_swiss, diff --git a/addons/account_budget/report/analytic_account_budget_report.py b/addons/account_budget/report/analytic_account_budget_report.py index a22195cfc76..a35fc3b15f4 100644 --- a/addons/account_budget/report/analytic_account_budget_report.py +++ b/addons/account_budget/report/analytic_account_budget_report.py @@ -26,7 +26,7 @@ import datetime class analytic_account_budget_report(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(analytic_account_budget_report, self).__init__(cr, uid, name, context) + super(analytic_account_budget_report, self).__init__(cr, uid, name, context=context) self.localcontext.update( { 'funct': self.funct, 'funct_total': self.funct_total, diff --git a/addons/account_budget/report/budget_report.py b/addons/account_budget/report/budget_report.py index 102707a14c7..c9c6c0750e4 100644 --- a/addons/account_budget/report/budget_report.py +++ b/addons/account_budget/report/budget_report.py @@ -27,7 +27,7 @@ import operator class budget_report(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(budget_report, self).__init__(cr, uid, name, context) + super(budget_report, self).__init__(cr, uid, name, context=context) self.localcontext.update( { 'lines': self.lines, 'budget_total': self.budget_total, diff --git a/addons/account_budget/report/crossovered_budget_report.py b/addons/account_budget/report/crossovered_budget_report.py index 3e46c1196f5..8b607e98cf1 100644 --- a/addons/account_budget/report/crossovered_budget_report.py +++ b/addons/account_budget/report/crossovered_budget_report.py @@ -29,7 +29,7 @@ import osv class budget_report(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(budget_report, self).__init__(cr, uid, name, context) + super(budget_report, self).__init__(cr, uid, name, context=context) self.localcontext.update( { 'funct': self.funct, 'funct_total': self.funct_total, diff --git a/addons/account_followup/report/report_followup_print.py b/addons/account_followup/report/report_followup_print.py index 53ad5ce2572..0c9768f45de 100644 --- a/addons/account_followup/report/report_followup_print.py +++ b/addons/account_followup/report/report_followup_print.py @@ -28,7 +28,7 @@ from report import report_sxw class report_rappel(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(report_rappel, self).__init__(cr, uid, name, context) + super(report_rappel, self).__init__(cr, uid, name, context=context) self.localcontext.update( { 'time' : time, 'ids_to_objects': self._ids_to_objects, diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.py b/addons/account_invoice_layout/report/report_account_invoice_layout.py index a577f7d656a..77221a54e81 100644 --- a/addons/account_invoice_layout/report/report_account_invoice_layout.py +++ b/addons/account_invoice_layout/report/report_account_invoice_layout.py @@ -25,7 +25,7 @@ from report import report_sxw class account_invoice_1(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(account_invoice_1, self).__init__(cr, uid, name, context) + super(account_invoice_1, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, 'invoice_lines': self.invoice_lines, diff --git a/addons/account_invoice_layout/report/special_message_invoice.py b/addons/account_invoice_layout/report/special_message_invoice.py index 38fe8739142..94dff32a54e 100644 --- a/addons/account_invoice_layout/report/special_message_invoice.py +++ b/addons/account_invoice_layout/report/special_message_invoice.py @@ -26,7 +26,7 @@ import pooler class account_invoice_with_message(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(account_invoice_with_message, self).__init__(cr, uid, name, context) + super(account_invoice_with_message, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, 'spcl_msg': self.spcl_msg, diff --git a/addons/account_payment/report/payment_order.py b/addons/account_payment/report/payment_order.py index 4767c63ba31..dec5c031f98 100644 --- a/addons/account_payment/report/payment_order.py +++ b/addons/account_payment/report/payment_order.py @@ -26,7 +26,7 @@ from report import report_sxw class payment_order(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(payment_order, self).__init__(cr, uid, name, context) + super(payment_order, self).__init__(cr, uid, name, context=context) self.localcontext.update( { 'time': time, diff --git a/addons/account_report/report/accounting_report.py b/addons/account_report/report/accounting_report.py index c489d99ca62..52f1a02221d 100644 --- a/addons/account_report/report/accounting_report.py +++ b/addons/account_report/report/accounting_report.py @@ -28,7 +28,7 @@ from report import report_sxw class accounting_report(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(accounting_report, self).__init__(cr, uid, name, context) + super(accounting_report, self).__init__(cr, uid, name, context=context) self.ret_list = [] self.localcontext.update({ 'time': time, diff --git a/addons/account_report/report/print_indicator.py b/addons/account_report/report/print_indicator.py index 9d4fa4673f4..53f59919b91 100644 --- a/addons/account_report/report/print_indicator.py +++ b/addons/account_report/report/print_indicator.py @@ -76,7 +76,7 @@ import os class accounting_report_indicator(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(accounting_report_indicator, self).__init__(cr, uid, name, context) + super(accounting_report_indicator, self).__init__(cr, uid, name, context=context) self.ret_list = [] self.localcontext.update({ 'time': time, diff --git a/addons/account_reporting/report/account_report_bs.py b/addons/account_reporting/report/account_report_bs.py index 955e4c12c6f..c741b0d2ff0 100644 --- a/addons/account_reporting/report/account_report_bs.py +++ b/addons/account_reporting/report/account_report_bs.py @@ -36,7 +36,7 @@ parents = { class account_report_bs(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(account_report_bs, self).__init__(cr, uid, name, context) + super(account_report_bs, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, 'lines': self.lines, diff --git a/addons/account_voucher/report/report_voucher.py b/addons/account_voucher/report/report_voucher.py index 27ba2efd488..9f40c6ad920 100755 --- a/addons/account_voucher/report/report_voucher.py +++ b/addons/account_voucher/report/report_voucher.py @@ -32,7 +32,7 @@ from tools import amount_to_text_en class report_voucher(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(report_voucher, self).__init__(cr, uid, name, context) + super(report_voucher, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, 'convert':self.convert, diff --git a/addons/account_voucher/report/report_voucher_amount.py b/addons/account_voucher/report/report_voucher_amount.py index 3b67ff7a9ac..246782e433e 100755 --- a/addons/account_voucher/report/report_voucher_amount.py +++ b/addons/account_voucher/report/report_voucher_amount.py @@ -32,7 +32,7 @@ from tools import amount_to_text_en class report_voucher_amount(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(report_voucher_amount, self).__init__(cr, uid, name, context) + super(report_voucher_amount, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, 'convert':self.convert @@ -48,4 +48,4 @@ report_sxw.report_sxw( 'account.voucher', 'addons/account_voucher/report/report_voucher_amount.rml', parser=report_voucher_amount,header=False -) \ No newline at end of file +) diff --git a/addons/account_voucher/report/rml_parse.py b/addons/account_voucher/report/rml_parse.py index 31bd26617cd..9f4b8e6bfb9 100644 --- a/addons/account_voucher/report/rml_parse.py +++ b/addons/account_voucher/report/rml_parse.py @@ -32,7 +32,7 @@ import sys class rml_parse(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(rml_parse, self).__init__(cr, uid, name, context=None) + super(rml_parse, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'comma_me': self.comma_me, 'format_date': self._get_and_change_date_format_for_swiss, diff --git a/addons/auction/report/auction_artists.py b/addons/auction/report/auction_artists.py index 91843906dff..c66531938f4 100644 --- a/addons/auction/report/auction_artists.py +++ b/addons/auction/report/auction_artists.py @@ -28,7 +28,7 @@ from report import report_sxw class auction_artists(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(auction_artists, self).__init__(cr, uid, name, context) + super(auction_artists, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, diff --git a/addons/auction/report/auction_bids.py b/addons/auction/report/auction_bids.py index 560160ac008..2153d246428 100644 --- a/addons/auction/report/auction_bids.py +++ b/addons/auction/report/auction_bids.py @@ -28,7 +28,7 @@ from report import report_sxw class auction_bids(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(auction_bids, self).__init__(cr, uid, name, context) + super(auction_bids, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, }) diff --git a/addons/auction/report/auction_buyer_result.py b/addons/auction/report/auction_buyer_result.py index 97ab54cc056..017f62eb5d0 100644 --- a/addons/auction/report/auction_buyer_result.py +++ b/addons/auction/report/auction_buyer_result.py @@ -28,7 +28,7 @@ from report import report_sxw class auction_buyer_result(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(auction_buyer_result, self).__init__(cr, uid, name, context) + super(auction_buyer_result, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, diff --git a/addons/auction/report/auction_catelog.py b/addons/auction/report/auction_catelog.py index 70b2b6db917..b9b8dad2dc7 100644 --- a/addons/auction/report/auction_catelog.py +++ b/addons/auction/report/auction_catelog.py @@ -28,7 +28,7 @@ from report import report_sxw class auction_catelog(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(auction_catelog, self).__init__(cr, uid, name, context) + super(auction_catelog, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, diff --git a/addons/auction/report/auction_objects.py b/addons/auction/report/auction_objects.py index 879b407c184..0879c7770e5 100644 --- a/addons/auction/report/auction_objects.py +++ b/addons/auction/report/auction_objects.py @@ -26,7 +26,7 @@ from report import report_sxw class auction_objects(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(auction_objects, self).__init__(cr, uid, name, context) + super(auction_objects, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, #'lines': self.lines diff --git a/addons/auction/report/auction_result.py b/addons/auction/report/auction_result.py index 48f21d73669..77ba88b9486 100644 --- a/addons/auction/report/auction_result.py +++ b/addons/auction/report/auction_result.py @@ -28,7 +28,7 @@ from report import report_sxw class auction_result(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(auction_result, self).__init__(cr, uid, name, context) + super(auction_result, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, diff --git a/addons/auction/report/auction_total_rml.py b/addons/auction/report/auction_total_rml.py index cc103e7c250..82c068bce26 100644 --- a/addons/auction/report/auction_total_rml.py +++ b/addons/auction/report/auction_total_rml.py @@ -29,7 +29,7 @@ from report import report_sxw class auction_total_rml(report_sxw.rml_parse): total_obj=[] def __init__(self, cr, uid, name, context): - super(auction_total_rml, self).__init__(cr, uid, name, context) + super(auction_total_rml, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, 'sum_taxes':self.sum_taxes, diff --git a/addons/auction/report/bids_lots.py b/addons/auction/report/bids_lots.py index 8358e76ea2a..e77d7948c92 100644 --- a/addons/auction/report/bids_lots.py +++ b/addons/auction/report/bids_lots.py @@ -28,7 +28,7 @@ from report import report_sxw class bids_lots(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(bids_lots, self).__init__(cr, uid, name, context) + super(bids_lots, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, }) diff --git a/addons/auction/report/bids_phones_details.py b/addons/auction/report/bids_phones_details.py index bf5e5343074..73899f957cd 100644 --- a/addons/auction/report/bids_phones_details.py +++ b/addons/auction/report/bids_phones_details.py @@ -28,7 +28,7 @@ from report import report_sxw class bids_phones_details(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(bids_phones_details, self).__init__(cr, uid, name, context) + super(bids_phones_details, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, }) diff --git a/addons/auction/report/buyer_form_report.py b/addons/auction/report/buyer_form_report.py index 20d93cef754..291be748930 100644 --- a/addons/auction/report/buyer_form_report.py +++ b/addons/auction/report/buyer_form_report.py @@ -30,7 +30,7 @@ class buyer_form_report(report_sxw.rml_parse): count=0 c=0 def __init__(self, cr, uid, name, context): - super(buyer_form_report, self).__init__(cr, uid, name, context) + super(buyer_form_report, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, 'sum_taxes': self.sum_taxes, diff --git a/addons/auction/report/buyer_list.py b/addons/auction/report/buyer_list.py index eaa44f22c0c..83799ba5169 100644 --- a/addons/auction/report/buyer_list.py +++ b/addons/auction/report/buyer_list.py @@ -34,7 +34,7 @@ class buyer_list(report_sxw.rml_parse): sum_buyer_price_val=0.0 sum_lot_val=0.0 def __init__(self, cr, uid, name, context): - super(buyer_list, self).__init__(cr, uid, name, context) + super(buyer_list, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, 'lines_lots_from_auction' : self.lines_lots_from_auction, diff --git a/addons/auction/report/catelogwithpictures.py b/addons/auction/report/catelogwithpictures.py index f3f954a2908..4063f884ad2 100644 --- a/addons/auction/report/catelogwithpictures.py +++ b/addons/auction/report/catelogwithpictures.py @@ -26,7 +26,7 @@ from report import report_sxw class catelogwithpictures(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(catelogwithpictures, self).__init__(cr, uid, name, context) + super(catelogwithpictures, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, diff --git a/addons/auction/report/deposit_seller.py b/addons/auction/report/deposit_seller.py index 4e0a184ffc7..f39fd6b5596 100644 --- a/addons/auction/report/deposit_seller.py +++ b/addons/auction/report/deposit_seller.py @@ -28,7 +28,7 @@ from report import report_sxw class deposit_seller(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(deposit_seller, self).__init__(cr, uid, name, context) + super(deposit_seller, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, diff --git a/addons/auction/report/lots_list.py b/addons/auction/report/lots_list.py index 32d23accb90..ad5e678c2f3 100644 --- a/addons/auction/report/lots_list.py +++ b/addons/auction/report/lots_list.py @@ -26,7 +26,7 @@ from report import report_sxw class lots_list(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(lots_list, self).__init__(cr, uid, name, context) + super(lots_list, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, 'bid_line' : self.bid_line diff --git a/addons/auction/report/lots_list_inventory.py b/addons/auction/report/lots_list_inventory.py index 42a993ccc7a..329591cf3ac 100644 --- a/addons/auction/report/lots_list_inventory.py +++ b/addons/auction/report/lots_list_inventory.py @@ -26,7 +26,7 @@ from report import report_sxw class lots_list_inventory(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(lots_list_inventory, self).__init__(cr, uid, name, context) + super(lots_list_inventory, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, 'bid_line' : self.bid_line diff --git a/addons/auction/report/lots_list_landscape.py b/addons/auction/report/lots_list_landscape.py index b638c6e54c4..99760d78715 100644 --- a/addons/auction/report/lots_list_landscape.py +++ b/addons/auction/report/lots_list_landscape.py @@ -26,7 +26,7 @@ from report import report_sxw class lots_list_llandscape(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(lots_list_landscape, self).__init__(cr, uid, name, context) + super(lots_list_landscape, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, diff --git a/addons/auction/report/report_lot_bar_code.py b/addons/auction/report/report_lot_bar_code.py index 3d9f8df4330..4767fe68c28 100644 --- a/addons/auction/report/report_lot_bar_code.py +++ b/addons/auction/report/report_lot_bar_code.py @@ -26,7 +26,7 @@ from report import report_sxw class auction_code_produit(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(auction_code_produit, self).__init__(cr, uid, name, context) + super(auction_code_produit, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, }) diff --git a/addons/auction/report/seller_form_report.py b/addons/auction/report/seller_form_report.py index a64759b2547..d0febfde712 100644 --- a/addons/auction/report/seller_form_report.py +++ b/addons/auction/report/seller_form_report.py @@ -28,7 +28,7 @@ from osv import osv class seller_form_report(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(seller_form_report, self).__init__(cr, uid, name, context) + super(seller_form_report, self).__init__(cr, uid, name, context=context) lot=self.pool.get('auction.lots').browse(cr,uid,uid) #address=lot.bord_vnd_id.address_get(self.cr,self.uid,[partner.id]) # partner=lot.bord_vnd_id.partner_id diff --git a/addons/hr_attendance/report/attendance_errors.py b/addons/hr_attendance/report/attendance_errors.py index ef3317e27da..58553cd5e83 100644 --- a/addons/hr_attendance/report/attendance_errors.py +++ b/addons/hr_attendance/report/attendance_errors.py @@ -28,7 +28,7 @@ import datetime class attendance_print(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(attendance_print, self).__init__(cr, uid, name, context) + super(attendance_print, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, 'lst': self._lst, diff --git a/addons/hr_expense/report/expense.py b/addons/hr_expense/report/expense.py index 0c35a035a38..376b5e6c16a 100644 --- a/addons/hr_expense/report/expense.py +++ b/addons/hr_expense/report/expense.py @@ -26,7 +26,7 @@ import datetime class expense(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(expense, self).__init__(cr, uid, name, context) + super(expense, self).__init__(cr, uid, name, context=context) self.localcontext.update( { 'time': time, }) diff --git a/addons/hr_timesheet_invoice/report/account_analytic_profit.py b/addons/hr_timesheet_invoice/report/account_analytic_profit.py index a767eba946a..600535ee027 100644 --- a/addons/hr_timesheet_invoice/report/account_analytic_profit.py +++ b/addons/hr_timesheet_invoice/report/account_analytic_profit.py @@ -25,7 +25,7 @@ import pooler class account_analytic_profit(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(account_analytic_profit, self).__init__(cr, uid, name, context) + super(account_analytic_profit, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'lines': self._lines, 'user_ids': self._user_ids, diff --git a/addons/hr_timesheet_invoice/report/cost_ledger.py b/addons/hr_timesheet_invoice/report/cost_ledger.py index 5e588f11e06..584ea3c6acd 100644 --- a/addons/hr_timesheet_invoice/report/cost_ledger.py +++ b/addons/hr_timesheet_invoice/report/cost_ledger.py @@ -27,7 +27,7 @@ from report import report_sxw class account_analytic_cost_ledger(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(account_analytic_cost_ledger, self).__init__(cr, uid, name, context) + super(account_analytic_cost_ledger, self).__init__(cr, uid, name, context=context) self.sum_revenue={} self.account_sum_revenue={} self.localcontext.update( { diff --git a/addons/l10n_ch/report/bvr.py b/addons/l10n_ch/report/bvr.py index c71c62a0da2..8804f6c876a 100755 --- a/addons/l10n_ch/report/bvr.py +++ b/addons/l10n_ch/report/bvr.py @@ -39,7 +39,7 @@ from mx.DateTime import * class account_invoice_bvr(report_sxw.rml_parse): """Report class that Allows to print BVR payement vector""" def __init__(self, cr, uid, name, context): - super(account_invoice_bvr, self).__init__(cr, uid, name, context) + super(account_invoice_bvr, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, 'user':self.pool.get("res.users").browse(cr,uid,uid), diff --git a/addons/l10n_fr/report/base_report.py b/addons/l10n_fr/report/base_report.py index 488f36304c5..52eb99154a6 100644 --- a/addons/l10n_fr/report/base_report.py +++ b/addons/l10n_fr/report/base_report.py @@ -31,7 +31,7 @@ from report import report_sxw class base_report(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(base_report, self).__init__(cr, uid, name, context) + super(base_report, self).__init__(cr, uid, name, context=context) self.localcontext.update( { 'time': time, '_load': self._load, diff --git a/addons/mrp/report/order.py b/addons/mrp/report/order.py index 5fc82b9f7f0..02526d88a64 100644 --- a/addons/mrp/report/order.py +++ b/addons/mrp/report/order.py @@ -27,7 +27,7 @@ import pooler class order(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(order, self).__init__(cr, uid, name, context) + super(order, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, }) diff --git a/addons/mrp_operations/report/mrp_code_barcode.py b/addons/mrp_operations/report/mrp_code_barcode.py index a4431e55b57..336a46ba546 100755 --- a/addons/mrp_operations/report/mrp_code_barcode.py +++ b/addons/mrp_operations/report/mrp_code_barcode.py @@ -26,7 +26,7 @@ from report import report_sxw class code_barcode(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(code_barcode, self).__init__(cr, uid, name, context) + super(code_barcode, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, }) diff --git a/addons/mrp_operations/report/mrp_wc_barcode.py b/addons/mrp_operations/report/mrp_wc_barcode.py index bc4fe4976ee..6725f95a95d 100755 --- a/addons/mrp_operations/report/mrp_wc_barcode.py +++ b/addons/mrp_operations/report/mrp_wc_barcode.py @@ -26,7 +26,7 @@ from report import report_sxw class workcenter_code(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(workcenter_code, self).__init__(cr, uid, name, context) + super(workcenter_code, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, }) diff --git a/addons/mrp_repair/report/order.py b/addons/mrp_repair/report/order.py index be6897d8c2e..b7f3d0bc19d 100644 --- a/addons/mrp_repair/report/order.py +++ b/addons/mrp_repair/report/order.py @@ -27,7 +27,7 @@ import pooler class order(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(order, self).__init__(cr, uid, name, context) + super(order, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, 'total': self.total, diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py index 1e5962c6586..6a6b9420255 100644 --- a/addons/point_of_sale/report/pos_details.py +++ b/addons/point_of_sale/report/pos_details.py @@ -112,7 +112,7 @@ class pos_details(report_sxw.rml_parse): return '%s - %s' % (min_date, max_date) def __init__(self, cr, uid, name, context): - super(pos_details, self).__init__(cr, uid, name, context) + super(pos_details, self).__init__(cr, uid, name, context=context) self.total = 0.0 self.localcontext.update({ 'time': time, diff --git a/addons/point_of_sale/report/pos_details_summary.py b/addons/point_of_sale/report/pos_details_summary.py index 826844effd6..dc625aee62e 100644 --- a/addons/point_of_sale/report/pos_details_summary.py +++ b/addons/point_of_sale/report/pos_details_summary.py @@ -109,7 +109,7 @@ class pos_details_summary(report_sxw.rml_parse): return '%s - %s' % (min_date, max_date) def __init__(self, cr, uid, name, context): - super(pos_details_summary, self).__init__(cr, uid, name, context) + super(pos_details_summary, self).__init__(cr, uid, name, context=context) self.total = 0.0 self.localcontext.update({ 'time': time, diff --git a/addons/point_of_sale/report/pos_invoice.py b/addons/point_of_sale/report/pos_invoice.py index 54423775614..1d2749b46ef 100644 --- a/addons/point_of_sale/report/pos_invoice.py +++ b/addons/point_of_sale/report/pos_invoice.py @@ -29,7 +29,7 @@ from tools.translate import _ class pos_invoice(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(pos_invoice, self).__init__(cr, uid, name, context) + super(pos_invoice, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, }) diff --git a/addons/point_of_sale/report/pos_lines.py b/addons/point_of_sale/report/pos_lines.py index 1abec66dc80..66f9754f412 100644 --- a/addons/point_of_sale/report/pos_lines.py +++ b/addons/point_of_sale/report/pos_lines.py @@ -27,7 +27,7 @@ from report import report_sxw class pos_lines(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(pos_lines, self).__init__(cr, uid, name, context) + super(pos_lines, self).__init__(cr, uid, name, context=context) self.total = 0.0 self.localcontext.update({ 'time': time, diff --git a/addons/point_of_sale/report/pos_receipt.py b/addons/point_of_sale/report/pos_receipt.py index 69f4bd706c2..15d8f177582 100644 --- a/addons/point_of_sale/report/pos_receipt.py +++ b/addons/point_of_sale/report/pos_receipt.py @@ -29,7 +29,7 @@ import pooler class order(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(order, self).__init__(cr, uid, name, context) + super(order, self).__init__(cr, uid, name, context=context) user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid) partner = user.company_id.partner_id diff --git a/addons/product/report/product_pricelist.py b/addons/product/report/product_pricelist.py index 3e232f7413c..dc3a1c3512c 100644 --- a/addons/product/report/product_pricelist.py +++ b/addons/product/report/product_pricelist.py @@ -27,7 +27,7 @@ import pooler class product_pricelist(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(product_pricelist, self).__init__(cr, uid, name, context) + super(product_pricelist, self).__init__(cr, uid, name, context=context) self.pricelist=False self.quantity=[] self.localcontext.update({ diff --git a/addons/purchase/report/order.py b/addons/purchase/report/order.py index 52aaa1ae865..66ba383141d 100644 --- a/addons/purchase/report/order.py +++ b/addons/purchase/report/order.py @@ -27,7 +27,7 @@ import pooler class order(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(order, self).__init__(cr, uid, name, context) + super(order, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, 'get_line_tax': self._get_line_tax, diff --git a/addons/purchase/report/request_quotation.py b/addons/purchase/report/request_quotation.py index 9acf4309264..0e920e2039d 100644 --- a/addons/purchase/report/request_quotation.py +++ b/addons/purchase/report/request_quotation.py @@ -27,7 +27,7 @@ import pooler class request_quotation(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(request_quotation, self).__init__(cr, uid, name, context) + super(request_quotation, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, 'user': self.pool.get('res.users').browse(cr, uid, uid, context) diff --git a/addons/report_intrastat/report/invoice.py b/addons/report_intrastat/report/invoice.py index 692b33d0095..7afdd1c180e 100644 --- a/addons/report_intrastat/report/invoice.py +++ b/addons/report_intrastat/report/invoice.py @@ -26,7 +26,7 @@ import pooler class account_invoice_intrastat(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(account_invoice_intrastat, self).__init__(cr, uid, name, context) + super(account_invoice_intrastat, self).__init__(cr, uid, name, context=context) self.total=0 self.localcontext.update({ 'time': time, diff --git a/addons/sale/report/order.py b/addons/sale/report/order.py index cb239b62f2a..ef33a9509f8 100644 --- a/addons/sale/report/order.py +++ b/addons/sale/report/order.py @@ -26,7 +26,7 @@ from osv import osv class order(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(order, self).__init__(cr, uid, name, context) + super(order, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, }) diff --git a/addons/sale/report/sale_prepare_allot.py b/addons/sale/report/sale_prepare_allot.py index ef59da50d7d..30f643d63f3 100644 --- a/addons/sale/report/sale_prepare_allot.py +++ b/addons/sale/report/sale_prepare_allot.py @@ -25,7 +25,7 @@ from report import report_sxw class sale_prepare(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(sale_prepare, self).__init__(cr, uid, name, context) + super(sale_prepare, self).__init__(cr, uid, name, context=context) self.localcontext.update( { 'allotment': self._allotment, }) diff --git a/addons/sale_delivery_report/report/shipping.py b/addons/sale_delivery_report/report/shipping.py index 63aeba6c10c..13ea8e754da 100644 --- a/addons/sale_delivery_report/report/shipping.py +++ b/addons/sale_delivery_report/report/shipping.py @@ -27,7 +27,7 @@ import pooler class shipping(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(shipping, self).__init__(cr, uid, name, context) + super(shipping, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, # 'get_address': self._get_address, diff --git a/addons/stock/report/lot_location.py b/addons/stock/report/lot_location.py index e20f89bb81f..a44ae876a9e 100644 --- a/addons/stock/report/lot_location.py +++ b/addons/stock/report/lot_location.py @@ -25,7 +25,7 @@ from report import report_sxw class lot_location(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(lot_location, self).__init__(cr, uid, name, context) + super(lot_location, self).__init__(cr, uid, name, context=context) self.grand_total = 0.0 self.localcontext.update({ diff --git a/addons/stock/report/lot_overview.py b/addons/stock/report/lot_overview.py index 3ecd26476df..f8442d7f3f6 100644 --- a/addons/stock/report/lot_overview.py +++ b/addons/stock/report/lot_overview.py @@ -25,7 +25,7 @@ from report import report_sxw class lot_overview(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(lot_overview, self).__init__(cr, uid, name, context) + super(lot_overview, self).__init__(cr, uid, name, context=context) self.price_total = 0.0 self.grand_total = 0.0 self.localcontext.update({ diff --git a/addons/stock/report/lot_overview_all.py b/addons/stock/report/lot_overview_all.py index 2f349d9bd93..addd7a9009f 100644 --- a/addons/stock/report/lot_overview_all.py +++ b/addons/stock/report/lot_overview_all.py @@ -25,7 +25,7 @@ from report import report_sxw class lot_overview_all(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(lot_overview_all, self).__init__(cr, uid, name, context) + super(lot_overview_all, self).__init__(cr, uid, name, context=context) self.price_total = 0.0 self.grand_total = 0.0 self.localcontext.update({ diff --git a/addons/stock/report/picking.py b/addons/stock/report/picking.py index 5a0746b80e8..0182ef3ba54 100644 --- a/addons/stock/report/picking.py +++ b/addons/stock/report/picking.py @@ -27,7 +27,7 @@ import pooler class picking(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(picking, self).__init__(cr, uid, name, context) + super(picking, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, }) From 6f68bf76ff2e7c669c0afecb41ec7dc78b70adc3 Mon Sep 17 00:00:00 2001 From: "HDA (OpenERP)" Date: Mon, 12 Oct 2009 15:53:33 +0530 Subject: [PATCH 13/14] Module:account_voucher Removed (tlh_TLH)Klingon translation file bzr revid: hda@tinyerp.com-20091012102333-tcvpvl11p43skegs --- addons/account_voucher/i18n/tlh_TLH.po | 598 ------------------------- 1 file changed, 598 deletions(-) delete mode 100644 addons/account_voucher/i18n/tlh_TLH.po diff --git a/addons/account_voucher/i18n/tlh_TLH.po b/addons/account_voucher/i18n/tlh_TLH.po deleted file mode 100644 index 40cccd6da7f..00000000000 --- a/addons/account_voucher/i18n/tlh_TLH.po +++ /dev/null @@ -1,598 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_voucher -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 5.0.0\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-05-19 14:36+0000\n" -"PO-Revision-Date: 2009-05-19 17:10+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-08-28 11:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_voucher -#: model:ir.actions.act_window,name:account_voucher.act_account_acount_move_line_open1 -msgid "Opening Balance Entry" -msgstr "" - -#. module: account_voucher -#: model:ir.ui.menu,name:account_voucher.menu_action_receipt_bakreceipt_voucher_list -msgid "Bank Receipts" -msgstr "" - -#. module: account_voucher -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "Particulars" -msgstr "" - -#. module: account_voucher -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "State :" -msgstr "" - -#. module: account_voucher -#: constraint:ir.actions.act_window:0 -msgid "Invalid model name in the action definition." -msgstr "" - -#. module: account_voucher -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "Ref. :" -msgstr "" - -#. module: account_voucher -#: selection:account.move,voucher_type:0 -#: selection:account.voucher,type:0 -#: selection:account.voucher.open,init,type:0 -#: model:ir.actions.act_window,name:account_voucher.action_view_cont_voucher_form -#: model:ir.ui.menu,name:account_voucher.menu_action_view_cont_voucher_form -msgid "Contra Voucher" -msgstr "" - -#. module: account_voucher -#: field:account.voucher,company_id:0 -msgid "Company" -msgstr "" - -#. module: account_voucher -#: selection:account.move,voucher_type:0 -#: selection:account.voucher,type:0 -#: model:ir.actions.act_window,name:account_voucher.action_view_jour_voucher_form -#: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_voucher_form -msgid "Journal Voucher" -msgstr "" - -#. module: account_voucher -#: rml:voucher.cash_receipt.drcr:0 -msgid "," -msgstr "" - -#. module: account_voucher -#: view:account.voucher:0 -msgid "Set to Draft" -msgstr "" - -#. module: account_voucher -#: wizard_button:account.voucher.open,init,open:0 -msgid "Open Voucher Entries" -msgstr "" - -#. module: account_voucher -#: model:ir.model,name:account_voucher.model_account_voucher_line -msgid "Voucher Line" -msgstr "" - -#. module: account_voucher -#: view:account.move:0 -msgid "Total Credit" -msgstr "" - -#. module: account_voucher -#: field:account.voucher,account_id:0 -#: field:account.voucher.line,account_id:0 -msgid "Account" -msgstr "" - -#. module: account_voucher -#: rml:voucher.cash_amount:0 -msgid "D" -msgstr "" - -#. module: account_voucher -#: field:account.account,level:0 -msgid "Level" -msgstr "" - -#. module: account_voucher -#: view:account.move:0 -msgid "Account Entry Line" -msgstr "" - -#. module: account_voucher -#: view:account.move:0 -msgid "Total Debit" -msgstr "" - -#. module: account_voucher -#: field:account.voucher,amount:0 -#: field:account.voucher.line,amount:0 -#: rml:voucher.cash_amount:0 -msgid "Amount" -msgstr "" - -#. module: account_voucher -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "Receiver's Signature" -msgstr "" - -#. module: account_voucher -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "No." -msgstr "" - -#. module: account_voucher -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "Amount (in words) :" -msgstr "" - -#. module: account_voucher -#: field:account.voucher.line,account_analytic_id:0 -msgid "Analytic Account" -msgstr "" - -#. module: account_voucher -#: selection:account.move,voucher_type:0 -#: selection:account.voucher,type:0 -#: selection:account.voucher.open,init,type:0 -#: model:ir.actions.act_window,name:account_voucher.action_view_jour_sale_voucher_form -#: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_sale_voucher_form -msgid "Journal Sale Voucher" -msgstr "" - -#. module: account_voucher -#: model:ir.actions.act_window,name:account_voucher.action_receipt_vou_voucher_list -#: model:ir.ui.menu,name:account_voucher.menu_action_receipt_vou_voucher_list -msgid "Receipt Vouchers" -msgstr "" - -#. module: account_voucher -#: rml:voucher.cash_amount:0 -msgid "Account :" -msgstr "" - -#. module: account_voucher -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "On Account of :" -msgstr "" - -#. module: account_voucher -#: model:ir.actions.act_window,name:account_voucher.action_payments_bankpay_voucher_list -#: model:ir.actions.act_window,name:account_voucher.action_payments_cashpay_voucher_list -#: model:ir.actions.act_window,name:account_voucher.action_payments_voucher_list -#: model:ir.ui.menu,name:account_voucher.menu_action_payments_voucher_list -msgid "Payment Vouchers" -msgstr "" - -#. module: account_voucher -#: view:account.voucher:0 -msgid "Create" -msgstr "" - -#. module: account_voucher -#: selection:account.account,type1:0 -#: selection:account.account.template,type1:0 -msgid "None" -msgstr "" - -#. module: account_voucher -#: field:account.voucher,number:0 -msgid "Number" -msgstr "" - -#. module: account_voucher -#: view:account.move:0 -#: field:account.voucher,state:0 -#: wizard_field:account.voucher.open,init,state:0 -msgid "State" -msgstr "" - -#. module: account_voucher -#: selection:account.account,type1:0 -#: selection:account.account.template,type1:0 -#: selection:account.voucher.line,type:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "Debit" -msgstr "" - -#. module: account_voucher -#: field:account.voucher,type:0 -#: field:account.voucher.line,type:0 -msgid "Type" -msgstr "" - -#. module: account_voucher -#: model:ir.ui.menu,name:account_voucher.menu_action_voucher_list -msgid "Voucher Entries" -msgstr "" - -#. module: account_voucher -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "Authorised Signatory" -msgstr "" - -#. module: account_voucher -#: view:account.voucher:0 -#: model:ir.actions.act_window,name:account_voucher.action_voucher_list -msgid "Vouchers" -msgstr "" - -#. module: account_voucher -#: view:account.voucher:0 -#: field:account.voucher.line,voucher_id:0 -#: model:res.request.link,name:account_voucher.req_link_voucher -msgid "Voucher" -msgstr "" - -#. module: account_voucher -#: wizard_view:account.voucher.open,init:0 -#: model:ir.ui.menu,name:account_voucher.menu_wizard_account_voucher_open -msgid "Open Vouchers" -msgstr "" - -#. module: account_voucher -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "" - -#. module: account_voucher -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "Dated :" -msgstr "" - -#. module: account_voucher -#: model:ir.ui.menu,name:account_voucher.menu_action_receipt_cashreceipt_voucher_list -msgid "Cash Receipts" -msgstr "" - -#. module: account_voucher -#: field:account.voucher,partner_id:0 -#: field:account.voucher.line,partner_id:0 -msgid "Partner" -msgstr "" - -#. module: account_voucher -#: model:ir.ui.menu,name:account_voucher.menu_action_view_bank_pay_voucher_form -msgid "New Bank Payment" -msgstr "" - -#. module: account_voucher -#: view:account.voucher:0 -#: field:account.voucher,payment_ids:0 -msgid "Voucher Lines" -msgstr "" - -#. module: account_voucher -#: field:account.voucher,currency_id:0 -msgid "Currency" -msgstr "" - -#. module: account_voucher -#: view:account.move:0 -#: field:account.move,narration:0 -#: view:account.voucher:0 -#: field:account.voucher,narration:0 -msgid "Narration" -msgstr "" - -#. module: account_voucher -#: field:account.voucher,reference:0 -msgid "Voucher Reference" -msgstr "" - -#. module: account_voucher -#: model:ir.ui.menu,name:account_voucher.menu_action_view_cash_rec_voucher_form -msgid "New Cash Receipt" -msgstr "" - -#. module: account_voucher -#: model:ir.actions.report.xml,name:account_voucher.report_account_voucher_amt -msgid "Voucher Report" -msgstr "" - -#. module: account_voucher -#: field:account.account,open_bal:0 -msgid "Opening Balance" -msgstr "" - -#. module: account_voucher -#: selection:account.voucher,state:0 -#: selection:account.voucher.open,init,state:0 -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "Draft" -msgstr "" - -#. module: account_voucher -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "PRO-FORMA" -msgstr "" - -#. module: account_voucher -#: model:ir.actions.act_window,name:account_voucher.action_receipt_cashreceipt_voucher_list -msgid "Cash Receipt" -msgstr "" - -#. module: account_voucher -#: model:ir.ui.menu,name:account_voucher.menu_action_view_cash_pay_voucher_form -msgid "New Cash Payment" -msgstr "" - -#. module: account_voucher -#: view:account.move:0 -msgid "Optional Information" -msgstr "" - -#. module: account_voucher -#: view:account.voucher:0 -msgid "General Entries" -msgstr "" - -#. module: account_voucher -#: field:account.voucher,date:0 -msgid "Date" -msgstr "" - -#. module: account_voucher -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid ":" -msgstr "" - -#. module: account_voucher -#: field:account.account,type1:0 -#: field:account.account.template,type1:0 -msgid "Dr/Cr" -msgstr "" - -#. module: account_voucher -#: model:ir.actions.report.xml,name:account_voucher.report_account_voucher -msgid "Voucher Report (Cr/Dr)" -msgstr "" - -#. module: account_voucher -#: field:account.move,voucher_type:0 -#: wizard_field:account.voucher.open,init,type:0 -msgid "Voucher Type" -msgstr "" - -#. module: account_voucher -#: selection:account.account,type1:0 -#: selection:account.account.template,type1:0 -#: selection:account.voucher.line,type:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "Credit" -msgstr "" - -#. module: account_voucher -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "Through :" -msgstr "" - -#. module: account_voucher -#: field:account.voucher,reference_type:0 -msgid "Reference Type" -msgstr "" - -#. module: account_voucher -#: model:ir.model,name:account_voucher.model_account_voucher -msgid "Accounting Voucher" -msgstr "" - -#. module: account_voucher -#: field:account.voucher,period_id:0 -msgid "Period" -msgstr "" - -#. module: account_voucher -#: model:ir.ui.menu,name:account_voucher.menu_action_payments_bankpay_voucher_list -msgid "Bank Payments" -msgstr "" - -#. module: account_voucher -#: view:account.move:0 -msgid "General Information" -msgstr "" - -#. module: account_voucher -#: wizard_field:account.voucher.open,init,period_ids:0 -msgid "Periods" -msgstr "" - -#. module: account_voucher -#: view:account.voucher:0 -#: selection:account.voucher,state:0 -#: wizard_button:account.voucher.open,init,end:0 -#: selection:account.voucher.open,init,state:0 -msgid "Cancel" -msgstr "" - -#. module: account_voucher -#: view:account.voucher:0 -#: selection:account.voucher,state:0 -#: selection:account.voucher.open,init,state:0 -msgid "Pro-forma" -msgstr "" - -#. module: account_voucher -#: constraint:ir.model:0 -msgid "" -"The Object name must start with x_ and not contain any special character !" -msgstr "" - -#. module: account_voucher -#: view:account.voucher:0 -msgid "Other Info" -msgstr "" - -#. module: account_voucher -#: model:ir.module.module,shortdesc:account_voucher.module_meta_information -msgid "Accounting Voucher Entries" -msgstr "" - -#. module: account_voucher -#: field:res.currency,sub_name:0 -msgid "Sub Currency" -msgstr "" - -#. module: account_voucher -#: model:ir.actions.act_window,name:account_voucher.action_other_voucher_list -#: model:ir.ui.menu,name:account_voucher.menu_action_other_voucher_list -msgid "Other Vouchers" -msgstr "" - -#. module: account_voucher -#: field:account.voucher.line,name:0 -msgid "Description" -msgstr "" - -#. module: account_voucher -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "Canceled" -msgstr "" - -#. module: account_voucher -#: selection:account.move,voucher_type:0 -#: selection:account.voucher,type:0 -#: selection:account.voucher.open,init,type:0 -#: model:ir.actions.act_window,name:account_voucher.action_view_cash_pay_voucher_form -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "Cash Payment Voucher" -msgstr "" - -#. module: account_voucher -#: model:ir.actions.act_window,name:account_voucher.action_receipt_bakreceipt_voucher_list -msgid "Bank Receipt" -msgstr "" - -#. module: account_voucher -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "-" -msgstr "" - -#. module: account_voucher -#: selection:account.move,voucher_type:0 -#: selection:account.voucher,type:0 -#: selection:account.voucher.open,init,type:0 -#: model:ir.actions.act_window,name:account_voucher.action_view_jour_pur_voucher_form -#: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_pur_voucher_form -msgid "Journal Purchase Voucher" -msgstr "" - -#. module: account_voucher -#: view:account.account:0 -msgid "Closing Balance" -msgstr "" - -#. module: account_voucher -#: field:account.voucher.line,ref:0 -msgid "Ref." -msgstr "" - -#. module: account_voucher -#: selection:account.voucher,state:0 -#: selection:account.voucher.open,init,state:0 -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "Posted" -msgstr "" - -#. module: account_voucher -#: field:account.voucher,name:0 -msgid "Name" -msgstr "" - -#. module: account_voucher -#: field:account.voucher,move_ids:0 -msgid "Real Entry" -msgstr "" - -#. module: account_voucher -#: model:ir.actions.wizard,name:account_voucher.wizard_account_voucher_open -msgid "Open a Voucher Entry" -msgstr "" - -#. module: account_voucher -#: field:account.voucher,move_id:0 -msgid "Account Entry" -msgstr "" - -#. module: account_voucher -#: view:account.voucher:0 -msgid "Entry Lines" -msgstr "" - -#. module: account_voucher -#: model:ir.ui.menu,name:account_voucher.menu_action_view_bank_rec_voucher_form -msgid "New Bank Receipt" -msgstr "" - -#. module: account_voucher -#: model:ir.ui.menu,name:account_voucher.menu_action_payments_cashpay_voucher_list -msgid "Cash Payments" -msgstr "" - -#. module: account_voucher -#: selection:account.move,voucher_type:0 -#: selection:account.voucher,type:0 -#: selection:account.voucher.open,init,type:0 -#: model:ir.actions.act_window,name:account_voucher.action_view_cash_rec_voucher_form -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "Cash Receipt Voucher" -msgstr "" - -#. module: account_voucher -#: selection:account.move,voucher_type:0 -#: selection:account.voucher,type:0 -#: selection:account.voucher.open,init,type:0 -#: model:ir.actions.act_window,name:account_voucher.action_view_bank_pay_voucher_form -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "Bank Payment Voucher" -msgstr "" - -#. module: account_voucher -#: selection:account.move,voucher_type:0 -#: selection:account.voucher,type:0 -#: selection:account.voucher.open,init,type:0 -#: model:ir.actions.act_window,name:account_voucher.action_view_bank_rec_voucher_form -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "Bank Receipt Voucher" -msgstr "" - -#. module: account_voucher -#: field:account.account,journal_id:0 -#: field:account.voucher,journal_id:0 -msgid "Journal" -msgstr "" From 2a2bb45c5e57a950258887422c637e06a6d2e368 Mon Sep 17 00:00:00 2001 From: "GPA(OpenERP)" <> Date: Mon, 12 Oct 2009 18:03:10 +0530 Subject: [PATCH 14/14] [FIX] Project_timesheet : Wrong synchro on analytic line creation fro tasks(for name). lp bug: https://launchpad.net/bugs/447402 fixed bzr revid: jvo@tinyerp.com-20091012123310-gih8iz51zuxmlxs4 --- addons/project_timesheet/project_timesheet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py index 71c3542c010..f914faec86f 100644 --- a/addons/project_timesheet/project_timesheet.py +++ b/addons/project_timesheet/project_timesheet.py @@ -84,7 +84,7 @@ class project_work(osv.osv): if line_id in list_avail_ids: obj = self.pool.get('hr.analytic.timesheet') if 'name' in vals: - vals_line['name'] = '%s: %s' % (tools.ustr(task.name), tools.ustr(vals['name']) or '/') + vals_line['name'] = '%s: %s' % (tools.ustr(task.task_id.name), tools.ustr(vals['name']) or '/') if 'user_id' in vals: vals_line['user_id'] = vals['user_id'] if 'date' in vals: