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

[MERGE]: Merge with lp:openobject-trunk-dev-addons2 

bzr revid: ksa@tinyerp.co.in-20100920055940-cikw8ea3ntyxy6r1
This commit is contained in:
ksa (Open ERP) 2010-09-20 11:29:40 +05:30
parent 49b9ae8e2e 558352fba2
commit 5fd0497457
1723 changed files with 112210 additions and 40129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons/account/__openerp__.py
View File

@ -45,7 +45,6 @@ module named account_voucher.
'init_xml': [],
"depends" : ["product", "analytic", "process","board"],
'update_xml': [
#'test/test_parent_structure.yml',
'security/account_security.xml',
'security/ir.model.access.csv',
'account_menuitem.xml',
@ -53,13 +52,15 @@ module named account_voucher.
'wizard/account_statement_from_invoice_view.xml',
'wizard/account_move_bank_reconcile_view.xml',
'wizard/account_use_model_view.xml',
'account_installer.xml',
'wizard/account_period_close_view.xml',
'account_view.xml',
'account_report.xml',
'wizard/account_report_common_view.xml',
'wizard/account_invoice_refund_view.xml',
'wizard/account_period_close_view.xml',
'wizard/account_fiscalyear_close_state.xml',
'wizard/account_chart_view.xml',
'wizard/account_tax_chart_view.xml',
'wizard/account_move_journal_view.xml',
'wizard/account_move_line_reconcile_select_view.xml',
'wizard/account_open_closed_fiscalyear_view.xml',
@ -74,13 +75,11 @@ module named account_voucher.
'wizard/account_journal_select_view.xml',
'wizard/account_change_currency_view.xml',
'wizard/account_validate_move_view.xml',
'wizard/account_pay_invoice_view.xml',
'wizard/account_unreconcile_view.xml',
'wizard/account_report_general_ledger_view.xml',
'wizard/account_invoice_state_view.xml',
'wizard/account_report_partner_balance_view.xml',
'wizard/account_report_account_balance_view.xml',
# 'wizard/account_move_line_select_view.xml',
'wizard/account_report_aged_partner_balance_view.xml',
'wizard/account_compare_account_balance_report_view.xml',
'wizard/account_report_partner_ledger_view.xml',
@ -96,7 +95,6 @@ module named account_voucher.
'account_invoice_workflow.xml',
'project/project_view.xml',
'project/project_report.xml',
'project/wizard/account_analytic_check_view.xml',
'project/wizard/account_analytic_balance_report_view.xml',
'project/wizard/account_analytic_cost_ledger_view.xml',
'project/wizard/account_analytic_inverted_balance_report.xml',
@ -110,7 +108,6 @@ module named account_voucher.
'process/supplier_invoice_process.xml',
'sequence_view.xml',
'company_view.xml',
'account_installer.xml',
'report/account_invoice_report_view.xml',
'report/account_entries_report_view.xml',
'report/account_report_view.xml',
@ -120,7 +117,6 @@ module named account_voucher.
"wizard/account_report_balance_sheet_view.xml"
],
'demo_xml': [
#'demo/price_accuracy00.yml',
'account_demo.xml',
'project/project_demo.xml',
'project/analytic_account_demo.xml',
@ -135,7 +131,6 @@ module named account_voucher.
'test/chart_of_account.yml',
'test/account_period_close.yml',
'test/account_fiscalyear_close_state.yml',
#'test/account_invoice_state.yml',
'test/account_use_model.yml',
'test/account_validate_account_move.yml',
'test/account_fiscalyear_close.yml',

523
addons/account/account.py
View File

File diff suppressed because it is too large Load Diff

76
addons/account/account_analytic_line.py
View File

@ -38,12 +38,15 @@ class account_analytic_line(osv.osv):
'journal_id' : fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='cascade', select=True),
'code' : fields.char('Code', size=8),
'ref': fields.char('Ref.', size=64),
'currency_id': fields.related('move_id', 'currency_id', type='many2one', relation='res.currency', string='Account currency', store=True, help="The related account currency if not equal to the company one.", readonly=True),
'amount_currency': fields.related('move_id', 'amount_currency', type='float', string='Amount currency', store=True, help="The amount expressed in the related account currency if not equal to the company one.", readonly=True),
}
_defaults = {
'date': lambda *a: time.strftime('%Y-%m-%d'),
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=c),
}
_order = 'date'
}
_order = 'date desc'
def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
if context is None:
@ -65,19 +68,21 @@ class account_analytic_line(osv.osv):
return False
return True
_constraints = [
# (_check_company, 'You can not create analytic line that is not in the same company than the account line', ['account_id'])
]
# Compute the cost based on the price type define into company
# property_valuation_price_type property
def on_change_unit_amount(self, cr, uid, id, prod_id, unit_amount,company_id,
unit=False, context=None):
unit=False, journal_id=False, context=None):
if context==None:
context={}
uom_obj = self.pool.get('product.uom')
product_obj = self.pool.get('product.product')
company_obj=self.pool.get('res.company')
analytic_journal_obj=self.pool.get('account.analytic.journal')
product_price_type_obj = self.pool.get('product.price.type')
if prod_id:
result = 0.0
prod = product_obj.browse(cr, uid, prod_id)
a = prod.product_tmpl_id.property_account_expense.id
if not a:
@ -89,16 +94,27 @@ class account_analytic_line(osv.osv):
(prod.name, prod.id,))
if not company_id:
company_id=company_obj._company_default_get(cr, uid, 'account.analytic.line', context)
flag = False
# Compute based on pricetype
pricetype=self.pool.get('product.price.type').browse(cr, uid, company_obj.browse(cr,uid,company_id).property_valuation_price_type.id)
pricetype=product_price_type_obj.browse(cr, uid, company_obj.browse(cr,uid,company_id).property_valuation_price_type.id)
if journal_id:
journal = analytic_journal_obj.browse(cr, uid, journal_id)
if journal.type == 'sale':
product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','list_price')], context)
if product_price_type_ids:
pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context)[0]
# Take the company currency as the reference one
if pricetype.field == 'list_price':
flag = True
amount_unit = prod.price_get(pricetype.field, context)[prod.id]
amount = amount_unit*unit_amount or 1.0
prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
amount = amount_unit*unit_amount or 1.0
result = round(amount, prec)
if not flag:
result *= -1
return {'value': {
'amount': - round(amount, prec),
'amount': result,
'general_account_id': a,
}}
return {}
@ -115,52 +131,6 @@ class account_analytic_line(osv.osv):
account_analytic_line()
class timesheet_invoice(osv.osv):
_name = "report.hr.timesheet.invoice.journal"
_description = "Analytic Account Costs and Revenues"
_auto = False
_columns = {
'name': fields.char('Year',size=64,required=False, readonly=True),
'account_id':fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, select=True),
'journal_id': fields.many2one('account.analytic.journal', 'Journal', readonly=True),
'quantity': fields.float('Quantities', readonly=True),
'cost': fields.float('Credit', readonly=True),
'revenue': fields.float('Debit', readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
}
_order = 'name desc, account_id'
def init(self, cr):
tools.drop_view_if_exists(cr, 'report_hr_timesheet_invoice_journal')
cr.execute("""
create or replace view report_hr_timesheet_invoice_journal as (
select
min(l.id) as id,
to_char(l.date, 'YYYY') as name,
to_char(l.date,'MM') as month,
sum(
CASE WHEN l.amount>0 THEN 0 ELSE l.amount
END
) as cost,
sum(
CASE WHEN l.amount>0 THEN l.amount ELSE 0
END
) as revenue,
sum(l.unit_amount* COALESCE(u.factor, 1)) as quantity,
journal_id,
account_id
from account_analytic_line l
LEFT OUTER join product_uom u on (u.id=l.product_uom_id)
group by
to_char(l.date, 'YYYY'),
to_char(l.date,'MM'),
journal_id,
account_id
)""")
timesheet_invoice()
class res_partner(osv.osv):
""" Inherits partner and adds contract information in the partner form """
_inherit = 'res.partner'

22
addons/account/account_assert_test.xml
View File

@ -1,28 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<assert model="account.move" search="[]" string="For all Ledger Postings, the state is valid implies that the sum of credits equals the sum of debits">
<assert model="account.move" search="[]" string="For all Journal Items, the state is valid implies that the sum of credits equals the sum of debits">
<test expr="not len(line_id) or line_id[0].state != 'valid' or (sum([l.debit - l.credit for l in line_id]) &lt;= 0.00001)"/>
</assert>
<!-- <assert model="account.account" search="[]" string="For all accounts, the balance is equal to the sum of the balance of its childs">
<assert model="account.account" search="[]" string="For all accounts, the balance is equal to the sum of the balance of its childs">
<test expr="not len(child_id) or (balance - sum([c.balance for c in child_id]) &lt;= 0.00001)"/>
</assert>
<assert model="account.move.line" search="[('account_id.type', '=', 'view')]" string="Accounts of view type do not contain any move line">
<test expr="False"/>
</assert>
<assert model="account.invoice" search="[('state', 'in', ['paid', 'open'])]" string="The total amount of all paid or open invoices is correctly computed">
<test expr="sum([l.price_subtotal for l in invoice_line]) - amount_untaxed &lt;= 0.00001"/>
</assert>
<assert model="account.move.reconcile" search="[]" string="For each reconciliation, the sum of credits equals the sum of debits">
<test expr="sum([l.debit - l.credit for l in line_id]) &lt;= 0.00001"/>
</assert>
-->
</data>
</openerp>

125
addons/account/account_bank_statement.py
View File

@ -29,6 +29,25 @@ import decimal_precision as dp
class account_bank_statement(osv.osv):
def create(self, cr, uid, vals, context=None):
seq = 0
if 'line_ids' in vals:
for line in vals['line_ids']:
seq += 1
line[2]['sequence'] = seq
vals[seq - 1] = line
return super(account_bank_statement, self).create(cr, uid, vals, context=context)
def write(self, cr, uid, ids, vals, context=None):
res = super(account_bank_statement, self).write(cr, uid, ids, vals, context=context)
for statement in self.browse(cr, uid, ids, context):
seq = 0
for line in statement.line_ids:
seq += 1
if not line.sequence:
self.pool.get('account.bank.statement.line').write(cr, uid, [line.id], {'sequence': seq}, context=context)
return res
def button_import_invoice(self, cr, uid, ids, context=None):
mod_obj = self.pool.get('ir.model.data')
if context is None:
@ -104,8 +123,7 @@ class account_bank_statement(osv.osv):
periods = self.pool.get('account.period').find(cr, uid)
if periods:
return periods[0]
else:
return False
return False
def _currency(self, cursor, user, ids, name, args, context=None):
res = {}
@ -142,6 +160,7 @@ class account_bank_statement(osv.osv):
'balance_end_real': fields.float('Ending Balance', digits_compute=dp.get_precision('Account'),
states={'confirm':[('readonly', True)]}),
'balance_end': fields.function(_end_balance, method=True, string='Balance'),
'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
'line_ids': fields.one2many('account.bank.statement.line',
'statement_id', 'Statement lines',
states={'confirm':[('readonly', True)]}),
@ -201,6 +220,7 @@ class account_bank_statement(osv.osv):
res_users_obj = self.pool.get('res.users')
account_move_obj = self.pool.get('account.move')
account_move_line_obj = self.pool.get('account.move.line')
account_analytic_line_obj = self.pool.get('account.analytic.line')
account_bank_statement_line_obj = self.pool.get('account.bank.statement.line')
obj_seq = self.pool.get('ir.sequence')
@ -222,6 +242,11 @@ class account_bank_statement(osv.osv):
raise osv.except_osv(_('Configuration Error !'),
_('Please verify that an account is defined in the journal.'))
if not st.name == '/':
next_number = st.name
else:
next_number = obj_seq.get(cr, uid, 'account.bank.statement')
for line in st.move_line_ids:
if line.state <> 'valid':
raise osv.except_osv(_('Error !'),
@ -230,14 +255,18 @@ class account_bank_statement(osv.osv):
# In line we get reconcile_id on bank.ste.rec.
# in bank stat.rec we get line_new_ids on bank.stat.rec.line
for move in st.line_ids:
context.update({'date':move.date})
if move.analytic_account_id:
if not st.journal_id.analytic_journal_id:
raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (st.journal_id.name,))
context.update({'date': move.date})
move_id = account_move_obj.create(cr, uid, {
'journal_id': st.journal_id.id,
'period_id': st.period_id.id,
'date': move.date,
}, context=context)
account_bank_statement_line_obj.write(cr, uid, [move.id], {
'move_ids': [(4,move_id, False)]
'move_ids': [(4, move_id, False)]
})
if not move.amount:
continue
@ -268,6 +297,7 @@ class account_bank_statement(osv.osv):
'journal_id': st.journal_id.id,
'period_id': st.period_id.id,
'currency_id': st.currency.id,
'analytic_account_id': move.analytic_account_id and move.analytic_account_id.id or False
}
amount = res_currency_obj.compute(cr, uid, st.currency.id,
@ -289,7 +319,28 @@ class account_bank_statement(osv.osv):
account=acc_cur)
val['amount_currency'] = amount_cur
torec.append(account_move_line_obj.create(cr, uid, val , context=context))
move_line_id = account_move_line_obj.create(cr, uid, val , context=context)
torec.append(move_line_id)
if move.analytic_account_id:
anal_val = {}
amt = (val['credit'] or 0.0) - (val['debit'] or 0.0)
anal_val = {
'name': val['name'],
'ref': val['ref'],
'date': val['date'],
'amount': amt,
'account_id': val['analytic_account_id'],
'currency_id': val['currency_id'],
'general_account_id': val['account_id'],
'journal_id': st.journal_id.analytic_journal_id.id,
'period_id': val['period_id'],
'user_id': uid,
'move_id': move_line_id
}
if val.get('amount_currency', False):
anal_val['amount_currency'] = val['amount_currency']
account_analytic_line_obj.create(cr, uid, anal_val, context=context)
if move.reconcile_id and move.reconcile_id.line_new_ids:
for newline in move.reconcile_id.line_new_ids:
@ -338,7 +389,7 @@ class account_bank_statement(osv.osv):
context=context):
if line.state <> 'valid':
raise osv.except_osv(_('Error !'),
_('Ledger Posting line "%s" is not valid') % line.name)
_('Journal Item "%s" is not valid') % line.name)
if move.reconcile_id and move.reconcile_id.line_ids:
## Search if move has already a partial reconciliation
@ -367,19 +418,11 @@ class account_bank_statement(osv.osv):
account_move_line_obj.reconcile(cr, uid, torec, 'statement', writeoff_acc_id=writeoff_acc_id, writeoff_period_id=st.period_id.id, writeoff_journal_id=st.journal_id.id, context=context)
else:
account_move_line_obj.reconcile_partial(cr, uid, torec, 'statement', context)
#except:
# raise osv.except_osv(_('Error !'), _('Unable to reconcile entry "%s": %.2f') % (move.name, move.amount))
if st.journal_id.entry_posted:
account_move_obj.write(cr, uid, [move_id], {'state': 'posted'})
move_name = next_number + ' - ' + str(move.sequence)
account_move_obj.write(cr, uid, [move_id], {'name': move_name, 'state': 'posted'}) # Bank statements will not consider boolean on journal entry_posted
self.log(cr, uid, st.id, 'Statement %s is confirmed and entries are created.' % st.name)
done.append(st.id)
next_number = obj_seq.get(cr, uid, 'account.bank.statement')
if not st.name == '/':
next_number = st.name + '/' + next_number[-1:]
account_move_obj.write(cr, uid, [move_id], {'state': 'posted', 'name': next_number})
self.write(cr, uid, [st.id], {'name': next_number}, context=context)
self.write(cr, uid, done, {'state':'confirm'}, context=context)
@ -399,28 +442,15 @@ class account_bank_statement(osv.osv):
return True
def onchange_journal_id(self, cursor, user, statement_id, journal_id, context=None):
if not journal_id:
return {'value': {'currency': False}}
account_journal_obj = self.pool.get('account.journal')
res_users_obj = self.pool.get('res.users')
res_currency_obj = self.pool.get('res.currency')
cursor.execute('SELECT balance_end_real \
FROM account_bank_statement \
WHERE journal_id = %s \
ORDER BY date DESC,id DESC LIMIT 1', (journal_id,))
WHERE journal_id = %s AND NOT state = %s \
ORDER BY date DESC,id DESC LIMIT 1', (journal_id, 'draft'))
res = cursor.fetchone()
balance_start = res and res[0] or 0.0
currency_id = account_journal_obj.browse(cursor, user, journal_id,
context=context).currency.id
if not currency_id:
currency_id = res_users_obj.browse(cursor, user, user,
context=context).company_id.currency_id.id
currency = res_currency_obj.name_get(cursor, user, [currency_id],
context=context)[0]
return {'value': {'balance_start': balance_start, 'currency': currency}}
return {'value': {'balance_start': balance_start}}
def unlink(self, cr, uid, ids, context=None):
stat = self.read(cr, uid, ids, ['state'])
@ -605,10 +635,10 @@ class account_bank_statement_reconcile_line(osv.osv):
'account_id': fields.many2one('account.account', 'Account', required=True),
'line_id': fields.many2one('account.bank.statement.reconcile', 'Reconcile'),
'amount': fields.float('Amount', required=True),
'analytic_id': fields.many2one('account.analytic.account',"Analytic Account")
'analytic_id': fields.many2one('account.analytic.account',"Analytic Account", domain=[('parent_id', '!=', False)])
}
_defaults = {
'name': lambda *a: 'Write-Off',
'name': 'Write-Off',
}
account_bank_statement_reconcile_line()
@ -616,13 +646,15 @@ account_bank_statement_reconcile_line()
class account_bank_statement_line(osv.osv):
def onchange_partner_id(self, cursor, user, line_id, partner_id, type, currency_id, context=None):
res_users_obj = self.pool.get('res.users')
res_currency_obj = self.pool.get('res.currency')
res = {'value': {}}
obj_partner = self.pool.get('res.partner')
if context is None:
context = {}
if not partner_id:
return res
account_id = False
line = self.browse(cursor, user, line_id)
if not line or (line and not line[0].account_id):
part = obj_partner.browse(cursor, user, partner_id, context=context)
@ -631,6 +663,24 @@ class account_bank_statement_line(osv.osv):
else:
account_id = part.property_account_receivable.id
res['value']['account_id'] = account_id
if account_id and (not line or (line and not line[0].amount)) and not context.get('amount', False):
company_currency_id = res_users_obj.browse(cursor, user, user,
context=context).company_id.currency_id.id
if not currency_id:
currency_id = company_currency_id
cursor.execute('SELECT sum(debit-credit) \
FROM account_move_line \
WHERE (reconcile_id is null) \
AND partner_id = %s \
AND account_id=%s', (partner_id, account_id))
pgres = cursor.fetchone()
balance = pgres and pgres[0] or 0.0
balance = res_currency_obj.compute(cursor, user, company_currency_id,
currency_id, balance, context=context)
res['value']['amount'] = balance
return res
def _reconcile_amount(self, cursor, user, ids, name, args, context=None):
@ -671,6 +721,7 @@ class account_bank_statement_line(osv.osv):
select=True, required=True, ondelete='cascade'),
'reconcile_id': fields.many2one('account.bank.statement.reconcile',
'Reconcile'),
'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'),
'move_ids': fields.many2many('account.move',
'account_bank_statement_line_move_rel', 'move_id','statement_id',
'Moves'),
@ -679,14 +730,14 @@ class account_bank_statement_line(osv.osv):
'reconcile_amount': fields.function(_reconcile_amount,
string='Amount reconciled', method=True, type='float'),
'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of bank statement lines."),
'company_id': fields.related('statement_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
}
_defaults = {
'name': lambda self,cr,uid,context={}: self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement.line'),
'date': lambda *a: time.strftime('%Y-%m-%d'),
'type': lambda *a: 'general',
'sequence': lambda *a: 10,
}
account_bank_statement_line()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

153
addons/account/account_cash_statement.py
View File

@ -77,7 +77,7 @@ class account_cash_statement(osv.osv):
"""
res ={}
for statement in self.browse(cr, uid, ids):
amount_total=0.0
amount_total = 0.0
if statement.journal_id.type not in('cash'):
continue
@ -118,19 +118,6 @@ class account_cash_statement(osv.osv):
res2[statement.id]=encoding_total
return res2
# def _default_journal_id(self, cr, uid, context={}):
# """ To get default journal for the object"
# @param name: Names of fields.
# @return: journal
# """
# company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
# journal = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', company_id)])
# if journal:
# return journal[0]
# else:
# return False
def _end_balance(self, cursor, user, ids, name, attr, context=None):
res_currency_obj = self.pool.get('res.currency')
res_users_obj = self.pool.get('res.users')
@ -164,17 +151,37 @@ class account_cash_statement(osv.osv):
res[r] = round(res[r], 2)
return res
def _get_company(self, cr, uid, ids, context={}):
def _get_company(self, cr, uid, context={}):
user_pool = self.pool.get('res.users')
company_pool = self.pool.get('res.company')
user = user_pool.browse(cr, uid, uid, uid)
user = user_pool.browse(cr, uid, uid, context)
company_id = user.company_id and user.company_id.id
if not company_id:
company_id = company_pool.search(cr, uid, [])[0]
return company_id
def _get_cash_open_box_lines(self, cr, uid, ids, context={}):
def _get_cash_open_box_lines(self, cr, uid, context={}):
res = []
curr = [1, 2, 5, 10, 20, 50, 100, 500]
for rs in curr:
dct = {
'pieces':rs,
'number':0
}
res.append(dct)
journal_ids = self.pool.get('account.journal').search(cr, uid, [('type','=','cash')], context=context)
if journal_ids:
results = self.search(cr, uid, [('journal_id','in',journal_ids),('state','=','confirm')],context=context)
if results:
cash_st = self.browse(cr, uid, results, context)[0]
for cash_line in cash_st.ending_details_ids:
for r in res:
if cash_line.pieces == r['pieces']:
r['number'] = cash_line.number
return res
def _get_default_cash_close_box_lines(self, cr, uid, context={}):
res = []
curr = [1, 2, 5, 10, 20, 50, 100, 500]
for rs in curr:
@ -185,7 +192,7 @@ class account_cash_statement(osv.osv):
res.append(dct)
return res
def _get_cash_close_box_lines(self, cr, uid, ids, context={}):
def _get_cash_close_box_lines(self, cr, ids, uid, context={}):
res = []
curr = [1, 2, 5, 10, 20, 50, 100, 500]
for rs in curr:
@ -193,16 +200,15 @@ class account_cash_statement(osv.osv):
'pieces':rs,
'number':0
}
res.append((0, 0, dct))
res.append((0,0,dct))
return res
_columns = {
'company_id':fields.many2one('res.company', 'Company', required=False),
'journal_id': fields.many2one('account.journal', 'Journal', required=True, states={'confirm': [('readonly', True)]}, domain=[('type', '=', 'cash')]),
'journal_id': fields.many2one('account.journal', 'Journal', required=True, states={'draft': [('readonly', False)]}, readonly=True, domain=[('type', '=', 'cash')]),
'balance_end_real': fields.float('Closing Balance', digits_compute=dp.get_precision('Account'), states={'confirm':[('readonly', True)]}, help="closing balance entered by the cashbox verifier"),
'state': fields.selection(
[('draft', 'Draft'),
('confirm', 'Confirmed'),
('confirm', 'Closed'),
('open','Open')], 'State', required=True, states={'confirm': [('readonly', True)]}, readonly="1"),
'total_entry_encoding':fields.function(_get_sum_entry_encoding, method=True, store=True, string="Cash Transaction", help="Total cash transactions"),
'closing_date':fields.datetime("Closed On"),
@ -210,29 +216,25 @@ class account_cash_statement(osv.osv):
'balance_end_cash': fields.function(_balance_end_cash, method=True, store=True, string='Balance', help="Closing balance based on cashBox"),
'starting_details_ids': fields.one2many('account.cashbox.line', 'starting_id', string='Opening Cashbox'),
'ending_details_ids': fields.one2many('account.cashbox.line', 'ending_id', string='Closing Cashbox'),
'name': fields.char('Name', size=64, required=True, readonly=False, help='if you give the Name other then / , its created Accounting Entries Move will be with same name as statement name. This allows the statement entries to have the same references than the statement itself'),
'name': fields.char('Name', size=64, required=True, states={'draft': [('readonly', False)]}, readonly=True, help='if you give the Name other then / , its created Accounting Entries Move will be with same name as statement name. This allows the statement entries to have the same references than the statement itself'),
'user_id':fields.many2one('res.users', 'Responsible', required=False),
}
_defaults = {
'state': lambda *a: 'draft',
'date': lambda *a:time.strftime("%Y-%m-%d %H:%M:%S"),
'user_id': lambda self, cr, uid, context=None: uid,
'company_id': _get_company,
'starting_details_ids':_get_cash_open_box_lines,
'ending_details_ids':_get_cash_open_box_lines
'ending_details_ids':_get_default_cash_close_box_lines
}
def create(self, cr, uid, vals, context=None):
company_id = vals and vals.get('company_id',False)
if company_id:
sql = [
('company_id', '=', vals['company_id']),
sql = [
('journal_id', '=', vals['journal_id']),
('state', '=', 'open')
]
open_jrnl = self.search(cr, uid, sql)
if open_jrnl:
raise osv.except_osv('Error', _('You can not have two open register for the same journal'))
]
open_jrnl = self.search(cr, uid, sql)
if open_jrnl:
raise osv.except_osv('Error', _('You can not have two open register for the same journal'))
if self.pool.get('account.journal').browse(cr, uid, vals['journal_id']).type == 'cash':
lines = end_lines = self._get_cash_close_box_lines(cr, uid, [], context)
@ -245,7 +247,7 @@ class account_cash_statement(osv.osv):
'starting_details_ids':False
})
res_id = super(account_cash_statement, self).create(cr, uid, vals, context=context)
self.write(cr, uid, [res_id], {})
#self.write(cr, uid, [res_id], {})
return res_id
def write(self, cr, uid, ids, vals, context=None):
@ -265,7 +267,7 @@ class account_cash_statement(osv.osv):
super(account_cash_statement, self).write(cr, uid, ids, vals)
res = self._get_starting_balance(cr, uid, ids)
for rs in res:
super(account_cash_statement, self).write(cr, uid, rs, res.get(rs))
super(account_cash_statement, self).write(cr, uid, [rs], res.get(rs))
return True
def onchange_journal_id(self, cr, uid, statement_id, journal_id, context={}):
@ -286,8 +288,6 @@ class account_cash_statement(osv.osv):
'balance_start': balance_start
})
return res
res = super(account_cash_statement, self).onchange_journal_id(cr, uid, statement_id, journal_id, context)
return res
@ -317,28 +317,28 @@ class account_cash_statement(osv.osv):
if statement.name and statement.name == '/':
number = self.pool.get('ir.sequence').get(cr, uid, 'account.cash.statement')
vals.update({
'name':number
'name': number
})
cr.execute("select id from account_bank_statement where journal_id=%s and user_id=%s and state=%s order by id desc limit 1", (statement.journal_id.id, uid, 'confirm'))
rs = cr.fetchone()
rs = rs and rs[0] or None
if rs:
if len(statement.starting_details_ids) > 0:
sid = []
for line in statement.starting_details_ids:
sid.append(line.id)
cash_pool.unlink(cr, uid, sid)
statement = statement_pool.browse(cr, uid, rs)
balance_start = statement.balance_end_real or 0.0
open_ids = cash_pool.search(cr, uid, [('ending_id','=',statement.id)])
for sid in open_ids:
default = {
'ending_id': False,
'starting_id':ids[0]
}
cash_pool.copy(cr, uid, sid, default)
# cr.execute("select id from account_bank_statement where journal_id=%s and user_id=%s and state=%s order by id desc limit 1", (statement.journal_id.id, uid, 'confirm'))
# rs = cr.fetchone()
# rs = rs and rs[0] or None
# if rs:
# if len(statement.starting_details_ids) > 0:
# sid = []
# for line in statement.starting_details_ids:
# sid.append(line.id)
# cash_pool.unlink(cr, uid, sid)
#
# statement = statement_pool.browse(cr, uid, rs)
# balance_start = statement.balance_end_real or 0.0
# open_ids = cash_pool.search(cr, uid, [('ending_id','=',statement.id)])
# for sid in open_ids:
# default = {
# 'ending_id': False,
# 'starting_id':ids[0]
# }
# cash_pool.copy(cr, uid, sid, default)
vals.update({
'date':time.strftime("%Y-%m-%d %H:%M:%S"),
@ -359,6 +359,7 @@ class account_cash_statement(osv.osv):
res_users_obj = self.pool.get('res.users')
account_move_obj = self.pool.get('account.move')
account_move_line_obj = self.pool.get('account.move.line')
account_analytic_line_obj = self.pool.get('account.analytic.line')
account_bank_statement_line_obj = self.pool.get('account.bank.statement.line')
company_currency_id = res_users_obj.browse(cr, uid, uid, context=context).company_id.currency_id.id
@ -374,10 +375,6 @@ class account_cash_statement(osv.osv):
if not self._equal_balance(cr, uid, ids, st, context):
raise osv.except_osv(_('Error !'), _('CashBox Balance is not matching with Calculated Balance !'))
# 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))
if (not st.journal_id.default_credit_account_id) \
or (not st.journal_id.default_debit_account_id):
raise osv.except_osv(_('Configuration Error !'),
@ -391,6 +388,10 @@ class account_cash_statement(osv.osv):
# In line we get reconcile_id on bank.ste.rec.
# in bank stat.rec we get line_new_ids on bank.stat.rec.line
for move in st.line_ids:
if move.analytic_account_id:
if not st.journal_id.analytic_journal_id:
raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (st.journal_id.name,))
context.update({'date':move.date})
move_id = account_move_obj.create(cr, uid, {
'journal_id': st.journal_id.id,
@ -429,6 +430,7 @@ class account_cash_statement(osv.osv):
'journal_id': st.journal_id.id,
'period_id': st.period_id.id,
'currency_id': st.currency.id,
'analytic_account_id': move.analytic_account_id and move.analytic_account_id.id or False
}
amount = res_currency_obj.compute(cr, uid, st.currency.id,
@ -449,8 +451,28 @@ class account_cash_statement(osv.osv):
move.account_id.currency_id.id, amount, context=context,
account=acc_cur)
val['amount_currency'] = amount_cur
move_line_id = account_move_line_obj.create(cr, uid, val , context=context)
torec.append(move_line_id)
torec.append(account_move_line_obj.create(cr, uid, val , context=context))
if move.analytic_account_id:
anal_val = {}
amt = (val['credit'] or 0.0) - (val['debit'] or 0.0)
anal_val = {
'name': val['name'],
'ref': val['ref'],
'date': val['date'],
'amount': amt,
'account_id': val['analytic_account_id'],
'currency_id': val['currency_id'],
'general_account_id': val['account_id'],
'journal_id': st.journal_id.analytic_journal_id.id,
'period_id': val['period_id'],
'user_id': uid,
'move_id': move_line_id
}
if val.get('amount_currency', False):
anal_val['amount_currency'] = val['amount_currency']
account_analytic_line_obj.create(cr, uid, anal_val, context=context)
if move.reconcile_id and move.reconcile_id.line_new_ids:
for newline in move.reconcile_id.line_new_ids:
@ -499,7 +521,7 @@ class account_cash_statement(osv.osv):
context=context):
if line.state <> 'valid':
raise osv.except_osv(_('Error !'),
_('Ledger Posting line "%s" is not valid') % line.name)
_('Journal Item "%s" is not valid') % line.name)
if move.reconcile_id and move.reconcile_id.line_ids:
torec += map(lambda x: x.id, move.reconcile_id.line_ids)
@ -515,9 +537,8 @@ class account_cash_statement(osv.osv):
account_move_line_obj.reconcile(cr, uid, torec, 'statement', writeoff_acc_id=writeoff_acc_id, writeoff_period_id=st.period_id.id, writeoff_journal_id=st.journal_id.id, context=context)
else:
account_move_line_obj.reconcile_partial(cr, uid, torec, 'statement', context)
if st.journal_id.entry_posted:
account_move_obj.write(cr, uid, [move_id], {'state':'posted'})
move_name = st.name + ' - ' + str(move.sequence)
account_move_obj.write(cr, uid, [move_id], {'state':'posted', 'name': move_name})
done.append(st.id)
vals = {

47
addons/account/account_installer.xml
View File

@ -8,13 +8,13 @@
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Accounting System Configuration</attribute>
<attribute name="string">Accounting Application Configuration</attribute>
</form>
<separator string="title" position="attributes">
<attribute name="string">Configure Your Accounting System</attribute>
<attribute name="string">Configure Your Accounting Chart</attribute>
</separator>
<xpath expr="//label[@string='description']" position="attributes">
<attribute name="string">From this screen, you can configure your accounting system. Choose a Chart of Account matched to your accounting system or the Generic Chart of Account which allows you to configure which suit your needs.</attribute>
<attribute name="string">The default Chart of Accounts is matching your country selection. If no certified Chart of Accounts exists for your specified country, a generic one can be installed and will be selected by default.</attribute>
</xpath>
<xpath expr="//button[@string='Install Modules']" position="attributes">
<attribute name="string">Configure</attribute>
@ -28,6 +28,7 @@
<field name="charts"/>
<group colspan="4">
<separator col="4" colspan="4" string="Configure Fiscal Year"/>
<field name="company_id" colspan="4" widget="selection" groups="base.group_multi_company"/>
<field name="date_start" on_change="on_change_start_date(date_start)"/>
<field name="date_stop"/>
<field name="period" colspan="4"/>
@ -65,28 +66,28 @@
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Extra Accounting Modules Installation</attribute>
<attribute name="string">Accounting Application Configuration</attribute>
</form>
<separator string="title" position="attributes">
<attribute name="string">Install Extra Accounting Modules In Your Accounting System</attribute>
<attribute name="string">Configure Your Accounting Application</attribute>
</separator>
<xpath expr="//label[@string='description']" position="attributes">
<attribute name="string">From this screen, you can install extra accounting modules in your accounting system. Select the modules to directly install them. If you do not think you need any of these right now, you can easily install them later.</attribute>
<attribute name="string">Add extra Accounting Addons to the ones already installed. Remember you can always install them at a later stage.</attribute>
</xpath>
<xpath expr="//button[@string='Install Modules']" position="attributes">
<attribute name="string">Configure</attribute>
</xpath>
<xpath expr='//separator[@string="vsep"]' position='attributes'>
<attribute name='rowspan'>23</attribute>
<attribute name='string'></attribute>
</xpath>
<group colspan="8">
<group colspan="4" height="450" width="600">
<group colspan="4">
<field name="account_analytic_plans"/>
<field name="account_payment"/>
<field name="account_followup"/>
<field name="account_voucher"/>
<field name="account_voucher_payment"/>
</group>
</group>
<field name="account_voucher"/>
<field name="account_followup"/>
<field name="account_payment"/>
<field name="account_analytic_plans"/>
<field name="account_anglo_saxon"/>
<!-- <field name="account_voucher_payment"/>-->
</group>
</data>
</field>
@ -103,7 +104,7 @@
</record>
<record id="action_account_installer" model="ir.actions.act_window">
<field name="name">Accounting Modules Installation</field>
<field name="name">Accounting Application Configuration</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.installer.modules</field>
<field name="view_id" ref="view_account_modules_installer"/>
@ -122,18 +123,8 @@
<field name="action_id" ref="action_account_installer"/>
<field name="sequence">5</field>
<field name="restart">always</field>
<field eval="[(6,0,[ref('base.group_extended')])]" name="groups_id"/>
</record>
<record id="account_ir_actions_todo_tree" model="ir.ui.view">
<field name="model">ir.actions.todo</field>
<field name="name">account_installer_action_replace</field>
<field name="type">tree</field>
<field name="inherit_id" ref="base.ir_actions_todo_tree"/>
<field name="arch" type="xml">
<xpath expr="//button[@string='Launch']" position="replace">
<button name="%(action_account_configuration_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/>
</xpath>
</field>
</record>
</data>
</openerp>

71
addons/account/account_invoice_view.xml
View File

@ -62,11 +62,10 @@
<field colspan="4" name="name"/>
<field colspan="4" name="origin" groups="base.group_extended"/>
<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)" groups="base.group_user"/>
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id" groups="account.group_account_user"/>
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="base.group_extended"/>
<newline/>
<field name="price_subtotal"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<field name="company_id" groups="base.group_multi_company" readonly="1"/>
<field colspan="4" name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/>
</page>
<page string="Notes">
@ -110,6 +109,8 @@
<field name="base_amount"/>
<field name="tax_code_id"/>
<field name="tax_amount"/>
<field name="factor_base" invisible="True"/>
<field name="factor_tax" invisible="True"/>
</form>
</field>
</record>
@ -137,7 +138,6 @@
<field name="state"/>
<button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
<button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="terp-dolar_ok!"/>
</tree>
</field>
</record>
@ -153,8 +153,8 @@
<field domain="[('type', '=', 'purchase')]" name="journal_id"/>
<field name="number" readonly="1"/>
<field name="type" invisible="1"/>
<field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
<button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}"/>
<field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
<button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
<newline/>
<field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0}"/>
<field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
@ -178,7 +178,7 @@
<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)"/>
<field name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id"/>
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="base.group_extended"/>
<field name="quantity"/>
<field name="price_unit"/>
<!-- Removed if subtotal is set -->
@ -196,6 +196,8 @@
<field invisible="True" name="base_amount"/>
<field invisible="True" name="tax_amount"/>
<field name="factor_base" invisible="True"/>
<field name="factor_tax" invisible="True"/>
</tree>
</field>
</group>
@ -209,12 +211,11 @@
<field name="state"/>
<field name="residual"/>
<group col="6" colspan="4">
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
<button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
<button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
<button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="terp-dolar_ok!"/>
<button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
</group>
</group>
</page>
@ -262,8 +263,8 @@
<field name="journal_id" groups="base.group_user"/>
<field name="number"/>
<field name="type" invisible="1"/>
<field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
<button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}"/>
<field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
<button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
<newline/>
<field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user"/>
<field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
@ -289,6 +290,8 @@
<field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,parent.date_invoice)"/>
<field invisible="True" name="base_amount"/>
<field invisible="True" name="tax_amount"/>
<field name="factor_base" invisible="True"/>
<field name="factor_tax" invisible="True"/>
</tree>
</field>
</group>
@ -302,13 +305,13 @@
<field name="state"/>
<field name="residual"/>
<group col="7" colspan="4" groups="base.group_user">
<button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-check"/>
<button name="invoice_open" states="draft,proforma2" string="Create" icon="terp-document-new"/>
<button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
<button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="terp-dolar_ok!"/>
<button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
<button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
<button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_account_user"/>
<button name="invoice_open" states="draft,proforma2" string="Create" icon="terp-camera_test"/>
<button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
<button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
</group>
</group>
</page>
@ -354,15 +357,15 @@
<search string="Search Invoice">
<group col="10" colspan="4">
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
<filter icon="terp-check" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
<filter icon="terp-check" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Invoices"/>
<filter icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
<filter icon="terp-camera_test" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Invoices"/>
<separator orientation="vertical"/>
<filter icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
<filter name="unpaid" icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
<separator orientation="vertical"/>
<field name="number"/>
<field name="partner_id"/>
<field name="user_id" select="1" default="uid" widget="selection" string="Responsible">
<filter domain="[('user_id','=',uid)]" help="Responsible" icon="terp-partner" separator="1"/>
<field name="user_id" select="1" default="uid" widget="selection" string="Salesman">
<filter domain="[('user_id','=',uid)]" help="My invoices" icon="terp-personal" separator="1"/>
</field>
<field name="origin"/>
<field name="amount_total"/>
@ -370,17 +373,17 @@
<newline/>
<group col="10" colspan="4">
<field name="journal_id" widget="selection" select='1'/>
<field name="period_id" select='1'/>
<field name="period_id" select='1' string="Period"/>
</group>
<newline/>
<group expand="0" string="Group By...">
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
<filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
<separator orientation="vertical"/>
<filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/>
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
<filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
<filter string="Invoice Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_invoice'}"/>
<filter string="Due Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_due'}"/>
</group>
@ -421,7 +424,6 @@
<field name="view_id" ref="invoice_form"/>
<field name="act_window_id" ref="action_invoice_tree"/>
</record>
<!-- <menuitem name="Invoices" id="menu_finance_invoice" parent="account.menu_finance" sequence="2"/>-->
<record id="action_invoice_tree1" model="ir.actions.act_window">
<field name="name">Customer Invoices</field>
@ -501,11 +503,14 @@
</record>
<menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/>
<act_window domain="[('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]}" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>
<act_window domain="[('journal_id','=',active_id),('state','!=','draft'),('reconciled','=',False)]" id="act_account_journal_2_account_invoice_opened" name="Unpaid invoices" res_model="account.invoice" src_model="account.journal"/>
<act_window domain="[('account_analytic_id', '=', active_id)]" id="act_account_analytic_account_2_account_invoice_line" name="Invoice lines" res_model="account.invoice.line" src_model="account.analytic.account"/>
<act_window
id="act_account_journal_2_account_invoice_opened"
name="Unpaid Invoices"
context="{'search_default_journal_id':active_id, 'search_default_unpaid':1,}"
res_model="account.invoice"
src_model="account.journal"/>
<act_window
domain="[('partner_id', '=', partner_id), ('account_id.reconcile', '=', True)]"

