diff --git a/addons/account/account.py b/addons/account/account.py
index cbba0237c78..fa30b20f2ca 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -125,7 +125,7 @@ class account_payment_term_line(osv.osv):
return True
_constraints = [
- (_check_percent, 'Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for 2% ', ['value_amount']),
+ (_check_percent, 'Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for 2%.', ['value_amount']),
]
account_payment_term_line()
@@ -136,7 +136,7 @@ class account_account_type(osv.osv):
def _get_current_report_type(self, cr, uid, ids, name, arg, context=None):
obj_data = self.pool.get('ir.model.data')
- obj_financial_report = self.pool.get('account.financial.report')
+ obj_financial_report = self.pool.get('account.financial.report')
res = {}
financial_report_ref = {
'asset': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_assets0')[1], context=context),
@@ -154,7 +154,7 @@ class account_account_type(osv.osv):
def _save_report_type(self, cr, uid, account_type_id, field_name, field_value, arg, context=None):
obj_data = self.pool.get('ir.model.data')
- obj_financial_report = self.pool.get('account.financial.report')
+ obj_financial_report = self.pool.get('account.financial.report')
#unlink if it exists somewhere in the financial reports related to BS or PL
financial_report_ref = {
'asset': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_assets0')[1], context=context),
@@ -179,7 +179,7 @@ class account_account_type(osv.osv):
'Balance' will generally be used for cash accounts.
'Detail' will copy each existing journal item of the previous year, even the reconciled ones.
'Unreconciled' will copy only the journal items that were unreconciled on the first day of the new fiscal year."""),
- 'report_type': fields.function(_get_current_report_type, fnct_inv=_save_report_type, type='selection', string='P&L / BS Category',
+ 'report_type': fields.function(_get_current_report_type, fnct_inv=_save_report_type, type='selection', string='P&L / BS Category',
selection= [('none','/'),
('income', _('Profit & Loss (Income account)')),
('expense', _('Profit & Loss (Expense account)')),
@@ -404,12 +404,12 @@ class account_account(osv.osv):
journal_obj = self.pool.get('account.journal')
jids = journal_obj.search(cr, uid, [('type','=','situation'),('centralisation','=',1),('company_id','=',account.company_id.id)], context=context)
if not jids:
- raise osv.except_osv(_('Error!'),_("You need an Opening journal with centralisation checked to set the initial balance!"))
+ raise osv.except_osv(_('Error!'),_("You need an Opening journal with centralisation checked to set the initial balance."))
period_obj = self.pool.get('account.period')
pids = period_obj.search(cr, uid, [('special','=',True),('company_id','=',account.company_id.id)], context=context)
if not pids:
- raise osv.except_osv(_('Error!'),_("No opening/closing period defined, please create one to set the initial balance!"))
+ raise osv.except_osv(_('Error!'),_("There is no opening/closing period defined, please create one to set the initial balance."))
move_obj = self.pool.get('account.move.line')
move_id = move_obj.search(cr, uid, [
@@ -426,7 +426,7 @@ class account_account(osv.osv):
}, context=context)
else:
if diff<0.0:
- raise osv.except_osv(_('Error!'),_("Unable to adapt the initial balance (negative value)!"))
+ raise osv.except_osv(_('Error!'),_("Unable to adapt the initial balance (negative value)."))
nameinv = (name=='credit' and 'debit') or 'credit'
move_id = move_obj.create(cr, uid, {
'name': _('Opening Balance'),
@@ -541,9 +541,9 @@ class account_account(osv.osv):
return True
_constraints = [
- (_check_recursion, 'Error ! You can not create recursive accounts.', ['parent_id']),
- (_check_type, 'Configuration Error! \nYou can not define children to an account with internal type different of "View"! ', ['type']),
- (_check_account_type, 'Configuration Error! \nYou can not select an account type with a deferral method different of "Unreconciled" for accounts with internal type "Payable/Receivable"! ', ['user_type','type']),
+ (_check_recursion, 'Error!\nYou cannot create recursive accounts.', ['parent_id']),
+ (_check_type, 'Configuration Error!\nYou cannot define children to an account with internal type different of "View".', ['type']),
+ (_check_account_type, 'Configuration Error!\nYou cannot select an account type with a deferral method different of "Unreconciled" for accounts with internal type "Payable/Receivable".', ['user_type','type']),
]
_sql_constraints = [
('code_company_uniq', 'unique (code,company_id)', 'The code of the account must be unique per company !')
@@ -619,14 +619,14 @@ class account_account(osv.osv):
if line_obj.search(cr, uid, [('account_id', 'in', account_ids)]):
if method == 'write':
- raise osv.except_osv(_('Error !'), _('You can not desactivate an account that contains some journal items.'))
+ raise osv.except_osv(_('Error!'), _('You cannot deactivate an account that contains journal items.'))
elif method == 'unlink':
- raise osv.except_osv(_('Error !'), _('You can not remove an account containing journal items.'))
+ raise osv.except_osv(_('Error!'), _('You cannot remove an account that contains journal items.'))
#Checking whether the account is set as a property to any Partner or not
value = 'account.account,' + str(ids[0])
partner_prop_acc = self.pool.get('ir.property').search(cr, uid, [('value_reference','=',value)], context=context)
if partner_prop_acc:
- raise osv.except_osv(_('Warning !'), _('You can not remove/desactivate an account which is set on a customer or supplier.'))
+ raise osv.except_osv(_('Warning!'), _('You cannot remove/deactivate an account which is set on a customer or supplier.'))
return True
def _check_allow_type_change(self, cr, uid, ids, new_type, context=None):
@@ -639,10 +639,10 @@ class account_account(osv.osv):
if line_obj.search(cr, uid, [('account_id', 'in', account_ids)]):
#Check for 'Closed' type
if old_type == 'closed' and new_type !='closed':
- raise osv.except_osv(_('Warning !'), _("You cannot change the type of account from 'Closed' to any other type which contains journal items!"))
+ raise osv.except_osv(_('Warning!'), _("You cannot change the type of account from 'Closed' to any other type which contains journal items!"))
#Check for change From group1 to group2 and vice versa
if (old_type in group1 and new_type in group2) or (old_type in group2 and new_type in group1):
- raise osv.except_osv(_('Warning !'), _("You cannot change the type of account from '%s' to '%s' type as it contains journal items!") % (old_type,new_type,))
+ raise osv.except_osv(_('Warning!'), _("You cannot change the type of account from '%s' to '%s' type as it contains journal items!") % (old_type,new_type,))
return True
def write(self, cr, uid, ids, vals, context=None):
@@ -661,7 +661,7 @@ class account_account(osv.osv):
# Allow the write if the value is the same
for i in [i['company_id'][0] for i in self.read(cr,uid,ids,['company_id'])]:
if vals['company_id']!=i:
- raise osv.except_osv(_('Warning !'), _('You cannot change the owner company of an account that already contains journal items.'))
+ raise osv.except_osv(_('Warning!'), _('You cannot change the owner company of an account that already contains journal items.'))
if 'active' in vals and not vals['active']:
self._check_moves(cr, uid, ids, "write", context=context)
if 'type' in vals.keys():
@@ -730,7 +730,7 @@ class account_journal(osv.osv):
'view_id': fields.many2one('account.journal.view', 'Display Mode', required=True, help="Gives the view used when writing or browsing entries in this journal. The view tells OpenERP which fields should be visible, required or readonly and in which order. You can create your own view for a faster encoding in each journal."),
'default_credit_account_id': fields.many2one('account.account', 'Default Credit Account', domain="[('type','!=','view')]", help="It acts as a default account for credit amount"),
'default_debit_account_id': fields.many2one('account.account', 'Default Debit Account', domain="[('type','!=','view')]", help="It acts as a default account for debit amount"),
- 'centralisation': fields.boolean('Centralised counterpart', help="Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."),
+ 'centralisation': fields.boolean('Centralised Counterpart', help="Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."),
'update_posted': fields.boolean('Allow Cancelling Entries', help="Check this box if you want to allow the cancellation the entries related to this journal or of the invoice related to this journal"),
'group_invoice_lines': fields.boolean('Group Invoice Lines', help="If this box is checked, the system will try to group the accounting lines when generating them from invoices."),
'sequence_id': fields.many2one('ir.sequence', 'Entry Sequence', help="This field contains the information related to the numbering of the journal entries of this journal.", required=True),
@@ -768,7 +768,7 @@ class account_journal(osv.osv):
return True
_constraints = [
- (_check_currency, 'Configuration error! The currency chosen should be shared by the default accounts too.', ['currency','default_debit_account_id','default_credit_account_id']),
+ (_check_currency, 'Configuration error!\nThe currency chosen should be shared by the default accounts too.', ['currency','default_debit_account_id','default_credit_account_id']),
]
def copy(self, cr, uid, id, default={}, context=None, done_list=[], local=False):
@@ -790,7 +790,7 @@ class account_journal(osv.osv):
if 'company_id' in vals and journal.company_id.id != vals['company_id']:
move_lines = self.pool.get('account.move.line').search(cr, uid, [('journal_id', 'in', ids)])
if move_lines:
- raise osv.except_osv(_('Warning !'), _('You can not modify the company of this journal as its related record exist in journal items'))
+ raise osv.except_osv(_('Warning!'), _('This journal already contains items, therefore you cannot modify its company field.'))
return super(account_journal, self).write(cr, uid, ids, vals, context=context)
def create_sequence(self, cr, uid, vals, context=None):
@@ -915,7 +915,7 @@ class account_fiscalyear(osv.osv):
return True
_constraints = [
- (_check_duration, 'Error! The start date of the fiscal year must be before his end date.', ['date_start','date_stop'])
+ (_check_duration, 'Error!\nThe start date of a fiscal year must precede its end date.', ['date_start','date_stop'])
]
def create_period3(self, cr, uid, ids, context=None):
@@ -966,7 +966,7 @@ class account_fiscalyear(osv.osv):
ids = self.search(cr, uid, args, context=context)
if not ids:
if exception:
- raise osv.except_osv(_('Error !'), _('No fiscal year defined for this date !\nPlease create one from the configuration of the accounting menu.'))
+ raise osv.except_osv(_('Error!'), _('There is no fiscal year defined for this date.\nPlease create one from the configuration of the accounting menu.'))
else:
return []
return ids
@@ -1032,8 +1032,8 @@ class account_period(osv.osv):
return True
_constraints = [
- (_check_duration, 'Error ! The duration of the Period(s) is/are invalid. ', ['date_stop']),
- (_check_year_limit, 'Invalid period ! Some periods overlap or the date period is not in the scope of the fiscal year. ', ['date_stop'])
+ (_check_duration, 'Error!\nThe duration of the Period(s) is/are invalid.', ['date_stop']),
+ (_check_year_limit, 'Error!\nThe period is invalid. Either some periods are overlapping or the period\'s dates are not matching the scope of the fiscal year.', ['date_stop'])
]
def next(self, cr, uid, period, step, context=None):
@@ -1055,7 +1055,7 @@ class account_period(osv.osv):
args.append(('company_id', '=', company_id))
ids = self.search(cr, uid, args, context=context)
if not ids:
- raise osv.except_osv(_('Error !'), _('No period defined for this date: %s !\nPlease create one.')%dt)
+ raise osv.except_osv(_('Error!'), _('There is no period defined for this date: %s.\nPlease create one.')%dt)
return ids
def action_draft(self, cr, uid, ids, *args):
@@ -1080,7 +1080,7 @@ class account_period(osv.osv):
if 'company_id' in vals:
move_lines = self.pool.get('account.move.line').search(cr, uid, [('period_id', 'in', ids)])
if move_lines:
- raise osv.except_osv(_('Warning !'), _('You can not modify company of this period as some journal items exists.'))
+ raise osv.except_osv(_('Warning!'), _('This journal already contains items for this period, therefore you cannot modify its company field.'))
return super(account_period, self).write(cr, uid, ids, vals, context=context)
def build_ctx_periods(self, cr, uid, period_from_id, period_to_id):
@@ -1093,9 +1093,9 @@ class account_period(osv.osv):
period_date_stop = period_to.date_stop
company2_id = period_to.company_id.id
if company1_id != company2_id:
- raise osv.except_osv(_('Error'), _('You should have chosen periods that belongs to the same company'))
+ raise osv.except_osv(_('Error!'), _('You should choose the periods that belong to the same company.'))
if period_date_start > period_date_stop:
- raise osv.except_osv(_('Error'), _('Start period should be smaller then End period'))
+ raise osv.except_osv(_('Error!'), _('Start period should precede then end period.'))
#for period from = january, we want to exclude the opening period (but it has same date_from, so we have to check if period_from is special or not to include that clause or not in the search).
if period_from.special:
return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('company_id', '=', company1_id)])
@@ -1134,7 +1134,7 @@ class account_journal_period(osv.osv):
cr.execute('select * from account_move_line where journal_id=%s and period_id=%s limit 1', (obj.journal_id.id, obj.period_id.id))
res = cr.fetchall()
if res:
- raise osv.except_osv(_('Error !'), _('You can not modify/delete a journal with entries for this period !'))
+ raise osv.except_osv(_('Error!'), _('You cannot modify/delete a journal with entries for this period.'))
return True
def write(self, cr, uid, ids, vals, context=None):
@@ -1303,7 +1303,7 @@ class account_move(osv.osv):
_constraints = [
(_check_centralisation,
- 'You can not create more than one move per period on centralized journal',
+ 'You cannot create more than one move per period on a centralized journal.',
['journal_id']),
]
@@ -1314,7 +1314,7 @@ class account_move(osv.osv):
valid_moves = self.validate(cr, uid, ids, context)
if not valid_moves:
- raise osv.except_osv(_('Integrity Error !'), _('You can not validate a non-balanced entry !\nMake sure you have configured payment terms properly !\nThe latest payment term line should be of the type "Balance" !'))
+ raise osv.except_osv(_('Error!'), _('You cannot validate a non-balanced entry.\nMake sure you have configured payment terms properly.\nThe latest payment term line should be of the "Balance" type.'))
obj_sequence = self.pool.get('ir.sequence')
for move in self.browse(cr, uid, valid_moves, context=context):
if move.name =='/':
@@ -1328,7 +1328,7 @@ class account_move(osv.osv):
c = {'fiscalyear_id': move.period_id.fiscalyear_id.id}
new_name = obj_sequence.next_by_id(cr, uid, journal.sequence_id.id, c)
else:
- raise osv.except_osv(_('Error'), _('No sequence defined on the journal !'))
+ raise osv.except_osv(_('Error!'), _('Please define a sequence on the journal.'))
if new_name:
self.write(cr, uid, [move.id], {'name':new_name})
@@ -1351,14 +1351,14 @@ class account_move(osv.osv):
if not top_common:
top_common = top_account
elif top_account.id != top_common.id:
- raise osv.except_osv(_('Error !'),
- _('You cannot validate this journal entry because account "%s" does not belong to chart of accounts "%s"!') % (account.name, top_common.name))
+ raise osv.except_osv(_('Error!'),
+ _('You cannot validate this journal entry because account "%s" does not belong to chart of accounts "%s".') % (account.name, top_common.name))
return self.post(cursor, user, ids, context=context)
def button_cancel(self, cr, uid, ids, context=None):
for line in self.browse(cr, uid, ids, context=context):
if not line.journal_id.update_posted:
- raise osv.except_osv(_('Error !'), _('You can not modify a posted entry of this journal !\nYou should set the journal to allow cancelling entries if you want to do that.'))
+ raise osv.except_osv(_('Error!'), _('You cannot modify a posted entry of this journal.\nFirst you should set the journal to allow cancelling entries.'))
if ids:
cr.execute('UPDATE account_move '\
'SET state=%s '\
@@ -1445,8 +1445,8 @@ class account_move(osv.osv):
obj_move_line = self.pool.get('account.move.line')
for move in self.browse(cr, uid, ids, context=context):
if move['state'] != 'draft':
- raise osv.except_osv(_('UserError'),
- _('You can not delete a posted journal entry "%s"!') % \
+ raise osv.except_osv(_('User Error!'),
+ _('You cannot delete a posted journal entry "%s".') % \
move['name'])
line_ids = map(lambda x: x.id, move.line_id)
context['journal_id'] = move.journal_id.id
@@ -1474,16 +1474,16 @@ class account_move(osv.osv):
account_id = move.journal_id.default_debit_account_id.id
mode2 = 'debit'
if not account_id:
- raise osv.except_osv(_('UserError'),
- _('There is no default default debit account defined \n' \
- 'on journal "%s"') % move.journal_id.name)
+ raise osv.except_osv(_('User Error!'),
+ _('There is no default debit account defined \n' \
+ 'on journal "%s".') % move.journal_id.name)
else:
account_id = move.journal_id.default_credit_account_id.id
mode2 = 'credit'
if not account_id:
- raise osv.except_osv(_('UserError'),
- _('There is no default default credit account defined \n' \
- 'on journal "%s"') % move.journal_id.name)
+ raise osv.except_osv(_('User Error!'),
+ _('There is no default credit account defined \n' \
+ 'on journal "%s".') % move.journal_id.name)
# find the first line of this move with the current mode
# or create it if it doesn't exist
@@ -1577,11 +1577,11 @@ class account_move(osv.osv):
if not company_id:
company_id = line.account_id.company_id.id
if not company_id == line.account_id.company_id.id:
- raise osv.except_osv(_('Error'), _("Couldn't create move between different companies"))
+ raise osv.except_osv(_('Error!'), _("Cannot create moves for different companies."))
if line.account_id.currency_id and line.currency_id:
if line.account_id.currency_id.id != line.currency_id.id and (line.account_id.currency_id.id != line.account_id.company_id.currency_id.id):
- raise osv.except_osv(_('Error'), _("""Couldn't create move with currency different from the secondary currency of the account "%s - %s". Clear the secondary currency field of the account definition if you want to accept all currencies.""") % (line.account_id.code, line.account_id.name))
+ raise osv.except_osv(_('Error!'), _("""Cannot create move with currency different from ..""") % (line.account_id.code, line.account_id.name))
if abs(amount) < 10 ** -4:
# If the move is balanced
@@ -1833,7 +1833,7 @@ class account_tax_code(osv.osv):
_check_recursion = check_cycle
_constraints = [
- (_check_recursion, 'Error ! You can not create recursive accounts.', ['parent_id'])
+ (_check_recursion, 'Error!\nYou cannot create recursive accounts.', ['parent_id'])
]
_order = 'code'
@@ -2118,7 +2118,7 @@ class account_tax(osv.osv):
}
def compute(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None):
- _logger.warning("Deprecated, use compute_all(...)['taxes'] instead of compute(...) to manage prices with tax included")
+ _logger.warning("Deprecated, use compute_all(...)['taxes'] instead of compute(...) to manage prices with tax included.")
return self._compute(cr, uid, taxes, price_unit, quantity, product, partner)
def _compute(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None, precision=None):
@@ -2307,7 +2307,7 @@ class account_model(osv.osv):
date_maturity = context.get('date',time.strftime('%Y-%m-%d'))
if line.date_maturity == 'partner':
if not line.partner_id:
- raise osv.except_osv(_('Error !'), _("Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!" \
+ raise osv.except_osv(_('Error!'), _("Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!" \
"\nPlease define partner on it!")%(line.name, model.name))
if line.partner_id.property_payment_term:
payment_term_id = line.partner_id.property_payment_term.id
@@ -2521,8 +2521,8 @@ class account_account_template(osv.osv):
_check_recursion = check_cycle
_constraints = [
- (_check_recursion, 'Error ! You can not create recursive account templates.', ['parent_id']),
- (_check_type, 'Configuration Error!\nYou can not define children to an account with internal type different of "View"! ', ['type']),
+ (_check_recursion, 'Error!\nYou cannot create recursive account templates.', ['parent_id']),
+ (_check_type, 'Configuration Error!\nYou cannot define children to an account that has internal type other than "View".', ['type']),
]
@@ -2623,7 +2623,7 @@ class account_add_tmpl_wizard(osv.osv_memory):
ptids = tmpl_obj.read(cr, uid, [tids[0]['parent_id'][0]], ['code'])
res = None
if not ptids or not ptids[0]['code']:
- raise osv.except_osv(_('Error !'), _('I can not locate a parent code for the template account!'))
+ raise osv.except_osv(_('Error!'), _('There is no parent code for the template account.'))
res = acc_obj.search(cr, uid, [('code','=',ptids[0]['code'])])
return res and res[0] or False
@@ -2729,7 +2729,7 @@ class account_tax_code_template(osv.osv):
_check_recursion = check_cycle
_constraints = [
- (_check_recursion, 'Error ! You can not create recursive Tax Codes.', ['parent_id'])
+ (_check_recursion, 'Error!\nYou cannot create recursive Tax Codes.', ['parent_id'])
]
_order = 'code,name'
account_tax_code_template()
@@ -2742,7 +2742,7 @@ class account_chart_template(osv.osv):
_columns={
'name': fields.char('Name', size=64, required=True),
'parent_id': fields.many2one('account.chart.template', 'Parent Chart Template'),
- 'code_digits': fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"),
+ 'code_digits': fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"),
'visible': fields.boolean('Can be Visible?', help="Set this to False if you don't want this template to be used actively in the wizard that generate Chart of Accounts from templates, this is useful when you want to generate accounts of this template only when loading its child template."),
'complete_tax_set': fields.boolean('Complete Set of Taxes', help='This boolean helps you to choose if you want to propose to the user to encode the sale and purchase rates or choose from list of taxes. This last choice assumes that the set of tax defined on this template is complete'),
'account_root_id': fields.many2one('account.account.template', 'Root Account', domain=[('parent_id','=',False)]),
@@ -3026,7 +3026,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
return res
def default_get(self, cr, uid, fields, context=None):
- res = super(wizard_multi_charts_accounts, self).default_get(cr, uid, fields, context=context)
+ res = super(wizard_multi_charts_accounts, self).default_get(cr, uid, fields, context=context)
tax_templ_obj = self.pool.get('account.tax.template')
if 'bank_accounts_id' in fields:
@@ -3102,7 +3102,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
# Get the analytic journal
data = False
if journal_type in ('sale', 'sale_refund'):
- data = obj_data.get_object_reference(cr, uid, 'account', 'analytic_journal_sale')
+ data = obj_data.get_object_reference(cr, uid, 'account', 'analytic_journal_sale')
elif journal_type in ('purchase', 'purchase_refund'):
pass
elif journal_type == 'general':
@@ -3128,7 +3128,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
if journal_type in ('general', 'situation'):
data = obj_data.get_object_reference(cr, uid, 'account', 'account_journal_view')
elif journal_type in ('sale_refund', 'purchase_refund'):
- data = obj_data.get_object_reference(cr, uid, 'account', 'account_sp_refund_journal_view')
+ data = obj_data.get_object_reference(cr, uid, 'account', 'account_sp_refund_journal_view')
else:
data = obj_data.get_object_reference(cr, uid, 'account', 'account_sp_journal_view')
return data and data[1] or False
@@ -3357,7 +3357,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
def _prepare_bank_journal(self, cr, uid, line, current_num, default_account_id, company_id, context=None):
'''
- This function prepares the value to use for the creation of a bank journal created through the wizard of
+ This function prepares the value to use for the creation of a bank journal created through the wizard of
generating COA from templates.
:param line: dictionary containing the values encoded by the user related to his bank account
@@ -3375,9 +3375,9 @@ class wizard_multi_charts_accounts(osv.osv_memory):
tmp = obj_data.get_object_reference(cr, uid, 'account', 'account_journal_bank_view')
view_id_cash = tmp and tmp[1] or False
- # we need to loop again to find next number for journal code
+ # we need to loop again to find next number for journal code
# because we can't rely on the value current_num as,
- # its possible that we already have bank journals created (e.g. by the creation of res.partner.bank)
+ # its possible that we already have bank journals created (e.g. by the creation of res.partner.bank)
# and the next number for account code might have been already used before for journal
for num in xrange(current_num, 100):
# journal_code has a maximal size of 5, hence we can enforce the boundary num < 100
@@ -3386,7 +3386,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
if not ids:
break
else:
- raise osv.except_osv(_('Error'), _('Cannot generate an unused journal code.'))
+ raise osv.except_osv(_('Error!'), _('Cannot generate an unused journal code.'))
vals = {
'name': line['acc_name'],
@@ -3464,7 +3464,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
journal_data.append(vals)
ref_acc_bank = obj_wizard.chart_template_id.bank_account_view_id
if journal_data and not ref_acc_bank.code:
- raise osv.except_osv(_('Configuration Error !'), _('The bank account defined on the selected chart of accounts hasn\'t a code.'))
+ raise osv.except_osv(_('Configuration Error!'), _('You have to set a code for the bank account defined on the selected chart of accounts.'))
current_num = 1
for line in journal_data:
diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index 06de5a3e43e..2117f6e49ea 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -87,18 +87,18 @@ class account_analytic_line(osv.osv):
if not a:
a = prod.categ_id.property_account_expense_categ.id
if not a:
- raise osv.except_osv(_('Error !'),
+ raise osv.except_osv(_('Error!'),
_('There is no expense account defined ' \
- 'for this product: "%s" (id:%d)') % \
+ 'for this product: "%s" (id:%d).') % \
(prod.name, prod.id,))
else:
a = prod.product_tmpl_id.property_account_income.id
if not a:
a = prod.categ_id.property_account_income_categ.id
if not a:
- raise osv.except_osv(_('Error !'),
+ raise osv.except_osv(_('Error!'),
_('There is no income account defined ' \
- 'for this product: "%s" (id:%d)') % \
+ 'for this product: "%s" (id:%d).') % \
(prod.name, prod_id,))
flag = False
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 11bcf565260..8df291a98d1 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -192,11 +192,11 @@ class account_bank_statement(osv.osv):
'ref': st_line.ref,
}
- def _prepare_bank_move_line(self, cr, uid, st_line, move_id, amount, company_currency_id,
+ def _prepare_bank_move_line(self, cr, uid, st_line, move_id, amount, company_currency_id,
context=None):
"""Compute the args to build the dict of values to create the bank move line from a
- statement line by calling the _prepare_move_line_vals. This method may be
- overridden to implement custom move generation (making sure to call super() to
+ statement line by calling the _prepare_move_line_vals. This method may be
+ overridden to implement custom move generation (making sure to call super() to
establish a clean extension chain).
:param browse_record st_line: account.bank.statement.line record to
@@ -219,12 +219,12 @@ class account_bank_statement(osv.osv):
res_currency_obj = self.pool.get('res.currency')
amt_cur = -res_currency_obj.compute(cr, uid, company_currency_id, cur_id, amount, context=context)
- res = self._prepare_move_line_vals(cr, uid, st_line, move_id, debit, credit,
+ res = self._prepare_move_line_vals(cr, uid, st_line, move_id, debit, credit,
amount_currency=amt_cur, currency_id=cur_id, analytic_id=anl_id, context=context)
return res
def _get_counter_part_account(sefl, cr, uid, st_line, context=None):
- """Retrieve the account to use in the counterpart move.
+ """Retrieve the account to use in the counterpart move.
This method may be overridden to implement custom move generation (making sure to
call super() to establish a clean extension chain).
@@ -237,7 +237,7 @@ class account_bank_statement(osv.osv):
return st_line.statement_id.journal_id.default_debit_account_id.id
def _get_counter_part_partner(sefl, cr, uid, st_line, context=None):
- """Retrieve the partner to use in the counterpart move.
+ """Retrieve the partner to use in the counterpart move.
This method may be overridden to implement custom move generation (making sure to
call super() to establish a clean extension chain).
@@ -247,11 +247,11 @@ class account_bank_statement(osv.osv):
"""
return st_line.partner_id and st_line.partner_id.id or False
- def _prepare_counterpart_move_line(self, cr, uid, st_line, move_id, amount, company_currency_id,
+ def _prepare_counterpart_move_line(self, cr, uid, st_line, move_id, amount, company_currency_id,
context=None):
"""Compute the args to build the dict of values to create the counter part move line from a
- statement line by calling the _prepare_move_line_vals. This method may be
- overridden to implement custom move generation (making sure to call super() to
+ statement line by calling the _prepare_move_line_vals. This method may be
+ overridden to implement custom move generation (making sure to call super() to
establish a clean extension chain).
:param browse_record st_line: account.bank.statement.line record to
@@ -271,12 +271,12 @@ class account_bank_statement(osv.osv):
if st_line.statement_id.currency.id <> company_currency_id:
amt_cur = st_line.amount
cur_id = st_line.statement_id.currency.id
- return self._prepare_move_line_vals(cr, uid, st_line, move_id, debit, credit,
+ return self._prepare_move_line_vals(cr, uid, st_line, move_id, debit, credit,
amount_currency = amt_cur, currency_id = cur_id, account_id = account_id,
partner_id = partner_id, context=context)
def _prepare_move_line_vals(self, cr, uid, st_line, move_id, debit, credit, currency_id = False,
- amount_currency= False, account_id = False, analytic_id = False,
+ amount_currency= False, account_id = False, analytic_id = False,
partner_id = False, context=None):
"""Prepare the dict of values to create the move line from a
statement line. All non-mandatory args will replace the default computed one.
@@ -350,12 +350,12 @@ class account_bank_statement(osv.osv):
amount = res_currency_obj.compute(cr, uid, st.currency.id,
company_currency_id, st_line.amount, context=context)
- bank_move_vals = self._prepare_bank_move_line(cr, uid, st_line, move_id, amount,
+ bank_move_vals = self._prepare_bank_move_line(cr, uid, st_line, move_id, amount,
company_currency_id, context=context)
move_line_id = account_move_line_obj.create(cr, uid, bank_move_vals, context=context)
torec.append(move_line_id)
- counterpart_move_vals = self._prepare_counterpart_move_line(cr, uid, st_line, move_id,
+ counterpart_move_vals = self._prepare_counterpart_move_line(cr, uid, st_line, move_id,
amount, company_currency_id, context=context)
account_move_line_obj.create(cr, uid, counterpart_move_vals, context=context)
@@ -364,7 +364,7 @@ class account_bank_statement(osv.osv):
context=context).line_id],
context=context):
if line.state <> 'valid':
- raise osv.except_osv(_('Error !'),
+ raise osv.except_osv(_('Error!'),
_('Journal item "%s" is not valid.') % line.name)
# Bank statements will not consider boolean on journal entry_posted
@@ -377,7 +377,7 @@ class account_bank_statement(osv.osv):
def balance_check(self, cr, uid, st_id, journal_type='bank', context=None):
st = self.browse(cr, uid, st_id, context=context)
if not ((abs((st.balance_end or 0.0) - st.balance_end_real) < 0.0001) or (abs((st.balance_end or 0.0) - st.balance_end_real) < 0.0001)):
- raise osv.except_osv(_('Error !'),
+ raise osv.except_osv(_('Error!'),
_('The statement balance is incorrect !\nThe expected balance (%.2f) is different than the computed one. (%.2f)') % (st.balance_end_real, st.balance_end))
return True
@@ -401,7 +401,7 @@ class account_bank_statement(osv.osv):
self.balance_check(cr, uid, st.id, journal_type=j_type, context=context)
if (not st.journal_id.default_credit_account_id) \
or (not st.journal_id.default_debit_account_id):
- raise osv.except_osv(_('Configuration Error !'),
+ raise osv.except_osv(_('Configuration Error!'),
_('Please verify that an account is defined in the journal.'))
if not st.name == '/':
@@ -415,7 +415,7 @@ class account_bank_statement(osv.osv):
for line in st.move_line_ids:
if line.state <> 'valid':
- raise osv.except_osv(_('Error !'),
+ raise osv.except_osv(_('Error!'),
_('The account entries lines are not in valid state.'))
for st_line in st.line_ids:
if st_line.analytic_account_id:
@@ -445,7 +445,7 @@ class account_bank_statement(osv.osv):
account_move_obj.unlink(cr, uid, ids, context)
done.append(st.id)
return self.write(cr, uid, done, {'state':'draft'}, context=context)
-
+
def _compute_balance_end_real(self, cr, uid, journal_id, context=None):
cr.execute('SELECT balance_end_real \
FROM account_bank_statement \
@@ -469,7 +469,7 @@ class account_bank_statement(osv.osv):
if t['state'] in ('draft'):
unlink_ids.append(t['id'])
else:
- raise osv.except_osv(_('Invalid action !'), _('In order to delete a bank statement, you must first cancel it to delete related journal items.'))
+ raise osv.except_osv(_('Invalid Action!'), _('In order to delete a bank statement, you must first cancel it to delete related journal items.'))
osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
return True
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index ae225cc60de..2bb89a84cdc 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -238,7 +238,7 @@ class account_cash_statement(osv.osv):
for statement in statement_pool.browse(cr, uid, ids, context=context):
vals = {}
if not self._user_allow(cr, uid, statement.id, context=context):
- raise osv.except_osv(_('Error !'), (_('You do not have rights to open this %s journal !') % (statement.journal_id.name, )))
+ raise osv.except_osv(_('Error!'), (_('You do not have rights to open this %s journal !') % (statement.journal_id.name, )))
if statement.name and statement.name == '/':
c = {'fiscalyear_id': statement.period_id.fiscalyear_id.id}
@@ -282,8 +282,8 @@ class account_cash_statement(osv.osv):
for item_label, item_account in TALBES:
if getattr(obj.journal_id, item_account):
- raise osv.except_osv(_('Error !'),
- _('There is no %s Account on the Journal %s') % (item_label, obj.journal_id.name,))
+ raise osv.except_osv(_('Error!'),
+ _('There is no %s Account on the journal %s.') % (item_label, obj.journal_id.name,))
is_profit = obj.difference < 0.0
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index b1c5db23df6..064ba419ebd 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -319,7 +319,7 @@ class account_invoice(osv.osv):
res['fields'][field]['selection'] = journal_select
doc = etree.XML(res['arch'])
-
+
if context.get('type', False):
for node in doc.xpath("//field[@name='partner_bank_id']"):
if context['type'] == 'in_refund':
@@ -327,7 +327,7 @@ class account_invoice(osv.osv):
elif context['type'] == 'out_refund':
node.set('domain', "[('partner_id', '=', partner_id)]")
res['arch'] = etree.tostring(doc)
-
+
if view_type == 'search':
if context.get('type', 'in_invoice') in ('out_invoice', 'out_refund'):
for node in doc.xpath("//group[@name='extended filter']"):
@@ -364,15 +364,15 @@ class account_invoice(osv.osv):
except Exception, e:
if '"journal_id" viol' in e.args[0]:
raise orm.except_orm(_('Configuration Error!'),
- _('There is no Accounting Journal of type Sale/Purchase defined!'))
+ _('There is no Sale/Purchase Journal(s) defined.'))
else:
- raise orm.except_orm(_('Unknown Error'), str(e))
+ raise orm.except_orm(_('Unknown Error!'), str(e))
def invoice_print(self, cr, uid, ids, context=None):
'''
This function prints the invoice and mark it as sent, so that we can see more easily the next step of the workflow
'''
- assert len(ids) == 1, 'This option should only be used for a single id at a time'
+ assert len(ids) == 1, 'This option should only be used for a single id at a time.'
self.write(cr, uid, ids, {'sent': True}, context=context)
datas = {
'ids': ids,
@@ -425,7 +425,7 @@ class account_invoice(osv.osv):
if t['state'] in ('draft', 'cancel') and t['internal_number']== False:
unlink_ids.append(t['id'])
else:
- raise osv.except_osv(_('Invalid action !'), _('You can not delete an invoice which is open or paid. We suggest you to refund it instead.'))
+ raise osv.except_osv(_('Invalid Action!'), _('You cannot delete an invoice which is open or paid. You should refund it instead.'))
osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
return True
@@ -458,8 +458,8 @@ class account_invoice(osv.osv):
rec_res_id = rec_line_data and rec_line_data[0].get('value_reference',False) and int(rec_line_data[0]['value_reference'].split(',')[1]) or False
pay_res_id = pay_line_data and pay_line_data[0].get('value_reference',False) and int(pay_line_data[0]['value_reference'].split(',')[1]) or False
if not rec_res_id and not pay_res_id:
- raise osv.except_osv(_('Configuration Error !'),
- _('Can not find a chart of accounts for this company, you should create one.'))
+ raise osv.except_osv(_('Configuration Error!'),
+ _('Cannot find a chart of accounts for this company, you should create one.'))
account_obj = self.pool.get('account.account')
rec_obj_acc = account_obj.browse(cr, uid, [rec_res_id])
pay_obj_acc = account_obj.browse(cr, uid, [pay_res_id])
@@ -521,7 +521,7 @@ class account_invoice(osv.osv):
pterm_list.sort()
res = {'value':{'date_due': pterm_list[-1]}}
else:
- raise osv.except_osv(_('Data Insufficient !'), _('The payment term of supplier does not have a payment term line!'))
+ raise osv.except_osv(_('Insufficient Data!'), _('The payment term of supplier does not have a payment term line.'))
return res
def onchange_invoice_line(self, cr, uid, ids, lines):
@@ -553,8 +553,8 @@ class account_invoice(osv.osv):
rec_res_id = rec_line_data and rec_line_data[0].get('value_reference',False) and int(rec_line_data[0]['value_reference'].split(',')[1]) or False
pay_res_id = pay_line_data and pay_line_data[0].get('value_reference',False) and int(pay_line_data[0]['value_reference'].split(',')[1]) or False
if not rec_res_id and not pay_res_id:
- raise osv.except_osv(_('Configuration Error !'),
- _('Can not find a chart of account, you should create one from the configuration of the accounting menu.'))
+ raise osv.except_osv(_('Configuration Error!'),
+ _('Cannot find a chart of account, you should create one from Settings\Configuration\Accounting menu.'))
if type in ('out_invoice', 'out_refund'):
acc_id = rec_res_id
else:
@@ -568,16 +568,16 @@ class account_invoice(osv.osv):
if line.account_id.company_id.id != company_id:
result_id = account_obj.search(cr, uid, [('name','=',line.account_id.name),('company_id','=',company_id)])
if not result_id:
- raise osv.except_osv(_('Configuration Error !'),
- _('Can not find a chart of account, you should create one from the configuration of the accounting menu.'))
+ raise osv.except_osv(_('Configuration Error!'),
+ _('Cannot find a chart of account, you should create one from Settings\Configuration\Accounting menu.'))
inv_line_obj.write(cr, uid, [line.id], {'account_id': result_id[-1]})
else:
if invoice_line:
for inv_line in invoice_line:
obj_l = account_obj.browse(cr, uid, inv_line[2]['account_id'])
if obj_l.company_id.id != company_id:
- raise osv.except_osv(_('Configuration Error !'),
- _('Invoice line account company does not match with invoice company.'))
+ raise osv.except_osv(_('Configuration Error!'),
+ _('Invoice line account\'s company and invoice\'s compnay does not match.'))
else:
continue
if company_id and type:
@@ -598,7 +598,7 @@ class account_invoice(osv.osv):
if r[1] == 'journal_id' and r[2] in journal_ids:
val['journal_id'] = r[2]
if not val.get('journal_id', False):
- raise osv.except_osv(_('Configuration Error !'), (_('Can\'t find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration\Financial Accounting\Accounts\Journals.') % (journal_type)))
+ raise osv.except_osv(_('Configuration Error!'), (_('Cannot find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration\Journals\Journals.') % (journal_type)))
dom = {'journal_id': [('id', 'in', journal_ids)]}
else:
journal_ids = obj_journal.search(cr, uid, [])
@@ -759,13 +759,13 @@ class account_invoice(osv.osv):
key = (tax.tax_code_id.id, tax.base_code_id.id, tax.account_id.id, tax.account_analytic_id.id)
tax_key.append(key)
if not key in compute_taxes:
- raise osv.except_osv(_('Warning !'), _('Global taxes defined, but they are not in invoice lines !'))
+ raise osv.except_osv(_('Warning!'), _('Global taxes defined, but they are not in invoice lines !'))
base = compute_taxes[key]['base']
if abs(base - tax.base) > inv.company_id.currency_id.rounding:
- raise osv.except_osv(_('Warning !'), _('Tax base different!\nClick on compute to update the tax base.'))
+ raise osv.except_osv(_('Warning!'), _('Tax base different!\nClick on compute to update the tax base.'))
for key in compute_taxes:
if not key in tax_key:
- raise osv.except_osv(_('Warning !'), _('Taxes are missing!\nClick on compute button.'))
+ raise osv.except_osv(_('Warning!'), _('Taxes are missing!\nClick on compute button.'))
def compute_invoice_totals(self, cr, uid, inv, company_currency, ref, invoice_move_lines):
total = 0
@@ -835,12 +835,12 @@ class account_invoice(osv.osv):
context = {}
for inv in self.browse(cr, uid, ids, context=context):
if not inv.journal_id.sequence_id:
- raise osv.except_osv(_('Error !'), _('Please define sequence on the journal related to this invoice.'))
+ raise osv.except_osv(_('Error!'), _('Please define sequence on the journal related to this invoice.'))
if not inv.invoice_line:
raise osv.except_osv(_('No Invoice Lines !'), _('Please create some invoice lines.'))
if inv.move_id:
continue
-
+
ctx = context.copy()
ctx.update({'lang': inv.partner_id.lang})
if not inv.date_invoice:
@@ -866,7 +866,7 @@ class account_invoice(osv.osv):
total_percent += line.value_amount
total_fixed = (total_fixed * 100) / (inv.amount_total or 1.0)
if (total_fixed + total_percent) > 100:
- raise osv.except_osv(_('Error !'), _("Can not create the invoice !\nThe related payment term is probably misconfigured as it gives a computed amount greater than the total invoiced amount. The latest line of your payment term must be of type 'balance' to avoid rounding issues."))
+ raise osv.except_osv(_('Error!'), _("Cannot create the invoice.\nThe related payment term is probably misconfigured as it gives a computed amount greater than the total invoiced amount. In order to avoid rounding issues, the latest line of your payment term must be of type 'balance'."))
# one move line per tax line
iml += ait_obj.move_line_get(cr, uid, inv.id)
@@ -947,8 +947,8 @@ class account_invoice(osv.osv):
journal_id = inv.journal_id.id
journal = journal_obj.browse(cr, uid, journal_id, context=ctx)
if journal.centralisation:
- raise osv.except_osv(_('UserError'),
- _('You cannot create an invoice on a centralised journal. Uncheck the centralised counterpart box in the related journal from the configuration menu.'))
+ raise osv.except_osv(_('User Error!'),
+ _('You cannot create an invoice on a centralized journal. Uncheck the centralized counterpart box in the related journal from the configuration menu.'))
line = self.finalize_invoice_move_lines(cr, uid, inv, line)
@@ -979,7 +979,7 @@ class account_invoice(osv.osv):
move_obj.post(cr, uid, [move_id], context=ctx)
self._log_event(cr, uid, ids)
return True
-
+
def invoice_validate(self, cr, uid, ids, context=None):
self.write(cr, uid, ids, {'state':'open'}, context=context)
return True
@@ -1061,7 +1061,7 @@ class account_invoice(osv.osv):
pay_ids = account_move_line_obj.browse(cr, uid, i['payment_ids'])
for move_line in pay_ids:
if move_line.reconcile_partial_id and move_line.reconcile_partial_id.line_partial_ids:
- raise osv.except_osv(_('Error !'), _('You can not cancel an invoice which is partially paid! You need to unreconcile related payment entries first!'))
+ raise osv.except_osv(_('Error!'), _('You cannot cancel an invoice which is partially paid. You need to unreconcile related payment entries first.'))
# First, set the invoices as cancelled and detach the move ids
self.write(cr, uid, ids, {'state':'cancel', 'move_id':False})
@@ -1187,7 +1187,7 @@ class account_invoice(osv.osv):
if context is None:
context = {}
#TODO check if we can use different period for payment and the writeoff line
- assert len(ids)==1, "Can only pay one invoice at a time"
+ assert len(ids)==1, "Can only pay one invoice at a time."
invoice = self.browse(cr, uid, ids[0], context=context)
src_account_id = invoice.account_id.id
# Take the seq as name for move
@@ -1273,7 +1273,7 @@ class account_invoice(osv.osv):
else:
code = invoice.currency_id.symbol
# TODO: use currency's formatting function
- msg = _("Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)") % \
+ msg = _("Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining).") % \
(name, pay_amount, code, invoice.amount_total, code, total, code)
self.message_append_note(cr, uid, [inv_id], body=msg, context=context)
self.pool.get('account.move.line').reconcile_partial(cr, uid, line_ids, 'manual', context)
@@ -1281,11 +1281,11 @@ class account_invoice(osv.osv):
# Update the stored value (fields.function), so we write to trigger recompute
self.pool.get('account.invoice').write(cr, uid, ids, {}, context=context)
return True
-
+
# -----------------------------------------
# OpenChatter notifications and need_action
# -----------------------------------------
-
+
def _get_document_type(self, type):
type_dict = {
'out_invoice': 'Customer invoice',
@@ -1294,19 +1294,19 @@ class account_invoice(osv.osv):
'in_refund': 'Supplier Refund',
}
return type_dict.get(type, 'Invoice')
-
+
def create_send_note(self, cr, uid, ids, context=None):
for obj in self.browse(cr, uid, ids, context=context):
self.message_append_note(cr, uid, [obj.id],body=_("%s created.") % (self._get_document_type(obj.type)), context=context)
-
+
def confirm_paid_send_note(self, cr, uid, ids, context=None):
for obj in self.browse(cr, uid, ids, context=context):
self.message_append_note(cr, uid, [obj.id], body=_("%s paid.") % (self._get_document_type(obj.type)), context=context)
-
+
def invoice_cancel_send_note(self, cr, uid, ids, context=None):
for obj in self.browse(cr, uid, ids, context=context):
self.message_append_note(cr, uid, [obj.id], body=_("%s cancelled.") % (self._get_document_type(obj.type)), context=context)
-
+
account_invoice()
class account_invoice_line(osv.osv):
@@ -1475,7 +1475,7 @@ class account_invoice_line(osv.osv):
if prod.uom_id.category_id.id != prod_uom.category_id.id:
warning = {
'title': _('Warning!'),
- 'message': _('You selected an Unit of Measure which is not compatible with the product.')
+ 'message': _('The selected unit of measure is not compatible with the unit of measure of the product.')
}
return {'value': res['value'], 'warning': warning}
return res
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 5eb56bfa645..18ab1a779a3 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -95,7 +95,7 @@ class account_move_line(osv.osv):
if initial_bal and not context.get('periods', False) and not where_move_lines_by_date:
#we didn't pass any filter in the context, and the initial balance can't be computed using only the fiscalyear otherwise entries will be summed twice
#so we have to invalidate this query
- raise osv.except_osv(_('Warning !'),_("You haven't supplied enough argument to compute the initial balance, please select a period and journal in the context."))
+ raise osv.except_osv(_('Warning!'),_("You have not supplied enough arguments to compute the initial balance, please select a period and a journal in the context."))
if context.get('journal_ids', False):
@@ -577,14 +577,14 @@ class account_move_line(osv.osv):
lines = self.browse(cr, uid, ids, context=context)
for l in lines:
if l.account_id.type == 'view':
- raise osv.except_osv(_('Error :'), _('You can not create journal items on a "view" account %s %s') % (l.account_id.code, l.account_id.name))
+ raise osv.except_osv(_('Error!'), _('You cannot create journal items on “View” type account %s %s.') % (l.account_id.code, l.account_id.name))
return True
def _check_no_closed(self, cr, uid, ids, context=None):
lines = self.browse(cr, uid, ids, context=context)
for l in lines:
if l.account_id.type == 'closed':
- raise osv.except_osv(_('Error :'), _('You can not create journal items on a closed account %s %s') % (l.account_id.code, l.account_id.name))
+ raise osv.except_osv(_('Error!'), _('You cannot create journal items on a closed account %s %s.') % (l.account_id.code, l.account_id.name))
return True
def _check_company_id(self, cr, uid, ids, context=None):
@@ -609,9 +609,9 @@ class account_move_line(osv.osv):
return True
_constraints = [
- (_check_no_view, 'You can not create journal items on an account of type view.', ['account_id']),
- (_check_no_closed, 'You can not create journal items on closed account.', ['account_id']),
- (_check_company_id, 'Company must be the same for its related account and period.', ['company_id']),
+ (_check_no_view, 'You cannot create journal items on an account of type view.', ['account_id']),
+ (_check_no_closed, 'You cannot create journal items on closed account.', ['account_id']),
+ (_check_company_id, 'Account and Period must belong to the same company.', ['company_id']),
(_check_date, 'The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal.', ['date']),
(_check_currency, 'The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal.', ['currency_id']),
]
@@ -743,7 +743,7 @@ class account_move_line(osv.osv):
context = {}
for line in self.browse(cr, uid, ids, context=context):
if company_list and not line.company_id.id in company_list:
- raise osv.except_osv(_('Warning !'), _('To reconcile the entries company should be the same for all entries'))
+ raise osv.except_osv(_('Warning!'), _('To reconcile the entries company should be the same for all entries.'))
company_list.append(line.company_id.id)
for line in self.browse(cr, uid, ids, context=context):
@@ -752,7 +752,7 @@ class account_move_line(osv.osv):
else:
currency_id = line.company_id.currency_id
if line.reconcile_id:
- raise osv.except_osv(_('Warning'), _('Already Reconciled!'))
+ raise osv.except_osv(_('Warning!'), _('Already reconciled.'))
if line.reconcile_partial_id:
for line2 in line.reconcile_partial_id.line_partial_ids:
if not line2.reconcile_id:
@@ -796,11 +796,11 @@ class account_move_line(osv.osv):
company_list = []
for line in self.browse(cr, uid, ids, context=context):
if company_list and not line.company_id.id in company_list:
- raise osv.except_osv(_('Warning !'), _('To reconcile the entries company should be the same for all entries'))
+ raise osv.except_osv(_('Warning!'), _('To reconcile the entries company should be the same for all entries.'))
company_list.append(line.company_id.id)
for line in unrec_lines:
if line.state <> 'valid':
- raise osv.except_osv(_('Error'),
+ raise osv.except_osv(_('Error!'),
_('Entry "%s" is not valid !') % line.name)
credit += line['credit']
debit += line['debit']
@@ -823,15 +823,15 @@ class account_move_line(osv.osv):
r = cr.fetchall()
#TODO: move this check to a constraint in the account_move_reconcile object
if not unrec_lines:
- raise osv.except_osv(_('Error'), _('Entry is already reconciled'))
+ raise osv.except_osv(_('Error!'), _('Entry is already reconciled.'))
account = account_obj.browse(cr, uid, account_id, context=context)
if r[0][1] != None:
- raise osv.except_osv(_('Error'), _('Some entries are already reconciled !'))
+ raise osv.except_osv(_('Error!'), _('Some entries are already reconciled.'))
if (not currency_obj.is_zero(cr, uid, account.company_id.currency_id, writeoff)) or \
(account.currency_id and (not currency_obj.is_zero(cr, uid, account.currency_id, currency))):
if not writeoff_acc_id:
- raise osv.except_osv(_('Warning'), _('You have to provide an account for the write off/exchange difference entry !'))
+ raise osv.except_osv(_('Warning!'), _('You have to provide an account for the write off/exchange difference entry.'))
if writeoff > 0:
debit = writeoff
credit = 0.0
@@ -1090,9 +1090,9 @@ class account_move_line(osv.osv):
res = cr.fetchone()
if res:
if res[1] != 'draft':
- raise osv.except_osv(_('UserError'),
+ raise osv.except_osv(_('User Error!'),
_('The account move (%s) for centralisation ' \
- 'has been confirmed!') % res[2])
+ 'has been confirmed.') % res[2])
return res
def _remove_move_reconcile(self, cr, uid, move_ids=[], context=None):
@@ -1139,9 +1139,9 @@ class account_move_line(osv.osv):
if isinstance(ids, (int, long)):
ids = [ids]
if vals.get('account_tax_id', False):
- raise osv.except_osv(_('Unable to change tax !'), _('You can not change the tax, you should remove and recreate lines !'))
+ raise osv.except_osv(_('Unable to change tax!'), _('You cannot change the tax, you should remove and recreate lines.'))
if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
- raise osv.except_osv(_('Bad account!'), _('You can not use an inactive account!'))
+ raise osv.except_osv(_('Bad Account!'), _('You cannot use an inactive account.'))
if update_check:
if ('account_id' in vals) or ('journal_id' in vals) or ('period_id' in vals) or ('move_id' in vals) or ('debit' in vals) or ('credit' in vals) or ('date' in vals):
self._update_check(cr, uid, ids, context)
@@ -1186,7 +1186,7 @@ class account_move_line(osv.osv):
result = cr.fetchall()
for (state,) in result:
if state == 'done':
- raise osv.except_osv(_('Error !'), _('You can not add/modify entries in a closed journal.'))
+ raise osv.except_osv(_('Error!'), _('You cannot add/modify entries in a closed journal.'))
if not result:
journal = journal_obj.browse(cr, uid, journal_id, context=context)
period = period_obj.browse(cr, uid, period_id, context=context)
@@ -1202,9 +1202,9 @@ class account_move_line(osv.osv):
for line in self.browse(cr, uid, ids, context=context):
err_msg = _('Move name (id): %s (%s)') % (line.move_id.name, str(line.move_id.id))
if line.move_id.state <> 'draft' and (not line.journal_id.entry_posted):
- raise osv.except_osv(_('Error !'), _('You can not do this modification on a confirmed entry! You can just change some non legal fields or you must unconfirm the journal entry first! \n%s') % err_msg)
+ raise osv.except_osv(_('Error!'), _('You cannot do this modification on a confirmed entry. You can just change some non legal fields or you must unconfirm the journal entry first.\n%s.') % err_msg)
if line.reconcile_id:
- raise osv.except_osv(_('Error !'), _('You can not do this modification on a reconciled entry! You can just change some non legal fields or you must unreconcile first!\n%s') % err_msg)
+ raise osv.except_osv(_('Error!'), _('You cannot do this modification on a reconciled entry. You can just change some non legal fields or you must unreconcile first.\n%s.') % err_msg)
t = (line.journal_id.id, line.period_id.id)
if t not in done:
self._update_journal_check(cr, uid, line.journal_id.id, line.period_id.id, context)
@@ -1224,7 +1224,7 @@ class account_move_line(osv.osv):
if company_id:
vals['company_id'] = company_id[0]
if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
- raise osv.except_osv(_('Bad account!'), _('You can not use an inactive account!'))
+ raise osv.except_osv(_('Bad Account!'), _('You cannot use an inactive account.'))
if 'journal_id' in vals:
context['journal_id'] = vals['journal_id']
if 'period_id' in vals:
@@ -1237,10 +1237,10 @@ class account_move_line(osv.osv):
if 'period_id' not in context or not isinstance(context.get('period_id', ''), (int, long)):
period_candidate_ids = self.pool.get('account.period').name_search(cr, uid, name=context.get('period_id',''))
if len(period_candidate_ids) != 1:
- raise osv.except_osv(_('Encoding error'), _('No period found or more than one period found for the given date.'))
+ raise osv.except_osv(_('Error!'), _('No period found or more than one period found for the given date.'))
context['period_id'] = period_candidate_ids[0][0]
if not context.get('journal_id', False) and context.get('search_default_journal_id', False):
- context['journal_id'] = context.get('search_default_journal_id')
+ context['journal_id'] = context.get('search_default_journal_id')
self._update_journal_check(cr, uid, context['journal_id'], context['period_id'], context)
move_id = vals.get('move_id', False)
journal = journal_obj.browse(cr, uid, context['journal_id'], context=context)
@@ -1263,7 +1263,7 @@ class account_move_line(osv.osv):
move_id = move_obj.create(cr, uid, v, context)
vals['move_id'] = move_id
else:
- raise osv.except_osv(_('No piece number !'), _('Can not create an automatic sequence for this piece!\nPut a sequence in the journal definition for automatic numbering or create a sequence manually for this piece.'))
+ raise osv.except_osv(_('No piece number !'), _('Cannot create an automatic sequence for this piece.\nPut a sequence in the journal definition for automatic numbering or create a sequence manually for this piece.'))
ok = not (journal.type_control_ids or journal.account_control_ids)
if ('account_id' in vals):
account = account_obj.browse(cr, uid, vals['account_id'], context=context)
@@ -1288,7 +1288,7 @@ class account_move_line(osv.osv):
vals['amount_currency'] = cur_obj.compute(cr, uid, account.company_id.currency_id.id,
account.currency_id.id, vals.get('debit', 0.0)-vals.get('credit', 0.0), context=ctx)
if not ok:
- raise osv.except_osv(_('Bad account !'), _('You can not use this general account in this journal, check the tab \'Entry Controls\' on the related journal !'))
+ raise osv.except_osv(_('Bad Account!'), _('You cannot use this general account in this journal, check the tab \'Entry Controls\' on the related journal.'))
if vals.get('analytic_account_id',False):
if journal.analytic_journal_id:
diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index 7b574c8960e..d258bb0b140 100644
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -20,6 +20,7 @@
rml="account/report/account_print_invoice.rml"
string="Invoices"
attachment="(object.state in ('open','paid')) and ('INV'+(object.number or '').replace('/','')+'.pdf')"
+ attachment_use="True"
usage="default"
/>
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 4fc4754ea3f..60a34628b1b 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -91,7 +91,7 @@ class account_installer(osv.osv_memory):
def check_unconfigured_cmp(self, cr, uid, context=None):
""" check if there are still unconfigured companies """
if not self.get_unconfigured_cmp(cr, uid, context=context):
- raise osv.except_osv(_('No unconfigured company !'), _("There are currently no company without chart of account. The wizard will therefore not be executed."))
+ raise osv.except_osv(_('No unconfigured company !'), _("There is currently no company without chart of account. The wizard will therefore not be executed."))
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
if context is None:context = {}
diff --git a/addons/account/report/common_report_header.py b/addons/account/report/common_report_header.py
index c0365875bdc..c93c3e02ee3 100644
--- a/addons/account/report/common_report_header.py
+++ b/addons/account/report/common_report_header.py
@@ -89,7 +89,7 @@ class common_report_header(object):
return ''
def _get_sortby(self, data):
- raise (_('Error'), _('Not implemented'))
+ raise (_('Error!'), _('Not implemented.'))
def _get_filter(self, data):
if data.get('form', False) and data['form'].get('filter', False):
diff --git a/addons/account/test/account_bank_statement.yml b/addons/account/test/account_bank_statement.yml
index 37789f3ad66..89d0b493444 100644
--- a/addons/account/test/account_bank_statement.yml
+++ b/addons/account/test/account_bank_statement.yml
@@ -70,4 +70,4 @@
try:
self.button_cancel(cr, uid, [ref("account_bank_statement_0")])
except Exception, e:
- assert e[0]=='UserError', 'Another exception has been raised!'
+ assert e[0]=='User Error!', 'Another exception has been raised!'
diff --git a/addons/account/wizard/account_automatic_reconcile.py b/addons/account/wizard/account_automatic_reconcile.py
index 5aeefefe8ce..b4355e79129 100644
--- a/addons/account/wizard/account_automatic_reconcile.py
+++ b/addons/account/wizard/account_automatic_reconcile.py
@@ -145,7 +145,7 @@ class account_automatic_reconcile(osv.osv_memory):
allow_write_off = form.allow_write_off
reconciled = unreconciled = 0
if not form.account_ids:
- raise osv.except_osv(_('UserError'), _('You must select accounts to reconcile'))
+ raise osv.except_osv(_('User Error!'), _('You must select accounts to reconcile.'))
for account_id in form.account_ids:
params = (account_id.id,)
if not allow_write_off:
diff --git a/addons/account/wizard/account_change_currency.py b/addons/account/wizard/account_change_currency.py
index fc460eceb11..d51df1e4d70 100644
--- a/addons/account/wizard/account_change_currency.py
+++ b/addons/account/wizard/account_change_currency.py
@@ -35,7 +35,7 @@ class account_change_currency(osv.osv_memory):
context = {}
if context.get('active_id',False):
if obj_inv.browse(cr, uid, context['active_id']).state != 'draft':
- raise osv.except_osv(_('Error'), _('You can only change currency for Draft Invoice !'))
+ raise osv.except_osv(_('Error!'), _('You can only change currency for Draft Invoice.'))
pass
def change_currency(self, cr, uid, ids, context=None):
@@ -56,18 +56,18 @@ class account_change_currency(osv.osv_memory):
if invoice.company_id.currency_id.id == invoice.currency_id.id:
new_price = line.price_unit * rate
if new_price <= 0:
- raise osv.except_osv(_('Error'), _('New currency is not configured properly !'))
+ raise osv.except_osv(_('Error!'), _('New currency is not configured properly.'))
if invoice.company_id.currency_id.id != invoice.currency_id.id and invoice.company_id.currency_id.id == new_currency:
old_rate = invoice.currency_id.rate
if old_rate <= 0:
- raise osv.except_osv(_('Error'), _('Current currency is not configured properly !'))
+ raise osv.except_osv(_('Error!'), _('Current currency is not configured properly.'))
new_price = line.price_unit / old_rate
if invoice.company_id.currency_id.id != invoice.currency_id.id and invoice.company_id.currency_id.id != new_currency:
old_rate = invoice.currency_id.rate
if old_rate <= 0:
- raise osv.except_osv(_('Error'), _('Current currency is not configured properly !'))
+ raise osv.except_osv(_('Error!'), _('Current currency is not configured properly.'))
new_price = (line.price_unit / old_rate ) * rate
obj_inv_line.write(cr, uid, [line.id], {'price_unit': new_price})
obj_inv.write(cr, uid, [invoice.id], {'currency_id': new_currency}, context=context)
diff --git a/addons/account/wizard/account_financial_report.py b/addons/account/wizard/account_financial_report.py
index f96127f6375..4f9d6abf099 100644
--- a/addons/account/wizard/account_financial_report.py
+++ b/addons/account/wizard/account_financial_report.py
@@ -67,7 +67,7 @@ class accounting_report(osv.osv_memory):
result['date_to'] = data['form']['date_to_cmp']
elif data['form']['filter_cmp'] == 'filter_period':
if not data['form']['period_from_cmp'] or not data['form']['period_to_cmp']:
- raise osv.except_osv(_('Error'),_('Select a starting and an ending period'))
+ raise osv.except_osv(_('Error!'),_('Select a starting and an ending period'))
result['period_from'] = data['form']['period_from_cmp']
result['period_to'] = data['form']['period_to_cmp']
return result
diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py
index 93746e5d964..196c14d3792 100644
--- a/addons/account/wizard/account_fiscalyear_close.py
+++ b/addons/account/wizard/account_fiscalyear_close.py
@@ -51,15 +51,15 @@ class account_fiscalyear_close(osv.osv_memory):
"""
def _reconcile_fy_closing(cr, uid, ids, context=None):
"""
- This private function manually do the reconciliation on the account_move_line given as `ids´, and directly
+ This private function manually do the reconciliation on the account_move_line given as `ids´, and directly
through psql. It's necessary to do it this way because the usual `reconcile()´ function on account.move.line
- object is really resource greedy (not supposed to work on reconciliation between thousands of records) and
+ object is really resource greedy (not supposed to work on reconciliation between thousands of records) and
it does a lot of different computation that are useless in this particular case.
"""
#check that the reconcilation concern journal entries from only one company
cr.execute('select distinct(company_id) from account_move_line where id in %s',(tuple(ids),))
if len(cr.fetchall()) > 1:
- raise osv.except_osv(_('Warning !'), _('The entries to reconcile should belong to the same company'))
+ raise osv.except_osv(_('Warning!'), _('The entries to reconcile should belong to the same company.'))
r_id = self.pool.get('account.move.reconcile').create(cr, uid, {'type': 'auto'})
cr.execute('update account_move_line set reconcile_id = %s where id in %s',(r_id, tuple(ids),))
return r_id
@@ -85,7 +85,7 @@ class account_fiscalyear_close(osv.osv_memory):
fy2_period_set = ','.join(map(lambda id: str(id[0]), cr.fetchall()))
if not fy_period_set or not fy2_period_set:
- raise osv.except_osv(_('UserError'), _('The periods to generate opening entries were not found'))
+ raise osv.except_osv(_('User Error!'), _('The periods to generate opening entries cannot be found.'))
period = obj_acc_period.browse(cr, uid, data[0].period_id.id, context=context)
new_fyear = obj_acc_fiscalyear.browse(cr, uid, data[0].fy2_id.id, context=context)
@@ -96,11 +96,11 @@ class account_fiscalyear_close(osv.osv_memory):
company_id = new_journal.company_id.id
if not new_journal.default_credit_account_id or not new_journal.default_debit_account_id:
- raise osv.except_osv(_('UserError'),
- _('The journal must have default credit and debit account'))
+ raise osv.except_osv(_('User Error!'),
+ _('The journal must have default credit and debit account.'))
if (not new_journal.centralisation) or new_journal.entry_posted:
- raise osv.except_osv(_('UserError'),
- _('The journal must have centralised counterpart without the Skipping draft state option checked!'))
+ raise osv.except_osv(_('User Error!'),
+ _('The journal must have centralized counterpart without the Skipping draft state option checked.'))
#delete existing move and move lines if any
move_ids = obj_acc_move.search(cr, uid, [
diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index 98c32eda7ee..b7d278b8849 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -106,9 +106,9 @@ class account_invoice_refund(osv.osv_memory):
journal_id = form.journal_id.id
for inv in inv_obj.browse(cr, uid, context.get('active_ids'), context=context):
if inv.state in ['draft', 'proforma2', 'cancel']:
- raise osv.except_osv(_('Error !'), _('Can not %s draft/proforma/cancel invoice.') % (mode))
+ raise osv.except_osv(_('Error!'), _('Cannot %s draft/proforma/cancel invoice.') % (mode))
if inv.reconciled and mode in ('cancel', 'modify'):
- raise osv.except_osv(_('Error !'), _('Can not %s invoice which is already reconciled, invoice should be unreconciled first. You can only Refund this invoice') % (mode))
+ raise osv.except_osv(_('Error!'), _('Cannot %s invoice which is already reconciled, invoice should be unreconciled first. You can only refund this invoice.') % (mode))
if form.period.id:
period = form.period.id
else:
@@ -143,8 +143,8 @@ class account_invoice_refund(osv.osv_memory):
description = inv.name
if not period:
- raise osv.except_osv(_('Data Insufficient !'), \
- _('No Period found on Invoice!'))
+ raise osv.except_osv(_('Insufficient Data!'), \
+ _('No period found on the invoice.'))
refund_id = inv_obj.refund(cr, uid, [inv.id], date, period, description, journal_id)
refund = inv_obj.browse(cr, uid, refund_id[0], context=context)
diff --git a/addons/account/wizard/account_invoice_state.py b/addons/account/wizard/account_invoice_state.py
index 7adcb908a34..55eab584040 100644
--- a/addons/account/wizard/account_invoice_state.py
+++ b/addons/account/wizard/account_invoice_state.py
@@ -41,7 +41,7 @@ class account_invoice_confirm(osv.osv_memory):
for record in data_inv:
if record['state'] not in ('draft','proforma','proforma2'):
- raise osv.except_osv(_('Warning'), _("Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-Forma' state!"))
+ raise osv.except_osv(_('Warning!'), _("Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-Forma' state."))
wf_service.trg_validate(uid, 'account.invoice', record['id'], 'invoice_open', cr)
return {'type': 'ir.actions.act_window_close'}
@@ -65,7 +65,7 @@ class account_invoice_cancel(osv.osv_memory):
for record in data_inv:
if record['state'] in ('cancel','paid'):
- raise osv.except_osv(_('Warning'), _("Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' or 'Done' state!"))
+ raise osv.except_osv(_('Warning!'), _("Selected invoice(s) cannot be cancelled as they are already in 'Cancelled' or 'Done' state."))
wf_service.trg_validate(uid, 'account.invoice', record['id'], 'invoice_cancel', cr)
return {'type': 'ir.actions.act_window_close'}
diff --git a/addons/account/wizard/account_move_bank_reconcile.py b/addons/account/wizard/account_move_bank_reconcile.py
index 9be351ed440..4679089b7cc 100644
--- a/addons/account/wizard/account_move_bank_reconcile.py
+++ b/addons/account/wizard/account_move_bank_reconcile.py
@@ -46,7 +46,7 @@ class account_move_bank_reconcile(osv.osv_memory):
from account_journal where id=%s', (data['journal_id'],))
account_id = cr.fetchone()[0]
if not account_id:
- raise osv.except_osv(_('Error'), _('You have to define \
+ raise osv.except_osv(_('Error!'), _('You have to define \
the bank account\nin the journal definition for reconciliation.'))
return {
'domain': "[('journal_id','=',%d), ('account_id','=',%d), ('state','<>','draft')]" % (data['journal_id'], account_id),
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index 66f634bd59f..1353efca1f5 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -60,7 +60,7 @@ class account_move_journal(osv.osv_memory):
if context.get('journal_type', False):
jids = journal_pool.search(cr, uid, [('type','=', context.get('journal_type'))])
if not jids:
- raise osv.except_osv(_('Configuration Error !'), _('Can\'t find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration/Financial Accounting/Accounts/Journals.') % context.get('journal_type'))
+ raise osv.except_osv(_('Configuration Error!'), _('Cannot find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration/Journals/Journals.') % context.get('journal_type'))
journal_id = jids[0]
return journal_id
@@ -83,25 +83,25 @@ class account_move_journal(osv.osv_memory):
if context:
if not view_id:
return res
-
+
period_pool = self.pool.get('account.period')
journal_pool = self.pool.get('account.journal')
-
+
journal_id = self._get_journal(cr, uid, context)
period_id = self._get_period(cr, uid, context)
-
+
journal = False
if journal_id:
journal = journal_pool.read(cr, uid, [journal_id], ['name'])[0]['name']
journal_string = _("Journal: %s") % tools.ustr(journal)
else:
journal_string = _("Journal: All")
-
+
period = False
if period_id:
period = period_pool.browse(cr, uid, [period_id], ['name'])[0]['name']
period_string = _("Period: %s") % tools.ustr(period)
-
+
open_string = _("Open")
view = """
""" % (_('Journal'), journal_string, _('Period'), period_string, open_string)
-
+
view = etree.fromstring(view.encode('utf8'))
xarch, xfields = self._view_look_dom_arch(cr, uid, view, view_id, context=context)
view = xarch
@@ -158,7 +158,7 @@ class account_move_journal(osv.osv_memory):
state = period.state
if state == 'done':
- raise osv.except_osv(_('UserError'), _('This period is already closed !'))
+ raise osv.except_osv(_('User Error!'), _('This period is already closed.'))
company = period.company_id.id
res = {
diff --git a/addons/account/wizard/account_open_closed_fiscalyear.py b/addons/account/wizard/account_open_closed_fiscalyear.py
index d48a561473e..b8d64fac0b5 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear.py
+++ b/addons/account/wizard/account_open_closed_fiscalyear.py
@@ -36,7 +36,7 @@ class account_open_closed_fiscalyear(osv.osv_memory):
data = self.browse(cr, uid, ids, context=context)[0]
period_journal = data.fyear_id.end_journal_period_id or False
if not period_journal:
- raise osv.except_osv(_('Error !'), _('No End of year journal defined for the fiscal year'))
+ raise osv.except_osv(_('Error!'), _('You have to set the end of the fiscal year for this journal.'))
ids_move = move_obj.search(cr, uid, [('journal_id','=',period_journal.journal_id.id),('period_id','=',period_journal.period_id.id)])
if ids_move:
diff --git a/addons/account/wizard/account_period_close.py b/addons/account/wizard/account_period_close.py
index b2c61d9197a..086485ac0f2 100644
--- a/addons/account/wizard/account_period_close.py
+++ b/addons/account/wizard/account_period_close.py
@@ -48,7 +48,7 @@ class account_period_close(osv.osv_memory):
for id in context['active_ids']:
account_move_ids = account_move_obj.search(cr, uid, [('period_id', '=', id), ('state', '=', "draft")], context=context)
if account_move_ids:
- raise osv.except_osv(_('Invalid action !'), _('In order to close a period, you must first post related journal entries.'))
+ raise osv.except_osv(_('Invalid Action!'), _('In order to close a period, you must first post related journal entries.'))
cr.execute('update account_journal_period set state=%s where period_id=%s', (mode, id))
cr.execute('update account_period set state=%s where id=%s', (mode, id))
diff --git a/addons/account/wizard/account_report_aged_partner_balance.py b/addons/account/wizard/account_report_aged_partner_balance.py
index 9b89b30c93b..c4167322b90 100644
--- a/addons/account/wizard/account_report_aged_partner_balance.py
+++ b/addons/account/wizard/account_report_aged_partner_balance.py
@@ -53,9 +53,9 @@ class account_aged_trial_balance(osv.osv_memory):
period_length = data['form']['period_length']
if period_length<=0:
- raise osv.except_osv(_('UserError'), _('You must enter a period length that cannot be 0 or below !'))
+ raise osv.except_osv(_('User Error!'), _('You must set a period length greater than 0.'))
if not data['form']['date_from']:
- raise osv.except_osv(_('UserError'), _('Enter a Start date !'))
+ raise osv.except_osv(_('User Error!'), _('You must set a start date.'))
start = datetime.strptime(data['form']['date_from'], "%Y-%m-%d")
diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index fa3c195cfb7..02da9a6ab1f 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -144,13 +144,13 @@ class account_common_report(osv.osv_memory):
result['date_to'] = data['form']['date_to']
elif data['form']['filter'] == 'filter_period':
if not data['form']['period_from'] or not data['form']['period_to']:
- raise osv.except_osv(_('Error'),_('Select a starting and an ending period'))
+ raise osv.except_osv(_('Error!'),_('Select a starting and an ending period.'))
result['period_from'] = data['form']['period_from']
result['period_to'] = data['form']['period_to']
return result
def _print_report(self, cr, uid, ids, data, context=None):
- raise (_('Error'), _('not implemented'))
+ raise (_('Error!'), _('Not implemented.'))
def check_report(self, cr, uid, ids, context=None):
if context is None:
diff --git a/addons/account/wizard/account_state_open.py b/addons/account/wizard/account_state_open.py
index 62e837b7366..f75aff365fe 100644
--- a/addons/account/wizard/account_state_open.py
+++ b/addons/account/wizard/account_state_open.py
@@ -34,7 +34,7 @@ class account_state_open(osv.osv_memory):
if 'active_ids' in context:
data_inv = obj_invoice.browse(cr, uid, context['active_ids'][0], context=context)
if data_inv.reconciled:
- raise osv.except_osv(_('Warning'), _('Invoice is already reconciled'))
+ raise osv.except_osv(_('Warning!'), _('Invoice is already reconciled.'))
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'account.invoice', context['active_ids'][0], 'open_test', cr)
return {'type': 'ir.actions.act_window_close'}
diff --git a/addons/account/wizard/account_use_model.py b/addons/account/wizard/account_use_model.py
index 4fb77cb3397..7ce73caba55 100644
--- a/addons/account/wizard/account_use_model.py
+++ b/addons/account/wizard/account_use_model.py
@@ -41,7 +41,7 @@ class account_use_model(osv.osv_memory):
for line in model.lines_id:
if line.date_maturity == 'partner':
if not line.partner_id:
- raise osv.except_osv(_('Error !'), _("Maturity date of entry line generated by model line '%s' is based on partner payment term!"\
+ raise osv.except_osv(_('Error!'), _("Maturity date of entry line generated by model line '%s' is based on partner payment term!"\
"\nPlease define partner on it!")%line.name)
pass
diff --git a/addons/account/wizard/account_validate_account_move.py b/addons/account/wizard/account_validate_account_move.py
index 818442a6b3b..1a53c9dfd53 100644
--- a/addons/account/wizard/account_validate_account_move.py
+++ b/addons/account/wizard/account_validate_account_move.py
@@ -36,7 +36,7 @@ class validate_account_move(osv.osv_memory):
data = self.browse(cr, uid, ids, context=context)[0]
ids_move = obj_move.search(cr, uid, [('state','=','draft'),('journal_id','=',data.journal_id.id),('period_id','=',data.period_id.id)])
if not ids_move:
- raise osv.except_osv(_('Warning'), _('Specified Journal does not have any account move entries in draft state for this period'))
+ raise osv.except_osv(_('Warning!'), _('Specified journal does not have any account move entries in draft state for this period.'))
obj_move.button_validate(cr, uid, ids_move, context=context)
return {'type': 'ir.actions.act_window_close'}
@@ -58,7 +58,7 @@ class validate_account_move_lines(osv.osv_memory):
move_ids.append(line.move_id.id)
move_ids = list(set(move_ids))
if not move_ids:
- raise osv.except_osv(_('Warning'), _('Selected Entry Lines does not have any account move enties in draft state'))
+ raise osv.except_osv(_('Warning!'), _('Selected Entry Lines does not have any account move enties in draft state.'))
obj_move.button_validate(cr, uid, move_ids, context)
return {'type': 'ir.actions.act_window_close'}
validate_account_move_lines()
diff --git a/addons/account/wizard/pos_box.py b/addons/account/wizard/pos_box.py
index 12a606833a1..b4254b5ba84 100644
--- a/addons/account/wizard/pos_box.py
+++ b/addons/account/wizard/pos_box.py
@@ -29,11 +29,11 @@ class CashBox(osv.osv_memory):
for box in self.browse(cr, uid, ids, context=context):
for record in records:
if not record.journal_id:
- raise osv.except_osv(_('Error !'),
+ raise osv.except_osv(_('Error!'),
_("Please check that the field 'Journal' is set on the Bank Statement"))
if not record.journal_id.internal_account_id:
- raise osv.except_osv(_('Error !'),
+ raise osv.except_osv(_('Error!'),
_("Please check that the field 'Internal Transfers Account' is set on the payment method '%s'.") % (record.journal_id.name,))
self._create_bank_statement_line(cr, uid, box, record, context=context)
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index c52485ae623..234d6fe0cf8 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -218,7 +218,7 @@ class account_analytic_plan_instance(osv.osv):
pids = ana_plan_instance_obj.search(cr, uid, [('name','=',vals['name']), ('code','=',vals['code']), ('plan_id','<>',False)], context=context)
if pids:
- raise osv.except_osv(_('Error'), _('A model having this name and code already exists !'))
+ raise osv.except_osv(_('Error!'), _('A model with this name and code already exists.'))
res = acct_anal_plan_line_obj.search(cr, uid, [('plan_id','=',journal.plan_id.id)], context=context)
for i in res:
@@ -231,7 +231,7 @@ class account_analytic_plan_instance(osv.osv):
if acct_anal_acct.search(cr, uid, [('parent_id', 'child_of', [item.root_analytic_id.id]), ('id', '=', tempo[2]['analytic_account_id'])], context=context):
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 %s and %s') % (str(item.min_required), str(item.max_required)))
+ raise osv.except_osv(_('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=context)
@@ -338,7 +338,7 @@ class account_move_line(osv.osv):
for line in self.browse(cr, uid, ids, context=context):
if line.analytics_id:
if not line.journal_id.analytic_journal_id:
- raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (line.journal_id.name,))
+ raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal.") % (line.journal_id.name,))
toremove = analytic_line_obj.search(cr, uid, [('move_id','=',line.id)], context=context)
if toremove:
@@ -482,7 +482,7 @@ class account_bank_statement(osv.osv):
for st_line in st.line_ids:
if st_line.analytics_id:
if not st.journal_id.analytic_journal_id:
- raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (st.journal_id.name,))
+ raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal.") % (st.journal_id.name,))
if not st_line.amount:
continue
return True
diff --git a/addons/account_analytic_plans/i18n/ar.po b/addons/account_analytic_plans/i18n/ar.po
index 27dfa9d912d..09a183a75f6 100644
--- a/addons/account_analytic_plans/i18n/ar.po
+++ b/addons/account_analytic_plans/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/bg.po b/addons/account_analytic_plans/i18n/bg.po
index 4d08afa5041..c0af63270d5 100644
--- a/addons/account_analytic_plans/i18n/bg.po
+++ b/addons/account_analytic_plans/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/bs.po b/addons/account_analytic_plans/i18n/bs.po
index d2c8bb24489..f15def73e16 100644
--- a/addons/account_analytic_plans/i18n/bs.po
+++ b/addons/account_analytic_plans/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/ca.po b/addons/account_analytic_plans/i18n/ca.po
index 1a94f74e5a6..e68f9c39f0d 100644
--- a/addons/account_analytic_plans/i18n/ca.po
+++ b/addons/account_analytic_plans/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/cs.po b/addons/account_analytic_plans/i18n/cs.po
index 0213627a743..2ddb3695d78 100644
--- a/addons/account_analytic_plans/i18n/cs.po
+++ b/addons/account_analytic_plans/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/da.po b/addons/account_analytic_plans/i18n/da.po
index 50858c33ea0..a9489556bb9 100644
--- a/addons/account_analytic_plans/i18n/da.po
+++ b/addons/account_analytic_plans/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/de.po b/addons/account_analytic_plans/i18n/de.po
index a6ba383283b..9eb1ffd8635 100644
--- a/addons/account_analytic_plans/i18n/de.po
+++ b/addons/account_analytic_plans/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/el.po b/addons/account_analytic_plans/i18n/el.po
index b2146d3af2f..2244480a865 100644
--- a/addons/account_analytic_plans/i18n/el.po
+++ b/addons/account_analytic_plans/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/es.po b/addons/account_analytic_plans/i18n/es.po
index ff561810b3d..e8d2aa61bea 100644
--- a/addons/account_analytic_plans/i18n/es.po
+++ b/addons/account_analytic_plans/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/es_AR.po b/addons/account_analytic_plans/i18n/es_AR.po
index 1ebcf662548..4b10fbc08aa 100644
--- a/addons/account_analytic_plans/i18n/es_AR.po
+++ b/addons/account_analytic_plans/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/es_CR.po b/addons/account_analytic_plans/i18n/es_CR.po
index 82b34a7ec88..d74368577ca 100644
--- a/addons/account_analytic_plans/i18n/es_CR.po
+++ b/addons/account_analytic_plans/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
"Language: \n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/es_EC.po b/addons/account_analytic_plans/i18n/es_EC.po
index af4caa96de4..060c2981488 100644
--- a/addons/account_analytic_plans/i18n/es_EC.po
+++ b/addons/account_analytic_plans/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/es_PY.po b/addons/account_analytic_plans/i18n/es_PY.po
index 9815a8d812d..1c6e35c2583 100644
--- a/addons/account_analytic_plans/i18n/es_PY.po
+++ b/addons/account_analytic_plans/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/et.po b/addons/account_analytic_plans/i18n/et.po
index 294c73c2e9c..9fb798a4905 100644
--- a/addons/account_analytic_plans/i18n/et.po
+++ b/addons/account_analytic_plans/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#~ msgid "Printing date:"
#~ msgstr "Trükkimise kuupäev:"
diff --git a/addons/account_analytic_plans/i18n/fa.po b/addons/account_analytic_plans/i18n/fa.po
index daace5a2bf3..ac18d42a208 100644
--- a/addons/account_analytic_plans/i18n/fa.po
+++ b/addons/account_analytic_plans/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/fi.po b/addons/account_analytic_plans/i18n/fi.po
index 8ddf0cfbe3c..193c2bc55a4 100644
--- a/addons/account_analytic_plans/i18n/fi.po
+++ b/addons/account_analytic_plans/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/fr.po b/addons/account_analytic_plans/i18n/fr.po
index 2e6552728dd..2bbfdf89760 100644
--- a/addons/account_analytic_plans/i18n/fr.po
+++ b/addons/account_analytic_plans/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/gl.po b/addons/account_analytic_plans/i18n/gl.po
index 6883e1f4f97..a10cf6c8016 100644
--- a/addons/account_analytic_plans/i18n/gl.po
+++ b/addons/account_analytic_plans/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/gu.po b/addons/account_analytic_plans/i18n/gu.po
index 8eb64ac4351..2c90bd64d77 100644
--- a/addons/account_analytic_plans/i18n/gu.po
+++ b/addons/account_analytic_plans/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/hr.po b/addons/account_analytic_plans/i18n/hr.po
index ad0ea0bcc8a..4b9abfdbd68 100644
--- a/addons/account_analytic_plans/i18n/hr.po
+++ b/addons/account_analytic_plans/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/hu.po b/addons/account_analytic_plans/i18n/hu.po
index 76304e6ece3..037e1fab1cc 100644
--- a/addons/account_analytic_plans/i18n/hu.po
+++ b/addons/account_analytic_plans/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/id.po b/addons/account_analytic_plans/i18n/id.po
index e9793863475..e32abfa4dbe 100644
--- a/addons/account_analytic_plans/i18n/id.po
+++ b/addons/account_analytic_plans/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/it.po b/addons/account_analytic_plans/i18n/it.po
index 3d35b3804e0..5e473fdcbff 100644
--- a/addons/account_analytic_plans/i18n/it.po
+++ b/addons/account_analytic_plans/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/ja.po b/addons/account_analytic_plans/i18n/ja.po
index 0d980741c27..e9bba1aba2b 100644
--- a/addons/account_analytic_plans/i18n/ja.po
+++ b/addons/account_analytic_plans/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/ko.po b/addons/account_analytic_plans/i18n/ko.po
index d83ea9f37e6..b4a0cc152db 100644
--- a/addons/account_analytic_plans/i18n/ko.po
+++ b/addons/account_analytic_plans/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/lt.po b/addons/account_analytic_plans/i18n/lt.po
index b46d9c7df7d..59b4a1e5c9c 100644
--- a/addons/account_analytic_plans/i18n/lt.po
+++ b/addons/account_analytic_plans/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/lv.po b/addons/account_analytic_plans/i18n/lv.po
index bef4866e77d..069e0c09311 100644
--- a/addons/account_analytic_plans/i18n/lv.po
+++ b/addons/account_analytic_plans/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/mn.po b/addons/account_analytic_plans/i18n/mn.po
index be1c22a48ec..b1fdc3ef6d9 100644
--- a/addons/account_analytic_plans/i18n/mn.po
+++ b/addons/account_analytic_plans/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/nl.po b/addons/account_analytic_plans/i18n/nl.po
index 8f7a1f837bf..38b049504f6 100644
--- a/addons/account_analytic_plans/i18n/nl.po
+++ b/addons/account_analytic_plans/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/nl_BE.po b/addons/account_analytic_plans/i18n/nl_BE.po
index 38f2af66e02..feaba980b61 100644
--- a/addons/account_analytic_plans/i18n/nl_BE.po
+++ b/addons/account_analytic_plans/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/oc.po b/addons/account_analytic_plans/i18n/oc.po
index 1f448d430e5..0bf8c06514f 100644
--- a/addons/account_analytic_plans/i18n/oc.po
+++ b/addons/account_analytic_plans/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/pl.po b/addons/account_analytic_plans/i18n/pl.po
index 7057a8593ab..101c44c6cbb 100644
--- a/addons/account_analytic_plans/i18n/pl.po
+++ b/addons/account_analytic_plans/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/pt.po b/addons/account_analytic_plans/i18n/pt.po
index 551777a0caf..7c7294f348f 100644
--- a/addons/account_analytic_plans/i18n/pt.po
+++ b/addons/account_analytic_plans/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/pt_BR.po b/addons/account_analytic_plans/i18n/pt_BR.po
index a82ac283bdc..6a436b361d4 100644
--- a/addons/account_analytic_plans/i18n/pt_BR.po
+++ b/addons/account_analytic_plans/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/ro.po b/addons/account_analytic_plans/i18n/ro.po
index debf955c1af..9d84d1326ec 100644
--- a/addons/account_analytic_plans/i18n/ro.po
+++ b/addons/account_analytic_plans/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/ru.po b/addons/account_analytic_plans/i18n/ru.po
index 21527cf8c73..e8031d92cca 100644
--- a/addons/account_analytic_plans/i18n/ru.po
+++ b/addons/account_analytic_plans/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/sl.po b/addons/account_analytic_plans/i18n/sl.po
index 3c06b93fa14..bba0b20f1ab 100644
--- a/addons/account_analytic_plans/i18n/sl.po
+++ b/addons/account_analytic_plans/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/sq.po b/addons/account_analytic_plans/i18n/sq.po
index 57450714c16..ad220a722bd 100644
--- a/addons/account_analytic_plans/i18n/sq.po
+++ b/addons/account_analytic_plans/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/sr.po b/addons/account_analytic_plans/i18n/sr.po
index 7aa6658a8f8..d09eb9ee4f6 100644
--- a/addons/account_analytic_plans/i18n/sr.po
+++ b/addons/account_analytic_plans/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/sr@latin.po b/addons/account_analytic_plans/i18n/sr@latin.po
index 740bb86d835..d40b0db6ea5 100644
--- a/addons/account_analytic_plans/i18n/sr@latin.po
+++ b/addons/account_analytic_plans/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/sv.po b/addons/account_analytic_plans/i18n/sv.po
index 1cb9ab23bce..0664ccf65ac 100644
--- a/addons/account_analytic_plans/i18n/sv.po
+++ b/addons/account_analytic_plans/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/tlh.po b/addons/account_analytic_plans/i18n/tlh.po
index 21e72b545ed..2ec43c63ecc 100644
--- a/addons/account_analytic_plans/i18n/tlh.po
+++ b/addons/account_analytic_plans/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/tr.po b/addons/account_analytic_plans/i18n/tr.po
index 40ac247c94b..9c0f62cfcb3 100644
--- a/addons/account_analytic_plans/i18n/tr.po
+++ b/addons/account_analytic_plans/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/uk.po b/addons/account_analytic_plans/i18n/uk.po
index 5dc6f9e0238..fadf2c2100c 100644
--- a/addons/account_analytic_plans/i18n/uk.po
+++ b/addons/account_analytic_plans/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/vi.po b/addons/account_analytic_plans/i18n/vi.po
index ed82694146a..d31062f84eb 100644
--- a/addons/account_analytic_plans/i18n/vi.po
+++ b/addons/account_analytic_plans/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/zh_CN.po b/addons/account_analytic_plans/i18n/zh_CN.po
index e4131bed167..fcf9539949d 100644
--- a/addons/account_analytic_plans/i18n/zh_CN.po
+++ b/addons/account_analytic_plans/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/zh_TW.po b/addons/account_analytic_plans/i18n/zh_TW.po
index 1a00d60b4d9..c96de9287a2 100644
--- a/addons/account_analytic_plans/i18n/zh_TW.po
+++ b/addons/account_analytic_plans/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
index 86fa1c888f5..a68321c334a 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
@@ -58,7 +58,7 @@ class account_crossovered_analytic(osv.osv_memory):
flag = False
break
if flag:
- raise osv.except_osv(_('User Error'),_('There are no Analytic lines related to Account %s' % name))
+ raise osv.except_osv(_('User Error!'),_('There are no analytic lines related to account %s.' % name))
datas = {
'ids': [],
diff --git a/addons/account_analytic_plans/wizard/analytic_plan_create_model.py b/addons/account_analytic_plans/wizard/analytic_plan_create_model.py
index 1cd3022f60b..a8ac8401569 100644
--- a/addons/account_analytic_plans/wizard/analytic_plan_create_model.py
+++ b/addons/account_analytic_plans/wizard/analytic_plan_create_model.py
@@ -35,10 +35,10 @@ class analytic_plan_create_model(osv.osv_memory):
if 'active_id' in context and context['active_id']:
plan = plan_obj.browse(cr, uid, context['active_id'], context=context)
if (not plan.name) or (not plan.code):
- raise osv.except_osv(_('Error'), _('Please put a name and a code before saving the model !'))
+ raise osv.except_osv(_('Error!'), _('Please put a name and a code before saving the model.'))
pids = anlytic_plan_obj.search(cr, uid, [], context=context)
if not pids:
- raise osv.except_osv(_('Error'), _('No analytic plan defined !'))
+ raise osv.except_osv(_('Error!'), _('There is no analytic plan defined.'))
plan_obj.write(cr, uid, [context['active_id']], {'plan_id':pids[0]}, context=context)
model_data_ids = mod_obj.search(cr, uid, [('model', '=', 'ir.ui.view'),('name', '=', 'view_analytic_plan_create_model')], context=context)
@@ -57,4 +57,4 @@ class analytic_plan_create_model(osv.osv_memory):
analytic_plan_create_model()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 8cd73c60aa7..b6828062a85 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -270,7 +270,7 @@ class account_asset_asset(osv.osv):
return True
_constraints = [
- (_check_recursion, 'Error ! You can not create recursive assets.', ['parent_id']),
+ (_check_recursion, 'Error ! You cannot create recursive assets.', ['parent_id']),
(_check_prorata, 'Prorata temporis can be applied only for time method "number of depreciations".', ['prorata']),
]
diff --git a/addons/account_asset/i18n/ar.po b/addons/account_asset/i18n/ar.po
index b8fc454466d..ae66d61ebbe 100644
--- a/addons/account_asset/i18n/ar.po
+++ b/addons/account_asset/i18n/ar.po
@@ -14,19 +14,19 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Assets in draft and open states"
-msgstr "أصول في مسودة أو حالات مفتوحة"
+msgstr "أصول في مسودة وحالات مفتوحة"
#. module: account_asset
#: field:account.asset.category,method_end:0
#: field:account.asset.history,method_end:0 field:asset.modify,method_end:0
msgid "Ending date"
-msgstr "اخر تاريخ"
+msgstr "تاريخ الإنتهاء"
#. module: account_asset
#: field:account.asset.asset,value_residual:0
@@ -143,7 +143,7 @@ msgstr "مُدخلات"
#: view:account.asset.asset:0
#: field:account.asset.asset,depreciation_line_ids:0
msgid "Depreciation Lines"
-msgstr "خطوط الإستلاك"
+msgstr "خطوط الأستهلاك"
#. module: account_asset
#: help:account.asset.asset,salvage_value:0
@@ -282,7 +282,7 @@ msgstr "طريقة الحساب"
#. module: account_asset
#: help:account.asset.asset,method_period:0
msgid "State here the time during 2 depreciations, in months"
-msgstr "تحديد الوقت لـ ٢ إستهلاك في الشهو"
+msgstr "تحديد الوقت لـ ٢ إستهلاك في الشهر"
#. module: account_asset
#: constraint:account.asset.asset:0
@@ -462,6 +462,9 @@ msgid ""
" * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
" * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
msgstr ""
+"أختر طريقة تستخدمها لحساب مبلغ خطوط الأستهلاك.\n"
+" الخطي: محسوبة علي أساس: إجمالي القيمة/ عدد الأستهلاك\n"
+" التدريجي: محسوبة علي أساس :القيمة المتبقية x عامل التدريجية"
#. module: account_asset
#: help:account.asset.asset,method_time:0
@@ -474,6 +477,10 @@ msgid ""
" * Ending Date: Choose the time between 2 depreciations and the date the "
"depreciations won't go beyond."
msgstr ""
+"أختر طريقة تستخدمها لحساب مواعيد وعددخطوط الأستهلاك.\n"
+" * عدد الاستهلاك: حدد عدد خطوط الاستهلاك والوقت بين 2 أستهلاك.\n"
+" * تاريخ الانتهاء:اختر الوقت بين 2 أستهلاك وتاريخ الأستهلاكات التي لم "
+"تتجاوز التخفيض."
#. module: account_asset
#: view:asset.asset.report:0
@@ -494,12 +501,12 @@ msgstr "الشريك"
#. module: account_asset
#: view:asset.asset.report:0 field:asset.asset.report,depreciation_value:0
msgid "Amount of Depreciation Lines"
-msgstr ""
+msgstr "قيمة خطوط الأستهلاك"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Posted depreciation lines"
-msgstr ""
+msgstr "سجل خطوط الأستهلاك"
#. module: account_asset
#: constraint:account.move.line:0
@@ -514,7 +521,7 @@ msgstr "أصول فرعية"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Date of depreciation"
-msgstr ""
+msgstr "تاريخ الأستهلاك"
#. module: account_asset
#: field:account.asset.history,user_id:0
@@ -529,7 +536,7 @@ msgstr "التاريخ"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Assets purchased in current month"
-msgstr ""
+msgstr "اصول مشتراه في الشهر الحالي"
#. module: account_asset
#: constraint:account.move.line:0
@@ -549,12 +556,12 @@ msgstr "احسب"
#. module: account_asset
#: view:account.asset.category:0
msgid "Search Asset Category"
-msgstr ""
+msgstr "بحث فئة الأصول"
#. module: account_asset
#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
msgid "asset.depreciation.confirmation.wizard"
-msgstr ""
+msgstr "asset.depreciation.confirmation.wizard"
#. module: account_asset
#: field:account.asset.asset,active:0
@@ -564,17 +571,17 @@ msgstr "نشِط"
#. module: account_asset
#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
msgid "Close asset"
-msgstr ""
+msgstr "وثيقة أصول"
#. module: account_asset
#: field:account.asset.depreciation.line,parent_state:0
msgid "State of Asset"
-msgstr ""
+msgstr "حالة الأصول"
#. module: account_asset
#: field:account.asset.depreciation.line,name:0
msgid "Depreciation Name"
-msgstr ""
+msgstr "اسم الأستهلاك"
#. module: account_asset
#: view:account.asset.asset:0 field:account.asset.asset,history_ids:0
@@ -599,7 +606,7 @@ msgstr "عام"
#. module: account_asset
#: field:account.asset.asset,prorata:0 field:account.asset.category,prorata:0
msgid "Prorata Temporis"
-msgstr ""
+msgstr "تناسب زمني"
#. module: account_asset
#: view:account.asset.category:0
@@ -614,7 +621,7 @@ msgstr "فاتورة"
#. module: account_asset
#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form_normal
msgid "Review Asset Categories"
-msgstr ""
+msgstr "مراجعة أصول الفئات"
#. module: account_asset
#: view:asset.depreciation.confirmation.wizard:0 view:asset.modify:0
@@ -629,7 +636,7 @@ msgstr "إغلاق"
#. module: account_asset
#: view:account.asset.asset:0 view:account.asset.category:0
msgid "Depreciation Method"
-msgstr ""
+msgstr "طريقة الأستهلاك"
#. module: account_asset
#: field:account.asset.asset,purchase_date:0 view:asset.asset.report:0
@@ -641,14 +648,14 @@ msgstr "تاريخ الشراء"
#: selection:account.asset.asset,method:0
#: selection:account.asset.category,method:0
msgid "Degressive"
-msgstr ""
+msgstr "تدريجي"
#. module: account_asset
#: help:asset.depreciation.confirmation.wizard,period_id:0
msgid ""
"Choose the period for which you want to automatically post the depreciation "
"lines of running assets"
-msgstr ""
+msgstr "أختر الفترة التي تريدها تلقائياً لنشر خطوط الأستهلاك من أصول التشغيل"
#. module: account_asset
#: view:account.asset.asset:0
@@ -658,18 +665,18 @@ msgstr "الحالي"
#. module: account_asset
#: field:account.asset.depreciation.line,remaining_value:0
msgid "Amount to Depreciate"
-msgstr ""
+msgstr "قيمة الاستهلاك"
#. module: account_asset
#: field:account.asset.category,open_asset:0
msgid "Skip Draft State"
-msgstr ""
+msgstr "تخطي حالة المسودة"
#. module: account_asset
#: view:account.asset.asset:0 view:account.asset.category:0
#: view:account.asset.history:0
msgid "Depreciation Dates"
-msgstr ""
+msgstr "تواريخ الأستهلاك"
#. module: account_asset
#: field:account.asset.asset,currency_id:0
@@ -684,7 +691,7 @@ msgstr "السجل اليومي"
#. module: account_asset
#: field:account.asset.depreciation.line,depreciated_value:0
msgid "Amount Already Depreciated"
-msgstr ""
+msgstr "القيمة المستهلكة بالفعل"
#. module: account_asset
#: field:account.asset.depreciation.line,move_check:0
@@ -701,6 +708,11 @@ msgid ""
"You can manually close an asset when the depreciation is over. If the last "
"line of depreciation is posted, the asset automatically goes in that state."
msgstr ""
+"عند إنشاء الاصول , الحالة تكون 'مسودة'.\n"
+"إذا تاكدت هذه الاصول ,الحالة تدخل في 'التشغيل' ويمكن إضافة خطوط الأستهلاك في "
+"الحساب .\n"
+"يمكنك يدوياً إغلاق الاصول عند زيادة الأستهلاك . إذا تم إضافة أخر خط من خطوط "
+"الأستهلاك,الاصل يذهب تلقائياً في هذه الحالة."
#. module: account_asset
#: field:account.asset.category,name:0
@@ -713,6 +725,8 @@ msgid ""
"Check this if you want to automatically confirm the assets of this category "
"when created by invoices."
msgstr ""
+"تحقق من هذا إذا كنت تريد التأكد تلقائياً من أصول فئة تم إنشاؤها بواسطة "
+"فواتير."
#. module: account_asset
#: view:account.asset.asset:0
@@ -733,25 +747,25 @@ msgstr "شهر- ١"
#. module: account_asset
#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
msgid "Asset depreciation line"
-msgstr ""
+msgstr "أصل خط إستهلاك"
#. module: account_asset
#: field:account.asset.asset,category_id:0 view:account.asset.category:0
#: field:asset.asset.report,asset_category_id:0
#: model:ir.model,name:account_asset.model_account_asset_category
msgid "Asset category"
-msgstr ""
+msgstr "فئة أصول"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Assets purchased in last month"
-msgstr ""
+msgstr "أصول مشتراه في الشهر الماضي"
#. module: account_asset
#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
#, python-format
msgid "Created Asset Moves"
-msgstr ""
+msgstr "إنشاء حركات الأصول"
#. module: account_asset
#: constraint:account.move.line:0
@@ -765,11 +779,14 @@ msgid ""
"search can also be used to personalise your Assets reports and so, match "
"this analysis to your needs;"
msgstr ""
+"من هذا التقرير, يمكنك أخذ فكرة عامة عن جميع الأستهلاك كما يمكن أيضا َ "
+"استخدام أداة البحث لإضفاء الطابع الشخصي الخاص بك علي تقارير الأصول وغير ذلك, "
+"طابق هذه التحليلات مع الأحتياجات الخاصة بك"
#. module: account_asset
#: help:account.asset.category,method_period:0
msgid "State here the time between 2 depreciations, in months"
-msgstr ""
+msgstr "أذكر الوقت بين ٢ تخفيضات، في الأشهر"
#. module: account_asset
#: field:account.asset.asset,method_number:0
@@ -780,28 +797,28 @@ msgstr ""
#: selection:account.asset.history,method_time:0
#: field:asset.modify,method_number:0
msgid "Number of Depreciations"
-msgstr ""
+msgstr "عدد التلفيات أو عدد الأستهلاكات"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Create Move"
-msgstr ""
+msgstr "إيجاد تحرك"
#. module: account_asset
#: view:asset.depreciation.confirmation.wizard:0
msgid "Post Depreciation Lines"
-msgstr ""
+msgstr "إضافة خطوط الأستهلاك"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Confirm Asset"
-msgstr ""
+msgstr "تأكيد الأصول"
#. module: account_asset
#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree
msgid "Asset Hierarchy"
-msgstr ""
+msgstr "هرمية الأصول"
#~ msgid "Child assets"
#~ msgstr "أصل فرعي"
@@ -877,3 +894,6 @@ msgstr ""
#~ msgid "Analytic information"
#~ msgstr "معلومات تحليلية"
+
+#~ msgid "Accounting information"
+#~ msgstr "معلومات محاسبية"
diff --git a/addons/account_asset/i18n/ca.po b/addons/account_asset/i18n/ca.po
index c883ae1a58b..a7bc0eb372f 100755
--- a/addons/account_asset/i18n/ca.po
+++ b/addons/account_asset/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_asset
#: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/cs.po b/addons/account_asset/i18n/cs.po
index 29a588941aa..197a3751fc0 100644
--- a/addons/account_asset/i18n/cs.po
+++ b/addons/account_asset/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
"X-Poedit-Language: Czech\n"
#. module: account_asset
diff --git a/addons/account_asset/i18n/da.po b/addons/account_asset/i18n/da.po
index 454623ae8f5..2796fd1a85f 100644
--- a/addons/account_asset/i18n/da.po
+++ b/addons/account_asset/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_asset
#: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/de.po b/addons/account_asset/i18n/de.po
index f18b031e05d..07f094ed24c 100755
--- a/addons/account_asset/i18n/de.po
+++ b/addons/account_asset/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_asset
#: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/es.po b/addons/account_asset/i18n/es.po
index 345855eb5b6..0d098e93c1c 100755
--- a/addons/account_asset/i18n/es.po
+++ b/addons/account_asset/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_asset
#: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/es_AR.po b/addons/account_asset/i18n/es_AR.po
index 39a3e946463..173bed5f355 100644
--- a/addons/account_asset/i18n/es_AR.po
+++ b/addons/account_asset/i18n/es_AR.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_asset
#: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/es_CR.po b/addons/account_asset/i18n/es_CR.po
index 14dd029c1b5..5a814afb640 100755
--- a/addons/account_asset/i18n/es_CR.po
+++ b/addons/account_asset/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
"Language: es\n"
#. module: account_asset
diff --git a/addons/account_asset/i18n/es_EC.po b/addons/account_asset/i18n/es_EC.po
index ced428e29da..fde61116e0c 100644
--- a/addons/account_asset/i18n/es_EC.po
+++ b/addons/account_asset/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_asset
#: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/et.po b/addons/account_asset/i18n/et.po
index e5ac70c04b9..567f7223177 100644
--- a/addons/account_asset/i18n/et.po
+++ b/addons/account_asset/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_asset
#: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/fi.po b/addons/account_asset/i18n/fi.po
index bde843ff4c4..dd067444993 100644
--- a/addons/account_asset/i18n/fi.po
+++ b/addons/account_asset/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_asset
#: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/fr.po b/addons/account_asset/i18n/fr.po
index 1f696d7d150..e660a078653 100755
--- a/addons/account_asset/i18n/fr.po
+++ b/addons/account_asset/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_asset
#: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/gu.po b/addons/account_asset/i18n/gu.po
index ff9f3c404ca..b8b437094a6 100644
--- a/addons/account_asset/i18n/gu.po
+++ b/addons/account_asset/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_asset
#: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/hr.po b/addons/account_asset/i18n/hr.po
index 8ba35754dea..b01e487b053 100644
--- a/addons/account_asset/i18n/hr.po
+++ b/addons/account_asset/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_asset
#: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/id.po b/addons/account_asset/i18n/id.po
index 0a49f8dac88..2cc9adb97ae 100644
--- a/addons/account_asset/i18n/id.po
+++ b/addons/account_asset/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_asset
#: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/ja.po b/addons/account_asset/i18n/ja.po
index ae6e8f43076..6b303942324 100644
--- a/addons/account_asset/i18n/ja.po
+++ b/addons/account_asset/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_asset
#: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/lt.po b/addons/account_asset/i18n/lt.po
index 6ae32969998..859ef9e2065 100644
--- a/addons/account_asset/i18n/lt.po
+++ b/addons/account_asset/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_asset
#: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/mn.po b/addons/account_asset/i18n/mn.po
index 5d55eb33b88..af6b4e278ee 100644
--- a/addons/account_asset/i18n/mn.po
+++ b/addons/account_asset/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_asset
#: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/nl.po b/addons/account_asset/i18n/nl.po
index 76c5f840154..bced4186945 100644
--- a/addons/account_asset/i18n/nl.po
+++ b/addons/account_asset/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_asset
#: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/nl_BE.po b/addons/account_asset/i18n/nl_BE.po
index f07405b5542..b608dd8ff05 100644
--- a/addons/account_asset/i18n/nl_BE.po
+++ b/addons/account_asset/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_asset
#: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/pl.po b/addons/account_asset/i18n/pl.po
index d9c3e259170..9805c996047 100755
--- a/addons/account_asset/i18n/pl.po
+++ b/addons/account_asset/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_asset
#: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/pt.po b/addons/account_asset/i18n/pt.po
index 2211ebf4a10..bbd480b263c 100755
--- a/addons/account_asset/i18n/pt.po
+++ b/addons/account_asset/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_asset
#: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/pt_BR.po b/addons/account_asset/i18n/pt_BR.po
index 7e907367e84..36ae09d2b8e 100644
--- a/addons/account_asset/i18n/pt_BR.po
+++ b/addons/account_asset/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_asset
#: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/ro.po b/addons/account_asset/i18n/ro.po
index 78b5e73a1c5..a8b18ebc985 100644
--- a/addons/account_asset/i18n/ro.po
+++ b/addons/account_asset/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_asset
#: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/ru.po b/addons/account_asset/i18n/ru.po
index 853841d6345..accd427cfd2 100644
--- a/addons/account_asset/i18n/ru.po
+++ b/addons/account_asset/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_asset
#: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/sl.po b/addons/account_asset/i18n/sl.po
index 839dd593d23..7e1c5324747 100644
--- a/addons/account_asset/i18n/sl.po
+++ b/addons/account_asset/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_asset
#: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/sr@latin.po b/addons/account_asset/i18n/sr@latin.po
index fe18f6831c2..687d211dad9 100644
--- a/addons/account_asset/i18n/sr@latin.po
+++ b/addons/account_asset/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_asset
#: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/sv.po b/addons/account_asset/i18n/sv.po
index c3a80b42bc4..bd58ffc7e57 100755
--- a/addons/account_asset/i18n/sv.po
+++ b/addons/account_asset/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_asset
#: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/tr.po b/addons/account_asset/i18n/tr.po
index 82f98816e02..acf1738c717 100644
--- a/addons/account_asset/i18n/tr.po
+++ b/addons/account_asset/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_asset
#: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/vi.po b/addons/account_asset/i18n/vi.po
index d4bcf2823cc..4a8f6634164 100644
--- a/addons/account_asset/i18n/vi.po
+++ b/addons/account_asset/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_asset
#: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/zh_CN.po b/addons/account_asset/i18n/zh_CN.po
index 08834220961..fe6952fc69e 100644
--- a/addons/account_asset/i18n/zh_CN.po
+++ b/addons/account_asset/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_asset
#: view:account.asset.asset:0
diff --git a/addons/account_bank_statement_extensions/account_bank_statement.py b/addons/account_bank_statement_extensions/account_bank_statement.py
index dc4914eeecd..6eeda843dc5 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement.py
+++ b/addons/account_bank_statement_extensions/account_bank_statement.py
@@ -34,7 +34,7 @@ class account_bank_statement(osv.osv):
# bypass obsolete statement line resequencing
if vals.get('line_ids', False) or context.get('ebanking_import', False):
res = super(osv.osv, self).write(cr, uid, ids, vals, context=context)
- else:
+ else:
res = super(account_bank_statement, self).write(cr, uid, ids, vals, context=context)
return res
@@ -70,7 +70,7 @@ class account_bank_statement_line_global(osv.osv):
'type': fields.selection([
('iso20022', 'ISO 20022'),
('coda', 'CODA'),
- ('manual', 'Manual'),
+ ('manual', 'Manual'),
], 'Type', required=True),
'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')),
'bank_statement_line_ids': fields.one2many('account.bank.statement.line', 'globalisation_id', 'Bank Statement Lines'),
@@ -108,12 +108,12 @@ class account_bank_statement_line(osv.osv):
'date': fields.date('Entry Date', required=True, states={'confirm': [('readonly', True)]}),
'val_date': fields.date('Valuta Date', states={'confirm': [('readonly', True)]}),
'globalisation_id': fields.many2one('account.bank.statement.line.global', 'Globalisation ID',
- states={'confirm': [('readonly', True)]},
+ states={'confirm': [('readonly', True)]},
help="Code to identify transactions belonging to the same globalisation level within a batch payment"),
'globalisation_amount': fields.related('globalisation_id', 'amount', type='float',
relation='account.bank.statement.line.global', string='Glob. Amount', readonly=True),
'state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed')],
- 'Status', required=True, readonly=True),
+ 'Status', required=True, readonly=True),
'counterparty_name': fields.char('Counterparty Name', size=35),
'counterparty_bic': fields.char('Counterparty BIC', size=11),
'counterparty_number': fields.char('Counterparty Number', size=34),
@@ -127,8 +127,8 @@ class account_bank_statement_line(osv.osv):
if context is None:
context = {}
if context.get('block_statement_line_delete', False):
- raise osv.except_osv(_('Warning'), _('Delete operation not allowed ! \
- Please go to the associated bank statement in order to delete and/or modify this bank statement line'))
+ raise osv.except_osv(_('Warning!'), _('Delete operation not allowed. \
+ Please go to the associated bank statement in order to delete and/or modify bank statement line.'))
return super(account_bank_statement_line, self).unlink(cr, uid, ids, context=context)
account_bank_statement_line()
diff --git a/addons/account_bank_statement_extensions/i18n/ar.po b/addons/account_bank_statement_extensions/i18n/ar.po
index 5fdd615c899..b5f820bb0af 100644
--- a/addons/account_bank_statement_extensions/i18n/ar.po
+++ b/addons/account_bank_statement_extensions/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
@@ -87,7 +87,7 @@ msgstr "كشف حساب"
#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
#: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
msgid "Confirm selected statement lines"
-msgstr ""
+msgstr "تأكيد أسطر البيان المختار"
#. module: account_bank_statement_extensions
#: report:bank.statement.balance.report:0
@@ -104,7 +104,7 @@ msgstr "الغى الأسطر"
#: view:account.bank.statement.line.global:0
#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global
msgid "Batch Payment Info"
-msgstr ""
+msgstr "معلومات دفعة السداد"
#. module: account_bank_statement_extensions
#: view:confirm.statement.line:0
@@ -269,7 +269,7 @@ msgstr "رقم كود البنك (BIC) للطرف الآخر"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,child_ids:0
msgid "Child Codes"
-msgstr "رموز الفرعي"
+msgstr "رموز فرعية"
#. module: account_bank_statement_extensions
#: view:confirm.statement.line:0
@@ -281,7 +281,7 @@ msgstr "هل تريد تأكيد سطور كشف الحساب المختارة؟
msgid ""
"The amount of the voucher must be the same amount as the one on the "
"statement line"
-msgstr "يجب ان تكون كمية الايصال نفس كمية الايصال في خط البيان"
+msgstr "يجب ان تكون قيمة الايصال نفس قيمة الايصال في خط البيان"
#. module: account_bank_statement_extensions
#: help:account.bank.statement.line,globalisation_id:0
@@ -293,7 +293,7 @@ msgstr ""
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Draft Statement Lines."
-msgstr ""
+msgstr "خطوط مسودة البيان."
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
@@ -328,7 +328,7 @@ msgstr "الحسابات المصرفية"
#. module: account_bank_statement_extensions
#: constraint:account.bank.statement:0
msgid "The journal and period chosen have to belong to the same company."
-msgstr "يجب أن يكون اليومية و الفترة مرتبطين لشركة واحدة."
+msgstr "يجب أن يكون دفتر اليومية و الفترة المختارة متعلقين بنفس الشركة."
#. module: account_bank_statement_extensions
#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
@@ -338,7 +338,7 @@ msgstr "كشف حساب بنك"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Statement Line"
-msgstr ""
+msgstr "خط البيان"
#. module: account_bank_statement_extensions
#: sql_constraint:account.bank.statement.line.global:0
@@ -350,12 +350,12 @@ msgstr "يجب أن يكون الكود مميزاً !"
#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
#: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
msgid "Bank Statement Lines"
-msgstr ""
+msgstr "خطوط بيان المصرف"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line.global:0
msgid "Child Batch Payments"
-msgstr ""
+msgstr "أصغر دفعة سداد"
#. module: account_bank_statement_extensions
#: view:cancel.statement.line:0
@@ -366,7 +366,7 @@ msgstr "إلغاء"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Statement Lines"
-msgstr ""
+msgstr "خطوط البيان"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
@@ -376,4 +376,4 @@ msgstr "إجمالي المبلغ"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,globalisation_id:0
msgid "Globalisation ID"
-msgstr ""
+msgstr "المعرف العالمي"
diff --git a/addons/account_bank_statement_extensions/i18n/de.po b/addons/account_bank_statement_extensions/i18n/de.po
index 8fa9fb71895..708ae0a932e 100644
--- a/addons/account_bank_statement_extensions/i18n/de.po
+++ b/addons/account_bank_statement_extensions/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/es.po b/addons/account_bank_statement_extensions/i18n/es.po
index 8a6149d3939..19c05e3dc1c 100644
--- a/addons/account_bank_statement_extensions/i18n/es.po
+++ b/addons/account_bank_statement_extensions/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/es_CR.po b/addons/account_bank_statement_extensions/i18n/es_CR.po
index 3afbb37e69d..2fc4c48ee6f 100644
--- a/addons/account_bank_statement_extensions/i18n/es_CR.po
+++ b/addons/account_bank_statement_extensions/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/es_EC.po b/addons/account_bank_statement_extensions/i18n/es_EC.po
index e9f258d6a98..56a742bca4a 100644
--- a/addons/account_bank_statement_extensions/i18n/es_EC.po
+++ b/addons/account_bank_statement_extensions/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/fi.po b/addons/account_bank_statement_extensions/i18n/fi.po
index a59e0e54197..9874186c1e9 100644
--- a/addons/account_bank_statement_extensions/i18n/fi.po
+++ b/addons/account_bank_statement_extensions/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/fr.po b/addons/account_bank_statement_extensions/i18n/fr.po
index 57ad6e881a3..4ca607db81e 100644
--- a/addons/account_bank_statement_extensions/i18n/fr.po
+++ b/addons/account_bank_statement_extensions/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/gu.po b/addons/account_bank_statement_extensions/i18n/gu.po
index ad904d56c09..e2e1d0827da 100644
--- a/addons/account_bank_statement_extensions/i18n/gu.po
+++ b/addons/account_bank_statement_extensions/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/it.po b/addons/account_bank_statement_extensions/i18n/it.po
index ba9d5fa36e3..d1df722e511 100644
--- a/addons/account_bank_statement_extensions/i18n/it.po
+++ b/addons/account_bank_statement_extensions/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/ja.po b/addons/account_bank_statement_extensions/i18n/ja.po
index 3f9e9718e82..cc44aaa19db 100644
--- a/addons/account_bank_statement_extensions/i18n/ja.po
+++ b/addons/account_bank_statement_extensions/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/mn.po b/addons/account_bank_statement_extensions/i18n/mn.po
index cea8f490947..c120bd90901 100644
--- a/addons/account_bank_statement_extensions/i18n/mn.po
+++ b/addons/account_bank_statement_extensions/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/nl.po b/addons/account_bank_statement_extensions/i18n/nl.po
index 8cf32e6bba7..98ddcaf1384 100644
--- a/addons/account_bank_statement_extensions/i18n/nl.po
+++ b/addons/account_bank_statement_extensions/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/pl.po b/addons/account_bank_statement_extensions/i18n/pl.po
index 6618f545e21..d8099b40e2d 100644
--- a/addons/account_bank_statement_extensions/i18n/pl.po
+++ b/addons/account_bank_statement_extensions/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/pt.po b/addons/account_bank_statement_extensions/i18n/pt.po
index 4e2d0fc4f74..7125c58ac79 100644
--- a/addons/account_bank_statement_extensions/i18n/pt.po
+++ b/addons/account_bank_statement_extensions/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/ro.po b/addons/account_bank_statement_extensions/i18n/ro.po
index dca7bce5132..2562c1e3531 100644
--- a/addons/account_bank_statement_extensions/i18n/ro.po
+++ b/addons/account_bank_statement_extensions/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/sr@latin.po b/addons/account_bank_statement_extensions/i18n/sr@latin.po
index bd80bf92e1c..6218b46876b 100644
--- a/addons/account_bank_statement_extensions/i18n/sr@latin.po
+++ b/addons/account_bank_statement_extensions/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/sv.po b/addons/account_bank_statement_extensions/i18n/sv.po
index c646c3fdf3a..dabc9a40c41 100644
--- a/addons/account_bank_statement_extensions/i18n/sv.po
+++ b/addons/account_bank_statement_extensions/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/tr.po b/addons/account_bank_statement_extensions/i18n/tr.po
index c53340d0d73..b49b2b49ab1 100644
--- a/addons/account_bank_statement_extensions/i18n/tr.po
+++ b/addons/account_bank_statement_extensions/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/zh_CN.po b/addons/account_bank_statement_extensions/i18n/zh_CN.po
index ddc5cb9b87b..cb519388417 100644
--- a/addons/account_bank_statement_extensions/i18n/zh_CN.po
+++ b/addons/account_bank_statement_extensions/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
diff --git a/addons/account_coda/account_coda.py b/addons/account_coda/account_coda.py
index 36700c97b84..cd117b5be88 100644
--- a/addons/account_coda/account_coda.py
+++ b/addons/account_coda/account_coda.py
@@ -2,9 +2,9 @@
##############################################################################
#
# OpenERP, Open Source Management Solution
-#
+#
# Copyright (c) 2011 Noviat nv/sa (www.noviat.be). All rights reserved.
-#
+#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
@@ -36,7 +36,7 @@ class coda_bank_account(osv.osv):
_columns = {
'name': fields.char('Name', size=64, required=True),
- 'bank_id': fields.many2one('res.partner.bank', 'Bank Account', required=True,
+ 'bank_id': fields.many2one('res.partner.bank', 'Bank Account', required=True,
help='Bank Account Number.\nThe CODA import function will find its CODA processing parameters on this number.'),
'description1': fields.char('Primary Account Description', size=35,
help='The Primary or Secondary Account Description should match the corresponding Account Description in the CODA file.'),
@@ -44,18 +44,18 @@ class coda_bank_account(osv.osv):
help='The Primary or Secondary Account Description should match the corresponding Account Description in the CODA file.'),
'state': fields.selection([
('normal', 'Normal'),
- ('info', 'Info')],
+ ('info', 'Info')],
'Type', required=True, select=1,
help='No Bank Statements will be generated for CODA Bank Statements from Bank Accounts of type \'Info\'.'),
- 'journal': fields.many2one('account.journal', 'Journal',
- domain=[('type', '=', 'bank')],
+ 'journal': fields.many2one('account.journal', 'Journal',
+ domain=[('type', '=', 'bank')],
states={'normal':[('required',True)],'info':[('required',False)]},
help='Bank Journal for the Bank Statement'),
'currency': fields.many2one('res.currency', 'Currency', required=True,
- help='The currency of the CODA Bank Statement'),
+ help='The currency of the CODA Bank Statement'),
'coda_st_naming': fields.char('Bank Statement Naming Policy', size=64,
help="Define the rules to create the name of the Bank Statements generated by the CODA processing." \
- "\nE.g. %(code)s%(y)s/%(paper)s"
+ "\nE.g. %(code)s%(y)s/%(paper)s"
"\n\nVariables:" \
"\nBank Journal Code: %(code)s" \
"\nCurrent Year with Century: %(year)s" \
@@ -79,9 +79,9 @@ class coda_bank_account(osv.osv):
'currency': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id,
'state': 'normal',
'coda_st_naming': '%(code)s/%(y)s/%(coda)s',
- 'active': True,
- 'find_bbacom': True,
- 'find_partner': True,
+ 'active': True,
+ 'find_bbacom': True,
+ 'find_partner': True,
'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
}
_sql_constraints = [
@@ -107,12 +107,12 @@ class coda_bank_account(osv.osv):
if not default:
default = {}
default = default.copy()
- default.update({'journal_id': None})
+ default.update({'journal_id': None})
default['description1'] = cba['description1'] or ''
default['description2'] = cba['description2'] or ''
default['name'] = (cba['name'] or '') + ' (copy)'
- default['state'] = cba['state']
- return super(coda_bank_account, self).copy(cr, uid, id, default, context)
+ default['state'] = cba['state']
+ return super(coda_bank_account, self).copy(cr, uid, id, default, context)
def onchange_state(self, cr, uid, ids, state):
return state =='info' and {'value': {'journal': None}} or {}
@@ -137,10 +137,10 @@ class account_coda(osv.osv):
'date': fields.date.context_today,
'user_id': lambda self,cr,uid,context: uid,
'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.coda', context=c),
- }
+ }
_sql_constraints = [
('coda_uniq', 'unique (name, coda_creation_date)', 'This CODA has already been imported !')
- ]
+ ]
def unlink(self, cr, uid, ids, context=None):
if context is None:
@@ -149,22 +149,22 @@ class account_coda(osv.osv):
coda_st_obj = self.pool.get('coda.bank.statement')
bank_st_obj = self.pool.get('account.bank.statement')
for coda in self.browse(cr, uid, ids, context=context):
- for coda_statement in coda.statement_ids:
+ for coda_statement in coda.statement_ids:
if not context.get('coda_statement_unlink', False):
if coda_st_obj.exists(cr, uid, coda_statement.id, context=context):
- coda_st_obj.unlink(cr, uid, [coda_statement.id], context=context)
+ coda_st_obj.unlink(cr, uid, [coda_statement.id], context=context)
if not context.get('bank_statement_unlink', False):
if coda_st_obj.exists(cr, uid, coda_statement.id, context=context) and (coda_statement.type == 'normal') and bank_st_obj.exists(cr, uid, coda_statement.statement_id.id, context=context):
- bank_st_obj.unlink(cr, uid, [coda_statement.statement_id.id], context=context)
+ bank_st_obj.unlink(cr, uid, [coda_statement.statement_id.id], context=context)
context.update({'coda_unlink': False})
return super(account_coda, self).unlink(cr, uid, ids, context=context)
-
+
account_coda()
-class account_coda_trans_type(osv.osv):
+class account_coda_trans_type(osv.osv):
_name = 'account.coda.trans.type'
_description = 'CODA transaction type'
- _rec_name = 'type'
+ _rec_name = 'type'
_columns = {
'type': fields.char('Transaction Type', size=1, required=True),
'parent_id': fields.many2one('account.coda.trans.type', 'Parent'),
@@ -172,36 +172,36 @@ class account_coda_trans_type(osv.osv):
}
account_coda_trans_type()
-class account_coda_trans_code(osv.osv):
+class account_coda_trans_code(osv.osv):
_name = 'account.coda.trans.code'
_description = 'CODA transaction code'
- _rec_name = 'code'
+ _rec_name = 'code'
_columns = {
'code': fields.char('Code', size=2, required=True, select=1),
'type': fields.selection([
('code', 'Transaction Code'),
- ('family', 'Transaction Family')],
- 'Type', required=True, select=1),
+ ('family', 'Transaction Family')],
+ 'Type', required=True, select=1),
'parent_id': fields.many2one('account.coda.trans.code', 'Family', select=1),
'description': fields.char('Description', size=128, translate=True, select=2),
'comment': fields.text('Comment', translate=True),
}
account_coda_trans_code()
-class account_coda_trans_category(osv.osv):
+class account_coda_trans_category(osv.osv):
_name = 'account.coda.trans.category'
_description = 'CODA transaction category'
- _rec_name = 'category'
+ _rec_name = 'category'
_columns = {
'category': fields.char('Transaction Category', size=3, required=True),
'description': fields.char('Description', size=256, translate=True),
}
account_coda_trans_category()
-class account_coda_comm_type(osv.osv):
+class account_coda_comm_type(osv.osv):
_name = 'account.coda.comm.type'
_description = 'CODA structured communication type'
- _rec_name = 'code'
+ _rec_name = 'code'
_columns = {
'code': fields.char('Structured Communication Type', size=3, required=True, select=1),
'description': fields.char('Description', size=128, translate=True),
@@ -212,9 +212,9 @@ class account_coda_comm_type(osv.osv):
account_coda_comm_type()
class coda_bank_statement(osv.osv):
- _name = 'coda.bank.statement'
- _description = 'CODA Bank Statement'
-
+ _name = 'coda.bank.statement'
+ _description = 'CODA Bank Statement'
+
def _default_journal_id(self, cr, uid, context={}):
if context.get('journal_id', False):
return context['journal_id']
@@ -245,16 +245,16 @@ class coda_bank_statement(osv.osv):
'coda_id': fields.many2one('account.coda', 'CODA Data File', ondelete='cascade'),
'type': fields.selection([
('normal', 'Normal'),
- ('info', 'Info')],
+ ('info', 'Info')],
'Type', required=True, readonly=True,
help='No Bank Statements are associated with CODA Bank Statements of type \'Info\'.'),
- 'statement_id': fields.many2one('account.bank.statement', 'Associated Bank Statement'),
+ 'statement_id': fields.many2one('account.bank.statement', 'Associated Bank Statement'),
'journal_id': fields.many2one('account.journal', 'Journal', readonly=True, domain=[('type', '=', 'bank')]),
- 'coda_bank_account_id': fields.many2one('coda.bank.account', 'Bank Account', readonly=True),
+ 'coda_bank_account_id': fields.many2one('coda.bank.account', 'Bank Account', readonly=True),
'period_id': fields.many2one('account.period', 'Period', required=True, readonly=True),
'balance_start': fields.float('Starting Balance', digits_compute=dp.get_precision('Account'), readonly=True),
'balance_end_real': fields.float('Ending Balance', digits_compute=dp.get_precision('Account'), readonly=True),
- 'balance_end': fields.function(_end_balance, method=True, store=True, string='Balance'),
+ 'balance_end': fields.function(_end_balance, method=True, store=True, string='Balance'),
'line_ids': fields.one2many('coda.bank.statement.line',
'statement_id', 'CODA Bank Statement lines', readonly=True),
'currency': fields.many2one('res.currency', 'Currency', required=True, readonly=True,
@@ -262,14 +262,14 @@ class coda_bank_statement(osv.osv):
'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
}
_defaults = {
- 'type': 'normal',
+ 'type': 'normal',
'currency': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id,
'journal_id': _default_journal_id,
'period_id': _get_period,
}
def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
- if context is None:
+ if context is None:
context = {}
res = super(coda_bank_statement, self).search(cr, uid, args=args, offset=offset, limit=limit, order=order,
context=context, count=count)
@@ -283,20 +283,20 @@ class coda_bank_statement(osv.osv):
context.update({'coda_statement_unlink': True})
coda_obj = self.pool.get('account.coda')
bank_st_obj = self.pool.get('account.bank.statement')
-
+
# find all CODA bank statements that are associated with the selected CODA bank statements via a common CODA file
- new_ids = []
+ new_ids = []
for coda_statement in self.browse(cr, uid, ids, context=context):
if coda_obj.exists(cr, uid, coda_statement.coda_id.id, context=context):
new_ids += [x.id for x in coda_obj.browse(cr, uid, coda_statement.coda_id.id, context=context).statement_ids]
- # unlink CODA banks statements as well as associated bank statements and CODA files
+ # unlink CODA banks statements as well as associated bank statements and CODA files
for coda_statement in self.browse(cr, uid, new_ids, context=context):
- if coda_statement.statement_id.state == 'confirm':
- raise osv.except_osv(_('Invalid action !'),
- _("Cannot delete CODA Bank Statement '%s' of Journal '%s'." \
- "\nThe associated Bank Statement has already been confirmed !" \
- "\nPlease undo this action first!") \
+ if coda_statement.statement_id.state == 'confirm':
+ raise osv.except_osv(_('Invalid Action!'),
+ _("Cannot delete CODA Bank Statement '%s' of journal '%s'." \
+ "\nThe associated Bank Statement has already been confirmed." \
+ "\nPlease undo this action first.") \
% (coda_statement.name, coda_statement.journal_id.name))
else:
if not context.get('coda_unlink', False):
@@ -304,11 +304,11 @@ class coda_bank_statement(osv.osv):
coda_obj.unlink(cr, uid, [coda_statement.coda_id.id], context=context)
if not context.get('bank_statement_unlink', False):
if coda_statement.statement_id and bank_st_obj.exists(cr, uid, coda_statement.statement_id.id, context=context):
- bank_st_obj.unlink(cr, uid, [coda_statement.statement_id.id], context=context)
+ bank_st_obj.unlink(cr, uid, [coda_statement.statement_id.id], context=context)
context.update({'coda_statement_unlink': False})
return super(coda_bank_statement, self).unlink(cr, uid, new_ids, context=context)
-
+
coda_bank_statement()
class account_bank_statement(osv.osv):
@@ -316,7 +316,7 @@ class account_bank_statement(osv.osv):
_columns = {
'coda_statement_id': fields.many2one('coda.bank.statement', 'Associated CODA Bank Statement'),
}
-
+
def unlink(self, cr, uid, ids, context=None):
if context is None:
context = {}
@@ -325,15 +325,15 @@ class account_bank_statement(osv.osv):
coda_st_obj = self.pool.get('coda.bank.statement')
# find all statements that are associated with the selected bank statements via a common CODA file
- ids_plus = []
+ ids_plus = []
for statement in self.browse(cr, uid, ids, context=context):
if statement.coda_statement_id:
for x in coda_obj.browse(cr, uid, statement.coda_statement_id.coda_id.id, context=context).statement_ids:
if x.type == 'normal':
ids_plus += [x.statement_id.id]
-
+
# unlink banks statements as well as associated CODA bank statements and CODA files
- for statement in self.browse(cr, uid, ids_plus, context=context):
+ for statement in self.browse(cr, uid, ids_plus, context=context):
if not context.get('coda_statement_unlink', False):
if statement.coda_statement_id and coda_st_obj.exists(cr, uid, statement.coda_statement_id.id, context=context):
coda_st_obj.unlink(cr, uid, [statement.coda_statement_id.id], context=context)
@@ -347,56 +347,56 @@ class account_bank_statement(osv.osv):
context.update({'bank_statement_unlink': False})
new_ids = list(set(ids + ids_plus))
return super(account_bank_statement, self).unlink(cr, uid, new_ids, context=context)
-
+
account_bank_statement()
class coda_bank_statement_line(osv.osv):
- _name = 'coda.bank.statement.line'
- _order = 'sequence'
+ _name = 'coda.bank.statement.line'
+ _order = 'sequence'
_description = 'CODA Bank Statement Line'
_columns = {
'name': fields.char('Communication', size=268, required=True),
'sequence': fields.integer('Sequence'),
'date': fields.date('Entry Date', required=True),
- 'val_date': fields.date('Valuta Date'),
+ 'val_date': fields.date('Valuta Date'),
'account_id': fields.many2one('account.account','Account'), # remove required=True
'type': fields.selection([
('supplier','Supplier'),
('customer','Customer'),
('general','General'),
- ('globalisation','Globalisation'),
- ('information','Information'),
- ('communication','Free Communication'),
+ ('globalisation','Globalisation'),
+ ('information','Information'),
+ ('communication','Free Communication'),
], 'Type', required=True),
- 'globalisation_level': fields.integer('Globalisation Level',
+ 'globalisation_level': fields.integer('Globalisation Level',
help="The value which is mentioned (1 to 9), specifies the hierarchy level"
" of the globalisation of which this record is the first."
"\nThe same code will be repeated at the end of the globalisation."),
- 'globalisation_amount': fields.float('Globalisation Amount', digits_compute=dp.get_precision('Account')),
+ 'globalisation_amount': fields.float('Globalisation Amount', digits_compute=dp.get_precision('Account')),
'globalisation_id': fields.many2one('account.bank.statement.line.global', 'Globalisation ID', readonly=True,
- help="Code to identify transactions belonging to the same globalisation level within a batch payment"),
+ help="Code to identify transactions belonging to the same globalisation level within a batch payment"),
'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')),
'partner_id': fields.many2one('res.partner', 'Partner'),
'counterparty_name': fields.char('Counterparty Name', size=35),
- 'counterparty_bic': fields.char('Counterparty BIC', size=11),
- 'counterparty_number': fields.char('Counterparty Number', size=34),
- 'counterparty_currency': fields.char('Counterparty Currency', size=3),
+ 'counterparty_bic': fields.char('Counterparty BIC', size=11),
+ 'counterparty_number': fields.char('Counterparty Number', size=34),
+ 'counterparty_currency': fields.char('Counterparty Currency', size=3),
'statement_id': fields.many2one('coda.bank.statement', 'CODA Bank Statement',
select=True, required=True, ondelete='cascade'),
'coda_bank_account_id': fields.related('statement_id', 'coda_bank_account_id', type='many2one', relation='coda.bank.account', string='Bank Account', store=True, readonly=True),
'ref': fields.char('Reference', size=32),
'note': fields.text('Notes'),
- 'company_id': fields.related('statement_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
+ 'company_id': fields.related('statement_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
}
def unlink(self, cr, uid, ids, context=None):
if context is None:
context = {}
if context.get('block_statement_line_delete', False):
- raise osv.except_osv('Warning', _('Delete operation not allowed !'))
+ raise osv.except_osv('Warning', _('Delete operation not allowed.'))
return super(account_bank_statement_line, self).unlink(cr, uid, ids, context=context)
-coda_bank_statement_line()
+coda_bank_statement_line()
class account_bank_statement_line_global(osv.osv):
_inherit = 'account.bank.statement.line.global'
diff --git a/addons/account_coda/wizard/account_coda_import.py b/addons/account_coda/wizard/account_coda_import.py
index daa8bbd1026..bb46593b158 100644
--- a/addons/account_coda/wizard/account_coda_import.py
+++ b/addons/account_coda/wizard/account_coda_import.py
@@ -2,9 +2,9 @@
##############################################################################
#
# OpenERP, Open Source Management Solution
-#
+#
# Copyright (c) 2011 Noviat nv/sa (www.noviat.be). All rights reserved.
-#
+#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
@@ -41,7 +41,7 @@ class account_coda_import(osv.osv_memory):
_defaults = {
'coda_fname': lambda *a: '',
}
-
+
def coda_parsing(self, cr, uid, ids, context=None, batch=False, codafile=None, codafilename=None):
if context is None:
context = {}
@@ -52,12 +52,12 @@ class account_coda_import(osv.osv_memory):
data=self.browse(cr,uid,ids)[0]
try:
codafile = data.coda_data
- codafilename = data.coda_fname
+ codafilename = data.coda_fname
except:
- raise osv.except_osv(_('Error!'), _('Wizard in incorrect state. Please hit the Cancel button!'))
+ raise osv.except_osv(_('Error!'), _('Wizard in incorrect state. Please hit the Cancel button.'))
return {}
- currency_obj = self.pool.get('res.currency')
+ currency_obj = self.pool.get('res.currency')
coda_bank_account_obj = self.pool.get('coda.bank.account')
trans_type_obj = self.pool.get('account.coda.trans.type')
trans_code_obj = self.pool.get('account.coda.trans.code')
@@ -85,7 +85,7 @@ class account_coda_import(osv.osv_memory):
coda_bank.update({'journal_code': coda_bank['journal'] and journal_obj.browse(cr, uid, coda_bank['journal'][0], context=context).code or ''})
coda_bank.update({'iban': partner_bank_obj.browse(cr, uid, coda_bank['bank_id'][0], context=context).iban})
coda_bank.update({'acc_number': partner_bank_obj.browse(cr, uid, coda_bank['bank_id'][0], context=context).acc_number})
- coda_bank.update({'currency_name': currency_obj.browse(cr, uid, coda_bank['currency'][0], context=context).name})
+ coda_bank.update({'currency_name': currency_obj.browse(cr, uid, coda_bank['currency'][0], context=context).name})
trans_type_table = trans_type_obj.read(cr, uid, trans_type_obj.search(cr, uid, []), context=context)
trans_code_table = trans_code_obj.read(cr, uid, trans_code_obj.search(cr, uid, []), context=context)
trans_category_table = trans_category_obj.read(cr, uid, trans_category_obj.search(cr, uid, []), context=context)
@@ -96,9 +96,9 @@ class account_coda_import(osv.osv_memory):
err_log = ''
coda_statements = []
recordlist = unicode(base64.decodestring(codafile), 'windows-1252', 'strict').split('\n')
-
+
for line in recordlist:
-
+
if not line:
pass
elif line[0] == '0':
@@ -109,11 +109,11 @@ class account_coda_import(osv.osv_memory):
st_line_seq = 0
glob_lvl_stack = [0]
# header data
- coda_statement['currency'] = 'EUR' # default currency
+ coda_statement['currency'] = 'EUR' # default currency
coda_statement['version'] = line[127]
coda_version = line[127]
if coda_version not in ['1','2']:
- err_string = _('\nCODA V%s statements are not supported, please contact your bank!') % coda_version
+ err_string = _('\nCODA V%s statements are not supported, please contact your bank.') % coda_version
err_code = 'R0001'
if batch:
return (err_code, err_string)
@@ -122,7 +122,7 @@ class account_coda_import(osv.osv_memory):
coda_statement['date'] = str2date(line[5:11])
period_id = period_obj.search(cr , uid, [('date_start' ,'<=', coda_statement['date']), ('date_stop','>=',coda_statement['date'])])
if not period_id:
- err_string = _("\nThe CODA creation date doesn't fall within a defined Accounting Period!" \
+ err_string = _("\nThe CODA creation date doesn't fall within a defined Accounting Period." \
"\nPlease create the Accounting Period for date %s.") % coda_statement['date']
err_code = 'R0002'
if batch:
@@ -130,19 +130,19 @@ class account_coda_import(osv.osv_memory):
raise osv.except_osv(_('Data Error!'), err_string)
coda_statement['period_id'] = period_id[0]
coda_statement['state'] = 'draft'
-
+
coda_id = coda_obj.search(cr, uid,[
('name', '=', codafilename),
('coda_creation_date', '=', coda_statement['date']),
])
if coda_id:
- err_string = _("\nCODA File with Filename '%s' and Creation Date '%s' has already been imported !") \
+ err_string = _("\nCODA File with Filename '%s' and Creation Date '%s' has already been imported.") \
% (codafilename, coda_statement['date'])
err_code = 'W0001'
if batch:
return (err_code, err_string)
- raise osv.except_osv(_('Warning !'), err_string)
-
+ raise osv.except_osv(_('Warning!'), err_string)
+
elif line[0] == '1':
if coda_version == '1':
coda_statement['acc_number'] = line[5:17]
@@ -150,24 +150,24 @@ class account_coda_import(osv.osv_memory):
coda_statement['currency'] = line[18:21]
elif line[1] == '0': # Belgian bank account BBAN structure
coda_statement['acc_number'] = line[5:17]
- coda_statement['currency'] = line[18:21]
+ coda_statement['currency'] = line[18:21]
elif line[1] == '1': # foreign bank account BBAN structure
- err_string = _('\nForeign bank accounts with BBAN structure are not supported !')
+ err_string = _('\nForeign bank accounts with BBAN structure are not supported.')
err_code = 'R1001'
if batch:
return (err_code, err_string)
raise osv.except_osv(_('Data Error!'), err_string)
elif line[1] == '2': # Belgian bank account IBAN structure
- coda_statement['acc_number']=line[5:21]
+ coda_statement['acc_number']=line[5:21]
coda_statement['currency'] = line[39:42]
elif line[1] == '3': # foreign bank account IBAN structure
- err_string = _('\nForeign bank accounts with IBAN structure are not supported !')
+ err_string = _('\nForeign bank accounts with IBAN structure are not supported.')
err_code = 'R1002'
if batch:
return (err_code, err_string)
raise osv.except_osv(_('Data Error!'), err_string)
else:
- err_string = _('\nUnsupported bank account structure !')
+ err_string = _('\nUnsupported bank account structure.')
err_code = 'R1003'
if batch:
return (err_code, err_string)
@@ -177,11 +177,11 @@ class account_coda_import(osv.osv_memory):
and (coda_statement['currency'] == x['currency_name']) and (coda_statement['description'] == (x['description1'] or x['description2'] or ''))
coda_bank = filter(cba_filter, coda_bank_table)
if coda_bank:
- coda_bank = coda_bank[0]
+ coda_bank = coda_bank[0]
coda_statement['type'] = coda_bank['state']
coda_statement['journal_id'] = coda_bank['journal'] and coda_bank['journal'][0]
coda_statement['currency_id'] = coda_bank['currency'][0]
- coda_statement['coda_bank_account_id'] = coda_bank['id']
+ coda_statement['coda_bank_account_id'] = coda_bank['id']
def_pay_acc = coda_bank['def_payable'][0]
def_rec_acc = coda_bank['def_receivable'][0]
awaiting_acc = coda_bank['awaiting_account'][0]
@@ -189,8 +189,8 @@ class account_coda_import(osv.osv_memory):
find_bbacom = coda_bank['find_bbacom']
find_partner = coda_bank['find_partner']
else:
- err_string = _("\nNo matching CODA Bank Account Configuration record found !") + \
- _("\nPlease check if the 'Bank Account Number', 'Currency' and 'Account Description' fields of your configuration record match with '%s', '%s' and '%s' !") \
+ err_string = _("\nNo matching CODA Bank Account Configuration record found.") + \
+ _("\nPlease check if the 'Bank Account Number', 'Currency' and 'Account Description' fields of your configuration record match with '%s', '%s' and '%s'.") \
% (coda_statement['acc_number'], coda_statement['currency'], coda_statement['description'])
err_code = 'R1004'
if batch:
@@ -199,13 +199,13 @@ class account_coda_import(osv.osv_memory):
bal_start = list2float(line[43:58]) # old balance data
if line[42] == '1': # 1= Debit
bal_start = - bal_start
- coda_statement['balance_start'] = bal_start
+ coda_statement['balance_start'] = bal_start
coda_statement['acc_holder'] = line[64:90]
coda_statement['paper_seq_number'] = line[2:5]
coda_statement['coda_seq_number'] = line[125:128]
if coda_bank['coda_st_naming']:
coda_statement['name'] = coda_bank['coda_st_naming'] % {
- 'code': coda_bank['journal_code'] or '',
+ 'code': coda_bank['journal_code'] or '',
'year': time.strftime('%Y'),
'y': time.strftime('%y'),
'coda': line[125:128],
@@ -213,7 +213,7 @@ class account_coda_import(osv.osv_memory):
}
else:
coda_statement['name'] = '/'
-
+
elif line[0] == '2':
# movement data record 2
if line[1] == '1':
@@ -222,7 +222,7 @@ class account_coda_import(osv.osv_memory):
st_line_seq = st_line_seq + 1
st_line['sequence'] = st_line_seq
st_line['type'] = 'general'
- st_line['reconcile'] = False
+ st_line['reconcile'] = False
st_line['struct_comm_type'] = ''
st_line['struct_comm_type_desc'] = ''
st_line['struct_comm_101'] = ''
@@ -230,25 +230,25 @@ class account_coda_import(osv.osv_memory):
st_line['partner_id'] = 0
st_line['account_id'] = 0
st_line['counterparty_name'] = ''
- st_line['counterparty_bic'] = ''
+ st_line['counterparty_bic'] = ''
st_line['counterparty_number'] = ''
- st_line['counterparty_currency'] = ''
+ st_line['counterparty_currency'] = ''
st_line['glob_lvl_flag'] = False
st_line['globalisation_id'] = 0
st_line['globalisation_code'] = ''
st_line['globalisation_amount'] = False
st_line['amount'] = False
-
+
st_line['ref'] = line[2:10]
st_line['trans_ref'] = line[10:31]
st_line_amt = list2float(line[32:47])
if line[31] == '1': # 1=debit
st_line_amt = - st_line_amt
- # processing of amount depending on globalisation code
+ # processing of amount depending on globalisation code
glob_lvl_flag = int(line[124])
- if glob_lvl_flag > 0:
- if glob_lvl_stack[-1] == glob_lvl_flag:
- st_line['glob_lvl_flag'] = glob_lvl_flag
+ if glob_lvl_flag > 0:
+ if glob_lvl_stack[-1] == glob_lvl_flag:
+ st_line['glob_lvl_flag'] = glob_lvl_flag
st_line['amount'] = st_line_amt
glob_lvl_stack.pop()
else:
@@ -265,23 +265,23 @@ class account_coda_import(osv.osv_memory):
st_line['trans_type'] = line[53]
trans_type = filter(lambda x: st_line['trans_type'] == x['type'], trans_type_table)
if not trans_type:
- err_string = _('\nThe File contains an invalid CODA Transaction Type : %s!') % st_line['trans_type']
+ err_string = _('\nThe File contains an invalid CODA Transaction Type : %s.') % st_line['trans_type']
err_code = 'R2001'
if batch:
return (err_code, err_string)
- raise osv.except_osv(_('Data Error!'), err_string)
- st_line['trans_type_desc'] = trans_type[0]['description']
+ raise osv.except_osv(_('Data Error!'), err_string)
+ st_line['trans_type_desc'] = trans_type[0]['description']
st_line['trans_family'] = line[54:56]
trans_family = filter(lambda x: (x['type'] == 'family') and (st_line['trans_family'] == x['code']), trans_code_table)
if not trans_family:
- err_string = _('\nThe File contains an invalid CODA Transaction Family : %s!') % st_line['trans_family']
+ err_string = _('\nThe File contains an invalid CODA Transaction Family : %s.') % st_line['trans_family']
err_code = 'R2002'
if batch:
return (err_code, err_string)
- raise osv.except_osv(_('Data Error!'), err_string)
+ raise osv.except_osv(_('Data Error!'), err_string)
st_line['trans_family_desc'] = trans_family[0]['description']
st_line['trans_code'] = line[56:58]
- trans_code = filter(lambda x: (x['type'] == 'code') and (st_line['trans_code'] == x['code']) and (trans_family[0]['id'] == x['parent_id'][0]),
+ trans_code = filter(lambda x: (x['type'] == 'code') and (st_line['trans_code'] == x['code']) and (trans_family[0]['id'] == x['parent_id'][0]),
trans_code_table)
if trans_code:
st_line['trans_code_desc'] = trans_code[0]['description']
@@ -292,49 +292,49 @@ class account_coda_import(osv.osv_memory):
if trans_category:
st_line['trans_category_desc'] = trans_category[0]['description']
else:
- st_line['trans_category_desc'] = _('Transaction Category unknown, please consult your bank.')
- # positions 61-115 : communication
+ st_line['trans_category_desc'] = _('Transaction Category unknown, please consult your bank.')
+ # positions 61-115 : communication
if line[61] == '1':
st_line['struct_comm_type'] = line[62:65]
comm_type = filter(lambda x: st_line['struct_comm_type'] == x['code'], comm_type_table)
if not comm_type:
- err_string = _('\nThe File contains an invalid Structured Communication Type : %s!') % st_line['struct_comm_type']
+ err_string = _('\nThe File contains an invalid Structured Communication Type : %s.') % st_line['struct_comm_type']
err_code = 'R2003'
if batch:
return (err_code, err_string)
- raise osv.except_osv(_('Data Error!'), err_string)
+ raise osv.except_osv(_('Data Error!'), err_string)
st_line['struct_comm_type_desc'] = comm_type[0]['description']
st_line['communication'] = st_line['name'] = line[65:115]
if st_line['struct_comm_type'] == '101':
- bbacomm = line[65:77]
- st_line['struct_comm_101'] = st_line['name'] = '+++' + bbacomm[0:3] + '/' + bbacomm[3:7] + '/' + bbacomm[7:] + '+++'
+ bbacomm = line[65:77]
+ st_line['struct_comm_101'] = st_line['name'] = '+++' + bbacomm[0:3] + '/' + bbacomm[3:7] + '/' + bbacomm[7:] + '+++'
else:
st_line['communication'] = st_line['name'] = line[62:115]
st_line['entry_date'] = str2date(line[115:121])
- # positions 122-124 not processed
+ # positions 122-124 not processed
coda_statement_lines[st_line_seq] = st_line
coda_statement['coda_statement_lines'] = coda_statement_lines
elif line[1] == '2':
# movement data record 2.2
if coda_statement['coda_statement_lines'][st_line_seq]['ref'] != line[2:10]:
- err_string = _('\nCODA parsing error on movement data record 2.2, seq nr %s!' \
+ err_string = _('\nCODA parsing error on movement data record 2.2, seq nr %s.' \
'\nPlease report this issue via your OpenERP support channel.') % line[2:10]
err_code = 'R2004'
if batch:
return (err_code, err_string)
- raise osv.except_osv(_('Error!'), err_string)
+ raise osv.except_osv(_('Error!'), err_string)
coda_statement['coda_statement_lines'][st_line_seq]['name'] += line[10:63]
coda_statement['coda_statement_lines'][st_line_seq]['communication'] += line[10:63]
- coda_statement['coda_statement_lines'][st_line_seq]['counterparty_bic'] = line[98:109].strip()
+ coda_statement['coda_statement_lines'][st_line_seq]['counterparty_bic'] = line[98:109].strip()
elif line[1] == '3':
# movement data record 2.3
if coda_statement['coda_statement_lines'][st_line_seq]['ref'] != line[2:10]:
- err_string = _('\nCODA parsing error on movement data record 2.3, seq nr %s!' \
+ err_string = _('\nCODA parsing error on movement data record 2.3, seq nr %s.' \
'\nPlease report this issue via your OpenERP support channel.') % line[2:10]
err_code = 'R2005'
if batch:
return (err_code, err_string)
- raise osv.except_osv(_('Error!'), err_string)
+ raise osv.except_osv(_('Error!'), err_string)
st_line = coda_statement_lines[st_line_seq]
if coda_version == '1':
counterparty_number = line[10:22]
@@ -346,7 +346,7 @@ class account_coda_import(osv.osv_memory):
counterparty_currency = line[23:26].strip()
else:
counterparty_number = line[10:44].strip()
- counterparty_currency = line[44:47].strip()
+ counterparty_currency = line[44:47].strip()
counterparty_name = line[47:82].strip()
st_line['name'] += line[82:125]
st_line['communication'] += line[82:125]
@@ -354,15 +354,15 @@ class account_coda_import(osv.osv_memory):
st_line['counterparty_currency'] = counterparty_currency
st_line['counterparty_name'] = counterparty_name
if counterparty_currency not in [coda_bank['currency_name'], '']:
- err_string = _('\nCODA parsing error on movement data record 2.3, seq nr %s!' \
- '\nPlease report this issue via your OpenERP support channel.') % line[2:10]
+ err_string = _('\nCODA parsing error on movement data record 2.3, seq nr %s.' \
+ '\nPlease report this issue via your OpenERP support channel.') % line[2:10]
err_code = 'R2006'
if batch:
return (err_code, err_string)
- raise osv.except_osv(_('Error!'), err_string)
+ raise osv.except_osv(_('Error!'), err_string)
- # partner matching and reconciliation
- if st_line['type'] == 'general':
+ # partner matching and reconciliation
+ if st_line['type'] == 'general':
match = False
bank_ids = False
# prepare reconciliation for bba scor
@@ -379,14 +379,14 @@ class account_coda_import(osv.osv_memory):
else:
st_line['account_id'] = partner.property_account_receivable.id or def_rec_acc
st_line['type'] = 'customer'
- if invoice.type in ['in_invoice', 'out_invoice']:
+ if invoice.type in ['in_invoice', 'out_invoice']:
iml_ids = move_line_obj.search(cr, uid, [('move_id', '=', invoice.move_id.id), ('reconcile_id', '=', False), ('account_id.reconcile', '=', True)])
if iml_ids:
st_line['reconcile'] = iml_ids[0]
match = True
else:
coda_parsing_note += _("\n Bank Statement '%s' line '%s':" \
- "\n There is no invoice matching the Structured Communication '%s'!" \
+ "\n There is no invoice matching the Structured Communication '%s'." \
"\n Please verify and adjust the invoice and perform the import again or otherwise change the corresponding entry manually in the generated Bank Statement.") \
% (coda_statement['name'], st_line['ref'], reference)
# lookup partner via counterparty_number
@@ -402,10 +402,10 @@ class account_coda_import(osv.osv_memory):
if not match and find_partner and bank_ids:
if len(bank_ids) > 1:
coda_parsing_note += _("\n Bank Statement '%s' line '%s':" \
- "\n No partner record assigned: There are multiple partners with the same Bank Account Number '%s'!" \
+ "\n No partner record assigned: There are multiple partners with the same Bank Account Number '%s'." \
"\n Please correct the configuration and perform the import again or otherwise change the corresponding entry manually in the generated Bank Statement.") \
% (coda_statement['name'], st_line['ref'], counterparty_number)
- else:
+ else:
bank = partner_bank_obj.browse(cr, uid, bank_ids[0], context)
st_line['partner_id'] = bank.partner_id.id
match = True
@@ -418,26 +418,26 @@ class account_coda_import(osv.osv_memory):
elif not match and find_partner:
if counterparty_number:
coda_parsing_note += _("\n Bank Statement '%s' line '%s':" \
- "\n The bank account '%s' is not defined for the partner '%s'!" \
+ "\n The bank account '%s' is not defined for the partner '%s'." \
"\n Please correct the configuration and perform the import again or otherwise change the corresponding entry manually in the generated Bank Statement.") \
- % (coda_statement['name'], st_line['ref'],
+ % (coda_statement['name'], st_line['ref'],
counterparty_number, counterparty_name)
else:
coda_parsing_note += _("\n Bank Statement '%s' line '%s':" \
- "\n No matching partner record found!" \
+ "\n No matching partner record found." \
"\n Please adjust the corresponding entry manually in the generated Bank Statement.") \
- % (coda_statement['name'], st_line['ref'])
+ % (coda_statement['name'], st_line['ref'])
st_line['account_id'] = awaiting_acc
# end of partner record lookup
coda_statement_lines[st_line_seq] = st_line
coda_statement['coda_statement_lines'] = coda_statement_lines
else:
# movement data record 2.x (x <> 1,2,3)
- err_string = _('\nMovement data records of type 2.%s are not supported !') % line[1]
+ err_string = _('\nMovement data records of type 2.%s are not supported.') % line[1]
err_code = 'R2007'
if batch:
return (err_code, err_string)
- raise osv.except_osv(_('Data Error!'), err_string)
+ raise osv.except_osv(_('Data Error!'), err_string)
elif line[0] == '3':
# information data record 3
@@ -461,19 +461,19 @@ class account_coda_import(osv.osv_memory):
err_code = 'R3001'
if batch:
return (err_code, err_string)
- raise osv.except_osv(_('Data Error!'), err_string)
- info_line['trans_type_desc'] = trans_type[0]['description']
+ raise osv.except_osv(_('Data Error!'), err_string)
+ info_line['trans_type_desc'] = trans_type[0]['description']
info_line['trans_family'] = line[32:34]
trans_family = filter(lambda x: (x['type'] == 'family') and (info_line['trans_family'] == x['code']), trans_code_table)
if not trans_family:
- err_string = _('\nThe File contains an invalid CODA Transaction Family : %s!') % st_line['trans_family']
+ err_string = _('\nThe File contains an invalid CODA Transaction Family : %s.') % st_line['trans_family']
err_code = 'R3002'
if batch:
return (err_code, err_string)
- raise osv.except_osv(_('Data Error!'), err_string)
+ raise osv.except_osv(_('Data Error!'), err_string)
info_line['trans_family_desc'] = trans_family[0]['description']
info_line['trans_code'] = line[34:36]
- trans_code = filter(lambda x: (x['type'] == 'code') and (info_line['trans_code'] == x['code']) and (trans_family[0]['id'] == x['parent_id']),
+ trans_code = filter(lambda x: (x['type'] == 'code') and (info_line['trans_code'] == x['code']) and (trans_family[0]['id'] == x['parent_id']),
trans_code_table)
if trans_code:
info_line['trans_code_desc'] = trans_code[0]['description']
@@ -484,13 +484,13 @@ class account_coda_import(osv.osv_memory):
if trans_category:
info_line['trans_category_desc'] = trans_category[0]['description']
else:
- info_line['trans_category_desc'] = _('Transaction Category unknown, please consult your bank.')
- # positions 40-113 : communication
+ info_line['trans_category_desc'] = _('Transaction Category unknown, please consult your bank.')
+ # positions 40-113 : communication
if line[39] == '1':
info_line['struct_comm_type'] = line[40:43]
comm_type = filter(lambda x: info_line['struct_comm_type'] == x['code'], comm_type_table)
if not comm_type:
- err_string = _('\nThe File contains an invalid Structured Communication Type : %s!') % info_line['struct_comm_type']
+ err_string = _('\nThe File contains an invalid Structured Communication Type : %s.') % info_line['struct_comm_type']
err_code = 'R3003'
if batch:
return (err_code, err_string)
@@ -505,18 +505,18 @@ class account_coda_import(osv.osv_memory):
elif line[1] == '2':
# information data record 3.2
if coda_statement['coda_statement_lines'][st_line_seq]['ref'] != line[2:10]:
- err_string = _('\nCODA parsing error on information data record 3.2, seq nr %s!' \
+ err_string = _('\nCODA parsing error on information data record 3.2, seq nr %s.' \
'\nPlease report this issue via your OpenERP support channel.') % line[2:10]
err_code = 'R3004'
if batch:
return (err_code, err_string)
raise osv.except_osv(_('Error!'), err_string)
- coda_statement['coda_statement_lines'][st_line_seq]['name'] += line[10:115]
+ coda_statement['coda_statement_lines'][st_line_seq]['name'] += line[10:115]
coda_statement['coda_statement_lines'][st_line_seq]['communication'] += line[10:115]
elif line[1] == '3':
# information data record 3.3
if coda_statement['coda_statement_lines'][st_line_seq]['ref'] != line[2:10]:
- err_string = _('\nCODA parsing error on information data record 3.3, seq nr %s!' \
+ err_string = _('\nCODA parsing error on information data record 3.3, seq nr %s.' \
'\nPlease report this issue via your OpenERP support channel.') % line[2:10]
err_code = 'R3005'
if batch:
@@ -524,7 +524,7 @@ class account_coda_import(osv.osv_memory):
raise osv.except_osv(_('Error!'), err_string)
coda_statement['coda_statement_lines'][st_line_seq]['name'] += line[10:100]
coda_statement['coda_statement_lines'][st_line_seq]['communication'] += line[10:100]
-
+
elif line[0] == '4':
# free communication data record 4
comm_line = {}
@@ -535,21 +535,21 @@ class account_coda_import(osv.osv_memory):
comm_line['communication'] = comm_line['name'] = line[32:112]
coda_statement_lines[st_line_seq] = comm_line
coda_statement['coda_statement_lines'] = coda_statement_lines
-
+
elif line[0] == '8':
# new balance record
bal_end = list2float(line[42:57])
if line[41] == '1': # 1=Debit
bal_end = - bal_end
coda_statement['balance_end_real'] = bal_end
-
+
elif line[0] == '9':
# footer record
- coda_statement['balance_min'] = list2float(line[22:37])
+ coda_statement['balance_min'] = list2float(line[22:37])
coda_statement['balance_plus'] = list2float(line[37:52])
if not bal_end:
coda_statement['balance_end_real'] = coda_statement['balance_start'] + coda_statement['balance_plus'] - coda_statement['balance_min']
- if coda_parsing_note:
+ if coda_parsing_note:
coda_statement['coda_parsing_note'] = '\nStatement Line matching results:' + coda_parsing_note
else:
coda_statement['coda_parsing_note'] = ''
@@ -557,11 +557,11 @@ class account_coda_import(osv.osv_memory):
#end for
err_string = ''
- err_code = ''
+ err_code = ''
coda_id = 0
coda_note = ''
line_note = ''
-
+
try:
coda_id = coda_obj.create(cr, uid,{
'name' : codafilename,
@@ -571,7 +571,7 @@ class account_coda_import(osv.osv_memory):
'user_id': uid,
})
context.update({'coda_id': coda_id})
-
+
except osv.except_osv, e:
cr.rollback()
err_string = _('\nApplication Error : ') + str(e)
@@ -585,24 +585,24 @@ class account_coda_import(osv.osv_memory):
err_code = 'G0001'
if batch:
return (err_code, err_string)
- raise osv.except_osv(_('CODA Import failed !'), err_string)
+ raise osv.except_osv(_('CODA Import failed.'), err_string)
nb_err = 0
err_string = ''
coda_st_ids = []
- bk_st_ids = []
-
+ bk_st_ids = []
+
for statement in coda_statements:
-
+
# The CODA Statement info is written to two objects: 'coda.bank.statement' and 'account.bank.statement'
try:
-
+
coda_st_id = coda_st_obj.create(cr, uid, {
'name': statement['name'],
'type': statement['type'],
'coda_bank_account_id': statement['coda_bank_account_id'],
- 'currency': statement['currency_id'],
+ 'currency': statement['currency_id'],
'journal_id': statement['journal_id'],
'coda_id': coda_id,
'date': statement['date'],
@@ -613,7 +613,7 @@ class account_coda_import(osv.osv_memory):
})
coda_st_ids.append(coda_st_id)
- if statement['type'] == 'normal':
+ if statement['type'] == 'normal':
context.update({'ebanking_import': 1})
journal = journal_obj.browse(cr, uid, statement['journal_id'], context=context)
cr.execute('SELECT balance_end_real \
@@ -626,16 +626,15 @@ class account_coda_import(osv.osv_memory):
if journal.default_debit_account_id and (journal.default_credit_account_id == journal.default_debit_account_id):
balance_start_check = journal.default_debit_account_id.balance
else:
- nb_err += 1
- err_string += _('\nConfiguration Error in journal %s!' \
- '\nPlease verify the Default Debit and Credit Account settings.') % journal.name
+ nb_err += 1
+ err_string += _('\nConfiguration Error!\nPlease verify the Default Debit and Credit Account settings in journal %s.') % journal.name
break
if balance_start_check <> statement['balance_start']:
- nb_err += 1
- err_string += _('\nThe CODA Statement %s Starting Balance (%.2f) does not correspond with the previous Closing Balance (%.2f) in journal %s!') \
- % (statement['name'], statement['balance_start'], balance_start_check, journal.name)
- break
-
+ nb_err += 1
+ err_string += _('\nThe CODA Statement %s Starting Balance (%.2f) does not correspond with the previous Closing Balance (%.2f) in journal %s.') \
+ % (statement['name'], statement['balance_start'], balance_start_check, journal.name)
+ break
+
bk_st_id = bank_st_obj.create(cr, uid, {
'name': statement['name'],
'journal_id': statement['journal_id'],
@@ -648,7 +647,7 @@ class account_coda_import(osv.osv_memory):
})
bk_st_ids.append(bk_st_id)
coda_st_obj.write(cr, uid, [coda_st_id], {'statement_id': bk_st_id}, context=context)
-
+
glob_id_stack = [(0, '', 0, '')] # stack with tuples (glob_lvl_flag, glob_code, glob_id, glob_name)
lines = statement['coda_statement_lines']
st_line_seq = 0
@@ -657,7 +656,7 @@ class account_coda_import(osv.osv_memory):
line = lines[x]
# handling non-transactional records : line['type'] in ['information', 'communication']
-
+
if line['type'] == 'information':
line['globalisation_id'] = glob_id_stack[-1][2]
@@ -673,25 +672,25 @@ class account_coda_import(osv.osv_memory):
line['trans_category'], line['trans_category_desc'],
line['struct_comm_type'], line['struct_comm_type_desc'],
line['communication'])
-
+
coda_st_line_id = coda_st_line_obj.create(cr, uid, {
'sequence': line['sequence'],
- 'ref': line['ref'],
+ 'ref': line['ref'],
'name': line['name'].strip() or '/',
- 'type' : 'information',
- 'date': line['entry_date'],
+ 'type' : 'information',
+ 'date': line['entry_date'],
'statement_id': coda_st_id,
'note': line_note,
})
-
+
elif line['type'] == 'communication':
line_note = _('Free Communication:\n %s') \
%(line['communication'])
-
+
coda_st_line_id = coda_st_line_obj.create(cr, uid, {
'sequence': line['sequence'],
- 'ref': line['ref'],
+ 'ref': line['ref'],
'name': line['name'].strip() or '/',
'type' : 'communication',
'date': statement['date'],
@@ -699,20 +698,20 @@ class account_coda_import(osv.osv_memory):
'note': line_note,
})
- # handling transactional records, # line['type'] in ['globalisation', 'general', 'supplier', 'customer']
+ # handling transactional records, # line['type'] in ['globalisation', 'general', 'supplier', 'customer']
else:
-
+
glob_lvl_flag = line['glob_lvl_flag']
- if glob_lvl_flag:
- if glob_id_stack[-1][0] == glob_lvl_flag:
+ if glob_lvl_flag:
+ if glob_id_stack[-1][0] == glob_lvl_flag:
line['globalisation_id'] = glob_id_stack[-1][2]
glob_id_stack.pop()
else:
glob_name = line['name'].strip() or '/'
glob_code = seq_obj.get(cr, uid, 'statement.line.global')
glob_id = glob_obj.create(cr, uid, {
- 'code': glob_code,
+ 'code': glob_code,
'name': glob_name,
'type': 'coda',
'parent_id': glob_id_stack[-1][2],
@@ -720,7 +719,7 @@ class account_coda_import(osv.osv_memory):
})
line['globalisation_id'] = glob_id
glob_id_stack.append((glob_lvl_flag, glob_code, glob_id, glob_name))
-
+
line_note = _('Partner name: %s \nPartner Account Number: %s' \
'\nTransaction Type: %s - %s' \
'\nTransaction Family: %s - %s' \
@@ -735,54 +734,54 @@ class account_coda_import(osv.osv_memory):
line['trans_category'], line['trans_category_desc'],
line['struct_comm_type'], line['struct_comm_type_desc'],
line['communication'])
-
+
if line['type'] == 'globalisation':
-
+
coda_st_line_id = coda_st_line_obj.create(cr, uid, {
'sequence': line['sequence'],
- 'ref': line['ref'],
+ 'ref': line['ref'],
'name': line['name'].strip() or '/',
'type' : 'globalisation',
- 'val_date' : line['val_date'],
+ 'val_date' : line['val_date'],
'date': line['entry_date'],
- 'globalisation_level': line['glob_lvl_flag'],
- 'globalisation_amount': line['globalisation_amount'],
- 'globalisation_id': line['globalisation_id'],
+ 'globalisation_level': line['glob_lvl_flag'],
+ 'globalisation_amount': line['globalisation_amount'],
+ 'globalisation_id': line['globalisation_id'],
'partner_id': line['partner_id'] or 0,
'account_id': line['account_id'],
'statement_id': coda_st_id,
'note': line_note,
})
- else: # line['type'] in ['general', 'supplier', 'customer']
+ else: # line['type'] in ['general', 'supplier', 'customer']
- if glob_lvl_flag == 0:
+ if glob_lvl_flag == 0:
line['globalisation_id'] = glob_id_stack[-1][2]
- if not line['account_id']:
+ if not line['account_id']:
line['account_id'] = awaiting_acc
-
+
coda_st_line_id = coda_st_line_obj.create(cr, uid, {
'sequence': line['sequence'],
- 'ref': line['ref'],
+ 'ref': line['ref'],
'name': line['name'] or '/',
'type' : line['type'],
- 'val_date' : line['val_date'],
+ 'val_date' : line['val_date'],
'date': line['entry_date'],
'amount': line['amount'],
'partner_id': line['partner_id'] or 0,
'counterparty_name': line['counterparty_name'],
- 'counterparty_bic': line['counterparty_bic'],
- 'counterparty_number': line['counterparty_number'],
- 'counterparty_currency': line['counterparty_currency'],
+ 'counterparty_bic': line['counterparty_bic'],
+ 'counterparty_number': line['counterparty_number'],
+ 'counterparty_currency': line['counterparty_currency'],
'account_id': line['account_id'],
- 'globalisation_level': line['glob_lvl_flag'],
- 'globalisation_id': line['globalisation_id'],
+ 'globalisation_level': line['glob_lvl_flag'],
+ 'globalisation_id': line['globalisation_id'],
'statement_id': coda_st_id,
'note': line_note,
})
if statement['type'] == 'normal':
-
+
st_line_seq += 1
voucher_id = False
line_name = line['name'].strip()
@@ -793,7 +792,7 @@ class account_coda_import(osv.osv_memory):
line_name = '/'
if line['reconcile']:
- voucher_vals = {
+ voucher_vals = {
'type': line['type'] == 'supplier' and 'payment' or 'receipt',
'name': line_name,
'partner_id': line['partner_id'],
@@ -808,15 +807,15 @@ class account_coda_import(osv.osv_memory):
voucher_id = voucher_obj.create(cr, uid, voucher_vals, context=context)
move_line = move_line_obj.browse(cr, uid, line['reconcile'], context=context)
- voucher_dict = voucher_obj.onchange_partner_id(cr, uid, [],
- partner_id = line['partner_id'],
- journal_id = statement['journal_id'],
- price = abs(line['amount']),
- currency_id = journal.company_id.currency_id.id,
+ voucher_dict = voucher_obj.onchange_partner_id(cr, uid, [],
+ partner_id = line['partner_id'],
+ journal_id = statement['journal_id'],
+ price = abs(line['amount']),
+ currency_id = journal.company_id.currency_id.id,
ttype = line['type'] == 'supplier' and 'payment' or 'receipt',
date = line['val_date'],
context = context)
- #_logger.warning('voucher_dict = %s' % voucher_dict)
+ #_logger.warning('voucher_dict = %s' % voucher_dict)
voucher_line_vals = False
if voucher_dict['value']['line_ids']:
for line_dict in voucher_dict['value']['line_ids']:
@@ -831,38 +830,38 @@ class account_coda_import(osv.osv_memory):
bank_st_line_id = bank_st_line_obj.create(cr, uid, {
'sequence': st_line_seq,
- 'ref': line['ref'],
+ 'ref': line['ref'],
'name': line_name,
'type' : line['type'],
- 'val_date' : line['val_date'],
+ 'val_date' : line['val_date'],
'date': line['entry_date'],
'amount': line['amount'],
'partner_id': line['partner_id'] or 0,
'counterparty_name': line['counterparty_name'],
- 'counterparty_bic': line['counterparty_bic'],
- 'counterparty_number': line['counterparty_number'],
- 'counterparty_currency': line['counterparty_currency'],
+ 'counterparty_bic': line['counterparty_bic'],
+ 'counterparty_number': line['counterparty_number'],
+ 'counterparty_currency': line['counterparty_currency'],
'account_id': line['account_id'],
- 'globalisation_id': line['globalisation_id'],
+ 'globalisation_id': line['globalisation_id'],
'statement_id': bk_st_id,
'voucher_id': voucher_id,
'note': line_note,
- })
+ })
# end 'for x in lines'
coda_st_obj.write(cr, uid, [coda_st_id], {}, context=context) # calculate balance
st_balance = coda_st_obj.read(cr, uid, coda_st_id, ['balance_end', 'balance_end_real'], context=context)
if st_balance['balance_end'] <> st_balance['balance_end_real']:
- err_string += _('\nIncorrect ending Balance in CODA Statement %s for Bank Account %s!') \
+ err_string += _('\nIncorrect ending Balance in CODA Statement %s for Bank Account %s.') \
% (statement['coda_seq_number'], (statement['acc_number'] + ' (' + statement['currency'] + ') - ' + statement['description']))
if statement['type'] == 'normal':
nb_err += 1
break
else:
statement['coda_parsing_note'] += '\n' + err_string
-
- if statement['type'] == 'normal':
- bank_st_obj.button_dummy(cr, uid, [bk_st_id], context=context) # calculate balance
+
+ if statement['type'] == 'normal':
+ bank_st_obj.button_dummy(cr, uid, [bk_st_id], context=context) # calculate balance
journal_name = journal.name
else:
journal_name = _('None')
@@ -904,7 +903,7 @@ class account_coda_import(osv.osv_memory):
_logger.error('Unknown Error while processing Statement %s\n%s' % (statement.get('name', '/'),tb))
# end 'for statement in coda_statements'
-
+
coda_note_header = _('CODA File is Imported :')
coda_note_footer = _('\n\nNumber of statements : ') + str(len(coda_st_ids))
err_log = err_log + _('\nNumber of errors : ') + str(nb_err) + '\n'
@@ -920,13 +919,13 @@ class account_coda_import(osv.osv_memory):
if batch:
err_code = 'G0002'
return (err_code, err_string)
- raise osv.except_osv(_('CODA Import failed !'), err_string)
-
+ raise osv.except_osv(_('CODA Import failed.'), err_string)
+
context.update({ 'bk_st_ids': bk_st_ids})
model_data_ids = mod_obj.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'account_coda_import_result_view')], context=context)
resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
self.write(cr, uid, ids, {'note': note}, context=context)
-
+
return {
'name': _('Import CODA File result'),
'res_id': ids[0],
@@ -961,7 +960,7 @@ class account_coda_import(osv.osv_memory):
domain += [('id','in', context.get('bk_st_ids', False))]
action.update({'domain': domain})
return action
-
+
account_coda_import()
def str2date(date_str):
diff --git a/addons/account_payment/account_move_line.py b/addons/account_payment/account_move_line.py
index 24f9486be95..cbbeb949b3c 100644
--- a/addons/account_payment/account_move_line.py
+++ b/addons/account_payment/account_move_line.py
@@ -107,7 +107,7 @@ class account_move_line(osv.osv):
if line.id not in line2bank and line.partner_id.bank_ids:
line2bank[line.id] = line.partner_id.bank_ids[0].id
else:
- raise osv.except_osv(_('Error !'), _('No partner defined on entry line'))
+ raise osv.except_osv(_('Error!'), _('There is no partner defined on the entry line.'))
return line2bank
_columns = {
diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index 22b7fc5f6f2..1d4c46df029 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -71,8 +71,8 @@ class payment_order(osv.osv):
#dead code
def get_wizard(self, type):
logger = netsvc.Logger()
- logger.notifyChannel("warning", netsvc.LOG_WARNING,
- "No wizard found for the payment type '%s'." % type)
+ logger.notifyChannel("Warning!", netsvc.LOG_WARNING,
+ "No wizard is found for the payment type '%s'." % type)
return None
def _total(self, cursor, user, ids, name, args, context=None):
diff --git a/addons/account_payment/i18n/am.po b/addons/account_payment/i18n/am.po
index 97238d8e74e..cdff07a1d48 100644
--- a/addons/account_payment/i18n/am.po
+++ b/addons/account_payment/i18n/am.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/ar.po b/addons/account_payment/i18n/ar.po
index ee8fc01f8f0..4da0565ae04 100644
--- a/addons/account_payment/i18n/ar.po
+++ b/addons/account_payment/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/bg.po b/addons/account_payment/i18n/bg.po
index 9fa9c3660d7..383f94a8dd3 100644
--- a/addons/account_payment/i18n/bg.po
+++ b/addons/account_payment/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/bs.po b/addons/account_payment/i18n/bs.po
index 3f7198f9b0a..efe3f38cad6 100644
--- a/addons/account_payment/i18n/bs.po
+++ b/addons/account_payment/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/ca.po b/addons/account_payment/i18n/ca.po
index d00b861f2b3..a84f8012838 100644
--- a/addons/account_payment/i18n/ca.po
+++ b/addons/account_payment/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/cs.po b/addons/account_payment/i18n/cs.po
index 6b030c10256..3c75dc1f81d 100644
--- a/addons/account_payment/i18n/cs.po
+++ b/addons/account_payment/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/da.po b/addons/account_payment/i18n/da.po
index 3ab1ba4557f..06a360cf94b 100644
--- a/addons/account_payment/i18n/da.po
+++ b/addons/account_payment/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/de.po b/addons/account_payment/i18n/de.po
index b0fa9c9e1a3..336eb3e41cc 100644
--- a/addons/account_payment/i18n/de.po
+++ b/addons/account_payment/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/el.po b/addons/account_payment/i18n/el.po
index 27c6fff9009..e14c3ec9369 100644
--- a/addons/account_payment/i18n/el.po
+++ b/addons/account_payment/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/es.po b/addons/account_payment/i18n/es.po
index d1116a2fba0..af303b2da58 100644
--- a/addons/account_payment/i18n/es.po
+++ b/addons/account_payment/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/es_AR.po b/addons/account_payment/i18n/es_AR.po
index cdc73a99114..43eccde767e 100644
--- a/addons/account_payment/i18n/es_AR.po
+++ b/addons/account_payment/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/es_CL.po b/addons/account_payment/i18n/es_CL.po
index 7f28e65f7dc..5bcfc3c3402 100644
--- a/addons/account_payment/i18n/es_CL.po
+++ b/addons/account_payment/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/es_CR.po b/addons/account_payment/i18n/es_CR.po
index b416fd780bf..2fc5e479428 100644
--- a/addons/account_payment/i18n/es_CR.po
+++ b/addons/account_payment/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
"Language: \n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/es_EC.po b/addons/account_payment/i18n/es_EC.po
index b427731a244..91ee05f2c15 100644
--- a/addons/account_payment/i18n/es_EC.po
+++ b/addons/account_payment/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/es_PY.po b/addons/account_payment/i18n/es_PY.po
index da6793b0056..0e9907a9b2c 100644
--- a/addons/account_payment/i18n/es_PY.po
+++ b/addons/account_payment/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/et.po b/addons/account_payment/i18n/et.po
index 01553ff7db7..6d602e1afc7 100644
--- a/addons/account_payment/i18n/et.po
+++ b/addons/account_payment/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/fa.po b/addons/account_payment/i18n/fa.po
index 49daffd21b1..589d0d70800 100644
--- a/addons/account_payment/i18n/fa.po
+++ b/addons/account_payment/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/fi.po b/addons/account_payment/i18n/fi.po
index 6be8c605ba9..1047ad36f80 100644
--- a/addons/account_payment/i18n/fi.po
+++ b/addons/account_payment/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/fr.po b/addons/account_payment/i18n/fr.po
index 479da07e8b9..8103582191f 100644
--- a/addons/account_payment/i18n/fr.po
+++ b/addons/account_payment/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: view:account.move.line:0
diff --git a/addons/account_payment/i18n/gl.po b/addons/account_payment/i18n/gl.po
index 5d3d94ab02d..58612b36752 100644
--- a/addons/account_payment/i18n/gl.po
+++ b/addons/account_payment/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/hi.po b/addons/account_payment/i18n/hi.po
index 270c0381666..fad17d86886 100644
--- a/addons/account_payment/i18n/hi.po
+++ b/addons/account_payment/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/hr.po b/addons/account_payment/i18n/hr.po
index 3482dc651f2..1d3b242fcfe 100644
--- a/addons/account_payment/i18n/hr.po
+++ b/addons/account_payment/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/hu.po b/addons/account_payment/i18n/hu.po
index 480c1d2c8e5..5dde8ca6903 100644
--- a/addons/account_payment/i18n/hu.po
+++ b/addons/account_payment/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/id.po b/addons/account_payment/i18n/id.po
index 1a9dc665e5f..e8c991b1d4b 100644
--- a/addons/account_payment/i18n/id.po
+++ b/addons/account_payment/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/it.po b/addons/account_payment/i18n/it.po
index 734341d746a..6baa529016d 100644
--- a/addons/account_payment/i18n/it.po
+++ b/addons/account_payment/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/ja.po b/addons/account_payment/i18n/ja.po
index eac69434bce..43a2ad83c8f 100644
--- a/addons/account_payment/i18n/ja.po
+++ b/addons/account_payment/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/ko.po b/addons/account_payment/i18n/ko.po
index ca46ff17ddb..7667f77ed96 100644
--- a/addons/account_payment/i18n/ko.po
+++ b/addons/account_payment/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/lt.po b/addons/account_payment/i18n/lt.po
index 0162d6e6faf..4df5a8fb489 100644
--- a/addons/account_payment/i18n/lt.po
+++ b/addons/account_payment/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/lv.po b/addons/account_payment/i18n/lv.po
index 13bb2e6b959..a8592eb846e 100644
--- a/addons/account_payment/i18n/lv.po
+++ b/addons/account_payment/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/mn.po b/addons/account_payment/i18n/mn.po
index e88f00e1a6e..3a9951574bc 100644
--- a/addons/account_payment/i18n/mn.po
+++ b/addons/account_payment/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/nb.po b/addons/account_payment/i18n/nb.po
index 62ed1bd4a3e..13f0b550741 100644
--- a/addons/account_payment/i18n/nb.po
+++ b/addons/account_payment/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/nl.po b/addons/account_payment/i18n/nl.po
index 2b4d8aa2df2..16e3e01c755 100644
--- a/addons/account_payment/i18n/nl.po
+++ b/addons/account_payment/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/nl_BE.po b/addons/account_payment/i18n/nl_BE.po
index 194e4f96472..12cd63f1aa6 100644
--- a/addons/account_payment/i18n/nl_BE.po
+++ b/addons/account_payment/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/oc.po b/addons/account_payment/i18n/oc.po
index 34915bfa553..456a4e969a6 100644
--- a/addons/account_payment/i18n/oc.po
+++ b/addons/account_payment/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/pl.po b/addons/account_payment/i18n/pl.po
index 74c94a2b7cc..551912364f1 100644
--- a/addons/account_payment/i18n/pl.po
+++ b/addons/account_payment/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/pt.po b/addons/account_payment/i18n/pt.po
index b4bbf876a42..5ca50badccc 100644
--- a/addons/account_payment/i18n/pt.po
+++ b/addons/account_payment/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/pt_BR.po b/addons/account_payment/i18n/pt_BR.po
index 31d73a88c23..46bb3fb57ab 100644
--- a/addons/account_payment/i18n/pt_BR.po
+++ b/addons/account_payment/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/ro.po b/addons/account_payment/i18n/ro.po
index 0bf856cac70..582c7f104c3 100644
--- a/addons/account_payment/i18n/ro.po
+++ b/addons/account_payment/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/ru.po b/addons/account_payment/i18n/ru.po
index 55fe12d4723..7a3ff827f36 100644
--- a/addons/account_payment/i18n/ru.po
+++ b/addons/account_payment/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/sl.po b/addons/account_payment/i18n/sl.po
index f8a6f8bae5d..638aefdaf6b 100644
--- a/addons/account_payment/i18n/sl.po
+++ b/addons/account_payment/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/sq.po b/addons/account_payment/i18n/sq.po
index d0782a4bd29..8a899514680 100644
--- a/addons/account_payment/i18n/sq.po
+++ b/addons/account_payment/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/sr.po b/addons/account_payment/i18n/sr.po
index a150f375317..3725ee94d91 100644
--- a/addons/account_payment/i18n/sr.po
+++ b/addons/account_payment/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/sr@latin.po b/addons/account_payment/i18n/sr@latin.po
index ca47f1740aa..c940641dc25 100644
--- a/addons/account_payment/i18n/sr@latin.po
+++ b/addons/account_payment/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/sv.po b/addons/account_payment/i18n/sv.po
index 8a583b8dead..4e5d59101a9 100644
--- a/addons/account_payment/i18n/sv.po
+++ b/addons/account_payment/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/tlh.po b/addons/account_payment/i18n/tlh.po
index 27a0b9da177..d7d47640709 100644
--- a/addons/account_payment/i18n/tlh.po
+++ b/addons/account_payment/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/tr.po b/addons/account_payment/i18n/tr.po
index f2a139af054..2af566ccefd 100644
--- a/addons/account_payment/i18n/tr.po
+++ b/addons/account_payment/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/uk.po b/addons/account_payment/i18n/uk.po
index d7baafbf0af..649f2523ce8 100644
--- a/addons/account_payment/i18n/uk.po
+++ b/addons/account_payment/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/vi.po b/addons/account_payment/i18n/vi.po
index e1e44f847b8..2ab557ace0a 100644
--- a/addons/account_payment/i18n/vi.po
+++ b/addons/account_payment/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/zh_CN.po b/addons/account_payment/i18n/zh_CN.po
index b19499a60f7..b331766a5fd 100644
--- a/addons/account_payment/i18n/zh_CN.po
+++ b/addons/account_payment/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/zh_TW.po b/addons/account_payment/i18n/zh_TW.po
index 6cc1b22c664..b492a307642 100644
--- a/addons/account_payment/i18n/zh_TW.po
+++ b/addons/account_payment/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 2cefaf15f0e..ce0c64337b9 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -473,7 +473,7 @@ class account_voucher(osv.osv):
tr_type = 'purchase'
else:
if not journal.default_credit_account_id or not journal.default_debit_account_id:
- raise osv.except_osv(_('Error !'), _('Please define default credit/debit accounts on the journal "%s" !') % (journal.name))
+ raise osv.except_osv(_('Error!'), _('Please define default credit/debit accounts on the journal "%s".') % (journal.name))
account_id = journal.default_credit_account_id.id or journal.default_debit_account_id.id
tr_type = 'receipt'
@@ -822,7 +822,7 @@ class account_voucher(osv.osv):
def unlink(self, cr, uid, ids, context=None):
for t in self.read(cr, uid, ids, ['state'], context=context):
if t['state'] not in ('draft', 'cancel'):
- raise osv.except_osv(_('Invalid action !'), _('Cannot delete Voucher(s) which are already opened or paid !'))
+ raise osv.except_osv(_('Invalid Action!'), _('Cannot delete voucher(s) which are already opened or paid.'))
return super(account_voucher, self).unlink(cr, uid, ids, context=context)
def onchange_payment(self, cr, uid, ids, pay_now, journal_id, partner_id, ttype='sale'):
@@ -919,8 +919,8 @@ class account_voucher(osv.osv):
elif voucher_brw.journal_id.sequence_id:
name = seq_obj.next_by_id(cr, uid, voucher_brw.journal_id.sequence_id.id, context=context)
else:
- raise osv.except_osv(_('Error !'),
- _('Please define a sequence on the journal !'))
+ raise osv.except_osv(_('Error!'),
+ _('Please define a sequence on the journal.'))
if not voucher_brw.reference:
ref = name.replace('/','')
else:
@@ -952,11 +952,11 @@ class account_voucher(osv.osv):
if amount_residual > 0:
account_id = line.voucher_id.company_id.expense_currency_exchange_account_id
if not account_id:
- raise osv.except_osv(_('Warning'),_("Unable to create accounting entry for currency rate difference. You have to configure the field 'Income Currency Rate' on the company! "))
+ raise osv.except_osv(_('Warning!'),_("First you have to configure the 'Income Currency Rate' on the company, then create accounting entry for currency rate difference."))
else:
account_id = line.voucher_id.company_id.income_currency_exchange_account_id
if not account_id:
- raise osv.except_osv(_('Warning'),_("Unable to create accounting entry for currency rate difference. You have to configure the field 'Expense Currency Rate' on the company! "))
+ raise osv.except_osv(_('Warning!'),_("First you have to configure the 'Expense Currency Rate' on the company, then create accounting entry for currency rate difference."))
# Even if the amount_currency is never filled, we need to pass the foreign currency because otherwise
# the receivable/payable account may have a secondary currency, which render this field mandatory
account_currency_id = company_currency <> current_currency and current_currency or False
@@ -1516,7 +1516,7 @@ class account_bank_statement_line(osv.osv):
return True
_constraints = [
- (_check_amount, 'The amount of the voucher must be the same amount as the one on the statement line', ['amount']),
+ (_check_amount, 'The amount of the voucher must be the same amount as the one on the statement line.', ['amount']),
]
_columns = {
diff --git a/addons/account_voucher/i18n/ar.po b/addons/account_voucher/i18n/ar.po
index bccd692c2f1..19cc4dd6199 100644
--- a/addons/account_voucher/i18n/ar.po
+++ b/addons/account_voucher/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/bg.po b/addons/account_voucher/i18n/bg.po
index 1f8c9b8277f..a418dfdb58e 100644
--- a/addons/account_voucher/i18n/bg.po
+++ b/addons/account_voucher/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/bs.po b/addons/account_voucher/i18n/bs.po
index b2e6de092b3..74b2a07705c 100644
--- a/addons/account_voucher/i18n/bs.po
+++ b/addons/account_voucher/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/ca.po b/addons/account_voucher/i18n/ca.po
index 3139336a379..0cf64a1c698 100644
--- a/addons/account_voucher/i18n/ca.po
+++ b/addons/account_voucher/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/cs.po b/addons/account_voucher/i18n/cs.po
index e2c4803181e..45b4d271ba9 100644
--- a/addons/account_voucher/i18n/cs.po
+++ b/addons/account_voucher/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/da.po b/addons/account_voucher/i18n/da.po
index 427e9de85df..593276c4514 100644
--- a/addons/account_voucher/i18n/da.po
+++ b/addons/account_voucher/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/de.po b/addons/account_voucher/i18n/de.po
index a459a4316dc..3a4899d4d60 100644
--- a/addons/account_voucher/i18n/de.po
+++ b/addons/account_voucher/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/el.po b/addons/account_voucher/i18n/el.po
index d1de39d5c31..aa7bf516124 100644
--- a/addons/account_voucher/i18n/el.po
+++ b/addons/account_voucher/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/es.po b/addons/account_voucher/i18n/es.po
index 46376d776f6..9feae6b279b 100644
--- a/addons/account_voucher/i18n/es.po
+++ b/addons/account_voucher/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/es_AR.po b/addons/account_voucher/i18n/es_AR.po
index cc486c0c408..1982a854a6f 100644
--- a/addons/account_voucher/i18n/es_AR.po
+++ b/addons/account_voucher/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/es_CR.po b/addons/account_voucher/i18n/es_CR.po
index 94b6d241c80..3a229d2d315 100644
--- a/addons/account_voucher/i18n/es_CR.po
+++ b/addons/account_voucher/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
"Language: \n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/es_EC.po b/addons/account_voucher/i18n/es_EC.po
index ce04fa989e9..8e0d12a48a4 100644
--- a/addons/account_voucher/i18n/es_EC.po
+++ b/addons/account_voucher/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/es_PY.po b/addons/account_voucher/i18n/es_PY.po
index ed2817ab396..27d715405af 100644
--- a/addons/account_voucher/i18n/es_PY.po
+++ b/addons/account_voucher/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/et.po b/addons/account_voucher/i18n/et.po
index e16e60b8156..2677094f960 100644
--- a/addons/account_voucher/i18n/et.po
+++ b/addons/account_voucher/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#~ msgid "Bank Receipt Voucher"
#~ msgstr "Panga sissetulekuorder"
diff --git a/addons/account_voucher/i18n/fa.po b/addons/account_voucher/i18n/fa.po
index 5a33adf1b2d..e4bc1a135fe 100644
--- a/addons/account_voucher/i18n/fa.po
+++ b/addons/account_voucher/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/fr.po b/addons/account_voucher/i18n/fr.po
index eafefc21065..ce3d56b353c 100644
--- a/addons/account_voucher/i18n/fr.po
+++ b/addons/account_voucher/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/gl.po b/addons/account_voucher/i18n/gl.po
index 887c4612e24..736234b7473 100644
--- a/addons/account_voucher/i18n/gl.po
+++ b/addons/account_voucher/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/gu.po b/addons/account_voucher/i18n/gu.po
index db36af32086..bbb554b0c58 100644
--- a/addons/account_voucher/i18n/gu.po
+++ b/addons/account_voucher/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/hi.po b/addons/account_voucher/i18n/hi.po
index 2fd9161896a..0b1daa131f6 100644
--- a/addons/account_voucher/i18n/hi.po
+++ b/addons/account_voucher/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/hr.po b/addons/account_voucher/i18n/hr.po
index 6bc7aa32f57..0a4281ac06f 100644
--- a/addons/account_voucher/i18n/hr.po
+++ b/addons/account_voucher/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/hu.po b/addons/account_voucher/i18n/hu.po
index b5e6ac0610c..485789f3010 100644
--- a/addons/account_voucher/i18n/hu.po
+++ b/addons/account_voucher/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/id.po b/addons/account_voucher/i18n/id.po
index 27d6d48e2f1..894b99594f5 100644
--- a/addons/account_voucher/i18n/id.po
+++ b/addons/account_voucher/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/it.po b/addons/account_voucher/i18n/it.po
index 0a76a5dfb9f..6b9cf4fa9ac 100644
--- a/addons/account_voucher/i18n/it.po
+++ b/addons/account_voucher/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/ja.po b/addons/account_voucher/i18n/ja.po
index 65cc4e0d622..651f5bbb2eb 100644
--- a/addons/account_voucher/i18n/ja.po
+++ b/addons/account_voucher/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/ko.po b/addons/account_voucher/i18n/ko.po
index 7607f2c6191..6e165dc2e53 100644
--- a/addons/account_voucher/i18n/ko.po
+++ b/addons/account_voucher/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/lt.po b/addons/account_voucher/i18n/lt.po
index dc6a4396d1f..8518eb45f47 100644
--- a/addons/account_voucher/i18n/lt.po
+++ b/addons/account_voucher/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/mn.po b/addons/account_voucher/i18n/mn.po
index b68b6f20733..ae448ef37db 100644
--- a/addons/account_voucher/i18n/mn.po
+++ b/addons/account_voucher/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/nl.po b/addons/account_voucher/i18n/nl.po
index 850bb5de1d4..5056ef787c3 100644
--- a/addons/account_voucher/i18n/nl.po
+++ b/addons/account_voucher/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
@@ -150,7 +150,7 @@ msgstr "Bon analyses"
#. module: account_voucher
#: view:account.voucher:0
msgid "Validate"
-msgstr "Bevestig"
+msgstr "Valideren"
#. module: account_voucher
#: view:sale.receipt.report:0 field:sale.receipt.report,day:0
diff --git a/addons/account_voucher/i18n/nl_BE.po b/addons/account_voucher/i18n/nl_BE.po
index 1685b5caa85..58d4e69d483 100644
--- a/addons/account_voucher/i18n/nl_BE.po
+++ b/addons/account_voucher/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/oc.po b/addons/account_voucher/i18n/oc.po
index 3001a508040..4193ece4e67 100644
--- a/addons/account_voucher/i18n/oc.po
+++ b/addons/account_voucher/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/pl.po b/addons/account_voucher/i18n/pl.po
index 48e17519830..b735102ea05 100644
--- a/addons/account_voucher/i18n/pl.po
+++ b/addons/account_voucher/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/pt.po b/addons/account_voucher/i18n/pt.po
index 99e6e81c416..f26bff523f2 100644
--- a/addons/account_voucher/i18n/pt.po
+++ b/addons/account_voucher/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/pt_BR.po b/addons/account_voucher/i18n/pt_BR.po
index 8c3f967bb03..4b7e48e402b 100644
--- a/addons/account_voucher/i18n/pt_BR.po
+++ b/addons/account_voucher/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/ro.po b/addons/account_voucher/i18n/ro.po
index 8f43a43caf7..5ac64605365 100644
--- a/addons/account_voucher/i18n/ro.po
+++ b/addons/account_voucher/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/ru.po b/addons/account_voucher/i18n/ru.po
index aee40a8bf21..24e3372b721 100644
--- a/addons/account_voucher/i18n/ru.po
+++ b/addons/account_voucher/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/sl.po b/addons/account_voucher/i18n/sl.po
index c4060424a03..61cbdba273e 100644
--- a/addons/account_voucher/i18n/sl.po
+++ b/addons/account_voucher/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/sq.po b/addons/account_voucher/i18n/sq.po
index 9e222fcd792..becd149d89c 100644
--- a/addons/account_voucher/i18n/sq.po
+++ b/addons/account_voucher/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/sr.po b/addons/account_voucher/i18n/sr.po
index 7fcef7b1be0..24752cb25ad 100644
--- a/addons/account_voucher/i18n/sr.po
+++ b/addons/account_voucher/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/sr@latin.po b/addons/account_voucher/i18n/sr@latin.po
index 9cedab378b2..58b7807f0fd 100644
--- a/addons/account_voucher/i18n/sr@latin.po
+++ b/addons/account_voucher/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/sv.po b/addons/account_voucher/i18n/sv.po
index 4349042670a..efee133f1e8 100644
--- a/addons/account_voucher/i18n/sv.po
+++ b/addons/account_voucher/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/tlh.po b/addons/account_voucher/i18n/tlh.po
index 57950b708c9..0b19d5de81a 100644
--- a/addons/account_voucher/i18n/tlh.po
+++ b/addons/account_voucher/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/tr.po b/addons/account_voucher/i18n/tr.po
index 35cfe61aa77..0ba9b64c052 100644
--- a/addons/account_voucher/i18n/tr.po
+++ b/addons/account_voucher/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
@@ -323,6 +323,8 @@ msgid ""
"Computed as the difference between the amount stated in the voucher and the "
"sum of allocation on the voucher lines."
msgstr ""
+"Fişte belirtilen tutar ve fiş satırlarının toplamı arasındaki fark olarak "
+"hesaplanmıştır."
#. module: account_voucher
#: selection:account.voucher,type:0 selection:sale.receipt.report,type:0
@@ -538,6 +540,7 @@ msgid ""
"Fields with internal purpose only that depicts if the voucher is a multi "
"currency one or not"
msgstr ""
+"Fişin çoklu para birimli olup olmadığını belirten yalnızca iç amaçlı alanlar"
#. module: account_voucher
#: field:account.statement.from.invoice,line_ids:0
@@ -617,7 +620,7 @@ msgstr "Taslak"
msgid ""
"Unable to create accounting entry for currency rate difference. You have to "
"configure the field 'Income Currency Rate' on the company! "
-msgstr ""
+msgstr "Kur farkı için muhasebe girişi oluşturulamıyor. "
#. module: account_voucher
#: view:account.voucher:0 view:sale.receipt.report:0
@@ -645,6 +648,8 @@ msgid ""
"Check this box if you are unsure of that journal entry and if you want to "
"note it as 'to be reviewed' by an accounting expert."
msgstr ""
+"Günlük girişi konusunda karasızsanız ve bir muhasebe uzmanı tarafından "
+"'incelenmeli' notunu düşmek istiyorsanız bu kutuyu işaretleyin."
#. module: account_voucher
#: selection:sale.receipt.report,month:0
@@ -934,6 +939,8 @@ msgid ""
"either choose to keep open this difference on the partner's account, or "
"reconcile it with the payment(s)"
msgstr ""
+"Bu alan, ödenen tutar ile satır tutarlarının toplamı arasındaki oluşabilecek "
+"fark konusunda neyi yapmak istediğinizi seçmenize yardım eder."
#. module: account_voucher
#: view:account.voucher:0
@@ -1016,6 +1023,8 @@ msgid ""
"The specific rate that will be used, in this voucher, between the selected "
"currency (in 'Payment Rate Currency' field) and the voucher currency."
msgstr ""
+"Bu fişte kullanılacak özel oran, seçilen para birimi (Ödeme Kuru Alanı) ile "
+"fiş para birimi arasındaki"
#. module: account_voucher
#: field:account.bank.statement.line,voucher_id:0 view:account.invoice:0
@@ -1067,6 +1076,8 @@ msgid ""
"Unable to create accounting entry for currency rate difference. You have to "
"configure the field 'Expense Currency Rate' on the company! "
msgstr ""
+"Kur farkı için hesap girişi oluşturulamıyor. Firmanın 'Gider Döviz Kur' unu "
+"yapılandırmalısınız! "
#. module: account_voucher
#: field:account.voucher,type:0
diff --git a/addons/account_voucher/i18n/uk.po b/addons/account_voucher/i18n/uk.po
index 6456968d6ea..26404f7c9da 100644
--- a/addons/account_voucher/i18n/uk.po
+++ b/addons/account_voucher/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/vi.po b/addons/account_voucher/i18n/vi.po
index 0dd43f28ff4..7ba805aae58 100644
--- a/addons/account_voucher/i18n/vi.po
+++ b/addons/account_voucher/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/zh_CN.po b/addons/account_voucher/i18n/zh_CN.po
index 843803a1874..c884902bb63 100644
--- a/addons/account_voucher/i18n/zh_CN.po
+++ b/addons/account_voucher/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/zh_TW.po b/addons/account_voucher/i18n/zh_TW.po
index 7cabec45beb..24835701ca5 100644
--- a/addons/account_voucher/i18n/zh_TW.po
+++ b/addons/account_voucher/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:21+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
+"X-Generator: Launchpad (build 15761)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
diff --git a/addons/account_voucher/test/case1_usd_usd.yml b/addons/account_voucher/test/case1_usd_usd.yml
index 5ff48e7d35d..d8ac932a055 100644
--- a/addons/account_voucher/test/case1_usd_usd.yml
+++ b/addons/account_voucher/test/case1_usd_usd.yml
@@ -141,7 +141,7 @@
!context
'type': 'receipt'
-
- I create the first voucher of payment with values 240 USD, journal USD,
+ On the first March, I create the first voucher of payment with values 240 USD, journal USD,
-
!record {model: account.voucher, id: account_voucher_1_case1, view: view_vendor_receipt_form}:
account_id: account.cash
@@ -235,7 +235,7 @@
move_line = move_line_obj.browse(cr, uid, move_lines[0])
assert (move_line.amount_residual_currency == 30.0) , "Residual amount is not correct for first Invoice"
-
- I create the second voucher of payment with values 45 USD, journal USD,
+ On the first April, I create the second voucher of payment with values 45 USD, journal USD,
-
!record {model: account.voucher, id: account_voucher_2_case1}:
account_id: account.cash
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index c16ed82a580..165af37888d 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -140,7 +140,7 @@ class account_analytic_account(osv.osv):
for account in self.browse(cr, uid, ids, context=context):
if account.company_id:
if account.company_id.currency_id.id != value:
- raise osv.except_osv(_('Error !'), _("If you set a company, the currency selected has to be the same as it's currency. \nYou can remove the company belonging, and thus change the currency, only on analytic account of type 'view'. This can be really usefull for consolidation purposes of several companies charts with different currencies, for example."))
+ raise osv.except_osv(_('Error!'), _("If you set a company, the currency selected has to be the same as it's currency. \nYou can remove the company belonging, and thus change the currency, only on analytic account of type 'view'. This can be really usefull for consolidation purposes of several companies charts with different currencies, for example."))
return cr.execute("""update account_analytic_account set currency_id=%s where id=%s""", (value, account.id, ))
def _currency(self, cr, uid, ids, field_name, arg, context=None):
@@ -232,7 +232,7 @@ class account_analytic_account(osv.osv):
_order = 'name asc'
_constraints = [
- (check_recursion, 'Error! You can not create recursive analytic accounts.', ['parent_id']),
+ (check_recursion, 'Error! You cannot create recursive analytic accounts.', ['parent_id']),
]
def copy(self, cr, uid, id, default=None, context=None):
@@ -333,7 +333,7 @@ class account_analytic_line(osv.osv):
return True
_constraints = [
- (_check_no_view, 'You can not create analytic line on view account.', ['account_id']),
+ (_check_no_view, 'You cannot create analytic line on view account.', ['account_id']),
]
account_analytic_line()
diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py
index cfb1aba10d1..9233845f7eb 100644
--- a/addons/analytic_user_function/analytic_user_function.py
+++ b/addons/analytic_user_function/analytic_user_function.py
@@ -92,7 +92,7 @@ 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 !'),
+ 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,))
@@ -127,7 +127,7 @@ 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 !'),
+ 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,))
diff --git a/addons/anonymization/anonymization.py b/addons/anonymization/anonymization.py
index b6e4d802ce2..47e168a12b8 100644
--- a/addons/anonymization/anonymization.py
+++ b/addons/anonymization/anonymization.py
@@ -425,7 +425,7 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
elif field_type == 'integer':
anonymized_value = 0
elif field_type in ['binary', 'many2many', 'many2one', 'one2many', 'reference']: # cannot anonymize these kind of fields
- msg = "Cannot anonymize fields of these types: binary, many2many, many2one, one2many, reference"
+ msg = "Cannot anonymize fields of these types: binary, many2many, many2one, one2many, reference."
self._raise_after_history_update(cr, uid, history_id, 'Error !', msg)
if anonymized_value is None:
@@ -453,9 +453,9 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
# add a result message in the wizard:
msgs = ["Anonymization successful.",
"",
- "Don't forget to save the resulting file to a safe place because you will not be able to revert the anonymization without this file.",
+ "Donot forget to save the resulting file to a safe place because you will not be able to revert the anonymization without this file.",
"",
- "This file is also stored in the %s directory. The absolute file path is: %s",
+ "This file is also stored in the %s directory. The absolute file path is: %s.",
]
msg = '\n'.join(msgs) % (dirpath, abs_filepath)
@@ -515,7 +515,7 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
wizards = self.browse(cr, uid, ids, context=context)
for wizard in wizards:
if not wizard.file_import:
- msg = "The anonymization export file was not supplied. It is not possible to reverse the anonymization process without this file."
+ msg = "It is not possible to reverse the anonymization process without supplying anonymization export file."
self._raise_after_history_update(cr, uid, history_id, 'Error !', msg)
# reverse the anonymization:
diff --git a/addons/anonymous/__init__.py b/addons/auth_anonymous/__init__.py
similarity index 100%
rename from addons/anonymous/__init__.py
rename to addons/auth_anonymous/__init__.py
diff --git a/addons/anonymous/__openerp__.py b/addons/auth_anonymous/__openerp__.py
similarity index 64%
rename from addons/anonymous/__openerp__.py
rename to addons/auth_anonymous/__openerp__.py
index 3494fca7a9f..95d98e65fea 100644
--- a/addons/anonymous/__openerp__.py
+++ b/addons/auth_anonymous/__openerp__.py
@@ -3,17 +3,17 @@
'description': 'Allow anonymous access to OpenERP.',
'author': 'OpenERP SA',
'version': '1.0',
- 'category': 'Tools',
+ 'category': 'Authentication',
'website': 'http://www.openerp.com',
'installable': True,
'depends': ['web'],
'data': [
- 'anonymous.xml',
+ 'auth_anonymous.xml',
],
'js': [
- 'static/src/js/anonymous.js',
+ 'static/src/js/auth_anonymous.js',
],
'qweb': [
- 'static/src/xml/anonymous.xml',
+ 'static/src/xml/auth_anonymous.xml',
],
}
diff --git a/addons/anonymous/anonymous.xml b/addons/auth_anonymous/auth_anonymous.xml
similarity index 100%
rename from addons/anonymous/anonymous.xml
rename to addons/auth_anonymous/auth_anonymous.xml
diff --git a/addons/anonymous/static/src/js/anonymous.js b/addons/auth_anonymous/static/src/js/auth_anonymous.js
similarity index 63%
rename from addons/anonymous/static/src/js/anonymous.js
rename to addons/auth_anonymous/static/src/js/auth_anonymous.js
index 15c03a6ce63..fab2be1fd53 100644
--- a/addons/anonymous/static/src/js/anonymous.js
+++ b/addons/auth_anonymous/static/src/js/auth_anonymous.js
@@ -1,11 +1,11 @@
-openerp.anonymous = function(instance) {
+openerp.auth_anonymous = function(instance) {
instance.web.Login.include({
start: function() {
var self = this;
return $.when(this._super()).pipe(function() {
- var dblist = self._db_list;
- if (dblist && dblist.length === 1) {
+ var dblist = self._db_list || [];
+ if (!self.session.session_is_valid() && dblist.length === 1) {
self.remember_credentials = false;
// XXX get login/pass from server (via a rpc call) ?
return self.do_login(dblist[0], 'anonymous', 'anonymous')
@@ -19,7 +19,7 @@ openerp.anonymous = function(instance) {
init: function(parent) {
this._super(parent);
if (this.session.username == 'anonymous') {
- this.template = 'UserMenu.anonymous';
+ this.template = 'UserMenu.auth_anonymous';
this.do_update = function() {}; // avoid change of avatar
}
},
@@ -30,8 +30,16 @@ openerp.anonymous = function(instance) {
var p = self.getParent();
var am = p.action_manager;
p.$element.find('.oe_leftbar').hide();
- am.do_action({type:'ir.actions.client', tag:'login', target: 'new'});
- am.dialog_widget.on('login', p, p.restart);
+ am.do_action({
+ type:'ir.actions.client',
+ tag:'login',
+ target: 'new',
+ params: {
+ login_successful: function() {
+ am.do_action("reload");
+ }
+ }
+ });
});
}
});
diff --git a/addons/anonymous/static/src/xml/anonymous.xml b/addons/auth_anonymous/static/src/xml/auth_anonymous.xml
similarity index 90%
rename from addons/anonymous/static/src/xml/anonymous.xml
rename to addons/auth_anonymous/static/src/xml/auth_anonymous.xml
index 7429efff458..79d7efcbdc8 100644
--- a/addons/anonymous/static/src/xml/anonymous.xml
+++ b/addons/auth_anonymous/static/src/xml/auth_anonymous.xml
@@ -3,7 +3,7 @@
-->
-
+