diff --git a/addons/account/account.py b/addons/account/account.py index 4629a306a0b..3947cf9d813 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -623,7 +623,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="The sequence gives the display order for a list of journals", required=True), + 'sequence_id': fields.many2one('ir.sequence', 'Entry Sequence', help="The sequence gives the display order for a list of journals", required=False), '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'), @@ -646,8 +646,58 @@ class account_journal(osv.osv): raise osv.except_osv(_('Warning !'), _('You cannot modify company of this journal as its related record exist in Entry Lines')) return super(account_journal, self).write(cr, uid, ids, vals, context=context) + def create_sequence(self, cr, uid, ids, context={}): + """ + Create new entry sequence for every new Joural + @param cr: cursor to database + @param user: id of current user + @param ids: list of record ids to be process + @param context: context arguments, like lang, time zone + @return: return a result + """ + + seq_pool = self.pool.get('ir.sequence') + seq_typ_pool = self.pool.get('ir.sequence.type') + + result = True + + journal = self.browse(cr, uid, ids[0], context) + code = journal.code.lower() + types = { + 'name':journal.name, + 'code':code + } + type_id = seq_typ_pool.create(cr, uid, types) + + seq = { + 'name':journal.name, + 'code':code, + 'active':True, + 'prefix':journal.code + "/%(year)s/", + 'padding':4, + 'number_increment':1 + } + seq_id = seq_pool.create(cr, uid, seq) + + res = {} + if not journal.sequence_id: + res.update({ + 'sequence_id':seq_id + }) + + if not journal.invoice_sequence_id: + res.update({ + 'invoice_sequence_id':seq_id + }) + + result = self.write(cr, uid, [journal.id], res) + + return result + def create(self, cr, uid, vals, context={}): journal_id = super(account_journal, self).create(cr, uid, vals, context) + self.create_sequence(cr, uid, [journal_id], context) + # journal_name = self.browse(cr, uid, [journal_id])[0].code # periods = self.pool.get('account.period') # ids = periods.search(cr, uid, [('date_stop','>=',time.strftime('%Y-%m-%d'))]) @@ -1202,9 +1252,11 @@ class account_move(osv.osv): def validate(self, cr, uid, ids, context={}): if context and ('__last_update' in context): del context['__last_update'] - ok = True + + valid_moves = [] #Maintains a list of moves which can be responsible to create analytic entries + for move in self.browse(cr, uid, ids, context): - #unlink analytic lines on move_lines + # Unlink old analytic lines on move_lines for obj_line in move.line_id: for obj in obj_line.analytic_lines: self.pool.get('account.analytic.line').unlink(cr,uid,obj.id) @@ -1213,7 +1265,7 @@ class account_move(osv.osv): amount = 0 line_ids = [] line_draft_ids = [] - company_id=None + company_id = None for line in move.line_id: amount += line.debit - line.credit line_ids.append(line.id) @@ -1230,45 +1282,59 @@ class account_move(osv.osv): raise osv.except_osv(_('Error'), _("""Couldn't create move with currency different from the secondary currency of the account "%s - %s". Clear the secondary currency field of the account definition if you want to accept all currencies.""" % (line.account_id.code, line.account_id.name))) if abs(amount) < 10 ** -4: + # If the move is balanced + # Add to the list of valid moves + # (analytic lines will be created later for valid moves) + valid_moves.append(move) + + # Check whether the move lines are confirmed + if not len(line_draft_ids): continue + # Update the move lines (set them as valid) + self.pool.get('account.move.line').write(cr, uid, line_draft_ids, { 'journal_id': move.journal_id.id, 'period_id': move.period_id.id, 'state': 'valid' }, context, check=False) - todo = [] + account = {} account2 = {} - if journal.type not in ('purchase','sale'): - continue + + if journal.type in ('purchase','sale'): + for line in move.line_id: + code = amount = 0 + key = (line.account_id.id, line.tax_code_id.id) + if key in account2: + code = account2[key][0] + amount = account2[key][1] * (line.debit + line.credit) + elif line.account_id.id in account: + code = account[line.account_id.id][0] + amount = account[line.account_id.id][1] * (line.debit + line.credit) + if (code or amount) and not (line.tax_code_id or line.tax_amount): + self.pool.get('account.move.line').write(cr, uid, [line.id], { + 'tax_code_id': code, + 'tax_amount': amount + }, context, check=False) + elif journal.centralisation: + # If the move is not balanced, it must be centralised... + + # Add to the list of valid moves + # (analytic lines will be created later for valid moves) + valid_moves.append(move) - for line in move.line_id: - code = amount = 0 - key = (line.account_id.id, line.tax_code_id.id) - if key in account2: - code = account2[key][0] - amount = account2[key][1] * (line.debit + line.credit) - elif line.account_id.id in account: - code = account[line.account_id.id][0] - amount = account[line.account_id.id][1] * (line.debit + line.credit) - if (code or amount) and not (line.tax_code_id or line.tax_amount): - self.pool.get('account.move.line').write(cr, uid, [line.id], { - 'tax_code_id': code, - 'tax_amount': amount - }, context, check=False) # - # Compute VAT + # Update the move lines (set them as valid) # - continue - if journal.centralisation: self._centralise(cr, uid, move, 'debit', context=context) self._centralise(cr, uid, move, 'credit', context=context) self.pool.get('account.move.line').write(cr, uid, line_draft_ids, { 'state': 'valid' }, context, check=False) - continue else: + # We can't validate it (it's unbalanced) + # Setting the lines as draft self.pool.get('account.move.line').write(cr, uid, line_ids, { 'journal_id': move.journal_id.id, 'period_id': move.period_id.id, @@ -1276,13 +1342,12 @@ class account_move(osv.osv): #'tax_amount': False, 'state': 'draft' }, context, check=False) - ok = False - if ok: - list_ids = [] - for tmp in move.line_id: - list_ids.append(tmp.id) - self.pool.get('account.move.line').create_analytic_lines(cr, uid, list_ids, context) - return ok + # Create analytic lines for the valid moves + for record in valid_moves: + self.pool.get('account.move.line').create_analytic_lines(cr, uid, [line.id for line in record.line_id], context) + + return len(valid_moves) > 0 + account_move() class account_move_reconcile(osv.osv): diff --git a/addons/account/account_demo.xml b/addons/account/account_demo.xml index 0b4ee8f097d..a8a1d1405cd 100644 --- a/addons/account/account_demo.xml +++ b/addons/account/account_demo.xml @@ -3,8 +3,8 @@ + Fiscal year + --> @@ -15,8 +15,8 @@ + Fiscal Periods + --> diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index c52302cb823..6ef38dde583 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -330,53 +330,50 @@
- + - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - + - - - - - + + + + - - - - - - + + + + + + + + + + + + + + + @@ -1194,7 +1191,7 @@ - + Journal Items @@ -2237,22 +2234,6 @@ id="menu_action_account_fiscal_position_form_template" parent="account_template_folder" sequence="20"/> - - Journal Entries - account.move - form - tree,form - - - - - - Journal Items account.move.line diff --git a/addons/account/data/account_data2.xml b/addons/account/data/account_data2.xml index ba606287d6a..10303dd8cbf 100644 --- a/addons/account/data/account_data2.xml +++ b/addons/account/data/account_data2.xml @@ -3,8 +3,8 @@ + Payment term + --> 30 Days End of Month @@ -17,10 +17,10 @@ + Account Journal View + --> - Cash Journal View + Bank/Cash Journal View @@ -74,12 +74,6 @@ credit - - - Tax - account_tax_id - - Analytic Account @@ -100,7 +94,7 @@ - Multi-Currency Cash Journal View + Bank/Cash Journal (Multi-Currency) View @@ -203,6 +197,12 @@ ref + + + Partner + partner_id + + Account @@ -210,12 +210,6 @@ - - - Partner - partner_id - - Name @@ -223,12 +217,6 @@ - - - Maturity Date - date_maturity - - Debit @@ -241,41 +229,206 @@ credit - - - Tax - account_tax_id - - Analytic Account analytic_account_id - - - Tax Acc. - tax_code_id - - - - - Tax - tax_amount - - State state - - + + + + Sale/Purchase Journal View + + + + Date + date + + + + + + N. Piece + move_id + + + + + + Ref + ref + + + + + Account + account_id + + + + + + Partner + partner_id + + + + + Name + name + + + + + + Maturity Date + date_maturity + + + + + Debit + debit + + + + + Credit + credit + + + + + Tax + account_tax_id + + + + + Analytic Account + analytic_account_id + + + + + Tax Acc. + tax_code_id + + + + + Tax + tax_amount + + + + + State + state + + + + + Sale/Purchase Refund Journal View + + + + Date + date + + + + + + N. Piece + move_id + + + + + + Ref + ref + + + + + Account + account_id + + + + + + Partner + partner_id + + + + + Name + name + + + + + + Maturity Date + date_maturity + + + + + Debit + debit + + + + + Credit + credit + + + + + Tax + account_tax_id + + + + + Analytic Account + analytic_account_id + + + + + Tax Acc. + tax_code_id + + + + + Tax + tax_amount + + + + + State + state + + + Account Journal Sequences + --> Account Journal @@ -298,8 +451,8 @@ + Account Statement Sequences + --> Account reconcile sequence diff --git a/addons/account/data/account_invoice.xml b/addons/account/data/account_invoice.xml index de2fff507f5..96407d926f2 100644 --- a/addons/account/data/account_invoice.xml +++ b/addons/account/data/account_invoice.xml @@ -5,10 +5,10 @@ Invoice account.invoice - + + Sequences types for invoices + --> Account Invoice Out account.invoice.out_invoice @@ -27,8 +27,8 @@ + Sequences for invoices + --> Account Invoice Out account.invoice.out_invoice @@ -55,16 +55,16 @@ + Sequences types for analytic account + --> Analytic account account.analytic.account + Sequence for analytic account + --> Analytic account sequence account.analytic.account diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml index 308de35e316..a1f3204b7f0 100644 --- a/addons/account/demo/account_minimal.xml +++ b/addons/account/demo/account_minimal.xml @@ -170,14 +170,14 @@ your own chart of account. + Account Journal + --> x Sales Journal SAJ sale - + @@ -188,8 +188,7 @@ your own chart of account. x Sales Credit Note Journal SCNJ sale_refund - True - + @@ -200,7 +199,7 @@ your own chart of account. x Expenses Journal EXJ purchase - + @@ -211,8 +210,7 @@ your own chart of account. x Expenses Credit Notes Journal ECNJ purchase_refund - True - + @@ -241,8 +239,8 @@ your own chart of account. + Product income and expense accounts, default parameters + --> property_account_expense diff --git a/addons/account/i18n/bs.po b/addons/account/i18n/bs.po index c04e9b901ad..2acdb44977c 100644 --- a/addons/account/i18n/bs.po +++ b/addons/account/i18n/bs.po @@ -1,19 +1,19 @@ # Translation of OpenERP Server. # This file contains the translation of the following modules: -# * account +# * account # msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-02-12 13:05+0000\n" -"Last-Translator: adnan \n" +"PO-Revision-Date: 2010-07-07 08:48+0000\n" +"Last-Translator: Bojan Markovic \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:03+0000\n" +"X-Launchpad-Export-Date: 2010-07-08 03:50+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -92,7 +92,8 @@ msgid "Unreconciled entries" msgstr "Neporavnata knjiženja" #. module: account -#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0 +#: field:account.invoice.tax,base_code_id:0 +#: field:account.tax,base_code_id:0 #: field:account.tax.template,base_code_id:0 msgid "Base Code" msgstr "Osnovni kod" @@ -124,7 +125,8 @@ msgid "Residual" msgstr "Ostatak" #. module: account -#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0 +#: field:account.tax,base_sign:0 +#: field:account.tax,ref_base_sign:0 #: field:account.tax.template,base_sign:0 #: field:account.tax.template,ref_base_sign:0 msgid "Base Code Sign" @@ -188,8 +190,10 @@ msgid "Move line select" msgstr "Odabir retka prijenosa" #. module: account -#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0 -#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0 +#: rml:account.journal.period.print:0 +#: rml:account.tax.code.entries:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 msgid "Entry label" msgstr "Oznaka unosa" @@ -204,12 +208,14 @@ msgid "Period Sum" msgstr "Suma perioda" #. module: account -#: view:account.tax:0 view:account.tax.template:0 +#: view:account.tax:0 +#: view:account.tax.template:0 msgid "Compute Code (if type=code)" msgstr "Kod za izračunavanje (ako je tip=Python kod)" #. module: account -#: view:account.move:0 view:account.move.line:0 +#: view:account.move:0 +#: view:account.move.line:0 msgid "Account Entry Line" msgstr "Redak računa" @@ -226,9 +232,12 @@ msgstr "Ponavljajuće stavke" #. module: account #: field:account.analytic.line,amount:0 #: field:account.bank.statement.line,amount:0 -#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0 -#: field:account.invoice.tax,amount:0 field:account.move,amount:0 -#: field:account.tax,amount:0 field:account.tax.template,amount:0 +#: field:account.bank.statement.reconcile.line,amount:0 +#: rml:account.invoice:0 +#: field:account.invoice.tax,amount:0 +#: field:account.move,amount:0 +#: field:account.tax,amount:0 +#: field:account.tax.template,amount:0 #: xsl:account.transfer:0 msgid "Amount" msgstr "Iznos" @@ -269,7 +278,8 @@ msgstr "" "vlastiti pogled za brži unos u svakoj temeljnici." #. module: account -#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0 +#: help:account.invoice,date_due:0 +#: help:account.invoice,payment_term:0 msgid "" "If you use payment terms, the due date will be computed automatically at the " "generation of accounting entries. If you keep the payment term and the due " @@ -278,12 +288,14 @@ msgid "" msgstr "" #. module: account -#: selection:account.tax,type:0 selection:account.tax.template,type:0 +#: selection:account.tax,type:0 +#: selection:account.tax.template,type:0 msgid "Fixed" msgstr "Fiksno" #. module: account -#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0 +#: model:ir.actions.report.xml,name:account.account_overdue +#: view:res.company:0 msgid "Overdue Payments" msgstr "Dospijela plaćanja" @@ -299,14 +311,15 @@ msgid "Select period" msgstr "Odaberite razdoblje" #. module: account -#: field:account.invoice,origin:0 field:account.invoice.line,origin:0 +#: field:account.invoice,origin:0 +#: field:account.invoice.line,origin:0 msgid "Origin" msgstr "Izvor" #. module: account #: rml:account.analytic.account.journal:0 msgid "Move Name" -msgstr "" +msgstr "Pomjeri ime" #. module: account #: xsl:account.transfer:0 @@ -329,7 +342,8 @@ msgid "Delta Debit" msgstr "Delta duguje" #. module: account -#: rml:account.invoice:0 field:account.invoice,amount_tax:0 +#: rml:account.invoice:0 +#: field:account.invoice,amount_tax:0 #: field:account.move.line,account_tax_id:0 msgid "Tax" msgstr "Porez" @@ -348,12 +362,14 @@ msgid "Analytic Account" msgstr "Analitičko konto" #. module: account -#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0 +#: field:account.tax,child_depend:0 +#: field:account.tax.template,child_depend:0 msgid "Tax on Children" -msgstr "" +msgstr "Dječiji porez" #. module: account -#: rml:account.central.journal:0 rml:account.general.journal:0 +#: rml:account.central.journal:0 +#: rml:account.general.journal:0 #: field:account.journal,name:0 msgid "Journal Name" msgstr "Naziv naloga za knjiženje" @@ -421,8 +437,11 @@ msgid "Contra" msgstr "" #. module: account -#: field:account.analytic.account,state:0 field:account.bank.statement,state:0 -#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0 +#: field:account.analytic.account,state:0 +#: field:account.bank.statement,state:0 +#: field:account.invoice,state:0 +#: view:account.move:0 +#: view:account.move.line:0 #: view:account.subscription:0 msgid "State" msgstr "Stanje" @@ -434,7 +453,8 @@ msgid "Unpaid Supplier Refunds" msgstr "Neplaćeni povrati dobavljaču" #. module: account -#: view:account.tax:0 view:account.tax.template:0 +#: view:account.tax:0 +#: view:account.tax.template:0 msgid "Special Computation" msgstr "Posebno računanje" @@ -456,8 +476,10 @@ msgid "Disc.(%)" msgstr "Popust (%)" #. module: account -#: rml:account.general.ledger:0 field:account.model,ref:0 -#: field:account.move,ref:0 rml:account.overdue:0 +#: rml:account.general.ledger:0 +#: field:account.model,ref:0 +#: field:account.move,ref:0 +#: rml:account.overdue:0 #: field:account.subscription,ref:0 msgid "Ref" msgstr "Referenca" @@ -650,7 +672,8 @@ msgid "Sub-Total :" msgstr "Sub-Total :" #. module: account -#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0 +#: field:account.analytic.account,line_ids:0 +#: view:account.analytic.line:0 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form #: model:ir.ui.menu,name:account.next_id_41 msgid "Analytic Entries" @@ -682,7 +705,8 @@ msgid "Select the Period for Analysis" msgstr "Izaberi period za analizu" #. module: account -#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0 +#: field:account.tax,ref_tax_sign:0 +#: field:account.tax,tax_sign:0 #: field:account.tax.template,ref_tax_sign:0 #: field:account.tax.template,tax_sign:0 msgid "Tax Code Sign" @@ -714,7 +738,8 @@ msgid "Field Name" msgstr "Naziv polja" #. module: account -#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0 +#: field:account.tax.code,sign:0 +#: field:account.tax.code.template,sign:0 msgid "Sign for parent" msgstr "Predznak za roditelja" @@ -724,7 +749,8 @@ msgid "End of Year Entries Journal" msgstr "Dnevnik knjiženja završetka godine" #. module: account -#: view:product.product:0 view:product.template:0 +#: view:product.product:0 +#: view:product.template:0 msgid "Purchase Properties" msgstr "Karakteristike nabave" @@ -744,9 +770,12 @@ msgid "Move Lines Created." msgstr "Stvoreni retci prijenosa." #. module: account -#: field:account.fiscalyear,state:0 field:account.journal.period,state:0 -#: field:account.move,state:0 field:account.move.line,state:0 -#: field:account.period,state:0 field:account.subscription,state:0 +#: field:account.fiscalyear,state:0 +#: field:account.journal.period,state:0 +#: field:account.move,state:0 +#: field:account.move.line,state:0 +#: field:account.period,state:0 +#: field:account.subscription,state:0 msgid "Status" msgstr "Stanje" @@ -899,8 +928,10 @@ msgstr "Odaberite kontni plan" #: rml:account.analytic.account.balance:0 #: rml:account.analytic.account.inverted.balance:0 #: rml:account.analytic.account.quantity_cost_ledger:0 -#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0 -#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0 +#: field:account.analytic.line,unit_amount:0 +#: rml:account.invoice:0 +#: field:account.invoice.line,quantity:0 +#: field:account.model.line,quantity:0 #: field:account.move.line,quantity:0 msgid "Quantity" msgstr "Količina" @@ -911,7 +942,7 @@ msgstr "Količina" #: wizard_field:account.partner.balance.report,init,date2:0 #: wizard_field:account.third_party_ledger.report,init,date2:0 msgid "End date" -msgstr "" +msgstr "Krajnji datum" #. module: account #: field:account.invoice.tax,base_amount:0 @@ -943,13 +974,16 @@ msgstr "Analitička faktura" #: wizard_field:account.automatic.reconcile,init,period_id:0 #: field:account.bank.statement,period_id:0 #: wizard_field:account.central.journal.report,init,period_id:0 -#: view:account.fiscalyear:0 rml:account.general.journal:0 +#: view:account.fiscalyear:0 +#: rml:account.general.journal:0 #: wizard_field:account.general.journal.report,init,period_id:0 #: wizard_field:account.invoice.pay,init,period_id:0 -#: field:account.journal.period,period_id:0 field:account.move,period_id:0 +#: field:account.journal.period,period_id:0 +#: field:account.move,period_id:0 #: wizard_field:account.move.journal,init,period_id:0 #: field:account.move.line,period_id:0 -#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0 +#: wizard_field:account.move.validate,init,period_id:0 +#: view:account.period:0 #: wizard_field:account.print.journal.report,init,period_id:0 #: field:account.subscription,period_nbr:0 msgid "Period" @@ -971,7 +1005,8 @@ msgid "Net Total:" msgstr "Ukupno netto:" #. module: account -#: view:account.fiscal.position:0 field:account.fiscal.position,name:0 +#: view:account.fiscal.position:0 +#: field:account.fiscal.position,name:0 #: field:account.fiscal.position.account,position_id:0 #: field:account.fiscal.position.account.template,position_id:0 #: field:account.fiscal.position.tax,position_id:0 @@ -1095,7 +1130,8 @@ msgid "Fiscal Position Templates" msgstr "Predlošci fiskalne pozicije" #. module: account -#: rml:account.invoice:0 field:account.invoice.line,price_unit:0 +#: rml:account.invoice:0 +#: field:account.invoice.line,price_unit:0 msgid "Unit Price" msgstr "Jedinična cijena" @@ -1248,7 +1284,8 @@ msgid "Not reconciled transactions" msgstr "Neusklađene transakcije" #. module: account -#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0 +#: view:account.fiscal.position:0 +#: field:account.fiscal.position,tax_ids:0 #: field:account.fiscal.position.template,tax_ids:0 msgid "Tax Mapping" msgstr "Mapiranje poreza" @@ -1270,7 +1307,8 @@ msgid "Write-Off account" msgstr "Konto za otpis" #. module: account -#: field:account.model.line,model_id:0 field:account.subscription,model_id:0 +#: field:account.model.line,model_id:0 +#: field:account.subscription,model_id:0 msgid "Model" msgstr "Model" @@ -1296,9 +1334,11 @@ msgid "Select invoices you want to pay and manages advances" msgstr "Odaberite fakture koje želite platiti i omogućuje avanse" #. module: account -#: selection:account.account,type:0 selection:account.account.template,type:0 +#: selection:account.account,type:0 +#: selection:account.account.template,type:0 #: model:account.account.type,name:account.account_type_root -#: selection:account.analytic.account,type:0 field:account.journal,view_id:0 +#: selection:account.analytic.account,type:0 +#: field:account.journal,view_id:0 msgid "View" msgstr "Prikaz" @@ -1369,7 +1409,8 @@ msgstr "Tipovi konta" #: wizard_field:account.central.journal.report,init,journal_id:0 #: wizard_field:account.general.journal.report,init,journal_id:0 #: field:account.invoice,journal_id:0 -#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0 +#: field:account.journal.period,journal_id:0 +#: field:account.model,journal_id:0 #: field:account.move,journal_id:0 #: wizard_field:account.move.bank.reconcile,init,journal_id:0 #: wizard_field:account.move.journal,init,journal_id:0 @@ -1385,7 +1426,8 @@ msgid "Journal" msgstr "Dnevnik" #. module: account -#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0 +#: field:account.account,child_id:0 +#: field:account.analytic.account,child_ids:0 msgid "Child Accounts" msgstr "Podkonta" @@ -1411,7 +1453,8 @@ msgid "Statement reconcile line" msgstr "Redak usklađivanja izvoda" #. module: account -#: view:account.tax:0 view:account.tax.template:0 +#: view:account.tax:0 +#: view:account.tax.template:0 msgid "Keep empty to use the income account" msgstr "Ne popunjavati za upotrebu računa za prihod" @@ -1538,7 +1581,8 @@ msgid "Account n°" msgstr "Broj računa" #. module: account -#: view:account.tax:0 view:account.tax.template:0 +#: view:account.tax:0 +#: view:account.tax.template:0 msgid "Keep empty to use the expense account" msgstr "Ostavite prazno za korištenje rashodovnog računa" @@ -1548,7 +1592,8 @@ msgid "Account to reconcile" msgstr "Račun za usklađivanje" #. module: account -#: rml:account.invoice:0 field:account.model.line,partner_id:0 +#: rml:account.invoice:0 +#: field:account.model.line,partner_id:0 #: field:account.move.line,partner_id:0 msgid "Partner Ref." msgstr "Vezna oznaka partnera" @@ -1560,12 +1605,14 @@ msgid "Receivable and Payable Accounts" msgstr "Konta potraživanja i dugovanja" #. module: account -#: view:account.subscription:0 field:account.subscription,lines_id:0 +#: view:account.subscription:0 +#: field:account.subscription,lines_id:0 msgid "Subscription Lines" msgstr "Retci pretplate" #. module: account -#: selection:account.analytic.journal,type:0 selection:account.journal,type:0 +#: selection:account.analytic.journal,type:0 +#: selection:account.journal,type:0 #: selection:account.tax,type_tax_use:0 #: selection:account.tax.template,type_tax_use:0 msgid "Purchase" @@ -1729,7 +1776,8 @@ msgid "Period length (days)" msgstr "Duljina razdoblja (dana)" #. module: account -#: selection:account.payment.term.line,value:0 selection:account.tax,type:0 +#: selection:account.payment.term.line,value:0 +#: selection:account.tax,type:0 #: selection:account.tax.template,type:0 msgid "Percent" msgstr "Procenat" @@ -1740,7 +1788,8 @@ msgid "Charts" msgstr "Planovi" #. module: account -#: selection:account.analytic.journal,type:0 selection:account.journal,type:0 +#: selection:account.analytic.journal,type:0 +#: selection:account.journal,type:0 #: selection:account.tax,type_tax_use:0 #: selection:account.tax.template,type_tax_use:0 msgid "Sale" @@ -1814,9 +1863,12 @@ msgstr "x Nalog za knjiženje knjižnih odobrenja troškova" #. module: account #: field:account.analytic.journal,type:0 -#: field:account.bank.statement.line,type:0 field:account.invoice,type:0 -#: field:account.journal,type:0 field:account.move,type:0 -#: field:account.move.reconcile,type:0 xsl:account.transfer:0 +#: field:account.bank.statement.line,type:0 +#: field:account.invoice,type:0 +#: field:account.journal,type:0 +#: field:account.move,type:0 +#: field:account.move.reconcile,type:0 +#: xsl:account.transfer:0 msgid "Type" msgstr "Tip" @@ -1964,7 +2016,8 @@ msgid "Journal-Period Name" msgstr "Knjiženja - naziv perioda" #. module: account -#: field:account.tax.code,name:0 field:account.tax.code.template,name:0 +#: field:account.tax.code,name:0 +#: field:account.tax.code.template,name:0 msgid "Tax Case Name" msgstr "Naziv poreznog pretinca" @@ -1979,7 +2032,8 @@ msgstr "" #. module: account #: field:account.bank.statement.line,partner_id:0 #: field:account.bank.statement.reconcile,partner_id:0 -#: rml:account.general.ledger:0 field:account.invoice,partner_id:0 +#: rml:account.general.ledger:0 +#: field:account.invoice,partner_id:0 #: field:account.move,partner_id:0 #: wizard_field:account.partner.balance.report,init,result_selection:0 #: wizard_field:account.third_party_ledger.report,init,result_selection:0 @@ -2053,8 +2107,10 @@ msgstr "Prošlost" #: field:account.bank.statement,currency:0 #: field:account.bank.statement.reconcile,total_currency:0 #: field:account.bank.statement.reconcile,total_second_currency:0 -#: rml:account.general.ledger:0 field:account.invoice,currency_id:0 -#: field:account.journal,currency:0 field:account.model.line,currency_id:0 +#: rml:account.general.ledger:0 +#: field:account.invoice,currency_id:0 +#: field:account.journal,currency:0 +#: field:account.model.line,currency_id:0 #: field:account.move.line,currency_id:0 msgid "Currency" msgstr "Valuta" @@ -2092,9 +2148,10 @@ msgid "Analytic Entry" msgstr "Stavka analitike" #. module: account -#: view:res.company:0 field:res.company,overdue_msg:0 +#: view:res.company:0 +#: field:res.company,overdue_msg:0 msgid "Overdue Payments Message" -msgstr "" +msgstr "Poruka o dospjelim plaćanjima." #. module: account #: model:ir.actions.act_window,name:account.action_tax_code_tree @@ -2144,7 +2201,8 @@ msgid "Detail" msgstr "Detalji" #. module: account -#: selection:account.account,type:0 selection:account.account.template,type:0 +#: selection:account.account,type:0 +#: selection:account.account.template,type:0 msgid "Consolidation" msgstr "Konsolidacija" @@ -2239,16 +2297,21 @@ msgid "The account basis of the tax declaration." msgstr "" #. module: account -#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0 +#: rml:account.analytic.account.journal:0 +#: field:account.analytic.line,date:0 #: field:account.bank.statement,date:0 #: field:account.bank.statement.line,date:0 -#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0 +#: field:account.bank.statement.reconcile,name:0 +#: rml:account.general.ledger:0 #: selection:account.general.ledger.report,checktype,sortbydate:0 -#: rml:account.journal.period.print:0 field:account.move,date:0 +#: rml:account.journal.period.print:0 +#: field:account.move,date:0 #: rml:account.overdue:0 #: wizard_field:account.subscription.generate,init,date:0 -#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0 -#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0 +#: field:account.subscription.line,date:0 +#: rml:account.tax.code.entries:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 #: xsl:account.transfer:0 msgid "Date" msgstr "Datum" @@ -2265,7 +2328,8 @@ msgid "Unreconcile" msgstr "Poništi usklađivanje" #. module: account -#: field:account.tax,type:0 field:account.tax.template,type:0 +#: field:account.tax,type:0 +#: field:account.tax.template,type:0 msgid "Tax Type" msgstr "Tip poreza" @@ -2275,7 +2339,8 @@ msgid "Statement Entries" msgstr "Stavke izvoda" #. module: account -#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0 +#: field:account.analytic.line,user_id:0 +#: field:account.journal,user_id:0 msgid "User" msgstr "Korisnik" @@ -2361,7 +2426,8 @@ msgid "Date End" msgstr "Završni datum" #. module: account -#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0 +#: view:account.bank.statement:0 +#: field:account.move.reconcile,line_id:0 #: model:ir.actions.act_window,name:account.action_move_line_search #: model:ir.actions.act_window,name:account.action_move_line_tree1 #: model:ir.ui.menu,name:account.menu_action_move_line_search @@ -2369,7 +2435,8 @@ msgid "Entry Lines" msgstr "Stavke unosa" #. module: account -#: view:account.tax:0 view:account.tax.template:0 +#: view:account.tax:0 +#: view:account.tax.template:0 msgid "Applicable Code (if type=code)" msgstr "Podobna šifra (if type=šifra)" @@ -2394,7 +2461,8 @@ msgstr "Unos stavke po retku" #. module: account #: help:account.chart.template,tax_template_ids:0 msgid "List of all the taxes that have to be installed by the wizard" -msgstr "Spisak svih poreza koji trebaju biti instalirani od strane čarobnjaka" +msgstr "" +"Spisak svih poreza koji trebaju biti instalirani od strane čarobnjaka" #. module: account #: rml:account.analytic.account.cost_ledger:0 @@ -2458,9 +2526,11 @@ msgstr "Iz analitičkog konta, stvori fakturu." #: wizard_button:account.general.journal.report,init,end:0 #: wizard_button:account.general.ledger.report,account_selection,end:0 #: wizard_button:account.general.ledger.report,checktype,end:0 -#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0 +#: view:account.invoice:0 +#: wizard_button:account.invoice.pay,addendum,end:0 #: wizard_button:account.invoice.pay,init,end:0 -#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0 +#: wizard_button:account.invoice.refund,init,end:0 +#: view:account.move:0 #: wizard_button:account.move.bank.reconcile,init,end:0 #: wizard_button:account.move.journal,init,end:0 #: wizard_button:account.move.line.reconcile,addendum,end:0 @@ -2479,7 +2549,8 @@ msgstr "Iz analitičkog konta, stvori fakturu." #: wizard_button:account.third_party_ledger.report,init,end:0 #: wizard_button:account.vat.declaration,init,end:0 #: wizard_button:account_use_models,init_form,end:0 -#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0 +#: view:wizard.company.setup:0 +#: view:wizard.multi.charts.accounts:0 msgid "Cancel" msgstr "Otkaži" @@ -2489,8 +2560,10 @@ msgid "Acc. Type Name" msgstr "Naziv tipa konta" #. module: account -#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0 -#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0 +#: help:account.tax,base_code_id:0 +#: help:account.tax,ref_base_code_id:0 +#: help:account.tax,ref_tax_code_id:0 +#: help:account.tax,tax_code_id:0 #: help:account.tax.template,base_code_id:0 #: help:account.tax.template,ref_base_code_id:0 #: help:account.tax.template,ref_tax_code_id:0 @@ -2504,7 +2577,8 @@ msgid "Litigation" msgstr "Parnica" #. module: account -#: view:account.move.line:0 wizard_view:account.move.validate,init:0 +#: view:account.move.line:0 +#: wizard_view:account.move.validate,init:0 #: view:account.payment.term:0 msgid "Information" msgstr "Obavijest" @@ -2614,7 +2688,8 @@ msgid "Price" msgstr "Cijena" #. module: account -#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0 +#: rml:account.analytic.account.journal:0 +#: rml:account.third_party_ledger:0 #: rml:account.third_party_ledger_other:0 msgid "-" msgstr "" @@ -2681,13 +2756,17 @@ msgid "Invoice Reference" msgstr "Referenca Fakture" #. module: account -#: field:account.account,name:0 field:account.account.template,name:0 +#: field:account.account,name:0 +#: field:account.account.template,name:0 #: rml:account.analytic.account.inverted.balance:0 #: field:account.bank.statement,name:0 #: field:account.bank.statement.line,name:0 -#: field:account.chart.template,name:0 field:account.config.wizard,name:0 -#: field:account.model.line,name:0 field:account.move,name:0 -#: field:account.move.line,name:0 field:account.move.reconcile,name:0 +#: field:account.chart.template,name:0 +#: field:account.config.wizard,name:0 +#: field:account.model.line,name:0 +#: field:account.move,name:0 +#: field:account.move.line,name:0 +#: field:account.move.reconcile,name:0 #: field:account.subscription,name:0 msgid "Name" msgstr "Naziv" @@ -2725,9 +2804,13 @@ msgid "" "higher ones. The order is important if you have a tax that has several tax " "children. In this case, the evaluation order is important." msgstr "" +"Polje sekvence koristi se da se poredaju porezni retci od najniže sekvence " +"prema višima. Red je bitan ako imate porez koji ima više podporeza. U ovom " +"slućaju, redosljed evaluacije je bitan." #. module: account -#: field:account.journal.column,view_id:0 view:account.journal.view:0 +#: field:account.journal.column,view_id:0 +#: view:account.journal.view:0 #: field:account.journal.view,name:0 #: model:ir.model,name:account.model_account_journal_view msgid "Journal View" @@ -2820,11 +2903,16 @@ msgid "Full Account Name" msgstr "Puno ime konta" #. module: account -#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0 -#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0 -#: rml:account.journal.period.print:0 rml:account.partner.balance:0 -#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0 -#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0 +#: rml:account.account.balance:0 +#: rml:account.analytic.account.analytic.check:0 +#: rml:account.analytic.account.balance:0 +#: rml:account.general.ledger:0 +#: rml:account.journal.period.print:0 +#: rml:account.partner.balance:0 +#: rml:account.tax.code.entries:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 +#: rml:account.vat.declaration:0 msgid "1cm 27.7cm 20cm 27.7cm" msgstr "1cm 27.7cm 20cm 27.7cm" @@ -2845,7 +2933,9 @@ msgid "Document: Customer account statement" msgstr "" #. module: account -#: view:product.product:0 view:product.template:0 view:res.partner:0 +#: view:product.product:0 +#: view:product.template:0 +#: view:res.partner:0 msgid "Accounting" msgstr "Računovodstvo" @@ -2890,8 +2980,10 @@ msgid "Centralisation" msgstr "Centralizacija" #. module: account -#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0 -#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0 +#: field:account.invoice.tax,tax_code_id:0 +#: field:account.tax,description:0 +#: field:account.tax,tax_code_id:0 +#: field:account.tax.template,tax_code_id:0 #: model:ir.model,name:account.model_account_tax_code msgid "Tax Code" msgstr "Šifra poreza" @@ -2933,12 +3025,14 @@ msgstr "" "datuma stvaranja ili datuma stvaranja plus uvjeti plaćanja partnera." #. module: account -#: selection:account.analytic.journal,type:0 selection:account.journal,type:0 +#: selection:account.analytic.journal,type:0 +#: selection:account.journal,type:0 msgid "Situation" msgstr "Stanje" #. module: account -#: rml:account.invoice:0 xsl:account.transfer:0 +#: rml:account.invoice:0 +#: xsl:account.transfer:0 msgid "Document" msgstr "Dokument" @@ -2976,7 +3070,8 @@ msgid "Cancel selected invoices" msgstr "Poništi odabrane Fakture" #. module: account -#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0 +#: view:account.analytic.journal:0 +#: field:account.analytic.line,journal_id:0 #: field:account.journal,analytic_journal_id:0 #: model:ir.actions.report.xml,name:account.analytic_journal_print #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report @@ -2999,23 +3094,28 @@ msgid "(" msgstr "(" #. module: account -#: view:account.invoice:0 view:account.period:0 view:account.subscription:0 +#: view:account.invoice:0 +#: view:account.period:0 +#: view:account.subscription:0 msgid "Set to Draft" msgstr "Postavi u pripremu" #. module: account -#: help:account.invoice,origin:0 help:account.invoice.line,origin:0 +#: help:account.invoice,origin:0 +#: help:account.invoice.line,origin:0 msgid "Reference of the document that produced this invoice." msgstr "Referenca dokumenta koji je stvorio ovu fakturu." #. module: account -#: selection:account.account,type:0 selection:account.account.template,type:0 +#: selection:account.account,type:0 +#: selection:account.account.template,type:0 #: selection:account.aged.trial.balance,init,result_selection:0 msgid "Payable" msgstr "Duguje" #. module: account -#: rml:account.invoice:0 field:account.invoice.tax,base:0 +#: rml:account.invoice:0 +#: field:account.invoice.tax,base:0 msgid "Base" msgstr "Osnovica" @@ -3025,7 +3125,8 @@ msgid "Model Name" msgstr "Naziv modela" #. module: account -#: selection:account.account,type:0 selection:account.account.template,type:0 +#: selection:account.account,type:0 +#: selection:account.account.template,type:0 msgid "Others" msgstr "Ostali" @@ -3035,13 +3136,15 @@ msgid "8" msgstr "8" #. module: account -#: view:account.invoice:0 view:account.move:0 +#: view:account.invoice:0 +#: view:account.move:0 #: wizard_button:account.move.validate,init,validate:0 msgid "Validate" msgstr "Potvrdi" #. module: account -#: view:account.model:0 field:account.model,legend:0 +#: view:account.model:0 +#: field:account.model,legend:0 msgid "Legend" msgstr "Legenda" @@ -3056,14 +3159,17 @@ msgid "account.move.line.select" msgstr "" #. module: account -#: view:account.account:0 rml:account.account.balance:0 +#: view:account.account:0 +#: rml:account.account.balance:0 #: wizard_field:account.account.balance.report,account_selection,Account_list:0 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0 #: field:account.bank.statement.line,account_id:0 #: field:account.bank.statement.reconcile.line,account_id:0 -#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0 +#: field:account.invoice,account_id:0 +#: field:account.invoice.line,account_id:0 #: field:account.journal,account_control_ids:0 -#: field:account.model.line,account_id:0 field:account.move.line,account_id:0 +#: field:account.model.line,account_id:0 +#: field:account.move.line,account_id:0 #: wizard_field:account.move.line.reconcile.select,init,account_id:0 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0 #: model:ir.model,name:account.model_account_account @@ -3084,9 +3190,12 @@ msgid "By Date and Period" msgstr "Po datumu i razdoblju" #. module: account -#: view:account.account:0 view:account.account.template:0 -#: view:account.bank.statement:0 field:account.bank.statement.line,note:0 -#: field:account.fiscal.position,note:0 view:account.invoice.line:0 +#: view:account.account:0 +#: view:account.account.template:0 +#: view:account.bank.statement:0 +#: field:account.bank.statement.line,note:0 +#: field:account.fiscal.position,note:0 +#: view:account.invoice.line:0 #: field:account.invoice.line,note:0 msgid "Notes" msgstr "Bilješke" @@ -3099,7 +3208,8 @@ msgid "" msgstr "Prijenosi računa fakture su usklađeni sa prijenosom računa plaćanja." #. module: account -#: rml:account.invoice:0 view:account.invoice:0 +#: rml:account.invoice:0 +#: view:account.invoice:0 #: field:account.invoice.line,invoice_line_tax_id:0 #: model:ir.actions.act_window,name:account.action_tax_form #: model:ir.ui.menu,name:account.menu_action_tax_form @@ -3124,15 +3234,21 @@ msgid "Statement encoding produces payment entries" msgstr "Unos izvoda stvara stavke za plaćanje" #. module: account -#: field:account.account,code:0 rml:account.account.balance:0 -#: field:account.account.template,code:0 field:account.account.type,code:0 +#: field:account.account,code:0 +#: rml:account.account.balance:0 +#: field:account.account.template,code:0 +#: field:account.account.type,code:0 #: rml:account.analytic.account.analytic.check:0 #: rml:account.analytic.account.balance:0 #: rml:account.analytic.account.inverted.balance:0 -#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0 -#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0 -#: rml:account.general.journal:0 field:account.journal,code:0 -#: rml:account.partner.balance:0 field:account.period,code:0 +#: rml:account.analytic.account.journal:0 +#: field:account.analytic.line,code:0 +#: field:account.config.wizard,code:0 +#: field:account.fiscalyear,code:0 +#: rml:account.general.journal:0 +#: field:account.journal,code:0 +#: rml:account.partner.balance:0 +#: field:account.period,code:0 msgid "Code" msgstr "Šifra" @@ -3142,7 +3258,8 @@ msgid "Financial Management" msgstr "Upravljanje finansijama" #. module: account -#: selection:account.account.type,close_method:0 selection:account.tax,type:0 +#: selection:account.account.type,close_method:0 +#: selection:account.tax,type:0 #: selection:account.tax.template,type:0 msgid "None" msgstr "Nijedan" @@ -3169,7 +3286,8 @@ msgid "Additionnal Information" msgstr "Dodatne informacije" #. module: account -#: field:account.tax,name:0 field:account.tax.template,name:0 +#: field:account.tax,name:0 +#: field:account.tax.template,name:0 #: rml:account.vat.declaration:0 msgid "Tax Name" msgstr "Naziv poreza" @@ -3246,7 +3364,8 @@ msgid "Partner Balance" msgstr "Saldo partnera" #. module: account -#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 msgid "Third Party Ledger" msgstr "Analitika treće strane" @@ -3259,7 +3378,8 @@ msgstr "" #. module: account #: selection:account.tax,applicable_type:0 -#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0 +#: field:account.tax,python_applicable:0 +#: field:account.tax,python_compute:0 #: selection:account.tax,type:0 #: selection:account.tax.template,applicable_type:0 #: field:account.tax.template,python_applicable:0 @@ -3298,7 +3418,8 @@ msgid "Import invoice" msgstr "Uvoz fakture" #. module: account -#: view:account.invoice:0 view:wizard.company.setup:0 +#: view:account.invoice:0 +#: view:wizard.company.setup:0 #: view:wizard.multi.charts.accounts:0 msgid "Create" msgstr "Kreiraj" @@ -3314,7 +3435,8 @@ msgid "Invoice line" msgstr "Redak fakture" #. module: account -#: field:account.account,shortcut:0 field:account.account.template,shortcut:0 +#: field:account.account,shortcut:0 +#: field:account.account.template,shortcut:0 msgid "Shortcut" msgstr "Prečica" @@ -3339,16 +3461,18 @@ msgstr "Današnji datum" msgid "" "The amount expressed in an optional other currency if it is a multi-currency " "entry." -msgstr "" +msgstr "Iznos izražen u opcionalnoj drugoj valuti ako je viševalutni unos." #. module: account -#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0 +#: field:account.tax,parent_id:0 +#: field:account.tax.template,parent_id:0 msgid "Parent Tax Account" msgstr "Porezni račun roditelja" #. module: account #: field:account.account,user_type:0 -#: field:account.account.template,user_type:0 view:account.account.type:0 +#: field:account.account.template,user_type:0 +#: view:account.account.type:0 #: field:account.analytic.account,type:0 #: model:ir.model,name:account.model_account_account_type msgid "Account Type" @@ -3384,7 +3508,8 @@ msgid "Central Journal" msgstr "Glavni nalog za knjiženje" #. module: account -#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 msgid "Balance brought forward" msgstr "Donešeni saldo" @@ -3460,7 +3585,8 @@ msgid "Journal code" msgstr "Šifra naloga za knjiženje" #. module: account -#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0 +#: wizard_button:account.fiscalyear.close,init,close:0 +#: view:account.model:0 msgid "Create entries" msgstr "Stvori stavke" @@ -3495,6 +3621,8 @@ msgid "" "This payment term will be used instead of the default one for the current " "partner" msgstr "" +"Ovi uvjeti plaćanja će se koristiti umjesto podrazumijevanih za trenutnog " +"partnera." #. module: account #: wizard_field:account.invoice.pay,addendum,comment:0 @@ -3516,11 +3644,14 @@ msgid "" msgstr "" #. module: account -#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0 -#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0 +#: field:account.account.type,sequence:0 +#: field:account.invoice.tax,sequence:0 +#: field:account.journal.column,sequence:0 +#: field:account.model.line,sequence:0 #: field:account.payment.term.line,sequence:0 #: field:account.sequence.fiscalyear,sequence_id:0 -#: field:account.tax,sequence:0 field:account.tax.template,sequence:0 +#: field:account.tax,sequence:0 +#: field:account.tax.template,sequence:0 #: field:fiscalyear.seq,sequence_id:0 msgid "Sequence" msgstr "Redoslijed" @@ -3588,7 +3719,8 @@ msgstr "Konto pretplate" #. module: account #: field:account.model.line,date_maturity:0 -#: field:account.move.line,date_maturity:0 rml:account.overdue:0 +#: field:account.move.line,date_maturity:0 +#: rml:account.overdue:0 msgid "Maturity date" msgstr "Datum dospijeća" @@ -3608,7 +3740,8 @@ msgid "Account Configure Wizard " msgstr "Čarobnjak za konfiguraciju računa " #. module: account -#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0 +#: field:account.config.wizard,date1:0 +#: field:account.fiscalyear,date_start:0 #: field:account.subscription,date_start:0 msgid "Start Date" msgstr "Početni datum" @@ -3646,7 +3779,8 @@ msgid "Unreconciled" msgstr "Neusklađen" #. module: account -#: field:account.account,note:0 field:account.account.template,note:0 +#: field:account.account,note:0 +#: field:account.account.template,note:0 msgid "Note" msgstr "Bilješka" @@ -3670,7 +3804,8 @@ msgid "Entry Sequence" msgstr "Redoslijed unosa" #. module: account -#: selection:account.account,type:0 selection:account.account.template,type:0 +#: selection:account.account,type:0 +#: selection:account.account.template,type:0 msgid "Closed" msgstr "Zatvoreno" @@ -3795,9 +3930,12 @@ msgid "Code/Date" msgstr "Šifra/Datum" #. module: account -#: field:account.account,active:0 field:account.analytic.account,active:0 -#: field:account.analytic.journal,active:0 field:account.journal,active:0 -#: field:account.journal.period,active:0 field:account.payment.term,active:0 +#: field:account.account,active:0 +#: field:account.analytic.account,active:0 +#: field:account.analytic.journal,active:0 +#: field:account.journal,active:0 +#: field:account.journal.period,active:0 +#: field:account.payment.term,active:0 #: field:account.tax,active:0 msgid "Active" msgstr "Aktivan" @@ -3849,15 +3987,20 @@ msgid "Secondary Currency" msgstr "Sekundarna valuta" #. module: account -#: field:account.account,credit:0 rml:account.account.balance:0 +#: field:account.account,credit:0 +#: rml:account.account.balance:0 #: field:account.analytic.account,credit:0 #: rml:account.analytic.account.balance:0 #: rml:account.analytic.account.cost_ledger:0 #: rml:account.analytic.account.inverted.balance:0 -#: rml:account.central.journal:0 rml:account.journal.period.print:0 -#: field:account.model.line,credit:0 field:account.move.line,credit:0 -#: rml:account.partner.balance:0 rml:account.tax.code.entries:0 -#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0 +#: rml:account.central.journal:0 +#: rml:account.journal.period.print:0 +#: field:account.model.line,credit:0 +#: field:account.move.line,credit:0 +#: rml:account.partner.balance:0 +#: rml:account.tax.code.entries:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 #: rml:account.vat.declaration:0 #: field:report.hr.timesheet.invoice.journal,cost:0 msgid "Credit" @@ -3882,7 +4025,7 @@ msgstr "Konto za povrat poreza" #: field:account.tax.code,child_ids:0 #: field:account.tax.code.template,child_ids:0 msgid "Child Codes" -msgstr "" +msgstr "Podšifre" #. module: account #: field:account.invoice,move_name:0 @@ -3890,7 +4033,8 @@ msgid "Account Move" msgstr "Konto prijenosa" #. module: account -#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0 +#: view:account.bank.statement:0 +#: field:account.bank.statement,line_ids:0 msgid "Statement lines" msgstr "Retci izvoda" @@ -3986,15 +4130,18 @@ msgid "Journal Column" msgstr "Kolona naloga za knjiženje" #. module: account -#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0 -#: selection:account.journal.period,state:0 selection:account.period,state:0 +#: selection:account.fiscalyear,state:0 +#: selection:account.invoice,state:0 +#: selection:account.journal.period,state:0 +#: selection:account.period,state:0 #: selection:account.subscription,state:0 msgid "Done" msgstr "Završeno" #. module: account #: wizard_field:account.account.balance.report,checktype,periods:0 -#: field:account.config.wizard,period:0 view:account.fiscalyear:0 +#: field:account.config.wizard,period:0 +#: view:account.fiscalyear:0 #: field:account.fiscalyear,period_ids:0 #: wizard_field:account.general.ledger.report,checktype,periods:0 #: wizard_field:account.partner.balance.report,init,periods:0 @@ -4007,7 +4154,8 @@ msgid "Periods" msgstr "Razdoblja" #. module: account -#: rml:account.invoice:0 view:account.invoice:0 +#: rml:account.invoice:0 +#: view:account.invoice:0 #: field:account.move.line,invoice:0 #: model:ir.model,name:account.model_account_invoice #: model:res.request.link,name:account.req_link_invoice @@ -4034,7 +4182,8 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..." msgstr "Analitički troškovi za refakturiranje nabave, timesheet-ovi,..." #. module: account -#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0 +#: field:account.account,tax_ids:0 +#: field:account.account.template,tax_ids:0 msgid "Default Taxes" msgstr "Zadani porezi" @@ -4052,6 +4201,8 @@ msgid "" "reports, so that you can see positive figures instead of negative ones in " "expenses accounts." msgstr "" +"Omogućuje da mijenjate predznak bilanse prikazane na izvještaju, tako da " +"vidite pozitivne iznose (umjesto negativnih) na kontima troškova" #. module: account #: help:account.config.wizard,code:0 @@ -4090,7 +4241,8 @@ msgstr "Tip kontrola" #. module: account #: field:account.analytic.account,name:0 #: rml:account.analytic.account.analytic.check:0 -#: rml:account.analytic.account.balance:0 rml:account.central.journal:0 +#: rml:account.analytic.account.balance:0 +#: rml:account.central.journal:0 msgid "Account Name" msgstr "Naziv konta" @@ -4181,7 +4333,8 @@ msgid "Import file from your bank statement" msgstr "Uvezi datoteku iz bankovnog izvoda" #. module: account -#: field:account.account,type:0 field:account.account.template,type:0 +#: field:account.account,type:0 +#: field:account.account.template,type:0 msgid "Internal Type" msgstr "Interni tip" @@ -4207,12 +4360,14 @@ msgid "Posted" msgstr "Proknjiženo" #. module: account -#: view:account.tax:0 view:account.tax.template:0 +#: view:account.tax:0 +#: view:account.tax.template:0 msgid "Credit Notes" msgstr "Knjižna odobrenja" #. module: account -#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0 +#: field:account.config.wizard,date2:0 +#: field:account.fiscalyear,date_stop:0 msgid "End Date" msgstr "Završni datum" @@ -4233,7 +4388,8 @@ msgid "Day of the Month" msgstr "Dan u mjesecu" #. module: account -#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0 +#: field:account.analytic.journal,line_ids:0 +#: field:account.tax.code,line_ids:0 msgid "Lines" msgstr "Retci" @@ -4251,7 +4407,8 @@ msgid "" msgstr "" #. module: account -#: view:account.tax:0 view:account.tax.template:0 +#: view:account.tax:0 +#: view:account.tax.template:0 msgid "Tax Declaration" msgstr "Porezni iskaz" @@ -4263,7 +4420,7 @@ msgstr "Datoteka izvoda" #. module: account #: view:ir.sequence:0 msgid "Fiscal Year Sequences" -msgstr "" +msgstr "Sekvenca fiskalne godine" #. module: account #: view:account.model.line:0 @@ -4311,12 +4468,14 @@ msgid "The optional quantity on entries" msgstr "" #. module: account -#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 msgid "JNRL" msgstr "JNRL" #. module: account -#: view:account.fiscalyear:0 view:account.period:0 +#: view:account.fiscalyear:0 +#: view:account.period:0 msgid "States" msgstr "Stanja" @@ -4352,7 +4511,8 @@ msgstr "Početni datum" #: rml:account.analytic.account.balance:0 #: rml:account.analytic.account.inverted.balance:0 #: rml:account.analytic.account.quantity_cost_ledger:0 -#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0 +#: field:account.invoice,amount_total:0 +#: field:account.invoice,check_total:0 msgid "Total" msgstr "Ukupno" @@ -4439,7 +4599,7 @@ msgstr "Unos stavaka po prijenosu" #. module: account #: wizard_view:account.analytic.account.chart,init:0 msgid "Analytic Account Charts" -msgstr "" +msgstr "Analitički kontni planovi" #. module: account #: wizard_field:account.aged.trial.balance,init,result_selection:0 @@ -4471,9 +4631,11 @@ msgstr "Potvrđene stavke iz fakture" #: field:account.fiscal.position,company_id:0 #: field:account.fiscalyear,company_id:0 #: wizard_field:account.general.ledger.report,checktype,company_id:0 -#: field:account.invoice,company_id:0 field:account.journal,company_id:0 +#: field:account.invoice,company_id:0 +#: field:account.journal,company_id:0 #: wizard_field:account.partner.balance.report,init,company_id:0 -#: field:account.tax,company_id:0 field:account.tax.code,company_id:0 +#: field:account.tax,company_id:0 +#: field:account.tax.code,company_id:0 #: wizard_field:account.third_party_ledger.report,init,company_id:0 #: wizard_field:account.vat.declaration,init,company_id:0 #: field:wizard.company.setup,company_id:0 @@ -4570,9 +4732,12 @@ msgid "Print Aged Trial Balance" msgstr "Ispis zrelog probnog salda" #. module: account -#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0 -#: field:account.model.line,ref:0 field:account.move.line,ref:0 -#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0 +#: field:account.analytic.line,ref:0 +#: field:account.bank.statement.line,ref:0 +#: field:account.model.line,ref:0 +#: field:account.move.line,ref:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 msgid "Ref." msgstr "Referenca" @@ -4649,7 +4814,8 @@ msgid "Control Invoice" msgstr "Kontroliraj fakturu" #. module: account -#: selection:account.account,type:0 selection:account.account.template,type:0 +#: selection:account.account,type:0 +#: selection:account.account.template,type:0 #: selection:account.aged.trial.balance,init,result_selection:0 msgid "Receivable" msgstr "Potraživanja" @@ -4676,7 +4842,8 @@ msgstr "PDV:" #. module: account #: rml:account.analytic.account.cost_ledger:0 #: rml:account.analytic.account.quantity_cost_ledger:0 -#: rml:account.central.journal:0 rml:account.general.journal:0 +#: rml:account.central.journal:0 +#: rml:account.general.journal:0 #: rml:account.invoice:0 msgid "Total:" msgstr "Ukupno:" @@ -4687,7 +4854,8 @@ msgid "account.analytic.journal" msgstr "account.analytic.journa" #. module: account -#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0 +#: view:account.fiscal.position:0 +#: field:account.fiscal.position,account_ids:0 #: field:account.fiscal.position.template,account_ids:0 msgid "Account Mapping" msgstr "Mapiranje konta" @@ -4703,7 +4871,8 @@ msgid "Account Reconciliation" msgstr "Usklađivanje konta" #. module: account -#: view:account.bank.statement:0 selection:account.bank.statement,state:0 +#: view:account.bank.statement:0 +#: selection:account.bank.statement,state:0 msgid "Confirm" msgstr "Potvrdi" @@ -4718,7 +4887,8 @@ msgid "Parent Account Template" msgstr "Predložak roditeljskog računa" #. module: account -#: help:account.tax,domain:0 help:account.tax.template,domain:0 +#: help:account.tax,domain:0 +#: help:account.tax.template,domain:0 msgid "" "This field is only used if you develop your own module allowing developers " "to create specific taxes in a custom domain." @@ -4738,7 +4908,8 @@ msgid "Analytic account" msgstr "Analitički konto" #. module: account -#: rml:account.invoice:0 selection:account.invoice,type:0 +#: rml:account.invoice:0 +#: selection:account.invoice,type:0 msgid "Supplier Invoice" msgstr "Ulazna faktura" @@ -4748,16 +4919,22 @@ msgid "Valid" msgstr "Potvrđeno" #. module: account -#: field:account.account,debit:0 rml:account.account.balance:0 +#: field:account.account,debit:0 +#: rml:account.account.balance:0 #: field:account.analytic.account,debit:0 #: rml:account.analytic.account.balance:0 #: rml:account.analytic.account.cost_ledger:0 #: rml:account.analytic.account.inverted.balance:0 -#: rml:account.central.journal:0 rml:account.general.ledger:0 -#: rml:account.journal.period.print:0 field:account.model.line,debit:0 -#: field:account.move.line,debit:0 rml:account.partner.balance:0 -#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0 -#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0 +#: rml:account.central.journal:0 +#: rml:account.general.ledger:0 +#: rml:account.journal.period.print:0 +#: field:account.model.line,debit:0 +#: field:account.move.line,debit:0 +#: rml:account.partner.balance:0 +#: rml:account.tax.code.entries:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 +#: rml:account.vat.declaration:0 #: field:report.hr.timesheet.invoice.journal,revenue:0 msgid "Debit" msgstr "Duguje" @@ -4819,7 +4996,8 @@ msgid "Reporting" msgstr "Izvještavanje" #. module: account -#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 msgid "/" msgstr "/" @@ -4850,7 +5028,8 @@ msgid "Configuration" msgstr "Postavke" #. module: account -#: view:account.analytic.line:0 view:account.invoice:0 +#: view:account.analytic.line:0 +#: view:account.invoice:0 msgid "Total amount" msgstr "Ukupni iznos" @@ -4900,12 +5079,14 @@ msgid "Paid invoice" msgstr "Plaćena faktura" #. module: account -#: view:account.tax:0 view:account.tax.template:0 +#: view:account.tax:0 +#: view:account.tax.template:0 msgid "Tax Definition" msgstr "Definicija poreza" #. module: account -#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0 +#: field:account.tax,tax_group:0 +#: field:account.tax.template,tax_group:0 msgid "Tax Group" msgstr "Grupa poreza" @@ -4948,7 +5129,8 @@ msgid "With movements" msgstr "Sa kretanjima" #. module: account -#: field:account.tax,domain:0 field:account.tax.template,domain:0 +#: field:account.tax,domain:0 +#: field:account.tax.template,domain:0 msgid "Domain" msgstr "Domena" @@ -4973,7 +5155,9 @@ msgid "Manually" msgstr "Ručno" #. module: account -#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0 +#: view:account.invoice:0 +#: view:account.tax:0 +#: view:account.tax.template:0 #: selection:account.vat.declaration,init,based_on:0 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened #: model:ir.actions.act_window,name:account.action_invoice_tree @@ -4990,7 +5174,8 @@ msgid "Payable Accounts" msgstr "Dugovni računi" #. module: account -#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0 +#: view:account.invoice.line:0 +#: field:account.invoice.tax,invoice_id:0 msgid "Invoice Line" msgstr "Redak fakture" @@ -5041,7 +5226,8 @@ msgid "The optional other currency if it is a multi-currency entry." msgstr "" #. module: account -#: view:account.invoice:0 field:account.invoice,payment_ids:0 +#: view:account.invoice:0 +#: field:account.invoice,payment_ids:0 #: selection:account.vat.declaration,init,based_on:0 msgid "Payments" msgstr "Plaćanja" @@ -5087,9 +5273,12 @@ msgstr "Odaberite datum nalofa za knjiženje i plaćanja" #. module: account #: selection:account.analytic.account,state:0 #: selection:account.bank.statement,state:0 -#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0 -#: selection:account.journal.period,state:0 selection:account.move,state:0 -#: selection:account.move.line,state:0 selection:account.period,state:0 +#: selection:account.fiscalyear,state:0 +#: selection:account.invoice,state:0 +#: selection:account.journal.period,state:0 +#: selection:account.move,state:0 +#: selection:account.move.line,state:0 +#: selection:account.period,state:0 #: selection:account.subscription,state:0 msgid "Draft" msgstr "U pripremi" @@ -5116,9 +5305,10 @@ msgid "Are you sure ?" msgstr "Jeste li sigurni?" #. module: account -#: rml:account.invoice:0 view:account.invoice:0 +#: rml:account.invoice:0 +#: view:account.invoice:0 msgid "PRO-FORMA" -msgstr "Predračun" +msgstr "PRO-FORMA" #. module: account #: field:account.move.reconcile,line_partial_ids:0 @@ -5152,16 +5342,22 @@ msgid "Supplier Invoice Process" msgstr "Proces fakturiranja dobavljača" #. module: account -#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0 -#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0 -#: rml:account.journal.period.print:0 rml:account.partner.balance:0 -#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0 -#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0 +#: rml:account.account.balance:0 +#: rml:account.analytic.account.analytic.check:0 +#: rml:account.analytic.account.balance:0 +#: rml:account.general.ledger:0 +#: rml:account.journal.period.print:0 +#: rml:account.partner.balance:0 +#: rml:account.tax.code.entries:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 +#: rml:account.vat.declaration:0 msgid "Page" msgstr "Stranica" #. module: account -#: view:account.move:0 view:account.move.line:0 +#: view:account.move:0 +#: view:account.move.line:0 msgid "Optional Information" msgstr "Dodatne informacije" @@ -5177,7 +5373,8 @@ msgid "Receivable and Payable" msgstr "Potraživanja i dugovanja" #. module: account -#: rml:account.account.balance:0 rml:account.general.journal:0 +#: rml:account.account.balance:0 +#: rml:account.general.journal:0 msgid ":" msgstr ":" @@ -5200,7 +5397,8 @@ msgid "" msgstr "" #. module: account -#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0 +#: view:account.bank.statement:0 +#: view:account.bank.statement.reconcile:0 #: view:account.subscription:0 msgid "Compute" msgstr "Izračunaj" @@ -5244,7 +5442,8 @@ msgid "End of period" msgstr "Kraj razdoblja" #. module: account -#: view:account.move:0 model:ir.model,name:account.model_account_move +#: view:account.move:0 +#: model:ir.model,name:account.model_account_move msgid "Account Entry" msgstr "Stavka konta" @@ -5255,7 +5454,8 @@ msgid "General Journal" msgstr "Opći nalog za knjiženje" #. module: account -#: field:account.account,balance:0 rml:account.account.balance:0 +#: field:account.account,balance:0 +#: rml:account.account.balance:0 #: selection:account.account.type,close_method:0 #: field:account.analytic.account,balance:0 #: rml:account.analytic.account.balance:0 @@ -5263,9 +5463,12 @@ msgstr "Opći nalog za knjiženje" #: rml:account.analytic.account.inverted.balance:0 #: field:account.bank.statement,balance_end:0 #: field:account.bank.statement.reconcile,total_balance:0 -#: rml:account.general.ledger:0 field:account.move.line,balance:0 -#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0 -#: selection:account.tax,type:0 rml:account.third_party_ledger:0 +#: rml:account.general.ledger:0 +#: field:account.move.line,balance:0 +#: rml:account.partner.balance:0 +#: selection:account.payment.term.line,value:0 +#: selection:account.tax,type:0 +#: rml:account.third_party_ledger:0 #: rml:account.third_party_ledger_other:0 msgid "Balance" msgstr "Saldo" @@ -5309,8 +5512,11 @@ msgid "The sequence used for invoice numbers in this journal." msgstr "" #. module: account -#: view:account.account:0 view:account.account.template:0 -#: view:account.journal:0 view:account.move:0 view:account.move.line:0 +#: view:account.account:0 +#: view:account.account.template:0 +#: view:account.journal:0 +#: view:account.move:0 +#: view:account.move.line:0 msgid "General Information" msgstr "Opće informacije" @@ -5352,7 +5558,8 @@ msgid "List of Accounts" msgstr "Lista konta" #. module: account -#: view:product.product:0 view:product.template:0 +#: view:product.product:0 +#: view:product.template:0 msgid "Sales Properties" msgstr "Svojstva prodaje" @@ -5445,11 +5652,15 @@ msgstr "IntraCom" #: view:account.analytic.account:0 #: field:account.analytic.account,description:0 #: field:account.analytic.line,name:0 -#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0 -#: field:account.invoice,name:0 field:account.invoice.line,name:0 +#: field:account.bank.statement.reconcile.line,name:0 +#: rml:account.invoice:0 +#: field:account.invoice,name:0 +#: field:account.invoice.line,name:0 #: wizard_field:account.invoice.refund,init,description:0 -#: rml:account.overdue:0 field:account.payment.term,note:0 -#: field:account.tax.code,info:0 field:account.tax.code.template,info:0 +#: rml:account.overdue:0 +#: field:account.payment.term,note:0 +#: field:account.tax.code,info:0 +#: field:account.tax.code.template,info:0 msgid "Description" msgstr "Opis" @@ -5493,7 +5704,8 @@ msgid "" msgstr "" #. module: account -#: field:account.tax.code,code:0 field:account.tax.code.template,code:0 +#: field:account.tax.code,code:0 +#: field:account.tax.code.template,code:0 msgid "Case Code" msgstr "Šifra pretinca" @@ -5575,7 +5787,8 @@ msgstr "Definicija modela" #. module: account #: model:account.account.type,name:account.account_type_cash_moves -#: selection:account.analytic.journal,type:0 selection:account.journal,type:0 +#: selection:account.analytic.journal,type:0 +#: selection:account.journal,type:0 msgid "Cash" msgstr "Gotovina" @@ -5615,7 +5828,8 @@ msgid "Keep empty for all open fiscal year" msgstr "Ostavite prazno za sve otvorene fiskalne godine" #. module: account -#: rml:account.invoice:0 selection:account.invoice,type:0 +#: rml:account.invoice:0 +#: selection:account.invoice,type:0 msgid "Supplier Refund" msgstr "Povrat dobavljaču" @@ -5660,10 +5874,14 @@ msgid "" "This account will be used to value outgoing stock for the current product " "category" msgstr "" +"Ovaj konto će se koristiti za vrijednost izlazne količine trenutne " +"kategorije proizvoda" #. module: account -#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0 -#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0 +#: help:account.tax,base_sign:0 +#: help:account.tax,ref_base_sign:0 +#: help:account.tax,ref_tax_sign:0 +#: help:account.tax,tax_sign:0 #: help:account.tax.template,base_sign:0 #: help:account.tax.template,ref_base_sign:0 #: help:account.tax.template,ref_tax_sign:0 @@ -5697,8 +5915,10 @@ msgid "Name of the fiscal year as displayed on screens." msgstr "Naziv fiskalne godine kako je prikazano na zaslonima" #. module: account -#: field:account.invoice,payment_term:0 view:account.payment.term:0 -#: field:account.payment.term,name:0 view:account.payment.term.line:0 +#: field:account.invoice,payment_term:0 +#: view:account.payment.term:0 +#: field:account.payment.term,name:0 +#: view:account.payment.term.line:0 #: field:account.payment.term.line,payment_id:0 #: model:ir.model,name:account.model_account_payment_term #: field:res.partner,property_payment_term:0 @@ -5755,7 +5975,8 @@ msgstr "Da" #. module: account #: help:account.account,reconcile:0 -msgid "Check this if the user is allowed to reconcile entries in this account." +msgid "" +"Check this if the user is allowed to reconcile entries in this account." msgstr "Provjeri da li je korisniku dozvoljeno poravnavanje unosa na kontu." #. module: account @@ -5780,7 +6001,8 @@ msgid "Accounting Dashboard" msgstr "" #. module: account -#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account +#: view:board.board:0 +#: model:ir.actions.act_window,name:account.act_my_account msgid "Accounts to invoice" msgstr "" @@ -5793,12 +6015,12 @@ msgstr "" #. module: account #: view:board.board:0 msgid "Aged receivables" -msgstr "" +msgstr "Zastarjela potraživanja" #. module: account #: model:ir.module.module,shortdesc:account.module_meta_information msgid "Board for accountant" -msgstr "" +msgstr "Tabla za računovođu" #. module: account #: model:ir.actions.act_window,name:account.action_aged_income @@ -5823,64 +6045,64 @@ msgstr "" #. module: account #: wizard_field:account.balance.account.balance.report,init,show_columns:0 msgid "Show Debit/Credit Information" -msgstr "Prikaži duguje/potražuje podatke" +msgstr "" #. module: account #: selection:account.balance.account.balance.report,init,account_choice:0 msgid "All accounts" -msgstr "Svi konta" +msgstr "" #. module: account #: wizard_field:account.balance.account.balance.report,init,period_manner:0 msgid "Entries Selection Based on" -msgstr "Odabir stavaka zasnovan na" +msgstr "" #. module: account #: wizard_view:account.balance.account.balance.report,backtoinit:0 #: wizard_view:account.balance.account.balance.report,zero_years:0 msgid "Notification" -msgstr "Obavještenje" +msgstr "" #. module: account #: selection:account.balance.account.balance.report,init,period_manner:0 msgid "Financial Period" -msgstr "Financijsko razdoblje" +msgstr "" #. module: account #: model:ir.actions.report.xml,name:account.account_account_balance #: model:ir.actions.report.xml,name:account.account_account_balance_landscape msgid "Account balance" -msgstr "Saldo konta" +msgstr "" #. module: account #: wizard_view:account.balance.account.balance.report,init:0 msgid "Select Period(s)" -msgstr "Odaberite razdoblja" +msgstr "" #. module: account #: selection:account.balance.account.balance.report,init,compare_pattern:0 msgid "Percentage" -msgstr "Procenat" +msgstr "" #. module: account #: wizard_field:account.balance.account.balance.report,init,compare_pattern:0 msgid "Compare Selected Years In Terms Of" -msgstr "Usporedi odabrane godine pod uvjetima" +msgstr "" #. module: account #: wizard_view:account.balance.account.balance.report,init:0 msgid "Select Fiscal Year(s)(Maximum Three Years)" -msgstr "Odaberite fiskalne godine (Maksimalno 3 godine)" +msgstr "" #. module: account #: wizard_field:account.balance.account.balance.report,init,select_account:0 msgid "Select Reference Account(for % comparision)" -msgstr "Izaberi odgovarajuća konta (za poređenje u %)" +msgstr "" #. module: account #: model:ir.actions.wizard,name:account.wizard_account_balance_report msgid "Account balance-Compare Years" -msgstr "Saldo konta - poredi godine" +msgstr "" #. module: account #: model:ir.module.module,description:account.module_meta_information @@ -5907,64 +6129,64 @@ msgstr "" #. module: account #: wizard_view:account.balance.account.balance.report,backtoinit:0 msgid "You have to select 'Landscape' option. Please Check it." -msgstr "Morate odabrati opciju 'Položeno'. Molimo označite je." +msgstr "" #. module: account #: wizard_field:account.balance.account.balance.report,init,landscape:0 msgid "Show Report in Landscape Form" -msgstr "Prikaži izvješće u položenoj formi" +msgstr "" #. module: account #: rml:account.account.balance.landscape:0 #: rml:account.balance.account.balance:0 msgid "Total :" -msgstr "Ukupno :" +msgstr "" #. module: account #: wizard_field:account.balance.account.balance.report,init,format_perc:0 msgid "Show Comparision in %" -msgstr "Prikaži usporedbu u %" +msgstr "" #. module: account #: wizard_view:account.balance.account.balance.report,init:0 msgid "Select Period" -msgstr "Odaberite razdoblje" +msgstr "" #. module: account #: wizard_view:account.balance.account.balance.report,init:0 msgid "Report Options" -msgstr "Postavke izvješća" +msgstr "" #. module: account #: selection:account.balance.account.balance.report,init,compare_pattern:0 msgid "Don't Compare" -msgstr "Ne uspoređuj" +msgstr "" #. module: account #: wizard_field:account.balance.account.balance.report,init,account_choice:0 msgid "Show Accounts" -msgstr "Prikaži račune" +msgstr "" #. module: account #: wizard_view:account.balance.account.balance.report,backtoinit:0 msgid "1. You have selected more than 3 years in any case." -msgstr "1. Odabrali ste više od 3 godine u svakom slučaju." +msgstr "" #. module: account #: model:ir.module.module,shortdesc:account.module_meta_information msgid "Accounting and financial management-Compare Accounts" -msgstr "Upravljanje računovodstvom i finansijama - Usporedi konta" +msgstr "" #. module: account #: rml:account.account.balance.landscape:0 #: rml:account.balance.account.balance:0 msgid "Year :" -msgstr "Godina:" +msgstr "" #. module: account #: wizard_view:account.balance.account.balance.report,backtoinit:0 msgid "You can select maximum 3 years. Please check again." -msgstr "Možete odabrati maksimalno 3 godine. Molimo pokušajte ponovno." +msgstr "" #. module: account #: wizard_view:account.balance.account.balance.report,backtoinit:0 @@ -5972,8 +6194,6 @@ msgid "" "3. You have selected 'Percentage' option with more than 2 years, but you " "have not selected landscape format." msgstr "" -"Izabrali ste \"Postotak\" opciju sa više od dvije godine, ali niste odabrali " -"\"Položeni\" format." #. module: account #: wizard_view:account.balance.account.balance.report,backtoinit:0 @@ -5985,12 +6205,12 @@ msgstr "" #. module: account #: help:account.balance.account.balance.report,init,select_account:0 msgid "Keep empty for comparision to its parent" -msgstr "Ostavite prazno za usporedbu sa roditeljem" +msgstr "" #. module: account #: selection:account.balance.account.balance.report,init,period_manner:0 msgid "Creation Date" -msgstr "Datum kreiranja" +msgstr "" #. module: account #: wizard_view:account.balance.account.balance.report,backtoinit:0 @@ -5998,28 +6218,24 @@ msgid "" "2. You have not selected 'Percentage' option, but you have selected more " "than 2 years." msgstr "" -"2. Niste odabrali opciju 'Postotak', ali ste odabrali više od 2 godine." #. module: account #: wizard_view:account.balance.account.balance.report,zero_years:0 msgid "" -"You may have selected the compare options with more than 1 year with credit/" -"debit columns and % option.This can lead contents to be printed out of the " -"paper.Please try again." +"You may have selected the compare options with more than 1 year with " +"credit/debit columns and % option.This can lead contents to be printed out " +"of the paper.Please try again." msgstr "" -"Postoji mogućnost da ste odabrali postavke usporedbe sa više od 1 godine sa " -"stupcima duguje/potražuje i % opcijom. Ovo može biti uzrok ispisa van " -"papira. Molimo pokušajte ponovno." #. module: account #: wizard_view:account.balance.account.balance.report,zero_years:0 msgid "You have to select at least 1 Fiscal Year. Try again." -msgstr "Morate odabrati bar 1 fiskalnu godinu. Pokušajte ponovno." +msgstr "" #. module: account #: wizard_view:account.balance.account.balance.report,init:0 msgid "Customize Report" -msgstr "Prilagodite izvješće" +msgstr "" #. module: account #: field:report.aged.receivable,name:0 @@ -6027,14 +6243,14 @@ msgid "Month Range" msgstr "" #. module: account -#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard +#: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard msgid "Invoices Created Within Past 15 Days" msgstr "" #. module: account -#: model:ir.model,name:account.model_report_invoice_created +#: model:ir.model,name:report_account.model_report_invoice_created msgid "Report of Invoices Created within Last 15 days" -msgstr "" +msgstr "Izvještaj o fakturama unesenim u zadnjih 15 dana" #. module: account #: view:report.invoice.created:0 @@ -6047,12 +6263,12 @@ msgid "Accounts by type" msgstr "" #. module: account -#: model:ir.model,name:account.model_report_aged_receivable +#: model:ir.model,name:report_account.model_report_aged_receivable msgid "Aged Receivable Till Today" msgstr "" #. module: account -#: model:ir.model,name:account.model_report_account_receivable +#: model:ir.model,name:report_account.model_report_account_receivable msgid "Receivable accounts" msgstr "" @@ -6062,18 +6278,18 @@ msgid "Range" msgstr "" #. module: account -#: model:ir.module.module,description:account.module_meta_information +#: model:ir.module.module,description:report_account.module_meta_information msgid "A module that adds new reports based on the account module." msgstr "" #. module: account -#: model:ir.module.module,shortdesc:account.module_meta_information +#: model:ir.module.module,shortdesc:report_account.module_meta_information msgid "Account Reporting - Reporting" msgstr "" #. module: account -#: model:ir.actions.act_window,name:account.action_account_receivable_graph -#: model:ir.ui.menu,name:account.menu_account_receivable_graph +#: model:ir.actions.act_window,name:report_account.action_account_receivable_graph +#: model:ir.ui.menu,name:report_account.menu_account_receivable_graph msgid "Balance by Type of Account" msgstr "" @@ -6088,7 +6304,7 @@ msgid "Create Date" msgstr "" #. module: account -#: model:ir.actions.act_window,name:account.action_aged_receivable_graph +#: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph #: view:report.aged.receivable:0 msgid "Aged Receivable" msgstr "" diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po index 699df15a9a2..ea4307e5542 100644 --- a/addons/account/i18n/ru.po +++ b/addons/account/i18n/ru.po @@ -1,19 +1,19 @@ # Translation of OpenERP Server. # This file contains the translation of the following modules: -# * account +# * account # msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-04-03 16:42+0000\n" -"Last-Translator: Alexandr Mitev \n" +"PO-Revision-Date: 2010-07-07 22:55+0000\n" +"Last-Translator: Pomazan Bogdan \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:05+0000\n" +"X-Launchpad-Export-Date: 2010-07-08 03:50+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -93,7 +93,8 @@ msgid "Unreconciled entries" msgstr "Несогласованные проводки" #. module: account -#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0 +#: field:account.invoice.tax,base_code_id:0 +#: field:account.tax,base_code_id:0 #: field:account.tax.template,base_code_id:0 msgid "Base Code" msgstr "Базовый Код" @@ -125,7 +126,8 @@ msgid "Residual" msgstr "Остаток" #. module: account -#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0 +#: field:account.tax,base_sign:0 +#: field:account.tax,ref_base_sign:0 #: field:account.tax.template,base_sign:0 #: field:account.tax.template,ref_base_sign:0 msgid "Base Code Sign" @@ -169,6 +171,10 @@ msgid "" "positive, it gives the day of the next month. Set 0 for net days (otherwise " "it's based on the beginning of the month)." msgstr "" +"Установите значение дня месяца -1 для последнего дня текущего месяца. В " +"случае положительного значения, значение дня будет соответствовать дню " +"следующего месяца. Установите значение 0 для чистых дней (иначе счет идет с " +"начала месяца)." #. module: account #: view:account.move:0 @@ -186,8 +192,10 @@ msgid "Move line select" msgstr "Выберите строку для перемещения" #. module: account -#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0 -#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0 +#: rml:account.journal.period.print:0 +#: rml:account.tax.code.entries:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 msgid "Entry label" msgstr "Метка проводки" @@ -202,12 +210,14 @@ msgid "Period Sum" msgstr "Сумма за период" #. module: account -#: view:account.tax:0 view:account.tax.template:0 +#: view:account.tax:0 +#: view:account.tax.template:0 msgid "Compute Code (if type=code)" msgstr "Вычислить код (если тип=код)" #. module: account -#: view:account.move:0 view:account.move.line:0 +#: view:account.move:0 +#: view:account.move.line:0 msgid "Account Entry Line" msgstr "Проводка по счету" @@ -224,9 +234,12 @@ msgstr "Повторяющиеся проводки" #. module: account #: field:account.analytic.line,amount:0 #: field:account.bank.statement.line,amount:0 -#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0 -#: field:account.invoice.tax,amount:0 field:account.move,amount:0 -#: field:account.tax,amount:0 field:account.tax.template,amount:0 +#: field:account.bank.statement.reconcile.line,amount:0 +#: rml:account.invoice:0 +#: field:account.invoice.tax,amount:0 +#: field:account.move,amount:0 +#: field:account.tax,amount:0 +#: field:account.tax.template,amount:0 #: xsl:account.transfer:0 msgid "Amount" msgstr "Сумма" @@ -268,7 +281,8 @@ msgstr "" "быстрого редактирования каждой книги проводок." #. module: account -#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0 +#: help:account.invoice,date_due:0 +#: help:account.invoice,payment_term:0 msgid "" "If you use payment terms, the due date will be computed automatically at the " "generation of accounting entries. If you keep the payment term and the due " @@ -282,12 +296,14 @@ msgstr "" "50% сегодня, 50% в следующем месяце." #. module: account -#: selection:account.tax,type:0 selection:account.tax.template,type:0 +#: selection:account.tax,type:0 +#: selection:account.tax.template,type:0 msgid "Fixed" msgstr "Фиксированный" #. module: account -#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0 +#: model:ir.actions.report.xml,name:account.account_overdue +#: view:res.company:0 msgid "Overdue Payments" msgstr "Просроченные платежи" @@ -303,7 +319,8 @@ msgid "Select period" msgstr "Выбрать период" #. module: account -#: field:account.invoice,origin:0 field:account.invoice.line,origin:0 +#: field:account.invoice,origin:0 +#: field:account.invoice.line,origin:0 msgid "Origin" msgstr "Происхождение" @@ -333,7 +350,8 @@ msgid "Delta Debit" msgstr "Дебетовое сальдо" #. module: account -#: rml:account.invoice:0 field:account.invoice,amount_tax:0 +#: rml:account.invoice:0 +#: field:account.invoice,amount_tax:0 #: field:account.move.line,account_tax_id:0 msgid "Tax" msgstr "Налог" @@ -352,12 +370,14 @@ msgid "Analytic Account" msgstr "Счет аналитического учета" #. module: account -#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0 +#: field:account.tax,child_depend:0 +#: field:account.tax.template,child_depend:0 msgid "Tax on Children" msgstr "Налог на детей" #. module: account -#: rml:account.central.journal:0 rml:account.general.journal:0 +#: rml:account.central.journal:0 +#: rml:account.general.journal:0 #: field:account.journal,name:0 msgid "Journal Name" msgstr "Название журнала" @@ -425,8 +445,11 @@ msgid "Contra" msgstr "Сторно" #. module: account -#: field:account.analytic.account,state:0 field:account.bank.statement,state:0 -#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0 +#: field:account.analytic.account,state:0 +#: field:account.bank.statement,state:0 +#: field:account.invoice,state:0 +#: view:account.move:0 +#: view:account.move.line:0 #: view:account.subscription:0 msgid "State" msgstr "Состояние" @@ -438,7 +461,8 @@ msgid "Unpaid Supplier Refunds" msgstr "Невыплаченные возвраты средств от поставщика" #. module: account -#: view:account.tax:0 view:account.tax.template:0 +#: view:account.tax:0 +#: view:account.tax.template:0 msgid "Special Computation" msgstr "Специальные расчеты" @@ -460,8 +484,10 @@ msgid "Disc.(%)" msgstr "Дисконт (%)" #. module: account -#: rml:account.general.ledger:0 field:account.model,ref:0 -#: field:account.move,ref:0 rml:account.overdue:0 +#: rml:account.general.ledger:0 +#: field:account.model,ref:0 +#: field:account.move,ref:0 +#: rml:account.overdue:0 #: field:account.subscription,ref:0 msgid "Ref" msgstr "Ссылка" @@ -654,7 +680,8 @@ msgid "Sub-Total :" msgstr "Подитог:" #. module: account -#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0 +#: field:account.analytic.account,line_ids:0 +#: view:account.analytic.line:0 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form #: model:ir.ui.menu,name:account.next_id_41 msgid "Analytic Entries" @@ -686,7 +713,8 @@ msgid "Select the Period for Analysis" msgstr "Выберите период для проведения анализа" #. module: account -#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0 +#: field:account.tax,ref_tax_sign:0 +#: field:account.tax,tax_sign:0 #: field:account.tax.template,ref_tax_sign:0 #: field:account.tax.template,tax_sign:0 msgid "Tax Code Sign" @@ -718,7 +746,8 @@ msgid "Field Name" msgstr "Название поля" #. module: account -#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0 +#: field:account.tax.code,sign:0 +#: field:account.tax.code.template,sign:0 msgid "Sign for parent" msgstr "" @@ -728,7 +757,8 @@ msgid "End of Year Entries Journal" msgstr "Журнал проводок конца года" #. module: account -#: view:product.product:0 view:product.template:0 +#: view:product.product:0 +#: view:product.template:0 msgid "Purchase Properties" msgstr "Свойства покупки" @@ -748,9 +778,12 @@ msgid "Move Lines Created." msgstr "Строка финансового документа создана." #. module: account -#: field:account.fiscalyear,state:0 field:account.journal.period,state:0 -#: field:account.move,state:0 field:account.move.line,state:0 -#: field:account.period,state:0 field:account.subscription,state:0 +#: field:account.fiscalyear,state:0 +#: field:account.journal.period,state:0 +#: field:account.move,state:0 +#: field:account.move.line,state:0 +#: field:account.period,state:0 +#: field:account.subscription,state:0 msgid "Status" msgstr "Статус" @@ -907,8 +940,10 @@ msgstr "Выбор плана счетов" #: rml:account.analytic.account.balance:0 #: rml:account.analytic.account.inverted.balance:0 #: rml:account.analytic.account.quantity_cost_ledger:0 -#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0 -#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0 +#: field:account.analytic.line,unit_amount:0 +#: rml:account.invoice:0 +#: field:account.invoice.line,quantity:0 +#: field:account.model.line,quantity:0 #: field:account.move.line,quantity:0 msgid "Quantity" msgstr "Количество" @@ -951,13 +986,16 @@ msgstr "aналитический счет" #: wizard_field:account.automatic.reconcile,init,period_id:0 #: field:account.bank.statement,period_id:0 #: wizard_field:account.central.journal.report,init,period_id:0 -#: view:account.fiscalyear:0 rml:account.general.journal:0 +#: view:account.fiscalyear:0 +#: rml:account.general.journal:0 #: wizard_field:account.general.journal.report,init,period_id:0 #: wizard_field:account.invoice.pay,init,period_id:0 -#: field:account.journal.period,period_id:0 field:account.move,period_id:0 +#: field:account.journal.period,period_id:0 +#: field:account.move,period_id:0 #: wizard_field:account.move.journal,init,period_id:0 #: field:account.move.line,period_id:0 -#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0 +#: wizard_field:account.move.validate,init,period_id:0 +#: view:account.period:0 #: wizard_field:account.print.journal.report,init,period_id:0 #: field:account.subscription,period_nbr:0 msgid "Period" @@ -979,7 +1017,8 @@ msgid "Net Total:" msgstr "Итог нетто" #. module: account -#: view:account.fiscal.position:0 field:account.fiscal.position,name:0 +#: view:account.fiscal.position:0 +#: field:account.fiscal.position,name:0 #: field:account.fiscal.position.account,position_id:0 #: field:account.fiscal.position.account.template,position_id:0 #: field:account.fiscal.position.tax,position_id:0 @@ -1103,7 +1142,8 @@ msgid "Fiscal Position Templates" msgstr "" #. module: account -#: rml:account.invoice:0 field:account.invoice.line,price_unit:0 +#: rml:account.invoice:0 +#: field:account.invoice.line,price_unit:0 msgid "Unit Price" msgstr "Цена за ед." @@ -1256,7 +1296,8 @@ msgid "Not reconciled transactions" msgstr "Не сверенные транзакции" #. module: account -#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0 +#: view:account.fiscal.position:0 +#: field:account.fiscal.position,tax_ids:0 #: field:account.fiscal.position.template,tax_ids:0 msgid "Tax Mapping" msgstr "" @@ -1278,7 +1319,8 @@ msgid "Write-Off account" msgstr "Счет списания" #. module: account -#: field:account.model.line,model_id:0 field:account.subscription,model_id:0 +#: field:account.model.line,model_id:0 +#: field:account.subscription,model_id:0 msgid "Model" msgstr "Модель" @@ -1304,9 +1346,11 @@ msgid "Select invoices you want to pay and manages advances" msgstr "" #. module: account -#: selection:account.account,type:0 selection:account.account.template,type:0 +#: selection:account.account,type:0 +#: selection:account.account.template,type:0 #: model:account.account.type,name:account.account_type_root -#: selection:account.analytic.account,type:0 field:account.journal,view_id:0 +#: selection:account.analytic.account,type:0 +#: field:account.journal,view_id:0 msgid "View" msgstr "Вид" @@ -1375,7 +1419,8 @@ msgstr "Типы счетов" #: wizard_field:account.central.journal.report,init,journal_id:0 #: wizard_field:account.general.journal.report,init,journal_id:0 #: field:account.invoice,journal_id:0 -#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0 +#: field:account.journal.period,journal_id:0 +#: field:account.model,journal_id:0 #: field:account.move,journal_id:0 #: wizard_field:account.move.bank.reconcile,init,journal_id:0 #: wizard_field:account.move.journal,init,journal_id:0 @@ -1391,7 +1436,8 @@ msgid "Journal" msgstr "Журнал" #. module: account -#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0 +#: field:account.account,child_id:0 +#: field:account.analytic.account,child_ids:0 msgid "Child Accounts" msgstr "" @@ -1417,7 +1463,8 @@ msgid "Statement reconcile line" msgstr "" #. module: account -#: view:account.tax:0 view:account.tax.template:0 +#: view:account.tax:0 +#: view:account.tax.template:0 msgid "Keep empty to use the income account" msgstr "Оставьте пустым для использования доходного счета" @@ -1544,7 +1591,8 @@ msgid "Account n°" msgstr "№ счета" #. module: account -#: view:account.tax:0 view:account.tax.template:0 +#: view:account.tax:0 +#: view:account.tax.template:0 msgid "Keep empty to use the expense account" msgstr "Оставьте пустым для использования счета расходов" @@ -1554,7 +1602,8 @@ msgid "Account to reconcile" msgstr "Счет для сверки" #. module: account -#: rml:account.invoice:0 field:account.model.line,partner_id:0 +#: rml:account.invoice:0 +#: field:account.model.line,partner_id:0 #: field:account.move.line,partner_id:0 msgid "Partner Ref." msgstr "Ссылка на партнера" @@ -1566,12 +1615,14 @@ msgid "Receivable and Payable Accounts" msgstr "" #. module: account -#: view:account.subscription:0 field:account.subscription,lines_id:0 +#: view:account.subscription:0 +#: field:account.subscription,lines_id:0 msgid "Subscription Lines" msgstr "Позиции подписки" #. module: account -#: selection:account.analytic.journal,type:0 selection:account.journal,type:0 +#: selection:account.analytic.journal,type:0 +#: selection:account.journal,type:0 #: selection:account.tax,type_tax_use:0 #: selection:account.tax.template,type_tax_use:0 msgid "Purchase" @@ -1736,7 +1787,8 @@ msgid "Period length (days)" msgstr "Длина периода (в днях)" #. module: account -#: selection:account.payment.term.line,value:0 selection:account.tax,type:0 +#: selection:account.payment.term.line,value:0 +#: selection:account.tax,type:0 #: selection:account.tax.template,type:0 msgid "Percent" msgstr "Процент" @@ -1747,7 +1799,8 @@ msgid "Charts" msgstr "Планы счетов" #. module: account -#: selection:account.analytic.journal,type:0 selection:account.journal,type:0 +#: selection:account.analytic.journal,type:0 +#: selection:account.journal,type:0 #: selection:account.tax,type_tax_use:0 #: selection:account.tax.template,type_tax_use:0 msgid "Sale" @@ -1821,9 +1874,12 @@ msgstr "" #. module: account #: field:account.analytic.journal,type:0 -#: field:account.bank.statement.line,type:0 field:account.invoice,type:0 -#: field:account.journal,type:0 field:account.move,type:0 -#: field:account.move.reconcile,type:0 xsl:account.transfer:0 +#: field:account.bank.statement.line,type:0 +#: field:account.invoice,type:0 +#: field:account.journal,type:0 +#: field:account.move,type:0 +#: field:account.move.reconcile,type:0 +#: xsl:account.transfer:0 msgid "Type" msgstr "Тип" @@ -1971,7 +2027,8 @@ msgid "Journal-Period Name" msgstr "Журнал - название периода" #. module: account -#: field:account.tax.code,name:0 field:account.tax.code.template,name:0 +#: field:account.tax.code,name:0 +#: field:account.tax.code.template,name:0 msgid "Tax Case Name" msgstr "" @@ -1986,7 +2043,8 @@ msgstr "" #. module: account #: field:account.bank.statement.line,partner_id:0 #: field:account.bank.statement.reconcile,partner_id:0 -#: rml:account.general.ledger:0 field:account.invoice,partner_id:0 +#: rml:account.general.ledger:0 +#: field:account.invoice,partner_id:0 #: field:account.move,partner_id:0 #: wizard_field:account.partner.balance.report,init,result_selection:0 #: wizard_field:account.third_party_ledger.report,init,result_selection:0 @@ -2059,8 +2117,10 @@ msgstr "" #: field:account.bank.statement,currency:0 #: field:account.bank.statement.reconcile,total_currency:0 #: field:account.bank.statement.reconcile,total_second_currency:0 -#: rml:account.general.ledger:0 field:account.invoice,currency_id:0 -#: field:account.journal,currency:0 field:account.model.line,currency_id:0 +#: rml:account.general.ledger:0 +#: field:account.invoice,currency_id:0 +#: field:account.journal,currency:0 +#: field:account.model.line,currency_id:0 #: field:account.move.line,currency_id:0 msgid "Currency" msgstr "Валюта" @@ -2098,7 +2158,8 @@ msgid "Analytic Entry" msgstr "Проводка аналитики" #. module: account -#: view:res.company:0 field:res.company,overdue_msg:0 +#: view:res.company:0 +#: field:res.company,overdue_msg:0 msgid "Overdue Payments Message" msgstr "" @@ -2150,7 +2211,8 @@ msgid "Detail" msgstr "Подробности" #. module: account -#: selection:account.account,type:0 selection:account.account.template,type:0 +#: selection:account.account,type:0 +#: selection:account.account.template,type:0 msgid "Consolidation" msgstr "Объединение" @@ -2245,16 +2307,21 @@ msgid "The account basis of the tax declaration." msgstr "" #. module: account -#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0 +#: rml:account.analytic.account.journal:0 +#: field:account.analytic.line,date:0 #: field:account.bank.statement,date:0 #: field:account.bank.statement.line,date:0 -#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0 +#: field:account.bank.statement.reconcile,name:0 +#: rml:account.general.ledger:0 #: selection:account.general.ledger.report,checktype,sortbydate:0 -#: rml:account.journal.period.print:0 field:account.move,date:0 +#: rml:account.journal.period.print:0 +#: field:account.move,date:0 #: rml:account.overdue:0 #: wizard_field:account.subscription.generate,init,date:0 -#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0 -#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0 +#: field:account.subscription.line,date:0 +#: rml:account.tax.code.entries:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 #: xsl:account.transfer:0 msgid "Date" msgstr "Дата" @@ -2271,7 +2338,8 @@ msgid "Unreconcile" msgstr "Не сверено" #. module: account -#: field:account.tax,type:0 field:account.tax.template,type:0 +#: field:account.tax,type:0 +#: field:account.tax.template,type:0 msgid "Tax Type" msgstr "Тип налога" @@ -2281,7 +2349,8 @@ msgid "Statement Entries" msgstr "" #. module: account -#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0 +#: field:account.analytic.line,user_id:0 +#: field:account.journal,user_id:0 msgid "User" msgstr "Пользователь" @@ -2367,7 +2436,8 @@ msgid "Date End" msgstr "Дата окончания" #. module: account -#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0 +#: view:account.bank.statement:0 +#: field:account.move.reconcile,line_id:0 #: model:ir.actions.act_window,name:account.action_move_line_search #: model:ir.actions.act_window,name:account.action_move_line_tree1 #: model:ir.ui.menu,name:account.menu_action_move_line_search @@ -2375,7 +2445,8 @@ msgid "Entry Lines" msgstr "Строки проводок" #. module: account -#: view:account.tax:0 view:account.tax.template:0 +#: view:account.tax:0 +#: view:account.tax.template:0 msgid "Applicable Code (if type=code)" msgstr "Применимый код (если тип=код)" @@ -2464,9 +2535,11 @@ msgstr "" #: wizard_button:account.general.journal.report,init,end:0 #: wizard_button:account.general.ledger.report,account_selection,end:0 #: wizard_button:account.general.ledger.report,checktype,end:0 -#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0 +#: view:account.invoice:0 +#: wizard_button:account.invoice.pay,addendum,end:0 #: wizard_button:account.invoice.pay,init,end:0 -#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0 +#: wizard_button:account.invoice.refund,init,end:0 +#: view:account.move:0 #: wizard_button:account.move.bank.reconcile,init,end:0 #: wizard_button:account.move.journal,init,end:0 #: wizard_button:account.move.line.reconcile,addendum,end:0 @@ -2485,7 +2558,8 @@ msgstr "" #: wizard_button:account.third_party_ledger.report,init,end:0 #: wizard_button:account.vat.declaration,init,end:0 #: wizard_button:account_use_models,init_form,end:0 -#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0 +#: view:wizard.company.setup:0 +#: view:wizard.multi.charts.accounts:0 msgid "Cancel" msgstr "Отмена" @@ -2495,8 +2569,10 @@ msgid "Acc. Type Name" msgstr "" #. module: account -#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0 -#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0 +#: help:account.tax,base_code_id:0 +#: help:account.tax,ref_base_code_id:0 +#: help:account.tax,ref_tax_code_id:0 +#: help:account.tax,tax_code_id:0 #: help:account.tax.template,base_code_id:0 #: help:account.tax.template,ref_base_code_id:0 #: help:account.tax.template,ref_tax_code_id:0 @@ -2510,7 +2586,8 @@ msgid "Litigation" msgstr "" #. module: account -#: view:account.move.line:0 wizard_view:account.move.validate,init:0 +#: view:account.move.line:0 +#: wizard_view:account.move.validate,init:0 #: view:account.payment.term:0 msgid "Information" msgstr "Информация" @@ -2620,7 +2697,8 @@ msgid "Price" msgstr "Цена" #. module: account -#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0 +#: rml:account.analytic.account.journal:0 +#: rml:account.third_party_ledger:0 #: rml:account.third_party_ledger_other:0 msgid "-" msgstr "-" @@ -2687,13 +2765,17 @@ msgid "Invoice Reference" msgstr "Ссылка на счет" #. module: account -#: field:account.account,name:0 field:account.account.template,name:0 +#: field:account.account,name:0 +#: field:account.account.template,name:0 #: rml:account.analytic.account.inverted.balance:0 #: field:account.bank.statement,name:0 #: field:account.bank.statement.line,name:0 -#: field:account.chart.template,name:0 field:account.config.wizard,name:0 -#: field:account.model.line,name:0 field:account.move,name:0 -#: field:account.move.line,name:0 field:account.move.reconcile,name:0 +#: field:account.chart.template,name:0 +#: field:account.config.wizard,name:0 +#: field:account.model.line,name:0 +#: field:account.move,name:0 +#: field:account.move.line,name:0 +#: field:account.move.reconcile,name:0 #: field:account.subscription,name:0 msgid "Name" msgstr "Название" @@ -2733,7 +2815,8 @@ msgid "" msgstr "" #. module: account -#: field:account.journal.column,view_id:0 view:account.journal.view:0 +#: field:account.journal.column,view_id:0 +#: view:account.journal.view:0 #: field:account.journal.view,name:0 #: model:ir.model,name:account.model_account_journal_view msgid "Journal View" @@ -2826,11 +2909,16 @@ msgid "Full Account Name" msgstr "" #. module: account -#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0 -#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0 -#: rml:account.journal.period.print:0 rml:account.partner.balance:0 -#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0 -#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0 +#: rml:account.account.balance:0 +#: rml:account.analytic.account.analytic.check:0 +#: rml:account.analytic.account.balance:0 +#: rml:account.general.ledger:0 +#: rml:account.journal.period.print:0 +#: rml:account.partner.balance:0 +#: rml:account.tax.code.entries:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 +#: rml:account.vat.declaration:0 msgid "1cm 27.7cm 20cm 27.7cm" msgstr "" @@ -2851,7 +2939,9 @@ msgid "Document: Customer account statement" msgstr "" #. module: account -#: view:product.product:0 view:product.template:0 view:res.partner:0 +#: view:product.product:0 +#: view:product.template:0 +#: view:res.partner:0 msgid "Accounting" msgstr "Бухгалтерский" @@ -2896,8 +2986,10 @@ msgid "Centralisation" msgstr "Централизация" #. module: account -#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0 -#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0 +#: field:account.invoice.tax,tax_code_id:0 +#: field:account.tax,description:0 +#: field:account.tax,tax_code_id:0 +#: field:account.tax.template,tax_code_id:0 #: model:ir.model,name:account.model_account_tax_code msgid "Tax Code" msgstr "Код налога" @@ -2937,12 +3029,14 @@ msgid "" msgstr "" #. module: account -#: selection:account.analytic.journal,type:0 selection:account.journal,type:0 +#: selection:account.analytic.journal,type:0 +#: selection:account.journal,type:0 msgid "Situation" msgstr "" #. module: account -#: rml:account.invoice:0 xsl:account.transfer:0 +#: rml:account.invoice:0 +#: xsl:account.transfer:0 msgid "Document" msgstr "Документ" @@ -2980,7 +3074,8 @@ msgid "Cancel selected invoices" msgstr "Отменить выбранные счета" #. module: account -#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0 +#: view:account.analytic.journal:0 +#: field:account.analytic.line,journal_id:0 #: field:account.journal,analytic_journal_id:0 #: model:ir.actions.report.xml,name:account.analytic_journal_print #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report @@ -3003,23 +3098,28 @@ msgid "(" msgstr "(" #. module: account -#: view:account.invoice:0 view:account.period:0 view:account.subscription:0 +#: view:account.invoice:0 +#: view:account.period:0 +#: view:account.subscription:0 msgid "Set to Draft" msgstr "Установить в 'Черновик'" #. module: account -#: help:account.invoice,origin:0 help:account.invoice.line,origin:0 +#: help:account.invoice,origin:0 +#: help:account.invoice.line,origin:0 msgid "Reference of the document that produced this invoice." msgstr "" #. module: account -#: selection:account.account,type:0 selection:account.account.template,type:0 +#: selection:account.account,type:0 +#: selection:account.account.template,type:0 #: selection:account.aged.trial.balance,init,result_selection:0 msgid "Payable" msgstr "К оплате" #. module: account -#: rml:account.invoice:0 field:account.invoice.tax,base:0 +#: rml:account.invoice:0 +#: field:account.invoice.tax,base:0 msgid "Base" msgstr "База" @@ -3029,7 +3129,8 @@ msgid "Model Name" msgstr "Название модели" #. module: account -#: selection:account.account,type:0 selection:account.account.template,type:0 +#: selection:account.account,type:0 +#: selection:account.account.template,type:0 msgid "Others" msgstr "" @@ -3039,13 +3140,15 @@ msgid "8" msgstr "" #. module: account -#: view:account.invoice:0 view:account.move:0 +#: view:account.invoice:0 +#: view:account.move:0 #: wizard_button:account.move.validate,init,validate:0 msgid "Validate" msgstr "Проверить" #. module: account -#: view:account.model:0 field:account.model,legend:0 +#: view:account.model:0 +#: field:account.model,legend:0 msgid "Legend" msgstr "Описание" @@ -3060,14 +3163,17 @@ msgid "account.move.line.select" msgstr "" #. module: account -#: view:account.account:0 rml:account.account.balance:0 +#: view:account.account:0 +#: rml:account.account.balance:0 #: wizard_field:account.account.balance.report,account_selection,Account_list:0 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0 #: field:account.bank.statement.line,account_id:0 #: field:account.bank.statement.reconcile.line,account_id:0 -#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0 +#: field:account.invoice,account_id:0 +#: field:account.invoice.line,account_id:0 #: field:account.journal,account_control_ids:0 -#: field:account.model.line,account_id:0 field:account.move.line,account_id:0 +#: field:account.model.line,account_id:0 +#: field:account.move.line,account_id:0 #: wizard_field:account.move.line.reconcile.select,init,account_id:0 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0 #: model:ir.model,name:account.model_account_account @@ -3088,9 +3194,12 @@ msgid "By Date and Period" msgstr "" #. module: account -#: view:account.account:0 view:account.account.template:0 -#: view:account.bank.statement:0 field:account.bank.statement.line,note:0 -#: field:account.fiscal.position,note:0 view:account.invoice.line:0 +#: view:account.account:0 +#: view:account.account.template:0 +#: view:account.bank.statement:0 +#: field:account.bank.statement.line,note:0 +#: field:account.fiscal.position,note:0 +#: view:account.invoice.line:0 #: field:account.invoice.line,note:0 msgid "Notes" msgstr "Примечания" @@ -3103,7 +3212,8 @@ msgid "" msgstr "" #. module: account -#: rml:account.invoice:0 view:account.invoice:0 +#: rml:account.invoice:0 +#: view:account.invoice:0 #: field:account.invoice.line,invoice_line_tax_id:0 #: model:ir.actions.act_window,name:account.action_tax_form #: model:ir.ui.menu,name:account.menu_action_tax_form @@ -3128,15 +3238,21 @@ msgid "Statement encoding produces payment entries" msgstr "" #. module: account -#: field:account.account,code:0 rml:account.account.balance:0 -#: field:account.account.template,code:0 field:account.account.type,code:0 +#: field:account.account,code:0 +#: rml:account.account.balance:0 +#: field:account.account.template,code:0 +#: field:account.account.type,code:0 #: rml:account.analytic.account.analytic.check:0 #: rml:account.analytic.account.balance:0 #: rml:account.analytic.account.inverted.balance:0 -#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0 -#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0 -#: rml:account.general.journal:0 field:account.journal,code:0 -#: rml:account.partner.balance:0 field:account.period,code:0 +#: rml:account.analytic.account.journal:0 +#: field:account.analytic.line,code:0 +#: field:account.config.wizard,code:0 +#: field:account.fiscalyear,code:0 +#: rml:account.general.journal:0 +#: field:account.journal,code:0 +#: rml:account.partner.balance:0 +#: field:account.period,code:0 msgid "Code" msgstr "Код" @@ -3146,7 +3262,8 @@ msgid "Financial Management" msgstr "Управление финансами" #. module: account -#: selection:account.account.type,close_method:0 selection:account.tax,type:0 +#: selection:account.account.type,close_method:0 +#: selection:account.tax,type:0 #: selection:account.tax.template,type:0 msgid "None" msgstr "Ничего" @@ -3174,7 +3291,8 @@ msgid "Additionnal Information" msgstr "Доп. информация" #. module: account -#: field:account.tax,name:0 field:account.tax.template,name:0 +#: field:account.tax,name:0 +#: field:account.tax.template,name:0 #: rml:account.vat.declaration:0 msgid "Tax Name" msgstr "Название налога" @@ -3251,7 +3369,8 @@ msgid "Partner Balance" msgstr "" #. module: account -#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 msgid "Third Party Ledger" msgstr "" @@ -3264,7 +3383,8 @@ msgstr "" #. module: account #: selection:account.tax,applicable_type:0 -#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0 +#: field:account.tax,python_applicable:0 +#: field:account.tax,python_compute:0 #: selection:account.tax,type:0 #: selection:account.tax.template,applicable_type:0 #: field:account.tax.template,python_applicable:0 @@ -3301,7 +3421,8 @@ msgid "Import invoice" msgstr "" #. module: account -#: view:account.invoice:0 view:wizard.company.setup:0 +#: view:account.invoice:0 +#: view:wizard.company.setup:0 #: view:wizard.multi.charts.accounts:0 msgid "Create" msgstr "Создать" @@ -3317,7 +3438,8 @@ msgid "Invoice line" msgstr "Позиция счета" #. module: account -#: field:account.account,shortcut:0 field:account.account.template,shortcut:0 +#: field:account.account,shortcut:0 +#: field:account.account.template,shortcut:0 msgid "Shortcut" msgstr "Горячая клвиша" @@ -3342,13 +3464,15 @@ msgid "" msgstr "" #. module: account -#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0 +#: field:account.tax,parent_id:0 +#: field:account.tax.template,parent_id:0 msgid "Parent Tax Account" msgstr "" #. module: account #: field:account.account,user_type:0 -#: field:account.account.template,user_type:0 view:account.account.type:0 +#: field:account.account.template,user_type:0 +#: view:account.account.type:0 #: field:account.analytic.account,type:0 #: model:ir.model,name:account.model_account_account_type msgid "Account Type" @@ -3384,7 +3508,8 @@ msgid "Central Journal" msgstr "" #. module: account -#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 msgid "Balance brought forward" msgstr "" @@ -3460,7 +3585,8 @@ msgid "Journal code" msgstr "Код журнала" #. module: account -#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0 +#: wizard_button:account.fiscalyear.close,init,close:0 +#: view:account.model:0 msgid "Create entries" msgstr "Создать проводки" @@ -3516,11 +3642,14 @@ msgid "" msgstr "" #. module: account -#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0 -#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0 +#: field:account.account.type,sequence:0 +#: field:account.invoice.tax,sequence:0 +#: field:account.journal.column,sequence:0 +#: field:account.model.line,sequence:0 #: field:account.payment.term.line,sequence:0 #: field:account.sequence.fiscalyear,sequence_id:0 -#: field:account.tax,sequence:0 field:account.tax.template,sequence:0 +#: field:account.tax,sequence:0 +#: field:account.tax.template,sequence:0 #: field:fiscalyear.seq,sequence_id:0 msgid "Sequence" msgstr "Последовательность" @@ -3586,7 +3715,8 @@ msgstr "Счет подписки" #. module: account #: field:account.model.line,date_maturity:0 -#: field:account.move.line,date_maturity:0 rml:account.overdue:0 +#: field:account.move.line,date_maturity:0 +#: rml:account.overdue:0 msgid "Maturity date" msgstr "Срок плетежа" @@ -3606,7 +3736,8 @@ msgid "Account Configure Wizard " msgstr "" #. module: account -#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0 +#: field:account.config.wizard,date1:0 +#: field:account.fiscalyear,date_start:0 #: field:account.subscription,date_start:0 msgid "Start Date" msgstr "" @@ -3644,7 +3775,8 @@ msgid "Unreconciled" msgstr "" #. module: account -#: field:account.account,note:0 field:account.account.template,note:0 +#: field:account.account,note:0 +#: field:account.account.template,note:0 msgid "Note" msgstr "Заметка" @@ -3668,7 +3800,8 @@ msgid "Entry Sequence" msgstr "Последовательный номер проводки" #. module: account -#: selection:account.account,type:0 selection:account.account.template,type:0 +#: selection:account.account,type:0 +#: selection:account.account.template,type:0 msgid "Closed" msgstr "Закрыто" @@ -3789,9 +3922,12 @@ msgid "Code/Date" msgstr "" #. module: account -#: field:account.account,active:0 field:account.analytic.account,active:0 -#: field:account.analytic.journal,active:0 field:account.journal,active:0 -#: field:account.journal.period,active:0 field:account.payment.term,active:0 +#: field:account.account,active:0 +#: field:account.analytic.account,active:0 +#: field:account.analytic.journal,active:0 +#: field:account.journal,active:0 +#: field:account.journal.period,active:0 +#: field:account.payment.term,active:0 #: field:account.tax,active:0 msgid "Active" msgstr "Активен" @@ -3843,15 +3979,20 @@ msgid "Secondary Currency" msgstr "Вторичная валюта" #. module: account -#: field:account.account,credit:0 rml:account.account.balance:0 +#: field:account.account,credit:0 +#: rml:account.account.balance:0 #: field:account.analytic.account,credit:0 #: rml:account.analytic.account.balance:0 #: rml:account.analytic.account.cost_ledger:0 #: rml:account.analytic.account.inverted.balance:0 -#: rml:account.central.journal:0 rml:account.journal.period.print:0 -#: field:account.model.line,credit:0 field:account.move.line,credit:0 -#: rml:account.partner.balance:0 rml:account.tax.code.entries:0 -#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0 +#: rml:account.central.journal:0 +#: rml:account.journal.period.print:0 +#: field:account.model.line,credit:0 +#: field:account.move.line,credit:0 +#: rml:account.partner.balance:0 +#: rml:account.tax.code.entries:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 #: rml:account.vat.declaration:0 #: field:report.hr.timesheet.invoice.journal,cost:0 msgid "Credit" @@ -3882,7 +4023,8 @@ msgid "Account Move" msgstr "" #. module: account -#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0 +#: view:account.bank.statement:0 +#: field:account.bank.statement,line_ids:0 msgid "Statement lines" msgstr "Позиции выписки" @@ -3974,15 +4116,18 @@ msgid "Journal Column" msgstr "Столбец журнала" #. module: account -#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0 -#: selection:account.journal.period,state:0 selection:account.period,state:0 +#: selection:account.fiscalyear,state:0 +#: selection:account.invoice,state:0 +#: selection:account.journal.period,state:0 +#: selection:account.period,state:0 #: selection:account.subscription,state:0 msgid "Done" msgstr "Выполнено" #. module: account #: wizard_field:account.account.balance.report,checktype,periods:0 -#: field:account.config.wizard,period:0 view:account.fiscalyear:0 +#: field:account.config.wizard,period:0 +#: view:account.fiscalyear:0 #: field:account.fiscalyear,period_ids:0 #: wizard_field:account.general.ledger.report,checktype,periods:0 #: wizard_field:account.partner.balance.report,init,periods:0 @@ -3995,7 +4140,8 @@ msgid "Periods" msgstr "Периоды" #. module: account -#: rml:account.invoice:0 view:account.invoice:0 +#: rml:account.invoice:0 +#: view:account.invoice:0 #: field:account.move.line,invoice:0 #: model:ir.model,name:account.model_account_invoice #: model:res.request.link,name:account.req_link_invoice @@ -4022,7 +4168,8 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..." msgstr "" #. module: account -#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0 +#: field:account.account,tax_ids:0 +#: field:account.account.template,tax_ids:0 msgid "Default Taxes" msgstr "Налоги по умолчанию" @@ -4077,7 +4224,8 @@ msgstr "" #. module: account #: field:account.analytic.account,name:0 #: rml:account.analytic.account.analytic.check:0 -#: rml:account.analytic.account.balance:0 rml:account.central.journal:0 +#: rml:account.analytic.account.balance:0 +#: rml:account.central.journal:0 msgid "Account Name" msgstr "Название счета" @@ -4168,7 +4316,8 @@ msgid "Import file from your bank statement" msgstr "" #. module: account -#: field:account.account,type:0 field:account.account.template,type:0 +#: field:account.account,type:0 +#: field:account.account.template,type:0 msgid "Internal Type" msgstr "" @@ -4194,12 +4343,14 @@ msgid "Posted" msgstr "" #. module: account -#: view:account.tax:0 view:account.tax.template:0 +#: view:account.tax:0 +#: view:account.tax.template:0 msgid "Credit Notes" msgstr "" #. module: account -#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0 +#: field:account.config.wizard,date2:0 +#: field:account.fiscalyear,date_stop:0 msgid "End Date" msgstr "" @@ -4220,7 +4371,8 @@ msgid "Day of the Month" msgstr "" #. module: account -#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0 +#: field:account.analytic.journal,line_ids:0 +#: field:account.tax.code,line_ids:0 msgid "Lines" msgstr "Строк" @@ -4238,7 +4390,8 @@ msgid "" msgstr "" #. module: account -#: view:account.tax:0 view:account.tax.template:0 +#: view:account.tax:0 +#: view:account.tax.template:0 msgid "Tax Declaration" msgstr "Налоговая декларация" @@ -4298,12 +4451,14 @@ msgid "The optional quantity on entries" msgstr "" #. module: account -#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 msgid "JNRL" msgstr "" #. module: account -#: view:account.fiscalyear:0 view:account.period:0 +#: view:account.fiscalyear:0 +#: view:account.period:0 msgid "States" msgstr "Cостояния" @@ -4339,7 +4494,8 @@ msgstr "Дата начала" #: rml:account.analytic.account.balance:0 #: rml:account.analytic.account.inverted.balance:0 #: rml:account.analytic.account.quantity_cost_ledger:0 -#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0 +#: field:account.invoice,amount_total:0 +#: field:account.invoice,check_total:0 msgid "Total" msgstr "Всего" @@ -4456,9 +4612,11 @@ msgstr "" #: field:account.fiscal.position,company_id:0 #: field:account.fiscalyear,company_id:0 #: wizard_field:account.general.ledger.report,checktype,company_id:0 -#: field:account.invoice,company_id:0 field:account.journal,company_id:0 +#: field:account.invoice,company_id:0 +#: field:account.journal,company_id:0 #: wizard_field:account.partner.balance.report,init,company_id:0 -#: field:account.tax,company_id:0 field:account.tax.code,company_id:0 +#: field:account.tax,company_id:0 +#: field:account.tax.code,company_id:0 #: wizard_field:account.third_party_ledger.report,init,company_id:0 #: wizard_field:account.vat.declaration,init,company_id:0 #: field:wizard.company.setup,company_id:0 @@ -4553,9 +4711,12 @@ msgid "Print Aged Trial Balance" msgstr "" #. module: account -#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0 -#: field:account.model.line,ref:0 field:account.move.line,ref:0 -#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0 +#: field:account.analytic.line,ref:0 +#: field:account.bank.statement.line,ref:0 +#: field:account.model.line,ref:0 +#: field:account.move.line,ref:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 msgid "Ref." msgstr "Ссылка" @@ -4605,9 +4766,10 @@ msgid "Account cost and revenue by journal (This Month)" msgstr "Расходы и доходы по журналам (текущий месяц)" #. module: account -#: model:ir.actions.act_window,name:account.action_aged_receivable +#: selection:account.partner.balance.report,init,result_selection:0 +#: selection:account.third_party_ledger.report,init,result_selection:0 msgid "Receivable Accounts" -msgstr "Счета к получению" +msgstr "" #. module: account #: wizard_button:account.move.line.unreconcile.select,init,open:0 @@ -4631,7 +4793,8 @@ msgid "Control Invoice" msgstr "" #. module: account -#: selection:account.account,type:0 selection:account.account.template,type:0 +#: selection:account.account,type:0 +#: selection:account.account.template,type:0 #: selection:account.aged.trial.balance,init,result_selection:0 msgid "Receivable" msgstr "Счета к получению" @@ -4658,7 +4821,8 @@ msgstr "НДС:" #. module: account #: rml:account.analytic.account.cost_ledger:0 #: rml:account.analytic.account.quantity_cost_ledger:0 -#: rml:account.central.journal:0 rml:account.general.journal:0 +#: rml:account.central.journal:0 +#: rml:account.general.journal:0 #: rml:account.invoice:0 msgid "Total:" msgstr "" @@ -4669,7 +4833,8 @@ msgid "account.analytic.journal" msgstr "" #. module: account -#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0 +#: view:account.fiscal.position:0 +#: field:account.fiscal.position,account_ids:0 #: field:account.fiscal.position.template,account_ids:0 msgid "Account Mapping" msgstr "" @@ -4685,7 +4850,8 @@ msgid "Account Reconciliation" msgstr "Сверка счета" #. module: account -#: view:account.bank.statement:0 selection:account.bank.statement,state:0 +#: view:account.bank.statement:0 +#: selection:account.bank.statement,state:0 msgid "Confirm" msgstr "Подтвердить" @@ -4700,7 +4866,8 @@ msgid "Parent Account Template" msgstr "" #. module: account -#: help:account.tax,domain:0 help:account.tax.template,domain:0 +#: help:account.tax,domain:0 +#: help:account.tax.template,domain:0 msgid "" "This field is only used if you develop your own module allowing developers " "to create specific taxes in a custom domain." @@ -4721,7 +4888,8 @@ msgid "Analytic account" msgstr "Счет аналитики" #. module: account -#: rml:account.invoice:0 selection:account.invoice,type:0 +#: rml:account.invoice:0 +#: selection:account.invoice,type:0 msgid "Supplier Invoice" msgstr "Счета поставщиков" @@ -4731,16 +4899,22 @@ msgid "Valid" msgstr "Корректный" #. module: account -#: field:account.account,debit:0 rml:account.account.balance:0 +#: field:account.account,debit:0 +#: rml:account.account.balance:0 #: field:account.analytic.account,debit:0 #: rml:account.analytic.account.balance:0 #: rml:account.analytic.account.cost_ledger:0 #: rml:account.analytic.account.inverted.balance:0 -#: rml:account.central.journal:0 rml:account.general.ledger:0 -#: rml:account.journal.period.print:0 field:account.model.line,debit:0 -#: field:account.move.line,debit:0 rml:account.partner.balance:0 -#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0 -#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0 +#: rml:account.central.journal:0 +#: rml:account.general.ledger:0 +#: rml:account.journal.period.print:0 +#: field:account.model.line,debit:0 +#: field:account.move.line,debit:0 +#: rml:account.partner.balance:0 +#: rml:account.tax.code.entries:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 +#: rml:account.vat.declaration:0 #: field:report.hr.timesheet.invoice.journal,revenue:0 msgid "Debit" msgstr "Дебет" @@ -4802,7 +4976,8 @@ msgid "Reporting" msgstr "Отчетность" #. module: account -#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 msgid "/" msgstr "/" @@ -4833,7 +5008,8 @@ msgid "Configuration" msgstr "Настройки" #. module: account -#: view:account.analytic.line:0 view:account.invoice:0 +#: view:account.analytic.line:0 +#: view:account.invoice:0 msgid "Total amount" msgstr "Итоговая сумма" @@ -4883,12 +5059,14 @@ msgid "Paid invoice" msgstr "" #. module: account -#: view:account.tax:0 view:account.tax.template:0 +#: view:account.tax:0 +#: view:account.tax.template:0 msgid "Tax Definition" msgstr "Определение налога" #. module: account -#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0 +#: field:account.tax,tax_group:0 +#: field:account.tax.template,tax_group:0 msgid "Tax Group" msgstr "Группа налога" @@ -4929,7 +5107,8 @@ msgid "With movements" msgstr "" #. module: account -#: field:account.tax,domain:0 field:account.tax.template,domain:0 +#: field:account.tax,domain:0 +#: field:account.tax.template,domain:0 msgid "Domain" msgstr "Домен" @@ -4954,7 +5133,9 @@ msgid "Manually" msgstr "" #. module: account -#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0 +#: view:account.invoice:0 +#: view:account.tax:0 +#: view:account.tax.template:0 #: selection:account.vat.declaration,init,based_on:0 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened #: model:ir.actions.act_window,name:account.action_invoice_tree @@ -4971,7 +5152,8 @@ msgid "Payable Accounts" msgstr "" #. module: account -#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0 +#: view:account.invoice.line:0 +#: field:account.invoice.tax,invoice_id:0 msgid "Invoice Line" msgstr "Позиция счета" @@ -5022,7 +5204,8 @@ msgid "The optional other currency if it is a multi-currency entry." msgstr "" #. module: account -#: view:account.invoice:0 field:account.invoice,payment_ids:0 +#: view:account.invoice:0 +#: field:account.invoice,payment_ids:0 #: selection:account.vat.declaration,init,based_on:0 msgid "Payments" msgstr "" @@ -5068,9 +5251,12 @@ msgstr "" #. module: account #: selection:account.analytic.account,state:0 #: selection:account.bank.statement,state:0 -#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0 -#: selection:account.journal.period,state:0 selection:account.move,state:0 -#: selection:account.move.line,state:0 selection:account.period,state:0 +#: selection:account.fiscalyear,state:0 +#: selection:account.invoice,state:0 +#: selection:account.journal.period,state:0 +#: selection:account.move,state:0 +#: selection:account.move.line,state:0 +#: selection:account.period,state:0 #: selection:account.subscription,state:0 msgid "Draft" msgstr "Черновик" @@ -5097,7 +5283,8 @@ msgid "Are you sure ?" msgstr "Вы уверены?" #. module: account -#: rml:account.invoice:0 view:account.invoice:0 +#: rml:account.invoice:0 +#: view:account.invoice:0 msgid "PRO-FORMA" msgstr "Проформа" @@ -5133,16 +5320,22 @@ msgid "Supplier Invoice Process" msgstr "" #. module: account -#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0 -#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0 -#: rml:account.journal.period.print:0 rml:account.partner.balance:0 -#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0 -#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0 +#: rml:account.account.balance:0 +#: rml:account.analytic.account.analytic.check:0 +#: rml:account.analytic.account.balance:0 +#: rml:account.general.ledger:0 +#: rml:account.journal.period.print:0 +#: rml:account.partner.balance:0 +#: rml:account.tax.code.entries:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 +#: rml:account.vat.declaration:0 msgid "Page" msgstr "" #. module: account -#: view:account.move:0 view:account.move.line:0 +#: view:account.move:0 +#: view:account.move.line:0 msgid "Optional Information" msgstr "Доп. информация" @@ -5158,7 +5351,8 @@ msgid "Receivable and Payable" msgstr "" #. module: account -#: rml:account.account.balance:0 rml:account.general.journal:0 +#: rml:account.account.balance:0 +#: rml:account.general.journal:0 msgid ":" msgstr ":" @@ -5181,7 +5375,8 @@ msgid "" msgstr "" #. module: account -#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0 +#: view:account.bank.statement:0 +#: view:account.bank.statement.reconcile:0 #: view:account.subscription:0 msgid "Compute" msgstr "Вычислить" @@ -5225,7 +5420,8 @@ msgid "End of period" msgstr "Конец периода" #. module: account -#: view:account.move:0 model:ir.model,name:account.model_account_move +#: view:account.move:0 +#: model:ir.model,name:account.model_account_move msgid "Account Entry" msgstr "Проводка по счету" @@ -5236,7 +5432,8 @@ msgid "General Journal" msgstr "" #. module: account -#: field:account.account,balance:0 rml:account.account.balance:0 +#: field:account.account,balance:0 +#: rml:account.account.balance:0 #: selection:account.account.type,close_method:0 #: field:account.analytic.account,balance:0 #: rml:account.analytic.account.balance:0 @@ -5244,9 +5441,12 @@ msgstr "" #: rml:account.analytic.account.inverted.balance:0 #: field:account.bank.statement,balance_end:0 #: field:account.bank.statement.reconcile,total_balance:0 -#: rml:account.general.ledger:0 field:account.move.line,balance:0 -#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0 -#: selection:account.tax,type:0 rml:account.third_party_ledger:0 +#: rml:account.general.ledger:0 +#: field:account.move.line,balance:0 +#: rml:account.partner.balance:0 +#: selection:account.payment.term.line,value:0 +#: selection:account.tax,type:0 +#: rml:account.third_party_ledger:0 #: rml:account.third_party_ledger_other:0 msgid "Balance" msgstr "Остаток" @@ -5290,8 +5490,11 @@ msgid "The sequence used for invoice numbers in this journal." msgstr "" #. module: account -#: view:account.account:0 view:account.account.template:0 -#: view:account.journal:0 view:account.move:0 view:account.move.line:0 +#: view:account.account:0 +#: view:account.account.template:0 +#: view:account.journal:0 +#: view:account.move:0 +#: view:account.move.line:0 msgid "General Information" msgstr "Общая информация" @@ -5330,7 +5533,8 @@ msgid "List of Accounts" msgstr "Список счетов" #. module: account -#: view:product.product:0 view:product.template:0 +#: view:product.product:0 +#: view:product.template:0 msgid "Sales Properties" msgstr "" @@ -5423,11 +5627,15 @@ msgstr "" #: view:account.analytic.account:0 #: field:account.analytic.account,description:0 #: field:account.analytic.line,name:0 -#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0 -#: field:account.invoice,name:0 field:account.invoice.line,name:0 +#: field:account.bank.statement.reconcile.line,name:0 +#: rml:account.invoice:0 +#: field:account.invoice,name:0 +#: field:account.invoice.line,name:0 #: wizard_field:account.invoice.refund,init,description:0 -#: rml:account.overdue:0 field:account.payment.term,note:0 -#: field:account.tax.code,info:0 field:account.tax.code.template,info:0 +#: rml:account.overdue:0 +#: field:account.payment.term,note:0 +#: field:account.tax.code,info:0 +#: field:account.tax.code.template,info:0 msgid "Description" msgstr "Описание" @@ -5471,7 +5679,8 @@ msgid "" msgstr "" #. module: account -#: field:account.tax.code,code:0 field:account.tax.code.template,code:0 +#: field:account.tax.code,code:0 +#: field:account.tax.code.template,code:0 msgid "Case Code" msgstr "" @@ -5553,7 +5762,8 @@ msgstr "Определенеие моделей" #. module: account #: model:account.account.type,name:account.account_type_cash_moves -#: selection:account.analytic.journal,type:0 selection:account.journal,type:0 +#: selection:account.analytic.journal,type:0 +#: selection:account.journal,type:0 msgid "Cash" msgstr "Наличные" @@ -5593,7 +5803,8 @@ msgid "Keep empty for all open fiscal year" msgstr "" #. module: account -#: rml:account.invoice:0 selection:account.invoice,type:0 +#: rml:account.invoice:0 +#: selection:account.invoice,type:0 msgid "Supplier Refund" msgstr "Возврат средств от поставщика" @@ -5640,8 +5851,10 @@ msgid "" msgstr "" #. module: account -#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0 -#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0 +#: help:account.tax,base_sign:0 +#: help:account.tax,ref_base_sign:0 +#: help:account.tax,ref_tax_sign:0 +#: help:account.tax,tax_sign:0 #: help:account.tax.template,base_sign:0 #: help:account.tax.template,ref_base_sign:0 #: help:account.tax.template,ref_tax_sign:0 @@ -5675,8 +5888,10 @@ msgid "Name of the fiscal year as displayed on screens." msgstr "" #. module: account -#: field:account.invoice,payment_term:0 view:account.payment.term:0 -#: field:account.payment.term,name:0 view:account.payment.term.line:0 +#: field:account.invoice,payment_term:0 +#: view:account.payment.term:0 +#: field:account.payment.term,name:0 +#: view:account.payment.term.line:0 #: field:account.payment.term.line,payment_id:0 #: model:ir.model,name:account.model_account_payment_term #: field:res.partner,property_payment_term:0 @@ -5733,7 +5948,8 @@ msgstr "Да" #. module: account #: help:account.account,reconcile:0 -msgid "Check this if the user is allowed to reconcile entries in this account." +msgid "" +"Check this if the user is allowed to reconcile entries in this account." msgstr "" #. module: account @@ -5744,64 +5960,65 @@ msgstr "" #. module: account #: view:board.board:0 msgid "Analytic accounts to close" -msgstr "Счета аналитики к закрытию" +msgstr "" #. module: account #: view:board.board:0 msgid "Draft invoices" -msgstr "Черновики счетов" +msgstr "" #. module: account #: model:ir.actions.act_window,name:account.open_board_account #: model:ir.ui.menu,name:account.menu_board_account msgid "Accounting Dashboard" -msgstr "Панель бухг. аналитики" +msgstr "" #. module: account -#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account +#: view:board.board:0 +#: model:ir.actions.act_window,name:account.act_my_account msgid "Accounts to invoice" -msgstr "Счета к выставлению" +msgstr "" #. module: account #: view:board.board:0 #: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice msgid "Costs to invoice" -msgstr "Расходы для выставления счетов" +msgstr "" #. module: account #: view:board.board:0 msgid "Aged receivables" -msgstr "Повременный расход" +msgstr "" #. module: account #: model:ir.module.module,shortdesc:account.module_meta_information msgid "Board for accountant" -msgstr "Панель контролёра счетов" +msgstr "" #. module: account #: model:ir.actions.act_window,name:account.action_aged_income msgid "Income Accounts" -msgstr "Счета доходов" +msgstr "" #. module: account #: view:board.board:0 msgid "My indicators" -msgstr "Мои индикаторы" +msgstr "" #. module: account #: view:board.board:0 msgid "Account Board" -msgstr "Панель счетов" +msgstr "" #. module: account #: view:board.board:0 msgid "Aged income" -msgstr "Повременный доход" +msgstr "" #. module: account #: wizard_field:account.balance.account.balance.report,init,show_columns:0 msgid "Show Debit/Credit Information" -msgstr "Показать информацию по дебету / кредиту" +msgstr "" #. module: account #: selection:account.balance.account.balance.report,init,account_choice:0 @@ -5817,7 +6034,7 @@ msgstr "" #: wizard_view:account.balance.account.balance.report,backtoinit:0 #: wizard_view:account.balance.account.balance.report,zero_years:0 msgid "Notification" -msgstr "Уведомление" +msgstr "" #. module: account #: selection:account.balance.account.balance.report,init,period_manner:0 @@ -5828,12 +6045,12 @@ msgstr "" #: model:ir.actions.report.xml,name:account.account_account_balance #: model:ir.actions.report.xml,name:account.account_account_balance_landscape msgid "Account balance" -msgstr "Баланс счета" +msgstr "" #. module: account #: wizard_view:account.balance.account.balance.report,init:0 msgid "Select Period(s)" -msgstr "Выбрать период(ы)" +msgstr "" #. module: account #: selection:account.balance.account.balance.report,init,compare_pattern:0 @@ -5843,22 +6060,22 @@ msgstr "" #. module: account #: wizard_field:account.balance.account.balance.report,init,compare_pattern:0 msgid "Compare Selected Years In Terms Of" -msgstr "Сравнить выбранные годы в терминах" +msgstr "" #. module: account #: wizard_view:account.balance.account.balance.report,init:0 msgid "Select Fiscal Year(s)(Maximum Three Years)" -msgstr "Сравнить учетные годы (Макс. три года)" +msgstr "" #. module: account #: wizard_field:account.balance.account.balance.report,init,select_account:0 msgid "Select Reference Account(for % comparision)" -msgstr "Выберите соответствующий счет (для % сравнения)" +msgstr "" #. module: account #: model:ir.actions.wizard,name:account.wizard_account_balance_report msgid "Account balance-Compare Years" -msgstr "Баланс по счету - сравнить по годам" +msgstr "" #. module: account #: model:ir.module.module,description:account.module_meta_information @@ -5890,7 +6107,7 @@ msgstr "" #. module: account #: wizard_field:account.balance.account.balance.report,init,landscape:0 msgid "Show Report in Landscape Form" -msgstr "Вывести отчет в ландшафной форме" +msgstr "" #. module: account #: rml:account.account.balance.landscape:0 @@ -5901,17 +6118,17 @@ msgstr "" #. module: account #: wizard_field:account.balance.account.balance.report,init,format_perc:0 msgid "Show Comparision in %" -msgstr "Показать сравнение в %" +msgstr "" #. module: account #: wizard_view:account.balance.account.balance.report,init:0 msgid "Select Period" -msgstr "Выберите период" +msgstr "" #. module: account #: wizard_view:account.balance.account.balance.report,init:0 msgid "Report Options" -msgstr "Параметры отчета" +msgstr "" #. module: account #: selection:account.balance.account.balance.report,init,compare_pattern:0 @@ -5921,12 +6138,12 @@ msgstr "" #. module: account #: wizard_field:account.balance.account.balance.report,init,account_choice:0 msgid "Show Accounts" -msgstr "Показать счета" +msgstr "" #. module: account #: wizard_view:account.balance.account.balance.report,backtoinit:0 msgid "1. You have selected more than 3 years in any case." -msgstr "1. В любом случае, выбрано более чем 3 года." +msgstr "" #. module: account #: model:ir.module.module,shortdesc:account.module_meta_information @@ -5977,9 +6194,9 @@ msgstr "" #. module: account #: wizard_view:account.balance.account.balance.report,zero_years:0 msgid "" -"You may have selected the compare options with more than 1 year with credit/" -"debit columns and % option.This can lead contents to be printed out of the " -"paper.Please try again." +"You may have selected the compare options with more than 1 year with " +"credit/debit columns and % option.This can lead contents to be printed out " +"of the paper.Please try again." msgstr "" #. module: account @@ -5990,7 +6207,7 @@ msgstr "" #. module: account #: wizard_view:account.balance.account.balance.report,init:0 msgid "Customize Report" -msgstr "Настройка отчета" +msgstr "" #. module: account #: field:report.aged.receivable,name:0 @@ -5998,12 +6215,12 @@ msgid "Month Range" msgstr "" #. module: account -#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard +#: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard msgid "Invoices Created Within Past 15 Days" msgstr "" #. module: account -#: model:ir.model,name:account.model_report_invoice_created +#: model:ir.model,name:report_account.model_report_invoice_created msgid "Report of Invoices Created within Last 15 days" msgstr "" @@ -6015,17 +6232,17 @@ msgstr "" #. module: account #: view:report.account.receivable:0 msgid "Accounts by type" -msgstr "Счета по типу" +msgstr "" #. module: account -#: model:ir.model,name:account.model_report_aged_receivable +#: model:ir.model,name:report_account.model_report_aged_receivable msgid "Aged Receivable Till Today" msgstr "" #. module: account -#: model:ir.model,name:account.model_report_account_receivable +#: model:ir.model,name:report_account.model_report_account_receivable msgid "Receivable accounts" -msgstr "Дебиторская задолженность" +msgstr "" #. module: account #: field:temp.range,name:0 @@ -6033,25 +6250,25 @@ msgid "Range" msgstr "" #. module: account -#: model:ir.module.module,description:account.module_meta_information +#: model:ir.module.module,description:report_account.module_meta_information msgid "A module that adds new reports based on the account module." msgstr "" #. module: account -#: model:ir.module.module,shortdesc:account.module_meta_information +#: model:ir.module.module,shortdesc:report_account.module_meta_information msgid "Account Reporting - Reporting" msgstr "" #. module: account -#: model:ir.actions.act_window,name:account.action_account_receivable_graph -#: model:ir.ui.menu,name:account.menu_account_receivable_graph +#: model:ir.actions.act_window,name:report_account.action_account_receivable_graph +#: model:ir.ui.menu,name:report_account.menu_account_receivable_graph msgid "Balance by Type of Account" -msgstr "Баланс по типу счетов" +msgstr "" #. module: account #: field:report.account.receivable,name:0 msgid "Week of Year" -msgstr "Неделя года" +msgstr "" #. module: account #: field:report.invoice.created,create_date:0 @@ -6059,7 +6276,7 @@ msgid "Create Date" msgstr "" #. module: account -#: model:ir.actions.act_window,name:account.action_aged_receivable_graph +#: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph #: view:report.aged.receivable:0 msgid "Aged Receivable" msgstr "" diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index af4cee7a7ba..8ee7e3e17dc 100644 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -217,11 +217,11 @@ Balance - [[ repeatIn(lines(data['form']), 'a') ]][[ a['level']>2 and setTag('para','para',{'fontName':"Helvetica"}) ]][[ a['code'] or removeParentNode('tr') ]] - [[ a['level']>2 and setTag('para','para',{'fontName':"Helvetica"}) ]][[ '..'*(a['level']-1) ]][[ a['name'] ]] - [[ a['level']>2 and setTag('para','para',{'fontName':"Helvetica"}) ]][[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['debit']) ]][[ a['type']<>'view' and removeParentNode('font') ]] [[formatLang(a['debit']) ]] - [[ a['level']>2 and setTag('para','para',{'fontName':"Helvetica"}) ]][[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['credit']) ]][[ a['type']<>'view' and removeParentNode('font') ]] [[ formatLang(a['credit']) ]] - [[ a['level']>2 and setTag('para','para',{'fontName':"Helvetica"}) ]][[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['balance']) ]][[ a['type']<>'view' and removeParentNode('font') ]] [[ formatLang(a['balance']) ]] + [[ repeatIn(lines(data['form']), 'a') ]][[ (a['level']>2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]][[ a['code'] or removeParentNode('tr') ]] + [[ (a['level']>2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]][[ '..'*(a['level']-1) ]][[ a['name'] ]] + [[ (a['level']>2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]][[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['debit']) ]][[ a['type']<>'view' and removeParentNode('font') ]] [[formatLang(a['debit']) ]] + [[ (a['level']>2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font')]][[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['credit']) ]][[ a['type']<>'view' and removeParentNode('font') ]] [[ formatLang(a['credit']) ]] + [[ (a['level']>2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]][[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['balance']) ]][[ a['type']<>'view' and removeParentNode('font') ]] [[ formatLang(a['balance']) ]] diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml index 184b087ce95..927bba3e228 100644 --- a/addons/account/report/account_entries_report_view.xml +++ b/addons/account/report/account_entries_report_view.xml @@ -50,36 +50,42 @@ - - - - - - - + + + - - - - - - + - - - - - + + + + + + + + + + + @@ -88,12 +94,20 @@ + + + + + + + + + + + - - - @@ -103,7 +117,7 @@ account.entries.report form tree,graph - {'search_default_profit': 1,'search_default_group_journal':1,'search_default_group_period': 1, 'group_by_no_leaf':1,'group_by':[]} + {'search_default_profit': 1,'search_default_group_account':1,'search_default_group_month': 1, 'group_by_no_leaf':1,'group_by':[]} diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py index 43c8344f110..a06c59da06a 100644 --- a/addons/account/report/account_invoice_report.py +++ b/addons/account/report/account_invoice_report.py @@ -77,84 +77,83 @@ class account_invoice_report(osv.osv): tools.drop_view_if_exists(cr, 'account_invoice_report') cr.execute(""" create or replace view account_invoice_report as ( - select - min(l.id) as id, - s.date_invoice as date, - to_char(s.date_invoice, 'YYYY') as year, - to_char(s.date_invoice, 'MM') as month, - to_char(s.date_invoice, 'YYYY-MM-DD') as day, - l.product_id as product_id, - sum(case when s.type in ('out_refund','in_invoice') then - l.quantity * u.factor * -1 - else - l.quantity * u.factor - end) as product_qty, - s.partner_id as partner_id, - s.reconciled::integer, - s.payment_term as payment_term, - s.period_id as period_id, - u.name as uom_name, - s.currency_id as currency_id, - s.journal_id as journal_id, - s.fiscal_position as fiscal_position, - s.user_id as user_id, - s.company_id as company_id, - sum(case when s.type in ('out_refund','in_invoice') then - l.quantity*l.price_unit * -1 - else - l.quantity*l.price_unit - end) as price_total, - sum(case when s.type in ('out_refund','in_invoice') then - l.quantity*l.price_unit * -1 - else - l.quantity*l.price_unit - end) / sum(l.quantity * u.factor)::decimal(16,2) as price_average, - count(*) as nbr, - s.type as type, - s.state, - pt.categ_id, - s.date_due as date_due, - s.address_contact_id as address_contact_id, - s.address_invoice_id as address_invoice_id, - s.account_id as account_id, - s.partner_bank as partner_bank, - sum(case when s.type in ('out_refund','in_invoice') then - s.residual * -1 - else - s.residual - end) as residual, - case when s.state != 'paid' then null else - extract(epoch from avg(am.date_created-l.create_date))/(24*60*60)::decimal(16,2) - end as delay_to_pay - from account_invoice_line l - left join account_invoice s on (s.id=l.invoice_id) - left join product_template pt on (pt.id=l.product_id) - left join product_uom u on (u.id=l.uos_id), - account_move_line am left join account_invoice i on (i.move_id=am.move_id) - where am.account_id=i.account_id - group by - s.type, - s.date_invoice, - s.partner_id, - l.product_id, - u.name, - l.uos_id, - s.reconciled, - s.user_id, - s.state, - s.residual, - pt.categ_id, - s.company_id, - s.payment_term, - s.period_id, - s.fiscal_position, - s.currency_id, - s.journal_id, - s.date_due, - s.address_contact_id, - s.address_invoice_id, - s.account_id, - s.partner_bank + select min(ail.id) as id, + ai.date_invoice as date, + to_char(ai.date_invoice, 'YYYY') as year, + to_char(ai.date_invoice, 'MM') as month, + to_char(ai.date_invoice, 'YYYY-MM-DD') as day, + ail.product_id, + ai.partner_id as partner_id, + ai.reconciled::integer, + ai.payment_term as payment_term, + ai.period_id as period_id, + u.name as uom_name, + ai.currency_id as currency_id, + ai.journal_id as journal_id, + ai.fiscal_position as fiscal_position, + ai.user_id as user_id, + ai.company_id as company_id, + count(ail.*) as nbr, + ai.type as type, + ai.state, + pt.categ_id, + ai.date_due as date_due, + ai.address_contact_id as address_contact_id, + ai.address_invoice_id as address_invoice_id, + ai.account_id as account_id, + ai.partner_bank as partner_bank, + sum(case when ai.type in ('out_refund','in_invoice') then + ail.quantity * u.factor * -1 + else + ail.quantity * u.factor + end) as product_qty, + sum(case when ai.type in ('out_refund','in_invoice') then + ail.quantity*ail.price_unit * -1 + else + ail.quantity*ail.price_unit + end) as price_total, + sum(ail.quantity*ail.price_unit)/sum(ail.quantity*u.factor)*count(ail.product_id)::decimal(16,2) as price_average, + sum((select extract(epoch from avg(date_trunc('day',aml.date_created)-date_trunc('day',l.create_date)))/(24*60*60)::decimal(16,2) + from account_move_line as aml + left join account_invoice as a ON (a.move_id=aml.move_id) + left join account_invoice_line as l ON (a.id=l.invoice_id) + where a.id=ai.id)) as delay_to_pay, + (case when ai.type in ('out_refund','in_invoice') then + ai.residual * -1 + else + ai.residual + end)/(select count(l.*) from account_invoice_line as l + left join account_invoice as a ON (a.id=l.invoice_id) + where a.id=ai.id) as residual + from account_invoice_line as ail + left join account_invoice as ai ON (ai.id=ail.invoice_id) + left join product_template pt on (pt.id=ail.product_id) + left join product_uom u on (u.id=ail.uos_id) + group by ail.product_id, + ai.date_invoice, + ai.id, + to_char(ai.date_invoice, 'YYYY'), + to_char(ai.date_invoice, 'MM'), + to_char(ai.date_invoice, 'YYYY-MM-DD'), + ai.partner_id, + ai.reconciled, + ai.payment_term, + ai.period_id, + u.name, + ai.currency_id, + ai.journal_id, + ai.fiscal_position, + ai.user_id, + ai.company_id, + ai.type, + ai.state, + pt.categ_id, + ai.date_due, + ai.address_contact_id, + ai.address_invoice_id, + ai.account_id, + ai.partner_bank, + ai.residual ) """) account_invoice_report() diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index f4956939fce..ca89cd10852 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -32,8 +32,8 @@ - - + + @@ -84,7 +84,7 @@ help = "Done Invoices"/> - + - - + + - - + + - - + + - + - - - - - + + + + + diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml index 5358af913de..3f1deb22e6b 100644 --- a/addons/account/report/general_ledger.rml +++ b/addons/account/report/general_ledger.rml @@ -26,7 +26,7 @@ - 1cm 27.7cm 20cm 27.7cm + 0.88cm 27.7cm 20.12cm 27.7cm @@ -105,7 +105,7 @@
[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]] - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] @@ -141,7 +141,7 @@ - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] Date Partner @@ -156,10 +156,10 @@
[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]] - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] - + [[ o.code or '' ]] [[ o.name or '' ]] diff --git a/addons/account/report/partner_balance.rml b/addons/account/report/partner_balance.rml index ff6e1214a1b..2df0f6b47a6 100644 --- a/addons/account/report/partner_balance.rml +++ b/addons/account/report/partner_balance.rml @@ -107,182 +107,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -305,19 +129,19 @@ Balance - + [[ formatLang(solde_debit(data)) ]] [[ formatLang(solde_credit(data)) ]] - [[ repeatIn(lines(data), 'a') ]][[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ a['ref'] ]] [[ a['type']==3 and a['code'] ]] - [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ a['name'] ]] - [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ formatLang(a['debit']) ]] - [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ formatLang(a['credit']) ]] - [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ formatLang(a['balance']) ]] - [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ formatLang(a['enlitige'] or 0.00) ]] + [[ repeatIn(lines(data), 'a') ]][[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]][[ a['ref'] ]] [[ a['type']==3 and a['code'] ]] + [[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]][[ a['name'] ]] + [[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]][[ formatLang(a['debit']) ]] + [[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]][[ formatLang(a['credit']) ]] + [[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]][[ formatLang(a['balance']) ]] + [[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]][[ formatLang(a['enlitige'] or 0.00) ]] diff --git a/addons/account/wizard/account_journal_select_view.xml b/addons/account/wizard/account_journal_select_view.xml index eb081416e89..4fc94ec0d6c 100644 --- a/addons/account/wizard/account_journal_select_view.xml +++ b/addons/account/wizard/account_journal_select_view.xml @@ -8,7 +8,7 @@ form -