60
addons/account/account_invoice_workflow.xml
View File

@ -1,6 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="res_roles_invoice0" model="res.roles">
<field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
<field name="description">Assign this role to the persons that should have the rights to confirm a draft invoice.</field>
</record>
<record id="wkf" model="workflow">
<field name="name">account.invoice.basic</field>
<field name="osv">account.invoice</field>
@ -12,19 +18,6 @@
<field name="flow_start">True</field>
<field name="name">draft</field>
</record>
<!-- <record model="workflow.activity" id="act_confirm">
<field name="wkf_id" ref="wkf"/>
<field name="name">confirm</field>
</record> -->
<!-- <record id="act_proforma" model="workflow.activity">-->
<!-- <field name="wkf_id" ref="wkf"/>-->
<!-- <field name="name">proforma</field>-->
<!-- <field name="action">action_move_create()-->
<!--write({'state':'proforma'})</field>-->
<!-- <field name="kind">function</field>-->
<!-- </record>-->
<record id="act_proforma2" model="workflow.activity">
<field name="wkf_id" ref="wkf"/>
@ -65,35 +58,11 @@ write({'state':'cancel'})</field>
<field name="kind">function</field>
</record>
<!--
<record model="workflow.transition" id="t1">
<field name="act_from" ref="act_draft"/>
<field name="act_to" ref="act_confirm"/>
</record>
-->
<!-- <record id="t3" model="workflow.transition">-->
<!-- <field name="act_from" ref="act_draft"/>-->
<!-- <field name="act_to" ref="act_proforma"/>-->
<!-- <field name="signal">invoice_proforma</field>-->
<!-- </record>-->
<record id="t4" model="workflow.transition">
<field name="act_from" ref="act_draft"/>
<field name="act_to" ref="act_open"/>
<field name="signal">invoice_open</field>
</record>
<!-- <record id="t5" model="workflow.transition">-->
<!-- <field name="act_from" ref="act_proforma"/>-->
<!-- <field name="act_to" ref="act_open"/>-->
<!-- <field name="signal">invoice_open</field>-->
<!-- </record>-->
<!-- <record id="t7" model="workflow.transition">-->
<!-- <field name="act_from" ref="act_proforma"/>-->
<!-- <field name="act_to" ref="act_paid"/>-->
<!-- <field name="trigger_model">account.move.line</field>-->
<!-- <field name="trigger_expr_id">move_line_id_payment_get()</field>-->
<!-- <field name="condition">test_paid()</field>-->
<!-- </record>-->
<record id="t8" model="workflow.transition">
<field name="act_from" ref="act_open"/>
<field name="act_to" ref="act_paid"/>
@ -106,11 +75,6 @@ write({'state':'cancel'})</field>
<field name="act_to" ref="act_cancel"/>
<field name="signal">invoice_cancel</field>
</record>
<!-- <record id="t11" model="workflow.transition">-->
<!-- <field name="act_from" ref="act_proforma"/>-->
<!-- <field name="act_to" ref="act_cancel"/>-->
<!-- <field name="signal">invoice_cancel</field>-->
<!-- </record>-->
<record id="t12" model="workflow.transition">
<field name="act_from" ref="act_open"/>
<field name="act_to" ref="act_cancel"/>
@ -126,7 +90,7 @@ write({'state':'cancel'})</field>
<field name="act_to" ref="act_cancel"/>
<field name="signal">invoice_cancel</field>
</record>
<record id="open_test_to_paid" model="workflow.transition">
<field name="act_from" ref="act_open_test"/>
<field name="act_to" ref="act_paid"/>
@ -134,7 +98,7 @@ write({'state':'cancel'})</field>
<field name="trigger_expr_id">move_line_id_payment_get()</field>
<field name="condition">test_paid()</field>
</record>
<record id="draft_to_pro2" model="workflow.transition">
<field name="act_from" ref="account.act_draft"/>
<field name="act_to" ref="act_proforma2"/>
@ -147,14 +111,6 @@ write({'state':'cancel'})</field>
<field name="signal">invoice_open</field>
</record>
<record id="pro2_to_paid" model="workflow.transition">
<field name="act_from" ref="act_proforma2"/>
<field name="act_to" ref="account.act_paid"/>
<field name="trigger_model">account.move.line</field>
<field name="trigger_expr_id">move_line_id_payment_get()</field>
<field name="condition">test_paid()</field>
</record>
<record id="pro2_to_cancel" model="workflow.transition">
<field name="act_from" ref="act_proforma2"/>
<field name="act_to" ref="account.act_cancel"/>

37
addons/account/account_menuitem.xml
View File

@ -3,46 +3,35 @@
<data>
<menuitem icon="terp-account" id="menu_finance" name="Accounting" sequence="13"/>
<menuitem id="menu_finance_receivables" name="Receivables" parent="menu_finance" sequence="1" groups="group_account_user,group_account_manager,base.group_system"/>
<menuitem id="menu_finance_payables" name="Payables" parent="menu_finance" sequence="2" groups="group_account_user,group_account_manager,base.group_system"/>
<menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="1" groups="group_account_user,group_account_manager,base.group_system"/>
<menuitem id="menu_finance_payables" name="Vendors" parent="menu_finance" sequence="2" groups="group_account_user,group_account_manager,base.group_system"/>
<menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"/>
<!-- <menuitem id="menu_accounting" name="Accounting" parent="menu_finance" sequence="5"/>-->
<menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8"/>
<menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user,group_account_manager,base.group_system,group_account_invoice"/>
<!-- This menu is used in account_code module -->
<menuitem id="menu_account_coda" name="Statements" parent="menu_finance_periodical_processing" sequence="12"/>
<menuitem id="menu_finance_periodical_processing_bank" name="Bank Reconciliation" parent="menu_finance_periodical_processing" sequence="8" groups="group_account_user,group_account_manager,base.group_system,group_account_invoice"/>
<menuitem id="periodical_processing_journal_entries_validation" name="Draft Entries" parent="menu_finance_periodical_processing" groups="group_account_user,group_account_manager,base.group_system"/>
<menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
<!-- <menuitem id="periodical_processing_recurrent_entries" name="Recurrent Entries" parent="menu_finance_periodical_processing"/>-->
<menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
<!-- <menuitem id="periodical_processing_end_of_period" name="End of Period" parent="menu_finance_periodical_processing"/>-->
<menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" sequence="5" groups="base.group_system"/>
<menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12" groups="base.group_system,group_account_invoice,group_account_manager,group_account_user"/>
<menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12" groups="base.group_system,group_account_manager,group_account_user"/>
<menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting"/>
<menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
<menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
<menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="13" groups="base.group_system"/>
<menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
<menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration"/>
<menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts"/>
<menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="analytic.group_analytic_accounting"/>
<menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts" groups="base.group_extended"/>
<menuitem id="menu_low_level" name="Low Level" parent="menu_finance_accounting" groups="base.group_extended"/>
<menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration"/>
<menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="30"/>
<menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
<!-- <menuitem id="menu_finance_configuration1" name="Configuration" parent="menu_finance" sequence="80"/>-->
<!-- <menuitem id="base.menu_action_currency_form" parent="menu_finance_configuration" sequence="20"/>-->
<!-- <menuitem id="menu_finance_accounting1" name="Financial Accounting" parent="menu_finance_configuration" sequence="80"/>-->
<!-- <menuitem id="menu_analytic_accounting1" name="Analytic Accounting" parent="menu_finance_configuration" sequence="80"/>-->
<!-- <menuitem id="menu_finance_reporting11" name="Reporting" parent="account.menu_finance" sequence="80"/>-->
<menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100" groups="base.group_system,group_account_manager"/>
<!-- <menuitem id="menu_finance_legal_statement1" name="Legal Statements" parent="account.menu_finance_reporting" sequence="200"/>-->
<menuitem id="menu_finance_entries" name="Accounting" parent="menu_finance" sequence="4"
groups="group_account_user,group_account_manager,base.group_system"/>
<menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15"
groups="base.group_extended"/>
<menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15" groups="base.group_extended"/>
<!-- <menuitem id="menu_finance_periodical_processing11" name="Periodical Processing" parent="account.menu_finance"-->
<!-- sequence="3"-->
<!-- groups="group_account_user"/>-->
<menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing" groups="group_account_user,group_account_manager,base.group_system"/>
<menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing" groups="group_account_user,group_account_manager,base.group_system" sequence="25"/>
<menuitem id="menu_finance_periodical_processing_billing" name="Billing" parent="menu_finance_periodical_processing" sequence="35"/>
<menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300" groups="account.group_account_manager"/>

92
addons/account/account_move_line.py
View File

@ -29,7 +29,7 @@ import tools
class account_move_line(osv.osv):
_name = "account.move.line"
_description = "Entry Lines"
_description = "Journal Items"
def _query_get(self, cr, uid, obj='l', context={}):
fiscalyear_obj = self.pool.get('account.fiscalyear')
@ -160,6 +160,9 @@ class account_move_line(osv.osv):
def _default_get(self, cr, uid, fields, context={}):
if not context.get('journal_id', False) and context.get('search_default_journal_id', False):
context['journal_id'] = context.get('search_default_journal_id')
period_obj = self.pool.get('account.period')
context = self.convert_to_period(cr, uid, context)
@ -305,6 +308,7 @@ class account_move_line(osv.osv):
ml = self.browse(cr, uid, id, context)
return map(lambda x: x.id, ml.move_id.line_id)
# TODO: this is false, it does not uses draft and closed periods
def _balance(self, cr, uid, ids, prop, unknow_none, unknow_dict):
res={}
# TODO group the foreach in sql
@ -344,9 +348,9 @@ class account_move_line(osv.osv):
result = []
for line in self.browse(cr, uid, ids, context):
if line.ref:
result.append((line.id, (line.name or '')+' ('+line.ref+')'))
result.append((line.id, (line.move_id.name or '')+' ('+line.ref+')'))
else:
result.append((line.id, line.name))
result.append((line.id, line.move_id.name))
return result
def _balance_search(self, cursor, user, obj, name, args, domain=None, context=None):
@ -424,9 +428,9 @@ class account_move_line(osv.osv):
'debit': fields.float('Debit', digits_compute=dp.get_precision('Account')),
'credit': fields.float('Credit', digits_compute=dp.get_precision('Account')),
'account_id': fields.many2one('account.account', 'Account', required=True, ondelete="cascade", domain=[('type','<>','view'), ('type', '<>', 'closed')], select=2),
'move_id': fields.many2one('account.move', 'Move', ondelete="cascade", help="The move of this entry line.", select=2),
'move_id': fields.many2one('account.move', 'Move', ondelete="cascade", help="The move of this entry line.", select=2, required=True),
'narration': fields.related('move_id','narration', type='text', relation='account.move', string='Narration'),
'ref': fields.char('Ref.', size=64),
'ref': fields.related('move_id', 'ref', string='Reference', type='char', size=64, store=True),
'statement_id': fields.many2one('account.bank.statement', 'Statement', help="The bank statement used for bank reconciliation", select=1),
'reconcile_id': fields.many2one('account.move.reconcile', 'Reconcile', readonly=True, ondelete='set null', select=2),
'reconcile_partial_id': fields.many2one('account.move.reconcile', 'Partial Reconcile', readonly=True, ondelete='set null', select=2),
@ -435,10 +439,10 @@ class account_move_line(osv.osv):
'period_id': fields.many2one('account.period', 'Period', required=True, select=2),
'journal_id': fields.many2one('account.journal', 'Journal', required=True, select=1),
'blocked': fields.boolean('Litigation', help="You can check this box to mark the entry line as a litigation with the associated partner"),
'blocked': fields.boolean('Litigation', help="You can check this box to mark this journal item as a litigation with the associated partner"),
'partner_id': fields.many2one('res.partner', 'Partner'),
'date_maturity': fields.date('Maturity date', help="This field is used for payable and receivable entries. You can put the limit date for the payment of this entry line."),
'date_maturity': fields.date('Due date', help="This field is used for payable and receivable journal entries. You can put the limit date for the payment of this line."),
'date': fields.related('move_id','date', string='Effective date', type='date', required=True,
store={
'account.move': (_get_move_lines, ['date'], 20)
@ -447,7 +451,7 @@ class account_move_line(osv.osv):
'analytic_lines': fields.one2many('account.analytic.line', 'move_id', 'Analytic lines'),
'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation')], 'Centralisation', size=6),
'balance': fields.function(_balance, fnct_search=_balance_search, method=True, string='Balance'),
'state': fields.selection([('draft','Draft'), ('valid','Valid')], 'State', readonly=True,
'state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'State', readonly=True,
help='When new move line is created the state will be \'Draft\'.\n* When all the payments are done it will be in \'Valid\' state.'),
'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or a tax code account."),
'tax_amount': fields.float('Tax/Base Amount', digits_compute=dp.get_precision('Account'), select=True, help="If the Tax account is a tax code account, this field will contain the taxed amount.If the tax account is base tax code, "\
@ -455,10 +459,10 @@ class account_move_line(osv.osv):
'invoice': fields.function(_invoice, method=True, string='Invoice',
type='many2one', relation='account.invoice', fnct_search=_invoice_search),
'account_tax_id':fields.many2one('account.tax', 'Tax'),
'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account'),
#TODO: remove this
'amount_taxed':fields.float("Taxed Amount", digits_compute=dp.get_precision('Account')),
'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True)
'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'),
#TODO: remove this
#'amount_taxed':fields.float("Taxed Amount", digits_compute=dp.get_precision('Account')),
'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
}
@ -572,7 +576,7 @@ class account_move_line(osv.osv):
if journal:
jt = self.pool.get('account.journal').browse(cr, uid, journal).type
#FIXME: Bank and cash journal are such a journal we can not assume a account based on this 2 journals
# Bank and cash journal can have a payment or receipt transection, and in both type partner account
# Bank and cash journal can have a payment or receipt transaction, and in both type partner account
# will not be same id payment then payable, and if receipt then receivable
#if jt in ('sale', 'purchase_refund', 'bank', 'cash'):
if jt in ('sale', 'purchase_refund'):
@ -864,7 +868,8 @@ class account_move_line(osv.osv):
fields = {}
flds = []
title = "Accounting Entries" #self.view_header_get(cr, uid, view_id, view_type, context)
xml = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5" on_write="on_create_write">\n\t''' % (title)
xml = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5" on_write="on_create_write" colors="red:state==\'draft\';black:state==\'valid\'">\n\t''' % (title)
ids = journal_pool.search(cr, uid, [])
journals = journal_pool.browse(cr, uid, ids)
all_journal = [None]
@ -902,8 +907,10 @@ class account_move_line(osv.osv):
field = field_it[0]
if common_fields.get(field) == total:
fields.get(field).append(None)
if field=='state':
state = 'colors="red:state==\'draft\'"'
# if field=='state':
# state = 'colors="red:state==\'draft\'"'
attrs = []
if field == 'debit':
attrs.append('sum="Total debit"')
@ -911,6 +918,9 @@ class account_move_line(osv.osv):
elif field == 'credit':
attrs.append('sum="Total credit"')
elif field == 'move_id':
attrs.append('required="False"')
elif field == 'account_tax_id':
attrs.append('domain="[(\'parent_id\',\'=\',False)]"')
attrs.append("context=\"{'journal_id':journal_id}\"")
@ -954,6 +964,24 @@ class account_move_line(osv.osv):
'has been confirmed!') % res[2])
return res
def _remove_move_reconcile(self, cr, uid, move_ids=[], context=None):
# Function remove move rencocile ids related with moves
obj_move_line = self.pool.get('account.move.line')
obj_move_rec = self.pool.get('account.move.reconcile')
unlink_ids = []
if not move_ids:
return True
recs = obj_move_line.read(cr, uid, move_ids, ['reconcile_id','reconcile_partial_id'])
full_recs = filter(lambda x: x['reconcile_id'], recs)
rec_ids = [rec['reconcile_id'][0] for rec in full_recs]
part_recs = filter(lambda x: x['reconcile_partial_id'], recs)
part_rec_ids = [rec['reconcile_partial_id'][0] for rec in part_recs]
unlink_ids += rec_ids
unlink_ids += part_rec_ids
if len(unlink_ids):
obj_move_rec.unlink(cr, uid, unlink_ids)
return True
def unlink(self, cr, uid, ids, context={}, check=True):
self._update_check(cr, uid, ids, context)
result = False
@ -975,9 +1003,10 @@ class account_move_line(osv.osv):
if 'period_id' in vals and 'period_id' not in context:
period_id = vals['period_id']
elif 'journal_id' not in context and 'move_id' in vals:
m = self.pool.get('account.move').browse(cr, uid, vals['move_id'])
journal_id = m.journal_id.id
period_id = m.period_id.id
if vals.get('move_id', False):
m = self.pool.get('account.move').browse(cr, uid, vals['move_id'])
journal_id = m.journal_id.id
period_id = m.period_id.id
else:
journal_id = context.get('journal_id',False)
period_id = context.get('period_id',False)
@ -986,7 +1015,7 @@ class account_move_line(osv.osv):
if journal.allow_date and period_id:
period = self.pool.get('account.period').browse(cr, uid, [period_id])[0]
if not time.strptime(vals['date'][:10],'%Y-%m-%d')>=time.strptime(period.date_start,'%Y-%m-%d') or not time.strptime(vals['date'][:10],'%Y-%m-%d')<=time.strptime(period.date_stop,'%Y-%m-%d'):
raise osv.except_osv(_('Error'),_('The date of your Ledger Posting is not in the defined period !'))
raise osv.except_osv(_('Error'),_('The date of your Journal Entry is not in the defined period!'))
else:
return True
@ -1074,9 +1103,9 @@ class account_move_line(osv.osv):
self._check_date(cr, uid, vals, context, check)
if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
raise osv.except_osv(_('Bad account!'), _('You can not use an inactive account!'))
if 'journal_id' in vals and 'journal_id' not in context:
if 'journal_id' in vals:
context['journal_id'] = vals['journal_id']
if 'period_id' in vals and 'period_id' not in context:
if 'period_id' in vals:
context['period_id'] = vals['period_id']
if ('journal_id' not in context) and ('move_id' in vals) and vals['move_id']:
m = self.pool.get('account.move').browse(cr, uid, vals['move_id'])
@ -1084,8 +1113,6 @@ class account_move_line(osv.osv):
context['period_id'] = m.period_id.id
self._update_journal_check(cr, uid, context['journal_id'], context['period_id'], context)
company_currency = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
move_id = vals.get('move_id', False)
journal = self.pool.get('account.journal').browse(cr, uid, context['journal_id'])
is_new_move = False
@ -1124,7 +1151,10 @@ class account_move_line(osv.osv):
if a.id == vals['account_id']:
ok = True
break
if (account.currency_id) and 'amount_currency' not in vals and account.currency_id.id <> company_currency:
# Automatically convert in the account's secondary currency if there is one and
# the provided values were not already multi-currency
if account.currency_id and 'amount_currency' not in vals and account.currency_id.id != account.company_id.currency_id.id:
vals['currency_id'] = account.currency_id.id
cur_obj = self.pool.get('res.currency')
ctx = {}
@ -1148,11 +1178,6 @@ class account_move_line(osv.osv):
'journal_id': journal.analytic_journal_id.id,
'ref': vals.get('ref', False),
})]
#else:
# raise osv.except_osv(_('No analytic journal !'), _('Please set an analytic journal on this financial journal !'))
#if not 'currency_id' in vals:
# vals['currency_id'] = account.company_id.currency_id.id
result = super(osv.osv, self).create(cr, uid, vals, context)
# CREATE Taxes
@ -1173,7 +1198,7 @@ class account_move_line(osv.osv):
tax_sign = 'tax_sign'
tmp_cnt = 0
for tax in tax_obj.compute(cr, uid, [tax_id], total, 1.00):
for tax in tax_obj.compute_all(cr, uid, [tax_id], total, 1.00).get('taxes'):
#create the base movement
if tmp_cnt == 0:
if tax[base_code]:
@ -1221,11 +1246,6 @@ class account_move_line(osv.osv):
self.create(cr, uid, data, context)
del vals['account_tax_id']
# No needed, related to the job
#if not is_new_move and 'date' in vals:
# if context and ('__last_update' in context):
# del context['__last_update']
# self.pool.get('account.move').write(cr, uid, [move_id], {'date':vals['date']}, context=context)
if check and ((not context.get('no_store_function')) or journal.entry_posted):
tmp = self.pool.get('account.move').validate(cr, uid, [vals['move_id']], context)
if journal.entry_posted and tmp:

27
addons/account/account_report.xml
View File

@ -4,7 +4,7 @@
<report auto="False" id="account_general_ledger" menu="False" model="account.account" name="account.general.ledger" rml="account/report/account_general_ledger.rml" string="General Ledger"/>
<report auto="False" id="account_3rdparty_ledger" menu="False" model="res.partner" name="account.third_party_ledger" rml="account/report/account_partner_ledger.rml" string="Partner Ledger"/>
<report auto="False" id="account_3rdparty_ledger_other" menu="False" model="res.partner" name="account.third_party_ledger_other" rml="account/report/account_partner_ledger_other.rml" string="Partner Other Ledger"/>
<report auto="False" id="account_account_balance" menu="False" model="account.account" name="account.account.balance" rml="account/report/account_balance.rml" string="Account Balance"/>
<report auto="False" id="account_account_balance" menu="False" model="account.account" name="account.account.balance" rml="account/report/account_balance.rml" string="Trial Balance"/>
<report auto="False" id="account_3rdparty_account_balance" menu="False" model="account.account" name="account.partner.balance" rml="account/report/account_partner_balance.rml" string="Partner Balance"/>
<report auto="False" id="account_central_journal" model="account.journal.period" name="account.central.journal" rml="account/report/account_central_journal.rml" string="Central Journals" header="False"/>
<report auto="False" id="account_general_journal" model="account.journal.period" name="account.general.journal" rml="account/report/account_general_journal.rml" string="General Journals" header="False"/>
@ -47,20 +47,6 @@
name="Taxes"
parent="account.menu_finance_generic_reporting" sequence="3"/>
<!-- <wizard
id="wizard_vat_declaration"
menu="False"
model="account.tax.code"
name="account.vat.declaration"
string="Print Taxes Report"/> -->
<!-- <menuitem
icon="STOCK_PRINT"
action="wizard_vat_declaration"
id="menu_wizard_vat_declaration"
parent="menu_tax_report"
type="wizard"/> -->
<report id="account_account_balance_compare"
string="Account balance"
model="account.account"
@ -77,16 +63,5 @@
auto="False"
menu="False"/>
<!--
<report id="analytic_journal"
string="Analytic journal"
model="account.analytic.account"
name="account.analytic.journal"
xml="account/report/analytic_journal.rml"
auto="False" />
-->
</data>
</openerp>

626
addons/account/account_view.xml
View File

File diff suppressed because it is too large Load Diff

93
addons/account/account_wizard.xml
View File

@ -1,100 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- <wizard-->
<!-- string="Account balance-Compare Years"-->
<!-- model="account.account"-->
<!-- name="account.balance.account.balance.report"-->
<!-- keyword="client_print_multi"-->
<!-- id="wizard_account_balance_compare_report"/>-->
<!-- for test only -->
<!-- wizard id="wizard_invoice_pay" model="account.invoice" name="account.invoice.pay" string="Pay invoice" groups="base.group_user"/-->
<!-- close year, period, journal -->
<!-- <wizard id="wizard_fiscalyear_close" menu="False" model="account.fiscalyear" name="account.fiscalyear.close" string="Generate Fiscal Year Opening Entries"/>-->
<!---->
<!-- <menuitem-->
<!-- action="wizard_fiscalyear_close"-->
<!-- id="menu_wizard_fy_close"-->
<!-- parent="menu_account_end_year_treatments"-->
<!-- type="wizard"-->
<!-- sequence="1"/>-->
<!-- <wizard id="wizard_fiscalyear_close_state" menu="False" model="account.fiscalyear" name="account.fiscalyear.close.state" string="Close a Fiscal Year"/>
<menuitem action="wizard_fiscalyear_close_state" id="menu_wizard_fy_close_state" parent="menu_account_end_year_treatments" type="wizard"/>
-->
<!-- automatic reconcile -->
<!-- <menuitem id="next_id_20" name="Reconciliation" parent="menu_finance_periodical_processing"/>-->
<!-- <wizard id="wizard_automatic_reconcile" menu="False" model="account.account" name="account.automatic.reconcile" string="Automatic reconciliation"/>
<menuitem action="wizard_automatic_reconcile" id="menu_automatic_reconcile" parent="next_id_20" type="wizard"/>-->
<!-- Import entry in statement -->
<!-- <wizard-->
<!-- string="Import invoices"-->
<!-- model="account.bank.statement"-->
<!-- name="populate_statement_from_inv"-->
<!-- menu="False"-->
<!-- id="wizard_populate_statement_from_inv"/>-->
<!-- manual reconcile -->
<!-- <wizard id="wizard_reconcile" model="account.move.line" name="account.move.line.reconcile" string="Reconcile Entries"/>-->
<!-- <wizard id="wizard_reconcile_unreconcile" model="account.move.reconcile" name="account.reconcile.unreconcile" string="Unreconcile Entries"/>-->
<!-- <wizard id="wizard_reconcile_select" menu="False" model="account.move.line" name="account.move.line.reconcile.select" string="Reconcile entries"/> -->
<!-- <menuitem action="wizard_reconcile_select" id="menu_reconcile_select" parent="account.next_id_20" type="wizard"/> -->
<!-- unreconcile -->
<!-- <wizard id="wizard_unreconcile" model="account.move.line" name="account.move.line.unreconcile" string="Unreconcile Entries"/>-->
<!-- <wizard id="wizard_unreconcile_select" menu="False" model="account.move.line" name="account.move.line.unreconcile.select" string="Unreconcile entries"/> -->
<!-- <menuitem action="wizard_unreconcile_select" id="menu_unreconcile_select" parent="account.next_id_20" type="wizard"/> -->
<!-- subscriptions -->
<!--
<wizard id="wizard_generate_subscription" menu="False" model="account.subscription" name="account.subscription.generate" string="Create subscription entries"/>
<menuitem action="wizard_generate_subscription" id="menu_generate_subscription" parent="account.menu_finance_periodical_processing" type="wizard"/>
-->
<!-- Aged partner balance -->
<!-- <wizard id="wizard_aged_trial_balance" menu="False" model="res.partner" name="account.aged.trial.balance" string="Aged Partner Balance"/>
<menuitem icon="STOCK_PRINT" action="wizard_aged_trial_balance" id="menu_aged_trial_balance" parent="next_id_22" type="wizard"/>-->
<!-- report-related wizards -->
<!-- <wizard id="wizard_partner_balance_report" menu="False" model="res.partner" name="account.partner.balance.report" string="Partner Balance"/>
<menuitem icon="STOCK_PRINT" action="wizard_partner_balance_report" id="menu_partner_balance" parent="account.next_id_22" type="wizard"/> -->
<menuitem id="next_id_22" name="Partner Accounts" parent="menu_finance_generic_reporting" sequence="1"/>
<!-- <wizard id="wizard_invoice_state_confirm" keyword="client_action_multi" model="account.invoice" multi="True" name="account.invoice.state.confirm" string="Confirm draft invoices" groups="base.group_user"/>-->
<!-- <wizard id="wizard_invoice_state_cancel" keyword="client_action_multi" model="account.invoice" multi="True" name="account.invoice.state.cancel" string="Cancel selected invoices" groups="base.group_user"/>-->
<!---->
<!-- account.move validate -->
<!-- <wizard id="wizard_validate_account_moves" menu="False" model="account.move" name="account.move.validate" string="Validate Ledger Postings"/>
<menuitem action="wizard_validate_account_moves" id="menu_validate_account_moves" parent="account.menu_finance_periodical_processing" type="wizard"/>
<wizard id="wizard_validate_account_moves_line" menu="True" model="account.move.line" name="account.move_line.validate" string="Validate Ledger Postings"/>-->
<!-- Use Models -->
<!-- <wizard string="Create Entries From Models" model="account.model" name="account_use_models" menu="False" id="wizard_account_use_model"/>-->
<!-- <menuitem action="wizard_account_use_model" type="wizard" parent="account.menu_finance_recurrent_entries" id="menu_account_use_model"/>-->
<!-- <wizard string="Create Entries From Models" model="account.move.line" name="account_use_models" menu="True" id="wizard_line_account_use_model"/>-->
<!-- account.invoice -->
<!-- <wizard string="Open State" model="account.invoice" name="account.wizard_paid_open" menu="False" id="wizard_paid_open" groups="base.group_user"/> -->
<!-- <wizard id="wizard_invoice_currency_change" model="account.invoice" name="account.invoice.currency_change" string="Change Currency" groups="base.group_user"/>-->
</data>
</openerp>

