odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] 

* add missing tools.translate
 * translate all missing raise
 * add encoding: utf-8 in missing file
 * add vim comment (when missing) at the end of file
 * convert tabs to spaces (PEP8 Compliant)
 * more pythonic when concatenate value

bzr revid: christophe.chauvet@syleam.fr-20090306235010-kf09klskd2voo5cp
This commit is contained in:
Christophe Chauvet 2009-03-07 00:50:10 +01:00
parent 1a21d05294
commit 6d2fac36f6
162 changed files with 365 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/account.py
View File

@ -1496,7 +1496,7 @@ class account_model(osv.osv):
for model in self.browse(cr, uid, ids, context):
period_id = self.pool.get('account.period').find(cr,uid, context=context)
if not period_id:
raise osv.except_osv('No period found !', 'Unable to find a valid period !')
raise osv.except_osv(_('No period found !'), _('Unable to find a valid period !'))
period_id = period_id[0]
move_id = self.pool.get('account.move').create(cr, uid, {
'ref': model.ref,

1
addons/account/project/wizard/wizard_account_analytic_line.py
View File

@ -77,3 +77,4 @@ class account_analytic_line(wizard.interface):
}
}
account_analytic_line('account.analytic.line')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/account/report/account_balance.py
View File

@ -227,3 +227,4 @@ class account_balance(report_sxw.rml_parse):
return self.sum_debit
report_sxw.report_sxw('report.account.account.balance', 'account.account', 'addons/account/report/account_balance.rml', parser=account_balance, header=False)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/account/report/account_tax_code.py
View File

@ -38,3 +38,4 @@ class account_tax_code_report(rml_parse.rml_parse):
report_sxw.report_sxw('report.account.tax.code.entries', 'account.tax.code',
'addons/account/report/account_tax_code.rml', parser=account_tax_code_report, header=False)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/account/report/aged_trial_balance.py
View File

@ -178,3 +178,4 @@ report_sxw.report_sxw('report.account.aged_trial_balance', 'res.partner',
'addons/account/report/aged_trial_balance.rml',parser=aged_trial_report,header=False)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/account/report/general_ledger.py
View File

@ -427,3 +427,4 @@ class general_ledger(rml_parse.rml_parse):
report_sxw.report_sxw('report.account.general.ledger', 'account.account', 'addons/account/report/general_ledger.rml', parser=general_ledger, header=False)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/account/report/general_ledger_landscape.py
View File

@ -406,3 +406,4 @@ class general_ledger_landscape(rml_parse.rml_parse):
return currency_total
report_sxw.report_sxw('report.account.general.ledger_landscape', 'account.account', 'addons/account/report/general_ledger_landscape.rml', parser=general_ledger_landscape, header=False)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/account/report/invoice.py
View File

@ -35,3 +35,4 @@ report_sxw.report_sxw(
'addons/account/report/invoice.rml',
parser=account_invoice
)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/account/report/partner_balance.py
View File

@ -617,3 +617,4 @@ class partner_balance(report_sxw.rml_parse):
report_sxw.report_sxw('report.account.partner.balance', 'res.partner',
'account/report/partner_balance.rml',parser=partner_balance,
header=False)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/account/report/rml_parse.py
View File

@ -175,3 +175,4 @@ class rml_parse(report_sxw.rml_parse):
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/account/report/tax_report.py
View File

@ -236,3 +236,4 @@ class tax_report(rml_parse.rml_parse):
report_sxw.report_sxw('report.account.vat.declaration', 'account.tax.code',
'addons/account/report/tax_report.rml', parser=tax_report, header=False)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/account/report/third_party_ledger.py
View File

@ -447,3 +447,4 @@ report_sxw.report_sxw('report.account.third_party_ledger', 'res.partner',
'addons/account/report/third_party_ledger.rml',parser=third_party_ledger,
header=False)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/account/sequence.py
View File

@ -49,3 +49,4 @@ class ir_sequence(osv.osv):
ir_sequence()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

6
addons/account/wizard/wizard_account_balance_report.py
View File

@ -23,6 +23,7 @@
import wizard
import pooler
import time
from tools.translate import _
period_form = '''<?xml version="1.0"?>
<form string="Select period">
@ -115,11 +116,11 @@ class wizard_report(wizard.interface):
res = cr.dictfetchall()
if res:
if (data['form']['date_to'] > res[0]['date_stop'] or data['form']['date_to'] < res[0]['date_start']):
raise wizard.except_wizard('UserError','Date to must be set between ' + res[0]['date_start'] + " and " + res[0]['date_stop'])
raise wizard.except_wizard(_('UserError'),_('Date to must be set between %s and %s') % (res[0]['date_start'], res[0]['date_stop']))
else:
return 'report'
else:
raise wizard.except_wizard('UserError','Date not in a defined fiscal year')
raise wizard.except_wizard(_('UserError'),_('Date not in a defined fiscal year'))
states = {
@ -141,3 +142,4 @@ class wizard_report(wizard.interface):
}
}
wizard_report('account.account.balance.report')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

4
addons/account/wizard/wizard_aged_trial_balance.py
View File

@ -26,6 +26,7 @@ import datetime
import pooler
from mx.DateTime import *
from tools.translate import _
_aged_trial_form = """<?xml version="1.0"?>
<form string="Aged Trial Balance">
@ -63,7 +64,7 @@ def _calc_dates(self, cr, uid, data, context):
res = {}
period_length = data['form']['period_length']
if period_length<=0:
raise wizard.except_wizard('UserError', 'You must enter a period length that cannot be 0 or below !')
raise wizard.except_wizard(_('UserError'), _('You must enter a period length that cannot be 0 or below !'))
start = datetime.date.fromtimestamp(time.mktime(time.strptime(data['form']['date1'],"%Y-%m-%d")))
start = DateTime(int(start.year),int(start.month),int(start.day))
if data['form']['direction_selection'] == 'past':
@ -110,3 +111,4 @@ class wizard_report(wizard.interface):
}
wizard_report('account.aged.trial.balance')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/account/wizard/wizard_automatic_reconcile.py
View File

@ -24,6 +24,7 @@ import wizard
import netsvc
import pooler
import time
from tools.translate import _
#TODO:

6
addons/account/wizard/wizard_general_ledger_report.py
View File

@ -24,6 +24,7 @@ import wizard
import pooler
import locale
import time
from tools.translate import _
account_form = '''<?xml version="1.0"?>
<form string="Select Chart">
@ -108,12 +109,12 @@ def _check_date(self, cr, uid, data, context):
res = cr.dictfetchall()
if res:
if (data['form']['date_to'] > res[0]['date_stop'] or data['form']['date_to'] < res[0]['date_start']):
raise wizard.except_wizard('UserError','Date to must be set between ' + res[0]['date_start'] + " and " + res[0]['date_stop'])
raise wizard.except_wizard(_('UserError'),_('Date to must be set between %s and %s') % (str(res[0]['date_start']), str(res[0]['date_stop'])))
else:
return 'checkreport'
else:
raise wizard.except_wizard('UserError','Date not in a defined fiscal year')
raise wizard.except_wizard(_('UserError'),_('Date not in a defined fiscal year'))
def _check_state(self, cr, uid, data, context):
@ -173,3 +174,4 @@ class wizard_report(wizard.interface):
}
}
wizard_report('account.general.ledger.report')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

