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

[MERGE] Sync with trunk - bunch of conflicts resolved 

bzr revid: odo@openerp.com-20120803142450-97z551yam1js822h
This commit is contained in:
Olivier Dony 2012-08-03 16:24:50 +02:00
parent 093f739273 c61431bd3e
commit f0873dcb32
6546 changed files with 183226 additions and 51589 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
addons/account/__openerp__.py
View File

@ -29,25 +29,23 @@ Accounting and Financial Management.
Financial and accounting module that covers:
--------------------------------------------
General accountings
Cost / Analytic accounting
Third party accounting
Taxes management
Budgets
Customer and Supplier Invoices
Bank statements
Reconciliation process by partner
* General Accounting
* Cost/Analytic accounting
* Third party accounting
* Taxes management
* Budgets
* Customer and Supplier Invoices
* Bank statements
* Reconciliation process by partner
Creates a dashboard for accountants that includes:
--------------------------------------------------
* List of Customer Invoice to Approve
* Company Analysis
* Graph of Aged Receivables
* Graph of Treasury
* List of Customer Invoice to Approve
* Company Analysis
* Graph of Treasury
The processes like maintaining of general ledger is done through the defined financial Journals (entry move line or
grouping is maintained through journal) for a particular financial year and for preparation of vouchers there is a
module named account_voucher.
The processes like maintaining of general ledger is done through the defined financial Journals (entry move line orgrouping is maintained through journal) for a particular
financial year and for preparation of vouchers there is a module named account_voucher.
""",
'website': 'http://www.openerp.com',
'images' : ['images/accounts.jpeg','images/bank_statement.jpeg','images/cash_register.jpeg','images/chart_of_accounts.jpeg','images/customer_invoice.jpeg','images/journal_entries.jpeg'],
@ -99,6 +97,7 @@ module named account_voucher.
'wizard/account_reconcile_partner_process_view.xml',
'wizard/account_automatic_reconcile_view.xml',
'wizard/account_financial_report_view.xml',
'wizard/pos_box.xml',
'project/wizard/project_account_analytic_line_view.xml',
'account_end_fy.xml',
'account_invoice_view.xml',
@ -145,8 +144,8 @@ module named account_voucher.
'test/account_use_model.yml',
'test/account_validate_account_move.yml',
'test/account_fiscalyear_close.yml',
'test/account_bank_statement.yml',
'test/account_cash_statement.yml',
#'test/account_bank_statement.yml',
#'test/account_cash_statement.yml',
'test/test_edi_invoice.yml',
'test/account_report.yml',
'test/account_fiscalyear_close_state.yml', #last test, as it will definitively close the demo fiscalyear

104
addons/account/account.py
View File

@ -29,6 +29,8 @@ import pooler
from osv import fields, osv
import decimal_precision as dp
from tools.translate import _
from tools.float_utils import float_round
_logger = logging.getLogger(__name__)
def check_cycle(self, cr, uid, ids, context=None):
@ -101,7 +103,7 @@ class account_payment_term_line(osv.osv):
'value': fields.selection([('procent', 'Percent'),
('balance', 'Balance'),
('fixed', 'Fixed Amount')], 'Valuation',
required=True, help="""Select here the kind of valuation related to this payment term line. Note that you should have your last line with the type 'Balance' to ensure that the whole amount will be threated."""),
required=True, help="""Select here the kind of valuation related to this payment term line. Note that you should have your last line with the type 'Balance' to ensure that the whole amount will be treated."""),
'value_amount': fields.float('Amount To Pay', digits_compute=dp.get_precision('Payment Term'), help="For percent enter a ratio between 0-1."),
'days': fields.integer('Number of Days', required=True, help="Number of days to add before computation of the day of month." \
@ -313,8 +315,8 @@ class account_account(osv.osv):
cr.execute(request, params)
_logger.debug('Status: %s',(cr.statusmessage))
for res in cr.dictfetchall():
accounts[res['id']] = res
for row in cr.dictfetchall():
accounts[row['id']] = row
# consolidate accounts with direct children
children_and_consolidated.reverse()
@ -474,7 +476,7 @@ class account_account(osv.osv):
'shortcut': fields.char('Shortcut', size=12),
'tax_ids': fields.many2many('account.tax', 'account_account_tax_default_rel',
'account_id', 'tax_id', 'Default Taxes'),
'note': fields.text('Note'),
'note': fields.text('Internal Notes'),
'company_currency_id': fields.function(_get_company_currency, type='many2one', relation='res.currency', string='Company Currency'),
'company_id': fields.many2one('res.company', 'Company', required=True),
'active': fields.boolean('Active', select=2, help="If the active field is set to False, it will allow you to hide the account without removing it."),
@ -714,6 +716,7 @@ class account_journal(osv.osv):
_name = "account.journal"
_description = "Journal"
_columns = {
'with_last_closing_balance' : fields.boolean('Opening With Last Closing Balance'),
'name': fields.char('Journal Name', size=64, required=True),
'code': fields.char('Code', size=5, required=True, help="The code will be displayed on reports."),
'type': fields.selection([('sale', 'Sale'),('sale_refund','Sale Refund'), ('purchase', 'Purchase'), ('purchase_refund','Purchase Refund'), ('cash', 'Cash'), ('bank', 'Bank and Cheques'), ('general', 'General'), ('situation', 'Opening/Closing Situation')], 'Type', size=32, required=True,
@ -730,16 +733,21 @@ class account_journal(osv.osv):
'centralisation': fields.boolean('Centralised counterpart', help="Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."),
'update_posted': fields.boolean('Allow Cancelling Entries', help="Check this box if you want to allow the cancellation the entries related to this journal or of the invoice related to this journal"),
'group_invoice_lines': fields.boolean('Group Invoice Lines', help="If this box is checked, the system will try to group the accounting lines when generating them from invoices."),
'sequence_id': fields.many2one('ir.sequence', 'Entry Sequence', help="This field contains the informatin related to the numbering of the journal entries of this journal.", required=True),
'sequence_id': fields.many2one('ir.sequence', 'Entry Sequence', help="This field contains the information related to the numbering of the journal entries of this journal.", required=True),
'user_id': fields.many2one('res.users', 'User', help="The user responsible for this journal"),
'groups_id': fields.many2many('res.groups', 'account_journal_group_rel', 'journal_id', 'group_id', 'Groups'),
'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
'entry_posted': fields.boolean('Skip \'Draft\' State for Manual Entries', help='Check this box if you don\'t want new journal entries to pass through the \'draft\' state and instead goes directly to the \'posted state\' without any manual validation. \nNote that journal entries that are automatically created by the system are always skipping that state.'),
'company_id': fields.many2one('res.company', 'Company', required=True, select=1, help="Company related to this journal"),
'allow_date':fields.boolean('Check Date in Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'),
'profit_account_id' : fields.many2one('account.account', 'Profit Account'),
'loss_account_id' : fields.many2one('account.account', 'Loss Account'),
'internal_account_id' : fields.many2one('account.account', 'Internal Transfers Account', select=1),
}
_defaults = {
'with_last_closing_balance' : False,
'user_id': lambda self, cr, uid, context: uid,
'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
}
@ -1263,7 +1271,7 @@ class account_move(osv.osv):
'period_id': fields.many2one('account.period', 'Period', required=True, states={'posted':[('readonly',True)]}),
'journal_id': fields.many2one('account.journal', 'Journal', required=True, states={'posted':[('readonly',True)]}),
'state': fields.selection([('draft','Unposted'), ('posted','Posted')], 'Status', required=True, readonly=True,
help='All manually created new journal entries are usually in the state \'Unposted\', but you can set the option to skip that state on the related journal. In that case, they will be behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' state.'),
help='All manually created new journal entries are usually in the state \'Unposted\', but you can set the option to skip that state on the related journal. In that case, they will behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' state.'),
'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}),
'to_check': fields.boolean('To Review', help='Check this box if you are unsure of that journal entry and if you want to note it as \'to be reviewed\' by an accounting expert.'),
'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", store=True),
@ -1782,7 +1790,7 @@ class account_tax_code(osv.osv):
'line_ids': fields.one2many('account.move.line', 'tax_code_id', 'Lines'),
'company_id': fields.many2one('res.company', 'Company', required=True),
'sign': fields.float('Coefficent for parent', required=True, help='You can specify here the coefficient that will be used when consolidating the amount of this case into its parent. For example, set 1/-1 if you want to add/substract it.'),
'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any VAT related to this Tax Code to appear on invoices"),
'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any tax related to this tax code to appear on invoices"),
'sequence': fields.integer('Sequence', help="Determine the display order in the report 'Accounting \ Reporting \ Generic Reporting \ Taxes \ Taxes Report'"),
}
@ -1862,8 +1870,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."),
@ -1872,17 +1882,17 @@ class account_tax(osv.osv):
'python_applicable':fields.text('Python Code'),
#
# Fields used for the VAT declaration
# Fields used for the Tax declaration
#
'base_code_id': fields.many2one('account.tax.code', 'Account Base Code', help="Use this code for the VAT declaration."),
'tax_code_id': fields.many2one('account.tax.code', 'Account Tax Code', help="Use this code for the VAT declaration."),
'base_code_id': fields.many2one('account.tax.code', 'Account Base Code', help="Use this code for the tax declaration."),
'tax_code_id': fields.many2one('account.tax.code', 'Account Tax Code', help="Use this code for the tax declaration."),
'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
# Same fields for refund invoices
'ref_base_code_id': fields.many2one('account.tax.code', 'Refund Base Code', help="Use this code for the VAT declaration."),
'ref_tax_code_id': fields.many2one('account.tax.code', 'Refund Tax Code', help="Use this code for the VAT declaration."),
'ref_base_code_id': fields.many2one('account.tax.code', 'Refund Base Code', help="Use this code for the tax declaration."),
'ref_tax_code_id': fields.many2one('account.tax.code', 'Refund Tax Code', help="Use this code for the tax declaration."),
'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
'include_base_amount': fields.boolean('Included in base amount', help="Indicates if the amount of tax must be included in the base amount for the computation of the next taxes"),
@ -2001,6 +2011,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,8 +2078,21 @@ 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')
totalin = totalex = round(price_unit * quantity, precision)
tax_compute_precision = precision
if taxes and taxes[0].company_id.tax_calculation_rounding_method == 'round_globally':
tax_compute_precision += 5
totalin = totalex = float_round(price_unit * quantity, precision)
tin = []
tex = []
for tax in taxes:
@ -2075,7 +2100,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 +2108,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 +2121,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 +2130,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 +2186,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,25 +2216,25 @@ 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
Price Unit is a Tax included price
RETURN:
[ tax ]
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
@ -2647,7 +2675,7 @@ class account_tax_code_template(osv.osv):
'parent_id': fields.many2one('account.tax.code.template', 'Parent Code', select=True),
'child_ids': fields.one2many('account.tax.code.template', 'parent_id', 'Child Codes'),
'sign': fields.float('Sign For Parent', required=True),
'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any VAT related to this Tax Code to appear on invoices"),
'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any tax related to this tax Code to appear on invoices."),
}
_defaults = {
@ -2762,17 +2790,17 @@ class account_tax_template(osv.osv):
'python_applicable':fields.text('Python Code'),
#
# Fields used for the VAT declaration
# Fields used for the Tax declaration
#
'base_code_id': fields.many2one('account.tax.code.template', 'Base Code', help="Use this code for the VAT declaration."),
'tax_code_id': fields.many2one('account.tax.code.template', 'Tax Code', help="Use this code for the VAT declaration."),
'base_code_id': fields.many2one('account.tax.code.template', 'Base Code', help="Use this code for the tax declaration."),
'tax_code_id': fields.many2one('account.tax.code.template', 'Tax Code', help="Use this code for the tax declaration."),
'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
# Same fields for refund invoices
'ref_base_code_id': fields.many2one('account.tax.code.template', 'Refund Base Code', help="Use this code for the VAT declaration."),
'ref_tax_code_id': fields.many2one('account.tax.code.template', 'Refund Tax Code', help="Use this code for the VAT declaration."),
'ref_base_code_id': fields.many2one('account.tax.code.template', 'Refund Base Code', help="Use this code for the tax declaration."),
'ref_tax_code_id': fields.many2one('account.tax.code.template', 'Refund Tax Code', help="Use this code for the tax declaration."),
'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
'include_base_amount': fields.boolean('Include in Base Amount', help="Set if the amount of tax must be included in the base amount before computing the next taxes."),
@ -3325,15 +3353,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
# Create Bank journals
self._create_bank_journals_from_o2m(cr, uid, obj_wizard, company_id, acc_template_ref, context=context)
action = {
'type': 'ir.actions.act_window',
'view_type': 'form',
'view_mode': 'form',
'res_model': 'board.board',
'view_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'board_account_form')[1],
'menu_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'menu_finance')[1]
}
return action
return {}
def _prepare_bank_journal(self, cr, uid, line, current_num, default_account_id, company_id, context=None):
'''

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]

289
addons/account/account_bank_statement.py
View File

@ -26,24 +26,18 @@ from tools.translate import _
import decimal_precision as dp
class account_bank_statement(osv.osv):
def create(self, cr, uid, vals, context=None):
seq = 0
if 'line_ids' in vals:
new_line_ids = []
for line in vals['line_ids']:
seq += 1
line[2]['sequence'] = seq
for idx, line in enumerate(vals['line_ids']):
line[2]['sequence'] = idx + 1
return super(account_bank_statement, self).create(cr, uid, vals, context=context)
def write(self, cr, uid, ids, vals, context=None):
res = super(account_bank_statement, self).write(cr, uid, ids, vals, context=context)
account_bank_statement_line_obj = self.pool.get('account.bank.statement.line')
for statement in self.browse(cr, uid, ids, context):
seq = 0
for line in statement.line_ids:
seq += 1
account_bank_statement_line_obj.write(cr, uid, [line.id], {'sequence': seq}, context=context)
for idx, line in enumerate(statement.line_ids):
account_bank_statement_line_obj.write(cr, uid, [line.id], {'sequence': idx + 1}, context=context)
return res
def _default_journal_id(self, cr, uid, context=None):
@ -51,45 +45,19 @@ class account_bank_statement(osv.osv):
context = {}
journal_pool = self.pool.get('account.journal')
journal_type = context.get('journal_type', False)
journal_id = False
company_id = self.pool.get('res.company')._company_default_get(cr, uid, 'account.bank.statement',context=context)
if journal_type:
ids = journal_pool.search(cr, uid, [('type', '=', journal_type),('company_id','=',company_id)])
if ids:
journal_id = ids[0]
return journal_id
return ids[0]
return False
def _end_balance(self, cursor, user, ids, name, attr, context=None):
res_currency_obj = self.pool.get('res.currency')
res_users_obj = self.pool.get('res.users')
res = {}
company_currency_id = res_users_obj.browse(cursor, user, user,
context=context).company_id.currency_id.id
statements = self.browse(cursor, user, ids, context=context)
for statement in statements:
for statement in self.browse(cursor, user, ids, context=context):
res[statement.id] = statement.balance_start
currency_id = statement.currency.id
for line in statement.move_line_ids:
if line.debit > 0:
if line.account_id.id == \
statement.journal_id.default_debit_account_id.id:
res[statement.id] += res_currency_obj.compute(cursor,
user, company_currency_id, currency_id,
line.debit, context=context)
else:
if line.account_id.id == \
statement.journal_id.default_credit_account_id.id:
res[statement.id] -= res_currency_obj.compute(cursor,
user, company_currency_id, currency_id,
line.credit, context=context)
if statement.state in ('draft', 'open'):
for line in statement.line_ids:
res[statement.id] += line.amount
for r in res:
res[r] = round(res[r], 2)
for line in statement.line_ids:
res[statement.id] += line.amount
return res
def _get_period(self, cr, uid, context=None):
@ -129,7 +97,7 @@ class account_bank_statement(osv.osv):
_description = "Bank Statement"
_inherit = ['mail.thread']
_columns = {
'name': fields.char('Name', size=64, required=True, states={'draft': [('readonly', False)]}, readonly=True, help='if you give the Name other then /, its created Accounting Entries Move will be with same name as statement name. This allows the statement entries to have the same references than the statement itself'), # readonly for account_cash_statement
'name': fields.char('Reference', size=64, required=True, states={'draft': [('readonly', False)]}, readonly=True, help='if you give the Name other then /, its created Accounting Entries Move will be with same name as statement name. This allows the statement entries to have the same references than the statement itself'), # readonly for account_cash_statement
'date': fields.date('Date', required=True, states={'confirm': [('readonly', True)]}, select=True),
'journal_id': fields.many2one('account.journal', 'Journal', required=True,
readonly=True, states={'draft':[('readonly',False)]}),
@ -141,7 +109,7 @@ class account_bank_statement(osv.osv):
states={'confirm': [('readonly', True)]}),
'balance_end': fields.function(_end_balance,
store = {
'account.bank.statement': (lambda self, cr, uid, ids, c={}: ids, ['line_ids','move_line_ids'], 10),
'account.bank.statement': (lambda self, cr, uid, ids, c={}: ids, ['line_ids','move_line_ids','balance_start'], 10),
'account.bank.statement.line': (_get_statement, ['amount'], 10),
},
string="Computed Balance", help='Balance as calculated based on Starting Balance and transaction lines'),
@ -205,7 +173,158 @@ class account_bank_statement(osv.osv):
def button_dummy(self, cr, uid, ids, context=None):
return self.write(cr, uid, ids, {}, context=context)
def _prepare_move(self, cr, uid, st_line, st_line_number, context=None):
"""Prepare the dict of values to create the move from a
statement line. This method may be overridden to implement custom
move generation (making sure to call super() to establish
a clean extension chain).
:param browse_record st_line: account.bank.statement.line record to
create the move from.
:param char st_line_number: will be used as the name of the generated account move
:return: dict of value to create() the account.move
"""
return {
'journal_id': st_line.statement_id.journal_id.id,
'period_id': st_line.statement_id.period_id.id,
'date': st_line.date,
'name': st_line_number,
'ref': st_line.ref,
}
def _prepare_bank_move_line(self, cr, uid, st_line, move_id, amount, company_currency_id,
context=None):
"""Compute the args to build the dict of values to create the bank move line from a
statement line by calling the _prepare_move_line_vals. This method may be
overridden to implement custom move generation (making sure to call super() to
establish a clean extension chain).
:param browse_record st_line: account.bank.statement.line record to
create the move from.
:param int/long move_id: ID of the account.move to link the move line
:param float amount: amount of the move line
:param int/long company_currency_id: ID of currency of the concerned company
:return: dict of value to create() the bank account.move.line
"""
anl_id = st_line.analytic_account_id and st_line.analytic_account_id.id or False
debit = ((amount<0) and -amount) or 0.0
credit = ((amount>0) and amount) or 0.0
cur_id = False
amt_cur = False
if st_line.statement_id.currency.id <> company_currency_id:
cur_id = st_line.statement_id.currency.id
if st_line.account_id and st_line.account_id.currency_id and st_line.account_id.currency_id.id <> company_currency_id:
cur_id = st_line.account_id.currency_id.id
if cur_id:
res_currency_obj = self.pool.get('res.currency')
amt_cur = -res_currency_obj.compute(cr, uid, company_currency_id, cur_id, amount, context=context)
res = self._prepare_move_line_vals(cr, uid, st_line, move_id, debit, credit,
amount_currency=amt_cur, currency_id=cur_id, analytic_id=anl_id, context=context)
return res
def _get_counter_part_account(sefl, cr, uid, st_line, context=None):
"""Retrieve the account to use in the counterpart move.
This method may be overridden to implement custom move generation (making sure to
call super() to establish a clean extension chain).
:param browse_record st_line: account.bank.statement.line record to
create the move from.
:return: int/long of the account.account to use as counterpart
"""
if st_line.amount >= 0:
return st_line.statement_id.journal_id.default_credit_account_id.id
return st_line.statement_id.journal_id.default_debit_account_id.id
def _get_counter_part_partner(sefl, cr, uid, st_line, context=None):
"""Retrieve the partner to use in the counterpart move.
This method may be overridden to implement custom move generation (making sure to
call super() to establish a clean extension chain).
:param browse_record st_line: account.bank.statement.line record to
create the move from.
:return: int/long of the res.partner to use as counterpart
"""
return st_line.partner_id and st_line.partner_id.id or False
def _prepare_counterpart_move_line(self, cr, uid, st_line, move_id, amount, company_currency_id,
context=None):
"""Compute the args to build the dict of values to create the counter part move line from a
statement line by calling the _prepare_move_line_vals. This method may be
overridden to implement custom move generation (making sure to call super() to
establish a clean extension chain).
:param browse_record st_line: account.bank.statement.line record to
create the move from.
:param int/long move_id: ID of the account.move to link the move line
:param float amount: amount of the move line
:param int/long account_id: ID of account to use as counter part
:param int/long company_currency_id: ID of currency of the concerned company
:return: dict of value to create() the bank account.move.line
"""
account_id = self._get_counter_part_account(cr, uid, st_line, context=context)
partner_id = self._get_counter_part_partner(cr, uid, st_line, context=context)
debit = ((amount > 0) and amount) or 0.0
credit = ((amount < 0) and -amount) or 0.0
cur_id = False
amt_cur = False
if st_line.statement_id.currency.id <> company_currency_id:
amt_cur = st_line.amount
cur_id = st_line.statement_id.currency.id
return self._prepare_move_line_vals(cr, uid, st_line, move_id, debit, credit,
amount_currency = amt_cur, currency_id = cur_id, account_id = account_id,
partner_id = partner_id, context=context)
def _prepare_move_line_vals(self, cr, uid, st_line, move_id, debit, credit, currency_id = False,
amount_currency= False, account_id = False, analytic_id = False,
partner_id = False, context=None):
"""Prepare the dict of values to create the move line from a
statement line. All non-mandatory args will replace the default computed one.
This method may be overridden to implement custom move generation (making sure to
call super() to establish a clean extension chain).
:param browse_record st_line: account.bank.statement.line record to
create the move from.
:param int/long move_id: ID of the account.move to link the move line
:param float debit: debit amount of the move line
:param float credit: credit amount of the move line
:param int/long currency_id: ID of currency of the move line to create
:param float amount_currency: amount of the debit/credit expressed in the currency_id
:param int/long account_id: ID of the account to use in the move line if different
from the statement line account ID
:param int/long analytic_id: ID of analytic account to put on the move line
:param int/long partner_id: ID of the partner to put on the move line
:return: dict of value to create() the account.move.line
"""
acc_id = account_id or st_line.account_id.id
cur_id = currency_id or st_line.statement_id.currency.id
par_id = partner_id or (((st_line.partner_id) and st_line.partner_id.id) or False)
return {
'name': st_line.name,
'date': st_line.date,
'ref': st_line.ref,
'move_id': move_id,
'partner_id': partner_id,
'account_id': acc_id,
'credit': credit,
'debit': debit,
'statement_id': st_line.statement_id.id,
'journal_id': st_line.statement_id.journal_id.id,
'period_id': st_line.statement_id.period_id.id,
'currency_id': cur_id,
'amount_currency': amount_currency,
'analytic_account_id': analytic_id,
}
def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, st_line_number, context=None):
"""Create the account move from the statement line.
:param int/long st_line_id: ID of the account.bank.statement.line to create the move from.
:param int/long company_currency_id: ID of the res.currency of the company
:param char st_line_number: will be used as the name of the generated account move
:return: ID of the account.move created
"""
if context is None:
context = {}
res_currency_obj = self.pool.get('res.currency')
@ -217,82 +336,28 @@ class account_bank_statement(osv.osv):
context.update({'date': st_line.date})
move_id = account_move_obj.create(cr, uid, {
'journal_id': st.journal_id.id,
'period_id': st.period_id.id,
'date': st_line.date,
'name': st_line_number,
'ref': st_line.ref,
}, context=context)
move_vals = self._prepare_move(cr, uid, st_line, st_line_number, context=context)
move_id = account_move_obj.create(cr, uid, move_vals, context=context)
account_bank_statement_line_obj.write(cr, uid, [st_line.id], {
'move_ids': [(4, move_id, False)]
})
torec = []
if st_line.amount >= 0:
account_id = st.journal_id.default_credit_account_id.id
else:
account_id = st.journal_id.default_debit_account_id.id
acc_cur = ((st_line.amount<=0) and st.journal_id.default_debit_account_id) or st_line.account_id
context.update({
'res.currency.compute.account': acc_cur,
})
amount = res_currency_obj.compute(cr, uid, st.currency.id,
company_currency_id, st_line.amount, context=context)
val = {
'name': st_line.name,
'date': st_line.date,
'ref': st_line.ref,
'move_id': move_id,
'partner_id': ((st_line.partner_id) and st_line.partner_id.id) or False,
'account_id': (st_line.account_id) and st_line.account_id.id,
'credit': ((amount>0) and amount) or 0.0,
'debit': ((amount<0) and -amount) or 0.0,
'statement_id': st.id,
'journal_id': st.journal_id.id,
'period_id': st.period_id.id,
'currency_id': st.currency.id,
'analytic_account_id': st_line.analytic_account_id and st_line.analytic_account_id.id or False
}
if st.currency.id <> company_currency_id:
amount_cur = res_currency_obj.compute(cr, uid, company_currency_id,
st.currency.id, amount, context=context)
val['amount_currency'] = -amount_cur
if st_line.account_id and st_line.account_id.currency_id and st_line.account_id.currency_id.id <> company_currency_id:
val['currency_id'] = st_line.account_id.currency_id.id
amount_cur = res_currency_obj.compute(cr, uid, company_currency_id,
st_line.account_id.currency_id.id, amount, context=context)
val['amount_currency'] = -amount_cur
move_line_id = account_move_line_obj.create(cr, uid, val, context=context)
bank_move_vals = self._prepare_bank_move_line(cr, uid, st_line, move_id, amount,
company_currency_id, context=context)
move_line_id = account_move_line_obj.create(cr, uid, bank_move_vals, context=context)
torec.append(move_line_id)
# Fill the secondary amount/currency
# if currency is not the same than the company
amount_currency = False
currency_id = False
if st.currency.id <> company_currency_id:
amount_currency = st_line.amount
currency_id = st.currency.id
account_move_line_obj.create(cr, uid, {
'name': st_line.name,
'date': st_line.date,
'ref': st_line.ref,
'move_id': move_id,
'partner_id': ((st_line.partner_id) and st_line.partner_id.id) or False,
'account_id': account_id,
'credit': ((amount < 0) and -amount) or 0.0,
'debit': ((amount > 0) and amount) or 0.0,
'statement_id': st.id,
'journal_id': st.journal_id.id,
'period_id': st.period_id.id,
'amount_currency': amount_currency,
'currency_id': currency_id,
}, context=context)
counterpart_move_vals = self._prepare_counterpart_move_line(cr, uid, st_line, move_id,
amount, company_currency_id, context=context)
account_move_line_obj.create(cr, uid, counterpart_move_vals, context=context)
for line in account_move_line_obj.browse(cr, uid, [x.id for x in
account_move_obj.browse(cr, uid, move_id,
@ -311,7 +376,7 @@ class account_bank_statement(osv.osv):
def balance_check(self, cr, uid, st_id, journal_type='bank', context=None):
st = self.browse(cr, uid, st_id, context=context)
if not ((abs((st.balance_end or 0.0) - st.balance_end_real) < 0.0001) or (abs((st.balance_end or 0.0) - st.balance_end_cash) < 0.0001)):
if not ((abs((st.balance_end or 0.0) - st.balance_end_real) < 0.0001) or (abs((st.balance_end or 0.0) - st.balance_end_real) < 0.0001)):
raise osv.except_osv(_('Error !'),
_('The statement balance is incorrect !\nThe expected balance (%.2f) is different than the computed one. (%.2f)') % (st.balance_end_real, st.balance_end))
return True
@ -380,14 +445,18 @@ class account_bank_statement(osv.osv):
account_move_obj.unlink(cr, uid, ids, context)
done.append(st.id)
return self.write(cr, uid, done, {'state':'draft'}, context=context)
def onchange_journal_id(self, cr, uid, statement_id, journal_id, context=None):
def _compute_balance_end_real(self, cr, uid, journal_id, context=None):
cr.execute('SELECT balance_end_real \
FROM account_bank_statement \
WHERE journal_id = %s AND NOT state = %s \
ORDER BY date DESC,id DESC LIMIT 1', (journal_id, 'draft'))
res = cr.fetchone()
balance_start = res and res[0] or 0.0
return res and res[0] or 0.0
def onchange_journal_id(self, cr, uid, statement_id, journal_id, context=None):
balance_start = self._compute_balance_end_real(cr, uid, journal_id, context=context)
journal_data = self.pool.get('account.journal').read(cr, uid, journal_id, ['default_debit_account_id', 'company_id'], context=context)
account_id = journal_data['default_debit_account_id']
company_id = journal_data['company_id']

338
addons/account/account_cash_statement.py
View File

@ -32,7 +32,7 @@ class account_cashbox_line(osv.osv):
_name = 'account.cashbox.line'
_description = 'CashBox Line'
_rec_name = 'number'
_rec_name = 'pieces'
def _sub_total(self, cr, uid, ids, name, arg, context=None):
@ -43,24 +43,27 @@ class account_cashbox_line(osv.osv):
"""
res = {}
for obj in self.browse(cr, uid, ids, context=context):
res[obj.id] = obj.pieces * obj.number
res[obj.id] = {
'subtotal_opening' : obj.pieces * obj.number_opening,
'subtotal_closing' : obj.pieces * obj.number_closing,
}
return res
def on_change_sub(self, cr, uid, ids, pieces, number, *a):
def on_change_sub_opening(self, cr, uid, ids, pieces, number, *a):
""" Compute the subtotal for the opening """
return {'value' : {'subtotal_opening' : (pieces * number) or 0.0 }}
""" Calculates Sub total on change of number
@param pieces: Names of fields.
@param number:
"""
sub = pieces * number
return {'value': {'subtotal': sub or 0.0}}
def on_change_sub_closing(self, cr, uid, ids, pieces, number, *a):
""" Compute the subtotal for the closing """
return {'value' : {'subtotal_closing' : (pieces * number) or 0.0 }}
_columns = {
'pieces': fields.float('Values', digits_compute=dp.get_precision('Account')),
'number': fields.integer('Number'),
'subtotal': fields.function(_sub_total, string='Sub Total', type='float', digits_compute=dp.get_precision('Account')),
'starting_id': fields.many2one('account.bank.statement', ondelete='cascade'),
'ending_id': fields.many2one('account.bank.statement', ondelete='cascade'),
'pieces': fields.float('Unit of Currency', digits_compute=dp.get_precision('Account')),
'number_opening' : fields.integer('Number of Units', help='Opening Unit Numbers'),
'number_closing' : fields.integer('Number of Units', help='Closing Unit Numbers'),
'subtotal_opening': fields.function(_sub_total, string='Opening Subtotal', type='float', digits_compute=dp.get_precision('Account'), multi='subtotal'),
'subtotal_closing': fields.function(_sub_total, string='Closing Subtotal', type='float', digits_compute=dp.get_precision('Account'), multi='subtotal'),
'bank_statement_id' : fields.many2one('account.bank.statement', ondelete='cascade'),
}
account_cashbox_line()
@ -69,39 +72,24 @@ class account_cash_statement(osv.osv):
_inherit = 'account.bank.statement'
def _get_starting_balance(self, cr, uid, ids, context=None):
""" Find starting balance
@param name: Names of fields.
@param arg: User defined arguments
@return: Dictionary of values.
def _update_balances(self, cr, uid, ids, context=None):
"""
Set starting and ending balances according to pieces count
"""
res = {}
for statement in self.browse(cr, uid, ids, context=context):
amount_total = 0.0
if statement.journal_id.type not in('cash'):
if statement.journal_id.type not in ('cash',):
continue
for line in statement.starting_details_ids:
amount_total+= line.pieces * line.number
res[statement.id] = {
'balance_start': amount_total
start = end = 0
for line in statement.details_ids:
start += line.subtotal_opening
end += line.subtotal_closing
data = {
'balance_start': start,
'balance_end_real': end,
}
return res
def _balance_end_cash(self, cr, uid, ids, name, arg, context=None):
""" Find ending balance "
@param name: Names of fields.
@param arg: User defined arguments
@return: Dictionary of values.
"""
res = {}
for statement in self.browse(cr, uid, ids, context=context):
amount_total = 0.0
for line in statement.ending_details_ids:
amount_total += line.pieces * line.number
res[statement.id] = amount_total
res[statement.id] = data
super(account_cash_statement, self).write(cr, uid, [statement.id], data, context=context)
return res
def _get_sum_entry_encoding(self, cr, uid, ids, name, arg, context=None):
@ -111,13 +99,10 @@ class account_cash_statement(osv.osv):
@param arg: User defined arguments
@return: Dictionary of values.
"""
res2 = {}
res = {}
for statement in self.browse(cr, uid, ids, context=context):
encoding_total=0.0
for line in statement.line_ids:
encoding_total += line.amount
res2[statement.id] = encoding_total
return res2
res[statement.id] = sum((line.amount for line in statement.line_ids), 0.0)
return res
def _get_company(self, cr, uid, context=None):
user_pool = self.pool.get('res.users')
@ -128,96 +113,98 @@ class account_cash_statement(osv.osv):
company_id = company_pool.search(cr, uid, [])
return company_id and company_id[0] or False
def _get_cash_open_box_lines(self, cr, uid, context=None):
res = []
curr = [1, 2, 5, 10, 20, 50, 100, 500]
for rs in curr:
dct = {
'pieces': rs,
'number': 0
}
res.append(dct)
journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash')], context=context)
if journal_ids:
results = self.search(cr, uid, [('journal_id', 'in', journal_ids),('state', '=', 'confirm')], context=context)
if results:
cash_st = self.browse(cr, uid, results, context=context)[0]
for cash_line in cash_st.ending_details_ids:
for r in res:
if cash_line.pieces == r['pieces']:
r['number'] = cash_line.number
return res
def _get_default_cash_close_box_lines(self, cr, uid, context=None):
res = []
curr = [1, 2, 5, 10, 20, 50, 100, 500]
for rs in curr:
dct = {
'pieces': rs,
'number': 0
}
res.append(dct)
return res
def _get_cash_close_box_lines(self, cr, uid, context=None):
res = []
curr = [1, 2, 5, 10, 20, 50, 100, 500]
for rs in curr:
dct = {
'pieces': rs,
'number': 0
}
res.append((0, 0, dct))
return res
def _get_cash_open_close_box_lines(self, cr, uid, context=None):
res = {}
start_l = []
end_l = []
starting_details = self._get_cash_open_box_lines(cr, uid, context=context)
ending_details = self._get_default_cash_close_box_lines(cr, uid, context)
for start in starting_details:
start_l.append((0, 0, start))
for end in ending_details:
end_l.append((0, 0, end))
res['start'] = start_l
res['end'] = end_l
return res
def _get_statement(self, cr, uid, ids, context=None):
def _get_statement_from_line(self, cr, uid, ids, context=None):
result = {}
for line in self.pool.get('account.bank.statement.line').browse(cr, uid, ids, context=context):
result[line.statement_id.id] = True
return result.keys()
def _compute_difference(self, cr, uid, ids, fieldnames, args, context=None):
result = dict.fromkeys(ids, 0.0)
for obj in self.browse(cr, uid, ids, context=context):
result[obj.id] = obj.balance_end_real - obj.balance_end
return result
def _compute_last_closing_balance(self, cr, uid, ids, fieldnames, args, context=None):
result = dict.fromkeys(ids, 0.0)
for obj in self.browse(cr, uid, ids, context=context):
if obj.state == 'draft':
statement_ids = self.search(cr, uid,
[('journal_id', '=', obj.journal_id.id),('state', '=', 'confirm')],
order='create_date desc',
limit=1,
context=context
)
if not statement_ids:
continue
else:
st = self.browse(cr, uid, statement_ids[0], context=context)
result[obj.id] = st.balance_end_real
return result
def onchange_journal_id(self, cr, uid, ids, journal_id, context=None):
result = super(account_cash_statement, self).onchange_journal_id(cr, uid, ids, journal_id)
if not journal_id:
return result
statement_ids = self.search(cr, uid,
[('journal_id', '=', journal_id),('state', '=', 'confirm')],
order='create_date desc',
limit=1,
context=context
)
if not statement_ids:
return result
st = self.browse(cr, uid, statement_ids[0], context=context)
result.setdefault('value', {}).update({'last_closing_balance' : st.balance_end_real})
return result
_columns = {
'total_entry_encoding': fields.function(_get_sum_entry_encoding, string="Cash Transaction", help="Total cash transactions",
'total_entry_encoding': fields.function(_get_sum_entry_encoding, string="Total Cash Transactions",
store = {
'account.bank.statement': (lambda self, cr, uid, ids, c={}: ids, ['line_ids','move_line_ids'], 10),
'account.bank.statement.line': (_get_statement, ['amount'], 10),
'account.bank.statement': (lambda self, cr, uid, ids, context=None: ids, ['line_ids','move_line_ids'], 10),
'account.bank.statement.line': (_get_statement_from_line, ['amount'], 10),
}),
'closing_date': fields.datetime("Closed On"),
'balance_end_cash': fields.function(_balance_end_cash, store=True, string='Closing Balance', help="Closing balance based on cashBox"),
'starting_details_ids': fields.one2many('account.cashbox.line', 'starting_id', string='Opening Cashbox'),
'ending_details_ids': fields.one2many('account.cashbox.line', 'ending_id', string='Closing Cashbox'),
'details_ids' : fields.one2many('account.cashbox.line', 'bank_statement_id', string='CashBox Lines'),
'opening_details_ids' : fields.one2many('account.cashbox.line', 'bank_statement_id', string='Opening Cashbox Lines'),
'closing_details_ids' : fields.one2many('account.cashbox.line', 'bank_statement_id', string='Closing Cashbox Lines'),
'user_id': fields.many2one('res.users', 'Responsible', required=False),
'difference' : fields.function(_compute_difference, method=True, string="Difference", type="float"),
'last_closing_balance' : fields.function(_compute_last_closing_balance, method=True, string='Last Closing Balance', type='float'),
}
_defaults = {
'state': 'draft',
'date': lambda self,cr,uid,context={}: context.get('date', time.strftime("%Y-%m-%d %H:%M:%S")),
'date': lambda self, cr, uid, context={}: context.get('date', time.strftime("%Y-%m-%d %H:%M:%S")),
'user_id': lambda self, cr, uid, context=None: uid,
'starting_details_ids': _get_cash_open_box_lines,
'ending_details_ids': _get_default_cash_close_box_lines
}
}
def create(self, cr, uid, vals, context=None):
if self.pool.get('account.journal').browse(cr, uid, vals['journal_id'], context=context).type == 'cash':
amount_total = 0.0
for line in vals.get('starting_details_ids',[]):
if line and len(line)==3 and line[2]:
amount_total+= line[2]['pieces'] * line[2]['number']
vals.update(balance_start= amount_total)
return super(account_cash_statement, self).create(cr, uid, vals, context=context)
journal = False
if vals.get('journal_id'):
journal = self.pool.get('account.journal').browse(cr, uid, vals['journal_id'], context=context)
if journal and (journal.type == 'cash') and not vals.get('details_ids'):
vals['details_ids'] = []
for value in journal.cashbox_line_ids:
nested_values = {
'number_closing' : 0,
'number_opening' : 0,
'pieces' : value.pieces
}
vals['details_ids'].append([0, False, nested_values])
res_id = super(account_cash_statement, self).create(cr, uid, vals, context=context)
self._update_balances(cr, uid, [res_id], context)
return res_id
def write(self, cr, uid, ids, vals, context=None):
"""
@ -233,34 +220,9 @@ class account_cash_statement(osv.osv):
@return: True on success, False otherwise
"""
super(account_cash_statement, self).write(cr, uid, ids, vals, context=context)
res = self._get_starting_balance(cr, uid, ids)
for rs in res:
super(account_cash_statement, self).write(cr, uid, [rs], res.get(rs))
return True
def onchange_journal_id(self, cr, uid, statement_id, journal_id, context=None):
""" Changes balance start and starting details if journal_id changes"
@param statement_id: Changed statement_id
@param journal_id: Changed journal_id
@return: Dictionary of changed values
"""
res = {}
balance_start = 0.0
if not journal_id:
res.update({
'balance_start': balance_start
})
return res
return super(account_cash_statement, self).onchange_journal_id(cr, uid, statement_id, journal_id, context=context)
def _equal_balance(self, cr, uid, cash_id, context=None):
statement = self.browse(cr, uid, cash_id, context=context)
self.write(cr, uid, [cash_id], {'balance_end_real': statement.balance_end})
statement.balance_end_real = statement.balance_end
if statement.balance_end != statement.balance_end_cash:
return False
return True
res = super(account_cash_statement, self).write(cr, uid, ids, vals, context=context)
self._update_balances(cr, uid, ids, context)
return res
def _user_allow(self, cr, uid, statement_id, context=None):
return True
@ -276,7 +238,7 @@ class account_cash_statement(osv.osv):
for statement in statement_pool.browse(cr, uid, ids, context=context):
vals = {}
if not self._user_allow(cr, uid, statement.id, context=context):
raise osv.except_osv(_('Error !'), (_('User %s does not have rights to access %s journal !') % (statement.user_id.name, statement.journal_id.name)))
raise osv.except_osv(_('Error !'), (_('You do not have rights to open this %s journal !') % (statement.journal_id.name, )))
if statement.name and statement.name == '/':
c = {'fiscalyear_id': statement.period_id.fiscalyear_id.id}
@ -294,13 +256,6 @@ class account_cash_statement(osv.osv):
self.write(cr, uid, [statement.id], vals, context=context)
return True
def balance_check(self, cr, uid, cash_id, journal_type='bank', context=None):
if journal_type == 'bank':
return super(account_cash_statement, self).balance_check(cr, uid, cash_id, journal_type, context)
if not self._equal_balance(cr, uid, cash_id, context):
raise osv.except_osv(_('Error !'), _('The closing balance should be the same than the computed balance!'))
return True
def statement_close(self, cr, uid, ids, journal_type='bank', context=None):
if journal_type == 'bank':
return super(account_cash_statement, self).statement_close(cr, uid, ids, journal_type, context)
@ -317,16 +272,67 @@ class account_cash_statement(osv.osv):
def button_confirm_cash(self, cr, uid, ids, context=None):
super(account_cash_statement, self).button_confirm_bank(cr, uid, ids, context=context)
return self.write(cr, uid, ids, {'closing_date': time.strftime("%Y-%m-%d %H:%M:%S")}, context=context)
absl_proxy = self.pool.get('account.bank.statement.line')
def button_cancel(self, cr, uid, ids, context=None):
cash_box_line_pool = self.pool.get('account.cashbox.line')
super(account_cash_statement, self).button_cancel(cr, uid, ids, context=context)
for st in self.browse(cr, uid, ids, context):
for end in st.ending_details_ids:
cash_box_line_pool.write(cr, uid, [end.id], {'number': 0})
return True
TABLES = (('Profit', 'profit_account_id'), ('Loss', 'loss_account_id'),)
for obj in self.browse(cr, uid, ids, context=context):
if obj.difference == 0.0:
continue
for item_label, item_account in TALBES:
if getattr(obj.journal_id, item_account):
raise osv.except_osv(_('Error !'),
_('There is no %s Account on the Journal %s') % (item_label, obj.journal_id.name,))
is_profit = obj.difference < 0.0
account = getattr(obj.journal_id, TABLES[is_profit][1])
values = {
'statement_id' : obj.id,
'journal_id' : obj.journal_id.id,
'account_id' : account.id,
'amount' : obj.difference,
'name' : 'Exceptional %s' % TABLES[is_profit][0],
}
absl_proxy.create(cr, uid, values, context=context)
return self.write(cr, uid, ids, {'closing_date': time.strftime("%Y-%m-%d %H:%M:%S")}, context=context)
account_cash_statement()
class account_journal(osv.osv):
_inherit = 'account.journal'
def _default_cashbox_line_ids(self, cr, uid, context=None):
# Return a list of coins in Euros.
result = [
dict(pieces=value) for value in [0.01, 0.02, 0.05, 0.1, 0.2, 0.5, 1, 2, 5, 10, 20, 50, 100, 200, 500]
]
return result
_columns = {
'cashbox_line_ids' : fields.one2many('account.journal.cashbox.line', 'journal_id', 'CashBox'),
}
_defaults = {
'cashbox_line_ids' : _default_cashbox_line_ids,
}
account_journal()
class account_journal_cashbox_line(osv.osv):
_name = 'account.journal.cashbox.line'
_rec_name = 'pieces'
_columns = {
'pieces': fields.float('Values', digits_compute=dp.get_precision('Account')),
'journal_id' : fields.many2one('account.journal', 'Journal', required=True, select=1),
}
_order = 'pieces asc'
account_journal_cashbox_line()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

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