11
addons/account/board_account_demo.xml
View File

@ -2,16 +2,9 @@
<openerp>
<data noupdate="1">
<!--
Administrator shortcut
Demo user startup menu
Administrator shortcut
Demo user startup menu
-->
<!-- <record id="sc_account_dash" model="ir.ui.view_sc">
<field name="name">Accounting dashboard</field>
<field name="user_id" ref="base.user_root"/>
<field name="resource">ir.ui.menu</field>
<field name="sequence">0</field>
<field name="res_id" ref="menu_board_account"/>
</record> -->
<record id="base.user_root" model="res.users">
<field name="action_id" ref="open_board_account"/>
</record>

2
addons/account/board_account_view.xml
View File

@ -49,7 +49,7 @@
<field name="view_id" ref="board_account_form"/>
</record>
<menuitem id="menu_dashboard_acc" name="Dashboard" sequence="2" parent="account.menu_finance_reporting"/>
<menuitem id="menu_dashboard_acc" name="Dashboard" sequence="2" parent="account.menu_finance_reporting" groups="group_account_user,group_account_manager,base.group_system"/>
<menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/>
<menuitem icon="terp-account" id="account.menu_finance" name="Accounting" sequence="13" action="open_board_account"/>
</data>

2
addons/account/company.py
View File

@ -29,7 +29,7 @@ class res_company(osv.osv):
'account.account',
type='many2one',
relation='account.account',
string="Reserve and Surplus Account",
string="Reserve and Profit/Loss Account",
method=True,
view_load=True,
domain="[('type', '=', 'payable')]",

16
addons/account/company_view.xml
View File

@ -7,15 +7,15 @@
<field name="model">res.company</field>
<field name="type">form</field>
<field name="arch" type="xml">
<notebook>
<page string="Overdue Payments" position="inside">
<separator string="Overdue Payments Message" colspan="4"/>
<field name="overdue_msg" nolabel="1" colspan ="4"/>
</page>
</notebook>
<notebook>
<page string="Overdue Payments" position="inside">
<separator string="Overdue Payments Message" colspan="4"/>
<field name="overdue_msg" nolabel="1" colspan ="4"/>
</page>
</notebook>
</field>
</record>
<record model="ir.ui.view" id="view_company_inherit_1_form">
<field name="name">res.company.form.inherit</field>
<field name="inherit_id" ref="base.view_company_form"/>
@ -24,7 +24,7 @@
<field name="arch" type="xml">
<page string="Configuration" position="inside">
<group col="2" colspan="2">
<separator string="Reserve And Surplus Account" colspan="2"/>
<separator string="Reserve And Profit/Loss Account" colspan="2"/>
<field name="property_reserve_and_surplus_account" colspan="2"/>
</group>
</page>

154
addons/account/configurable_account_chart.xml
View File

@ -125,7 +125,7 @@
<field name="type">view</field>
<field name="user_type" ref="conf_account_type_view"/>
</record>
<record id="conf_fas" model="account.account.template">
<field name="code">10</field>
<field name="name">Fixed Assets</field>
@ -133,7 +133,7 @@
<field name="type">view</field>
<field name="user_type" ref="account_type_asset_view1"/>
</record>
<record id="conf_xfa" model="account.account.template">
<field name="code">100</field>
<field name="name">Fixed Asset Account</field>
@ -141,7 +141,7 @@
<field name="type">other</field>
<field name="user_type" ref="account_type_asset_view1"/>
</record>
<record id="conf_nca" model="account.account.template">
<field name="code">11</field>
<field name="name">Net Current Assets</field>
@ -149,7 +149,7 @@
<field name="type">view</field>
<field name="user_type" ref="account_type_asset_view1"/>
</record>
<record id="conf_cas" model="account.account.template">
<field name="code">110</field>
<field name="name">Current Assets</field>
@ -157,7 +157,7 @@
<field name="type">view</field>
<field name="user_type" ref="account_type_asset_view1"/>
</record>
<record id="conf_stk" model="account.account.template">
<field name="code">1101</field>
<field name="name">Purchased Stocks</field>
@ -165,7 +165,7 @@
<field name="type">other</field>
<field name="user_type" ref="conf_account_type_asset"/>
</record>
<record id="conf_a_recv" model="account.account.template">
<field name="code">1102</field>
<field name="name">Debtors</field>
@ -174,35 +174,23 @@
<field eval="True" name="reconcile"/>
<field name="user_type" ref="conf_account_type_asset"/>
</record>
<!-- <record id="account.property_account_receivable" model="ir.property">
<field eval="'account.account,'+str(a_recv)" name="value"/>
</record> -->
<record id="conf_ova" model="account.account.template">
<field name="code">1103</field>
<field name="name">Output VAT</field>
<field name="name">Tax Paid</field>
<field ref="conf_cas" name="parent_id"/>
<field name="type">other</field>
<field name="user_type" ref="conf_account_type_asset"/>
</record>
<record id="conf_bnk" model="account.account.template">
<field name="code">1104</field>
<field name="name">Bank Current Account</field>
<field ref="conf_cas" name="parent_id"/>
<field name="type">view</field>
<field name="user_type" ref="conf_account_type_bnk"/>
<field name="user_type" ref="account_type_asset_view1"/>
</record>
<!-- <record id="conf_cash" model="account.account.template">-->
<!-- <field name="code">1105</field>-->
<!-- <field name="name">Cash</field>-->
<!-- <field ref="conf_cas" name="parent_id"/>-->
<!-- <field name="type">view</field>-->
<!-- <field name="user_type" ref="conf_account_type_cash"/>-->
<!-- </record>-->
<record id="conf_cli" model="account.account.template">
<field name="code">111</field>
<field name="name">Current Liabilities</field>
@ -210,7 +198,7 @@
<field name="type">view</field>
<field name="user_type" ref="account_type_liability_view1"/>
</record>
<record id="conf_a_pay" model="account.account.template">
<field name="code">1111</field>
<field name="name">Creditors</field>
@ -219,29 +207,25 @@
<field eval="True" name="reconcile"/>
<field name="user_type" ref="conf_account_type_liability"/>
</record>
<!-- <record id="account.property_account_payable" model="ir.property">
<field eval="'account.account,'+str(a_pay)" name="value"/>
</record>-->
<record id="conf_iva" model="account.account.template">
<field name="code">1112</field>
<field name="name">Input VAT</field>
<field name="name">Tax Received</field>
<field ref="conf_cli" name="parent_id"/>
<field name="type">other</field>
<field name="user_type" ref="conf_account_type_liability"/>
</record>
<record id="conf_a_reserve_and_surplus" model="account.account.template">
<field name="code">1113</field>
<field name="name">Reserve and Surplus Account</field>
<field name="name">Reserve and Profit/Loss Account</field>
<field ref="conf_cli" name="parent_id"/>
<field name="type">payable</field>
<field eval="True" name="reconcile"/>
<field name="user_type" ref="conf_account_type_liability"/>
</record>
<!-- Profit and Loss -->
<record id="conf_gpf" model="account.account.template">
@ -259,7 +243,7 @@
<field name="type">view</field>
<field name="user_type" ref="account_type_income_view1"/>
</record>
<record id="conf_a_sale" model="account.account.template">
<field name="code">200</field>
<field name="name">Product Sales</field>
@ -267,11 +251,7 @@
<field name="type">other</field>
<field name="user_type" ref="conf_account_type_income"/>
</record>
<!-- <record id="account.property_account_income_categ" model="ir.property">
<field eval="'account.account,'+str(a_sale)" name="value"/>
</record> -->
<record id="conf_cos" model="account.account.template">
<field name="code">21</field>
<field name="name">Cost of Sales</field>
@ -279,7 +259,7 @@
<field name="type">view</field>
<field name="user_type" ref="account_type_income_view1"/>
</record>
<record id="conf_cog" model="account.account.template">
<field name="code">210</field>
<field name="name">Cost of Goods Sold</field>
@ -287,7 +267,7 @@
<field name="type">other</field>
<field name="user_type" ref="conf_account_type_expense"/>
</record>
<record id="conf_ovr" model="account.account.template">
<field name="code">22</field>
<field name="name">Overheads</field>
@ -295,7 +275,7 @@
<field name="type">view</field>
<field name="user_type" ref="account_type_expense_view1"/>
</record>
<record id="conf_a_expense" model="account.account.template">
<field name="code">220</field>
<field name="name">Expenses</field>
@ -304,12 +284,16 @@
<field name="user_type" ref="conf_account_type_expense"/>
</record>
<!-- <record id="account.property_account_expense_categ" model="ir.property">
<field eval="'account.account,'+str(a_expense)" name="value"/>
</record> -->
<record id="conf_a_salary_expense" model="account.account.template">
<field name="code">221</field>
<field name="name">Salary Expenses</field>
<field ref="conf_ovr" name="parent_id"/>
<field name="type">other</field>
<field name="user_type" ref="conf_account_type_expense"/>
</record>
<!-- Taxes -->
<!-- TAX Code Definitions -->
<!-- TAX Code Definitions -->
<!-- Invoiced TAX -->
@ -324,63 +308,63 @@
<!-- Input TAX -->
<record id="tax_code_input" model="account.tax.code.template">
<field name="name">Input TAX</field>
<field name="name">Tax Received</field>
<field name="parent_id" ref="tax_code_balance_net"/>
<field eval="-1" name="sign"/>
</record>
<record id="tax_code_input_S" model="account.tax.code.template">
<field name="name">Input TAX Rate S (15%)</field>
<field name="name">Tax Received Rate S (15%)</field>
<field name="parent_id" ref="tax_code_input"/>
</record>
<record id="tax_code_input_R" model="account.tax.code.template">
<field name="name">Input TAX Rate R (5%)</field>
<field name="name">Tax Received Rate R (5%)</field>
<field name="parent_id" ref="tax_code_input"/>
</record>
<record id="tax_code_input_X" model="account.tax.code.template">
<field name="name">Input TAX Rate X (Exempt)</field>
<field name="name">Tax Received Rate X (Exempt)</field>
<field name="parent_id" ref="tax_code_input"/>
</record>
<record id="tax_code_input_O" model="account.tax.code.template">
<field name="name">Input TAX Rate O (Out of scope)</field>
<field name="name">Tax Received Rate O (Out of scope)</field>
<field name="parent_id" ref="tax_code_input"/>
</record>
<!-- Output TAX -->
<record id="tax_code_output" model="account.tax.code.template">
<field name="name">Output TAX</field>
<field name="name">Tax Paid</field>
<field name="parent_id" ref="tax_code_balance_net"/>
</record>
<record id="tax_code_output_S" model="account.tax.code.template">
<field name="name">Output TAX Rate S (15%)</field>
<field name="name">Tax Paid Rate S (15%)</field>
<field name="parent_id" ref="tax_code_output"/>
</record>
<record id="tax_code_output_R" model="account.tax.code.template">
<field name="name">Output TAX Rate R (5%)</field>
<field name="name">Tax Paid Rate R (5%)</field>
<field name="parent_id" ref="tax_code_output"/>
</record>
<record id="tax_code_output_X" model="account.tax.code.template">
<field name="name">Output TAX Rate X (Exempt)</field>
<field name="name">Tax Paid Rate X (Exempt)</field>
<field name="parent_id" ref="tax_code_output"/>
</record>
<record id="tax_code_output_O" model="account.tax.code.template">
<field name="name">Output TAX Rate O (Out of scope)</field>
<field name="name">Tax Paid Rate O (Out of scope)</field>
<field name="parent_id" ref="tax_code_output"/>
</record>
<!-- Invoiced Base of TAX -->
<!-- Purchases -->
<record id="tax_code_base_net" model="account.tax.code.template">
<field name="name">Tax Bases</field>
<field name="parent_id" ref="tax_code_chart_root"/>
@ -395,7 +379,7 @@
<field name="name">Taxable Purchases Rated S (15%)</field>
<field name="parent_id" ref="tax_code_base_purchases"/>
</record>
<record id="tax_code_purch_R" model="account.tax.code.template">
<field name="name">Taxable Purchases Rated R (5%)</field>
<field name="parent_id" ref="tax_code_base_purchases"/>
@ -405,34 +389,34 @@
<field name="name">Taxable Purchases Type X (Exempt)</field>
<field name="parent_id" ref="tax_code_base_purchases"/>
</record>
<record id="tax_code_purch_O" model="account.tax.code.template">
<field name="name">Taxable Purchases Type O (Out of scope)</field>
<field name="parent_id" ref="tax_code_base_purchases"/>
</record>
<!-- Sales -->
<record id="tax_code_base_sales" model="account.tax.code.template">
<field name="name">Base of Taxable Sales</field>
<field name="parent_id" ref="tax_code_base_net"/>
</record>
<record id="tax_code_sales_S" model="account.tax.code.template">
<field name="name">Taxable Sales Rated S (15%)</field>
<field name="parent_id" ref="tax_code_base_sales"/>
</record>
<record id="tax_code_sales_R" model="account.tax.code.template">
<field name="name">Taxable Sales Rated R (5%)</field>
<field name="parent_id" ref="tax_code_base_sales"/>
</record>
<record id="tax_code_sales_X" model="account.tax.code.template">
<field name="name">Taxable Sales Type X (Exempt)</field>
<field name="parent_id" ref="tax_code_base_sales"/>
</record>
<record id="tax_code_sales_O" model="account.tax.code.template">
<field name="name">Taxable Sales Type O (Out of scope)</field>
<field name="parent_id" ref="tax_code_base_sales"/>
@ -486,6 +470,8 @@
<field name="name">OTAX X</field>
<field eval="0.0" name="amount"/>
<field name="type">percent</field>
<field name="account_collected_id" ref="conf_ova"/>
<field name="account_paid_id" ref="conf_ova"/>
<field name="base_code_id" ref="tax_code_purch_X"/>
<field name="tax_code_id" ref="tax_code_output_X"/>
<field name="ref_base_code_id" ref="tax_code_purch_X"/>
@ -498,6 +484,8 @@
<field name="name">OTAX O</field>
<field eval="0.0" name="amount"/>
<field name="type">percent</field>
<field name="account_collected_id" ref="conf_ova"/>
<field name="account_paid_id" ref="conf_ova"/>
<field name="base_code_id" ref="tax_code_purch_O"/>
<field name="tax_code_id" ref="tax_code_output_O"/>
<field name="ref_base_code_id" ref="tax_code_purch_O"/>
@ -540,6 +528,8 @@
<field name="name">ITAX X</field>
<field eval="0.0" name="amount"/>
<field name="type">percent</field>
<field name="account_collected_id" ref="conf_iva"/>
<field name="account_paid_id" ref="conf_iva"/>
<field name="base_code_id" ref="tax_code_sales_X"/>
<field name="tax_code_id" ref="tax_code_input_X"/>
<field name="ref_base_code_id" ref="tax_code_sales_X"/>
@ -552,25 +542,27 @@
<field name="name">ITAX O</field>
<field eval="0.0" name="amount"/>
<field name="type">percent</field>
<field name="account_collected_id" ref="conf_iva"/>
<field name="account_paid_id" ref="conf_iva"/>
<field name="base_code_id" ref="tax_code_sales_O"/>
<field name="tax_code_id" ref="tax_code_input_O"/>
<field name="ref_base_code_id" ref="tax_code_sales_O"/>
<field name="ref_tax_code_id" ref="tax_code_input_O"/>
<field name="type_tax_use">sale</field>
</record>
<!-- = = = = = = = = = = = = = = = -->
<!-- Fiscal Position Templates -->
<!-- Fiscal Mapping Templates -->
<!-- = = = = = = = = = = = = = = = -->
<record id="fiscal_position_normal_taxes_template1" model="account.fiscal.position.template">
<field name="name">Normal Taxes</field>
<field name="chart_template_id" ref="configurable_chart_template"/>
</record>
<record id="fiscal_position_tax_exempt_template2" model="account.fiscal.position.template">
<field name="name">Tax Exempt</field>
<field name="chart_template_id" ref="configurable_chart_template"/>
@ -595,7 +587,7 @@
<!-- Assigned Default Taxes For Different Account -->
<record id="conf_a_sale" model="account.account.template">
<field name="tax_ids" eval="[(6,0,[ref('itaxs')])]"/>
</record>
@ -603,7 +595,7 @@
<record id="conf_a_expense" model="account.account.template">
<field name="tax_ids" eval="[(6,0,[ref('otaxs')])]"/>
</record>
</data>
</openerp>

75
addons/account/data/account_data2.xml
View File

@ -27,20 +27,20 @@
<field name="name">Date</field>
<field name="field">date</field>
<field eval="True" name="required"/>
<field eval="1" name="sequence"/>
<field eval="3" name="sequence"/>
</record>
<record id="bank_col2" model="account.journal.column">
<field name="view_id" ref="account_journal_bank_view"/>
<field name="name">N. Piece</field>
<field name="name">Journal Entry</field>
<field name="field">move_id</field>
<field eval="False" name="required"/>
<field eval="2" name="sequence"/>
<field eval="1" name="sequence"/>
</record>
<record id="bank_col7" model="account.journal.column">
<field name="view_id" ref="account_journal_bank_view"/>
<field name="name">Name</field>
<field name="field">name</field>
<field eval="3" name="sequence"/>
<field eval="7" name="sequence"/>
<field eval="True" name="required"/>
</record>
<record id="bank_col4" model="account.journal.column">
@ -78,7 +78,7 @@
<field name="view_id" ref="account_journal_bank_view"/>
<field name="name">Ref</field>
<field name="field">ref</field>
<field eval="7" name="sequence"/>
<field eval="2" name="sequence"/>
</record>
<record id="bank_col23" model="account.journal.column">
<field name="view_id" ref="account_journal_bank_view"/>
@ -93,6 +93,7 @@
<field eval="20" name="sequence"/>
</record>
<record id="account_journal_bank_view_multi" model="account.journal.view">
<field name="name">Bank/Cash Journal (Multi-Currency) View</field>
</record>
@ -101,20 +102,20 @@
<field name="name">Date</field>
<field name="field">date</field>
<field eval="True" name="required"/>
<field eval="1" name="sequence"/>
<field eval="3" name="sequence"/>
</record>
<record id="bank_col2_multi" model="account.journal.column">
<field name="view_id" ref="account_journal_bank_view_multi"/>
<field name="name">N. Piece</field>
<field name="name">Journal Entry</field>
<field name="field">move_id</field>
<field eval="False" name="required"/>
<field eval="2" name="sequence"/>
<field eval="1" name="sequence"/>
</record>
<record id="bank_col7_multi" model="account.journal.column">
<field name="view_id" ref="account_journal_bank_view_multi"/>
<field name="name">Name</field>
<field name="field">name</field>
<field eval="3" name="sequence"/>
<field eval="7" name="sequence"/>
<field eval="True" name="required"/>
</record>
<record id="bank_col4_multi" model="account.journal.column">
@ -164,7 +165,7 @@
<field name="view_id" ref="account_journal_bank_view_multi"/>
<field name="name">Ref</field>
<field name="field">ref</field>
<field eval="7" name="sequence"/>
<field eval="2" name="sequence"/>
</record>
<record id="bank_col23_multi" model="account.journal.column">
<field name="view_id" ref="account_journal_bank_view_multi"/>
@ -188,39 +189,39 @@
<field name="name">Date</field>
<field name="field">date</field>
<field eval="True" name="required"/>
<field eval="1" name="sequence"/>
<field eval="3" name="sequence"/>
</record>
<record id="journal_col2" model="account.journal.column">
<field name="view_id" ref="account_journal_view"/>
<field name="name">N. Piece</field>
<field name="name">Journal Entry</field>
<field name="field">move_id</field>
<field eval="False" name="required"/>
<field eval="2" name="sequence"/>
<field eval="1" name="sequence"/>
</record>
<record id="journal_col3" model="account.journal.column">
<field name="view_id" ref="account_journal_view"/>
<field name="name">Ref</field>
<field name="field">ref</field>
<field eval="3" name="sequence"/>
<field eval="2" name="sequence"/>
</record>
<record id="journal_col5" model="account.journal.column">
<field name="view_id" ref="account_journal_view"/>
<field name="name">Partner</field>
<field name="field">partner_id</field>
<field eval="4" name="sequence"/>
<field eval="5" name="sequence"/>
</record>
<record id="journal_col4" model="account.journal.column">
<field name="view_id" ref="account_journal_view"/>
<field name="name">Account</field>
<field name="field">account_id</field>
<field eval="True" name="required"/>
<field eval="5" name="sequence"/>
<field eval="6" name="sequence"/>
</record>
<record id="journal_col6" model="account.journal.column">
<field name="view_id" ref="account_journal_view"/>
<field name="name">Name</field>
<field name="field">name</field>
<field eval="6" name="sequence"/>
<field eval="7" name="sequence"/>
<field eval="True" name="required"/>
</record>
<record id="journal_col8" model="account.journal.column">
@ -247,8 +248,8 @@
<field name="field">state</field>
<field eval="14" name="sequence"/>
</record>
<record id="account_sp_journal_view" model="account.journal.view">
<field name="name">Sale/Purchase Journal View</field>
</record>
@ -257,20 +258,20 @@
<field name="name">Date</field>
<field name="field">date</field>
<field eval="True" name="required"/>
<field eval="1" name="sequence"/>
<field eval="3" name="sequence"/>
</record>
<record id="sp_journal_col2" model="account.journal.column">
<field name="view_id" ref="account_sp_journal_view"/>
<field name="name">N. Piece</field>
<field name="name">Journal Entry</field>
<field name="field">move_id</field>
<field eval="False" name="required"/>
<field eval="2" name="sequence"/>
<field eval="1" name="sequence"/>
</record>
<record id="sp_journal_col3" model="account.journal.column">
<field name="view_id" ref="account_sp_journal_view"/>
<field name="name">Ref</field>
<field name="field">ref</field>
<field eval="3" name="sequence"/>
<field eval="2" name="sequence"/>
</record>
<record id="sp_journal_col4" model="account.journal.column">
<field name="view_id" ref="account_sp_journal_view"/>
@ -294,7 +295,7 @@
</record>
<record id="sp_journal_col7" model="account.journal.column">
<field name="view_id" ref="account_sp_journal_view"/>
<field name="name">Maturity Date</field>
<field name="name">Due Date</field>
<field name="field">date_maturity</field>
<field eval="7" name="sequence"/>
</record>
@ -346,7 +347,7 @@
<field name="field">reconcile_id</field>
<field eval="20" name="sequence"/>
</record>
<record id="account_sp_refund_journal_view" model="account.journal.view">
<field name="name">Sale/Purchase Refund Journal View</field>
</record>
@ -355,20 +356,20 @@
<field name="name">Date</field>
<field name="field">date</field>
<field eval="True" name="required"/>
<field eval="1" name="sequence"/>
<field eval="3" name="sequence"/>
</record>
<record id="sp_refund_journal_col2" model="account.journal.column">
<field name="view_id" ref="account_sp_refund_journal_view"/>
<field name="name">N. Piece</field>
<field name="name">Journal Entry</field>
<field name="field">move_id</field>
<field eval="False" name="required"/>
<field eval="2" name="sequence"/>
<field eval="1" name="sequence"/>
</record>
<record id="sp_refund_journal_col3" model="account.journal.column">
<field name="view_id" ref="account_sp_refund_journal_view"/>
<field name="name">Ref</field>
<field name="field">ref</field>
<field eval="3" name="sequence"/>
<field eval="2" name="sequence"/>
</record>
<record id="sp_refund_journal_col4" model="account.journal.column">
<field name="view_id" ref="account_sp_refund_journal_view"/>
@ -392,7 +393,7 @@
</record>
<record id="sp_refund_journal_col7" model="account.journal.column">
<field name="view_id" ref="account_sp_refund_journal_view"/>
<field name="name">Maturity Date</field>
<field name="name">Due Date</field>
<field name="field">date_maturity</field>
<field eval="7" name="sequence"/>
</record>
@ -444,7 +445,7 @@
<field name="field">reconcile_id</field>
<field eval="20" name="sequence"/>
</record>
<!--
Account Journal Sequences
-->
@ -461,12 +462,14 @@
<record id="sequence_sale_journal" model="ir.sequence">
<field name="name">Sale Journal</field>
<field name="code">account.journal</field>
<field name="prefix"/>
<field eval="3" name="padding"/>
<field name="prefix">SAJ/%(year)s/</field>
</record>
<record id="sequence_purchase_journal" model="ir.sequence">
<field name="name">Purchase Journal</field>
<field name="code">account.journal</field>
<field name="prefix"/>
<field eval="3" name="padding"/>
<field name="prefix">EXJ/%(year)s/</field>
</record>
<!--
@ -493,10 +496,10 @@
<field name="name">Account Bank Statement</field>
<field name="code">account.bank.statement</field>
<field name="prefix">St. %(month)s/%(day)s/</field>
<field eval="0" name="number_next"/>
<field eval="1" name="number_next"/>
<field eval="1" name="number_increment"/>
</record>
<record id="cash_sequence_statement_type" model="ir.sequence.type">
<field name="name">Cash Statement</field>
<field name="code">account.cash.statement</field>
@ -505,7 +508,7 @@
<field name="name">Account Cash Statement</field>
<field name="code">account.cash.statement</field>
<field name="prefix">Cr. %(month)s/%(day)s/</field>
<field eval="0" name="number_next"/>
<field eval="1" name="number_next"/>
<field eval="1" name="number_increment"/>
</record>
</data>

30
addons/account/demo/account_minimal.xml
View File

@ -151,7 +151,7 @@
<field name="code">X11004</field>
<field name="name">Bank Current Account - (test)</field>
<field ref="cas" name="parent_id"/>
<field name="type">other</field>
<field name="type">liquidity</field>
<field name="user_type" ref="account_type_asset"/>
</record>
@ -159,7 +159,7 @@
<field name="code">X11005</field>
<field name="name">Cash - (test)</field>
<field ref="cas" name="parent_id"/>
<field name="type">other</field>
<field name="type">liquidity</field>
<field name="user_type" ref="account_type_asset"/>
</record>
@ -199,7 +199,7 @@
<record id="rsa" model="account.account">
<field name="code">X1113</field>
<field name="name">Reserve and Surplus - (test)</field>
<field name="name">Reserve and Profit/Loss - (test)</field>
<field ref="cli" name="parent_id"/>
<field name="type">payable</field>
<field name="user_type" ref="account_type_liability"/>
@ -300,6 +300,14 @@
<field name="parent_id" ref="ovr"/>
</record>
<record id="a_salary_expense" model="account.account">
<field name="code">X2112</field>
<field name="name">Salary Expenses - (test)</field>
<field ref="ovr" name="parent_id"/>
<field name="type">other</field>
<field name="user_type" ref="account_type_expense"/>
</record>
<!-- Properties -->
<record forcecreate="True" id="property_account_receivable" model="ir.property">
<field name="name">property_account_receivable</field>
@ -338,7 +346,6 @@
<field name="type">sale</field>
<field name="view_id" ref="account_sp_journal_view"/>
<field name="sequence_id" ref="sequence_sale_journal"/>
<field name="invoice_sequence_id" ref="seq_type_out_invoice"/>
<field model="account.account" name="default_credit_account_id" ref="a_sale"/>
<field model="account.account" name="default_debit_account_id" ref="a_sale"/>
<field name="user_id" ref="base.user_root"/>
@ -347,6 +354,7 @@
<field name="name">Sales Credit Note Journal - (test)</field>
<field name="code">SCNJ</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_sale_journal"/>
<field model="account.account" name="default_credit_account_id" ref="a_sale"/>
@ -360,7 +368,6 @@
<field name="type">purchase</field>
<field name="view_id" ref="account_sp_journal_view"/>
<field name="sequence_id" ref="sequence_purchase_journal"/>
<field name="invoice_sequence_id" ref="seq_type_in_invoice"/>
<field model="account.account" name="default_debit_account_id" ref="a_expense"/>
<field model="account.account" name="default_credit_account_id" ref="a_expense"/>
<field name="user_id" ref="base.user_root"/>
@ -369,6 +376,7 @@
<field name="name">Expenses Credit Notes Journal - (test)</field>
<field name="code">ECNJ</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_purchase_journal"/>
<field model="account.account" name="default_debit_account_id" ref="a_expense"/>
@ -411,18 +419,6 @@
Product income and expense accounts, default parameters
-->
<!-- <record id="property_account_expense_prd" model="ir.property">-->
<!-- <field name="name">property_account_expense</field>-->
<!-- <field name="fields_id" search="[('model','=','product.template'),('name','=','property_account_expense')]"/>-->
<!-- <field eval="'account.account,'+str(ref('account.a_expense'))" name="value"/>-->
<!-- <field name="company_id" ref="base.main_company"/>-->
<!-- </record>-->
<!-- <record id="property_account_income_prd" model="ir.property">-->
<!-- <field name="name">property_account_income</field>-->
<!-- <field name="fields_id" search="[('model','=','product.template'),('name','=','property_account_income')]"/>-->
<!-- <field eval="'account.account,'+str(ref('account.a_sale'))" name="value"/>-->
<!-- <field name="company_id" ref="base.main_company"/>-->
<!-- </record>-->
<record id="property_account_expense_categ" model="ir.property">
<field name="name">property_account_expense_categ</field>
<field name="fields_id" search="[('model','=','product.category'),('name','=','property_account_expense_categ')]"/>

22
addons/account/i18n/account.pot
View File

@ -590,7 +590,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -981,7 +981,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1003,7 +1003,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1088,7 +1088,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1120,7 +1120,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1181,7 +1181,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1755,7 +1755,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid "The fiscal position will determine taxes and the accounts used for the the partner."
msgid "The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
#. module: account
@ -2020,7 +2020,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3551,7 +3551,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3654,7 +3654,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5741,7 +5741,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

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

@ -610,7 +610,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1004,7 +1004,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1026,7 +1026,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1113,7 +1113,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1145,7 +1145,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1211,7 +1211,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1789,8 +1789,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
#. module: account
@ -2060,7 +2059,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3626,7 +3625,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3731,7 +3730,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5866,7 +5865,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

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

@ -624,7 +624,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1018,7 +1018,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1040,7 +1040,7 @@ msgstr "Деца"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1129,7 +1129,7 @@ msgstr "Нова аналитична сметка"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1161,7 +1161,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1227,7 +1227,7 @@ msgstr "Валута на компанията"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1807,8 +1807,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
#. module: account
@ -2078,7 +2077,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3654,7 +3653,7 @@ msgstr "Последователност"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3759,7 +3758,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5908,8 +5907,8 @@ msgstr "Условие за плащане"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Фискални позиции"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

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

@ -630,8 +630,8 @@ msgstr "(Zadržite prazno da biste otvorili tekuće stanje)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Mapiranje fiskalne pozicije računa"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1028,7 +1028,7 @@ msgstr "Ukupno netto:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr "Fiskalna pozicija"
#. module: account
@ -1050,8 +1050,8 @@ msgstr "Potomci"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Mapiranje poreza fiskalne pozicije"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1139,8 +1139,8 @@ msgstr "Novo analitičko konto"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Predlošci fiskalne pozicije"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1171,8 +1171,8 @@ msgstr "Iznos izražen u alternativnoj drugoj valuti."
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Predložak fiskalne pozicije"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1242,8 +1242,8 @@ msgstr "Valuta preduzeća"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Mapiranje fiskalne pozicije na konto predloška"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1824,9 +1824,8 @@ msgstr "Slijedeći"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
msgstr "Fiskalna pozicija će odrediti poreze i račune korištene za partnera."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2098,8 +2097,8 @@ msgstr "Proces fakturiranja kupcu"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Napomena za fiskalnu poziciju"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3697,8 +3696,8 @@ msgstr "Redoslijed"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Predložak za fiskalnu poziciju"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3804,8 +3803,8 @@ msgstr "Fakture u pripremi"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Mapiranje fiskalne pozicije na predložak poreza"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -5992,8 +5991,8 @@ msgstr "Uslovi plaćanja"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Fiskalne pozicije"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

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

@ -634,8 +634,8 @@ msgstr "(deixar-lo buit per a obrir la situació actual)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Mapa de relacions comptes posició fiscal"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1032,8 +1032,8 @@ msgstr "Base:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Posició fiscal"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1054,8 +1054,8 @@ msgstr "Fills"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Mapa de relacions d'impostos posició fiscal"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1143,8 +1143,8 @@ msgstr "Nou compte analític"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Plantilles de posicions fiscals"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1175,8 +1175,8 @@ msgstr "L'import expressat en una altra divisa opcional."
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Plantilla de posició fiscal"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1246,8 +1246,8 @@ msgstr "Divisa de la companyia"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Mapa comptes plantilla posició fiscal"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1830,11 +1830,9 @@ msgstr "Següent"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
"La posició fiscal determinarà els impostos i els comptes utilitzats per la "
"empresa."
""
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2107,8 +2105,8 @@ msgstr "Procés de factura de client"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Observació posició fiscal :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3711,8 +3709,8 @@ msgstr "Seqüència"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Plantilla per posició fiscal"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3818,8 +3816,8 @@ msgstr "Factures esborrany"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Mapa impostos plantilla posició fiscal"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -6015,8 +6013,8 @@ msgstr "Termini de pagament"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Posicions fiscals"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

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