6
addons/account/wizard/wizard_partner_balance_report.py
View File

@ -23,6 +23,7 @@
import time
import wizard
import pooler
from tools.translate import _
period_form = '''<?xml version="1.0"?>
<form string="Select Date-Period">
@ -106,12 +107,12 @@ class wizard_report(wizard.interface):
res = cr.dictfetchall()
if res:
if (data['form']['date2'] > res[0]['date_stop'] or data['form']['date2'] < res[0]['date_start']):
raise wizard.except_wizard('UserError','Date to must be set between ' + res[0]['date_start'] + " and " + res[0]['date_stop'])
raise wizard.except_wizard(_('UserError'),_('Date to must be set between %s and %s') % (str(res[0]['date_start']), str(res[0]['date_stop'])))
else:
return 'report'
else:
raise wizard.except_wizard('UserError','Date not in a defined fiscal year')
raise wizard.except_wizard(_('UserError'),_('Date not in a defined fiscal year'))
states = {
'init': {
@ -125,3 +126,4 @@ class wizard_report(wizard.interface):
}
}
wizard_report('account.partner.balance.report')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/account/wizard/wizard_refund.py
View File

@ -24,6 +24,7 @@ import pooler
import osv
import netsvc
import time
from tools.translate import _
sur_form = '''<?xml version="1.0"?>
<form string="Credit Note">

2
addons/account/wizard/wizard_state_open.py
View File

@ -38,7 +38,7 @@ def _change_inv_state(self, cr, uid, data, context):
pool_obj = pooler.get_pool(cr.dbname)
data_inv = pool_obj.get('account.invoice').browse(cr, uid, data['ids'][0])
if data_inv.reconciled:
raise wizard.except_wizard('Warning', 'Invoice is already reconciled')
raise wizard.except_wizard(_('Warning'), _('Invoice is already reconciled'))
wf_service = netsvc.LocalService("workflow")
res = wf_service.trg_validate(uid, 'account.invoice', data['ids'][0], 'open_test', cr)
return {}

2
addons/account/wizard/wizard_statement_from_invoice.py
View File

@ -1,3 +1,4 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# Copyright (c) 2008 Camptocamp SA All Rights Reserved. (JGG)
@ -171,3 +172,4 @@ class PopulateStatementFromInv(wizard.interface):
},
}
PopulateStatementFromInv('populate_statement_from_inv')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

6
addons/account/wizard/wizard_third_party_ledger.py
View File

