diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index 114f0a5860c..e1b9078ec3f 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -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'], diff --git a/addons/account/account.py b/addons/account/account.py index fab9de5407c..cbba0237c78 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -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() @@ -731,7 +733,7 @@ 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'), @@ -1269,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), @@ -1788,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'"), } @@ -1880,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"), @@ -2090,7 +2092,7 @@ class account_tax(osv.osv): tax_compute_precision = precision if taxes and taxes[0].company_id.tax_calculation_rounding_method == 'round_globally': tax_compute_precision += 5 - totalin = totalex = round(price_unit * quantity, precision) + totalin = totalex = float_round(price_unit * quantity, precision) tin = [] tex = [] for tax in taxes: @@ -2217,7 +2219,7 @@ class account_tax(osv.osv): 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 ] @@ -2673,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 = { @@ -2788,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."), diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 8f9c6ed1d6f..11bcf565260 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -173,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') @@ -185,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, diff --git a/addons/account/account_bank_view.xml b/addons/account/account_bank_view.xml index 6ee69184ce1..4b3436c8a51 100644 --- a/addons/account/account_bank_view.xml +++ b/addons/account/account_bank_view.xml @@ -42,7 +42,17 @@ form tree,form - Configure your company's bank account and select those that must appear on the report footer. You can reorder banks in the list view. If you use the accounting application of OpenERP, journals and accounts will be created automatically based on these data. + +

+ Click to setup a new bank account. +

+ Configure your company's bank account and select those that must + appear on the report footer. +

+ If you use the accounting application of OpenERP, journals and + accounts will be created automatically based on these data. +

+ new - - Accounting - 5 - - - 3 automatic diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 1296d5c718a..501a50b96c2 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -196,7 +196,7 @@ - + @@ -344,7 +344,22 @@ - + + + + + + + + + + + + +
@@ -427,32 +442,22 @@ search - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - @@ -504,11 +509,18 @@ [('type','=','out_invoice')] {'default_type':'out_invoice', 'type':'out_invoice', 'journal_type': 'sale'} - - Click here to create a new Invoice. - <p> - An invoice can be generated automatically from a sale order or a delivery order. - The invoice can be send by email. + +

+ Click to create a customer invoice. +

+ OpenERP's electronic invoicing allows to ease and fasten the + collection of customer payments. Your customer receives the + invoice by email and he can pay online and/or import it + in his own system. +

+ The discussions with your customer are automatically displayed at + the bottom of each invoice. +

@@ -537,11 +549,14 @@ [('type','=','in_invoice')] {'default_type': 'in_invoice', 'type': 'in_invoice', 'journal_type': 'purchase'} - - Click here to create Supplier invoice. - <p> - You can control the invoice from your supplier according to what you purchased or received. - OpenERP can also generate draft invoices automatically from purchase orders or receipts. + +

+ Click to record a new supplier invoice. +

+ You can control the invoice from your supplier according to + what you purchased or received. OpenERP can also generate + draft invoices automatically from purchase orders or receipts. +

@@ -555,11 +570,16 @@ [('type','=','out_refund')] {'default_type':'out_refund', 'type':'out_refund', 'journal_type': 'sale_refund'} - - Click here to create a new customer refund. - <p> - A refund is a document that credits an invoice completely or partially. - You can also generate refunds and reconcile them directly from the invoice form. + +

+ Click to create a customer refund. +

+ A refund is a document that credits an invoice completely or + partially. +

+ Instead of manually creating a customer refund, you + can generate it directly from the related customer invoice. +

@@ -586,11 +606,13 @@ [('type','=','in_refund')] {'default_type': 'in_refund', 'type': 'in_refund', 'journal_type': 'purchase_refund'} - - Click here to create a new supplier refund. - <p> - Track refunds you receive from your suppliers. - You can also generate refunds and reconcile them directly from the invoice form. + +

+ Click to register a refund you received from a supplier. +

+ Instead of creating the supplier refund manually, you can generate + refunds and reconcile them directly from the related supplier invoice. +

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 57cc125bb5b..5eb56bfa645 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -327,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) @@ -1347,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 ''), diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 1e1f7b91851..24d21cff3e8 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -63,15 +63,10 @@ search - - - - - - - - - + + + + @@ -83,7 +78,19 @@ account.fiscalyear form tree,form - Define your company's financial year according to your needs. A financial year is a period at the end of which a company's accounts are made up (usually 12 months). The financial year is usually referred to by the date in which it ends. For example, if a company's financial year ends November 30, 2011, then everything between December 1, 2010 and November 30, 2011 would be referred to as FY 2011. You are not obliged to follow the actual calendar year. + +