@ -612,7 +612,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1006,8 +1006,8 @@ msgstr "Čistá celkem:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Fiskální pozice"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1028,7 +1028,7 @@ msgstr "Děti"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1115,8 +1115,8 @@ msgstr "Nový analitickiý účet"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Fiskální pozice Šablony"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1147,8 +1147,8 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Fiskální pozice šablony"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1213,7 +1213,7 @@ msgstr "Společnost měny"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1791,8 +1791,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
#. module: account
@ -2062,7 +2061,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3628,7 +3627,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3733,7 +3732,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5868,7 +5867,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

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

@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-15 12:23+0000\n"
"PO-Revision-Date: 2010-09-08 09:01+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Danish <da@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: 2010-08-16 06:44+0000\n"
"X-Launchpad-Export-Date: 2010-09-09 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -616,7 +616,7 @@ msgstr "(Holdes tom for at åbne nuværende situation)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1010,8 +1010,8 @@ msgstr "Net Total:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Nuværende position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1032,7 +1032,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1119,7 +1119,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1151,7 +1151,7 @@ msgstr "Det beløb udtrykt i anden valgfri valuta."
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1223,7 +1223,7 @@ msgstr "Firma valuta"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1803,7 +1803,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2074,7 +2074,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3640,7 +3640,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3745,7 +3745,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5880,7 +5880,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

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

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-15 10:07+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"PO-Revision-Date: 2010-08-29 10:43+0000\n"
"Last-Translator: Ferdinand-chricar <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: 2010-08-16 06:44+0000\n"
"X-Launchpad-Export-Date: 2010-08-30 03:57+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -272,6 +272,9 @@ msgid ""
"in which order. You can create your own view for a faster encoding in each "
"journal."
msgstr ""
"Definiert Felder (sichtbar, zwingend, nur lesen) für die Sicht für dieses "
"Journal. Für jedes Journal können eingene Sichten erzeugt wrden um scheller "
"erfassen zu können"
#. module: account
#: help:account.invoice,date_due:0
@ -626,8 +629,8 @@ msgstr "(frei lassen um aktuelle Einstellung zu verwenden)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Summen und Salden Zuordnung"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1026,14 +1029,14 @@ msgstr "Nettosumme:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
#: field:account.move.line,product_uom_id:0
msgid "UoM"
msgstr "UoM"
msgstr "ME"
#. module: account
#: wizard_field:account.third_party_ledger.report,init,page_split:0
@ -1048,8 +1051,8 @@ msgstr "(Sub-)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Summen- & Saldenliste Zuordnung Steuern"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1137,14 +1140,14 @@ msgstr "Neues Analytisches Konto"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Summen- & Saldenliste Vorlagen"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
#: field:account.invoice.line,price_unit:0
msgid "Unit Price"
msgstr "Preis/UoM"
msgstr "Preis/ME"
#. module: account
#: rml:account.analytic.account.journal:0
@ -1169,8 +1172,8 @@ msgstr "optionaler Betrag in anderer Währung"
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Summen- & Saldenliste Vorlage"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1240,8 +1243,8 @@ msgstr "Betriebl. Währung"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Steuerliche Position Vorlage für Kontenzuordnung"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1504,7 +1507,7 @@ msgstr "Beende Jahr"
#. module: account
#: model:ir.model,name:account.model_wizard_company_setup
msgid "wizard.company.setup"
msgstr ""
msgstr "wizard.company.setup"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
@ -1822,11 +1825,9 @@ msgstr "Weiter"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
"Die Position in der Saldenliste bestimmt Steuern- und Finanzkonten für den "
"Partner."
""
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2100,8 +2101,8 @@ msgstr "Prozess Abrechnung von Kundenaufträgen"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Hinweis Steuermapping"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3699,8 +3700,8 @@ msgstr "Sequenzer"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Summen- und Saldenliste Vorlage"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3806,8 +3807,8 @@ msgstr "Entwurf Rechnungen"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Steuerliche Position Vorlage Steuerzuordnung"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -5386,7 +5387,7 @@ msgstr "Teilbuchung"
#. module: account
#: help:account.move.line,statement_id:0
msgid "The bank statement used for bank reconciliation"
msgstr ""
msgstr "Der Bankauszug für den Bankausgleich"
#. module: account
#: view:account.fiscalyear:0
@ -5477,7 +5478,7 @@ msgstr "Berechne"
#. module: account
#: help:account.invoice.line,account_id:0
msgid "The income or expense account related to the selected product."
msgstr "Aufwand- und Ertragskonto des Produktes"
msgstr "Aufwand- und Erlöskonto des Produktes"
#. module: account
#: field:account.tax,type_tax_use:0
@ -5795,7 +5796,7 @@ msgstr "5"
#: field:product.category,property_account_income_categ:0
#: field:product.template,property_account_income:0
msgid "Income Account"
msgstr "Ertragskonto"
msgstr "Erlöskonto"
#. module: account
#: field:account.period,special:0
@ -6005,8 +6006,8 @@ msgstr "Zahlungsbedingung"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Positionen Summen & Salden"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

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

@ -634,8 +634,8 @@ msgstr "(Διατηρήστε κενό για να ανοίξετε την τρ
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Χάρτης Λογαριασμών Φορολογικής Θέσης"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1032,8 +1032,8 @@ msgstr "Καθαρό Σύνολο:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Φορολογική Θέση"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1054,8 +1054,8 @@ msgstr "Υποκατηγορίες"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Χάρτογράφηση Φόρων Φορολογικής Θέσης"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1143,8 +1143,8 @@ msgstr "Νέος Λογαριασμός Αναλυτικής"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Πρότυπα Φορολογικής Θέσης"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1175,8 +1175,8 @@ msgstr "Το ποσό, εκφρασμένο σε ένα (προαιρετικό)
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Πρότυπο Φορολογικής Θέσης"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1247,8 +1247,8 @@ msgstr "Νόμισμα Εταιρίας"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Χάρτης Λογαριασμών Προτύπων Φορολογικής Θέσης"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1832,11 +1832,9 @@ msgstr "Επόμενο"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
"Η φορολογική θέση θα καθορίσει τους φόρους και τους λογαριασμούς που θα "
"χρησιμοποιηθούν για αυτόν τον συνεργάτη."
""
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2109,8 +2107,8 @@ msgstr "Επεξεργασία Τιμολογίου Πελάτη"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Σχόλιο Φορολογικής Θέσης:"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3713,8 +3711,8 @@ msgstr "Ιεράρχηση"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Πρότυπο για Φορολογική Θέση"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3820,8 +3818,8 @@ msgstr "Πρόχειρα Τιμολόγια"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Χάρτογράφηση Φόρων Προτύπου Φορολογικής Θέσης"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -6024,8 +6022,8 @@ msgstr "Όρος Πληρωμής"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Φορολογικές Θέσεις"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

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

@ -634,8 +634,8 @@ msgstr "(dejarlo vacío para abrir la situación actual)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Mapeo cuentas posición fiscal"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1032,8 +1032,8 @@ msgstr "Base:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Posición fiscal"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1054,8 +1054,8 @@ msgstr "Hijos"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Mapeo de impuestos posición fiscal"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1143,8 +1143,8 @@ msgstr "Nueva cuenta analítica"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Plantillas de posiciones fiscales"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1175,8 +1175,8 @@ msgstr "El importe expresado en otra divisa opcional."
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Plantilla de posición fiscal"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1247,8 +1247,8 @@ msgstr "Divisa de la compañía"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Mapeo cuentas plantilla posición fiscal"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1831,11 +1831,8 @@ msgstr "Siguiente"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
"La posición fiscal determinará los impuestos y las cuentas utilizadas para "
"la empresa."
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2109,8 +2106,8 @@ msgstr "Proceso de factura de cliente"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Observación posición fiscal :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3712,8 +3709,8 @@ msgstr "Secuencia"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Plantilla para posición fiscal"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3819,8 +3816,8 @@ msgstr "Facturas borrador"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Mapeo de impuestos en plantilla posiciones fiscales"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -6017,8 +6014,8 @@ msgstr "Plazo de pago"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Posiciones fiscales"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

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

@ -632,8 +632,8 @@ msgstr "(dejar vacío para abrir el estado actual)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Mapeo de cuentas y posición fiscal"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1030,8 +1030,8 @@ msgstr "Total Neto:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Posición fiscal"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1052,8 +1052,8 @@ msgstr "Hijos"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Cruce de posición de impuestos fiscales"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1141,8 +1141,8 @@ msgstr "Nueva cuenta analítica"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Plantillas de posiciones fiscales"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1173,8 +1173,8 @@ msgstr "El importe expresado en otra moneda opcional."
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Plantilla de posición fiscal"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1245,8 +1245,8 @@ msgstr "Moneda de la compañía"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Asociación de cuentas Planilla posición fiscal"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1828,11 +1828,8 @@ msgstr "Siguiente"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
"La posición fiscal determinará los impuestos y las cuentas utilizadas por el "
"partner"
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2106,7 +2103,7 @@ msgstr "Proceso de factura de cliente"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3710,8 +3707,8 @@ msgstr "Secuencia"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Plantilla para posición fiscal"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3817,8 +3814,8 @@ msgstr "Facturas en borrador"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Asociación de impuestos plantilla posición fiscal"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -6015,8 +6012,8 @@ msgstr "Términos de Pago"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Posiciones fiscales"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

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

File diff suppressed because it is too large Load Diff

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

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-08 05:46+0000\n"
"Last-Translator: lyyser <logard.1961@gmail.com>\n"
"PO-Revision-Date: 2010-08-28 08:23+0000\n"
"Last-Translator: OpenERP Administrators <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: 2010-08-12 03:51+0000\n"
"X-Launchpad-Export-Date: 2010-08-29 03:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -615,8 +615,8 @@ msgstr "(Jätke tühjaks, et avada praegune seis)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Finantspositsioonide kontode kaardistamine"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -637,7 +637,7 @@ msgstr "Kooskõlasta konto kirjet"
#. module: account
#: wizard_button:account.move.bank.reconcile,init,open:0
msgid "Open for bank reconciliation"
msgstr ""
msgstr "Avatud panga võrdlevaks kooskõlastamiseks"
#. module: account
#: field:account.invoice.line,discount:0
@ -1009,8 +1009,8 @@ msgstr "Netosumma:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Finantspositsioon"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1031,7 +1031,7 @@ msgstr "Alam"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1118,8 +1118,8 @@ msgstr "Uus analüütiline konto"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Finantspositsioonide mallid"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1150,8 +1150,8 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Finantspositsiooni mall"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1216,7 +1216,7 @@ msgstr "Ettevõtte valuuta"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1794,8 +1794,7 @@ msgstr "Järgmine"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
#. module: account
@ -2065,7 +2064,7 @@ msgstr "Kliendi arve protsess"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3631,8 +3630,8 @@ msgstr "Järjekord"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Mall finantspositsioonile"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3736,7 +3735,7 @@ msgstr "Mustandarved"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5873,8 +5872,8 @@ msgstr "Maksetingimus"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Finantspositsioonid"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

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

@ -611,7 +611,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1005,7 +1005,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1027,7 +1027,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1114,7 +1114,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1146,7 +1146,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1212,7 +1212,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1790,7 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2061,7 +2061,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3627,7 +3627,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3732,7 +3732,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5867,7 +5867,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

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

@ -611,7 +611,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1005,7 +1005,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1027,7 +1027,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1114,7 +1114,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1146,7 +1146,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1212,7 +1212,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1790,7 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2061,7 +2061,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3627,7 +3627,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3732,7 +3732,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5867,7 +5867,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

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

@ -631,8 +631,8 @@ msgstr "Jätä tyhjäksi avataksesi nykyisen tilanteen"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Talouskannan tilien kartoitus"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1029,8 +1029,8 @@ msgstr "Netto:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Talouskanta"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1051,8 +1051,8 @@ msgstr "Alatilit"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Talouskannan verojen kartoitus"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1140,8 +1140,8 @@ msgstr "Uusi analyyttinen tili"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Talouskantojen mallit"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1172,8 +1172,8 @@ msgstr "Summa ilmoitettuna valinnaisessa toisessa valuutassa."
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Talouskannan malli"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1243,8 +1243,8 @@ msgstr "Yritysvaluutta"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Talouskannan mallin tilien kartoitukset"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1825,9 +1825,8 @@ msgstr "Seuraava"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
msgstr "Talouskanta määrittelee kumppaniin sovellettavat verot ja tilit."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2098,7 +2097,7 @@ msgstr "Asiakaslaskutusprosessi"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3690,8 +3689,8 @@ msgstr "Sarja"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Malli talouskannalle"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3797,8 +3796,8 @@ msgstr "Luonnoslaskut"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Talouskannan mallin veron kartoitukset"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -5982,8 +5981,8 @@ msgstr "Maksuehto"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Talouskannat"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

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

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-02 19:46+0000\n"
"Last-Translator: mga (Open ERP) <Unknown>\n"
"PO-Revision-Date: 2010-09-03 08:02+0000\n"
"Last-Translator: Quentin THEURET <quentin@theuret.net>\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: 2010-08-12 03:51+0000\n"
"X-Launchpad-Export-Date: 2010-09-04 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -693,8 +693,8 @@ msgstr "(Laisser vide pour consulter la situation courrante)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Affectation des comptes par régime fiscal"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1084,8 +1084,8 @@ msgstr "Total net :"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Régime fiscal"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1106,8 +1106,8 @@ msgstr "Enfant"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Affectation des taxes par régime fiscal"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1195,8 +1195,8 @@ msgstr "Nouveau compte analytique"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Modèles de régimes fiscaux"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1227,8 +1227,8 @@ msgstr "Le montant exprimé dans une autre devise optionelle."
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Modèle de régime fiscal"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1299,8 +1299,8 @@ msgstr "Devise société"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Affectation des comptes suivant le modèle de régime fiscal"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1764,7 +1764,7 @@ msgstr "Coûts & Revenus"
#. module: account
#: constraint:account.account:0
msgid "Error ! You can not create recursive accounts."
msgstr "Erreur ! Vous ne pouvez pas créer d'écritures récursives."
msgstr "Erreur ! Vous ne pouvez pas créer des compte récursifs"
#. module: account
#: rml:account.tax.code.entries:0
@ -1880,12 +1880,9 @@ msgstr "Suivant"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
msgid
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
"Le régime fiscal déterminera les taxes et les comptes utilisés pour le "
"partenaire."
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2159,8 +2156,8 @@ msgstr "Processus de la facture client"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Remarque position fiscale :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3748,8 +3745,8 @@ msgstr "Séquence"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Modèle de régime fiscal"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3765,7 +3762,7 @@ msgstr "Avoir"
#. module: account
#: model:ir.actions.todo,note:account.config_fiscalyear
msgid "Define Fiscal Years and Select Charts of Account"
msgstr "Définir l'exercice fiscal et le plan comptable"
msgstr "Définir l'exercice fiscal et choisir le plan comptable"
#. module: account
#: wizard_field:account.move.line.reconcile,addendum,period_id:0
@ -3855,8 +3852,8 @@ msgstr "Factures en brouillon"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Affectation des taxes dans le modèle de régime fiscal"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -6024,8 +6021,8 @@ msgstr "Condition de paiement"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Régimes fiscaux"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0
@ -6202,7 +6199,7 @@ msgstr "Sélectionner le COmpte Référence (pour la comparaison en %)"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_account_balance_report
msgid "Account balance-Compare Years"
msgstr ""
msgstr "Balance des Comptes - Comparer les Années"
#. module: account
#: model:ir.module.module,description:account.module_meta_information
@ -6225,6 +6222,21 @@ msgid ""
" 5. You have an option to print the desired report in Landscape format.\n"
" "
msgstr ""
"Le module de Balance des Comptes est une fonctionnalité additionnelle du "
"module de Gestion Financière.\n"
"\n"
" Ce module vous offre plusieurs options d'impression du bilan.\n"
"\n"
" 1. Comparaison des bilans de différentes années.\n"
"\n"
" 2. Affichage des écarts entre deux années en pourcentage ou en valeur.\n"
"\n"
" 3. Définition d'une valeur de référence à comparer à une seule année.\n"
"\n"
" 4. Affichage jusqu'à la date actuelle ou depuis la date de création.\n"
"\n"
" 5. Impression au format portrait ou paysage.\n"
" "
#. module: account
#: wizard_view:account.balance.account.balance.report,backtoinit:0
@ -6240,7 +6252,7 @@ msgstr "Afficher le Rapport au Format Paysage"
#: rml:account.account.balance.landscape:0
#: rml:account.balance.account.balance:0
msgid "Total :"
msgstr ""
msgstr "Total :"
#. module: account
#: wizard_field:account.balance.account.balance.report,init,format_perc:0
@ -6275,13 +6287,13 @@ msgstr "1. Vous avez sélectionner plus de 3 années dans tous les cas."
#. module: account
#: model:ir.module.module,shortdesc:account.module_meta_information
msgid "Accounting and financial management-Compare Accounts"
msgstr ""
msgstr "Gestion financière et comptable - Comparez les comptes"
#. module: account
#: rml:account.account.balance.landscape:0
#: rml:account.balance.account.balance:0
msgid "Year :"
msgstr ""
msgstr "Année :"
#. module: account
#: wizard_view:account.balance.account.balance.report,backtoinit:0
@ -6332,6 +6344,10 @@ msgid ""
"credit/debit columns and % option.This can lead contents to be printed out "
"of the paper.Please try again."
msgstr ""
"Vous avez choisi de comparer avec l’option supérieure à 1 an sur les "
"colonnes de crédit/ débit et des %.\r\n"
"Cela peut conduire le contenu à être imprimé en dehors de la plage du format "
"de papier. Veuillez essayer à nouveau."
#. module: account
#: wizard_view:account.balance.account.balance.report,zero_years:0
@ -6346,22 +6362,22 @@ msgstr "Personnaliser le Rapport"
#. module: account
#: field:report.aged.receivable,name:0
msgid "Month Range"
msgstr ""
msgstr "Plage mensuelle"
#. module: account
#: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
msgid "Invoices Created Within Past 15 Days"
msgstr ""
msgstr "Factures créées depuis 15 jours"
#. module: account
#: model:ir.model,name:report_account.model_report_invoice_created
msgid "Report of Invoices Created within Last 15 days"
msgstr ""
msgstr "Rapport des factures créées depuis 15 jours"
#. module: account
#: view:report.invoice.created:0
msgid "Total Amount"
msgstr ""
msgstr "Montant Total"
#. module: account
#: view:report.account.receivable:0
@ -6381,17 +6397,18 @@ msgstr "Comptes recevables"
#. module: account
#: field:temp.range,name:0
msgid "Range"
msgstr ""
msgstr "Intervalle"
#. module: account
#: model:ir.module.module,description:report_account.module_meta_information
msgid "A module that adds new reports based on the account module."
msgstr ""
"Un module qui ajoute de nouveaux rapports basé sur le module account."
#. module: account
#: model:ir.module.module,shortdesc:report_account.module_meta_information
msgid "Account Reporting - Reporting"
msgstr ""
msgstr "Rapports financiers et de comptabilité - Rapports"
#. module: account
#: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
@ -6407,7 +6424,7 @@ msgstr "Semaine de l'année"
#. module: account
#: field:report.invoice.created,create_date:0
msgid "Create Date"
msgstr ""
msgstr "Date de Création"
#. module: account
#: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
@ -6418,7 +6435,7 @@ msgstr ""
#. module: account
#: view:report.invoice.created:0
msgid "Untaxed Amount"
msgstr ""
msgstr "Montant HT"
#~ msgid "account.config.wizard"
#~ msgstr "account.config.wizard"

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

@ -611,7 +611,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1005,7 +1005,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1027,7 +1027,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1114,7 +1114,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1146,7 +1146,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1212,7 +1212,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1790,8 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
#. module: account
@ -2061,7 +2060,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3627,7 +3626,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3732,7 +3731,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5869,7 +5868,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

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

@ -611,7 +611,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1005,7 +1005,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1027,7 +1027,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1114,7 +1114,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1146,7 +1146,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1212,7 +1212,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1790,8 +1790,7 @@ msgstr "આગળ"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
#. module: account
@ -2061,7 +2060,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3627,7 +3626,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3732,7 +3731,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5867,7 +5866,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

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

File diff suppressed because it is too large Load Diff

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

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-15 11:44+0000\n"
"PO-Revision-Date: 2010-09-08 08:54+0000\n"
"Last-Translator: OpenERP Administrators <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: 2010-08-16 06:44+0000\n"
"X-Launchpad-Export-Date: 2010-09-09 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -610,7 +610,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1004,7 +1004,7 @@ msgstr "Nettó összesen:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1026,7 +1026,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1113,7 +1113,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1145,7 +1145,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1211,7 +1211,7 @@ msgstr "Cég pénzneme"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1789,8 +1789,7 @@ msgstr "Tovább"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
#. module: account
@ -2060,7 +2059,7 @@ msgstr "Vevői számla folyamat"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3628,7 +3627,7 @@ msgstr "Sorszám"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3733,7 +3732,7 @@ msgstr "Számla tervezetek"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5870,7 +5869,7 @@ msgstr "Fizetési feltétel"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

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