@ -23,6 +23,7 @@
import time
import wizard
import pooler
from tools.translate import _
period_form = '''<?xml version="1.0"?>
@ -112,12 +113,12 @@ class wizard_report(wizard.interface):
res = cr.dictfetchall()
if res:
if (data['form']['date2'] > res[0]['date_stop'] or data['form']['date2'] < res[0]['date_start']):
raise wizard.except_wizard('UserError','Date to must be set between ' + res[0]['date_start'] + " and " + res[0]['date_stop'])
raise wizard.except_wizard(_('UserError'),_('Date to must be set between %s and %s') % (str(res[0]['date_start']) , str(res[0]['date_stop'])))
else:
return 'report'
else:
raise wizard.except_wizard('UserError','Date not in a defined fiscal year')
raise wizard.except_wizard(_('UserError'),_('Date not in a defined fiscal year'))
def _check_state(self, cr, uid, data, context):
@ -142,3 +143,4 @@ class wizard_report(wizard.interface):
wizard_report('account.third_party_ledger.report')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

3
addons/account/wizard/wizard_use_model.py
View File

@ -23,6 +23,7 @@ import wizard
import time
import datetime
import pooler
from tools.translate import _
model_form = """<?xml version="1.0"?>
<form string="Select Message">
@ -52,7 +53,7 @@ def _create_entries(self, cr, uid, data, context):
period_id = pool_obj.get('account.period').find(cr,uid, context=context)
if not period_id:
raise wizard.except_wizard('No period found !', 'Unable to find a valid period !')
raise wizard.except_wizard(_('No period found !'), _('Unable to find a valid period !'))
period_id = period_id[0]
move_id = pool_obj.get('account.move').create(cr, uid, {
'ref': model.ref,

1
addons/account/wizard/wizard_vat.py
View File

@ -88,3 +88,4 @@ class wizard_report(wizard.interface):
wizard_report('account.vat.declaration')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/account_analytic_default/__init__.py
View File

@ -20,3 +20,4 @@
#
##############################################################################
import account_analytic_default
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/account_analytic_default/account_analytic_default.py
View File

@ -106,3 +106,4 @@ class account_invoice_line(osv.osv):
return res_prod
account_invoice_line()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

6
addons/account_analytic_plans/account_analytic_plans.py
View File

@ -30,6 +30,7 @@ from osv import fields, osv,orm
import ir
import tools
from tools.translate import _
class one2many_mod2(fields.one2many):
def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
@ -176,7 +177,7 @@ class account_analytic_plan_instance(osv.osv):
pids = self.pool.get('account.analytic.plan.instance').search(cr, uid, [('name','=',vals['name']),('code','=',vals['code']),('plan_id','<>',False)])
if pids:
raise osv.except_osv('Error', 'A model having this name and code already exists !')
raise osv.except_osv(_('Error'), _('A model having this name and code already exists !'))
res = self.pool.get('account.analytic.plan.line').search(cr,uid,[('plan_id','=',journal.plan_id.id)])
for i in res:
@ -189,7 +190,7 @@ class account_analytic_plan_instance(osv.osv):
if self.pool.get('account.analytic.account').search(cr,uid,[('parent_id','child_of',[item.root_analytic_id.id]),('id','=',tempo[2]['analytic_account_id'])]):
total_per_plan += tempo[2]['rate']
if total_per_plan < item.min_required or total_per_plan > item.max_required:
raise osv.except_osv("Value Error" ,"The Total Should be Between " + str(item.min_required) + " and " + str(item.max_required))
raise osv.except_osv(_('Value Error') ,_('The Total Should be Between %s and %s" % (str(item.min_required), str(item.max_required))))
return super(account_analytic_plan_instance, self).create(cr, uid, vals, context)
@ -374,3 +375,4 @@ class analytic_default(osv.osv):
}
analytic_default()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

5
addons/account_analytic_plans/wizard/create_model.py
View File

@ -23,6 +23,7 @@ import wizard
import time
import netsvc
import pooler
from tools.translate import _
info = '''<?xml version="1.0"?>
<form string="Distribution Model Saved">
@ -35,10 +36,10 @@ def activate(self, cr, uid, data, context):
if data['id']:
plan = plan_obj.browse(cr, uid, data['id'], context)
if (not plan.name) or (not plan.code):
raise wizard.except_wizard('Error', 'Please put a name and a code before saving the model !')
raise wizard.except_wizard(_('Error'), _('Please put a name and a code before saving the model !'))
pids = pooler.get_pool(cr.dbname).get('account.analytic.plan').search(cr, uid, [], context=context)
if (not pids):
raise wizard.except_wizard('Error', 'No analytic plan defined !')
raise wizard.except_wizard(_('Error'), _('No analytic plan defined !'))
plan_obj.write(cr,uid,[data['id']],{'plan_id':pids[0]})
return 'info'
else:

3
addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py
View File