+ Click to start a new fiscal year. +

+ Define your company's financial year according to your needs. A + financial year is a period at the end of which a company's + accounts are made up (usually 12 months). The financial year is + usually referred to by the date in which it ends. For example, + if a company's financial year ends November 30, 2011, then + everything between December 1, 2010 and November 30, 2011 + would be referred to as FY 2011. +

+ @@ -146,11 +153,8 @@ search - - - - - + + @@ -161,7 +165,14 @@ form tree,form {'search_default_draft': 1} - Here you can define a financial period, an interval of time in your company's financial year. An accounting period typically is a month or a quarter. It usually corresponds to the periods of the tax declaration. Create and manage periods from here and decide whether a period should be closed or left open depending on your company's activities over a specific period. + +

+ Click to add a fiscal period. +

+ An accounting period typically is a month or a quarter. It + usually corresponds to the periods of the tax declaration. +

+ @@ -217,18 +228,12 @@ search - - - - - - - - - + + + + - @@ -274,7 +279,18 @@ tree,form,graph - Create and manage the accounts you need to record journal entries. An account is part of a ledger allowing your company to register all kinds of debit and credit transactions. Companies present their annual accounts in two main parts: the balance sheet and the income statement (profit and loss account). The annual accounts of a company are required by law to disclose a certain amount of information. They have to be certified by an external auditor annually. + +

+ Click to add an account. +

+ An account is part of a ledger allowing your company + to register all kinds of debit and credit transactions. + Companies present their annual accounts in two main parts: the + balance sheet and the income statement (profit and loss + account). The annual accounts of a company are required by law + to disclose a certain amount of information. +

+ @@ -334,7 +350,17 @@ tree [('currency_id','!=',False)] - When doing multi-currency transactions, you may loose or gain some amount due to changes of exchange rate. This menu gives you a forecast of the Gain or Loss you'd realized if those transactions were ended today. Only for accounts having a secondary currency set. + +

+ Click to add an account. +

+ When doing multi-currency transactions, you may loose or gain + some amount due to changes of exchange rate. This menu gives + you a forecast of the Gain or Loss you'd realized if those + transactions were ended today. Only for accounts having a + secondary currency set. +

+ form tree,form - Here you can customize an existing journal view or create a new view. Journal views determine the way you can record entries in your journal. Select the fields you want to appear in a journal and determine the sequence in which they will appear. Then you can create a new journal and link your view to it. + +

+ Click to specify lists of columns to display for a type of journal. +

+ Journal views determine the way you can record entries in + your journal. Select the fields you want to appear in a journal + and determine the sequence in which they will appear. +

+ On the journal definition form, you can select the view you + want to use to display journal items related to this journal. +

+ @@ -440,21 +477,15 @@ search - - - - - - - - + + @@ -532,7 +563,18 @@ account.journal form tree,form - Create and manage your company's journals from this menu. A journal is used to record transactions of all accounting data related to the day-to-day business of your company using double-entry bookkeeping system. Depending on the nature of its activities and the number of daily transactions, a company may keep several types of specialized journals such as a cash journal, purchase journal, sales journal... + +

+ Click to add a journal. +

+ A journal is used to record transactions of all accounting data + related to the day-to-day business. +

+ A typical company may use one journal per payment method (cash, + bank accounts, checks), one purchase journal, one sale journal + and one for miscellaneous information. +

+ @@ -542,22 +584,15 @@ search - - - - - - - - - - - - + + + + + + - @@ -587,22 +622,15 @@ search - - - - - - - - - - - - + + + + + + - @@ -696,7 +724,18 @@ [('journal_id.type', '=', 'bank')] {'journal_type':'bank'} - A bank statement is a summary of all financial transactions occurring over a given period of time on a deposit account, a credit card or any other type of financial account. The starting balance will be proposed automatically and the closing balance is to be found on your statement. When you are in the Payment column of a line, you can press F1 to open the reconciliation form. + +

+ Click to register a bank statement. +

+ A bank statement is a summary of all financial transactions + occurring over a given period of time on a bank account. You + should receive this periodicaly from your bank. +

+ OpenERP allows you to reconcile a statement line directly with + the related sale or puchase invoices. +

+ @@ -775,7 +814,17 @@ form tree,form - An account type is used to determine how an account is used in each journal. The deferral method of an account type determines the process for the annual closing. Reports such as the Balance Sheet and the Profit and Loss report use the category (profit/loss or balance sheet). For example, the account type could be linked to an asset account, expense account or payable account. From this view, you can create and manage the account types you need for your company. + +

