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

[MERGE]: Merged with lp:openobject-addons 

bzr revid: atp@tinyerp.com-20120813051748-klau4w0nig2apfxb
This commit is contained in:
Atul Patel (OpenERP) 2012-08-13 10:47:48 +05:30
parent 9825ad01c6 9211174a6f
commit 7a1a9460d9
6132 changed files with 30446 additions and 98796 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
addons/account/account.py
View File

@ -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:

8
addons/account/account_analytic_line.py
View File

@ -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

38
addons/account/account_bank_statement.py
View File

@ -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

8
addons/account/account_cash_statement.py
View File

@ -169,7 +169,7 @@ class account_cash_statement(osv.osv):
return result
_columns = {
'total_entry_encoding': fields.function(_get_sum_entry_encoding, string="Total Cash Transactions",
'total_entry_encoding': fields.function(_get_sum_entry_encoding, string="Total Transactions",
store = {
'account.bank.statement': (lambda self, cr, uid, ids, context=None: ids, ['line_ids','move_line_ids'], 10),
'account.bank.statement.line': (_get_statement_from_line, ['amount'], 10),
@ -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

8
addons/account/account_installer.xml
View File

@ -9,9 +9,11 @@
<form position="attributes" version="7.0">
<attribute name="string">Accounting Application Configuration</attribute>
</form>
<button name="action_next" position="attributes">
<attribute name="string">Continue</attribute>
</button>
<footer position="replace">
<footer>
<button name="action_next" type="object" string="Continue" class="oe_highlight"/>
</footer>
</footer>
<separator string="title" position="replace">
<group>
<field name="charts"/>

72
addons/account/account_invoice.py
View File

@ -306,7 +306,7 @@ class account_invoice(osv.osv):
if view_type == 'form':
if partner['supplier'] and not partner['customer']:
view_id = self.pool.get('ir.ui.view').search(cr,uid,[('name', '=', 'account.invoice.supplier.form')])
else:
elif partner['customer'] and not partner['supplier']:
view_id = self.pool.get('ir.ui.view').search(cr,uid,[('name', '=', 'account.invoice.form')])
if view_id and isinstance(view_id, (list, tuple)):
view_id = view_id[0]
@ -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 <b>created</b>.") % (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 <b>paid</b>.") % (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 <b>cancelled</b>.") % (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

14
addons/account/account_invoice_view.xml
View File

@ -163,8 +163,10 @@
<sheet string="Supplier Invoice">
<div class="oe_title">
<h1>
<label string="Draft Invoice" attrs="{'invisible': [('state', '&lt;&gt;', 'draft')]}"/>
<label string="Invoice" attrs="{'invisible': [('state', '=', 'draft')]}"/>
<label string="Draft Invoice" attrs="{'invisible': ['|',('state','&lt;&gt;','draft'), ('type','&lt;&gt;','in_invoice')]}"/>
<label string="Draft Refund" attrs="{'invisible': ['|',('state','&lt;&gt;','draft'), ('type','&lt;&gt;','in_refund')]}"/>
<label string="Invoice" attrs="{'invisible': ['|',('state', '=', 'draft'), ('type','&lt;&gt;','in_invoice')]}"/>
<label string="Refund" attrs="{'invisible': ['|',('state', '=', 'draft'), ('type','&lt;&gt;','in_refund')]}"/>
<field name="number" class="oe_inline" attrs="{'invisible': [('state', '=', 'draft')]}"/>
</h1>
</div>
@ -309,9 +311,11 @@
</header>
<sheet string="Invoice">
<h1>
<label string="Draft Invoice " attrs="{'invisible': [('state','not in',('draft',))]}"/>
<label string="Draft Invoice " attrs="{'invisible': ['|',('state','not in',('draft',)), ('type','&lt;&gt;','out_invoice')]}"/>
<label string="Draft Refund " attrs="{'invisible': ['|',('state','not in',('draft',)), ('type','&lt;&gt;','out_refund')]}"/>
<label string="Pro Forma Invoice " attrs="{'invisible': [('state','not in',('proforma','proforma2'))]}"/>
<label string="Invoice " attrs="{'invisible': [('state','in',('draft','proforma','proforma2'))]}"/>
<label string="Invoice " attrs="{'invisible': ['|',('state','in',('draft','proforma','proforma2')), ('type','&lt;&gt;','out_invoice')]}"/>
<label string="Refund " attrs="{'invisible': ['|',('state','in',('draft','proforma','proforma2')), ('type','&lt;&gt;','out_refund')]}"/>
<field name="number" readonly="1" class="oe_inline"/>
</h1>
<field name="type" invisible="1"/>
@ -347,7 +351,7 @@
<field name="invoice_line" nolabel="1" widget="one2many_list" context="{'type': type}">
<tree string="Invoice Lines" editable="bottom">
<field name="invoice_line_tax_id" invisible="1"/>
<field name="product_id" invisible="1"/>
<field name="product_id" />
<field name="name"/>
<field name="account_id" groups="account.group_account_user"
domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]"

50
addons/account/account_move_line.py
View File

@ -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:

1
addons/account/account_report.xml
View File

@ -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"
/>
<report id="account_transfers" model="account.transfer" name="account.transfer" string="Transfers" xml="account/report/transfer.xml" xsl="account/report/transfer.xsl"/>

2
addons/account/company_view.xml
View File

@ -25,7 +25,7 @@
<xpath expr="//group[@name='account_grp']" position="inside">
<field name="property_reserve_and_surplus_account"/>
<field name="tax_calculation_rounding_method"/>
<field name="paypal_account" placeholder="sales@openerp.com"/>
<field name="paypal_account" placeholder="e.g. sales@openerp.com"/>
</xpath>
</field>
</record>

97
addons/account/i18n/ar.po
View File

@ -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-07-14 05:51+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0
@ -57,7 +57,7 @@ msgstr "إحصائيات الحساب"
#. module: account
#: view:account.invoice:0
msgid "Proforma/Open/Paid Invoices"
msgstr ""
msgstr "الفواتير المبدئية/المفتوحة/المدفوعة"
#. module: account
#: field:report.invoice.created,residual:0
@ -83,7 +83,7 @@ msgstr "تعريف فروع"
#: code:addons/account/account_bank_statement.py:302
#, python-format
msgid "Journal item \"%s\" is not valid."
msgstr "عنصر يومية غير صحيح \"%s\"."
msgstr "بند اليومية \"%s\" غير صحيح."
#. module: account
#: model:ir.model,name:account.model_report_aged_receivable
@ -120,12 +120,14 @@ msgid ""
"Configuration error! The currency chosen should be shared by the default "
"accounts too."
msgstr ""
"خطأ في الإعدادات! يجب أن تكون العملة المختارة مشتركة للحسابات الإفتراضية "
"أيضأً."
#. module: account
#: report:account.invoice:0
#: field:account.invoice.line,origin:0
msgid "Origin"
msgstr "الاصل"
msgstr "المصدر"
#. module: account
#: view:account.account:0
@ -192,7 +194,7 @@ msgstr "عمود الأسماء"
#: code:addons/account/wizard/account_move_journal.py:95
#, python-format
msgid "Journal: %s"
msgstr "يومية: %s"
msgstr "دفتر اليومية: %s"
#. module: account
#: help:account.analytic.journal,type:0
@ -239,7 +241,7 @@ msgstr "فاتورة '%s' ستدفع علي الأجزاء التالية: %s%s
#. module: account
#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
msgid "Accounting entries are an input of the reconciliation."
msgstr "السجلات المحاسبية ستكون مدخلات للموازنة"
msgstr "سيتم استخدام القيود المحاسبية أثناء التسوية."
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
@ -250,7 +252,7 @@ msgstr "تقارير دولة بلجيكا"
#: code:addons/account/account_move_line.py:1200
#, python-format
msgid "You can not add/modify entries in a closed journal."
msgstr "لايمكن اضافة/تعديل البيانات في سجل مقفل"
msgstr "لايمكن اضافة أو تعديل البيانات في دفتر يومية مقفل."
#. module: account
#: help:account.account,user_type:0
@ -259,6 +261,8 @@ msgid ""
"legal reports, and set the rules to close a fiscal year and generate opening "
"entries."
msgstr ""
"يستخدم نوع الحساب لغرض الاستعلام، لتوليد تقارير قانونية خاصة ببلد معين, "
"ولتحديد قواعد إنهاء عام مالي و توليد إدخالات افتتاحية."
#. module: account
#: report:account.overdue:0
@ -309,8 +313,7 @@ msgid ""
"Installs localized accounting charts to match as closely as possible the "
"accounting needs of your company based on your country."
msgstr ""
"تثبيت مخططات المحاسبة المترجمة لتتوافق بأكبر قدر ممكن إلى المحاسبة التي "
"تحتاجها شركتك على أساس بلدتك."
"يقوم بتثبيت دليل محاسبي متوافق مع احتياجات مؤسستك حسب قوانين وأنظمة بلدك."
#. module: account
#: code:addons/account/wizard/account_move_journal.py:63
@ -344,11 +347,13 @@ msgid ""
"leave the automatic formatting, it will be computed based on the financial "
"reports hierarchy (auto-computed field 'level')."
msgstr ""
"يمكنك هنا إعداد التنسيق الذى ترىد ان يظهر به هذا السجل. إذا تركت التنسيق "
"الآلي, سيتم تعيينه آلياً بناءً على هيكل التقارير المالية."
#. module: account
#: view:account.installer:0
msgid "Configure"
msgstr "إضبط"
msgstr "إعداد"
#. module: account
#: selection:account.entries.report,month:0
@ -373,7 +378,7 @@ msgstr ""
#. module: account
#: constraint:account.move.line:0
msgid "You can not create journal items on an account of type view."
msgstr "لا يمكنك إنشاء يومية علي حساب في وضع القراءة فقط"
msgstr "لا يمكنك إنشاء عناصر يومية علي حساب من نوع ’عرض’."
#. module: account
#: model:ir.model,name:account.model_account_tax_template
@ -444,7 +449,7 @@ msgstr "قالب مخطط"
#. module: account
#: help:account.model.line,amount_currency:0
msgid "The amount expressed in an optional other currency."
msgstr "أعرب الكمية بعملات اخرى اختيارية."
msgstr "قيمة المبلغ بعملة اختيارية أخرى."
#. module: account
#: field:accounting.report,enable_filter:0
@ -512,7 +517,7 @@ msgstr "تأكيد الفوراتير المختارة"
#. module: account
#: field:account.addtmpl.wizard,cparent_id:0
msgid "Parent target"
msgstr "الهدف الاساس"
msgstr "الهدف الرئيسي"
#. module: account
#: field:account.bank.statement,account_id:0
@ -545,7 +550,7 @@ msgstr "اسم الشركة يجب أن يكون فريداً"
#. module: account
#: model:ir.model,name:account.model_account_invoice_refund
msgid "Invoice Refund"
msgstr "استرجاع فاتورة"
msgstr "استرداد فاتورة"
#. module: account
#: report:account.overdue:0
@ -785,6 +790,8 @@ msgid ""
"Taxes are missing!\n"
"Click on compute button."
msgstr ""
"الضرائب ناقصة!\n"
"اضغط على زر الحساب"
#. module: account
#: model:ir.model,name:account.model_account_subscription_line
@ -807,12 +814,12 @@ msgstr "فواتير المورد و المردودات المالية"
#: view:account.unreconcile.reconcile:0
#: model:ir.model,name:account.model_account_move_line_unreconcile_select
msgid "Unreconciliation"
msgstr "عكس التسوية"
msgstr "إلغاء التسوية"
#. module: account
#: view:account.payment.term.line:0
msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
msgstr ""
msgstr "عند 14 يوم صافي 2%، والمبلغ المتبقي عند 30 يوم نهاية الشهر"
#. module: account
#: model:ir.model,name:account.model_account_analytic_journal_report
@ -837,6 +844,9 @@ msgid ""
"or Loss you'd realized if those transactions were ended today. Only for "
"accounts having a secondary currency set."
msgstr ""
"عند القيام بعمليات متعددة العملات، قد تكسب أو تخسر قليلاً بسبب التغيرات في "
"سعر الصرف. توفر لك هذه القائمة توقعات بالمكسب أو الخسارة اللتان كنت ستحققهما "
"في حالة إتمام هذه العمليات اليوم (للحسابات التي لها عملة ثانوية فقط)."
#. module: account
#: selection:account.entries.report,month:0
@ -918,6 +928,8 @@ msgid ""
"You cannot validate this journal entry because account \"%s\" does not "
"belong to chart of accounts \"%s\"!"
msgstr ""
"لا يمكنك التحقق من صحة قيد اليومية لأن الحساب \"%s\" لاينتمى إلى الدليل "
"المحاسبي \"%s\"!"
#. module: account
#: code:addons/account/account_move_line.py:835
@ -926,6 +938,7 @@ msgid ""
"This account does not allow reconciliation! You should update the account "
"definition to change this."
msgstr ""
"هذا الحساب لا يسمح بالتسوية! يجب أن تقوم بتحديث تعريف الحساب لتغيير ذلك."
#. module: account
#: view:account.invoice:0
@ -996,7 +1009,7 @@ msgstr ""
#: code:addons/account/account.py:2596
#, python-format
msgid "I can not locate a parent code for the template account!"
msgstr ""
msgstr "لا أستطيع تحديد النرميز الأصلي للحساب النموذجي!"
#. module: account
#: view:account.analytic.line:0
@ -1072,6 +1085,7 @@ msgid ""
"You cannot change the type of account from '%s' to '%s' type as it contains "
"journal items!"
msgstr ""
"لا يمكنك تغيير نوع الحساب من نوع '%s' إلى نوع '%s' لأنه يحتوي على سجلات!"
#. module: account
#: field:account.report.general.ledger,sortby:0
@ -1097,7 +1111,7 @@ msgstr ""
#, python-format
msgid ""
"You have to provide an account for the write off/exchange difference entry !"
msgstr ""
msgstr "لابد من توفير حساب لإدخال تخفيض/ سعر التحويل!"
#. module: account
#: view:account.tax:0
@ -1136,7 +1150,7 @@ msgstr "تكوين المدخلات قبل:"
#. module: account
#: view:account.move.line:0
msgid "Unbalanced Journal Items"
msgstr ""
msgstr "قيود دفتر اليومية غير متوازنة"
#. module: account
#: model:account.account.type,name:account.data_account_type_bank
@ -1162,6 +1176,8 @@ msgid ""
"Total amount (in Secondary currency) for transactions held in secondary "
"currency for this account."
msgstr ""
"المبلغ الإجمالي (بالعملة الثانوية) للعمليات التي أجريت باستخدام العملة "
"الثانوية لهذا الحساب."
#. module: account
#: field:account.fiscal.position.tax,tax_dest_id:0
@ -1177,7 +1193,7 @@ msgstr "مركزية الدين"
#. module: account
#: view:report.account_type.sales:0
msgid "All Months Sales by type"
msgstr ""
msgstr "مبيعات جميع الأشهر حسب نوعها"
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree2
@ -1205,12 +1221,12 @@ msgstr "الغاء الفواتير"
#. module: account
#: help:account.journal,code:0
msgid "The code will be displayed on reports."
msgstr ""
msgstr "سيتم عرض الرمز في التقارير."
#. module: account
#: view:account.tax.template:0
msgid "Taxes used in Purchases"
msgstr ""
msgstr "الضرائب المستخدمة في المشتريات"
#. module: account
#: field:account.invoice.tax,tax_code_id:0
@ -1242,6 +1258,8 @@ msgid ""
"You can not use this general account in this journal, check the tab 'Entry "
"Controls' on the related journal !"
msgstr ""
"لا يمكنك استخدام هذا الحساب العام في دفتر اليومية هذا. تحقق من شريط \"ضوابط "
"الإدخال\" في دفتر اليومية."
#. module: account
#: field:account.move.line.reconcile,trans_nbr:0
@ -1277,7 +1295,7 @@ msgstr "أخرى"
#. module: account
#: view:account.subscription:0
msgid "Draft Subscription"
msgstr ""
msgstr "اشتركات المسودة"
#. module: account
#: view:account.account:0
@ -1504,7 +1522,7 @@ msgstr "عدد القيود "
msgid ""
"By unchecking the active field, you may hide a fiscal position without "
"deleting it."
msgstr ""
msgstr "عند إلغاء اختيار حقل \"نشط\"، يمكنك إخفاء الوضع المالي دون حذفه."
#. module: account
#: model:ir.model,name:account.model_temp_range
@ -1582,7 +1600,7 @@ msgstr "بحث كشوف حساب المصرف"
#. module: account
#: view:account.move.line:0
msgid "Unposted Journal Items"
msgstr ""
msgstr "قيود دفتر اليومية غير المسجلة"
#. module: account
#: view:account.chart.template:0
@ -1714,7 +1732,7 @@ msgstr ""
#. module: account
#: view:account.analytic.account:0
msgid "Pending Accounts"
msgstr ""
msgstr "حسابات معلقة"
#. module: account
#: view:account.tax.template:0
@ -1863,7 +1881,7 @@ msgstr "خطأ! لا يمكنك إنشاء شركات متداخلة (شركات
#. module: account
#: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
msgid "Sale/Purchase Journal"
msgstr ""
msgstr "دفتر يومية المبيعات والمشتريات"
#. module: account
#: view:account.analytic.account:0
@ -1905,6 +1923,8 @@ msgid ""
"will be added, Loss : Amount will be deducted.), as calculated in Profit & "
"Loss Report"
msgstr ""
"يستخدم هذا الحساب لتحويل الربح والخسارة (في حالة الربح: سيتم إضافة المبلغ، "
"الخسارة: سيتم خصم المبلغ)، حسب تقرير الأرباح والخسائر"
#. module: account
#: model:process.node,note:account.process_node_reconciliation0
@ -1947,7 +1967,7 @@ msgstr "إذا تم إختيار \"صحيح\" فلن تقبل قيد بتاري
#: code:addons/account/account_invoice.py:73
#, python-format
msgid "You must define an analytic journal of type '%s'!"
msgstr ""
msgstr "يجب تعريف دفتر يومية تحليلي من نوع '%s'!"
#. module: account
#: field:account.installer,config_logo:0
@ -1962,11 +1982,13 @@ msgid ""
"currency. You should remove the secondary currency on the account or select "
"a multi-currency view on the journal."
msgstr ""
"الحساب المحدد لقيد اليومية يجبرك علي توفير عملة ثانوية. يجب إزالة العملة "
"الثانوية على الحساب أو تحديد طريقة عرض العملات في اليومية."
#. module: account
#: model:ir.actions.act_window,help:account.action_account_financial_report_tree
msgid "Makes a generic system to draw financial reports easily."
msgstr ""
msgstr "ينشئ نظاماً عاماً لاستخلاص التقارير المالية بسهولة."
#. module: account
#: view:account.invoice:0
@ -1985,12 +2007,12 @@ msgstr ""
#. module: account
#: view:account.analytic.line:0
msgid "Analytic Journal Items related to a sale journal."
msgstr ""
msgstr "قيود دفتر اليومية التحليلي المتعلقة بدفتر يومية المبيعات."
#. module: account
#: selection:account.financial.report,style_overwrite:0
msgid "Italic Text (smaller)"
msgstr ""
msgstr "نص مائل (أصغر)"
#. module: account
#: view:account.bank.statement:0
@ -2008,7 +2030,7 @@ msgstr "مسودّة"
#. module: account
#: report:account.journal.period.print.sale.purchase:0
msgid "VAT Declaration"
msgstr ""
msgstr "إعلان ضريبة القيمة المضافة"
#. module: account
#: field:account.move.reconcile,line_partial_ids:0
@ -2078,7 +2100,7 @@ msgstr ""
#: code:addons/account/account_bank_statement.py:357
#, python-format
msgid "You have to assign an analytic journal on the '%s' journal!"
msgstr ""
msgstr "لديك تعيين تحليل اليومية علي'%s' دفتر اليومية"
#. module: account
#: selection:account.invoice,state:0
@ -2126,6 +2148,8 @@ msgid ""
"Put a sequence in the journal definition for automatic numbering or create a "
"sequence manually for this piece."
msgstr ""
"لم يتم التمكن من إنشاء تسلسل تلقائي لهذه القطعة!\n"
"ضع تسلسل في تعريف السجل للترقيم التلقائي أو أنشيئ التسلسل يدويا لهذه القطعة."
#. module: account
#: code:addons/account/account.py:787
@ -2133,7 +2157,7 @@ msgstr ""
msgid ""
"You can not modify the company of this journal as its related record exist "
"in journal items"
msgstr ""
msgstr "لا يمكن تعديل الشركه المتسجله في المجله والموجوده في البنود اليوميه"
#. module: account
#: report:account.invoice:0
@ -2325,6 +2349,7 @@ msgid ""
"In order to delete a bank statement, you must first cancel it to delete "
"related journal items."
msgstr ""
"لكي يتم مسح كشف حساب بنكي, عليك أولا إلغائه لمسح البنود المتعلفة في السجل"
#. module: account
#: field:account.invoice,payment_term:0
@ -4356,7 +4381,7 @@ msgstr "إنشاء قيد من النماذج"
#: field:account.account,reconcile:0
#: field:account.account.template,reconcile:0
msgid "Allow Reconciliation"
msgstr "سماح بالتسوية"
msgstr "السماح بالتسوية"
#. module: account
#: code:addons/account/account.py:1077

4
addons/account/i18n/bg.po
View File

@ -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-07-14 05:51+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:03+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/br.po
View File

@ -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-07-14 05:51+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:03+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/bs.po
View File

@ -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-07-14 05:51+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:03+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/ca.po
View File

@ -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-07-14 05:51+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:03+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/cs.po
View File

@ -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-07-14 05:52+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:03+0000\n"
"X-Generator: Launchpad (build 15745)\n"
"X-Poedit-Language: Czech\n"
#. module: account

4
addons/account/i18n/da.po
View File

@ -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-07-14 05:52+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:03+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/de.po
View File

@ -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-07-14 05:52+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:04+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/el.po
View File

@ -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-07-14 05:52+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:04+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/en_GB.po
View File

@ -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-07-14 05:57+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:09+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/en_US.po
View File

@ -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-07-14 05:57+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:08+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

6
addons/account/i18n/es.po
View File

@ -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-07-14 05:56+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:07+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0
@ -5812,7 +5812,7 @@ msgstr "Cuenta n°"
#: code:addons/account/account_invoice.py:88
#, python-format
msgid "Free Reference"
msgstr "Referencia libre"
msgstr "Referencia libre / Nº Fact. Proveedor"
#. module: account
#: field:account.payment.term.line,value:0

4
addons/account/i18n/es_AR.po
View File

@ -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-07-14 05:57+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:09+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/es_CL.po
View File

@ -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-07-14 05:58+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:09+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/es_CR.po
View File

@ -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-07-14 05:58+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:09+0000\n"
"X-Generator: Launchpad (build 15745)\n"
"Language: \n"
#. module: account

4
addons/account/i18n/es_DO.po
View File

@ -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-07-14 05:57+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:09+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/es_EC.po
View File

@ -16,8 +16,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-01 04:43+0000\n"
"X-Generator: Launchpad (build 15719)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/es_PY.po
View File

@ -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-07-14 05:58+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/es_VE.po
View File

@ -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-07-14 05:57+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:09+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/et.po
View File

@ -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-07-14 05:52+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:03+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/eu.po
View File

@ -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-07-14 05:51+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/fa.po
View File

@ -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-07-14 05:54+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:06+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/fa_AF.po
View File

@ -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-07-14 05:58+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/fi.po
View File

@ -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-07-14 05:52+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:03+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/fr.po
View File

@ -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-07-14 05:52+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:04+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: code:addons/account/account_move_line.py:1200

4
addons/account/i18n/fr_BE.po
View File

@ -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-07-14 05:57+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:08+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/gl.po
View File

@ -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-07-14 05:52+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:04+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/gu.po
View File

@ -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-07-14 05:53+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:04+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/he.po
View File

@ -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-07-14 05:53+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:04+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/hi.po
View File

@ -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-07-14 05:53+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:04+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/hr.po
View File

@ -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-07-14 05:55+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:07+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

6
addons/account/i18n/hu.po
View File

@ -8,13 +8,13 @@ msgstr ""
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-05-17 13:09+0000\n"
"Last-Translator: Peter <herczegp@gmail.com>\n"
"Last-Translator: Herczeg Péter <herczegp@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-07-14 05:53+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:04+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/id.po
View File

@ -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-07-14 05:53+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:05+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

978
addons/account/i18n/it.po
View File

File diff suppressed because it is too large Load Diff

4
addons/account/i18n/ja.po
View File

@ -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-07-14 05:53+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:05+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/kab.po
View File

@ -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-07-14 05:53+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:05+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/kk.po
View File

@ -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-07-14 05:53+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:05+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/ko.po
View File

@ -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-07-14 05:53+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:05+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/lo.po
View File

@ -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-07-14 05:54+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:05+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/lt.po
View File

@ -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-07-14 05:54+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:05+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/lv.po
View File

@ -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-07-14 05:54+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:05+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/mk.po
View File

@ -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-07-14 05:54+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:06+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

1148
addons/account/i18n/mn.po
View File

File diff suppressed because it is too large Load Diff

344
addons/account/i18n/nb.po
View File

File diff suppressed because it is too large Load Diff

197
addons/account/i18n/nl.po
View File

@ -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-07-14 05:52+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:03+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: code:addons/account/account.py:1307
@ -271,9 +271,9 @@ msgid ""
"legal reports, and set the rules to close a fiscal year and generate opening "
"entries."
msgstr ""
"De rekeningsoort wordt gebruikt voor (land-specifieke) rapportagedoeleinden "
"en bepaalt de handelswijze bij het afsluiten van het boekjaar en het openen "
"van de balans."
"De rekening categorie wordt gebruikt voor (land-specifieke) "
"rapportagedoeleinden en bepaalt de handelswijze bij het afsluiten van het "
"boekjaar en het openen van de balans."
#. module: account
#: report:account.overdue:0
@ -493,9 +493,9 @@ msgid ""
"amount of each area of the tax declaration for your country. It’s presented "
"in a hierarchical structure, which can be modified to fit your needs."
msgstr ""
"De belastingstructuur is een boomweergave van de verschillende "
"De belastingweergave is een boomweergave van de verschillende "
"belastingrubrieken, en toont de belastingsituatie van dit moment. De "
"bedragen in de belastingstructuur komen overeen met de onderdelen van de "
"bedragen in de belastingweergave komen overeen met de onderdelen van de "
"belastingaangifte van uw land. De hiërarchische structuur kan naar uw wensen "
"worden aangepast."
@ -586,7 +586,7 @@ msgstr "Niet afgeletterde transacties"
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
msgid "Counterpart"
msgstr "Tegenboeking"
msgstr "Tegenrekening"
#. module: account
#: view:account.fiscal.position:0
@ -750,7 +750,7 @@ msgstr "Vandaag afgeletterde relaties"
#. module: account
#: view:report.hr.timesheet.invoice.journal:0
msgid "Sale journal in this year"
msgstr "Verkoop journaal in dit jaar"
msgstr "Verkoopboek in dit jaar"
#. module: account
#: selection:account.financial.report,display_detail:0
@ -858,7 +858,7 @@ msgstr "Automatisch afletteren"
#. module: account
#: report:account.analytic.account.quantity_cost_ledger:0
msgid "J.C./Move name"
msgstr "J.C./Verplaats naam"
msgstr "Dagboek code / Mutatienaam"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_gain_loss
@ -936,7 +936,7 @@ msgstr "Gem. betaaltermijn"
#: model:ir.actions.act_window,name:account.action_tax_code_tree
#: model:ir.ui.menu,name:account.menu_action_tax_code_tree
msgid "Chart of Taxes"
msgstr "Belastingstructuur"
msgstr "Belastingweergave"
#. module: account
#: view:account.fiscalyear:0
@ -1105,7 +1105,7 @@ msgstr "Weeknummer"
#. module: account
#: field:account.report.general.ledger,landscape:0
msgid "Landscape Mode"
msgstr "Landschap modus"
msgstr "Liggend afdrukken"
#. module: account
#: code:addons/account/account.py:645
@ -1358,7 +1358,7 @@ msgstr "Concept abonnement"
#: model:ir.model,name:account.model_account_account
#: field:report.account.sales,account_id:0
msgid "Account"
msgstr "Grootboekrek."
msgstr "Rekening"
#. module: account
#: field:account.tax,include_base_amount:0
@ -1420,7 +1420,7 @@ msgstr "Belastingsjabloon zoeken"
#: model:ir.actions.act_window,name:account.action_account_reconcile_select
#: model:ir.actions.act_window,name:account.action_view_account_move_line_reconcile
msgid "Reconcile Entries"
msgstr "Letter boekingen af"
msgstr "Afletteren boekingen"
#. module: account
#: model:ir.actions.report.xml,name:account.account_overdue
@ -1591,7 +1591,7 @@ msgstr "Herhalende boekingen"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Sjabloon voor fiscale situatie"
msgstr "Sjabloon voor fiscale positie"
#. module: account
#: field:account.automatic.reconcile,reconciled:0
@ -1649,7 +1649,7 @@ msgstr "Crediteur"
#: field:account.tax,account_paid_id:0
#: field:account.tax.template,account_paid_id:0
msgid "Refund Tax Account"
msgstr "Rekening terugontvangen belasting"
msgstr "Rekening te vorderen belasting"
#. module: account
#: view:account.bank.statement:0
@ -1675,7 +1675,7 @@ msgstr ""
#. module: account
#: report:account.analytic.account.cost_ledger:0
msgid "Date/Code"
msgstr "Datum/code"
msgstr "Datum"
#. module: account
#: field:account.analytic.line,general_account_id:0
@ -1935,7 +1935,7 @@ msgstr "Kostenplaatsen"
#, python-format
msgid "Please verify that an account is defined in the journal."
msgstr ""
"Controleer alstublieft of een grootboekrekening is opgegeven in het journaal"
"Controleer alstublieft of een grootboekrekening is opgegeven in het dagboek"
#. module: account
#: selection:account.entries.report,move_line_state:0
@ -2261,14 +2261,14 @@ msgstr "CIKB"
#: view:account.subscription:0
#: selection:account.subscription,state:0
msgid "Running"
msgstr "Running"
msgstr "Lopend"
#. module: account
#: view:account.chart.template:0
#: field:product.category,property_account_income_categ:0
#: field:product.template,property_account_income:0
msgid "Income Account"
msgstr "Opbrengsten rekening"
msgstr "Opbrengsten verkoop rekening"
#. module: account
#: code:addons/account/account_invoice.py:370
@ -2491,9 +2491,9 @@ msgid ""
"You can create one in the menu: \n"
"Configuration\\Financial Accounting\\Accounts\\Journals."
msgstr ""
"Kan geen journaal van het type %s vinden voor dit bedrijf.\n"
"U kunt een journaal creëren in het menu:\n"
"Configuratie\\Financieel boekhouden\\Rekeningen\\Journalen"
"Kan geen dagboek van het type %s vinden voor dit bedrijf.\n"
"U kunt een dagboek aanmaken in het menu:\n"
"Instellingen\\ Financiële administratie\\Dagboeken"
#. module: account
#: model:account.payment.term,name:account.account_payment_term_advance
@ -2624,7 +2624,7 @@ msgid ""
"The fiscal position will determine taxes and the accounts used for the "
"partner."
msgstr ""
"De fiscale situatie bepaalt de belastingen en de grootboekrekeningen die "
"De fiscale positie bepaalt de belastingen en de grootboekrekeningen die "
"gebruikt worden voor de relatie."
#. module: account
@ -2668,7 +2668,7 @@ msgstr "Kostenplaatsen"
#: model:ir.ui.menu,name:account.menu_action_account_form
#: model:ir.ui.menu,name:account.menu_analytic
msgid "Accounts"
msgstr "Rekeningen"
msgstr "Grootboekrekeningen"
#. module: account
#: code:addons/account/account_invoice.py:369
@ -2894,7 +2894,7 @@ msgstr "Klanten"
#: report:account.analytic.account.journal:0
#: report:account.analytic.account.quantity_cost_ledger:0
msgid "Period to"
msgstr "Periode tot"
msgstr "Periode t/m"
#. module: account
#: selection:account.entries.report,month:0
@ -2944,7 +2944,7 @@ msgstr "Verplicht"
#: field:product.category,property_account_expense_categ:0
#: field:product.template,property_account_expense:0
msgid "Expense Account"
msgstr "Kosten rekening"
msgstr "Inkoopwaarde verkopen"
#. module: account
#: help:account.invoice,period_id:0
@ -3291,7 +3291,7 @@ msgstr ""
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
#, python-format
msgid "No End of year journal defined for the fiscal year"
msgstr "Geen Eindejaars-journaal gedefinieerd voor het fiscale jaar"
msgstr "Geen Eindejaars-dagboek gedefinieerd voor het fiscale jaar"
#. module: account
#: view:account.tax:0
@ -3331,7 +3331,7 @@ msgstr "Laat leeg om de kostenrekening te gebruiken"
#: model:ir.ui.menu,name:account.menu_journals
#: model:ir.ui.menu,name:account.menu_journals_report
msgid "Journals"
msgstr "Overige dagboeken"
msgstr "Dagboeken"
#. module: account
#: field:account.partner.reconcile.process,to_reconcile:0
@ -3420,7 +3420,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
msgid "Unreconcile Entries"
msgstr "Boekingen niet vereffenen"
msgstr "Afletteren ongedaan maken"
#. module: account
#: field:account.tax.code,notprintable:0
@ -3607,7 +3607,7 @@ msgstr ""
#. module: account
#: field:account.journal,centralisation:0
msgid "Centralised counterpart"
msgstr "Samengevoegde tegenboeking"
msgstr "Centrale tegenrekening"
#. module: account
#: code:addons/account/account_move_line.py:584
@ -3864,7 +3864,7 @@ msgid ""
"menu."
msgstr ""
"U kunt geen factuur aanmaken in een gecentraliseerd dagboek. Zet de optie "
"'Gecentraliseerde tegenboekingen' uit in de instellingen van het dagboek."
"'Centrale tegenrekening' uit in de instellingen van het dagboek."
#. module: account
#: field:account.account,name:0
@ -3894,13 +3894,13 @@ msgstr ""
#. module: account
#: field:account.move.line,date:0
msgid "Effective date"
msgstr "Effective date"
msgstr "Boek datum"
#. module: account
#: model:ir.actions.act_window,name:account.action_bank_tree
#: model:ir.ui.menu,name:account.menu_action_bank_tree
msgid "Setup your Bank Accounts"
msgstr "Stel uw bankrekeningen in"
msgstr "Bankrekeningen"
#. module: account
#: code:addons/account/wizard/account_move_bank_reconcile.py:53
@ -3911,7 +3911,7 @@ msgstr "Standaard invoer"
#. module: account
#: help:account.journal,analytic_journal_id:0
msgid "Journal for analytic entries"
msgstr "Journaal voor kostenplaats boekingen"
msgstr "Dagboek voor kostenplaats boekingen"
#. module: account
#: constraint:account.aged.trial.balance:0
@ -3992,7 +3992,7 @@ msgstr ""
"Aangeraden wordt om een apart dagboek te gebruiken voor het maken van de "
"openingsboekingen van de fiscale jaren. Merk op dat de juiste instellingen "
"hiervoor zijn: de standaard debet- en creditrekeningen, type 'situatie' en "
"met gecentraliseerde tegenboekingen."
"met gecentraliseerde tegenrekeningen."
#. module: account
#: view:account.installer:0
@ -4028,7 +4028,7 @@ msgstr "Bevestig"
#: model:ir.actions.act_window,name:account.action_account_analytic_cost
#: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
msgid "Cost Ledger"
msgstr "Kostenstaat"
msgstr "Kostenplaats kosten"
#. module: account
#: model:account.financial.report,name:account.account_financial_report_assets0
@ -4079,7 +4079,7 @@ msgstr "30 Dagen einde van de maand"
#: model:ir.actions.act_window,name:account.action_account_analytic_balance
#: model:ir.actions.report.xml,name:account.account_analytic_account_balance
msgid "Analytic Balance"
msgstr "Kostenplaats balans"
msgstr "Kostenplaatsbalans (kostenplaats-rekening)"
#. module: account
#: help:account.account,active:0
@ -4142,7 +4142,7 @@ msgstr ""
#: field:report.account.receivable,type:0
#: field:report.account_type.sales,user_type:0
msgid "Account Type"
msgstr "Rekeningsoort"
msgstr "Rekening categorie"
#. module: account
#: view:res.partner:0
@ -4458,7 +4458,7 @@ msgstr "Kan zichtbaar zijn?"
#. module: account
#: model:ir.model,name:account.model_account_journal_select
msgid "Account Journal Select"
msgstr "Rekening journaal selectie"
msgstr "Rekening dagboek selectie"
#. module: account
#: view:account.tax.template:0
@ -4502,7 +4502,7 @@ msgstr "Genereer boekingen vanuit standaard modellen"
#: field:account.account,reconcile:0
#: field:account.account.template,reconcile:0
msgid "Allow Reconciliation"
msgstr "Verrekening toestaan"
msgstr "Afletteren toestaan"
#. module: account
#: code:addons/account/account.py:1077
@ -4610,7 +4610,7 @@ msgstr ""
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the income account"
msgstr "Laat leeg om de opbrengsten rekening te gebruiken"
msgstr "Laat leeg om de opbrengsten verkoop rekening te gebruiken"
#. module: account
#: code:addons/account/account.py:3299
@ -4695,7 +4695,7 @@ msgid ""
"All draft account entries in this journal and period will be validated. It "
"means you won't be able to modify their accounting fields anymore."
msgstr ""
"Alle concept boekingen in dit journaal en periode worden gecontroleerd. Dit "
"Alle concept boekingen in dit dagboek en periode worden gecontroleerd. Dit "
"betekent dat u de boekingsvelden niet meer kunt wijzigen."
#. module: account
@ -4711,7 +4711,7 @@ msgstr "Startdatum"
#. module: account
#: field:account.chart.template,property_account_income:0
msgid "Income Account on Product Template"
msgstr "Opbrengsten rekening op product sjabloon"
msgstr "Opbrengsten verkoop rekening op product sjabloon"
#. module: account
#: code:addons/account/account.py:3120
@ -5061,7 +5061,7 @@ msgstr ""
#. module: account
#: report:account.analytic.account.balance:0
msgid "Analytic Balance -"
msgstr "Kostenplaats saldo -"
msgstr "Kostenplaats balans -"
#. module: account
#: report:account.account.balance:0
@ -5193,12 +5193,12 @@ msgstr "Interne naam"
#. module: account
#: selection:account.subscription,period_type:0
msgid "month"
msgstr "maand"
msgstr "Maand"
#. module: account
#: field:account.partner.reconcile.process,next_partner_id:0
msgid "Next Partner to Reconcile"
msgstr "Volgende relatie voor vereffening"
msgstr "Volgende relatie om af te letteren"
#. module: account
#: field:account.invoice.tax,account_id:0
@ -5608,7 +5608,7 @@ msgstr "Normale tekst"
#. module: account
#: view:account.invoice.refund:0
msgid "Refund Invoice Options"
msgstr "Creditnota opties"
msgstr "Credit factuur opties"
#. module: account
#: help:account.automatic.reconcile,power:0
@ -5633,7 +5633,7 @@ msgstr ""
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Fiscale situatie sjabloon"
msgstr "Fiscale positie sjabloon"
#. module: account
#: view:account.analytic.chart:0
@ -5884,7 +5884,7 @@ msgid ""
"You can define both numeric and alphanumeric tax codes."
msgstr ""
"De balastingrubriek definitie hangt af van de belastingopgave van uw land. "
"OpenERP geeft u de mogelijkheid om, vanuit dit menu, een belastingstructuur "
"OpenERP geeft u de mogelijkheid om, vanuit dit menu, een belastingweergave "
"te beheren. Het is mogelijk om numerieke en alfanumerieke belastingrubrieken "
"te gebruiken."
@ -5981,7 +5981,7 @@ msgstr "Huidige valuta is niet correct geconfigureerd!"
#: field:account.tax,account_collected_id:0
#: field:account.tax.template,account_collected_id:0
msgid "Invoice Tax Account"
msgstr "Rekening ontvangen belastig"
msgstr "Rekening af te dragen belasting"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_general_journal
@ -6081,7 +6081,7 @@ msgstr ""
#. module: account
#: view:account.subscription:0
msgid "Running Subscription"
msgstr "Lopende abonnementen"
msgstr "Lopende boekingen"
#. module: account
#: report:account.invoice:0
@ -6231,6 +6231,10 @@ msgid ""
"choice assumes that the set of tax defined for the chosen template is "
"complete"
msgstr ""
"Deze optie helpt u bij het kiezen of u de gebruiker de verkoop- en "
"inkoopkoers wil laten invoeren of de gebruikelijke keuzevelden te gebruiken. "
"Bij de laatste keuze neemt het systeem aan dat de belastingen voor het "
"gekozen sjabloon compleet zijn."
#. module: account
#: report:account.vat.declaration:0
@ -6428,7 +6432,7 @@ msgstr "Afletteren: Ga naar de volgende relatie"
#: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
#: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
msgid "Inverted Analytic Balance"
msgstr "Omgekeerde kostenplaats balans"
msgstr "Kostenplaatsbalans (rekening-kostenplaats)"
#. module: account
#: field:account.tax.template,applicable_type:0
@ -6768,8 +6772,9 @@ msgid ""
"This account will be used instead of the default one as the receivable "
"account for the current partner"
msgstr ""
"Deze rekening zal gebruikt worden in plaats van de standaard- als de "
"opbrengsten rekening voor de huidige relatie."
"Deze rekening zal gebruikt worden als de debiteuren rekening voor de huidige "
"relatie, in plaats van de standaard rekening, zoals ingesteld bij "
"Instellingen\\Instellingen\\Parameters\\Configuratie parameters."
#. module: account
#: field:account.tax,python_applicable:0
@ -6859,7 +6864,7 @@ msgstr "Behoud het balans +/- teken"
#: model:ir.actions.report.xml,name:account.account_vat_declaration
#: model:ir.ui.menu,name:account.menu_account_vat_declaration
msgid "Taxes Report"
msgstr "Overzicht belasting"
msgstr "Belastingen rapport"
#. module: account
#: selection:account.journal.period,state:0
@ -7275,7 +7280,7 @@ msgstr "Financieel rapporthistorie"
#: view:analytic.entries.report:0
#: field:analytic.entries.report,product_uom_id:0
msgid "Product UOM"
msgstr "Product eenh."
msgstr "Product maateenheid"
#. module: account
#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
@ -7740,11 +7745,17 @@ msgid ""
"few new accounts (You don't need to define the whole structure that is "
"common to both several times)."
msgstr ""
"Dit optionele veld geeft u de mogelijkheid om een rekeningsjabloon te "
"koppelen aan een specifiek rekeningsjabloon, welke anders mag zijn dan de "
"bovenliggende sjablonen. Dit geeft u de mogelijkheid om een rekeningsjabloon "
"te definiëren welke een uitbreiding is op de andere, met een aantal extra "
"nieuwe rekeningen (U hoeft niet de gehele structuur te definiëren voor het "
"gedeelte wat gelijk is)."
#. module: account
#: view:account.move:0
msgid "Unposted Journal Entries"
msgstr "Niet geboekte journaalposten"
msgstr "Ongeboekte journaalposten"
#. module: account
#: view:product.product:0
@ -8010,7 +8021,7 @@ msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_legal_statement
msgid "Legal Reports"
msgstr "Wettelijke rapporten"
msgstr "Boekhoudkundige rapporten"
#. module: account
#: field:account.tax.code,sum_period:0
@ -8197,6 +8208,12 @@ msgid ""
"Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
"generate analytic entries on the related account."
msgstr ""
"Het normale grootboekschema heeft een structuur volgens de wettelijke "
"richtlijnen voor boekhouden. De kostenplaats rekeningen kunt u vrij "
"inrichten naar uw behoeften. Kostenplaatsen worden normaliter gebruikt bij "
"contracten, projecten en/of afdelingen. De meeste acties uitgevoerd door "
"OpenERP (facturen, urenstaten, declaraties, etc.) genereren "
"kostenplaatsboekingen."
#. module: account
#: field:account.account.type,close_method:0
@ -8248,7 +8265,7 @@ msgstr ""
#. module: account
#: report:account.analytic.account.inverted.balance:0
msgid "Inverted Analytic Balance -"
msgstr "Geïnverteerde kostenplaatsbalans -"
msgstr "Omgekeerde kostenplaatsbalans -"
#. module: account
#: view:account.move.bank.reconcile:0
@ -8348,7 +8365,7 @@ msgstr "Proforma"
#. module: account
#: report:account.analytic.account.cost_ledger:0
msgid "J.C. /Move name"
msgstr "J.C. /Mutatienaam"
msgstr "Dagboek code / Mutatienaam"
#. module: account
#: model:ir.model,name:account.model_account_open_closed_fiscalyear
@ -8473,7 +8490,7 @@ msgstr "Aangepaste balans"
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Fiscale situatie sjablonen"
msgstr "Fiscale positie sjablonen"
#. module: account
#: view:account.entries.report:0
@ -8579,7 +8596,7 @@ msgstr "Letter deels af"
#. module: account
#: model:ir.model,name:account.model_account_analytic_inverted_balance
msgid "Account Analytic Inverted Balance"
msgstr "Geïnverteerde kostenplaats balans"
msgstr "Kostenplaatsbalans (rekening-kostenplaats)"
#. module: account
#: model:ir.model,name:account.model_account_common_report
@ -8674,7 +8691,7 @@ msgstr "Fiscale jaar afgesloten"
#. module: account
#: field:account.invoice.refund,journal_id:0
msgid "Refund Journal"
msgstr "Creditnota dagboek"
msgstr "Credit factuur dagboek"
#. module: account
#: report:account.account.balance:0
@ -8696,7 +8713,7 @@ msgid ""
msgstr ""
"Met dit programmaonderdeel kunt u verkoopfacturen aanmaken en beheren. "
"OpenERP kan ook automatisch concept facturen aanmaken van verkooporders of "
"leveringsopdrachten. U hoeft ze alleen nog maar te bevestigen alvorens u ze "
"uitgaande leveringen. U hoeft ze alleen nog maar te bevestigen alvorens u ze "
"verstuurt naar uw klanten."
#. module: account
@ -9067,7 +9084,7 @@ msgid ""
msgstr ""
"Voor rekeningen welke normaliter meer debet zijn dan credit en welke u "
"afgedrukt wilt hebben als negatief bedrag in uw rapporten, dient u het +/- "
"teken van de balans om te draaien. Bijvoorbeeld voor de opbrengsten "
"teken van de balans om te draaien. Bijvoorbeeld voor de opbrengsten verkoop "
"rekening. Hetzelfde geld voor rekeningen welke normaliter meer credit zijn "
"dan debet en welke u wilt afdrukken als positief bedrag in uw rapporten, "
"bijvoorbeeld de inkomsten rekening."
@ -9502,9 +9519,9 @@ msgstr ""
"Dit formulier wordt gebruikt door boekhouders voor het invoeren van grote "
"hoeveelheden boekingen in OpenERP. Indien u een klantfactuur wilt boeken, "
"selecteert u het dagboek en de periode in de zoekbalk. Beging vervolgens met "
"het vastleggen van de regel voor de opbrengsten rekening, OpenERP zal u "
"automatisch de een voorstel doen voor de belastingen, gerelateerd aan deze "
"rekening en de tegenrekening \"Debiteuren\""
"het vastleggen van de regel voor de opbrengsten verkoop rekening, OpenERP "
"zal u automatisch de een voorstel doen voor de belastingen, gerelateerd aan "
"deze rekening en de tegenrekening \"Debiteuren\""
#. module: account
#: code:addons/account/wizard/account_automatic_reconcile.py:152
@ -9567,7 +9584,7 @@ msgstr ""
#. module: account
#: view:analytic.entries.report:0
msgid "Analytic Entries of last 365 days"
msgstr "Kostenplaatsboekingen over ed afgelopen 365 dagen"
msgstr "Kostenplaatsboekingen over de afgelopen 365 dagen"
#. module: account
#: report:account.central.journal:0
@ -9660,7 +9677,7 @@ msgstr "Verdeling"
#. module: account
#: model:ir.model,name:account.model_account_analytic_balance
msgid "Account Analytic Balance"
msgstr "Kostenplaats balans"
msgstr "Kostenplaatsbalans (kostenplaats-rekening)"
#. module: account
#: code:addons/account/account.py:412
@ -9871,8 +9888,9 @@ msgid ""
"This account will be used instead of the default one as the payable account "
"for the current partner"
msgstr ""
"Deze rekening zal gebruikt worden in plaats van de standaard- als de "
"crediteurenrekening van de huidige relatie."
"Deze rekening zal gebruikt worden als de crediteuren rekening van de huidige "
"relatie in plaats van de standaard rekening, zoals ingesteld bij "
"Instellingen\\Instellingen\\Parameters\\Configuratie parameters."
#. module: account
#: field:account.period,special:0
@ -9931,7 +9949,7 @@ msgstr ""
#: code:addons/account/account.py:181
#, python-format
msgid "Profit & Loss (Income account)"
msgstr "Winst & verlies (omzet rekening)"
msgstr "Winst & verlies (Omzet rekening)"
#. module: account
#: constraint:account.account:0
@ -10037,7 +10055,7 @@ msgstr "April"
#. module: account
#: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0
msgid "Profit (Loss) to report"
msgstr "Winst (verlies) te rapoprteren"
msgstr "Winst (verlies) te rapporteren"
#. module: account
#: view:account.move.line.reconcile.select:0
@ -10389,7 +10407,7 @@ msgstr "Lege rekeningen? "
#. module: account
#: constraint:account.bank.statement:0
msgid "The journal and period chosen have to belong to the same company."
msgstr "De gekozen journaal en periode moeten behoren tot hetzelfde bedrijf."
msgstr "Het gekozen dagboek en periode moeten behoren tot hetzelfde bedrijf."
#. module: account
#: view:account.invoice:0
@ -10560,8 +10578,8 @@ msgstr ""
"Het 'Interne Type' wordt gebruikt voor functies die beschikbaar zijn op "
"verschillende soorten rekeningen: 'Weergave' kan geen boekingen hebben, "
"consolidatie zijn rekeningen die onderliggende rekeningen kunnen hebben voor "
"multi-company consolidaties, te crediteuren/debiteuren zijn voor de "
"relatierekeningen (voor debet/credit berekeningen), gesloten wodrt gebruikt "
"multi-company consolidaties, de crediteuren/debiteuren zijn voor de "
"relatierekeningen (voor debet/credit berekeningen), gesloten wordt gebruikt "
"voor afgeschreven rekeningen."
#. module: account
@ -10599,7 +10617,7 @@ msgstr "December"
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
#: model:ir.ui.menu,name:account.account_analytic_journal_print
msgid "Print Analytic Journals"
msgstr "Druk kostenplaatsdagboeken af"
msgstr "Kostenplaatsdagboeken"
#. module: account
#: view:account.invoice.report:0
@ -10709,11 +10727,12 @@ msgid ""
"created by the system on document validation (invoices, bank statements...) "
"and will be created in 'Posted' state."
msgstr ""
"Alle handmatig gemaakte nieuwe journaalposten zijn meestal in de staat 'Niet "
"geboekt', maar u kunt met de optie instellen om deze status over te slaan op "
"het betreffende dagboek. In dat geval worden ze behandeld als journaalposten "
"automatisch aangemaakt door het systeem bij document validatie (facturen, "
"bankafschriften, ...). Tevens worden ze aangemaakt in de 'Geboekt' staat."
"Alle handmatig gemaakte nieuwe journaalposten zijn meestal in de staat "
"'Ongeboekt', maar u kunt met de optie instellen om deze status over te slaan "
"op het betreffende dagboek. In dat geval worden ze behandeld als "
"journaalposten automatisch aangemaakt door het systeem bij document "
"validatie (facturen, bankafschriften, ...). Tevens worden ze aangemaakt in "
"de 'Geboekt' staat."
#. module: account
#: view:account.fiscal.position.template:0
@ -10949,7 +10968,7 @@ msgstr "Daboekregels bevestigen"
#: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
#: model:ir.actions.report.xml,name:account.account_analytic_account_quantity_cost_ledger
msgid "Cost Ledger (Only quantities)"
msgstr "Kostenadministratie (Alleen aantallen)"
msgstr "Kostenplaats kosten (alleen aantallen)"
#. module: account
#: model:process.node,note:account.process_node_supplierpaidinvoice0
@ -11086,7 +11105,7 @@ msgstr "Meestal 1 of -1"
#: model:ir.actions.act_window,name:account.action_account_analytic_chart
#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
msgid "Chart of Analytic Accounts"
msgstr "Kostenplaatsenrekeningschema"
msgstr "Kostenplaatsenschema"
#. module: account
#: field:account.chart.template,property_account_expense:0
@ -13026,9 +13045,6 @@ msgstr ""
#~ msgid "Cost Ledger for period"
#~ msgstr "Kosten grootboek voor periode"
#~ msgid "Income Accounts"
#~ msgstr "Opbrengsten rekeningen"
#~ msgid "Consider reconciled entries"
#~ msgstr "Afgeletterde boekingen meenemen"
@ -13189,3 +13205,6 @@ msgstr ""
#~ msgid "Tax codes"
#~ msgstr "Belastingrubrieken"
#~ msgid "Income Accounts"
#~ msgstr "Opbrengsten verkoop rekening"

4
addons/account/i18n/nl_BE.po
View File

@ -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-07-28 04:57+0000\n"
"X-Generator: Launchpad (build 15694)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:09+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/oc.po
View File

@ -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-07-14 05:54+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:06+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/pl.po
View File

@ -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-07-14 05:54+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:06+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/pt.po
View File

@ -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-07-14 05:55+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:06+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/pt_BR.po
View File

@ -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-07-29 04:37+0000\n"
"X-Generator: Launchpad (build 15694)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:09+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/ro.po
View File

@ -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-07-14 05:55+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:06+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/ru.po
View File

@ -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-07-14 05:55+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:06+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/si.po
View File

@ -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-07-14 05:55+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:07+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/sk.po
View File

@ -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-07-14 05:55+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:07+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/sl.po
View File

@ -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-07-14 05:55+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:07+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/sq.po
View File

@ -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-07-14 05:51+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/sr.po
View File

@ -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-07-14 05:55+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:07+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/sr@latin.po
View File

@ -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-07-14 05:58+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

47
addons/account/i18n/sv.po
View File

@ -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-07-14 05:56+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:07+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0
@ -729,7 +729,7 @@ msgstr "Skriv ut faktura"
#. module: account
#: field:account.partner.reconcile.process,today_reconciled:0
msgid "Partners Reconciled Today"
msgstr "Partners Sammanslagna Idag"
msgstr "Avstämda företag idag"
#. module: account
#: view:report.hr.timesheet.invoice.journal:0
@ -1576,7 +1576,7 @@ msgstr "Mall för skatteregion"
#. module: account
#: field:account.automatic.reconcile,reconciled:0
msgid "Reconciled transactions"
msgstr "Reconciled transactions"
msgstr "Avstämda transaktioner"
#. module: account
#: field:account.journal.view,columns_id:0
@ -2074,7 +2074,7 @@ msgstr "Öppna verifikat"
#. module: account
#: field:account.automatic.reconcile,account_ids:0
msgid "Accounts to Reconcile"
msgstr "Konton att balansera"
msgstr "Konton att stämma av"
#. module: account
#: model:process.transition,note:account.process_transition_filestatement0
@ -2471,7 +2471,7 @@ msgstr "30 dagar månadsskiftet"
#. module: account
#: view:account.entries.report:0
msgid "Unreconciled entries"
msgstr "Ej avstämda transaktioner"
msgstr "Oavstämda poster"
#. module: account
#: field:account.invoice.tax,base_code_id:0
@ -2712,7 +2712,7 @@ msgstr "Automatisk avstämning"
#. module: account
#: field:account.invoice,reconciled:0
msgid "Paid/Reconciled"
msgstr "Betald/Återbetald"
msgstr "Betald/avstämd"
#. module: account
#: field:account.tax,ref_base_code_id:0
@ -3386,7 +3386,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
msgid "Unreconcile Entries"
msgstr "Unreconcile Entries"
msgstr "Oavstämda poster"
#. module: account
#: field:account.tax.code,notprintable:0
@ -3519,7 +3519,7 @@ msgstr "Försäljningskonto per kontotyp"
#. module: account
#: view:account.move.line:0
msgid "Unreconciled Journal Items"
msgstr "Obalanserade transaktioner"
msgstr "Oavstämda verifikat"
#. module: account
#: sql_constraint:res.currency:0
@ -3645,7 +3645,7 @@ msgstr "Bokför"
#: view:account.unreconcile:0
#: view:account.unreconcile.reconcile:0
msgid "Unreconcile"
msgstr "Unreconcile"
msgstr "Oavstäm"
#. module: account
#: view:account.analytic.line:0
@ -3677,7 +3677,7 @@ msgstr ""
#: code:addons/account/account_move_line.py:837
#, python-format
msgid "Some entries are already reconciled !"
msgstr "Some entries are already reconciled !"
msgstr "Vissa poster är redan avstämda !"
#. module: account
#: view:account.tax:0
@ -3770,7 +3770,8 @@ msgstr "Betalorder"
msgid ""
"Check this option if you want the user to reconcile entries in this account."
msgstr ""
"Check this option if you want the user to reconcile entries in this account."
"Markera det här alternativet om du vill att användaren ska stämma av poster "
"i detta konto."
#. module: account
#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
@ -4018,7 +4019,7 @@ msgstr "Visningskonton"
#. module: account
#: view:account.state.open:0
msgid "(Invoice should be unreconciled if you want to open it)"
msgstr "(Invoice should be unreconciled if you want to open it)"
msgstr "(fakturan skall vara oavstämd om du vill öppna den)"
#. module: account
#: field:account.chart,period_from:0
@ -4386,7 +4387,7 @@ msgstr "Kontoutdrag är registrerade"
#: code:addons/account/wizard/account_reconcile.py:133
#, python-format
msgid "Reconcile Writeoff"
msgstr "Beräkna avskrivning"
msgstr "Stäm av avskrivning"
#. module: account
#: view:report.account.receivable:0
@ -4709,7 +4710,7 @@ msgstr "Mina fakturor"
#. module: account
#: selection:account.bank.accounts.wizard,account_type:0
msgid "Check"
msgstr "Markera"
msgstr "Check"
#. module: account
#: view:account.invoice:0
@ -5531,7 +5532,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_view_move_line
msgid "Lines to reconcile"
msgstr "Rader att balansera"
msgstr "Rader att stämma av"
#. module: account
#: report:account.analytic.account.balance:0
@ -6894,7 +6895,7 @@ msgstr ""
"Du kan inte göra denna ändring på en avstämd transaktion! Du kan bara ändra "
"vissa icke bokföringsinformation eller så måste du göra transaktionen "
"oavstämd först!\n"
"% s"
"%s"
#. module: account
#: report:account.general.ledger:0
@ -7700,7 +7701,7 @@ msgstr "Icke bokförda verifikat"
#: view:product.product:0
#: view:product.template:0
msgid "Sales Properties"
msgstr "Sales Properties"
msgstr "Försäljningsegenskaper"
#. module: account
#: model:ir.ui.menu,name:account.menu_manual_reconcile
@ -9032,7 +9033,7 @@ msgstr "Öppna transaktionsjournal"
#. module: account
#: model:process.transition,note:account.process_transition_customerinvoice0
msgid "Draft invoices are checked, validated and printed."
msgstr "Priliminära fakturor är kontrollerade, validerade och utskrivna."
msgstr "Preliminära fakturor är kontrollerade, validerade och utskrivna."
#. module: account
#: help:account.chart.template,property_reserve_and_surplus_account:0
@ -9445,7 +9446,7 @@ msgstr ""
#: code:addons/account/wizard/account_automatic_reconcile.py:152
#, python-format
msgid "You must select accounts to reconcile"
msgstr "You must select accounts to reconcile"
msgstr "Du måste välja konton att stämma av"
#. module: account
#: model:process.transition,note:account.process_transition_entriesreconcile0
@ -9557,8 +9558,8 @@ msgid ""
"The journal must have centralised counterpart without the Skipping draft "
"state option checked!"
msgstr ""
"The journal must have centralised counterpart without the Skipping draft "
"state option checked!"
"Journalen ska ha centraliserat motkonto som inte har alternativet att hoppar "
"över utkastläget!"
#. module: account
#: view:account.invoice.report:0
@ -10457,7 +10458,7 @@ msgstr ""
#: code:addons/account/account_move_line.py:832
#, python-format
msgid "Entry is already reconciled"
msgstr "Entry is already reconciled"
msgstr "Verifikat är redan avstämd"
#. module: account
#: model:ir.model,name:account.model_report_account_receivable

4
addons/account/i18n/ta.po
View File

@ -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-07-14 05:56+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:07+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/te.po
View File

@ -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-07-14 05:56+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:07+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/th.po
View File

@ -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-07-14 05:56+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:08+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/tlh.po
View File

@ -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-07-14 05:56+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:08+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

656
addons/account/i18n/tr.po
View File

File diff suppressed because it is too large Load Diff

4
addons/account/i18n/ug.po
View File

@ -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-07-14 05:56+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:08+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/uk.po
View File

@ -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-07-14 05:56+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:08+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/ur.po
View File

@ -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-07-14 05:57+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:08+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/vi.po
View File

@ -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-07-14 05:57+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:08+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/zh_CN.po
View File

@ -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-07-14 05:58+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/zh_HK.po
View File

@ -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-07-14 05:57+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:08+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/zh_TW.po
View File

@ -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-07-14 05:58+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Launchpad-Export-Date: 2012-08-07 05:09+0000\n"
"X-Generator: Launchpad (build 15745)\n"
#. module: account
#: view:account.invoice.report:0

11
addons/account/installer.py
View File

@ -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 = {}
@ -119,6 +119,15 @@ class account_installer(osv.osv_memory):
self.execute_simple(cr, uid, ids, context)
super(account_installer, self).execute(cr, uid, ids, context=context)
def action_next(self, cr, uid, ids, context=None):
next = self.execute(cr, uid, ids, context=context)
for installer in self.browse(cr, uid, ids, context=context):
if installer.charts == 'l10n_be':
return {'type': 'ir.actions.act_window_close'}
else :
if next : return next
return self.next(cr, uid, ids, context=context)
def execute_simple(self, cr, uid, ids, context=None):
if context is None:
context = {}

4
addons/account/partner_view.xml
View File

@ -109,8 +109,8 @@
<field name="zip" class="oe_inline" placeholder="ZIP"/>
<field name="city" class="oe_inline" placeholder="City"/>
</div>
<field name="state_id" placeholder="State"/>
<field name="country_id" placeholder="Country"/>
<field name="state_id" placeholder="State" options='{"no_open": true}'/>
<field name="country_id" placeholder="Country" options='{"no_open": true}'/>
</div>
</group>
<group name="bank" string="Information About the Bank">

2
addons/account/report/common_report_header.py
View File

@ -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):

6
addons/account/res_config.py
View File

@ -79,10 +79,10 @@ class account_config_settings(osv.osv_memory):
'purchase_refund_sequence_prefix': fields.related('purchase_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier credit note sequence'),
'purchase_refund_sequence_next': fields.related('purchase_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next supplier credit note number'),
'module_account_check_writing': fields.boolean('pay your supplier by check',
'module_account_check_writing': fields.boolean('pay your suppliers by check',
help="""This allows you to check writing and printing.
This installs the module account_check_writing."""),
'module_account_accountant': fields.boolean('accountant features',
'module_account_accountant': fields.boolean('full accounting features: journals, legal statements, chart of accounts, etc.',
help="""If you do not check this box, you will be able to do invoicing & payments, but not accounting (Journal Items, Chart of Accounts, ...)"""),
'module_account_asset': fields.boolean('assets management',
help="""This allows you to manage the assets owned by a company or a person.
@ -99,7 +99,7 @@ class account_config_settings(osv.osv_memory):
* serve as base for an easy plug-in of various automated payment mechanisms, and
* provide a more efficient way to manage invoice payments.
This installs the module account_payment."""),
'module_account_voucher': fields.boolean('anage customer payments',
'module_account_voucher': fields.boolean('manage customer payments',
help="""This includes all the basic requirements of voucher entries for bank, cash, sales, purchase, expense, contra, etc.
This installs the module account_voucher."""),
'module_account_followup': fields.boolean('manage customer payment follow-ups',

78
addons/account/res_config_view.xml
View File

@ -43,7 +43,7 @@
</div>
</div>
</group>
<separator string="Chart of Account and Fiscal Year" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}"/>
<separator string="Chart of Accounts" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}"/>
<group attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
<label for="id" string="Chart of Account"/>
<div>
@ -103,6 +103,39 @@
</div>
</div>
</group>
<separator string="Accounting &amp; Finance"/>
<group>
<label for="id" string="Options"/>
<div name="account_config">
<div>
<label for="currency_id"/>
<field name="currency_id" class="oe_inline"/>
</div>
<div>
<label for="decimal_precision"/>
<field name="decimal_precision" class="oe_inline"/>
</div>
<div>
<label for="tax_calculation_rounding_method"/>
<field name="tax_calculation_rounding_method" class="oe_inline"/>
</div>
</div>
<label for="id" string="Features"/>
<div>
<div>
<field name="module_account_accountant" class="oe_inline"/>
<label for="module_account_accountant"/>
</div>
<div>
<field name="module_account_asset" class="oe_inline"/>
<label for="module_account_asset"/>
</div>
<div>
<field name="module_account_budget" class="oe_inline"/>
<label for="module_account_budget"/>
</div>
</div>
</group>
<separator string="eInvoicing &amp; Payments"/>
<group>
<label for="id" string="Customer"/>
@ -187,52 +220,17 @@
<label for="id" string="Configuration"/>
<div>
<div>
<label string="Configure your bank accounts"/>
<button name="%(action_bank_tree)d"
string="Configure"
string="Configure your bank accounts"
icon="gtk-go-forward"
type="action"
class="oe_inline oe_link"/>
<label for="company_footer"/>
<field name="company_footer"/>
</div>
<p>
<label for="company_footer"/>: <field name="company_footer" class="oe_inline"/>
</p>
<div>
<label for="paypal_account"/>
<field name="paypal_account" placeholder="sales@openerp.com" class="oe_inline"/>
</div>
</div>
</group>
<separator string="Accounting &amp; Finance"/>
<group>
<label for="id" string="Options"/>
<div name="account_config">
<div>
<label for="currency_id"/>
<field name="currency_id" class="oe_inline"/>
</div>
<div>
<label for="decimal_precision"/>
<field name="decimal_precision" class="oe_inline"/>
</div>
<div>
<label for="tax_calculation_rounding_method"/>
<field name="tax_calculation_rounding_method" class="oe_inline"/>
</div>
</div>
<label for="id" string="Features"/>
<div>
<div>
<field name="module_account_accountant" class="oe_inline"/>
<label for="module_account_accountant"/>
</div>
<div>
<field name="module_account_asset" class="oe_inline"/>
<label for="module_account_asset"/>
</div>
<div>
<field name="module_account_budget" class="oe_inline"/>
<label for="module_account_budget"/>
<field name="paypal_account" placeholder="e.g. sales@openerp.com" class="oe_inline"/>
</div>
</div>
</group>

2
addons/account/test/account_bank_statement.yml
View File

@ -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!'

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

@ -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:

8
addons/account/wizard/account_change_currency.py
View File

@ -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)

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

@ -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

16
addons/account/wizard/account_fiscalyear_close.py
View File

@ -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, [

8
addons/account/wizard/account_invoice_refund.py
View File

@ -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)

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

@ -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'}

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

@ -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),

16
addons/account/wizard/account_move_journal.py
View File

@ -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 = """<?xml version="1.0" encoding="utf-8"?>
<form string="Standard entries" version="7.0">
@ -116,7 +116,7 @@ class account_move_journal(osv.osv_memory):
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>""" % (_('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 = {

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

@ -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:

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

@ -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))

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

@ -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")

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

@ -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:

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

@ -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'}

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