@ -23,6 +23,7 @@ import wizard
import time
import datetime
import pooler
from tools.translate import _
form = """<?xml version="1.0"?>
<form string="Select Information">
@ -59,7 +60,7 @@ class wizard_crossovered_analytic(wizard.interface):
break
if flag:
raise wizard.except_wizard('User Error',"There are no Analytic lines related to Account '" + name +"'" )
raise wizard.except_wizard(_('User Error'),_('There are no Analytic lines related to Account %s' % name))
return {}
states = {

3
addons/account_budget/crossovered_budget.py
View File

@ -25,6 +25,7 @@ import netsvc
from mx import DateTime
import time
import datetime
from tools.translate import _
def strToDate(dt):
@ -161,7 +162,7 @@ class crossovered_budget_lines(osv.osv):
for line in self.browse(cr, uid, ids):
acc_ids = [x.id for x in line.general_budget_id.account_ids]
if not acc_ids:
raise osv.except_osv('Error!',"The General Budget '" + str(line.general_budget_id.name) + "' has no Accounts!" )
raise osv.except_osv(_('Error!'),_("The General Budget '%s' has no Accounts!" % str(line.general_budget_id.name)))
date_to = line.date_to
date_from = line.date_from
if context.has_key('wizard_date_from'):

3
addons/account_budget/wizard/wizard_budget_report.py
View File

@ -24,6 +24,7 @@ import time
import wizard
import datetime
import pooler
from tools.translate import _
dates_form = '''<?xml version="1.0"?>
<form string="Select period">
@ -41,7 +42,7 @@ class wizard_report(wizard.interface):
pool_obj = pooler.get_pool(cr.dbname)
data_model = pool_obj.get(data['model']).browse(cr,uid,data['id'])
if not data_model.dotation_ids:
raise wizard.except_wizard('Insufficient Data!',"No Dotations or Master Budget Expenses Found on Budget '"+ data_model.name +"'!")
raise wizard.except_wizard(_('Insufficient Data!'),_('No Dotations or Master Budget Expenses Found on Budget %s!') % data_model.name)
return data['form']
states = {

3
addons/account_date_check/account_date_check.py
View File

@ -29,6 +29,7 @@ import ir
from mx import DateTime
import pooler
from tools import config
from tools.translate import _
class account_journal(osv.osv):
_inherit='account.journal'
@ -62,7 +63,7 @@ class account_move_line(osv.osv):
if not journal.allow_date:
period=self.pool.get('account.period').browse(cr,uid,[period_id])[0]
if not time.strptime(vals['date'],'%Y-%m-%d')>=time.strptime(period.date_start,'%Y-%m-%d') and time.strptime(vals['date'],'%Y-%m-%d')<=time.strptime(period.date_stop,'%Y-%m-%d'):
raise osv.except_osv('Error','The date of your account move is not in the defined period !')
raise osv.except_osv(_('Error'),_('The date of your account move is not in the defined period !'))
else:
return True

2
addons/account_payment/account_move_line.py
View File

@ -21,7 +21,7 @@
##############################################################################
from osv import fields, osv
from tools.translate import _
class account_move_line(osv.osv):
_inherit = "account.move.line"

1
addons/account_payment/report/__init__.py
View File

@ -21,3 +21,4 @@
##############################################################################
import payment_order
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

4
addons/account_payment/report/payment_order.py
View File

@ -31,4 +31,6 @@ class payment_order(report_sxw.rml_parse):
'time': time,
})
report_sxw.report_sxw('report.payment.order', 'payment.order', 'addons/account_payment/report/payment_order.rml', parser=payment_order,header=False)
report_sxw.report_sxw('report.payment.order', 'payment.order', 'addons/account_payment/report/payment_order.rml', parser=payment_order,header=False)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/account_report/account.py
View File

@ -24,6 +24,7 @@ import netsvc
from osv import fields, osv
import pooler
from tools.misc import currency
from tools.translate import _
import mx.DateTime
from mx.DateTime import RelativeDateTime, now, DateTime, localtime

3
addons/account_report/wizard/wizard_print_indicators.py
View File

@ -22,6 +22,7 @@
import wizard
import pooler
from tools.translate import _
form = '''<?xml version="1.0"?>
<form string="Print Indicators">
@ -55,7 +56,7 @@ def _load_base(self, cr, uid, data, context):
def _check_len(self, cr, uid, data, context):
if len(data['form']['base_selection'][0][2])>8:
raise wizard.except_wizard('User Error!',"Please select maximum 8 records to fit the page-width.")
raise wizard.except_wizard(_('User Error!'),_("Please select maximum 8 records to fit the page-width."))
return data['form']
class wizard_print_indicators(wizard.interface):

1
addons/account_voucher/__init__.py
View File

@ -23,3 +23,4 @@
import voucher
import voucher_account
import report
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

4
addons/account_voucher/report/__init__.py
View File

@ -20,4 +20,6 @@
#
##############################################################################
import report_voucher
import report_voucher_amount
import report_voucher_amount
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

4
addons/account_voucher/report/report_voucher.py
View File

@ -64,4 +64,6 @@ report_sxw.report_sxw(
'account.voucher',
'addons/account_voucher/report/report_voucher.rml',
parser=report_voucher,header=False
)
)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

4
addons/account_voucher/report/report_voucher_amount.py
View File

@ -43,4 +43,6 @@ report_sxw.report_sxw(
'account.voucher',
'addons/account_voucher/report/report_voucher_amount.rml',
parser=report_voucher_amount,header=False
)
)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

4
addons/account_voucher/voucher.py
View File

@ -28,6 +28,7 @@ import mx.DateTime
from mx.DateTime import RelativeDateTime
from tools import config
from tools.translate import _
type2journal = {
'rec_voucher':'cash',
@ -180,7 +181,7 @@ class account_voucher(osv.osv):
if t['state'] in ('draft', 'cancel'):
unlink_ids.append(t['id'])
else:
raise osv.except_osv('Invalid action !', 'Cannot delete invoice(s) which are already opened or paid !')
raise osv.except_osv(_('Invalid action !'), _('Cannot delete invoice(s) which are already opened or paid !'))
osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
return True
@ -604,3 +605,4 @@ class VoucherLine(osv.osv):
}
VoucherLine()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/account_voucher/voucher_account.py
View File

@ -144,3 +144,4 @@ class Account(osv.osv):
}
Account()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/account_voucher/wizard/__init__.py
View File

@ -20,3 +20,4 @@
#
##############################################################################
import open_voucher
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

13
addons/analytic_user_function/analytic_user_function.py
View File

@ -21,6 +21,7 @@
##############################################################################
from osv import fields,osv
from osv import orm
from tools.translate import _
class analytic_user_funct_grid(osv.osv):
@ -94,9 +95,9 @@ class hr_analytic_timesheet(osv.osv):
if not a:
a = r.product_id.categ_id.property_account_expense_categ.id
if not a:
raise osv.except_osv('Error !',
'There is no expense account define ' \
'for this product: "%s" (id:%d)' % \
raise osv.except_osv(_('Error !'),
_('There is no expense account define ' \
'for this product: "%s" (id:%d)') % \
(r.product_id.name, r.product_id.id,))
amount = unit_amount * self.pool.get('product.uom')._compute_price(cr, uid,
r.product_id.uom_id.id, r.product_id.standard_price, False)
@ -127,9 +128,9 @@ class hr_analytic_timesheet(osv.osv):
if not a:
a = r.product_id.categ_id.property_account_expense_categ.id
if not a:
raise osv.except_osv('Error !',
'There is no expense account define ' \
'for this product: "%s" (id:%d)' % \
raise osv.except_osv(_('Error !'),
_('There is no expense account define ' \
'for this product: "%s" (id:%d)') % \
(r.product_id.name, r.product_id.id,))
amount = unit_amount * r.product_id.uom_id._compute_price(cr, uid,
r.product_id.uom_id.id, r.product_id.standard_price, False)

9
addons/auction/auction.py
View File

@ -25,6 +25,7 @@ import netsvc
from osv import fields, osv, orm
import ir
from mx import DateTime
from tools.translate import _
#----------------------------------------------------------
# Auction Artists
@ -627,7 +628,7 @@ class auction_lots(osv.osv):
continue
partner_r=self.pool.get('res.partner')
if not lot.ach_uid.id:
raise orm.except_orm('Missed buyer !', 'The object "%s" has no buyer assigned.' % (lot.name,))
raise orm.except_orm(_('Missed buyer !'), _('The object "%s" has no buyer assigned.') % (lot.name,))
else:
partner_ref =lot.ach_uid.id
lot_name = lot.obj_num
@ -635,7 +636,7 @@ class auction_lots(osv.osv):
contact_addr_id = res['contact']
invoice_addr_id = res['invoice']
if not invoice_addr_id:
raise orm.except_orm('No Invoice Address', 'The Buyer "%s" has no Invoice Address.' % (contact_addr_id,))
raise orm.except_orm(_('No Invoice Address'), _('The Buyer "%s" has no Invoice Address.') % (contact_addr_id,))
inv = {
'name': 'Auction proforma:' +lot.name,
'journal_id': lot.auction_id.journal_id.id,
@ -754,13 +755,13 @@ class auction_lots(osv.osv):
continue
partner_r=self.pool.get('res.partner')
if not lot.ach_uid.id:
raise orm.except_orm('Missed buyer !', 'The object "%s" has no buyer assigned.' % (lot.name,))
raise orm.except_orm(_('Missed buyer !'), _('The object "%s" has no buyer assigned.') % (lot.name,))
if (lot.auction_id.id,lot.ach_uid.id) in invoices:
inv_id = invoices[(lot.auction_id.id,lot.ach_uid.id)]
else:
add = partner_r.read(cr, uid, [lot.ach_uid.id], ['address'])[0]['address']
if not len(add):
raise orm.except_orm('Missed Address !', 'The Buyer has no Invoice Address.')
raise orm.except_orm(_('Missed Address !'), _('The Buyer has no Invoice Address.'))
price = lot.obj_price or 0.0
lot_name =lot.obj_num
inv={

1
addons/auction/barcode/__init__.py
View File

@ -31,3 +31,4 @@
#
__version__ = '0.9'
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/auction/barcode/code128.py
View File

@ -319,3 +319,4 @@ class Code128(MultiWidthBarcode):
dval = dval + _patterns[c]
self.decomposed = dval
return self.decomposed
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/auction/barcode/code39.py
View File

@ -253,3 +253,4 @@ class Extended39(_Code39Base):
raise ValueError
self.encoded = _encode39(self.encoded, self.checksum)
return self.encoded
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/auction/barcode/code93.py
View File

@ -230,3 +230,4 @@ class Extended93(_Code93Base):
raise ValueError
self.encoded = _encode93(self.encoded)
return self.encoded
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/auction/barcode/common.py
View File

@ -703,3 +703,4 @@ class Code11(Barcode):
dval = dval + self.patterns[c] + 'i'
self.decomposed = dval[:-1]
return self.decomposed
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/auction/barcode/fourstate.py
View File

@ -79,3 +79,4 @@ _ozC_patterns = {
}
#http://www.auspost.com.au/futurepost/
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/auction/barcode/test.py
View File

@ -53,3 +53,4 @@ if __name__=='__main__':
run()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/auction/barcode/usps.py
View File

@ -229,3 +229,4 @@ class POSTNET(Barcode):
h = self.fbarheight
self.rect(left, 0.0, self.barwide, h)
left = left + self.barwide + self.spacewide
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/auction/report/buyer_list.py
View File

@ -25,6 +25,7 @@ import pooler
import time
from report import report_sxw
from osv import osv
from tools.translate import _
class buyer_list(report_sxw.rml_parse):
auc_lot_ids=[]

1
addons/auction/wizard/wizard_aie_send.py
View File

@ -30,6 +30,7 @@ import base64
import mimetypes
import httplib
import threading
from tools.translate import _
login_form = '''<?xml version="1.0"?>
<form title="Login">

1
addons/auction/wizard/wizard_aie_send_result.py
View File

@ -26,6 +26,7 @@
import wizard
import netsvc
from tools.translate import _
login_form = '''<?xml version="1.0"?>
<form title="Login">

5
addons/audittrail/audittrail.py
View File

@ -27,6 +27,7 @@ import netsvc
import pooler
import string
import time,copy
from tools.translate import _
class audittrail_rule(osv.osv):
_name = 'audittrail.rule'
@ -59,8 +60,8 @@ class audittrail_rule(osv.osv):
obj = self.pool.get(thisrule.object_id.model)
if not obj:
raise osv.except_osv(
'WARNING:audittrail is not part of the pool',
'Change audittrail depends -- Setting rule as DRAFT')
_('WARNING:audittrail is not part of the pool'),
_('Change audittrail depends -- Setting rule as DRAFT'))
self.write(cr, uid, [thisrule.id], {"state": "draft"})
val={
"name":'View Log',

1
addons/base_module_merge/wizard/base_module_merge.py
View File

@ -26,6 +26,7 @@ import pooler
import tools
import os
from xml.dom import minidom
from tools.translate import _
info_start_form = '''<?xml version="1.0"?>
<form string="Module Merging">

1
addons/base_module_publish/wizard/base_module_publish.py
View File

@ -29,6 +29,7 @@ import base64
import module_zip
import tools
from tools.translate import _
intro_form = '''<?xml version="1.0"?>
<form string="Module publication">

3
addons/base_module_publish/wizard/base_module_publish_all.py
View File

@ -25,6 +25,7 @@ import pooler
import module_zip
from base_module_publish import post_multipart
from urllib import urlopen
from tools.translate import _
intro_form = '''<?xml version="1.0"?>
<form string="Module publication">
@ -102,7 +103,7 @@ def _upload(self, cr, uid, datas, context):
res['module_file'])
])
if result[0] == "1":
raise wizard.except_wizard('Error', 'Login failed!')
raise wizard.except_wizard(_('Error'), _('Login failed!'))
elif result[0] == "0":
log[0].append(mod.name)
elif result[0] == "2":

1
addons/base_module_publish/wizard/module_zip.py
View File

@ -21,6 +21,7 @@
##############################################################################
import pooler
import addons
from tools.translate import _
def createzip(cr, uid, moduleid, context, b64enc=True, src=True):
pool = pooler.get_pool(cr.dbname)

3
addons/base_report_creator/base_report_creator.py
View File

@ -24,6 +24,7 @@ import string
import time
import tools
from osv import fields,osv,orm
from tools.translate import _
#class ir_model_fields(osv.osv):
# _inherit = 'ir.model.fields'
@ -216,7 +217,7 @@ class report_creator(osv.osv):
if reference_model_dict:
self.model_set_id = model_dict.get(reference_model_dict.keys()[reference_model_dict.values().index(min(reference_model_dict.values()))])
if model_list and not len(model_dict.keys()) == 1:
raise osv.except_osv("No Related Models!!",'These is/are model(s) (%s) in selection which is/are not related to any other model'%','.join(model_list) )
raise osv.except_osv(_('No Related Models!!'),_('These is/are model(s) (%s) in selection which is/are not related to any other model') % ','.join(model_list))
if filter_ids and where_list<>[]:
where_list.append('and')
where_list.append(' ')

1
addons/base_report_designer/wizard/base_report_designer_modify.py
View File

@ -27,6 +27,7 @@ import pooler
import urllib
import base64
import tools
from tools.translate import _
intro_form = '''<?xml version="1.0"?>
<form string="Report designer">

3
addons/board/wizard/board_wizard.py
View File

@ -25,6 +25,7 @@ import time
import wizard
import osv
import pooler
from tools.translate import _
section_form = '''<?xml version="1.0"?>
<form string="Create Menu For Dashboard">
@ -42,7 +43,7 @@ def check_views(self, cr, uid, data, context):
pool = pooler.get_pool(cr.dbname)
board = pool.get('board.board').browse(cr, uid, data['id'])
if not board.line_ids:
raise wizard.except_wizard('User Error!',"Please Insert Dashboard View(s) !")
raise wizard.except_wizard(_('User Error!'),_('Please Insert Dashboard View(s) !'))
return data['form']
def board_menu_create(self, cr, uid, data, context):

1
addons/board_auction/__init__.py
View File

@ -0,0 +1 @@
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/board_crm_configuration/__init__.py
View File

@ -20,3 +20,4 @@
#
##############################################################################
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/board_document/__init__.py
View File

@ -0,0 +1 @@
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/crm_configuration/__init__.py
View File

@ -23,3 +23,4 @@ import crm_config
import report
import wizard
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/crm_configuration/wizard/__init__.py
View File

@ -23,3 +23,4 @@
import meeting_planify
import wizard_partner_create
import wizard_opportunity_set
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/crm_configuration/wizard/meeting_planify.py
View File

@ -73,3 +73,4 @@ class make_meeting(wizard.interface):
make_meeting('crm.case.meeting')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

6
addons/crm_configuration/wizard/wizard_opportunity_set.py
View File

@ -26,6 +26,7 @@ import wizard
import netsvc
import ir
import pooler
from tools.translate import _
case_form = """<?xml version="1.0"?>
<form string="Convert To Opportunity">
@ -49,7 +50,7 @@ class make_opportunity(wizard.interface):
case_obj = pool.get('crm.case')
for case in case_obj.browse(cr, uid, data['ids']):
if not case.partner_id:
raise wizard.except_wizard("Warning !",
raise wizard.except_wizard(_('Warning !'),
_('You must assign a partner to this lead before converting to opportunity.\n' \
'You can use the convert to partner button.'))
return {'name': case.name, 'probability': case.probability or 20.0, 'planned_revenue':case.planned_revenue}
@ -60,7 +61,7 @@ class make_opportunity(wizard.interface):
data_obj = pool.get('ir.model.data')
id = section_obj.search(cr, uid, [('code','=','oppor')], context=context)
if not id:
raise wizard.except_wizard(_("Error !"),
raise wizard.except_wizard(_('Error !'),
_('You did not installed the opportunities tracking when you configured the crm_configuration module.' \
'\nI can not convert the lead to an opportunity, you must create a section with the code \'oppor\'.'
))
@ -106,3 +107,4 @@ class make_opportunity(wizard.interface):
make_opportunity('crm.case.opportunity_set')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

5
addons/crm_configuration/wizard/wizard_partner_create.py
View File

@ -26,6 +26,7 @@ import wizard
import netsvc
import ir
import pooler
from tools.translate import _
case_form = """<?xml version="1.0"?>
<form string="Convert To Partner">
@ -46,7 +47,7 @@ class make_partner(wizard.interface):
case_obj = pool.get('crm.case')
for case in case_obj.browse(cr, uid, data['ids']):
if case.partner_id:
raise wizard.except_wizard("Warning !",
raise wizard.except_wizard(_('Warning !'),
_('A partner is already defined on this lead.'))
return {}
@ -58,7 +59,7 @@ class make_partner(wizard.interface):
for case in case_obj.browse(cr, uid, data['ids']):
partner_id = partner_obj.search(cr, uid, [('name', '=', case.partner_name or case.name)])
if partner_id:
raise wizard.except_wizard("Warning !",_('A partner is already existing with the same name.'))
raise wizard.except_wizard(_('Warning !'),_('A partner is already existing with the same name.'))
else:
partner_id = partner_obj.create(cr, uid, {
'name': case.partner_name or case.name,

1
addons/crm_vertical/__init__.py
View File

@ -20,3 +20,4 @@
#
##############################################################################
#import crm_vertical
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

4
addons/crm_vertical/crm_vertical.py
View File

@ -26,6 +26,7 @@ from osv import fields,osv,orm
import os
import mx.DateTime
import base64
from tools.translate import _
# here need to implement inheritance on osv_memory object. after that, it will work well.
class crm_menu_config_wizard(osv.osv_memory):
@ -40,7 +41,8 @@ class crm_menu_config_wizard(osv.osv_memory):
try:
tools.convert_xml_import(cr, 'crm_configuration', tools.file_open(os.path.join('crm_vertical',file_name )), {}, 'init', *args)
except Exception, e:
raise osv.except_osv('Error !', e)
raise osv.except_osv(_('Error !'), str(e))
return res
crm_menu_config_wizard()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

15
addons/document/document.py
View File

@ -38,6 +38,7 @@ import string
from psycopg2 import Binary
from tools import config
import tools
from tools.translate import _
def random_name():
random.seed()
@ -376,14 +377,14 @@ class document_directory(osv.osv):
return True
def write(self, cr, uid, ids, vals, context=None):
if not self._check_duplication(cr,uid,vals,ids,op='write'):
raise osv.except_osv('ValidateError', _('Directory name must be unique!'))
raise osv.except_osv(_('ValidateError'), _('Directory name must be unique!'))
return super(document_directory,self).write(cr,uid,ids,vals,context=context)
def create(self, cr, uid, vals, context=None):
if not self._check_duplication(cr,uid,vals):
raise osv.except_osv('ValidateError', _('Directory name must be unique!'))
raise osv.except_osv(_('ValidateError'), _('Directory name must be unique!'))
if vals.get('name',False) and (vals.get('name').find('/')+1 or vals.get('name').find('@')+1 or vals.get('name').find('$')+1 or vals.get('name').find('#')+1) :
raise osv.except_osv('ValidateError', _('Directory name contains special characters!'))
raise osv.except_osv(_('ValidateError'), _('Directory name contains special characters!'))
return super(document_directory,self).create(cr, uid, vals, context)
document_directory()
@ -516,7 +517,7 @@ class document_file(osv.osv):
try:
os.makedirs(path)
except:
raise except_orm('Permission Denied !', 'You do not permissions to write on the server side.')
raise except_orm(_('Permission Denied !'), _('You do not permissions to write on the server side.'))
flag = None
# This can be improved
@ -534,7 +535,7 @@ class document_file(osv.osv):
cr.execute('update ir_attachment set store_fname=%s,store_method=%s,file_size=%s where id=%s', (os.path.join(flag,filename),'fs',len(v),id))
return True
except Exception,e :
raise except_orm('Error!', str(e))
raise except_orm(_('Error!'), str(e))
_columns = {
'user_id': fields.many2one('res.users', 'Owner', select=1),
@ -598,7 +599,7 @@ class document_file(osv.osv):
if not len(res):
return False
if not self._check_duplication(cr,uid,vals,ids,'write'):
raise except_orm('ValidateError', 'File name must be unique!')
raise except_orm(_('ValidateError'), _('File name must be unique!'))
result = super(document_file,self).write(cr,uid,ids,vals,context=context)
cr.commit()
try:
@ -651,7 +652,7 @@ class document_file(osv.osv):
datas=vals.get('datas',False)
vals['file_size']= len(datas)
if not self._check_duplication(cr,uid,vals):
raise except_orm('ValidateError', 'File name must be unique!')
raise except_orm(_('ValidateError'), _('File name must be unique!'))
result = super(document_file,self).create(cr, uid, vals, context)
cr.commit()
try:

1
addons/document_ics/__init__.py
View File

@ -21,3 +21,4 @@
##############################################################################
import document
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/event/event.py
View File

@ -25,6 +25,7 @@ import time
import netsvc
import pooler
import tools
from tools.translate import _
class crm_case_log(osv.osv):
_inherit = 'crm.case.log'

1
addons/event/wizard/confirm_registration.py
View File

@ -78,3 +78,4 @@ class confirm_registration(wizard.interface):
}
confirm_registration('event.confirm_registration')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

3
addons/event_project/wizard/event_task.py
View File

@ -21,13 +21,14 @@
##############################################################################
import wizard
import pooler
from tools.translate import _
def _event_tasks(self, cr, uid, data, context):
event_id = data['id']
cr.execute('SELECT project_id FROM event_event WHERE id = %s', (event_id, ))
res = cr.fetchone()
if not res[0]:
raise wizard.except_wizard('Error !', 'No project defined for this event.\nYou can create one with the retro-planning button !')
raise wizard.except_wizard(_('Error !'), _('No project defined for this event.\nYou can create one with the retro-planning button !'))
value = {
'domain': [('project_id', '=', res[0])],
'name': 'Tasks',

1
addons/hr/hr.py
View File

@ -171,3 +171,4 @@ class hr_timesheet(osv.osv):
hr_timesheet()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

4
addons/hr_holidays/hr.py
View File

@ -34,7 +34,7 @@ import pooler
import netsvc
import datetime
from osv import fields, osv
from tools.translate import _
def _employee_get(obj,cr,uid,context={}):
ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
@ -206,7 +206,7 @@ class hr_holidays(osv.osv):
leaves_rest=obj_holidays_per_user.max_leaves - obj_holidays_per_user.leaves_taken
if not obj_holidays_per_user.holiday_status.limit:
if leaves_rest < leave_asked:
raise osv.except_osv('Attention!','You Cannot Validate leaves while available leaves are less than asked leaves.')
raise osv.except_osv(_('Attention!'),_('You Cannot Validate leaves while available leaves are less than asked leaves.'))
self.pool.get('hr.holidays.per.user').write(cr,uid,obj_holidays_per_user.id,{'leaves_taken':obj_holidays_per_user.leaves_taken + leave_asked})
if record.holiday_status.section_id:
vals={}

4
addons/hr_timesheet/hr_timesheet.py
View File

@ -24,7 +24,7 @@ import time
from osv import fields
from osv import osv
from osv.orm import except_orm
from tools.translate import _
class hr_employee(osv.osv):
_name = "hr.employee"
@ -124,7 +124,7 @@ class hr_analytic_timesheet(osv.osv):
raise except_orm(_('ValidateError'),
_('No analytic account defined on the project.\nPlease set one or we can not automatically fill the timesheet.'))
else:
raise
raise except_orm(_('UnknownError'), str(e))
def on_change_user_id(self, cr, uid, ids, user_id):
if not user_id:

4
addons/l10n_be/wizard/__init__.py
View File

@ -20,4 +20,6 @@
#
##############################################################################
import account_vat_declaration
import partner_vat_listing
import partner_vat_listing
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/l10n_be/wizard/account_vat_declaration.py
View File

@ -127,3 +127,4 @@ class wizard_vat_declaration(wizard.interface):
}
wizard_vat_declaration('wizard.account.xml.vat.declaration')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

6
addons/l10n_be/wizard/partner_vat_listing.py
View File

@ -24,6 +24,7 @@ import time
import datetime
import pooler
import base64
from tools.translate import _
form = """<?xml version="1.0"?>
<form string="Select Fiscal Year">
@ -67,7 +68,7 @@ class wizard_vat(wizard.interface):
obj_cmpny = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid).company_id
company_vat = obj_cmpny.partner_id.vat
if not company_vat:
raise wizard.except_wizard('Data Insufficient','No VAT Number Associated with Main Company!')
raise wizard.except_wizard(_('Data Insufficient'),_('No VAT Number Associated with Main Company!'))
cref = company_vat + seq_controlref
dnum = cref + seq_declarantnum
@ -75,7 +76,7 @@ class wizard_vat(wizard.interface):
p_id_list=pooler.get_pool(cr.dbname).get('res.partner').search(cr,uid,[('vat_subjected','!=',False)])
if not p_id_list:
raise wizard.except_wizard('Data Insufficient!','No partner has a VAT Number asociated with him.')
raise wizard.except_wizard(_('Data Insufficient!'),_('No partner has a VAT Number asociated with him.'))
obj_year=pooler.get_pool(cr.dbname).get('account.fiscalyear').browse(cr,uid,data['form']['fyear'])
period_ids = pooler.get_pool(cr.dbname).get('account.period').search(cr, uid, [('fiscalyear_id', '=', data['form']['fyear'])])
period = "("+','.join(map(lambda x: str(x), period_ids)) +")"
@ -193,3 +194,4 @@ class wizard_vat(wizard.interface):
}
wizard_vat('list.vat.detail')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/l10n_ch/__init__.py
View File