+ Click to define a new account type. +

+ An account type is used to determine how an account is used in + each journal. The deferral method of an account type determines + the process for the annual closing. Reports such as the Balance + Sheet and the Profit and Loss report use the category + (profit/loss or balance sheet). +

+ @@ -550,7 +551,6 @@ Set Your Accounting Options - automatic diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index b092b3a2f8c..174002a8d8d 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -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 diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po index 7eff1938061..14beb1f5d65 100644 --- a/addons/account/i18n/es_EC.po +++ b/addons/account/i18n/es_EC.po @@ -10,15 +10,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \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) " -"\n" +"PO-Revision-Date: 2012-07-30 03:26+0000\n" +"Last-Translator: Cristian Salamea (Gnuthink) \n" "Language-Team: Spanish (Ecuador) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 05:58+0000\n" -"X-Generator: Launchpad (build 15614)\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 diff --git a/addons/account/i18n/nl_BE.po b/addons/account/i18n/nl_BE.po index 770abf9dce5..6a19e582ed3 100644 --- a/addons/account/i18n/nl_BE.po +++ b/addons/account/i18n/nl_BE.po @@ -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 \n" +"PO-Revision-Date: 2012-07-27 12:48+0000\n" +"Last-Translator: Els Van Vossel (Agaplan) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 05:58+0000\n" -"X-Generator: Launchpad (build 15614)\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 diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po index 48b27e67be2..885a88d84c4 100644 --- a/addons/account/i18n/pt_BR.po +++ b/addons/account/i18n/pt_BR.po @@ -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) \n" +"PO-Revision-Date: 2012-07-28 14:05+0000\n" +"Last-Translator: Fábio Martinelli \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 05:57+0000\n" -"X-Generator: Launchpad (build 15614)\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¤cy_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" diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml index cd75daa6c07..1e360f6c742 100644 --- a/addons/account/partner_view.xml +++ b/addons/account/partner_view.xml @@ -78,18 +78,19 @@ - + + + + + + - - - - - + @@ -142,16 +143,5 @@ view_type="form" view_mode="tree,form,graph,calendar"/> - - res.partner.form.reconcile - res.partner - - - - - - - - diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 76aaaf7df6a..b95e1c16bfd 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -30,22 +30,15 @@ search - - - - - - - - - - - - + + + + + + - @@ -107,7 +100,21 @@ tree [('parent_id','=',False)] - The normal chart of accounts has a structure defined by the legal requirement of the country. The analytic chart of accounts structure should reflect your own business needs in term of costs/revenues reporting. They are usually structured by contracts, projects, products or departements. Most of the OpenERP operations (invoices, timesheets, expenses, etc) generate analytic entries on the related account. + +

+ Click to add a new analytic account. +

+ The normal chart of accounts has a structure defined by the + legal requirement of the country. The analytic chart of + accounts structure should reflect your own business needs in + term of costs/revenues reporting. +

+ They are usually structured by contracts, projects, products or + departements. Most of the OpenERP operations (invoices, + timesheets, expenses, etc) generate analytic entries on the + related account. +