@ -611,7 +611,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1005,7 +1005,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1027,7 +1027,7 @@ msgstr "Anak"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1114,7 +1114,7 @@ msgstr "Akun Analisis Baru"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1146,7 +1146,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1212,7 +1212,7 @@ msgstr "Mata uang perusahaan"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1790,8 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
#. module: account
@ -2061,7 +2060,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3627,7 +3626,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3732,7 +3731,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5869,7 +5868,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

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

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-15 12:30+0000\n"
"Last-Translator: eLBati - albatos.com <lorenzo.battistini@albatos.com>\n"
"PO-Revision-Date: 2010-09-08 09:15+0000\n"
"Last-Translator: OpenERP Administrators <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: 2010-08-16 06:44+0000\n"
"X-Launchpad-Export-Date: 2010-09-09 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -55,7 +55,7 @@ msgstr "Attività"
#. module: account
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr "Nome di modulo non valido nella definizione dell'azione."
msgstr "Nome modello non valido nella definizione dell'azione."
#. module: account
#: help:account.journal,currency:0
@ -65,7 +65,7 @@ msgstr "La valuta usata per inserire rendiconto"
#. module: account
#: wizard_view:account_use_models,init_form:0
msgid "Select Message"
msgstr "Seleziona Messaggio"
msgstr "Seleziona il Messaggio"
#. module: account
#: help:product.category,property_account_income_categ:0
@ -389,7 +389,7 @@ msgstr "Descrizione della Fattura"
#. module: account
#: constraint:account.analytic.account:0
msgid "Error! You can not create recursive analytic accounts."
msgstr ""
msgstr "Errore! Non puoi creare account analitici ricorsivi"
#. module: account
#: field:account.bank.statement.reconcile,total_entry:0
@ -436,7 +436,7 @@ msgstr "Negativo"
#. module: account
#: rml:account.partner.balance:0
msgid "(Account/Partner) Name"
msgstr ""
msgstr "Nome (Conto/Partner)"
#. module: account
#: selection:account.move,type:0
@ -622,6 +622,8 @@ msgid ""
"The sequence field is used to order the resources from lower sequences to "
"higher ones"
msgstr ""
"Il campo \"sequenza\" è usato per ordinare le risorse dalla sequenza minote "
"alla maggiore"
#. module: account
#: wizard_view:account.analytic.account.chart,init:0
@ -631,7 +633,7 @@ msgstr "(Tenere vuoto per aprire la situazione corrente)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -712,7 +714,7 @@ msgstr "Resi da clienti"
#. module: account
#: wizard_view:account.analytic.account.chart,init:0
msgid "Select the Period for Analysis"
msgstr ""
msgstr "Seleziona il periodo per l'analisi"
#. module: account
#: field:account.tax,ref_tax_sign:0
@ -725,7 +727,7 @@ msgstr ""
#. module: account
#: help:res.partner,credit:0
msgid "Total amount this customer owes you."
msgstr ""
msgstr "Importo totale che questo cliente vi deve"
#. module: account
#: view:account.move.line:0
@ -838,6 +840,8 @@ msgid ""
"These types are defined according to your country. The type contain more "
"information about the account and it's specificities."
msgstr ""
"Questi tipi sono definiti a seconda della tua nazione. I tipi contengono più "
"informazioni circa il conto e la sua specificità"
#. module: account
#: selection:account.automatic.reconcile,init,power:0
@ -959,12 +963,12 @@ msgstr "Data finale"
#. module: account
#: field:account.invoice.tax,base_amount:0
msgid "Base Code Amount"
msgstr ""
msgstr "Importo codice base"
#. module: account
#: help:account.journal,user_id:0
msgid "The user responsible for this journal"
msgstr ""
msgstr "L'utente responsabile per questo giornale"
#. module: account
#: field:account.journal,default_debit_account_id:0
@ -1009,7 +1013,7 @@ msgstr "Totale finale"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_accounting
msgid "Financial Accounting"
msgstr "Contabilità Finanziaria"
msgstr "Contabilità Ordinaria"
#. module: account
#: rml:account.invoice:0
@ -1027,8 +1031,8 @@ msgstr "Totale imponibile"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Posizione fiscale"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1049,7 +1053,7 @@ msgstr "Sottoconto"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1138,7 +1142,7 @@ msgstr "Nuovo conto analitico"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1150,7 +1154,7 @@ msgstr "Prezzo unitario"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "Period from :"
msgstr ""
msgstr "Periodo che va da:"
#. module: account
#: model:ir.model,name:account.model_wizard_multi_charts_accounts
@ -1170,7 +1174,7 @@ msgstr "L'importo espresso in un'altra valuta opzionale"
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1192,7 +1196,7 @@ msgstr "Apri conti"
#. module: account
#: wizard_view:account.fiscalyear.close.state,init:0
msgid "Are you sure you want to close the fiscal year ?"
msgstr ""
msgstr "Sei sicuro di voler chiudere l'anno fiscale?"
#. module: account
#: selection:account.move,type:0
@ -1207,7 +1211,7 @@ msgstr "Conto bancario"
#. module: account
#: field:account.chart.template,tax_template_ids:0
msgid "Tax Template List"
msgstr ""
msgstr "Lista modelli di tasse"
#. module: account
#: model:process.transition,name:account.process_transition_invoiceimport0
@ -1236,13 +1240,13 @@ msgstr "Valuta società"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
msgid "Parent Analytic Account"
msgstr ""
msgstr "Conto Analitico Padre"
#. module: account
#: wizard_button:account.move.line.reconcile,init_partial,addendum:0
@ -1282,7 +1286,7 @@ msgstr "Importo fissato"
#. module: account
#: rml:account.analytic.account.analytic.check:0
msgid "Analytic Credit"
msgstr ""
msgstr "Credito analitico"
#. module: account
#: field:account.move.line,reconcile_partial_id:0
@ -1333,12 +1337,12 @@ msgstr "Chiusura Anno Fiscale"
#. module: account
#: field:account.journal,centralisation:0
msgid "Centralised counterpart"
msgstr ""
msgstr "Contropartita centralizzata"
#. module: account
#: view:wizard.company.setup:0
msgid "Message"
msgstr ""
msgstr "Messaggio"
#. module: account
#: model:process.node,note:account.process_node_supplierpaymentorder0
@ -1371,7 +1375,7 @@ msgstr "Voci analitiche"
#. module: account
#: help:account.tax,type:0
msgid "The computation method for the tax amount."
msgstr ""
msgstr "Il metodo di calcolo per l'importo delle tasse"
#. module: account
#: model:process.node,note:account.process_node_accountingentries0
@ -1405,7 +1409,7 @@ msgstr "Voci tassa"
#. module: account
#: field:ir.sequence,fiscal_ids:0
msgid "Sequences"
msgstr ""
msgstr "Sequenze"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_type_form
@ -1439,12 +1443,12 @@ msgstr "Libro Giornale"
#: field:account.account,child_id:0
#: field:account.analytic.account,child_ids:0
msgid "Child Accounts"
msgstr ""
msgstr "Conto figlio"
#. module: account
#: field:account.account,check_history:0
msgid "Display History"
msgstr ""
msgstr "Mostra lo storico"
#. module: account
#: wizard_field:account.third_party_ledger.report,init,date1:0
@ -1455,7 +1459,7 @@ msgstr " Data d'inizio"
#: wizard_field:account.account.balance.report,checktype,display_account:0
#: wizard_field:account.general.ledger.report,checktype,display_account:0
msgid "Display accounts "
msgstr ""
msgstr "Mostra conti "
#. module: account
#: model:ir.model,name:account.model_account_bank_statement_reconcile_line
@ -1482,6 +1486,8 @@ msgid ""
"The partner bank account to pay\n"
"Keep empty to use the default"
msgstr ""
"Il conto della banca del partner da pagare\n"
"Lasciare vuoto per usare il default"
#. module: account
#: field:res.partner,debit:0
@ -1506,7 +1512,7 @@ msgstr "account.analytic.line.extended"
#. module: account
#: field:account.journal,refund_journal:0
msgid "Refund Journal"
msgstr ""
msgstr "Giornale dei Fondi"
#. module: account
#: model:account.account.type,name:account.account_type_income
@ -1577,7 +1583,7 @@ msgstr "Apri per la riconciliazione"
#. module: account
#: model:account.journal,name:account.bilan_journal
msgid "Journal d'ouverture"
msgstr ""
msgstr "Giornale d'apertura"
#. module: account
#: selection:account.tax,tax_group:0
@ -1599,7 +1605,7 @@ msgstr "Lasciare il campo vuoto per usare il conto Spesa"
#. module: account
#: wizard_field:account.automatic.reconcile,init,account_ids:0
msgid "Account to reconcile"
msgstr ""
msgstr "Conto da riconciliare"
#. module: account
#: rml:account.invoice:0
@ -1618,7 +1624,7 @@ msgstr "Conti di incasso e pagamento"
#: view:account.subscription:0
#: field:account.subscription,lines_id:0
msgid "Subscription Lines"
msgstr ""
msgstr "Linee sottoscritte"
#. module: account
#: selection:account.analytic.journal,type:0
@ -1647,7 +1653,7 @@ msgstr "Chiudi periodo"
#. module: account
#: rml:account.overdue:0
msgid "Due"
msgstr ""
msgstr "Dovuto"
#. module: account
#: rml:account.journal.period.print:0
@ -1675,7 +1681,7 @@ msgstr "Libro Giornale"
#. module: account
#: rml:account.analytic.account.quantity_cost_ledger:0
msgid "Max Qty:"
msgstr ""
msgstr "Quant. massima:"
#. module: account
#: wizard_button:account.invoice.refund,init,refund:0
@ -1687,7 +1693,7 @@ msgstr "Fattura di resi"
#: model:ir.actions.wizard,name:account.wizard_period_close
#: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
msgid "Close a Period"
msgstr ""
msgstr "Chiudi un periodo"
#. module: account
#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_2_report_hr_timesheet_invoice_journal
@ -1697,7 +1703,7 @@ msgstr "Costi e ricavi"
#. module: account
#: constraint:account.account:0
msgid "Error ! You can not create recursive accounts."
msgstr ""
msgstr "Errore! Non puoi creare conti ricorsivi"
#. module: account
#: rml:account.tax.code.entries:0
@ -1707,7 +1713,7 @@ msgstr "Numero conto"
#. module: account
#: view:account.config.wizard:0
msgid "Skip"
msgstr ""
msgstr "Salta"
#. module: account
#: field:account.invoice,period_id:0
@ -1727,7 +1733,7 @@ msgstr "Riapri"
#. module: account
#: wizard_view:account.fiscalyear.close,init:0
msgid "Are you sure you want to create entries?"
msgstr ""
msgstr "Sei sicuro di voler creare la voce?"
#. module: account
#: field:account.tax,include_base_amount:0
@ -1743,7 +1749,7 @@ msgstr "Delta di Credito"
#: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile
#: model:ir.actions.wizard,name:account.wizard_unreconcile
msgid "Unreconcile Entries"
msgstr ""
msgstr "Voci non riconciliate"
#. module: account
#: model:process.node,note:account.process_node_supplierdraftinvoices0
@ -1753,13 +1759,13 @@ msgstr ""
#. module: account
#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
msgid "Cost Legder for period"
msgstr ""
msgstr "Libro mastro dei costi per il periodo"
#. module: account
#: model:ir.actions.act_window,name:account.action_bank_statement_tree2
#: model:ir.ui.menu,name:account.menu_bank_statement_tree2
msgid "New Statement"
msgstr ""
msgstr "Nuova dichiarazione"
#. module: account
#: wizard_field:account.analytic.account.chart,init,from_date:0
@ -1814,15 +1820,14 @@ msgstr "Prossimo"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
"La posizione fiscale determinerà tasse e il conto da usarsi per il partner."
""
#. module: account
#: rml:account.analytic.account.cost_ledger:0
msgid "Date or Code"
msgstr ""
msgstr "Data o codice"
#. module: account
#: field:account.analytic.account,user_id:0
@ -1832,7 +1837,7 @@ msgstr "Gestione conti"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "to :"
msgstr ""
msgstr "a:"
#. module: account
#: wizard_field:account.move.line.reconcile,init_full,debit:0
@ -1870,7 +1875,7 @@ msgstr "Data inizio"
#. module: account
#: model:account.journal,name:account.refund_expenses_journal
msgid "x Expenses Credit Notes Journal"
msgstr ""
msgstr "x Giornale note di accredito su Acquisti"
#. module: account
#: field:account.analytic.journal,type:0
@ -1942,7 +1947,7 @@ msgstr "Numero di Giorni"
#. module: account
#: help:account.invoice,reference:0
msgid "The partner reference of this invoice."
msgstr ""
msgstr "Il partner di riferimento per questa fattura."
#. module: account
#: wizard_field:account.general.ledger.report,checktype,sortbydate:0
@ -1957,7 +1962,7 @@ msgstr "Da verificare"
#. module: account
#: help:res.partner,debit:0
msgid "Total amount you have to pay to this supplier."
msgstr ""
msgstr "Totale da pagare a questo fornitore"
#. module: account
#: selection:account.automatic.reconcile,init,power:0
@ -1982,7 +1987,7 @@ msgstr "Piano dei conti"
#. module: account
#: help:account.tax,name:0
msgid "This name will be displayed on reports"
msgstr ""
msgstr "Questo nome sarà visualizzato sulle stampe"
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2014,7 +2019,7 @@ msgstr "Resi da clienti"
#. module: account
#: rml:account.vat.declaration:0
msgid "Tax Amount"
msgstr ""
msgstr "Importo Imposta"
#. module: account
#: rml:account.analytic.account.quantity_cost_ledger:0
@ -2024,7 +2029,7 @@ msgstr ""
#. module: account
#: field:account.journal.period,name:0
msgid "Journal-Period Name"
msgstr ""
msgstr "Nome periodo del giornale"
#. module: account
#: field:account.tax.code,name:0
@ -2039,6 +2044,9 @@ msgid ""
"'draft' state and instead goes directly to the 'posted state' without any "
"manual validation."
msgstr ""
"Selezionare questa casella se non vuoi che le nuove movimentazioni contabili "
"saltino lo stato 'bozza' e diventino invece direttamente 'confermate' senza "
"alcuna validazione manuale."
#. module: account
#: field:account.bank.statement.line,partner_id:0
@ -2062,7 +2070,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Draft Invoice"
msgstr ""
msgstr "Fattura in bozza"
#. module: account
#: model:account.account.type,name:account.account_type_expense
@ -2072,7 +2080,7 @@ msgstr "Uscita"
#. module: account
#: field:account.journal,invoice_sequence_id:0
msgid "Invoice Sequence"
msgstr ""
msgstr "Sequenza di fatturazione"
#. module: account
#: wizard_view:account.automatic.reconcile,init:0
@ -2082,17 +2090,17 @@ msgstr "Opzioni"
#. module: account
#: model:process.process,name:account.process_process_invoiceprocess0
msgid "Customer Invoice Process"
msgstr ""
msgstr "Processo di fatturazione cliente"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
msgid "Opening Entries Period"
msgstr ""
msgstr "Periodo di Voci aperte"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_validate_account_moves
@ -2109,7 +2117,7 @@ msgstr "giorni"
#. module: account
#: selection:account.aged.trial.balance,init,direction_selection:0
msgid "Past"
msgstr ""
msgstr "Passato"
#. module: account
#: field:account.analytic.account,company_currency_id:0
@ -2133,7 +2141,7 @@ msgstr "Fattura non pagate"
#. module: account
#: model:process.transition,name:account.process_transition_paymentreconcile0
msgid "Payment Reconcile"
msgstr ""
msgstr "Pagamento riconciliato"
#. module: account
#: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form
@ -2145,7 +2153,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_subscription_form_new
#: model:ir.ui.menu,name:account.menu_action_subscription_form_new
msgid "New Subscription"
msgstr ""
msgstr "Nuova sottoscrizione"
#. module: account
#: view:account.payment.term:0
@ -2161,7 +2169,7 @@ msgstr "Registrazione analitica"
#: view:res.company:0
#: field:res.company,overdue_msg:0
msgid "Overdue Payments Message"
msgstr ""
msgstr "Messaggio in caso di pagamenti in ritardo"
#. module: account
#: model:ir.actions.act_window,name:account.action_tax_code_tree
@ -2203,7 +2211,7 @@ msgstr "Bozze"
#. module: account
#: wizard_field:account.invoice.refund,init,period:0
msgid "Force period"
msgstr ""
msgstr "Forza il periodo"
#. module: account
#: selection:account.account.type,close_method:0
@ -2214,7 +2222,7 @@ msgstr "Dettaglio"
#: selection:account.account,type:0
#: selection:account.account.template,type:0
msgid "Consolidation"
msgstr ""
msgstr "Consolidamento"
#. module: account
#: field:account.chart.template,account_root_id:0
@ -2246,7 +2254,7 @@ msgstr "Piano dei conti"
#. module: account
#: model:account.journal,name:account.check_journal
msgid "x Checks Journal"
msgstr ""
msgstr "x Controllo giornale"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_generate_subscription
@ -2257,7 +2265,7 @@ msgstr "Creare voci relative a canoni"
#. module: account
#: wizard_field:account.fiscalyear.close,init,journal_id:0
msgid "Opening Entries Journal"
msgstr ""
msgstr "Giornale delle Voci aperte"
#. module: account
#: view:account.config.wizard:0
@ -2286,12 +2294,12 @@ msgstr "Tutti i periodi sono vuoti"
#. module: account
#: model:account.account.type,name:account.account_type_liability
msgid "Liability"
msgstr ""
msgstr "Debiti"
#. module: account
#: selection:account.automatic.reconcile,init,power:0
msgid "2"
msgstr ""
msgstr "2"
#. module: account
#: wizard_view:account.chart,init:0
@ -2303,7 +2311,7 @@ msgstr ""
#. module: account
#: help:account.invoice.tax,base_code_id:0
msgid "The account basis of the tax declaration."
msgstr ""
msgstr "Il conto si basa sulla denuncia della tassa"
#. module: account
#: rml:account.analytic.account.journal:0
@ -2328,7 +2336,7 @@ msgstr "Data"
#. module: account
#: field:account.invoice,reference_type:0
msgid "Reference Type"
msgstr ""
msgstr "Tipo riferimento"
#. module: account
#: wizard_button:account.move.line.unreconcile,init,unrec:0
@ -2351,7 +2359,7 @@ msgstr "Voci di documento"
#: field:account.analytic.line,user_id:0
#: field:account.journal,user_id:0
msgid "User"
msgstr ""
msgstr "Utente Open ERP"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_template_form
@ -2372,7 +2380,7 @@ msgstr ""
#. module: account
#: rml:account.journal.period.print:0
msgid "Voucher No"
msgstr ""
msgstr "Buono Numero"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_automatic_reconcile
@ -2388,7 +2396,7 @@ msgstr "Importa fattura"
#. module: account
#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
msgid "and Journals"
msgstr ""
msgstr "e Giornali"
#. module: account
#: view:account.tax:0
@ -2411,11 +2419,13 @@ msgid ""
"Set if the tax computation is based on the computation of child taxes rather "
"than on the total amount."
msgstr ""
"Indica se il calcolo della tassa è basato sul conteggio delle tasse "
"\"figlio\" invece che sul totale importo."
#. module: account
#: rml:account.central.journal:0
msgid "Journal Code"
msgstr ""
msgstr "Codifica Giornale"
#. module: account
#: help:account.tax,applicable_type:0
@ -2423,11 +2433,13 @@ msgid ""
"If not applicable (computed through a Python code), the tax won't appear on "
"the invoice."
msgstr ""
"Se non applicabile (calcolato attraverso una procedura Python), la tassa non "
"appare sulla fattura"
#. module: account
#: field:account.model,lines_id:0
msgid "Model Entries"
msgstr ""
msgstr "Voce Modello"
#. module: account
#: field:account.analytic.account,date:0
@ -2470,7 +2482,7 @@ msgstr "Codifica di registrazioni per linea"
#. module: account
#: help:account.chart.template,tax_template_ids:0
msgid "List of all the taxes that have to be installed by the wizard"
msgstr ""
msgstr "Elenco di tutte le imposte che devono essere installate dal wizard"
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2483,7 +2495,7 @@ msgstr "Periodo da"
#: model:process.node,name:account.process_node_bankstatement0
#: model:process.node,name:account.process_node_supplierbankstatement0
msgid "Bank Statement"
msgstr ""
msgstr "Estratto conto"
#. module: account
#: wizard_view:account.invoice.pay,addendum:0
@ -2505,13 +2517,13 @@ msgstr "L'importo in valuta del Libro Giornale"
#. module: account
#: wizard_field:account.general.ledger.report,checktype,landscape:0
msgid "Landscape Mode"
msgstr ""
msgstr "Modalità Orizzontale"
#. module: account
#: model:process.transition,note:account.process_transition_analyticinvoice0
#: model:process.transition,note:account.process_transition_supplieranalyticcost0
msgid "From analytic accounts, Create invoice."
msgstr ""
msgstr "Dai conti analitici, Crea fattura."
#. module: account
#: wizard_button:account.account.balance.report,account_selection,end:0
@ -2582,7 +2594,7 @@ msgstr "Usa questo codice per la Dichiarazione IVA"
#. module: account
#: field:account.move.line,blocked:0
msgid "Litigation"
msgstr ""
msgstr "Causa"
#. module: account
#: view:account.move.line:0
@ -2594,7 +2606,7 @@ msgstr "Informazione"
#. module: account
#: model:ir.ui.menu,name:account.menu_tax_report
msgid "Taxes Reports"
msgstr ""
msgstr "Stampa Tasse"
#. module: account
#: field:res.partner,property_account_payable:0
@ -2619,13 +2631,15 @@ msgstr "Conto Crediti predefinito"
#. module: account
#: model:process.node,name:account.process_node_supplierpaymentorder0
msgid "Payment Order"
msgstr ""
msgstr "Ordine di Pagamento"
#. module: account
#: help:account.account.template,reconcile:0
msgid ""
"Check this option if you want the user to reconcile entries in this account."
msgstr ""
"Spunta questa opzione se vuoi che sia l'utente a riconciliare le voci di "
"questo conto"
#. module: account
#: rml:account.analytic.account.journal:0
@ -2648,12 +2662,12 @@ msgstr "Capitale"
#. module: account
#: field:wizard.company.setup,overdue_msg:0
msgid "Overdue Payment Message"
msgstr ""
msgstr "Messaggio per pagamento in ritardo"
#. module: account
#: model:ir.model,name:account.model_account_tax_code_template
msgid "Tax Code Template"
msgstr ""
msgstr "Modelli di Codice Tassa"
#. module: account
#: rml:account.partner.balance:0
@ -2678,7 +2692,7 @@ msgstr "Movimenti di fine anno"
#. module: account
#: model:ir.ui.menu,name:account.menu_generic_report
msgid "Generic Reports"
msgstr ""
msgstr "Stampe generiche"
#. module: account
#: wizard_field:account.automatic.reconcile,init,power:0
@ -2734,7 +2748,7 @@ msgstr "Numero fattura"
#. module: account
#: field:account.period,date_stop:0
msgid "End of Period"
msgstr ""
msgstr "Concludi il periodo"
#. module: account
#: wizard_button:populate_statement_from_inv,go,finish:0
@ -2750,7 +2764,7 @@ msgstr "Imponibile"
#: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
#: model:ir.actions.wizard,name:account.account_analytic_account_inverted_balance_report
msgid "Inverted Analytic Balance"
msgstr ""
msgstr "Bilancio Conti Analitici inverso"
#. module: account
#: field:account.tax,applicable_type:0
@ -2788,7 +2802,7 @@ msgstr ""
#. module: account
#: wizard_field:account.aged.trial.balance,init,direction_selection:0
msgid "Analysis Direction"
msgstr ""
msgstr "Analisi della direzione"
#. module: account
#: wizard_button:populate_statement_from_inv,init,go:0
@ -2812,6 +2826,10 @@ msgid ""
"higher ones. The order is important if you have a tax that has several tax "
"children. In this case, the evaluation order is important."
msgstr ""
"Il campo sequenza è usato per ordinare le linee delle tasse dalla più "
"piccola alla più grande. Questo ordinamento è importante se hai delle tasse "
"che hanno tasse \"figlio\". In questo caso, l'ordine con cui vendono "
"valutate è importante."
#. module: account
#: field:account.journal.column,view_id:0
@ -2819,12 +2837,12 @@ msgstr ""
#: field:account.journal.view,name:0
#: model:ir.model,name:account.model_account_journal_view
msgid "Journal View"
msgstr ""
msgstr "Vista Giornale"
#. module: account
#: selection:account.move.line,centralisation:0
msgid "Credit Centralisation"
msgstr ""
msgstr "Centralizzazione del credito"
#. module: account
#: rml:account.overdue:0
@ -2942,7 +2960,7 @@ msgstr ""
#: view:product.template:0
#: view:res.partner:0
msgid "Accounting"
msgstr "Informazioni contabili"
msgstr "Contabilità"
#. module: account
#: view:account.fiscal.position.template:0
@ -3658,7 +3676,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3765,7 +3783,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5906,8 +5924,8 @@ msgstr "Modalità di pagamento"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Posizioni fiscali"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0
@ -5976,7 +5994,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.open_board_account
#: model:ir.ui.menu,name:account.menu_board_account
msgid "Accounting Dashboard"
msgstr ""
msgstr "Cruscotto Contabilità"
#. module: account
#: view:board.board:0
@ -6195,6 +6213,8 @@ msgid ""
"2. You have not selected 'Percentage' option, but you have selected more "
"than 2 years."
msgstr ""
"2. Non hai selezionato l'opzione 'Percentuale', ma hai selezionato più di 2 "
"anni."
#. module: account
#: wizard_view:account.balance.account.balance.report,zero_years:0
@ -6203,46 +6223,49 @@ msgid ""
"credit/debit columns and % option.This can lead contents to be printed out "
"of the paper.Please try again."
msgstr ""
"Potresti aver selezionato le opzioni confronto per più di 1 anno con le "
"colonne credito/debito e % come opzione. Questo potrebbe far uscire i "
"contenuti dai margini di stampa. Controlla."
#. module: account
#: wizard_view:account.balance.account.balance.report,zero_years:0
msgid "You have to select at least 1 Fiscal Year. Try again."
msgstr ""
msgstr "Devi selezionare almeno 1 anno Fiscale. Riprova."
#. module: account
#: wizard_view:account.balance.account.balance.report,init:0
msgid "Customize Report"
msgstr ""
msgstr "Rapporto Personalizzato"
#. module: account
#: field:report.aged.receivable,name:0
msgid "Month Range"
msgstr ""
msgstr "Intervallo del mese"
#. module: account
#: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
msgid "Invoices Created Within Past 15 Days"
msgstr ""
msgstr "Fatture create negli ultimi 15 giorni"
#. module: account
#: model:ir.model,name:report_account.model_report_invoice_created
msgid "Report of Invoices Created within Last 15 days"
msgstr ""
msgstr "Rapporto delle fatture create negli ultimi 15 giorni"
#. module: account
#: view:report.invoice.created:0
msgid "Total Amount"
msgstr ""
msgstr "Importo Totale"
#. module: account
#: view:report.account.receivable:0
msgid "Accounts by type"
msgstr ""
msgstr "Conti per Tipo"
#. module: account
#: model:ir.model,name:report_account.model_report_aged_receivable
msgid "Aged Receivable Till Today"
msgstr ""
msgstr "Crediti passati fino ad oggi"
#. module: account
#: model:ir.model,name:report_account.model_report_account_receivable
@ -6252,44 +6275,44 @@ msgstr ""
#. module: account
#: field:temp.range,name:0
msgid "Range"
msgstr ""
msgstr "Intervallo"
#. module: account
#: model:ir.module.module,description:report_account.module_meta_information
msgid "A module that adds new reports based on the account module."
msgstr ""
msgstr "Modulo che aggiunge nuovi report basati sul modulo Conti (Account)"
#. module: account
#: model:ir.module.module,shortdesc:report_account.module_meta_information
msgid "Account Reporting - Reporting"
msgstr ""
msgstr "Resoconto - Rapporto"
#. module: account
#: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
#: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
msgid "Balance by Type of Account"
msgstr ""
msgstr "Saldo per Tipo Conto"
#. module: account
#: field:report.account.receivable,name:0
msgid "Week of Year"
msgstr ""
msgstr "Settimana dell'anno"
#. module: account
#: field:report.invoice.created,create_date:0
msgid "Create Date"
msgstr ""
msgstr "Data di Creazione"
#. module: account
#: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
#: view:report.aged.receivable:0
msgid "Aged Receivable"
msgstr ""
msgstr "Crediti in sospeso"
#. module: account
#: view:report.invoice.created:0
msgid "Untaxed Amount"
msgstr ""
msgstr "Importo non tassato"
#~ msgid "account.config.wizard"
#~ msgstr "account.config.wizard"

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

@ -611,7 +611,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1005,7 +1005,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1027,7 +1027,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1114,7 +1114,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1146,7 +1146,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1212,7 +1212,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1790,8 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
#. module: account
@ -2061,7 +2060,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3627,7 +3626,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3732,7 +3731,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5867,7 +5866,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

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

@ -611,7 +611,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1005,7 +1005,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1027,7 +1027,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1114,7 +1114,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1146,7 +1146,7 @@ msgstr "다른 통화 단위로 환산된 금액"
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1212,7 +1212,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1790,8 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
#. module: account
@ -2061,7 +2060,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3627,7 +3626,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3732,7 +3731,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5867,7 +5866,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

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

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-15 11:30+0000\n"
"PO-Revision-Date: 2010-09-08 08:56+0000\n"
"Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-16 06:44+0000\n"
"X-Launchpad-Export-Date: 2010-09-09 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -614,8 +614,8 @@ msgstr "(palikti tusčią tam, kad atidarytumėte einamąją situaciją)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Sąskaitų fiskalinė pozicija"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1010,8 +1010,8 @@ msgstr "Iš viso be mokesčių:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Fiskalinė pozicija"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1032,8 +1032,8 @@ msgstr "Žemesnysis"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Fiskalinė pozicija mokesčiams"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1121,8 +1121,8 @@ msgstr "Nauja analitinė sąskaita"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Fiskalinės pozicijos šablonai"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1153,8 +1153,8 @@ msgstr "Suma pasirinktinai gali būti įrašyta kita valiuta."
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Fiskalinės pozicijos šablonas"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1219,8 +1219,8 @@ msgstr "Įmonės naudojama valiuta"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Sąskaitų fiskalinės pozicijos nustatymai"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1799,10 +1799,8 @@ msgstr "Toliau"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
"Fiskalinė pozicija padės nustatyti mokesčius ir apskaitą kontrahentams."
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2075,7 +2073,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3659,8 +3657,8 @@ msgstr "Seka"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Fiskalinės pozicijos šablonas"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3766,8 +3764,8 @@ msgstr "Sąskaitų faktūrų juodraščiai"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Fiskalinės pozicijos mokesčiams nustatymai"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -5933,8 +5931,8 @@ msgstr "Mokėjimo terminas"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Fiskalinė pozicija"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

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

@ -623,7 +623,7 @@ msgstr "(Atstāt tukšu, lai atvērtu esošo stāvokli)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1017,8 +1017,8 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Fiskālā Pozīcija"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1039,7 +1039,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1126,7 +1126,7 @@ msgstr "Jauns Analītiskais Konts"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1158,7 +1158,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1224,7 +1224,7 @@ msgstr "Uzņēmuma valūta"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1802,8 +1802,7 @@ msgstr "Nākamais"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
#. module: account
@ -2073,7 +2072,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3639,7 +3638,7 @@ msgstr "Secība"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3744,7 +3743,7 @@ msgstr "Neapstiprināti Rēķini"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5879,8 +5878,8 @@ msgstr "Apmaksas Termiņš"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Fiskālās Pozīcijas"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

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

@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-11 05:36+0000\n"
"Last-Translator: ub121 <ubs121@gmail.com>\n"
"PO-Revision-Date: 2010-09-09 03:29+0000\n"
"Last-Translator: sugi <Unknown>\n"
"Language-Team: Mongolian <mn@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: 2010-08-12 03:52+0000\n"
"X-Launchpad-Export-Date: 2010-09-09 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -619,7 +619,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1015,8 +1015,8 @@ msgstr "Цэвэр дүн"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Фискал посишион"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1037,8 +1037,8 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Санхүүгийн байршил татварын зурагжуулалт"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1124,8 +1124,8 @@ msgstr "Шинэ аналитик данс"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Загвар фискал посишион"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1156,7 +1156,7 @@ msgstr "Гүйлгээний валютаар илэрхийлэгдэх дүн"
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1227,7 +1227,7 @@ msgstr "Компаны валют"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1809,10 +1809,8 @@ msgstr "Цааш нь"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
"The fiscal mapping will determine taxes and the accounts used for the partner."
msgstr ""
"Зөвхөн тухайн харилцагчид зориулагдсан татвар, дансуудыг тодорхойлно."
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2083,8 +2081,8 @@ msgstr "Худалдан авагчийн нэхэмжлэлийн явц"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Фискал посишион тайлбар :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3673,8 +3671,8 @@ msgstr "Дугаарлалт"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Санхүүгийн байршилын загвар"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3780,7 +3778,7 @@ msgstr "Ноорог нэхэмжлэлүүд"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5964,7 +5962,7 @@ msgstr "Төлбөрийн нөхцөл"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

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

@ -611,7 +611,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1005,7 +1005,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1027,7 +1027,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1114,7 +1114,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1146,7 +1146,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1212,7 +1212,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1790,7 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2061,7 +2061,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3627,7 +3627,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3732,7 +3732,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5867,7 +5867,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

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

@ -631,8 +631,8 @@ msgstr "(laat leeg om de huidige situatie te behouden)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Fiscale toewijzing grootboekrekeningen"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1030,8 +1030,8 @@ msgstr "Netto totaal"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Fiscale positie"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1052,8 +1052,8 @@ msgstr "Kinderen"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Toewijzing belastingen"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1141,8 +1141,8 @@ msgstr "Nieuwe kostenplaats"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Fiscale situatie sjablonen"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1173,8 +1173,8 @@ msgstr "Het bedrag uitgedrukt in een optionele andere valuta."
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Fiscale situatie sjabloon"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1244,8 +1244,8 @@ msgstr "Bedrijfsvaluta"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Vervangingstabel belastingpositie-sjabloon"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1827,10 +1827,9 @@ msgstr "Volgend"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
"De fiscale positie bepaald de belastingen op verkopen bij de huidige relatie."
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2104,8 +2103,8 @@ msgstr "Verkoopfactuur proces"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Opmerking fiscale positie :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3710,8 +3709,8 @@ msgstr "Reeks"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Sjabloon voor fiscale situatie"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3817,8 +3816,8 @@ msgstr "Concept-facturen"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Vervangingstabel belastingpositie belastingsjabloon"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -6017,8 +6016,8 @@ msgstr "Betalingsconditie"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Fiscale positie"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

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

@ -633,8 +633,8 @@ msgstr "(leeg om de huidige situatie te openen)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Rekeningkoppeling fiscale positie"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1031,8 +1031,8 @@ msgstr "Nettototaal:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Fiscale positie"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1053,8 +1053,8 @@ msgstr "Afhankel."
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Btw-koppeling fiscale positie"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1142,8 +1142,8 @@ msgstr "Nieuwe analytische rekening"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Sjablonen fiscale posities"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1174,8 +1174,8 @@ msgstr "Het bedrag uitgedrukt in een optionele andere munt."
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Sjabloon fiscale posities"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1248,8 +1248,8 @@ msgstr "Firmamunt"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Rekeningkoppeling sjabloon fiscale positie"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1830,9 +1830,9 @@ msgstr "Volgende"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr "Fiscale positie bepaalt btw en rekeningen voor de relatie."
msgstr ""
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2106,8 +2106,8 @@ msgstr "Verkoopfactuurprocedure"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Opmerking fiscale positie:"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3687,7 +3687,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3792,7 +3792,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5928,7 +5928,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

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

@ -613,7 +613,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1007,7 +1007,7 @@ msgstr "Total net :"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1029,7 +1029,7 @@ msgstr "Enfant"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1116,7 +1116,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1148,7 +1148,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1214,7 +1214,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1792,7 +1792,7 @@ msgstr "Seguent"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2063,7 +2063,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3629,7 +3629,7 @@ msgstr "Sequéncia"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3734,7 +3734,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5869,7 +5869,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

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

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-15 11:29+0000\n"
"PO-Revision-Date: 2010-09-08 08:57+0000\n"
"Last-Translator: OpenERP Administrators <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: 2010-08-16 06:44+0000\n"
"X-Launchpad-Export-Date: 2010-09-09 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -630,8 +630,8 @@ msgstr "(Pozostaw puste, aby otworzyć bieżącą sytuację)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Mapowanie kont obszarów podatkowych"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1028,8 +1028,8 @@ msgstr "Suma netto:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Obszar podatkowy"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1050,8 +1050,8 @@ msgstr "Podrzędne"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Mapowanie podatków wg obszarów podatkowych"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1139,8 +1139,8 @@ msgstr "Nowe konto analityczne"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Szablony obszarów podatkowych"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1171,8 +1171,8 @@ msgstr "Wartość wyrażona w ewentualnej innej walucie."
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Szablon obszaru podatkowego"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1242,8 +1242,8 @@ msgstr "Waluta firmy"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Mapowanie szablonów kont obszarów podatkowych"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1824,9 +1824,9 @@ msgstr "Następne"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr "Obszar podatkowy określa podatki i konta stosowane dla partnera."
msgstr ""
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2098,8 +2098,8 @@ msgstr "Proces faktury dla klienta"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Uwaga do obszaru podatkowego :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3697,8 +3697,8 @@ msgstr "Numeracja"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Szablon dla obszaru podatkowego"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3804,8 +3804,8 @@ msgstr "Projekty faktur"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Mapowanie podatków wg szablonów obszarów podatkowych"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -5996,8 +5996,8 @@ msgstr "Warunki płatności"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Obszary podatkowe"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

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

@ -628,8 +628,8 @@ msgstr "(Manter vazio para abrir a situação actual)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Mapeamento de contas da posição fiscal"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1026,8 +1026,8 @@ msgstr "Neto total:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Posição fiscal"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1048,8 +1048,8 @@ msgstr "Contas-filho"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Mapeamento de impostos de posições fiscais"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1137,8 +1137,8 @@ msgstr "Nova conta da contabilidade analítica"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Modelos de posição fiscal"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1169,8 +1169,8 @@ msgstr "Montante apresentado numa outra moeda, opcional."
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Modelo de posição fiscal"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1240,8 +1240,8 @@ msgstr "Moeda da empresa"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Mapeamento do Modelo de Posição Fiscal."
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1822,10 +1822,9 @@ msgstr "Seguinte"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
"A posição fiscal determinará os impostos e as contas usados para o parceiro."
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2097,8 +2096,8 @@ msgstr "Processo de facturação a clientes"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Nota da posição fiscal"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3699,8 +3698,8 @@ msgstr "Sequência"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Modelo de posição fiscal"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3806,8 +3805,8 @@ msgstr "Facturas em rascunhos"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Mapeamento de imposto e modelos de posição fiscal"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -5999,8 +5998,8 @@ msgstr "Termo do Pagamento"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Posições fiscais"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

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

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-02 20:11+0000\n"
"Last-Translator: mga (Open ERP) <Unknown>\n"
"PO-Revision-Date: 2010-09-01 06:55+0000\n"
"Last-Translator: OpenERP Administrators <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: 2010-08-12 03:54+0000\n"
"X-Launchpad-Export-Date: 2010-09-02 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -631,8 +631,8 @@ msgstr "(Manter vazia para abrir a situação atual)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Mapa da posição fiscal das contas"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1029,8 +1029,8 @@ msgstr "Total líquido:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Posição fiscal"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1051,8 +1051,8 @@ msgstr "Filhos"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Mapeamento das posições Fiscais"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1140,8 +1140,8 @@ msgstr "Nova conta analítica"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Modelo de posição fiscal"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1172,8 +1172,8 @@ msgstr "O valor expresso em outra moeda opcional"
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Modelo de posição fiscal"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1243,8 +1243,8 @@ msgstr "Moeda da empresa"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Mapeamento contábil dos Modelos para Posição Fiscal"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1826,11 +1826,9 @@ msgstr "Próximo"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
"A posição fiscal irá determinar os impostos e as contas usadas para o "
"parceiro."
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2103,8 +2101,8 @@ msgstr "Processo de faturamento de clientes"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Ressalva de Posição Fiscal"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3706,8 +3704,8 @@ msgstr "Sequencia"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Modelo para posição fiscal"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3813,8 +3811,8 @@ msgstr "Faturas Provisórias"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Modelo para Mapeamento do Imposto na Posição Fiscal"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -6011,8 +6009,8 @@ msgstr "Forma de Pagamento"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Posições fiscais"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0
@ -6073,107 +6071,107 @@ msgstr "Processar Datas de Lançamento"
#. module: account
#: view:board.board:0
msgid "Analytic accounts to close"
msgstr ""
msgstr "Contas analíticas em aberto"
#. module: account
#: view:board.board:0
msgid "Draft invoices"
msgstr ""
msgstr "Faturas provisórias"
#. module: account
#: model:ir.actions.act_window,name:account.open_board_account
#: model:ir.ui.menu,name:account.menu_board_account
msgid "Accounting Dashboard"
msgstr ""
msgstr "Painel contábil"
#. module: account
#: view:board.board:0
#: model:ir.actions.act_window,name:account.act_my_account
msgid "Accounts to invoice"
msgstr ""
msgstr "Contas a serem faturadas"
#. module: account
#: view:board.board:0
#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
msgid "Costs to invoice"
msgstr ""
msgstr "Custos a faturar"
#. module: account
#: view:board.board:0
msgid "Aged receivables"
msgstr ""
msgstr "Recebíveis vencidos"
#. module: account
#: model:ir.module.module,shortdesc:account.module_meta_information
msgid "Board for accountant"
msgstr ""
msgstr "Painel de Contabilização"
#. module: account
#: model:ir.actions.act_window,name:account.action_aged_income
msgid "Income Accounts"
msgstr ""
msgstr "Contas de Receitas"
#. module: account
#: view:board.board:0
msgid "My indicators"
msgstr ""
msgstr "Meus indicadores"
#. module: account
#: view:board.board:0
msgid "Account Board"
msgstr ""
msgstr "Painel Contábil"
#. module: account
#: view:board.board:0
msgid "Aged income"
msgstr ""
msgstr "Receita vencida"
#. module: account
#: wizard_field:account.balance.account.balance.report,init,show_columns:0
msgid "Show Debit/Credit Information"
msgstr ""
msgstr "Exibir Informações de Débito/Crédito"
#. module: account
#: selection:account.balance.account.balance.report,init,account_choice:0
msgid "All accounts"
msgstr ""
msgstr "Todas as contas"
#. module: account
#: wizard_field:account.balance.account.balance.report,init,period_manner:0
msgid "Entries Selection Based on"
msgstr ""
msgstr "Lançamentos escolhidos com base em"
#. module: account
#: wizard_view:account.balance.account.balance.report,backtoinit:0
#: wizard_view:account.balance.account.balance.report,zero_years:0
msgid "Notification"
msgstr ""
msgstr "Alerta"
#. module: account
#: selection:account.balance.account.balance.report,init,period_manner:0
msgid "Financial Period"
msgstr ""
msgstr "Período Financeiro"
#. module: account
#: model:ir.actions.report.xml,name:account.account_account_balance
#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
msgid "Account balance"
msgstr ""
msgstr "Saldo da Conta"
#. module: account
#: wizard_view:account.balance.account.balance.report,init:0
msgid "Select Period(s)"
msgstr ""
msgstr "Selecione o(s) Período(s)"
#. module: account
#: selection:account.balance.account.balance.report,init,compare_pattern:0
msgid "Percentage"
msgstr ""
msgstr "Porcentagem"
#. module: account
#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
msgid "Compare Selected Years In Terms Of"
msgstr ""
msgstr "Comparar os Anos Escolhidos em Termos de"
#. module: account
#: wizard_view:account.balance.account.balance.report,init:0
@ -6188,7 +6186,7 @@ msgstr "Selecione conta de referência (para comparação de %)"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_account_balance_report
msgid "Account balance-Compare Years"
msgstr ""
msgstr "Balanço de Contas - Comparação Anual"
#. module: account
#: model:ir.module.module,description:account.module_meta_information
@ -6211,6 +6209,25 @@ msgid ""
" 5. You have an option to print the desired report in Landscape format.\n"
" "
msgstr ""
"O Módulo de Saldo da Conta é uma funcionalidade adicional ao Módulo de "
"Gestão Financeira.\n"
"\n"
" Este módulo oferece diversas opções para impressão.\n"
"\n"
" 1. Você pode comparar o balanço de diferentes anos.\n"
"\n"
" 2. Você pode configurar uma comparação por dinheiro ou percentual para "
"comparação entre dois anos.\n"
"\n"
" 3. Você pode configurar a conta de referência para a comparação "
"percentual para os anos específicos.\n"
"\n"
" 4. Você pode selecionar períodos como data atual ou períodos por data de "
"criação.\n"
"\n"
" 5. Você tem a opção de imprimir o relatório desejado em formato "
"paisagem.\n"
" "
#. module: account
#: wizard_view:account.balance.account.balance.report,backtoinit:0
@ -6359,7 +6376,7 @@ msgstr "Contas por tipo"
#. module: account
#: model:ir.model,name:report_account.model_report_aged_receivable
msgid "Aged Receivable Till Today"
msgstr ""
msgstr "Recebíveis Vencidos até Hoje"
#. module: account
#: model:ir.model,name:report_account.model_report_account_receivable
@ -6379,7 +6396,7 @@ msgstr "Um módulo que adiciona novos relatórios com base no módulo de conta."
#. module: account
#: model:ir.module.module,shortdesc:report_account.module_meta_information
msgid "Account Reporting - Reporting"
msgstr ""
msgstr "Relatório de Contas"
#. module: account
#: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
@ -6401,7 +6418,7 @@ msgstr "Criar data"
#: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
#: view:report.aged.receivable:0
msgid "Aged Receivable"
msgstr ""
msgstr "A Receber"
#. module: account
#: view:report.invoice.created:0

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

@ -631,8 +631,8 @@ msgstr "(Lasati necompletat pentru a deschide situaţia curentă)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Corespondenţa conturilor de poziţie fiscală"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1030,8 +1030,8 @@ msgstr "Total net :"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Poziţie fiscală"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1052,8 +1052,8 @@ msgstr "Descendenţi"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Corespondenţa taxelor pentru poziţiile fiscale"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1141,8 +1141,8 @@ msgstr "Cont analitic nou"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Şabloane poziţii fiscale"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1173,8 +1173,8 @@ msgstr "Suma exprimată întro altă monedă opţională"
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Şablon poziţie fiscală"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1245,8 +1245,8 @@ msgstr "Moneda companiei"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Corespondenţa conturilor cu şabloanele de poziţii fiscale"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1828,10 +1828,9 @@ msgstr "Înainte"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
"Poziţia fiscală va determina taxele şi conturile utilizate pentru partener."
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2103,8 +2102,8 @@ msgstr "Proces facturare clienţi"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Comentariu poziţie fiscală"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3708,8 +3707,8 @@ msgstr "Secvenţă"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Şablon pentru poziţia fiscală"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3815,8 +3814,8 @@ msgstr "Facturi ciornă"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Corespondenţa taxelor pentru şablonul poziţiei fiscale"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -6005,8 +6004,8 @@ msgstr "Termen de plată"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Poziţii fiscale"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

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