315
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,42 +164,39 @@
<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>
<page string="Invoice">
<field context="{'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line">
<tree string="Invoice lines">
<tree string="Invoice lines" editable="bottom">
<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 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="base.group_account_user"/>
<field name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
@ -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>
@ -284,8 +292,10 @@
<form version="7.0">
<header>
<span groups="base.group_user">
<button name="action_invoice_sent" type="object" string="Send by Email" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}" class="oe_highlight"/>
<button name="invoice_print" string="Print Invoice" type="object" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}" class="oe_highlight"/>
<button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight"/>
<button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight"/>
<button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}"/>
<button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}"/>
<button name="invoice_open" states="draft" string="Validate" class="oe_highlight"/>
<button name="invoice_open" states="proforma2" string="Validate"/>
<button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>
@ -304,88 +314,103 @@
<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"/>
<field domain="[('company_id', '=', company_id),('type','=', 'receivable')]"
name="account_id" groups="account.group_account_user"/>
<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}">
<tree string="Invoice Lines" editable="bottom">
<field name="invoice_line_tax_id" invisible="1"/>
<field name="product_id" invisible="1"/>
<field name="name"/>
<field name="account_id" groups="account.group_account_user"
domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]"
on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
<field name="quantity"/>
<field name="uos_id" 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)"/>
<field name="price_unit"/>
<field name="discount" groups="sale.group_discount_per_so_line"/>
<field name="price_subtotal"/>
</tree>
</field>
<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 +429,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>
@ -417,32 +442,22 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Invoice">
<group>
<field name="number"
string="Invoice"
filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/>
<separator orientation="vertical"/>
<filter name="draft" icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
<filter name="proforma" icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices" groups="account.group_proforma_invoices"/>
<filter name="invoices" icon="terp-dolar" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
<separator orientation="vertical"/>
<filter name="unpaid" icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
<separator orientation="vertical"/>
<filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal"/>
<separator orientation="vertical"/>
<field name="partner_id"/>
<field name="user_id" widget="selection" string="Salesperson"/>
<field name="journal_id" widget="selection"/>
<field name="period_id" string="Period"/>
</group>
<newline/>
<field name="number" string="Invoice" filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/>
<filter name="draft" icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
<filter name="proforma" icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices" groups="account.group_proforma_invoices"/>
<filter name="invoices" icon="terp-dolar" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
<filter name="unpaid" icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
<separator/>
<filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal"/>
<field name="partner_id"/>
<field name="user_id" string="Salesperson"/>
<field name="journal_id"/>
<field name="period_id" string="Period"/>
<group expand="0" string="Group By...">
<filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/>
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
<filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
<filter string="Invoice Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_invoice'}"/>
<filter string="Due Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_due'}"/>