+ search - - - - - - - - - - - - - - + + + + + + + + + - - @@ -304,11 +304,8 @@ search - - - - - + + diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml index 7c9870ca07e..35031180523 100644 --- a/addons/account/report/account_analytic_entries_report_view.xml +++ b/addons/account/report/account_analytic_entries_report_view.xml @@ -34,31 +34,21 @@ search - - - - - - - - - - - - + + + + + + - - - - diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml index 54275f6a4b3..8c445052094 100644 --- a/addons/account/report/account_entries_report_view.xml +++ b/addons/account/report/account_entries_report_view.xml @@ -67,54 +67,35 @@ search - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - + - - - - - diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index 7d6a4003b53..e3e0b210f20 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -55,68 +55,32 @@ search - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - diff --git a/addons/account/report/account_journal_sale_purchase.rml b/addons/account/report/account_journal_sale_purchase.rml index 68f93b88294..236879669f9 100644 --- a/addons/account/report/account_journal_sale_purchase.rml +++ b/addons/account/report/account_journal_sale_purchase.rml @@ -219,7 +219,7 @@ Account Partner Label - VAT + Tax Debit Credit @@ -271,7 +271,7 @@ Account Partner Label - VAT + Tax Debit Credit @@ -330,7 +330,7 @@ - VAT Declaration + Tax Declaration diff --git a/addons/account/report/account_treasury_report_view.xml b/addons/account/report/account_treasury_report_view.xml index 9e07c196f3c..f0096b561bb 100644 --- a/addons/account/report/account_treasury_report_view.xml +++ b/addons/account/report/account_treasury_report_view.xml @@ -36,12 +36,9 @@ search - - - - - - + + + diff --git a/addons/account/res_config.py b/addons/account/res_config.py index 16f37f05301..120d901a006 100644 --- a/addons/account/res_config.py +++ b/addons/account/res_config.py @@ -37,82 +37,82 @@ class account_config_settings(osv.osv_memory): 'company_id': fields.many2one('res.company', 'Company', required=True), 'has_default_company': fields.boolean('Has default company', readonly=True), 'expects_chart_of_accounts': fields.related('company_id', 'expects_chart_of_accounts', type='boolean', - string='This Company Has its Own Chart of Accounts', + string='This company has its own chart of accounts', help="""Check this box if this company is a legal entity."""), 'currency_id': fields.related('company_id', 'currency_id', type='many2one', relation='res.currency', required=True, - string='Default Company Currency', help="Main currency of the company."), + string='Default company currency', help="Main currency of the company."), 'paypal_account': fields.related('company_id', 'paypal_account', type='char', size=128, - string='Paypal Account', help="Paypal account (email) for receiving online payments (credit card, etc.) If you set a paypal account, the customer will be able to pay your invoices or quotations with a button \"Pay with Paypal\" in automated emails or through the OpenERP portal."), + string='Paypal account', help="Paypal account (email) for receiving online payments (credit card, etc.) If you set a paypal account, the customer will be able to pay your invoices or quotations with a button \"Pay with Paypal\" in automated emails or through the OpenERP portal."), 'company_footer': fields.related('company_id', 'rml_footer2', type='char', size=250, readonly=True, - string='Bank Accounts on Reports', help="Bank accounts as printed in the footer of each customer document. This is for information purpose only, you should configure these bank accounts through the above button \"Configure Bank Accounts\"."), + string='Bank accounts on reports will display as followed', help="Bank accounts as printed in the footer of each customer document. This is for information purpose only, you should configure these bank accounts through the above button \"Configure Bank Accounts\"."), '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"), + 'chart_template_id': fields.many2one('account.chart.template', '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', + ], 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 (%)'), - 'purchase_tax_rate': fields.float('Purchase Tax (%)'), - 'complete_tax_set': fields.boolean('Complete Set of Taxes', help='This boolean helps you to choose if you want to propose to the user to encode the sales and purchase rates or use the usual m2o fields. This last choice assumes that the set of tax defined for the chosen template is complete'), + '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 (%)'), + 'purchase_tax_rate': fields.float('Purchase tax (%)'), + 'complete_tax_set': fields.boolean('Complete set of taxes', help='This boolean helps you to choose if you want to propose to the user to encode the sales and purchase rates or use the usual m2o fields. This last choice assumes that the set of tax defined for the chosen template is complete'), 'has_fiscal_year': fields.boolean('Company has a fiscal year'), - 'date_start': fields.date('Start Date', required=True), - 'date_stop': fields.date('End Date', required=True), + 'date_start': fields.date('Start date', required=True), + 'date_stop': fields.date('End date', required=True), 'period': fields.selection([('month', 'Monthly'), ('3months','3 Monthly')], 'Periods', required=True), - 'sale_journal_id': fields.many2one('account.journal', 'Sale Journal'), - 'sale_sequence_prefix': fields.related('sale_journal_id', 'sequence_id', 'prefix', type='char', string='Invoice Sequence'), - 'sale_sequence_next': fields.related('sale_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Invoice Number'), - 'sale_refund_journal_id': fields.many2one('account.journal', 'Sale Refund Journal'), - 'sale_refund_sequence_prefix': fields.related('sale_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Credit Note Sequence'), - 'sale_refund_sequence_next': fields.related('sale_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Credit Note Number'), + 'sale_journal_id': fields.many2one('account.journal', 'Sale journal'), + 'sale_sequence_prefix': fields.related('sale_journal_id', 'sequence_id', 'prefix', type='char', string='Invoice sequence'), + 'sale_sequence_next': fields.related('sale_journal_id', 'sequence_id', 'number_next', type='integer', string='Next invoice number'), + 'sale_refund_journal_id': fields.many2one('account.journal', 'Sale refund journal'), + 'sale_refund_sequence_prefix': fields.related('sale_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Credit note sequence'), + 'sale_refund_sequence_next': fields.related('sale_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next credit note number'), 'purchase_journal_id': fields.many2one('account.journal', 'Purchase Journal'), - 'purchase_sequence_prefix': fields.related('purchase_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier Invoice Sequence'), - 'purchase_sequence_next': fields.related('purchase_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Supplier Invoice Number'), - 'purchase_refund_journal_id': fields.many2one('account.journal', 'Purchase Refund Journal'), - 'purchase_refund_sequence_prefix': fields.related('purchase_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier Credit Note Sequence'), - 'purchase_refund_sequence_next': fields.related('purchase_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Supplier Credit Note Number'), + 'purchase_sequence_prefix': fields.related('purchase_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier invoice sequence'), + 'purchase_sequence_next': fields.related('purchase_journal_id', 'sequence_id', 'number_next', type='integer', string='Next supplier invoice number'), + 'purchase_refund_journal_id': fields.many2one('account.journal', 'Purchase refund journal'), + 'purchase_refund_sequence_prefix': fields.related('purchase_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier credit note sequence'), + 'purchase_refund_sequence_next': fields.related('purchase_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next supplier credit note number'), - 'module_account_check_writing': fields.boolean('Check Writing', + 'module_account_check_writing': fields.boolean('pay your supplier by check', help="""This allows you to check writing and printing. This installs the module account_check_writing."""), - 'module_account_accountant': fields.boolean('Accountant Features', + 'module_account_accountant': fields.boolean('accountant features', help="""If you do not check this box, you will be able to do invoicing & payments, but not accounting (Journal Items, Chart of Accounts, ...)"""), - 'module_account_asset': fields.boolean('Assets Management', + 'module_account_asset': fields.boolean('assets management', help="""This allows you to manage the assets owned by a company or a person. It keeps track of the depreciation occurred on those assets, and creates account move for those depreciation lines. This installs the module account_asset. If you do not check this box, you will be able to do invoicing & payments, but not accounting (Journal Items, Chart of Accounts, ...)"""), - 'module_account_budget': fields.boolean('Budget Management', + 'module_account_budget': fields.boolean('budget management', help="""This allows accountants to manage analytic and crossovered budgets. Once the master budgets and the budgets are defined, the project managers can set the planned amount on each analytic account. This installs the module account_budget."""), - 'module_account_payment': fields.boolean('Manage Payment Orders', + 'module_account_payment': fields.boolean('manage payment orders', help="""This allows you to create and manage your payment orders, with purposes to * serve as base for an easy plug-in of various automated payment mechanisms, and * provide a more efficient way to manage invoice payments. This installs the module account_payment."""), - 'module_account_voucher': fields.boolean('Manage Customer Payments', + 'module_account_voucher': fields.boolean('anage customer payments', help="""This includes all the basic requirements of voucher entries for bank, cash, sales, purchase, expense, contra, etc. This installs the module account_voucher."""), - 'module_account_followup': fields.boolean('Manage Customer Payment Follow-ups', + 'module_account_followup': fields.boolean('manage customer payment follow-ups', help="""This allows to automate letters for unpaid invoices, with multi-level recalls. This installs the module account_followup."""), - 'group_proforma_invoices': fields.boolean('Allow Pro-forma Invoices', + 'group_proforma_invoices': fields.boolean('allow pro-forma invoices', implied_group='account.group_proforma_invoices', help="Allows you to put invoices in pro-forma state."), - 'default_sale_tax': fields.many2one('account.tax', 'Default Sale Tax', + 'default_sale_tax': fields.many2one('account.tax', 'Default sale tax', help="This sale tax will be assigned by default on new products."), - 'default_purchase_tax': fields.many2one('account.tax', 'Default Purchase Tax', + 'default_purchase_tax': fields.many2one('account.tax', 'Default purchase tax', help="This purchase tax will be assigned by default on new products."), - 'decimal_precision': fields.integer('Decimal Precision on Journal Entries', + 'decimal_precision': fields.integer('Decimal precision on journal entries', help="""As an example, a decimal precision of 2 will allow journal entries like: 9.99 EUR, whereas a decimal precision of 4 will allow journal entries like: 0.0231 EUR."""), } diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml index a79b8fe2ed7..fd0fa552238 100644 --- a/addons/account/res_config_view.xml +++ b/addons/account/res_config_view.xml @@ -15,106 +15,235 @@ account.config.settings form -
+
+ - + - - - - - - - - - - - - - -
+
+
+
+
+
+
+
+
+
+
+ + + + + + - - - - - - - - - - - -