pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] merged RCO portal branch, including more recent trunk

Browse Source 
bzr revid: odo@openerp.com-20110408133800-ts9t3tne7ixm09gz
This commit is contained in:
Olivier Dony
2011-04-08 15:38:00 +02:00
parent 6922668a77 5b75e199db
commit e165096efd
1326 changed files with 181467 additions and 18493 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/__openerp__.py
+24 -15
View File
@@ -22,26 +22,35 @@
"name" : "Accounting and Financial Management",
"version" : "1.1",
"author" : "OpenERP SA",
"category": 'Generic Modules/Accounting',
"description": """Financial and accounting module that covers:
General accountings
Cost / Analytic accounting
Third party accounting
Taxes management
Budgets
Customer and Supplier Invoices
Bank statements
Reconciliation process by partner
Creates a dashboard for accountants that includes:
* List of uninvoiced quotations
* Graph of aged receivables
* Graph of aged incomes
"category": 'Finance',
"description": """
Accounting and Financial Management.
====================================
Financial and accounting module that covers:
--------------------------------------------
General accountings
Cost / Analytic accounting
Third party accounting
Taxes management
Budgets
Customer and Supplier Invoices
Bank statements
Reconciliation process by partner
Creates a dashboard for accountants that includes:
--------------------------------------------------
* List of Customer Invoice to Approve
* Company Analysis
* Graph of Aged Receivables
* Graph of Treasury
The processes like maintaining of general ledger is done through the defined financial Journals (entry move line or
grouping is maintained through journal) for a particular financial year and for preparation of vouchers there is a
module named account_voucher.
""",
'website': 'http://www.openerp.com',
'images' : ['images/accounts.jpeg','images/bank_statement.jpeg','images/cash_register.jpeg','images/chart_of_accounts.jpeg','images/customer_invoice.jpeg','images/journal_entries.jpeg'],
'init_xml': [],
"depends" : ["product", "analytic", "process","board"],
'update_xml': [
@@ -133,7 +142,7 @@ module named account_voucher.
'test/account_bank_statement.yml',
'test/account_cash_statement.yml',
'test/account_report.yml',
],
'installable': True,
addons/account/account.py
+124 -126
View File
@@ -249,6 +249,7 @@ class account_account(osv.osv):
children_and_consolidated = self._get_children_and_consol(cr, uid, ids, context=context)
#compute for each account the balance/debit/credit from the move lines
accounts = {}
res = {}
if children_and_consolidated:
aml_query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
@@ -305,11 +306,13 @@ class account_account(osv.osv):
sums[current.id][fn] += sums[child.id][fn]
else:
sums[current.id][fn] += currency_obj.compute(cr, uid, child.company_id.currency_id.id, current.company_id.currency_id.id, sums[child.id][fn], context=context)
res = {}
null_result = dict((fn, 0.0) for fn in field_names)
for id in ids:
res[id] = sums.get(id, null_result)
return res
else:
for id in ids:
res[id] = 0.0
return res
def _get_company_currency(self, cr, uid, ids, field_name, arg, context=None):
result = {}
@@ -333,7 +336,7 @@ class account_account(osv.osv):
return result
def _get_level(self, cr, uid, ids, field_name, arg, context=None):
res={}
res = {}
accounts = self.browse(cr, uid, ids, context=context)
for account in accounts:
level = 0
@@ -395,7 +398,7 @@ class account_account(osv.osv):
'reconcile': False,
'active': True,
'currency_mode': 'current',
'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.account', context=c),
'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.account', context=c),
}
def _check_recursion(self, cr, uid, ids, context=None):
@@ -474,7 +477,7 @@ class account_account(osv.osv):
for record in reads:
name = record['name']
if record['code']:
name = record['code'] + ' '+name
name = record['code'] + ' ' + name
res.append((record['id'], name))
return res
@@ -606,7 +609,6 @@ class account_journal(osv.osv):
" Select 'Cash' to be used at the time of making payment."\
" Select 'General' for miscellaneous operations."\
" Select 'Opening/Closing Situation' to be used at the time of new fiscal year creation or end of year entries generation."),
'refund_journal': fields.boolean('Refund Journal', help='Fill this if the journal is to be used for refunds of invoices.'),
'type_control_ids': fields.many2many('account.account.type', 'account_journal_type_rel', 'journal_id','type_id', 'Type Controls', domain=[('code','<>','view'), ('code', '<>', 'closed')]),
'account_control_ids': fields.many2many('account.account', 'account_account_type_rel', 'journal_id','account_id', 'Account', domain=[('type','<>','view'), ('type', '<>', 'closed')]),
'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."),
@@ -642,6 +644,7 @@ class account_journal(osv.osv):
default = default.copy()
default['code'] = (journal['code'] or '') + '(copy)'
default['name'] = (journal['name'] or '') + '(copy)'
default['sequence_id'] = False
return super(account_journal, self).copy(cr, uid, id, default, context=context)
def write(self, cr, uid, ids, vals, context=None):
@@ -742,9 +745,7 @@ class account_journal(osv.osv):
}
res = {}
view_id = type_map.get(type, 'account_journal_view')
user = user_pool.browse(cr, uid, uid)
if type in ('cash', 'bank') and currency and user.company_id.currency_id.id != currency:
view_id = 'account_journal_bank_view_multi'
@@ -755,7 +756,6 @@ class account_journal(osv.osv):
'centralisation':type == 'situation',
'view_id':data.res_id,
})
return {
'value':res
}
@@ -805,19 +805,28 @@ class account_fiscalyear(osv.osv):
(_check_fiscal_year, 'Error! You cannot define overlapping fiscal years',['date_start', 'date_stop'])
]
def create_period3(self,cr, uid, ids, context=None):
def create_period3(self, cr, uid, ids, context=None):
return self.create_period(cr, uid, ids, context, 3)
def create_period(self,cr, uid, ids, context=None, interval=1):
def create_period(self, cr, uid, ids, context=None, interval=1):
period_obj = self.pool.get('account.period')
for fy in self.browse(cr, uid, ids, context=context):
ds = datetime.strptime(fy.date_start, '%Y-%m-%d')
while ds.strftime('%Y-%m-%d')<fy.date_stop:
period_obj.create(cr, uid, {
'name': _('Opening Period'),
'code': ds.strftime('00/%Y'),
'date_start': ds,
'date_stop': ds,
'special': True,
'fiscalyear_id': fy.id,
})
while ds.strftime('%Y-%m-%d') < fy.date_stop:
de = ds + relativedelta(months=interval, days=-1)
if de.strftime('%Y-%m-%d')>fy.date_stop:
if de.strftime('%Y-%m-%d') > fy.date_stop:
de = datetime.strptime(fy.date_stop, '%Y-%m-%d')
self.pool.get('account.period').create(cr, uid, {
period_obj.create(cr, uid, {
'name': ds.strftime('%m/%Y'),
'code': ds.strftime('%m/%Y'),
'date_start': ds.strftime('%Y-%m-%d'),
@@ -1115,9 +1124,8 @@ class account_move(osv.osv):
res_ids = set(id[0] for id in cr.fetchall())
ids = ids and (ids & res_ids) or res_ids
if ids:
return [('id','in',tuple(ids))]
else:
return [('id', '=', '0')]
return [('id', 'in', tuple(ids))]
return [('id', '=', '0')]
_columns = {
'name': fields.char('Number', size=64, required=True),
@@ -1201,7 +1209,6 @@ class account_move(osv.osv):
'SET state=%s '\
'WHERE id IN %s',
('posted', tuple(valid_moves),))
return True
def button_validate(self, cursor, user, ids, context=None):
@@ -1516,7 +1523,6 @@ class account_move_reconcile(osv.osv):
result.append((r.id,r.name))
return result
account_move_reconcile()
#----------------------------------------------------------
@@ -1828,7 +1834,6 @@ class account_tax(osv.osv):
obj_partener_address = self.pool.get('res.partner.address')
for tax in taxes:
# we compute the amount for the current tax object and append it to the result
data = {'id':tax.id,
'name':tax.description and tax.description + " - " + tax.name or tax.name,
'account_collected_id':tax.account_collected_id.id,
@@ -1910,7 +1915,7 @@ class account_tax(osv.osv):
totalex -= r.get('amount', 0.0)
totlex_qty = 0.0
try:
totlex_qty=totalex/quantity
totlex_qty = totalex/quantity
except:
pass
tex = self._compute(cr, uid, tex, totlex_qty, quantity, address_id=address_id, product=product, partner=partner)
@@ -2043,6 +2048,7 @@ class account_tax(osv.osv):
r['amount'] = round(r['amount'] * quantity, prec)
total += r['amount']
return res
account_tax()
# ---------------------------------------------------------
@@ -2171,13 +2177,11 @@ class account_subscription(osv.osv):
'name': fields.char('Name', size=64, required=True),
'ref': fields.char('Reference', size=16),
'model_id': fields.many2one('account.model', 'Model', required=True),
'date_start': fields.date('Start Date', required=True),
'period_total': fields.integer('Number of Periods', required=True),
'period_nbr': fields.integer('Period', required=True),
'period_type': fields.selection([('day','days'),('month','month'),('year','year')], 'Period Type', required=True),
'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'State', required=True, readonly=True),
'lines_id': fields.one2many('account.subscription.line', 'subscription_id', 'Subscription Lines')
}
_defaults = {
@@ -2232,6 +2236,7 @@ class account_subscription(osv.osv):
ds = (datetime.strptime(ds, '%Y-%m-%d') + relativedelta(years=sub.period_nbr)).strftime('%Y-%m-%d')
self.write(cr, uid, ids, {'state':'running'})
return True
account_subscription()
class account_subscription_line(osv.osv):
@@ -2260,6 +2265,7 @@ class account_subscription_line(osv.osv):
return all_moves
_rec_name = 'date'
account_subscription_line()
# ---------------------------------------------------------------
@@ -2346,9 +2352,9 @@ class account_add_tmpl_wizard(osv.osv_memory):
_name = 'account.addtmpl.wizard'
def _get_def_cparent(self, cr, uid, context=None):
acc_obj=self.pool.get('account.account')
tmpl_obj=self.pool.get('account.account.template')
tids=tmpl_obj.read(cr, uid, [context['tmpl_ids']], ['parent_id'])
acc_obj = self.pool.get('account.account')
tmpl_obj = self.pool.get('account.account.template')
tids = tmpl_obj.read(cr, uid, [context['tmpl_ids']], ['parent_id'])
if not tids or not tids[0]['parent_id']:
return False
ptids = tmpl_obj.read(cr, uid, [tids[0]['parent_id'][0]], ['code'])
@@ -2356,7 +2362,6 @@ class account_add_tmpl_wizard(osv.osv_memory):
if not ptids or not ptids[0]['code']:
raise osv.except_osv(_('Error !'), _('Cannot locate parent code for template account!'))
res = acc_obj.search(cr, uid, [('code','=',ptids[0]['code'])])
return res and res[0] or False
_columns = {
@@ -2449,6 +2454,8 @@ class account_chart_template(osv.osv):
'property_account_expense': fields.many2one('account.account.template','Expense Account on Product Template'),
'property_account_income': fields.many2one('account.account.template','Income Account on Product Template'),
'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Profit/Loss Account', domain=[('type', '=', 'payable')], help='This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss: Amount will be deducted.), Which is calculated from Profilt & Loss Report'),
'property_account_income_opening': fields.many2one('account.account.template','Opening Entries Income Account'),
'property_account_expense_opening': fields.many2one('account.account.template','Opening Entries Expense Account'),
}
account_chart_template()
@@ -2526,7 +2533,6 @@ class account_tax_template(osv.osv):
}
_order = 'sequence'
account_tax_template()
# Fiscal Position Templates
@@ -2602,10 +2608,12 @@ class wizard_multi_charts_accounts(osv.osv_memory):
res['value']["sale_tax"] = False
res['value']["purchase_tax"] = False
if chart_template_id:
# default tax is given by the lowesst sequence. For same sequence we will take the latest created as it will be the case for tax created while isntalling the generic chart of account
sale_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
, "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence")
, "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence, id desc")
purchase_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
, "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence")
, "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence, id desc")
res['value']["sale_tax"] = sale_tax_ids and sale_tax_ids[0] or False
res['value']["purchase_tax"] = purchase_tax_ids and purchase_tax_ids[0] or False
return res
@@ -2635,10 +2643,9 @@ class wizard_multi_charts_accounts(osv.osv_memory):
return False
def _get_default_accounts(self, cr, uid, context=None):
accounts = [{'acc_name':'Current','account_type':'bank'},
{'acc_name':'Deposit','account_type':'bank'},
{'acc_name':'Cash','account_type':'cash'}]
return accounts
return [{'acc_name': _('Current'),'account_type':'bank'},
{'acc_name': _('Deposit'),'account_type':'bank'},
{'acc_name': _('Cash'),'account_type':'cash'}]
_defaults = {
'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, [uid], c)[0].company_id.id,
@@ -2681,6 +2688,10 @@ class wizard_multi_charts_accounts(osv.osv_memory):
obj_data = self.pool.get('ir.model.data')
analytic_journal_obj = self.pool.get('account.analytic.journal')
obj_tax_code = self.pool.get('account.tax.code')
obj_tax_code_template = self.pool.get('account.tax.code.template')
obj_acc_journal_view = self.pool.get('account.journal.view')
ir_values = self.pool.get('ir.values')
obj_product = self.pool.get('product.product')
# Creating Account
obj_acc_root = obj_multi.chart_template_id.account_root_id
tax_code_root_id = obj_multi.chart_template_id.tax_code_root_id.id
@@ -2693,10 +2704,10 @@ class wizard_multi_charts_accounts(osv.osv_memory):
todo_dict = {}
#create all the tax code
children_tax_code_template = self.pool.get('account.tax.code.template').search(cr, uid, [('parent_id','child_of',[tax_code_root_id])], order='id')
children_tax_code_template = obj_tax_code_template.search(cr, uid, [('parent_id','child_of',[tax_code_root_id])], order='id')
children_tax_code_template.sort()
for tax_code_template in self.pool.get('account.tax.code.template').browse(cr, uid, children_tax_code_template, context=context):
vals={
for tax_code_template in obj_tax_code_template.browse(cr, uid, children_tax_code_template, context=context):
vals = {
'name': (tax_code_root_id == tax_code_template.id) and obj_multi.company_id.name or tax_code_template.name,
'code': tax_code_template.code,
'info': tax_code_template.info,
@@ -2746,14 +2757,13 @@ class wizard_multi_charts_accounts(osv.osv_memory):
'account_paid_id': tax.account_paid_id and tax.account_paid_id.id or False,
}
tax_template_ref[tax.id] = new_tax
#deactivate the parent_store functionnality on account_account for rapidity purpose
ctx = context and context.copy() or {}
ctx['defer_parent_store_computation'] = True
children_acc_template = obj_acc_template.search(cr, uid, [('parent_id','child_of',[obj_acc_root.id]),('nocreate','!=',True)])
children_acc_template.sort()
for account_template in obj_acc_template.browse(cr, uid, children_acc_template,context=context):
for account_template in obj_acc_template.browse(cr, uid, children_acc_template, context=context):
tax_ids = []
for tax in account_template.tax_ids:
tax_ids.append(tax_template_ref[tax.id])
@@ -2779,8 +2789,10 @@ class wizard_multi_charts_accounts(osv.osv_memory):
}
new_account = obj_acc.create(cr, uid, vals, context=ctx)
acc_template_ref[account_template.id] = new_account
#reactivate the parent_store functionnality on account_account
self.pool.get('account.account')._parent_store_compute(cr)
obj_acc._parent_store_compute(cr)
for key,value in todo_dict.items():
if value['account_collected_id'] or value['account_paid_id']:
@@ -2789,41 +2801,23 @@ class wizard_multi_charts_accounts(osv.osv_memory):
'account_paid_id': acc_template_ref.get(value['account_paid_id'], False),
})
# Creating Journals Sales and Purchase
vals_journal={}
# Creating Journals
data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_sp_journal_view')])
data = obj_data.browse(cr, uid, data_id[0], context=context)
view_id = data.res_id
seq_id = obj_sequence.search(cr, uid, [('name','=','Account Journal')])[0]
if obj_multi.seq_journal:
seq_id_sale = obj_sequence.search(cr, uid, [('name','=','Sale Journal')])[0]
seq_id_purchase = obj_sequence.search(cr, uid, [('name','=','Purchase Journal')])[0]
seq_id_sale_refund = obj_sequence.search(cr, uid, [('name','=','Sales Refund Journal')])
if seq_id_sale_refund:
seq_id_sale_refund = seq_id_sale_refund[0]
seq_id_purchase_refund = obj_sequence.search(cr, uid, [('name','=','Purchase Refund Journal')])
if seq_id_purchase_refund:
seq_id_purchase_refund = seq_id_purchase_refund[0]
else:
seq_id_sale = seq_id
seq_id_purchase = seq_id
seq_id_sale_refund = seq_id
seq_id_purchase_refund = seq_id
vals_journal['view_id'] = view_id
#Sales Journal
analitical_sale_ids = analytic_journal_obj.search(cr,uid,[('type','=','sale')])
analitical_journal_sale = analitical_sale_ids and analitical_sale_ids[0] or False
analytical_sale_ids = analytic_journal_obj.search(cr,uid,[('type','=','sale')])
analytical_journal_sale = analytical_sale_ids and analytical_sale_ids[0] or False
vals_journal['name'] = _('Sales Journal')
vals_journal['type'] = 'sale'
vals_journal['code'] = _('SAJ')
vals_journal['sequence_id'] = seq_id_sale
vals_journal['company_id'] = company_id
vals_journal['analytic_journal_id'] = analitical_journal_sale
vals_journal = {
'name': _('Sales Journal'),
'type': 'sale',
'code': _('SAJ'),
'view_id': view_id,
'company_id': company_id,
'analytic_journal_id': analytical_journal_sale,
}
if obj_multi.chart_template_id.property_account_receivable:
vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
@@ -2832,38 +2826,35 @@ class wizard_multi_charts_accounts(osv.osv_memory):
obj_journal.create(cr,uid,vals_journal)
# Purchase Journal
analitical_purchase_ids = analytic_journal_obj.search(cr,uid,[('type','=','purchase')])
analitical_journal_purchase = analitical_purchase_ids and analitical_purchase_ids[0] or False
analytical_purchase_ids = analytic_journal_obj.search(cr,uid,[('type','=','purchase')])
analytical_journal_purchase = analytical_purchase_ids and analytical_purchase_ids[0] or False
vals_journal['name'] = _('Purchase Journal')
vals_journal['type'] = 'purchase'
vals_journal['code'] = _('EXJ')
vals_journal['sequence_id'] = seq_id_purchase
vals_journal['view_id'] = view_id
vals_journal['company_id'] = company_id
vals_journal['analytic_journal_id'] = analitical_journal_purchase
vals_journal = {
'name': _('Purchase Journal'),
'type': 'purchase',
'code': _('EXJ'),
'view_id': view_id,
'company_id': company_id,
'analytic_journal_id': analytical_journal_purchase,
}
if obj_multi.chart_template_id.property_account_payable:
vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
obj_journal.create(cr,uid,vals_journal)
# Creating Journals Sales Refund and Purchase Refund
vals_journal = {}
data_id = obj_data.search(cr, uid, [('model', '=', 'account.journal.view'), ('name', '=', 'account_sp_refund_journal_view')], context=context)
data = obj_data.browse(cr, uid, data_id[0], context=context)
view_id = data.res_id
#Sales Refund Journal
vals_journal = {
'view_id': view_id,
'name': _('Sales Refund Journal'),
'type': 'sale_refund',
'refund_journal': True,
'code': _('SCNJ'),
'sequence_id': seq_id_sale_refund,
'analytic_journal_id': analitical_journal_sale,
'view_id': view_id,
'analytic_journal_id': analytical_journal_sale,
'company_id': company_id
}
@@ -2871,23 +2862,15 @@ class wizard_multi_charts_accounts(osv.osv_memory):
vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
# if obj_multi.property_account_receivable:
# vals_journal.update({
# 'default_credit_account_id': acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id],
# 'default_debit_account_id': acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
# })
obj_journal.create(cr, uid, vals_journal, context=context)
# Purchase Refund Journal
vals_journal = {
'view_id': view_id,
'name': _('Purchase Refund Journal'),
'type': 'purchase_refund',
'refund_journal': True,
'code': _('ECNJ'),
'sequence_id': seq_id_purchase_refund,
'analytic_journal_id': analitical_journal_purchase,
'view_id': view_id,
'analytic_journal_id': analytical_journal_purchase,
'company_id': company_id
}
@@ -2895,14 +2878,41 @@ class wizard_multi_charts_accounts(osv.osv_memory):
vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
# if obj_multi.property_account_payable:
# vals_journal.update({
# 'default_credit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id],
# 'default_debit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id]
# })
obj_journal.create(cr, uid, vals_journal, context=context)
# Miscellaneous Journal
data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_view')])
data = obj_data.browse(cr, uid, data_id[0], context=context)
view_id = data.res_id
analytical_miscellaneous_ids = analytic_journal_obj.search(cr, uid, [('type', '=', 'situation')], context=context)
analytical_journal_miscellaneous = analytical_miscellaneous_ids and analytical_miscellaneous_ids[0] or False
vals_journal = {
'name': _('Miscellaneous Journal'),
'type': 'general',
'code': _('MISC'),
'view_id': view_id,
'analytic_journal_id': analytical_journal_miscellaneous,
'company_id': company_id
}
obj_journal.create(cr, uid, vals_journal, context=context)
# Opening Entries Journal
if obj_multi.chart_template_id.property_account_income_opening and obj_multi.chart_template_id.property_account_expense_opening:
vals_journal = {
'name': _('Opening Entries Journal'),
'type': 'situation',
'code': _('OPEJ'),
'view_id': view_id,
'company_id': company_id,
'centralisation': True,
'default_credit_account_id': acc_template_ref[obj_multi.chart_template_id.property_account_income_opening.id],
'default_debit_account_id': acc_template_ref[obj_multi.chart_template_id.property_account_expense_opening.id]
}
obj_journal.create(cr, uid, vals_journal, context=context)
# Bank Journals
data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')])
data = obj_data.browse(cr, uid, data_id[0], context=context)
@@ -2935,24 +2945,17 @@ class wizard_multi_charts_accounts(osv.osv_memory):
}
acc_cash_id = obj_acc.create(cr,uid,vals)
if obj_multi.seq_journal:
vals_seq={
'name': _('Bank Journal ') + vals['name'],
'code': 'account.journal',
}
seq_id = obj_sequence.create(cr,uid,vals_seq)
#create the bank journal
analitical_bank_ids = analytic_journal_obj.search(cr,uid,[('type','=','situation')])
analitical_journal_bank = analitical_bank_ids and analitical_bank_ids[0] or False
vals_journal['name']= vals['name']
vals_journal['code']= _('BNK') + str(current_num)
vals_journal['sequence_id'] = seq_id
vals_journal['type'] = line.account_type == 'cash' and 'cash' or 'bank'
vals_journal['company_id'] = company_id
vals_journal['analytic_journal_id'] = analitical_journal_bank
analytical_bank_ids = analytic_journal_obj.search(cr,uid,[('type','=','situation')])
analytical_journal_bank = analytical_bank_ids and analytical_bank_ids[0] or False
vals_journal = {
'name': vals['name'],
'code': _('BNK') + str(current_num),
'type': line.account_type == 'cash' and 'cash' or 'bank',
'company_id': company_id,
'analytic_journal_id': False,
'currency_id': False,
}
if line.currency_id:
vals_journal['view_id'] = view_id_cur
vals_journal['currency'] = line.currency_id.id
@@ -2985,7 +2988,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
'name': record[0],
'company_id': company_id,
'fields_id': field[0],
'value': account and 'account.account,'+str(acc_template_ref[account.id]) or False,
'value': account and 'account.account,' + str(acc_template_ref[account.id]) or False,
}
if r:
@@ -2998,7 +3001,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
fp_ids = obj_fiscal_position_template.search(cr, uid, [('chart_template_id', '=', obj_multi.chart_template_id.id)])
if fp_ids:
obj_tax_fp = self.pool.get('account.fiscal.position.tax')
obj_ac_fp = self.pool.get('account.fiscal.position.account')
@@ -3026,7 +3028,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
}
obj_ac_fp.create(cr, uid, vals_acc)
ir_values = self.pool.get('ir.values')
if obj_multi.sale_tax:
ir_values.set(cr, uid, key='default', key2=False, name="taxes_id", company=obj_multi.company_id.id,
models =[('product.product',False)], value=[tax_template_to_tax[obj_multi.sale_tax.id]])
@@ -3037,16 +3038,13 @@ class wizard_multi_charts_accounts(osv.osv_memory):
wizard_multi_charts_accounts()
class account_bank_accounts_wizard(osv.osv_memory):
_name = 'account.bank.accounts.wizard'
_name='account.bank.accounts.wizard'
_columns = {
'acc_name': fields.char('Account Name.', size=64, required=True),
'bank_account_id': fields.many2one('wizard.multi.charts.accounts', 'Bank Account', required=True),
'currency_id': fields.many2one('res.currency', 'Currency'),
'account_type': fields.selection([('cash','Cash'),('check','Check'),('bank','Bank')], 'Type', size=32),
}
_defaults = {
'currency_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id,
'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."),
'account_type': fields.selection([('cash','Cash'), ('check','Check'), ('bank','Bank')], 'Account Type', size=32),
}
account_bank_accounts_wizard()
addons/account/account_analytic_line.py
+6 -2
View File
@@ -80,7 +80,10 @@ class account_analytic_line(osv.osv):
j_id = analytic_journal_obj.browse(cr, uid, journal_id, context=context)
prod = product_obj.browse(cr, uid, prod_id, context=context)
result = 0.0
if prod_id:
unit = prod.uom_id.id
if j_id.type == 'purchase':
unit = prod.uom_po_id.id
if j_id.type <> 'sale':
a = prod.product_tmpl_id.property_account_expense.id
if not a:
@@ -127,6 +130,7 @@ class account_analytic_line(osv.osv):
return {'value': {
'amount': result,
'general_account_id': a,
'product_uom_id': unit
}
}
@@ -155,4 +159,4 @@ class res_partner(osv.osv):
res_partner()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account/account_bank_statement.py
+1 -2
View File
@@ -303,8 +303,7 @@ class account_bank_statement(osv.osv):
st = self.browse(cr, uid, st_id, context=context)
if not (abs((st.balance_end or 0.0) - st.balance_end_real) < 0.0001):
raise osv.except_osv(_('Error !'),
_('The statement balance is incorrect !\n') +
_('The expected balance (%.2f) is different than the computed one. (%.2f)') % (st.balance_end_real, st.balance_end))
_('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
def statement_close(self, cr, uid, ids, journal_type='bank', context=None):
addons/account/account_cash_statement.py
+1
View File
@@ -32,6 +32,7 @@ class account_cashbox_line(osv.osv):
_name = 'account.cashbox.line'
_description = 'CashBox Line'
_rec_name = 'number'
def _sub_total(self, cr, uid, ids, name, arg, context=None):
addons/account/account_installer.xml
-15
View File
@@ -37,21 +37,6 @@
<field name="sale_tax" on_change="on_change_tax(sale_tax)" attrs="{'required':[('charts','=','configurable')]}"/>
<field name="purchase_tax" groups="base.group_extended"/>
</group>
<group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
<separator col="4" colspan="4" string="Bank and Cash Accounts"/>
<field colspan="4" mode="tree" height="200" name="bank_accounts_id" nolabel="1" widget="one2many_list">
<form string="">
<field name="acc_name"/>
<field name="account_type"/>
<field name="currency_id" widget="selection" groups="base.group_extended"/>
</form>
<tree editable="bottom" string="Your bank and cash accounts">
<field name="acc_name"/>
<field name="account_type"/>
<field name="currency_id" widget="selection" groups="base.group_extended"/>
</tree>
</field>
</group>
</group>
</group>
</data>
addons/account/account_invoice_view.xml
+4 -4
View File
@@ -172,7 +172,7 @@
<field name="reference" nolabel="1"/>
<field name="date_due"/>
<field name="check_total" required="2"/>
<field colspan="4" default_get="{'check_total': check_total, 'invoice_line': invoice_line, 'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False}" name="invoice_line" nolabel="1">
<field colspan="4" default_get="{'check_total': check_total, 'invoice_line': invoice_line, 'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False}" name="invoice_line" context="{'type': type}" nolabel="1">
<tree string="Invoice lines">
<field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"/>
<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)"/>
@@ -280,7 +280,7 @@
<field domain="[('company_id', '=', company_id),('type','=', 'receivable')]" name="account_id" groups="account.group_account_user"/>
<field name="name"/>
<field name="payment_term" widget="selection"/>
<field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list"/>
<field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list" context="{'type': type}"/>
<group col="1" colspan="2">
<field name="tax_line" nolabel="1">
<tree editable="bottom" string="Taxes">
@@ -506,12 +506,12 @@
</record>
<menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/>
<act_window context="{'search_default_partner_id':[active_id]}" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>
<act_window context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>
<act_window
id="act_account_journal_2_account_invoice_opened"
name="Unpaid Invoices"
context="{'search_default_journal_id':active_id, 'search_default_unpaid':1,}"
context="{'search_default_journal_id': [active_id], 'search_default_unpaid':1, 'default_journal_id': active_id}"
res_model="account.invoice"
src_model="account.journal"/>
addons/account/account_move_line.py
+6 -3
View File
@@ -1087,12 +1087,15 @@ class account_move_line(osv.osv):
move_obj = self.pool.get('account.move')
self._update_check(cr, uid, ids, context)
result = False
move_ids = set()
for line in self.browse(cr, uid, ids, context=context):
move_ids.add(line.move_id.id)
context['journal_id'] = line.journal_id.id
context['period_id'] = line.period_id.id
result = super(account_move_line, self).unlink(cr, uid, [line.id], context=context)
if check:
move_obj.validate(cr, uid, [line.move_id.id], context=context)
move_ids = list(move_ids)
if check and move_ids:
move_obj.validate(cr, uid, move_ids, context=context)
return result
def _check_date(self, cr, uid, vals, context=None, check=True):
@@ -1297,7 +1300,7 @@ class account_move_line(osv.osv):
if vals.get('account_tax_id', False):
tax_id = tax_obj.browse(cr, uid, vals['account_tax_id'])
total = vals['debit'] - vals['credit']
if journal.refund_journal:
if journal.type in ('purchase_refund', 'sale_refund'):
base_code = 'ref_base_code_id'
tax_code = 'ref_tax_code_id'
account_id = 'account_paid_id'
addons/account/account_view.xml
+20 -16
View File
@@ -47,6 +47,7 @@
<tree colors="blue:state in ('draft');gray:state in ('done') " string="Fiscalyear">
<field name="code"/>
<field name="name"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="state"/>
</tree>
</field>
@@ -116,6 +117,7 @@
<field name="date_start"/>
<field name="date_stop"/>
<field name="special"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="state"/>
<button name="action_draft" states="done" string="Set to Draft" type="object" icon="terp-document-new" groups="account.group_account_manager"/>
<button name="%(action_account_period_close)d" states="draft" string="Close Period" type="action" icon="terp-camera_test"/>
@@ -570,7 +572,7 @@
<field name="ref"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
<field name="type" on_change="onchange_type(partner_id, type)"/>
<field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
<field domain="[('journal_id','=',parent.journal_id), ('company_id', '=', parent.company_id)]" name="account_id"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
<field name="amount"/>
</tree>
@@ -580,7 +582,7 @@
<field name="ref"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
<field name="type" on_change="onchange_type(partner_id, type)"/>
<field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
<field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view'), ('company_id', '=', parent.company_id)]" name="account_id"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
<field name="amount"/>
<field name="sequence" readonly="0"/>
@@ -1011,7 +1013,7 @@
<field name="invoice"/>
<field name="name"/>
<field name="partner_id" on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"/>
<field name="account_id" domain="[('journal_id','=',journal_id)]"/>
<field name="account_id" domain="[('journal_id','=',journal_id), ('company_id', '=', company_id)]"/>
<field name="journal_id"/>
<field name="debit" sum="Total debit"/>
<field name="credit" sum="Total credit"/>
@@ -1046,7 +1048,7 @@
<page string="Information">
<group col="2" colspan="2">
<separator colspan="2" string="Amount"/>
<field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<field name="account_id" select="1" domain="[('company_id', '=', company_id), ('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
<field name="debit"/>
<field name="credit"/>
<field name="quantity"/>
@@ -1120,7 +1122,7 @@
<field name="date"/>
<field name="journal_id" readonly="False" select="1"/>
<field name="period_id" readonly="False"/>
<field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation'),('company_id', '=', company_id)]"/>
<field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
<newline/>
<field name="debit"/>
@@ -1341,7 +1343,7 @@
<page string="Information">
<group col="2" colspan="2">
<separator colspan="2" string="Amount"/>
<field name="account_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<field name="account_id" domain="[('company_id', '=', parent.company_id), ('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<field name="debit"/>
<field name="credit"/>
<field name="quantity"/>
@@ -1403,7 +1405,7 @@
<field name="invoice"/>
<field name="name"/>
<field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,parent.date,parent.journal_id)"/>
<field name="account_id" domain="[('journal_id','=',parent.journal_id)]"/>
<field name="account_id" domain="[('journal_id','=',parent.journal_id),('company_id', '=', parent.company_id)]"/>
<field name="date_maturity"/>
<field name="debit" sum="Total Debit"/>
<field name="credit" sum="Total Credit"/>
@@ -1496,7 +1498,7 @@
<act_window
id="act_account_move_to_account_move_line_open"
name="Journal Items"
context="{'search_default_move_id':[active_id]}"
context="{'search_default_move_id':[active_id], 'default_move_id': active_id}"
res_model="account.move.line"
src_model="account.move"/>
@@ -1538,7 +1540,7 @@
<act_window
id="act_account_acount_move_line_open"
name="Entries"
context="{'search_default_account_id':[active_id], 'search_default_unreconciled':0}"
context="{'search_default_account_id':[active_id], 'search_default_unreconciled':0, 'default_account_id': active_id}"
res_model="account.move.line"
src_model="account.account"/>
@@ -1546,7 +1548,7 @@
id="act_account_acount_move_line_open_unreconciled"
name="Unreconciled Entries"
res_model="account.move.line"
context="{'search_default_account_id':[active_id], 'search_default_unreconciled':1,}"
context="{'search_default_account_id':[active_id], 'search_default_unreconciled':1, 'default_account_id': active_id}"
src_model="account.account"/>
<act_window domain="[('reconcile_id', '=', active_id)]" id="act_account_acount_move_line_reconcile_open" name="Reconciled entries" res_model="account.move.line" src_model="account.move.reconcile"/>
@@ -1991,20 +1993,20 @@
<act_window
id="act_account_journal_2_account_bank_statement"
name="Bank statements"
context="{'search_default_journal_id':active_id,}"
context="{'search_default_journal_id': active_id, 'default_journal_id': active_id}"
res_model="account.bank.statement"
src_model="account.journal"/>
<act_window
id="act_account_journal_2_account_move_line"
name="Journal Items"
context="{'search_default_journal_id':active_id,}"
context="{'search_default_journal_id':active_id, 'default_journal_id': active_id}"
res_model="account.move.line"
src_model="account.journal"/>
<act_window context="{'search_default_reconcile_id':False, 'search_default_partner_id':[active_id]}" domain="[('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]" id="act_account_partner_account_move_all" name="Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner" groups="base.group_extended"/>
<act_window context="{'search_default_reconcile_id':False, 'search_default_partner_id':[active_id], 'default_partner_id': active_id}" domain="[('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]" id="act_account_partner_account_move_all" name="Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner" groups="base.group_extended"/>
<act_window context="{'search_default_partner_id':[active_id]}" id="act_account_partner_account_move" name="Journal Items" res_model="account.move.line" src_model="res.partner" groups="account.group_account_user"/>
<act_window context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}" id="act_account_partner_account_move" name="Journal Items" res_model="account.move.line" src_model="res.partner" groups="account.group_account_user"/>
<record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
<field name="name">Create Account</field>
@@ -2150,6 +2152,8 @@
<field name="property_account_income_categ" domain="[('id', 'child_of', [account_root_id])]" />
<field name="property_account_expense" domain="[('id', 'child_of', [account_root_id])]"/>
<field name="property_account_income" domain="[('id', 'child_of', [account_root_id])]"/>
<field name="property_account_income_opening" domain="[('id', 'child_of', [account_root_id])]"/>
<field name="property_account_expense_opening" domain="[('id', 'child_of', [account_root_id])]"/>
<field name="property_reserve_and_surplus_account" />
</group>
</form>
@@ -2572,7 +2576,7 @@ action = self.pool.get('res.config').next(cr, uid, [], context)
<field name="ref"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
<field name="type" on_change="onchange_type(partner_id, type)"/>
<field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
<field domain="[('journal_id','=',parent.journal_id), ('company_id', '=', parent.company_id)]" name="account_id"/>
<field name="analytic_account_id" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]" groups="analytic.group_analytic_accounting" />
<field name="amount"/>
</tree>
@@ -2582,7 +2586,7 @@ action = self.pool.get('res.config').next(cr, uid, [], context)
<field name="ref"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
<field name="type" on_change="onchange_type(partner_id, type)"/>
<field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
<field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view'), ('company_id', '=', parent.company_id)]" name="account_id"/>
<field name="analytic_account_id" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]" groups="analytic.group_analytic_accounting" />
<field name="amount"/>
<field name="sequence"/>
addons/account/configurable_account_chart.xml
+24
View File
@@ -191,6 +191,14 @@
<field name="user_type" ref="conf_account_type_asset"/>
</record>
<record id="conf_o_income" model="account.account.template">
<field name="code">1106</field>
<field name="name">Opening Income Account</field>
<field ref="conf_cas" name="parent_id"/>
<field name="type">other</field>
<field name="user_type" ref="conf_account_type_income"/>
</record>
<record id="conf_cli" model="account.account.template">
<field name="code">111</field>
<field name="name">Current Liabilities</field>
@@ -225,6 +233,13 @@
<field name="user_type" ref="conf_account_type_liability"/>
</record>
<record id="conf_o_expense" model="account.account.template">
<field name="code">1114</field>
<field name="name">Opening Expense Account</field>
<field ref="conf_cli" name="parent_id"/>
<field name="type">other</field>
<field name="user_type" ref="conf_account_type_expense"/>
</record>
<!-- Profit and Loss -->
@@ -431,6 +446,8 @@
<field name="property_account_payable" ref="conf_a_pay"/>
<field name="property_account_expense_categ" ref="conf_a_expense"/>
<field name="property_account_income_categ" ref="conf_a_sale"/>
<field name="property_account_income_opening" ref="conf_o_income"/>
<field name="property_account_expense_opening" ref="conf_o_expense"/>
<field name="property_reserve_and_surplus_account" ref="conf_a_reserve_and_surplus"/>
</record>
@@ -596,6 +613,13 @@
<field name="tax_ids" eval="[(6,0,[ref('otaxs')])]"/>
</record>
<record id="action_wizard_multi_chart_todo" model="ir.actions.todo">
<field name="name">Generate Chart of Accounts from a Chart Template</field>
<field name="action_id" ref="account.action_wizard_multi_chart"/>
<field name="state">open</field>
<field name="restart">onskip</field>
</record>
</data>
</openerp>
addons/account/data/account_data2.xml
+13
View File
@@ -483,6 +483,19 @@
<field eval="3" name="padding"/>
<field name="prefix">CSH/%(year)s/</field>
</record>
<record id="sequence_opening_journal" model="ir.sequence">
<field name="name">Opening Entries Journal</field>
<field name="code">account.journal</field>
<field eval="3" name="padding"/>
<field name="prefix">OPEJ/%(year)s/</field>
</record>
<record id="sequence_miscellaneous_journal" model="ir.sequence">
<field name="name">Miscellaneous Journal</field>
<field name="code">account.journal</field>
<field eval="3" name="padding"/>
<field name="prefix">MISJ/%(year)s/</field>
</record>
<!--
Account Statement Sequences
-->
addons/account/demo/account_minimal.xml
+36 -3
View File
@@ -163,6 +163,14 @@
<field name="user_type" ref="account_type_asset"/>
</record>
<record id="o_income" model="account.account">
<field name="code">X11006</field>
<field name="name">Opening Income - (test)</field>
<field ref="cas" name="parent_id"/>
<field name="type">other</field>
<field name="user_type" ref="account_type_income"/>
</record>
<record model="account.account" id="liabilities_view">
<field name="name">Liabilities - (test)</field>
<field name="code">X11</field>
@@ -205,6 +213,14 @@
<field name="user_type" ref="account_type_liability"/>
</record>
<record id="o_expense" model="account.account">
<field name="code">X1114</field>
<field name="name">Opening Expense - (test)</field>
<field ref="cli" name="parent_id"/>
<field name="type">other</field>
<field name="user_type" ref="account_type_expense"/>
</record>
<!-- Profit and Loss -->
<record id="gpf" model="account.account">
@@ -355,7 +371,6 @@
<field name="name">Sales Credit Note Journal - (test)</field>
<field name="code">TSCNJ</field>
<field name="type">sale_refund</field>
<field eval="True" name="refund_journal"/>
<field name="view_id" ref="account_sp_refund_journal_view"/>
<field name="sequence_id" ref="sequence_refund_sales_journal"/>
<field model="account.account" name="default_credit_account_id" ref="a_sale"/>
@@ -379,7 +394,6 @@
<field name="name">Expenses Credit Notes Journal - (test)</field>
<field name="code">TECNJ</field>
<field name="type">purchase_refund</field>
<field eval="True" name="refund_journal"/>
<field name="view_id" ref="account_sp_refund_journal_view"/>
<field name="sequence_id" ref="sequence_refund_purchase_journal"/>
<field model="account.account" name="default_debit_account_id" ref="a_expense"/>
@@ -421,7 +435,26 @@
<field name="analytic_journal_id" ref="sit"/>
<field name="user_id" ref="base.user_root"/>
</record>
<record id="miscellaneous_journal" model="account.journal">
<field name="name">Miscellaneous Journal - (test)</field>
<field name="code">TMIS</field>
<field name="type">general</field>
<field name="view_id" ref="account_journal_view"/>
<field name="sequence_id" ref="sequence_miscellaneous_journal"/>
<field name="analytic_journal_id" ref="sit"/>
<field name="user_id" ref="base.user_root"/>
</record>
<record id="opening_journal" model="account.journal">
<field name="name">Opening Entries Journal - (test)</field>
<field name="code">TOEJ</field>
<field name="type">situation</field>
<field name="view_id" ref="account_journal_view"/>
<field name="sequence_id" ref="sequence_opening_journal"/>
<field model="account.account" name="default_debit_account_id" ref="o_income"/>
<field model="account.account" name="default_credit_account_id" ref="o_expense"/>
<field eval="True" name="centralisation"/>
<field name="user_id" ref="base.user_root"/>
</record>
<!--
Product income and expense accounts, default parameters
-->
addons/account/i18n/account.pot
+11 -17
View File
@@ -674,13 +674,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
""
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2459,9 +2452,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The expected balance (%.2f) is different than the computed one. (%.2f)"
msgid "The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
#. module: account
@@ -2681,6 +2675,12 @@ msgstr ""
msgid "View"
msgstr ""
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -3997,12 +3997,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5238,9 +5232,9 @@ msgid "As soon as the reconciliation is done, the invoice's state turns to “do
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/ar.po
+12 -17
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: 2011-01-20 04:52+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:47+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -708,12 +708,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2574,9 +2568,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2813,6 +2808,12 @@ msgstr ""
msgid "View"
msgstr ""
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4183,12 +4184,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5478,9 +5473,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/bg.po
+752 -624
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/br.po
+12 -17
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: 2011-01-15 05:18+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:47+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -709,12 +709,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2575,9 +2569,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2814,6 +2809,12 @@ msgstr ""
msgid "View"
msgstr ""
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4184,12 +4185,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5479,9 +5474,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/bs.po
+12 -17
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: 2011-01-15 05:18+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:47+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -714,12 +714,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2589,9 +2583,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2835,6 +2830,12 @@ msgstr "Osnovni konto porezne prijave."
msgid "View"
msgstr "Prikaz"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4211,12 +4212,6 @@ msgstr ""
msgid "Account Balance -"
msgstr "Saldo računa -"
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5510,9 +5505,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/ca.po
+26 -22
View File
@@ -7,15 +7,15 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2010-12-11 13:09+0000\n"
"PO-Revision-Date: 2011-03-26 18:10+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@zikzakmedia.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: 2011-01-15 05:19+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-27 04:53+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -716,12 +716,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr "El balanç de l'extracte bancari és incorrecte!\n"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -1806,7 +1800,7 @@ msgstr ""
#. module: account
#: constraint:res.company:0
msgid "Error! You can not create recursive companies."
msgstr ""
msgstr "Error! No podeu crear companyies recursives."
#. module: account
#: view:account.analytic.account:0
@@ -2598,11 +2592,12 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr "El balanç previst (%.2f) és diferent del calculat. (%.2f)"
msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2847,6 +2842,12 @@ msgstr "El compte base de la declaració d'impostos."
msgid "View"
msgstr "Vista"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4229,12 +4230,6 @@ msgstr ""
msgid "Account Balance -"
msgstr "Balanç compte -"
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -4454,7 +4449,7 @@ msgstr ""
#: view:account.invoice.cancel:0
#: view:account.invoice.confirm:0
msgid "Close"
msgstr "Tancat"
msgstr "Tanca"
#. module: account
#: field:account.bank.statement.line,move_ids:0
@@ -5537,9 +5532,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
@@ -9536,7 +9531,7 @@ msgstr "Factura rectificativa (abonament)"
#. module: account
#: field:wizard.multi.charts.accounts,bank_accounts_id:0
msgid "Bank Accounts"
msgstr "Comptes de banc"
msgstr "Comptes bancaris"
#. module: account
#: field:res.partner,credit:0
@@ -9964,6 +9959,11 @@ msgstr ""
#~ msgid "Invoice import"
#~ msgstr "Import factura"
#, python-format
#~ msgid ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
#~ msgstr "El balanç previst (%.2f) és diferent del calculat. (%.2f)"
#~ msgid "Ending Balance"
#~ msgstr "Saldo final"
@@ -10933,6 +10933,10 @@ msgstr ""
#~ msgid "Fiscal Position Template Tax Mapping"
#~ msgstr "Mapa impostos plantilla posició fiscal"
#, python-format
#~ msgid "The statement balance is incorrect !\n"
#~ msgstr "El balanç de l'extracte bancari és incorrecte!\n"
#, python-format
#~ msgid ""
#~ "No period defined for this date !\n"
addons/account/i18n/cs.po
+12 -17
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: 2011-01-27 04:36+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:48+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -712,12 +712,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2578,9 +2572,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2817,6 +2812,12 @@ msgstr ""
msgid "View"
msgstr "Pohled"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4187,12 +4188,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5482,9 +5477,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/da.po
+18 -18
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: 2011-01-15 05:19+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:48+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -709,12 +709,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2582,12 +2576,12 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
"Den forventede balance (%.2f) er forskellig fra den beregnede. (%.2f)"
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2828,6 +2822,12 @@ msgstr ""
msgid "View"
msgstr "Vis"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4198,12 +4198,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5495,9 +5489,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
@@ -9728,6 +9722,12 @@ msgstr ""
#~ msgid "Invoice import"
#~ msgstr "Faktura import"
#, python-format
#~ msgid ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
#~ msgstr ""
#~ "Den forventede balance (%.2f) er forskellig fra den beregnede. (%.2f)"
#~ msgid "Continue"
#~ msgstr "Fortsæt"
addons/account/i18n/de.po
+34 -20
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-02-13 22:46+0000\n"
"PO-Revision-Date: 2011-04-03 09:24+0000\n"
"Last-Translator: Ferdinand @ Camptocamp <Unknown>\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: 2011-02-15 04:37+0000\n"
"X-Generator: Launchpad (build 12351)\n"
"X-Launchpad-Export-Date: 2011-04-04 04:47+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -757,12 +757,6 @@ msgstr "Schecks"
msgid "Partners Reconciled Today"
msgstr "Heute ausgeglichene Partner"
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr "Der Saldo für diesen gebuchten Auszug stimmt nicht überein !\n"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2730,11 +2724,14 @@ msgid "August"
msgstr "August"
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr "Der erwartete Wert (%.2f) weicht ab von dem berechneten Wert (%.2f)"
msgstr ""
"Der Belegsaldo ist falsch !\n"
"Der erwartete Saldo (%.2f) weicht vom errechneten ab. (%.2f)"
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2990,6 +2987,12 @@ msgstr "Das Basis Konto für die Steuererklärung"
msgid "View"
msgstr "Ansicht"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr "BNK%s"
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4441,12 +4444,6 @@ msgstr ""
msgid "Account Balance -"
msgstr "Saldo"
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr "Rechnung "
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5814,10 +5811,10 @@ msgstr ""
"zu 'Erledigt' ( d.h. Bezahlt)."
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgstr "wurde geprüft und gebucht."
msgid "Invoice '%s' is validated."
msgstr "Rechnung '%s' ist validiert."
#. module: account
#: view:account.chart.template:0
@@ -10560,6 +10557,11 @@ msgstr ""
#~ msgid "Invoice import"
#~ msgstr "Importiere Rechnungen"
#, python-format
#~ msgid ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
#~ msgstr "Der erwartete Wert (%.2f) weicht ab von dem berechneten Wert (%.2f)"
#~ msgid "Ending Balance"
#~ msgstr "Endsaldo"
@@ -11888,6 +11890,10 @@ msgstr ""
#~ "Belegen der Finanzbuchhaltung: Rechnung, Gutschrift, Lieferantenzahlung, "
#~ "Bankauszug, etc."
#, python-format
#~ msgid "The statement balance is incorrect !\n"
#~ msgstr "Der Saldo für diesen gebuchten Auszug stimmt nicht überein !\n"
#, python-format
#~ msgid "UnknownError"
#~ msgstr "UnbekannterFehler"
@@ -11951,6 +11957,10 @@ msgstr ""
#~ "Durch Aktivierung dieser Option, kann die Ansicht dieser Zahlungsbedingung "
#~ "verhindert werden ohne sie zu löschen."
#, python-format
#~ msgid "Invoice "
#~ msgstr "Rechnung "
#~ msgid ""
#~ "Define your company's fiscal year depending on the period you have chosen to "
#~ "follow. A fiscal year is a 1 year period over which a company budgets its "
@@ -11996,6 +12006,10 @@ msgstr ""
#~ "Wenn dieses Feld aktiviert ist , kann eine definierte Steuer ausgeblendet "
#~ "werden, ohne diese vollständig zu entfernen."
#, python-format
#~ msgid "is validated."
#~ msgstr "wurde geprüft und gebucht."
#~ msgid ""
#~ "If the active field is set to true, it will allow you to hide the journal "
#~ "period without removing it."
addons/account/i18n/el.po
+23 -19
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: 2011-01-25 04:55+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:49+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -741,12 +741,6 @@ msgstr "Επιταγή"
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr "Το υπόλοιπο του παραστατικού είναι εσφαλμένο\n"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2631,13 +2625,12 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
"Το αναμενόμενο ισοζύγιο (%.2f) είναι διαφορετικό απο αυτό που έχει "
"υπολογιστεί. (%.2f)"
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2883,6 +2876,12 @@ msgstr "Ο βασικός λογαριασμός για φορολογική δ
msgid "View"
msgstr "Όψη"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4266,12 +4265,6 @@ msgstr ""
msgid "Account Balance -"
msgstr "Account Balance -"
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5578,9 +5571,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
@@ -9898,6 +9891,13 @@ msgstr ""
#~ msgid "Invoice import"
#~ msgstr "Εισαγωγή τιμολογίων"
#, python-format
#~ msgid ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
#~ msgstr ""
#~ "Το αναμενόμενο ισοζύγιο (%.2f) είναι διαφορετικό απο αυτό που έχει "
#~ "υπολογιστεί. (%.2f)"
#~ msgid "Continue"
#~ msgstr "Συνέχεια"
@@ -10278,6 +10278,10 @@ msgstr ""
#~ msgid "Statement reconcile line"
#~ msgstr "Γραμμή συμφωνίας παραστατικού"
#, python-format
#~ msgid "The statement balance is incorrect !\n"
#~ msgstr "Το υπόλοιπο του παραστατικού είναι εσφαλμένο\n"
#~ msgid "Legal Statements"
#~ msgstr "Νομικές Δηλώσεις"
addons/account/i18n/en_US.po
+12 -17
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: 2011-01-15 05:26+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:56+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -709,12 +709,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2577,9 +2571,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2816,6 +2811,12 @@ msgstr ""
msgid "View"
msgstr ""
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4188,12 +4189,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5483,9 +5478,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/es.po
+97 -87
View File
@@ -7,15 +7,15 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-01-18 11:21+0000\n"
"PO-Revision-Date: 2011-03-27 11:05+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@zikzakmedia.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: 2011-01-19 04:44+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-28 04:36+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -395,7 +395,7 @@ msgid ""
"OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
"Cash Registers, or Customer/Supplier payments."
msgstr ""
"Los contables utilizan esta vista para introducir apuntes masivamente en "
"Los contables utilizan esta vista para introducir asientos masivamente en "
"OpenERP. Cuando utiliza los extractos bancarios, registros de caja, o pagos "
"de cliente/proveedor OpenERP crea automáticamente apuntes contables."
@@ -568,7 +568,7 @@ msgstr "Cuenta utilizada en este diario"
#: help:account.report.general.ledger,chart_account_id:0
#: help:account.vat.declaration,chart_account_id:0
msgid "Select Charts of Accounts"
msgstr "Seleccionar plan contable"
msgstr "Seleccionar plan contable."
#. module: account
#: view:product.product:0
@@ -754,12 +754,6 @@ msgstr "Comprobar"
msgid "Partners Reconciled Today"
msgstr "Empresas conciliadas hoy"
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr "¡El balance del extracto bancario es incorrecto!\n"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -1431,9 +1425,9 @@ msgid ""
"statements, etc."
msgstr ""
"Un asiento de diario se compone de varias anotaciones, cada una de las "
"cuales es una operación bien al debe o bien al haber. OpenERP crea "
"automáticamente un asiento por cada documento contable: factura, reembolso, "
"pago a proveedor, extractos de cuenta bancaria, etc"
"cuales es una operación al debe o al haber. OpenERP crea automáticamente un "
"asiento por cada documento contable: factura, factura rectificativa (abono), "
"pago a proveedor, extractos de cuenta bancaria, etc."
#. module: account
#: view:account.entries.report:0
@@ -1449,7 +1443,7 @@ msgstr "Una tabla temporal utilizada para la vista de tablero"
#: model:ir.actions.act_window,name:account.action_invoice_tree4
#: model:ir.ui.menu,name:account.menu_action_invoice_tree4
msgid "Supplier Refunds"
msgstr "Facturas rectificativas (abono) de proveedor"
msgstr "Facturas rectificativas de proveedor"
#. module: account
#: view:account.payment.term.line:0
@@ -1945,8 +1939,8 @@ msgid ""
"Check this box if you want to use a different sequence for each created "
"journal. Otherwise, all will use the same sequence."
msgstr ""
"Marque esta caja si desea utilizar una secuencia diferente para cada diario "
"creado. De lo contrario, todos utilizarán la misma secuencia."
"Marque esta opción si desea utilizar una secuencia diferente para cada "
"diario creado. De lo contrario, todos utilizarán la misma secuencia."
#. module: account
#: help:account.partner.ledger,amount_currency:0
@@ -2117,7 +2111,7 @@ msgid ""
"accounts."
msgstr ""
"Esta clasificación se utiliza para diferenciar tipos con efectos especiales "
"en OpenERP: vista no puede tener apuntes, consolidación son cuentas que "
"en OpenERP: vista no puede tener asientos, consolidación son cuentas que "
"pueden tener cuentas hijas para consolidaciones multi-empresa, "
"pagable/cobrable son para cuentas de empresas (para los cálculos de crédito "
"/ débito), cerrado es para cuentas de depreciación."
@@ -2207,7 +2201,7 @@ msgstr "Nº ctdad de productos "
#. module: account
#: model:ir.model,name:account.model_product_template
msgid "Product Template"
msgstr "Plantilla producto"
msgstr "Plantilla de producto"
#. module: account
#: report:account.account.balance:0
@@ -2246,7 +2240,7 @@ msgstr "Ejercicio fiscal"
#: help:account.report.general.ledger,fiscalyear_id:0
#: help:account.vat.declaration,fiscalyear_id:0
msgid "Keep empty for all open fiscal year"
msgstr "Dejarlo vacío para todos los ejercicios fiscales abiertos"
msgstr "Dejarlo vacío para todos los ejercicios fiscales abiertos."
#. module: account
#: model:ir.model,name:account.model_account_move
@@ -2527,8 +2521,7 @@ msgid ""
"You cannot modify company of this journal as its related record exist in "
"Entry Lines"
msgstr ""
"No puede modificar la compañía de este diario ya que existe un registro "
"relacionado en las líneas de asiento"
"No puede modificar la compañía de este diario porqué ya contiene asientos"
#. module: account
#: report:account.journal.period.print:0
@@ -2651,9 +2644,9 @@ msgid ""
"Note that journal entries that are automatically created by the system are "
"always skipping that state."
msgstr ""
"Marque esta opción si no desea que los nuevos apuntes pasen por el estado "
"'Borrador' y por tanto vayan directamente al estado 'Asentado' sin ninguna "
"validación manual. \n"
"Marque esta opción si no desea que los nuevos asientos pasen por el estado "
"'No asentado' y por tanto vayan directamente al estado 'Asentado' sin "
"ninguna validación manual. \n"
"Tenga en cuenta que los apuntes creados automáticamente por el sistema "
"siempre obvian ese estado."
@@ -2721,11 +2714,12 @@ msgid "August"
msgstr "Agosto"
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr "El balance previsto (%.2f) es diferente del calculado. (%.2f)"
msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2981,6 +2975,12 @@ msgstr "La cuenta base de la declaración de impuestos."
msgid "View"
msgstr "Vista"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -3074,7 +3074,7 @@ msgid ""
" 'Unreconciled' will copy only the journal items that were unreconciled on "
"the first day of the new fiscal year."
msgstr ""
"Establezca aquí el método que se usará, el asistente genérico, para crear el "
"Establezca aquí el método que usará el asistente genérico para crear el "
"asiento de cierre de ejercicio para todas las cuentas de este tipo.\n"
"\n"
" 'Ninguno' significa que no se hará nada.\n"
@@ -3130,7 +3130,7 @@ msgstr "Empresas restantes"
#: view:account.subscription:0
#: field:account.subscription,lines_id:0
msgid "Subscription Lines"
msgstr "Líneas de asientos periódicos"
msgstr "Apuntes de asientos periódicos"
#. module: account
#: selection:account.analytic.journal,type:0
@@ -3257,7 +3257,7 @@ msgid ""
"All selected journal entries will be validated and posted. It means you "
"won't be able to modify their accounting fields anymore."
msgstr ""
"Todos los apuntes seleccionadas serán validados y asentados. Esto significa "
"Todos los asientos seleccionados serán validados y asentados. Esto significa "
"que ya no podrá modificar sus campos contables."
#. module: account
@@ -3489,8 +3489,8 @@ msgid ""
"based on partner payment term!\n"
"Please define partner on it!"
msgstr ""
"La fecha de vencimiento de la línea de asiento generado por la línea del "
"modelo '%s' del modelo '%s' se basa en el plazo de pago de la empresa.\n"
"La fecha de vencimiento del apunte generado por la línea del modelo '%s' del "
"modelo '%s' se basa en el plazo de pago de la empresa.\n"
"¡Por favor, defina la empresa en él!"
#. module: account
@@ -4016,9 +4016,9 @@ msgid ""
"the system on document validation (invoices, bank statements...) and will be "
"created in 'Posted' state."
msgstr ""
"Todos los apuntes creadas manualmente están, por lo general, en el estado "
"Todos los asientos creados manualmente están, por lo general, en el estado "
"'No asentado', pero puede configurar la opción de omitir ese estado en el "
"diario correspondiente. En ese caso, se comportan como apuntes creados "
"diario correspondiente. En ese caso, se comportan como asientos creados "
"automáticamente por el sistema en la validación de documentos (facturas, "
"extractos bancarios, ...) y se crearán en estado 'Asentado'."
@@ -4061,7 +4061,7 @@ msgstr "Descripción impuesto"
#: code:addons/account/report/common_report_header.py:68
#, python-format
msgid "All Posted Entries"
msgstr "Todos los apuntes asentados"
msgstr "Todos los asientos asentados"
#. module: account
#: code:addons/account/account_bank_statement.py:357
@@ -4311,7 +4311,7 @@ msgstr "Considerar asientos conciliados."
#: view:validate.account.move:0
#: view:validate.account.move.lines:0
msgid "Post Journal Entries"
msgstr "Asentar apuntes"
msgstr "Asentar asientos"
#. module: account
#: selection:account.invoice,state:0
@@ -4421,12 +4421,6 @@ msgstr ""
msgid "Account Balance -"
msgstr "Balance cuenta -"
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr "Factura "
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -4564,7 +4558,7 @@ msgstr "Aplicación impuesto"
#: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
#, python-format
msgid "Journal Items"
msgstr "Registros del diario"
msgstr "Apuntes contables"
#. module: account
#: selection:account.account.type,report_type:0
@@ -4684,7 +4678,7 @@ msgid ""
"You should set the journal to allow cancelling entries if you want to do "
"that."
msgstr ""
"¡No se puede modificar una apunte asentado de este diario!\n"
"¡No se puede modificar una asiento asentado de este diario!\n"
"Debe configurar el diario para permitir la cancelación de los asientos si "
"quiere hacerlo."
@@ -4831,7 +4825,7 @@ msgstr "mes"
#: code:addons/account/account_bank_statement.py:293
#, python-format
msgid "Journal Item \"%s\" is not valid"
msgstr "Registro del diario \"%s\" no es válido"
msgstr "Apunte \"%s\" no es válido"
#. module: account
#: view:account.payment.term:0
@@ -5093,7 +5087,7 @@ msgstr "Contabilidad analítica"
#: selection:account.invoice.report,type:0
#: selection:report.invoice.created,type:0
msgid "Customer Refund"
msgstr "Reembolso del cliente"
msgstr "Factura rectificativa de cliente"
#. module: account
#: view:account.account:0
@@ -5355,7 +5349,7 @@ msgstr "Contabilidad. Conciliación automática"
#: view:account.move:0
#: view:account.move.line:0
msgid "Journal Item"
msgstr "Registro diario"
msgstr "Apunte contable"
#. module: account
#: model:ir.model,name:account.model_account_move_journal
@@ -5498,7 +5492,7 @@ msgstr "Reintegrar factura"
#. module: account
#: field:account.invoice,address_invoice_id:0
msgid "Invoice Address"
msgstr "Dirección factura"
msgstr "Dirección de factura"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_entries_report_all
@@ -5668,7 +5662,7 @@ msgstr " 365 Días "
#: model:ir.actions.act_window,name:account.action_invoice_tree3
#: model:ir.ui.menu,name:account.menu_action_invoice_tree3
msgid "Customer Refunds"
msgstr "Facturas rectificativas (abono) de cliente"
msgstr "Facturas rectificativas de cliente"
#. module: account
#: view:account.payment.term.line:0
@@ -5742,9 +5736,9 @@ msgid ""
"line of the expense account. OpenERP will propose to you automatically the "
"Tax related to this account and the counterpart \"Account Payable\"."
msgstr ""
"Esta vista puede ser utilizada por los contables para registrar apuntes "
"Esta vista puede ser utilizada por los contables para registrar asientos "
"rápidamente en OpenERP. Si desea registrar una factura de proveedor, "
"comience registrando la línea de la cuenta de gastos. OpenERP le propondrá "
"comience registrando el apunte de la cuenta de gastos. OpenERP le propondrá "
"automáticamente el impuesto asociado a esta cuenta y la \"cuenta a pagar\" "
"de contrapartida."
@@ -5781,10 +5775,10 @@ msgstr ""
"convierte en \"Realizada\" (es decir, pagada) en el sistema."
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgstr "está validada."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
#: view:account.chart.template:0
@@ -5852,8 +5846,8 @@ msgid ""
"You cannot modify Company of account as its related record exist in Entry "
"Lines"
msgstr ""
"No puede modificar la compañía de la cuenta ya que existe un registro "
"relacionado en líneas de asientos"
"No puede modificar la compañía de la cuenta porqué ya hay apuntes con esta "
"cuenta"
#. module: account
#: help:account.fiscalyear.close.state,fy_id:0
@@ -6085,7 +6079,7 @@ msgstr "Liquidez"
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
#: model:ir.ui.menu,name:account.account_analytic_journal_entries
msgid "Analytic Journal Items"
msgstr "Registros diario analítico"
msgstr "Apuntes analíticos"
#. module: account
#: view:account.fiscalyear.close:0
@@ -6149,7 +6143,7 @@ msgstr "¡Introduzca una fecha inicial!"
#: selection:account.invoice.report,type:0
#: selection:report.invoice.created,type:0
msgid "Supplier Refund"
msgstr "Factura rectificativa (abono) de proveedor"
msgstr "Factura rectificativa de proveedor"
#. module: account
#: model:ir.ui.menu,name:account.menu_dashboard_acc
@@ -6477,7 +6471,7 @@ msgstr ""
"factura deben estar conciliados con sus contrapartidas, normalmente pagos. "
"Con la funcionalidad de reconciliación automática, OpenERP realiza su propia "
"búsqueda de apuntes a conciliar en una serie de cuentas. Encuentra los "
"apuntes, para cada tercero, donde las cantidades se correspondan."
"apuntes, para cada empresa, cuando las cantidades se correspondan."
#. module: account
#: view:account.move:0
@@ -6515,8 +6509,8 @@ msgstr ""
msgid ""
"Selected Entry Lines does not have any account move enties in draft state"
msgstr ""
"Las líneas de asiento seleccionadas no tienen ningún movimiento contable en "
"estado borrador"
"Los apuntes seleccionados no tienen ningún movimiento contable en estado "
"borrador"
#. module: account
#: selection:account.aged.trial.balance,target_move:0
@@ -6816,8 +6810,8 @@ msgid ""
"This date will be used as the invoice date for Refund Invoice and Period "
"will be chosen accordingly!"
msgstr ""
"¡Esta fecha se utilizará como la fecha de facturación de la factura "
"rectificativa (abono) y el período será elegido en consecuencia!"
"Esta fecha se utilizará como la fecha de facturación de la factura "
"rectificativa (abono) y el período será elegido en consecuencia."
#. module: account
#: field:account.aged.trial.balance,period_length:0
@@ -6960,8 +6954,7 @@ msgid ""
"search for account entries, open a journal, then select a record line."
msgstr ""
"Puede buscar un asiento contable en concreto a través de información útil. "
"Para buscar asientos contables, abra un diario, luego seleccione una línea "
"de registro."
"Para buscar asientos contables, abra un diario, luego seleccione un apunte."
#. module: account
#: report:account.invoice:0
@@ -7139,7 +7132,7 @@ msgid ""
"line of the expense account, OpenERP will propose to you automatically the "
"Tax related to this account and the counter-part \"Account Payable\"."
msgstr ""
"Esta vista es usada por los contables para registrar apuntes masivamente en "
"Esta vista es usada por los contables para registrar asientos masivamente en "
"OpenERP. Si quiere registrar una factura de proveedor, comience "
"introduciendo el apunte de la cuenta de gastos. OpenERP le propondrá "
"automáticamente el impuesto asociado a esta cuenta, y la \"cuenta a pagar\" "
@@ -7161,7 +7154,7 @@ msgstr ""
#: field:account.invoice.tax,invoice_id:0
#: model:ir.model,name:account.model_account_invoice_line
msgid "Invoice Line"
msgstr "Línea factura"
msgstr "Línea de factura"
#. module: account
#: field:account.balance.report,display_account:0
@@ -7232,7 +7225,7 @@ msgstr ""
#: view:account.move.line:0
#: selection:account.move.line,state:0
msgid "Unbalanced"
msgstr "No balanceado"
msgstr "Descuadrado"
#. module: account
#: selection:account.move.line,centralisation:0
@@ -7371,7 +7364,7 @@ msgstr "Código"
#. module: account
#: view:validate.account.move:0
msgid "Post Journal Entries of a Journal"
msgstr "Asentar apuntes de un diario"
msgstr "Asentar asientos de un diario"
#. module: account
#: view:product.product:0
@@ -8120,8 +8113,7 @@ msgstr "Diario de compras"
#: view:account.invoice.refund:0
msgid "Refund Invoice: Creates the refund invoice, ready for editing."
msgstr ""
"Factura rectificativa (abono): Crea la factura de abono, preparada para "
"editarla."
"Factura rectificativa: Crea la factura de abono, preparada para editarla."
#. module: account
#: field:account.invoice.line,price_subtotal:0
@@ -8534,8 +8526,8 @@ msgid ""
"You cannot modify company of this period as its related record exist in "
"Entry Lines"
msgstr ""
"No puede modificar la compañía de este periodo ya que existe un registro "
"relacionado en las líneas de asiento"
"No puede modificar la compañía de este periodo porqué ya hay apuntes en este "
"período."
#. module: account
#: view:account.move:0
@@ -8618,10 +8610,10 @@ msgid ""
"in which order. You can create your own view for a faster encoding in each "
"journal."
msgstr ""
"Establece la vista usada cuando se escriben o consultan apuntes en este "
"diario. La vista le dice a OpenERP qué campos deben ser visibles, requeridos "
"o de sólo lectura, y en qué orden. Puede crear su propia vista en cada "
"diario para introducir apuntes más rápido."
"Establece la vista usada cuando se escriben o consultan asientos en este "
"diario. La vista le indica a OpenERP qué campos deben ser visibles, "
"requeridos o de sólo lectura, y en qué orden. Puede crear su propia vista en "
"cada diario para introducir apuntes más rápido."
#. module: account
#: field:account.period,date_stop:0
@@ -8729,10 +8721,11 @@ msgid ""
"partially. You can easily generate refunds and reconcile them directly from "
"the invoice form."
msgstr ""
"Con reembolsos de proveedor puede gestionar las notas de crédito que recibe "
"de sus proveedores. Un reembolso es un documento que abona una factura total "
"o parcialmente. Puede fácilmente generar reembolsos y conciliarlos "
"directamente desde el formulario de factura."
"Con facturas rectificativas de proveedor puede gestionar las facturas de "
"abono que recibe de sus proveedores. Una factura rectificativa es un "
"documento que abona una factura total o parcialmente. Puede fácilmente "
"generar facturas rectificativas y conciliarlas directamente desde el "
"formulario de factura."
#. module: account
#: view:account.account.template:0
@@ -8848,7 +8841,7 @@ msgid ""
"the income account. OpenERP will propose to you automatically the Tax "
"related to this account and the counter-part \"Account receivable\"."
msgstr ""
"Esta vista es usada por los contables para registrar apuntes masivamente en "
"Esta vista es usada por los contables para registrar asientos masivamente en "
"OpenERP. Si quiere registrar una factura de cliente, seleccione el diario y "
"el periodo en la barra de herramientas de búsqueda. Luego, comience "
"introduciendo el apunte de la cuenta de ingresos. OpenERP le propondrá "
@@ -9291,8 +9284,8 @@ msgid ""
"payment term!\n"
"Please define partner on it!"
msgstr ""
"La fecha de vencimiento de la línea de asiento generado por la línea del "
"modelo '%s' se basa en el plazo de pago de la empresa.\n"
"La fecha de vencimiento del apunte generado por la línea del modelo '%s' se "
"basa en el plazo de pago de la empresa.\n"
"¡Por favor, defina la empresa en él!"
#. module: account
@@ -9421,7 +9414,7 @@ msgid ""
"and is the process of transferring debit and credit amounts from a journal "
"of original entry to a ledger book."
msgstr ""
"El proceso de validación de apuntes, también llamado 'asentar', transfiere "
"El proceso de validación de asientos, también llamado 'asentar', transfiere "
"los importes del debe y haber de la anotación original a un libro mayor."
#. module: account
@@ -9498,7 +9491,7 @@ msgstr "Seleccionar periodo"
#: view:account.move.line:0
#: report:account.move.voucher:0
msgid "Posted"
msgstr "Fijado"
msgstr "Asentado"
#. module: account
#: report:account.account.balance:0
@@ -10051,7 +10044,7 @@ msgstr "Buscar factura"
#: view:account.invoice.report:0
#: model:ir.actions.act_window,name:account.action_account_invoice_refund
msgid "Refund"
msgstr "Factura rectificativa (abono)"
msgstr "Factura rectificativa"
#. module: account
#: field:wizard.multi.charts.accounts,bank_accounts_id:0
@@ -10270,6 +10263,10 @@ msgstr ""
#~ msgid "Keep empty to use the period of the validation date."
#~ msgstr "Dejarlo vacío para usar el período de la fecha de validación."
#, python-format
#~ msgid "The statement balance is incorrect !\n"
#~ msgstr "¡El balance del extracto bancario es incorrecto!\n"
#, python-format
#~ msgid ""
#~ "You can specify year, month and date in the name of the model using the "
@@ -10514,6 +10511,11 @@ msgstr ""
#~ msgid "Invoice import"
#~ msgstr "Importe factura"
#, python-format
#~ msgid ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
#~ msgstr "El balance previsto (%.2f) es diferente del calculado. (%.2f)"
#~ msgid "Ending Balance"
#~ msgstr "Saldo final"
@@ -11957,6 +11959,10 @@ msgstr ""
#~ "Si el campo activo se desmarca, permite ocultar el plazo de pago sin "
#~ "eliminarlo."
#, python-format
#~ msgid "Invoice "
#~ msgstr "Factura "
#~ msgid "Rule must have at least one checked access right !"
#~ msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
@@ -11966,6 +11972,10 @@ msgstr ""
#~ msgstr ""
#~ "Si el campo activo se desmarca, permite ocultar el impuesto sin eliminarlo."
#, python-format
#~ msgid "is validated."
#~ msgstr "está validada."
#~ msgid ""
#~ "If the active field is set to true, it will allow you to hide the journal "
#~ "period without removing it."
addons/account/i18n/es_AR.po
+41 -27
View File
@@ -7,24 +7,24 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2009-11-18 03:34+0000\n"
"Last-Translator: Carlos Sebastián Macri - Daycrom <cmacri@daycrom.com>\n"
"PO-Revision-Date: 2011-03-17 20:16+0000\n"
"Last-Translator: jpdborgna <Unknown>\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: 2011-01-15 05:26+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:56+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
msgid "System payment"
msgstr ""
msgstr "Sistema de pagos"
#. module: account
#: view:account.journal:0
msgid "Other Configuration"
msgstr ""
msgstr "Otra configuración"
#. module: account
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
@@ -39,16 +39,17 @@ msgid ""
"You cannot remove/deactivate an account which is set as a property to any "
"Partner."
msgstr ""
"No se puede eliminar/desactivar una cuenta que está vinculada a una empresa."
#. module: account
#: view:account.move.reconcile:0
msgid "Journal Entry Reconcile"
msgstr ""
msgstr "Conciliar asiento contable"
#. module: account
#: field:account.installer.modules,account_voucher:0
msgid "Voucher Management"
msgstr ""
msgstr "Administracion de Comprobantes"
#. module: account
#: view:account.account:0
@@ -62,7 +63,7 @@ msgstr "Estadísticas de cuentas"
#: field:account.invoice,residual:0
#: field:report.invoice.created,residual:0
msgid "Residual"
msgstr "Residuo"
msgstr "Valor residual"
#. module: account
#: code:addons/account/invoice.py:785
@@ -714,12 +715,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr "El balance del extracto es incorrecto!\n"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2596,11 +2591,12 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr "El balance previsto (%.2f) es diferente del calculado. (%.2f)"
msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2846,6 +2842,12 @@ msgstr "La cuenta base de la declaración de impuestos."
msgid "View"
msgstr "Vista"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4229,12 +4231,6 @@ msgstr ""
msgid "Account Balance -"
msgstr "Balance de cuenta -"
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5538,9 +5534,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
@@ -9675,7 +9671,7 @@ msgstr "Futuro"
#. module: account
#: view:account.move.line:0
msgid "Search Journal Items"
msgstr ""
msgstr "Buscar líneas asientos"
#. module: account
#: help:account.tax,base_sign:0
@@ -9702,7 +9698,7 @@ msgstr "Cuenta de gastos en plantilla producto"
#. module: account
#: field:account.analytic.line,amount_currency:0
msgid "Amount currency"
msgstr ""
msgstr "Moneda del importe"
#. module: account
#: code:addons/account/wizard/account_report_aged_partner_balance.py:55
@@ -9728,6 +9724,13 @@ msgid ""
"certain amount of information. They have to be certified by an external "
"auditor annually."
msgstr ""
"Cree y gestione las cuentas que necesite para codificar asientos en los "
"diarios. Una cuenta es parte de un plan de cuentas que permite a su compañía "
"registrar todo tipo de transacciones de crédito y débito. Las compañías "
"presentan sus cuentas anuales en dos partes principales: El balance y la "
"cuenta de pérdidas y ganancias. Las cuentas anuales de una compañía son "
"requeridas por ley para que contengan cierta cantidad de información. Tienen "
"que ser certificadas por un auditor externo anualmente."
#. module: account
#: help:account.move.line,amount_residual_currency:0
@@ -9735,6 +9738,8 @@ msgid ""
"The residual amount on a receivable or payable of a journal entry expressed "
"in its currency (maybe different of the company currency)."
msgstr ""
"El importe residual de un apunte a cobrar o a pagar expresado en su moneda "
"(puede ser diferente de la moneda de la compañía)."
#~ msgid "Confirm statement from draft"
#~ msgstr "Confirmar extracto desde borrador"
@@ -9935,6 +9940,11 @@ msgstr ""
#~ msgid "Analytic Credit"
#~ msgstr "Haber analítico"
#, python-format
#~ msgid ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
#~ msgstr "El balance previsto (%.2f) es diferente del calculado. (%.2f)"
#~ msgid "Continue"
#~ msgstr "Continuar"
@@ -9962,6 +9972,10 @@ msgstr ""
#~ msgid "Crédit"
#~ msgstr "Haber"
#, python-format
#~ msgid "The statement balance is incorrect !\n"
#~ msgstr "El balance del extracto es incorrecto!\n"
#~ msgid "Legal Statements"
#~ msgstr "Declaraciones Legales"
addons/account/i18n/es_EC.po
+31 -19
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: 2011-01-19 04:44+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:57+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -750,12 +750,6 @@ msgstr "Revisar"
msgid "Partners Reconciled Today"
msgstr "Empresas conciliadas hoy"
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr "The statement balance is incorrect !\n"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2707,12 +2701,12 @@ msgid "August"
msgstr "Agosto"
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
"The expected balance (%.2f) is different than the computed one. (%.2f)"
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2966,6 +2960,12 @@ msgstr "La cuenta base de la declaración de impuestos."
msgid "View"
msgstr "Vista"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4400,12 +4400,6 @@ msgstr ""
msgid "Account Balance -"
msgstr "Saldo de cuenta -"
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr "Invoice "
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5756,10 +5750,10 @@ msgstr ""
"(i.e. paid) in the system."
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgstr "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
#: view:account.chart.template:0
@@ -11884,6 +11878,12 @@ msgstr ""
#~ msgstr ""
#~ "Cash Register allows you to manage cash entries in your cash journals."
#, python-format
#~ msgid ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
#~ msgstr ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
#~ msgid "Customer Invoices to Validate"
#~ msgstr "Facturas de Cliente a Validar"
@@ -11954,6 +11954,10 @@ msgstr ""
#~ "If the active field is set to true, it will allow you to hide the payment "
#~ "term without removing it."
#, python-format
#~ msgid "Invoice "
#~ msgstr "Invoice "
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Nombre de modelo no válido en la definición de acción."
@@ -12010,6 +12014,10 @@ msgstr ""
#~ "impossible any new entry record. Close a fiscal year when you need to "
#~ "finalize your end of year results definitive."
#, python-format
#~ msgid "The statement balance is incorrect !\n"
#~ msgstr "The statement balance is incorrect !\n"
#~ msgid "TITLE COMPANY"
#~ msgstr "TITLE COMPANY"
@@ -12033,6 +12041,10 @@ msgstr ""
#~ "all lines of your statement. When you are in the Payment column of the a "
#~ "line, you can press F1 to open the reconciliation form."
#, python-format
#~ msgid "is validated."
#~ msgstr "is validated."
#~ msgid "Treasory Analysis"
#~ msgstr "Treasory Analysis"
addons/account/i18n/es_PY.po
+10274
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/et.po
+15 -20
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: 2011-01-15 05:19+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:49+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -708,12 +708,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2574,9 +2568,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2813,6 +2808,12 @@ msgstr ""
msgid "View"
msgstr "Vaade"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4183,12 +4184,6 @@ msgstr ""
msgid "Account Balance -"
msgstr "Konto bilanss -"
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5475,9 +5470,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
@@ -9909,6 +9904,9 @@ msgstr ""
#~ msgid "Unpaid invoices"
#~ msgstr "Maksmata arved"
#~ msgid "Unpaid Supplier Refunds"
#~ msgstr "Maksmata tarnija hüvitised"
#~ msgid "Are you sure you want to refund this invoice ?"
#~ msgstr "Oled sa kindel, et soovid hüvitada seda arvet?"
@@ -10249,9 +10247,6 @@ msgstr ""
#~ msgid "The opening journal must not have any entry in the new fiscal year !"
#~ msgstr "Avatav päevik ei tohi sisaldama kirjeid uues finantsaastas !"
#~ msgid "Unpaid Supplier Refunds"
#~ msgstr "Maksmata tarnija hüvitised"
#~ msgid "Print Journal"
#~ msgstr "Prindi päevik"
addons/account/i18n/eu.po
+12 -17
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: 2011-01-15 05:18+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:47+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -709,12 +709,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2575,9 +2569,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2814,6 +2809,12 @@ msgstr ""
msgid "View"
msgstr ""
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4184,12 +4185,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5479,9 +5474,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/fa.po
+12 -17
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: 2011-01-15 05:22+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:52+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -709,12 +709,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2575,9 +2569,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2814,6 +2809,12 @@ msgstr ""
msgid "View"
msgstr ""
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4184,12 +4185,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5479,9 +5474,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/fa_AF.po
+9623
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/fi.po
+23 -19
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: 2011-01-19 04:42+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:49+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -715,12 +715,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr "Tiliotteen saldo on virheellinen!\n"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -1237,7 +1231,7 @@ msgstr ""
#. module: account
#: report:account.invoice:0
msgid "Your Reference"
msgstr ""
msgstr "Viitteenne"
#. module: account
#: view:account.move.reconcile:0
@@ -2594,11 +2588,12 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr "Oletettu saldo (%.2f) on erisuuri kuin laskettu. (%2f)"
msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2842,6 +2837,12 @@ msgstr "Verotuksen tilipohja."
msgid "View"
msgstr "Näkymä"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4217,12 +4218,6 @@ msgstr ""
msgid "Account Balance -"
msgstr "Tilin saldo -"
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5525,9 +5520,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
@@ -10003,6 +9998,11 @@ msgstr ""
#~ msgid "Select invoices you want to pay and manages advances"
#~ msgstr "Valitse maksettavat laskut sekä hallinnoi ennakkomaksuja"
#, python-format
#~ msgid ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
#~ msgstr "Oletettu saldo (%.2f) on erisuuri kuin laskettu. (%2f)"
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "Virheellinen XML näkymäarkkitehtuurille!"
@@ -10558,6 +10558,10 @@ msgstr ""
#~ msgid "Parent Analytic Account"
#~ msgstr "Ylempi analyyttinen tili"
#, python-format
#~ msgid "The statement balance is incorrect !\n"
#~ msgstr "Tiliotteen saldo on virheellinen!\n"
#~ msgid "Partner Ref."
#~ msgstr "Kumppanin viite"
addons/account/i18n/fr.po
+31 -19
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: 2011-01-21 04:39+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:49+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: code:addons/account/account.py:1291
@@ -817,12 +817,6 @@ msgstr "Chèque"
msgid "Partners Reconciled Today"
msgstr "Partenaires rapprochés aujourd'hui"
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr "Le solde du relevé est incorrect.\n"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2782,11 +2776,12 @@ msgid "August"
msgstr "Août"
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr "Le solde affiché (%.2f) est différent du solde calculé. (%.2f)"
msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -3032,6 +3027,12 @@ msgstr "La base de compte de la déclaration fiscale."
msgid "View"
msgstr "Vue"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4476,12 +4477,6 @@ msgstr ""
msgid "Account Balance -"
msgstr "Balance"
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr "Facture "
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5830,10 +5825,10 @@ msgstr ""
"(c'est à dire payée) dans le système."
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgstr "est validé."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
#: view:account.chart.template:0
@@ -11906,6 +11901,10 @@ msgstr ""
#~ msgid "Error ! You can not create recursive Menu."
#~ msgstr "Erreur ! Vous ne pouvez pas créer de menu récursif."
#, python-format
#~ msgid "Invoice "
#~ msgstr "Facture "
#~ msgid ""
#~ "This account will be used for invoices instead of the default one to value "
#~ "expenses for the current product"
@@ -11913,6 +11912,10 @@ msgstr ""
#~ "Ce compte sera utilisé pour les factures à la place du compte par défaut "
#~ "pour valoriser les charges liées au produit actuel"
#, python-format
#~ msgid "is validated."
#~ msgstr "est validé."
#~ msgid "Cash Journal - (test)"
#~ msgstr "Journal de liquidités - (test)"
@@ -11974,6 +11977,15 @@ msgstr ""
#~ "indiquant qu'il rembourse une partie ou la totalité de la facture qu'il vous "
#~ "a adressée."
#, python-format
#~ msgid "The statement balance is incorrect !\n"
#~ msgstr "Le solde du relevé est incorrect.\n"
#, python-format
#~ msgid ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
#~ msgstr "Le solde affiché (%.2f) est différent du solde calculé. (%.2f)"
#~ msgid ""
#~ "Customer Refunds helps you manage the credit notes issued/to be issued for "
#~ "your customers. A refund invoice is a document that cancels an invoice or a "
addons/account/i18n/fr_BE.po
+12 -17
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: 2011-01-15 05:26+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:56+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -709,12 +709,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2577,9 +2571,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2816,6 +2811,12 @@ msgstr ""
msgid "View"
msgstr ""
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4186,12 +4187,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5481,9 +5476,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/gl.po
+655 -495
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/gu.po
+13 -18
View File
@@ -14,13 +14,13 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-01-15 05:20+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:50+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
msgid "System payment"
msgstr ""
msgstr "ચુકવણી"
#. module: account
#: view:account.journal:0
@@ -709,12 +709,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2575,9 +2569,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2814,6 +2809,12 @@ msgstr ""
msgid "View"
msgstr "જુઓ"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4184,12 +4185,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5479,9 +5474,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/he.po
+12 -17
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: 2011-01-15 05:20+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:50+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -709,12 +709,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2575,9 +2569,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2814,6 +2809,12 @@ msgstr ""
msgid "View"
msgstr ""
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4184,12 +4185,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5479,9 +5474,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/hi.po
+12 -17
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: 2011-01-15 05:21+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:50+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -710,12 +710,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2576,9 +2570,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2815,6 +2810,12 @@ msgstr ""
msgid "View"
msgstr ""
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4185,12 +4186,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5480,9 +5475,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/hr.po
+26 -18
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: 2011-01-18 04:42+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:53+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -716,12 +716,6 @@ msgstr "Čekovi"
msgid "Partners Reconciled Today"
msgstr "Danas zatvoreni partneri"
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr "Saldo izvoda je netočan !\n"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2595,11 +2589,12 @@ msgid "August"
msgstr "Kolovoz"
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr "Očekivani slado (%.2f) je različit od izračunatog. (%.2f)"
msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2836,6 +2831,12 @@ msgstr "Porezna osnovica"
msgid "View"
msgstr "Pogled"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4212,12 +4213,6 @@ msgstr ""
msgid "Account Balance -"
msgstr "Saldo konta -"
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr "Račun "
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5516,9 +5511,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
@@ -9765,6 +9760,11 @@ msgstr ""
#~ msgid "Ending Balance"
#~ msgstr "Završni saldo"
#, python-format
#~ msgid ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
#~ msgstr "Očekivani slado (%.2f) je različit od izračunatog. (%.2f)"
#~ msgid "Continue"
#~ msgstr "Nastavi"
@@ -10099,6 +10099,10 @@ msgstr ""
#~ msgid "Entries by Statements"
#~ msgstr "Stavke po izvodima"
#, python-format
#~ msgid "The statement balance is incorrect !\n"
#~ msgstr "Saldo izvoda je netočan !\n"
#~ msgid "Confirm statement with/without reconciliation from draft statement"
#~ msgstr "Potvrdi izvod sa/bez usklađivanja sa izvodom u pripremi."
@@ -10821,3 +10825,7 @@ msgstr ""
#~ msgid "Template for Fiscal Mapping"
#~ msgstr "Predložak fiskalnog mapiranja"
#, python-format
#~ msgid "Invoice "
#~ msgstr "Račun "
addons/account/i18n/hu.po
+47 -33
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-02-09 17:14+0000\n"
"PO-Revision-Date: 2011-03-18 11:11+0000\n"
"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\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: 2011-02-10 04:35+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-19 05:19+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -747,12 +747,6 @@ msgstr "Csekk"
msgid "Partners Reconciled Today"
msgstr "Ma párosított partnerek"
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr "Hibás kivonat egyenleg!\n"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -1688,7 +1682,7 @@ msgid ""
msgstr ""
"Számlatükör megjelenítése üzleti évenként és időszak szerinti szűréssel. A "
"főkönyvi számlákat faszerkezetben mutatja. A számlára klikkelve megjeleníti "
"a a számla könyvelési tételeit."
"a számla könyvelési tételeit."
#. module: account
#: constraint:account.fiscalyear:0
@@ -1846,7 +1840,7 @@ msgstr "Soronkénti tételek"
#. module: account
#: report:account.tax.code.entries:0
msgid "A/c Code"
msgstr "Számla száma"
msgstr "Főkönyvi számla"
#. module: account
#: field:account.invoice,move_id:0
@@ -2698,11 +2692,14 @@ msgid "August"
msgstr "Augusztus"
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr "A várt egyenleg (%.2f) eltér a számított egyenlegtől (%.2f)."
msgstr ""
"A kivonat egyenlege hibás!\n"
"A várt egyenleg (%.2f) eltér a számított egyenlegtől (%.2f)."
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2949,6 +2946,12 @@ msgstr "Az adóbevallásban szereplő adóalap."
msgid "View"
msgstr "Gyűjtő"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr "BNK%s"
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -3643,7 +3646,7 @@ msgstr "Leképezés"
#: field:account.move.reconcile,name:0
#: field:account.subscription,name:0
msgid "Name"
msgstr "Név"
msgstr "Megnevezés"
#. module: account
#: model:ir.model,name:account.model_account_aged_trial_balance
@@ -4171,7 +4174,7 @@ msgstr "A rendszer nem talál érvényes időszakot!"
#. module: account
#: report:account.tax.code.entries:0
msgid "Voucher No"
msgstr "Nyugta száma"
msgstr "Bizonylat sorszáma"
#. module: account
#: view:wizard.multi.charts.accounts:0
@@ -4383,12 +4386,6 @@ msgstr ""
msgid "Account Balance -"
msgstr "Számla egyenleg -"
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr "Számla "
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -4952,8 +4949,8 @@ msgstr "Tranzakció"
#: help:account.tax.template,tax_code_id:0
msgid "Use this code for the VAT declaration."
msgstr ""
"Az itt megadott kód sorában jelenik meg az adóalap az adókimutatásban és az "
"adókivonatban, amelyek alapján az ÁFA-bevallás elkészíthető."
"Az itt megadott kód sorában jelenik meg az adóalap/adó az adókimutatásban és "
"az adókivonatban, amelyek alapján az ÁFA-bevallás elkészíthető."
#. module: account
#: view:account.move.line:0
@@ -5186,7 +5183,8 @@ msgstr "Devizaösszeg"
msgid ""
"Specified Journal does not have any account move entries in draft state for "
"this period"
msgstr "A megadott naplóban nincs tervezet állapotú tétel a kért időszakban"
msgstr ""
"A megadott naplóban nincs tervezet állapotú tétel ebben az időszakban."
#. module: account
#: model:ir.actions.act_window,name:account.action_view_move_line
@@ -5727,10 +5725,10 @@ msgstr ""
"rendszerben."
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgstr "jóváhagyásra került."
msgid "Invoice '%s' is validated."
msgstr "'%s' számla jóváhagyásra került."
#. module: account
#: view:account.chart.template:0
@@ -6410,11 +6408,10 @@ msgid ""
"reconcile in a series of accounts. It finds entries for each partner where "
"the amounts correspond."
msgstr ""
"Egy vevő/szállító számla akkor minősül rendezettnek, ha az párosításra "
"került a banki/pénztári kifizetéssel vagy egy jóváíró számlával vagy egy "
"szállító/vevő számlával. Az automatikus párosítás funkció minden partnerre "
"megkeresi a párosítható tételeket. Az összegében egyező tételek párosítását "
"végrehajtja."
"Egy számla akkor minősül rendezettnek, ha az párosításra került a "
"banki/pénztári kifizetéssel vagy egy jóváíró számlával. Az automatikus "
"párosítás funkció minden partnerre megkeresi a párosítható tételeket. Az "
"összegében egyező tételek párosítását végrehajtja."
#. module: account
#: view:account.move:0
@@ -7848,7 +7845,7 @@ msgid ""
"the start and end of the month or quarter."
msgstr ""
"Ez a menüpont kinyomtatja a számlákon vagy kifizetéseken alapuló ÁFA-"
"kimutatást, amely alapján összeállítható az ÁFA-bevallás. Válassza ki a "
"kimutatást, amelynek alapján az ÁFA-bevallás elkészíthető. Válassza ki a "
"megfelelő időszakot. Valós idejű adatokat tartalmaz, így bármikor "
"tájékozódhat a bevallandó ÁFÁ-ról."
@@ -10273,6 +10270,10 @@ msgstr ""
#~ msgid "Amount paid"
#~ msgstr "Kifizetés összege"
#, python-format
#~ msgid "The statement balance is incorrect !\n"
#~ msgstr "Hibás kivonat egyenleg!\n"
#~ msgid "Total quantity"
#~ msgstr "Mennyiség összesen"
@@ -10479,3 +10480,16 @@ msgstr ""
#~ msgid "Entry encoding"
#~ msgstr "Adatbevitel"
#, python-format
#~ msgid "Invoice "
#~ msgstr "Számla "
#, python-format
#~ msgid "is validated."
#~ msgstr "jóváhagyásra került."
#, python-format
#~ msgid ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
#~ msgstr "A várt egyenleg (%.2f) eltér a számított egyenlegtől (%.2f)."
addons/account/i18n/id.po
+28 -28
View File
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-02-18 10:04+0000\n"
"PO-Revision-Date: 2011-02-24 07:59+0000\n"
"Last-Translator: moelyana <Unknown>\n"
"Language-Team: Indonesian <id@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-02-19 05:05+0000\n"
"X-Generator: Launchpad (build 12351)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:50+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -76,7 +76,7 @@ msgstr "Harap buat nomor urut untuk jurnal tagihan"
#. module: account
#: constraint:account.period:0
msgid "Error ! The duration of the Period(s) is/are invalid. "
msgstr "Ada kesalahan! Jangka waktu periode salah "
msgstr "Maaf! durasi/jangka waktu Periode salah "
#. module: account
#: field:account.analytic.line,currency_id:0
@@ -332,6 +332,7 @@ msgstr "St."
#, python-format
msgid "Invoice line account company does not match with invoice company."
msgstr ""
"Baris tagihan dari rekening perusahaan tidak sesuai dengan tagihan perusahaan"
#. module: account
#: field:account.journal.column,field:0
@@ -427,7 +428,7 @@ msgstr "Situasi Pembukaan/ Penutupan"
#. module: account
#: help:account.journal,currency:0
msgid "The currency used to enter statement"
msgstr "Mata uang yang digunakan untuk memasukkan pernyataan"
msgstr "Mata uang yang digunakan untuk masukkan pernyataan"
#. module: account
#: field:account.open.closed.fiscalyear,fyear_id:0
@@ -752,12 +753,6 @@ msgstr "Centang"
msgid "Partners Reconciled Today"
msgstr "Hari ini Para Mitra Telah Direkonsiliasi"
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr "Saldo neraca salah !\n"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2644,9 +2639,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2883,6 +2879,12 @@ msgstr ""
msgid "View"
msgstr "Tampilan"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4264,12 +4266,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5574,9 +5570,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
@@ -9724,12 +9720,12 @@ msgstr ""
#. module: account
#: selection:account.aged.trial.balance,direction_selection:0
msgid "Future"
msgstr ""
msgstr "Masa Depan"
#. module: account
#: view:account.move.line:0
msgid "Search Journal Items"
msgstr ""
msgstr "Cari Jurnal Produk"
#. module: account
#: help:account.tax,base_sign:0
@@ -9746,12 +9742,12 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Template Account Fiscal Mapping"
msgstr ""
msgstr "Template Akun Pemetaan Fiskal"
#. module: account
#: field:account.chart.template,property_account_expense:0
msgid "Expense Account on Product Template"
msgstr ""
msgstr "Beban Account pada Template Produk"
#. module: account
#: field:account.analytic.line,amount_currency:0
@@ -9762,13 +9758,13 @@ msgstr ""
#: code:addons/account/wizard/account_report_aged_partner_balance.py:55
#, python-format
msgid "You must enter a period length that cannot be 0 or below !"
msgstr ""
msgstr "Jumlah mata uang"
#. module: account
#: code:addons/account/account.py:501
#, python-format
msgid "You cannot remove an account which has account entries!. "
msgstr ""
msgstr "Anda tidak dapat menghapus akun yang akunnya sudah tercatat "
#. module: account
#: model:ir.actions.act_window,help:account.action_account_form
@@ -9788,8 +9784,8 @@ msgid ""
"The residual amount on a receivable or payable of a journal entry expressed "
"in its currency (maybe different of the company currency)."
msgstr ""
"Jumlah sisa piutang/ hutang dari catatan jurnal dinyatakan dalam mata "
"uangnya (yang mungkin berbeda dari mata uang perusahaan)."
"Jumlah residual pada piutang / hutang dari catatan jurnal dinyatakan dalam "
"mata uang (mungkin berbeda dari mata uang perusahaan)."
#~ msgid "Asset"
#~ msgstr "Aktiva"
@@ -10174,3 +10170,7 @@ msgstr ""
#~ msgid "Customize Report"
#~ msgstr "Mengatur Laporan"
#, python-format
#~ msgid "The statement balance is incorrect !\n"
#~ msgstr "Saldo neraca salah !\n"
addons/account/i18n/it.po
+38 -26
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: 2011-02-02 04:40+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:50+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -753,12 +753,6 @@ msgstr "Controllo"
msgid "Partners Reconciled Today"
msgstr "Partner con riconliliazione effettuata oggi."
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr "Il bilancio della registrazione non è corretto!\n"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -1085,7 +1079,7 @@ msgstr "In contestazione"
#: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
#: model:ir.ui.menu,name:account.journal_cash_move_lines
msgid "Cash Registers"
msgstr "Registratori di Cassa"
msgstr "Movimenti Registratore di Cassa"
#. module: account
#: selection:account.account.type,report_type:0
@@ -2710,11 +2704,12 @@ msgid "August"
msgstr "Agosto"
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr "Il saldo calcolato (%.2f) è diverso da quello inserito. (%.2f)"
msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2967,6 +2962,12 @@ msgstr "Il conto si basa sulla denuncia della tassa"
msgid "View"
msgstr "Vista"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -3715,7 +3716,7 @@ msgstr ""
#. module: account
#: view:account.analytic.line:0
msgid "General Accounting"
msgstr "Contabilita' generale"
msgstr "Contabilità generale"
#. module: account
#: report:account.overdue:0
@@ -4402,12 +4403,6 @@ msgstr ""
msgid "Account Balance -"
msgstr "Bilancio"
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr "Fattura "
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -4839,7 +4834,7 @@ msgstr "Bilancio"
#. module: account
#: model:ir.ui.menu,name:account.final_accounting_reports
msgid "Accounting Reports"
msgstr "Reports di contabilita'"
msgstr "Reports di contabilità"
#. module: account
#: field:account.move,line_id:0
@@ -4946,7 +4941,7 @@ msgstr "Periodo non trovato !"
#. module: account
#: field:account.journal,update_posted:0
msgid "Allow Cancelling Entries"
msgstr "Conferma cancellazione voci"
msgstr "Consenti cancellazione registrazioni"
#. module: account
#: field:account.tax.code,sign:0
@@ -5667,8 +5662,8 @@ msgid ""
"Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
"Forma' state!"
msgstr ""
"Le fatture scelte non possono essere confermate, essendo nello stato 'Draft' "
"o 'Pro-forma'"
"Le fatture scelte non possono essere confermate, non essendo nello stato "
"'Draft' o 'Pro-forma'!"
#. module: account
#: report:account.invoice:0
@@ -5745,10 +5740,10 @@ msgstr ""
"nel sistema viene mutato in \"eseguito\" (e.s. pagata)."
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgstr "è convalidato."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
#: view:account.chart.template:0
@@ -7625,7 +7620,7 @@ msgstr ""
#: view:account.installer.modules:0
msgid "Add extra Accounting functionalities to the ones already installed."
msgstr ""
"Aggiunge ulteriori funzionalita' alla contabilita', oltre a quelle gia' "
"Aggiunge ulteriori funzionalità alla contabilità, oltre a quelle già "
"installate"
#. module: account
@@ -10969,6 +10964,14 @@ msgstr ""
#~ msgid "Error ! You can not create recursive Menu."
#~ msgstr "Errore! Non è possibile creare un menù ricorsivo."
#, python-format
#~ msgid "Invoice "
#~ msgstr "Fattura "
#, python-format
#~ msgid "is validated."
#~ msgstr "è convalidato."
#~ msgid ""
#~ "A journal entry consists of several journal items, each of which is either a "
#~ "debit or a credit. OpenERP creates automatically one journal entry per "
@@ -11000,6 +11003,10 @@ msgstr ""
#~ "emesse. OpenERP genera in modo automatico le fatture in stato di bozza, in "
#~ "modo che basti confermarle per poterle spedire al cliente."
#, python-format
#~ msgid "The statement balance is incorrect !\n"
#~ msgstr "Il bilancio della registrazione non è corretto!\n"
#~ msgid ""
#~ "Exception made of a mistake of our side, it seems that the following bills "
#~ "stay unpaid. Please, take appropriate measures in order to carry out this "
@@ -11018,6 +11025,11 @@ msgstr ""
#~ "Il rimborso da un fornitore consiste in una nota di credito che indica che "
#~ "rimborsa in tutto od in parte una fattura che ha inviato."
#, python-format
#~ msgid ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
#~ msgstr "Il saldo calcolato (%.2f) è diverso da quello inserito. (%.2f)"
#~ msgid ""
#~ "A supplier refund is a credit note from your supplier indicating that he "
#~ "refunds part or totality of the invoice sent to you."
addons/account/i18n/kab.po
+12 -17
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: 2011-01-15 05:21+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:51+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -709,12 +709,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2575,9 +2569,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2814,6 +2809,12 @@ msgstr ""
msgid "View"
msgstr ""
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4184,12 +4185,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5479,9 +5474,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/ko.po
+12 -17
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: 2011-01-15 05:21+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:51+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -709,12 +709,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2575,9 +2569,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2814,6 +2809,12 @@ msgstr ""
msgid "View"
msgstr ""
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4184,12 +4185,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5479,9 +5474,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/lo.po
+12 -17
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: 2011-01-19 04:43+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:51+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -709,12 +709,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2575,9 +2569,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2814,6 +2809,12 @@ msgstr ""
msgid "View"
msgstr ""
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4184,12 +4185,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5479,9 +5474,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/lt.po
+22 -18
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: 2011-01-15 05:22+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:51+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -714,12 +714,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr "Dokumento balansas neteisingas!\n"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2588,11 +2582,12 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr "Tikėtinas balansas (%.2f) skirtingas nuo apskaičiuotojo. (%.2f)"
msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2827,6 +2822,12 @@ msgstr "Deklaruojama mokesčių suma"
msgid "View"
msgstr "Žiūrėti"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4205,12 +4206,6 @@ msgstr ""
msgid "Account Balance -"
msgstr "Sąskaitos balansas -"
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5509,9 +5504,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
@@ -10185,6 +10180,11 @@ msgstr ""
#~ msgid "Bank Receipt"
#~ msgstr "Banko pajamos"
#, python-format
#~ msgid ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
#~ msgstr "Tikėtinas balansas (%.2f) skirtingas nuo apskaičiuotojo. (%.2f)"
#~ msgid "Fiscal Position Template Account Mapping"
#~ msgstr "Sąskaitų fiskalinės pozicijos nustatymai"
@@ -10776,5 +10776,9 @@ msgstr ""
#~ msgid "Untaxed amount"
#~ msgstr "Suma be mokesčių"
#, python-format
#~ msgid "The statement balance is incorrect !\n"
#~ msgstr "Dokumento balansas neteisingas!\n"
#~ msgid "Legal Statements"
#~ msgstr "Teisiniai dokumentai"
addons/account/i18n/lv.po
+50 -53
View File
@@ -8,30 +8,30 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2010-12-12 02:11+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"PO-Revision-Date: 2011-04-01 08:51+0000\n"
"Last-Translator: Vladimirs Kuzmins <Unknown>\n"
"Language-Team: Latvian <lv@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-01-15 05:21+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-04-02 04:55+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
msgid "System payment"
msgstr ""
msgstr "Sistēmas maksājums"
#. module: account
#: view:account.journal:0
msgid "Other Configuration"
msgstr ""
msgstr "Cita konfigurācija"
#. module: account
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
#, python-format
msgid "No End of year journal defined for the fiscal year"
msgstr ""
msgstr "Finanšu gadam nav definēts gada beigu žurnāls"
#. module: account
#: code:addons/account/account.py:506
@@ -79,7 +79,7 @@ msgstr "Kļūda! Perioda ilgums nav pareizs. "
#. module: account
#: field:account.analytic.line,currency_id:0
msgid "Account currency"
msgstr ""
msgstr "Konta Valūta"
#. module: account
#: view:account.tax:0
@@ -94,7 +94,7 @@ msgstr ""
#. module: account
#: field:account.partner.ledger,reconcil:0
msgid "Include Reconciled Entries"
msgstr ""
msgstr "Iekļaut saskaņotos ierakstus"
#. module: account
#: view:account.pl.report:0
@@ -106,7 +106,7 @@ msgstr ""
#. module: account
#: model:process.transition,name:account.process_transition_invoiceimport0
msgid "Import from invoice or payment"
msgstr ""
msgstr "Importēt no rēķina vai maksājuma"
#. module: account
#: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -165,7 +165,7 @@ msgstr "Atsauce"
#. module: account
#: view:account.open.closed.fiscalyear:0
msgid "Choose Fiscal Year "
msgstr ""
msgstr "Izvēlēties finanšu gadu "
#. module: account
#: help:account.payment.term,active:0
@@ -178,7 +178,7 @@ msgstr ""
#: code:addons/account/invoice.py:1421
#, python-format
msgid "Warning!"
msgstr ""
msgstr "Uzmanību!"
#. module: account
#: field:account.fiscal.position.account,account_src_id:0
@@ -194,7 +194,7 @@ msgstr "Visi Analītiskie Ieraksti"
#. module: account
#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
msgid "Invoices Created Within Past 15 Days"
msgstr ""
msgstr "Rēķini, kas izveidoti pēdējās 15 dienās"
#. module: account
#: selection:account.account.type,sign:0
@@ -205,7 +205,7 @@ msgstr "Negatīvs"
#: code:addons/account/wizard/account_move_journal.py:95
#, python-format
msgid "Journal: %s"
msgstr ""
msgstr "Žurnāls: %s"
#. module: account
#: help:account.analytic.journal,type:0
@@ -233,6 +233,8 @@ msgid ""
"No period defined for this date: %s !\n"
"Please create a fiscal year."
msgstr ""
"Šim datumam nav definēts periods: %s !\n"
"Lūdzu, izveidojiet finanšu gadu!"
#. module: account
#: model:ir.model,name:account.model_account_move_line_reconcile_select
@@ -258,7 +260,7 @@ msgstr ""
#: code:addons/account/invoice.py:1210
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
msgstr ""
msgstr "Rēķins '%s' ir apmaksāts daļēji: %s%s no %s%s (%s%s atlicis)"
#. module: account
#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
@@ -268,7 +270,7 @@ msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
msgid "Belgian Reports"
msgstr ""
msgstr "Beļģijas atskaites"
#. module: account
#: code:addons/account/account_move_line.py:1176
@@ -279,7 +281,7 @@ msgstr ""
#. module: account
#: view:account.bank.statement:0
msgid "Calculated Balance"
msgstr ""
msgstr "Aprēķināta bilance"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
@@ -291,12 +293,12 @@ msgstr ""
#. module: account
#: view:account.fiscalyear.close.state:0
msgid "Close Fiscalyear"
msgstr ""
msgstr "Slēgt finanšu gadu"
#. module: account
#: field:account.automatic.reconcile,allow_write_off:0
msgid "Allow write off"
msgstr ""
msgstr "Atļaut norakstīšanu"
#. module: account
#: view:account.analytic.chart:0
@@ -312,7 +314,7 @@ msgstr ""
#: code:addons/account/invoice.py:529
#, python-format
msgid "Invoice line account company does not match with invoice company."
msgstr ""
msgstr "Rēķina rindas konta uzņēmums neatbilst rēķina uzņēmumam."
#. module: account
#: field:account.journal.column,field:0
@@ -351,7 +353,7 @@ msgstr "Iepirkuma Parametri"
#: view:account.installer:0
#: view:account.installer.modules:0
msgid "Configure"
msgstr ""
msgstr "Konfigurēt"
#. module: account
#: selection:account.entries.report,month:0
@@ -360,7 +362,7 @@ msgstr ""
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "June"
msgstr ""
msgstr "Jūnijs"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_moves_bank
@@ -416,7 +418,7 @@ msgstr ""
#. module: account
#: field:account.journal,default_debit_account_id:0
msgid "Default Debit Account"
msgstr ""
msgstr "Noklusējuma debeta konts"
#. module: account
#: view:account.move:0
@@ -438,7 +440,7 @@ msgstr ""
#: field:account.tax.template,chart_template_id:0
#: field:wizard.multi.charts.accounts,chart_template_id:0
msgid "Chart Template"
msgstr ""
msgstr "Grafika sagatave"
#. module: account
#: help:account.model.line,amount_currency:0
@@ -499,7 +501,7 @@ msgstr "Žurnāls"
#. module: account
#: model:ir.model,name:account.model_account_invoice_confirm
msgid "Confirm the selected invoices"
msgstr ""
msgstr "Apstiprināt izvēlētos rēķinus"
#. module: account
#: field:account.addtmpl.wizard,cparent_id:0
@@ -528,12 +530,12 @@ msgstr ""
#: help:account.report.general.ledger,chart_account_id:0
#: help:account.vat.declaration,chart_account_id:0
msgid "Select Charts of Accounts"
msgstr ""
msgstr "Izvēlēties kontu plānu"
#. module: account
#: view:product.product:0
msgid "Purchase Taxes"
msgstr ""
msgstr "Iegādes nodokļi"
#. module: account
#: model:ir.model,name:account.model_account_invoice_refund
@@ -588,12 +590,12 @@ msgstr "Visi"
#. module: account
#: field:account.invoice.report,address_invoice_id:0
msgid "Invoice Address Name"
msgstr ""
msgstr "Rēķina adreses nosaukums"
#. module: account
#: selection:account.installer,period:0
msgid "3 Monthly"
msgstr ""
msgstr "Ik pēc trim mēn."
#. module: account
#: view:account.unreconcile.reconcile:0
@@ -605,7 +607,7 @@ msgstr ""
#. module: account
#: view:analytic.entries.report:0
msgid " 30 Days "
msgstr ""
msgstr " 30 dienas "
#. module: account
#: field:ir.sequence,fiscal_ids:0
@@ -620,7 +622,7 @@ msgstr ""
#. module: account
#: report:account.central.journal:0
msgid "Centralized Journal"
msgstr ""
msgstr "Centralizēts žurnāls"
#. module: account
#: sql_constraint:account.sequence.fiscalyear:0
@@ -663,7 +665,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_journal_period
msgid "Journal Period"
msgstr ""
msgstr "Žurnāla periods"
#. module: account
#: code:addons/account/account_move_line.py:732
@@ -687,7 +689,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_report_general_ledger
msgid "General Ledger Report"
msgstr ""
msgstr "Galvenās grāmatas atskaite"
#. module: account
#: view:account.invoice:0
@@ -697,7 +699,7 @@ msgstr ""
#. module: account
#: view:account.use.model:0
msgid "Are you sure you want to create entries?"
msgstr ""
msgstr "Vai esat pārliecināti, ka vēlaties izveidot ierakstus?"
#. module: account
#: selection:account.bank.accounts.wizard,account_type:0
@@ -709,12 +711,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -724,14 +720,14 @@ msgstr "Procenti"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_charts
msgid "Charts"
msgstr ""
msgstr "Diagrammas"
#. module: account
#: code:addons/account/project/wizard/project_account_analytic_line.py:47
#: model:ir.model,name:account.model_project_account_analytic_line
#, python-format
msgid "Analytic Entries by line"
msgstr ""
msgstr "Analītiskie ieraksti pa rindām"
#. module: account
#: code:addons/account/wizard/account_change_currency.py:39
@@ -784,7 +780,7 @@ msgstr ""
#. module: account
#: view:account.payment.term.line:0
msgid "Due date Computation"
msgstr ""
msgstr "Termiņa aprēķins"
#. module: account
#: report:account.analytic.account.quantity_cost_ledger:0
@@ -798,7 +794,7 @@ msgstr ""
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "September"
msgstr ""
msgstr "Septembris"
#. module: account
#: selection:account.subscription,period_type:0
@@ -2580,9 +2576,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2821,6 +2818,12 @@ msgstr ""
msgid "View"
msgstr "Skatījums"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4191,12 +4194,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5491,9 +5488,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/mn.po
+31 -19
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: 2011-01-15 05:22+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:51+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -724,12 +724,6 @@ msgstr "Шалгах"
msgid "Partners Reconciled Today"
msgstr "Өнөөдөр төлбөр барагдсан харилцагч"
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr "Үлдэгдэл тохирохгүй байна !\n"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2622,12 +2616,12 @@ msgid "August"
msgstr "8 сар"
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
"Бодит үлдэгдэл (%.2f) нь тооцоолсон үлдэгдлээс ялгаатай байна. (%.2f)"
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2876,6 +2870,12 @@ msgstr "Татварын зарлалтын суурь данс."
msgid "View"
msgstr "Харах"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4283,12 +4283,6 @@ msgstr ""
msgid "Account Balance -"
msgstr "Дансны тэнцэл-"
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr "Нэхэмжлэл "
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5596,10 +5590,10 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgstr "батлагдсан."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
#: view:account.chart.template:0
@@ -11185,6 +11179,12 @@ msgstr ""
#~ msgstr ""
#~ "Кассын ордер нь танд бэлэн мөнгөний журналд гүйлгээ удирдах боломж олгоно."
#, python-format
#~ msgid ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
#~ msgstr ""
#~ "Бодит үлдэгдэл (%.2f) нь тооцоолсон үлдэгдлээс ялгаатай байна. (%.2f)"
#~ msgid ""
#~ "Supplier Invoices allows you to enter and manage invoices issued by your "
#~ "suppliers. OpenERP generates draft of supplier invoices automatically so "
@@ -11215,6 +11215,10 @@ msgstr ""
#~ msgid "Sale Tax"
#~ msgstr "Борлуулалтын татвар"
#, python-format
#~ msgid "Invoice "
#~ msgstr "Нэхэмжлэл "
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
@@ -11224,6 +11228,10 @@ msgstr ""
#~ msgid "Please select periods."
#~ msgstr "Мөчлөгөө сонгоно уу."
#, python-format
#~ msgid "The statement balance is incorrect !\n"
#~ msgstr "Үлдэгдэл тохирохгүй байна !\n"
#~ msgid ""
#~ "A bank statement is a summary of all financial transactions occurring over a "
#~ "given period of time on a deposit account, a credit card, or any other type "
@@ -11236,6 +11244,10 @@ msgstr ""
#~ "Эхлээд нээлтийн болон хаалтийн үлдэгдлээ оруулаад бүх гүйлгээнүүдээ шивж "
#~ "оруулна."
#, python-format
#~ msgid "is validated."
#~ msgstr "батлагдсан."
#~ msgid "Treasory Analysis"
#~ msgstr "Сан хөмрөгийн анализ"
addons/account/i18n/nb.po
+15 -19
View File
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-01-20 22:15+0000\n"
"Last-Translator: Terje Nauf <Unknown>\n"
"PO-Revision-Date: 2011-03-30 13:55+0000\n"
"Last-Translator: Rolv Råen (adEgo) <Unknown>\n"
"Language-Team: Norwegian Bokmal <nb@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-01-21 04:40+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-31 04:36+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -732,12 +732,6 @@ msgstr "Sjekk"
msgid "Partners Reconciled Today"
msgstr "Partnere avstemt i dag"
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -1162,6 +1156,7 @@ msgstr ""
#, python-format
msgid "You can not modify/delete a journal with entries for this period !"
msgstr ""
"Du kan ikke endre eller slette en journal med posteringer for angitt periode!"
#. module: account
#: help:account.invoice,origin:0
@@ -2600,9 +2595,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2839,6 +2835,12 @@ msgstr ""
msgid "View"
msgstr ""
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4209,12 +4211,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5504,9 +5500,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/nl.po
+36 -20
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: 2011-01-19 04:42+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:48+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: code:addons/account/account.py:1167
@@ -754,12 +754,6 @@ msgstr "Cheque"
msgid "Partners Reconciled Today"
msgstr "Vandaag afgeletterde relaties"
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr "Het saldo op het afschrift is onjuist!\n"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -1385,7 +1379,7 @@ msgstr "Belastingen zoeken"
#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger
msgid "Account Analytic Cost Ledger"
msgstr ""
msgstr "Analytisch kostenboek"
#. module: account
#: view:account.model:0
@@ -2004,6 +1998,9 @@ msgid ""
"be with same name as statement name. This allows the statement entries to "
"have the same references than the statement itself"
msgstr ""
"Wanneer u een andere waarde voor Naam opgeeft dan /, dan krijgen de "
"gecreëerde boekingen dezelfde waarde voor naam. Hierdoor zullen referenties "
"makkelijker terug te vinden zijn."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_unreconcile
@@ -2332,6 +2329,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"
#. module: account
#: field:account.invoice.tax,base_code_id:0
@@ -2515,6 +2515,8 @@ msgid ""
"You cannot modify company of this journal as its related record exist in "
"Entry Lines"
msgstr ""
"U kunt het bedrijf niet meer veranderen in dit dagboek omdat er inmiddels al "
"gerelateerde transacties op zijn geboekt."
#. module: account
#: report:account.journal.period.print:0
@@ -2707,12 +2709,12 @@ msgid "August"
msgstr "Augustus"
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
"Het verwachte saldo (%.2f) is verschillend van het berekende saldo (%.2f)."
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2966,6 +2968,12 @@ msgstr "De grootboekrekening van de belastingverklaring"
msgid "View"
msgstr "Aanzicht"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -3001,7 +3009,7 @@ msgstr "Begint op"
#. module: account
#: model:ir.model,name:account.model_account_partner_ledger
msgid "Account Partner Ledger"
msgstr ""
msgstr "Relatie grootboek/saldi"
#. module: account
#: help:account.journal.column,sequence:0
@@ -4386,12 +4394,6 @@ msgstr ""
msgid "Account Balance -"
msgstr "Grootboekkaart"
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr "Factuur "
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5689,9 +5691,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
@@ -10155,6 +10157,12 @@ msgstr ""
#~ msgid "Invoice import"
#~ msgstr "Factuurimport"
#, python-format
#~ msgid ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
#~ msgstr ""
#~ "Het verwachte saldo (%.2f) is verschillend van het berekende saldo (%.2f)."
#~ msgid "Ending Balance"
#~ msgstr "Eindsaldo"
@@ -11452,6 +11460,10 @@ msgstr ""
#~ msgid "logo"
#~ msgstr "logo"
#, python-format
#~ msgid "The statement balance is incorrect !\n"
#~ msgstr "Het saldo op het afschrift is onjuist!\n"
#~ msgid ""
#~ "Example: 14 days 2%, 30 days net\n"
#~ "1. Line 1: percent 0.02 14 days\n"
@@ -11550,3 +11562,7 @@ msgstr ""
#~ msgid "Ansicht"
#~ msgstr "Weergave"
#, python-format
#~ msgid "Invoice "
#~ msgstr "Factuur "
addons/account/i18n/nl_BE.po
+12 -17
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: 2011-01-15 05:26+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:56+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -711,12 +711,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2583,9 +2577,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2833,6 +2828,12 @@ msgstr "De rekeningbasis van de btw-aangifte."
msgid "View"
msgstr "Weergave"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4205,12 +4206,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5504,9 +5499,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/oc.po
+12 -17
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: 2011-01-15 05:22+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:52+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -709,12 +709,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2575,9 +2569,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2814,6 +2809,12 @@ msgstr ""
msgid "View"
msgstr "Afichatge"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4184,12 +4185,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5479,9 +5474,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/pl.po
+31 -19
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: 2011-01-15 05:22+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:52+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -746,12 +746,6 @@ msgstr "Czek"
msgid "Partners Reconciled Today"
msgstr "Partnerzy uzgodnieni dzisiaj"
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr "Bilans zestawienia jest nieprawidłowy !\n"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2666,11 +2660,12 @@ msgid "August"
msgstr "Sierpień"
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr "Spodziewane saldo (%.2f) jest inne od obliczonego. (%.2f)"
msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2916,6 +2911,12 @@ msgstr "Rejestr podstawy podatku"
msgid "View"
msgstr "Widok"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4318,12 +4319,6 @@ msgstr ""
msgid "Account Balance -"
msgstr "Saldo konta -"
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr "Faktura "
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5642,10 +5637,10 @@ msgstr ""
"'Wykonano'."
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgstr "zostało zatwierdzone."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
#: view:account.chart.template:0
@@ -10555,6 +10550,10 @@ msgstr ""
#~ msgid "Entry label"
#~ msgstr "Etykieta zapisu"
#, python-format
#~ msgid "The statement balance is incorrect !\n"
#~ msgstr "Bilans zestawienia jest nieprawidłowy !\n"
#~ msgid "Encode manually the statement"
#~ msgstr "Wprowadź ręcznie zestawienie"
@@ -10736,6 +10735,11 @@ msgstr ""
#~ msgid "Voucher Nb"
#~ msgstr "Nr vouchera"
#, python-format
#~ msgid ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
#~ msgstr "Spodziewane saldo (%.2f) jest inne od obliczonego. (%.2f)"
#~ msgid "Bank Receipt"
#~ msgstr "Potwierdzenie bankowe"
@@ -11497,9 +11501,17 @@ msgstr ""
#~ msgid "Error ! You can not create recursive Menu."
#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
#, python-format
#~ msgid "Invoice "
#~ msgstr "Faktura "
#~ msgid "Rule must have at least one checked access right !"
#~ msgstr "Reguła musi mieć zaznaczone co najmniej jedno prawo dostępu !"
#, python-format
#~ msgid "is validated."
#~ msgstr "zostało zatwierdzone."
#~ msgid "Cash Journal - (test)"
#~ msgstr "Dziennik kasowy (test)"
addons/account/i18n/pt.po
+34 -22
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: 2011-01-23 04:58+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:52+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -30,7 +30,7 @@ msgstr "Outras configurações"
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
#, python-format
msgid "No End of year journal defined for the fiscal year"
msgstr ""
msgstr "Nenhum diário de fim de ano definido para o ano fiscal"
#. module: account
#: code:addons/account/account.py:506
@@ -692,7 +692,7 @@ msgstr "Período de abertura"
#. module: account
#: model:ir.model,name:account.model_account_journal_period
msgid "Journal Period"
msgstr ""
msgstr "Período do Diário"
#. module: account
#: code:addons/account/account_move_line.py:732
@@ -738,12 +738,6 @@ msgstr "Cheque"
msgid "Partners Reconciled Today"
msgstr "Parceiros reconciliados hoje"
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr "O saldo do extrato é incorrecto!\n"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -1067,7 +1061,7 @@ msgstr "Em disputa"
#: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
#: model:ir.ui.menu,name:account.journal_cash_move_lines
msgid "Cash Registers"
msgstr ""
msgstr "Registos de Caixa"
#. module: account
#: selection:account.account.type,report_type:0
@@ -2636,11 +2630,12 @@ msgid "August"
msgstr "Agosto"
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr "O saldo esperado (%.2f) é diferente do calculado. (%.2f)"
msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2885,6 +2880,12 @@ msgstr "A contas base da declaração fiscal"
msgid "View"
msgstr "Ecrã"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4267,12 +4268,6 @@ msgstr ""
msgid "Account Balance -"
msgstr "Saldo da Conta -"
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr "Fatura "
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5578,10 +5573,10 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgstr "está validado"
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
#: view:account.chart.template:0
@@ -10342,6 +10337,10 @@ msgstr ""
#~ msgid "You can not validate a non-balanced entry !"
#~ msgstr "Não pode validar um movimento não balanceado."
#, python-format
#~ msgid "The statement balance is incorrect !\n"
#~ msgstr "O saldo do extrato é incorrecto!\n"
#~ msgid "Date or Code"
#~ msgstr "Data ou Código"
@@ -11328,6 +11327,10 @@ msgstr ""
#~ msgid "Error ! You can not create recursive Menu."
#~ msgstr "Erro! Não pode criar menus recursivos."
#, python-format
#~ msgid "Invoice "
#~ msgstr "Fatura "
#~ msgid "Size of the field can never be less than 1 !"
#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
@@ -11373,6 +11376,10 @@ msgstr ""
#~ msgid "Bilanzkonten - Aktiva - Vermögenskonten"
#~ msgstr "Balanço de Contas - Ativo - Contas financeiras"
#, python-format
#~ msgid "is validated."
#~ msgstr "está validado"
#~ msgid "Default UoM"
#~ msgstr "UdM Padrão"
@@ -11398,5 +11405,10 @@ msgstr ""
#~ "Faturas a clientes, permite criar e gerir as faturas emitidas aos clientes. "
#~ "O OpenERP gera faturas em rascunho automaticamente, que só terá de confirmar."
#, python-format
#~ msgid ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
#~ msgstr "O saldo esperado (%.2f) é diferente do calculado. (%.2f)"
#~ msgid "Ansicht"
#~ msgstr "Vista"
addons/account/i18n/pt_BR.po
+59 -33
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-02-20 20:25+0000\n"
"PO-Revision-Date: 2011-03-08 21:39+0000\n"
"Last-Translator: Emerson <Unknown>\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: 2011-02-21 04:50+0000\n"
"X-Generator: Launchpad (build 12351)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:56+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -749,12 +749,6 @@ msgstr "Verificar"
msgid "Partners Reconciled Today"
msgstr "Parceiros Reconciliados Hoje"
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr "O saldo do demonstrativo está incorreto\n"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2637,11 +2631,11 @@ msgid ""
"Note that journal entries that are automatically created by the system are "
"always skipping that state."
msgstr ""
"Marque esta caixa se cocê não quer novos lançamentos de diário passem pelo "
"estado de \"rascunho\" e ao invés ir diretamente para o estado \"postado\" "
"sem nenhuma validação manual. \n"
"Marque esta caixa se você não quer que novos lançamentos de diário passem "
"pelo estado 'provisório'. Ao invés disso, eles irão diretamente para o "
"estado 'postado' sem nenhuma validação manual. \n"
"Note que os lançamentos de diário que são automaticamente criados pelo "
"sistema estão sempre saindo daquele estado."
"sistema já pulam o status 'privisório'."
#. module: account
#: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
@@ -2707,11 +2701,12 @@ msgid "August"
msgstr "Agosto"
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr "O saldo esperado (%.2f) é diferente do calculado. (%.2f)"
msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2965,6 +2960,12 @@ msgstr "A base contábil da declaração de imposto."
msgid "View"
msgstr "Visualizar"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -3242,8 +3243,8 @@ msgid ""
"All selected journal entries will be validated and posted. It means you "
"won't be able to modify their accounting fields anymore."
msgstr ""
"Todas entradas do diário vão ser validadas e congeladas. Você então não "
"poderá mais alterar os campos delas."
"Todas os lançamentos do diário serão validados e postados. Isto significa "
"que você não poderá mais alterar seus campos."
#. module: account
#: code:addons/account/invoice.py:370
@@ -4004,6 +4005,11 @@ msgid ""
"the system on document validation (invoices, bank statements...) and will be "
"created in 'Posted' state."
msgstr ""
"Todos os novos lançamentos manuais de diário, geralmente, estão com status "
"'Não postado'. Mas você pode alterar o diário relacionado para pular esta "
"opção. Neste caso, os lançamentos vão se comportar como lançamentos criados "
"automaticamente pelo sistema na validação de documentos (faturas, extratos, "
"...) os quais já são gerados com status 'Postado'."
#. module: account
#: code:addons/account/account_analytic_line.py:91
@@ -4045,7 +4051,7 @@ msgstr "Descrição da taxa"
#: code:addons/account/report/common_report_header.py:68
#, python-format
msgid "All Posted Entries"
msgstr "Todos os lançamentos publicados"
msgstr "Todos os Lançamentos Postados"
#. module: account
#: code:addons/account/account_bank_statement.py:357
@@ -4404,12 +4410,6 @@ msgstr ""
msgid "Account Balance -"
msgstr "Saldo da conta -"
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr "Fatura "
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -4557,7 +4557,7 @@ msgstr "Planilha de Balanço (Ativos)"
#. module: account
#: report:account.tax.code.entries:0
msgid "Third Party (Country)"
msgstr ""
msgstr "Terceiro (País)"
#. module: account
#: code:addons/account/account.py:938
@@ -4665,9 +4665,9 @@ msgid ""
"You should set the journal to allow cancelling entries if you want to do "
"that."
msgstr ""
"Você não pode modificar um lançamento feito neste diário!\n"
"Você não pode modificar um lançamento postado deste diário!\n"
"Você deveria ajustar o diário para permitir o cancelamento de lançamentos se "
"você quiser fazer isso."
"você quiser fazer isto."
#. module: account
#: model:ir.ui.menu,name:account.account_template_folder
@@ -5753,10 +5753,10 @@ msgstr ""
"'concluído' (pago) no sistema."
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgstr "está validada."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
#: view:account.chart.template:0
@@ -6083,6 +6083,10 @@ msgid ""
"the tool search to analyse information about analytic entries generated in "
"the system."
msgstr ""
"Nesta tela, tenha uma análise dos seus diferentes lançamentos analíticos de "
"acordo com o plano de centro de custos (lançamentos analíticos) que você "
"definiu. Use a ferramenta de pesquisa para localizar as informações geradas "
"no sistema."
#. module: account
#: sql_constraint:account.journal:0
@@ -6472,6 +6476,8 @@ msgid ""
"This report is an analysis done by a partner. It is a PDF report containing "
"one line per partner representing the cumulative credit balance"
msgstr ""
"Este relatório é uma análise feita de um parceiro. É um relatório PDF "
"contendo um parceiro por linha representando o saldo de créditos cumulativo."
#. module: account
#: code:addons/account/wizard/account_validate_account_move.py:61
@@ -7717,6 +7723,9 @@ msgid ""
"will see the taxes with codes related to your legal statement according to "
"your country."
msgstr ""
"A planilha de taxas é usada para gerar sua declaração periódica de impostos. "
"Você verá as taxas com códigos relacionados à sua declaração legal de acordo "
"com o país."
#. module: account
#: view:account.installer.modules:0
@@ -7957,7 +7966,7 @@ msgstr "Visões de Diário"
#. module: account
#: model:ir.model,name:account.model_account_move_bank_reconcile
msgid "Move bank reconcile"
msgstr ""
msgstr "Reconciliar movimento bancário"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_type_form
@@ -9413,7 +9422,7 @@ msgstr "Selecione o período"
#: view:account.move.line:0
#: report:account.move.voucher:0
msgid "Posted"
msgstr "Publicado"
msgstr "Postado"
#. module: account
#: report:account.account.balance:0
@@ -10117,7 +10126,7 @@ msgstr "Normalmente 1 ou -1"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Template Account Fiscal Mapping"
msgstr ""
msgstr "Modelo para Mapeamento de Conta Fiscal"
#. module: account
#: field:account.chart.template,property_account_expense:0
@@ -11065,6 +11074,11 @@ msgstr ""
#~ msgid "Journal de vente"
#~ msgstr "Diário de vendas"
#, python-format
#~ msgid ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
#~ msgstr "O saldo esperado (%.2f) é diferente do calculado. (%.2f)"
#~ msgid "Fiscal Position Template Account Mapping"
#~ msgstr "Mapeamento contábil dos Modelos para Posição Fiscal"
@@ -11294,6 +11308,10 @@ msgstr ""
#~ msgid "Parent Analytic Account"
#~ msgstr "Conta-pai analítica"
#, python-format
#~ msgid "The statement balance is incorrect !\n"
#~ msgstr "O saldo do demonstrativo está incorreto\n"
#~ msgid "Balance brought forward"
#~ msgstr "Saldo transferido de para"
@@ -11695,3 +11713,11 @@ msgstr ""
#~ msgid "Expenses Credit Notes Journal - (test)"
#~ msgstr "Diário de Notas de Crédito de despesas"
#, python-format
#~ msgid "Invoice "
#~ msgstr "Fatura "
#, python-format
#~ msgid "is validated."
#~ msgstr "está validada."
addons/account/i18n/ro.po
+55 -41
View File
@@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-01-20 20:44+0000\n"
"Last-Translator: Mihai Boiciuc <Unknown>\n"
"PO-Revision-Date: 2011-03-27 08:22+0000\n"
"Last-Translator: filsys <office@filsystem.ro>\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: 2011-01-21 04:40+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-28 04:35+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
msgid "System payment"
msgstr ""
msgstr "Sistem plată"
#. module: account
#: view:account.journal:0
@@ -48,7 +48,7 @@ msgstr ""
#. module: account
#: field:account.installer.modules,account_voucher:0
msgid "Voucher Management"
msgstr "Gestionare Voucher-e"
msgstr "Gestionare Chitanțe"
#. module: account
#: view:account.account:0
@@ -56,7 +56,7 @@ msgstr "Gestionare Voucher-e"
#: view:account.move:0
#: view:account.move.line:0
msgid "Account Statistics"
msgstr "Statistica cont"
msgstr "Statistică cont"
#. module: account
#: field:account.invoice,residual:0
@@ -88,7 +88,7 @@ msgstr "Definiție copii"
#. module: account
#: model:ir.model,name:account.model_report_aged_receivable
msgid "Aged Receivable Till Today"
msgstr ""
msgstr "Facturi clienți restante la zi"
#. module: account
#: field:account.partner.ledger,reconcil:0
@@ -107,7 +107,7 @@ msgstr ""
#. module: account
#: model:process.transition,name:account.process_transition_invoiceimport0
msgid "Import from invoice or payment"
msgstr ""
msgstr "Importă din factură dau plată"
#. module: account
#: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -125,6 +125,9 @@ msgid ""
"If you unreconciliate transactions, you must also verify all the actions "
"that are linked to those transactions because they will not be disabled"
msgstr ""
"Dacă dezactivati relatia intre tranzactii, trebuie să verificaţi de "
"asemenea, toate acţiunile care sunt legate de aceste operaţiuni, deoarece "
"acestea nu vor fi dezactivate"
#. module: account
#: report:account.tax.code.entries:0
@@ -174,6 +177,8 @@ msgid ""
"If the active field is set to False, it will allow you to hide the payment "
"term without removing it."
msgstr ""
"În cazul în care câmpul activ este setat FALS, aceasta vă va permite să se "
"ascundă termenul de plată fără să îl eliminaţi"
#. module: account
#: code:addons/account/invoice.py:1421
@@ -206,7 +211,7 @@ msgstr "Negativ"
#: code:addons/account/wizard/account_move_journal.py:95
#, python-format
msgid "Journal: %s"
msgstr ""
msgstr "Jurnal: %s"
#. module: account
#: help:account.analytic.journal,type:0
@@ -215,6 +220,9 @@ msgid ""
"invoice) to create analytic entries, OpenERP will look for a matching "
"journal of the same type."
msgstr ""
"Oferă tipul jurnalului analitic. Atunci când are nevoie de un document (de "
"exemplu: o factură) pentru a crea o intrare analitica, OpenERP va căuta un "
"jurnalul potrivit de acelaşi tip."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -234,6 +242,8 @@ msgid ""
"No period defined for this date: %s !\n"
"Please create a fiscal year."
msgstr ""
"Nici o perioadă definită pentru această dată:% s\n"
"Vă rugam să creați o perioada fiscală."
#. module: account
#: model:ir.model,name:account.model_account_move_line_reconcile_select
@@ -262,12 +272,12 @@ msgstr ""
#: code:addons/account/invoice.py:1210
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
msgstr ""
msgstr "Factura '%s' este platită parțial: %s%s din %s%s (rest %s%s)"
#. module: account
#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
msgid "Accounting entries are an input of the reconciliation."
msgstr ""
msgstr "Înregistrările contabile sunt un element de reconciliere"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
@@ -283,14 +293,14 @@ msgstr "Nu puteţi adăuga/modifica înregistrări într-un jurnal închis."
#. module: account
#: view:account.bank.statement:0
msgid "Calculated Balance"
msgstr ""
msgstr "Sold Calculat"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
#: model:ir.actions.act_window,name:account.action_view_account_use_model
#: model:ir.ui.menu,name:account.menu_action_manual_recurring
msgid "Manual Recurring"
msgstr ""
msgstr "Recurență manuală"
#. module: account
#: view:account.fiscalyear.close.state:0
@@ -715,12 +725,6 @@ msgstr "Bifează"
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr "Soldul final este incorect !\n"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -1611,7 +1615,7 @@ msgstr "Suma pe an"
#. module: account
#: model:ir.actions.report.xml,name:account.report_account_voucher_new
msgid "Print Voucher"
msgstr "Tipărire voucher"
msgstr "Tipărire chitanță"
#. module: account
#: view:account.change.currency:0
@@ -2204,7 +2208,7 @@ msgstr "Filtre"
#: selection:report.invoice.created,state:0
#, python-format
msgid "Open"
msgstr "Deschidere"
msgstr "Deschis"
#. module: account
#: model:process.node,note:account.process_node_draftinvoices0
@@ -2598,11 +2602,12 @@ msgid "August"
msgstr "August"
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr "The soldul prognozat (%.2f) este diferit de cel calculat. (%.2f)"
msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2847,6 +2852,12 @@ msgstr "Baza de conturi pentru declaraţia fiscală"
msgid "View"
msgstr "Machetă"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4022,7 +4033,7 @@ msgstr "Nu există perioadă validă !"
#. module: account
#: report:account.tax.code.entries:0
msgid "Voucher No"
msgstr "Număr bon"
msgstr "Număr chitanță"
#. module: account
#: view:wizard.multi.charts.accounts:0
@@ -4225,12 +4236,6 @@ msgstr ""
msgid "Account Balance -"
msgstr "Sold cont -"
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -4280,7 +4285,7 @@ msgstr ""
#: view:account.invoice.report:0
#: field:account.invoice.report,user_id:0
msgid "Salesman"
msgstr ""
msgstr "Agent de vânzări"
#. module: account
#: view:account.invoice.report:0
@@ -4366,7 +4371,7 @@ msgstr "Aplicare taxă"
#: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
#, python-format
msgid "Journal Items"
msgstr ""
msgstr "Poziții jurnal"
#. module: account
#: selection:account.account.type,report_type:0
@@ -5252,7 +5257,7 @@ msgstr "Conturi debitori şi creditori"
#. module: account
#: field:account.fiscal.position.account.template,position_id:0
msgid "Fiscal Mapping"
msgstr ""
msgstr "Corespondență fiscală"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_state_open
@@ -5534,9 +5539,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
@@ -6427,7 +6432,7 @@ msgstr ""
#: field:account.invoice,origin:0
#: field:report.invoice.created,origin:0
msgid "Source Document"
msgstr ""
msgstr "Document sursă"
#. module: account
#: help:account.account.type,sign:0
@@ -7731,7 +7736,7 @@ msgstr "Data scadenţei"
#: model:ir.ui.menu,name:account.menu_account_supplier
#: model:ir.ui.menu,name:account.menu_finance_payables
msgid "Suppliers"
msgstr ""
msgstr "Furnizori"
#. module: account
#: constraint:account.move:0
@@ -8674,7 +8679,7 @@ msgstr ""
#. module: account
#: field:account.installer.modules,account_payment:0
msgid "Suppliers Payment Management"
msgstr ""
msgstr "Administrare Plată Furnizori"
#. module: account
#: field:account.period,name:0
@@ -9660,7 +9665,7 @@ msgstr "Viitor"
#. module: account
#: view:account.move.line:0
msgid "Search Journal Items"
msgstr ""
msgstr "Caută poziții jurnal"
#. module: account
#: help:account.tax,base_sign:0
@@ -9677,7 +9682,7 @@ msgstr "De obicei 1 sau -1."
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Template Account Fiscal Mapping"
msgstr ""
msgstr "Șablon corespondență fiscală cont"
#. module: account
#: field:account.chart.template,property_account_expense:0
@@ -9814,6 +9819,10 @@ msgstr ""
#~ msgid "Value"
#~ msgstr "Valoare"
#, python-format
#~ msgid "The statement balance is incorrect !\n"
#~ msgstr "Soldul final este incorect !\n"
#~ msgid "Crédit"
#~ msgstr "Credit"
@@ -10201,6 +10210,11 @@ msgstr ""
#~ msgid "Invoice import"
#~ msgstr "Import factură"
#, python-format
#~ msgid ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
#~ msgstr "The soldul prognozat (%.2f) este diferit de cel calculat. (%.2f)"
#~ msgid "Parent Analytic Account"
#~ msgstr "Contul analitic părinte"
addons/account/i18n/ru.po
+274 -168
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/si.po
+12 -17
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: 2011-01-15 05:23+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:53+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -709,12 +709,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2575,9 +2569,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2814,6 +2809,12 @@ msgstr ""
msgid "View"
msgstr ""
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4184,12 +4185,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5479,9 +5474,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/sk.po
+12 -17
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: 2011-01-15 05:23+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:53+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -709,12 +709,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2575,9 +2569,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2814,6 +2809,12 @@ msgstr ""
msgid "View"
msgstr ""
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4184,12 +4185,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5479,9 +5474,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/sl.po
+18 -18
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: 2011-01-15 05:24+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:54+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -716,12 +716,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2582,11 +2576,12 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr "Pričakovano stanje (%.2f) je različno od izračunanega (%.2f)"
msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2824,6 +2819,12 @@ msgstr ""
msgid "View"
msgstr "Pogled:"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4194,12 +4195,6 @@ msgstr ""
msgid "Account Balance -"
msgstr "Stanje konta -"
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5494,9 +5489,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
@@ -10104,6 +10099,11 @@ msgstr ""
#~ msgid "Continue"
#~ msgstr "Nadaljuj"
#, python-format
#~ msgid ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
#~ msgstr "Pričakovano stanje (%.2f) je različno od izračunanega (%.2f)"
#~ msgid "Skip"
#~ msgstr "Preskoči"
addons/account/i18n/sq.po
+12 -17
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: 2011-01-15 05:18+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:47+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -711,12 +711,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2582,9 +2576,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2824,6 +2819,12 @@ msgstr ""
msgid "View"
msgstr ""
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4194,12 +4195,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5492,9 +5487,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/sr.po
+27 -30
View File
@@ -14,18 +14,18 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-01-15 05:23+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:53+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
msgid "System payment"
msgstr ""
msgstr "Систем плаћања"
#. module: account
#: view:account.journal:0
msgid "Other Configuration"
msgstr ""
msgstr "Остале конфигурације"
#. module: account
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
@@ -40,6 +40,8 @@ msgid ""
"You cannot remove/deactivate an account which is set as a property to any "
"Partner."
msgstr ""
"Не можете обрисати/поставити неактивним конто јер је повезан са неким "
"партнером."
#. module: account
#: view:account.move.reconcile:0
@@ -57,13 +59,13 @@ msgstr ""
#: view:account.move:0
#: view:account.move.line:0
msgid "Account Statistics"
msgstr "Knjigovodstvene statistike"
msgstr "Књиговодствене статистике"
#. module: account
#: field:account.invoice,residual:0
#: field:report.invoice.created,residual:0
msgid "Residual"
msgstr "Ostatak"
msgstr "Остатак"
#. module: account
#: code:addons/account/invoice.py:785
@@ -74,27 +76,27 @@ msgstr ""
#. module: account
#: constraint:account.period:0
msgid "Error ! The duration of the Period(s) is/are invalid. "
msgstr "Greška! Trajanje razdoblja je pogrešno. "
msgstr "Грешка! Трајање раздобља је погрешно. "
#. module: account
#: field:account.analytic.line,currency_id:0
msgid "Account currency"
msgstr ""
msgstr "Валута налога"
#. module: account
#: view:account.tax:0
msgid "Children Definition"
msgstr ""
msgstr "Дефинисање подређеног члана"
#. module: account
#: model:ir.model,name:account.model_report_aged_receivable
msgid "Aged Receivable Till Today"
msgstr "Zaostala potraživanja do danas"
msgstr "Заостала потраживања до данас"
#. module: account
#: field:account.partner.ledger,reconcil:0
msgid "Include Reconciled Entries"
msgstr "Uključi zatvorene stavke"
msgstr "Укључи затворене ставке"
#. module: account
#: view:account.pl.report:0
@@ -106,17 +108,17 @@ msgstr ""
#. module: account
#: model:process.transition,name:account.process_transition_invoiceimport0
msgid "Import from invoice or payment"
msgstr ""
msgstr "Преузимање из рачуна или плаћања"
#. module: account
#: model:ir.model,name:account.model_wizard_multi_charts_accounts
msgid "wizard.multi.charts.accounts"
msgstr "carobnjak.vise.kontnih.naloga"
msgstr "чаробњак.вишеконтних.налога"
#. module: account
#: view:account.move:0
msgid "Total Debit"
msgstr "Ukupno duguje"
msgstr "Укупно дугује"
#. module: account
#: view:account.unreconcile:0
@@ -128,7 +130,7 @@ msgstr ""
#. module: account
#: report:account.tax.code.entries:0
msgid "Accounting Entries-"
msgstr "Stavke naloga"
msgstr "Ставке налога"
#. module: account
#: code:addons/account/account.py:1291
@@ -714,12 +716,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2590,9 +2586,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2836,6 +2833,12 @@ msgstr "Porezka osnovica"
msgid "View"
msgstr "Pregled"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4213,12 +4216,6 @@ msgstr ""
msgid "Account Balance -"
msgstr "Saldo konta -"
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5512,9 +5509,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/sr@latin.po
+12 -17
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: 2011-01-15 05:27+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:58+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -714,12 +714,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2590,9 +2584,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2836,6 +2831,12 @@ msgstr "Porezka osnovica"
msgid "View"
msgstr "Pregled"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4213,12 +4214,6 @@ msgstr ""
msgid "Account Balance -"
msgstr "Saldo konta -"
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5512,9 +5507,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/sv.po
+33 -21
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: 2011-01-25 04:55+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:54+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -24,7 +24,7 @@ msgstr "Systembetalning"
#. module: account
#: view:account.journal:0
msgid "Other Configuration"
msgstr "Övrig Konfiguration"
msgstr "Övrig konfiguration"
#. module: account
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
@@ -727,12 +727,6 @@ msgstr "Markera"
msgid "Partners Reconciled Today"
msgstr "Partners Sammanslagna Idag"
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr "The statement balance is incorrect !\n"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2625,12 +2619,12 @@ msgid "August"
msgstr "Augusti"
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
"The expected balance (%.2f) is different than the computed one. (%.2f)"
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2874,6 +2868,12 @@ msgstr "The account basis of the tax declaration."
msgid "View"
msgstr "Visa"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -3947,7 +3947,7 @@ msgstr "Standardmoms"
#: code:addons/account/invoice.py:88
#, python-format
msgid "Free Reference"
msgstr "Free Reference"
msgstr "Meddelande"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
@@ -4260,12 +4260,6 @@ msgstr ""
msgid "Account Balance -"
msgstr "Account Balance -"
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr "Faktura "
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5570,10 +5564,10 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgstr "har validerats."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
#: view:account.chart.template:0
@@ -10536,6 +10530,12 @@ msgstr ""
#~ msgid "Fiscal Position Template Account Mapping"
#~ msgstr "Fiscal Position Template Account Mapping"
#, python-format
#~ msgid ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
#~ msgstr ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
#~ msgid "Third party (Country)"
#~ msgstr "Tredje part (Land)"
@@ -10561,6 +10561,10 @@ msgstr ""
#~ "1. Line 1: percent 0.02 14 days\n"
#~ "2. Line 2: balance 30 days"
#, python-format
#~ msgid "The statement balance is incorrect !\n"
#~ msgstr "The statement balance is incorrect !\n"
#~ msgid "TITLE COMPANY"
#~ msgstr "TITLE COMPANY"
@@ -11134,3 +11138,11 @@ msgstr ""
#~ msgid "End of Year"
#~ msgstr "Årsavslut"
#, python-format
#~ msgid "is validated."
#~ msgstr "har validerats."
#, python-format
#~ msgid "Invoice "
#~ msgstr "Faktura "
addons/account/i18n/ta.po
+12 -17
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: 2011-01-15 05:24+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:54+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -709,12 +709,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2575,9 +2569,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2814,6 +2809,12 @@ msgstr ""
msgid "View"
msgstr ""
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4184,12 +4185,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5479,9 +5474,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/te.po
+12 -17
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: 2011-01-15 05:24+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:54+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -709,12 +709,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2575,9 +2569,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2814,6 +2809,12 @@ msgstr ""
msgid "View"
msgstr ""
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4184,12 +4185,6 @@ msgstr ""
msgid "Account Balance -"
msgstr "ఖాతా నిల్వ -"
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5479,9 +5474,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/th.po
+16 -17
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: 2011-01-20 04:53+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:54+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -709,12 +709,6 @@ msgstr "ตรวจสอบ"
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr "งบการเงินมียอดคงเหลือไม่ถูกต้อง\n"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2577,9 +2571,10 @@ msgid "August"
msgstr "สิงหาคม"
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2816,6 +2811,12 @@ msgstr ""
msgid "View"
msgstr "แสดงตัวอย่าง"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4186,12 +4187,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5481,9 +5476,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
@@ -9646,3 +9641,7 @@ msgstr ""
#~ msgid "Print Taxes Report"
#~ msgstr "พิมพ์รายงานภาษี"
#, python-format
#~ msgid "The statement balance is incorrect !\n"
#~ msgstr "งบการเงินมียอดคงเหลือไม่ถูกต้อง\n"
addons/account/i18n/tlh.po
+12 -17
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: 2011-01-15 05:25+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:54+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -708,12 +708,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2574,9 +2568,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2813,6 +2808,12 @@ msgstr ""
msgid "View"
msgstr ""
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4183,12 +4184,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5478,9 +5473,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/tr.po
+31 -19
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: 2011-01-24 04:54+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:55+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -738,12 +738,6 @@ msgstr "Çek"
msgid "Partners Reconciled Today"
msgstr "Partners Reconciled Today"
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr "The statement balance is incorrect !\n"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2654,12 +2648,12 @@ msgid "August"
msgstr "August"
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
"The expected balance (%.2f) is different than the computed one. (%.2f)"
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2910,6 +2904,12 @@ msgstr "The account basis of the tax declaration."
msgid "View"
msgstr "Görünüm"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4314,12 +4314,6 @@ msgstr ""
msgid "Account Balance -"
msgstr "Account Balance -"
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr "Invoice "
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5647,10 +5641,10 @@ msgstr ""
"(i.e. paid) in the system."
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgstr "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
#: view:account.chart.template:0
@@ -13952,6 +13946,12 @@ msgstr ""
#~ "Seçilen dil systemde yüklü ise bu ortağa ait bütün belgeler bu dilde "
#~ "yazdırılacaktır. Aksi taktirde, İngilizce kullanılır."
#, python-format
#~ msgid ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
#~ msgstr ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
#~ msgid "Base Field"
#~ msgstr "Taban Alan"
@@ -15902,6 +15902,10 @@ msgstr ""
#~ msgid "No product in this location."
#~ msgstr "No product in this location."
#, python-format
#~ msgid "Invoice "
#~ msgstr "Invoice "
#~ msgid "Field Type"
#~ msgstr "Alan Türü"
@@ -17038,6 +17042,10 @@ msgstr ""
#~ msgid "Default Company"
#~ msgstr "Default Company"
#, python-format
#~ msgid "The statement balance is incorrect !\n"
#~ msgstr "The statement balance is incorrect !\n"
#~ msgid "ID of the view defined in xml file"
#~ msgstr "ID of the view defined in xml file"
@@ -17367,6 +17375,10 @@ msgstr ""
#~ msgid "ir.actions.todo"
#~ msgstr "ir.actions.todo"
#, python-format
#~ msgid "is validated."
#~ msgstr "is validated."
#~ msgid "Couldn't find previous ir.actions.todo"
#~ msgstr "Couldn't find previous ir.actions.todo"
addons/account/i18n/ug.po
+12 -17
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: 2011-01-15 05:25+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:55+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -709,12 +709,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2575,9 +2569,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2814,6 +2809,12 @@ msgstr ""
msgid "View"
msgstr ""
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4184,12 +4185,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5479,9 +5474,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/uk.po
+12 -17
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: 2011-01-15 05:25+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:55+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -710,12 +710,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2576,9 +2570,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2815,6 +2810,12 @@ msgstr ""
msgid "View"
msgstr "Перегляд"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4185,12 +4186,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5481,9 +5476,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/ur.po
+12 -17
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: 2011-01-18 04:42+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:55+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -709,12 +709,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2575,9 +2569,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2814,6 +2809,12 @@ msgstr ""
msgid "View"
msgstr ""
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4184,12 +4185,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5479,9 +5474,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/vi.po
+32 -20
View File
@@ -9,13 +9,13 @@ msgstr ""
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-01-19 21:51+0000\n"
"Last-Translator: Phong Nguyen <Unknown>\n"
"Last-Translator: Phong Nguyen-Thanh <Unknown>\n"
"Language-Team: Vietnamese <vi@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-01-20 04:53+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:55+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -745,12 +745,6 @@ msgstr "Séc"
msgid "Partners Reconciled Today"
msgstr "Các đối tác được đối soát hôm nay"
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr "The statement balance is incorrect !\n"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2668,12 +2662,12 @@ msgid "August"
msgstr "Tháng Tám"
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
"The expected balance (%.2f) is different than the computed one. (%.2f)"
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2925,6 +2919,12 @@ msgstr "The account basis of the tax declaration."
msgid "View"
msgstr "View"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4338,12 +4338,6 @@ msgstr ""
msgid "Account Balance -"
msgstr "Số dư tài khoản -"
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr "Hóa đơn "
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5676,10 +5670,10 @@ msgstr ""
"(i.e. paid) in the system."
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgstr "đã được kiểm tra."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
#: view:account.chart.template:0
@@ -10321,6 +10315,12 @@ msgstr ""
#~ msgid "The certificate ID of the module must be unique !"
#~ msgstr "Mã chứng nhận của mô đun này phải là duy nhất !"
#, python-format
#~ msgid ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
#~ msgstr ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
#~ msgid "Options"
#~ msgstr "Options"
@@ -10421,6 +10421,10 @@ msgstr ""
#~ msgid "Income"
#~ msgstr "Income"
#, python-format
#~ msgid "The statement balance is incorrect !\n"
#~ msgstr "The statement balance is incorrect !\n"
#~ msgid ""
#~ "If the active field is set to true, it will allow you to hide the tax "
#~ "without removing it."
@@ -10800,6 +10804,10 @@ msgstr ""
#~ "A supplier refund is a credit note from your supplier indicating that he "
#~ "refunds part or totality of the invoice sent to you."
#, python-format
#~ msgid "Invoice "
#~ msgstr "Hóa đơn "
#~ msgid "Default UoM"
#~ msgstr "Đơn vị đo mặc định"
@@ -10820,3 +10828,7 @@ msgstr ""
#~ msgid "Entry encoding"
#~ msgstr "Mã hóa bút toán"
#, python-format
#~ msgid "is validated."
#~ msgstr "đã được kiểm tra."
addons/account/i18n/zh_CN.po
+22 -18
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: 2011-02-05 05:00+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:57+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -710,12 +710,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr "银行单据的余额不对！\n"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2578,11 +2572,12 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr "预期的余额为(%.2f)它和计算额(%.2f)不同。"
msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2820,6 +2815,12 @@ msgstr "纳税申报的计税基准科目"
msgid "View"
msgstr "视图"
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4190,12 +4191,6 @@ msgstr ""
msgid "Account Balance -"
msgstr "科目余额 -"
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5487,9 +5482,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
@@ -10642,6 +10637,11 @@ msgstr ""
#~ msgid "Standard entry"
#~ msgstr "普通凭证"
#, python-format
#~ msgid ""
#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
#~ msgstr "预期的余额为(%.2f)它和计算额(%.2f)不同。"
#~ msgid "Select invoices you want to pay and manages advances"
#~ msgstr "选择你要支付和要放款的发票"
@@ -10666,6 +10666,10 @@ msgstr ""
#~ "１.第一行：百分比２％１４天\n"
#~ "２.第二行：剩下３０天"
#, python-format
#~ msgid "The statement balance is incorrect !\n"
#~ msgstr "银行单据的余额不对！\n"
#~ msgid "TITLE COMPANY"
#~ msgstr "公司名称"
addons/account/i18n/zh_HK.po
+12 -17
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: 2011-01-15 05:26+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:56+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -709,12 +709,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2575,9 +2569,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2814,6 +2809,12 @@ msgstr ""
msgid "View"
msgstr ""
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4184,12 +4185,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5479,9 +5474,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
addons/account/i18n/zh_TW.po
+22 -27
View File
@@ -13,24 +13,24 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-01-15 05:27+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-03-18 04:57+0000\n"
"X-Generator: Launchpad (build 12559)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
msgid "System payment"
msgstr ""
msgstr "系統付款"
#. module: account
#: view:account.journal:0
msgid "Other Configuration"
msgstr ""
msgstr "其他配置"
#. module: account
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
#, python-format
msgid "No End of year journal defined for the fiscal year"
msgstr ""
msgstr "未為財政年度定義年終日記帳"
#. module: account
#: code:addons/account/account.py:506
@@ -56,7 +56,7 @@ msgstr ""
#: view:account.move:0
#: view:account.move.line:0
msgid "Account Statistics"
msgstr ""
msgstr "帳戶統計"
#. module: account
#: field:account.invoice,residual:0
@@ -78,7 +78,7 @@ msgstr ""
#. module: account
#: field:account.analytic.line,currency_id:0
msgid "Account currency"
msgstr ""
msgstr "帳戶貨幣"
#. module: account
#: view:account.tax:0
@@ -149,7 +149,7 @@ msgstr ""
#: view:account.move.line.reconcile:0
#: view:account.move.line.reconcile.writeoff:0
msgid "Reconcile"
msgstr ""
msgstr "對帳"
#. module: account
#: field:account.bank.statement.line,ref:0
@@ -159,12 +159,12 @@ msgstr ""
#: field:account.move.line,ref:0
#: field:account.subscription,ref:0
msgid "Reference"
msgstr "参照"
msgstr "參照"
#. module: account
#: view:account.open.closed.fiscalyear:0
msgid "Choose Fiscal Year "
msgstr ""
msgstr "選擇財政年度 "
#. module: account
#: help:account.payment.term,active:0
@@ -177,7 +177,7 @@ msgstr ""
#: code:addons/account/invoice.py:1421
#, python-format
msgid "Warning!"
msgstr ""
msgstr "警告！"
#. module: account
#: field:account.fiscal.position.account,account_src_id:0
@@ -708,12 +708,6 @@ msgstr ""
msgid "Partners Reconciled Today"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
@@ -2574,9 +2568,10 @@ msgid "August"
msgstr ""
#. module: account
#: code:addons/account/account_bank_statement.py:307
#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2813,6 +2808,12 @@ msgstr ""
msgid "View"
msgstr ""
#. module: account
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
@@ -4183,12 +4184,6 @@ msgstr ""
msgid "Account Balance -"
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#, python-format
msgid "Invoice "
msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
@@ -5478,9 +5473,9 @@ msgid ""
msgstr ""
#. module: account
#: code:addons/account/invoice.py:989
#: code:addons/account/invoice.py:997
#, python-format
msgid "is validated."
msgid "Invoice '%s' is validated."
msgstr ""
#. module: account
@@ -7094,7 +7089,7 @@ msgstr ""
#: code:addons/account/invoice.py:720
#, python-format
msgid "Warning !"
msgstr ""
msgstr "警告！"
#. module: account
#: field:account.entries.report,move_line_state:0
addons/account/installer.py
+61 -569
View File
@@ -34,15 +34,9 @@ class account_installer(osv.osv_memory):
_name = 'account.installer'
_inherit = 'res.config.installer'
def _get_default_accounts(self, cr, uid, context=None):
accounts = [{'acc_name': 'Current', 'account_type': 'bank'},
{'acc_name': 'Deposit', 'account_type': 'bank'},
{'acc_name': 'Cash', 'account_type': 'cash'}]
return accounts
def _get_charts(self, cr, uid, context=None):
modules = self.pool.get('ir.module.module')
ids = modules.search(cr, uid, [('category_id', '=', 'Account Charts')], context=context)
ids = modules.search(cr, uid, [('name', 'like', 'l10n_')], context=context)
charts = list(
sorted(((m.name, m.shortdesc)
for m in modules.browse(cr, uid, ids, context=context)),
@@ -60,7 +54,6 @@ class account_installer(osv.osv_memory):
'date_start': fields.date('Start Date', required=True),
'date_stop': fields.date('End Date', required=True),
'period': fields.selection([('month', 'Monthly'), ('3months','3 Monthly')], 'Periods', required=True),
'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Your Bank and Cash Accounts'),
'sale_tax': fields.float('Sale Tax(%)'),
'purchase_tax': fields.float('Purchase Tax(%)'),
'company_id': fields.many2one('res.company', 'Company', required=True),
@@ -92,7 +85,6 @@ class account_installer(osv.osv_memory):
'sale_tax': 0.0,
'purchase_tax': 0.0,
'company_id': _default_company,
'bank_accounts_id': _get_default_accounts,
'charts': _get_default_charts
}
@@ -125,458 +117,18 @@ class account_installer(osv.osv_memory):
return {'value': {'date_stop': end_date.strftime('%Y-%m-%d')}}
return {}
def generate_configurable_chart(self, cr, uid, ids, context=None):
obj_acc = self.pool.get('account.account')
obj_acc_tax = self.pool.get('account.tax')
obj_journal = self.pool.get('account.journal')
obj_acc_tax_code = self.pool.get('account.tax.code')
obj_acc_template = self.pool.get('account.account.template')
obj_acc_tax_template = self.pool.get('account.tax.code.template')
obj_fiscal_position_template = self.pool.get('account.fiscal.position.template')
obj_fiscal_position = self.pool.get('account.fiscal.position')
analytic_journal_obj = self.pool.get('account.analytic.journal')
obj_acc_chart_template = self.pool.get('account.chart.template')
obj_acc_journal_view = self.pool.get('account.journal.view')
mod_obj = self.pool.get('ir.model.data')
obj_sequence = self.pool.get('ir.sequence')
property_obj = self.pool.get('ir.property')
fields_obj = self.pool.get('ir.model.fields')
obj_tax_fp = self.pool.get('account.fiscal.position.tax')
obj_ac_fp = self.pool.get('account.fiscal.position.account')
result = mod_obj.get_object_reference(cr, uid, 'account', 'configurable_chart_template')
id = result and result[1] or False
obj_multi = obj_acc_chart_template.browse(cr, uid, id, context=context)
record = self.browse(cr, uid, ids, context=context)[0]
if context is None:
context = {}
company_id = self.browse(cr, uid, ids, context=context)[0].company_id
seq_journal = True
# Creating Account
obj_acc_root = obj_multi.account_root_id
tax_code_root_id = obj_multi.tax_code_root_id.id
#new code
acc_template_ref = {}
tax_template_ref = {}
tax_code_template_ref = {}
todo_dict = {}
#create all the tax code
children_tax_code_template = obj_acc_tax_template.search(cr, uid, [('parent_id', 'child_of', [tax_code_root_id])], order='id')
children_tax_code_template.sort()
for tax_code_template in obj_acc_tax_template.browse(cr, uid, children_tax_code_template, context=context):
vals = {
'name': (tax_code_root_id == tax_code_template.id) and company_id.name or tax_code_template.name,
'code': tax_code_template.code,
'info': tax_code_template.info,
'parent_id': tax_code_template.parent_id and ((tax_code_template.parent_id.id in tax_code_template_ref) and tax_code_template_ref[tax_code_template.parent_id.id]) or False,
'company_id': company_id.id,
'sign': tax_code_template.sign,
}
new_tax_code = obj_acc_tax_code.create(cr, uid, vals, context=context)
#recording the new tax code to do the mapping
tax_code_template_ref[tax_code_template.id] = new_tax_code
#create all the tax
for tax in obj_multi.tax_template_ids:
#create it
vals_tax = {
'name': tax.name,
'sequence': tax.sequence,
'amount': tax.amount,
'type': tax.type,
'applicable_type': tax.applicable_type,
'domain': tax.domain,
'parent_id': tax.parent_id and ((tax.parent_id.id in tax_template_ref) and tax_template_ref[tax.parent_id.id]) or False,
'child_depend': tax.child_depend,
'python_compute': tax.python_compute,
'python_compute_inv': tax.python_compute_inv,
'python_applicable': tax.python_applicable,
'base_code_id': tax.base_code_id and ((tax.base_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.base_code_id.id]) or False,
'tax_code_id': tax.tax_code_id and ((tax.tax_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.tax_code_id.id]) or False,
'base_sign': tax.base_sign,
'tax_sign': tax.tax_sign,
'ref_base_code_id': tax.ref_base_code_id and ((tax.ref_base_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.ref_base_code_id.id]) or False,
'ref_tax_code_id': tax.ref_tax_code_id and ((tax.ref_tax_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.ref_tax_code_id.id]) or False,
'ref_base_sign': tax.ref_base_sign,
'ref_tax_sign': tax.ref_tax_sign,
'include_base_amount': tax.include_base_amount,
'description': tax.description,
'company_id': company_id.id,
'type_tax_use': tax.type_tax_use,
'price_include': tax.price_include
}
new_tax = obj_acc_tax.create(cr, uid, vals_tax, context=context)
#as the accounts have not been created yet, we have to wait before filling these fields
todo_dict[new_tax] = {
'account_collected_id': tax.account_collected_id and tax.account_collected_id.id or False,
'account_paid_id': tax.account_paid_id and tax.account_paid_id.id or False,
}
tax_template_ref[tax.id] = new_tax
#deactivate the parent_store functionnality on account_account for rapidity purpose
ctx = context and context.copy() or {}
ctx['defer_parent_store_computation'] = True
children_acc_template = obj_acc_template.search(cr, uid, [('parent_id', 'child_of', [obj_acc_root.id]), ('nocreate', '!=', True)], context=context)
children_acc_template.sort()
for account_template in obj_acc_template.browse(cr, uid, children_acc_template, context=context):
tax_ids = []
for tax in account_template.tax_ids:
tax_ids.append(tax_template_ref[tax.id])
#create the account_account
dig = 6
code_main = account_template.code and len(account_template.code) or 0
code_acc = account_template.code or ''
if code_main > 0 and code_main <= dig and account_template.type != 'view':
code_acc = str(code_acc) + (str('0'*(dig-code_main)))
vals = {
'name': (obj_acc_root.id == account_template.id) and company_id.name or account_template.name,
#'sign': account_template.sign,
'currency_id': account_template.currency_id and account_template.currency_id.id or False,
'code': code_acc,
'type': account_template.type,
'user_type': account_template.user_type and account_template.user_type.id or False,
'reconcile': account_template.reconcile,
'shortcut': account_template.shortcut,
'note': account_template.note,
'parent_id': account_template.parent_id and ((account_template.parent_id.id in acc_template_ref) and acc_template_ref[account_template.parent_id.id]) or False,
'tax_ids': [(6, 0, tax_ids)],
'company_id': company_id.id,
}
new_account = obj_acc.create(cr, uid, vals, context=ctx)
acc_template_ref[account_template.id] = new_account
if account_template.name == 'Bank Current Account':
b_vals = {
'name': 'Bank Accounts',
'code': '110500',
'type': 'view',
'user_type': account_template.parent_id.user_type and account_template.user_type.id or False,
'shortcut': account_template.shortcut,
'note': account_template.note,
'parent_id': account_template.parent_id and ((account_template.parent_id.id in acc_template_ref) and acc_template_ref[account_template.parent_id.id]) or False,
'tax_ids': [(6,0,tax_ids)],
'company_id': company_id.id,
}
bank_account = obj_acc.create(cr, uid, b_vals, context=ctx)
view_id_cash = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal View')], context=context)[0] #why fixed name here?
view_id_cur = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal (Multi-Currency) View')], context=context)[0] #Why Fixed name here?
cash_result = mod_obj.get_object_reference(cr, uid, 'account', 'conf_account_type_cash')
cash_type_id = cash_result and cash_result[1] or False
bank_result = mod_obj.get_object_reference(cr, uid, 'account', 'conf_account_type_bnk')
bank_type_id = bank_result and bank_result[1] or False
check_result = mod_obj.get_object_reference(cr, uid, 'account', 'conf_account_type_chk')
check_type_id = check_result and check_result[1] or False
# record = self.browse(cr, uid, ids, context=context)[0]
code_cnt = 1
vals_seq = {
'name': _('Bank Journal '),
'code': 'account.journal',
'prefix': 'BNK/%(year)s/',
'company_id': company_id.id,
'padding': 5
}
seq_id = obj_sequence.create(cr, uid, vals_seq, context=context)
#create the bank journals
analitical_bank_ids = analytic_journal_obj.search(cr, uid, [('type', '=', 'situation')], context=context)
analitical_journal_bank = analitical_bank_ids and analitical_bank_ids[0] or False
vals_journal = {
'name': _('Bank Journal '),
'code': _('BNK'),
'sequence_id': seq_id,
'type': 'bank',
'company_id': company_id.id,
'analytic_journal_id': analitical_journal_bank
}
if vals.get('currency_id', False):
vals_journal.update({
'view_id': view_id_cur,
'currency': vals.get('currency_id', False)
})
else:
vals_journal.update({'view_id': view_id_cash})
vals_journal.update({
'default_credit_account_id': new_account,
'default_debit_account_id': new_account,
})
obj_journal.create(cr, uid, vals_journal, context=context)
for val in record.bank_accounts_id:
seq_padding = 5
if val.account_type == 'cash':
type = cash_type_id
elif val.account_type == 'bank':
type = bank_type_id
elif val.account_type == 'check':
type = check_type_id
else:
type = check_type_id
seq_padding = None
vals_bnk = {
'name': val.acc_name or '',
'currency_id': val.currency_id.id or False,
'code': str(110500 + code_cnt),
'type': 'liquidity',
'user_type': type,
'parent_id': bank_account,
'company_id': company_id.id
}
child_bnk_acc = obj_acc.create(cr, uid, vals_bnk, context=ctx)
vals_seq_child = {
'name': _(vals_bnk['name'] + ' ' + 'Journal'),
'code': 'account.journal',
'prefix': _((vals_bnk['name'][:3].upper()) + '/%(year)s/'),
'padding': seq_padding
}
seq_id = obj_sequence.create(cr, uid, vals_seq_child, context=context)
#create the bank journal
vals_journal = {}
vals_journal = {
'name': vals_bnk['name'] + _(' Journal'),
'code': _(vals_bnk['name'][:3]).upper(),
'sequence_id': seq_id,
'type': 'cash',
'company_id': company_id.id
}
if vals.get('currency_id', False):
vals_journal.update({
'view_id': view_id_cur,
'currency': vals_bnk.get('currency_id', False),
})
else:
vals_journal.update({'view_id': view_id_cash})
vals_journal.update({
'default_credit_account_id': child_bnk_acc,
'default_debit_account_id': child_bnk_acc,
'analytic_journal_id': analitical_journal_bank
})
obj_journal.create(cr, uid, vals_journal, context=context)
code_cnt += 1
#reactivate the parent_store functionality on account_account
obj_acc._parent_store_compute(cr)
for key, value in todo_dict.items():
if value['account_collected_id'] or value['account_paid_id']:
obj_acc_tax.write(cr, uid, [key], {
'account_collected_id': acc_template_ref[value['account_collected_id']],
'account_paid_id': acc_template_ref[value['account_paid_id']],
})
# Creating Journals Sales and Purchase
vals_journal = {}
data_id = mod_obj.search(cr, uid, [('model', '=', 'account.journal.view'), ('name', '=', 'account_sp_journal_view')], context=context)
data = mod_obj.browse(cr, uid, data_id[0], context=context)
view_id = data.res_id
seq_id = obj_sequence.search(cr,uid,[('name', '=', 'Account Journal')], context=context)[0]
if seq_journal:
seq_sale = {
'name': 'Sale Journal',
'code': 'account.journal',
'prefix': 'SAJ/%(year)s/',
'padding': 3,
'company_id': company_id.id
}
seq_id_sale = obj_sequence.create(cr, uid, seq_sale, context=context)
seq_purchase = {
'name': 'Purchase Journal',
'code': 'account.journal',
'prefix': 'EXJ/%(year)s/',
'padding': 3,
'company_id': company_id.id
}
seq_id_purchase = obj_sequence.create(cr, uid, seq_purchase, context=context)
seq_refund_sale = {
'name': 'Sales Refund Journal',
'code': 'account.journal',
'prefix': 'SCNJ/%(year)s/',
'padding': 3,
'company_id': company_id.id
}
seq_id_sale_refund = obj_sequence.create(cr, uid, seq_refund_sale, context=context)
seq_refund_purchase = {
'name': 'Purchase Refund Journal',
'code': 'account.journal',
'prefix': 'ECNJ/%(year)s/',
'padding': 3,
'company_id': company_id.id
}
seq_id_purchase_refund = obj_sequence.create(cr, uid, seq_refund_purchase, context=context)
else:
seq_id_sale = seq_id
seq_id_purchase = seq_id
seq_id_sale_refund = seq_id
seq_id_purchase_refund = seq_id
vals_journal['view_id'] = view_id
#Sales Journal
analitical_sale_ids = analytic_journal_obj.search(cr, uid, [('type','=','sale')], context=context)
analitical_journal_sale = analitical_sale_ids and analitical_sale_ids[0] or False
vals_journal.update({
'name': _('Sales Journal'),
'type': 'sale',
'code': _('SAJ'),
'sequence_id': seq_id_sale,
'analytic_journal_id': analitical_journal_sale,
'company_id': company_id.id
})
if obj_multi.property_account_receivable:
vals_journal.update({
'default_credit_account_id': acc_template_ref[obj_multi.property_account_income_categ.id],
'default_debit_account_id': acc_template_ref[obj_multi.property_account_income_categ.id],
})
obj_journal.create(cr, uid, vals_journal, context=context)
# Purchase Journal
analitical_purchase_ids = analytic_journal_obj.search(cr, uid, [('type', '=', 'purchase')], context=context)
analitical_journal_purchase = analitical_purchase_ids and analitical_purchase_ids[0] or False
vals_journal.update({
'name': _('Purchase Journal'),
'type': 'purchase',
'code': _('EXJ'),
'sequence_id': seq_id_purchase,
'analytic_journal_id': analitical_journal_purchase,
'company_id': company_id.id
})
if obj_multi.property_account_payable:
vals_journal.update({
'default_credit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id],
'default_debit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id]
})
obj_journal.create(cr, uid, vals_journal, context=context)
# Creating Journals Sales Refund and Purchase Refund
vals_journal = {}
data_id = mod_obj.search(cr, uid, [('model', '=', 'account.journal.view'), ('name', '=', 'account_sp_refund_journal_view')], context=context)
data = mod_obj.browse(cr, uid, data_id[0], context=context)
view_id = data.res_id
#Sales Refund Journal
vals_journal = {
'view_id': view_id,
'name': _('Sales Refund Journal'),
'type': 'sale_refund',
'refund_journal': True,
'code': _('SCNJ'),
'sequence_id': seq_id_sale_refund,
'analytic_journal_id': analitical_journal_sale,
'company_id': company_id.id
}
if obj_multi.property_account_receivable:
vals_journal.update({
'default_credit_account_id': acc_template_ref[obj_multi.property_account_income_categ.id],
'default_debit_account_id': acc_template_ref[obj_multi.property_account_income_categ.id]
})
obj_journal.create(cr, uid, vals_journal, context=context)
# Purchase Refund Journal
vals_journal = {
'view_id': view_id,
'name': _('Purchase Refund Journal'),
'type': 'purchase_refund',
'refund_journal': True,
'code': _('ECNJ'),
'sequence_id': seq_id_purchase_refund,
'analytic_journal_id': analitical_journal_purchase,
'company_id': company_id.id
}
if obj_multi.property_account_payable:
vals_journal.update({
'default_credit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id],
'default_debit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id]
})
obj_journal.create(cr, uid, vals_journal, context=context)
# Bank Journals
view_id_cash = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal View')], context=context)[0] #TOFIX: Why put fixed name ?
view_id_cur = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal (Multi-Currency) View')], context=context)[0] #TOFIX: why put fixed name?
#create the properties
todo_list = [
('property_account_receivable', 'res.partner', 'account.account'),
('property_account_payable', 'res.partner', 'account.account'),
('property_account_expense_categ', 'product.category', 'account.account'),
('property_account_income_categ', 'product.category', 'account.account'),
('property_account_expense', 'product.template', 'account.account'),
('property_account_income', 'product.template', 'account.account'),
('property_reserve_and_surplus_account', 'res.company', 'account.account'),
]
for record in todo_list:
r = []
r = property_obj.search(cr, uid, [('name', '=', record[0]), ('company_id', '=', company_id.id)], context=context)
account = getattr(obj_multi, record[0])
field = fields_obj.search(cr, uid, [('name', '=', record[0]), ('model', '=', record[1]), ('relation', '=', record[2])], context=context)
vals = {
'name': record[0],
'company_id': company_id.id,
'fields_id': field[0],
'value': account and 'account.account, '+str(acc_template_ref[account.id]) or False,
}
if r:
#the property exist: modify it
property_obj.write(cr, uid, r, vals, context=context)
else:
#create the property
property_obj.create(cr, uid, vals, context=context)
fp_ids = obj_fiscal_position_template.search(cr, uid, [('chart_template_id', '=', obj_multi.id)], context=context)
if fp_ids:
for position in obj_fiscal_position_template.browse(cr, uid, fp_ids, context=context):
vals_fp = {
'company_id': company_id.id,
'name': position.name,
}
new_fp = obj_fiscal_position.create(cr, uid, vals_fp, context=context)
for tax in position.tax_ids:
vals_tax = {
'tax_src_id': tax_template_ref[tax.tax_src_id.id],
'tax_dest_id': tax.tax_dest_id and tax_template_ref[tax.tax_dest_id.id] or False,
'position_id': new_fp,
}
obj_tax_fp.create(cr, uid, vals_tax, context=context)
for acc in position.account_ids:
vals_acc = {
'account_src_id': acc_template_ref[acc.account_src_id.id],
'account_dest_id': acc_template_ref[acc.account_dest_id.id],
'position_id': new_fp,
}
obj_ac_fp.create(cr, uid, vals_acc, context=context)
def execute(self, cr, uid, ids, context=None):
if context is None:
context = {}
super(account_installer, self).execute(cr, uid, ids, context=context)
fy_obj = self.pool.get('account.fiscalyear')
mod_obj = self.pool.get('ir.model.data')
obj_acc = self.pool.get('account.account')
obj_tax_code = self.pool.get('account.tax.code')
obj_temp_tax_code = self.pool.get('account.tax.code.template')
obj_tax = self.pool.get('account.tax')
obj_acc_temp = self.pool.get('account.account.template')
obj_tax_code_temp = self.pool.get('account.tax.code.template')
obj_tax_temp = self.pool.get('account.tax.template')
obj_product = self.pool.get('product.product')
ir_values = self.pool.get('ir.values')
obj_acc_chart_temp = self.pool.get('account.chart.template')
record = self.browse(cr, uid, ids, context=context)[0]
company_id = record.company_id
for res in self.read(cr, uid, ids, context=context):
@@ -584,131 +136,84 @@ class account_installer(osv.osv_memory):
fp = tools.file_open(opj('account', 'configurable_account_chart.xml'))
tools.convert_xml_import(cr, 'account', fp, {}, 'init', True, None)
fp.close()
self.generate_configurable_chart(cr, uid, ids, context=context)
s_tax = (res.get('sale_tax', 0.0))/100
p_tax = (res.get('purchase_tax', 0.0))/100
tax_val = {}
default_tax = []
pur_temp_tax = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_base_purchases')
pur_temp_tax_id = pur_temp_tax and pur_temp_tax[1] or False
pur_temp_tax_names = obj_temp_tax_code.read(cr, uid, [pur_temp_tax_id], ['name'], context=context)
pur_tax_parent_name = pur_temp_tax_names and pur_temp_tax_names[0]['name'] or False
pur_taxcode_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', pur_tax_parent_name)], context=context)
if pur_taxcode_parent_id:
pur_taxcode_parent_id = pur_taxcode_parent_id[0]
else:
pur_taxcode_parent_id = False
pur_temp_tax_paid = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_input')
pur_temp_tax_paid = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_output')
pur_temp_tax_paid_id = pur_temp_tax_paid and pur_temp_tax_paid[1] or False
pur_temp_tax_paid_names = obj_temp_tax_code.read(cr, uid, [pur_temp_tax_paid_id], ['name'], context=context)
pur_tax_paid_parent_name = pur_temp_tax_names and pur_temp_tax_paid_names[0]['name'] or False
pur_taxcode_paid_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', pur_tax_paid_parent_name)], context=context)
if pur_taxcode_paid_parent_id:
pur_taxcode_paid_parent_id = pur_taxcode_paid_parent_id[0]
else:
pur_taxcode_paid_parent_id = False
sale_temp_tax = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_base_sales')
sale_temp_tax_id = sale_temp_tax and sale_temp_tax[1] or False
sale_temp_tax_names = obj_temp_tax_code.read(cr, uid, [sale_temp_tax_id], ['name'], context=context)
sale_tax_parent_name = sale_temp_tax_names and sale_temp_tax_names[0]['name'] or False
sale_taxcode_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', sale_tax_parent_name)], context=context)
if sale_taxcode_parent_id:
sale_taxcode_parent_id = sale_taxcode_parent_id[0]
else:
sale_taxcode_parent_id = False
sale_temp_tax_paid = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_output')
sale_temp_tax_paid = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_input')
sale_temp_tax_paid_id = sale_temp_tax_paid and sale_temp_tax_paid[1] or False
sale_temp_tax_paid_names = obj_temp_tax_code.read(cr, uid, [sale_temp_tax_paid_id], ['name'], context=context)
sale_tax_paid_parent_name = sale_temp_tax_paid_names and sale_temp_tax_paid_names[0]['name'] or False
sale_taxcode_paid_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', sale_tax_paid_parent_name)], context=context)
if sale_taxcode_paid_parent_id:
sale_taxcode_paid_parent_id = sale_taxcode_paid_parent_id[0]
else:
sale_taxcode_paid_parent_id = False
if s_tax*100 > 0.0:
tax_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Tax Received')], context=context)
chart_temp_ids = obj_acc_chart_temp.search(cr, uid, [('name','=','Configurable Account Chart Template')], context=context)
chart_temp_id = chart_temp_ids and chart_temp_ids[0] or False
if s_tax * 100 > 0.0:
tax_account_ids = obj_acc_temp.search(cr, uid, [('name', '=', 'Tax Received')], context=context)
sales_tax_account_id = tax_account_ids and tax_account_ids[0] or False
vals_tax_code = {
'name': 'TAX%s%%'%(s_tax*100),
'code': 'TAX%s%%'%(s_tax*100),
'company_id': company_id.id,
'sign': 1,
'parent_id': sale_taxcode_parent_id
vals_tax_code_temp = {
'name': _('TAX %s%%') % (s_tax*100),
'code': _('TAX %s%%') % (s_tax*100),
'parent_id': sale_temp_tax_id
}
new_tax_code = obj_tax_code.create(cr, uid, vals_tax_code, context=context)
vals_paid_tax_code = {
'name': 'TAX Received %s%%'%(s_tax*100),
'code': 'TAX Received %s%%'%(s_tax*100),
'company_id': company_id.id,
'sign': 1,
'parent_id': sale_taxcode_paid_parent_id
}
new_paid_tax_code = obj_tax_code.create(cr, uid, vals_paid_tax_code, context=context)
sales_tax = obj_tax.create(cr, uid,
{'name': 'TAX %s%%'%(s_tax*100),
new_tax_code_temp = obj_tax_code_temp.create(cr, uid, vals_tax_code_temp, context=context)
vals_paid_tax_code_temp = {
'name': _('TAX Received %s%%') % (s_tax*100),
'code': _('TAX Received %s%%') % (s_tax*100),
'parent_id': sale_temp_tax_paid_id
}
new_paid_tax_code_temp = obj_tax_code_temp.create(cr, uid, vals_paid_tax_code_temp, context=context)
sales_tax_temp = obj_tax_temp.create(cr, uid, {
'name': _('TAX %s%%') % (s_tax*100),
'amount': s_tax,
'base_code_id': new_tax_code,
'tax_code_id': new_paid_tax_code,
'base_code_id': new_tax_code_temp,
'tax_code_id': new_paid_tax_code_temp,
'ref_base_code_id': new_tax_code_temp,
'ref_tax_code_id': new_paid_tax_code_temp,
'type_tax_use': 'sale',
'type': 'percent',
'sequence': 0,
'account_collected_id': sales_tax_account_id,
'account_paid_id': sales_tax_account_id
}, context=context)
default_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Product Sales')], context=context)
if default_account_ids:
obj_acc.write(cr, uid, default_account_ids, {'tax_ids': [(6, 0, [sales_tax])]}, context=context)
tax_val.update({'taxes_id': [(6, 0, [sales_tax])]})
default_tax.append(('taxes_id', sales_tax))
if p_tax*100 > 0.0:
tax_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Tax Paid')], context=context)
'account_paid_id': sales_tax_account_id,
'chart_template_id': chart_temp_id,
}, context=context)
if p_tax * 100 > 0.0:
tax_account_ids = obj_acc_temp.search(cr, uid, [('name', '=', 'Tax Paid')], context=context)
purchase_tax_account_id = tax_account_ids and tax_account_ids[0] or False
vals_tax_code = {
'name': 'TAX%s%%'%(p_tax*100),
'code': 'TAX%s%%'%(p_tax*100),
'company_id': company_id.id,
'sign': 1,
'parent_id': pur_taxcode_parent_id
vals_tax_code_temp = {
'name': _('TAX %s%%') % (p_tax*100),
'code': _('TAX %s%%') % (p_tax*100),
'parent_id': pur_temp_tax_id
}
new_tax_code = obj_tax_code.create(cr, uid, vals_tax_code, context=context)
vals_paid_tax_code = {
'name': 'TAX Paid %s%%'%(p_tax*100),
'code': 'TAX Paid %s%%'%(p_tax*100),
'company_id': company_id.id,
'sign': 1,
'parent_id': pur_taxcode_paid_parent_id
new_tax_code_temp = obj_tax_code_temp.create(cr, uid, vals_tax_code_temp, context=context)
vals_paid_tax_code_temp = {
'name': _('TAX Paid %s%%') % (p_tax*100),
'code': _('TAX Paid %s%%') % (p_tax*100),
'parent_id': pur_temp_tax_paid_id
}
new_paid_tax_code = obj_tax_code.create(cr, uid, vals_paid_tax_code, context=context)
purchase_tax = obj_tax.create(cr, uid,
{'name': 'TAX%s%%'%(p_tax*100),
'description': 'TAX%s%%'%(p_tax*100),
new_paid_tax_code_temp = obj_tax_code_temp.create(cr, uid, vals_paid_tax_code_temp, context=context)
purchase_tax_temp = obj_tax_temp.create(cr, uid, {
'name': _('TAX %s%%') % (p_tax*100),
'description': _('TAX %s%%') % (p_tax*100),
'amount': p_tax,
'base_code_id': new_tax_code,
'tax_code_id': new_paid_tax_code,
'type_tax_use': 'purchase',
'account_collected_id': purchase_tax_account_id,
'account_paid_id': purchase_tax_account_id
}, context=context)
default_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Expenses')], context=context)
if default_account_ids:
obj_acc.write(cr, uid, default_account_ids, {'tax_ids': [(6, 0, [purchase_tax])]}, context=context)
tax_val.update({'supplier_taxes_id': [(6 ,0, [purchase_tax])]})
default_tax.append(('supplier_taxes_id', purchase_tax))
if tax_val:
product_ids = obj_product.search(cr, uid, [], context=context)
for product in obj_product.browse(cr, uid, product_ids, context=context):
obj_product.write(cr, uid, product.id, tax_val, context=context)
for name, value in default_tax:
ir_values.set(cr, uid, key='default', key2=False, name=name, models =[('product.product', False)], value=[value])
'base_code_id': new_tax_code_temp,
'tax_code_id': new_paid_tax_code_temp,
'ref_base_code_id': new_tax_code_temp,
'ref_tax_code_id': new_paid_tax_code_temp,
'type_tax_use': 'purchase',
'type': 'percent',
'sequence': 0,
'account_collected_id': purchase_tax_account_id,
'account_paid_id': purchase_tax_account_id,
'chart_template_id': chart_temp_id,
}, context=context)
if 'date_start' in res and 'date_stop' in res:
f_ids = fy_obj.search(cr, uid, [('date_start', '<=', res['date_start']), ('date_stop', '>=', res['date_stop']), ('company_id', '=', res['company_id'])], context=context)
f_ids = fy_obj.search(cr, uid, [('date_start', '<=', res['date_start']), ('date_stop', '>=', res['date_stop']), ('company_id', '=', res['company_id'][0])], context=context)
if not f_ids:
name = code = res['date_start'][:4]
if int(name) != int(res['date_stop'][:4]):
@@ -719,7 +224,7 @@ class account_installer(osv.osv_memory):
'code': code,
'date_start': res['date_start'],
'date_stop': res['date_stop'],
'company_id': res['company_id']
'company_id': res['company_id'][0]
}
fiscal_id = fy_obj.create(cr, uid, vals, context=context)
if res['period'] == 'month':
@@ -727,7 +232,6 @@ class account_installer(osv.osv_memory):
elif res['period'] == '3months':
fy_obj.create_period3(cr, uid, [fiscal_id])
def modules_to_install(self, cr, uid, ids, context=None):
modules = super(account_installer, self).modules_to_install(
cr, uid, ids, context=context)
@@ -740,18 +244,6 @@ class account_installer(osv.osv_memory):
account_installer()
class account_bank_accounts_wizard(osv.osv_memory):
_name='account.bank.accounts.wizard'
_columns = {
'acc_name': fields.char('Account Name.', size=64, required=True),
'bank_account_id': fields.many2one('account.installer', 'Bank Account', required=True),
'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."),
'account_type': fields.selection([('cash','Cash'), ('check','Check'), ('bank','Bank')], 'Account Type', size=32),
}
account_bank_accounts_wizard()
class account_installer_modules(osv.osv_memory):
_name = 'account.installer.modules'
_inherit = 'res.config.installer'
addons/account/invoice.py
+37 -10
View File
@@ -51,11 +51,9 @@ class account_invoice(osv.osv):
user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
company_id = context.get('company_id', user.company_id.id)
type2journal = {'out_invoice': 'sale', 'in_invoice': 'purchase', 'out_refund': 'sale_refund', 'in_refund': 'purchase_refund'}
refund_journal = {'out_invoice': False, 'in_invoice': False, 'out_refund': True, 'in_refund': True}
journal_obj = self.pool.get('account.journal')
res = journal_obj.search(cr, uid, [('type', '=', type2journal.get(type_inv, 'sale')),
('company_id', '=', company_id),
('refund_journal', '=', refund_journal.get(type_inv, False))],
('company_id', '=', company_id)],
limit=1)
return res and res[0] or False
@@ -364,13 +362,13 @@ class account_invoice(osv.osv):
def unlink(self, cr, uid, ids, context=None):
if context is None:
context = {}
invoices = self.read(cr, uid, ids, ['state'], context=context)
invoices = self.read(cr, uid, ids, ['state','internal_number'], context=context)
unlink_ids = []
for t in invoices:
if t['state'] in ('draft', 'cancel'):
if t['state'] in ('draft', 'cancel') and t['internal_number']== False:
unlink_ids.append(t['id'])
else:
raise osv.except_osv(_('Invalid action !'), _('Cannot delete invoice(s) that are already opened or paid !'))
raise osv.except_osv(_('Invalid action !'), _('Cannot delete invoice(s) that are already opened(or been in opened state ever) or paid!'))
osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
return True
@@ -657,7 +655,9 @@ class account_invoice(osv.osv):
def _convert_ref(self, cr, uid, ref):
return (ref or '').replace('/','')
def _get_analytic_lines(self, cr, uid, id):
def _get_analytic_lines(self, cr, uid, id, context=None):
if context is None:
context = {}
inv = self.browse(cr, uid, id)
cur_obj = self.pool.get('res.currency')
@@ -667,7 +667,7 @@ class account_invoice(osv.osv):
else:
sign = -1
iml = self.pool.get('account.invoice.line').move_line_get(cr, uid, inv.id)
iml = self.pool.get('account.invoice.line').move_line_get(cr, uid, inv.id, context=context)
for il in iml:
if il['account_analytic_id']:
if inv.type in ('in_invoice', 'in_refund'):
@@ -994,7 +994,7 @@ class account_invoice(osv.osv):
ctx = context.copy()
if obj_inv.type in ('out_invoice', 'out_refund'):
ctx = self.get_log_context(cr, uid, context=ctx)
message = _('Invoice ') + " '" + name + "' "+ _("is validated.")
message = _("Invoice '%s' is validated.") % name
self.log(cr, uid, inv_id, message, context=ctx)
return True
@@ -1290,6 +1290,20 @@ class account_invoice_line(osv.osv):
'price_unit': _price_unit_default,
}
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
if context is None:
context = {}
res = super(account_invoice_line,self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
if context.get('type', False):
doc = etree.XML(res['arch'])
for node in doc.xpath("//field[@name='product_id']"):
if context['type'] in ('in_invoice', 'in_refund'):
node.set('domain', "[('purchase_ok', '=', True)]")
else:
node.set('domain', "[('sale_ok', '=', True)]")
res['arch'] = etree.tostring(doc)
return res
def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
if context is None:
context = {}
@@ -1336,6 +1350,7 @@ class account_invoice_line(osv.osv):
domain = {}
result['uos_id'] = res.uom_id.id or uom or False
result['note'] = res.description
if result['uos_id']:
res2 = res.uom_id.category_id.id
if res2:
@@ -1351,6 +1366,8 @@ class account_invoice_line(osv.osv):
currency = self.pool.get('res.currency').browse(cr, uid, currency_id, context=context)
if company.currency_id.id != currency.id:
if type in ('in_invoice', 'in_refund'):
res_final['value']['price_unit'] = res.standard_price
new_price = res_final['value']['price_unit'] * currency.rate
res_final['value']['price_unit'] = new_price
@@ -1592,7 +1609,17 @@ class res_partner(osv.osv):
_columns = {
'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True),
}
def copy(self, cr, uid, id, default=None, context=None):
if default is None:
default = {}
if context is None:
context = {}
default.update({'invoice_ids' : []})
return super(res_partner, self).copy(cr, uid, id, default, context)
res_partner()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account/partner_view.xml
+3 -3
View File
@@ -76,13 +76,13 @@
<page string="Accounting">
<group col="2" colspan="2">
<separator string="Customer Accounting Properties" colspan="2"/>
<field name="property_account_receivable" groups="base.group_extended" />
<field name="property_account_receivable" groups="account.group_account_invoice" />
<field name="property_account_position" widget="selection"/>
<field name="property_payment_term" widget="selection"/>
</group>
<group col="2" colspan="2">
<separator string="Supplier Accounting Properties" colspan="2"/>
<field name="property_account_payable" groups="base.group_extended"/>
<field name="property_account_payable" groups="account.group_account_invoice"/>
</group>
<group col="2" colspan="2">
<separator string="Customer Credit" colspan="2"/>
@@ -131,7 +131,7 @@
id="action_analytic_open"
name="Analytic Accounts"
res_model="account.analytic.account"
context="{'search_default_partner_id':[active_id]}"
context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
src_model="res.partner"
view_type="form"
view_mode="tree,form,graph,calendar"
addons/account/project/analytic_account_demo.xml
+40 -1
View File
@@ -8,89 +8,106 @@
<record id="analytic_absences" model="account.analytic.account">
<field name="name">Leaves</field>
<field name="code">1</field>
<field name="type">view</field>
<field name="parent_id" ref="analytic_root"/>
</record>
<record id="analytic_internal" model="account.analytic.account">
<field name="name">Internal</field>
<field name="code">2</field>
<field name="type">view</field>
<field name="parent_id" ref="analytic_root"/>
</record>
<record id="analytic_our_super_product" model="account.analytic.account">
<field name="name">Our Super Product</field>
<field name="code">100</field>
<field name="state">open</field>
<field name="type">view</field>
<field name="parent_id" ref="analytic_root"/>
</record>
<record id="analytic_project_1" model="account.analytic.account">
<field name="name">Project 1</field>
<field name="code">101</field>
<field name="type">view</field>
<field name="parent_id" ref="analytic_root"/>
</record>
<record id="analytic_project_2" model="account.analytic.account">
<field name="name">Project 2</field>
<field name="code">102</field>
<field name="type">view</field>
<field name="parent_id" ref="analytic_root"/>
</record>
<record id="analytic_journal_trainings" model="account.analytic.account">
<field name="name">Training</field>
<field name="code">4</field>
<field name="type">view</field>
<field name="parent_id" ref="analytic_internal"/>
</record>
<record id="analytic_in_house" model="account.analytic.account">
<field name="name">In House</field>
<field name="code">1</field>
<field name="type">normal</field>
<field name="parent_id" ref="analytic_journal_trainings"/>
</record>
<record id="analytic_online" model="account.analytic.account">
<field name="name">Online</field>
<field name="code">2</field>
<field name="type">normal</field>
<field name="parent_id" ref="analytic_journal_trainings"/>
</record>
<record id="analytic_support" model="account.analytic.account">
<field name="name">Support</field>
<field name="code">support</field>
<field name="type">view</field>
<field name="parent_id" ref="analytic_our_super_product"/>
</record>
<record id="analytic_partners" model="account.analytic.account">
<field name="name">Partners</field>
<field name="code">partners</field>
<field name="type">view</field>
<field name="parent_id" ref="analytic_support"/>
</record>
<record id="analytic_customers" model="account.analytic.account">
<field name="name">Customers</field>
<field name="code">customers</field>
<field name="type">view</field>
<field name="parent_id" ref="analytic_support"/>
</record>
<record id="analytic_support_internal" model="account.analytic.account">
<field name="name">Internal</field>
<field name="code">3</field>
<field name="type">normal</field>
<field name="parent_id" ref="analytic_support"/>
</record>
<record id="analytic_integration" model="account.analytic.account">
<field name="name">Integration</field>
<field name="code">integration</field>
<field name="type">view</field>
<field name="parent_id" ref="analytic_our_super_product"/>
</record>
<record id="analytic_consultancy" model="account.analytic.account">
<field name="name">Consultancy</field>
<field name="code">4</field>
<field name="type">normal</field>
<field name="parent_id" ref="analytic_our_super_product"/>
</record>
<record id="analytic_super_product_trainings" model="account.analytic.account">
<field name="name">Training</field>
<field name="code">5</field>
<field name="type">normal</field>
<field name="parent_id" ref="analytic_our_super_product"/>
</record>
<record id="analytic_seagate_p1" model="account.analytic.account">
<field name="name">Seagate P1</field>
<field name="code">1</field>
<field name="parent_id" ref="analytic_integration"/>
<field name="type">normal</field>
<field name="state">open</field>
<field name="partner_id" ref="base.res_partner_seagate"/>
</record>
<record id="analytic_seagate_p2" model="account.analytic.account">
<field name="name">Seagate P2</field>
<field name="code">2</field>
<field name="type">normal</field>
<field name="parent_id" ref="analytic_integration"/>
<field name="state">open</field>
<field name="partner_id" ref="base.res_partner_seagate"/>
@@ -99,11 +116,13 @@
<field name="name">Magasin BML 1</field>
<field name="code">3</field>
<field name="parent_id" ref="analytic_integration"/>
<field name="type">normal</field>
<field name="partner_id" ref="base.res_partner_15"/>
</record>
<record id="analytic_integration_c2c" model="account.analytic.account">
<field name="name">CampToCamp</field>
<field name="code">7</field>
<field name="type">normal</field>
<field eval="str(time.localtime()[0] - 1) + '-08-07'" name="date_start"/>
<field eval="time.strftime('%Y-12-31')" name="date"/>
<field name="parent_id" ref="analytic_integration"/>
@@ -114,18 +133,21 @@
<field name="name">Agrolait</field>
<field name="code">3</field>
<field name="parent_id" ref="analytic_customers"/>
<field name="type">normal</field>
<field name="partner_id" ref="base.res_partner_agrolait"/>
</record>
<record id="analytic_asustek" model="account.analytic.account">
<field name="name">Asustek</field>
<field name="code">4</field>
<field name="parent_id" ref="analytic_customers"/>
<field name="type">normal</field>
<field name="parent_id" ref="analytic_customers"/>
<field name="partner_id" ref="base.res_partner_asus"/>
</record>
<record id="analytic_distripc" model="account.analytic.account">
<field name="name">DistriPC</field>
<field name="code">7</field>
<field name="parent_id" ref="analytic_customers"/>
<field name="type">normal</field>
<field name="partner_id" ref="base.res_partner_4"/>
</record>
<record id="analytic_sednacom" model="account.analytic.account">
@@ -134,6 +156,7 @@
<field eval="str(time.localtime()[0] - 1) + '-05-09'" name="date_start"/>
<field eval="time.strftime('%Y-05-08')" name="date"/>
<field name="parent_id" ref="analytic_partners"/>
<field name="type">normal</field>
<field name="partner_id" ref="base.res_partner_sednacom"/>
<field name="state">open</field>
</record>
@@ -142,6 +165,7 @@
<field name="code">3</field>
<field eval="time.strftime('%Y-02-01')" name="date_start"/>
<field eval="time.strftime('%Y-07-01')" name="date"/>
<field name="type">normal</field>
<field name="parent_id" ref="analytic_partners"/>
<field name="partner_id" ref="base.res_partner_thymbra"/>
<field name="state">open</field>
@@ -151,6 +175,7 @@
<field name="code">10</field>
<field eval="time.strftime('%Y-04-24')" name="date_start"/>
<field eval="str(time.localtime()[0] + 1) + '-04-24'" name="date"/>
<field name="type">normal</field>
<field name="parent_id" ref="analytic_partners"/>
<field name="partner_id" ref="base.res_partner_11"/>
</record>
@@ -159,12 +184,14 @@
<field name="code">12</field>
<field eval="time.strftime('%Y-02-01')" name="date_start"/>
<field eval="str(time.localtime()[0] + 1) + '-02-01'" name="date"/>
<field name="type">normal</field>
<field name="parent_id" ref="analytic_partners"/>
<field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
</record>
<record id="analytic_tiny_at_work" model="account.analytic.account">
<field name="name">OpenERP SA AT Work</field>
<field name="code">15</field>
<field name="type">normal</field>
<field name="parent_id" ref="analytic_partners"/>
<field name="partner_id" ref="base.res_partner_tinyatwork"/>
</record>
@@ -173,6 +200,7 @@
<field name="code">21</field>
<field eval="time.strftime('%Y-%m-%d', time.localtime(time.time() - 365 * 86400))" name="date_start"/>
<field eval="time.strftime('%Y-%m-%d')" name="date"/>
<field name="type">normal</field>
<field name="parent_id" ref="analytic_partners"/>
<field name="partner_id" ref="base.res_partner_c2c"/>
<field name="state">open</field>
@@ -180,56 +208,67 @@
<record id="analytic_project_2_support" model="account.analytic.account">
<field name="name">Support</field>
<field name="code">1</field>
<field name="type">normal</field>
<field name="parent_id" ref="analytic_project_2"/>
</record>
<record id="analytic_project_2_development" model="account.analytic.account">
<field name="name">Development</field>
<field name="code">2</field>
<field name="type">normal</field>
<field name="parent_id" ref="analytic_project_2"/>
</record>
<record id="analytic_project_1_trainings" model="account.analytic.account">
<field name="name">Training</field>
<field name="code">1</field>
<field name="type">normal</field>
<field name="parent_id" ref="analytic_project_1"/>
</record>
<record id="analytic_project_1_development" model="account.analytic.account">
<field name="name">Development</field>
<field name="code">2</field>
<field name="type">normal</field>
<field name="parent_id" ref="analytic_project_1"/>
</record>
<record id="analytic_administratif" model="account.analytic.account">
<field name="name">Administrative</field>
<field name="code">1</field>
<field name="type">normal</field>
<field name="parent_id" ref="analytic_internal"/>
</record>
<record id="analytic_commercial_marketing" model="account.analytic.account">
<field name="name">Commercial &amp; Marketing</field>
<field name="code">2</field>
<field name="type">normal</field>
<field name="parent_id" ref="analytic_internal"/>
</record>
<record id="analytic_our_super_product_development" model="account.analytic.account">
<field name="name">Our Super Product Development</field>
<field name="code">3</field>
<field name="type">view</field>
<field name="parent_id" ref="analytic_internal"/>
</record>
<record id="analytic_stable" model="account.analytic.account">
<field name="name">Stable</field>
<field name="code">1</field>
<field name="type">normal</field>
<field name="parent_id" ref="analytic_our_super_product_development"/>
</record>
<record id="analytic_trunk" model="account.analytic.account">
<field name="name">Trunk</field>
<field name="code">2</field>
<field name="type">normal</field>
<field name="parent_id" ref="analytic_our_super_product_development"/>
</record>
<record id="analytic_paid" model="account.analytic.account">
<field name="name">Paid</field>
<field name="code">1</field>
<field name="type">normal</field>
<field name="parent_id" ref="analytic_absences"/>
</record>
<record id="analytic_unpaid" model="account.analytic.account">
<field name="name">Unpaid</field>
<field name="code">2</field>
<field name="type">normal</field>
<field name="parent_id" ref="analytic_absences"/>
</record>
</data>
addons/account/project/project_view.xml
+4 -3
View File
@@ -55,7 +55,7 @@
<field name="type">tree</field>
<field name="field_parent">child_complete_ids</field>
<field name="arch" type="xml">
<tree colors="red:(date&lt;current_date);black:(date&gt;=current_date);black:(date==False)" string="Analytic account" toolbar="1">
<tree colors="blue:type in ('view');red:(date&lt;current_date);black:(date&gt;=current_date);black:(date==False)" string="Analytic account" toolbar="1">
<field name="name"/>
<field name="code"/>
<field name="quantity"/>
@@ -68,6 +68,7 @@
<field name="user_id" invisible="1"/>
<field name="partner_id" invisible="1"/>
<field name="parent_id" invisible="1"/>
<field name="type"/>
</tree>
</field>
</record>
@@ -81,7 +82,7 @@
<group colspan="4" col="6">
<field name="name" select="1" colspan="4"/>
<field name="code" select="1"/>
<field name="parent_id" on_change="on_change_parent(parent_id)" groups="base.group_extended"/>
<field name="parent_id" on_change="on_change_parent(parent_id)" groups="base.group_extended" domain="[('type','=','view')]"/>
<field name="company_id" on_change="on_change_company(company_id)" select="2" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
<field name="type" select="2"/>
</group>
@@ -445,7 +446,7 @@
</record>
<act_window
context="{'search_default_account_id': [active_id], 'search_default_user_id': False}"
context="{'search_default_account_id': [active_id], 'search_default_user_id': False, 'default_account_id': active_id}"
id="act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal"
name="All Analytic Entries"
res_model="account.analytic.line"
addons/account/report/account_balance.py
+1 -1
View File
@@ -89,7 +89,7 @@ class account_balance(report_sxw.rml_parse, common_report_header):
self.sum_debit += account_rec['debit']
self.sum_credit += account_rec['credit']
if disp_acc == 'bal_movement':
if not currency_obj.is_zero(self.cr, self.uid, currency, res['credit']) > 0 or not currency_obj.is_zero(self.cr, self.uid, currency, res['debit']) > 0 or not currency_obj.is_zero(self.cr, self.uid, currency, res['balance']):
if not currency_obj.is_zero(self.cr, self.uid, currency, res['credit']) or not currency_obj.is_zero(self.cr, self.uid, currency, res['debit']) or not currency_obj.is_zero(self.cr, self.uid, currency, res['balance']):
self.result_acc.append(res)
elif disp_acc == 'bal_solde':
if not currency_obj.is_zero(self.cr, self.uid, currency, res['balance']):
addons/account/report/account_balance_sheet.py
+3 -2
View File
@@ -100,7 +100,8 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header)
ctx['fiscalyear'] = data['form'].get('fiscalyear_id', False)
if data['form']['filter'] == 'filter_period':
ctx['periods'] = data['form'].get('periods', False)
ctx['period_from'] = data['form'].get('period_from', False)
ctx['period_to'] = data['form'].get('period_to', False)
elif data['form']['filter'] == 'filter_date':
ctx['date_from'] = data['form'].get('date_from', False)
ctx['date_to'] = data['form'].get('date_to', False)
@@ -143,7 +144,7 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header)
if typ == 'asset' and account.type <> 'view' and (account.debit <> account.credit):
self.result_sum_cr += account.balance
if data['form']['display_account'] == 'bal_movement':
if not currency_pool.is_zero(self.cr, self.uid, currency, account.credit) > 0 or not currency_pool.is_zero(self.cr, self.uid, currency, account.debit) > 0 or not currency_pool.is_zero(self.cr, self.uid, currency, account.balance):
if not currency_pool.is_zero(self.cr, self.uid, currency, account.credit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.debit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.balance):
accounts_temp.append(account_dict)
elif data['form']['display_account'] == 'bal_solde':
if not currency_pool.is_zero(self.cr, self.uid, currency, account.balance):
addons/account/report/account_invoice_report_view.xml
+2 -2
View File
@@ -114,7 +114,7 @@
<filter string="Salesman" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True,'residual_invisible':True}"/>
<filter string="Category of Product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id','residual_invisible':True}"/>
<filter string="Category of Product" name="category_product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id','residual_invisible':True}"/>
<separator orientation="vertical"/>
<filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
@@ -139,7 +139,7 @@
<field name="res_model">account.invoice.report</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="context">{'search_default_current':1, 'search_default_partner':1, 'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,}</field>
<field name="context">{'search_default_current':1, 'search_default_category_product':1, 'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,}</field>
<field name="search_view_id" ref="view_account_invoice_report_search"/>
<field name="help">From this report, you can have an overview of the amount invoiced to your customer as well as payment delays. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs.</field>
addons/account/report/account_print_invoice.rml
+12 -12
View File
@@ -142,16 +142,16 @@
<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
<para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
<pto_header><!-- Must be after setLang() -->
<blockTable colWidths="202.0,87.0,71.0,57.0,42.0,71.0" style="Table7">
<tr>
<td> <para style="terp_tblheader_Details">Description</para> </td>
<td> <para style="terp_tblheader_Details_Centre">Taxes</para> </td>
<td> <para style="terp_tblheader_Details_Centre">Quantity</para> </td>
<td> <para style="terp_tblheader_Details_Right">Unit Price </para> </td>
<td> <para style="terp_tblheader_Details_Right">Disc.(%)</para> </td>
<td> <para style="terp_tblheader_Details_Right">Price</para> </td>
</tr>
</blockTable>
<blockTable colWidths="202.0,87.0,71.0,57.0,42.0,71.0" style="Table7">
<tr>
<td> <para style="terp_tblheader_Details">Description</para> </td>
<td> <para style="terp_tblheader_Details_Centre">Taxes</para> </td>
<td> <para style="terp_tblheader_Details_Centre">Quantity</para> </td>
<td> <para style="terp_tblheader_Details_Right">Unit Price </para> </td>
<td> <para style="terp_tblheader_Details_Right">Disc.(%)</para> </td>
<td> <para style="terp_tblheader_Details_Right">Price</para> </td>
</tr>
</blockTable>
</pto_header>
<blockTable colWidths="297.0,233.0" style="Table_Partner_Address">
<tr>
@@ -194,7 +194,7 @@
<td>
<para style="terp_tblheader_General_Centre">Invoice Date</para>
</td>
<td>
<td>
<para style="terp_tblheader_General_Centre">Origin</para>
</td>
<td>
@@ -210,7 +210,7 @@
<td>
<para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>
</td>
<td>
<td>
<para style="terp_default_Centre_9">[[ o.origin or '' ]]</para>
</td>
<td>
addons/account/report/account_profit_loss.py
+3 -2
View File
@@ -93,7 +93,8 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header):
ctx['fiscalyear'] = data['form'].get('fiscalyear_id', False)
if data['form']['filter'] == 'filter_period':
ctx['periods'] = data['form'].get('periods', False)
ctx['period_from'] = data['form'].get('period_from', False)
ctx['period_to'] = data['form'].get('period_to', False)
elif data['form']['filter'] == 'filter_date':
ctx['date_from'] = data['form'].get('date_from', False)
ctx['date_to'] = data['form'].get('date_to', False)
@@ -113,7 +114,7 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header):
if typ == 'income' and account.type <> 'view' and (account.debit <> account.credit):
self.result_sum_cr += abs(account.debit - account.credit)
if data['form']['display_account'] == 'bal_movement':
if not currency_pool.is_zero(self.cr, self.uid, currency, account.credit) > 0 or not currency_pool.is_zero(self.cr, self.uid, currency, account.debit) > 0 or not currency_pool.is_zero(self.cr, self.uid, currency, account.balance):
if not currency_pool.is_zero(self.cr, self.uid, currency, account.credit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.debit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.balance):
accounts_temp.append(account)
elif data['form']['display_account'] == 'bal_solde':
if not currency_pool.is_zero(self.cr, self.uid, currency, account.balance):
addons/account/security/account_security.xml
+36 -14
View File
@@ -16,98 +16,120 @@
<field name="name">Account Entry</field>
<field ref="model_account_move" name="model_id"/>
<field eval="True" name="global"/>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record id="account_move_line_comp_rule" model="ir.rule">
<field name="name">Entry lines</field>
<field model="ir.model" name="model_id" ref="model_account_move_line"/>
<field eval="True" name="global"/>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record id="journal_period_comp_rule" model="ir.rule">
<field name="name">Journal Period</field>
<field model="ir.model" name="model_id" ref="model_account_journal_period"/>
<field eval="True" name="global"/>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record id="journal_comp_rule" model="ir.rule">
<field name="name">Journal multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_journal"/>
<field eval="True" name="global"/>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record id="analytic_journal_comp_rule" model="ir.rule">
<field name="name">Analytic journal multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_analytic_journal"/>
<field eval="True" name="global"/>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record id="analytic_journal_comp_rule_false" model="ir.rule">
<field name="name">Analytic journal multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_analytic_journal"/>
<field eval="True" name="global"/>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record id="period_comp_rule" model="ir.rule">
<field name="name">Period multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_period"/>
<field eval="True" name="global"/>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record id="fiscal_year_comp_rule" model="ir.rule">
<field name="name">Fiscal year multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_fiscalyear"/>
<field eval="True" name="global"/>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record id="account_comp_rule" model="ir.rule">
<field name="name">Account multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_account"/>
<field eval="True" name="global"/>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record id="tax_comp_rule" model="ir.rule">
<field name="name">Tax multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_tax"/>
<field eval="True" name="global"/>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record id="tax_code_comp_rule" model="ir.rule">
<field name="name">Tax code multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_tax_code"/>
<field eval="True" name="global"/>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record id="invoice_comp_rule" model="ir.rule">
<field name="name">Invoice multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_invoice"/>
<field eval="True" name="global"/>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record id="account_fiscal_position_comp_rule" model="ir.rule">
<field name="name">Account fiscal Mapping company rule</field>
<field model="ir.model" name="model_id" ref="model_account_fiscal_position"/>
<field eval="True" name="global"/>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record id="account_model_comp_rule" model="ir.rule">
<field name="name">Account model company rule</field>
<field model="ir.model" name="model_id" ref="model_account_model"/>
<field eval="True" name="global"/>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record model="ir.rule" id="account_invoice_line_comp_rule">
<field name="name">Invoice Line company rule</field>
<field name="model_id" ref="model_account_invoice_line"/>
<field name="global" eval="True"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record model="ir.rule" id="account_bank_statement_comp_rule">
<field name="name">Account bank statement company rule</field>
<field name="model_id" ref="model_account_bank_statement"/>
<field name="global" eval="True"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record model="ir.rule" id="account_bank_statement_line_comp_rule">
<field name="name">Account bank statement line company rule</field>
<field name="model_id" ref="model_account_bank_statement_line"/>
<field name="global" eval="True"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
</data></openerp>
addons/account/security/ir.model.access.csv
+1
View File
@@ -63,6 +63,7 @@
"access_account_fiscalyear_user","account.fiscalyear.user","model_account_fiscalyear","account.group_account_user",1,0,0,0
"access_account_fiscalyear_invoice","account.fiscalyear.invoice","model_account_fiscalyear","account.group_account_invoice",1,0,0,0
"access_account_fiscalyear_partner_manager","account.fiscalyear.partnermanager","model_account_fiscalyear","base.group_partner_manager",1,0,0,0
"access_account_fiscalyear_employee","account.fiscalyear employee","model_account_fiscalyear","base.group_user",1,0,0,0
"access_res_currency_account_manager","res.currency account manager","base.model_res_currency","group_account_manager",1,1,1,1
"access_res_currency_rate_account_manager","res.currency.rate account manager","base.model_res_currency_rate","group_account_manager",1,1,1,1
"access_account_invoice_user","account.invoice user","model_account_invoice","base.group_user",1,0,0,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
63 access_account_fiscalyear_user account.fiscalyear.user model_account_fiscalyear account.group_account_user 1 0 0 0
64 access_account_fiscalyear_invoice account.fiscalyear.invoice model_account_fiscalyear account.group_account_invoice 1 0 0 0
65 access_account_fiscalyear_partner_manager account.fiscalyear.partnermanager model_account_fiscalyear base.group_partner_manager 1 0 0 0
66 access_account_fiscalyear_employee account.fiscalyear employee model_account_fiscalyear base.group_user 1 0 0 0
67 access_res_currency_account_manager res.currency account manager base.model_res_currency group_account_manager 1 1 1 1
68 access_res_currency_rate_account_manager res.currency.rate account manager base.model_res_currency_rate group_account_manager 1 1 1 1
69 access_account_invoice_user account.invoice user model_account_invoice base.group_user 1 0 0 0
addons/account/wizard/account_automatic_reconcile.py
+15 -15
View File
@@ -143,15 +143,15 @@ class account_automatic_reconcile(osv.osv_memory):
obj_model = self.pool.get('ir.model.data')
if context is None:
context = {}
form = self.read(cr, uid, ids, [])[0]
max_amount = form.get('max_amount', False) and form.get('max_amount') or 0.0
power = form['power']
allow_write_off = form['allow_write_off']
form = self.browse(cr, uid, ids, context=context)[0]
max_amount = form.max_amount or 0.0
power = form.power
allow_write_off = form.allow_write_off
reconciled = unreconciled = 0
if not form['account_ids']:
if not form.account_ids:
raise osv.except_osv(_('UserError'), _('You must select accounts to reconcile'))
for account_id in form['account_ids']:
params = (account_id,)
for account_id in form.account_ids:
params = (account_id.id,)
if not allow_write_off:
query = """SELECT partner_id FROM account_move_line WHERE account_id=%s AND reconcile_id IS NULL
AND state <> 'draft' GROUP BY partner_id
@@ -172,12 +172,12 @@ class account_automatic_reconcile(osv.osv_memory):
"AND partner_id=%s " \
"AND state <> 'draft' " \
"AND reconcile_id IS NULL",
(account_id, partner_id))
(account_id.id, partner_id))
line_ids = [id for (id,) in cr.fetchall()]
if line_ids:
reconciled += len(line_ids)
if allow_write_off:
move_line_obj.reconcile(cr, uid, line_ids, 'auto', form['writeoff_acc_id'], form['period_id'], form['journal_id'], context)
move_line_obj.reconcile(cr, uid, line_ids, 'auto', form.writeoff_acc_id.id, form.period_id.id, form.journal_id.id, context)
else:
move_line_obj.reconcile_partial(cr, uid, line_ids, 'manual', context=context)
@@ -191,7 +191,7 @@ class account_automatic_reconcile(osv.osv_memory):
"AND partner_id IS NOT NULL " \
"GROUP BY partner_id " \
"HAVING count(*)>1",
(account_id,))
(account_id.id,))
partner_ids = [id for (id,) in cr.fetchall()]
#filter?
for partner_id in partner_ids:
@@ -205,7 +205,7 @@ class account_automatic_reconcile(osv.osv_memory):
"AND state <> 'draft' " \
"AND debit > 0 " \
"ORDER BY date_maturity",
(account_id, partner_id))
(account_id.id, partner_id))
debits = cr.fetchall()
# get the list of unreconciled 'credit transactions' for this partner
@@ -218,10 +218,10 @@ class account_automatic_reconcile(osv.osv_memory):
"AND state <> 'draft' " \
"AND credit > 0 " \
"ORDER BY date_maturity",
(account_id, partner_id))
(account_id.id, partner_id))
credits = cr.fetchall()
(rec, unrec) = self.do_reconcile(cr, uid, credits, debits, max_amount, power, form['writeoff_acc_id'], form['period_id'], form['journal_id'], context)
(rec, unrec) = self.do_reconcile(cr, uid, credits, debits, max_amount, power, form.writeoff_acc_id.id, form.period_id.id, form.journal_id.id, context)
reconciled += rec
unreconciled += unrec
@@ -234,7 +234,7 @@ class account_automatic_reconcile(osv.osv_memory):
"WHERE account_id=%s " \
"AND reconcile_id IS NULL " \
"AND state <> 'draft' " + partner_filter,
(account_id,))
(account_id.id,))
additional_unrec = cr.fetchone()[0]
unreconciled = unreconciled + additional_unrec
context.update({'reconciled': reconciled, 'unreconciled': unreconciled})
@@ -252,4 +252,4 @@ class account_automatic_reconcile(osv.osv_memory):
account_automatic_reconcile()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account/wizard/account_change_currency.py
+3 -3
View File
@@ -45,8 +45,8 @@ class account_change_currency(osv.osv_memory):
obj_currency = self.pool.get('res.currency')
if context is None:
context = {}
data = self.read(cr, uid, ids)[0]
new_currency = data['currency_id']
data = self.browse(cr, uid, ids, context=context)[0]
new_currency = data.currency_id.id
invoice = obj_inv.browse(cr, uid, context['active_id'], context=context)
if invoice.currency_id.id == new_currency:
@@ -76,4 +76,4 @@ class account_change_currency(osv.osv_memory):
account_change_currency()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account/wizard/account_chart.py
+9 -6
View File
@@ -30,12 +30,12 @@ class account_chart(osv.osv_memory):
_columns = {
'fiscalyear': fields.many2one('account.fiscalyear', \
'Fiscal year', \
help = 'Keep empty for all open fiscal years'),
help='Keep empty for all open fiscal years'),
'period_from': fields.many2one('account.period', 'Start period'),
'period_to': fields.many2one('account.period', 'End period'),
'target_move': fields.selection([('posted', 'All Posted Entries'),
('all', 'All Entries'),
], 'Target Moves', required = True),
], 'Target Moves', required=True),
}
def onchange_fiscalyear(self, cr, uid, ids, fiscalyear_id=False, context=None):
@@ -83,13 +83,16 @@ class account_chart(osv.osv_memory):
result = mod_obj.get_object_reference(cr, uid, 'account', 'action_account_tree')
id = result and result[1] or False
result = act_obj.read(cr, uid, [id], context=context)[0]
fiscalyear_id = data.get('fiscalyear', False) and data['fiscalyear'][0] or False
result['periods'] = []
if data['period_from'] and data['period_to']:
result['periods'] = period_obj.build_ctx_periods(cr, uid, data['period_from'], data['period_to'])
result['context'] = str({'fiscalyear': data['fiscalyear'], 'periods': result['periods'], \
period_from = data.get('period_from', False) and data['period_from'][0] or False
period_to = data.get('period_to', False) and data['period_to'][0] or False
result['periods'] = period_obj.build_ctx_periods(cr, uid, period_from, period_to)
result['context'] = str({'fiscalyear': fiscalyear_id, 'periods': result['periods'], \
'state': data['target_move']})
if data['fiscalyear']:
result['name'] += ':' + fy_obj.read(cr, uid, [data['fiscalyear']], context=context)[0]['code']
if fiscalyear_id:
result['name'] += ':' + fy_obj.read(cr, uid, [fiscalyear_id], context=context)[0]['code']
return result
_defaults = {
addons/account/wizard/account_fiscalyear_close.py
+9 -9
View File
@@ -56,22 +56,22 @@ class account_fiscalyear_close(osv.osv_memory):
obj_acc_account = self.pool.get('account.account')
obj_acc_journal_period = self.pool.get('account.journal.period')
data = self.read(cr, uid, ids, context=context)
data = self.browse(cr, uid, ids, context=context)
if context is None:
context = {}
fy_id = data[0]['fy_id']
fy_id = data[0].fy_id.id
cr.execute("SELECT id FROM account_period WHERE date_stop < (SELECT date_start FROM account_fiscalyear WHERE id = %s)", (str(data[0]['fy2_id']),))
cr.execute("SELECT id FROM account_period WHERE date_stop < (SELECT date_start FROM account_fiscalyear WHERE id = %s)", (str(data[0].fy2_id.id),))
fy_period_set = ','.join(map(lambda id: str(id[0]), cr.fetchall()))
cr.execute("SELECT id FROM account_period WHERE date_start > (SELECT date_stop FROM account_fiscalyear WHERE id = %s)", (str(fy_id),))
fy2_period_set = ','.join(map(lambda id: str(id[0]), cr.fetchall()))
period = obj_acc_period.browse(cr, uid, data[0]['period_id'], context=context)
new_fyear = obj_acc_fiscalyear.browse(cr, uid, data[0]['fy2_id'], context=context)
old_fyear = obj_acc_fiscalyear.browse(cr, uid, data[0]['fy_id'], context=context)
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)
old_fyear = obj_acc_fiscalyear.browse(cr, uid, fy_id, context=context)
new_journal = data[0]['journal_id']
new_journal = data[0].journal_id.id
new_journal = obj_acc_journal.browse(cr, uid, new_journal, context=context)
if not new_journal.default_credit_account_id or not new_journal.default_debit_account_id:
@@ -107,7 +107,7 @@ class account_fiscalyear_close(osv.osv_memory):
obj_acc_move_line.create(cr, uid, {
'debit': account.balance>0 and account.balance,
'credit': account.balance<0 and -account.balance,
'name': data[0]['report_name'],
'name': data[0].report_name,
'date': period.date_start,
'journal_id': new_journal.id,
'period_id': period.id,
@@ -204,7 +204,7 @@ class account_fiscalyear_close(osv.osv_memory):
if ids:
obj_acc_move_line.reconcile(cr, uid, ids, context=context)
new_period = data[0]['period_id']
new_period = data[0].period_id.id
ids = obj_acc_journal_period.search(cr, uid, [('journal_id','=',new_journal.id),('period_id','=',new_period)])
if not ids:
ids = [obj_acc_journal_period.create(cr, uid, {
addons/account/wizard/account_fiscalyear_close_state.py
+2 -2
View File
@@ -41,7 +41,7 @@ class account_fiscalyear_close_state(osv.osv_memory):
"""
for data in self.read(cr, uid, ids, context=context):
fy_id = data['fy_id']
fy_id = data['fy_id'][0]
cr.execute('UPDATE account_journal_period ' \
'SET state = %s ' \
@@ -61,4 +61,4 @@ class account_fiscalyear_close_state(osv.osv_memory):
account_fiscalyear_close_state()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account/wizard/account_fiscalyear_close_view.xml
+1 -1
View File
@@ -13,7 +13,7 @@
<field name="fy_id" domain = "[('state','=','draft')]"/>
<field name="fy2_id" domain = "[('state','=','draft')]"/>
<field name="journal_id"/>
<field name="period_id" domain ="[('fiscalyear_id','=',fy2_id)]" />
<field name="period_id" domain ="[('fiscalyear_id','=',fy2_id),('special','=', True)]" />
<field name="report_name" colspan="4"/>
<separator colspan="4"/>
<group colspan="4" col="6">
addons/account/wizard/account_invoice_refund.py
+13 -13
View File
@@ -36,7 +36,7 @@ class account_invoice_refund(osv.osv_memory):
'period': fields.many2one('account.period', 'Force period'),
'journal_id': fields.many2one('account.journal', 'Refund Journal', help='You can select here the journal to use for the refund invoice that will be created. If you leave that field empty, it will use the same journal as the current invoice.'),
'description': fields.char('Description', size=128, required=True),
'filter_refund': fields.selection([('modify', 'Modify'), ('refund', 'Refund'), ('cancel', 'Cancel')], "Refund Type", required=True, help='Refund invoice base on this type. You can not Modify and Cancel if the invoice is already reconciled'),
'filter_refund': fields.selection([('refund', 'Refund'), ('cancel', 'Cancel'),('modify', 'Modify')], "Refund Type", required=True, help='Refund invoice base on this type. You can not Modify and Cancel if the invoice is already reconciled'),
}
def _get_journal(self, cr, uid, context=None):
@@ -52,7 +52,7 @@ class account_invoice_refund(osv.osv_memory):
_defaults = {
'date': lambda *a: time.strftime('%Y-%m-%d'),
'journal_id': _get_journal,
'filter_refund': 'modify',
'filter_refund': 'refund',
}
def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
@@ -88,29 +88,29 @@ class account_invoice_refund(osv.osv_memory):
if context is None:
context = {}
for form in self.read(cr, uid, ids, context=context):
for form in self.browse(cr, uid, ids, context=context):
created_inv = []
date = False
period = False
description = False
company = res_users_obj.browse(cr, uid, uid, context=context).company_id
journal_id = form.get('journal_id', False)
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))
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))
if form['period']:
period = form['period']
if form.period.id:
period = form.period.id
else:
period = inv.period_id and inv.period_id.id or False
if not journal_id:
journal_id = inv.journal_id.id
if form['date']:
date = form['date']
if not form['period']:
if form.date:
date = form.date
if not form.period.id:
cr.execute("select name from ir_model_fields \
where model = 'account.period' \
and name = 'company_id'")
@@ -128,8 +128,8 @@ class account_invoice_refund(osv.osv_memory):
period = res[0]
else:
date = inv.date_invoice
if form['description']:
description = form['description']
if form.description:
description = form.description
else:
description = inv.name
@@ -211,10 +211,10 @@ class account_invoice_refund(osv.osv_memory):
return result
def invoice_refund(self, cr, uid, ids, context=None):
data_refund = self.read(cr, uid, ids, [],context=context)[0]['filter_refund']
data_refund = self.read(cr, uid, ids, ['filter_refund'],context=context)[0]['filter_refund']
return self.compute_refund(cr, uid, ids, data_refund, context=context)
account_invoice_refund()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account/wizard/account_move_journal.py
+1 -1
View File
@@ -148,7 +148,7 @@ class account_move_journal(osv.osv_memory):
journal_id = self._get_journal(cr, uid, context)
period_id = self._get_period(cr, uid, context)
target_move = self.read(cr, uid, ids, [])[0]['target_move']
target_move = self.read(cr, uid, ids, ['target_move'], context=context)[0]['target_move']
name = _("Journal Items")
if journal_id:
addons/account/wizard/account_open_closed_fiscalyear.py
+5 -6
View File
@@ -31,14 +31,13 @@ class account_open_closed_fiscalyear(osv.osv_memory):
}
def remove_entries(self, cr, uid, ids, context=None):
fy_obj = self.pool.get('account.fiscalyear')
move_obj = self.pool.get('account.move')
data = self.read(cr, uid, ids, [], context=context)[0]
data_fyear = fy_obj.browse(cr, uid, data['fyear_id'], context=context)
if not data_fyear.end_journal_period_id:
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'))
period_journal = data_fyear.end_journal_period_id
ids_move = move_obj.search(cr, uid, [('journal_id','=',period_journal.journal_id.id),('period_id','=',period_journal.period_id.id)])
if ids_move:
cr.execute('delete from account_move where id IN %s', (tuple(ids_move),))
@@ -46,4 +45,4 @@ class account_open_closed_fiscalyear(osv.osv_memory):
account_open_closed_fiscalyear()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account/wizard/account_reconcile.py
+2 -2
View File
@@ -153,9 +153,9 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
if context is None:
context = {}
data = self.read(cr, uid, ids,context=context)[0]
account_id = data['writeoff_acc_id']
account_id = data['writeoff_acc_id'][0]
context['date_p'] = data['date_p']
journal_id = data['journal_id']
journal_id = data['journal_id'][0]
context['comment'] = data['comment']
if data['analytic_id']:
context['analytic_id'] = data['analytic_id']
addons/account/wizard/account_report_common.py
+4 -1
View File
@@ -131,7 +131,10 @@ class account_common_report(osv.osv_memory):
data = {}
data['ids'] = context.get('active_ids', [])
data['model'] = context.get('active_model', 'ir.ui.menu')
data['form'] = self.read(cr, uid, ids, ['date_from', 'date_to', 'fiscalyear_id', 'journal_ids', 'period_from', 'period_to', 'filter', 'chart_account_id', 'target_move'])[0]
data['form'] = self.read(cr, uid, ids, ['date_from', 'date_to', 'fiscalyear_id', 'journal_ids', 'period_from', 'period_to', 'filter', 'chart_account_id', 'target_move'], context=context)[0]
for field in ['fiscalyear_id', 'chart_account_id', 'period_from', 'period_to']:
if isinstance(data['form'][field], tuple):
data['form'][field] = data['form'][field][0]
used_context = self._build_contexts(cr, uid, ids, data, context=context)
data['form']['periods'] = used_context.get('periods', False) and used_context['periods'] or []
data['form']['used_context'] = used_context
addons/account/wizard/account_tax_chart.py
+10 -12
View File
@@ -54,21 +54,19 @@ class account_tax_chart(osv.osv_memory):
period_obj = self.pool.get('account.period')
if context is None:
context = {}
data = self.read(cr, uid, ids, [], context=context)[0]
data = self.browse(cr, uid, ids, context=context)[0]
result = mod_obj.get_object_reference(cr, uid, 'account', 'action_tax_code_tree')
id = result and result[1] or False
result = act_obj.read(cr, uid, [id], context=context)[0]
if data['period_id']:
fiscalyear_id = period_obj.read(cr, uid, [data['period_id']], context=context)[0]['fiscalyear_id'][0]
result['context'] = str({'period_id': data['period_id'], \
'fiscalyear_id': fiscalyear_id, \
'state': data['target_move']})
else:
result['context'] = str({'state': data['target_move']})
if data['period_id']:
period_code = period_obj.read(cr, uid, [data['period_id']], context=context)[0]['code']
if data.period_id:
result['context'] = str({'period_id': data.period_id.id, \
'fiscalyear_id': data.period_id.fiscalyear_id.id, \
'state': data.target_move})
period_code = data.period_id.code
result['name'] += period_code and (':' + period_code) or ''
else:
result['context'] = str({'state': data.target_move})
return result
_defaults = {
@@ -78,4 +76,4 @@ class account_tax_chart(osv.osv_memory):
account_tax_chart()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

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