@ -41,3 +41,4 @@ import payment
import report
import bank
import account_move_line
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/l10n_ch/__terp__.py
View File

@ -107,3 +107,4 @@ TODO :
"active": False,
"installable": True,
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/l10n_ch/account_move_line.py
View File

@ -68,3 +68,4 @@ class AccountMoveLine(osv.osv):
return line2bank
AccountMoveLine()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/l10n_ch/bank.py
View File

@ -43,3 +43,4 @@ class Bank(osv.osv):
}
Bank()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/l10n_ch/company.py
View File

@ -47,3 +47,4 @@ class res_company(osv.osv):
}
res_company()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/l10n_ch/dta.py
View File

@ -93,3 +93,4 @@ class account_dta_line(osv.osv):
account_dta_line()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

4
addons/l10n_ch/invoice.py
View File

@ -207,4 +207,6 @@ class account_tax_code(osv.osv):
### The case code of the taxt code
'code': fields.char('Case Code', size=512),
}
account_tax_code()
account_tax_code()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/l10n_ch/partner.py
View File

@ -96,3 +96,4 @@ class res_partner_bank(osv.osv):
res_partner_bank()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/l10n_ch/payment.py
View File

@ -41,3 +41,4 @@ class payment_order(osv.osv):
return 'l10n_ch','wizard_account_dta_create'
return super(payment_order,self).get_wizard(mode)
payment_order()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/l10n_ch/report/__init__.py
View File