8
addons/account/account_menuitem.xml
View File

@ -2,10 +2,12 @@
<openerp>
<data>
<menuitem icon="terp-account" id="menu_finance" name="Invoicing" sequence="14"
<!-- Top menu item -->
<menuitem name="Invoicing"
id="menu_finance"
groups="group_account_user,group_account_manager,group_account_invoice"
web_icon="images/accounting.png"
web_icon_hover="images/accounting-hover.png"/>
sequence="100"/>
<menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="2"/>
<menuitem id="menu_finance_payables" name="Suppliers" parent="menu_finance" sequence="3"/>
<menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="4"

47
addons/account/account_move_line.py
View File

@ -19,6 +19,7 @@
#
##############################################################################
import sys
import time
from datetime import datetime
from operator import itemgetter
@ -326,7 +327,7 @@ class account_move_line(osv.osv):
if account and ((not fields) or ('debit' in fields) or ('credit' in fields)):
data['account_id'] = account.id
# Propose the price VAT excluded, the VAT will be added when confirming line
# Propose the price Tax excluded, the Tax will be added when confirming line
if account.tax_ids:
taxes = fiscal_pos_obj.map_tax(cr, uid, part and part.property_account_position or False, account.tax_ids)
tax = tax_obj.browse(cr, uid, taxes)
@ -985,37 +986,32 @@ class account_move_line(osv.osv):
if context.get('view_mode', False):
return result
fld = []
fields = {}
flds = []
title = _("Accounting Entries") #self.view_header_get(cr, uid, view_id, view_type, context)
title = _("Accounting Entries") # self.view_header_get(cr, uid, view_id, view_type, context)
ids = journal_pool.search(cr, uid, [])
ids = journal_pool.search(cr, uid, [], context=context)
journals = journal_pool.browse(cr, uid, ids, context=context)
all_journal = [None]
common_fields = {}
total = len(journals)
for journal in journals:
all_journal.append(journal.id)
for field in journal.view_id.columns_id:
# sometimes, it's possible that a defined column is not loaded (the module containing
# sometimes, it's possible that a defined column is not loaded (the module containing
# this field is not loaded) when we make an update.
if field.name not in self._columns:
if field.field not in self._columns:
continue
if not field.field in fields:
fields[field.field] = [journal.id]
if not field.field in flds:
fld.append((field.field, field.sequence))
flds.append(field.field)
common_fields[field.field] = 1
else:
fields.get(field.field).append(journal.id)
common_fields[field.field] = common_fields[field.field] + 1
fld.append(('period_id', 3))
fld.append(('journal_id', 10))
flds.append('period_id')
flds.append('journal_id')
fields['period_id'] = all_journal
fields['journal_id'] = all_journal
default_columns = {
'period_id': 3,
'journal_id': 10,
'state': sys.maxint,
}
for d in default_columns:
if d not in flds:
fld.append((d, default_columns[d]))
flds.append(d)
fld = sorted(fld, key=itemgetter(1))
widths = {
'statement_id': 50,
@ -1029,10 +1025,7 @@ class account_move_line(osv.osv):
colors="red:state=='draft';black:state=='valid'")
fields_get = self.fields_get(cr, uid, flds, context)
for field, _seq in fld:
if common_fields.get(field) == total:
fields.get(field).append(None)
# if field=='state':
# state = 'colors="red:state==\'draft\'"'
# TODO add string to element
f = etree.SubElement(document, 'field', name=field)
if field == 'debit':
@ -1354,7 +1347,7 @@ class account_move_line(osv.osv):
}
if data['tax_code_id']:
self.create(cr, uid, data, context)
#create the VAT movement
#create the Tax movement
data = {
'move_id': vals['move_id'],
'name': tools.ustr(vals['name'] or '') + ' ' + tools.ustr(tax['name'] or ''),

721
addons/account/account_view.xml
View File

File diff suppressed because it is too large Load Diff

8
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,7 +44,8 @@ class res_company(osv.osv):
_defaults = {
'expects_chart_of_accounts': True,
'overdue_msg': '''Dear Sir, dear Madam,
'tax_calculation_rounding_method': 'round_per_line',
'overdue_msg': '''Dear Sir/Madam,
Our records indicate that some payments on your account are still due. Please find details below.
If the amount has already been paid, please disregard this notice. Otherwise, please forward us the total amount stated below.

9
addons/account/company_view.xml
View File

@ -22,10 +22,11 @@
<field name="model">res.company</field>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="currency_id" position="after">
<field name="property_reserve_and_surplus_account" colspan="2"/>
<field name="paypal_account" placeholder="sales@openerp.com"/>
</field>
<xpath expr="//group[@name='account_grp']" position="inside">
<field name="property_reserve_and_surplus_account"/>
<field name="tax_calculation_rounding_method"/>
<field name="paypal_account" placeholder="sales@openerp.com"/>
</xpath>
</field>
</record>

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,

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

@ -203,7 +203,7 @@ msgstr ""
#. module: account
#: help:account.tax.code,notprintable:0
#: help:account.tax.code.template,notprintable:0
msgid "Check this box if you don't want any VAT related to this Tax Code to appear on invoices"
msgid "Check this box if you don't want any tax related to this tax code to appear on invoices"
msgstr ""
#. module: account
@ -1853,7 +1853,7 @@ msgstr ""
#. module: account
#: report:account.journal.period.print.sale.purchase:0
msgid "VAT Declaration"
msgid "Tax Declaration"
msgstr ""
#. module: account
@ -2249,7 +2249,7 @@ msgstr ""
#. module: account
#: view:account.vat.declaration:0
msgid "This menu prints a VAT declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."
msgid "This menu prints a tax declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."
msgstr ""
#. module: account
@ -4480,7 +4480,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_vat_declaration
#: model:ir.model,name:account.model_account_vat_declaration
msgid "Account Vat Declaration"
msgid "Account Tax Declaration"
msgstr ""
#. module: account
@ -4821,7 +4821,7 @@ msgstr ""
#: help:account.tax.template,ref_base_code_id:0
#: help:account.tax.template,ref_tax_code_id:0
#: help:account.tax.template,tax_code_id:0
msgid "Use this code for the VAT declaration."
msgid "Use this code for the tax declaration."
msgstr ""
#. module: account
@ -5247,7 +5247,7 @@ msgstr ""
#. module: account
#: report:account.journal.period.print.sale.purchase:0
msgid "VAT"
msgid "Tax"
msgstr ""
#. module: account
@ -7561,7 +7561,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_account_vat_declaration
msgid "This menu print a VAT declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."
msgid "This menu print a tax declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."
msgstr ""
#. module: account

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

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

@ -10,15 +10,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: 2011-12-31 16:16+0000\n"
"Last-Translator: Christopher Ormaza - (Ecuadorenlinea.net) "
"<chris.ormaza@gmail.com>\n"
"PO-Revision-Date: 2012-07-30 03:26+0000\n"
"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
"Language-Team: Spanish (Ecuador) <es_EC@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:44+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-08-01 04:43+0000\n"
"X-Generator: Launchpad (build 15719)\n"
#. module: account
#: view:account.invoice.report:0
@ -446,7 +445,7 @@ msgstr "Total crédito"
#. module: account
#: view:account.move.line.unreconcile.select:0
msgid "Open for Unreconciliation"
msgstr ""
msgstr "Abrir para romper conciliación"
#. module: account
#: field:account.account.template,chart_template_id:0
@ -1612,7 +1611,7 @@ msgstr "Base Imponible"
#. module: account
#: view:account.partner.reconcile.process:0
msgid "Go to Next Partner"
msgstr ""
msgstr "Ir a la siguiente empresa"
#. module: account
#: view:account.bank.statement:0
@ -2859,7 +2858,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_tax_code_list
#: model:ir.ui.menu,name:account.menu_action_tax_code_list
msgid "Tax Codes"
msgstr ""
msgstr "Códigos de impuestos"
#. module: account
#: view:account.account:0
@ -3229,7 +3228,7 @@ msgstr "Plantillas para el plan contable"
#. module: account
#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
msgid "Set Your Accounting Options"
msgstr ""
msgstr "Configurar tu Contabilidad"
#. module: account
#: view:report.account.sales:0
@ -4405,7 +4404,7 @@ msgstr "Reconcile Writeoff"
#. module: account
#: view:report.account.receivable:0
msgid "Accounts by Type"
msgstr ""
msgstr "Cuentas por tipo"
#. module: account
#: view:account.bank.statement:0
@ -4447,7 +4446,7 @@ msgstr "res_config_contents"
#. module: account
#: view:account.unreconcile:0
msgid "Unreconciliate Transactions"
msgstr ""
msgstr "Transacciones no conciliadas"
#. module: account
#: help:account.chart.template,visible:0
@ -4650,7 +4649,7 @@ msgstr "Fecha de realizacion"
#. module: account
#: view:account.unreconcile.reconcile:0
msgid "Unreconciliation Transactions"
msgstr ""
msgstr "Desconcialiación de Transacciones"
#. module: account
#: field:account.tax,ref_tax_code_id:0
@ -4785,7 +4784,7 @@ msgstr "Pagado"
#. module: account
#: view:account.period.close:0
msgid "Are you sure?"
msgstr ""
msgstr "¿Está Seguro?"
#. module: account
#: help:account.move.line,statement_id:0
@ -5183,7 +5182,7 @@ msgstr "Cuenta impuesto"
#. module: account
#: view:account.automatic.reconcile:0
msgid "Reconciliation Result"
msgstr ""
msgstr "Resultado de conciliación"
#. module: account
#: model:account.financial.report,name:account.account_financial_report_balancesheet0
@ -6173,7 +6172,7 @@ msgstr "Impuesto de venta(%)"
#. module: account
#: view:account.addtmpl.wizard:0
msgid "Create an Account Based on this Template"
msgstr ""
msgstr "Crear una cuenta basada en esta plantilla"
#. module: account
#: view:account.account.type: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

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

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2010-07-22 16:28+0000\n"
"Last-Translator: Niels Huylebroeck <Unknown>\n"
"PO-Revision-Date: 2012-07-27 12:48+0000\n"
"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:43+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-28 04:57+0000\n"
"X-Generator: Launchpad (build 15694)\n"
#. module: account
#: view:account.invoice.report:0
@ -444,7 +444,7 @@ msgstr "Totaal credit"
#. module: account
#: view:account.move.line.unreconcile.select:0
msgid "Open for Unreconciliation"
msgstr ""
msgstr "Afpunting ongedaan maken"
#. module: account
#: field:account.account.template,chart_template_id:0
@ -1611,7 +1611,7 @@ msgstr "Onbelast"
#. module: account
#: view:account.partner.reconcile.process:0
msgid "Go to Next Partner"
msgstr ""
msgstr "Naar volgende relatie"
#. module: account
#: view:account.bank.statement:0
@ -2854,7 +2854,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_tax_code_list
#: model:ir.ui.menu,name:account.menu_action_tax_code_list
msgid "Tax Codes"
msgstr ""
msgstr "Btw-codes"
#. module: account
#: view:account.account:0
@ -3226,7 +3226,7 @@ msgstr "Sjablonen boekhoudplan"
#. module: account
#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
msgid "Set Your Accounting Options"
msgstr ""
msgstr "Stel uw boekhouding in"
#. module: account
#: view:report.account.sales:0
@ -4402,7 +4402,7 @@ msgstr "Afpunten met afschrijving"
#. module: account
#: view:report.account.receivable:0
msgid "Accounts by Type"
msgstr ""
msgstr "Rekeningen per type"
#. module: account
#: view:account.bank.statement:0
@ -4444,7 +4444,7 @@ msgstr "res_config_contents"
#. module: account
#: view:account.unreconcile:0
msgid "Unreconciliate Transactions"
msgstr ""
msgstr "Afpuntingen ongedaan maken"
#. module: account
#: help:account.chart.template,visible:0
@ -4645,7 +4645,7 @@ msgstr "Bewerkingsdatum"
#. module: account
#: view:account.unreconcile.reconcile:0
msgid "Unreconciliation Transactions"
msgstr ""
msgstr "Afpuntingen ongedaan maken"
#. module: account
#: field:account.tax,ref_tax_code_id:0
@ -4780,7 +4780,7 @@ msgstr "Betaald"
#. module: account
#: view:account.period.close:0
msgid "Are you sure?"
msgstr ""
msgstr "Bent u zeker?"
#. module: account
#: help:account.move.line,statement_id:0
@ -5177,7 +5177,7 @@ msgstr "Btw-rekening"
#. module: account
#: view:account.automatic.reconcile:0
msgid "Reconciliation Result"
msgstr ""
msgstr "Afpuntresultaat"
#. module: account
#: model:account.financial.report,name:account.account_financial_report_balancesheet0
@ -6169,7 +6169,7 @@ msgstr "Verkoop-btw (%)"
#. module: account
#: view:account.addtmpl.wizard:0
msgid "Create an Account Based on this Template"
msgstr ""
msgstr "Maak een rekening op basis van deze sjabloon"
#. module: account
#: view:account.account.type:0
@ -7310,7 +7310,7 @@ msgstr "Hoofdrekeningsjabloon"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Configure your Chart of Accounts"
msgstr ""
msgstr "Installeer uw boekhoudplan"
#. module: account
#: view:account.bank.statement:0
@ -8205,7 +8205,7 @@ msgstr "Omgekeerde analytische balans -"
#. module: account
#: view:account.move.bank.reconcile:0
msgid "Open for Bank Reconciliation"
msgstr ""
msgstr "Bank afpunten"
#. module: account
#: view:account.analytic.line:0
@ -8394,7 +8394,7 @@ msgstr ""
#. module: account
#: view:account.tax.template:0
msgid "Compute Code for Taxes Included Prices"
msgstr ""
msgstr "Bereken code voor prijzen inclusief btw"
#. module: account
#: code:addons/account/account_invoice.py:1030
@ -9071,7 +9071,7 @@ msgstr "Verkopen van dit jaar per type"
#. module: account
#: view:account.analytic.cost.ledger.journal.report:0
msgid "Cost Ledger for Period"
msgstr ""
msgstr "Analytisch dagboek voor periode"
#. module: account
#: help:account.tax,child_depend:0
@ -9539,7 +9539,7 @@ msgstr "U moet een bankrekening instellen in het afpuntjournaal."
#. module: account
#: view:account.move.line.reconcile:0
msgid "Reconciliation Transactions"
msgstr ""
msgstr "Afpunttransacties"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_common_menu
@ -9644,7 +9644,7 @@ msgstr "Vervaldatum"
#. module: account
#: view:account.move.journal:0
msgid "Standard Entries"
msgstr ""
msgstr "Standaardboekingen"
#. module: account
#: help:account.journal,type:0
@ -10598,7 +10598,7 @@ msgstr ""
#. module: account
#: view:account.payment.term:0
msgid "Description on Invoices"
msgstr ""
msgstr "Omschrijving op facturen"
#. module: account
#: model:ir.model,name:account.model_account_analytic_chart

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

308
addons/account/i18n/pt_BR.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:26+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
"PO-Revision-Date: 2012-07-28 14:05+0000\n"
"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:43+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
"X-Generator: Launchpad (build 15694)\n"
#. module: account
#: view:account.invoice.report:0
@ -3235,7 +3235,7 @@ msgstr "Modelo de plano de contas"
#. module: account
#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
msgid "Set Your Accounting Options"
msgstr ""
msgstr "Defina suas opções Contábeis"
#. module: account
#: view:report.account.sales:0
@ -4222,6 +4222,10 @@ msgid ""
"some non legal fields or you must unconfirm the journal entry first! \n"
"%s"
msgstr ""
"Você não pode fazer essa modificação em uma entrada confirmada! Você pode "
"apenas mudar alguns campos não legais ou você deve primeiro desconfirmar a "
"entrada de diário em primeiro lugar\" \n"
"%s"
#. module: account
#: field:res.company,paypal_account:0
@ -4472,6 +4476,10 @@ msgid ""
"you want to generate accounts of this template only when loading its child "
"template."
msgstr ""
"Marque como False se você não quer que este template seja usado no "
"configurador que gera o Plano de Contas dos modelos, isto é útil quando você "
"deseja criar as contas desse modelo somente quando for carregar os modelos "
"filhos."
#. module: account
#: view:account.use.model:0
@ -4816,6 +4824,9 @@ msgid ""
"You can not define children to an account with internal type different of "
"\"View\"! "
msgstr ""
"Erro de configuração!\n"
"Você não pode definir um filho a uma conta com tipo interno diferente de "
"\"Visualização\"! "
#. module: account
#: code:addons/account/account.py:923
@ -5120,6 +5131,10 @@ msgid ""
"encode the sale and purchase rates or choose from list of taxes. This last "
"choice assumes that the set of tax defined on this template is complete"
msgstr ""
"Esta lógica ajuda você a escolher se você quer propor para o usuário "
"codificar as taxas de compra e venda ou escolher de um conjunto de impostos. "
" Esta última escolha pressupõe que o conjunto de imposto definido para o "
"modelo escolhido está completa"
#. module: account
#: view:account.financial.report:0
@ -5748,7 +5763,7 @@ msgstr "Sub-contas"
#: code:addons/account/account_move_line.py:1214
#, python-format
msgid "Move name (id): %s (%s)"
msgstr ""
msgstr "Mova nome (id) %s (%s)"
#. module: account
#: view:account.move.line.reconcile:0
@ -6091,6 +6106,9 @@ msgid ""
"You can not define children to an account with internal type different of "
"\"View\"! "
msgstr ""
"Erro de configuração!\n"
"Você não pode definir um filho a uma conta com tipo interno diferente de "
"\"Visualização\"! "
#. module: account
#: help:res.partner.bank,journal_id:0
@ -6211,6 +6229,10 @@ msgid ""
"choice assumes that the set of tax defined for the chosen template is "
"complete"
msgstr ""
"Este logica ajuda você a escolher se você quer propor ao usuário para "
"codificar as vendas e as taxas de compra ou use os campos usuais m2o. Esta "
"última escolha pressupõe que o conjunto de imposto definido para o modelo "
"escolhido está completa"
#. module: account
#: report:account.vat.declaration:0
@ -6230,7 +6252,7 @@ msgstr "Faturas em Aberto e Pagos"
#. module: account
#: selection:account.financial.report,display_detail:0
msgid "Display children flat"
msgstr ""
msgstr "Mostrar plano filho"
#. module: account
#: code:addons/account/account.py:629
@ -6662,7 +6684,7 @@ msgstr "Criar lançamentos recorrentes manuais no diário escolhido."
#. module: account
#: help:res.partner.bank,currency_id:0
msgid "Currency of the related account journal."
msgstr ""
msgstr "Moeda da conta do diário relacionada."
#. module: account
#: code:addons/account/account.py:1563
@ -6787,7 +6809,7 @@ msgstr "Criar lançamento"
#: code:addons/account/account.py:182
#, python-format
msgid "Profit & Loss (Expense account)"
msgstr ""
msgstr "Ganhos e perdas (conta de Despesa)"
#. module: account
#: code:addons/account/account.py:622
@ -6914,6 +6936,9 @@ msgid ""
"some non legal fields or you must unreconcile first!\n"
"%s"
msgstr ""
"Você não pode fazer essa modificação em uma entrada reconciliada! Você pode "
"apenas mudar alguns campos não legais ou você deve desconciliar primeiro!\n"
"%s"
#. module: account
#: report:account.general.ledger:0
@ -7054,6 +7079,9 @@ msgid ""
"Please define BIC/Swift code on bank for bank type IBAN Account to make "
"valid payments"
msgstr ""
"\n"
"Por favor defina o BIC/Swift code no Banco para o tipo de conta IBAN para "
"fazer pagamentos válidos"
#. module: account
#: report:account.analytic.account.cost_ledger:0
@ -7186,7 +7214,7 @@ msgstr "Documento de Origem"
#: code:addons/account/account.py:1432
#, python-format
msgid "You can not delete a posted journal entry \"%s\"!"
msgstr ""
msgstr "Você não pode excluir um lançamento do diário publicado \"%s\"!"
#. module: account
#: selection:account.partner.ledger,filter:0
@ -7360,7 +7388,7 @@ msgstr "Entradas Postadas"
#. module: account
#: help:account.payment.term.line,value_amount:0
msgid "For percent enter a ratio between 0-1."
msgstr ""
msgstr "Para porcentagem introduzir um razão entre 0-1."
#. module: account
#: report:account.invoice:0
@ -7590,7 +7618,7 @@ msgstr "Os prazos para gerar entradas de abertura não foram encontrados"
#. module: account
#: model:account.account.type,name:account.data_account_type_view
msgid "Root/View"
msgstr ""
msgstr "Origem/Visualização"
#. module: account
#: code:addons/account/account.py:3121
@ -7660,7 +7688,7 @@ msgstr "Multi-Moedas"
#. module: account
#: field:account.model.line,date_maturity:0
msgid "Maturity Date"
msgstr ""
msgstr "Data de Vencimento"
#. module: account
#: code:addons/account/account_move_line.py:1302
@ -7706,6 +7734,11 @@ msgid ""
"few new accounts (You don't need to define the whole structure that is "
"common to both several times)."
msgstr ""
"Este campo opcional te permite criar um link para um modelo específico de "
"plano de contas que pode ser diferente do que o superior pertence. Isto "
"permite a você definir o plano de contas que amplia e completa com algumas "
"novas contas (você não precisa definir toda uma estrutura que é comum aos "
"dois várias vezes)."
#. module: account
#: view:account.move:0
@ -7758,6 +7791,7 @@ msgstr "Cancelar Faturas Selecionadas"
msgid ""
"This field is used to generate legal reports: profit and loss, balance sheet."
msgstr ""
"Este campo é usado para gerar relatórios legais: de lucros e perdas, balanço."
#. module: account
#: model:ir.actions.act_window,help:account.action_review_payment_terms_installer
@ -7767,6 +7801,10 @@ msgid ""
"terms for each letter. Each customer or supplier can be assigned to one of "
"these payment terms."
msgstr ""
"Termos de pagamento define as condições para pagamento de um cliente ou "
"fornecedor em um ou mais pagamentos. Lembretes periódicos irão usar os "
"termos de pagamento em cada aviso. Cada cliente ou fornecedor pode ser "
"associado para um desses termos de pagamento."
#. module: account
#: selection:account.entries.report,month:0
@ -7897,7 +7935,7 @@ msgstr "Quantidade ideal de entradas."
#. module: account
#: view:account.financial.report:0
msgid "Parent Report"
msgstr ""
msgstr "Relatório"
#. module: account
#: view:account.state.open:0
@ -7947,7 +7985,7 @@ msgstr " 7 Dias "
#. module: account
#: field:account.bank.statement,balance_end:0
msgid "Computed Balance"
msgstr ""
msgstr "Balanço computado"
#. module: account
#: field:account.account,parent_id:0
@ -8032,7 +8070,7 @@ msgstr "Status da Linha de Movimento"
#. module: account
#: model:ir.model,name:account.model_account_move_line_reconcile
msgid "Account move line reconcile"
msgstr ""
msgstr "Reconciliar movimentação de linha de conta"
#. module: account
#: view:account.subscription.generate:0
@ -8075,7 +8113,7 @@ msgstr "Selecione uma moeda para ser usada na fatura"
#, python-format
msgid ""
"The bank account defined on the selected chart of accounts hasn't a code."
msgstr ""
msgstr "A conta bancária definida no plano de contas não possui um código"
#. module: account
#: code:addons/account/wizard/account_invoice_refund.py:108
@ -8092,7 +8130,7 @@ msgstr "Sem Linhas na Fatura !"
#. module: account
#: view:account.financial.report:0
msgid "Report Type"
msgstr ""
msgstr "Tipo de Relatório"
#. module: account
#: view:account.analytic.account:0
@ -8121,6 +8159,8 @@ msgid ""
"Select Fiscal Year which you want to remove entries for its End of year "
"entries journal"
msgstr ""
"Escolha o Ano Fiscal que você deseja remover entradas de diário de "
"Fechamento de ano"
#. module: account
#: field:account.tax.template,type_tax_use:0
@ -8153,6 +8193,12 @@ msgid ""
"Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
"generate analytic entries on the related account."
msgstr ""
"Um plano de contas normal tem uma estrutura definida por uma legislação "
"mínima obrigatória no país. A estrutura do plano de contas analítico deve "
"refletir sua própria necessidade empresarial em termos de relatórios de "
"receitas/despesas. Eles são geralmente estruturados por contratos, projetos, "
"produtos ou departamentos. A maioria das operações do OpenErp (faturas, "
"planilhas de tempo, despesas, etc) geram uma entrada em uma conta relacionada"
#. module: account
#: field:account.account.type,close_method:0
@ -8251,6 +8297,15 @@ msgid ""
"related journal entries may or may not be reconciled. \n"
"* The 'Cancelled' state is used when user cancel invoice."
msgstr ""
" * 'Cotação' é usada quando um usuário está criando uma fatura nova e sem "
"confirmação. \n"
"* 'Pro-forma' quando uma fatura está em Pro-forma ela não possui um código "
"de fatura. \n"
"* 'Aberto' é quando um usuário cria uma fatura, um número de fatura é "
"gerado. Ficará em Aberto enquanto o usuário não pagar a fatura\n"
"* 'Pago' é definido automaticamente quando a fatura for paga. Suas entradas "
"nos diários podem ou não ser reconciliadas. \n"
"* 'Cancelado' é usado quando o usuário cancela a fatura."
#. module: account
#: view:account.invoice.report:0
@ -8281,6 +8336,7 @@ msgstr ""
msgid ""
"Can not find a chart of accounts for this company, you should create one."
msgstr ""
"Não encontramos um plano de contas para esta empresa, você deve criar um."
#. module: account
#: view:account.invoice:0
@ -8290,7 +8346,7 @@ msgstr "Pro-forma"
#. module: account
#: report:account.analytic.account.cost_ledger:0
msgid "J.C. /Move name"
msgstr ""
msgstr "J.C. /Nome da movimentação"
#. module: account
#: model:ir.model,name:account.model_account_open_closed_fiscalyear
@ -8359,6 +8415,8 @@ msgid ""
"Total amount (in Company currency) for transactions held in secondary "
"currency for this account."
msgstr ""
"Valor Total (na moeda da empresa) para as transações mantidas em uma moeda "
"secundária para esta conta."
#. module: account
#: report:account.invoice:0
@ -8395,6 +8453,8 @@ msgid ""
"You can not cancel an invoice which is partially paid! You need to "
"unreconcile related payment entries first!"
msgstr ""
"Você não pode cancelar uma fatura que foi parcialmente paga! Você precisa "
"desconciliar as entradas de pagamento primeiro!"
#. module: account
#: field:account.chart.template,property_account_income_categ:0
@ -8425,7 +8485,7 @@ msgstr "Valor do Imposto/Base"
#. module: account
#: view:account.payment.term.line:0
msgid " Valuation: Percent"
msgstr ""
msgstr " Avaliação: Percentual"
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree3
@ -8516,18 +8576,18 @@ msgstr "Conciliação parcial"
#. module: account
#: model:ir.model,name:account.model_account_analytic_inverted_balance
msgid "Account Analytic Inverted Balance"
msgstr ""
msgstr "Balanço invertido da conta analítica"
#. module: account
#: model:ir.model,name:account.model_account_common_report
msgid "Account Common Report"
msgstr ""
msgstr "Relatório de Conta Comum"
#. module: account
#: view:account.invoice.report:0
#: view:analytic.entries.report:0
msgid "current month"
msgstr ""
msgstr "mês atual"
#. module: account
#: code:addons/account/account.py:1052
@ -8536,6 +8596,8 @@ msgid ""
"No period defined for this date: %s !\n"
"Please create one."
msgstr ""
"Nenhum período definido para esta data: %s !\n"
"Por favor, crie um."
#. module: account
#: model:process.transition,name:account.process_transition_filestatement0
@ -8563,7 +8625,7 @@ msgstr "Tipos de Conta"
#. module: account
#: view:account.payment.term.line:0
msgid " Value amount: n.a"
msgstr ""
msgstr " Valor total: n.a"
#. module: account
#: view:account.automatic.reconcile:0
@ -8595,11 +8657,17 @@ msgid ""
"You should press this button to re-open it and let it continue its normal "
"process after having resolved the eventual exceptions it may have created."
msgstr ""
"Este botão só aparece quando a situação da fatura for 'Paga' (mostrando que "
"foi paga e totalmente reconciliada) e o valor gerado automaticamente "
"'Reconciliado' for falso (representando que não é mais o caso). Em outras "
"palavras, a fatura foi desconciliada e não cabe mais usar a situação 'paga' "
". Você deve clicar neste botão e re-abrir e então continuar o processo "
"normal depois de resolver as exceções que possa ter gerado"
#. module: account
#: model:ir.model,name:account.model_account_fiscalyear_close_state
msgid "Fiscalyear Close state"
msgstr ""
msgstr "Situação do Fechamento do Ano Fiscal"
#. module: account
#: field:account.invoice.refund,journal_id:0
@ -8635,6 +8703,8 @@ msgstr ""
msgid ""
"In order to close a period, you must first post related journal entries."
msgstr ""
"Para fechar um período você precisa primeiro criar as entradas de diário "
"relacionadas."
#. module: account
#: view:account.entries.report:0
@ -8652,7 +8722,7 @@ msgstr "A conta do parceiro usada para esta fatura"
#: code:addons/account/account.py:3296
#, python-format
msgid "Tax %.2f%%"
msgstr ""
msgstr "Imposto %.2f%%"
#. module: account
#: view:account.analytic.account:0
@ -8763,6 +8833,8 @@ msgstr "Faturas Não Pagas"
#, python-format
msgid "The payment term of supplier does not have a payment term line!"
msgstr ""
"O termo de pagamento do fornecedor não possui uma linha de prazo de "
"pagamento!"
#. module: account
#: field:account.move.line.reconcile,debit:0
@ -8827,17 +8899,17 @@ msgstr "Nome do diário"
#. module: account
#: view:account.move.line:0
msgid "Next Partner Entries to reconcile"
msgstr ""
msgstr "Próxima entrada a reconciliar"
#. module: account
#: selection:account.financial.report,style_overwrite:0
msgid "Smallest Text"
msgstr ""
msgstr "Menor Texto"
#. module: account
#: model:res.groups,name:account.group_account_invoice
msgid "Invoicing & Payments"
msgstr ""
msgstr "Faturamento & Pagamentos"
#. module: account
#: help:account.invoice,internal_number:0
@ -8889,6 +8961,9 @@ msgid ""
"Make sure you have configured payment terms properly !\n"
"The latest payment term line should be of the type \"Balance\" !"
msgstr ""
"Você não pode validar uma entrada sem balanço!\n"
"Tenha certeza de que você configurou os termos de pagamento corretamente!\n"
"A última linha de prazo de pagamento deve ser do tipo \"Balanço\"!"
#. module: account
#: view:account.account:0
@ -8966,7 +9041,7 @@ msgstr "Endereço do contato"
#: code:addons/account/account.py:2256
#, python-format
msgid "Wrong model !"
msgstr ""
msgstr "Modelo errado!"
#. module: account
#: field:account.invoice.refund,period:0
@ -8987,6 +9062,11 @@ msgid ""
"accounts that are typically more credited than debited and that you would "
"like to print as positive amounts in your reports; e.g.: Income account."
msgstr ""
"Para contas que são tipicamente mais debitadas do que creditadas e que você "
"deseja exibir como valores negativos nos relatórios, você deve inverter o "
"sinal do balanço; ex.: Conta de despesa. O mesmo aplica para contas que são "
"tipicamente mais creditadas do que debitadas e você deseja exibir como "
"valores positivos nos relatórios; ex.: Contas de recebimento."
#. module: account
#: field:res.partner,contract_ids:0
@ -9028,7 +9108,7 @@ msgstr ""
#: code:addons/account/account_invoice.py:808
#, python-format
msgid "Please define sequence on the journal related to this invoice."
msgstr ""
msgstr "Defina a sequencia do diário referente a essa fatura."
#. module: account
#: view:account.move:0
@ -9041,7 +9121,7 @@ msgstr "Nota Interna"
#. module: account
#: view:report.account.sales:0
msgid "This year's Sales by type"
msgstr ""
msgstr "Vendas deste ano, por tipo"
#. module: account
#: view:account.analytic.cost.ledger.journal.report:0
@ -9095,7 +9175,7 @@ msgstr "Linhas de lançamentos"
#. module: account
#: model:ir.actions.act_window,name:account.action_view_financial_accounts_installer
msgid "Review your Financial Accounts"
msgstr ""
msgstr "Reveja as suas contas financeiras"
#. module: account
#: model:ir.actions.act_window,name:account.action_open_journal_button
@ -9136,7 +9216,7 @@ msgstr "Pagamento registrado"
#. module: account
#: view:account.fiscalyear.close.state:0
msgid "Close states of Fiscal year and periods"
msgstr ""
msgstr "Situação do fechamento de Ano Fiscal e períodos"
#. module: account
#: view:account.analytic.line:0
@ -9176,7 +9256,7 @@ msgstr "Caros Ser/Senhora,"
#. module: account
#: field:account.vat.declaration,display_detail:0
msgid "Display Detail"
msgstr ""
msgstr "Mostrar Detalhes"
#. module: account
#: code:addons/account/account.py:3118
@ -9221,7 +9301,7 @@ msgstr "Fim do Período"
#: 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 "Relatórios Financeiros"
#. module: account
#: report:account.account.balance:0
@ -9305,7 +9385,7 @@ msgstr "Documento: demonstrativo da conta cliente"
#. module: account
#: field:account.account.type,report_type:0
msgid "P&L / BS Category"
msgstr ""
msgstr "Categoria P&L / BS"
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree4
@ -9481,12 +9561,12 @@ msgstr ""
#. module: account
#: view:analytic.entries.report:0
msgid "Analytic Entries of last 365 days"
msgstr ""
msgstr "Entradas analíticas dos últimos 365 dias"
#. module: account
#: report:account.central.journal:0
msgid "A/C No."
msgstr ""
msgstr "No. A/C"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
@ -9522,7 +9602,7 @@ msgstr "Conciliação de transações"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_common_menu
msgid "Common Report"
msgstr ""
msgstr "Relatório Comum"
#. module: account
#: view:account.account:0
@ -9543,7 +9623,7 @@ msgstr ""
#. module: account
#: view:account.invoice.report:0
msgid "Customer And Supplier Invoices"
msgstr ""
msgstr "Faturas de clientes e fornecedores"
#. module: account
#: model:process.node,note:account.process_node_paymententries0
@ -9583,6 +9663,8 @@ msgid ""
"No opening/closing period defined, please create one to set the initial "
"balance!"
msgstr ""
"Nenhum período de abertura/fechamento definido, por favor crie um e defina o "
"balanço inicial!"
#. module: account
#: report:account.account.balance:0
@ -9631,6 +9713,11 @@ msgid ""
"journals. Select 'Opening/Closing Situation' for entries generated for new "
"fiscal years."
msgstr ""
"Escolha 'Venda' para diários de faturas de clientes. Escolha 'Compra' para "
"diários de faturas de fornecedores. Escolha 'Dinheiro' ou 'Banco' para "
"diários que são usados nos pagamentos de clientes ou fornecedores. Escolha "
"'Geral' para diários de operações diversas. Escolha 'Situação de "
"Abertura/Fechamento' para entradas geradas em um novo ano fiscal."
#. module: account
#: model:ir.model,name:account.model_account_subscription
@ -9683,6 +9770,8 @@ msgid ""
"It indicates that the invoice has been paid and the journal entry of the "
"invoice has been reconciled with one or several journal entries of payment."
msgstr ""
"Indica que a fatura foi paga e a entrada do diário foi reconciliada com um "
"ou mais diários de pagamentos"
#. module: account
#: view:account.invoice:0
@ -9720,6 +9809,13 @@ msgid ""
"open period. Close a period when you do not want to record new entries and "
"want to lock this period for tax related calculation."
msgstr ""
"Um período é um período fiscal em que a contabilidade deve ser registrada "
"para atividades relacionadas. Períodos mensais costumam ser o padrão, mas "
"dependendo do seu pais ou necessidades da empresa, você também pode definir "
"períodos trimestrais. Após fechar um período é impossível adicionar novas "
"entradas, todas as novas entradas deverão ser feitas no período seguinte. "
"Feche um período quando você não desejar mais gravar novas entradas e quer "
"bloquear o período para o cálculo de impostos"
#. module: account
#: view:account.analytic.account:0
@ -9755,7 +9851,7 @@ msgstr "Ativo"
#. module: account
#: view:accounting.report:0
msgid "Comparison"
msgstr ""
msgstr "Comparação"
#. module: account
#: code:addons/account/account_invoice.py:372
@ -9828,7 +9924,7 @@ msgstr ""
#: code:addons/account/account.py:181
#, python-format
msgid "Profit & Loss (Income account)"
msgstr ""
msgstr "Ganhos e perdas (conta Lucro)"
#. module: account
#: constraint:account.account:0
@ -9837,6 +9933,9 @@ msgid ""
"You can not select an account type with a deferral method different of "
"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
msgstr ""
"Erro de Configuração!\n"
"Você não pode selecionar um tipo de conta com um método de deferimento "
"diferente de \"Não conciliado\" para contas do tipo \"Pagáveis/Recebíveis\" "
#. module: account
#: view:account.model:0
@ -9873,7 +9972,7 @@ msgstr "Geral"
#. module: account
#: view:analytic.entries.report:0
msgid "Analytic Entries of last 30 days"
msgstr ""
msgstr "Entradas analíticas dos últimos 30 dias"
#. module: account
#: selection:account.aged.trial.balance,filter:0
@ -9930,7 +10029,7 @@ msgstr "Abril"
#. module: account
#: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0
msgid "Profit (Loss) to report"
msgstr ""
msgstr "Lucro (Prejuízo) para relatório"
#. module: account
#: view:account.move.line.reconcile.select:0
@ -9954,7 +10053,7 @@ msgstr ""
#. module: account
#: selection:account.financial.report,style_overwrite:0
msgid "Title 2 (bold)"
msgstr ""
msgstr "Título 2 (em negrito)"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2
@ -9995,6 +10094,8 @@ msgid ""
"When new statement is created the state will be 'Draft'.\n"
"And after getting confirmation from the bank it will be in 'Confirmed' state."
msgstr ""
"Quando um novo statement for criado, a situação será 'Rascunho'.\n"
"E após a confirmação do banco a situação será \"Confirmada\"."
#. module: account
#: model:ir.model,name:account.model_account_period
@ -10115,7 +10216,7 @@ msgstr "Sequências de ano fiscal"
#. module: account
#: selection:account.financial.report,display_detail:0
msgid "No detail"
msgstr ""
msgstr "Não há detalhes"
#. module: account
#: code:addons/account/account_analytic_line.py:102
@ -10126,14 +10227,14 @@ msgstr "Não há conta de entrada definida para este produto:\"%s\" (id:%d)"
#. module: account
#: constraint:account.move.line:0
msgid "You can not create journal items on closed account."
msgstr ""
msgstr "Você não pode criar ítens de diário em uma conta fechada."
#. module: account
#: field:account.account,unrealized_gain_loss:0
#: 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 "Perdas ou Ganhos não realizados"
#. module: account
#: view:account.fiscalyear:0
@ -10146,12 +10247,12 @@ msgstr "Estado"
#. module: account
#: model:ir.actions.server,name:account.ir_actions_server_edi_invoice
msgid "Auto-email confirmed invoices"
msgstr ""
msgstr "Enviar automaticamente as Faturas confirmadas"
#. module: account
#: field:account.invoice,check_total:0
msgid "Verification Total"
msgstr ""
msgstr "Verificação total"
#. module: account
#: report:account.analytic.account.balance:0
@ -10279,7 +10380,7 @@ msgstr "Esvaziar as contas ? "
#. module: account
#: constraint:account.bank.statement:0
msgid "The journal and period chosen have to belong to the same company."
msgstr ""
msgstr "O diário e o período escolhido tem que pertencer à mesma empresa."
#. module: account
#: view:account.invoice:0
@ -10303,11 +10404,13 @@ msgid ""
"This account will be used to value outgoing stock for the current product "
"category using cost price"
msgstr ""
"Esta conta será usada para para estimar o estoque de saída da categoria de "
"produtos usando o preço de custo"
#. module: account
#: view:wizard.multi.charts.accounts:0
msgid "Generate Your Chart of Accounts from a Chart Template"
msgstr ""
msgstr "Crie seu Plano de Contas através de um modelo"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_invoice_report_all
@ -10379,7 +10482,7 @@ msgstr "Débito"
#. module: account
#: selection:account.financial.report,style_overwrite:0
msgid "Title 3 (bold, smaller)"
msgstr ""
msgstr "Título 3 (em negrito, menor)"
#. module: account
#: field:account.invoice,invoice_line:0
@ -10394,7 +10497,7 @@ msgstr "Erro ! Você não pode criar templates recursivos para contas."
#. module: account
#: selection:account.print.journal,sort_selection:0
msgid "Journal Entry Number"
msgstr ""
msgstr "Número da Entrada de Diário"
#. module: account
#: view:account.subscription:0
@ -10408,6 +10511,8 @@ msgid ""
"You cannot change the type of account from 'Closed' to any other type which "
"contains journal items!"
msgstr ""
"Você não pode mudar o tipo de conta de 'Fechado' para nenhum outro tipo que "
"contém entradas de diário!"
#. module: account
#: code:addons/account/account_move_line.py:832
@ -10433,7 +10538,7 @@ msgstr "Intervalo"
#. module: account
#: view:account.analytic.line:0
msgid "Analytic Journal Items related to a purchase journal."
msgstr ""
msgstr "Itens de diário relacionados a um diário de compras."
#. module: account
#: help:account.account,type:0
@ -10444,6 +10549,11 @@ msgid ""
"payable/receivable are for partners accounts (for debit/credit "
"computations), closed for depreciated accounts."
msgstr ""
"O 'Tipo Interno' é usado para recursos disponíveis em diferentes tipo de "
"contas: visualizações não podem conter itens de diário, consolidações são "
"contas que possuem contas filhas de consolidações multi-empresas, "
"pagáveis/recebíveis são para contas de parceiros (para cálculo de "
"débito/crédito), fechado para contas de depreciação."
#. module: account
#: selection:account.balance.report,display_account:0
@ -10485,7 +10595,7 @@ msgstr "Imprimir diários analíticos"
#. module: account
#: view:account.invoice.report:0
msgid "Group by month of Invoice Date"
msgstr ""
msgstr "Agrupar por mês da fatura"
#. module: account
#: view:account.analytic.line:0
@ -10519,6 +10629,8 @@ msgstr "A outra moeda opcional se este for um lançamento multi-moeda"
msgid ""
"Import of the statement in the system from a supplier or customer invoice"
msgstr ""
"Importar da declaração no sistema a partir de uma fatura do fornecedor ou "
"cliente"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
@ -10551,7 +10663,7 @@ msgstr ""
#. module: account
#: view:account.payment.term:0
msgid "Description on Invoices"
msgstr ""
msgstr "Descrição nas Faturas"
#. module: account
#: model:ir.model,name:account.model_account_analytic_chart
@ -10578,7 +10690,7 @@ msgstr "Conta inválida!"
#. module: account
#: field:account.print.journal,sort_selection:0
msgid "Entries Sorted by"
msgstr ""
msgstr "Entradas classificadas por"
#. module: account
#: help:account.move,state:0
@ -10589,6 +10701,11 @@ msgid ""
"created by the system on document validation (invoices, bank statements...) "
"and will be created in 'Posted' state."
msgstr ""
"Todas as entradas de diário criadas manualmente ficam na situação 'Não "
"publicadas', mas você pode definir uma opção para pular esta situação no "
"diário relacionado. Neste caso, elas se comportarão como entradas de diário "
"automaticamente pelo sistema na validação do documento (faturas, extratos "
"bancários...) e serão criadas na situação 'Publicadas'."
#. module: account
#: view:account.fiscal.position.template:0
@ -10719,6 +10836,76 @@ msgid ""
"% endif\n"
" "
msgstr ""
"\n"
"Olá ${object.address_invoice_id.name and ' ' or "
"''}${object.address_invoice_id.name or ''},\n"
"\n"
"Uma nova fatura está disponível para ${object.partner_id.name}:\n"
" | Número da Fatura: *${object.number}*\n"
" | Total da Fatura: *${object.amount_total} "
"${object.currency_id.name}*\n"
" | Data da Fatura: ${object.date_invoice}\n"
" % if object.origin:\n"
" | Referente a: ${object.origin}\n"
" % endif\n"
" | Seu contato: ${object.user_id.name} ${object.user_id.user_email and "
"'<%s>'%(object.user_id.user_email) or ''}\n"
"\n"
"Você pode ver a fatura, fazer o download e pagar online usando o seguinte "
"link:\n"
" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
"\n"
"% if object.company_id.paypal_account and object.type in ('out_invoice', "
"'in_refund'):\n"
"<% \n"
"comp_name = quote(object.company_id.name)\n"
"inv_number = quote(object.number)\n"
"paypal_account = quote(object.company_id.paypal_account)\n"
"inv_amount = quote(str(object.amount_total))\n"
"cur_name = quote(object.currency_id.name)\n"
"paypal_url = \"https://www.paypal.com/cgi-"
"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s\"\\\n"
" "
"\"&invoice=%s&amount=%s&currency_code=%s&button_subtype=services&no_note=1&bn"
"=OpenERP_Invoice_PayNow_%s\" % \\\n"
" "
"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
"\n"
"%>\n"
"É possível pagar diretamente através do Paypal:\n"
" ${paypal_url}\n"
"% endif\n"
"\n"
"Se você tiver alguma dúvida por favor entre em contato conosco.\n"
"\n"
"\n"
"Obrigado por escolher ${object.company_id.name}!\n"
"\n"
"\n"
"--\n"
"${object.user_id.name} ${object.user_id.user_email and "
"'<%s>'%(object.user_id.user_email) or ''}\n"
"${object.company_id.name}\n"
"% if object.company_id.street:\n"
"${object.company_id.street or ''}\n"
"% endif\n"
"% if object.company_id.street2:\n"
"${object.company_id.street2}\n"
"% endif\n"
"% if object.company_id.city or object.company_id.zip:\n"
"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
"% endif\n"
"% if object.company_id.country_id:\n"
"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
"or ''} ${object.company_id.country_id.name or ''}\n"
"% endif\n"
"% if object.company_id.phone:\n"
"Phone: ${object.company_id.phone}\n"
"% endif\n"
"% if object.company_id.website:\n"
"${object.company_id.website or ''}\n"
"% endif\n"
" "
#. module: account
#: model:ir.model,name:account.model_res_partner_bank
@ -13102,3 +13289,6 @@ msgstr ""
#~ msgid "Install your Chart of Accounts"
#~ msgstr "Instale o seu Plano de Contas"
#~ msgid "Description On Invoices"
#~ msgstr "Descrição em Faturas"

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

96
addons/account/partner_view.xml
View File

@ -76,56 +76,57 @@
<field name="arch" type="xml">
<page string="History" position="before" version="7.0">
<page string="Accounting" col="4">
<group col="4">
<group string="Customer Accounting Properties" col="4">
<field name="property_account_receivable" groups="account.group_account_invoice" />
<group>
<group>
<field name="property_account_position" widget="selection"/>
</group>
<group>
<field name="last_reconciliation_date"/>
</group>
<group>
<field name="property_account_receivable" groups="account.group_account_invoice" />
<field name="property_payment_term" widget="selection"/>
</group>
<group string="Supplier Accounting Properties" col="4">
<field name="property_account_payable" groups="account.group_account_invoice"/>
</group>
<group string="Customer Credit" col="4">
<field name="credit"/>
<field name="credit_limit"/>
</group>
<group string="Supplier Debit" col="4">
<group>
<field name="property_account_payable" groups="account.group_account_invoice"/>
<field name="debit"/>
</group>
<field name="bank_ids">
<form string="Bank account" version="7.0">
<field name="state"/>
<field name="acc_number"/>
<group>
<group name="owner" string="Bank Account Owner">
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
<field name="owner_name"/>
<label for="street" string="Address"/>
<div>
<field name="street" placeholder="Street..."/>
<div>
<field name="zip" class="oe_inline" placeholder="ZIP"/>
<field name="city" class="oe_inline" placeholder="City"/>
</div>
<field name="state_id" placeholder="State"/>
<field name="country_id" placeholder="Country"/>
</div>
</group>
<group name="bank" string="Information About the Bank">
<field name="bank" on_change="onchange_bank_id(bank)"/>
<field name="bank_name"/>
<field name="bank_bic" placeholder="[Identifier code]"/>
</group>
</group>
</form>
<tree string="Bank Details">
<field name="sequence" invisible="1"/>
<field name="acc_number"/>
<field name="bank_name"/>
<field name="owner_name"/>
</tree>
</field>
</group>
<field name="bank_ids">
<form string="Bank account" version="7.0">
<field name="state"/>
<field name="acc_number"/>
<group>
<group name="owner" string="Bank Account Owner">
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
<field name="owner_name"/>
<label for="street" string="Address"/>
<div>
<field name="street" placeholder="Street..."/>
<div>
<field name="zip" class="oe_inline" placeholder="ZIP"/>
<field name="city" class="oe_inline" placeholder="City"/>
</div>
<field name="state_id" placeholder="State"/>
<field name="country_id" placeholder="Country"/>
</div>
</group>
<group name="bank" string="Information About the Bank">
<field name="bank" on_change="onchange_bank_id(bank)"/>
<field name="bank_name"/>
<field name="bank_bic" placeholder="e.g. GEBABEBB"/>
</group>
</group>
</form>
<tree string="Bank Details">
<field name="sequence" invisible="1"/>
<field name="acc_number"/>
<field name="bank_name"/>
<field name="owner_name"/>
</tree>
</field>
</page>
</page>
</field>
@ -142,16 +143,5 @@
view_type="form"
view_mode="tree,form,graph,calendar"/>
<record id="view_res_partner_reconcile" model="ir.ui.view">
<field name="name">res.partner.form.reconcile</field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<field name="credit_limit" position="after">
<field name="last_reconciliation_date"/>
</field>
</field>
</record>
</data>
</openerp>

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

@ -30,22 +30,15 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Analytic Account">
<group>
<field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Account"/>
<separator orientation="vertical"/>
<field name="date"/>
<separator orientation="vertical"/>
<filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
<filter icon="terp-camera_test" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
<separator orientation="vertical"/>
<field name="partner_id"/>
<field name="user_id" widget="selection"/>
</group>
<newline/>
<field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Account"/>
<field name="date"/>
<filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
<filter icon="terp-camera_test" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
<field name="partner_id"/>
<field name="user_id"/>
<group expand="0" string="Group By...">
<filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="Associated Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
<filter string="Parent Account" icon="terp-folder-green" domain="[]" context="{'group_by':'parent_id'}"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/>
</group>
@ -118,6 +111,7 @@
<field name="name">account.analytic.line.form</field>
<field name="model">account.analytic.line</field>
<field name="type">form</field>
<field name="priority">1</field>
<field name="arch" type="xml">
<form string="Analytic Entry" version="7.0">
<group>
@ -182,27 +176,20 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Analytic Lines">
<group>
<field name="name" string="Analytic Line"/>
<separator orientation="vertical"/>
<field name="date"/>
<separator orientation="vertical"/>
<filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" icon="terp-camera_test" help="Analytic Journal Items related to a sale journal."/>
<filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" icon="terp-purchase" help="Analytic Journal Items related to a purchase journal."/>
<filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation'))]" icon="terp-folder-orange"/>
<filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
<separator orientation="vertical"/>
<field name="account_id"/>
<field name="user_id"/>
</group>
<newline/>
<field name="name" string="Analytic Line"/>
<field name="date"/>
<filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" icon="terp-camera_test" help="Analytic Journal Items related to a sale journal."/>
<filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" icon="terp-purchase" help="Analytic Journal Items related to a purchase journal."/>
<filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation'))]" icon="terp-folder-orange"/>
<separator/>
<filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
<field name="account_id"/>
<field name="user_id"/>
<group string="Group By..." expand="0">
<filter string="Account" context="{'group_by':'account_id'}" icon="terp-folder-green"/>
<filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-orange"/>
<filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
<separator orientation="vertical"/>
<filter string="Fin.Account" context="{'group_by':'general_account_id'}" icon="terp-folder-green"/>
<separator orientation="vertical"/>
<filter string="Product" context="{'group_by':'product_id'}" icon="terp-accessories-archiver"/>
</group>
</search>
@ -241,19 +228,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>
@ -289,11 +290,8 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Analytic Journals">
<group>
<field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Journal"/>
<field name="type"/>
</group>
<newline/>
<field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Journal"/>
<field name="type"/>
<group expand="0" string="Group By...">
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
</group>
@ -371,7 +369,7 @@
<field name="inherit_id" ref="account.view_account_journal_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="currency" position="after">
<field name="type" position="after">
<field name="analytic_journal_id"/>
</field>
</field>

22
addons/account/report/account_analytic_entries_report_view.xml
View File

@ -34,31 +34,21 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Analytic Entries Analysis">
<group>
<field name="day" string="Day"/>
<separator orientation="vertical"/>
<field name="date"/>
<separator orientation="vertical"/>
<filter string="My Entries" icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/>
<separator orientation="vertical"/>
<field name="account_id" groups="analytic.group_analytic_accounting"/>
<field name="product_id" />
<field name="user_id"/>
</group>
<newline/>
<field name="day" string="Day"/>
<field name="date"/>
<filter string="My Entries" icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/>
<field name="account_id" groups="analytic.group_analytic_accounting"/>
<field name="product_id" />
<field name="user_id"/>
<group expand="0" string="Group By...">
<filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
<filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
<filter string="Account" name="Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
<filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
<filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
<filter string="Product Unit of Measure" icon="terp-mrp" context="{'group_by':'product_uom_id'}"/>
<separator orientation="vertical" groups="base.group_multi_company"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical"/>
<filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
<filter string="Month" name="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>

51
addons/account/report/account_entries_report_view.xml
View File

@ -67,54 +67,35 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Entries Analysis">
<group>
<field name="date"/>
<field name="date_created"/>
<field name="date_maturity"/>
<separator orientation="vertical"/>
<filter icon="terp-go-year" string="This F.Year"
name="thisyear"
context="{'year':'current_year'}"
help="Journal Entries with period in current year"/>
<filter icon="terp-go-month" string="This Period"
name="period"
context="{'period':'current_period'}"
help="Journal Entries with period in current period"/>
<separator orientation="vertical"/>
<filter string="Unposted" icon="terp-document-new" domain="[('move_state','=','draft')]" help = "entries"/>
<filter string="Posted" icon="terp-camera_test" domain="[('move_state','=','posted')]" help = "Posted entries"/>
<separator orientation="vertical"/>
<filter string="Unreconciled" icon="terp-dolar_ok!" domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help = "Unreconciled entries"/>
<filter string="Reconciled" icon="terp-dolar" domain="[('reconcile_id','!=',False)]" help = "Reconciled entries"/>
<separator orientation="vertical"/>
<field name="account_id"/>
<field name="journal_id" widget="selection"/>
<field name="period_id"/>
</group>
<newline/>
<group expand="0" string="Extended Filters...">
<field name="date"/>
<field name="date_created"/>
<field name="date_maturity"/>
<filter icon="terp-go-year" string="This F.Year" name="thisyear" context="{'year':'current_year'}" help="Journal Entries with period in current year"/>
<filter icon="terp-go-month" string="This Period" name="period" context="{'period':'current_period'}" help="Journal Entries with period in current period"/>
<separator/>
<filter string="Unposted" icon="terp-document-new" domain="[('move_state','=','draft')]" help = "entries"/>
<filter string="Posted" icon="terp-camera_test" domain="[('move_state','=','posted')]" help = "Posted entries"/>
<separator/>
<filter string="Unreconciled" icon="terp-dolar_ok!" domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help = "Unreconciled entries"/>
<filter string="Reconciled" icon="terp-dolar" domain="[('reconcile_id','!=',False)]" help = "Reconciled entries"/>
<field name="account_id"/>
<field name="journal_id"/>
<field name="period_id"/>
<group expand="0" string="Extended Filters...">
<field name="fiscalyear_id"/>
<separator orientation="vertical"/>
<field name="product_id"/>
<field name="partner_id"/>
<separator orientation="vertical" groups="base.group_multi_company"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
<newline/>
</group>
<group expand="1" string="Group By...">
<filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':['product_id','product_uom_id'], 'quantity_visible':1}"/>
<separator orientation="vertical"/>
<filter string="Currency" name="group_currency" icon="terp-dolar" context="{'group_by':'currency_id', 'currency_id_visible':1, 'amount_currency_visible':1}"/>
<filter string="Journal" name="group_journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
<filter string="Account" name="group_account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
<separator orientation="vertical"/>
<filter string="Acc.Type" icon="terp-stock_symbol-selection" context="{'group_by':'user_type'}" name="usertype"/>
<filter string="Int.Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
<separator orientation="vertical" groups="base.group_multi_company"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical"/>
<filter string="Date" icon="terp-go-today" context="{'group_by':'date'}"/>
<filter string="Period" icon="terp-go-month" name="group_period" context="{'group_by':'period_id'}"/>
<filter string="Fiscal Year" icon="terp-go-year" context="{'group_by':'fiscalyear_id'}"/>

64
addons/account/report/account_invoice_report_view.xml
View File

@ -55,68 +55,32 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Invoices Analysis">
<group>
<filter icon="terp-go-year" string="Year"
name="year"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
help="year"/>
<separator orientation="vertical"/>
<field name="date"/>
<separator orientation="vertical"/>
<filter string="Draft"
icon="terp-document-new"
domain="[('state','=','draft')]"
help = "Draft Invoices"/>
<filter string="Pro-forma"
icon="terp-gtk-media-pause"
domain="['|', ('state','=','proforma'),('state','=','proforma2')]"
help = "Pro-forma Invoices"/>
<filter string="Invoiced"
name="current"
icon="terp-check"
domain="[('state','not in', ('draft','cancel'))]"
help = "Open and Paid Invoices"/>
<separator orientation="vertical"/>
<filter icon="terp-personal" string="Customer"
name="customer"
domain="['|', ('type','=','out_invoice'),('type','=','out_refund')]"
help="Customer Invoices And Refunds"/>
<filter icon="terp-personal"
string="Supplier"
domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]"
help="Supplier Invoices And Refunds"/>
<separator orientation="vertical"/>
<filter icon="terp-dolar" string="Invoice"
domain="['|', ('type','=','out_invoice'),('type','=','in_invoice')]"
help="Customer And Supplier Invoices"/>
<filter icon="terp-dolar_ok!"
string="Refund"
domain="['|', ('type','=','out_refund'),('type','=','in_refund')]"
help="Customer And Supplier Refunds"/>
<separator orientation="vertical"/>
<field name="partner_id"/>
<field name="user_id" />
<field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/>
</group>
<newline/>
<field name="date"/>
<filter icon="terp-go-year" string="Year" name="year" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]" help="year"/>
<separator/>
<filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft Invoices"/>
<filter string="Pro-forma" icon="terp-gtk-media-pause" domain="['|', ('state','=','proforma'),('state','=','proforma2')]" help = "Pro-forma Invoices"/>
<filter string="Invoiced" name="current" icon="terp-check" domain="[('state','not in', ('draft','cancel'))]" help = "Open and Paid Invoices"/>
<separator/>
<filter icon="terp-personal" string="Customer" name="customer" domain="['|', ('type','=','out_invoice'),('type','=','out_refund')]" help="Customer Invoices And Refunds"/>
<filter icon="terp-personal" string="Supplier" domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]" help="Supplier Invoices And Refunds"/>
<filter icon="terp-dolar" string="Invoice" domain="['|', ('type','=','out_invoice'),('type','=','in_invoice')]" help="Customer And Supplier Invoices"/>
<filter icon="terp-dolar_ok!" string="Refund" domain="['|', ('type','=','out_refund'),('type','=','in_refund')]" help="Customer And Supplier Refunds"/>
<field name="partner_id"/>
<field name="user_id" />
<field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/>
<group expand="1" string="Group By...">
<filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id','residual_visible':True}"/>
<filter string="Salesperson" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/>
<filter string="Due Date" icon="terp-go-today" context="{'group_by':'date_due'}"/>
<filter string="Period" icon="terp-go-month" context="{'group_by':'period_id'}" name="period"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True,'residual_invisible':True}"/>
<filter string="Category of Product" name="category_product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id','residual_invisible':True}"/>
<separator orientation="vertical"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
<separator orientation="vertical"/>
<filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
<filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_line_id'}"/>
<separator orientation="vertical" groups="base.group_multi_company"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical"/>
<filter string="Day" name="day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Invoice Date"/>
<filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Invoice Date"/>
<filter string="Year" name="group_year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Invoice Date"/>