@ -629,7 +629,7 @@ msgstr "(Оставить пустым для отображения текущ
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1027,8 +1027,8 @@ msgstr "Итог нетто"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Налоговая позиция"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1049,8 +1049,8 @@ msgstr "Потомки"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Структура налогов финансовой области"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1138,7 +1138,7 @@ msgstr "Новый счет аналитики"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1170,8 +1170,8 @@ msgstr "Сумма выраженная в дополнительной друг
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Шаблон финансовой области"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1241,8 +1241,8 @@ msgstr "Валюта компании"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Шаблон структуры счетов финансовой области"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1820,11 +1820,9 @@ msgstr "Далее"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
"Финансовая область будет определять налоги и счета, используемые для "
"контрагента."
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2093,7 +2091,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3663,7 +3661,7 @@ msgstr "Последовательность"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3768,8 +3766,8 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Структура налоговых шаблонов для финансовой области"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -5908,7 +5906,7 @@ msgstr "Условия оплаты"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

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

@ -611,7 +611,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1005,7 +1005,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1027,7 +1027,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1114,7 +1114,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1146,7 +1146,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1212,7 +1212,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1790,7 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2061,7 +2061,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3627,7 +3627,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3732,7 +3732,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5867,7 +5867,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

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

@ -614,7 +614,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1008,7 +1008,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1030,7 +1030,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1117,7 +1117,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1149,7 +1149,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1215,7 +1215,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1793,7 +1793,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2064,7 +2064,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3630,7 +3630,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3735,7 +3735,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5870,7 +5870,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

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

@ -623,8 +623,8 @@ msgstr "(Postite prazno da se odpre terenutno stanje)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Preslikava kontov glede na davčno pozicijo"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1019,8 +1019,8 @@ msgstr "Skupaj (brez davkov):"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Davčna pozicija"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1041,8 +1041,8 @@ msgstr "Otroci"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Preslikava davkov glede na davčno pozicijo"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1130,8 +1130,8 @@ msgstr "Nov analitičen konto"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Predloge davčnih pozicij"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1162,8 +1162,8 @@ msgstr "Znesek izražen v poljubni drugi valuti"
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Vzorec za davčno pozicijo"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1228,8 +1228,8 @@ msgstr "Valute družba"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Preslikava kontov za vzorec za davčno pozicijo"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1810,11 +1810,9 @@ msgstr "Naslednji"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
"Davčna pozicija bo določila davke in konte, ki se bodo uporabljali za tega "
"partnerja."
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2087,8 +2085,8 @@ msgstr "Proces računa stranke"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Opomba za davčno pozicijo"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3657,7 +3655,7 @@ msgstr "Zaporedje"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3762,7 +3760,7 @@ msgstr "Osnutki računov"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5906,7 +5904,7 @@ msgstr "Plačilni pogoj"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

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

@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: ASTRIT BOKSHI <astritbokshi@gmail.com>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-15 10:43+0000\n"
"PO-Revision-Date: 2010-09-08 08:38+0000\n"
"Last-Translator: bokshas <astritbokshi@gmail.com>\n"
"Language-Team: Albanian <sq@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: 2010-08-16 06:44+0000\n"
"X-Launchpad-Export-Date: 2010-09-09 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -633,8 +633,8 @@ msgstr "(Mbaje zbrazët për të hapur gjenden aktuale)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Hartimi i Pozicionit Aktual Fiskal"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1031,7 +1031,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1053,7 +1053,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1140,7 +1140,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1172,7 +1172,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1238,7 +1238,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1816,7 +1816,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2087,7 +2087,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3653,7 +3653,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3758,7 +3758,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5893,7 +5893,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

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

@ -614,7 +614,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1008,7 +1008,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1030,7 +1030,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1117,7 +1117,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1149,7 +1149,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1215,7 +1215,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1793,7 +1793,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2064,7 +2064,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3630,7 +3630,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3735,7 +3735,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5870,7 +5870,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

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

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-15 11:45+0000\n"
"PO-Revision-Date: 2010-09-08 08:36+0000\n"
"Last-Translator: OpenERP Administrators <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: 2010-08-16 06:44+0000\n"
"X-Launchpad-Export-Date: 2010-09-09 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -124,7 +124,7 @@ msgstr "Kvarvarande"
#: field:account.tax.template,base_sign:0
#: field:account.tax.template,ref_base_sign:0
msgid "Base Code Sign"
msgstr "Baskodsbelopp"
msgstr "Baskodstecken"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_unreconcile_select
@ -620,8 +620,8 @@ msgstr "(Tomt öppnar med aktuella värden)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Mappning av momsredovisningskonton"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1018,8 +1018,8 @@ msgstr "Nettototal:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Momsredovisningsnummer"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1040,8 +1040,8 @@ msgstr "Barn"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Mappning av momsredovisningsnummer"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1127,8 +1127,8 @@ msgstr "Nytt objektkonto"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Förlaga för momsredovisningsnummer"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1159,8 +1159,8 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Förlaga för momsredovisningsnummer"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1230,7 +1230,7 @@ msgstr "Företagets valuta"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1505,7 +1505,7 @@ msgstr ""
#. module: account
#: model:account.account.type,name:account.account_type_income
msgid "Income"
msgstr "Intäkt"
msgstr "Intäkter"
#. module: account
#: selection:account.bank.statement.line,type:0
@ -1808,7 +1808,7 @@ msgstr "Nästa"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2079,7 +2079,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -2636,7 +2636,7 @@ msgstr "Skapa faktura"
#. module: account
#: model:account.account.type,name:account.account_type_cash_equity
msgid "Equity"
msgstr "Värdeökning"
msgstr "Eget kapital"
#. module: account
#: field:wizard.company.setup,overdue_msg:0
@ -3658,7 +3658,7 @@ msgstr "Sekvens"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3763,7 +3763,7 @@ msgstr "Utkastfakturor"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5917,8 +5917,8 @@ msgstr "Betalningsvillkor"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Momsredovisningsnummer"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

6253
addons/account/i18n/ta.po Normal file
View File

File diff suppressed because it is too large Load Diff

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

@ -611,7 +611,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1005,7 +1005,7 @@ msgstr "నికర మొత్తం:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1027,7 +1027,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1114,7 +1114,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1146,7 +1146,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1212,7 +1212,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1790,7 +1790,7 @@ msgstr "తర్వాత"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2061,7 +2061,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3627,7 +3627,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3732,7 +3732,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5867,7 +5867,7 @@ msgstr "చెల్లింపు కాలం"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

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

@ -611,7 +611,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1005,7 +1005,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1027,7 +1027,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1114,7 +1114,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1146,7 +1146,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1212,7 +1212,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1790,7 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2061,7 +2061,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3627,7 +3627,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3732,7 +3732,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5867,7 +5867,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

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

@ -610,7 +610,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1004,7 +1004,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1026,7 +1026,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1113,7 +1113,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1145,7 +1145,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1211,7 +1211,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1789,7 +1789,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2060,7 +2060,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3626,7 +3626,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3731,7 +3731,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5866,7 +5866,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

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

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-15 11:53+0000\n"
"PO-Revision-Date: 2010-09-08 08:48+0000\n"
"Last-Translator: Omer Barlas <omer@barlas.com.tr>\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: 2010-08-16 06:45+0000\n"
"X-Launchpad-Export-Date: 2010-09-09 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -613,8 +613,8 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "Mali Durum Eşleme Hes."
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1007,8 +1007,8 @@ msgstr "Net Toplam:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "Mali Durum"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1029,8 +1029,8 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Mali Durum Vergi Haritası"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1116,8 +1116,8 @@ msgstr "Yeni Analiz Hesabı"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "Mali Durum Şablonu"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1148,8 +1148,8 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "Mali Durum Şablonu"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1214,8 +1214,8 @@ msgstr "Firma Dövizi"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "Mali Durum Şablonu Eşleme Hes."
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1792,7 +1792,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2063,8 +2063,8 @@ msgstr "Müşteri Fatura İşlemleri"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "Mali Durum Beyanı :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3629,8 +3629,8 @@ msgstr "Sıra No"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "Mali Durum için Şablon"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3734,8 +3734,8 @@ msgstr "Taslak Faturalar"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Mali Durum Şablonu Vergi Eşlemesi"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -5869,8 +5869,8 @@ msgstr "Ödeme Vadesi"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "Mali Durumlar"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

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

@ -611,7 +611,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1005,7 +1005,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1027,7 +1027,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1114,7 +1114,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1146,7 +1146,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1212,7 +1212,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1790,7 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2061,7 +2061,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3627,7 +3627,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3732,7 +3732,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5867,7 +5867,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

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

@ -610,7 +610,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1004,7 +1004,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1026,7 +1026,7 @@ msgstr "Дочірній"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1114,7 +1114,7 @@ msgstr "Новий Аналітичний Рахунок"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1146,7 +1146,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1212,7 +1212,7 @@ msgstr "Валюта компанії"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1792,7 +1792,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2063,7 +2063,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3639,7 +3639,7 @@ msgstr "Послідовність"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3744,7 +3744,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5891,7 +5891,7 @@ msgstr "Терміни оплати"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

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

@ -624,8 +624,8 @@ msgstr "giữ vị trí trống cho lấn mở hiện tại"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "sơ đồ tài chính liên kết các tài khoản"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1018,7 +1018,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1040,7 +1040,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1127,7 +1127,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1159,7 +1159,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1225,7 +1225,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1803,7 +1803,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2074,7 +2074,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3640,7 +3640,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3745,7 +3745,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5880,7 +5880,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

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

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-15 11:07+0000\n"
"PO-Revision-Date: 2010-09-08 09:06+0000\n"
"Last-Translator: Jeff Wang <wjfonhand@hotmail.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: 2010-08-16 06:45+0000\n"
"X-Launchpad-Export-Date: 2010-09-09 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -612,8 +612,8 @@ msgstr "(当前状态留空为待处理)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgstr "财务结构科目一览表"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,contact_id:0
@ -1006,8 +1006,8 @@ msgstr "不含税合计:"
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr "财务结构"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
@ -1028,8 +1028,8 @@ msgstr "子科目"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "财务结构税一览"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1040,7 +1040,7 @@ msgstr "新的供应商发票"
#. module: account
#: wizard_field:account.invoice.pay,init,amount:0
msgid "Amount paid"
msgstr "已付金额"
msgstr "支付金额"
#. module: account
#: selection:account.invoice,type:0
@ -1115,8 +1115,8 @@ msgstr "新的辅助核算项目"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr "财务结构模板"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -1147,8 +1147,8 @@ msgstr "这金额表示一个可选的其它货币"
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr "财务结构模板"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
@ -1214,8 +1214,8 @@ msgstr "公司本位币"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr "财务结构模板科目一览"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
@ -1794,9 +1794,9 @@ msgstr "下一步"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr "财务结构将决定业务伙伴使用的税和科目"
msgstr ""
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@ -2065,8 +2065,8 @@ msgstr "客户发票处理"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgstr "财务状况备注:"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@ -3633,8 +3633,8 @@ msgstr "序列"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgstr "财务结构模板"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
#: view:account.bank.statement:0
@ -3738,8 +3738,8 @@ msgstr "发票草稿"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "财务结构模板税一览"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
#: rml:account.invoice:0
@ -5882,8 +5882,8 @@ msgstr "付款条款"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgstr "财务结构"
msgid "Fiscal Mappings"
msgstr ""
#. module: account
#: model:process.process,name:account.process_process_statementprocess0

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

@ -611,7 +611,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1005,7 +1005,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1027,7 +1027,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1114,7 +1114,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1146,7 +1146,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1212,7 +1212,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1790,7 +1790,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2061,7 +2061,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3627,7 +3627,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3732,7 +3732,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5867,7 +5867,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

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

@ -610,7 +610,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Fiscal Position Accounts Mapping"
msgid "Accounts Fiscal Mapping"
msgstr ""
#. module: account
@ -1004,7 +1004,7 @@ msgstr ""
#: field:account.invoice,fiscal_position:0
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgid "Fiscal Mapping"
msgstr ""
#. module: account
@ -1026,7 +1026,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgid "Taxes Fiscal Mapping"
msgstr ""
#. module: account
@ -1113,7 +1113,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgid "Fiscal Mapping Templates"
msgstr ""
#. module: account
@ -1145,7 +1145,7 @@ msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgid "Fiscal Mapping Template"
msgstr ""
#. module: account
@ -1211,7 +1211,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgid "Template Account Fiscal Mapping"
msgstr ""
#. module: account
@ -1789,7 +1789,7 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
@ -2060,7 +2060,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
msgid "Fiscal Mapping Remark :"
msgstr ""
#. module: account
@ -3626,7 +3626,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
msgid "Template for Fiscal Mapping"
msgstr ""
#. module: account
@ -3731,7 +3731,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgid "Template Tax Fiscal Mapping"
msgstr ""
#. module: account
@ -5866,7 +5866,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
msgid "Fiscal Mappings"
msgstr ""
#. module: account

127
addons/account/installer.py
View File

@ -53,7 +53,7 @@ class account_installer(osv.osv_memory):
_columns = {
# Accounting
'charts':fields.selection(_get_charts, 'Chart of Accounts',
required=False,
required=True,
help="Installs localized accounting charts to match as closely as "
"possible the accounting needs of your company based on your "
"country."),
@ -63,20 +63,44 @@ class account_installer(osv.osv_memory):
'Periods', required=True),
'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Bank Accounts',required=True),
'sale_tax':fields.float('Sale Tax(%)'),
'purchase_tax':fields.float('Purchase Tax(%)')
'purchase_tax':fields.float('Purchase Tax(%)'),
'company_id': fields.many2one('res.company', 'Company'),
}
def _default_company(self, cr, uid, context={}):
user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
if user.company_id:
return user.company_id.id
return False
def _get_default_charts(self, cr, uid, context={}):
module_name = False
company_id = self._default_company(cr, uid, context=context)
company = self.pool.get('res.company').browse(cr, uid, company_id)
address_id = self.pool.get('res.partner').address_get(cr, uid, [company.partner_id.id])
if address_id['default']:
address = self.pool.get('res.partner.address').browse(cr, uid, address_id['default'])
code = address.country_id.code
module_name = (code and 'l10n_' + code.lower()) or False
if module_name:
module_id = self.pool.get('ir.module.module').search(cr, uid, [('name', '=', module_name)])
if module_id:
return module_name
return 'configurable'
_defaults = {
'date_start': lambda *a: time.strftime('%Y-01-01'),
'date_stop': lambda *a: time.strftime('%Y-12-31'),
'period':lambda *a:'month',
'sale_tax':lambda *a:0.0,
'purchase_tax':lambda *a:0.0,
#'charts':'configurable',
'bank_accounts_id':_get_default_accounts
'company_id': _default_company,
'bank_accounts_id':_get_default_accounts,
'charts': _get_default_charts
}
def on_change_tax(self, cr, uid, id, tax):
return{'value':{'purchase_tax':tax}}
return {'value':{'purchase_tax':tax}}
def on_change_start_date(self, cr, uid, id, start_date):
if start_date:
@ -251,14 +275,14 @@ class account_installer(osv.osv_memory):
elif val.account_type == 'check':
type = check_type_id
seq_prefix = "CHK/"
else:
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(110400 + code_cnt),
'type': 'other',
'type': 'liquidity',
'user_type': type,
'parent_id':new_account,
'company_id': company_id.id }
@ -311,15 +335,15 @@ class account_installer(osv.osv_memory):
seq_sale = {
'name': 'Sale Journal',
'code': 'account.journal',
'prefix': 'INV/',
'padding': 4
'prefix': '%(year)s/',
'padding': 3
}
seq_id_sale = obj_sequence.create(cr, uid, seq_sale)
seq_purchase = {
'name': 'Purchase Journal',
'code': 'account.journal',
'prefix': 'VEN/',
'padding': 4
'prefix': '%(year)s/',
'padding': 3
}
seq_id_purchase = obj_sequence.create(cr, uid, seq_purchase)
else:
@ -351,7 +375,7 @@ class account_installer(osv.osv_memory):
vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.property_account_expense_categ.id]
obj_journal.create(cr,uid,vals_journal)
# 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')])
@ -366,6 +390,7 @@ class account_installer(osv.osv_memory):
#Sales Refund Journal
vals_journal['name'] = _('Sales Refund Journal')
vals_journal['type'] = 'sale_refund'
vals_journal['refund_journal'] = True
vals_journal['code'] = _('SCNJ')
vals_journal['sequence_id'] = seq_id_sale_refund
@ -378,6 +403,7 @@ class account_installer(osv.osv_memory):
# Purchase Refund Journal
vals_journal['name'] = _('Purchase Refund Journal')
vals_journal['type'] = 'purchase_refund'
vals_journal['refund_journal'] = True
vals_journal['code'] = _('ECNJ')
vals_journal['sequence_id'] = seq_id_purchase_refund
@ -386,7 +412,7 @@ class account_installer(osv.osv_memory):
vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.property_account_expense_categ.id]
obj_journal.create(cr,uid,vals_journal)
# Bank Journals
view_id_cash = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal View')])[0] #TOFIX: Why put fixed name ?
view_id_cur = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal (Multi-Currency) View')])[0] #TOFIX: why put fixed name?
@ -459,6 +485,7 @@ class account_installer(osv.osv_memory):
def execute(self, cr, uid, ids, context=None):
if context is None:
context = {}
fy_obj = self.pool.get('account.fiscalyear')
data_pool = self.pool.get('ir.model.data')
obj_acc = self.pool.get('account.account')
super(account_installer, self).execute(cr, uid, ids, context=context)
@ -486,6 +513,8 @@ class account_installer(osv.osv_memory):
sal_tax_parent_id = mod_obj.read(cr, uid, [sal_tax_parent], ['res_id'])[0]['res_id']
if s_tax*100 > 0.0:
tax_account_ids = obj_acc.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),
@ -500,18 +529,25 @@ class account_installer(osv.osv_memory):
'amount':s_tax,
'base_code_id':new_tax_code,
'tax_code_id':new_tax_code,
'type_tax_use':'sale'
'type_tax_use':'sale',
'account_collected_id':sales_tax_account_id,
'account_paid_id':sales_tax_account_id
})
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])]})
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)
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_tax_parent_id
}
}
new_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_tax_code)
purchase_tax = obj_tax.create(cr, uid,
{'name':'TAX%s%%'%(p_tax*100),
@ -519,8 +555,13 @@ class account_installer(osv.osv_memory):
'amount':p_tax,
'base_code_id':new_tax_code,
'tax_code_id':new_tax_code,
'type_tax_use':'purchase'
'type_tax_use':'purchase',
'account_collected_id':purchase_tax_account_id,
'account_paid_id':purchase_tax_account_id
})
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])]})
tax_val.update({'supplier_taxes_id':[(6,0,[purchase_tax])]})
default_tax.append(('supplier_taxes_id',purchase_tax))
if len(tax_val):
@ -531,22 +572,24 @@ class account_installer(osv.osv_memory):
ir_values.set(cr, uid, key='default', key2=False, name=name, models =[('product.product',False)], value=[value])
if 'date_start' in res and 'date_stop' in res:
name = code = res['date_start'][:4]
if int(name) != int(res['date_stop'][:4]):
name = res['date_start'][:4] +'-'+ res['date_stop'][:4]
code = res['date_start'][2:4] +'-'+ res['date_stop'][2:4]
res_obj = self.pool.get('account.fiscalyear')
vals = {'name':name,
'code':code,
'date_start':res['date_start'],
'date_stop':res['date_stop'],
}
period_id = res_obj.create(cr, uid, vals, context=context)
if res['period'] == 'month':
res_obj.create_period(cr, uid, [period_id])
elif res['period'] == '3months':
res_obj.create_period3(cr, uid, [period_id])
f_ids = fy_obj.search(cr, uid, [('date_start', '<=', res['date_start']), ('date_stop', '>=', res['date_stop']), ('company_id','=',res['company_id'])])
if not f_ids:
name = code = res['date_start'][:4]
if int(name) != int(res['date_stop'][:4]):
name = res['date_start'][:4] +'-'+ res['date_stop'][:4]
code = res['date_start'][2:4] +'-'+ res['date_stop'][2:4]
vals = {'name': name,
'code': code,
'date_start': res['date_start'],
'date_stop': res['date_stop'],
'company_id': res['company_id']
}
fiscal_id = fy_obj.create(cr, uid, vals, context=context)
if res['period'] == 'month':
fy_obj.create_period(cr, uid, [fiscal_id])
elif res['period'] == '3months':
fy_obj.create_period3(cr, uid, [fiscal_id])
# #fially inactive the demo chart of accounts
# data_id = data_pool.search(cr, uid, [('model','=','account.account'), ('name','=','chart0')])
# if data_id:
@ -574,8 +617,8 @@ class account_bank_accounts_wizard(osv.osv_memory):
_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),
'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),
}
_defaults = {
'currency_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id,
@ -600,12 +643,18 @@ class account_installer_modules(osv.osv_memory):
"per-partner policies."),
'account_voucher':fields.boolean('Voucher Management',
help="Account Voucher module includes all the basic requirements of "
"Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, etc... "),
'account_voucher_payment':fields.boolean('Voucher and Reconcile Management',
help="Extension Account Voucher module includes allows to link payment / receipt "
"entries with voucher, also automatically reconcile during the payment and receipt entries."),
"Voucher Entries for Bank, Cash, Sales, Purchase, Expenses, Contra, etc... "),
'account_anglo_saxon': fields.boolean('Anglo-Saxon Accounting',
help="This module will support the Anglo-Saxons accounting methodology by "
"changing the accounting logic with stock transactions."),
# 'account_voucher_payment':fields.boolean('Voucher and Reconcile Management',
# help="Extension Account Voucher module includes allows to link payment / receipt "
# "entries with voucher, also automatically reconcile during the payment and receipt entries."),
}
_defaults = {
'account_voucher': True,
}
account_installer_modules()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

152
addons/account/invoice.py
View File

@ -219,7 +219,7 @@ class account_invoice(osv.osv):
_name = "account.invoice"
_description = 'Invoice'
_order = "id"
_order = "id desc"
_columns = {
'name': fields.char('Description', size=64, select=True, readonly=True, states={'draft':[('readonly',False)]}),
@ -268,7 +268,7 @@ class account_invoice(osv.osv):
'invoice_line': fields.one2many('account.invoice.line', 'invoice_id', 'Invoice Lines', readonly=True, states={'draft':[('readonly',False)]}),
'tax_line': fields.one2many('account.invoice.tax', 'invoice_id', 'Tax Lines', readonly=True, states={'draft':[('readonly',False)]}),
'move_id': fields.many2one('account.move', 'Invoice Movement', readonly=True, help="Links to the automatically generated Ledger Postings."),
'move_id': fields.many2one('account.move', 'Journal Entry', readonly=True, help="Link to the automatically generated Journal Items."),
'amount_untaxed': fields.function(_amount_all, method=True, digits_compute=dp.get_precision('Account'), string='Untaxed',
store={
'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
@ -299,7 +299,7 @@ class account_invoice(osv.osv):
'account.invoice': (lambda self, cr, uid, ids, c={}: ids, None, 50), # Check if we can remove ?
'account.move.line': (_get_invoice_from_line, None, 50),
'account.move.reconcile': (_get_invoice_from_reconcile, None, 50),
}, help="The Ledger Postings of the invoice have been reconciled with Ledger Postings of the payment(s)."),
}, help="The Journal Entry of the invoice have been totally reconciled with one or several Journal Entries of payment."),
'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',
help='Bank Account Number, Company bank account if Invoice is customer or supplier refund, otherwise Partner bank account number.', readonly=True, states={'draft':[('readonly',False)]}),
'move_lines':fields.function(_get_lines , method=True, type='many2many', relation='account.move.line', string='Entry Lines'),
@ -313,13 +313,12 @@ class account_invoice(osv.osv):
},
help="Remaining amount due."),
'payment_ids': fields.function(_compute_lines, method=True, relation='account.move.line', type="many2many", string='Payments'),
'move_name': fields.char('Ledger Posting', size=64, readonly=True, states={'draft':[('readonly',False)]}),
'move_name': fields.char('Journal Entry', size=64, readonly=True, states={'draft':[('readonly',False)]}),
'user_id': fields.many2one('res.users', 'Salesman', readonly=True, states={'draft':[('readonly',False)]}),
'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True, states={'draft':[('readonly',False)]})
'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Mapping', readonly=True, states={'draft':[('readonly',False)]})
}
_defaults = {
'type': _get_type,
#'date_invoice': lambda *a: time.strftime('%Y-%m-%d'),
'state': 'draft',
'journal_id': _get_journal,
'currency_id': _get_currency,
@ -372,9 +371,6 @@ class account_invoice(osv.osv):
osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
return True
# def get_invoice_address(self, cr, uid, ids):
# res = self.pool.get('res.partner').address_get(cr, uid, [part], ['invoice'])
# return [{}]
def onchange_partner_id(self, cr, uid, ids, type, partner_id,\
date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):
invoice_addr_id = False
@ -401,10 +397,10 @@ class account_invoice(osv.osv):
rec_pro_id = property_obj.search(cr,uid,[('name','=','property_account_receivable'),('company_id','=',company_id)])
if not pay_pro_id:
pay_pro_id = property_obj.search(cr,uid,[('name','=','property_account_payable'),('company_id','=',company_id)])
rec_line_data = property_obj.read(cr,uid,rec_pro_id,['name','value','res_id'])
pay_line_data = property_obj.read(cr,uid,pay_pro_id,['name','value','res_id'])
rec_res_id = rec_line_data and int(rec_line_data[0]['value'].split(',')[1]) or False
pay_res_id = pay_line_data and int(pay_line_data[0]['value'].split(',')[1]) or False
rec_line_data = property_obj.read(cr,uid,rec_pro_id,['name','value_reference','res_id'])
pay_line_data = property_obj.read(cr,uid,pay_pro_id,['name','value_reference','res_id'])
rec_res_id = rec_line_data and rec_line_data[0].get('value_reference',False) and int(rec_line_data[0]['value_reference'].split(',')[1]) or False
pay_res_id = pay_line_data and pay_line_data[0].get('value_reference',False) and int(pay_line_data[0]['value_reference'].split(',')[1]) or False
if not rec_res_id and not pay_res_id:
raise osv.except_osv(_('Configuration Error !'),
_('Can not find account chart for this company, Please Create account.'))
@ -459,9 +455,9 @@ class account_invoice(osv.osv):
def onchange_payment_term_date_invoice(self, cr, uid, ids, payment_term_id, date_invoice):
if not payment_term_id:
return {}
res={}
pt_obj= self.pool.get('account.payment.term')
if not date_invoice :
res = {}
pt_obj = self.pool.get('account.payment.term')
if not date_invoice:
date_invoice = time.strftime('%Y-%m-%d')
pterm_list = pt_obj.compute(cr, uid, payment_term_id, value=1, date_ref=date_invoice)
@ -469,7 +465,7 @@ class account_invoice(osv.osv):
if pterm_list:
pterm_list = [line[0] for line in pterm_list]
pterm_list.sort()
res= {'value':{'date_due': pterm_list[-1]}}
res = {'value':{'date_due': pterm_list[-1]}}
else:
raise osv.except_osv(_('Data Insufficient !'), _('The Payment Term of Supplier does not have Payment Term Lines(Computation) defined !'))
@ -497,10 +493,10 @@ class account_invoice(osv.osv):
rec_pro_id = property_obj.search(cr, uid, [('name','=','property_account_receivable'),('company_id','=',company_id)])
if not pay_pro_id:
pay_pro_id = property_obj.search(cr, uid, [('name','=','property_account_payable'),('company_id','=',company_id)])
rec_line_data = property_obj.read(cr, uid, rec_pro_id, ['name','value','res_id'])
pay_line_data = property_obj.read(cr, uid, pay_pro_id, ['name','value','res_id'])
rec_res_id = rec_line_data and int(rec_line_data[0]['value'].split(',')[1]) or False
pay_res_id = pay_line_data and int(pay_line_data[0]['value'].split(',')[1]) or False
rec_line_data = property_obj.read(cr, uid, rec_pro_id, ['name','value_reference','res_id'])
pay_line_data = property_obj.read(cr, uid, pay_pro_id, ['name','value_reference','res_id'])
rec_res_id = rec_line_data and rec_line_data[0].get('value_reference',False) and int(rec_line_data[0]['value_reference'].split(',')[1]) or False
pay_res_id = pay_line_data and pay_line_data[0].get('value_reference',False) and int(pay_line_data[0]['value_reference'].split(',')[1]) or False
if not rec_res_id and not pay_res_id:
raise osv.except_osv(_('Configuration Error !'),
_('Can not find account chart for this company, Please Create account.'))
@ -527,34 +523,37 @@ class account_invoice(osv.osv):
obj_l = account_obj.browse(cr, uid, inv_line[2]['account_id'])
if obj_l.company_id.id != company_id:
raise osv.except_osv(_('Configuration Error !'),
_('invoice line account company is not match with invoice company.'))
_('Invoice line account company does not match with invoice company.'))
else:
continue
if company_id and type:
if type in ('out_invoice', 'out_refund'):
if type in ('out_invoice'):
journal_type = 'sale'
elif type in ('out_refund'):
journal_type = 'sale_refund'
elif type in ('in_refund'):
journal_type = 'purchase_refund'
else:
journal_type = 'purchase'
journal_ids = obj_journal.search(cr, uid, [('company_id','=',company_id), ('type', '=', journal_type)])
if journal_ids:
val['journal_id'] = journal_ids[0]
else:
raise osv.except_osv(_('Configuration Error !'),
_('Can not find account journal for this company in invoice, Please Create journal.'))
raise osv.except_osv(_('Configuration Error !'), _('Can\'t find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration\Financial Accounting\Accounts\Journals.' % (journal_type)))
dom = {'journal_id': [('id', 'in', journal_ids)]}
else:
journal_ids = obj_journal.search(cr, uid, [])
if currency_id and company_id:
currency = self.pool.get('res.currency').browse(cr, uid, currency_id)
if currency.company_id.id != company_id:
if currency.company_id and currency.company_id.id != company_id:
val['currency_id'] = False
else:
val['currency_id'] = currency.id
if company_id:
company = self.pool.get('res.company').browse(cr, uid, company_id)
if company.currency_id.company_id.id != company_id:
if company.currency_id.company_id and company.currency_id.company_id.id != company_id:
val['currency_id'] = False
else:
val['currency_id'] = company.currency_id.id
@ -598,9 +597,9 @@ class account_invoice(osv.osv):
def copy(self, cr, uid, id, default={}, context=None):
default.update({
'state':'draft',
'number':False,
'move_id':False,
'state':'draft',
'number':False,
'move_id':False,
'move_name':False,
'internal_number': False,
})
@ -635,9 +634,8 @@ class account_invoice(osv.osv):
context.update({'lang': partner.lang})
for taxe in ait_obj.compute(cr, uid, id, context=context).values():
ait_obj.create(cr, uid, taxe)
# Update the stored value (fields.function), so we write to trigger recompute
# Update the stored value (fields.function), so we write to trigger recompute
self.pool.get('account.invoice').write(cr, uid, ids, {'invoice_line':[]}, context=context)
# self.pool.get('account.invoice').write(cr, uid, ids, {}, context=context)
return True
def button_compute(self, cr, uid, ids, context=None, set_total=False):
@ -804,10 +802,21 @@ class account_invoice(osv.osv):
if inv.type in ('in_invoice', 'in_refund') and abs(inv.check_total - inv.amount_total) >= (inv.currency_id.rounding/2.0):
raise osv.except_osv(_('Bad total !'), _('Please verify the price of the invoice !\nThe real total does not match the computed total.'))
if inv.payment_term:
total_fixed = total_percent = 0
for line in inv.payment_term.line_ids:
if line.value == 'fixed':
total_fixed += line.value_amount
if line.value == 'procent':
total_percent += line.value_amount
total_fixed = (total_fixed * 100) / inv.amount_total
if (total_fixed + total_percent) > 100:
raise osv.except_osv(_('Error !'), _("You cannot create an invoice !\nAs you have defined payment term and so the total of invoice should be greater than the computed amount for journal entries using payment term"))
# one move line per tax line
iml += ait_obj.move_line_get(cr, uid, inv.id)
entry_type=''
entry_type = ''
if inv.type in ('in_invoice', 'in_refund'):
ref = inv.reference
entry_type = 'journal_pur_voucher'
@ -880,7 +889,7 @@ class account_invoice(osv.osv):
line = self.group_lines(cr, uid, iml, line, inv)
journal_id = inv.journal_id.id #self._get_journal(cr, uid, {'type': inv['type']})
journal_id = inv.journal_id.id
journal = self.pool.get('account.journal').browse(cr, uid, journal_id)
if journal.centralisation:
raise osv.except_osv(_('UserError'),
@ -889,18 +898,18 @@ class account_invoice(osv.osv):
line = self.finalize_invoice_move_lines(cr, uid, inv, line)
move = {
'ref': inv.number,
'ref': inv.reference and inv.reference or inv.name,
'line_id': line,
'journal_id': journal_id,
'date': date,
'type': entry_type,
'narration':inv.comment
}
period_id=inv.period_id and inv.period_id.id or False
period_id = inv.period_id and inv.period_id.id or False
if not period_id:
period_ids= self.pool.get('account.period').search(cr, uid, [('date_start','<=',inv.date_invoice or time.strftime('%Y-%m-%d')),('date_stop','>=',inv.date_invoice or time.strftime('%Y-%m-%d'))])
period_ids = self.pool.get('account.period').search(cr, uid, [('date_start','<=',inv.date_invoice or time.strftime('%Y-%m-%d')),('date_stop','>=',inv.date_invoice or time.strftime('%Y-%m-%d'))])
if len(period_ids):
period_id=period_ids[0]
period_id = period_ids[0]
if period_id:
move['period_id'] = period_id
for i in line:
@ -914,7 +923,6 @@ class account_invoice(osv.osv):
# account move reference when creating the same invoice after a cancelled one:
self.pool.get('account.move').post(cr, uid, [move_id], context={'invoice':inv})
self._log_event(cr, uid, ids)
return True
def line_get_convert(self, cr, uid, x, part, date, context=None):
@ -941,7 +949,7 @@ class account_invoice(osv.osv):
def action_number(self, cr, uid, ids, *args):
#TODO: not correct fix but required a frech values before reading it.
self.write(cr, uid, ids, {})
for obj_inv in self.browse(cr, uid, ids):
id = obj_inv.id
invtype = obj_inv.type
@ -950,7 +958,7 @@ class account_invoice(osv.osv):
reference = obj_inv.reference or ''
self.write(cr, uid, ids, {'internal_number':number})
if invtype in ('in_invoice', 'in_refund'):
ref = reference
else:
@ -967,7 +975,7 @@ class account_invoice(osv.osv):
'WHERE account_move_line.move_id = %s ' \
'AND account_analytic_line.move_id = account_move_line.id',
(ref, move_id))
for inv_id, name in self.name_get(cr, uid, [id]):
message = _('Invoice ') + " '" + name + "' "+ _("is validated.")
self.log(cr, uid, inv_id, message)
@ -1023,9 +1031,9 @@ class account_invoice(osv.osv):
def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
if not args:
args=[]
args = []
if context is None:
context={}
context = {}
ids = []
if name:
ids = self.search(cr, user, [('number','=',name)]+ args, limit=limit, context=context)
@ -1204,7 +1212,7 @@ class account_invoice_line(osv.osv):
cur_obj = self.pool.get('res.currency')
for line in self.browse(cr, uid, ids):
price = line.price_unit * (1-(line.discount or 0.0)/100.0)
taxes = tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, price, line.quantity)
taxes = tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, price, line.quantity, product=line.product_id, address_id=line.invoice_id.address_invoice_id, partner=line.invoice_id.partner_id)
res[line.id] = taxes['total']
if line.invoice_id:
cur = line.invoice_id.currency_id
@ -1301,7 +1309,12 @@ class account_invoice_line(osv.osv):
else:
app_acc_in = in_acc_cate
else:
app_acc_in = account_obj.browse(cr, uid, in_pro_id)[0]
# Get the fields from the ir.property record
my_value = property_obj.read(cr,uid,in_pro_id,['name','value_reference','res_id'])
# Parse the value_reference field to get the ID of the account.account record
account_id = int (my_value[0]["value_reference"].split(",")[1])
# Use the ID of the account.account record in the browse for the account.account record
app_acc_in = account_obj.browse(cr, uid, [account_id])[0]
if not exp_pro_id:
ex_acc = res.product_tmpl_id.property_account_expense
ex_acc_cate = res.categ_id.property_account_expense_categ
@ -1322,9 +1335,6 @@ class account_invoice_line(osv.osv):
else:
app_acc_in = in_acc_cate
app_acc_exp = ex_acc_cate
# else:
# app_acc_in = self.pool.get('account.account').browse(cr,uid,in_pro_id)[0]
# app_acc_exp = self.pool.get('account.account').browse(cr,uid,exp_pro_id)[0]
if app_acc_in.company_id.id != company_id and app_acc_exp.company_id.id != company_id:
in_res_id = account_obj.search(cr, uid, [('name','=',app_acc_in.name),('company_id','=',company_id)])
exp_res_id = account_obj.search(cr, uid, [('name','=',app_acc_exp.name),('company_id','=',company_id)])
@ -1367,8 +1377,8 @@ class account_invoice_line(osv.osv):
else:
result.update({'price_unit': res.list_price, 'invoice_line_tax_id': tax_id})
if not name:
result['name'] = res.partner_ref
# if not name:
result['name'] = res.partner_ref
domain = {}
result['uos_id'] = res.uom_id.id or uom or False
@ -1386,10 +1396,6 @@ class account_invoice_line(osv.osv):
company = self.pool.get('res.company').browse(cr, uid, company_id)
currency = self.pool.get('res.currency').browse(cr, uid, currency_id)
if not currency.company_id.id == company.id:
raise osv.except_osv(_('Configuration Error !'),
_('Can not select currency that is not related to any company.\nPlease select accordingly !.'))
if company.currency_id.id != currency.id:
new_price = res_final['value']['price_unit'] * currency.rate
res_final['value']['price_unit'] = new_price
@ -1480,6 +1486,24 @@ account_invoice_line()
class account_invoice_tax(osv.osv):
_name = "account.invoice.tax"
_description = "Invoice Tax"
def _count_factor(self, cr, uid, ids, name, args, context=None):
res = {}
for invoice_tax in self.browse(cr, uid, ids, context=context):
res[invoice_tax.id] = {
'factor_base': 1.0,
'factor_tax': 1.0,
}
if invoice_tax.amount <> 0.0:
factor_tax = invoice_tax.tax_amount / invoice_tax.amount
res[invoice_tax.id]['factor_tax'] = factor_tax
if invoice_tax.base <> 0.0:
factor_base = invoice_tax.base_amount / invoice_tax.base
res[invoice_tax.id]['factor_base'] = factor_base
return res
_columns = {
'invoice_id': fields.many2one('account.invoice', 'Invoice Line', ondelete='cascade', select=True),
'name': fields.char('Tax Description', size=64, required=True),
@ -1494,27 +1518,35 @@ class account_invoice_tax(osv.osv):
'tax_code_id': fields.many2one('account.tax.code', 'Tax Code', help="The tax basis of the tax declaration."),
'tax_amount': fields.float('Tax Code Amount', digits_compute=dp.get_precision('Account')),
'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True),
'factor_base' : fields.function(_count_factor, method=True, string='Multipication factor for Base code', type='float', multi="all"),
'factor_tax' : fields.function(_count_factor, method=True, string='Multipication factor Tax code', type='float', multi="all")
}
def base_change(self, cr, uid, ids, base, currency_id=False, company_id=False, date_invoice=False):
cur_obj = self.pool.get('res.currency')
company_obj = self.pool.get('res.company')
company_currency=False
company_currency = False
factor = 1
if ids:
factor = self.read(cr, uid, ids[0], ['factor_base'])['factor_base']
if company_id:
company_currency = company_obj.read(cr, uid, [company_id], ['currency_id'])[0]['currency_id'][0]
if currency_id and company_currency:
base = cur_obj.compute(cr, uid, currency_id, company_currency, base, context={'date': date_invoice or time.strftime('%Y-%m-%d')}, round=False)
base = cur_obj.compute(cr, uid, currency_id, company_currency, base*factor, context={'date': date_invoice or time.strftime('%Y-%m-%d')}, round=False)
return {'value': {'base_amount':base}}
def amount_change(self, cr, uid, ids, amount, currency_id=False, company_id=False, date_invoice=False):
cur_obj = self.pool.get('res.currency')
company_obj = self.pool.get('res.company')
company_currency=False
company_currency = False
factor = 1
if ids:
factor = self.read(cr, uid, ids[0], ['factor_tax'])['factor_tax']
if company_id:
company_currency = company_obj.read(cr, uid, [company_id], ['currency_id'])[0]['currency_id'][0]
if currency_id and company_currency:
amount = cur_obj.compute(cr, uid, currency_id, company_currency, amount, context={'date': date_invoice or time.strftime('%Y-%m-%d')}, round=False)
return {'value': {'tax_amount':amount}}
amount = cur_obj.compute(cr, uid, currency_id, company_currency, amount*factor, context={'date': date_invoice or time.strftime('%Y-%m-%d')}, round=False)
return {'value': {'tax_amount': amount}}
_order = 'sequence'
_defaults = {

22
addons/account/partner.py
View File

@ -25,9 +25,9 @@ import ir
class account_fiscal_position(osv.osv):
_name = 'account.fiscal.position'
_description = 'Fiscal Position'
_description = 'Fiscal Mapping'
_columns = {
'name': fields.char('Fiscal Position', size=64, translate=True, required=True),
'name': fields.char('Fiscal Mapping', size=64, translate=True, required=True),
'company_id': fields.many2one('res.company', 'Company'),
'account_ids': fields.one2many('account.fiscal.position.account', 'position_id', 'Account Mapping'),
'tax_ids': fields.one2many('account.fiscal.position.tax', 'position_id', 'Tax Mapping'),
@ -55,7 +55,7 @@ class account_fiscal_position(osv.osv):
if not fposition_id :
return account_id
for pos in fposition_id.account_ids:
if pos.account_src_id.id==account_id:
if pos.account_src_id.id == account_id:
account_id = pos.account_dest_id.id
break
return account_id
@ -64,10 +64,10 @@ account_fiscal_position()
class account_fiscal_position_tax(osv.osv):
_name = 'account.fiscal.position.tax'
_description = 'Fiscal Position Taxes Mapping'
_description = 'Taxes Fiscal Mapping'
_rec_name = 'position_id'
_columns = {
'position_id': fields.many2one('account.fiscal.position', 'Fiscal Position', required=True, ondelete='cascade'),
'position_id': fields.many2one('account.fiscal.position', 'Fiscal Mapping', required=True, ondelete='cascade'),
'tax_src_id': fields.many2one('account.tax', 'Tax Source', required=True),
'tax_dest_id': fields.many2one('account.tax', 'Replacement Tax')
}
@ -76,10 +76,10 @@ account_fiscal_position_tax()
class account_fiscal_position_account(osv.osv):
_name = 'account.fiscal.position.account'
_description = 'Fiscal Position Accounts Mapping'
_description = 'Accounts Fiscal Mapping'
_rec_name = 'position_id'
_columns = {
'position_id': fields.many2one('account.fiscal.position', 'Fiscal Position', required=True, ondelete='cascade'),
'position_id': fields.many2one('account.fiscal.position', 'Fiscal Mapping', required=True, ondelete='cascade'),
'account_src_id': fields.many2one('account.account', 'Account Source', domain=[('type','<>','view')], required=True),
'account_dest_id': fields.many2one('account.account', 'Account Destination', domain=[('type','<>','view')], required=True)
}
@ -172,10 +172,10 @@ class res_partner(osv.osv):
'account.fiscal.position',
type='many2one',
relation='account.fiscal.position',
string="Fiscal Position",
string="Fiscal Mapping",
method=True,
view_load=True,
help="The fiscal position will determine taxes and the accounts used for the partner.",
help="The fiscal Mapping will determine taxes and the accounts used for the partner.",
),
'property_payment_term': fields.property(
'account.payment.term',
@ -187,8 +187,8 @@ class res_partner(osv.osv):
help="This payment term will be used instead of the default one for the current partner"),
'ref_companies': fields.one2many('res.company', 'partner_id',
'Companies that refers to partner'),
'last_reconciliation_date': fields.datetime('Last Reconciliation Date', help='Date on which partner account entries reconciled last time')
'last_reconciliation_date': fields.datetime('Last Reconciliation Date', help='Date on which the partner accounting entries were reconciled last time')
}
res_partner()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