@ -31,3 +31,4 @@
##############################################################################
import bvr
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/l10n_ch/report/bvr.py
View File

@ -100,3 +100,4 @@ report_sxw.report_sxw(
parser=account_invoice_bvr,
header=False)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/l10n_ch/report/tiny_sxw2rml.py
View File

@ -339,3 +339,4 @@ if __name__ == "__main__":
result = style.applyStylesheet(doc, None)
xml = style.saveResultToString(result)
print xml
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/l10n_ch/wizard/__init__.py
View File

@ -34,3 +34,4 @@ import dta_wizard
import wizard_bvr
import bvr_import
import journal_config
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

27
addons/l10n_ch/wizard/bvr_import.py
View File

@ -35,6 +35,8 @@ import base64
import time
from tools import mod10r
import re
from tools.translate import _
ASK_FORM = """<?xml version="1.0"?>
<form string="BVR Import">
<field name="file"/>
@ -103,12 +105,12 @@ def _import(obj, cursor, user, data, context):
if line[0:3] in ('999', '995'):
if find_total:
raise wizard.except_wizard('Error',
'Too much total record found!')
raise wizard.except_wizard(_('Error'),
_('Too much total record found!'))
find_total = True
if lines:
raise wizard.except_wizard('Error',
'Record found after total record!')
raise wizard.except_wizard(_('Error'),
_('Record found after total record!'))
amount = float(line[39:49]) + (float(line[49:51]) / 100)
cost = float(line[69:76]) + (float(line[76:78]) / 100)
if line[2] == '5':
@ -117,11 +119,11 @@ def _import(obj, cursor, user, data, context):
if round(amount - total_amount, 2) >= 0.01 \
or round(cost - total_cost, 2) >= 0.01:
raise wizard.except_wizard('Error',
'Total record different from the computed!')
raise wizard.except_wizard(_('Error'),
_('Total record different from the computed!'))
if int(line[51:63]) != len(records):
raise wizard.except_wizard('Error',
'Number record different from the computed!')
raise wizard.except_wizard(_('Error'),
_('Number record different from the computed!'))
else:
record = {
'reference': line[12:39],
@ -132,8 +134,8 @@ def _import(obj, cursor, user, data, context):
}
if record['reference'] != mod10r(record['reference'][:-1]):
raise wizard.except_wizard('Error',
'Recursive mod10 is invalid for reference: %s' % \
raise wizard.except_wizard(_('Error'),
_('Recursive mod10 is invalid for reference: %s') % \
record['reference'])
if line[2] == '5':
@ -202,8 +204,8 @@ def _import(obj, cursor, user, data, context):
else:
account_id = account_payable
if not account_id :
raise wizard.except_wizard('Error',
'The properties account payable account receivable')
raise wizard.except_wizard(_('Error'),
_('The properties account payable account receivable'))
values['account_id'] = account_id
values['partner_id'] = partner_id
@ -248,3 +250,4 @@ class BVRImport(wizard.interface):
}
BVRImport('l10n_ch.bvr_import')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

Some files were not shown because too many files have changed in this diff Show More