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

[MERGE] upstream 

bzr revid: hmo@tinyerp.com-20120716111343-z05o5wes4wj1apbo
This commit is contained in:
Harry (OpenERP) 2012-07-16 16:43:43 +05:30
parent 58677aa2df 08d2eb4828
commit 5ca4e7a371
5930 changed files with 131947 additions and 36941 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
addons/account/account.py
View File

@ -1862,8 +1862,10 @@ class account_tax(osv.osv):
'applicable_type': fields.selection( [('true','Always'), ('code','Given by Python Code')], 'Applicability', required=True,
help="If not applicable (computed through a Python code), the tax won't appear on the invoice."),
'domain':fields.char('Domain', size=32, help="This field is only used if you develop your own module allowing developers to create specific taxes in a custom domain."),
'account_collected_id':fields.many2one('account.account', 'Invoice Tax Account'),
'account_paid_id':fields.many2one('account.account', 'Refund Tax Account'),
'account_collected_id':fields.many2one('account.account', 'Invoice Tax Account', help="Set the account that will be set by default on invoice tax lines for invoices. Leave empty to use the expense account."),
'account_paid_id':fields.many2one('account.account', 'Refund Tax Account', help="Set the account that will be set by default on invoice tax lines for refunds. Leave empty to use the expense account."),
'account_analytic_collected_id':fields.many2one('account.analytic.account', 'Invoice Tax Analytic Account', help="Set the analytic account that will be used by default on the invoice tax lines for invoices. Leave empty if you don't want to use an analytic account on the invoice tax lines by default."),
'account_analytic_paid_id':fields.many2one('account.analytic.account', 'Refund Tax Analytic Account', help="Set the analytic account that will be used by default on the invoice tax lines for refunds. Leave empty if you don't want to use an analytic account on the invoice tax lines by default."),
'parent_id':fields.many2one('account.tax', 'Parent Tax Account', select=True),
'child_ids':fields.one2many('account.tax', 'parent_id', 'Child Tax Accounts'),
'child_depend':fields.boolean('Tax on Children', help="Set if the tax computation is based on the computation of child taxes rather than on the total amount."),
@ -2001,6 +2003,8 @@ class account_tax(osv.osv):
'name':tax.description and tax.description + " - " + tax.name or tax.name,
'account_collected_id':tax.account_collected_id.id,
'account_paid_id':tax.account_paid_id.id,
'account_analytic_collected_id': tax.account_analytic_collected_id.id,
'account_analytic_paid_id': tax.account_analytic_paid_id.id,
'base_code_id': tax.base_code_id.id,
'ref_base_code_id': tax.ref_base_code_id.id,
'sequence': tax.sequence,
@ -2066,7 +2070,20 @@ class account_tax(osv.osv):
'taxes': [] # List of taxes, see compute for the format
}
"""
# By default, for each tax, tax amount will first be computed
# and rounded at the 'Account' decimal precision for each
# PO/SO/invoice line and then these rounded amounts will be
# summed, leading to the total amount for that tax. But, if the
# company has tax_calculation_rounding_method = round_globally,
# we still follow the same method, but we use a much larger
# precision when we round the tax amount for each line (we use
# the 'Account' decimal precision + 5), and that way it's like
# rounding after the sum of the tax amounts of each line
precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
tax_compute_precision = precision
if taxes and taxes[0].company_id.tax_calculation_rounding_method == 'round_globally':
tax_compute_precision += 5
totalin = totalex = round(price_unit * quantity, precision)
tin = []
tex = []
@ -2075,7 +2092,7 @@ class account_tax(osv.osv):
tex.append(tax)
else:
tin.append(tax)
tin = self.compute_inv(cr, uid, tin, price_unit, quantity, product=product, partner=partner)
tin = self.compute_inv(cr, uid, tin, price_unit, quantity, product=product, partner=partner, precision=tax_compute_precision)
for r in tin:
totalex -= r.get('amount', 0.0)
totlex_qty = 0.0
@ -2083,7 +2100,7 @@ class account_tax(osv.osv):
totlex_qty = totalex/quantity
except:
pass
tex = self._compute(cr, uid, tex, totlex_qty, quantity,product=product, partner=partner)
tex = self._compute(cr, uid, tex, totlex_qty, quantity, product=product, partner=partner, precision=tax_compute_precision)
for r in tex:
totalin += r.get('amount', 0.0)
return {
@ -2096,7 +2113,7 @@ class account_tax(osv.osv):
_logger.warning("Deprecated, use compute_all(...)['taxes'] instead of compute(...) to manage prices with tax included")
return self._compute(cr, uid, taxes, price_unit, quantity, product, partner)
def _compute(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None):
def _compute(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None, precision=None):
"""
Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
@ -2105,14 +2122,15 @@ class account_tax(osv.osv):
tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
one tax for each tax id in IDS and their children
"""
if not precision:
precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
res = self._unit_compute(cr, uid, taxes, price_unit, product, partner, quantity)
total = 0.0
precision_pool = self.pool.get('decimal.precision')
for r in res:
if r.get('balance',False):
r['amount'] = round(r.get('balance', 0.0) * quantity, precision_pool.precision_get(cr, uid, 'Account')) - total
r['amount'] = round(r.get('balance', 0.0) * quantity, precision) - total
else:
r['amount'] = round(r.get('amount', 0.0) * quantity, precision_pool.precision_get(cr, uid, 'Account'))
r['amount'] = round(r.get('amount', 0.0) * quantity, precision)
total += r['amount']
return res
@ -2160,6 +2178,8 @@ class account_tax(osv.osv):
'amount': amount,
'account_collected_id': tax.account_collected_id.id,
'account_paid_id': tax.account_paid_id.id,
'account_analytic_collected_id': tax.account_analytic_collected_id.id,
'account_analytic_paid_id': tax.account_analytic_paid_id.id,
'base_code_id': tax.base_code_id.id,
'ref_base_code_id': tax.ref_base_code_id.id,
'sequence': tax.sequence,
@ -2188,7 +2208,7 @@ class account_tax(osv.osv):
r['todo'] = 0
return res
def compute_inv(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None):
def compute_inv(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None, precision=None):
"""
Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
Price Unit is a VAT included price
@ -2198,15 +2218,15 @@ class account_tax(osv.osv):
tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
one tax for each tax id in IDS and their children
"""
if not precision:
precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
res = self._unit_compute_inv(cr, uid, taxes, price_unit, product, partner=None)
total = 0.0
obj_precision = self.pool.get('decimal.precision')
for r in res:
prec = obj_precision.precision_get(cr, uid, 'Account')
if r.get('balance',False):
r['amount'] = round(r['balance'] * quantity, prec) - total
r['amount'] = round(r['balance'] * quantity, precision) - total
else:
r['amount'] = round(r['amount'] * quantity, prec)
r['amount'] = round(r['amount'] * quantity, precision)
total += r['amount']
return res

4
addons/account/account_analytic_line.py
View File

@ -34,8 +34,8 @@ class account_analytic_line(osv.osv):
'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='restrict', 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),
'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 = {

6
addons/account/account_bank.py
View File

@ -43,6 +43,12 @@ class bank(osv.osv):
"Return the name to use when creating a bank journal"
return (bank.bank_name or '') + ' ' + bank.acc_number
def _prepare_name_get(self, cr, uid, bank_type_obj, bank_obj, context=None):
"""Add ability to have %(currency_name)s in the format_layout of
res.partner.bank.type"""
bank_obj._data[bank_obj.id]['currency_name'] = bank_obj.currency_id and bank_obj.currency_id.name or ''
return super(bank, self)._prepare_name_get(cr, uid, bank_type_obj, bank_obj, context=context)
def post_write(self, cr, uid, ids, context={}):
if isinstance(ids, (int, long)):
ids = [ids]

20
addons/account/account_invoice.py
View File

@ -195,7 +195,7 @@ class account_invoice(osv.osv):
'number': fields.related('move_id','name', type='char', readonly=True, size=64, relation='account.move', store=True, string='Number'),
'internal_number': fields.char('Invoice Number', size=32, readonly=True, help="Unique number of the invoice, computed automatically when the invoice is created."),
'reference': fields.char('Invoice Reference', size=64, help="The partner reference of this invoice."),
'reference_type': fields.selection(_get_reference_type, 'Reference Type',
'reference_type': fields.selection(_get_reference_type, 'Payment Reference',
required=True, readonly=True, states={'draft':[('readonly',False)]}),
'comment': fields.text('Additional Information'),
@ -756,7 +756,7 @@ class account_invoice(osv.osv):
for tax in inv.tax_line:
if tax.manual:
continue
key = (tax.tax_code_id.id, tax.base_code_id.id, tax.account_id.id)
key = (tax.tax_code_id.id, tax.base_code_id.id, tax.account_id.id, tax.account_analytic_id.id)
tax_key.append(key)
if not key in compute_taxes:
raise osv.except_osv(_('Warning !'), _('Global taxes defined, but they are not in invoice lines !'))
@ -1345,7 +1345,7 @@ class account_invoice_line(osv.osv):
_name = "account.invoice.line"
_description = "Invoice Line"
_columns = {
'name': fields.char('Description', size=256, required=True),
'name': fields.text('Description', required=True),
'origin': fields.char('Source', size=256, help="Reference of the document that produced this invoice."),
'invoice_id': fields.many2one('account.invoice', 'Invoice Reference', ondelete='cascade', select=True),
'uos_id': fields.many2one('product.uom', 'Unit of Measure', ondelete='set null'),
@ -1357,7 +1357,6 @@ class account_invoice_line(osv.osv):
'quantity': fields.float('Quantity', required=True),
'discount': fields.float('Discount (%)', digits_compute= dp.get_precision('Account')),
'invoice_line_tax_id': fields.many2many('account.tax', 'account_invoice_line_tax', 'invoice_line_id', 'tax_id', 'Taxes', domain=[('parent_id','=',False)]),
'note': fields.text('Notes'),
'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'),
'company_id': fields.related('invoice_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),
'partner_id': fields.related('invoice_id','partner_id',type='many2one',relation='res.partner',string='Partner',store=True)
@ -1430,7 +1429,8 @@ class account_invoice_line(osv.osv):
domain = {}
result['uos_id'] = res.uom_id.id or uom or False
result['note'] = res.description
if res.description:
result['name'] += '\n'+res.description
if result['uos_id']:
res2 = res.uom_id.category_id.id
if res2:
@ -1524,7 +1524,7 @@ class account_invoice_line(osv.osv):
def move_line_get_item(self, cr, uid, line, context=None):
return {
'type':'src',
'name': line.name[:64],
'name': line.name.split('\n')[0][:64],
'price_unit':line.price_unit,
'quantity':line.quantity,
'price':line.price_subtotal,
@ -1578,6 +1578,7 @@ class account_invoice_tax(osv.osv):
'invoice_id': fields.many2one('account.invoice', 'Invoice Line', ondelete='cascade', select=True),
'name': fields.char('Tax Description', size=64, required=True),
'account_id': fields.many2one('account.account', 'Tax Account', required=True, domain=[('type','<>','view'),('type','<>','income'), ('type', '<>', 'closed')]),
'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'),
'base': fields.float('Base', digits_compute=dp.get_precision('Account')),
'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')),
'manual': fields.boolean('Manual'),
@ -1648,14 +1649,16 @@ class account_invoice_tax(osv.osv):
val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
val['account_id'] = tax['account_collected_id'] or line.account_id.id
val['account_analytic_id'] = tax['account_analytic_collected_id']
else:
val['base_code_id'] = tax['ref_base_code_id']
val['tax_code_id'] = tax['ref_tax_code_id']
val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['ref_base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['ref_tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
val['account_id'] = tax['account_paid_id'] or line.account_id.id
val['account_analytic_id'] = tax['account_analytic_paid_id']
key = (val['tax_code_id'], val['base_code_id'], val['account_id'])
key = (val['tax_code_id'], val['base_code_id'], val['account_id'], val['account_analytic_id'])
if not key in tax_grouped:
tax_grouped[key] = val
else:
@ -1687,7 +1690,8 @@ class account_invoice_tax(osv.osv):
'price': t['amount'] or 0.0,
'account_id': t['account_id'],
'tax_code_id': t['tax_code_id'],
'tax_amount': t['tax_amount']
'tax_amount': t['tax_amount'],
'account_analytic_id': t['account_analytic_id'],
})
return res

257
addons/account/account_invoice_view.xml
View File

@ -50,24 +50,27 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Invoice Line" version="7.0">
<group col="4">
<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.currency_id, context, parent.company_id)"/>
<field name="name"/>
<label string="Quantity" for="quantity" align="1.0"/>
<div>
<field name="quantity" class="oe_inline"/>
<field name="uos_id" class="oe_inline"
on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
</div>
<field name="price_unit"/>
<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)" groups="account.group_account_user"/>
<field name="discount" groups="sale.group_discount_per_so_line"/>
<field name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" widget="many2many_tags"/>
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
<field name="company_id" groups="base.group_multi_company" readonly="1"/>
<group>
<group>
<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.currency_id, context, parent.company_id)"/>
<label for="quantity"/>
<div>
<field name="quantity" class="oe_inline"/>
<field name="uos_id" class="oe_inline" groups="product.group_uom"
on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
</div>
<field name="price_unit"/>
<field name="discount" groups="sale.group_discount_per_so_line"/>
</group>
<group>
<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)" groups="account.group_account_user"/>
<field name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" widget="many2many_tags"/>
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
<field name="company_id" groups="base.group_multi_company" readonly="1"/>
</group>
</group>
<separator string="Notes"/>
<field name="note"/>
<label for="name"/>
<field name="name"/>
</form>
</field>
</record>
@ -98,6 +101,7 @@
<field name="name"/>
<field name="sequence"/>
<field name="account_id" groups="account.group_account_user"/>
<field name="account_analytic_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" groups="analytic.group_analytic_accounting"/>
<field name="manual"/>
<field name="amount"/>
<field name="base" readonly="0"/>
@ -119,9 +123,9 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree colors="blue:state == 'draft';black:state in ('proforma','proforma2','open');gray:state == 'cancel'" string="Invoice">
<field name="partner_id" groups="base.group_user"/>
<field name="date_invoice"/>
<field name="number"/>
<field name="partner_id" groups="base.group_user"/>
<field name="reference" invisible="1"/>
<field name="name" invisible="1"/>
<field name="journal_id" invisible="1"/>
@ -160,36 +164,33 @@
<div class="oe_title">
<h1>
<label string="Draft Invoice" attrs="{'invisible': [('state', '&lt;&gt;', 'draft')]}"/>
<label for="number" class="oe_edit_only" attrs="{'invisible': [('state', '=', 'draft')]}"/>
<label string="Invoice" attrs="{'invisible': [('state', '=', 'draft')]}"/>
<field name="number" class="oe_inline" attrs="{'invisible': [('state', '=', 'draft')]}"/>
</h1>
<h2>
<label for="origin" string="Concerns" class="oe_inline"/>
<field name="origin" placeholder="PO0025" class="oe_inline"/>
<label string=" from " attrs="{'invisible': [('origin', '=', False)]}" class='oe_inline'/>
<field string="Supplier" name="partner_id" class="oe_inline"
</div>
<field name="type" invisible="1"/>
<group>
<group>
<field string="Supplier" name="partner_id"
on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
domain="[('supplier', '=', True)]"/>
</h2>
</div>
<group>
<field name="fiscal_position" widget="selection"/>
<field name="origin"/>
<label for="reference_type"/>
<div>
<field name="reference_type" class="oe_inline oe_edit_only"/>
<field name="reference" class="oe_inline"/>
</div>
</group>
<group>
<field name="date_invoice"/>
<field name="date_due"/>
<field name="type" invisible="1"/>
<field name="period_id" domain="[('state', '=', 'draft')]" groups="account.group_account_user" widget="selection"/>
</group>
<group>
<field name="fiscal_position" widget="selection"/>
<field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]"
name="account_id" groups="account.group_account_user"/>
<field name="journal_id" groups="account.group_account_user"
on_change="onchange_journal_id(journal_id, context)" widget="selection"/>
<field name="currency_id"/>
<field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]" name="account_id" groups="account.group_account_user" invisible="1"/>
</group>
<group>
<label for="reference"/>
<div>
<field name="reference" placeholder="Payment Reference"/>
</div>
</group>
</group>
<notebook>
@ -209,47 +210,54 @@
<field name="uos_id" invisible="1"/>
</tree>
</field>
<group>
<group class="oe_subtotal_footer oe_right">
<field name="amount_untaxed"/>
<div>
<field name="tax_line">
<tree editable="bottom" string="Taxes">
<field name="name"/>
<field name="account_id" groups="account.group_account_invoice"/>
<field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
<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>
<button name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
<label for="amount_tax"/>
<button name="button_reset_taxes" states="draft,proforma2"
string="(update)" class="oe_link oe_edit_only"
type="object" help="Recompute taxes and total"/>
</div>
<group class="oe_subtotal_footer">
<field name="amount_untaxed"/>
<field name="amount_tax"/>
<field name="amount_total" class="oe_subtotal_footer_separator"/>
<field name="amount_tax" nolabel="1"/>
<field name="amount_total" class="oe_subtotal_footer_separator"/>
<field name="residual" style="margin-top: 10px"/>
<field name="reconciled" invisible="1"/>
</group>
<field name="residual"/>
<field name="reconciled" invisible="1"/>
</group>
<label for="comment" string="Terms and Conditions"/>
<div style="width: 50%%">
<field name="tax_line">
<tree editable="bottom" string="Taxes">
<field name="name"/>
<field name="account_id" groups="account.group_account_invoice"/>
<field name="account_analytic_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" groups="analytic.group_analytic_accounting"/>
<field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
<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>
</div>
<div class="oe_clear">
<label for="comment"/>
</div>
<field name="comment"/>
</page>
<page string="Other Info">
<group>
<group>
<field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
<field name="payment_term" widget="selection"/>
</group>
<group>
<field name="user_id"/>
<field name="name" invisible="1"/>
<field name="move_id" groups="account.group_account_user"/>
<field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
</group>
<group>
<field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
<field name="user_id"/>
<field name="name" invisible="1"/>
<field name="payment_term" widget="selection"/>
</group>
<group>
<field name="move_id" groups="account.group_account_user"/>
<field name="period_id" domain="[('state', '=', 'draft')]" groups="account.group_account_user" widget="selection"/>
<field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
</group>
</group>
</page>
<page string="Payments">
@ -269,9 +277,9 @@
</page>
</notebook>
</sheet>
<footer>
<div class="oe_chatter">
<field name="message_ids" widget="mail_thread"/>
</footer>
</div>
</form>
</field>
</record>
@ -304,27 +312,18 @@
<label string="Invoice " attrs="{'invisible': [('state','in',('draft','proforma','proforma2'))]}"/>
<field name="number" readonly="1" class="oe_inline"/>
</h1>
<label string="Concerns" for="name" class="oe_edit_only"/>
<h2>
<field name="name" placeholder="Project XYZ"/>
</h2>
<field name="type" invisible="1"/>
<group>
<group>
<field string="Customer" name="partner_id"
on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
groups="base.group_user" context="{'search_default_customer': 1}"
domain="[('customer', '=', True)]"/>
groups="base.group_user" context="{'search_default_customer':1, 'show_address': 1}"
options='{"always_reload": true}'/>
<field name="fiscal_position" widget="selection" />
<field name="payment_term" widget="selection"/>
</group>
<group>
<field name="date_invoice"/>
<field name="period_id" domain="[('state', '=', 'draft')]"
groups="account.group_account_user" widget="selection"/>
<field name="journal_id" groups="account.group_account_user"
on_change="onchange_journal_id(journal_id, context)" widget="selection"/>
@ -334,58 +333,70 @@
<label for="currency_id"/>
<div>
<field name="currency_id" class="oe_inline"/>
<!-- note fp: I don't think we need this feature ?
<button name="%(action_account_change_currency)d" type="action"
icon="terp-stock_effects-object-colorize"
attrs="{'invisible':[('state','!=','draft')]}"
groups="account.group_account_user"/>
groups="account.group_account_user"/> -->
</div>
</group>
</group>
<field name="sent" invisible="1"/>
<notebook colspan="4">
<page string="Invoice">
<field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list" context="{'type': type}"/>
<group>
<page string="Invoice Lines">
<field name="invoice_line" nolabel="1" widget="one2many_list" context="{'type': type}"/>
<group class="oe_subtotal_footer oe_right">
<field name="amount_untaxed"/>
<div>
<field name="tax_line" nolabel="1">
<tree editable="bottom" string="Taxes">
<field name="name"/>
<field name="account_id" groups="account.group_account_user"/>
<field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
<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>
<button name="button_reset_taxes" states="draft,proforma2" string="Compute Taxes"
type="object" groups="account.group_account_user" icon="terp-stock_format-scientific"
help="This action will erase taxes"/>
<label for="amount_tax"/>
<button name="button_reset_taxes" states="draft,proforma2"
string="(update)" class="oe_link oe_edit_only"
type="object" help="Recompute taxes and total"/>
</div>
<group class="oe_subtotal_footer">
<field name="amount_untaxed"/>
<field name="amount_tax"/>
<field name="amount_total" class="oe_subtotal_footer_separator"/>
<field name="residual" style="margin-top: 10px" groups="account.group_account_user"/>
<field name="reconciled" invisible="1"/>
</group>
<field name="amount_tax" nolabel="1"/>
<field name="amount_total" class="oe_subtotal_footer_separator"/>
<field name="residual" groups="account.group_account_user"/>
<field name="reconciled" invisible="1"/>
</group>
<group>
<field name="payment_term" class="oe_inline"/>
</group>
<div class="oe_clear">
<label for="comment"/>
</div>
<field name="comment" class="oe_inline" placeholder="Additional notes..."/>
</page>
<page string="Other Info">
<group col="4">
<field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
<newline/>
<field name="date_due"/>
<field name="user_id" groups="base.group_user"/>
<newline/>
<field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"/>
<field name="origin" placeholder="SO0032" groups="base.group_user"/>
<field name="move_id" groups="account.group_account_user"/>
<group>
<field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
<field name="user_id" groups="base.group_user"/>
<field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"/>
<field name="period_id" domain="[('state', '=', 'draft')]"
groups="account.group_account_manager"
string="Accounting Period"
placeholder="force period"/>
<field name="date_due"/>
</group>
<group>
<field name="origin" groups="base.group_user"/>
<field name="name" string="Customer Reference"/>
<field name="move_id" groups="account.group_account_user"/>
</group>
</group>
<field name="comment" placeholder="Add an additional information in the invoice..."/>
<field name="tax_line">
<tree editable="bottom" string="Taxes">
<field name="name"/>
<field name="account_id" groups="account.group_account_user"/>
<field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
<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>
</page>
<page string="Payments" groups="base.group_user">
<field name="payment_ids">
@ -404,9 +415,9 @@
</page>
</notebook>
</sheet>
<footer>
<div class="oe_chatter">
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
</footer>
</div>
</form>
</field>
</record>

4
addons/account/account_view.xml
View File

@ -909,9 +909,9 @@
<field name="amount" attrs="{'readonly':[('type','in',('none', 'code', 'balance'))]}"/>
<separator colspan="4" string="Accounting Information"/>
<field name="account_collected_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<label colspan="2" nolabel="1" string="Keep empty to use the income account"/>
<field name="account_analytic_collected_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id), ('parent_id', '&lt;&gt;', False)]" groups="analytic.group_analytic_accounting"/>
<field name="account_paid_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<label colspan="2" nolabel="1" string="Keep empty to use the expense account"/>
<field name="account_analytic_paid_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id), ('parent_id', '&lt;&gt;', False)]" groups="analytic.group_analytic_accounting"/>
<separator colspan="4" string="Tax Declaration: Invoices"/>
<field name="base_code_id"/>
<field name="base_sign"/>

6
addons/account/company.py
View File

@ -25,6 +25,11 @@ class res_company(osv.osv):
_inherit = "res.company"
_columns = {
'expects_chart_of_accounts': fields.boolean('Expects a Chart of Accounts'),
'tax_calculation_rounding_method': fields.selection([
('round_per_line', 'Round per Line'),
('round_globally', 'Round Globally'),
], 'Tax Calculation Rounding Method',
help="If you select 'Round per Line' : for each tax, the tax amount will first be computed and rounded for each PO/SO/invoice line and then these rounded amounts will be summed, leading to the total amount for that tax. If you select 'Round Globally': for each tax, the tax amount will be computed for each PO/SO/invoice line, then these amounts will be summed and eventually this total tax amount will be rounded. If you sell with tax included, you should choose 'Round per line' because you certainly want the sum of your tax-included line subtotals to be equal to the total amount with taxes."),
'paypal_account': fields.char("Paypal Account", size=128, help="Paypal username (usually email) for receiving online payments."),
'overdue_msg': fields.text('Overdue Payments Message', translate=True),
'property_reserve_and_surplus_account': fields.property(
@ -39,6 +44,7 @@ class res_company(osv.osv):
_defaults = {
'expects_chart_of_accounts': True,
'tax_calculation_rounding_method': 'round_per_line',
'overdue_msg': '''Dear Sir, dear Madam,
Our records indicate that some payments on your account are still due. Please find details below.

1
addons/account/company_view.xml
View File

@ -24,6 +24,7 @@
<field name="arch" type="xml">
<field name="currency_id" position="after">
<field name="property_reserve_and_surplus_account" colspan="2"/>
<field name="tax_calculation_rounding_method"/>
<field name="paypal_account" placeholder="sales@openerp.com"/>
</field>
</field>

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

@ -31,7 +31,6 @@ INVOICE_LINE_EDI_STRUCT = {
'price_unit': True,
'quantity': True,
'discount': True,
'note': True,
# fields used for web preview only - discarded on import
'price_subtotal': True,

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

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:35+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:51+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0
@ -38,6 +38,8 @@ msgid ""
"Determine the display order in the report 'Accounting \\ Reporting \\ "
"Generic Reporting \\ Taxes \\ Taxes Report'"
msgstr ""
"تحديد عرض الترتيب في التقرير ’المحاسبة/تقارير/الإبلاغ العام/الضرائب/تقرير "
"الضرائب’"
#. module: account
#: view:account.move.reconcile:0
@ -371,7 +373,7 @@ msgstr ""
#. module: account
#: constraint:account.move.line:0
msgid "You can not create journal items on an account of type view."
msgstr ""
msgstr "لا يمكنك إنشاء يومية علي حساب في وضع القراءة فقط"
#. module: account
#: model:ir.model,name:account.model_account_tax_template
@ -689,6 +691,8 @@ msgid ""
"The date of your Journal Entry is not in the defined period! You should "
"change the date or remove this constraint from the journal."
msgstr ""
"تاريخ قيد اليومية غير معرف الفترة! يجب تغيير التاريخ أو إزالة هذا الشرط من "
"اليومية."
#. module: account
#: model:ir.model,name:account.model_account_report_general_ledger

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

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:36+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:51+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:36+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:51+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:36+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:51+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:36+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:51+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:36+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:52+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"X-Poedit-Language: Czech\n"
#. module: account

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:36+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:52+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-26 05:22+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:52+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:37+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:52+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:43+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:57+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:43+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:57+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:41+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:56+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0
@ -7618,7 +7618,7 @@ msgstr "Raiz/vista"
#: code:addons/account/account.py:3121
#, python-format
msgid "OPEJ"
msgstr ""
msgstr "OPEJ"
#. module: account
#: report:account.invoice:0

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

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:43+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:57+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:43+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:58+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:58+0000\n"
"X-Generator: Launchpad (build 15614)\n"
"Language: \n"
#. module: account

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-07-03 05:36+0000\n"
"X-Generator: Launchpad (build 15531)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:57+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0
@ -53,7 +53,7 @@ msgstr "Coinciliar entrada de diario"
#: view:account.move:0
#: view:account.move.line:0
msgid "Account Statistics"
msgstr ""
msgstr "Estadísticas de cuentas"
#. module: account
#: view:account.invoice:0
@ -73,23 +73,23 @@ msgstr "¡Error! La duración del periodo(s) no es válido. "
#. module: account
#: field:account.analytic.line,currency_id:0
msgid "Account currency"
msgstr ""
msgstr "Moneda contable"
#. module: account
#: view:account.tax:0
msgid "Children Definition"
msgstr ""
msgstr "Definición hijos"
#. module: account
#: code:addons/account/account_bank_statement.py:302
#, python-format
msgid "Journal item \"%s\" is not valid."
msgstr ""
msgstr "El asiento \"%s\" no es válido"
#. module: account
#: model:ir.model,name:account.model_report_aged_receivable
msgid "Aged Receivable Till Today"
msgstr ""
msgstr "A cobrar anteriores hasta hoy"
#. module: account
#: model:process.transition,name:account.process_transition_invoiceimport0
@ -112,6 +112,9 @@ msgid ""
"If you unreconciliate transactions, you must also verify all the actions "
"that are linked to those transactions because they will not be disabled"
msgstr ""
"Si rompe la conciliación de transacciones, también debe verificar todas la "
"acciones que están relacionadas con esas transacciones porque no serán "
"deshabilitadas."
#. module: account
#: constraint:account.journal:0
@ -119,6 +122,8 @@ msgid ""
"Configuration error! The currency chosen should be shared by the default "
"accounts too."
msgstr ""
"¡Error de configuración! La moneda elegida debería ser también la misma en "
"las cuentas por defecto"
#. module: account
#: report:account.invoice:0
@ -156,6 +161,8 @@ msgid ""
"If the active field is set to False, it will allow you to hide the payment "
"term without removing it."
msgstr ""
"Si el campo activo se desmarca, permite ocultar el plazo de pago sin "
"eliminarlo."
#. module: account
#: code:addons/account/account_invoice.py:1428
@ -167,13 +174,13 @@ msgstr "¡Aviso!"
#: code:addons/account/account.py:3112
#, python-format
msgid "Miscellaneous Journal"
msgstr ""
msgstr "Diario varios"
#. module: account
#: field:account.fiscal.position.account,account_src_id:0
#: field:account.fiscal.position.account.template,account_src_id:0
msgid "Account Source"
msgstr ""
msgstr "Origen cuenta"
#. module: account
#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal

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

@ -17,8 +17,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:58+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:58+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:43+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:57+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:37+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:52+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:36+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:51+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:39+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:54+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:58+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:37+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:52+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:37+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:52+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: code:addons/account/account_move_line.py:1200

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:43+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:57+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:37+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:52+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:37+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:53+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:38+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:53+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:38+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:53+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:40+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:55+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:38+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:53+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:38+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:53+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:38+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:53+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-06-20 16:18+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
"PO-Revision-Date: 2012-07-06 02:41+0000\n"
"Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@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: 2012-06-22 04:38+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:53+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0
@ -4942,7 +4942,7 @@ msgstr "会計表"
#. module: account
#: field:account.journal.column,name:0
msgid "Column Name"
msgstr "カラム名"
msgstr "列名"
#. module: account
#: view:account.general.journal:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:38+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:53+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:38+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:53+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:39+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:53+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:39+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:54+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:39+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:54+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:39+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:54+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:39+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:54+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:39+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:54+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0
@ -243,7 +243,7 @@ msgstr "'%s' нэхэмжлэл хэсэгчлэн төлөгдсөн: %s%s of %
#. module: account
#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
msgid "Accounting entries are an input of the reconciliation."
msgstr ""
msgstr "Гүйцээлт бүхий журналын бичилтүүд бүртгэгдэнэ."
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
@ -328,12 +328,12 @@ msgid ""
"\n"
"You can create one in the menu: \n"
"Configuration/Financial Accounting/Accounts/Journals."
msgstr ""
msgstr "Уг компанид %s төрлийн журнал тодорхойлогдоогүй байна."
#. module: account
#: model:ir.model,name:account.model_account_unreconcile
msgid "Account Unreconcile"
msgstr ""
msgstr "Гүйцээлт цуцлалт"
#. module: account
#: view:product.product:0
@ -348,11 +348,15 @@ msgid ""
"leave the automatic formatting, it will be computed based on the financial "
"reports hierarchy (auto-computed field 'level')."
msgstr ""
"Энд та энэ бичлэг ямар байдлаар дэлгэцэнд харагдах форматыг тохируулж болно. "
"Хэрэв та автомат форматлалттайгаар үлдээвэл энэ нь санхүүгийн тайлангийн "
"шатлал дээр үндэслэн тооцоологдоно. 'level' буюу түвшин талбар автоматаар "
"тооцоологдоно."
#. module: account
#: view:account.installer:0
msgid "Configure"
msgstr ""
msgstr "Тохируулга"
#. module: account
#: selection:account.entries.report,month:0
@ -377,12 +381,12 @@ msgstr ""
#. module: account
#: constraint:account.move.line:0
msgid "You can not create journal items on an account of type view."
msgstr ""
msgstr "Та харах төрлийн дансанд бичилт үүсгэх боломжгүй."
#. module: account
#: model:ir.model,name:account.model_account_tax_template
msgid "account.tax.template"
msgstr ""
msgstr "account.tax.template"
#. module: account
#: model:ir.model,name:account.model_account_bank_accounts_wizard
@ -539,7 +543,7 @@ msgstr "Дансны модоо сонго"
#. module: account
#: sql_constraint:res.company:0
msgid "The company name must be unique !"
msgstr ""
msgstr "Компаний нэр үл давхцах байх ёстой !"
#. module: account
#: model:ir.model,name:account.model_account_invoice_refund
@ -578,7 +582,7 @@ msgstr "Санхүүгийн жил хаах"
#. module: account
#: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
msgid "The accountant confirms the statement."
msgstr ""
msgstr "Нягтлан ордерийн гүйлгээг батлана."
#. module: account
#: selection:account.balance.report,display_account:0
@ -637,13 +641,15 @@ msgstr "Төв журнал"
#. module: account
#: sql_constraint:account.sequence.fiscalyear:0
msgid "Main Sequence must be different from current !"
msgstr ""
msgstr "Үндсэн дараалал нь одоогийн дарааллаас ялгаатай байх ёстой !"
#. module: account
#: code:addons/account/account_move_line.py:1251
#, python-format
msgid "No period found or more than one period found for the given date."
msgstr ""
"Тухайн огноонд тохирох мөчлөг олдохгүй эсвэл нэгээс олон мөчлөг "
"тодорхойлогдсон байна."
#. module: account
#: field:account.invoice.tax,tax_amount:0
@ -665,7 +671,7 @@ msgstr "Мөчлөг хаах"
#. module: account
#: model:ir.model,name:account.model_account_common_partner_report
msgid "Account Common Partner Report"
msgstr ""
msgstr "Харилцагчийн ерөнхий тайлан"
#. module: account
#: field:account.fiscalyear.close,period_id:0
@ -690,6 +696,8 @@ msgid ""
"The date of your Journal Entry is not in the defined period! You should "
"change the date or remove this constraint from the journal."
msgstr ""
"Журналын бичилтийн огноо нь тухайн мөчлөгт тохирохгүй байна! Та огноогоо "
"солих юмуу журналын тохиргооноос энэ шаардамжийг арилгах хэрэгтэй."
#. module: account
#: model:ir.model,name:account.model_account_report_general_ledger
@ -719,12 +727,12 @@ msgstr "Өнөөдөр төлбөр барагдсан харилцагч"
#. module: account
#: view:report.hr.timesheet.invoice.journal:0
msgid "Sale journal in this year"
msgstr ""
msgstr "Энэ жилийн Борлуулалтын Журнал"
#. module: account
#: selection:account.financial.report,display_detail:0
msgid "Display children with hierarchy"
msgstr ""
msgstr "Мод хэлбэрийн харагдац"
#. module: account
#: selection:account.payment.term.line,value:0
@ -742,7 +750,7 @@ msgstr "Моднууд"
#: model:ir.model,name:account.model_project_account_analytic_line
#, python-format
msgid "Analytic Entries by line"
msgstr ""
msgstr "Аналитик бичилтийн мөрүүд"
#. module: account
#: field:account.invoice.refund,filter_refund:0
@ -782,6 +790,8 @@ msgid ""
"Taxes are missing!\n"
"Click on compute button."
msgstr ""
"Татвар оноолт буруу!\n"
"Тооцоолох товч дээр дарна уу."
#. module: account
#: model:ir.model,name:account.model_account_subscription_line
@ -796,7 +806,7 @@ msgstr "Уг нэхэмжлэлийг тухайн харилцагч хэрхэ
#. module: account
#: view:account.invoice.report:0
msgid "Supplier Invoices And Refunds"
msgstr ""
msgstr "Ханган Нийлүүлэгчийн Нэхэмжлэх болон Зарлага (Буцаалт)"
#. module: account
#: view:account.move.line.unreconcile.select:0
@ -804,7 +814,7 @@ msgstr ""
#: view:account.unreconcile.reconcile:0
#: model:ir.model,name:account.model_account_move_line_unreconcile_select
msgid "Unreconciliation"
msgstr "Тулгагдаагүй бичилтүүд"
msgstr "Гүйцээлтийг арилгах"
#. module: account
#: view:account.payment.term.line:0
@ -834,6 +844,11 @@ msgid ""
"or Loss you'd realized if those transactions were ended today. Only for "
"accounts having a secondary currency set."
msgstr ""
"Солилцооны ханшны өөрчлөлтөөс хамааран олон валютын гүйлгээ хийж байгаад "
"тодорхой дүнгээр ашиг, алдагдал хүлээж болдог. Энэ меню нь хэрэв гүйлгээний "
"ханшийн тэгшитгэлийн өнөөдөр хийсэн бол ямар ашиг, алдагдал хүлээх "
"урьдчилсан таамагийг өгдөг. Зөвхөн хоёрдогч валют тохируулагдсан дансууд "
"дээр нь хэрэглэгдэнэ."
#. module: account
#: selection:account.entries.report,month:0
@ -876,7 +891,7 @@ msgstr "Тооцоололт"
#. module: account
#: selection:account.invoice.refund,filter_refund:0
msgid "Cancel: refund invoice and reconcile"
msgstr ""
msgstr "Цуцлах: нэхэмжлэлийг буцаалт хийн холбоно"
#. module: account
#: field:account.cashbox.line,pieces:0
@ -913,6 +928,8 @@ msgid ""
"You cannot validate this journal entry because account \"%s\" does not "
"belong to chart of accounts \"%s\"!"
msgstr ""
"\"%s\" данс \"%s\" дансны жагсаалтад байхгүй байгаа тул энэ журналын "
"бичилтыг батлах боложмгүй!"
#. module: account
#: code:addons/account/account_move_line.py:835
@ -921,6 +938,8 @@ msgid ""
"This account does not allow reconciliation! You should update the account "
"definition to change this."
msgstr ""
"Уг дансанд гүйцээлт зөвшөөрөгдөөгүй байна! Та дансны тохиргоог өөрчилснөөр "
"гүйцээлт хийх боломжтой болно."
#. module: account
#: view:account.invoice:0
@ -959,7 +978,7 @@ msgstr "Өргөтгөсөн хайлт..."
#. module: account
#: model:ir.ui.menu,name:account.menu_account_central_journal
msgid "Centralizing Journal"
msgstr ""
msgstr "Нээлт, хаалтын журнал"
#. module: account
#: selection:account.journal,type:0
@ -1068,7 +1087,7 @@ msgstr ""
#. module: account
#: field:account.report.general.ledger,sortby:0
msgid "Sort by"
msgstr ""
msgstr "Эрэмбэлэх"
#. module: account
#: help:account.fiscalyear.close,fy_id:0
@ -1092,7 +1111,7 @@ msgstr ""
#. module: account
#: view:account.tax:0
msgid "Applicability Options"
msgstr ""
msgstr "Хэрэглэж болох нөхцөлүүд"
#. module: account
#: report:account.partner.balance:0
@ -1121,12 +1140,12 @@ msgstr "Менежер"
#. module: account
#: view:account.subscription.generate:0
msgid "Generate Entries before:"
msgstr ""
msgstr "Өмнөхөөсөө дахин гүйлгээ үүсгэх"
#. module: account
#: view:account.move.line:0
msgid "Unbalanced Journal Items"
msgstr ""
msgstr "Баланс бариагүй журналын бичилт"
#. module: account
#: model:account.account.type,name:account.data_account_type_bank
@ -1151,7 +1170,7 @@ msgstr "Орлого зарлагын ордер батлах"
msgid ""
"Total amount (in Secondary currency) for transactions held in secondary "
"currency for this account."
msgstr ""
msgstr "Уг дансанд хийгдсэн гүйлгээний дүн (хоёрдогч вальютаар)."
#. module: account
#: field:account.fiscal.position.tax,tax_dest_id:0
@ -1167,7 +1186,7 @@ msgstr "Кредит төвлөрүүлэлт"
#. module: account
#: view:report.account_type.sales:0
msgid "All Months Sales by type"
msgstr ""
msgstr "Бүх сарын борлуулалт төрлөөр"
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree2
@ -1177,6 +1196,11 @@ msgid ""
"purchase orders or receipts. This way, you can control the invoice from your "
"supplier according to what you purchased or received."
msgstr ""
"\"Нийлүүлэгчийн нэхэмжлэл\"-ийн тусламжтайгаар та бэлтгэн нийлүүлэгчтэй "
"холбоотой нэхэмжлэлүүдийг удирдан хянах боломжтой. OpenERP нь худалдан "
"авалтын захиалгаас автоматаар ноорог нэхэмжлэл үүсгэдэг. Ийм замаар та "
"бэлтгэн нийлүүлэгчээс юу захиалсан, алийг нь хүлээн авсан зэргээ "
"нэхэмжлэлээр хянах боломжтой юм."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
@ -1192,12 +1216,12 @@ msgstr "Нэхэмжлэл цуцлах"
#. module: account
#: help:account.journal,code:0
msgid "The code will be displayed on reports."
msgstr ""
msgstr "Код тайлан дээр харагдана."
#. module: account
#: view:account.tax.template:0
msgid "Taxes used in Purchases"
msgstr ""
msgstr "Худалдан авалтад хэрэглэгдэх татвар"
#. module: account
#: field:account.invoice.tax,tax_code_id:0
@ -1229,6 +1253,8 @@ msgid ""
"You can not use this general account in this journal, check the tab 'Entry "
"Controls' on the related journal !"
msgstr ""
"Та уг дансыг тухайн журналд ашиглах боломжгүй. Тухайн журналын 'Гүйлгээ "
"удирдлага' хэсгийг шалгана уу!"
#. module: account
#: field:account.move.line.reconcile,trans_nbr:0
@ -1264,7 +1290,7 @@ msgstr "Бусад"
#. module: account
#: view:account.subscription:0
msgid "Draft Subscription"
msgstr ""
msgstr "Ноорог маягт"
#. module: account
#: view:account.account:0
@ -1298,7 +1324,7 @@ msgstr "Данс"
#. module: account
#: field:account.tax,include_base_amount:0
msgid "Included in base amount"
msgstr ""
msgstr "Суурь үнэнд шингэсэн"
#. module: account
#: view:account.entries.report:0
@ -1338,7 +1364,7 @@ msgstr "Эхлэх дуусах мөчлөгийг сонго"
#. module: account
#: model:account.financial.report,name:account.account_financial_report_profitandloss0
msgid "Profit and Loss"
msgstr ""
msgstr "Ашиг, Алдагдал"
#. module: account
#: model:ir.model,name:account.model_account_account_template
@ -1348,7 +1374,7 @@ msgstr "Дансны загвар"
#. module: account
#: view:account.tax.code.template:0
msgid "Search tax template"
msgstr ""
msgstr "Татварын загвар хайх"
#. module: account
#: view:account.move.reconcile:0
@ -1367,7 +1393,7 @@ msgstr "Төлбөр шаардах хуудас"
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Initial Balance"
msgstr ""
msgstr "Эхний үлдэгдэл"
#. module: account
#: view:account.invoice:0
@ -1388,7 +1414,7 @@ msgstr "Тайлангийн өгөгдөл"
#. module: account
#: model:ir.model,name:account.model_account_entries_report
msgid "Journal Items Analysis"
msgstr ""
msgstr "Журналын бичилт шинжилгээ"
#. module: account
#: model:ir.ui.menu,name:account.next_id_22
@ -1493,7 +1519,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_temp_range
msgid "A Temporary table used for Dashboard view"
msgstr ""
msgstr "Хяналтын самбарыг харахад түр хэрэглэгддэг хүснэгт"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree4
@ -1566,7 +1592,7 @@ msgstr "Харилцахын ордер хайх"
#. module: account
#: view:account.move.line:0
msgid "Unposted Journal Items"
msgstr ""
msgstr "Батлагдаагүй журналын бичилт"
#. module: account
#: view:account.chart.template:0
@ -1628,7 +1654,7 @@ msgstr "Нэхэмжлэл"
#: model:process.node,note:account.process_node_analytic0
#: model:process.node,note:account.process_node_analyticcost0
msgid "Analytic costs to invoice"
msgstr ""
msgstr "Нэхэмжлэгдэх аналитик өртөг"
#. module: account
#: view:ir.sequence:0
@ -1696,7 +1722,7 @@ msgstr ""
#. module: account
#: view:account.analytic.account:0
msgid "Pending Accounts"
msgstr ""
msgstr "Хүлээгдэж буй данс"
#. module: account
#: view:account.tax.template:0
@ -1709,6 +1735,8 @@ msgid ""
"If the active field is set to False, it will allow you to hide the journal "
"period without removing it."
msgstr ""
"Хэрэв идэвхитэй талбарыг сонгоогүй бол энэ нь тайлант үеийн журналыг "
"устгахгүйгээр нуух боломж олгоно."
#. module: account
#: view:res.partner:0
@ -1723,7 +1751,7 @@ msgstr "Авлага & Өглөг"
#. module: account
#: model:ir.model,name:account.model_account_common_journal_report
msgid "Account Common Journal Report"
msgstr ""
msgstr "Ерөнхий журнал тайлан"
#. module: account
#: selection:account.partner.balance,display_partner:0
@ -1765,7 +1793,7 @@ msgstr "Ноорог ордер"
#. module: account
#: view:account.tax:0
msgid "Tax Declaration: Credit Notes"
msgstr ""
msgstr "Татвар тодорхойлолт: Кредит залруулга"
#. module: account
#: field:account.move.line.reconcile,credit:0
@ -1783,7 +1811,7 @@ msgstr ""
#. module: account
#: sql_constraint:account.move.line:0
msgid "Wrong credit or debit value in accounting entry !"
msgstr ""
msgstr "Буруу кредит эсвэл дебит дүн бүхий дансны бичилт байна !"
#. module: account
#: view:account.invoice.report:0
@ -1805,12 +1833,12 @@ msgstr "Санхүүгийн жил тохируулах"
#. module: account
#: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
msgid "Entries By Line"
msgstr ""
msgstr "Гүйлгээний мөрүүд"
#. module: account
#: field:account.vat.declaration,based_on:0
msgid "Based on"
msgstr ""
msgstr "Суурь"
#. module: account
#: field:account.invoice,move_id:0
@ -1821,7 +1849,7 @@ msgstr "Ажил гүйлгээ"
#. module: account
#: view:account.tax:0
msgid "Tax Declaration: Invoices"
msgstr ""
msgstr "Татварын Мэдүүлэг: Нэхэмжлэх"
#. module: account
#: field:account.cashbox.line,subtotal:0
@ -1835,7 +1863,7 @@ msgstr "Нийлбэр"
#: model:ir.model,name:account.model_account_treasury_report
#: model:ir.ui.menu,name:account.menu_action_account_treasury_report_all
msgid "Treasury Analysis"
msgstr ""
msgstr "Жасийн (Сан) Тооцооны Арга"
#. module: account
#: constraint:res.company:0
@ -1845,7 +1873,7 @@ msgstr ""
#. module: account
#: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
msgid "Sale/Purchase Journal"
msgstr ""
msgstr "Борлуулалт/Худалдан Авалтын Журнал"
#. module: account
#: view:account.analytic.account:0
@ -1868,7 +1896,7 @@ msgstr "Хүчинтэй"
#: model:ir.actions.act_window,name:account.action_account_print_journal
#: model:ir.model,name:account.model_account_print_journal
msgid "Account Print Journal"
msgstr ""
msgstr "Журнал хэвлэлт"
#. module: account
#: model:ir.model,name:account.model_product_category
@ -1887,6 +1915,9 @@ msgid ""
"will be added, Loss : Amount will be deducted.), as calculated in Profit & "
"Loss Report"
msgstr ""
"Энэ данс нь Орлого зарлагын ажил гүйлгээнд хэрэглэгдэх бөгөөд орлого үр "
"дүнгийн тайланд тусна. (Хэрэв орлого бол: дансны дүн өсөж, Зарлага бол: "
"дансны дүн буурана.)"
#. module: account
#: model:process.node,note:account.process_node_reconciliation0
@ -1932,7 +1963,7 @@ msgstr ""
#: code:addons/account/account_invoice.py:73
#, python-format
msgid "You must define an analytic journal of type '%s'!"
msgstr ""
msgstr "Та '%s' төрлийн аналитик журнал тодорхойлох шаардлагатай!"
#. module: account
#: field:account.installer,config_logo:0
@ -1951,7 +1982,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_account_financial_report_tree
msgid "Makes a generic system to draw financial reports easily."
msgstr ""
msgstr "Санхүүгийн тайланг ерөнхий байдлаар хялбархнаар үүсгэнэ."
#. module: account
#: view:account.invoice:0
@ -1965,16 +1996,18 @@ msgid ""
"If the active field is set to False, it will allow you to hide the tax "
"without removing it."
msgstr ""
"Хэрэв идэвхитэй талбарыг сонгоогүй бол энэ нь татварыг устгалгүйгээр нуух "
"боломж олгоно."
#. module: account
#: view:account.analytic.line:0
msgid "Analytic Journal Items related to a sale journal."
msgstr ""
msgstr "Борлуулалтын журналд холбогдох аналитик журналын бичилтүүд."
#. module: account
#: selection:account.financial.report,style_overwrite:0
msgid "Italic Text (smaller)"
msgstr ""
msgstr "Налуу текст (жижигээр)"
#. module: account
#: view:account.bank.statement:0
@ -1992,7 +2025,7 @@ msgstr "Ноорог"
#. module: account
#: report:account.journal.period.print.sale.purchase:0
msgid "VAT Declaration"
msgstr ""
msgstr "НӨАТ тодорхойлолт"
#. module: account
#: field:account.move.reconcile,line_partial_ids:0
@ -2093,7 +2126,7 @@ msgstr ""
#. module: account
#: view:account.chart.template:0
msgid "Search Chart of Account Templates"
msgstr ""
msgstr "Дансны Модны Үлгэр Хайх"
#. module: account
#: code:addons/account/account_move_line.py:1277
@ -2115,7 +2148,7 @@ msgstr ""
#. module: account
#: report:account.invoice:0
msgid "Customer Code"
msgstr ""
msgstr "Захиалагчийн код"
#. module: account
#: view:account.installer:0
@ -2446,7 +2479,7 @@ msgstr "Өдөр"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_renew_view
msgid "Accounts to Renew"
msgstr ""
msgstr "Шинэчлэх Дансдууд"
#. module: account
#: model:ir.model,name:account.model_account_model_line
@ -2804,7 +2837,7 @@ msgstr ""
#. module: account
#: view:account.payment.term.line:0
msgid "Line 2:"
msgstr ""
msgstr "Мөр 2:"
#. module: account
#: field:account.journal.column,required:0
@ -2940,7 +2973,7 @@ msgstr "Нэхэмжлэлийн валют"
#: field:accounting.report,account_report_id:0
#: model:ir.ui.menu,name:account.menu_account_financial_reports_tree
msgid "Account Reports"
msgstr ""
msgstr "Тайлагнах Дансд"
#. module: account
#: field:account.payment.term,line_ids:0
@ -2965,7 +2998,7 @@ msgstr "Татварын загварын жагсаалт"
#. module: account
#: model:ir.ui.menu,name:account.menu_account_print_sale_purchase_journal
msgid "Sale/Purchase Journals"
msgstr ""
msgstr "Борлуулалт/Худалдан авалтын Журналууд"
#. module: account
#: help:account.account,currency_mode:0
@ -3007,7 +3040,7 @@ msgstr "Байнга"
#: view:account.invoice.report:0
#: view:analytic.entries.report:0
msgid "Month-1"
msgstr ""
msgstr "Сар-1"
#. module: account
#: view:account.analytic.line:0
@ -3226,7 +3259,7 @@ msgstr ""
#. module: account
#: view:account.payment.term.line:0
msgid " Value amount: 0.02"
msgstr ""
msgstr " Үнийн дүн:0.02"
#. module: account
#: model:ir.actions.act_window,name:account.open_board_account
@ -3374,7 +3407,7 @@ msgstr ""
#. module: account
#: view:account.invoice.line:0
msgid "Quantity :"
msgstr ""
msgstr "Тоо хэмжээ"
#. module: account
#: field:account.aged.trial.balance,period_length:0
@ -3384,7 +3417,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
msgid "Print Sale/Purchase Journal"
msgstr ""
msgstr "Борлуулалт/Худалдан авалтын Журналыг хэвлэх"
#. module: account
#: field:account.invoice.report,state:0
@ -3813,6 +3846,7 @@ msgid ""
"Value of Loss or Gain due to changes in exchange rate when doing multi-"
"currency transactions."
msgstr ""
"Олон валютын гүйлгээ хийж байх үеийн солилцооны ханшийн ашиг, алдагдлын утга"
#. module: account
#: view:account.analytic.line:0
@ -3872,7 +3906,7 @@ msgstr "Өртөгийн тайлан"
#. module: account
#: model:account.financial.report,name:account.account_financial_report_assets0
msgid "Assets"
msgstr ""
msgstr "Хөрөнгө"
#. module: account
#: view:account.invoice.confirm:0
@ -3950,7 +3984,7 @@ msgstr ""
#. module: account
#: view:account.payment.term.line:0
msgid " Number of Days: 30"
msgstr ""
msgstr " Өдрийн тоо: 30"
#. module: account
#: field:account.account,shortcut:0
@ -4170,7 +4204,7 @@ msgstr "Хэрэв тэг үлдэгдэлтэй дансуудыг харахы
#. module: account
#: view:account.tax:0
msgid "Compute Code"
msgstr ""
msgstr "Тооцоолох код"
#. module: account
#: view:account.account.template:0
@ -4220,7 +4254,7 @@ msgstr "Дансны мод"
#. module: account
#: selection:account.financial.report,style_overwrite:0
msgid "Main Title 1 (bold, underlined)"
msgstr ""
msgstr "Үндсэн гарчиг 1(тод,доогуур зураастай)"
#. module: account
#: report:account.analytic.account.balance:0
@ -4241,7 +4275,7 @@ msgstr "Нэхэмжлэл статистик"
#. module: account
#: field:account.account,exchange_rate:0
msgid "Exchange Rate"
msgstr ""
msgstr "Солилцооны ханш"
#. module: account
#: model:process.transition,note:account.process_transition_paymentorderreconcilation0
@ -4392,7 +4426,7 @@ msgstr "Энэ бол кредит гүйлгээний үндсэн данс"
#: view:validate.account.move:0
#: view:validate.account.move.lines:0
msgid "Post Journal Entries"
msgstr ""
msgstr "Журналийн бичилтүүдийг илгээх"
#. module: account
#: selection:account.invoice,state:0
@ -4511,6 +4545,9 @@ msgid ""
"All draft account entries in this journal and period will be validated. It "
"means you won't be able to modify their accounting fields anymore."
msgstr ""
"Энэ журналь болон мөчлөгт хамаарах бүх ноорог санхүүгийн бичилтүүд "
"шалгагдана. Энэ нь эдгээр ноорог бичилтүүдийн санхүүгийн талбаруудыг дахин "
"засварлах боломжгүй болно гэсэн үг юм."
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_configuration
@ -4564,7 +4601,7 @@ msgstr "Нэхэмжлэл"
#. module: account
#: view:account.invoice:0
msgid "My invoices"
msgstr ""
msgstr "Миний нэхэмжлэлүүд"
#. module: account
#: selection:account.bank.accounts.wizard,account_type:0
@ -4794,7 +4831,7 @@ msgstr "Ажил гүйлгээ"
#. module: account
#: view:report.hr.timesheet.invoice.journal:0
msgid "Sale journal in this month"
msgstr ""
msgstr "Энэ сарын борлуулалтын журнал"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_vat_declaration
@ -4949,7 +4986,7 @@ msgstr ""
#: field:account.financial.report,children_ids:0
#: model:ir.model,name:account.model_account_financial_report
msgid "Account Report"
msgstr ""
msgstr "Санхүүгийн тайлан"
#. module: account
#: field:account.journal.column,name:0
@ -5169,7 +5206,7 @@ msgstr "Аналитик бичилт шилжилгээ"
#. module: account
#: field:wizard.multi.charts.accounts,bank_accounts_id:0
msgid "Cash and Banks"
msgstr ""
msgstr "Касс болон банк"
#. module: account
#: model:ir.model,name:account.model_account_installer
@ -5823,7 +5860,7 @@ msgstr "Үйлчлүүлэгчийн буцаалт"
#. module: account
#: field:account.account,foreign_balance:0
msgid "Foreign Balance"
msgstr ""
msgstr "Гадаад бланс"
#. module: account
#: field:account.journal.period,name:0
@ -6963,7 +7000,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
msgid "Financial Reports Hierarchy"
msgstr ""
msgstr "Санхүүгийн Тайлангуудын Шатлал"
#. module: account
#: field:account.entries.report,product_uom_id:0
@ -7329,7 +7366,7 @@ msgstr "Хэвийн"
#: model:ir.actions.act_window,name:account.action_email_templates
#: model:ir.ui.menu,name:account.menu_email_templates
msgid "Email Templates"
msgstr ""
msgstr "Имэйл Үлгэрүүд"
#. module: account
#: view:account.move.line:0
@ -7364,7 +7401,7 @@ msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_multi_currency
msgid "Multi-Currencies"
msgstr ""
msgstr "Олон-валют"
#. module: account
#: field:account.model.line,date_maturity:0
@ -7404,7 +7441,7 @@ msgstr ""
#: view:account.financial.report:0
#: model:ir.ui.menu,name:account.menu_account_report_tree_hierarchy
msgid "Account Reports Hierarchy"
msgstr ""
msgstr "Дансны Тайлангийн Шатлал"
#. module: account
#: help:account.account.template,chart_template_id:0
@ -7525,7 +7562,7 @@ msgstr "Ангилалын код"
#. module: account
#: view:validate.account.move:0
msgid "Post Journal Entries of a Journal"
msgstr ""
msgstr "Өгөгдсөн журналын бүх бичилтүүдийг илгээх"
#. module: account
#: view:product.product:0
@ -8099,7 +8136,7 @@ msgstr "Орлогын толгой данс"
#. module: account
#: field:account.account,adjusted_balance:0
msgid "Adjusted Balance"
msgstr ""
msgstr "Тохируулсан бланс"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
@ -8883,7 +8920,7 @@ msgstr "Мөчлөгийн төгсгөл"
#: model:ir.actions.act_window,name:account.action_account_report_pl
#: model:ir.ui.menu,name:account.menu_account_reports
msgid "Financial Reports"
msgstr ""
msgstr "Санхүүгийн Тайлангууд"
#. module: account
#: report:account.account.balance:0
@ -9567,7 +9604,7 @@ msgstr "4 сар"
#. module: account
#: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0
msgid "Profit (Loss) to report"
msgstr ""
msgstr "Ашиг (Алдагдалт) тайланд"
#. module: account
#: view:account.move.line.reconcile.select:0
@ -9767,7 +9804,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_account_gain_loss
#: model:ir.ui.menu,name:account.menu_unrealized_gains_losses
msgid "Unrealized Gain or Loss"
msgstr ""
msgstr "Тэгшитгэгдээгүй Ашиг эсвэл Алдагдал"
#. module: account
#: view:account.fiscalyear:0
@ -10019,7 +10056,7 @@ msgstr ""
#. module: account
#: selection:account.print.journal,sort_selection:0
msgid "Journal Entry Number"
msgstr ""
msgstr "Журналын бичилтийн дугаар"
#. module: account
#: view:account.subscription:0
@ -10842,9 +10879,6 @@ msgstr ""
#~ msgid "Draft Supplier Refunds"
#~ msgstr "Нийлүүлэгчийн ноорог буцаалт"
#~ msgid "Unreconciliation transactions"
#~ msgstr "Тулгагдаагүй гүйлгээнүүд"
#~ msgid "Analytic Journal -"
#~ msgstr "Аналитик журнал -"
@ -12261,3 +12295,12 @@ msgstr ""
#~ msgid "Invoices Created Within Past 15 Days"
#~ msgstr "Сүүлийн 15 өдөрт үүссэн нэхэмжлэлүүд"
#~ msgid "Go to next partner"
#~ msgstr "Дараагийн харилцагч"
#~ msgid "Open For Unreconciliation"
#~ msgstr "Гүйцээлтийг арилгахаар нээх"
#~ msgid "Unreconciliation transactions"
#~ msgstr "Гүйлгээнүүдийн гүйцээлтийг арилгах"

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:39+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:54+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-29 04:38+0000\n"
"X-Generator: Launchpad (build 15505)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:52+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: code:addons/account/account.py:1307
@ -218,7 +218,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_account_tax_template_form
#: model:ir.ui.menu,name:account.menu_action_account_tax_template_form
msgid "Tax Templates"
msgstr "Belasting templates"
msgstr "Belasting sjablonen"
#. module: account
#: model:ir.model,name:account.model_account_tax
@ -260,7 +260,9 @@ msgstr "Belgische overzichten"
#: code:addons/account/account_move_line.py:1200
#, python-format
msgid "You can not add/modify entries in a closed journal."
msgstr "Er kunnen geen boekingen worden aangepast die zijn afgesloten"
msgstr ""
"Er kunnen geen wijzigingen worden aangebracht in een dagboek dat al is "
"afgesloten."
#. module: account
#: help:account.account,user_type:0
@ -384,7 +386,7 @@ msgid ""
msgstr ""
"Dit formulier wordt gebruikt door boekhouders voor het invoeren van grote "
"hoeveelheden boekingen in OpenERP. De journaalposten worden aangemaakt door "
"OpenERP als er gebruik wordt gemaakt van bankafschriften, kassasystemen of "
"OpenERP als er gebruik wordt gemaakt van bankafschriften, Kasregisters of "
"klant/leverancier-betalingen."
#. module: account
@ -573,7 +575,7 @@ msgstr "Creditering factuur"
#. module: account
#: report:account.overdue:0
msgid "Li."
msgstr "Li."
msgstr "Bt."
#. module: account
#: field:account.automatic.reconcile,unreconciled:0
@ -916,7 +918,7 @@ msgstr "Berekening"
#. module: account
#: selection:account.invoice.refund,filter_refund:0
msgid "Cancel: refund invoice and reconcile"
msgstr "Annuleer: factuur crediteren en afletteren"
msgstr "Factuur annuleren: factuur crediteren en afletteren"
#. module: account
#: field:account.cashbox.line,pieces:0
@ -1151,13 +1153,13 @@ msgstr "Toepasbaarheidsopties"
#. module: account
#: report:account.partner.balance:0
msgid "In dispute"
msgstr "Geschil"
msgstr "Wordt betwist"
#. module: account
#: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
#: model:ir.ui.menu,name:account.journal_cash_move_lines
msgid "Cash Registers"
msgstr "Kassasystemen"
msgstr "Kasregisters"
#. module: account
#: report:account.analytic.account.journal:0
@ -1724,8 +1726,8 @@ msgid ""
"Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
"cancel the current invoice."
msgstr ""
"Annuleer factuur: Genereert een creditfactuur, valideert en lettert af om de "
"huidige factuur te annuleren."
"Factuur annuleren: Genereert een creditfactuur, valideert en lettert af om "
"de huidige factuur te annuleren."
#. module: account
#: model:ir.ui.menu,name:account.periodical_processing_invoicing
@ -2711,7 +2713,7 @@ msgstr "Afletteren bank"
#. module: account
#: report:account.invoice:0
msgid "Disc.(%)"
msgstr "Korting. (%)"
msgstr "Krt. (%)"
#. module: account
#: report:account.general.ledger:0
@ -3836,7 +3838,7 @@ msgstr "Mutaties"
#. module: account
#: selection:account.invoice.refund,filter_refund:0
msgid "Create a draft Refund"
msgstr "Maak een concept terugbetaling"
msgstr "Crediteer factuur: Maak een concept credit factuur"
#. module: account
#: view:account.state.open:0
@ -8380,8 +8382,8 @@ msgid ""
"Modify Invoice: Cancels the current invoice and creates a new copy of it "
"ready for editing."
msgstr ""
"Wijzig factuur: Annuleert de huidige facturen en maak een kopie aan, gereed "
"voor bewerken."
"Wijzig factuur: Annuleert de huidige factuur en maakt een kopie aan waarop u "
"wijzigingen kunt maken."
#. module: account
#: field:account.automatic.reconcile,period_id:0
@ -8565,8 +8567,8 @@ msgid ""
"You can check this box to mark this journal item as a litigation with the "
"associated partner"
msgstr ""
"U kunt deze optie aanvinken om deze boeking te markeren als een geschil met "
"de geassocieerde partner"
"U kunt deze optie aanvinken om deze boeking te markeren als deze boeking "
"wordt betwist door uw klant."
#. module: account
#: field:account.move.line,reconcile_partial_id:0
@ -9383,7 +9385,7 @@ msgstr "Belastingrubriek sjabloon"
#. module: account
#: report:account.overdue:0
msgid "Document: Customer account statement"
msgstr "Document: Boekhoudkundige klantverklaring"
msgstr "Document: Rekeningoverzicht klant"
#. module: account
#: field:account.account.type,report_type:0
@ -10737,7 +10739,8 @@ msgstr "November"
#: selection:account.invoice.refund,filter_refund:0
msgid "Modify: refund invoice, reconcile and create a new draft invoice"
msgstr ""
"Bewerken: Crediteer factuur, afletteren en maak een nieuwe concept factuur"
"Wijzig factuur: Annuleert de huidige factuur en maakt een kopie aan waarop u "
"wijzigingen kunt maken."
#. module: account
#: help:account.invoice.line,account_id:0

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

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:43+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:58+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:39+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:54+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:40+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:54+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0
@ -1496,7 +1496,7 @@ msgstr "# cyfr"
#. module: account
#: field:account.journal,entry_posted:0
msgid "Skip 'Draft' State for Manual Entries"
msgstr "Pomiń stan \"prjekt\" przy ręcznych zapisach"
msgstr "Pomiń stan \"Projekt\" przy ręcznych zapisach"
#. module: account
#: view:account.invoice.report:0
@ -6673,7 +6673,7 @@ msgid ""
"this journal or of the invoice related to this journal"
msgstr ""
"Zaznacz to pole, jeśli chcesz pozwolić na anulowanie zapisów związanych z "
"tego dziennika lub faktur tego dziennika."
"tym dziennikiem lub faktur z tego dziennika."
#. module: account
#: view:account.fiscalyear.close:0

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

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:40+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:55+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:43+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:57+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:40+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:55+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:40+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:55+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:40+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:55+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:41+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:55+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:41+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:55+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:35+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:51+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:40+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:55+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:58+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:41+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:56+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0
@ -479,11 +479,10 @@ msgid ""
"amount of each area of the tax declaration for your country. It’s presented "
"in a hierarchical structure, which can be modified to fit your needs."
msgstr ""
"Skattetabellen är en trädvy som återspeglar strukturen i de skatteklasser "
"(eller skattekoder) och visar den aktuella skattesituationen. Tabellen "
"representerar den mängd varje område av deklarationen för ditt land. Det "
"presenteras i en hierarkisk struktur, som kan ändras för att passa dina "
"behov."
"Skattetabellen är en trädvy som återspeglar skatteklassernas (eller "
"skattekodernas) struktur och visar den aktuella skattesituationen. Tabellen "
"representerar de belopp för varje ruta i ditt lands deklaration, presenterat "
"i en hierarkisk struktur, som kan ändras för att passa dina behov."
#. module: account
#: view:account.analytic.line:0
@ -660,7 +659,7 @@ msgstr "Period saknas eller flera perioder finns för det givna datumet."
#. module: account
#: field:account.invoice.tax,tax_amount:0
msgid "Tax Code Amount"
msgstr "Tax Code Amount"
msgstr "Skattekodsbelopp"
#. module: account
#: code:addons/account/account.py:3116
@ -1249,7 +1248,7 @@ msgstr "Moms vid inköp"
#: field:account.tax.template,tax_code_id:0
#: model:ir.model,name:account.model_account_tax_code
msgid "Tax Code"
msgstr "Momskod"
msgstr "Skattekod"
#. module: account
#: field:account.account,currency_mode:0
@ -1466,7 +1465,7 @@ msgstr "Central Journal"
#: selection:account.partner.balance,display_partner:0
#: selection:account.report.general.ledger,display_account:0
msgid "With balance is not equal to 0"
msgstr "With balance is not equal to 0"
msgstr "Med balans skilt från 0"
#. module: account
#: view:account.tax:0
@ -1726,7 +1725,7 @@ msgstr "Okänt företag"
#. module: account
#: field:account.tax.code,sum:0
msgid "Year Sum"
msgstr "Year Sum"
msgstr "Årtotal"
#. module: account
#: code:addons/account/account_invoice.py:1429
@ -2719,7 +2718,7 @@ msgstr "Betald/Återbetald"
#: field:account.tax,ref_base_code_id:0
#: field:account.tax.template,ref_base_code_id:0
msgid "Refund Base Code"
msgstr "Refund Base Code"
msgstr "Återbetalningskod"
#. module: account
#: selection:account.tax.template,applicable_type:0
@ -3337,7 +3336,7 @@ msgstr " Värdebelopp: 0.02"
#: model:ir.actions.act_window,name:account.open_board_account
#: model:ir.ui.menu,name:account.menu_board_account
msgid "Accounting Dashboard"
msgstr "Redovisningsdashboard"
msgstr "Redovisningsinfopanel"
#. module: account
#: field:account.bank.statement,balance_start:0
@ -3462,7 +3461,7 @@ msgstr "Sök affärshändelse"
#: field:account.tax.code,name:0
#: field:account.tax.code.template,name:0
msgid "Tax Case Name"
msgstr "Tax Case Name"
msgstr "Skatteklass"
#. module: account
#: report:account.invoice:0
@ -3726,14 +3725,14 @@ msgid ""
"If not applicable (computed through a Python code), the tax won't appear on "
"the invoice."
msgstr ""
"If not applicable (computed through a Python code), the tax won't appear on "
"the invoice."
"Om ej tillämpligt (beräknas med Pythonkod), kommer skatten inte att visas på "
"fakturan."
#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Applicable Code (if type=code)"
msgstr "Applicable Code (if type=code)"
msgstr "Gäller Kod (om type = kod)"
#. module: account
#: view:account.invoice.report:0
@ -4243,7 +4242,7 @@ msgstr "Tax Lines"
#. module: account
#: field:account.tax,base_code_id:0
msgid "Account Base Code"
msgstr "Konto bas kod"
msgstr "Kontobaskod"
#. module: account
#: code:addons/account/account_analytic_line.py:93
@ -4641,7 +4640,7 @@ msgstr "Unreconciliation Transactions"
#: field:account.tax,ref_tax_code_id:0
#: field:account.tax.template,ref_tax_code_id:0
msgid "Refund Tax Code"
msgstr "Refund Tax Code"
msgstr "Återbetalningsskattekod"
#. module: account
#: view:validate.account.move:0
@ -5069,7 +5068,7 @@ msgstr "Betalningar"
#. module: account
#: view:account.tax:0
msgid "Reverse Compute Code"
msgstr "Backberäknings kod"
msgstr "Återberäkningskod"
#. module: account
#: field:account.subscription.line,move_id:0
@ -5080,7 +5079,7 @@ msgstr "Konteringspost"
#: field:account.tax,python_compute_inv:0
#: field:account.tax.template,python_compute_inv:0
msgid "Python Code (reverse)"
msgstr "Python Code (reverse)"
msgstr "Pythonkod (bakåt)"
#. module: account
#: model:ir.actions.act_window,name:account.action_payment_term_form
@ -5222,7 +5221,7 @@ msgstr "Ingen period är vald för fakturan!"
#. module: account
#: view:account.tax.template:0
msgid "Compute Code (if type=code)"
msgstr "Compute Code (if type=code)"
msgstr "Beräkna kod (if type=code)"
#. module: account
#: selection:account.analytic.journal,type:0
@ -5413,7 +5412,7 @@ msgstr "Du kan inte skapa mer än en transaktion per period i huvudboken."
#: field:account.tax.template,ref_tax_sign:0
#: field:account.tax.template,tax_sign:0
msgid "Tax Code Sign"
msgstr "Tax Code Sign"
msgstr "Skattekodstecken"
#. module: account
#: model:ir.model,name:account.model_report_invoice_created
@ -7081,7 +7080,7 @@ msgstr ""
#: field:account.tax.code,child_ids:0
#: field:account.tax.code.template,child_ids:0
msgid "Child Codes"
msgstr "Child Codes"
msgstr "Underkoder"
#. module: account
#: view:account.tax.template:0
@ -7380,7 +7379,7 @@ msgstr "Ok"
#. module: account
#: field:account.chart.template,tax_code_root_id:0
msgid "Root Tax Code"
msgstr "Root Tax Code"
msgstr "skattekodsrot"
#. module: account
#: help:account.journal,centralisation:0
@ -7802,7 +7801,7 @@ msgstr "Numreringsfältet används för stigande sortering"
#: field:account.tax.code,code:0
#: field:account.tax.code.template,code:0
msgid "Case Code"
msgstr "Ärendekod"
msgstr "Skatteklasskod"
#. module: account
#: view:validate.account.move:0
@ -8229,7 +8228,7 @@ msgstr "You must first select a partner !"
#: view:account.invoice:0
#: field:account.invoice,comment:0
msgid "Additional Information"
msgstr "Additional Information"
msgstr "Ytterligare information"
#. module: account
#: help:account.invoice,state:0
@ -8681,7 +8680,7 @@ msgstr "Kontakter"
#: view:account.tax.code.template:0
#: field:account.tax.code.template,parent_id:0
msgid "Parent Code"
msgstr "Parent Code"
msgstr "Överliggande kod"
#. module: account
#: model:ir.model,name:account.model_account_payment_term_line
@ -9317,7 +9316,7 @@ msgstr "Obetald"
#. module: account
#: model:ir.model,name:account.model_account_tax_code_template
msgid "Tax Code Template"
msgstr "Tax Code Template"
msgstr "Skattekodsmall"
#. module: account
#: report:account.overdue:0
@ -10509,7 +10508,7 @@ msgstr "Account Data"
#. module: account
#: view:account.tax.code.template:0
msgid "Account Tax Code Template"
msgstr "Account Tax Code Template"
msgstr "Kontoskattekodsmall"
#. module: account
#: model:process.node,name:account.process_node_manually0
@ -10592,11 +10591,11 @@ msgid ""
msgstr ""
"Skapa och hantera ditt företags journaler från denna meny. En journal som "
"används för att registrera transaktioner för alla redovisningsdata knutet "
"till den dagliga verksamheten i ditt företag som använder dubbel bokföring "
"system. Beroende på arten av sin verksamhet och antalet dagliga "
"transaktioner kan ett företag ha flera typer av specialiserade journaler som "
"till exempel journalen för kontantförsäljning, inköpsjournalen och "
"försäljningsjournalen ..."
"till den dagliga verksamheten i ditt företag som använder dubbel bokföring. "
"Beroende på arten av sin verksamhet och antalet dagliga transaktioner kan "
"ett företag ha flera typer av specialiserade journaler som till exempel "
"journalen för kontantförsäljning, inköpsjournalen och försäljningsjournalen "
"..."
#. module: account
#: view:account.payment.term:0
@ -12903,9 +12902,6 @@ msgstr ""
#~ msgid "Receivable Accounts"
#~ msgstr "Kundfordringskonton"
#~ msgid "Tax codes"
#~ msgstr "Skattedeklarationsrubriker"
#~ msgid "Install your Chart of Accounts"
#~ msgstr "Installera din kontoplan"
@ -12929,3 +12925,6 @@ msgstr ""
#~ msgid "Reconciliation transactions"
#~ msgstr "Avstämningstransaktioner"
#~ msgid "Tax codes"
#~ msgstr "Skattekoder"

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:41+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:56+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:41+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:56+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:41+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:56+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:42+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:56+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:42+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:56+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:42+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:56+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:42+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:56+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:42+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:57+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:42+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:57+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-06-20 16:17+0000\n"
"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
"PO-Revision-Date: 2012-07-11 03:05+0000\n"
"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:58+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0
@ -4963,7 +4963,7 @@ msgstr "资产负债表"
#: view:account.general.journal:0
#: model:ir.ui.menu,name:account.menu_account_general_journal
msgid "General Journals"
msgstr "一般账簿"
msgstr "总账账簿"
#. module: account
#: field:account.journal,allow_date:0
@ -5702,7 +5702,7 @@ msgstr "发票税科目"
#: model:ir.actions.act_window,name:account.action_account_general_journal
#: model:ir.model,name:account.model_account_general_journal
msgid "Account General Journal"
msgstr "一般账簿"
msgstr "科目总账账簿"
#. module: account
#: field:account.payment.term.line,days:0
@ -10184,7 +10184,7 @@ msgstr "周期次数"
#: report:account.general.journal:0
#: model:ir.actions.report.xml,name:account.account_general_journal
msgid "General Journal"
msgstr "一般账簿"
msgstr "总账账簿"
#. module: account
#: view:account.invoice:0

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

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:42+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:57+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-14 05:58+0000\n"
"X-Generator: Launchpad (build 15614)\n"
#. module: account
#: view:account.invoice.report:0

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

@ -236,19 +236,33 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Project line" version="7.0">
<group col="4">
<field name="name"/>
<field name="account_id"/>
<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, 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"/>
<field name="currency_id"/>
<field name="amount_currency"/>
<field name="company_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
<group>
<group>
<field name="name"/>
<field name="account_id"/>
<field name="journal_id"/>
</group>
<group>
<field name="date" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
<field name="company_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
</group>
<group string="Amount">
<field name="amount"/>
<label for="amount_currency"/>
<div>
<field name="amount_currency" class="oe_inline"/>
<field name="currency_id" class="oe_inline"/>
</div>
<field invisible="1" name="general_account_id"/>
</group>
<group string="Product Information">
<field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/>
<label for="unit_amount"/>
<div>
<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" class="oe_inline"/>
<field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" class="oe_inline"/>
</div>
</group>
</group>
</form>
</field>

32
addons/account/report/account_print_invoice.rml
View File

@ -244,7 +244,7 @@
<blockTable colWidths="185.0,70.0,80.0,60.0,50.0,85.0" style="Table8">
<tr>
<td>
<para style="terp_default_9">[[ l.name ]]</para>
<para style="terp_default_9">[[ format(l.name) ]]</para>
</td>
<td>
<para style="terp_default_Centre_9">[[ ', '.join([ lt.name or '' for lt in l.invoice_line_tax_id ]) ]]</para>
@ -262,36 +262,6 @@
<para style="terp_default_Right_9">[[ formatLang(l.price_subtotal, dp='Account', currency_obj=o.currency_id) ]]</para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_Note">[[ format(l.note or '') or removeParentNode('tr') ]]</para>
</td>
<td>
<para style="terp_default_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Right_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Right_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Right_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Right_9">
<font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
</section>
<blockTable colWidths="385.0,60.0,85.0" style="Table10">

7
addons/account/res_config.py
View File

@ -49,6 +49,12 @@ class account_config_settings(osv.osv_memory):
'has_chart_of_accounts': fields.boolean('Company has a chart of accounts'),
'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', domain="[('visible','=', True)]"),
'code_digits': fields.integer('# of Digits', help="No. of Digits to use for account code"),
'tax_calculation_rounding_method': fields.related('company_id',
'tax_calculation_rounding_method', type='selection', selection=[
('round_per_line', 'Round per Line'),
('round_globally', 'Round Globally'),
], string='Tax Calculation Rounding Method',
help="If you select 'Round per Line' : for each tax, the tax amount will first be computed and rounded for each PO/SO/invoice line and then these rounded amounts will be summed, leading to the total amount for that tax. If you select 'Round Globally': for each tax, the tax amount will be computed for each PO/SO/invoice line, then these amounts will be summed and eventually this total tax amount will be rounded. If you sell with tax included, you should choose 'Round per line' because you certainly want the sum of your tax-included line subtotals to be equal to the total amount with taxes."),
'sale_tax': fields.many2one("account.tax.template", "Default Sale Tax"),
'purchase_tax': fields.many2one("account.tax.template", "Default Purchase Tax"),
'sale_tax_rate': fields.float('Sales Tax (%)'),
@ -152,6 +158,7 @@ class account_config_settings(osv.osv_memory):
'has_chart_of_accounts': has_chart_of_accounts,
'has_fiscal_year': bool(fiscalyear_count),
'chart_template_id': False,
'tax_calculation_rounding_method': company.tax_calculation_rounding_method,
}
# update journals and sequences
for journal_type in ('sale', 'sale_refund', 'purchase', 'purchase_refund'):

4
addons/account/res_config_view.xml
View File

@ -21,7 +21,7 @@
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<sheet>
<field name="has_default_company" invisible="1" />
<field name="has_chart_of_accounts" invisible="1"/>
<field name="complete_tax_set" invisible="1"/>
@ -76,6 +76,7 @@
<group>
<field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]"
attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
<field name="tax_calculation_rounding_method"/>
<field name="module_account_asset"/>
<field name="module_account_budget"/>
</group>
@ -134,7 +135,6 @@
<group name="analytic_accounting" invisible="1" string="Analytic Accounting"/>
</group>
</sheet>
</form>
</field>
</record>

10
addons/account/wizard/account_automatic_reconcile_view.xml
View File

@ -8,11 +8,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Reconciliation" version="7.0">
<header>
<button name="reconcile" string="Reconcile" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Reconciliation"/>
<label string="For an invoice to be considered as paid, the invoice entries must be reconciled with counterparts, usually payments. With the automatic reconciliation functionality, OpenERP makes its own search for entries to reconcile in a series of accounts. It finds entries for each partner where the amounts correspond."/>
<field name="account_ids" domain="[('reconcile','=',1)]"/>
@ -26,6 +21,11 @@
<field name="journal_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
<field name="period_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
</group>
<footer>
<button name="reconcile" string="Reconcile" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/account/wizard/account_change_currency_view.xml
View File

@ -7,14 +7,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Invoice Currency" version="7.0">
<header>
<button name="change_currency" string="Change Currency" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group string="This wizard will change the currency of the invoice">
<field name="currency_id"/>
</group>
<footer>
<button name="change_currency" string="Change Currency" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/account/wizard/account_chart_view.xml
View File

@ -7,11 +7,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Account charts" version="7.0">
<header>
<button string="Open Charts" name="account_chart_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group colspan="4">
<field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)"/>
<field name="target_move"/>
@ -20,6 +15,11 @@
<field name="period_from"/>
<field name="period_to"/>
</group>
<footer>
<button string="Open Charts" name="account_chart_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/account/wizard/account_fiscalyear_close_view.xml
View File

@ -7,11 +7,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Generate Fiscal Year Opening Entries" version="7.0">
<header>
<button string="Create" name="data_save" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Generate Fiscal Year Opening Entries"/>
<label string="This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones."/>
<newline/>
@ -22,6 +17,11 @@
<field name="period_id" domain ="[('fiscalyear_id','=',fy2_id),('special','=', True)]" />
<field name="report_name"/>
</group>
<footer>
<button string="Create" name="data_save" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/account/wizard/account_invoice_refund_view.xml
View File

@ -8,11 +8,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Credit Note" version="7.0">
<header>
<button string='Refund' name="invoice_refund" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Credit Note Options"/>
<group col="4">
<field name="description"/>
@ -24,6 +19,11 @@
<label string="Modify Invoice: Cancels the current invoice and creates a new copy of it ready for editing."/>
<label string="Credit Note: Creates the credit note, ready for editing."/>
<label string="Cancel Invoice: Creates the credit note, validate and reconcile it to cancel the current invoice."/>
<footer>
<button string='Refund' name="invoice_refund" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

32
addons/account/wizard/account_invoice_state_view.xml
View File

@ -6,14 +6,14 @@
<field name="model">account.invoice.confirm</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Confirm Draft Invoices" version="7.0">
<header>
<button string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Confirm Draft Invoices"/>
</form>
<form string="Confirm Draft Invoices" version="7.0">
<separator string="Confirm Draft Invoices"/>
<footer>
<button string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>
@ -28,14 +28,14 @@
<field name="model">account.invoice.cancel</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Cancel Selected Invoices" version="7.0">
<header>
<button string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Cancel Selected Invoices"/>
</form>
<form string="Cancel Selected Invoices" version="7.0">
<separator string="Cancel Selected Invoices"/>
<footer>
<button string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

14
addons/account/wizard/account_journal_select_view.xml
View File

@ -7,14 +7,14 @@
<field name="model">account.journal.select</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Journal Select" version="7.0">
<header>
<button string="Open Entries" name="action_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<form string="Journal Select" version="7.0">
<label string="Are you sure you want to open Journal Entries?"/>
</form>
<footer>
<button string="Open Entries" name="action_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/account/wizard/account_move_bank_reconcile_view.xml
View File

@ -7,14 +7,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Bank reconciliation" version="7.0">
<header>
<button string="Open for Bank Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group>
<field name="journal_id"/>
</group>
<footer>
<button string="Open for Bank Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/account/wizard/account_move_line_reconcile_select_view.xml
View File

@ -7,14 +7,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Reconciliation" version="7.0">
<header>
<button string="Open for Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group>
<field name="account_id"/>
</group>
<footer>
<button string="Open for Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

6
addons/account/wizard/account_move_line_select_view.xml
View File

@ -8,12 +8,12 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Account Select" version="7.0">
<header>
<label string="Are you sure you want to open Account move line entries?"/>
<footer>
<button string="Open Entries" name="open_window" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<label string="Are you sure you want to open Account move line entries?"/>
</footer>
</form>
</field>
</record>

10
addons/account/wizard/account_move_line_unreconcile_select_view.xml
View File

@ -7,14 +7,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Unreconciliation" version="7.0">
<header>
<button string="Open for Unreconciliation" name="action_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group>
<field name="account_id"/>
</group>
<footer>
<button string="Open for Unreconciliation" name="action_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/account/wizard/account_open_closed_fiscalyear_view.xml
View File

@ -7,14 +7,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Choose Fiscal Year " version="7.0">
<header>
<button string="Open" name="remove_entries" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group>
<field name="fyear_id" domain="[('state','=','draft')]"/>
</group>
<footer>
<button string="Open" name="remove_entries" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/account/wizard/account_period_close_view.xml
View File

@ -8,14 +8,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Close Period" version="7.0">
<header>
<button string="Close Period" name="data_save" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group string="Are you sure?">
<field name="sure"/>
</group>
<footer>
<button string="Close Period" name="data_save" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

6
addons/account/wizard/account_reconcile_partner_process_view.xml
View File

@ -7,15 +7,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Partner Reconciliation" version="7.0">
<header>
<button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to Next Partner" class="oe_highlight" />
</header>
<group col="4">
<field name="next_partner_id"/>
<field name="progress" widget="progressbar" colspan="4"/>
<field name="today_reconciled"/>
<field name="to_reconcile"/>
</group>
<footer>
<button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to Next Partner" class="oe_highlight" />
</footer>
</form>
</field>
</record>

14
addons/account/wizard/account_reconcile_view.xml
View File

@ -8,13 +8,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Reconciliation" version="7.0">
<header>
<button string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}" class="oe_highlight"/>
<button string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
<button string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group col="4" string="Reconciliation Transactions">
<field name="trans_nbr"/>
<newline/>
@ -23,6 +16,13 @@
</group><group string="Write-Off">
<field name="writeoff"/>
</group>
<footer>
<button string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}" class="oe_highlight"/>
<button string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
<button string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

10
addons/account/wizard/account_report_aged_partner_balance_view.xml
View File

@ -9,11 +9,6 @@
<!--<field name="inherit_id" ref="account_common_report_view" />-->
<field name="arch" type="xml">
<form string="Report Options" version="7.0">
<header>
<button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Aged Partner Balance"/>
<label string="Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. "/>
<group col="4">
@ -26,6 +21,11 @@
<field name="direction_selection"/>
</group>
<field name="journal_ids" required="0" invisible="1"/>
<footer>
<button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</footer>
</form>
</field>
</record>

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