6
addons/account/report/account_journal_sale_purchase.rml
View File

@ -219,7 +219,7 @@
<td><para style="P10a">Account</para></td>
<td><para style="P10a">Partner</para></td>
<td><para style="P10a">Label</para></td>
<td><para style="P10a">VAT</para></td>
<td><para style="P10a">Tax</para></td>
<td><para style="P11"></para></td>
<td><para style="P10b">Debit</para></td>
<td><para style="P10b">Credit</para></td>
@ -271,7 +271,7 @@
<td><para style="P10a">Account</para></td>
<td><para style="P10a">Partner</para></td>
<td><para style="P10a">Label</para></td>
<td><para style="P10a">VAT</para></td>
<td><para style="P10a">Tax</para></td>
<td><para style="P11"></para></td>
<td><para style="P10b">Debit</para></td>
<td><para style="P10b">Credit</para></td>
@ -330,7 +330,7 @@
<blockTable colWidths="15.0,80.0,20.0,182.0" style="Table1" repeatRows="1">
<tr>
<td><para style="P12"></para></td>
<td><para style="P12">VAT Declaration</para></td>
<td><para style="P12">Tax Declaration</para></td>
<td><para style="P12"></para></td>
<td><para style="P12"></para></td>
</tr>

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

9
addons/account/report/account_treasury_report_view.xml
View File