17
addons/account/partner_view.xml
View File

@ -7,7 +7,7 @@
<field name="model">account.fiscal.position</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Fiscal Position">
<form string="Fiscal Mapping">
<field name="name" select="1"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<separator string="Mapping" colspan="4"/>
@ -42,7 +42,7 @@
<field name="model">account.fiscal.position</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Fiscal Position">
<tree string="Fiscal Mapping">
<field name="name"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</tree>
@ -50,7 +50,7 @@
</record>
<record id="action_account_fiscal_position_form" model="ir.actions.act_window">
<field name="name">Fiscal Positions</field>
<field name="name">Fiscal Mappings</field>
<field name="res_model">account.fiscal.position</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
@ -63,7 +63,7 @@
<!--
Partners Extension
-->
-->
<record id="view_partner_property_form" model="ir.ui.view">
<field name="name">res.partner.property.form.inherit</field>
@ -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="account.group_account_user" />
<field name="property_account_receivable" groups="base.group_extended" />
<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="account.group_account_user"/>
<field name="property_account_payable" groups="base.group_extended"/>
</group>
<group col="2" colspan="2">
<separator string="Customer Credit" colspan="2"/>
@ -131,10 +131,11 @@
id="action_analytic_open"
name="Analytic Accounts"
res_model="account.analytic.account"
domain="[('partner_id','=',active_id)]"
context="{'search_default_partner_id':[active_id]}"
src_model="res.partner"
view_type="form"
view_mode="tree,form,graph,calendar"/>
view_mode="tree,form,graph,calendar"
groups="base.group_extended"/>
<record id="view_res_partner_reconcile" model="ir.ui.view">
<field name="name">res.partner.form.reconcile</field>

66
addons/account/process/customer_invoice_process.xml
View File

@ -1,21 +1,21 @@
<?xml version="1.0" ?>
<openerp>
<data>
<!--
Process
<!--
Process
-->
<record id="process_process_invoiceprocess0" model="process.process">
<field eval="1" name="active"/>
<field name="model_id" ref="account.model_account_invoice"/>
<field eval="&quot;&quot;&quot;Customer Invoice&quot;&quot;&quot;" name="name"/>
</record>
<!--
<!--
Process Node
-->
<record id="process_node_analytic0" model="process.node">
<field name="menu_id" ref="account.account_analytic_def_account"/>
<field name="model_id" ref="analytic.model_account_analytic_account"/>
@ -26,7 +26,7 @@
<field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'close')&quot;&quot;&quot;" name="model_states"/>
<field eval="1" name="flow_start"/>
</record>
<record id="process_node_draftinvoices0" model="process.node">
<field name="menu_id" ref="account.menu_action_invoice_tree1"/>
<field name="model_id" ref="account.model_account_invoice"/>
@ -37,7 +37,7 @@
<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/>
</record>
<record id="process_node_invoiceinvoice0" model="process.node">
<field name="menu_id" ref="account.menu_finance_receivables"/>
<field name="model_id" ref="account.model_account_invoice"/>
@ -48,7 +48,7 @@
<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/>
</record>
<record id="process_node_accountingentries0" model="process.node">
<field name="menu_id" ref="account.menu_action_move_journal_line_form"/>
<field name="model_id" ref="account.model_account_move"/>
@ -58,7 +58,7 @@
<field name="process_id" ref="process_process_invoiceprocess0"/>
<field eval="0" name="flow_start"/>
</record>
<record id="process_node_bankstatement0" model="process.node">
<field name="menu_id" ref="account.menu_bank_statement_tree"/>
<field name="model_id" ref="account.model_account_bank_statement"/>
@ -70,7 +70,7 @@
<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
<field eval="1" name="flow_start"/>
</record>
<record id="process_node_paymententries0" model="process.node">
<field name="menu_id" ref="account.menu_action_move_journal_line_form"/>
<field name="model_id" ref="account.model_account_move_line"/>
@ -81,7 +81,7 @@
<field eval="&quot;&quot;&quot;object.state in ('draft', 'valid')&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/>
</record>
<record id="process_node_reconciliation0" model="process.node">
<field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
<field name="model_id" ref="account.model_account_move_reconcile"/>
@ -92,7 +92,7 @@
<field eval="&quot;&quot;&quot;object.state=='valid'&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/>
</record>
<record id="process_node_paidinvoice0" model="process.node">
<field name="menu_id" ref="account.menu_action_invoice_tree1"/>
<field name="model_id" ref="account.model_account_invoice"/>
@ -103,7 +103,7 @@
<field eval="&quot;&quot;&quot;object.state=='paid'&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/>
</record>
<record id="process_node_accountingstatemententries0" model="process.node">
<field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
<field name="model_id" ref="account.model_account_move_line"/>
@ -115,20 +115,12 @@
<field eval="&quot;&quot;&quot;object.state in ('draft', 'valid')&quot;&quot;&quot;" name="model_states"/>
<field eval="0" name="flow_start"/>
</record>
<!--
<!--
Process Transition
-->
<record id="res_roles_invoice0" model="res.roles">
<field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
</record>
<!-- <record id="account.t5" model="workflow.transition">-->
<!-- <field name="role_id" ref="res_roles_invoice0"/>-->
<!-- </record>-->
<record id="process_transition_confirmstatementfromdraft0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@ -137,7 +129,7 @@
<field model="process.node" name="target_node_id" ref="process_node_accountingstatemententries0"/>
<field model="process.node" name="source_node_id" ref="account.process_node_draftstatement0"/>
</record>
<record id="process_transition_analyticinvoice0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@ -146,7 +138,7 @@
<field model="process.node" name="target_node_id" ref="process_node_draftinvoices0"/>
<field model="process.node" name="source_node_id" ref="process_node_analytic0"/>
</record>
<record id="process_transition_customerinvoice0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@ -156,7 +148,7 @@
<field model="process.node" name="source_node_id" ref="process_node_draftinvoices0"/>
<field eval="[(6,0,[ref('account.pro2_to_open')])]" name="transition_ids"/>
</record>
<record id="process_transition_validentries0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@ -165,7 +157,7 @@
<field model="process.node" name="target_node_id" ref="process_node_accountingentries0"/>
<field model="process.node" name="source_node_id" ref="process_node_invoiceinvoice0"/>
</record>
<record id="process_transition_entriesreconcile0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@ -174,7 +166,7 @@
<field model="process.node" name="target_node_id" ref="process_node_reconciliation0"/>
<field model="process.node" name="source_node_id" ref="process_node_accountingentries0"/>
</record>
<record id="process_transition_statemententries0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@ -183,7 +175,7 @@
<field model="process.node" name="target_node_id" ref="process_node_paymententries0"/>
<field model="process.node" name="source_node_id" ref="process_node_bankstatement0"/>
</record>
<record id="process_transition_paymentreconcile0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@ -192,7 +184,7 @@
<field model="process.node" name="target_node_id" ref="process_node_reconciliation0"/>
<field model="process.node" name="source_node_id" ref="process_node_paymententries0"/>
</record>
<record id="process_transition_reconcilepaid0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@ -201,17 +193,17 @@
<field model="process.node" name="target_node_id" ref="process_node_paidinvoice0"/>
<field model="process.node" name="source_node_id" ref="process_node_reconciliation0"/>
</record>
<!--
<!--
Process Action
-->
<record id="process_transition_action_createentries0" model="process.transition.action">
<field eval="&quot;&quot;&quot;action_move_create&quot;&quot;&quot;" name="action"/>
<field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
<field eval="&quot;&quot;&quot;Create entry&quot;&quot;&quot;" name="name"/>
<field name="transition_id" ref="process_transition_customerinvoice0"/>
</record>
</data>
</openerp>

3
addons/account/product.py
View File

@ -48,6 +48,7 @@ product_category()
#----------------------------------------------------------
# Products
#----------------------------------------------------------
class product_template(osv.osv):
_inherit = "product.template"
_columns = {
@ -76,5 +77,3 @@ class product_template(osv.osv):
}
product_template()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

6
addons/account/product_view.xml
View File

@ -9,15 +9,19 @@
<field name="arch" type="xml">
<notebook position="inside">
<page string="Accounting">
<group groups="base.group_extended">
<separator string="Sales Properties" colspan="2"/>
<separator string="Purchase Properties" colspan="2"/>
<field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}" groups="base.group_extended"/>
<field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" groups="base.group_extended"/>
</group>
<newline/>
<group colspan="2">
<separator string="Sale Taxes" colspan="2"/>
<separator string="Purchase Taxes" colspan="2"/>
<field name="taxes_id" nolabel="1" colspan="2" attrs="{'readonly':[('sale_ok','=',0)]}"/>
<field name="supplier_taxes_id" nolabel="1" colspan="2" attrs="{'readonly':[('purchase_ok','=',0)]}"/>
</group>
</page>
</notebook>
</field>

19
addons/account/project/project_report.xml
View File

@ -3,32 +3,13 @@
<data>
<report auto="False" id="analytic_journal_print" menu="False" model="account.analytic.journal" name="account.analytic.account.journal" rml="account/project/report/analytic_journal.rml" string="Analytic Journal"/>
<!-- <wizard id="account_analytic_account_journal_report" keyword="client_print_multi" model="account.analytic.journal" name="account.analytic.account.journal.report" string="Analytic Journal"/>-->
<report auto="False" id="account_analytic_account_balance" menu="False" model="account.analytic.account" name="account.analytic.account.balance" rml="account/project/report/analytic_balance.rml" string="Analytic Balance"/>
<!--<wizard id="account_analytic_account_balance_report" keyword="client_print_multi" model="account.analytic.account" name="account.analytic.account.balance.report" string="Analytic Balance"/> -->
<report auto="False" id="account_analytic_account_inverted_balance" menu="False" model="account.analytic.account" name="account.analytic.account.inverted.balance" rml="account/project/report/inverted_analytic_balance.rml" string="Inverted Analytic Balance"/>
<!-- <wizard id="account_analytic_account_inverted_balance_report" keyword="client_print_multi" model="account.analytic.account" name="account.analytic.account.inverted.balance.report" string="Inverted Analytic Balance"/>-->
<report auto="False" id="account_analytic_account_cost_ledger" menu="False" model="account.analytic.account" name="account.analytic.account.cost_ledger" rml="account/project/report/cost_ledger.rml" string="Cost Ledger"/>
<!-- <wizard id="account_analytic_account_cost_ledger_report" keyword="client_print_multi" model="account.analytic.account" name="account.analytic.account.cost_ledger.report" string="Cost Ledger"/>-->
<report auto="False" id="account_analytic_account_quantity_cost_ledger" menu="False" model="account.analytic.account" name="account.analytic.account.quantity_cost_ledger" rml="account/project/report/quantity_cost_ledger.rml" string="Cost Ledger (Only quantities)"/>
<!-- <wizard id="account_analytic_account_quantity_cost_ledger_report" keyword="client_print_multi" model="account.analytic.account" name="account.analytic.account.quantity_cost_ledger.report" string="Cost Ledger (Only quantities)"/>-->
<report auto="False" id="account_analytic_account_analytic_check" menu="False" model="account.account" name="account.analytic.account.analytic.check" rml="account/project/report/analytic_check.rml" string="Analytic Check"/>
<!-- <wizard id="account_analytic_account_analytic_check_report" keyword="client_print_multi" model="account.account" name="account.analytic.account.analytic.check.report" string="Analytic Check"/>-->
</data>
</openerp>

198
addons/account/project/project_view.xml
View File

@ -8,7 +8,7 @@
<field name="type">tree</field>
<field eval="8" name="priority"/>
<field name="arch" type="xml">
<tree colors="red:(date&lt;=current_date);black:(date&gt;current_date)" string="Analytic account">
<tree toolbar="1" colors="red:(date&lt;current_date);black:(date&gt;=current_date);black:(date==False)" string="Analytic account">
<field name="code"/>
<field name="complete_name"/>
<field name="quantity"/>
@ -25,8 +25,9 @@
<field name="arch" type="xml">
<search string="Analytic Account">
<group col="8" colspan="4">
<filter icon="terp-check" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
<filter icon="terp-go-today" string="Overpassed Account" domain="[('date','&lt;',time.strftime('%%Y-%%m-%%d'))]" help="Overpassed Account"/>
<filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
<filter icon="terp-camera_test" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="code" select="1"/>
@ -38,7 +39,7 @@
<filter string="Parent" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/>
<filter string="Type" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'type'}"/>
<separator orientation="vertical"/>
<filter string="Associated Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Associated Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
</group>
</search>
@ -51,7 +52,7 @@
<field name="type">tree</field>
<field name="field_parent">child_ids</field>
<field name="arch" type="xml">
<tree toolbar="True" colors="red:(date&lt;=current_date);black:(date&gt;current_date)" string="Analytic account">
<tree colors="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"/>
@ -59,12 +60,8 @@
<field name="debit"/>
<field name="credit"/>
<field name="balance"/>
<field name="company_currency_id"/>
<!-- <field name="date"/>-->
<!-- <field name="parent_id" invisible="1"/>-->
<!-- <field name="type" invisible="1"/>-->
<!-- <field name="partner_id" invisible="1"/>-->
<!-- <field name="user_id" invisible="1"/>-->
<field name="currency_id"/>
<field name="date" invisible="1"/>
</tree>
</field>
</record>
@ -78,10 +75,9 @@
<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)"/>
<field name="parent_id" on_change="on_change_parent(parent_id)" groups="base.group_extended"/>
<field name="company_id" select="2" widget="selection" groups="base.group_multi_company"/>
<field name="type" select="2"/>
<field name="company_currency_id" select="2"/>
</group>
<notebook colspan="4">
<page string="Account Data">
@ -89,7 +85,6 @@
<newline/>
<field name="date_start"/>
<field name="date" select="2"/>
<newline/>
<field name="quantity_max"/>
<field name="user_id"/>
@ -109,11 +104,9 @@
<field name="view_type">form</field>
<field name="view_mode">tree,graph,form</field>
<field name="view_id" ref="view_account_analytic_account_tree"/>
<field name="context">{"search_default_user_id":uid}</field>
<field name="search_view_id" ref="account.view_account_analytic_account_search"/>
</record>
<!--<menuitem id="menu_analytic_account" name="Analytic Accounts" parent="account.menu_analytic_accounting"/>-->
<menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="menu_analytic_accounting"/>
<menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="menu_analytic_accounting" groups="analytic.group_analytic_accounting"/>
<record id="act_account_renew_view" model="ir.actions.act_window">
<field name="name">Accounts to Renew</field>
@ -127,25 +120,14 @@
<record id="action_account_analytic_account_tree2" model="ir.actions.act_window">
<field name="name">Chart of Analytic Accounts</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.analytic.account</field>
<field name="domain">[('parent_id','=',False)]</field>
<field name="view_type">tree</field>
<field name="view_mode">form,graph</field>
<field name="view_id" ref="view_account_analytic_account_tree"/>
<field name="domain">[('parent_id','=',False)]</field>
<field name="help">Analytic Charts of Accounts allows you to access to reports by analytic accounts (or cost accounts) . From this menu you can access to analytic balance, a report that relates the analytic accounts to the general accounts. It is useful for analyzing the profitability of projects, giving you the profitability of a project for the different operations that you used to carry out the project.</field>
</record>
<!-- <menuitem-->
<!-- action="action_account_analytic_account_tree2"-->
<!-- id="account_analytic_def_chart"-->
<!-- parent="account_analytic_def_account"/>-->
<!-- <menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart" parent="account.menu_finance_charts"/>-->
<!-- <wizard id="wizard_analytic_account_chart" menu="False" model="account.analytic.account" name="account.analytic.account.chart" string="Analytic Chart of Accounts"/>
<menuitem icon="STOCK_INDENT" action="wizard_analytic_account_chart" id="menu_action_analytic_account_tree2" parent="account.menu_finance_charts" type="wizard"/>-->
<menuitem id="next_id_40" name="Analytic" parent="account.menu_finance_generic_reporting" sequence="4"/>
<!-- <menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart_balance" parent="next_id_40"/>-->
<menuitem groups="analytic.group_analytic_accounting" id="next_id_40" name="Analytic" parent="account.menu_finance_generic_reporting" sequence="4"/>
<record id="view_account_analytic_line_form" model="ir.ui.view">
<field name="name">account.analytic.line.form</field>
@ -153,23 +135,31 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Analytic Entry">
<separator string="General Information" colspan="4"/>
<field colspan="4" name="name" select="1"/>
<field name="amount" select="2"/>
<field name="date" select="1"/>
<field name="account_id" select="1"/>
<field name="journal_id" select="2"/>
<field name="general_account_id" select="2"/>
<field name="move_id" select="2"/>
<separator string="Optional Information" colspan="4"/>
<field name="unit_amount" select="2"/>
<field name="ref" select="2"/>
<field name="currency_id" select="2"/>
<field name="amount_currency" select="2"/>
<field name="company_id" select="2" groups="base.group_multi_company"/>
<newline/>
<field name="product_id" select="2"/>
<field name="product_uom_id" select="2"/>
<group colspan="4" col="6">
<field name="name"/>
<field name="ref"/>
<field name="account_id"/>
<field name="journal_id"/>
<field name="date"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
<group colspan="2" col="4">
<separator string="Amount" colspan="4"/>
<field name="amount" colspan="4"/>
<field name="amount_currency" colspan="2"/>
<field name="currency_id" colspan="2" nolabel="1"/>
</group>
<group colspan="2" col="4">
<separator string="Product Information" colspan="4"/>
<field name="product_id" colspan="4"/>
<field name="unit_amount" colspan="2"/>
<field name="product_uom_id" colspan="2" nolabel="1"/>
</group>
<group colspan="2" col="2" groups="base.group_extended">
<separator string="General Accounting" colspan="2"/>
<field name="general_account_id"/>
<field name="move_id" readonly="1"/>
</group>
</form>
</field>
</record>
@ -181,13 +171,13 @@
<tree editable="top" string="Analytic Entries">
<field name="date" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
<field name="name"/>
<field name="journal_id"/>
<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" sum="Total quantity"/>
<field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
<field domain="[('type','=','normal')]" name="account_id"/>
<field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/>
<field domain="[('type','=','normal')]" name="account_id" groups="base.group_extended"/>
<field invisible="True" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
<field name="amount" sum="Total amount"/>
<field name="general_account_id"/>
<field name="journal_id"/>
<field name="ref"/>
<field name="currency_id" />
<field name="amount_currency" />
@ -202,22 +192,29 @@
<field name="arch" type="xml">
<search string="Search Analytic Lines">
<group col='6' colspan='4'>
<field name="name" select="1"/>
<field name="account_id" select="1"/>
<field name="amount" select="1"/>
<filter string="Sale" domain="[('journal_id.type','=','sale')]" icon="terp-sale"/>
<filter string="Purchase" domain="[('journal_id.type','=','purchase')]" icon="terp-purchase"/>
<separator orientation="vertical"/>
<separator orientation="vertical"/>
<field name="date" select="1"/>
<field name="name" select="1"/>
<field name="account_id" select="1" groups="base.group_extended"/>
<field name="user_id" widget="selection"/>
</group>
<newline/>
<group col='6' colspan='4'>
<field name="journal_id" select="1" widget="selection"/>
<group string="Group By..." expand="0">
<filter string="Analytic Account" context="{'group_by':'account_id'}" groups="base.group_extended" icon="terp-folder-blue"/>
<filter string="Analytic Journal" context="{'group_by':'journal_id'}" icon="terp-folder-orange"/>
<separator orientation="vertical"/>
<filter string="General Account" context="{'group_by':'general_account_id'}" icon="terp-folder-green"/>
<separator orientation="vertical"/>
<filter string="Product" context="{'group_by':'product_id'}" icon="terp-accessories-archiver"/>
</group>
<newline/>
<group string="Group By..." expand="0">
<filter string="General Account" context="{'group_by':'general_account_id'}"/>
<filter string="Analytic Account" context="{'group_by':'account_id'}"/>
<filter string="Analytic Journal" context="{'group_by':'journal_id'}"/>
<filter string="Product" context="{'group_by':'product_id'}"/>
<group expand="0" string="Extended options...">
<field name="journal_id" widget="selection"/>
<field name="product_id" widget="selection"/>
<field name="amount" select="1"/>
</group>
</search>
</field>
@ -230,14 +227,8 @@
<field name="context">{"search_default_user_id":uid}</field>
<field name="view_id" ref="view_account_analytic_line_tree"/>
</record>
<!-- <wizard id="action_account_analytic_line" menu="False" model="account.analytic.line" name="account.analytic.line" string="Entries by Line"/>-->
<!-- <menuitem id="next_id_41" name="Analytic Entries" parent="account.menu_finance_entries"/>-->
<!-- Entries by Line -->
<!-- <menuitem icon="STOCK_JUSTIFY_FILL"-->
<!-- action="action_project_account_analytic_line_form"-->
<!-- id="account_entries_analytic_entries"-->
<!-- parent="next_id_41"/>-->
<!-- Entries by Line -->
<record id="action_account_tree1" model="ir.actions.act_window">
<field name="name">Analytic Entries</field>
@ -263,11 +254,11 @@
<field name="arch" type="xml">
<form string="Project line">
<field name="name"/>
<field name="account_id"/>
<field name="account_id" groups="base.group_extended"/>
<field name="date" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
<field name="journal_id"/>
<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
<field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
<field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/>
<field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
<field invisible="True" name="general_account_id"/>
<field name="amount"/>
@ -308,12 +299,12 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Analytic Journals">
<group>
<field name="name"/>
<field name="code"/>
<field name="type"/>
</group>
<newline/>
<group>
<field name="code"/>
<field name="name"/>
<field name="type"/>
</group>
<newline/>
<group expand="0" string="Group By...">
<filter string="Type" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'type'}"/>
</group>
@ -342,7 +333,7 @@
<field name="view_mode">tree,form,search</field>
<field name="search_view_id" ref="view_analytic_journal_search" />
</record>
<menuitem action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic_accounting"/>
<menuitem groups="analytic.group_analytic_accounting" action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic_accounting" sequence="5"/>
#
# Open journal entries
@ -354,31 +345,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_entries" groups="base.group_extended"/>
<!-- <record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
<field name="name">Check Register</field>
<field name="res_model">account.analytic.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('journal_id','=',active_id)]</field>
</record> -->
<!-- <menuitem action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_bank_and_cash"/>-->
<!-- <record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
<field name="name">Check Registers</field>
<field name="res_model">account.analytic.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('journal_id','=',active_id)]</field>
</record> -->
<!-- <menuitem action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_bank_and_cash"/>-->
<!-- <record id="ir_open_account_journal_analytic" model="ir.values">-->
<!-- <field eval="'tree_but_open'" name="key2"/>-->
<!-- <field eval="'account.analytic.journal'" name="model"/>-->
<!-- <field name="name">Open Analytic Journal</field>-->
<!-- <field eval="'ir.actions.act_window,%d'%action_account_analytic_journal_open_form" name="value"/>-->
<!-- <field eval="True" name="object"/>-->
<!-- </record>-->
<menuitem groups="analytic.group_analytic_accounting" action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_entries"/>
#
# Reporting
@ -390,16 +357,7 @@
<field name="view_type">tree</field>
<field name="help">To print an analytics (or costs) journal for a given period. The report give code, move name, account number, general amount and analytic amount.</field>
</record>
<menuitem action="action_account_analytic_journal_tree" id="account_analytic_journal_print" parent="account.next_id_40"/>
<!-- <record id="action_account_analytic_journal_tree2" model="ir.actions.act_window">-->
<!-- <field name="name">Analytic Entries by Journal</field>-->
<!-- <field name="res_model">account.analytic.journal</field>-->
<!-- <field name="view_type">tree</field>-->
<!-- <field name="view_id" ref="view_account_analytic_journal_tree"/>-->
<!-- </record>-->
<!-- <menuitem action="action_account_analytic_journal_tree2" id="account_analytic_journal_entries" parent="account.next_id_41"/>-->
<menuitem groups="analytic.group_analytic_accounting" action="action_account_analytic_journal_tree" id="account_analytic_journal_print" parent="account.next_id_40"/>
#
# Statistics
@ -469,18 +427,14 @@
</field>
</record>
<record id="report_account_analytic_journal_tree" model="ir.actions.act_window">
<field name="name">Account cost and revenue by journal</field>
<field name="res_model">report.hr.timesheet.invoice.journal</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="search_view_id" ref="report_hr_timesheet_invoice_journal_search"/>
</record>
<!-- <menuitem action="report_account_analytic_journal_tree" id="report_account_analytic_journal_print" parent="account.next_id_40"/>-->
<act_window domain="[('account_id', '=', active_id)]" id="act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal" name="All Analytic Entries" res_model="account.analytic.line" src_model="account.analytic.account" view_mode="tree,form" view_type="form"/>
<act_window domain="[('account_id', '=', active_id)]" id="act_acc_analytic_acc_2_report_hr_timesheet_invoice_journal" name="Costs &amp; Revenues" res_model="report.hr.timesheet.invoice.journal" src_model="account.analytic.account" view_mode="graph,tree,form" view_type="form"/>
<act_window
context="{'search_default_account_id': [active_id], 'search_default_user_id': False}"
id="act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal"
name="All Analytic Entries"
res_model="account.analytic.line"
src_model="account.analytic.account"
view_mode="tree,form"
view_type="form"/>
<record id="view_account_journal_1" model="ir.ui.view">
<field name="name">account.journal.form.1</field>

5
addons/account/project/report/__init__.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@ -24,7 +24,6 @@ import analytic_balance
import inverted_analytic_balance
import cost_ledger
import quantity_cost_ledger
import analytic_check
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

6
addons/account/project/report/analytic_balance.py
View File

@ -75,7 +75,7 @@ class account_analytic_balance(report_sxw.rml_parse):
sum(aal.amount) AS balance, sum(aal.unit_amount) AS quantity \
FROM account_analytic_line AS aal, account_account AS aa \
WHERE (aal.general_account_id=aa.id) \
AND (aal.account_id IN aal.account_id IN %s)\
AND (aal.account_id IN %s)\
AND (date>=%s) AND (date<=%s) AND aa.active \
GROUP BY aal.general_account_id, aa.name, aa.code, aal.code \
ORDER BY aal.code", (tuple(ids), date1, date2))
@ -101,7 +101,7 @@ class account_analytic_balance(report_sxw.rml_parse):
self.acc_data_dict[account_id] = ids
else:
ids = self.acc_data_dict[account_id]
query_params = (tuple(ids), date1, date2)
if option == "credit" :
self.cr.execute("SELECT -sum(amount) FROM account_analytic_line \
@ -154,7 +154,7 @@ class account_analytic_balance(report_sxw.rml_parse):
report_sxw.report_sxw('report.account.analytic.account.balance',
'account.analytic.account', 'addons/account/project/report/analytic_balance.rml',
parser=account_analytic_balance, header=False)
parser=account_analytic_balance, header="internal")
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

335
addons/account/project/report/analytic_balance.rml
View File

@ -1,39 +1,8 @@
<?xml version="1.0"?>
<document filename="test.pdf">
<template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
<template pageSize="(595.0,842.0)" title="Analytic Balance" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
<header>
<pageGraphics>
<!--logo-->
<!--<fill color="darkblue"/>-->
<!--<stroke color="darkblue"/>-->
<!--TITLE COMPANY-->
<!-- <drawString x="4.6cm" y="28.7cm">[[ company.partner_id.name ]]</drawString> -->
<setFont name="Helvetica-Bold" size="9"/>
<!--COL 1-->
<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
<drawRightString x="20cm" y="28.1cm">Analytic Balance - [[ company.currency_id.name ]]</drawRightString>
<!-- Header -->
<setFont name="Helvetica" size="9"/>
<drawString x="1.0cm" y="1cm"> [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]</drawString>
<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
<lineMode width="0.7"/>
<lines>1cm 27.7cm 20cm 27.7cm</lines>
<setFont name="Helvetica" size="8"/>
</pageGraphics>
</header>
</pageTemplate>
</template>
<stylesheet>
@ -41,156 +10,216 @@
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<blockTableStyle id="Table_Header_analytic">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,1" stop="-1,1"/>
<lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,2" stop="1,2"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,3" stop="-1,-1"/>
</blockTableStyle>
<blockTableStyle id="Table_Header_Tile">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
</blockTableStyle>
<blockTableStyle id="Table3">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
</blockTableStyle>
<blockTableStyle id="Table2">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="tbl_content">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="tbl_data">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#777777" start="0,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="Standard" fontName="Times-Roman"/>
<paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Times-Roman"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Footer" fontName="Times-Roman"/>
<paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Helvetica"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Footer" fontName="Helvetica"/>
<paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details" fontName="Helvetica" fontSize="8.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica" fontSize="8.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica" fontSize="8.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_8_right_bold" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_8_bold" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_space" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<images/>
</stylesheet>
<images/>
<story>
<blockTable colWidths="57.0,280.0,50.0,50.0,50.0,50.0" style="Table1">
<tr>
<td>
<para style="terp_tblheader_Details">Code</para>
</td>
<td>
<para style="terp_tblheader_Details">Account Name</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Debit </para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Credit</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Balance</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Quantity</para>
</td>
</tr>
<tr>
<td>
<para style="terp_tblheader_General">Total</para>
</td>
<td></td>
<td>
<para style="terp_tblheader_General_Right"><u>[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'debit')) ]]</u></para>
</td>
<td>
<para style="terp_tblheader_General_Right"><u>[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'credit')) ]]</u></para>
</td>
<td>
<para style="terp_tblheader_General_Right"><u>[[ formatLang(sum_balance(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'])) ]]</u></para>
</td>
<td>
<para style="terp_tblheader_General_Right"><u>[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'quantity')) ]]</u></para>
</td>
</tr>
</blockTable>
<section>
<para style="terp_default_8">[[ repeatIn(get_objects(data['form']['empty_acc']),'o') ]]</para>
<blockTable colWidths="57.0,280.0,50.0,50.0,50.0,50.0" style="tbl_data">
<tr>
<blockTable colWidths="482.0" style="Table_Header_analytic">
<tr>
<td>
<para style="terp_default_8_bold">[[ o['code'] ]]</para>
</td>
<td>
<para style="terp_default_8_bold">[[ o['complete_name'] ]]</para>
</td>
<td>
<para style="terp_default_8_right_bold"><u>[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'], 'debit')) ]]</u></para>
</td>
<td>
<para style="terp_default_8_right_bold"><u>[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'], 'credit')) ]]</u></para>
</td>
<td>
<para style="terp_default_8_right_bold"><u>[[ formatLang(move_sum_balance(o['id'],data['form']['date1'],data['form']['date2'])) ]]</u></para>
</td>
<td>
<para style="terp_default_8_right_bold"><u>[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'], 'quantity')) ]]</u></para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_8">[[ repeatIn(lines_g(o['id'],data['form']['date1'],data['form']['date2']),'move_g') ]]</para>
<para style="terp_default_8">[[ move_g['code'] ]]</para>
</td>
<td>
<para style="terp_default_8">[[ move_g['name'] ]]</para>
</td>
<td>
<para style="terp_default_Right_8">[[ formatLang(move_g['debit'])]]</para>
</td>
<td>
<para style="terp_default_Right_8">[[ formatLang(move_g['credit']) ]]</para>
</td>
<td>
<para style="terp_default_Right_8">[[ formatLang(move_g['balance'])]]</para>
</td>
<td>
<para style="terp_default_Right_8">[[ formatLang(move_g['quantity']) ]]</para>
</td>
</tr>
<para style="terp_header_Centre">Analytic Balance - [[ company.currency_id.name ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_space">
<font color="white"> </font>
</para>
<blockTable colWidths="55.0,221.0,55.0,52.0,60.0,39.0" style="Table_Header_Tile">
<tr>
<td>
<para style="terp_tblheader_Details">Code</para>
</td>
<td>
<para style="terp_tblheader_Details">Account Name</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Debit<font face="Helvetica" size="8.0">([[ company.currency_id.name]])</font></para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Credit(<font face="Helvetica" size="8.0">[[ company.currency_id.name]])</font></para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Balance<font face="Helvetica" size="8.0">([[ company.currency_id.name]])</font></para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Quantity</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<blockTable colWidths="54.0,222.0,56.0,51.0,62.0,38.0" style="Table1">
<tr>
<td>
<para style="terp_tblheader_Details">Total</para>
</td>
<td>
<para style="terp_tblheader_Details">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'debit')) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'credit')) ]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'quantity')) ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<section>
<para style="terp_default_8">[[ repeatIn(get_objects(data['form']['empty_acc']),'o') ]]</para>
<blockTable colWidths="55.0,221.0,56.0,50.0,62.0,38.0" style="Table3">
<tr>
<td>
<para style="terp_default_Bold_9">[[ o['code'] ]]</para>
</td>
<td>
<para style="terp_default_Bold_9">[[ o['complete_name'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'debit')) ]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'credit')) ]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ formatLang(move_sum_balance(o['id'],data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'quantity')) ]]</para>
</td>
</tr>
</blockTable>
</section>
<para style="terp_default_8">
<para style="terp_default_2">
<font color="white"> </font>
</para>
<section>
<para style="terp_default_8">[[ repeatIn(lines_g(o['id'],data['form']['date1'],data['form']['date2']),'move_g') ]]</para>
<blockTable colWidths="55.0,222.0,56.0,49.0,63.0,37.0" style="Table2">
<tr>
<td>
<para style="terp_default_9">[[ move_g['code'] ]]</para>
</td>
<td>
<para style="terp_default_9">[[ move_g['name'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(move_g['debit'])]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(move_g['credit']) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(move_g['balance'])]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(move_g['quantity']) ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
</section>
<para style="terp_default_2">
<font color="white"> </font>
</para>
</section>
<para style="terp_default_9">
<font color="white"> </font>
</para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
<para style="Standard">
<font color="white"> </font>
</para>
</story>
</document>

100
addons/account/project/report/analytic_check.py
View File

@ -1,100 +0,0 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import time
import pooler
from report import report_sxw
class account_analytic_analytic_check(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
super(account_analytic_analytic_check, self).__init__(cr, uid, name, context=context)
self.sum_gen_deb = 0.0
self.sum_gen_cred = 0.0
self.sum_ana_deb = 0.0
self.sum_ana_cred = 0.0
self.localcontext.update( {
'time': time,
'lines_p': self._lines_p,
'general_debit': self._gen_deb,
'general_credit': self._gen_cred,
'analytic_debit': self._ana_deb,
'analytic_credit': self._ana_cred,
'delta_debit': self._delta_deb,
'delta_credit': self._delta_cred,
})
def _lines_p(self, date1, date2):
res = []
acc_obj = self.pool.get('account.account')
for a in acc_obj.read(self.cr, self.uid, self.ids, ['name', 'code']):
self.cr.execute("SELECT sum(debit), sum(credit) \
FROM account_move_line \
WHERE date>=%s AND date<=%s AND state<>'draft' AND account_id = %s", (date1, date2, a['id']))
(gd, gc) = self.cr.fetchone()
gd = gd or 0.0
gc = gc or 0.0
self.cr.execute("SELECT abs(sum(amount)) AS balance \
FROM account_analytic_line \
WHERE date>=%s AND date<=%s AND amount<0 AND general_account_id = %s", (date1, date2, a['id']))
(ad,) = self.cr.fetchone()
ad = ad or 0.0
self.cr.execute("SELECT abs(sum(amount)) AS balance \
FROM account_analytic_line \
WHERE date>=%s AND date<=%s AND amount>0 AND general_account_id = %s", (date1, date2, a['id']))
(ac,) = self.cr.fetchone()
ac = ac or 0.0
res.append({'code': a['code'], 'name': a['name'],
'gen_debit': gd,
'gen_credit': gc,
'ana_debit': ad,
'ana_credit': ac,
'delta_debit': gd - ad,
'delta_credit': gc - ac,})
self.sum_gen_deb += gd
self.sum_gen_cred += gc
self.sum_ana_deb += ad
self.sum_ana_cred += ac
return res
def _gen_deb(self, date1, date2):
return self.sum_gen_deb
def _gen_cred(self, date1, date2):
return self.sum_gen_cred
def _ana_deb(self, date1, date2):
return self.sum_ana_deb
def _ana_cred(self, date1, date2):
return self.sum_ana_cred
def _delta_deb(self, date1, date2):
return (self._gen_deb(date1,date2)-self._ana_deb(date1,date2))
def _delta_cred(self, date1, date2):
return (self._gen_cred(date1,date2)-self._ana_cred(date1,date2))
report_sxw.report_sxw('report.account.analytic.account.analytic.check', 'account.analytic.account', 'addons/account/project/report/analytic_check.rml',parser=account_analytic_analytic_check, header=False)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

190
addons/account/project/report/analytic_check.rml
View File

@ -1,190 +0,0 @@
<?xml version="1.0"?>
<document filename="test.pdf">
<template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
<header>
<pageGraphics>
<!--logo-->
<!--<fill color="darkblue"/>-->
<!--<stroke color="darkblue"/>-->
<!--TITLE COMPANY-->
<!-- <drawString x="4.6cm" y="28.7cm">[[ company.partner_id.name ]]</drawString> -->
<setFont name="Helvetica-Bold" size="9"/>
<!--COL 1-->
<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
<drawRightString x="20cm" y="28.1cm">Analytic Check - [[ company.currency_id.name ]]</drawRightString>
<!-- Header -->
<setFont name="Helvetica" size="9"/>
<drawString x="1.0cm" y="1cm"> [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]</drawString>
<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
<lineMode width="0.7"/>
<lines>1cm 27.7cm 20cm 27.7cm</lines>
<setFont name="Helvetica" size="8"/>
</pageGraphics>
</header>
</pageTemplate>
</template>
<stylesheet>
<blockTableStyle id="Standard_Outline">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table4">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,2" stop="1,2"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,1" stop="-1,1"/>
</blockTableStyle>
<blockTableStyle id="Table5">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table3">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="-1,-1"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
<lineStyle kind="LINEBELOW" colorName="#777777" start="0,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
<blockValign value="TOP"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P2" fontName="Times-Roman" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Standard" fontName="Times-Roman"/>
<paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Times-Roman"/>
<paraStyle name="Preformatted Text" fontName="Courier" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_General" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General_R" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Footer" fontName="Times-Roman"/>
<paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
</stylesheet>
<images/>
<story>
<blockTable colWidths="46.0,135.0,60.0,59.0,60.0,59.0,59.0,60.0" style="Table4" repeatRows="1">
<tr>
<td>
<para style="terp_tblheader_General">Code</para>
</td>
<td>
<para style="terp_tblheader_General">Account Name</para>
</td>
<td>
<para style="terp_tblheader_General_R">General Debit</para>
</td>
<td>
<para style="terp_tblheader_General_R">General Credit</para>
</td>
<td>
<para style="terp_tblheader_General_R">Analytic Debit</para>
</td>
<td>
<para style="terp_tblheader_General_R">Analytic Credit</para>
</td>
<td>
<para style="terp_tblheader_General_R">Delta Debit</para>
</td>
<td>
<para style="terp_tblheader_General_R">Delta Credit</para>
</td>
</tr>
<tr>
<td>
<para style="terp_tblheader_Details">[[ (lines_p(data['form']['date1'],data['form']['date2']),'acc') == False or removeParentNode('para') ]]</para>
<para style="terp_tblheader_Details">Total</para>
</td>
<td></td>
<td>
<para style="terp_tblheader_General_Right"><u>[[ formatLang( general_debit(data['form']['date1'],data['form']['date2'])) ]]</u></para>
</td>
<td>
<para style="terp_tblheader_General_Right"><u>[[ formatLang( general_credit(data['form']['date1'],data['form']['date2'])) ]]</u></para>
</td>
<td>
<para style="terp_tblheader_General_Right"><u>[[ formatLang( analytic_debit(data['form']['date1'],data['form']['date2'])) ]]</u></para>
</td>
<td>
<para style="terp_tblheader_General_Right"><u>[[ formatLang( analytic_credit(data['form']['date1'],data['form']['date2'])) ]]</u></para>
</td>
<td>
<para style="terp_tblheader_General_Right"><u>[[ formatLang( delta_debit(data['form']['date1'],data['form']['date2'])) ]]</u></para>
</td>
<td>
<para style="terp_tblheader_General_Right"><u>[[ formatLang( delta_credit(data['form']['date1'],data['form']['date2'])) ]]</u></para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_8"><font face="Times-Roman">[[ repeatIn(lines_p(data['form']['date1'],data['form']['date2']),'acc') ]] </font>[[ acc['code'] ]]</para>
</td>
<td>
<para style="terp_default_8">[[ acc['name'] ]]</para>
</td>
<td>
<para style="terp_default_Right_8">[[ formatLang( acc['gen_debit']) ]]</para>
</td>
<td>
<para style="terp_default_Right_8">[[ formatLang( acc['gen_credit']) ]]</para>
</td>
<td>
<para style="terp_default_Right_8">[[ formatLang( acc['ana_debit']) ]]</para>
</td>
<td>
<para style="terp_default_Right_8">[[ formatLang( acc['ana_credit']) ]]</para>
</td>
<td>
<para style="terp_default_Right_8">[[ formatLang( acc['delta_debit']) ]]</para>
</td>
<td>
<para style="terp_default_Right_8">[[ formatLang( acc['delta_credit']) ]]</para>
</td>
</tr>
</blockTable>
</story>
</document>

2
addons/account/project/report/analytic_journal.py
View File

@ -57,7 +57,7 @@ class account_analytic_journal(report_sxw.rml_parse):
res = self.cr.dictfetchone()
return res['sum'] or 0
report_sxw.report_sxw('report.account.analytic.journal', 'account.analytic.journal', 'addons/account/project/report/analytic_journal.rml',parser=account_analytic_journal,header=False)
report_sxw.report_sxw('report.account.analytic.journal', 'account.analytic.journal', 'addons/account/project/report/analytic_journal.rml',parser=account_analytic_journal,header="internal")
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

58
addons/account/project/report/analytic_journal.rml
View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<document filename="test.pdf">
<template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
<template pageSize="(595.0,842.0)" title="Analytic Journal" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
</pageTemplate>
@ -64,6 +64,34 @@
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
</blockTableStyle>
<blockTableStyle id="Table5">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
</blockTableStyle>
<blockTableStyle id="Table6">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
@ -116,16 +144,36 @@
<images/>
<story>
<para style="P12">[[ repeatIn(objects,'o') ]]</para>
<blockTable colWidths="539.0" style="Table_Tilte">
<para style="terp_default_8">
<font color="white"> </font>
</para>
<para style="terp_header_Centre">Analytic Journal</para>
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="180.0,180.0,180.0" style="Table5">
<tr>
<td>
<para style="terp_header_Centre">Analytic Journal - [[ company.currency_id.name ]]</para>
<para style="terp_tblheader_Details_Centre">Period from</para>
</td>
<td>
<para style="terp_tblheader_Details_Centre">Period to</para>
</td>
<td>
<para style="terp_tblheader_Details_Centre">Currency</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="180.0,180.0,180.0" style="Table6">
<tr>
<td>
<para style="terp_header_Centre">Period from : [[ data['form']['date1'] ]]</para>
<para style="terp_header_Centre">to : [[ data['form']['date2'] ]]</para>
<para style="terp_default_Centre_8">[[ formatLang(data['form']['date1'],date=True) ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ formatLang(data['form']['date2'],date=True) ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ company.currency_id.name ]]</para>
</td>
</tr>
</blockTable>

2
addons/account/project/report/cost_ledger.py
View File

@ -108,7 +108,7 @@ class account_analytic_cost_ledger(report_sxw.rml_parse):
credit = self._sum_credit(accounts, date1, date2) or 0.0
return (debit-credit)
report_sxw.report_sxw('report.account.analytic.account.cost_ledger', 'account.analytic.account', 'addons/account/project/report/cost_ledger.rml',parser=account_analytic_cost_ledger, header=False)
report_sxw.report_sxw('report.account.analytic.account.cost_ledger', 'account.analytic.account', 'addons/account/project/report/cost_ledger.rml',parser=account_analytic_cost_ledger, header="internal")
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

81
addons/account/project/report/cost_ledger.rml
View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<document filename="test.pdf">
<template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
<template pageSize="(595.0,842.0)" title="Cost Ledger" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
</pageTemplate>
@ -10,7 +10,7 @@
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table_Heading_Content">
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
@ -82,16 +82,16 @@
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="Standard" fontName="Times-Roman"/>
<paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Times-Roman"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Helvetica"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Footer" fontName="Times-Roman"/>
<paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="Footer" fontName="Helvetica"/>
<paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
@ -115,12 +115,12 @@
<paraStyle name="terp_Default_Bold_Right_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_Default_Bold_Right_9_U" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_Default_Right_9_U" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9_Italic" fontName="Times-Italic" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9_italic_Rignt" fontName="Times-Italic" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9_Italic" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9_italic_Rignt" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<images/>
</stylesheet>
<images/>
<story>
<blockTable colWidths="161.0,161.0,161.0" repeatRows="1" style="Table_Heading_Content">
<blockTable colWidths="161.0,161.0,161.0" repeatRows="1" style="Table1">
<tr>
<td>
<para style="terp_default_9">
@ -137,15 +137,6 @@
</td>
</tr>
</blockTable>
<para style="terp_default_8">
<font color="white"> </font>
</para>
<para style="terp_default_8">
<font color="white"> </font>
</para>
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="161.0,161.0,161.0" style="Table_Date_Sub_detail">
<tr>
<td>
@ -162,13 +153,13 @@
<blockTable colWidths="161.0,161.0,161.0" style="Table_Sub_Content">
<tr>
<td>
<para style="terp_tblheader_General_Centre">[[ formatLang(data['form']['date1'],date = True) ]]</para>
<para style="terp_default_Centre_8">[[ formatLang(data['form']['date1'],date = True) ]]</para>
</td>
<td>
<para style="terp_tblheader_General_Centre">[[ formatLang(data['form']['date2'],date = True) ]]</para>
<para style="terp_default_Centre_8">[[ formatLang(data['form']['date2'],date = True) ]]</para>
</td>
<td>
<para style="terp_tblheader_General_Centre">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]]</para>
<para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]]</para>
</td>
</tr>
</blockTable>
@ -178,19 +169,19 @@
<blockTable colWidths="63.0,249.0,57.0,57.0,57.0" style="Table_Header_Title">
<tr>
<td>
<para style="terp_tblheader_Details">Date or Code</para>
<para style="terp_tblheader_Details">Date/Code</para>
</td>
<td>
<para style="terp_tblheader_Details">J.C. or Move name</para>
<para style="terp_tblheader_Details">J.C. /Move name</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Debit </para>
<para style="terp_tblheader_Details_Right">Debit([[ company.currency_id.code]])</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Credit</para>
<para style="terp_tblheader_Details_Right">Credit([[ company.currency_id.code]])</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Balance</para>
<para style="terp_tblheader_Details_Centre">Balance([[ company.currency_id.code]])</para>
</td>
</tr>
</blockTable>
@ -208,13 +199,13 @@
</para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_credit(objects,data['form']['date1'],data['form']['date2'])) ]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_credit(objects,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_balance(objects,data['form']['date1'],data['form']['date2'])) ]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_balance(objects,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@ -232,13 +223,13 @@
<para style="terp_default_Bold_9">[[ o.complete_name ]]</para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_debit(o.id,data['form']['date1'],data['form']['date2'])) ]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_debit(o.id,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_credit(o.id,data['form']['date1'],data['form']['date2'])) ]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_credit(o.id,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_balance(o.id,data['form']['date1'],data['form']['date2']))]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_balance(o.id,data['form']['date1'],data['form']['date2']))]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@ -256,13 +247,13 @@
<para style="terp_default_Bold_9">[[ move_g['name'] ]]</para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['debit']) ]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['debit']) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['credit']) ]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['credit']) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['balance']) ]]</para>
<para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['balance']) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@ -283,13 +274,13 @@
<para style="terp_default_9_Italic">[[ move_a['name'] ]]</para>
</td>
<td>
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['debit'] )]]</para>
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['debit'] )]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['credit']) ]]</para>
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['credit']) ]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['balance']) ]]</para>
<para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['balance']) ]] [[ company.currency_id.symbol]]</para>
</td>
</tr>
</blockTable>
@ -306,4 +297,4 @@
<font color="white"> </font>
</para>
</story>
</document>
</document>

2
addons/account/project/report/inverted_analytic_balance.py
View File

@ -120,7 +120,7 @@ class account_inverted_analytic_balance(report_sxw.rml_parse):
WHERE account_id IN %s AND date>=%s AND date<=%s", (tuple(ids),date1, date2,))
return self.cr.fetchone()[0] or 0.0
report_sxw.report_sxw('report.account.analytic.account.inverted.balance', 'account.analytic.account', 'addons/account/project/report/inverted_analytic_balance.rml',parser=account_inverted_analytic_balance, header=False)
report_sxw.report_sxw('report.account.analytic.account.inverted.balance', 'account.analytic.account', 'addons/account/project/report/inverted_analytic_balance.rml',parser=account_inverted_analytic_balance, header="internal")
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

49
addons/account/project/report/inverted_analytic_balance.rml
View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<document filename="test.pdf">
<template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
<template pageSize="(595.0,842.0)" title="Inverted Analytic Balance" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
</pageTemplate>
@ -84,8 +84,8 @@
<paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_space" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<images/>
</stylesheet>
<images/>
<story>
<blockTable colWidths="539.0" style="Table_Title">
<tr>
@ -94,10 +94,7 @@
</td>
</tr>
</blockTable>
<para style="terp_default_space">
<font color="white"> </font>
</para>
<para style="terp_default_space">
<para style="Text body">
<font color="white"> </font>
</para>
<blockTable colWidths="58.0,238.0,62.0,62.0,60.0,59.0" style="Table_Header_table">
@ -109,13 +106,13 @@
<para style="terp_tblheader_Details">Name</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Debit</para>
<para style="terp_tblheader_Details_Right">Debit<font face="Helvetica" size="8.0">([[ company.currency_id.code]])</font></para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Credit</para>
<para style="terp_tblheader_Details_Right">Credit<font face="Helvetica" size="8.0">([[ company.currency_id.code]])</font></para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Balance </para>
<para style="terp_tblheader_Details_Right">Balance<font face="Helvetica" size="8.0">([[ company.currency_id.code]])</font></para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Quantity</para>
@ -136,22 +133,19 @@
</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]]</para>
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_credit(objects,data['form']['date1'],data['form']['date2']))]]</para>
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_credit(objects,data['form']['date1'],data['form']['date2']))]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']))]]</para>
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']))]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(sum_quantity(objects,data['form']['date1'],data['form']['date2'])) ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<section>
<para style="terp_default_8">[[ repeatIn(lines_g(objects,data['form']['date1'],data['form']['date2']),'move_g') ]]</para>
<blockTable colWidths="58.0,238.0,62.0,62.0,60.0,59.0" style="Table3">
@ -163,22 +157,19 @@
<para style="terp_default_Bold_9">[[ move_g['name'] ]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(move_g['debit'])]]</para>
<para style="terp_tblheader_Details_Right">[[ formatLang(move_g['debit'])]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[formatLang(move_g['credit'])]]</para>
<para style="terp_tblheader_Details_Right">[[formatLang(move_g['credit'])]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(move_g['balance'])]]</para>
<para style="terp_tblheader_Details_Right">[[ formatLang(move_g['balance'])]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[formatLang(move_g['quantity']) ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<section>
<para style="terp_default_8">[[ repeatIn(lines_a(objects,move_g['id'],data['form']['date1'],data['form']['date2']),'move_a') ]]</para>
<blockTable colWidths="58.0,238.0,62.0,62.0,60.0,59.0" style="Table4">
@ -190,16 +181,16 @@
<para style="terp_default_9">[[ move_a['complete_name'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(move_a['debit']) ]]</para>
<para style="terp_default_Right_9">[[ formatLang(move_a['debit']) ]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(move_a['credit']) ]]</para>
<para style="terp_default_Right_9">[[ formatLang(move_a['credit']) ]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(move_a['balance']) ]]</para>
<para style="terp_default_Right_9">[[ formatLang(move_a['balance']) ]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(move_a['quantity'] or 0.00) ]]</para>
<para style="terp_default_Right_9">[[ formatLang(move_a['quantity']) ]]</para>
</td>
</tr>
</blockTable>
@ -207,12 +198,6 @@
<font color="white"> </font>
</para>
</section>
<para style="terp_default_2">
<font color="white"> </font>
</para>
</section>
<para style="terp_default_2">
<font color="white"> </font>
</para>
</story>
</document>
</document>

4
addons/account/project/report/quantity_cost_ledger.py
View File

@ -120,6 +120,6 @@ class account_analytic_quantity_cost_ledger(report_sxw.rml_parse):
report_sxw.report_sxw('report.account.analytic.account.quantity_cost_ledger',
'account.analytic.account',
'addons/account/project/report/quantity_cost_ledger.rml',
parser=account_analytic_quantity_cost_ledger, header=False)
parser=account_analytic_quantity_cost_ledger, header="internal")
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

81
addons/account/project/report/quantity_cost_ledger.rml
View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<document filename="test.pdf">
<template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
<template pageSize="(595.0,842.0)" title="Cost Ledger" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
</pageTemplate>
@ -79,16 +79,16 @@
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="Standard" fontName="Times-Roman"/>
<paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Times-Roman"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Helvetica"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Footer" fontName="Times-Roman"/>
<paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="Footer" fontName="Helvetica"/>
<paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
@ -110,12 +110,12 @@
<paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9_Italic" fontName="Times-Italic" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9_Italic_Right" fontName="Times-Italic" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9_Italic" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9_Italic_Right" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Rignt_9_U" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9_Right_U" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<images/>
</stylesheet>
<images/>
<story>
<blockTable colWidths="161.0,161.0,161.0" repeatRows="1" style="Table_Header_Detail">
<tr>
@ -134,15 +134,6 @@
</td>
</tr>
</blockTable>
<para style="terp_default_8">
<font color="white"> </font>
</para>
<para style="terp_default_8">
<font color="white"> </font>
</para>
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="161.0,161.0,161.0" style="Table_Date_Detail">
<tr>
<td>
@ -159,13 +150,13 @@
<blockTable colWidths="161.0,161.0,161.0" style="Table_Date_Content">
<tr>
<td>
<para style="terp_tblheader_General_Centre">[[ formatLang(data['form']['date1'],date = True) ]]</para>
<para style="terp_default_Centre_8">[[ formatLang(data['form']['date1'],date = True) ]]</para>
</td>
<td>
<para style="terp_tblheader_General_Centre">[[ formatLang(data['form']['date2'],date = True) ]]</para>
<para style="terp_default_Centre_8">[[ formatLang(data['form']['date2'],date = True) ]]</para>
</td>
<td>
<para style="terp_tblheader_General_Centre">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]]</para>
<para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]]</para>
</td>
</tr>
</blockTable>
@ -175,7 +166,7 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="82.0,247.0,92.0,60.0" style="Table_Header_Move_Line">
<blockTable colWidths="57.0,288.0,77.0,60.0" style="Table_Header_Move_Line">
<tr>
<td>
<para style="terp_tblheader_Details">Code/Date</para>
@ -191,10 +182,7 @@
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<blockTable colWidths="81.0,249.0,92.0,60.0" style="Table_Final_Total">
<blockTable colWidths="57.0,288.0,77.0,60.0" style="Table_Final_Total">
<tr>
<td>
<para style="terp_default_Bold_9">Total:</para>
@ -214,21 +202,15 @@
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<section>
<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<blockTable colWidths="81.0,249.0,92.0,59.0" style="Table_Account_Detail">
<blockTable colWidths="58.0,287.0,78.0,59.0" style="Table_Account_Detail">
<tr>
<td>
<para style="terp_default_Bold_9">[[ o.code ]]<font face="Times-Roman" size="10.0"/></para>
<para style="terp_default_Bold_9">[[ o.code ]]<font face="Helvetica" size="10.0"/></para>
</td>
<td>
<para style="terp_default_Bold_9">[[ o.complete_name ]]<font face="Times-Roman" size="10.0"/></para>
<para style="terp_default_Bold_9">[[ o.complete_name ]]<font face="Helvetica" size="10.0"/></para>
</td>
<td>
<para style="terp_default_Bold_9">Max Qty: [[ formatLang (o.quantity_max )]]</para>
@ -238,15 +220,9 @@
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<section>
<para style="terp_default_8">[[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_g') ]]</para>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<blockTable colWidths="81.0,342.0,59.0" style="Table_Analytical_Detail">
<blockTable colWidths="58.0,365.0,59.0" style="Table_Analytical_Detail">
<tr>
<td>
<para style="terp_default_Bold_9">[[ move_g['code'] ]] </para>
@ -259,7 +235,7 @@
</td>
</tr>
</blockTable>
<blockTable colWidths="81.0,51.0,290.0,59.0" style="Table_Move_Line_Content">
<blockTable colWidths="59.0,32.0,332.0,59.0" style="Table_Move_Line_Content">
<tr>
<td>
<para style="terp_default_9_Italic">[[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_a') ]]</para>
@ -280,15 +256,6 @@
<font color="white"> </font>
</para>
</section>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<para style="terp_default_2">
<font color="white"> </font>
</para>
</section>
<para style="terp_default_2">
<font color="white"> </font>
</para>
</story>
</document>
</document>

3
addons/account/project/wizard/__init__.py
View File

@ -24,8 +24,7 @@ import account_analytic_balance_report
import account_analytic_inverted_balance_report
import account_analytic_cost_ledger_report
import account_analytic_cost_ledger_for_journal_report
import account_analytic_check
import project_account_analytic_line
import account_analytic_chart
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

4
addons/account/project/wizard/account_analytic_balance_report.py
View File

@ -30,12 +30,12 @@ class account_analytic_balance(osv.osv_memory):
'date1': fields.date('Start of period', required=True),
'date2': fields.date('End of period', required=True),
'empty_acc': fields.boolean('Empty Accounts ? ', help='Check if you want to display Accounts with 0 balance too.'),
}
}
_defaults = {
'date1':time.strftime('%Y-01-01'),
'date2':time.strftime('%Y-%m-%d')
}
}
def check_report(self, cr, uid, ids, context=None):
datas = {}

2
addons/account/project/wizard/account_analytic_chart.py
View File

@ -27,7 +27,7 @@ class account_analytic_chart(osv.osv_memory):
_columns = {
'from_date': fields.date('From'),
'to_date': fields.date('To'),
}
}
def analytic_account_chart_open_window(self, cr, uid, ids, context=None):
mod_obj = self.pool.get('ir.model.data')

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