@ -36,12 +36,9 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Treasury Analysis">
<group>
<field name="fiscalyear_id"/>
<field name="period_id"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
<newline/>
<field name="fiscalyear_id"/>
<field name="period_id"/>
<field name="company_id" groups="base.group_multi_company"/>
</search>
</field>
</record>

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

57
addons/account/res_config_view.xml
View File

@ -21,7 +21,6 @@
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"/>
@ -34,7 +33,6 @@
<field name="expects_chart_of_accounts"/>
</group>
<div class="oe_form_button_save_dirty">
<group string="Select a Chart of Accounts to Install"
attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
<group>
@ -51,9 +49,7 @@
<button string="Install More Chart Templates" icon="gtk-go-forward"
name="%(open_account_charts_modules)d" type="action"/>
</group>
</div>
<div class="oe_form_button_save_dirty">
<group string="No Fiscal Year Defined for This Company"
attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_fiscal_year','=',True)]}">
<label for="date_start" string="Date Range"/>
@ -63,78 +59,67 @@
</div>
<field name="period"/>
</group>
</div>
<group string="Accounting Configuration">
<group>
<group>
<group name="account_config">
<separator string="Accounting Configuration" colspan="2"/>
<field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]"
attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
<field name="module_account_accountant"/>
<field name="currency_id"/>
<field name="decimal_precision"/>
</group>
<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>
</group>
<field name="sale_journal_id" invisible="1"/>
<field name="sale_refund_journal_id" invisible="1"/>
<field name="purchase_journal_id" invisible="1"/>
<field name="purchase_refund_journal_id" invisible="1"/>
<group>
<group string="Customer Invoices">
<separator string="Customer Invoices" colspan="2"/>
<label for="sale_sequence_next"/>
<group>
<field name="sale_sequence_prefix" class="oe_inline" nolabel="1"
help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
<field name="sale_sequence_next" class="oe_inline" nolabel="1" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
<field name="sale_sequence_next" class="oe_inline" nolabel="1" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
</group>
<label for="sale_refund_sequence_next"/>
<group>
<field name="sale_refund_sequence_prefix" class="oe_inline" nolabel="1"
<field name="sale_refund_sequence_prefix" class="oe_inline" nolabel="1"
help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
<field name="sale_refund_sequence_next" class="oe_inline" nolabel="1" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
<field name="sale_refund_sequence_next" nolabel="1" class="oe_inline" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
</group>
<field name="module_account_voucher"/>
<field name="module_account_followup"/>
<field name="group_proforma_invoices"/>
<separator name="analytic_accounting" invisible="1" string="Analytic Accounting"/>
</group>
<group string="Supplier Invoices">
<group name="other_cofing">
<separator string="Supplier Invoices" colspan="2"/>
<label for="purchase_sequence_next"/>
<group>
<field name="purchase_sequence_prefix" class="oe_inline" nolabel="1"
help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
<field name="purchase_sequence_next" class="oe_inline" nolabel="1" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
<field name="purchase_sequence_next" nolabel="1" class="oe_inline" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
</group>
<label for="purchase_refund_sequence_next"/>
<group>
<field name="purchase_refund_sequence_prefix" class="oe_inline" nolabel="1"
<field name="purchase_refund_sequence_prefix" class="oe_inline" nolabel="1"
help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
<field name="purchase_refund_sequence_next" class="oe_inline" nolabel="1"
attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}"/>
<field name="purchase_refund_sequence_next" class="oe_inline"
attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}" nolabel="1"/>
</group>
<field name="module_account_payment"/>
</group>
<group string="Electronic Payments">
<separator string="Electronic Payments" colspan="2"/>
<field name="paypal_account" placeholder="sales@openerp.com"/>
</group>
<group string="Bank &amp; Cash">
<separator string="Bank &amp; Cash" colspan="2"/>
<label for="id" string="Configure Bank Accounts"/>
<button name="%(action_bank_tree)d" string="Configure Bank Accounts" icon="gtk-go-forward" type="action"/>
<field name="company_footer"/>
<field name="module_account_check_writing"/>
</group>
<group name="analytic_accounting" invisible="1" string="Analytic Accounting"/>
</group>
</sheet>
<field name="sale_journal_id" invisible="1"/>
<field name="sale_refund_journal_id" invisible="1"/>
<field name="purchase_journal_id" invisible="1"/>
<field name="purchase_refund_journal_id" invisible="1"/>
</form>
</field>
</record>

3
addons/account/res_currency.py
View File

@ -44,4 +44,5 @@ class res_currency_account(osv.osv):
res_currency_account()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

3
addons/account/test/account_cash_statement.yml
View File

@ -1,5 +1,5 @@
-
In order to test Cash statement I create a Cash statement and confirm it and check it's move created
In order to test Cash statement I create a Cash statement and confirm it and check its move created
-
!record {model: account.bank.statement, id: account_bank_statement_1}:
date: !eval time.strftime('%Y-%m-%d')
@ -57,7 +57,6 @@
- pieces: 500.0
number: 2
subtotal: 1000.0
balance_end_cash: 1120.0
-
I clicked on Close CashBox button to close the cashbox

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

@ -64,6 +64,8 @@ import account_report_account_balance
import account_change_currency
import pos_box;
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

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>

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