openerp-community team mailing list archive
-
openerp-community team
-
Mailing list archive
-
Message #00459
[Merge] lp:~openerp-community/openobject-addons/fix-819242 into lp:openobject-addons
Mustufa Rangwala (Open ERP) has proposed merging lp:~openerp-community/openobject-addons/fix-819242 into lp:openobject-addons.
Requested reviews:
qdp (OpenERP) (qdp)
Mustufa Rangwala (Open ERP) (mra-tinyerp)
Related bugs:
Bug #819242 in OpenERP Addons: "Wrong group on view_move_line_form view in account module"
https://bugs.launchpad.net/openobject-addons/+bug/819242
For more details, see:
https://code.launchpad.net/~openerp-community/openobject-addons/fix-819242/+merge/70114
--
The attached diff has been truncated due to its size.
https://code.launchpad.net/~openerp-community/openobject-addons/fix-819242/+merge/70114
Your team OpenERP Community is subscribed to branch lp:~openerp-community/openobject-addons/fix-819242.
=== modified file 'account/account.py'
--- account/account.py 2011-07-18 08:34:24 +0000
+++ account/account.py 2011-08-02 06:32:40 +0000
@@ -249,7 +249,11 @@
children_and_consolidated = self._get_children_and_consol(cr, uid, ids, context=context)
#compute for each account the balance/debit/credit from the move lines
accounts = {}
+<<<<<<< TREE
res = {}
+=======
+ sums = {}
+>>>>>>> MERGE-SOURCE
if children_and_consolidated:
aml_query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
@@ -285,7 +289,6 @@
# consolidate accounts with direct children
children_and_consolidated.reverse()
brs = list(self.browse(cr, uid, children_and_consolidated, context=context))
- sums = {}
currency_obj = self.pool.get('res.currency')
while brs:
current = brs[0]
@@ -306,6 +309,7 @@
sums[current.id][fn] += sums[child.id][fn]
else:
sums[current.id][fn] += currency_obj.compute(cr, uid, child.company_id.currency_id.id, current.company_id.currency_id.id, sums[child.id][fn], context=context)
+<<<<<<< TREE
null_result = dict((fn, 0.0) for fn in field_names)
for id in ids:
res[id] = sums.get(id, null_result)
@@ -313,6 +317,13 @@
for id in ids:
res[id] = 0.0
return res
+=======
+ res = {}
+ null_result = dict((fn, 0.0) for fn in field_names)
+ for id in ids:
+ res[id] = sums.get(id, null_result)
+ return res
+>>>>>>> MERGE-SOURCE
def _get_company_currency(self, cr, uid, ids, field_name, arg, context=None):
result = {}
@@ -1331,7 +1342,12 @@
def _centralise(self, cr, uid, move, mode, context=None):
assert mode in ('debit', 'credit'), 'Invalid Mode' #to prevent sql injection
+<<<<<<< TREE
currency_obj = self.pool.get('res.currency')
+=======
+ currency_obj = self.pool.get('res.currency')
+ move_line_obj = self.pool.get('account.move.line')
+>>>>>>> MERGE-SOURCE
if context is None:
context = {}
@@ -1358,7 +1374,7 @@
line_id = res[0]
else:
context.update({'journal_id': move.journal_id.id, 'period_id': move.period_id.id})
- line_id = self.pool.get('account.move.line').create(cr, uid, {
+ line_id = move_line_obj.create(cr, uid, {
'name': _(mode.capitalize()+' Centralisation'),
'centralisation': mode,
'account_id': account_id,
@@ -1382,6 +1398,7 @@
cr.execute('SELECT SUM(%s) FROM account_move_line WHERE move_id=%%s AND id!=%%s' % (mode,), (move.id, line_id2))
result = cr.fetchone()[0] or 0.0
cr.execute('update account_move_line set '+mode2+'=%s where id=%s', (result, line_id))
+<<<<<<< TREE
#adjust also the amount in currency if needed
cr.execute("select currency_id, sum(amount_currency) as amount_currency from account_move_line where move_id = %s and currency_id is not null group by currency_id", (move.id,))
@@ -1410,6 +1427,36 @@
'amount_currency': amount_currency,
}, context)
+=======
+
+ #adjust also the amount in currency if needed
+ cr.execute("select currency_id, sum(amount_currency) as amount_currency from account_move_line where move_id = %s and currency_id is not null group by currency_id", (move.id,))
+ for row in cr.dictfetchall():
+ currency_id = currency_obj.browse(cr, uid, row['currency_id'], context=context)
+ if not currency_obj.is_zero(cr, uid, currency_id, row['amount_currency']):
+ amount_currency = row['amount_currency'] * -1
+ account_id = amount_currency > 0 and move.journal_id.default_debit_account_id.id or move.journal_id.default_credit_account_id.id
+ cr.execute('select id from account_move_line where move_id=%s and centralisation=\'currency\' and currency_id = %s limit 1', (move.id, row['currency_id']))
+ res = cr.fetchone()
+ if res:
+ cr.execute('update account_move_line set amount_currency=%s , account_id=%s where id=%s', (amount_currency, account_id, res[0]))
+ else:
+ context.update({'journal_id': move.journal_id.id, 'period_id': move.period_id.id})
+ line_id = move_line_obj.create(cr, uid, {
+ 'name': _('Currency Adjustment'),
+ 'centralisation': 'currency',
+ 'account_id': account_id,
+ 'move_id': move.id,
+ 'journal_id': move.journal_id.id,
+ 'period_id': move.period_id.id,
+ 'date': move.period_id.date_stop,
+ 'debit': 0.0,
+ 'credit': 0.0,
+ 'currency_id': row['currency_id'],
+ 'amount_currency': amount_currency,
+ }, context)
+
+>>>>>>> MERGE-SOURCE
return True
#
@@ -1591,7 +1638,8 @@
AND move.id = line.move_id \
GROUP BY line.tax_code_id',
(parent_ids,) + where_params)
- res=dict(cr.fetchall())
+ res = dict(cr.fetchall())
+ res2 = {}
obj_precision = self.pool.get('decimal.precision')
res2 = {}
for record in self.browse(cr, uid, ids, context=context):
@@ -2698,12 +2746,21 @@
configured_cmp = [r[0] for r in cr.fetchall()]
unconfigured_cmp = list(set(company_ids)-set(configured_cmp))
for field in res['fields']:
+<<<<<<< TREE
if field == 'company_id':
res['fields'][field]['domain'] = unconfigured_cmp
res['fields'][field]['selection'] = [('', '')]
if unconfigured_cmp:
cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
res['fields'][field]['selection'] = cmp_select
+=======
+ if field == 'company_id':
+ res['fields'][field]['domain'] = [('id','in',unconfigured_cmp)]
+ res['fields'][field]['selection'] = [('', '')]
+ if unconfigured_cmp:
+ cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
+ res['fields'][field]['selection'] = cmp_select
+>>>>>>> MERGE-SOURCE
return res
def execute(self, cr, uid, ids, context=None):
@@ -2978,6 +3035,7 @@
acc_cash_id = obj_acc.create(cr,uid,vals)
#create the bank journal
+<<<<<<< TREE
vals_journal = {
'name': vals['name'],
'code': _('BNK') + str(current_num),
@@ -2986,6 +3044,19 @@
'analytic_journal_id': False,
'currency_id': False,
}
+=======
+ analitical_bank_ids = analytic_journal_obj.search(cr,uid,[('type','=','situation')])
+ analitical_journal_bank = analitical_bank_ids and analitical_bank_ids[0] or False
+
+ vals_journal = {}
+ vals_journal['name']= vals['name']
+ vals_journal['code']= _('BNK') + str(current_num)
+ vals_journal['sequence_id'] = seq_id
+ vals_journal['type'] = line.account_type == 'cash' and 'cash' or 'bank'
+ vals_journal['company_id'] = company_id
+ vals_journal['analytic_journal_id'] = analitical_journal_bank
+
+>>>>>>> MERGE-SOURCE
if line.currency_id:
vals_journal['view_id'] = view_id_cur
vals_journal['currency'] = line.currency_id.id
=== modified file 'account/account_move_line.py'
--- account/account_move_line.py 2011-07-18 08:34:24 +0000
+++ account/account_move_line.py 2011-08-02 06:32:40 +0000
@@ -228,11 +228,14 @@
# Starts: Manual entry from account.move form
if context.get('lines',[]):
total_new = 0.00
- for i in context['lines']:
- if i[2]:
- total_new += (i[2]['debit'] or 0.00)- (i[2]['credit'] or 0.00)
- for item in i[2]:
- data[item] = i[2][item]
+ for line_record in context['lines']:
+ if not isinstance(line_record, (tuple, list)):
+ line_record_detail = self.read(cr, uid, line_record, ['analytic_account_id','debit','credit','name','reconcile_id','tax_code_id','tax_amount','account_id','ref','currency_id','date_maturity','amount_currency','partner_id', 'reconcile_partial_id'])
+ else:
+ line_record_detail = line_record[2]
+ total_new += (line_record_detail['debit'] or 0.00)- (line_record_detail['credit'] or 0.00)
+ for item in line_record_detail.keys():
+ data[item] = line_record_detail[item]
if context['journal']:
journal_data = journal_obj.browse(cr, uid, context['journal'], context=context)
if journal_data.type == 'purchase':
@@ -503,8 +506,13 @@
}),
'date_created': fields.date('Creation date', select=True),
'analytic_lines': fields.one2many('account.analytic.line', 'move_id', 'Analytic lines'),
+<<<<<<< TREE
'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation'),('currency','Currency Adjustment')], 'Centralisation', size=8),
'balance': fields.function(_balance, fnct_search=_balance_search, string='Balance'),
+=======
+ 'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation'),('currency','Currency Adjustment')], 'Centralisation', size=8),
+ 'balance': fields.function(_balance, fnct_search=_balance_search, method=True, string='Balance'),
+>>>>>>> MERGE-SOURCE
'state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'State', readonly=True,
help='When new move line is created the state will be \'Draft\'.\n* When all the payments are done it will be in \'Valid\' state.'),
'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or a tax code account."),
@@ -550,7 +558,7 @@
'date_created': lambda *a: time.strftime('%Y-%m-%d'),
'state': 'draft',
'currency_id': _get_currency,
- 'journal_id': lambda self, cr, uid, c: c.get('journal_id', False),
+ 'journal_id': lambda self, cr, uid, c: c.get('journal_id', c.get('journal',False)),
'account_id': lambda self, cr, uid, c: c.get('account_id', False),
'period_id': lambda self, cr, uid, c: c.get('period_id', False),
'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.move.line', context=c)
=== modified file 'account/account_view.xml'
--- account/account_view.xml 2011-07-22 13:42:35 +0000
+++ account/account_view.xml 2011-08-02 06:32:40 +0000
@@ -423,7 +423,7 @@
<group col="2" colspan="2">
<group colspan="2" col="2">
<separator string="Accounts" colspan="4"/>
- <field name="default_debit_account_id" attrs="{'required':[('type','in', ('cash', 'bank'))]}" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
+ <field name="default_debit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
<field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
</group>
<group colspan="2" col="2">
@@ -592,7 +592,23 @@
</field>
</page>
<page string="Journal Entries" name="move_live_ids">
- <field colspan="4" name="move_line_ids" nolabel="1"/>
+ <field colspan="4" name="move_line_ids" nolabel="1" mode="tree,form">
+ <tree string="Journal Items" editable="top" on_write="on_create_write">
+ <field name="move_id"/>
+ <field name="ref"/>
+ <field name="date"/>
+ <field name="period_id"/>
+ <field name="partner_id" on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"/>
+ <field name="account_id"/>
+ <field name="name"/>
+ <field name="journal_id" invisible="1"/>
+ <field name="debit" sum="Total debit"/>
+ <field name="credit" sum="Total credit"/>
+ <field name="reconcile_partial_id" groups="base.group_extended"/>
+ <field name="reconcile_id"/>
+ <field name="state"/>
+ </tree>
+ </field>
</page>
</notebook>
<group col="8" colspan="4">
@@ -1102,7 +1118,7 @@
<separator string="Internal Note" colspan="4"/>
<field name="narration" colspan="4" nolabel="1"/>
</page>
- <page string="Analytic Lines" groups="base.group_analytic_accounting">
+ <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
<field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
</page>
</notebook>
@@ -1149,7 +1165,7 @@
<field name="reconcile_partial_id"/>
<field name="state"/>
</page>
- <page string="Analytic Lines" groups="base.group_analytic_accounting">
+ <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
<field colspan="4" name="analytic_lines" nolabel="1" />
</page>
</notebook>
@@ -1330,7 +1346,7 @@
</group>
<notebook colspan="4">
<page string="Journal Items">
- <field colspan="4" name="line_id" nolabel="1" height="250" widget="one2many_list" default_get="{'lines':line_id ,'journal':journal_id }">
+ <field colspan="4" name="line_id" nolabel="1" height="250" widget="one2many_list" default_get="{'lines':line_id , 'journal':journal_id, 'period_id':period_id}">
<form string="Journal Item">
<group col="6" colspan="4">
<field name="name"/>
@@ -1397,7 +1413,7 @@
<separator string="Internal Note" colspan="4"/>
<field name="narration" colspan="4" nolabel="1"/>
</page>
- <page string="Analytic Lines" groups="base.group_analytic_accounting">
+ <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
<field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
</page>
</notebook>
=== modified file 'account/board_account_view.xml'
--- account/board_account_view.xml 2011-01-14 00:11:01 +0000
+++ account/board_account_view.xml 2011-08-02 06:32:40 +0000
@@ -2,7 +2,7 @@
<openerp>
<data>
- <record id="note_account_type" model="board.note.type">
+ <record id="note_account_type" model="board.note.type">
<field name="name">Accountants</field>
</record>
@@ -20,23 +20,37 @@
<field name="view_mode">graph,tree</field>
<field name="domain">[('type','=','income')]</field>
</record>
- <record id="action_company_analysis_tree" model="ir.actions.act_window">
- <field name="name">Company Analysis</field>
- <field name="res_model">account.entries.report</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,graph</field>
- <field name="context">{'group_by':['user_type'], 'group_by_no_leaf':1}</field>
- <field name="view_id" ref="account.view_account_entries_report_tree"/>
- <field name="domain">[('year','=',time.strftime('%Y'))]</field>
- </record>
- <record id="action_treasory_graph" model="ir.actions.act_window">
- <field name="name">Treasury</field>
- <field name="res_model">account.account</field>
- <field name="view_type">form</field>
- <field name="view_mode">graph,tree</field>
- <field name="domain">[('type','=','liquidity')]</field>
- <field name="view_id" ref="account.view_treasory_graph"/>
- </record>
+
+ <record id="action_company_analysis_tree" model="ir.actions.act_window">
+ <field name="name">Company Analysis</field>
+ <field name="res_model">account.entries.report</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,graph</field>
+ <field name="context">{'group_by':['user_type'], 'group_by_no_leaf':1}</field>
+ <field name="view_id" ref="account.view_account_entries_report_tree"/>
+ <field name="domain">[('year','=',time.strftime('%Y'))]</field>
+ </record>
+
+ <record id="action_treasory_graph" model="ir.actions.act_window">
+ <field name="name">Treasury</field>
+ <field name="res_model">account.account</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">graph,tree</field>
+ <field name="domain">[('type','=','liquidity')]</field>
+ <field name="view_id" ref="account.view_treasory_graph"/>
+ </record>
+
+ <record id="action_draft_customer_invoices_dashboard" model="ir.actions.act_window">
+ <field name="name">Customer Invoices to Approve</field>
+ <field name="res_model">account.invoice</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form,calendar,graph</field>
+ <field eval="False" name="view_id"/>
+ <field name="domain">[('state','=','draft'),('type','=','out_invoice')]</field>
+ <field name="context">{'type':'out_invoice', 'journal_type': 'sale'}</field>
+ <field name="search_view_id" ref="account.view_account_invoice_filter"/>
+ </record>
+
<record id="board_account_form" model="ir.ui.view">
<field name="name">board.account.form</field>
<field name="model">board.board</field>
@@ -45,7 +59,7 @@
<form string="Account Board">
<hpaned>
<child1>
- <action colspan="4" height="160" width="400" name="%(account.action_invoice_tree1)d" string="Customer Invoices to Approve" domain="[('state','=','draft'),('type','=','out_invoice')]"/>
+ <action colspan="4" height="160" width="400" name="%(action_draft_customer_invoices_dashboard)d" string="Customer Invoices to Approve" />
<action colspan="4" height="160" width="400" name="%(action_company_analysis_tree)d" string="Company Analysis" groups="account.group_account_manager"/>
</child1>
<child2>
=== modified file 'account/i18n/account.pot'
--- account/i18n/account.pot 2011-03-09 04:58:22 +0000
+++ account/i18n/account.pot 2011-08-02 06:32:40 +0000
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
+"Project-Id-Version: OpenERP Server 6.0.2\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2011-01-11 11:14:28+0000\n"
-"PO-Revision-Date: 2011-01-11 11:14:28+0000\n"
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2011-05-09 10:18+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,13 +26,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#, python-format
-msgid "No End of year journal defined for the fiscal year"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:506
+#: code:addons/account/account.py:516
#, python-format
msgid "You cannot remove/deactivate an account which is set as a property to any Partner."
msgstr ""
@@ -62,7 +56,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:785
+#: code:addons/account/invoice.py:793
#, python-format
msgid "Please define sequence on invoice journal"
msgstr ""
@@ -123,7 +117,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1291
+#: code:addons/account/account.py:1305
#, python-format
msgid "You can not delete posted movement: \"%s\"!"
msgstr ""
@@ -165,7 +159,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1421
+#: code:addons/account/invoice.py:1436
#, python-format
msgid "Warning!"
msgstr ""
@@ -214,7 +208,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:901
+#: code:addons/account/account.py:915
#, python-format
msgid "No period defined for this date: %s !\n"
"Please create a fiscal year."
@@ -237,7 +231,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1210
+#: code:addons/account/invoice.py:1224
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
msgstr ""
@@ -253,7 +247,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1176
+#: code:addons/account/account_move_line.py:1182
#, python-format
msgid "You can not add/modify entries in a closed journal."
msgstr ""
@@ -291,7 +285,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:529
+#: code:addons/account/invoice.py:532
#, python-format
msgid "Invoice line account company does not match with invoice company."
msgstr ""
@@ -518,7 +512,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_cash_statement.py:348
+#: code:addons/account/account_cash_statement.py:349
#, python-format
msgid "CashBox Balance is not matching with Calculated Balance !"
msgstr ""
@@ -598,7 +592,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2779
+#: code:addons/account/account.py:2823
#: code:addons/account/installer.py:434
#, python-format
msgid "SAJ"
@@ -631,8 +625,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
#, python-format
msgid "To reconcile the entries company should be the same for all entries"
msgstr ""
@@ -693,7 +687,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:39
+#: code:addons/account/wizard/account_change_currency.py:38
#, python-format
msgid "You can only change currency for Draft Invoice !"
msgstr ""
@@ -791,7 +785,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1191
+#: code:addons/account/account_move_line.py:1197
#, python-format
msgid "You can not do this modification on a confirmed entry ! Please note that you can just change some non important fields !"
msgstr ""
@@ -816,6 +810,7 @@
#. module: account
#: report:account.overdue:0
+#: report:account.aged_trial_balance:0
msgid "Due"
msgstr ""
@@ -904,15 +899,19 @@
#: field:account.journal,code:0
#: report:account.partner.balance:0
#: field:account.period,code:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Code"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
+#: code:addons/account/account_move_line.py:169
#: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:670
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "No Analytic Journal !"
@@ -989,7 +988,6 @@
#. module: account
#: report:account.analytic.account.journal:0
-#: report:account.move.voucher:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "-"
@@ -1071,6 +1069,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
@@ -1078,7 +1077,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:976
+#: code:addons/account/account.py:990
#, python-format
msgid "You can not modify/delete a journal with entries for this period !"
msgstr ""
@@ -1216,8 +1215,8 @@
msgstr ""
#. module: account
-#: model:ir.actions.act_window,name:account.action_partner_all
#: model:ir.ui.menu,name:account.next_id_22
+#: report:account.aged_trial_balance:0
msgid "Partners"
msgstr ""
@@ -1246,7 +1245,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "You can not use this general account in this journal !"
msgstr ""
@@ -1334,7 +1333,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:815
+#: code:addons/account/invoice.py:823
#, python-format
msgid "Cannot create the invoice !\n"
"The payment term defined gives a computed amount greater than the total invoiced amount."
@@ -1346,14 +1345,9 @@
msgstr ""
#. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-#: selection:account.bank.statement,state:0
-#: selection:account.entries.report,type:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.period,state:0
-msgid "Closed"
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
msgstr ""
#. module: account
@@ -1484,7 +1478,6 @@
msgstr ""
#. module: account
-#: field:account.bank.statement,user_id:0
#: view:account.invoice:0
msgid "Responsible"
msgstr ""
@@ -1526,11 +1519,6 @@
msgstr ""
#. module: account
-#: model:ir.actions.report.xml,name:account.report_account_voucher_new
-msgid "Print Voucher"
-msgstr ""
-
-#. module: account
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
msgstr ""
@@ -1546,7 +1534,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:799
#, python-format
msgid "The account is not defined to be reconciled !"
msgstr ""
@@ -1577,7 +1565,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:806
#, python-format
msgid "You have to provide an account for the write off entry !"
msgstr ""
@@ -1593,11 +1581,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Ref. :"
-msgstr ""
-
-#. module: account
#: view:account.analytic.chart:0
msgid "Analytic Account Charts"
msgstr ""
@@ -1613,7 +1596,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_cash_statement.py:328
+#: code:addons/account/account_cash_statement.py:329
#, python-format
msgid "User %s does not have rights to access %s journal !"
msgstr ""
@@ -1634,7 +1617,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:499
+#: code:addons/account/account.py:509
#, python-format
msgid "You cannot deactivate an account that contains account moves."
msgstr ""
@@ -1650,7 +1633,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:519
+#: code:addons/account/account.py:529
#, python-format
msgid "You cannot change the type of account from 'Closed' to any other type which contains account entries!"
msgstr ""
@@ -1802,11 +1785,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Canceled"
-msgstr ""
-
-#. module: account
#: view:account.invoice:0
#: view:report.invoice.created:0
msgid "Untaxed Amount"
@@ -1904,7 +1882,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
#, python-format
msgid "There is no default default debit account defined \n"
"on journal \"%s\""
@@ -1947,7 +1925,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2844
+#: code:addons/account/account.py:2888
#: code:addons/account/installer.py:498
#, python-format
msgid "ECNJ"
@@ -1967,7 +1945,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:352
+#: code:addons/account/invoice.py:351
#, python-format
msgid "There is no Accounting Journal of type Sale/Purchase defined!"
msgstr ""
@@ -1978,6 +1956,7 @@
msgstr ""
#. module: account
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.print.journal,sort_selection:0
msgid "Entries Sorted By"
@@ -2006,6 +1985,7 @@
#: field:account.fiscalyear,name:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.journal.period,fiscalyear_id:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -2015,6 +1995,11 @@
#: report:account.third_party_ledger_other:0
#: report:account.vat.declaration:0
#: model:ir.model,name:account.model_account_fiscalyear
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
msgid "Fiscal Year"
msgstr ""
@@ -2113,7 +2098,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:545
+#: code:addons/account/invoice.py:552
#, python-format
msgid "Can't find any account journal of %s type for this company.\n"
"\n"
@@ -2176,7 +2161,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2796
+#: code:addons/account/account.py:2840
#: code:addons/account/installer.py:454
#, python-format
msgid "EXJ"
@@ -2253,7 +2238,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:350
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -2265,13 +2250,12 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
#: report:account.overdue:0
msgid "Date:"
msgstr ""
#. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:654
#, python-format
msgid "You cannot modify company of this journal as its related record exist in Entry Lines"
msgstr ""
@@ -2305,6 +2289,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.overdue:0
#: report:account.third_party_ledger:0
@@ -2407,16 +2392,16 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1195
#, python-format
msgid "No sequence defined on the journal !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
-#: code:addons/account/invoice.py:670
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2464,11 +2449,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Number:"
-msgstr ""
-
-#. module: account
#: selection:account.print.journal,sort_selection:0
msgid "Reference Number"
msgstr ""
@@ -2567,7 +2547,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:822
+#: code:addons/account/account.py:836
#, python-format
msgid "No fiscal year defined for this date !\n"
"Please create one."
@@ -2676,6 +2656,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
@@ -2683,6 +2664,9 @@
#. module: account
#: code:addons/account/account.py:2906
+=======
+#: code:addons/account/account.py:2950
+>>>>>>> MERGE-SOURCE
#: code:addons/account/installer.py:296
#, python-format
msgid "BNK"
@@ -2767,6 +2751,12 @@
msgstr ""
#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+#, python-format
+msgid "No End of year journal defined for the fiscal year"
+msgstr ""
+
+#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the expense account"
@@ -2785,6 +2775,7 @@
#: field:account.common.report,journal_ids:0
#: report:account.general.journal:0
#: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger_landscape:0
#: view:account.journal.period:0
#: report:account.partner.balance:0
#: field:account.partner.balance,journal_ids:0
@@ -2845,7 +2836,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "No Partner Defined !"
msgstr ""
@@ -2873,11 +2864,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Journal:"
-msgstr ""
-
-#. module: account
#: view:account.bank.statement:0
#: selection:account.bank.statement,state:0
#: view:account.invoice:0
@@ -2885,7 +2871,6 @@
#: view:account.invoice.report:0
#: selection:account.invoice.report,state:0
#: selection:account.journal.period,state:0
-#: report:account.move.voucher:0
#: view:account.subscription:0
#: selection:account.subscription,state:0
#: selection:report.invoice.created,state:0
@@ -2925,17 +2910,12 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Authorised Signatory"
-msgstr ""
-
-#. module: account
#: view:validate.account.move.lines:0
msgid "All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore."
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Cannot delete invoice(s) that are already opened or paid !"
msgstr ""
@@ -2951,8 +2931,10 @@
msgstr ""
#. module: account
-#: view:account.payment.term.line:0
-msgid " value amount: n.a"
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
msgstr ""
#. module: account
@@ -2994,13 +2976,14 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:532
#, python-format
msgid "You cannot change the type of account from '%s' to '%s' type as it contains account entries!"
msgstr ""
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
msgid "Counterpart"
msgstr ""
@@ -3103,6 +3086,7 @@
#: field:account.entries.report,date:0
#: selection:account.general.journal,filter:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice.report,date:0
#: report:account.journal.period.print:0
#: view:account.move:0
@@ -3146,20 +3130,20 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2095
+#: code:addons/account/account.py:2109
#, python-format
msgid "Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!\n"
"Please define partner on it!"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:810
+#: code:addons/account/account_move_line.py:801
#, python-format
msgid "Some entries are already reconciled !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1204
+#: code:addons/account/account.py:1218
#, python-format
msgid "You cannot validate a Journal Entry unless all journal items are in same chart of accounts !"
msgstr ""
@@ -3273,7 +3257,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "Unable to change tax !"
msgstr ""
@@ -3284,13 +3268,13 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1422
+#: code:addons/account/invoice.py:1437
#, python-format
msgid "You selected an Unit of Measure which is not compatible with the product."
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#, python-format
msgid "The Payment Term of Supplier does not have Payment Term Lines(Computation) defined !"
msgstr ""
@@ -3567,7 +3551,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:714
+#: code:addons/account/invoice.py:722
#, python-format
msgid "Global taxes defined, but are not in invoice lines !"
msgstr ""
@@ -3621,7 +3605,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:91
+#: code:addons/account/account_analytic_line.py:90
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -3795,7 +3779,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "Unable to find a valid period !"
@@ -3843,6 +3827,13 @@
msgstr ""
#. module: account
+#: constraint:account.account:0
+#: constraint:account.account.template:0
+msgid "Configuration Error! \n"
+"You cannot define children to an account with internal type different of \"View\"! "
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
msgid "Account Analytic Cost Ledger For Journal Report"
msgstr ""
@@ -3864,11 +3855,11 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1290
-#: code:addons/account/account.py:1318
-#: code:addons/account/account.py:1325
-#: code:addons/account/account_move_line.py:1055
-#: code:addons/account/invoice.py:896
+#: code:addons/account/account.py:1304
+#: code:addons/account/account.py:1332
+#: code:addons/account/account.py:1339
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/invoice.py:904
#: code:addons/account/wizard/account_automatic_reconcile.py:152
#: code:addons/account/wizard/account_fiscalyear_close.py:78
#: code:addons/account/wizard/account_fiscalyear_close.py:81
@@ -3921,12 +3912,6 @@
msgstr ""
#. module: account
-#: constraint:account.account:0
-msgid "You cannot create an account! \n"
-"Make sure if the account has children then it should be type \"View\"!"
-msgstr ""
-
-#. module: account
#: view:account.subscription.generate:0
#: model:ir.actions.act_window,name:account.action_account_subscription_generate
#: model:ir.ui.menu,name:account.menu_generate_subscription
@@ -3971,7 +3956,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1397
+#: code:addons/account/account.py:1411
#, python-format
msgid "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."
msgstr ""
@@ -3998,6 +3983,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
msgstr ""
@@ -4030,7 +4024,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid "Please verify the price of the invoice !\n"
"The real total does not match the computed total."
@@ -4141,29 +4135,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:938
-#: code:addons/account/account.py:940
-#: code:addons/account/account.py:1181
-#: code:addons/account/account.py:1393
-#: code:addons/account/account.py:1397
-#: code:addons/account/account_cash_statement.py:249
-#: code:addons/account/account_move_line.py:780
-#: code:addons/account/account_move_line.py:803
-#: code:addons/account/account_move_line.py:805
-#: code:addons/account/account_move_line.py:808
-#: code:addons/account/account_move_line.py:810
-#: code:addons/account/account_move_line.py:1117
-#: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_change_currency.py:39
-#: code:addons/account/wizard/account_change_currency.py:60
-#: code:addons/account/wizard/account_change_currency.py:65
-#: code:addons/account/wizard/account_change_currency.py:71
-#: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#: code:addons/account/wizard/account_report_common.py:120
-#: code:addons/account/wizard/account_report_common.py:126
-#, python-format
-msgid "Error"
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid "With Supplier Refunds you can manage the credit notes you receive from your suppliers. A refund is a document that credits an invoice completely or partially. You can easily generate refunds and reconcile them directly from the invoice form."
msgstr ""
#. module: account
@@ -4181,7 +4154,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:720
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Taxes missing !"
msgstr ""
@@ -4234,7 +4207,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1210
+#: code:addons/account/account.py:1224
#, python-format
msgid "You can not modify a posted entry of this journal !\n"
"You should set the journal to allow cancelling entries if you want to do that."
@@ -4251,7 +4224,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:940
+#: code:addons/account/account.py:954
#, python-format
msgid "Start period should be smaller then End period"
msgstr ""
@@ -4281,6 +4254,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,target_move:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.journal,target_move:0
#: report:account.partner.balance:0
@@ -4293,6 +4267,11 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,target_move:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
msgid "Target Moves"
msgstr ""
@@ -4362,7 +4341,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid "Integrity Error !"
msgstr ""
@@ -4408,6 +4387,8 @@
#: view:account.bs.report:0
#: model:ir.actions.act_window,name:account.action_account_bs_report
#: model:ir.ui.menu,name:account.menu_account_bs_report
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
msgid "Balance Sheet"
msgstr ""
@@ -4500,12 +4481,7 @@
msgstr ""
#. module: account
-#: constraint:account.move.line:0
-msgid "You can not create move line on receivable/payable account without partner"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "No period found !"
@@ -4575,7 +4551,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2896
+#: code:addons/account/account.py:2940
#: code:addons/account/installer.py:283
#: code:addons/account/installer.py:295
#, python-format
@@ -4603,7 +4579,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1193
+#: code:addons/account/account_move_line.py:1199
#, python-format
msgid "You can not do this modification on a reconciled entry ! Please note that you can just change some non important fields !"
msgstr ""
@@ -4657,12 +4633,12 @@
#. module: account
#: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:405
-#: code:addons/account/invoice.py:505
-#: code:addons/account/invoice.py:520
-#: code:addons/account/invoice.py:528
-#: code:addons/account/invoice.py:545
-#: code:addons/account/invoice.py:1347
+#: code:addons/account/invoice.py:408
+#: code:addons/account/invoice.py:508
+#: code:addons/account/invoice.py:523
+#: code:addons/account/invoice.py:531
+#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:1361
#: code:addons/account/wizard/account_move_journal.py:63
#, python-format
msgid "Configuration Error !"
@@ -4734,7 +4710,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1326
+#: code:addons/account/account.py:1340
#, python-format
msgid "There is no default default credit account defined \n"
"on journal \"%s\""
@@ -4870,7 +4846,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:738
+#: code:addons/account/account_move_line.py:729
#, python-format
msgid "Already Reconciled!"
msgstr ""
@@ -4904,7 +4880,7 @@
#. module: account
#: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:821
#, python-format
msgid "Write-Off"
msgstr ""
@@ -5029,7 +5005,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:60
+#: code:addons/account/wizard/account_change_currency.py:59
#, python-format
msgid "New currency is not confirured properly !"
msgstr ""
@@ -5054,14 +5030,14 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "You can not use an inactive account!"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:794
#, python-format
msgid "Entries are not of the same account or already reconciled ! "
msgstr ""
@@ -5096,7 +5072,7 @@
#. module: account
#: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -5297,7 +5273,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:546
#, python-format
msgid "You cannot modify Company of account as its related record exist in Entry Lines"
msgstr ""
@@ -5549,9 +5525,9 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:406
-#: code:addons/account/invoice.py:506
-#: code:addons/account/invoice.py:1348
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
#, python-format
msgid "Can not find account chart for this company, Please Create account."
msgstr ""
@@ -5698,8 +5674,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:143
-#: code:addons/account/account_move_line.py:905
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
#, python-format
msgid "Entries: "
msgstr ""
@@ -5710,7 +5686,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1393
+#: code:addons/account/account.py:1407
#, python-format
msgid "Couldn't create move between different companies"
msgstr ""
@@ -5738,7 +5714,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:781
+#: code:addons/account/account_move_line.py:772
#, python-format
msgid "Entry \"%s\" is not valid !"
msgstr ""
@@ -5797,30 +5773,31 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:499
-#: code:addons/account/account.py:501
-#: code:addons/account/account.py:822
-#: code:addons/account/account.py:901
-#: code:addons/account/account.py:976
-#: code:addons/account/account.py:1204
-#: code:addons/account/account.py:1210
-#: code:addons/account/account.py:2095
-#: code:addons/account/account.py:2333
-#: code:addons/account/account_analytic_line.py:90
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account.py:509
+#: code:addons/account/account.py:511
+#: code:addons/account/account.py:836
+#: code:addons/account/account.py:915
+#: code:addons/account/account.py:990
+#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2357
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
#: code:addons/account/account_bank_statement.py:292
#: code:addons/account/account_bank_statement.py:305
#: code:addons/account/account_bank_statement.py:345
-#: code:addons/account/account_cash_statement.py:328
-#: code:addons/account/account_cash_statement.py:348
-#: code:addons/account/account_move_line.py:1176
-#: code:addons/account/account_move_line.py:1191
-#: code:addons/account/account_move_line.py:1193
-#: code:addons/account/invoice.py:785
-#: code:addons/account/invoice.py:815
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1197
+#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:1014
#: code:addons/account/wizard/account_invoice_refund.py:100
#: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
#: code:addons/account/wizard/account_use_model.py:44
#, python-format
msgid "Error !"
@@ -5874,6 +5851,11 @@
msgstr ""
#. module: account
+#: report:account.general.ledger_landscape:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
#: view:account.partner.balance:0
#: view:account.partner.ledger:0
msgid "This report is an analysis done by a partner. It is a PDF report containing one line per partner representing the cumulative credit balance"
@@ -5921,7 +5903,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:65
+#: code:addons/account/wizard/account_change_currency.py:64
#, python-format
msgid "Currnt currency is not confirured properly !"
msgstr ""
@@ -5938,9 +5920,11 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.report.general.ledger:0
#: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
#: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
#: model:ir.ui.menu,name:account.menu_general_ledger
msgid "General Ledger"
msgstr ""
@@ -5983,11 +5967,13 @@
#: report:account.general.journal:0
#: report:account.invoice:0
#: report:account.partner.balance:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Total:"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2050
+#: code:addons/account/account.py:2064
#, python-format
msgid "You can specify year, month and date in the name of the model using the following labels:\n"
"\n"
@@ -6015,7 +6001,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#: code:addons/account/wizard/account_invoice_refund.py:137
#, python-format
msgid "Data Insufficient !"
@@ -6147,7 +6133,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:521
+#: code:addons/account/invoice.py:524
#, python-format
msgid "Can not find account chart for this company in invoice line account, Please Create account."
msgstr ""
@@ -6301,7 +6287,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:938
+#: code:addons/account/account.py:952
#, python-format
msgid "You should have chosen periods that belongs to the same company"
msgstr ""
@@ -6395,7 +6381,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_cash_statement.py:249
+#: code:addons/account/account_cash_statement.py:250
#, python-format
msgid "You can not have two open register for the same journal"
msgstr ""
@@ -6418,7 +6404,6 @@
#. module: account
#: report:account.invoice:0
#: view:account.invoice:0
-#: report:account.move.voucher:0
msgid "PRO-FORMA"
msgstr ""
@@ -6428,10 +6413,8 @@
msgstr ""
#. module: account
-#: selection:account.entries.report,move_line_state:0
-#: view:account.move.line:0
-#: selection:account.move.line,state:0
-msgid "Unbalanced"
+#: view:account.payment.term.line:0
+msgid " value amount: n.a"
msgstr ""
#. module: account
@@ -6446,6 +6429,7 @@
#. module: account
#: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
#: view:account.journal:0
#: field:account.journal,user_id:0
#: view:analytic.entries.report:0
@@ -6469,13 +6453,13 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "Bad account !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2777
+#: code:addons/account/account.py:2821
#: code:addons/account/installer.py:432
#, python-format
msgid "Sales Journal"
@@ -6493,7 +6477,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid "No piece number !"
msgstr ""
@@ -6714,17 +6698,17 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:506
-#: code:addons/account/account.py:519
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
#: code:addons/account/account.py:532
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:927
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/invoice.py:714
-#: code:addons/account/invoice.py:717
-#: code:addons/account/invoice.py:720
+#: code:addons/account/account.py:546
+#: code:addons/account/account.py:654
+#: code:addons/account/account.py:941
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Warning !"
msgstr ""
@@ -6747,15 +6731,11 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Amount (in words) :"
-msgstr ""
-
-#. module: account
#: field:account.bank.statement.line,partner_id:0
#: view:account.entries.report:0
#: field:account.entries.report,partner_id:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: field:account.invoice,partner_id:0
#: field:account.invoice.line,partner_id:0
@@ -6786,7 +6766,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "No Invoice Lines !"
msgstr ""
@@ -6833,7 +6813,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:359
+#: code:addons/account/invoice.py:360
#, python-format
msgid "Invoice '%s' is paid."
msgstr ""
@@ -6890,7 +6870,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "You must first select a partner !"
msgstr ""
@@ -6952,7 +6932,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2841
+#: code:addons/account/account.py:2885
#: code:addons/account/installer.py:495
#, python-format
msgid "Purchase Refund Journal"
@@ -6985,6 +6965,7 @@
#: view:account.entries.report:0
#: field:account.entries.report,period_id:0
#: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: view:account.invoice.report:0
#: field:account.journal.period,period_id:0
@@ -7072,6 +7053,11 @@
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
msgid "Chart of Account"
msgstr ""
@@ -7130,7 +7116,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:897
+#: code:addons/account/invoice.py:905
#, python-format
msgid "Cannot create invoice move on centralised journal"
msgstr ""
@@ -7180,7 +7166,12 @@
#: report:account.account.balance:0
#: report:account.central.journal:0
#: report:account.general.journal:0
+#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Filter By"
msgstr ""
@@ -7214,7 +7205,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2794
+#: code:addons/account/account.py:2838
#: code:addons/account/installer.py:452
#, python-format
msgid "Purchase Journal"
@@ -7374,8 +7365,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "Bad account!"
msgstr ""
@@ -7386,7 +7377,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1056
+#: code:addons/account/account_move_line.py:1062
#, python-format
msgid "The account move (%s) for centralisation has been confirmed!"
msgstr ""
@@ -7405,6 +7396,7 @@
#: field:account.entries.report,currency_id:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice,currency_id:0
#: field:account.invoice.report,currency_id:0
#: field:account.journal,currency:0
@@ -7557,14 +7549,14 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2817
+#: code:addons/account/account.py:2861
#: code:addons/account/installer.py:476
#, python-format
msgid "Sales Refund Journal"
msgstr ""
#. module: account
-#: code:addons/account/account.py:927
+#: code:addons/account/account.py:941
#, python-format
msgid "You cannot modify company of this period as its related record exist in Entry Lines"
msgstr ""
@@ -7611,7 +7603,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "Please create some invoice lines."
msgstr ""
@@ -7627,7 +7619,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2820
+#: code:addons/account/account.py:2864
#: code:addons/account/installer.py:479
#, python-format
msgid "SCNJ"
@@ -7659,6 +7651,7 @@
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
@@ -7668,13 +7661,14 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2333
+#: code:addons/account/account.py:2357
#, python-format
msgid "Cannot locate parent code for template account!"
msgstr ""
#. module: account
#: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
msgid "Analysis Direction"
msgstr ""
@@ -7705,7 +7699,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/invoice.py:1014
#, python-format
msgid "You cannot cancel the Invoice which is Partially Paid! You need to unreconcile concerned payment entries!"
msgstr ""
@@ -7731,14 +7725,34 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:70
#, python-format
msgid "Current currency is not confirured properly !"
msgstr ""
#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree4
-msgid "With Supplier Refunds you can manage the credit notes you receive from your suppliers. A refund is a document that credits an invoice completely or partially. You can easily generate refunds and reconcile them directly from the invoice form."
+#: code:addons/account/account.py:952
+#: code:addons/account/account.py:954
+#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1411
+#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:120
+#: code:addons/account/wizard/account_report_common.py:126
+#, python-format
+msgid "Error"
msgstr ""
#. module: account
@@ -7747,11 +7761,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Particulars"
-msgstr ""
-
-#. module: account
#: selection:account.account.type,report_type:0
msgid "Profit & Loss (Income Accounts)"
msgstr ""
@@ -7776,6 +7785,7 @@
#: field:account.entries.report,balance:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.move.line,balance:0
#: report:account.partner.balance:0
#: selection:account.payment.term.line,value:0
@@ -7784,6 +7794,10 @@
#: report:account.third_party_ledger_other:0
#: field:report.account.receivable,balance:0
#: field:report.aged.receivable,balance:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Balance"
msgstr ""
@@ -7794,6 +7808,11 @@
#. module: account
#: report:account.account.balance:0
+#: report:account.general.ledger_landscape:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Display Account"
msgstr ""
@@ -7875,11 +7894,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Receiver's Signature"
-msgstr ""
-
-#. module: account
#: report:account.general.ledger:0
#: report:account.journal.period.print:0
#: report:account.third_party_ledger:0
@@ -7895,6 +7909,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.line,move_id:0
#: field:analytic.entries.report,move_id:0
@@ -7902,7 +7917,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "You can not change the tax, you should remove and recreate lines !"
msgstr ""
@@ -7992,6 +8007,7 @@
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
@@ -8035,7 +8051,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:717
+#: code:addons/account/invoice.py:725
#, python-format
msgid "Tax base different !\n"
"Click on compute to update tax base"
@@ -8061,6 +8077,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_from:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_start:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -8073,6 +8090,7 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,date_from:0
+#: report:account.aged_trial_balance:0
msgid "Start Date"
msgstr ""
@@ -8089,7 +8107,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid "Bad total !"
msgstr ""
@@ -8140,13 +8158,13 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:354
+#: code:addons/account/invoice.py:353
#, python-format
msgid "Unknown Error"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid "You cannot validate a non-balanced entry !\n"
"Make sure you have configured Payment Term properly !\n"
@@ -8186,10 +8204,10 @@
#: field:account.entries.report,credit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,credit:0
#: field:account.move.line,credit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -8205,11 +8223,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Through :"
-msgstr ""
-
-#. module: account
#: view:account.general.journal:0
#: model:ir.ui.menu,name:account.menu_account_general_journal
msgid "General Journals"
@@ -8381,11 +8394,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "State:"
-msgstr ""
-
-#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_running
msgid "Running Subscriptions"
msgstr ""
@@ -8412,7 +8420,6 @@
#: view:account.move:0
#: selection:account.move,state:0
#: view:account.move.line:0
-#: report:account.move.voucher:0
msgid "Posted"
msgstr ""
@@ -8431,6 +8438,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_to:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_stop:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -8484,7 +8492,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:100
+#: code:addons/account/account_analytic_line.py:99
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -8520,6 +8528,7 @@
#: field:report.account.sales,amount_total:0
#: field:report.account_type.sales,amount_total:0
#: field:report.invoice.created,amount_total:0
+#: report:account.aged_trial_balance:0
msgid "Total"
msgstr ""
@@ -8630,8 +8639,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:738
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:806
#: code:addons/account/wizard/account_invoice_state.py:44
#: code:addons/account/wizard/account_invoice_state.py:68
#: code:addons/account/wizard/account_report_balance_sheet.py:70
@@ -8649,14 +8658,14 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "On Account of :"
-msgstr ""
-
-#. module: account
-#: view:account.automatic.reconcile:0
-#: view:account.move.line.reconcile.writeoff:0
-msgid "Write-Off Move"
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
msgstr ""
#. module: account
@@ -8695,10 +8704,10 @@
#: field:account.entries.report,debit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,debit:0
#: field:account.move.line,debit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -8719,18 +8728,12 @@
msgstr ""
#. module: account
-#: constraint:account.account.template:0
-msgid "You cannot create an account template! \n"
-"Make sure if the account template has parent then it should be type \"View\"! "
-msgstr ""
-
-#. module: account
#: view:account.subscription:0
msgid "Recurring"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:805
+#: code:addons/account/account_move_line.py:796
#, python-format
msgid "Entry is already reconciled"
msgstr ""
@@ -8751,7 +8754,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid "Can not create an automatic sequence for this piece !\n"
"\n"
@@ -8872,7 +8875,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:346
+#: code:addons/account/invoice.py:345
#, python-format
msgid "Invoice '%s' is waiting for validation."
msgstr ""
@@ -8897,7 +8900,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account_move_line.py:1123
#, python-format
msgid "The date of your Journal Entry is not in the defined period!"
msgstr ""
@@ -9001,6 +9004,7 @@
#: field:account.partner.ledger,result_selection:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
+#: report:account.aged_trial_balance:0
msgid "Partner's"
msgstr ""
@@ -9100,7 +9104,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:501
+#: code:addons/account/account.py:511
#, python-format
msgid "You cannot remove an account which has account entries!. "
msgstr ""
@@ -9115,3 +9119,48 @@
msgid "The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."
msgstr ""
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+msgid "Liabilities"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+msgid "Balance:"
+msgstr ""
+
+#. module: account
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+msgid "Particular"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Aged Trial Balance"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Period Length(days)"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Account Total"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Not due"
+msgstr ""
=== modified file 'account/i18n/ar.po'
--- account/i18n/ar.po 2011-06-19 04:37:30 +0000
+++ account/i18n/ar.po 2011-08-02 06:32:40 +0000
@@ -6,15 +6,26 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
+<<<<<<< TREE
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-06-18 11:20+0000\n"
"Last-Translator: Ahmed Mokhlis <Unknown>\n"
+=======
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2011-01-19 12:00+0000\n"
+"Last-Translator: bamuhrez <bamuhrez@xxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-06-19 04:37+0000\n"
"X-Generator: Launchpad (build 13168)\n"
+=======
+"X-Launchpad-Export-Date: 2011-07-23 05:36+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -24,6 +35,7 @@
#. module: account
#: view:account.journal:0
msgid "Other Configuration"
+<<<<<<< TREE
msgstr "تعديلات أخرى"
#. module: account
@@ -34,6 +46,12 @@
#. module: account
#: code:addons/account/account.py:516
+=======
+msgstr "تعديلات أخرى"
+
+#. module: account
+#: code:addons/account/account.py:516
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You cannot remove/deactivate an account which is set as a property to any "
@@ -856,6 +874,7 @@
#. module: account
#: report:account.overdue:0
+#: report:account.aged_trial_balance:0
msgid "Due"
msgstr ""
@@ -947,6 +966,10 @@
#: field:account.journal,code:0
#: report:account.partner.balance:0
#: field:account.period,code:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Code"
msgstr ""
@@ -1266,6 +1289,7 @@
#. module: account
#: model:ir.ui.menu,name:account.next_id_22
+#: report:account.aged_trial_balance:0
msgid "Partners"
msgstr ""
@@ -1401,14 +1425,9 @@
msgstr ""
#. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-#: selection:account.bank.statement,state:0
-#: selection:account.entries.report,type:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.period,state:0
-msgid "Closed"
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
msgstr ""
#. module: account
@@ -1589,11 +1608,6 @@
msgstr ""
#. module: account
-#: model:ir.actions.report.xml,name:account.report_account_voucher_new
-msgid "Print Voucher"
-msgstr ""
-
-#. module: account
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
msgstr ""
@@ -1661,11 +1675,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Ref. :"
-msgstr ""
-
-#. module: account
#: view:account.analytic.chart:0
msgid "Analytic Account Charts"
msgstr ""
@@ -1878,11 +1887,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Canceled"
-msgstr ""
-
-#. module: account
#: view:account.invoice:0
#: view:report.invoice.created:0
msgid "Untaxed Amount"
@@ -2109,6 +2113,11 @@
#: report:account.third_party_ledger_other:0
#: report:account.vat.declaration:0
#: model:ir.model,name:account.model_account_fiscalyear
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
msgid "Fiscal Year"
msgstr ""
@@ -2582,11 +2591,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Number:"
-msgstr ""
-
-#. module: account
#: selection:account.print.journal,sort_selection:0
msgid "Reference Number"
msgstr ""
@@ -2810,6 +2814,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
@@ -2817,6 +2822,9 @@
#. module: account
#: code:addons/account/account.py:2950
+=======
+#: code:addons/account/account.py:2950
+>>>>>>> MERGE-SOURCE
#: code:addons/account/installer.py:296
#, python-format
msgid "BNK"
@@ -2907,6 +2915,12 @@
msgstr ""
#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+#, python-format
+msgid "No End of year journal defined for the fiscal year"
+msgstr "لايوجد نهاية لسجل السنة للعام المØاسبي"
+
+#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the expense account"
@@ -3016,11 +3030,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Journal:"
-msgstr ""
-
-#. module: account
#: view:account.bank.statement:0
#: selection:account.bank.statement,state:0
#: view:account.invoice:0
@@ -3067,11 +3076,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Authorised Signatory"
-msgstr ""
-
-#. module: account
#: view:validate.account.move.lines:0
msgid ""
"All selected journal entries will be validated and posted. It means you "
@@ -3095,8 +3099,10 @@
msgstr ""
#. module: account
-#: view:account.payment.term.line:0
-msgid " value amount: n.a"
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
msgstr ""
#. module: account
@@ -4027,6 +4033,15 @@
msgstr ""
#. module: account
+#: constraint:account.account:0
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error! \n"
+"You cannot define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
msgid "Account Analytic Cost Ledger For Journal Report"
msgstr ""
@@ -4105,13 +4120,6 @@
msgstr ""
#. module: account
-#: constraint:account.account:0
-msgid ""
-"You cannot create an account! \n"
-"Make sure if the account has children then it should be type \"View\"!"
-msgstr ""
-
-#. module: account
#: view:account.subscription.generate:0
#: model:ir.actions.act_window,name:account.action_account_subscription_generate
#: model:ir.ui.menu,name:account.menu_generate_subscription
@@ -4188,6 +4196,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
msgstr ""
@@ -4333,6 +4350,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:952
#: code:addons/account/account.py:954
#: code:addons/account/account.py:1195
@@ -4355,6 +4373,14 @@
#: code:addons/account/wizard/account_report_common.py:126
#, python-format
msgid "Error"
+=======
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"With Supplier Refunds you can manage the credit notes you receive from your "
+"suppliers. A refund is a document that credits an invoice completely or "
+"partially. You can easily generate refunds and reconcile them directly from "
+"the invoice form."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4489,6 +4515,11 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,target_move:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
msgid "Target Moves"
msgstr ""
@@ -4605,6 +4636,8 @@
#: view:account.bs.report:0
#: model:ir.actions.act_window,name:account.action_account_bs_report
#: model:ir.ui.menu,name:account.menu_account_bs_report
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
msgid "Balance Sheet"
msgstr ""
@@ -4699,6 +4732,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: constraint:account.move.line:0
msgid ""
"You can not create move line on receivable/payable account without partner"
@@ -4706,6 +4740,9 @@
#. module: account
#: code:addons/account/account.py:2081
+=======
+#: code:addons/account/account.py:2081
+>>>>>>> MERGE-SOURCE
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "No period found !"
@@ -6155,6 +6192,11 @@
msgstr ""
#. module: account
+#: report:account.general.ledger_landscape:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
#: view:account.partner.balance:0
#: view:account.partner.ledger:0
msgid ""
@@ -6277,6 +6319,8 @@
#: report:account.general.journal:0
#: report:account.invoice:0
#: report:account.partner.balance:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Total:"
msgstr ""
@@ -6780,10 +6824,8 @@
msgstr ""
#. module: account
-#: selection:account.entries.report,move_line_state:0
-#: view:account.move.line:0
-#: selection:account.move.line,state:0
-msgid "Unbalanced"
+#: view:account.payment.term.line:0
+msgid " value amount: n.a"
msgstr ""
#. module: account
@@ -7118,11 +7160,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Amount (in words) :"
-msgstr ""
-
-#. module: account
#: field:account.bank.statement.line,partner_id:0
#: view:account.entries.report:0
#: field:account.entries.report,partner_id:0
@@ -7468,6 +7505,11 @@
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
msgid "Chart of Account"
msgstr ""
@@ -7583,6 +7625,10 @@
#: report:account.general.journal:0
#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Filter By"
msgstr ""
@@ -8120,6 +8166,7 @@
#. module: account
#: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
msgid "Analysis Direction"
msgstr ""
@@ -8184,12 +8231,28 @@
msgstr ""
#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree4
-msgid ""
-"With Supplier Refunds you can manage the credit notes you receive from your "
-"suppliers. A refund is a document that credits an invoice completely or "
-"partially. You can easily generate refunds and reconcile them directly from "
-"the invoice form."
+#: code:addons/account/account.py:952
+#: code:addons/account/account.py:954
+#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1411
+#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:120
+#: code:addons/account/wizard/account_report_common.py:126
+#, python-format
+msgid "Error"
msgstr ""
#. module: account
@@ -8198,11 +8261,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Particulars"
-msgstr ""
-
-#. module: account
#: selection:account.account.type,report_type:0
msgid "Profit & Loss (Income Accounts)"
msgstr ""
@@ -8236,6 +8294,10 @@
#: report:account.third_party_ledger_other:0
#: field:report.account.receivable,balance:0
#: field:report.aged.receivable,balance:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Balance"
msgstr ""
@@ -8246,7 +8308,15 @@
#. module: account
#: report:account.account.balance:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+>>>>>>> MERGE-SOURCE
msgid "Display Account"
msgstr ""
@@ -8341,11 +8411,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Receiver's Signature"
-msgstr ""
-
-#. module: account
#: report:account.general.ledger:0
#: report:account.journal.period.print:0
#: report:account.third_party_ledger:0
@@ -8547,6 +8612,7 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,date_from:0
+#: report:account.aged_trial_balance:0
msgid "Start Date"
msgstr ""
@@ -8692,11 +8758,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Through :"
-msgstr ""
-
-#. module: account
#: view:account.general.journal:0
#: model:ir.ui.menu,name:account.menu_account_general_journal
msgid "General Journals"
@@ -8878,11 +8939,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "State:"
-msgstr ""
-
-#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_running
msgid "Running Subscriptions"
msgstr ""
@@ -9017,6 +9073,7 @@
#: field:report.account.sales,amount_total:0
#: field:report.account_type.sales,amount_total:0
#: field:report.invoice.created,amount_total:0
+#: report:account.aged_trial_balance:0
msgid "Total"
msgstr ""
@@ -9152,14 +9209,14 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "On Account of :"
-msgstr ""
-
-#. module: account
-#: view:account.automatic.reconcile:0
-#: view:account.move.line.reconcile.writeoff:0
-msgid "Write-Off Move"
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
msgstr ""
#. module: account
@@ -9222,14 +9279,6 @@
msgstr ""
#. module: account
-#: constraint:account.account.template:0
-msgid ""
-"You cannot create an account template! \n"
-"Make sure if the account template has parent then it should be type "
-"\"View\"! "
-msgstr ""
-
-#. module: account
#: view:account.subscription:0
msgid "Recurring"
msgstr ""
@@ -9515,6 +9564,7 @@
#: field:account.partner.ledger,result_selection:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
+#: report:account.aged_trial_balance:0
msgid "Partner's"
msgstr ""
@@ -9639,6 +9689,7 @@
"The residual amount on a receivable or payable of a journal entry expressed "
"in its currency (maybe different of the company currency)."
msgstr ""
+<<<<<<< TREE
#~ msgid "Asset"
#~ msgstr "أصل"
@@ -9700,3 +9751,51 @@
#~ msgid "Recurrent Entries"
#~ msgstr "إدخالات متكررة"
+=======
+
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+msgid "Liabilities"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+msgid "Balance:"
+msgstr ""
+
+#. module: account
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+msgid "Particular"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Aged Trial Balance"
+msgstr "ميزان المراجعة القديم"
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Period Length(days)"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Account Total"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Not due"
+msgstr ""
+>>>>>>> MERGE-SOURCE
=== modified file 'account/i18n/bg.po'
--- account/i18n/bg.po 2011-05-02 18:46:43 +0000
+++ account/i18n/bg.po 2011-08-02 06:32:40 +0000
@@ -6,15 +6,25 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
+<<<<<<< TREE
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-03-02 06:18+0000\n"
+=======
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2011-04-01 09:39+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Dimitar Markov <dimitar.markov@xxxxxxxxx>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-29 05:05+0000\n"
"X-Generator: Launchpad (build 12758)\n"
+=======
+"X-Launchpad-Export-Date: 2011-07-23 05:36+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -27,13 +37,7 @@
msgstr "Други наÑтройки"
#. module: account
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#, python-format
-msgid "No End of year journal defined for the fiscal year"
-msgstr "Ðе е дефиниран край на финанÑовата година в Журнала"
-
-#. module: account
-#: code:addons/account/account.py:506
+#: code:addons/account/account.py:516
#, python-format
msgid ""
"You cannot remove/deactivate an account which is set as a property to any "
@@ -67,7 +71,7 @@
msgstr "ОÑтатък"
#. module: account
-#: code:addons/account/invoice.py:785
+#: code:addons/account/invoice.py:793
#, python-format
msgid "Please define sequence on invoice journal"
msgstr "ÐœÐ¾Ð»Ñ Ð·Ñдайте поÑледователноÑÑ‚ за дневник фактури"
@@ -136,7 +140,7 @@
msgstr "Счетоводни запиÑи-"
#. module: account
-#: code:addons/account/account.py:1291
+#: code:addons/account/account.py:1305
#, python-format
msgid "You can not delete posted movement: \"%s\"!"
msgstr "Ðе може да изтриете публикувано движение: \"%s\"!"
@@ -182,7 +186,7 @@
"без да го изтривате."
#. module: account
-#: code:addons/account/invoice.py:1421
+#: code:addons/account/invoice.py:1436
#, python-format
msgid "Warning!"
msgstr "Предупреждение!"
@@ -236,7 +240,7 @@
msgstr "account.tax"
#. module: account
-#: code:addons/account/account.py:901
+#: code:addons/account/account.py:915
#, python-format
msgid ""
"No period defined for this date: %s !\n"
@@ -269,7 +273,7 @@
"Отметнете ако не иÑкате в тази фактура да учаÑтват ДДС Ñвързани данъци"
#. module: account
-#: code:addons/account/invoice.py:1210
+#: code:addons/account/invoice.py:1224
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
msgstr "Фактура '%s' е чаÑтично платена: %s%s от %s%s (%s%s оÑтатък)"
@@ -285,7 +289,7 @@
msgstr "БелгийÑки отчети"
#. module: account
-#: code:addons/account/account_move_line.py:1176
+#: code:addons/account/account_move_line.py:1182
#, python-format
msgid "You can not add/modify entries in a closed journal."
msgstr "Ðе може да добавÑте/променÑте запиÑи в затворен дневник."
@@ -323,7 +327,7 @@
msgstr "Ул."
#. module: account
-#: code:addons/account/invoice.py:529
+#: code:addons/account/invoice.py:532
#, python-format
msgid "Invoice line account company does not match with invoice company."
msgstr ""
@@ -572,7 +576,7 @@
msgstr "ÐÑма обединÑващи транзакции"
#. module: account
-#: code:addons/account/account_cash_statement.py:348
+#: code:addons/account/account_cash_statement.py:349
#, python-format
msgid "CashBox Balance is not matching with Calculated Balance !"
msgstr "БаланÑÑŠÑ‚ в каÑата не Ð¾Ñ‚Ð³Ð¾Ð²Ð°Ñ€Ñ Ð½Ð° изчиÑÐ»ÐµÐ½Ð¸Ñ Ð±Ð°Ð»Ð°Ð½Ñ!"
@@ -656,7 +660,7 @@
msgstr "Код на количеÑтво Ñума"
#. module: account
-#: code:addons/account/account.py:2779
+#: code:addons/account/account.py:2823
#: code:addons/account/installer.py:434
#, python-format
msgid "SAJ"
@@ -689,8 +693,8 @@
msgstr "Период на дневник"
#. module: account
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
#, python-format
msgid "To reconcile the entries company should be the same for all entries"
msgstr ""
@@ -751,7 +755,7 @@
msgstr "Ðналитични запиÑи по редове"
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:39
+#: code:addons/account/wizard/account_change_currency.py:38
#, python-format
msgid "You can only change currency for Draft Invoice !"
msgstr "Можете да ÑменÑте валутите Ñамо на фактури в проект"
@@ -853,7 +857,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1191
+#: code:addons/account/account_move_line.py:1197
#, python-format
msgid ""
"You can not do this modification on a confirmed entry ! Please note that you "
@@ -882,6 +886,7 @@
#. module: account
#: report:account.overdue:0
+#: report:account.aged_trial_balance:0
msgid "Due"
msgstr "Краен Ñрок"
@@ -973,15 +978,19 @@
#: field:account.journal,code:0
#: report:account.partner.balance:0
#: field:account.period,code:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Code"
msgstr "Код"
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
+#: code:addons/account/account_move_line.py:169
#: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:670
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "No Analytic Journal !"
@@ -1062,7 +1071,6 @@
#. module: account
#: report:account.analytic.account.journal:0
-#: report:account.move.voucher:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "-"
@@ -1148,6 +1156,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
@@ -1155,7 +1164,7 @@
msgstr "Етикет на запиÑ"
#. module: account
-#: code:addons/account/account.py:976
+#: code:addons/account/account.py:990
#, python-format
msgid "You can not modify/delete a journal with entries for this period !"
msgstr "Ðе може да променÑте/узтривате дневник ÑÑŠÑ Ð·Ð°Ð¿Ð¸Ñи от този период !"
@@ -1293,8 +1302,8 @@
msgstr "Ðнализ на журналните единици"
#. module: account
-#: model:ir.actions.act_window,name:account.action_partner_all
#: model:ir.ui.menu,name:account.next_id_22
+#: report:account.aged_trial_balance:0
msgid "Partners"
msgstr "Партньори"
@@ -1323,7 +1332,7 @@
msgstr "Централен дневник"
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "You can not use this general account in this journal !"
msgstr "Ðе може да използвате главна Ñметка за този дневник !"
@@ -1416,7 +1425,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:815
+#: code:addons/account/invoice.py:823
#, python-format
msgid ""
"Cannot create the invoice !\n"
@@ -1433,15 +1442,10 @@
msgstr "Ðнгло-СакÑонÑко ÑчетоводÑтво"
#. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-#: selection:account.bank.statement,state:0
-#: selection:account.entries.report,type:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.period,state:0
-msgid "Closed"
-msgstr "Приключен"
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr "Движение на отпиÑване"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
@@ -1586,7 +1590,6 @@
msgstr "Разделени журнални поÑледователноÑти"
#. module: account
-#: field:account.bank.statement,user_id:0
#: view:account.invoice:0
msgid "Responsible"
msgstr "Отговорник"
@@ -1630,11 +1633,6 @@
msgstr "Годишна Ñума"
#. module: account
-#: model:ir.actions.report.xml,name:account.report_account_voucher_new
-msgid "Print Voucher"
-msgstr "Отпечатване на ваучер"
-
-#. module: account
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
msgstr "Този помощник ще промени валутата на фактурата"
@@ -1656,7 +1654,7 @@
msgstr "Грешка! Ðе можете да дефинирате заÑтъпващи Ñе финанÑови години."
#. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:799
#, python-format
msgid "The account is not defined to be reconciled !"
msgstr "Сметката не е поÑочена за равнÑване!"
@@ -1689,7 +1687,7 @@
msgstr "Приходни и разходни"
#. module: account
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:806
#, python-format
msgid "You have to provide an account for the write off entry !"
msgstr "ТрÑбва да изберете Ñметка за запиÑа на отпиÑването !"
@@ -1705,11 +1703,6 @@
msgstr "Ð’Ñички партньори"
#. module: account
-#: report:account.move.voucher:0
-msgid "Ref. :"
-msgstr "Реф. :"
-
-#. module: account
#: view:account.analytic.chart:0
msgid "Analytic Account Charts"
msgstr "Диаграми аналитична Ñметка"
@@ -1725,7 +1718,7 @@
msgstr "Отпратка към клиент:"
#. module: account
-#: code:addons/account/account_cash_statement.py:328
+#: code:addons/account/account_cash_statement.py:329
#, python-format
msgid "User %s does not have rights to access %s journal !"
msgstr ""
@@ -1746,7 +1739,7 @@
msgstr "Данъчна декларациÑ: кредитни извеÑтиÑ"
#. module: account
-#: code:addons/account/account.py:499
+#: code:addons/account/account.py:509
#, python-format
msgid "You cannot deactivate an account that contains account moves."
msgstr "Ðе можете да деактивирате Ñметка коÑто Ñъдържа движениÑ."
@@ -1762,7 +1755,7 @@
msgstr "Ðе може да Ñъздадете ред за движение в приключена Ñметка."
#. module: account
-#: code:addons/account/account.py:519
+#: code:addons/account/account.py:529
#, python-format
msgid ""
"You cannot change the type of account from 'Closed' to any other type which "
@@ -1924,11 +1917,6 @@
msgstr "Изображение"
#. module: account
-#: report:account.move.voucher:0
-msgid "Canceled"
-msgstr "Отменени"
-
-#. module: account
#: view:account.invoice:0
#: view:report.invoice.created:0
msgid "Untaxed Amount"
@@ -2035,7 +2023,7 @@
msgstr " Дневник"
#. module: account
-#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
#, python-format
msgid ""
"There is no default default debit account defined \n"
@@ -2087,7 +2075,7 @@
msgstr "ОпиÑание"
#. module: account
-#: code:addons/account/account.py:2844
+#: code:addons/account/account.py:2888
#: code:addons/account/installer.py:498
#, python-format
msgid "ECNJ"
@@ -2107,7 +2095,7 @@
msgstr "Приходна Ñметка"
#. module: account
-#: code:addons/account/invoice.py:352
+#: code:addons/account/invoice.py:351
#, python-format
msgid "There is no Accounting Journal of type Sale/Purchase defined!"
msgstr "ÐÑма Ñчетоводен дневник за продажби/покупки!"
@@ -2118,6 +2106,7 @@
msgstr "Счетоводни ÑвойÑтва"
#. module: account
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.print.journal,sort_selection:0
msgid "Entries Sorted By"
@@ -2146,6 +2135,7 @@
#: field:account.fiscalyear,name:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.journal.period,fiscalyear_id:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -2155,6 +2145,11 @@
#: report:account.third_party_ledger_other:0
#: report:account.vat.declaration:0
#: model:ir.model,name:account.model_account_fiscalyear
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
msgid "Fiscal Year"
msgstr "ФинанÑова година"
@@ -2256,7 +2251,7 @@
msgstr "Данъчен код"
#. module: account
-#: code:addons/account/invoice.py:545
+#: code:addons/account/invoice.py:552
#, python-format
msgid ""
"Can't find any account journal of %s type for this company.\n"
@@ -2326,7 +2321,7 @@
msgstr "Ð—Ð°Ð¿Ð¸Ñ Ð½Ð° модела на Ñметка"
#. module: account
-#: code:addons/account/account.py:2796
+#: code:addons/account/account.py:2840
#: code:addons/account/installer.py:454
#, python-format
msgid "EXJ"
@@ -2417,7 +2412,7 @@
msgstr "Сметки"
#. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:350
#, python-format
msgid "Configuration Error!"
msgstr "Грешка при наÑтройване!"
@@ -2429,13 +2424,12 @@
msgstr "Средна цена"
#. module: account
-#: report:account.move.voucher:0
#: report:account.overdue:0
msgid "Date:"
msgstr "Дата:"
#. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:654
#, python-format
msgid ""
"You cannot modify company of this journal as its related record exist in "
@@ -2471,6 +2465,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.overdue:0
#: report:account.third_party_ledger:0
@@ -2580,16 +2575,16 @@
msgstr "Този помощник ще Ñъздаде повтарÑщи Ñе Ñчетоводни запиÑи"
#. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1195
#, python-format
msgid "No sequence defined on the journal !"
msgstr "Ðе Ñа зададени поÑледоватеноÑти за този дневник !"
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
-#: code:addons/account/invoice.py:670
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2638,11 +2633,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Number:"
-msgstr "Ðомер:"
-
-#. module: account
#: selection:account.print.journal,sort_selection:0
msgid "Reference Number"
msgstr "Референтен номер"
@@ -2752,7 +2742,7 @@
msgstr "Ðналитични запиÑи"
#. module: account
-#: code:addons/account/account.py:822
+#: code:addons/account/account.py:836
#, python-format
msgid ""
"No fiscal year defined for this date !\n"
@@ -2878,6 +2868,7 @@
msgstr "Изглед"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
@@ -2885,6 +2876,9 @@
#. module: account
#: code:addons/account/account.py:2906
+=======
+#: code:addons/account/account.py:2950
+>>>>>>> MERGE-SOURCE
#: code:addons/account/installer.py:296
#, python-format
msgid "BNK"
@@ -2975,6 +2969,12 @@
msgstr ""
#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+#, python-format
+msgid "No End of year journal defined for the fiscal year"
+msgstr "Ðе е дефиниран край на финанÑовата година в Журнала"
+
+#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the expense account"
@@ -2993,6 +2993,7 @@
#: field:account.common.report,journal_ids:0
#: report:account.general.journal:0
#: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger_landscape:0
#: view:account.journal.period:0
#: report:account.partner.balance:0
#: field:account.partner.balance,journal_ids:0
@@ -3053,7 +3054,7 @@
msgstr "Ðачален баланÑ"
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "No Partner Defined !"
msgstr "Ðе е зададен партньор !"
@@ -3083,11 +3084,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Journal:"
-msgstr "Дневник:"
-
-#. module: account
#: view:account.bank.statement:0
#: selection:account.bank.statement,state:0
#: view:account.invoice:0
@@ -3095,7 +3091,6 @@
#: view:account.invoice.report:0
#: selection:account.invoice.report,state:0
#: selection:account.journal.period,state:0
-#: report:account.move.voucher:0
#: view:account.subscription:0
#: selection:account.subscription,state:0
#: selection:report.invoice.created,state:0
@@ -3135,11 +3130,6 @@
msgstr "година"
#. module: account
-#: report:account.move.voucher:0
-msgid "Authorised Signatory"
-msgstr ""
-
-#. module: account
#: view:validate.account.move.lines:0
msgid ""
"All selected journal entries will be validated and posted. It means you "
@@ -3147,7 +3137,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Cannot delete invoice(s) that are already opened or paid !"
msgstr "Ðе може да изтриете фактура(и) които вече Ñа отворени или платени !"
@@ -3163,9 +3153,11 @@
msgstr "ТранÑфери"
#. module: account
-#: view:account.payment.term.line:0
-msgid " value amount: n.a"
-msgstr ""
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
+msgstr "ÐебаланÑиран"
#. module: account
#: view:account.chart:0
@@ -3210,7 +3202,7 @@
"ÑÑŠÑтоÑние \"Отменени\" или \"Готови\"!"
#. module: account
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:532
#, python-format
msgid ""
"You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3221,6 +3213,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
msgid "Counterpart"
msgstr "Съконтрагент"
@@ -3325,6 +3318,7 @@
#: field:account.entries.report,date:0
#: selection:account.general.journal,filter:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice.report,date:0
#: report:account.journal.period.print:0
#: view:account.move:0
@@ -3368,7 +3362,7 @@
msgstr "Диаграма на шаблони на Ñметка"
#. module: account
-#: code:addons/account/account.py:2095
+#: code:addons/account/account.py:2109
#, python-format
msgid ""
"Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3377,13 +3371,13 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:810
+#: code:addons/account/account_move_line.py:801
#, python-format
msgid "Some entries are already reconciled !"
msgstr "ÐÑкой запиÑи вече Ñа били приравнени !"
#. module: account
-#: code:addons/account/account.py:1204
+#: code:addons/account/account.py:1218
#, python-format
msgid ""
"You cannot validate a Journal Entry unless all journal items are in same "
@@ -3506,7 +3500,7 @@
msgstr "Ðналитични артикули"
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "Unable to change tax !"
msgstr "Ðе може да Ñе ÑÐ¼ÐµÐ½Ñ Ð´Ð°Ð½ÑŠÐºÐ° !"
@@ -3517,14 +3511,14 @@
msgstr "#ЗапиÑи"
#. module: account
-#: code:addons/account/invoice.py:1422
+#: code:addons/account/invoice.py:1437
#, python-format
msgid ""
"You selected an Unit of Measure which is not compatible with the product."
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#, python-format
msgid ""
"The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3820,7 +3814,7 @@
msgstr "Вид Ñметка"
#. module: account
-#: code:addons/account/invoice.py:714
+#: code:addons/account/invoice.py:722
#, python-format
msgid "Global taxes defined, but are not in invoice lines !"
msgstr "Общите данъци Ñа зададени, но не Ñа в редовете на фактурата !"
@@ -3879,7 +3873,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:91
+#: code:addons/account/account_analytic_line.py:90
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr "ÐÑма зададена Ñметка разходи за този продукт: \"%s\" (id:%d)"
@@ -4054,7 +4048,7 @@
msgstr "кредитни извеÑтиÑ"
#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "Unable to find a valid period !"
@@ -4106,6 +4100,15 @@
msgstr "Данъци включени в цената"
#. module: account
+#: constraint:account.account:0
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error! \n"
+"You cannot define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
msgid "Account Analytic Cost Ledger For Journal Report"
msgstr ""
@@ -4127,11 +4130,11 @@
msgstr "ПромÑна"
#. module: account
-#: code:addons/account/account.py:1290
-#: code:addons/account/account.py:1318
-#: code:addons/account/account.py:1325
-#: code:addons/account/account_move_line.py:1055
-#: code:addons/account/invoice.py:896
+#: code:addons/account/account.py:1304
+#: code:addons/account/account.py:1332
+#: code:addons/account/account.py:1339
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/invoice.py:904
#: code:addons/account/wizard/account_automatic_reconcile.py:152
#: code:addons/account/wizard/account_fiscalyear_close.py:78
#: code:addons/account/wizard/account_fiscalyear_close.py:81
@@ -4184,13 +4187,6 @@
msgstr "Грешка! Ðе могат да бъдат Ñъздавани рекурÑивни Ñметки."
#. module: account
-#: constraint:account.account:0
-msgid ""
-"You cannot create an account! \n"
-"Make sure if the account has children then it should be type \"View\"!"
-msgstr ""
-
-#. module: account
#: view:account.subscription.generate:0
#: model:ir.actions.act_window,name:account.action_account_subscription_generate
#: model:ir.ui.menu,name:account.menu_generate_subscription
@@ -4235,7 +4231,7 @@
msgstr "ТрÑбва да зададете аналитичен дневник от вид '%s' !"
#. module: account
-#: code:addons/account/account.py:1397
+#: code:addons/account/account.py:1411
#, python-format
msgid ""
"Couldn't create move with currency different from the secondary currency of "
@@ -4267,6 +4263,15 @@
msgstr "Ð‘Ð°Ð»Ð°Ð½Ñ Ð¿Ð¾ Ñметка -"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+msgstr "Фактура "
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
msgstr "Ðачална дата"
@@ -4300,7 +4305,7 @@
msgstr "Фактури"
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid ""
"Please verify the price of the invoice !\n"
@@ -4414,30 +4419,13 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:938
-#: code:addons/account/account.py:940
-#: code:addons/account/account.py:1181
-#: code:addons/account/account.py:1393
-#: code:addons/account/account.py:1397
-#: code:addons/account/account_cash_statement.py:249
-#: code:addons/account/account_move_line.py:780
-#: code:addons/account/account_move_line.py:803
-#: code:addons/account/account_move_line.py:805
-#: code:addons/account/account_move_line.py:808
-#: code:addons/account/account_move_line.py:810
-#: code:addons/account/account_move_line.py:1117
-#: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_change_currency.py:39
-#: code:addons/account/wizard/account_change_currency.py:60
-#: code:addons/account/wizard/account_change_currency.py:65
-#: code:addons/account/wizard/account_change_currency.py:71
-#: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#: code:addons/account/wizard/account_report_common.py:120
-#: code:addons/account/wizard/account_report_common.py:126
-#, python-format
-msgid "Error"
-msgstr "Грешка"
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"With Supplier Refunds you can manage the credit notes you receive from your "
+"suppliers. A refund is a document that credits an invoice completely or "
+"partially. You can easily generate refunds and reconcile them directly from "
+"the invoice form."
+msgstr ""
#. module: account
#: field:account.analytic.Journal.report,date2:0
@@ -4454,7 +4442,7 @@
msgstr "Детайли за банката"
#. module: account
-#: code:addons/account/invoice.py:720
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Taxes missing !"
msgstr "ЛипÑват данъци !"
@@ -4509,7 +4497,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1210
+#: code:addons/account/account.py:1224
#, python-format
msgid ""
"You can not modify a posted entry of this journal !\n"
@@ -4530,7 +4518,7 @@
msgstr "Подчинени Ñметки за данъци"
#. module: account
-#: code:addons/account/account.py:940
+#: code:addons/account/account.py:954
#, python-format
msgid "Start period should be smaller then End period"
msgstr ""
@@ -4560,6 +4548,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,target_move:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.journal,target_move:0
#: report:account.partner.balance:0
@@ -4572,6 +4561,11 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,target_move:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
msgid "Target Moves"
msgstr "Целеви движениÑ"
@@ -4643,7 +4637,7 @@
msgstr "Ред 1:"
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid "Integrity Error !"
msgstr "Грешка за цÑлоÑтноÑÑ‚ !"
@@ -4689,6 +4683,8 @@
#: view:account.bs.report:0
#: model:ir.actions.act_window,name:account.action_account_bs_report
#: model:ir.ui.menu,name:account.menu_account_bs_report
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
msgid "Balance Sheet"
msgstr "БаланÑ"
@@ -4783,13 +4779,7 @@
msgstr "Данък върху подчинени"
#. module: account
-#: constraint:account.move.line:0
-msgid ""
-"You can not create move line on receivable/payable account without partner"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "No period found !"
@@ -4863,7 +4853,7 @@
"Дата=15.01, Брой дни=22, Ден от меÑеца=-1, тогава дата на изпъление е 28.02."
#. module: account
-#: code:addons/account/account.py:2896
+#: code:addons/account/account.py:2940
#: code:addons/account/installer.py:283
#: code:addons/account/installer.py:295
#, python-format
@@ -4891,7 +4881,7 @@
msgstr "Ðачало на период"
#. module: account
-#: code:addons/account/account_move_line.py:1193
+#: code:addons/account/account_move_line.py:1199
#, python-format
msgid ""
"You can not do this modification on a reconciled entry ! Please note that "
@@ -4949,12 +4939,12 @@
#. module: account
#: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:405
-#: code:addons/account/invoice.py:505
-#: code:addons/account/invoice.py:520
-#: code:addons/account/invoice.py:528
-#: code:addons/account/invoice.py:545
-#: code:addons/account/invoice.py:1347
+#: code:addons/account/invoice.py:408
+#: code:addons/account/invoice.py:508
+#: code:addons/account/invoice.py:523
+#: code:addons/account/invoice.py:531
+#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:1361
#: code:addons/account/wizard/account_move_journal.py:63
#, python-format
msgid "Configuration Error !"
@@ -5031,7 +5021,7 @@
msgstr "Сортиране по"
#. module: account
-#: code:addons/account/account.py:1326
+#: code:addons/account/account.py:1340
#, python-format
msgid ""
"There is no default default credit account defined \n"
@@ -5181,7 +5171,7 @@
msgstr "Създаване на начални запиÑи"
#. module: account
-#: code:addons/account/account_move_line.py:738
+#: code:addons/account/account_move_line.py:729
#, python-format
msgid "Already Reconciled!"
msgstr "Вече равнено!"
@@ -5217,7 +5207,7 @@
#. module: account
#: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:821
#, python-format
msgid "Write-Off"
msgstr "ОтпиÑване"
@@ -5354,7 +5344,7 @@
msgstr "# Редове"
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:60
+#: code:addons/account/wizard/account_change_currency.py:59
#, python-format
msgid "New currency is not confirured properly !"
msgstr "Ðовата валута не е наÑтроена правилно!"
@@ -5379,14 +5369,14 @@
msgstr "Подреждане по"
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "You can not use an inactive account!"
msgstr "Ðе може да използвате неактивна Ñметка!"
#. module: account
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:794
#, python-format
msgid "Entries are not of the same account or already reconciled ! "
msgstr "ЗапиÑите не Ñа от Ñъщата Ñметка или не Ñа изравнени ! "
@@ -5421,7 +5411,7 @@
#. module: account
#: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Invalid action !"
msgstr "Ðевалидно дейÑтвие !"
@@ -5632,7 +5622,7 @@
msgstr "ПредприÑтиÑ"
#. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:546
#, python-format
msgid ""
"You cannot modify Company of account as its related record exist in Entry "
@@ -5904,9 +5894,9 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:406
-#: code:addons/account/invoice.py:506
-#: code:addons/account/invoice.py:1348
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
#, python-format
msgid "Can not find account chart for this company, Please Create account."
msgstr ""
@@ -6057,8 +6047,8 @@
msgstr "СтатиÑтика на аналитични запиÑи"
#. module: account
-#: code:addons/account/account_analytic_line.py:143
-#: code:addons/account/account_move_line.py:905
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
#, python-format
msgid "Entries: "
msgstr "ЗапиÑи: "
@@ -6069,7 +6059,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1393
+#: code:addons/account/account.py:1407
#, python-format
msgid "Couldn't create move between different companies"
msgstr "Ðе може да Ñъздаде движение между различни фирми"
@@ -6107,7 +6097,7 @@
msgstr "Общ дебит"
#. module: account
-#: code:addons/account/account_move_line.py:781
+#: code:addons/account/account_move_line.py:772
#, python-format
msgid "Entry \"%s\" is not valid !"
msgstr "Ð—Ð°Ð¿Ð¸Ñ \"%s\" е невалиден !"
@@ -6173,30 +6163,31 @@
msgstr " оценка: процент"
#. module: account
-#: code:addons/account/account.py:499
-#: code:addons/account/account.py:501
-#: code:addons/account/account.py:822
-#: code:addons/account/account.py:901
-#: code:addons/account/account.py:976
-#: code:addons/account/account.py:1204
-#: code:addons/account/account.py:1210
-#: code:addons/account/account.py:2095
-#: code:addons/account/account.py:2333
-#: code:addons/account/account_analytic_line.py:90
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account.py:509
+#: code:addons/account/account.py:511
+#: code:addons/account/account.py:836
+#: code:addons/account/account.py:915
+#: code:addons/account/account.py:990
+#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2357
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
#: code:addons/account/account_bank_statement.py:292
#: code:addons/account/account_bank_statement.py:305
#: code:addons/account/account_bank_statement.py:345
-#: code:addons/account/account_cash_statement.py:328
-#: code:addons/account/account_cash_statement.py:348
-#: code:addons/account/account_move_line.py:1176
-#: code:addons/account/account_move_line.py:1191
-#: code:addons/account/account_move_line.py:1193
-#: code:addons/account/invoice.py:785
-#: code:addons/account/invoice.py:815
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1197
+#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:1014
#: code:addons/account/wizard/account_invoice_refund.py:100
#: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
#: code:addons/account/wizard/account_use_model.py:44
#, python-format
msgid "Error !"
@@ -6255,6 +6246,11 @@
msgstr ""
#. module: account
+#: report:account.general.ledger_landscape:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
#: view:account.partner.balance:0
#: view:account.partner.ledger:0
msgid ""
@@ -6309,7 +6305,7 @@
msgstr "Избор на дневник"
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:65
+#: code:addons/account/wizard/account_change_currency.py:64
#, python-format
msgid "Currnt currency is not confirured properly !"
msgstr "Текущата валута не е наÑтроена правилно!"
@@ -6326,9 +6322,11 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.report.general.ledger:0
#: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
#: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
#: model:ir.ui.menu,name:account.menu_general_ledger
msgid "General Ledger"
msgstr "Главна Ñчетоводна книга"
@@ -6378,11 +6376,13 @@
#: report:account.general.journal:0
#: report:account.invoice:0
#: report:account.partner.balance:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Total:"
msgstr "Общо:"
#. module: account
-#: code:addons/account/account.py:2050
+#: code:addons/account/account.py:2064
#, python-format
msgid ""
"You can specify year, month and date in the name of the model using the "
@@ -6420,7 +6420,7 @@
msgstr "Подчинени кодове"
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#: code:addons/account/wizard/account_invoice_refund.py:137
#, python-format
msgid "Data Insufficient !"
@@ -6579,7 +6579,7 @@
msgstr "Редове"
#. module: account
-#: code:addons/account/invoice.py:521
+#: code:addons/account/invoice.py:524
#, python-format
msgid ""
"Can not find account chart for this company in invoice line account, Please "
@@ -6752,7 +6752,7 @@
"програмиÑтите да Ñъздадат Ñпецифичен данък в потребителÑки домейн."
#. module: account
-#: code:addons/account/account.py:938
+#: code:addons/account/account.py:952
#, python-format
msgid "You should have chosen periods that belongs to the same company"
msgstr ""
@@ -6856,7 +6856,7 @@
msgstr "ÐŸÐ¾Ð´Ð¿Ð¸Ñ Ð²ÑŠÑ€Ñ…Ñƒ Ñправки"
#. module: account
-#: code:addons/account/account_cash_statement.py:249
+#: code:addons/account/account_cash_statement.py:250
#, python-format
msgid "You can not have two open register for the same journal"
msgstr ""
@@ -6885,7 +6885,6 @@
#. module: account
#: report:account.invoice:0
#: view:account.invoice:0
-#: report:account.move.voucher:0
msgid "PRO-FORMA"
msgstr "Проформа"
@@ -6897,11 +6896,9 @@
msgstr ""
#. module: account
-#: selection:account.entries.report,move_line_state:0
-#: view:account.move.line:0
-#: selection:account.move.line,state:0
-msgid "Unbalanced"
-msgstr "ÐебаланÑиран"
+#: view:account.payment.term.line:0
+msgid " value amount: n.a"
+msgstr ""
#. module: account
#: selection:account.move.line,centralisation:0
@@ -6915,6 +6912,7 @@
#. module: account
#: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
#: view:account.journal:0
#: field:account.journal,user_id:0
#: view:analytic.entries.report:0
@@ -6942,13 +6940,13 @@
"крайна дата за плащането на този ред."
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "Bad account !"
msgstr "Грешна Ñметка !"
#. module: account
-#: code:addons/account/account.py:2777
+#: code:addons/account/account.py:2821
#: code:addons/account/installer.py:432
#, python-format
msgid "Sales Journal"
@@ -6966,7 +6964,7 @@
msgstr "Данък на фактура"
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid "No piece number !"
msgstr "ÐÑма номер на цена !"
@@ -7208,17 +7206,17 @@
msgstr "ФикÑиран"
#. module: account
-#: code:addons/account/account.py:506
-#: code:addons/account/account.py:519
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
#: code:addons/account/account.py:532
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:927
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/invoice.py:714
-#: code:addons/account/invoice.py:717
-#: code:addons/account/invoice.py:720
+#: code:addons/account/account.py:546
+#: code:addons/account/account.py:654
+#: code:addons/account/account.py:941
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Warning !"
msgstr "Предупреждение !"
@@ -7241,15 +7239,11 @@
msgstr "ПреÑмÑтане на абонамент"
#. module: account
-#: report:account.move.voucher:0
-msgid "Amount (in words) :"
-msgstr "Сума (Ñловом):"
-
-#. module: account
#: field:account.bank.statement.line,partner_id:0
#: view:account.entries.report:0
#: field:account.entries.report,partner_id:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: field:account.invoice,partner_id:0
#: field:account.invoice.line,partner_id:0
@@ -7280,7 +7274,7 @@
msgstr "Ðе може да %s проект/проформа/отказ на фактура"
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "No Invoice Lines !"
msgstr "ÐÑма фактурни редове!"
@@ -7329,7 +7323,7 @@
msgstr "Отложен метод"
#. module: account
-#: code:addons/account/invoice.py:359
+#: code:addons/account/invoice.py:360
#, python-format
msgid "Invoice '%s' is paid."
msgstr "Фактура '%s' е платена."
@@ -7392,7 +7386,7 @@
msgstr "ÐÑоцииран партньор"
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "You must first select a partner !"
msgstr "Първо Ñ‚Ñ€Ñбва да изберете партньор !"
@@ -7457,7 +7451,7 @@
msgstr "Изберете финанÑова година"
#. module: account
-#: code:addons/account/account.py:2841
+#: code:addons/account/account.py:2885
#: code:addons/account/installer.py:495
#, python-format
msgid "Purchase Refund Journal"
@@ -7492,6 +7486,7 @@
#: view:account.entries.report:0
#: field:account.entries.report,period_id:0
#: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: view:account.invoice.report:0
#: field:account.journal.period,period_id:0
@@ -7593,6 +7588,11 @@
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
msgid "Chart of Account"
msgstr "Сметкоплан"
@@ -7658,7 +7658,7 @@
msgstr "Видове Ñметки"
#. module: account
-#: code:addons/account/invoice.py:897
+#: code:addons/account/invoice.py:905
#, python-format
msgid "Cannot create invoice move on centralised journal"
msgstr ""
@@ -7709,7 +7709,12 @@
#: report:account.account.balance:0
#: report:account.central.journal:0
#: report:account.general.journal:0
+#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Filter By"
msgstr "Филтриране по"
@@ -7747,7 +7752,7 @@
msgstr "Ред на уÑловие за плащане"
#. module: account
-#: code:addons/account/account.py:2794
+#: code:addons/account/account.py:2838
#: code:addons/account/installer.py:452
#, python-format
msgid "Purchase Journal"
@@ -7915,8 +7920,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "Bad account!"
msgstr "Грешна Ñметка!"
@@ -7927,7 +7932,7 @@
msgstr "ОÑтавете празно за вÑички отворени данъчни години"
#. module: account
-#: code:addons/account/account_move_line.py:1056
+#: code:addons/account/account_move_line.py:1062
#, python-format
msgid "The account move (%s) for centralisation has been confirmed!"
msgstr "Движение по Ñметка (%s) за централизиране е потвърдено!"
@@ -7949,6 +7954,7 @@
#: field:account.entries.report,currency_id:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice,currency_id:0
#: field:account.invoice.report,currency_id:0
#: field:account.journal,currency:0
@@ -8123,14 +8129,14 @@
msgstr "Период от"
#. module: account
-#: code:addons/account/account.py:2817
+#: code:addons/account/account.py:2861
#: code:addons/account/installer.py:476
#, python-format
msgid "Sales Refund Journal"
msgstr "Дневник Ð¾Ð±ÐµÐ·Ñ‰ÐµÑ‚ÐµÐ½Ð¸Ñ Ð·Ð° продажби"
#. module: account
-#: code:addons/account/account.py:927
+#: code:addons/account/account.py:941
#, python-format
msgid ""
"You cannot modify company of this period as its related record exist in "
@@ -8179,7 +8185,7 @@
msgstr "Данък покупка (%)"
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "Please create some invoice lines."
msgstr ""
@@ -8195,7 +8201,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2820
+#: code:addons/account/account.py:2864
#: code:addons/account/installer.py:479
#, python-format
msgid "SCNJ"
@@ -8237,6 +8243,7 @@
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
@@ -8246,13 +8253,14 @@
msgstr "Ðачало на период"
#. module: account
-#: code:addons/account/account.py:2333
+#: code:addons/account/account.py:2357
#, python-format
msgid "Cannot locate parent code for template account!"
msgstr ""
#. module: account
#: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
msgid "Analysis Direction"
msgstr "РъководтÑво за анализ"
@@ -8283,7 +8291,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/invoice.py:1014
#, python-format
msgid ""
"You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8311,19 +8319,35 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:70
#, python-format
msgid "Current currency is not confirured properly !"
msgstr "Текущата валута не наÑтроена правилно!"
#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree4
-msgid ""
-"With Supplier Refunds you can manage the credit notes you receive from your "
-"suppliers. A refund is a document that credits an invoice completely or "
-"partially. You can easily generate refunds and reconcile them directly from "
-"the invoice form."
-msgstr ""
+#: code:addons/account/account.py:952
+#: code:addons/account/account.py:954
+#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1411
+#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:120
+#: code:addons/account/wizard/account_report_common.py:126
+#, python-format
+msgid "Error"
+msgstr "Грешка"
#. module: account
#: view:account.account.template:0
@@ -8331,11 +8355,6 @@
msgstr "Сметки вземаниÑ"
#. module: account
-#: report:account.move.voucher:0
-msgid "Particulars"
-msgstr ""
-
-#. module: account
#: selection:account.account.type,report_type:0
msgid "Profit & Loss (Income Accounts)"
msgstr "Печалба и загуби (приходни Ñметки)"
@@ -8360,6 +8379,7 @@
#: field:account.entries.report,balance:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.move.line,balance:0
#: report:account.partner.balance:0
#: selection:account.payment.term.line,value:0
@@ -8368,6 +8388,10 @@
#: report:account.third_party_ledger_other:0
#: field:report.account.receivable,balance:0
#: field:report.aged.receivable,balance:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Balance"
msgstr "БаланÑ"
@@ -8378,6 +8402,11 @@
#. module: account
#: report:account.account.balance:0
+#: report:account.general.ledger_landscape:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Display Account"
msgstr "Показване на Ñметка"
@@ -8472,11 +8501,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Receiver's Signature"
-msgstr ""
-
-#. module: account
#: report:account.general.ledger:0
#: report:account.journal.period.print:0
#: report:account.third_party_ledger:0
@@ -8492,6 +8516,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.line,move_id:0
#: field:analytic.entries.report,move_id:0
@@ -8499,7 +8524,7 @@
msgstr "ПремеÑтване"
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "You can not change the tax, you should remove and recreate lines !"
msgstr ""
@@ -8596,6 +8621,7 @@
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
@@ -8639,7 +8665,7 @@
msgstr "Ðбонамент за Ñметка"
#. module: account
-#: code:addons/account/invoice.py:717
+#: code:addons/account/invoice.py:725
#, python-format
msgid ""
"Tax base different !\n"
@@ -8668,6 +8694,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_from:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_start:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -8680,6 +8707,7 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,date_from:0
+#: report:account.aged_trial_balance:0
msgid "Start Date"
msgstr "Ðачална дата"
@@ -8696,7 +8724,7 @@
msgstr "Ðеприравнен"
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid "Bad total !"
msgstr "Грешна обща Ñума !"
@@ -8754,13 +8782,13 @@
msgstr "Ðктивен"
#. module: account
-#: code:addons/account/invoice.py:354
+#: code:addons/account/invoice.py:353
#, python-format
msgid "Unknown Error"
msgstr "Ðепозната грешка"
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid ""
"You cannot validate a non-balanced entry !\n"
@@ -8805,10 +8833,10 @@
#: field:account.entries.report,credit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,credit:0
#: field:account.move.line,credit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -8827,11 +8855,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Through :"
-msgstr "Чрез :"
-
-#. module: account
#: view:account.general.journal:0
#: model:ir.ui.menu,name:account.menu_account_general_journal
msgid "General Journals"
@@ -9013,11 +9036,6 @@
msgstr "Вътрешен тип"
#. module: account
-#: report:account.move.voucher:0
-msgid "State:"
-msgstr "СъÑтоÑние:"
-
-#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_running
msgid "Running Subscriptions"
msgstr "ИзпълнÑващи Ñе абонаменти"
@@ -9044,7 +9062,6 @@
#: view:account.move:0
#: selection:account.move,state:0
#: view:account.move.line:0
-#: report:account.move.voucher:0
msgid "Posted"
msgstr "Публикувано"
@@ -9063,6 +9080,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_to:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_stop:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -9116,7 +9134,7 @@
msgstr "Този модел е за повтарÑщи Ñе запиÑи на Ñметка"
#. module: account
-#: code:addons/account/account_analytic_line.py:100
+#: code:addons/account/account_analytic_line.py:99
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr "ÐÑма зададена приходна Ñметка за продукта: \"%s\" (id:%d)"
@@ -9152,6 +9170,7 @@
#: field:report.account.sales,amount_total:0
#: field:report.account_type.sales,amount_total:0
#: field:report.invoice.created,amount_total:0
+#: report:account.aged_trial_balance:0
msgid "Total"
msgstr "Общо"
@@ -9266,8 +9285,8 @@
msgstr "Край на периода"
#. module: account
-#: code:addons/account/account_move_line.py:738
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:806
#: code:addons/account/wizard/account_invoice_state.py:44
#: code:addons/account/wizard/account_invoice_state.py:68
#: code:addons/account/wizard/account_report_balance_sheet.py:70
@@ -9287,15 +9306,15 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "On Account of :"
-msgstr ""
-
-#. module: account
-#: view:account.automatic.reconcile:0
-#: view:account.move.line.reconcile.writeoff:0
-msgid "Write-Off Move"
-msgstr "Движение на отпиÑване"
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
+msgstr "Приключен"
#. module: account
#: model:process.node,note:account.process_node_paidinvoice0
@@ -9333,10 +9352,10 @@
#: field:account.entries.report,debit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,debit:0
#: field:account.move.line,debit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -9357,20 +9376,12 @@
msgstr "Грешка! Ðе може да Ñъздавате рекурÑивни шаблони за Ñметки."
#. module: account
-#: constraint:account.account.template:0
-msgid ""
-"You cannot create an account template! \n"
-"Make sure if the account template has parent then it should be type "
-"\"View\"! "
-msgstr ""
-
-#. module: account
#: view:account.subscription:0
msgid "Recurring"
msgstr "ПовтарÑщо Ñе"
#. module: account
-#: code:addons/account/account_move_line.py:805
+#: code:addons/account/account_move_line.py:796
#, python-format
msgid "Entry is already reconciled"
msgstr "ЗапиÑа вече е приравнен"
@@ -9391,7 +9402,7 @@
msgstr "Обхват"
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid ""
"Can not create an automatic sequence for this piece !\n"
@@ -9521,7 +9532,7 @@
msgstr "Свързване на Ñметки"
#. module: account
-#: code:addons/account/invoice.py:346
+#: code:addons/account/invoice.py:345
#, python-format
msgid "Invoice '%s' is waiting for validation."
msgstr "Фактура '%s' очаква проверка."
@@ -9546,7 +9557,7 @@
msgstr "Сметката за приходи или разходи Ñвързана Ñ Ð¸Ð·Ð±Ñ€Ð°Ð½Ð¸Ñ Ð¿Ñ€Ð¾Ð´ÑƒÐºÑ‚."
#. module: account
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account_move_line.py:1123
#, python-format
msgid "The date of your Journal Entry is not in the defined period!"
msgstr ""
@@ -9650,6 +9661,7 @@
#: field:account.partner.ledger,result_selection:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
+#: report:account.aged_trial_balance:0
msgid "Partner's"
msgstr ""
@@ -9752,7 +9764,7 @@
"ТрÑбва да въведете дължина на период, коÑто не може да бъде 0 или по-малко."
#. module: account
-#: code:addons/account/account.py:501
+#: code:addons/account/account.py:511
#, python-format
msgid "You cannot remove an account which has account entries!. "
msgstr ""
@@ -9776,6 +9788,7 @@
"The residual amount on a receivable or payable of a journal entry expressed "
"in its currency (maybe different of the company currency)."
msgstr ""
+<<<<<<< TREE
#~ msgid "Keep empty to use the period of the validation date."
#~ msgstr "ОÑтавете празно за да бъде изпозван периода на проверка на дадата."
@@ -10523,3 +10536,75 @@
#, python-format
#~ msgid "is validated."
#~ msgstr "е валидирано."
+=======
+
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+msgid "Liabilities"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+msgid "Balance:"
+msgstr ""
+
+#. module: account
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+msgid "Particular"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Aged Trial Balance"
+msgstr "Стар пробен баланÑ"
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Period Length(days)"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Account Total"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Not due"
+msgstr ""
+
+#~ msgid "Print Voucher"
+#~ msgstr "Отпечатване на ваучер"
+
+#~ msgid "Ref. :"
+#~ msgstr "Реф. :"
+
+#~ msgid "Canceled"
+#~ msgstr "Отменени"
+
+#~ msgid "Number:"
+#~ msgstr "Ðомер:"
+
+#~ msgid "Journal:"
+#~ msgstr "Дневник:"
+
+#~ msgid "Amount (in words) :"
+#~ msgstr "Сума (Ñловом):"
+
+#~ msgid "Through :"
+#~ msgstr "Чрез :"
+
+#~ msgid "State:"
+#~ msgstr "СъÑтоÑние:"
+>>>>>>> MERGE-SOURCE
=== modified file 'account/i18n/br.po'
--- account/i18n/br.po 2011-04-29 05:56:18 +0000
+++ account/i18n/br.po 2011-08-02 06:32:40 +0000
@@ -7,15 +7,25 @@
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2010-12-12 09:25+0000\n"
+=======
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2011-01-19 12:00+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Breton <br@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-29 05:04+0000\n"
"X-Generator: Launchpad (build 12758)\n"
+=======
+"X-Launchpad-Export-Date: 2011-07-23 05:36+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,13 +38,7 @@
msgstr "Kefluniadur all"
#. module: account
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#, python-format
-msgid "No End of year journal defined for the fiscal year"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:506
+#: code:addons/account/account.py:516
#, python-format
msgid ""
"You cannot remove/deactivate an account which is set as a property to any "
@@ -66,7 +70,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:785
+#: code:addons/account/invoice.py:793
#, python-format
msgid "Please define sequence on invoice journal"
msgstr ""
@@ -131,7 +135,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1291
+#: code:addons/account/account.py:1305
#, python-format
msgid "You can not delete posted movement: \"%s\"!"
msgstr ""
@@ -175,7 +179,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1421
+#: code:addons/account/invoice.py:1436
#, python-format
msgid "Warning!"
msgstr ""
@@ -227,7 +231,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:901
+#: code:addons/account/account.py:915
#, python-format
msgid ""
"No period defined for this date: %s !\n"
@@ -255,7 +259,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1210
+#: code:addons/account/invoice.py:1224
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
msgstr ""
@@ -271,7 +275,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1176
+#: code:addons/account/account_move_line.py:1182
#, python-format
msgid "You can not add/modify entries in a closed journal."
msgstr "N'hallit ket ouzhpennañ/kemmañ enmontoù en ur marilh serr"
@@ -309,7 +313,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:529
+#: code:addons/account/invoice.py:532
#, python-format
msgid "Invoice line account company does not match with invoice company."
msgstr ""
@@ -551,7 +555,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_cash_statement.py:348
+#: code:addons/account/account_cash_statement.py:349
#, python-format
msgid "CashBox Balance is not matching with Calculated Balance !"
msgstr ""
@@ -633,7 +637,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2779
+#: code:addons/account/account.py:2823
#: code:addons/account/installer.py:434
#, python-format
msgid "SAJ"
@@ -666,8 +670,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
#, python-format
msgid "To reconcile the entries company should be the same for all entries"
msgstr ""
@@ -728,7 +732,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:39
+#: code:addons/account/wizard/account_change_currency.py:38
#, python-format
msgid "You can only change currency for Draft Invoice !"
msgstr ""
@@ -829,7 +833,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1191
+#: code:addons/account/account_move_line.py:1197
#, python-format
msgid ""
"You can not do this modification on a confirmed entry ! Please note that you "
@@ -856,6 +860,7 @@
#. module: account
#: report:account.overdue:0
+#: report:account.aged_trial_balance:0
msgid "Due"
msgstr ""
@@ -947,15 +952,19 @@
#: field:account.journal,code:0
#: report:account.partner.balance:0
#: field:account.period,code:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Code"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
+#: code:addons/account/account_move_line.py:169
#: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:670
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "No Analytic Journal !"
@@ -1034,7 +1043,6 @@
#. module: account
#: report:account.analytic.account.journal:0
-#: report:account.move.voucher:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "-"
@@ -1120,6 +1128,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
@@ -1127,7 +1136,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:976
+#: code:addons/account/account.py:990
#, python-format
msgid "You can not modify/delete a journal with entries for this period !"
msgstr ""
@@ -1265,8 +1274,8 @@
msgstr ""
#. module: account
-#: model:ir.actions.act_window,name:account.action_partner_all
#: model:ir.ui.menu,name:account.next_id_22
+#: report:account.aged_trial_balance:0
msgid "Partners"
msgstr ""
@@ -1295,7 +1304,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "You can not use this general account in this journal !"
msgstr ""
@@ -1388,7 +1397,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:815
+#: code:addons/account/invoice.py:823
#, python-format
msgid ""
"Cannot create the invoice !\n"
@@ -1402,14 +1411,9 @@
msgstr ""
#. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-#: selection:account.bank.statement,state:0
-#: selection:account.entries.report,type:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.period,state:0
-msgid "Closed"
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
msgstr ""
#. module: account
@@ -1547,7 +1551,6 @@
msgstr ""
#. module: account
-#: field:account.bank.statement,user_id:0
#: view:account.invoice:0
msgid "Responsible"
msgstr ""
@@ -1591,11 +1594,6 @@
msgstr ""
#. module: account
-#: model:ir.actions.report.xml,name:account.report_account_voucher_new
-msgid "Print Voucher"
-msgstr ""
-
-#. module: account
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
msgstr ""
@@ -1614,7 +1612,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:799
#, python-format
msgid "The account is not defined to be reconciled !"
msgstr ""
@@ -1647,7 +1645,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:806
#, python-format
msgid "You have to provide an account for the write off entry !"
msgstr ""
@@ -1663,11 +1661,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Ref. :"
-msgstr ""
-
-#. module: account
#: view:account.analytic.chart:0
msgid "Analytic Account Charts"
msgstr ""
@@ -1683,7 +1676,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_cash_statement.py:328
+#: code:addons/account/account_cash_statement.py:329
#, python-format
msgid "User %s does not have rights to access %s journal !"
msgstr ""
@@ -1704,7 +1697,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:499
+#: code:addons/account/account.py:509
#, python-format
msgid "You cannot deactivate an account that contains account moves."
msgstr ""
@@ -1720,7 +1713,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:519
+#: code:addons/account/account.py:529
#, python-format
msgid ""
"You cannot change the type of account from 'Closed' to any other type which "
@@ -1880,11 +1873,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Canceled"
-msgstr ""
-
-#. module: account
#: view:account.invoice:0
#: view:report.invoice.created:0
msgid "Untaxed Amount"
@@ -1989,7 +1977,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
#, python-format
msgid ""
"There is no default default debit account defined \n"
@@ -2041,7 +2029,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2844
+#: code:addons/account/account.py:2888
#: code:addons/account/installer.py:498
#, python-format
msgid "ECNJ"
@@ -2061,7 +2049,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:352
+#: code:addons/account/invoice.py:351
#, python-format
msgid "There is no Accounting Journal of type Sale/Purchase defined!"
msgstr ""
@@ -2072,6 +2060,7 @@
msgstr ""
#. module: account
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.print.journal,sort_selection:0
msgid "Entries Sorted By"
@@ -2100,6 +2089,7 @@
#: field:account.fiscalyear,name:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.journal.period,fiscalyear_id:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -2109,6 +2099,11 @@
#: report:account.third_party_ledger_other:0
#: report:account.vat.declaration:0
#: model:ir.model,name:account.model_account_fiscalyear
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
msgid "Fiscal Year"
msgstr ""
@@ -2208,7 +2203,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:545
+#: code:addons/account/invoice.py:552
#, python-format
msgid ""
"Can't find any account journal of %s type for this company.\n"
@@ -2278,7 +2273,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2796
+#: code:addons/account/account.py:2840
#: code:addons/account/installer.py:454
#, python-format
msgid "EXJ"
@@ -2362,7 +2357,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:350
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -2374,13 +2369,12 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
#: report:account.overdue:0
msgid "Date:"
msgstr ""
#. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:654
#, python-format
msgid ""
"You cannot modify company of this journal as its related record exist in "
@@ -2416,6 +2410,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.overdue:0
#: report:account.third_party_ledger:0
@@ -2524,16 +2519,16 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1195
#, python-format
msgid "No sequence defined on the journal !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
-#: code:addons/account/invoice.py:670
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2582,11 +2577,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Number:"
-msgstr ""
-
-#. module: account
#: selection:account.print.journal,sort_selection:0
msgid "Reference Number"
msgstr ""
@@ -2693,7 +2683,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:822
+#: code:addons/account/account.py:836
#, python-format
msgid ""
"No fiscal year defined for this date !\n"
@@ -2810,6 +2800,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
@@ -2817,6 +2808,9 @@
#. module: account
#: code:addons/account/account.py:2906
+=======
+#: code:addons/account/account.py:2950
+>>>>>>> MERGE-SOURCE
#: code:addons/account/installer.py:296
#, python-format
msgid "BNK"
@@ -2907,6 +2901,12 @@
msgstr ""
#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+#, python-format
+msgid "No End of year journal defined for the fiscal year"
+msgstr ""
+
+#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the expense account"
@@ -2925,6 +2925,7 @@
#: field:account.common.report,journal_ids:0
#: report:account.general.journal:0
#: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger_landscape:0
#: view:account.journal.period:0
#: report:account.partner.balance:0
#: field:account.partner.balance,journal_ids:0
@@ -2985,7 +2986,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "No Partner Defined !"
msgstr ""
@@ -3015,11 +3016,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Journal:"
-msgstr ""
-
-#. module: account
#: view:account.bank.statement:0
#: selection:account.bank.statement,state:0
#: view:account.invoice:0
@@ -3027,7 +3023,6 @@
#: view:account.invoice.report:0
#: selection:account.invoice.report,state:0
#: selection:account.journal.period,state:0
-#: report:account.move.voucher:0
#: view:account.subscription:0
#: selection:account.subscription,state:0
#: selection:report.invoice.created,state:0
@@ -3067,11 +3062,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Authorised Signatory"
-msgstr ""
-
-#. module: account
#: view:validate.account.move.lines:0
msgid ""
"All selected journal entries will be validated and posted. It means you "
@@ -3079,7 +3069,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Cannot delete invoice(s) that are already opened or paid !"
msgstr ""
@@ -3095,8 +3085,10 @@
msgstr ""
#. module: account
-#: view:account.payment.term.line:0
-msgid " value amount: n.a"
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
msgstr ""
#. module: account
@@ -3140,7 +3132,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:532
#, python-format
msgid ""
"You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3149,6 +3141,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
msgid "Counterpart"
msgstr ""
@@ -3251,6 +3244,7 @@
#: field:account.entries.report,date:0
#: selection:account.general.journal,filter:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice.report,date:0
#: report:account.journal.period.print:0
#: view:account.move:0
@@ -3294,7 +3288,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2095
+#: code:addons/account/account.py:2109
#, python-format
msgid ""
"Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3303,13 +3297,13 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:810
+#: code:addons/account/account_move_line.py:801
#, python-format
msgid "Some entries are already reconciled !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1204
+#: code:addons/account/account.py:1218
#, python-format
msgid ""
"You cannot validate a Journal Entry unless all journal items are in same "
@@ -3429,7 +3423,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "Unable to change tax !"
msgstr ""
@@ -3440,14 +3434,14 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1422
+#: code:addons/account/invoice.py:1437
#, python-format
msgid ""
"You selected an Unit of Measure which is not compatible with the product."
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#, python-format
msgid ""
"The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3741,7 +3735,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:714
+#: code:addons/account/invoice.py:722
#, python-format
msgid "Global taxes defined, but are not in invoice lines !"
msgstr ""
@@ -3800,7 +3794,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:91
+#: code:addons/account/account_analytic_line.py:90
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -3975,7 +3969,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "Unable to find a valid period !"
@@ -4025,6 +4019,15 @@
msgstr ""
#. module: account
+#: constraint:account.account:0
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error! \n"
+"You cannot define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
msgid "Account Analytic Cost Ledger For Journal Report"
msgstr ""
@@ -4046,11 +4049,11 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1290
-#: code:addons/account/account.py:1318
-#: code:addons/account/account.py:1325
-#: code:addons/account/account_move_line.py:1055
-#: code:addons/account/invoice.py:896
+#: code:addons/account/account.py:1304
+#: code:addons/account/account.py:1332
+#: code:addons/account/account.py:1339
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/invoice.py:904
#: code:addons/account/wizard/account_automatic_reconcile.py:152
#: code:addons/account/wizard/account_fiscalyear_close.py:78
#: code:addons/account/wizard/account_fiscalyear_close.py:81
@@ -4103,13 +4106,6 @@
msgstr ""
#. module: account
-#: constraint:account.account:0
-msgid ""
-"You cannot create an account! \n"
-"Make sure if the account has children then it should be type \"View\"!"
-msgstr ""
-
-#. module: account
#: view:account.subscription.generate:0
#: model:ir.actions.act_window,name:account.action_account_subscription_generate
#: model:ir.ui.menu,name:account.menu_generate_subscription
@@ -4154,7 +4150,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1397
+#: code:addons/account/account.py:1411
#, python-format
msgid ""
"Couldn't create move with currency different from the secondary currency of "
@@ -4186,6 +4182,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
msgstr ""
@@ -4219,7 +4224,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid ""
"Please verify the price of the invoice !\n"
@@ -4331,29 +4336,12 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:938
-#: code:addons/account/account.py:940
-#: code:addons/account/account.py:1181
-#: code:addons/account/account.py:1393
-#: code:addons/account/account.py:1397
-#: code:addons/account/account_cash_statement.py:249
-#: code:addons/account/account_move_line.py:780
-#: code:addons/account/account_move_line.py:803
-#: code:addons/account/account_move_line.py:805
-#: code:addons/account/account_move_line.py:808
-#: code:addons/account/account_move_line.py:810
-#: code:addons/account/account_move_line.py:1117
-#: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_change_currency.py:39
-#: code:addons/account/wizard/account_change_currency.py:60
-#: code:addons/account/wizard/account_change_currency.py:65
-#: code:addons/account/wizard/account_change_currency.py:71
-#: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#: code:addons/account/wizard/account_report_common.py:120
-#: code:addons/account/wizard/account_report_common.py:126
-#, python-format
-msgid "Error"
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"With Supplier Refunds you can manage the credit notes you receive from your "
+"suppliers. A refund is a document that credits an invoice completely or "
+"partially. You can easily generate refunds and reconcile them directly from "
+"the invoice form."
msgstr ""
#. module: account
@@ -4371,7 +4359,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:720
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Taxes missing !"
msgstr ""
@@ -4426,7 +4414,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1210
+#: code:addons/account/account.py:1224
#, python-format
msgid ""
"You can not modify a posted entry of this journal !\n"
@@ -4445,7 +4433,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:940
+#: code:addons/account/account.py:954
#, python-format
msgid "Start period should be smaller then End period"
msgstr ""
@@ -4475,6 +4463,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,target_move:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.journal,target_move:0
#: report:account.partner.balance:0
@@ -4487,6 +4476,11 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,target_move:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
msgid "Target Moves"
msgstr ""
@@ -4557,7 +4551,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid "Integrity Error !"
msgstr ""
@@ -4603,6 +4597,8 @@
#: view:account.bs.report:0
#: model:ir.actions.act_window,name:account.action_account_bs_report
#: model:ir.ui.menu,name:account.menu_account_bs_report
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
msgid "Balance Sheet"
msgstr ""
@@ -4697,13 +4693,7 @@
msgstr ""
#. module: account
-#: constraint:account.move.line:0
-msgid ""
-"You can not create move line on receivable/payable account without partner"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "No period found !"
@@ -4775,7 +4765,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2896
+#: code:addons/account/account.py:2940
#: code:addons/account/installer.py:283
#: code:addons/account/installer.py:295
#, python-format
@@ -4803,7 +4793,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1193
+#: code:addons/account/account_move_line.py:1199
#, python-format
msgid ""
"You can not do this modification on a reconciled entry ! Please note that "
@@ -4859,12 +4849,12 @@
#. module: account
#: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:405
-#: code:addons/account/invoice.py:505
-#: code:addons/account/invoice.py:520
-#: code:addons/account/invoice.py:528
-#: code:addons/account/invoice.py:545
-#: code:addons/account/invoice.py:1347
+#: code:addons/account/invoice.py:408
+#: code:addons/account/invoice.py:508
+#: code:addons/account/invoice.py:523
+#: code:addons/account/invoice.py:531
+#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:1361
#: code:addons/account/wizard/account_move_journal.py:63
#, python-format
msgid "Configuration Error !"
@@ -4941,7 +4931,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1326
+#: code:addons/account/account.py:1340
#, python-format
msgid ""
"There is no default default credit account defined \n"
@@ -5088,7 +5078,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:738
+#: code:addons/account/account_move_line.py:729
#, python-format
msgid "Already Reconciled!"
msgstr ""
@@ -5124,7 +5114,7 @@
#. module: account
#: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:821
#, python-format
msgid "Write-Off"
msgstr ""
@@ -5261,7 +5251,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:60
+#: code:addons/account/wizard/account_change_currency.py:59
#, python-format
msgid "New currency is not confirured properly !"
msgstr ""
@@ -5286,14 +5276,14 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "You can not use an inactive account!"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:794
#, python-format
msgid "Entries are not of the same account or already reconciled ! "
msgstr ""
@@ -5328,7 +5318,7 @@
#. module: account
#: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -5539,7 +5529,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:546
#, python-format
msgid ""
"You cannot modify Company of account as its related record exist in Entry "
@@ -5805,9 +5795,9 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:406
-#: code:addons/account/invoice.py:506
-#: code:addons/account/invoice.py:1348
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
#, python-format
msgid "Can not find account chart for this company, Please Create account."
msgstr ""
@@ -5956,8 +5946,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:143
-#: code:addons/account/account_move_line.py:905
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
#, python-format
msgid "Entries: "
msgstr ""
@@ -5968,7 +5958,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1393
+#: code:addons/account/account.py:1407
#, python-format
msgid "Couldn't create move between different companies"
msgstr ""
@@ -6006,7 +5996,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:781
+#: code:addons/account/account_move_line.py:772
#, python-format
msgid "Entry \"%s\" is not valid !"
msgstr ""
@@ -6070,30 +6060,31 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:499
-#: code:addons/account/account.py:501
-#: code:addons/account/account.py:822
-#: code:addons/account/account.py:901
-#: code:addons/account/account.py:976
-#: code:addons/account/account.py:1204
-#: code:addons/account/account.py:1210
-#: code:addons/account/account.py:2095
-#: code:addons/account/account.py:2333
-#: code:addons/account/account_analytic_line.py:90
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account.py:509
+#: code:addons/account/account.py:511
+#: code:addons/account/account.py:836
+#: code:addons/account/account.py:915
+#: code:addons/account/account.py:990
+#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2357
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
#: code:addons/account/account_bank_statement.py:292
#: code:addons/account/account_bank_statement.py:305
#: code:addons/account/account_bank_statement.py:345
-#: code:addons/account/account_cash_statement.py:328
-#: code:addons/account/account_cash_statement.py:348
-#: code:addons/account/account_move_line.py:1176
-#: code:addons/account/account_move_line.py:1191
-#: code:addons/account/account_move_line.py:1193
-#: code:addons/account/invoice.py:785
-#: code:addons/account/invoice.py:815
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1197
+#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:1014
#: code:addons/account/wizard/account_invoice_refund.py:100
#: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
#: code:addons/account/wizard/account_use_model.py:44
#, python-format
msgid "Error !"
@@ -6152,6 +6143,11 @@
msgstr ""
#. module: account
+#: report:account.general.ledger_landscape:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
#: view:account.partner.balance:0
#: view:account.partner.ledger:0
msgid ""
@@ -6203,7 +6199,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:65
+#: code:addons/account/wizard/account_change_currency.py:64
#, python-format
msgid "Currnt currency is not confirured properly !"
msgstr ""
@@ -6220,9 +6216,11 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.report.general.ledger:0
#: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
#: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
#: model:ir.ui.menu,name:account.menu_general_ledger
msgid "General Ledger"
msgstr ""
@@ -6272,11 +6270,13 @@
#: report:account.general.journal:0
#: report:account.invoice:0
#: report:account.partner.balance:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Total:"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2050
+#: code:addons/account/account.py:2064
#, python-format
msgid ""
"You can specify year, month and date in the name of the model using the "
@@ -6306,7 +6306,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#: code:addons/account/wizard/account_invoice_refund.py:137
#, python-format
msgid "Data Insufficient !"
@@ -6463,7 +6463,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:521
+#: code:addons/account/invoice.py:524
#, python-format
msgid ""
"Can not find account chart for this company in invoice line account, Please "
@@ -6631,7 +6631,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:938
+#: code:addons/account/account.py:952
#, python-format
msgid "You should have chosen periods that belongs to the same company"
msgstr ""
@@ -6735,7 +6735,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_cash_statement.py:249
+#: code:addons/account/account_cash_statement.py:250
#, python-format
msgid "You can not have two open register for the same journal"
msgstr ""
@@ -6764,7 +6764,6 @@
#. module: account
#: report:account.invoice:0
#: view:account.invoice:0
-#: report:account.move.voucher:0
msgid "PRO-FORMA"
msgstr ""
@@ -6776,10 +6775,8 @@
msgstr ""
#. module: account
-#: selection:account.entries.report,move_line_state:0
-#: view:account.move.line:0
-#: selection:account.move.line,state:0
-msgid "Unbalanced"
+#: view:account.payment.term.line:0
+msgid " value amount: n.a"
msgstr ""
#. module: account
@@ -6794,6 +6791,7 @@
#. module: account
#: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
#: view:account.journal:0
#: field:account.journal,user_id:0
#: view:analytic.entries.report:0
@@ -6819,13 +6817,13 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "Bad account !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2777
+#: code:addons/account/account.py:2821
#: code:addons/account/installer.py:432
#, python-format
msgid "Sales Journal"
@@ -6843,7 +6841,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid "No piece number !"
msgstr ""
@@ -7077,17 +7075,17 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:506
-#: code:addons/account/account.py:519
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
#: code:addons/account/account.py:532
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:927
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/invoice.py:714
-#: code:addons/account/invoice.py:717
-#: code:addons/account/invoice.py:720
+#: code:addons/account/account.py:546
+#: code:addons/account/account.py:654
+#: code:addons/account/account.py:941
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Warning !"
msgstr ""
@@ -7110,15 +7108,11 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Amount (in words) :"
-msgstr ""
-
-#. module: account
#: field:account.bank.statement.line,partner_id:0
#: view:account.entries.report:0
#: field:account.entries.report,partner_id:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: field:account.invoice,partner_id:0
#: field:account.invoice.line,partner_id:0
@@ -7149,7 +7143,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "No Invoice Lines !"
msgstr ""
@@ -7198,7 +7192,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:359
+#: code:addons/account/invoice.py:360
#, python-format
msgid "Invoice '%s' is paid."
msgstr ""
@@ -7259,7 +7253,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "You must first select a partner !"
msgstr ""
@@ -7324,7 +7318,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2841
+#: code:addons/account/account.py:2885
#: code:addons/account/installer.py:495
#, python-format
msgid "Purchase Refund Journal"
@@ -7359,6 +7353,7 @@
#: view:account.entries.report:0
#: field:account.entries.report,period_id:0
#: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: view:account.invoice.report:0
#: field:account.journal.period,period_id:0
@@ -7458,6 +7453,11 @@
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
msgid "Chart of Account"
msgstr ""
@@ -7521,7 +7521,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:897
+#: code:addons/account/invoice.py:905
#, python-format
msgid "Cannot create invoice move on centralised journal"
msgstr ""
@@ -7571,7 +7571,12 @@
#: report:account.account.balance:0
#: report:account.central.journal:0
#: report:account.general.journal:0
+#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Filter By"
msgstr ""
@@ -7609,7 +7614,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2794
+#: code:addons/account/account.py:2838
#: code:addons/account/installer.py:452
#, python-format
msgid "Purchase Journal"
@@ -7776,8 +7781,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "Bad account!"
msgstr ""
@@ -7788,7 +7793,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1056
+#: code:addons/account/account_move_line.py:1062
#, python-format
msgid "The account move (%s) for centralisation has been confirmed!"
msgstr ""
@@ -7809,6 +7814,7 @@
#: field:account.entries.report,currency_id:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice,currency_id:0
#: field:account.invoice.report,currency_id:0
#: field:account.journal,currency:0
@@ -7981,14 +7987,14 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2817
+#: code:addons/account/account.py:2861
#: code:addons/account/installer.py:476
#, python-format
msgid "Sales Refund Journal"
msgstr ""
#. module: account
-#: code:addons/account/account.py:927
+#: code:addons/account/account.py:941
#, python-format
msgid ""
"You cannot modify company of this period as its related record exist in "
@@ -8037,7 +8043,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "Please create some invoice lines."
msgstr ""
@@ -8053,7 +8059,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2820
+#: code:addons/account/account.py:2864
#: code:addons/account/installer.py:479
#, python-format
msgid "SCNJ"
@@ -8091,6 +8097,7 @@
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
@@ -8100,13 +8107,14 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2333
+#: code:addons/account/account.py:2357
#, python-format
msgid "Cannot locate parent code for template account!"
msgstr ""
#. module: account
#: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
msgid "Analysis Direction"
msgstr ""
@@ -8137,7 +8145,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/invoice.py:1014
#, python-format
msgid ""
"You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8165,18 +8173,34 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:70
#, python-format
msgid "Current currency is not confirured properly !"
msgstr ""
#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree4
-msgid ""
-"With Supplier Refunds you can manage the credit notes you receive from your "
-"suppliers. A refund is a document that credits an invoice completely or "
-"partially. You can easily generate refunds and reconcile them directly from "
-"the invoice form."
+#: code:addons/account/account.py:952
+#: code:addons/account/account.py:954
+#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1411
+#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:120
+#: code:addons/account/wizard/account_report_common.py:126
+#, python-format
+msgid "Error"
msgstr ""
#. module: account
@@ -8185,11 +8209,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Particulars"
-msgstr ""
-
-#. module: account
#: selection:account.account.type,report_type:0
msgid "Profit & Loss (Income Accounts)"
msgstr ""
@@ -8214,6 +8233,7 @@
#: field:account.entries.report,balance:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.move.line,balance:0
#: report:account.partner.balance:0
#: selection:account.payment.term.line,value:0
@@ -8222,6 +8242,10 @@
#: report:account.third_party_ledger_other:0
#: field:report.account.receivable,balance:0
#: field:report.aged.receivable,balance:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Balance"
msgstr ""
@@ -8232,6 +8256,11 @@
#. module: account
#: report:account.account.balance:0
+#: report:account.general.ledger_landscape:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Display Account"
msgstr ""
@@ -8326,11 +8355,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Receiver's Signature"
-msgstr ""
-
-#. module: account
#: report:account.general.ledger:0
#: report:account.journal.period.print:0
#: report:account.third_party_ledger:0
@@ -8346,6 +8370,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.line,move_id:0
#: field:analytic.entries.report,move_id:0
@@ -8353,7 +8378,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "You can not change the tax, you should remove and recreate lines !"
msgstr ""
@@ -8447,6 +8472,7 @@
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
@@ -8490,7 +8516,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:717
+#: code:addons/account/invoice.py:725
#, python-format
msgid ""
"Tax base different !\n"
@@ -8517,6 +8543,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_from:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_start:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -8529,6 +8556,7 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,date_from:0
+#: report:account.aged_trial_balance:0
msgid "Start Date"
msgstr ""
@@ -8545,7 +8573,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid "Bad total !"
msgstr ""
@@ -8603,13 +8631,13 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:354
+#: code:addons/account/invoice.py:353
#, python-format
msgid "Unknown Error"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid ""
"You cannot validate a non-balanced entry !\n"
@@ -8652,10 +8680,10 @@
#: field:account.entries.report,credit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,credit:0
#: field:account.move.line,credit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -8674,11 +8702,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Through :"
-msgstr ""
-
-#. module: account
#: view:account.general.journal:0
#: model:ir.ui.menu,name:account.menu_account_general_journal
msgid "General Journals"
@@ -8860,11 +8883,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "State:"
-msgstr ""
-
-#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_running
msgid "Running Subscriptions"
msgstr ""
@@ -8891,7 +8909,6 @@
#: view:account.move:0
#: selection:account.move,state:0
#: view:account.move.line:0
-#: report:account.move.voucher:0
msgid "Posted"
msgstr ""
@@ -8910,6 +8927,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_to:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_stop:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -8963,7 +8981,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:100
+#: code:addons/account/account_analytic_line.py:99
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -8999,6 +9017,7 @@
#: field:report.account.sales,amount_total:0
#: field:report.account_type.sales,amount_total:0
#: field:report.invoice.created,amount_total:0
+#: report:account.aged_trial_balance:0
msgid "Total"
msgstr ""
@@ -9113,8 +9132,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:738
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:806
#: code:addons/account/wizard/account_invoice_state.py:44
#: code:addons/account/wizard/account_invoice_state.py:68
#: code:addons/account/wizard/account_report_balance_sheet.py:70
@@ -9134,14 +9153,14 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "On Account of :"
-msgstr ""
-
-#. module: account
-#: view:account.automatic.reconcile:0
-#: view:account.move.line.reconcile.writeoff:0
-msgid "Write-Off Move"
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
msgstr ""
#. module: account
@@ -9180,10 +9199,10 @@
#: field:account.entries.report,debit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,debit:0
#: field:account.move.line,debit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -9204,20 +9223,12 @@
msgstr ""
#. module: account
-#: constraint:account.account.template:0
-msgid ""
-"You cannot create an account template! \n"
-"Make sure if the account template has parent then it should be type "
-"\"View\"! "
-msgstr ""
-
-#. module: account
#: view:account.subscription:0
msgid "Recurring"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:805
+#: code:addons/account/account_move_line.py:796
#, python-format
msgid "Entry is already reconciled"
msgstr ""
@@ -9238,7 +9249,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid ""
"Can not create an automatic sequence for this piece !\n"
@@ -9368,7 +9379,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:346
+#: code:addons/account/invoice.py:345
#, python-format
msgid "Invoice '%s' is waiting for validation."
msgstr ""
@@ -9393,7 +9404,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account_move_line.py:1123
#, python-format
msgid "The date of your Journal Entry is not in the defined period!"
msgstr ""
@@ -9497,6 +9508,7 @@
#: field:account.partner.ledger,result_selection:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
+#: report:account.aged_trial_balance:0
msgid "Partner's"
msgstr ""
@@ -9598,7 +9610,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:501
+#: code:addons/account/account.py:511
#, python-format
msgid "You cannot remove an account which has account entries!. "
msgstr ""
@@ -9621,6 +9633,55 @@
"The residual amount on a receivable or payable of a journal entry expressed "
"in its currency (maybe different of the company currency)."
msgstr ""
+<<<<<<< TREE
#~ msgid "supplier"
#~ msgstr "pourchaser"
+=======
+
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+msgid "Liabilities"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+msgid "Balance:"
+msgstr ""
+
+#. module: account
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+msgid "Particular"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Aged Trial Balance"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Period Length(days)"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Account Total"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Not due"
+msgstr ""
+>>>>>>> MERGE-SOURCE
=== modified file 'account/i18n/bs.po'
--- account/i18n/bs.po 2011-04-29 05:56:18 +0000
+++ account/i18n/bs.po 2011-08-02 06:32:40 +0000
@@ -6,15 +6,25 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
+<<<<<<< TREE
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2010-12-11 15:12+0000\n"
+=======
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2011-01-19 12:00+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Fabien (Open ERP) <fp@xxxxxxxxxxx>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-29 05:04+0000\n"
"X-Generator: Launchpad (build 12758)\n"
+=======
+"X-Launchpad-Export-Date: 2011-07-23 05:36+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -27,13 +37,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#, python-format
-msgid "No End of year journal defined for the fiscal year"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:506
+#: code:addons/account/account.py:516
#, python-format
msgid ""
"You cannot remove/deactivate an account which is set as a property to any "
@@ -65,7 +69,7 @@
msgstr "Ostatak"
#. module: account
-#: code:addons/account/invoice.py:785
+#: code:addons/account/invoice.py:793
#, python-format
msgid "Please define sequence on invoice journal"
msgstr ""
@@ -130,7 +134,7 @@
msgstr "RaÄunovodstvene stavke-"
#. module: account
-#: code:addons/account/account.py:1291
+#: code:addons/account/account.py:1305
#, python-format
msgid "You can not delete posted movement: \"%s\"!"
msgstr ""
@@ -174,7 +178,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1421
+#: code:addons/account/invoice.py:1436
#, python-format
msgid "Warning!"
msgstr ""
@@ -226,7 +230,7 @@
msgstr "account.tax"
#. module: account
-#: code:addons/account/account.py:901
+#: code:addons/account/account.py:915
#, python-format
msgid ""
"No period defined for this date: %s !\n"
@@ -258,7 +262,7 @@
"pojavljuje na fakturama."
#. module: account
-#: code:addons/account/invoice.py:1210
+#: code:addons/account/invoice.py:1224
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
msgstr ""
@@ -274,7 +278,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1176
+#: code:addons/account/account_move_line.py:1182
#, python-format
msgid "You can not add/modify entries in a closed journal."
msgstr ""
@@ -312,7 +316,7 @@
msgstr "St."
#. module: account
-#: code:addons/account/invoice.py:529
+#: code:addons/account/invoice.py:532
#, python-format
msgid "Invoice line account company does not match with invoice company."
msgstr ""
@@ -554,7 +558,7 @@
msgstr "Neusklađene transakcije"
#. module: account
-#: code:addons/account/account_cash_statement.py:348
+#: code:addons/account/account_cash_statement.py:349
#, python-format
msgid "CashBox Balance is not matching with Calculated Balance !"
msgstr ""
@@ -638,7 +642,7 @@
msgstr "Iznos Å¡ifre poreza"
#. module: account
-#: code:addons/account/account.py:2779
+#: code:addons/account/account.py:2823
#: code:addons/account/installer.py:434
#, python-format
msgid "SAJ"
@@ -671,8 +675,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
#, python-format
msgid "To reconcile the entries company should be the same for all entries"
msgstr ""
@@ -733,7 +737,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:39
+#: code:addons/account/wizard/account_change_currency.py:38
#, python-format
msgid "You can only change currency for Draft Invoice !"
msgstr ""
@@ -834,7 +838,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1191
+#: code:addons/account/account_move_line.py:1197
#, python-format
msgid ""
"You can not do this modification on a confirmed entry ! Please note that you "
@@ -861,6 +865,7 @@
#. module: account
#: report:account.overdue:0
+#: report:account.aged_trial_balance:0
msgid "Due"
msgstr "Krajnji rok"
@@ -952,15 +957,19 @@
#: field:account.journal,code:0
#: report:account.partner.balance:0
#: field:account.period,code:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Code"
msgstr "Å ifra"
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
+#: code:addons/account/account_move_line.py:169
#: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:670
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "No Analytic Journal !"
@@ -1039,7 +1048,6 @@
#. module: account
#: report:account.analytic.account.journal:0
-#: report:account.move.voucher:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "-"
@@ -1125,6 +1133,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
@@ -1132,7 +1141,7 @@
msgstr "Oznaka stavke"
#. module: account
-#: code:addons/account/account.py:976
+#: code:addons/account/account.py:990
#, python-format
msgid "You can not modify/delete a journal with entries for this period !"
msgstr ""
@@ -1270,8 +1279,8 @@
msgstr ""
#. module: account
-#: model:ir.actions.act_window,name:account.action_partner_all
#: model:ir.ui.menu,name:account.next_id_22
+#: report:account.aged_trial_balance:0
msgid "Partners"
msgstr ""
@@ -1300,7 +1309,7 @@
msgstr "Glavni nalog za knjiženje"
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "You can not use this general account in this journal !"
msgstr ""
@@ -1393,7 +1402,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:815
+#: code:addons/account/invoice.py:823
#, python-format
msgid ""
"Cannot create the invoice !\n"
@@ -1407,15 +1416,10 @@
msgstr ""
#. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-#: selection:account.bank.statement,state:0
-#: selection:account.entries.report,type:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.period,state:0
-msgid "Closed"
-msgstr "Zatvoreno"
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr "Otpiši prijenos"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
@@ -1552,7 +1556,6 @@
msgstr "Razdvojeni redoslijedi naloga za knjiženje"
#. module: account
-#: field:account.bank.statement,user_id:0
#: view:account.invoice:0
msgid "Responsible"
msgstr ""
@@ -1596,11 +1599,6 @@
msgstr "Godišnja suma"
#. module: account
-#: model:ir.actions.report.xml,name:account.report_account_voucher_new
-msgid "Print Voucher"
-msgstr ""
-
-#. module: account
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
msgstr ""
@@ -1619,7 +1617,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:799
#, python-format
msgid "The account is not defined to be reconciled !"
msgstr ""
@@ -1652,7 +1650,7 @@
msgstr "Potraživanja i dugovanja"
#. module: account
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:806
#, python-format
msgid "You have to provide an account for the write off entry !"
msgstr ""
@@ -1668,11 +1666,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Ref. :"
-msgstr ""
-
-#. module: account
#: view:account.analytic.chart:0
msgid "Analytic Account Charts"
msgstr "AnalitiÄki kontni planovi"
@@ -1688,7 +1681,7 @@
msgstr "Referenca kupca"
#. module: account
-#: code:addons/account/account_cash_statement.py:328
+#: code:addons/account/account_cash_statement.py:329
#, python-format
msgid "User %s does not have rights to access %s journal !"
msgstr ""
@@ -1709,7 +1702,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:499
+#: code:addons/account/account.py:509
#, python-format
msgid "You cannot deactivate an account that contains account moves."
msgstr ""
@@ -1725,7 +1718,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:519
+#: code:addons/account/account.py:529
#, python-format
msgid ""
"You cannot change the type of account from 'Closed' to any other type which "
@@ -1887,11 +1880,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Canceled"
-msgstr ""
-
-#. module: account
#: view:account.invoice:0
#: view:report.invoice.created:0
msgid "Untaxed Amount"
@@ -1998,7 +1986,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
#, python-format
msgid ""
"There is no default default debit account defined \n"
@@ -2050,7 +2038,7 @@
msgstr "Opis"
#. module: account
-#: code:addons/account/account.py:2844
+#: code:addons/account/account.py:2888
#: code:addons/account/installer.py:498
#, python-format
msgid "ECNJ"
@@ -2070,7 +2058,7 @@
msgstr "Konto prihoda"
#. module: account
-#: code:addons/account/invoice.py:352
+#: code:addons/account/invoice.py:351
#, python-format
msgid "There is no Accounting Journal of type Sale/Purchase defined!"
msgstr ""
@@ -2081,6 +2069,7 @@
msgstr "Svojstva raÄunovodstva"
#. module: account
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.print.journal,sort_selection:0
msgid "Entries Sorted By"
@@ -2109,6 +2098,7 @@
#: field:account.fiscalyear,name:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.journal.period,fiscalyear_id:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -2118,6 +2108,11 @@
#: report:account.third_party_ledger_other:0
#: report:account.vat.declaration:0
#: model:ir.model,name:account.model_account_fiscalyear
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
msgid "Fiscal Year"
msgstr "Fisklana godina"
@@ -2217,7 +2212,7 @@
msgstr "Å ifra poreza"
#. module: account
-#: code:addons/account/invoice.py:545
+#: code:addons/account/invoice.py:552
#, python-format
msgid ""
"Can't find any account journal of %s type for this company.\n"
@@ -2287,7 +2282,7 @@
msgstr "Stavke raÄuna modela"
#. module: account
-#: code:addons/account/account.py:2796
+#: code:addons/account/account.py:2840
#: code:addons/account/installer.py:454
#, python-format
msgid "EXJ"
@@ -2376,7 +2371,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:350
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -2388,13 +2383,12 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
#: report:account.overdue:0
msgid "Date:"
msgstr "Datum:"
#. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:654
#, python-format
msgid ""
"You cannot modify company of this journal as its related record exist in "
@@ -2430,6 +2424,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.overdue:0
#: report:account.third_party_ledger:0
@@ -2538,16 +2533,16 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1195
#, python-format
msgid "No sequence defined on the journal !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
-#: code:addons/account/invoice.py:670
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2596,11 +2591,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Number:"
-msgstr ""
-
-#. module: account
#: selection:account.print.journal,sort_selection:0
msgid "Reference Number"
msgstr "Broj reference"
@@ -2707,7 +2697,7 @@
msgstr "AnalitiÄke stavke"
#. module: account
-#: code:addons/account/account.py:822
+#: code:addons/account/account.py:836
#, python-format
msgid ""
"No fiscal year defined for this date !\n"
@@ -2831,6 +2821,7 @@
msgstr "Prikaz"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
@@ -2838,6 +2829,9 @@
#. module: account
#: code:addons/account/account.py:2906
+=======
+#: code:addons/account/account.py:2950
+>>>>>>> MERGE-SOURCE
#: code:addons/account/installer.py:296
#, python-format
msgid "BNK"
@@ -2928,6 +2922,12 @@
msgstr ""
#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+#, python-format
+msgid "No End of year journal defined for the fiscal year"
+msgstr ""
+
+#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the expense account"
@@ -2946,6 +2946,7 @@
#: field:account.common.report,journal_ids:0
#: report:account.general.journal:0
#: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger_landscape:0
#: view:account.journal.period:0
#: report:account.partner.balance:0
#: field:account.partner.balance,journal_ids:0
@@ -3006,7 +3007,7 @@
msgstr "PoÄetni saldo"
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "No Partner Defined !"
msgstr ""
@@ -3036,11 +3037,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Journal:"
-msgstr ""
-
-#. module: account
#: view:account.bank.statement:0
#: selection:account.bank.statement,state:0
#: view:account.invoice:0
@@ -3048,7 +3044,6 @@
#: view:account.invoice.report:0
#: selection:account.invoice.report,state:0
#: selection:account.journal.period,state:0
-#: report:account.move.voucher:0
#: view:account.subscription:0
#: selection:account.subscription,state:0
#: selection:report.invoice.created,state:0
@@ -3088,11 +3083,6 @@
msgstr "Godina"
#. module: account
-#: report:account.move.voucher:0
-msgid "Authorised Signatory"
-msgstr ""
-
-#. module: account
#: view:validate.account.move.lines:0
msgid ""
"All selected journal entries will be validated and posted. It means you "
@@ -3100,7 +3090,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Cannot delete invoice(s) that are already opened or paid !"
msgstr ""
@@ -3116,8 +3106,10 @@
msgstr "Prijenosi"
#. module: account
-#: view:account.payment.term.line:0
-msgid " value amount: n.a"
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
msgstr ""
#. module: account
@@ -3161,7 +3153,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:532
#, python-format
msgid ""
"You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3170,6 +3162,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
msgid "Counterpart"
msgstr ""
@@ -3273,6 +3266,7 @@
#: field:account.entries.report,date:0
#: selection:account.general.journal,filter:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice.report,date:0
#: report:account.journal.period.print:0
#: view:account.move:0
@@ -3316,7 +3310,7 @@
msgstr "Predložak kontnog plana"
#. module: account
-#: code:addons/account/account.py:2095
+#: code:addons/account/account.py:2109
#, python-format
msgid ""
"Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3325,13 +3319,13 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:810
+#: code:addons/account/account_move_line.py:801
#, python-format
msgid "Some entries are already reconciled !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1204
+#: code:addons/account/account.py:1218
#, python-format
msgid ""
"You cannot validate a Journal Entry unless all journal items are in same "
@@ -3454,7 +3448,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "Unable to change tax !"
msgstr ""
@@ -3465,14 +3459,14 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1422
+#: code:addons/account/invoice.py:1437
#, python-format
msgid ""
"You selected an Unit of Measure which is not compatible with the product."
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#, python-format
msgid ""
"The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3766,7 +3760,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:714
+#: code:addons/account/invoice.py:722
#, python-format
msgid "Global taxes defined, but are not in invoice lines !"
msgstr ""
@@ -3825,7 +3819,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:91
+#: code:addons/account/account_analytic_line.py:90
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -4000,7 +3994,7 @@
msgstr "Knjižna odobrenja"
#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "Unable to find a valid period !"
@@ -4052,6 +4046,15 @@
msgstr "Porez ukljuÄen u cijenu"
#. module: account
+#: constraint:account.account:0
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error! \n"
+"You cannot define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
msgid "Account Analytic Cost Ledger For Journal Report"
msgstr ""
@@ -4073,11 +4076,11 @@
msgstr "Promjeni"
#. module: account
-#: code:addons/account/account.py:1290
-#: code:addons/account/account.py:1318
-#: code:addons/account/account.py:1325
-#: code:addons/account/account_move_line.py:1055
-#: code:addons/account/invoice.py:896
+#: code:addons/account/account.py:1304
+#: code:addons/account/account.py:1332
+#: code:addons/account/account.py:1339
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/invoice.py:904
#: code:addons/account/wizard/account_automatic_reconcile.py:152
#: code:addons/account/wizard/account_fiscalyear_close.py:78
#: code:addons/account/wizard/account_fiscalyear_close.py:81
@@ -4130,13 +4133,6 @@
msgstr "Greška: ne mogu se praviti rekurzivni nalozi."
#. module: account
-#: constraint:account.account:0
-msgid ""
-"You cannot create an account! \n"
-"Make sure if the account has children then it should be type \"View\"!"
-msgstr ""
-
-#. module: account
#: view:account.subscription.generate:0
#: model:ir.actions.act_window,name:account.action_account_subscription_generate
#: model:ir.ui.menu,name:account.menu_generate_subscription
@@ -4181,7 +4177,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1397
+#: code:addons/account/account.py:1411
#, python-format
msgid ""
"Couldn't create move with currency different from the secondary currency of "
@@ -4213,6 +4209,15 @@
msgstr "Saldo raÄuna -"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
msgstr ""
@@ -4246,7 +4251,7 @@
msgstr "Fakture"
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid ""
"Please verify the price of the invoice !\n"
@@ -4358,29 +4363,12 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:938
-#: code:addons/account/account.py:940
-#: code:addons/account/account.py:1181
-#: code:addons/account/account.py:1393
-#: code:addons/account/account.py:1397
-#: code:addons/account/account_cash_statement.py:249
-#: code:addons/account/account_move_line.py:780
-#: code:addons/account/account_move_line.py:803
-#: code:addons/account/account_move_line.py:805
-#: code:addons/account/account_move_line.py:808
-#: code:addons/account/account_move_line.py:810
-#: code:addons/account/account_move_line.py:1117
-#: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_change_currency.py:39
-#: code:addons/account/wizard/account_change_currency.py:60
-#: code:addons/account/wizard/account_change_currency.py:65
-#: code:addons/account/wizard/account_change_currency.py:71
-#: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#: code:addons/account/wizard/account_report_common.py:120
-#: code:addons/account/wizard/account_report_common.py:126
-#, python-format
-msgid "Error"
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"With Supplier Refunds you can manage the credit notes you receive from your "
+"suppliers. A refund is a document that credits an invoice completely or "
+"partially. You can easily generate refunds and reconcile them directly from "
+"the invoice form."
msgstr ""
#. module: account
@@ -4398,7 +4386,7 @@
msgstr "Detalji banke"
#. module: account
-#: code:addons/account/invoice.py:720
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Taxes missing !"
msgstr ""
@@ -4453,7 +4441,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1210
+#: code:addons/account/account.py:1224
#, python-format
msgid ""
"You can not modify a posted entry of this journal !\n"
@@ -4472,7 +4460,7 @@
msgstr "Konta potporeza."
#. module: account
-#: code:addons/account/account.py:940
+#: code:addons/account/account.py:954
#, python-format
msgid "Start period should be smaller then End period"
msgstr ""
@@ -4502,6 +4490,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,target_move:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.journal,target_move:0
#: report:account.partner.balance:0
@@ -4514,6 +4503,11 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,target_move:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
msgid "Target Moves"
msgstr "Cilj prijenosa"
@@ -4584,7 +4578,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid "Integrity Error !"
msgstr ""
@@ -4630,6 +4624,8 @@
#: view:account.bs.report:0
#: model:ir.actions.act_window,name:account.action_account_bs_report
#: model:ir.ui.menu,name:account.menu_account_bs_report
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
msgid "Balance Sheet"
msgstr ""
@@ -4724,13 +4720,7 @@
msgstr "DjeÄiji porez"
#. module: account
-#: constraint:account.move.line:0
-msgid ""
-"You can not create move line on receivable/payable account without partner"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "No period found !"
@@ -4804,7 +4794,7 @@
"dana=22, dan u mjesecu=-1, onda je datum dospjeća 28.02."
#. module: account
-#: code:addons/account/account.py:2896
+#: code:addons/account/account.py:2940
#: code:addons/account/installer.py:283
#: code:addons/account/installer.py:295
#, python-format
@@ -4832,7 +4822,7 @@
msgstr "PoÄetak razdoblja"
#. module: account
-#: code:addons/account/account_move_line.py:1193
+#: code:addons/account/account_move_line.py:1199
#, python-format
msgid ""
"You can not do this modification on a reconciled entry ! Please note that "
@@ -4888,12 +4878,12 @@
#. module: account
#: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:405
-#: code:addons/account/invoice.py:505
-#: code:addons/account/invoice.py:520
-#: code:addons/account/invoice.py:528
-#: code:addons/account/invoice.py:545
-#: code:addons/account/invoice.py:1347
+#: code:addons/account/invoice.py:408
+#: code:addons/account/invoice.py:508
+#: code:addons/account/invoice.py:523
+#: code:addons/account/invoice.py:531
+#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:1361
#: code:addons/account/wizard/account_move_journal.py:63
#, python-format
msgid "Configuration Error !"
@@ -4970,7 +4960,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1326
+#: code:addons/account/account.py:1340
#, python-format
msgid ""
"There is no default default credit account defined \n"
@@ -5119,7 +5109,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:738
+#: code:addons/account/account_move_line.py:729
#, python-format
msgid "Already Reconciled!"
msgstr ""
@@ -5155,7 +5145,7 @@
#. module: account
#: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:821
#, python-format
msgid "Write-Off"
msgstr "Otpis"
@@ -5292,7 +5282,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:60
+#: code:addons/account/wizard/account_change_currency.py:59
#, python-format
msgid "New currency is not confirured properly !"
msgstr ""
@@ -5317,14 +5307,14 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "You can not use an inactive account!"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:794
#, python-format
msgid "Entries are not of the same account or already reconciled ! "
msgstr ""
@@ -5359,7 +5349,7 @@
#. module: account
#: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -5570,7 +5560,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:546
#, python-format
msgid ""
"You cannot modify Company of account as its related record exist in Entry "
@@ -5840,9 +5830,9 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:406
-#: code:addons/account/invoice.py:506
-#: code:addons/account/invoice.py:1348
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
#, python-format
msgid "Can not find account chart for this company, Please Create account."
msgstr ""
@@ -5991,8 +5981,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:143
-#: code:addons/account/account_move_line.py:905
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
#, python-format
msgid "Entries: "
msgstr ""
@@ -6003,7 +5993,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1393
+#: code:addons/account/account.py:1407
#, python-format
msgid "Couldn't create move between different companies"
msgstr ""
@@ -6041,7 +6031,7 @@
msgstr "Ukupan dug"
#. module: account
-#: code:addons/account/account_move_line.py:781
+#: code:addons/account/account_move_line.py:772
#, python-format
msgid "Entry \"%s\" is not valid !"
msgstr ""
@@ -6107,30 +6097,31 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:499
-#: code:addons/account/account.py:501
-#: code:addons/account/account.py:822
-#: code:addons/account/account.py:901
-#: code:addons/account/account.py:976
-#: code:addons/account/account.py:1204
-#: code:addons/account/account.py:1210
-#: code:addons/account/account.py:2095
-#: code:addons/account/account.py:2333
-#: code:addons/account/account_analytic_line.py:90
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account.py:509
+#: code:addons/account/account.py:511
+#: code:addons/account/account.py:836
+#: code:addons/account/account.py:915
+#: code:addons/account/account.py:990
+#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2357
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
#: code:addons/account/account_bank_statement.py:292
#: code:addons/account/account_bank_statement.py:305
#: code:addons/account/account_bank_statement.py:345
-#: code:addons/account/account_cash_statement.py:328
-#: code:addons/account/account_cash_statement.py:348
-#: code:addons/account/account_move_line.py:1176
-#: code:addons/account/account_move_line.py:1191
-#: code:addons/account/account_move_line.py:1193
-#: code:addons/account/invoice.py:785
-#: code:addons/account/invoice.py:815
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1197
+#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:1014
#: code:addons/account/wizard/account_invoice_refund.py:100
#: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
#: code:addons/account/wizard/account_use_model.py:44
#, python-format
msgid "Error !"
@@ -6189,6 +6180,11 @@
msgstr ""
#. module: account
+#: report:account.general.ledger_landscape:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
#: view:account.partner.balance:0
#: view:account.partner.ledger:0
msgid ""
@@ -6240,7 +6236,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:65
+#: code:addons/account/wizard/account_change_currency.py:64
#, python-format
msgid "Currnt currency is not confirured properly !"
msgstr ""
@@ -6257,9 +6253,11 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.report.general.ledger:0
#: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
#: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
#: model:ir.ui.menu,name:account.menu_general_ledger
msgid "General Ledger"
msgstr "Glavna knjiga"
@@ -6309,11 +6307,13 @@
#: report:account.general.journal:0
#: report:account.invoice:0
#: report:account.partner.balance:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Total:"
msgstr "Ukupno:"
#. module: account
-#: code:addons/account/account.py:2050
+#: code:addons/account/account.py:2064
#, python-format
msgid ""
"You can specify year, month and date in the name of the model using the "
@@ -6343,7 +6343,7 @@
msgstr "Podšifre"
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#: code:addons/account/wizard/account_invoice_refund.py:137
#, python-format
msgid "Data Insufficient !"
@@ -6502,7 +6502,7 @@
msgstr "Retci"
#. module: account
-#: code:addons/account/invoice.py:521
+#: code:addons/account/invoice.py:524
#, python-format
msgid ""
"Can not find account chart for this company in invoice line account, Please "
@@ -6675,7 +6675,7 @@
"razvijateljima da stvaraju posebne poreze u vlastitoj domeni."
#. module: account
-#: code:addons/account/account.py:938
+#: code:addons/account/account.py:952
#, python-format
msgid "You should have chosen periods that belongs to the same company"
msgstr ""
@@ -6779,7 +6779,7 @@
msgstr "Predznak u izvješćima"
#. module: account
-#: code:addons/account/account_cash_statement.py:249
+#: code:addons/account/account_cash_statement.py:250
#, python-format
msgid "You can not have two open register for the same journal"
msgstr ""
@@ -6808,7 +6808,6 @@
#. module: account
#: report:account.invoice:0
#: view:account.invoice:0
-#: report:account.move.voucher:0
msgid "PRO-FORMA"
msgstr "PRO-FORMA"
@@ -6820,10 +6819,8 @@
msgstr ""
#. module: account
-#: selection:account.entries.report,move_line_state:0
-#: view:account.move.line:0
-#: selection:account.move.line,state:0
-msgid "Unbalanced"
+#: view:account.payment.term.line:0
+msgid " value amount: n.a"
msgstr ""
#. module: account
@@ -6838,6 +6835,7 @@
#. module: account
#: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
#: view:account.journal:0
#: field:account.journal,user_id:0
#: view:analytic.entries.report:0
@@ -6863,13 +6861,13 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "Bad account !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2777
+#: code:addons/account/account.py:2821
#: code:addons/account/installer.py:432
#, python-format
msgid "Sales Journal"
@@ -6887,7 +6885,7 @@
msgstr "Porez fakture"
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid "No piece number !"
msgstr ""
@@ -7129,17 +7127,17 @@
msgstr "Fiksno"
#. module: account
-#: code:addons/account/account.py:506
-#: code:addons/account/account.py:519
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
#: code:addons/account/account.py:532
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:927
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/invoice.py:714
-#: code:addons/account/invoice.py:717
-#: code:addons/account/invoice.py:720
+#: code:addons/account/account.py:546
+#: code:addons/account/account.py:654
+#: code:addons/account/account.py:941
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Warning !"
msgstr ""
@@ -7162,15 +7160,11 @@
msgstr "IzraÄun pretplate"
#. module: account
-#: report:account.move.voucher:0
-msgid "Amount (in words) :"
-msgstr ""
-
-#. module: account
#: field:account.bank.statement.line,partner_id:0
#: view:account.entries.report:0
#: field:account.entries.report,partner_id:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: field:account.invoice,partner_id:0
#: field:account.invoice.line,partner_id:0
@@ -7201,7 +7195,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "No Invoice Lines !"
msgstr ""
@@ -7250,7 +7244,7 @@
msgstr "NaÄin odgode"
#. module: account
-#: code:addons/account/invoice.py:359
+#: code:addons/account/invoice.py:360
#, python-format
msgid "Invoice '%s' is paid."
msgstr ""
@@ -7313,7 +7307,7 @@
msgstr "Vezani partner"
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "You must first select a partner !"
msgstr ""
@@ -7378,7 +7372,7 @@
msgstr "Odaberite fiskalnu godinu"
#. module: account
-#: code:addons/account/account.py:2841
+#: code:addons/account/account.py:2885
#: code:addons/account/installer.py:495
#, python-format
msgid "Purchase Refund Journal"
@@ -7413,6 +7407,7 @@
#: view:account.entries.report:0
#: field:account.entries.report,period_id:0
#: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: view:account.invoice.report:0
#: field:account.journal.period,period_id:0
@@ -7514,6 +7509,11 @@
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
msgid "Chart of Account"
msgstr ""
@@ -7577,7 +7577,7 @@
msgstr "Tipovi konta"
#. module: account
-#: code:addons/account/invoice.py:897
+#: code:addons/account/invoice.py:905
#, python-format
msgid "Cannot create invoice move on centralised journal"
msgstr ""
@@ -7627,7 +7627,12 @@
#: report:account.account.balance:0
#: report:account.central.journal:0
#: report:account.general.journal:0
+#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Filter By"
msgstr ""
@@ -7665,7 +7670,7 @@
msgstr "Redak uvjeta plaćanja"
#. module: account
-#: code:addons/account/account.py:2794
+#: code:addons/account/account.py:2838
#: code:addons/account/installer.py:452
#, python-format
msgid "Purchase Journal"
@@ -7833,8 +7838,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "Bad account!"
msgstr ""
@@ -7845,7 +7850,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1056
+#: code:addons/account/account_move_line.py:1062
#, python-format
msgid "The account move (%s) for centralisation has been confirmed!"
msgstr ""
@@ -7866,6 +7871,7 @@
#: field:account.entries.report,currency_id:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice,currency_id:0
#: field:account.invoice.report,currency_id:0
#: field:account.journal,currency:0
@@ -8040,14 +8046,14 @@
msgstr "Razdoblje od"
#. module: account
-#: code:addons/account/account.py:2817
+#: code:addons/account/account.py:2861
#: code:addons/account/installer.py:476
#, python-format
msgid "Sales Refund Journal"
msgstr ""
#. module: account
-#: code:addons/account/account.py:927
+#: code:addons/account/account.py:941
#, python-format
msgid ""
"You cannot modify company of this period as its related record exist in "
@@ -8096,7 +8102,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "Please create some invoice lines."
msgstr ""
@@ -8112,7 +8118,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2820
+#: code:addons/account/account.py:2864
#: code:addons/account/installer.py:479
#, python-format
msgid "SCNJ"
@@ -8150,6 +8156,7 @@
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
@@ -8159,13 +8166,14 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2333
+#: code:addons/account/account.py:2357
#, python-format
msgid "Cannot locate parent code for template account!"
msgstr ""
#. module: account
#: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
msgid "Analysis Direction"
msgstr "Smjer analiza"
@@ -8196,7 +8204,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/invoice.py:1014
#, python-format
msgid ""
"You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8224,18 +8232,34 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:70
#, python-format
msgid "Current currency is not confirured properly !"
msgstr ""
#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree4
-msgid ""
-"With Supplier Refunds you can manage the credit notes you receive from your "
-"suppliers. A refund is a document that credits an invoice completely or "
-"partially. You can easily generate refunds and reconcile them directly from "
-"the invoice form."
+#: code:addons/account/account.py:952
+#: code:addons/account/account.py:954
+#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1411
+#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:120
+#: code:addons/account/wizard/account_report_common.py:126
+#, python-format
+msgid "Error"
msgstr ""
#. module: account
@@ -8244,11 +8268,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Particulars"
-msgstr ""
-
-#. module: account
#: selection:account.account.type,report_type:0
msgid "Profit & Loss (Income Accounts)"
msgstr ""
@@ -8273,6 +8292,7 @@
#: field:account.entries.report,balance:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.move.line,balance:0
#: report:account.partner.balance:0
#: selection:account.payment.term.line,value:0
@@ -8281,6 +8301,10 @@
#: report:account.third_party_ledger_other:0
#: field:report.account.receivable,balance:0
#: field:report.aged.receivable,balance:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Balance"
msgstr "Saldo"
@@ -8291,6 +8315,11 @@
#. module: account
#: report:account.account.balance:0
+#: report:account.general.ledger_landscape:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Display Account"
msgstr ""
@@ -8385,11 +8414,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Receiver's Signature"
-msgstr ""
-
-#. module: account
#: report:account.general.ledger:0
#: report:account.journal.period.print:0
#: report:account.third_party_ledger:0
@@ -8405,6 +8429,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.line,move_id:0
#: field:analytic.entries.report,move_id:0
@@ -8412,7 +8437,7 @@
msgstr "Prijenos"
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "You can not change the tax, you should remove and recreate lines !"
msgstr ""
@@ -8506,6 +8531,7 @@
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
@@ -8549,7 +8575,7 @@
msgstr "Konto pretplate"
#. module: account
-#: code:addons/account/invoice.py:717
+#: code:addons/account/invoice.py:725
#, python-format
msgid ""
"Tax base different !\n"
@@ -8576,6 +8602,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_from:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_start:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -8588,6 +8615,7 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,date_from:0
+#: report:account.aged_trial_balance:0
msgid "Start Date"
msgstr "PoÄetni datum"
@@ -8604,7 +8632,7 @@
msgstr "Neusklađen"
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid "Bad total !"
msgstr ""
@@ -8662,13 +8690,13 @@
msgstr "Aktivan"
#. module: account
-#: code:addons/account/invoice.py:354
+#: code:addons/account/invoice.py:353
#, python-format
msgid "Unknown Error"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid ""
"You cannot validate a non-balanced entry !\n"
@@ -8713,10 +8741,10 @@
#: field:account.entries.report,credit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,credit:0
#: field:account.move.line,credit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -8735,11 +8763,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Through :"
-msgstr ""
-
-#. module: account
#: view:account.general.journal:0
#: model:ir.ui.menu,name:account.menu_account_general_journal
msgid "General Journals"
@@ -8921,11 +8944,6 @@
msgstr "Interni tip"
#. module: account
-#: report:account.move.voucher:0
-msgid "State:"
-msgstr ""
-
-#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_running
msgid "Running Subscriptions"
msgstr "Pretplate koje su u tijeku"
@@ -8952,7 +8970,6 @@
#: view:account.move:0
#: selection:account.move,state:0
#: view:account.move.line:0
-#: report:account.move.voucher:0
msgid "Posted"
msgstr "Proknjiženo"
@@ -8971,6 +8988,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_to:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_stop:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -9024,7 +9042,7 @@
msgstr "Ovo je model za ponavljajuće raÄunovodstvene unose"
#. module: account
-#: code:addons/account/account_analytic_line.py:100
+#: code:addons/account/account_analytic_line.py:99
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -9060,6 +9078,7 @@
#: field:report.account.sales,amount_total:0
#: field:report.account_type.sales,amount_total:0
#: field:report.invoice.created,amount_total:0
+#: report:account.aged_trial_balance:0
msgid "Total"
msgstr "Ukupno"
@@ -9174,8 +9193,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:738
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:806
#: code:addons/account/wizard/account_invoice_state.py:44
#: code:addons/account/wizard/account_invoice_state.py:68
#: code:addons/account/wizard/account_report_balance_sheet.py:70
@@ -9195,15 +9214,15 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "On Account of :"
-msgstr ""
-
-#. module: account
-#: view:account.automatic.reconcile:0
-#: view:account.move.line.reconcile.writeoff:0
-msgid "Write-Off Move"
-msgstr "Otpiši prijenos"
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
+msgstr "Zatvoreno"
#. module: account
#: model:process.node,note:account.process_node_paidinvoice0
@@ -9241,10 +9260,10 @@
#: field:account.entries.report,debit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,debit:0
#: field:account.move.line,debit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -9265,20 +9284,12 @@
msgstr ""
#. module: account
-#: constraint:account.account.template:0
-msgid ""
-"You cannot create an account template! \n"
-"Make sure if the account template has parent then it should be type "
-"\"View\"! "
-msgstr ""
-
-#. module: account
#: view:account.subscription:0
msgid "Recurring"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:805
+#: code:addons/account/account_move_line.py:796
#, python-format
msgid "Entry is already reconciled"
msgstr ""
@@ -9299,7 +9310,7 @@
msgstr "Raspon"
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid ""
"Can not create an automatic sequence for this piece !\n"
@@ -9429,7 +9440,7 @@
msgstr "Mapiranje konta"
#. module: account
-#: code:addons/account/invoice.py:346
+#: code:addons/account/invoice.py:345
#, python-format
msgid "Invoice '%s' is waiting for validation."
msgstr ""
@@ -9454,7 +9465,7 @@
msgstr "RaÄun prihoda ili troÅ¡kova vezan za odabrani proizvod."
#. module: account
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account_move_line.py:1123
#, python-format
msgid "The date of your Journal Entry is not in the defined period!"
msgstr ""
@@ -9558,6 +9569,7 @@
#: field:account.partner.ledger,result_selection:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
+#: report:account.aged_trial_balance:0
msgid "Partner's"
msgstr ""
@@ -9659,7 +9671,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:501
+#: code:addons/account/account.py:511
#, python-format
msgid "You cannot remove an account which has account entries!. "
msgstr ""
@@ -9682,6 +9694,7 @@
"The residual amount on a receivable or payable of a journal entry expressed "
"in its currency (maybe different of the company currency)."
msgstr ""
+<<<<<<< TREE
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Neispravan naziv modela u definiciji zadatka."
@@ -11028,3 +11041,51 @@
#~ msgid "Journal de frais"
#~ msgstr "Knjiga troškova"
+=======
+
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+msgid "Liabilities"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+msgid "Balance:"
+msgstr ""
+
+#. module: account
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+msgid "Particular"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Aged Trial Balance"
+msgstr "Zreli probni saldo"
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Period Length(days)"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Account Total"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Not due"
+msgstr ""
+>>>>>>> MERGE-SOURCE
=== modified file 'account/i18n/ca.po'
--- account/i18n/ca.po 2011-04-29 05:56:18 +0000
+++ account/i18n/ca.po 2011-08-02 06:32:40 +0000
@@ -6,50 +6,55 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
+<<<<<<< TREE
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-03-26 18:10+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@xxxxxxxxxxxxxxx>\n"
+=======
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2011-07-31 12:41+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-29 05:05+0000\n"
"X-Generator: Launchpad (build 12758)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-01 05:06+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
msgid "System payment"
-msgstr ""
+msgstr "Sistema de pagaments"
#. module: account
#: view:account.journal:0
msgid "Other Configuration"
-msgstr ""
-
-#. module: account
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#, python-format
-msgid "No End of year journal defined for the fiscal year"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:506
+msgstr "Altra configuració"
+
+#. module: account
+#: code:addons/account/account.py:516
#, python-format
msgid ""
"You cannot remove/deactivate an account which is set as a property to any "
"Partner."
-msgstr ""
+msgstr "No podeu suprimir/desactivar un compte vinculat a una empresa"
#. module: account
#: view:account.move.reconcile:0
msgid "Journal Entry Reconcile"
-msgstr ""
+msgstr "Concilia l'assentament comptable"
#. module: account
#: field:account.installer.modules,account_voucher:0
msgid "Voucher Management"
-msgstr ""
+msgstr "Gestió de rebuts"
#. module: account
#: view:account.account:0
@@ -66,10 +71,10 @@
msgstr "Pendent"
#. module: account
-#: code:addons/account/invoice.py:785
+#: code:addons/account/invoice.py:793
#, python-format
msgid "Please define sequence on invoice journal"
-msgstr ""
+msgstr "Definiu una seqüència en el diari de la factura"
#. module: account
#: constraint:account.period:0
@@ -79,12 +84,12 @@
#. module: account
#: field:account.analytic.line,currency_id:0
msgid "Account currency"
-msgstr ""
+msgstr "Moneda comptable"
#. module: account
#: view:account.tax:0
msgid "Children Definition"
-msgstr ""
+msgstr "Definició de fills"
#. module: account
#: model:ir.model,name:account.model_report_aged_receivable
@@ -102,11 +107,13 @@
"The Profit and Loss report gives you an overview of your company profit and "
"loss in a single document"
msgstr ""
+"L'informe de pèrdues i guanys (PiG) li dóna una visió global de les pèrdues "
+"i guanys de la seva companyia en un únic document"
#. module: account
#: model:process.transition,name:account.process_transition_invoiceimport0
msgid "Import from invoice or payment"
-msgstr ""
+msgstr "Importa des de factura o pagament"
#. module: account
#: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -124,6 +131,8 @@
"If you unreconciliate transactions, you must also verify all the actions "
"that are linked to those transactions because they will not be disabled"
msgstr ""
+"Si desconcileu transaccions, heu de verificar totes les accions relacionades "
+"amb aquestes perquè no es desactivaran."
#. module: account
#: report:account.tax.code.entries:0
@@ -131,7 +140,7 @@
msgstr "Assentaments comptables"
#. module: account
-#: code:addons/account/account.py:1291
+#: code:addons/account/account.py:1305
#, python-format
msgid "You can not delete posted movement: \"%s\"!"
msgstr "No podeu eliminar el moviment fixat: \"%s\"!"
@@ -165,7 +174,7 @@
#. module: account
#: view:account.open.closed.fiscalyear:0
msgid "Choose Fiscal Year "
-msgstr ""
+msgstr "Seleccioneu l'exercici fiscal "
#. module: account
#: help:account.payment.term,active:0
@@ -173,12 +182,14 @@
"If the active field is set to False, it will allow you to hide the payment "
"term without removing it."
msgstr ""
+"Si el camp actiu es desmarca, permet ocultar el termini de pagament sense "
+"eliminar-ho."
#. module: account
-#: code:addons/account/invoice.py:1421
+#: code:addons/account/invoice.py:1436
#, python-format
msgid "Warning!"
-msgstr ""
+msgstr "AvÃs!"
#. module: account
#: field:account.fiscal.position.account,account_src_id:0
@@ -205,7 +216,7 @@
#: code:addons/account/wizard/account_move_journal.py:95
#, python-format
msgid "Journal: %s"
-msgstr ""
+msgstr "Diari: %s"
#. module: account
#: help:account.analytic.journal,type:0
@@ -214,6 +225,9 @@
"invoice) to create analytic entries, OpenERP will look for a matching "
"journal of the same type."
msgstr ""
+"Dona el tipus de diari analÃtic. Quan necessiteu crear entrades analÃtiques "
+"per un document (p.ex: una factura), OpenERP cercarà un diari del mateix "
+"tipus."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -227,17 +241,19 @@
msgstr "account.tax"
#. module: account
-#: code:addons/account/account.py:901
+#: code:addons/account/account.py:915
#, python-format
msgid ""
"No period defined for this date: %s !\n"
"Please create a fiscal year."
msgstr ""
+"Sense perÃode definit per aquesta data: %s !\n"
+"Creeu un any fiscal."
#. module: account
#: model:ir.model,name:account.model_account_move_line_reconcile_select
msgid "Move line reconcile select"
-msgstr ""
+msgstr "Selecciona conciliació de la lÃnia moviment"
#. module: account
#: help:account.model.line,sequence:0
@@ -259,23 +275,23 @@
"d'impost aparegui en les factures."
#. module: account
-#: code:addons/account/invoice.py:1210
+#: code:addons/account/invoice.py:1224
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
-msgstr ""
+msgstr "Factura '%s' està pagada parcialment: %s%s de %s%s (%s%s restant)"
#. module: account
#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
msgid "Accounting entries are an input of the reconciliation."
-msgstr ""
+msgstr "Els assentaments comptables són una entrada de la conciliació."
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
msgid "Belgian Reports"
-msgstr ""
+msgstr "Informes Belgues"
#. module: account
-#: code:addons/account/account_move_line.py:1176
+#: code:addons/account/account_move_line.py:1182
#, python-format
msgid "You can not add/modify entries in a closed journal."
msgstr "No podeu afegir/modificar assentaments en un diari tancat."
@@ -283,24 +299,24 @@
#. module: account
#: view:account.bank.statement:0
msgid "Calculated Balance"
-msgstr ""
+msgstr "Balanç calculat"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
#: model:ir.actions.act_window,name:account.action_view_account_use_model
#: model:ir.ui.menu,name:account.menu_action_manual_recurring
msgid "Manual Recurring"
-msgstr ""
+msgstr "Recurrència manual"
#. module: account
#: view:account.fiscalyear.close.state:0
msgid "Close Fiscalyear"
-msgstr ""
+msgstr "Tanca any fiscal"
#. module: account
#: field:account.automatic.reconcile,allow_write_off:0
msgid "Allow write off"
-msgstr ""
+msgstr "Permetre desfasament"
#. module: account
#: view:account.analytic.chart:0
@@ -313,10 +329,12 @@
msgstr "Est."
#. module: account
-#: code:addons/account/invoice.py:529
+#: code:addons/account/invoice.py:532
#, python-format
msgid "Invoice line account company does not match with invoice company."
msgstr ""
+"L'empresa del compte de la lÃnia de la factura no coincideix amb l'empresa "
+"de la factura"
#. module: account
#: field:account.journal.column,field:0
@@ -329,6 +347,8 @@
"Installs localized accounting charts to match as closely as possible the "
"accounting needs of your company based on your country."
msgstr ""
+"Instal·leu plans comptables localitzats referits al seu paÃs per cobrir les "
+"necessitats comptables de la seva companyia."
#. module: account
#: code:addons/account/wizard/account_move_journal.py:63
@@ -339,11 +359,15 @@
"You can create one in the menu: \n"
"Configuration/Financial Accounting/Accounts/Journals."
msgstr ""
+"No es pot trobar cap diari comptable del tipus %s per aquesta companyia.\n"
+"\n"
+"Podeu crear un al menu: \n"
+"Configuració/Comptabilitat financera/Comptes/Diaris."
#. module: account
#: model:ir.model,name:account.model_account_unreconcile
msgid "Account Unreconcile"
-msgstr ""
+msgstr "Desconciliar compte"
#. module: account
#: view:product.product:0
@@ -355,7 +379,7 @@
#: view:account.installer:0
#: view:account.installer.modules:0
msgid "Configure"
-msgstr ""
+msgstr "Configura"
#. module: account
#: selection:account.entries.report,month:0
@@ -364,7 +388,7 @@
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "June"
-msgstr ""
+msgstr "Juny"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_moves_bank
@@ -373,6 +397,9 @@
"OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
"Cash Registers, or Customer/Supplier payments."
msgstr ""
+"Els comptables utilitzen aquesta vista per gravar registres en massa a "
+"OpenERP. OpenERP crea els moviments comptables si fa ús d'extractes "
+"bancaris, registres de caixa o pagaments de client/proveïdor."
#. module: account
#: model:ir.model,name:account.model_account_tax_template
@@ -393,12 +420,12 @@
#. module: account
#: selection:account.journal,type:0
msgid "Purchase Refund"
-msgstr ""
+msgstr "Abonament de compra"
#. module: account
#: selection:account.journal,type:0
msgid "Opening/Closing Situation"
-msgstr ""
+msgstr "Situació obertura/tancament"
#. module: account
#: help:account.journal,currency:0
@@ -416,6 +443,8 @@
"This field contains the informatin related to the numbering of the journal "
"entries of this journal."
msgstr ""
+"Aquest camp conté la informació relacionada amb la numeració dels "
+"assentaments d'aquest diari."
#. module: account
#: field:account.journal,default_debit_account_id:0
@@ -435,7 +464,7 @@
#. module: account
#: view:account.move.line.unreconcile.select:0
msgid "Open For Unreconciliation"
-msgstr ""
+msgstr "Obre per trencar la conciliació"
#. module: account
#: field:account.fiscal.position.template,chart_template_id:0
@@ -456,6 +485,9 @@
"it comes to 'Printed' state. When all transactions are done, it comes in "
"'Done' state."
msgstr ""
+"Quan es crea un perÃode de diari, l'estat és 'esborrany'. Si un informe es "
+"imprès, passa a estat 'imprès'. Quan totes les transaccions s'han fet, passa "
+"a estat 'realitzat'."
#. module: account
#: model:ir.actions.act_window,help:account.action_account_tax_chart
@@ -465,6 +497,11 @@
"amount of each area of the tax declaration for your country. It’s presented "
"in a hierarchical structure, which can be modified to fit your needs."
msgstr ""
+"La taula d'impostos és una vista en arbre que reflecteix l'estructura de "
+"tipus impositius (o codis d'impost) i mostra la situació impositiva actual. "
+"La taula d'impostos representa la quantitat econòmica corresponent a cada "
+"codi de la declaració d'impostos del paÃs. Es representa en una estructura "
+"jerà rquica, que pot ser modificada d'acord a les vostres necessitats."
#. module: account
#: view:account.analytic.line:0
@@ -503,17 +540,17 @@
#. module: account
#: model:ir.model,name:account.model_account_invoice_confirm
msgid "Confirm the selected invoices"
-msgstr ""
+msgstr "Confirma les factures seleccionades"
#. module: account
#: field:account.addtmpl.wizard,cparent_id:0
msgid "Parent target"
-msgstr ""
+msgstr "Destinació pare"
#. module: account
#: field:account.bank.statement,account_id:0
msgid "Account used in this journal"
-msgstr ""
+msgstr "Compte utilitzat en aquest diari"
#. module: account
#: help:account.aged.trial.balance,chart_account_id:0
@@ -532,7 +569,7 @@
#: help:account.report.general.ledger,chart_account_id:0
#: help:account.vat.declaration,chart_account_id:0
msgid "Select Charts of Accounts"
-msgstr ""
+msgstr "Seleccioneu el pla comptable"
#. module: account
#: view:product.product:0
@@ -542,7 +579,7 @@
#. module: account
#: model:ir.model,name:account.model_account_invoice_refund
msgid "Invoice Refund"
-msgstr ""
+msgstr "Abonament de factura"
#. module: account
#: report:account.overdue:0
@@ -555,10 +592,10 @@
msgstr "Transaccions no conciliades"
#. module: account
-#: code:addons/account/account_cash_statement.py:348
+#: code:addons/account/account_cash_statement.py:349
#, python-format
msgid "CashBox Balance is not matching with Calculated Balance !"
-msgstr ""
+msgstr "El saldo del diari de caixa no concorda amb el saldo calculat !"
#. module: account
#: view:account.fiscal.position:0
@@ -576,7 +613,7 @@
#. module: account
#: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
msgid "The accountant confirms the statement."
-msgstr ""
+msgstr "El comptable confirma l'extracte."
#. module: account
#: selection:account.balance.report,display_account:0
@@ -592,12 +629,12 @@
#. module: account
#: field:account.invoice.report,address_invoice_id:0
msgid "Invoice Address Name"
-msgstr ""
+msgstr "Nom de l'adreça de la factura"
#. module: account
#: selection:account.installer,period:0
msgid "3 Monthly"
-msgstr ""
+msgstr "Trimestral"
#. module: account
#: view:account.unreconcile.reconcile:0
@@ -612,7 +649,7 @@
#. module: account
#: view:analytic.entries.report:0
msgid " 30 Days "
-msgstr ""
+msgstr " 30 dies "
#. module: account
#: field:ir.sequence,fiscal_ids:0
@@ -627,12 +664,12 @@
#. module: account
#: report:account.central.journal:0
msgid "Centralized Journal"
-msgstr ""
+msgstr "Diari centralitzat"
#. module: account
#: sql_constraint:account.sequence.fiscalyear:0
msgid "Main Sequence must be different from current !"
-msgstr ""
+msgstr "La seqüència principal ha de ser diferent de l'actual!"
#. module: account
#: field:account.invoice.tax,tax_amount:0
@@ -640,7 +677,7 @@
msgstr "Import codi impost"
#. module: account
-#: code:addons/account/account.py:2779
+#: code:addons/account/account.py:2823
#: code:addons/account/installer.py:434
#, python-format
msgid "SAJ"
@@ -649,7 +686,7 @@
#. module: account
#: help:account.bank.statement,balance_end_real:0
msgid "closing balance entered by the cashbox verifier"
-msgstr ""
+msgstr "tancant el balanç introduït pel verificador de caixa"
#. module: account
#: view:account.period:0
@@ -660,7 +697,7 @@
#. module: account
#: model:ir.model,name:account.model_account_common_partner_report
msgid "Account Common Partner Report"
-msgstr ""
+msgstr "Informe del compte comú amb l'empresa"
#. module: account
#: field:account.fiscalyear.close,period_id:0
@@ -670,14 +707,16 @@
#. module: account
#: model:ir.model,name:account.model_account_journal_period
msgid "Journal Period"
-msgstr ""
+msgstr "Diari del perÃode"
#. module: account
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
#, python-format
msgid "To reconcile the entries company should be the same for all entries"
msgstr ""
+"Per conciliar els seients, la companyia hauria de ser la mateixa per a tots "
+"els assentaments"
#. module: account
#: view:account.account:0
@@ -694,7 +733,7 @@
#. module: account
#: model:ir.model,name:account.model_account_report_general_ledger
msgid "General Ledger Report"
-msgstr ""
+msgstr "Informe del llibre major"
#. module: account
#: view:account.invoice:0
@@ -709,12 +748,12 @@
#. module: account
#: selection:account.bank.accounts.wizard,account_type:0
msgid "Check"
-msgstr ""
+msgstr "Comprova"
#. module: account
#: field:account.partner.reconcile.process,today_reconciled:0
msgid "Partners Reconciled Today"
-msgstr ""
+msgstr "Empreses conciliades avui"
#. module: account
#: selection:account.payment.term.line,value:0
@@ -732,13 +771,13 @@
#: model:ir.model,name:account.model_project_account_analytic_line
#, python-format
msgid "Analytic Entries by line"
-msgstr ""
+msgstr "Assentaments analÃtics per lÃnia"
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:39
+#: code:addons/account/wizard/account_change_currency.py:38
#, python-format
msgid "You can only change currency for Draft Invoice !"
-msgstr ""
+msgstr "Només podeu canviar la moneda per a factures a l'esborrany!"
#. module: account
#: view:account.analytic.journal:0
@@ -775,17 +814,17 @@
#. module: account
#: model:ir.model,name:account.model_account_analytic_Journal_report
msgid "Account Analytic Journal"
-msgstr ""
+msgstr "Diari analÃtic comptable"
#. module: account
#: model:ir.model,name:account.model_account_automatic_reconcile
msgid "Automatic Reconcile"
-msgstr ""
+msgstr "Conciliació automà tica"
#. module: account
#: view:account.payment.term.line:0
msgid "Due date Computation"
-msgstr ""
+msgstr "CÃ lcul de la data de venciment"
#. module: account
#: report:account.analytic.account.quantity_cost_ledger:0
@@ -799,7 +838,7 @@
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "September"
-msgstr ""
+msgstr "Setembre"
#. module: account
#: selection:account.subscription,period_type:0
@@ -810,7 +849,7 @@
#: help:account.account.template,nocreate:0
msgid ""
"If checked, the new chart of accounts will not contain this by default."
-msgstr ""
+msgstr "Si està marcat, el nou pla comptable no ho contindrà per defecte."
#. module: account
#: code:addons/account/wizard/account_invoice_refund.py:102
@@ -819,6 +858,9 @@
"Can not %s invoice which is already reconciled, invoice should be "
"unreconciled first. You can only Refund this invoice"
msgstr ""
+"No es pot %s factura que ja està conciliada, primer haurÃeu de trencar la "
+"conciliació de la factura. Només podeu fer un abonament (factura "
+"rectificativa) d'aquesta factura."
#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -833,10 +875,10 @@
#. module: account
#: view:account.move.line:0
msgid "Next Partner to reconcile"
-msgstr ""
+msgstr "Propera empresa a conciliar"
#. module: account
-#: code:addons/account/account_move_line.py:1191
+#: code:addons/account/account_move_line.py:1197
#, python-format
msgid ""
"You can not do this modification on a confirmed entry ! Please note that you "
@@ -849,7 +891,7 @@
#: view:account.invoice.report:0
#: field:account.invoice.report,delay_to_pay:0
msgid "Avg. Delay To Pay"
-msgstr ""
+msgstr "Retard mitjà per a pagar"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_tax_chart
@@ -865,6 +907,7 @@
#. module: account
#: report:account.overdue:0
+#: report:account.aged_trial_balance:0
msgid "Due"
msgstr "Degut"
@@ -872,7 +915,7 @@
#: view:account.invoice.report:0
#: field:account.invoice.report,price_total_tax:0
msgid "Total With Tax"
-msgstr ""
+msgstr "Total amb impostos"
#. module: account
#: view:account.invoice:0
@@ -880,7 +923,7 @@
#: view:validate.account.move:0
#: view:validate.account.move.lines:0
msgid "Approve"
-msgstr ""
+msgstr "Aprova"
#. module: account
#: view:account.invoice:0
@@ -902,22 +945,22 @@
#: view:account.invoice.report:0
#: view:account.move.line:0
msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtres estesos..."
#. module: account
#: model:ir.ui.menu,name:account.menu_account_central_journal
msgid "Centralizing Journal"
-msgstr ""
+msgstr "Diari centralitzat"
#. module: account
#: selection:account.journal,type:0
msgid "Sale Refund"
-msgstr ""
+msgstr "Abonament de vendes"
#. module: account
#: model:process.node,note:account.process_node_accountingstatemententries0
msgid "Bank statement"
-msgstr ""
+msgstr "Extracte bancari"
#. module: account
#: field:account.analytic.line,move_id:0
@@ -931,11 +974,14 @@
"amount.If the tax account is base tax code, this field will contain the "
"basic amount(without tax)."
msgstr ""
+"Si el compte és un compte de tipus impositiu, aquest camp contindrà la suma "
+"de l'impost. Si el compte és un tipus de base impositiva, el camp contindrà "
+"la suma de la base imposable (sense impost)."
#. module: account
#: view:account.analytic.line:0
msgid "Purchases"
-msgstr ""
+msgstr "Compres"
#. module: account
#: field:account.model,lines_id:0
@@ -956,15 +1002,19 @@
#: field:account.journal,code:0
#: report:account.partner.balance:0
#: field:account.period,code:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Code"
msgstr "Codi"
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
+#: code:addons/account/account_move_line.py:169
#: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:670
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "No Analytic Journal !"
@@ -982,13 +1032,13 @@
#. module: account
#: field:account.bank.accounts.wizard,acc_name:0
msgid "Account Name."
-msgstr ""
+msgstr "Nom del compte"
#. module: account
#: field:account.chart.template,property_reserve_and_surplus_account:0
#: field:res.company,property_reserve_and_surplus_account:0
msgid "Reserve and Profit/Loss Account"
-msgstr ""
+msgstr "Compte de reserves i de pèrdues i guanys"
#. module: account
#: field:report.account.receivable,name:0
@@ -1005,12 +1055,12 @@
#. module: account
#: view:board.board:0
msgid "Customer Invoices to Approve"
-msgstr ""
+msgstr "Factures de client per aprovar"
#. module: account
#: help:account.fiscalyear.close,fy_id:0
msgid "Select a Fiscal year to close"
-msgstr ""
+msgstr "Seleccioneu un exercici fiscal per tancar"
#. module: account
#: help:account.account,user_type:0
@@ -1019,11 +1069,14 @@
"These types are defined according to your country. The type contains more "
"information about the account and its specificities."
msgstr ""
+"Aquests tipus es defineixen d'acord a la legislació comptable del vostre "
+"paÃs. El tipus conté més informació sobre el compte i les seves "
+"especificitats."
#. module: account
#: view:account.tax:0
msgid "Applicability Options"
-msgstr ""
+msgstr "Opcions per la vostra aplicació"
#. module: account
#: report:account.partner.balance:0
@@ -1034,16 +1087,15 @@
#: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
#: model:ir.ui.menu,name:account.journal_cash_move_lines
msgid "Cash Registers"
-msgstr ""
+msgstr "Registres de caixa"
#. module: account
#: selection:account.account.type,report_type:0
msgid "Profit & Loss (Expense Accounts)"
-msgstr ""
+msgstr "Pèrdues i Guanys (comptes de despeses)"
#. module: account
#: report:account.analytic.account.journal:0
-#: report:account.move.voucher:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "-"
@@ -1052,17 +1104,17 @@
#. module: account
#: view:account.analytic.account:0
msgid "Manager"
-msgstr ""
+msgstr "Director"
#. module: account
#: view:account.subscription.generate:0
msgid "Generate Entries before:"
-msgstr ""
+msgstr "Genera els assentaments abans:"
#. module: account
#: selection:account.bank.accounts.wizard,account_type:0
msgid "Bank"
-msgstr ""
+msgstr "Banc"
#. module: account
#: field:account.period,date_start:0
@@ -1072,7 +1124,7 @@
#. module: account
#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
msgid "Confirm statement"
-msgstr ""
+msgstr "Confirma extracte"
#. module: account
#: field:account.fiscal.position.tax,tax_dest_id:0
@@ -1093,11 +1145,15 @@
"purchase orders or receipts. This way, you can control the invoice from your "
"supplier according to what you purchased or received."
msgstr ""
+"Amb les factures de proveïdor podeu introduir i gestionar factures emeses "
+"pels seus proveïdors. OpenERP també pot generar esborranys de factura "
+"automà ticament des de comandes o albarans de compra. D'aquesta forma, podeu "
+"contrastar la factura del seu proveïdor amb el comprat o rebut."
#. module: account
#: view:account.invoice.cancel:0
msgid "Cancel Invoices"
-msgstr ""
+msgstr "Cancel·la factures"
#. module: account
#: view:account.unreconcile.reconcile:0
@@ -1129,6 +1185,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
@@ -1136,7 +1193,7 @@
msgstr "Etiqueta assentament"
#. module: account
-#: code:addons/account/account.py:976
+#: code:addons/account/account.py:990
#, python-format
msgid "You can not modify/delete a journal with entries for this period !"
msgstr ""
@@ -1184,19 +1241,19 @@
#. module: account
#: field:account.tax,include_base_amount:0
msgid "Included in base amount"
-msgstr ""
+msgstr "Inclòs en l'import base"
#. module: account
#: view:account.entries.report:0
#: model:ir.actions.act_window,name:account.action_account_entries_report_all
#: model:ir.ui.menu,name:account.menu_action_account_entries_report_all
msgid "Entries Analysis"
-msgstr ""
+msgstr "Anà lisi d'assentaments"
#. module: account
#: field:account.account,level:0
msgid "Level"
-msgstr ""
+msgstr "Nivell"
#. module: account
#: report:account.invoice:0
@@ -1217,7 +1274,7 @@
#: code:addons/account/wizard/account_report_common.py:120
#, python-format
msgid "Select a starting and an ending period"
-msgstr ""
+msgstr "Seleccioneu un perÃode inicial i final"
#. module: account
#: model:ir.model,name:account.model_account_account_template
@@ -1227,12 +1284,12 @@
#. module: account
#: view:account.tax.code.template:0
msgid "Search tax template"
-msgstr ""
+msgstr "Cerca plantilla impostos"
#. module: account
#: report:account.invoice:0
msgid "Your Reference"
-msgstr ""
+msgstr "La vostra referència"
#. module: account
#: view:account.move.reconcile:0
@@ -1251,12 +1308,12 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Initial Balance"
-msgstr ""
+msgstr "Balanç inicial"
#. module: account
#: view:account.invoice:0
msgid "Reset to Draft"
-msgstr ""
+msgstr "Inicialitza a esborrany"
#. module: account
#: view:wizard.multi.charts.accounts:0
@@ -1272,13 +1329,13 @@
#. module: account
#: model:ir.model,name:account.model_account_entries_report
msgid "Journal Items Analysis"
-msgstr ""
+msgstr "Anà lisi d'elements del diari"
#. module: account
-#: model:ir.actions.act_window,name:account.action_partner_all
#: model:ir.ui.menu,name:account.next_id_22
+#: report:account.aged_trial_balance:0
msgid "Partners"
-msgstr ""
+msgstr "Empreses"
#. module: account
#: view:account.bank.statement:0
@@ -1305,7 +1362,7 @@
msgstr "Diari central"
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "You can not use this general account in this journal !"
msgstr "No podeu utilitzar aquest compte general en aquest diari!"
@@ -1323,12 +1380,12 @@
#. module: account
#: view:account.tax:0
msgid "Search Taxes"
-msgstr ""
+msgstr "Cerca impostos"
#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger
msgid "Account Analytic Cost Ledger"
-msgstr ""
+msgstr "Comptabilitat. Diari de costos analÃtics"
#. module: account
#: view:account.model:0
@@ -1338,7 +1395,7 @@
#. module: account
#: field:account.entries.report,nbr:0
msgid "# of Items"
-msgstr ""
+msgstr "Nº d'elements"
#. module: account
#: field:account.automatic.reconcile,max_amount:0
@@ -1358,13 +1415,13 @@
#. module: account
#: field:account.journal,entry_posted:0
msgid "Skip 'Draft' State for Manual Entries"
-msgstr ""
+msgstr "Omet estat 'Esborrany' pels assentaments manuals."
#. module: account
#: view:account.invoice.report:0
#: field:account.invoice.report,price_total:0
msgid "Total Without Tax"
-msgstr ""
+msgstr "Total base"
#. module: account
#: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -1374,16 +1431,20 @@
"entry per accounting document: invoice, refund, supplier payment, bank "
"statements, etc."
msgstr ""
+"Un assentament de diari es compon de diverses anotacions, cadascuna de les "
+"quals és una operació bé al deure o al haver. OpenERP crea automà ticament un "
+"assentament per cada document comptable: factura, reemborsament, pagament a "
+"proveïdor, extractes de compte bancari, etc"
#. module: account
#: view:account.entries.report:0
msgid "# of Entries "
-msgstr ""
+msgstr "Nombre d'assentaments "
#. module: account
#: model:ir.model,name:account.model_temp_range
msgid "A Temporary table used for Dashboard view"
-msgstr ""
+msgstr "Una taula temporal utilitzada per a la vista de taulell"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree4
@@ -1396,36 +1457,35 @@
msgid ""
"Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
msgstr ""
+"Per exemple: a 14 dies nets 2 per cent, import restant a 30 dies fi de mes."
#. module: account
-#: code:addons/account/invoice.py:815
+#: code:addons/account/invoice.py:823
#, python-format
msgid ""
"Cannot create the invoice !\n"
"The payment term defined gives a computed amount greater than the total "
"invoiced amount."
msgstr ""
+"No es pot crear la factura!\n"
+"El termini de pagament definit genera un import superior a l'import total "
+"facturat."
#. module: account
#: field:account.installer.modules,account_anglo_saxon:0
msgid "Anglo-Saxon Accounting"
-msgstr ""
+msgstr "Comptabilitat anglosaxona"
#. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-#: selection:account.bank.statement,state:0
-#: selection:account.entries.report,type:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.period,state:0
-msgid "Closed"
-msgstr "Tancament"
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr "Moviment de desajust"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
msgid "Recurring Entries"
-msgstr ""
+msgstr "Assentaments recurrents"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
@@ -1435,7 +1495,7 @@
#. module: account
#: model:account.tax.code,name:account.account_tax_code_0
msgid "Tax Code Test"
-msgstr ""
+msgstr "Test codi impost"
#. module: account
#: field:account.automatic.reconcile,reconciled:0
@@ -1471,18 +1531,20 @@
#. module: account
#: view:account.partner.reconcile.process:0
msgid "Go to next partner"
-msgstr ""
+msgstr "Vés a la següent empresa"
#. module: account
#: view:account.bank.statement:0
msgid "Search Bank Statements"
-msgstr ""
+msgstr "Cerca extractes bancaris"
#. module: account
#: sql_constraint:account.model.line:0
msgid ""
"Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
msgstr ""
+"Valors deure o haver incorrectes en el model (deure + haver ha de ser major "
+"que \"0\")!"
#. module: account
#: view:account.chart.template:0
@@ -1512,11 +1574,17 @@
"the Payment column of a line, you can press F1 to open the reconciliation "
"form."
msgstr ""
+"Un extracte de compte bancari és un resum de totes les transaccions "
+"financeres ocorregudes en un perÃode de temps en un compte de dipòsit, una "
+"targeta de crèdit o qualsevol altre tipus de compte financer. El balanç "
+"inicial serà proposat automà ticament i el balanç de tancament es basarà en "
+"el seu extracte. Situant-se sobre la columna Pagaments d'una lÃnia, podeu "
+"prémer F1 per obrir el formulari de conciliació."
#. module: account
#: report:account.analytic.account.cost_ledger:0
msgid "Date/Code"
-msgstr ""
+msgstr "Data/Codi"
#. module: account
#: field:account.analytic.line,general_account_id:0
@@ -1544,7 +1612,7 @@
#: model:process.node,note:account.process_node_analytic0
#: model:process.node,note:account.process_node_analyticcost0
msgid "Analytic costs to invoice"
-msgstr ""
+msgstr "Costos analÃtics a facturar"
#. module: account
#: view:ir.sequence:0
@@ -1557,10 +1625,9 @@
msgstr "Seqüències de diaris separades"
#. module: account
-#: field:account.bank.statement,user_id:0
#: view:account.invoice:0
msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
#. module: account
#: report:account.overdue:0
@@ -1570,7 +1637,7 @@
#. module: account
#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
msgid "Sales by Account Type"
-msgstr ""
+msgstr "Vendes per tipus de compte"
#. module: account
#: view:account.invoice.refund:0
@@ -1578,11 +1645,13 @@
"Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
"cancel the current invoice."
msgstr ""
+"Cancel·la la factura: Crea la factura d'abonament (rectificativa), la valida "
+"i concilia per cancel·lar la factura actual."
#. module: account
#: model:ir.ui.menu,name:account.periodical_processing_invoicing
msgid "Invoicing"
-msgstr ""
+msgstr "Facturació"
#. module: account
#: field:account.chart.template,tax_code_root_id:0
@@ -1601,14 +1670,9 @@
msgstr "Suma de l'any"
#. module: account
-#: model:ir.actions.report.xml,name:account.report_account_voucher_new
-msgid "Print Voucher"
-msgstr ""
-
-#. module: account
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
-msgstr ""
+msgstr "Aquest assistent canviarà la moneda de la factura"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_chart
@@ -1617,14 +1681,17 @@
"Have a complete tree view of all journal items per account code by clicking "
"on an account."
msgstr ""
+"Mostra el pla de comptes de l'empresa per exercici fiscal i filtrat pel "
+"perÃode. Obteniu una vista en arbre completa de tots els assentaments per "
+"codi de compte que podeu estendre fent clic sobre un compte."
#. module: account
#: constraint:account.fiscalyear:0
msgid "Error! You cannot define overlapping fiscal years"
-msgstr ""
+msgstr "Error! No podeu definir exercicis fiscals que es superposin"
#. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:799
#, python-format
msgid "The account is not defined to be reconciled !"
msgstr "El compte no s'ha definit per ser conciliat!"
@@ -1632,7 +1699,7 @@
#. module: account
#: field:account.cashbox.line,pieces:0
msgid "Values"
-msgstr ""
+msgstr "Valors"
#. module: account
#: help:account.journal.period,active:0
@@ -1640,6 +1707,8 @@
"If the active field is set to False, it will allow you to hide the journal "
"period without removing it."
msgstr ""
+"Si el camp actiu està establert a fals, us permetrà ocultar el perÃode del "
+"diari sense esborrar-lo."
#. module: account
#: view:res.partner:0
@@ -1657,7 +1726,7 @@
msgstr "Comptes a cobrar i pagar"
#. module: account
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:806
#, python-format
msgid "You have to provide an account for the write off entry !"
msgstr "Heu d'indicar un compte per l'assentament d'ajust!"
@@ -1665,17 +1734,12 @@
#. module: account
#: model:ir.model,name:account.model_account_common_journal_report
msgid "Account Common Journal Report"
-msgstr ""
+msgstr "Comptabilitat. Informe diari comú"
#. module: account
#: selection:account.partner.balance,display_partner:0
msgid "All Partners"
-msgstr ""
-
-#. module: account
-#: report:account.move.voucher:0
-msgid "Ref. :"
-msgstr ""
+msgstr "Totes les empreses"
#. module: account
#: view:account.analytic.chart:0
@@ -1685,7 +1749,7 @@
#. module: account
#: view:account.analytic.line:0
msgid "My Entries"
-msgstr ""
+msgstr "Els meus assentaments"
#. module: account
#: report:account.overdue:0
@@ -1693,10 +1757,10 @@
msgstr "Ref. client:"
#. module: account
-#: code:addons/account/account_cash_statement.py:328
+#: code:addons/account/account_cash_statement.py:329
#, python-format
msgid "User %s does not have rights to access %s journal !"
-msgstr ""
+msgstr "L'usuari %s no te drets per accedir al diari %s !"
#. module: account
#: help:account.period,special:0
@@ -1711,10 +1775,10 @@
#. module: account
#: view:account.tax:0
msgid "Tax Declaration: Credit Notes"
-msgstr ""
+msgstr "Declaració d'impostos: Factures rectficatives"
#. module: account
-#: code:addons/account/account.py:499
+#: code:addons/account/account.py:509
#, python-format
msgid "You cannot deactivate an account that contains account moves."
msgstr "No podeu desactivar un compte que conté assentaments comptables."
@@ -1727,10 +1791,10 @@
#. module: account
#: constraint:account.move.line:0
msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "No podeu crear una lÃnia de moviment en un compte tancat."
#. module: account
-#: code:addons/account/account.py:519
+#: code:addons/account/account.py:529
#, python-format
msgid ""
"You cannot change the type of account from 'Closed' to any other type which "
@@ -1742,60 +1806,60 @@
#. module: account
#: view:res.company:0
msgid "Reserve And Profit/Loss Account"
-msgstr ""
+msgstr "Compte de reserves i pèrdues/guanys"
#. module: account
#: sql_constraint:account.move.line:0
msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Valor erroni del deure o haver en l'assentament comptable !"
#. module: account
#: view:account.invoice.report:0
#: model:ir.actions.act_window,name:account.action_account_invoice_report_all
#: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
msgid "Invoices Analysis"
-msgstr ""
+msgstr "Anà lisi de factures"
#. module: account
#: model:ir.model,name:account.model_account_period_close
msgid "period close"
-msgstr ""
+msgstr "tancament del perÃode"
#. module: account
#: view:account.installer:0
msgid "Configure Fiscal Year"
-msgstr ""
+msgstr "Configura l'exercici fiscal"
#. module: account
#: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
msgid "Entries By Line"
-msgstr ""
+msgstr "Assentaments per lÃnia"
#. module: account
#: report:account.tax.code.entries:0
msgid "A/c Code"
-msgstr ""
+msgstr "Codi del compte"
#. module: account
#: field:account.invoice,move_id:0
#: field:account.invoice,move_name:0
msgid "Journal Entry"
-msgstr ""
+msgstr "Assentament del Diari"
#. module: account
#: view:account.tax:0
msgid "Tax Declaration: Invoices"
-msgstr ""
+msgstr "Declaració d'impostos: Factures"
#. module: account
#: field:account.cashbox.line,subtotal:0
msgid "Sub Total"
-msgstr ""
+msgstr "Subtotal"
#. module: account
#: view:account.account:0
msgid "Treasury Analysis"
-msgstr ""
+msgstr "Anà lisi de tresoreria"
#. module: account
#: constraint:res.company:0
@@ -1823,12 +1887,12 @@
#: model:ir.actions.act_window,name:account.action_account_print_journal
#: model:ir.model,name:account.model_account_print_journal
msgid "Account Print Journal"
-msgstr ""
+msgstr "Comptabilitat. Imprimeix diari"
#. module: account
#: model:ir.model,name:account.model_product_category
msgid "Product Category"
-msgstr ""
+msgstr "Categoria del producte"
#. module: account
#: selection:account.account.type,report_type:0
@@ -1838,18 +1902,20 @@
#. module: account
#: field:account.bs.report,reserve_account_id:0
msgid "Reserve & Profit/Loss Account"
-msgstr ""
+msgstr "Compte de Reserves i Pèrdues/Guanys"
#. module: account
#: help:account.bank.statement,balance_end:0
msgid "Closing balance based on Starting Balance and Cash Transactions"
msgstr ""
+"Saldo de tancament calculat a partir del balanç inicial i les transaccions "
+"de caixa."
#. module: account
#: model:process.node,note:account.process_node_reconciliation0
#: model:process.node,note:account.process_node_supplierreconciliation0
msgid "Comparison between accounting and payment entries"
-msgstr ""
+msgstr "Comparació entre assentaments comptables i de pagament"
#. module: account
#: view:account.tax:0
@@ -1873,6 +1939,8 @@
"It adds the currency column if the currency is different then the company "
"currency"
msgstr ""
+"Afegeix la columna de moneda si la moneda és diferent de la moneda de "
+"l'empresa."
#. module: account
#: help:account.journal,allow_date:0
@@ -1880,23 +1948,20 @@
"If set to True then do not accept the entry if the entry date is not into "
"the period dates"
msgstr ""
+"Si es marca aquesta opció, no s'accepten assentaments la data dels quals no "
+"estigui dins de les dates del perÃode."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_pl_report
msgid "Account Profit And Loss"
-msgstr ""
+msgstr "Compte de pèrdues i guanys"
#. module: account
#: field:account.installer,config_logo:0
#: field:account.installer.modules,config_logo:0
#: field:wizard.multi.charts.accounts,config_logo:0
msgid "Image"
-msgstr ""
-
-#. module: account
-#: report:account.move.voucher:0
-msgid "Canceled"
-msgstr ""
+msgstr "Imatge"
#. module: account
#: view:account.invoice:0
@@ -1910,6 +1975,7 @@
"If the active field is set to False, it will allow you to hide the tax "
"without removing it."
msgstr ""
+"Si el camp actiu està desmarcat, permetrà ocultar l'impost sense eliminar-lo."
#. module: account
#: help:account.bank.statement,name:0
@@ -1918,6 +1984,9 @@
"be with same name as statement name. This allows the statement entries to "
"have the same references than the statement itself"
msgstr ""
+"si li doneu un nom diferent de /, l'assentament comptable tindrà el mateix "
+"nom que l'extracte. Això permet que els assentaments de l'extracte tinguin "
+"les mateixes referències que el propi extracte"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_unreconcile
@@ -1945,17 +2014,17 @@
#. module: account
#: field:account.automatic.reconcile,account_ids:0
msgid "Accounts to Reconcile"
-msgstr ""
+msgstr "Comptes a conciliar"
#. module: account
#: model:process.transition,note:account.process_transition_filestatement0
msgid "Import of the statement in the system from an electronic file"
-msgstr ""
+msgstr "Importa al sistema un extracte des d'un fitxer electrònic"
#. module: account
#: model:process.node,name:account.process_node_importinvoice0
msgid "Import from invoice"
-msgstr ""
+msgstr "Importa des de factura"
#. module: account
#: selection:account.entries.report,month:0
@@ -1964,22 +2033,22 @@
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "January"
-msgstr ""
+msgstr "Gener"
#. module: account
#: view:account.journal:0
msgid "Validations"
-msgstr ""
+msgstr "Validacions"
#. module: account
#: view:account.entries.report:0
msgid "This F.Year"
-msgstr ""
+msgstr "Aquest exercici fiscal"
#. module: account
#: view:account.tax.chart:0
msgid "Account tax charts"
-msgstr ""
+msgstr "Pla d'impostos comptables"
#. module: account
#: constraint:account.period:0
@@ -2002,15 +2071,17 @@
#: code:addons/account/installer.py:348
#, python-format
msgid " Journal"
-msgstr ""
+msgstr " Diari"
#. module: account
-#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
#, python-format
msgid ""
"There is no default default debit account defined \n"
"on journal \"%s\""
msgstr ""
+"No s'ha definit cap compte deure per defecte\n"
+"al diari \"%s\""
#. module: account
#: help:account.account,type:0
@@ -2023,11 +2094,16 @@
"partners accounts (for debit/credit computations), closed for depreciated "
"accounts."
msgstr ""
+"Aquesta classificació s'utilitza per diferenciar tipus amb efectes especials "
+"a l'OpenERP: vista no pot tenir anotacions, consolidació són comptes que "
+"poden tenir comptes fills per a consolidacions multi-empresa, "
+"pagable/cobrable són per a comptes d'empreses (per als cà lculs de crèdit / "
+"dèbit), tancat és per a comptes de depreciació."
#. module: account
#: view:account.chart.template:0
msgid "Search Chart of Account Templates"
-msgstr ""
+msgstr "Cerca plantilles de pla comptable"
#. module: account
#: view:account.installer:0
@@ -2036,6 +2112,9 @@
"certified Chart of Accounts exists for your specified country, a generic one "
"can be installed and will be selected by default."
msgstr ""
+"El pla comptable per defecte s'ajusta a la selecció del paÃs. Si no existeix "
+"un pla comptable certificat per al paÃs especificat, es pot instal·lar un de "
+"genèric que serà seleccionat per defecte."
#. module: account
#: view:account.account.type:0
@@ -2057,7 +2136,7 @@
msgstr "Descripció"
#. module: account
-#: code:addons/account/account.py:2844
+#: code:addons/account/account.py:2888
#: code:addons/account/installer.py:498
#, python-format
msgid "ECNJ"
@@ -2077,7 +2156,7 @@
msgstr "Compte d'ingressos"
#. module: account
-#: code:addons/account/invoice.py:352
+#: code:addons/account/invoice.py:351
#, python-format
msgid "There is no Accounting Journal of type Sale/Purchase defined!"
msgstr "No s'ha definit un diari comptable de tipus Venda/Compra!"
@@ -2088,6 +2167,7 @@
msgstr "Propietats de comptabilitat"
#. module: account
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.print.journal,sort_selection:0
msgid "Entries Sorted By"
@@ -2096,17 +2176,17 @@
#. module: account
#: field:account.change.currency,currency_id:0
msgid "Change to"
-msgstr ""
+msgstr "Canvia a"
#. module: account
#: view:account.entries.report:0
msgid "# of Products Qty "
-msgstr ""
+msgstr "Nº qtat de productes "
#. module: account
#: model:ir.model,name:account.model_product_template
msgid "Product Template"
-msgstr ""
+msgstr "Plantilla del producte"
#. module: account
#: report:account.account.balance:0
@@ -2116,6 +2196,7 @@
#: field:account.fiscalyear,name:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.journal.period,fiscalyear_id:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -2125,6 +2206,11 @@
#: report:account.third_party_ledger_other:0
#: report:account.vat.declaration:0
#: model:ir.model,name:account.model_account_fiscalyear
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
msgid "Fiscal Year"
msgstr "Exercici fiscal"
@@ -2204,7 +2290,7 @@
#: model:process.node,note:account.process_node_draftinvoices0
#: model:process.node,note:account.process_node_supplierdraftinvoices0
msgid "Draft state of an invoice"
-msgstr ""
+msgstr "Estat esborrany d'una factura"
#. module: account
#: help:account.account,reconcile:0
@@ -2217,7 +2303,7 @@
#. module: account
#: view:account.partner.reconcile.process:0
msgid "Partner Reconciliation"
-msgstr ""
+msgstr "Conciliació d'empresa"
#. module: account
#: field:account.tax,tax_code_id:0
@@ -2226,7 +2312,7 @@
msgstr "Codi impost comptable"
#. module: account
-#: code:addons/account/invoice.py:545
+#: code:addons/account/invoice.py:552
#, python-format
msgid ""
"Can't find any account journal of %s type for this company.\n"
@@ -2234,6 +2320,10 @@
"You can create one in the menu: \n"
"Configuration\\Financial Accounting\\Accounts\\Journals."
msgstr ""
+"No es troba cap diari del tipus %s per a aquesta companyia.\n"
+"\n"
+"Heu de crear un en el menú: \n"
+"Configuració\\Comptabilitat financera\\Comptes\\Diaris."
#. module: account
#: field:account.invoice.tax,base_code_id:0
@@ -2245,6 +2335,7 @@
#: help:account.invoice.tax,sequence:0
msgid "Gives the sequence order when displaying a list of invoice tax."
msgstr ""
+"Indica l'ordre de seqüència quan es mostra una llista d'impostos de factura."
#. module: account
#: field:account.tax,base_sign:0
@@ -2264,6 +2355,12 @@
"useful because it enables you to preview at any time the tax that you owe at "
"the start and end of the month or quarter."
msgstr ""
+"Aquest menú imprimeix una declaració d'IVA basada en factures o pagaments. "
+"Seleccioneu un o diversos perÃodes de l'exercici fiscal. La informació "
+"necessà ria per a la declaració d'IVA és generada automà ticament per OpenERP "
+"a partir de les factures (o pagaments, en alguns països). Aquesta informació "
+"s'actualitza en temps real. És molt útil perquè li permet previsualitzar en "
+"qualsevol moment els impostos que deu al principi i fi del mes o trimestre."
#. module: account
#: selection:account.move.line,centralisation:0
@@ -2274,7 +2371,7 @@
#: view:account.invoice.confirm:0
#: model:ir.actions.act_window,name:account.action_account_invoice_confirm
msgid "Confirm Draft Invoices"
-msgstr ""
+msgstr "Confirma factures esborrany"
#. module: account
#: field:account.entries.report,day:0
@@ -2283,12 +2380,12 @@
#: view:analytic.entries.report:0
#: field:analytic.entries.report,day:0
msgid "Day"
-msgstr ""
+msgstr "Dia"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_renew_view
msgid "Accounts to Renew"
-msgstr ""
+msgstr "Comptes a renovar"
#. module: account
#: model:ir.model,name:account.model_account_model_line
@@ -2296,7 +2393,7 @@
msgstr "LÃniees de model d'assentament"
#. module: account
-#: code:addons/account/account.py:2796
+#: code:addons/account/account.py:2840
#: code:addons/account/installer.py:454
#, python-format
msgid "EXJ"
@@ -2330,7 +2427,7 @@
#. module: account
#: model:ir.ui.menu,name:account.menu_account_pp_statements
msgid "Statements"
-msgstr ""
+msgstr "Extractes"
#. module: account
#: report:account.analytic.account.journal:0
@@ -2343,17 +2440,21 @@
"The fiscal position will determine taxes and the accounts used for the "
"partner."
msgstr ""
+"La posició fiscal calcularà els impostos i els comptes comptables utilitzats "
+"per a aquesta empresa."
#. module: account
#: view:account.print.journal:0
msgid ""
"This report gives you an overview of the situation of a specific journal"
msgstr ""
+"Aquest informe us proporciona una visió global sobre la situació d'un diari "
+"especÃfic"
#. module: account
#: constraint:product.category:0
msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "Error! No podeu crear categories recursives."
#. module: account
#: report:account.invoice:0
@@ -2382,10 +2483,10 @@
#: model:ir.ui.menu,name:account.menu_action_account_form
#: model:ir.ui.menu,name:account.menu_analytic
msgid "Accounts"
-msgstr ""
+msgstr "Comptes"
#. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:350
#, python-format
msgid "Configuration Error!"
msgstr "Error de configuració!"
@@ -2394,31 +2495,31 @@
#: view:account.invoice.report:0
#: field:account.invoice.report,price_average:0
msgid "Average Price"
-msgstr ""
+msgstr "Preu mitjà "
#. module: account
-#: report:account.move.voucher:0
#: report:account.overdue:0
msgid "Date:"
msgstr "Data:"
#. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:654
#, python-format
msgid ""
"You cannot modify company of this journal as its related record exist in "
"Entry Lines"
msgstr ""
+"No podeu modificar l'empresa d'aquest diari perquè ja conté assentaments"
#. module: account
#: report:account.journal.period.print:0
msgid "Label"
-msgstr ""
+msgstr "Etiqueta"
#. module: account
#: view:account.tax:0
msgid "Accounting Information"
-msgstr ""
+msgstr "Informació comptable"
#. module: account
#: view:account.tax:0
@@ -2439,6 +2540,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.overdue:0
#: report:account.third_party_ledger:0
@@ -2450,11 +2552,13 @@
#: help:account.move.line,tax_code_id:0
msgid "The Account can either be a base tax code or a tax code account."
msgstr ""
+"El compte pot ser o bé un compte d'un codi d'impost base o bé d'un codi "
+"d'impost."
#. module: account
#: model:ir.ui.menu,name:account.menu_automatic_reconcile
msgid "Automatic Reconciliation"
-msgstr ""
+msgstr "Conciliació automà tica"
#. module: account
#: field:account.invoice,reconciled:0
@@ -2472,7 +2576,7 @@
#: model:ir.actions.act_window,name:account.action_bank_statement_tree
#: model:ir.ui.menu,name:account.menu_bank_statement_tree
msgid "Bank Statements"
-msgstr ""
+msgstr "Extractes bancaris"
#. module: account
#: selection:account.tax.template,applicable_type:0
@@ -2485,7 +2589,7 @@
#: view:account.move:0
#: view:account.move.line:0
msgid "Dates"
-msgstr ""
+msgstr "Dates"
#. module: account
#: field:account.tax,parent_id:0
@@ -2499,6 +2603,8 @@
"Automatically generate entries based on what has been entered in the system "
"before a specific date."
msgstr ""
+"Genera automà ticament els assentaments a partir del que s'ha introduït en el "
+"sistema abans d'una data concreta."
#. module: account
#: view:account.aged.trial.balance:0
@@ -2511,7 +2617,7 @@
#: model:process.transition,name:account.process_transition_entriesreconcile0
#: model:process.transition,name:account.process_transition_supplierentriesreconcile0
msgid "Accounting entries"
-msgstr ""
+msgstr "Assentaments comptables"
#. module: account
#: field:account.invoice.line,discount:0
@@ -2527,36 +2633,41 @@
"Note that journal entries that are automatically created by the system are "
"always skipping that state."
msgstr ""
+"Marqueu aquesta opció si no desitjeu que les noves anotacions passin per "
+"l'estat 'Esborrany' i per tant vagin directament a l'estat 'Assentat' sense "
+"cap validació manual.\n"
+"Tingueu en compte que les anotacions creades automà ticament pel sistema "
+"sempre obvien aquest estat."
#. module: account
#: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
#: model:ir.ui.menu,name:account.menu_act_ir_actions_bleble
msgid "New Company Financial Setting"
-msgstr ""
+msgstr "Configuració financera per una nova companyia"
#. module: account
#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
#: view:report.account.sales:0
#: view:report.account_type.sales:0
msgid "Sales by Account"
-msgstr ""
+msgstr "Vendes per compte"
#. module: account
#: view:account.use.model:0
msgid "This wizard will create recurring accounting entries"
-msgstr ""
+msgstr "Aquest assistent crearà assentaments comptables recursius"
#. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1195
#, python-format
msgid "No sequence defined on the journal !"
-msgstr ""
+msgstr "No s'ha definit una seqüència en el diari !"
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
-#: code:addons/account/invoice.py:670
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2573,7 +2684,7 @@
#: model:ir.ui.menu,name:account.menu_account_customer
#: model:ir.ui.menu,name:account.menu_finance_receivables
msgid "Customers"
-msgstr ""
+msgstr "Clients"
#. module: account
#: report:account.analytic.account.cost_ledger:0
@@ -2589,7 +2700,7 @@
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "August"
-msgstr ""
+msgstr "Agost"
#. module: account
#: code:addons/account/account_bank_statement.py:306
@@ -2605,11 +2716,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Number:"
-msgstr ""
-
-#. module: account
#: selection:account.print.journal,sort_selection:0
msgid "Reference Number"
msgstr "Número de referència"
@@ -2621,7 +2727,7 @@
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "October"
-msgstr ""
+msgstr "Octubre"
#. module: account
#: help:account.move.line,quantity:0
@@ -2629,11 +2735,14 @@
"The optional quantity expressed by this line, eg: number of product sold. "
"The quantity is not a legal requirement but is very useful for some reports."
msgstr ""
+"La quantitat opcional expressada per aquesta lÃnia, per exemple: el nombre "
+"de productes venuts. La quantitat no és un requisit legal, però és molt útil "
+"per a alguns informes."
#. module: account
#: view:account.payment.term.line:0
msgid "Line 2:"
-msgstr ""
+msgstr "LÃnia 2:"
#. module: account
#: field:account.journal.column,required:0
@@ -2658,6 +2767,8 @@
msgid ""
"used in statement reconciliation domain, but shouldn't be used elswhere."
msgstr ""
+"utilitzat en el domini de conciliació d'extractes, però no s'hauria "
+"d'utilitzar en cap altre lloc."
#. module: account
#: field:account.invoice.tax,base_amount:0
@@ -2667,7 +2778,7 @@
#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
-msgstr ""
+msgstr "Impost de venda per defecte"
#. module: account
#: help:account.model.line,date_maturity:0
@@ -2676,6 +2787,9 @@
"between the creation date or the creation date of the entries plus the "
"partner payment terms."
msgstr ""
+"La data de venciment dels assentaments generats per aquest model. Podeu "
+"triar entre la data de creació o la data de creació dels assentaments més "
+"els terminis de pagament de l'empresa."
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_accounting
@@ -2686,7 +2800,7 @@
#: view:account.pl.report:0
#: model:ir.ui.menu,name:account.menu_account_pl_report
msgid "Profit And Loss"
-msgstr ""
+msgstr "Pèrdues i guanys"
#. module: account
#: view:account.fiscal.position:0
@@ -2709,6 +2823,8 @@
"It adds initial balance row on report which display previous sum amount of "
"debit/credit/balance"
msgstr ""
+"Afegeix una fila de saldo inicial en l'informe que mostra l'import previ del "
+"deure/haver/saldo"
#. module: account
#: view:account.analytic.line:0
@@ -2717,7 +2833,7 @@
msgstr "Entrades analÃtiques"
#. module: account
-#: code:addons/account/account.py:822
+#: code:addons/account/account.py:836
#, python-format
msgid ""
"No fiscal year defined for this date !\n"
@@ -2751,12 +2867,12 @@
#. module: account
#: view:account.period:0
msgid "Search Period"
-msgstr ""
+msgstr "Cerca perÃode"
#. module: account
#: view:account.change.currency:0
msgid "Invoice Currency"
-msgstr ""
+msgstr "Moneda de la factura"
#. module: account
#: field:account.payment.term,line_ids:0
@@ -2766,7 +2882,7 @@
#. module: account
#: field:account.bank.statement,total_entry_encoding:0
msgid "Cash Transaction"
-msgstr ""
+msgstr "Transició de caixa"
#. module: account
#: view:res.partner:0
@@ -2806,17 +2922,17 @@
#. module: account
#: view:account.fiscalyear:0
msgid "Search Fiscalyear"
-msgstr ""
+msgstr "Cerca exercici fiscal"
#. module: account
#: selection:account.tax,applicable_type:0
msgid "Always"
-msgstr ""
+msgstr "Sempre"
#. module: account
#: view:account.analytic.line:0
msgid "Total Quantity"
-msgstr ""
+msgstr "Quantitat total"
#. module: account
#: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
@@ -2843,6 +2959,7 @@
msgstr "Vista"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
@@ -2850,6 +2967,9 @@
#. module: account
#: code:addons/account/account.py:2906
+=======
+#: code:addons/account/account.py:2950
+>>>>>>> MERGE-SOURCE
#: code:addons/account/installer.py:296
#, python-format
msgid "BNK"
@@ -2878,17 +2998,17 @@
#. module: account
#: view:account.subscription:0
msgid "Starts on"
-msgstr ""
+msgstr "Comença en"
#. module: account
#: model:ir.model,name:account.model_account_partner_ledger
msgid "Account Partner Ledger"
-msgstr ""
+msgstr "Llibre major de l'empresa"
#. module: account
#: help:account.journal.column,sequence:0
msgid "Gives the sequence order to journal column."
-msgstr ""
+msgstr "Indica l'ordre de seqüència de la columna del diari."
#. module: account
#: view:account.tax.template:0
@@ -2901,6 +3021,7 @@
#: help:account.bank.accounts.wizard,currency_id:0
msgid "Forces all moves for this account to have this secondary currency."
msgstr ""
+"Força a tots els moviments d'aquest compte, tenir aquesta moneda secundà ria."
#. module: account
#: model:ir.actions.act_window,help:account.action_validate_account_move_line
@@ -2908,6 +3029,9 @@
"This wizard will validate all journal entries of a particular journal and "
"period. Once journal entries are validated, you can not update them anymore."
msgstr ""
+"Aquest assentament validarà tots els assentaments d'un diari i perÃode en "
+"particular. Una vegada que es validen els assentaments, no es poden "
+"modificar més."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_chart_template_form
@@ -2938,6 +3062,21 @@
" 'Unreconciled' will copy only the journal items that were unreconciled on "
"the first day of the new fiscal year."
msgstr ""
+"Estableix aquà el mètode que utilitzarà l'assistent genèric per crear el "
+"assentament de tancament d'exercici per a tots els comptes d'aquest tipus.\n"
+"\n"
+"'Cap' significa que no es farà res.\n"
+"'Saldo' normalment s'utilitzarà per a comptes d'efectiu.\n"
+"'Detallat' copiarà cada anotació de l'exercici anterior, fins i tot els no "
+"conciliats.\n"
+"'Sense conciliar' copiarà només les anotacions no conciliades el primer dia "
+"del nou exercici fiscal."
+
+#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+#, python-format
+msgid "No End of year journal defined for the fiscal year"
+msgstr "No hi ha cap diari de tancament definit per a l'exercici fiscal"
#. module: account
#: view:account.tax:0
@@ -2958,6 +3097,7 @@
#: field:account.common.report,journal_ids:0
#: report:account.general.journal:0
#: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger_landscape:0
#: view:account.journal.period:0
#: report:account.partner.balance:0
#: field:account.partner.balance,journal_ids:0
@@ -2979,7 +3119,7 @@
#. module: account
#: field:account.partner.reconcile.process,to_reconcile:0
msgid "Remaining Partners"
-msgstr ""
+msgstr "Empreses restants"
#. module: account
#: view:account.subscription:0
@@ -3004,7 +3144,7 @@
#: model:ir.actions.act_window,name:account.action_account_installer
#: view:wizard.multi.charts.accounts:0
msgid "Accounting Application Configuration"
-msgstr ""
+msgstr "Configuració de l'aplicació de comptabilitat"
#. module: account
#: model:ir.actions.act_window,name:account.open_board_account
@@ -3018,7 +3158,7 @@
msgstr "Saldo inicial"
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "No Partner Defined !"
msgstr "No s'ha definit empresa!"
@@ -3046,11 +3186,8 @@
"The amount expressed in the related account currency if not equal to the "
"company one."
msgstr ""
-
-#. module: account
-#: report:account.move.voucher:0
-msgid "Journal:"
-msgstr ""
+"L'import expressat en la moneda comptable relacionada no és igual al de la "
+"companyia."
#. module: account
#: view:account.bank.statement:0
@@ -3060,7 +3197,6 @@
#: view:account.invoice.report:0
#: selection:account.invoice.report,state:0
#: selection:account.journal.period,state:0
-#: report:account.move.voucher:0
#: view:account.subscription:0
#: selection:account.subscription,state:0
#: selection:report.invoice.created,state:0
@@ -3070,7 +3206,7 @@
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Accounting Chart Configuration"
-msgstr ""
+msgstr "Configuració del pla comptable"
#. module: account
#: field:account.tax.code,notprintable:0
@@ -3082,17 +3218,17 @@
#: report:account.vat.declaration:0
#: field:account.vat.declaration,chart_tax_id:0
msgid "Chart of Tax"
-msgstr ""
+msgstr "Pla dels impostos"
#. module: account
#: view:account.journal:0
msgid "Search Account Journal"
-msgstr ""
+msgstr "Cerca diari"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
msgid "Pending Invoice"
-msgstr ""
+msgstr "Factura pendent"
#. module: account
#: selection:account.subscription,period_type:0
@@ -3100,19 +3236,16 @@
msgstr "any"
#. module: account
-#: report:account.move.voucher:0
-msgid "Authorised Signatory"
-msgstr ""
-
-#. module: account
#: view:validate.account.move.lines:0
msgid ""
"All selected journal entries will be validated and posted. It means you "
"won't be able to modify their accounting fields anymore."
msgstr ""
+"Tots els assentaments seleccionats seran validats i assentats. Això "
+"significa que ja no podreu modificar els camps comptables."
#. module: account
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Cannot delete invoice(s) that are already opened or paid !"
msgstr "No es poden esborrar factures obertes o pagades!"
@@ -3120,7 +3253,7 @@
#. module: account
#: report:account.account.balance.landscape:0
msgid "Total :"
-msgstr ""
+msgstr "Total :"
#. module: account
#: model:ir.actions.report.xml,name:account.account_transfers
@@ -3128,8 +3261,10 @@
msgstr "Transferències"
#. module: account
-#: view:account.payment.term.line:0
-msgid " value amount: n.a"
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
msgstr ""
#. module: account
@@ -3145,12 +3280,12 @@
#. module: account
#: view:account.installer:0
msgid "Your bank and cash accounts"
-msgstr ""
+msgstr "Comptes bancaris i de caixa"
#. module: account
#: view:account.move:0
msgid "Search Move"
-msgstr ""
+msgstr "Cerca moviment"
#. module: account
#: field:account.tax.code,name:0
@@ -3171,9 +3306,11 @@
"Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
"or 'Done' state!"
msgstr ""
+"La/es factura/es seleccionada/es no es pot/den cancel·lar ja que està en "
+"estat 'Cancel·lat' o 'Realitzat'!"
#. module: account
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:532
#, python-format
msgid ""
"You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3184,24 +3321,25 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
msgid "Counterpart"
-msgstr ""
+msgstr "Contrapartida"
#. module: account
#: view:account.journal:0
msgid "Invoicing Data"
-msgstr ""
+msgstr "Dades de facturació"
#. module: account
#: field:account.invoice.report,state:0
msgid "Invoice State"
-msgstr ""
+msgstr "Estat de la factura"
#. module: account
#: view:account.invoice.report:0
#: field:account.invoice.report,categ_id:0
msgid "Category of Product"
-msgstr ""
+msgstr "Categoria del producte"
#. module: account
#: view:account.move:0
@@ -3209,18 +3347,18 @@
#: view:account.move.line:0
#: field:account.move.line,narration:0
msgid "Narration"
-msgstr ""
+msgstr "Notes"
#. module: account
#: view:account.addtmpl.wizard:0
#: model:ir.actions.act_window,name:account.action_account_addtmpl_wizard_form
msgid "Create Account"
-msgstr ""
+msgstr "Crea compte"
#. module: account
#: model:ir.model,name:account.model_report_account_type_sales
msgid "Report of the Sales by Account Type"
-msgstr ""
+msgstr "Informe de les vendes per tipus de compte"
#. module: account
#: selection:account.account.type,close_method:0
@@ -3230,7 +3368,7 @@
#. module: account
#: field:account.installer,bank_accounts_id:0
msgid "Your Bank and Cash Accounts"
-msgstr ""
+msgstr "Els seus comptes de banc i caixa"
#. module: account
#: report:account.invoice:0
@@ -3249,6 +3387,7 @@
#: view:account.tax.chart:0
msgid "(If you do not select period it will take all open periods)"
msgstr ""
+"(si no seleccioneu el perÃode s'utilitzaran tots els perÃodes oberts)"
#. module: account
#: field:account.journal,centralisation:0
@@ -3258,7 +3397,7 @@
#. module: account
#: model:ir.model,name:account.model_account_partner_reconcile_process
msgid "Reconcilation Process partner by partner"
-msgstr ""
+msgstr "Procés de conciliació empresa per empresa"
#. module: account
#: selection:account.automatic.reconcile,power:0
@@ -3288,6 +3427,7 @@
#: field:account.entries.report,date:0
#: selection:account.general.journal,filter:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice.report,date:0
#: report:account.journal.period.print:0
#: view:account.move:0
@@ -3331,27 +3471,32 @@
msgstr "Plantilla del pla comptable"
#. module: account
-#: code:addons/account/account.py:2095
+#: code:addons/account/account.py:2109
#, python-format
msgid ""
"Maturity date of entry line generated by model line '%s' of model '%s' is "
"based on partner payment term!\n"
"Please define partner on it!"
msgstr ""
+"La data de venciment de l'anotació generada per la lÃnia del model '%s' del "
+"model '%s' es basa en el termini de pagament de l'empresa.\n"
+"definiu l'empresa en ell!"
#. module: account
-#: code:addons/account/account_move_line.py:810
+#: code:addons/account/account_move_line.py:801
#, python-format
msgid "Some entries are already reconciled !"
msgstr "Alguns assentaments ja estan conciliats!"
#. module: account
-#: code:addons/account/account.py:1204
+#: code:addons/account/account.py:1218
#, python-format
msgid ""
"You cannot validate a Journal Entry unless all journal items are in same "
"chart of accounts !"
msgstr ""
+"No podeu validar un assentament fins que tots els moviments estiguin en el "
+"mateix pla comptable!"
#. module: account
#: view:account.tax:0
@@ -3361,7 +3506,7 @@
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
msgid "Budgets"
-msgstr ""
+msgstr "Pressupostos"
#. module: account
#: selection:account.aged.trial.balance,filter:0
@@ -3380,7 +3525,7 @@
#: selection:account.report.general.ledger,filter:0
#: selection:account.vat.declaration,filter:0
msgid "No Filters"
-msgstr ""
+msgstr "Sense filtres"
#. module: account
#: selection:account.analytic.journal,type:0
@@ -3390,7 +3535,7 @@
#. module: account
#: view:res.partner:0
msgid "History"
-msgstr ""
+msgstr "Històric"
#. module: account
#: help:account.tax,applicable_type:0
@@ -3412,12 +3557,12 @@
#: view:account.invoice.report:0
#: field:account.invoice.report,product_qty:0
msgid "Qty"
-msgstr ""
+msgstr "Qtat"
#. module: account
#: field:account.invoice.report,address_contact_id:0
msgid "Contact Address Name"
-msgstr ""
+msgstr "Adreça del contacte"
#. module: account
#: field:account.move.line,blocked:0
@@ -3427,7 +3572,7 @@
#. module: account
#: view:account.analytic.line:0
msgid "Search Analytic Lines"
-msgstr ""
+msgstr "Cerca lÃnies analÃtiques"
#. module: account
#: field:res.partner,property_account_payable:0
@@ -3439,6 +3584,7 @@
msgid ""
"You cannot create entries on different periods/journals in the same move"
msgstr ""
+"No podeu crear apunts en diferents perÃodes/diaris en el mateix assentament"
#. module: account
#: model:process.node,name:account.process_node_supplierpaymentorder0
@@ -3467,10 +3613,10 @@
#. module: account
#: model:ir.actions.act_window,name:account.action_account_tree1
msgid "Analytic Items"
-msgstr ""
+msgstr "Anotacions analÃtiques"
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "Unable to change tax !"
msgstr "No ha estat possible canviar l'impost!"
@@ -3478,17 +3624,18 @@
#. module: account
#: field:analytic.entries.report,nbr:0
msgid "#Entries"
-msgstr ""
+msgstr "Núm. assentament"
#. module: account
-#: code:addons/account/invoice.py:1422
+#: code:addons/account/invoice.py:1437
#, python-format
msgid ""
"You selected an Unit of Measure which is not compatible with the product."
msgstr ""
+"Heu seleccionat una unitat de mesura que no és compatible amb el producte."
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#, python-format
msgid ""
"The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3505,12 +3652,12 @@
#. module: account
#: field:account.invoice.tax,factor_tax:0
msgid "Multipication factor Tax code"
-msgstr ""
+msgstr "Factor de multiplicació del impost"
#. module: account
#: view:account.fiscal.position:0
msgid "Mapping"
-msgstr ""
+msgstr "Correspondència"
#. module: account
#: field:account.account,name:0
@@ -3528,7 +3675,7 @@
#. module: account
#: model:ir.model,name:account.model_account_aged_trial_balance
msgid "Account Aged Trial balance Report"
-msgstr ""
+msgstr "Informe de comprovació de venciments en el balanç"
#. module: account
#: field:account.move.line,date:0
@@ -3544,7 +3691,7 @@
#. module: account
#: help:account.journal,analytic_journal_id:0
msgid "Journal for analytic entries"
-msgstr ""
+msgstr "Diari d'assentaments analÃtics"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance
@@ -3565,11 +3712,13 @@
"Print Report with the currency column if the currency is different then the "
"company currency"
msgstr ""
+"Imprimeix informe amb la columna de la moneda, si la moneda és diferent de "
+"la moneda de la companyia."
#. module: account
#: view:account.analytic.line:0
msgid "General Accounting"
-msgstr ""
+msgstr "Comptabilitat general"
#. module: account
#: report:account.overdue:0
@@ -3584,13 +3733,17 @@
"debit/credit accounts, of type 'situation' and with a centralized "
"counterpart."
msgstr ""
+"El més recomanable és utilitzar un diari dedicat als assentaments d'obertura "
+"de tots els exercicis. Tingueu en compte que ho haurÃeu de definir amb "
+"comptes de deure/haver per defecte, de tipus 'situació' i amb una "
+"contrapartida centralitzada."
#. module: account
#: view:account.installer:0
#: view:account.installer.modules:0
#: view:wizard.multi.charts.accounts:0
msgid "title"
-msgstr ""
+msgstr "tÃtol"
#. module: account
#: view:account.invoice:0
@@ -3602,12 +3755,12 @@
#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form
msgid "Recurring Lines"
-msgstr ""
+msgstr "LÃnies recursives"
#. module: account
#: field:account.partner.balance,display_partner:0
msgid "Display Partners"
-msgstr ""
+msgstr "Mostra empreses"
#. module: account
#: view:account.invoice:0
@@ -3618,6 +3771,7 @@
#: sql_constraint:account.model.line:0
msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
msgstr ""
+"Valor erroni del deure o haver en el model (deure o haver ha de ser \"0\")!"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_invoice_report_all
@@ -3626,11 +3780,15 @@
"customer as well as payment delays. The tool search can also be used to "
"personalise your Invoices reports and so, match this analysis to your needs."
msgstr ""
+"A partir d'aquest informe, podeu tenir una visió general de l'import "
+"facturat als seus clients, aixà com els retards en els pagaments. L'eina de "
+"recerca també es pot utilitzar per personalitzar els informes de les "
+"factures i per tant, adaptar aquest anà lisi a les seves necessitats."
#. module: account
#: view:account.invoice.confirm:0
msgid "Confirm Invoices"
-msgstr ""
+msgstr "Confirma factures"
#. module: account
#: selection:account.account,currency_mode:0
@@ -3660,7 +3818,7 @@
#: field:account.report.general.ledger,period_from:0
#: field:account.vat.declaration,period_from:0
msgid "Start period"
-msgstr ""
+msgstr "PerÃode inicial"
#. module: account
#: field:account.tax,name:0
@@ -3694,7 +3852,7 @@
#: code:addons/account/report/account_profit_loss.py:124
#, python-format
msgid "Net Loss"
-msgstr ""
+msgstr "Pèrdues netes"
#. module: account
#: help:account.account,active:0
@@ -3702,16 +3860,17 @@
"If the active field is set to False, it will allow you to hide the account "
"without removing it."
msgstr ""
+"Si el camp actiu es desmarca, permet ocultar el compte sense eliminar-lo."
#. module: account
#: view:account.tax.template:0
msgid "Search Tax Templates"
-msgstr ""
+msgstr "Cerca plantilles d'impostos"
#. module: account
#: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
msgid "Draft Entries"
-msgstr ""
+msgstr "Assentaments en esborrany"
#. module: account
#: field:account.account,shortcut:0
@@ -3740,12 +3899,12 @@
#: model:ir.actions.report.xml,name:account.account_account_balance
#: model:ir.ui.menu,name:account.menu_general_Balance_report
msgid "Trial Balance"
-msgstr ""
+msgstr "Balanç de sumes i saldos"
#. module: account
#: model:ir.model,name:account.model_account_invoice_cancel
msgid "Cancel the Selected Invoices"
-msgstr ""
+msgstr "Cancel·la les factures seleccionades"
#. module: account
#: help:product.category,property_account_income_categ:0
@@ -3754,6 +3913,8 @@
"This account will be used to value outgoing stock for the current product "
"category using sale price"
msgstr ""
+"Aquest compte s'utilitzarà per valorar l'estoc que ha sortit de la categoria "
+"de producte actual utilitzant el preu de venda."
#. module: account
#: selection:account.automatic.reconcile,power:0
@@ -3766,11 +3927,14 @@
"Analytic costs (timesheets, some purchased products, ...) come from analytic "
"accounts. These generate draft supplier invoices."
msgstr ""
+"Els costos analÃtics (fulls de serveis, alguns productes comprats, ...) "
+"provenen dels comptes analÃtics. Aquests generen factures esborrador de "
+"proveïdor."
#. module: account
#: view:account.bank.statement:0
msgid "Close CashBox"
-msgstr ""
+msgstr "Tanca caixa"
#. module: account
#: view:account.invoice.report:0
@@ -3781,10 +3945,10 @@
#. module: account
#: view:account.entries.report:0
msgid "Acc.Type"
-msgstr ""
+msgstr "Tipus de compte"
#. module: account
-#: code:addons/account/invoice.py:714
+#: code:addons/account/invoice.py:722
#, python-format
msgid "Global taxes defined, but are not in invoice lines !"
msgstr "Impostos globals definits, però no estan en lÃnies de la factura!"
@@ -3803,7 +3967,7 @@
#. module: account
#: field:account.invoice.report,uom_name:0
msgid "Reference UoM"
-msgstr ""
+msgstr "Referència UdM"
#. module: account
#: field:account.account,note:0
@@ -3814,7 +3978,7 @@
#. module: account
#: view:account.analytic.account:0
msgid "Overdue Account"
-msgstr ""
+msgstr "Compta d'endarreriments"
#. module: account
#: selection:account.invoice,state:0
@@ -3830,7 +3994,7 @@
#. module: account
#: field:account.tax,base_code_id:0
msgid "Account Base Code"
-msgstr ""
+msgstr "Codi base del compte"
#. module: account
#: help:account.move,state:0
@@ -3841,12 +4005,18 @@
"the system on document validation (invoices, bank statements...) and will be "
"created in 'Posted' state."
msgstr ""
+"Tots els assentaments creats manualment estan, generalment, en l'estat 'No "
+"assentant', però podeu configurar l'opció d'ometre aquest estat en el diari "
+"corresponent. En aquest cas, es comporten com els assentaments creats "
+"automà ticament pel sistema de validació de documents (factures, extractes "
+"bancaris, ...) i es crearan en estat 'Assentat'."
#. module: account
-#: code:addons/account/account_analytic_line.py:91
+#: code:addons/account/account_analytic_line.py:90
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
+"No hi ha compte de despeses definit per aquest producte: \"%s\" (id:%d)"
#. module: account
#: view:res.partner:0
@@ -3887,11 +4057,12 @@
#, python-format
msgid "Statement %s is confirmed, journal items are created."
msgstr ""
+"S'ha confirmat l'extracte %s, s'han creat els assentaments comptables."
#. module: account
#: constraint:account.fiscalyear:0
msgid "Error! The duration of the Fiscal Year is invalid. "
-msgstr ""
+msgstr "Error! La durada de l'exercici fiscal no és và lida. "
#. module: account
#: field:report.aged.receivable,name:0
@@ -3906,12 +4077,12 @@
#. module: account
#: view:account.tax:0
msgid "Compute Code"
-msgstr ""
+msgstr "Codi calculat"
#. module: account
#: view:account.account.template:0
msgid "Default taxes"
-msgstr ""
+msgstr "Impostos per defecte"
#. module: account
#: code:addons/account/invoice.py:88
@@ -3930,26 +4101,28 @@
"When new move line is created the state will be 'Draft'.\n"
"* When all the payments are done it will be in 'Valid' state."
msgstr ""
+"Quan es crea una nova anotació, l'estat serà 'Esborrany'.\n"
+"* Quan es realitzin tots els pagaments, l'estat serà 'Và lid'"
#. module: account
#: field:account.journal,view_id:0
msgid "Display Mode"
-msgstr ""
+msgstr "Mode de visualització"
#. module: account
#: model:process.node,note:account.process_node_importinvoice0
msgid "Statement from invoice or payment"
-msgstr ""
+msgstr "Extracte des de factura o pagament"
#. module: account
#: view:account.payment.term.line:0
msgid " day of the month: 0"
-msgstr ""
+msgstr " dia del mes: 0"
#. module: account
#: model:ir.model,name:account.model_account_chart
msgid "Account chart"
-msgstr ""
+msgstr "Pla comptable"
#. module: account
#: report:account.account.balance.landscape:0
@@ -3961,23 +4134,23 @@
#. module: account
#: help:account.fiscalyear.close,report_name:0
msgid "Give name of the new entries"
-msgstr ""
+msgstr "Indiqueu el nom dels nous assentaments"
#. module: account
#: model:ir.model,name:account.model_account_invoice_report
msgid "Invoices Statistics"
-msgstr ""
+msgstr "EstadÃstiques de factures"
#. module: account
#: model:process.transition,note:account.process_transition_paymentorderreconcilation0
msgid "Bank statements are entered in the system."
-msgstr ""
+msgstr "S'han introduït els extractes bancaris en el sistema."
#. module: account
#: code:addons/account/wizard/account_reconcile.py:133
#, python-format
msgid "Reconcile Writeoff"
-msgstr ""
+msgstr "Desfés conciliació"
#. module: account
#: field:account.model.line,date_maturity:0
@@ -4000,17 +4173,17 @@
#: code:addons/account/report/common_report_header.py:92
#, python-format
msgid "Not implemented"
-msgstr ""
+msgstr "No s'ha implementat"
#. module: account
#: model:ir.model,name:account.model_account_journal_select
msgid "Account Journal Select"
-msgstr ""
+msgstr "Seleccioneu compte de diari"
#. module: account
#: view:account.invoice:0
msgid "Print Invoice"
-msgstr ""
+msgstr "Imprimeix factura"
#. module: account
#: view:account.tax.template:0
@@ -4018,7 +4191,7 @@
msgstr "Factures rectificatives (abonament)"
#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "Unable to find a valid period !"
@@ -4037,7 +4210,7 @@
#. module: account
#: view:account.unreconcile:0
msgid "Unreconciliate transactions"
-msgstr ""
+msgstr "Transaccions no conciliades"
#. module: account
#: view:account.use.model:0
@@ -4070,15 +4243,24 @@
msgstr "Impostos inclosos en preu"
#. module: account
+#: constraint:account.account:0
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error! \n"
+"You cannot define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
msgid "Account Analytic Cost Ledger For Journal Report"
-msgstr ""
+msgstr "Llibre de costos analÃtics per informe diari"
#. module: account
#: model:ir.actions.act_window,name:account.action_model_form
#: model:ir.ui.menu,name:account.menu_action_model_form
msgid "Recurring Models"
-msgstr ""
+msgstr "Models recursius"
#. module: account
#: selection:account.automatic.reconcile,power:0
@@ -4091,11 +4273,11 @@
msgstr "Canvia"
#. module: account
-#: code:addons/account/account.py:1290
-#: code:addons/account/account.py:1318
-#: code:addons/account/account.py:1325
-#: code:addons/account/account_move_line.py:1055
-#: code:addons/account/invoice.py:896
+#: code:addons/account/account.py:1304
+#: code:addons/account/account.py:1332
+#: code:addons/account/account.py:1339
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/invoice.py:904
#: code:addons/account/wizard/account_automatic_reconcile.py:152
#: code:addons/account/wizard/account_fiscalyear_close.py:78
#: code:addons/account/wizard/account_fiscalyear_close.py:81
@@ -4114,12 +4296,12 @@
#. module: account
#: help:account.journal,default_credit_account_id:0
msgid "It acts as a default account for credit amount"
-msgstr ""
+msgstr "Actua com un compte per defecte per als imports en l'haver"
#. module: account
#: help:account.partner.ledger,reconcil:0
msgid "Consider reconciled entries"
-msgstr ""
+msgstr "Considerar assentaments conciliats."
#. module: account
#: model:ir.actions.act_window,name:account.action_validate_account_move_line
@@ -4139,7 +4321,7 @@
#. module: account
#: help:account.bank.statement,balance_end_cash:0
msgid "Closing balance based on cashBox"
-msgstr ""
+msgstr "Saldo del tancament basat en la caixa."
#. module: account
#: constraint:account.account:0
@@ -4148,23 +4330,16 @@
msgstr "Error! No es poden crear comptes recursius."
#. module: account
-#: constraint:account.account:0
-msgid ""
-"You cannot create an account! \n"
-"Make sure if the account has children then it should be type \"View\"!"
-msgstr ""
-
-#. module: account
#: view:account.subscription.generate:0
#: model:ir.actions.act_window,name:account.action_account_subscription_generate
#: model:ir.ui.menu,name:account.menu_generate_subscription
msgid "Generate Entries"
-msgstr ""
+msgstr "Genera assentaments"
#. module: account
#: help:account.vat.declaration,chart_tax_id:0
msgid "Select Charts of Taxes"
-msgstr ""
+msgstr "Selecciona pla d'impuestos."
#. module: account
#: view:account.fiscal.position:0
@@ -4185,12 +4360,12 @@
#. module: account
#: view:account.bank.statement:0
msgid "Confirmed"
-msgstr ""
+msgstr "Confirmat"
#. module: account
#: report:account.invoice:0
msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Factura cancel·lada"
#. module: account
#: code:addons/account/invoice.py:73
@@ -4199,13 +4374,16 @@
msgstr "Heu de definir un diari analÃtic de tipus «%s»!"
#. module: account
-#: code:addons/account/account.py:1397
+#: code:addons/account/account.py:1411
#, python-format
msgid ""
"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."
msgstr ""
+"No s'ha pogut crear moviment amb moneda diferent de la moneda secundà ria del "
+"compte \"% s -% s\". Esborreu el camp de moneda secundà ria de la definició "
+"del compte si voleu acceptar totes les monedes.m"
#. module: account
#: field:account.invoice.refund,date:0
@@ -4224,6 +4402,8 @@
"All draft account entries in this journal and period will be validated. It "
"means you won't be able to modify their accounting fields anymore."
msgstr ""
+"Tots els assentaments en esborrany d'aquest diari i perÃode seran validats. "
+"Això significa que ja no podreu modificar els camps comptables."
#. module: account
#: report:account.account.balance.landscape:0
@@ -4231,9 +4411,18 @@
msgstr "Balanç compte -"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+msgstr "Factura "
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
-msgstr ""
+msgstr "Data d'inici"
#. module: account
#: field:account.chart.template,property_account_income:0
@@ -4245,6 +4434,8 @@
msgid ""
"Date on which the partner accounting entries were reconciled last time"
msgstr ""
+"Data en què els assentaments comptables de l'empresa van ser conciliats per "
+"última vegada."
#. module: account
#: field:account.fiscalyear.close,fy2_id:0
@@ -4264,7 +4455,7 @@
msgstr "Factures"
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid ""
"Please verify the price of the invoice !\n"
@@ -4279,12 +4470,12 @@
#: view:account.invoice.report:0
#: field:account.invoice.report,user_id:0
msgid "Salesman"
-msgstr ""
+msgstr "Venedor"
#. module: account
#: view:account.invoice.report:0
msgid "Invoiced"
-msgstr ""
+msgstr "Facturat"
#. module: account
#: view:account.use.model:0
@@ -4304,7 +4495,7 @@
#. module: account
#: view:account.addtmpl.wizard:0
msgid "Add"
-msgstr ""
+msgstr "Afegeix"
#. module: account
#: help:account.invoice,date_invoice:0
@@ -4314,7 +4505,7 @@
#. module: account
#: selection:account.journal,type:0
msgid "Bank and Cheques"
-msgstr ""
+msgstr "Banc i xecs"
#. module: account
#: view:account.period.close:0
@@ -4329,7 +4520,7 @@
#. module: account
#: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
msgid "Draft invoices are validated. "
-msgstr ""
+msgstr "Factures en esborrany són validades. "
#. module: account
#: view:account.bank.statement:0
@@ -4365,43 +4556,31 @@
#: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
#, python-format
msgid "Journal Items"
-msgstr ""
+msgstr "Apunts comptables"
#. module: account
#: selection:account.account.type,report_type:0
msgid "Balance Sheet (Assets Accounts)"
-msgstr ""
+msgstr "Balanç de situació (comptes d'actiu)"
#. module: account
#: report:account.tax.code.entries:0
msgid "Third Party (Country)"
+msgstr "Tercera part (paÃs)"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"With Supplier Refunds you can manage the credit notes you receive from your "
+"suppliers. A refund is a document that credits an invoice completely or "
+"partially. You can easily generate refunds and reconcile them directly from "
+"the invoice form."
msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:938
-#: code:addons/account/account.py:940
-#: code:addons/account/account.py:1181
-#: code:addons/account/account.py:1393
-#: code:addons/account/account.py:1397
-#: code:addons/account/account_cash_statement.py:249
-#: code:addons/account/account_move_line.py:780
-#: code:addons/account/account_move_line.py:803
-#: code:addons/account/account_move_line.py:805
-#: code:addons/account/account_move_line.py:808
-#: code:addons/account/account_move_line.py:810
-#: code:addons/account/account_move_line.py:1117
-#: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_change_currency.py:39
-#: code:addons/account/wizard/account_change_currency.py:60
-#: code:addons/account/wizard/account_change_currency.py:65
-#: code:addons/account/wizard/account_change_currency.py:71
-#: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#: code:addons/account/wizard/account_report_common.py:120
-#: code:addons/account/wizard/account_report_common.py:126
-#, python-format
-msgid "Error"
-msgstr "Error"
+"Amb factures rectificatives de proveïdor podeu gestionar les factures "
+"d'abonament que rebi dels seus proveïdors. Una factura rectificativa és un "
+"document que abona una factura total o parcialment. Podeu generar fà cilment "
+"factures rectificatives i conciliar-les directament des del formulari de "
+"factura."
#. module: account
#: field:account.analytic.Journal.report,date2:0
@@ -4418,7 +4597,7 @@
msgstr "Detalls del banc"
#. module: account
-#: code:addons/account/invoice.py:720
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Taxes missing !"
msgstr "Falten impostos!"
@@ -4429,11 +4608,16 @@
"To print an analytics (or costs) journal for a given period. The report give "
"code, move name, account number, general amount and analytic amount."
msgstr ""
+"Per imprimir un diari analÃtic (o costos) durant un perÃode determinat. En "
+"l'informe es llista el codi, el nom de moviment, número de compte, l'import "
+"general i l'import analÃtic."
#. module: account
#: help:account.journal,refund_journal:0
msgid "Fill this if the journal is to be used for refunds of invoices."
msgstr ""
+"Marqueu aquesta opció si el diari s'utilitzarà per a factures rectificatives "
+"(abonaments)."
#. module: account
#: view:account.fiscalyear.close:0
@@ -4443,7 +4627,7 @@
#. module: account
#: field:account.journal,group_invoice_lines:0
msgid "Group Invoice Lines"
-msgstr ""
+msgstr "Agrupa lÃnies de factura"
#. module: account
#: view:account.invoice.cancel:0
@@ -4460,20 +4644,20 @@
#: model:ir.actions.act_window,name:account.action_account_vat_declaration
#: model:ir.model,name:account.model_account_vat_declaration
msgid "Account Vat Declaration"
-msgstr ""
+msgstr "Compte declaració d'IVA"
#. module: account
#: view:account.period:0
msgid "To Close"
-msgstr ""
+msgstr "Per tancar"
#. module: account
#: field:account.journal,allow_date:0
msgid "Check Date not in the Period"
-msgstr ""
+msgstr "Comprova la data, no està en el perÃode"
#. module: account
-#: code:addons/account/account.py:1210
+#: code:addons/account/account.py:1224
#, python-format
msgid ""
"You can not modify a posted entry of this journal !\n"
@@ -4495,10 +4679,10 @@
msgstr "Comptes impostos filles"
#. module: account
-#: code:addons/account/account.py:940
+#: code:addons/account/account.py:954
#, python-format
msgid "Start period should be smaller then End period"
-msgstr ""
+msgstr "El perÃode inicial ha de ser més petit que el perÃode final"
#. module: account
#: selection:account.automatic.reconcile,power:0
@@ -4525,6 +4709,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,target_move:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.journal,target_move:0
#: report:account.partner.balance:0
@@ -4537,6 +4722,11 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,target_move:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
msgid "Target Moves"
msgstr "Moviments destÃ"
@@ -4584,6 +4774,7 @@
msgid ""
"This report gives you an overview of the situation of your general journals"
msgstr ""
+"Aquest informe proporciona una vista general de la situació dels seus diaris"
#. module: account
#: field:account.entries.report,year:0
@@ -4594,20 +4785,20 @@
#: field:report.account.sales,name:0
#: field:report.account_type.sales,name:0
msgid "Year"
-msgstr ""
+msgstr "Any"
#. module: account
#: field:account.bank.statement,starting_details_ids:0
msgid "Opening Cashbox"
-msgstr ""
+msgstr "Obertura de caixa"
#. module: account
#: view:account.payment.term.line:0
msgid "Line 1:"
-msgstr ""
+msgstr "LÃnia 1:"
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid "Integrity Error !"
msgstr "Error d'integritat!"
@@ -4626,7 +4817,7 @@
#: code:addons/account/account_bank_statement.py:293
#, python-format
msgid "Journal Item \"%s\" is not valid"
-msgstr ""
+msgstr "L'anotació \"%s\" no és và lida"
#. module: account
#: view:account.payment.term:0
@@ -4636,7 +4827,7 @@
#. module: account
#: field:account.partner.reconcile.process,next_partner_id:0
msgid "Next Partner to Reconcile"
-msgstr ""
+msgstr "Següent empresa per concilia"
#. module: account
#: field:account.invoice.tax,account_id:0
@@ -4653,13 +4844,15 @@
#: view:account.bs.report:0
#: model:ir.actions.act_window,name:account.action_account_bs_report
#: model:ir.ui.menu,name:account.menu_account_bs_report
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
msgid "Balance Sheet"
-msgstr ""
+msgstr "Balanç de situació"
#. module: account
#: model:ir.ui.menu,name:account.final_accounting_reports
msgid "Accounting Reports"
-msgstr ""
+msgstr "Informes comptables"
#. module: account
#: field:account.move,line_id:0
@@ -4672,7 +4865,7 @@
#. module: account
#: view:account.entries.report:0
msgid "This Period"
-msgstr ""
+msgstr "Aquest perÃode"
#. module: account
#: field:account.analytic.line,product_uom_id:0
@@ -4731,7 +4924,7 @@
#: model:process.transition,name:account.process_transition_suppliervalidentries0
#: model:process.transition,name:account.process_transition_validentries0
msgid "Validation"
-msgstr ""
+msgstr "Validació"
#. module: account
#: help:account.invoice,reconciled:0
@@ -4739,6 +4932,8 @@
"The Journal Entry of the invoice have been totally reconciled with one or "
"several Journal Entries of payment."
msgstr ""
+"El assentament de la factura ha estat totalment conciliat amb un o diversos "
+"assentaments de pagament."
#. module: account
#: field:account.tax,child_depend:0
@@ -4747,13 +4942,7 @@
msgstr "Impost en fills"
#. module: account
-#: constraint:account.move.line:0
-msgid ""
-"You can not create move line on receivable/payable account without partner"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "No period found !"
@@ -4767,7 +4956,7 @@
#. module: account
#: field:account.tax.code,sign:0
msgid "Coefficent for parent"
-msgstr ""
+msgstr "Coeficient per a pare"
#. module: account
#: report:account.partner.balance:0
@@ -4777,7 +4966,7 @@
#. module: account
#: view:account.bank.statement:0
msgid "Transaction"
-msgstr ""
+msgstr "Transacció"
#. module: account
#: help:account.tax,base_code_id:0
@@ -4794,7 +4983,7 @@
#. module: account
#: view:account.move.line:0
msgid "Debit/Credit"
-msgstr ""
+msgstr "Deure/Haver"
#. module: account
#: view:report.hr.timesheet.invoice.journal:0
@@ -4827,7 +5016,7 @@
"Número de dies=22, Dia de mes=-1, llavors la data de venciment és 28/02."
#. module: account
-#: code:addons/account/account.py:2896
+#: code:addons/account/account.py:2940
#: code:addons/account/installer.py:283
#: code:addons/account/installer.py:295
#, python-format
@@ -4855,7 +5044,7 @@
msgstr "Inici del perÃode"
#. module: account
-#: code:addons/account/account_move_line.py:1193
+#: code:addons/account/account_move_line.py:1199
#, python-format
msgid ""
"You can not do this modification on a reconciled entry ! Please note that "
@@ -4867,12 +5056,12 @@
#. module: account
#: model:ir.model,name:account.model_account_common_account_report
msgid "Account Common Account Report"
-msgstr ""
+msgstr "Informe comptable comú"
#. module: account
#: field:account.bank.statement.line,name:0
msgid "Communication"
-msgstr ""
+msgstr "Comunicació"
#. module: account
#: model:ir.ui.menu,name:account.menu_analytic_accounting
@@ -4913,12 +5102,12 @@
#. module: account
#: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:405
-#: code:addons/account/invoice.py:505
-#: code:addons/account/invoice.py:520
-#: code:addons/account/invoice.py:528
-#: code:addons/account/invoice.py:545
-#: code:addons/account/invoice.py:1347
+#: code:addons/account/invoice.py:408
+#: code:addons/account/invoice.py:508
+#: code:addons/account/invoice.py:523
+#: code:addons/account/invoice.py:531
+#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:1361
#: code:addons/account/wizard/account_move_journal.py:63
#, python-format
msgid "Configuration Error !"
@@ -4931,6 +5120,9 @@
"something to reconcile or not. This figure already count the current partner "
"as reconciled."
msgstr ""
+"Aquestes són les empreses restants a les quals haurÃeu de comprovar si hi ha "
+"alguna cosa per conciliar o no. Aquesta xifra ja comptabilitza l'empresa "
+"actual com a conciliada."
#. module: account
#: view:account.subscription.line:0
@@ -4940,7 +5132,7 @@
#. module: account
#: field:account.entries.report,quantity:0
msgid "Products Quantity"
-msgstr ""
+msgstr "Quantitat de productes"
#. module: account
#: view:account.entries.report:0
@@ -4949,25 +5141,25 @@
#: selection:account.move,state:0
#: view:account.move.line:0
msgid "Unposted"
-msgstr ""
+msgstr "Sense comptabilitzar"
#. module: account
#: view:account.change.currency:0
#: model:ir.actions.act_window,name:account.action_account_change_currency
#: model:ir.model,name:account.model_account_change_currency
msgid "Change Currency"
-msgstr ""
+msgstr "Canvia la moneda"
#. module: account
#: model:process.node,note:account.process_node_accountingentries0
#: model:process.node,note:account.process_node_supplieraccountingentries0
msgid "Accounting entries."
-msgstr ""
+msgstr "Assentaments comptables."
#. module: account
#: view:account.invoice:0
msgid "Payment Date"
-msgstr ""
+msgstr "Data de pagament"
#. module: account
#: selection:account.automatic.reconcile,power:0
@@ -4988,19 +5180,23 @@
"According value related accounts will be display on respective reports "
"(Balance Sheet Profit & Loss Account)"
msgstr ""
+"Segons el valor relacionat els comptes es mostraran en els seus respectius "
+"informes (Balanç de situació comptable de pèrdues i guanys)."
#. module: account
#: field:account.report.general.ledger,sortby:0
msgid "Sort By"
-msgstr ""
+msgstr "Ordena per"
#. module: account
-#: code:addons/account/account.py:1326
+#: code:addons/account/account.py:1340
#, python-format
msgid ""
"There is no default default credit account defined \n"
"on journal \"%s\""
msgstr ""
+"No s'ha definit un compte d'haver per defecte\n"
+"en el diari \"%s\""
#. module: account
#: field:account.entries.report,amount_currency:0
@@ -5022,7 +5218,7 @@
#. module: account
#: model:ir.actions.act_window,name:account.action_view_move_line
msgid "Lines to reconcile"
-msgstr ""
+msgstr "LÃnies a conciliar"
#. module: account
#: report:account.analytic.account.balance:0
@@ -5042,12 +5238,12 @@
#. module: account
#: view:account.move.line:0
msgid "Number (Move)"
-msgstr ""
+msgstr "Número (moviment)"
#. module: account
#: view:account.invoice.refund:0
msgid "Refund Invoice Options"
-msgstr ""
+msgstr "Opcions de factura rectificativa (abonament)"
#. module: account
#: help:account.automatic.reconcile,power:0
@@ -5055,6 +5251,8 @@
"Number of partial amounts that can be combined to find a balance point can "
"be chosen as the power of the automatic reconciliation"
msgstr ""
+"La potència de la conciliació automà tica a seleccionar és el número dels "
+"imports parcials que es poden combinar per trobar un saldo a zero."
#. module: account
#: help:account.payment.term.line,sequence:0
@@ -5086,6 +5284,10 @@
"impossible any new entry record. Close a fiscal year when you need to "
"finalize your end of year results definitive "
msgstr ""
+"Si no heu d'introduir més assentaments en un exercici fiscal, podeu tancar "
+"des d'aquÃ. Es tancaran tots els perÃodes oberts en aquest exercici que farà "
+"impossible introduir cap assentament nou. Tanqueu l'exercici fiscal quan "
+"necessiteu els resultats finals del exercici definitivament. "
#. module: account
#: field:account.central.journal,amount_currency:0
@@ -5100,7 +5302,7 @@
#. module: account
#: view:account.bank.statement:0
msgid "Open CashBox"
-msgstr ""
+msgstr "Obre caixa"
#. module: account
#: view:account.move.line.reconcile:0
@@ -5116,17 +5318,17 @@
#. module: account
#: view:account.subscription:0
msgid "Valid Up to"
-msgstr ""
+msgstr "VÃ lid fins"
#. module: account
#: view:board.board:0
msgid "Aged Receivables"
-msgstr ""
+msgstr "A cobrar vençuts"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
msgid "Account Automatic Reconcile"
-msgstr ""
+msgstr "Compte de conciliació automà tica"
#. module: account
#: view:account.move:0
@@ -5137,19 +5339,19 @@
#. module: account
#: model:ir.model,name:account.model_account_move_journal
msgid "Move journal"
-msgstr ""
+msgstr "Diari de moviments"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
#: model:ir.ui.menu,name:account.menu_wizard_fy_close
msgid "Generate Opening Entries"
-msgstr ""
+msgstr "Genera assentaments d'obertura"
#. module: account
-#: code:addons/account/account_move_line.py:738
+#: code:addons/account/account_move_line.py:729
#, python-format
msgid "Already Reconciled!"
-msgstr ""
+msgstr "Ja està conciliat!"
#. module: account
#: help:account.tax,type:0
@@ -5162,6 +5364,8 @@
"This module will support the Anglo-Saxons accounting methodology by changing "
"the accounting logic with stock transactions."
msgstr ""
+"Aquest mòdul suporta la metodologia comptable anglosaxona, canviant la "
+"lògica comptable en les transaccions d'estoc."
#. module: account
#: field:report.invoice.created,create_date:0
@@ -5173,7 +5377,7 @@
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
#: model:ir.ui.menu,name:account.account_def_analytic_journal
msgid "Analytic Journals"
-msgstr ""
+msgstr "Diaris analÃtics"
#. module: account
#: field:account.account,child_id:0
@@ -5182,7 +5386,7 @@
#. module: account
#: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:821
#, python-format
msgid "Write-Off"
msgstr "Desajust"
@@ -5213,7 +5417,7 @@
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "March"
-msgstr ""
+msgstr "Març"
#. module: account
#: view:account.account.template:0
@@ -5231,11 +5435,13 @@
"Streamlines invoice payment and creates hooks to plug automated payment "
"systems in."
msgstr ""
+"Agilita el pagament de factures i crea interfÃcies per connectar sistemes de "
+"pagament automatitzats."
#. module: account
#: field:account.payment.term.line,value:0
msgid "Valuation"
-msgstr ""
+msgstr "Valoració"
#. module: account
#: selection:account.aged.trial.balance,result_selection:0
@@ -5250,13 +5456,13 @@
#. module: account
#: field:account.fiscal.position.account.template,position_id:0
msgid "Fiscal Mapping"
-msgstr ""
+msgstr "Assignació fiscal"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_state_open
#: model:ir.model,name:account.model_account_state_open
msgid "Account State Open"
-msgstr ""
+msgstr "Estat del compte obert"
#. module: account
#: report:account.analytic.account.quantity_cost_ledger:0
@@ -5280,6 +5486,9 @@
"document shows your debit and credit taking in consideration some criteria "
"you can choose by using the search tool."
msgstr ""
+"Des d'aquesta vista obteniu un anà lisi dels diferents comptes financers. El "
+"document mostra el deure i haver tenint en consideració algun criteri que "
+"podeu seleccionar utilitzant l'eina de cerca."
#. module: account
#: model:ir.actions.act_window,help:account.action_tax_code_list
@@ -5288,6 +5497,9 @@
"OpenERP allows you to define the tax structure and manage it from this menu. "
"You can define both numeric and alphanumeric tax codes."
msgstr ""
+"La definició dels codis d'impostos depèn de la declaració d'impostos del "
+"paÃs. OpenERP li permet definir i gestionar l'estructura d'impostos des "
+"d'aquest menú. Podeu definir codis numèrics i alfanumèrics."
#. module: account
#: help:account.partner.reconcile.process,progress:0
@@ -5295,6 +5507,8 @@
"Shows you the progress made today on the reconciliation process. Given by \n"
"Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
msgstr ""
+"Mostra el progrés realitzat avui en el procés de conciliació. Indica:\n"
+"Empreses conciliades avui / (Empreses restants + Empreses conciliades avui)"
#. module: account
#: help:account.payment.term.line,value:0
@@ -5303,6 +5517,9 @@
"that you should have your last line with the type 'Balance' to ensure that "
"the whole amount will be threated."
msgstr ""
+"Seleccioneu el tipus de valoració relacionat amb aquesta lÃnia de termini de "
+"pagament. Tingueu en compte que heu de tenir l'última lÃnia amb el tipus "
+"'Saldo' per garantir que l'import total sigui processat."
#. module: account
#: field:account.invoice,period_id:0
@@ -5316,13 +5533,13 @@
#: view:account.invoice.report:0
#: field:account.invoice.report,nbr:0
msgid "# of Lines"
-msgstr ""
+msgstr "# de lÃnies"
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:60
+#: code:addons/account/wizard/account_change_currency.py:59
#, python-format
msgid "New currency is not confirured properly !"
-msgstr ""
+msgstr "La nova moneda no està configurada correctament!"
#. module: account
#: field:account.aged.trial.balance,filter:0
@@ -5341,17 +5558,17 @@
#: field:account.report.general.ledger,filter:0
#: field:account.vat.declaration,filter:0
msgid "Filter by"
-msgstr ""
+msgstr "Filtra per"
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "You can not use an inactive account!"
msgstr "No podeu utilitzar un compte inactiu!"
#. module: account
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:794
#, python-format
msgid "Entries are not of the same account or already reconciled ! "
msgstr "Assentaments no són del mateix compte o ja estan conciliats! "
@@ -5366,7 +5583,7 @@
#: model:ir.actions.act_window,name:account.action_account_general_journal
#: model:ir.model,name:account.model_account_general_journal
msgid "Account General Journal"
-msgstr ""
+msgstr "Compte del diari general"
#. module: account
#: code:addons/account/report/common_report_header.py:100
@@ -5386,7 +5603,7 @@
#. module: account
#: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Invalid action !"
msgstr "Acció no và lida!"
@@ -5395,12 +5612,12 @@
#: code:addons/account/wizard/account_move_journal.py:102
#, python-format
msgid "Period: %s"
-msgstr ""
+msgstr "PerÃode: %s"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Template Tax Fiscal Position"
-msgstr ""
+msgstr "Plantilla posició fiscal impost"
#. module: account
#: help:account.tax,name:0
@@ -5423,7 +5640,7 @@
#. module: account
#: view:analytic.entries.report:0
msgid " 365 Days "
-msgstr ""
+msgstr " 365 Dies "
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree3
@@ -5434,7 +5651,7 @@
#. module: account
#: view:account.payment.term.line:0
msgid "Amount Computation"
-msgstr ""
+msgstr "CÃ lcul del import"
#. module: account
#: field:account.journal.period,name:0
@@ -5444,18 +5661,18 @@
#. module: account
#: field:account.invoice.tax,factor_base:0
msgid "Multipication factor for Base code"
-msgstr ""
+msgstr "Factor de multiplicació per al codi base"
#. module: account
#: code:addons/account/wizard/account_report_common.py:126
#, python-format
msgid "not implemented"
-msgstr ""
+msgstr "no implementat"
#. module: account
#: help:account.journal,company_id:0
msgid "Company related to this journal"
-msgstr ""
+msgstr "Companyia relacionada amb aquest diari"
#. module: account
#: code:addons/account/wizard/account_invoice_state.py:44
@@ -5464,6 +5681,8 @@
"Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
"Forma' state!"
msgstr ""
+"La/es factura/es seleccionada/es no es pot/den confirmar ja que no està /n en "
+"estat 'Esborrany' o 'Pro-forma'!"
#. module: account
#: report:account.invoice:0
@@ -5475,7 +5694,7 @@
#: model:ir.actions.act_window,name:account.action_analytic_entries_report
#: model:ir.ui.menu,name:account.menu_action_analytic_entries_report
msgid "Analytic Entries Analysis"
-msgstr ""
+msgstr "Anà lisi assentaments analÃtics"
#. module: account
#: selection:account.aged.trial.balance,direction_selection:0
@@ -5501,11 +5720,16 @@
"line of the expense account. OpenERP will propose to you automatically the "
"Tax related to this account and the counterpart \"Account Payable\"."
msgstr ""
+"Aquesta vista pot ser utilitzada pels comptables per registrar assentaments "
+"rà pidament en OpenERP. Si desitgeu registrar una factura de proveïdor, "
+"comenceu registrant l'anotació del compte de despeses. OpenERP li proposarà "
+"automà ticament l'impost associat en aquest compte i el \"compte a pagar\" de "
+"contrapartida."
#. module: account
#: field:account.entries.report,date_created:0
msgid "Date Created"
-msgstr ""
+msgstr "Data de creació"
#. module: account
#: field:account.payment.term.line,value_amount:0
@@ -5518,6 +5742,8 @@
"The code will be used to generate the numbers of the journal entries of this "
"journal."
msgstr ""
+"El codi s'utilitzarà per generar els números dels assentaments d'aquest "
+"diari."
#. module: account
#: view:account.invoice:0
@@ -5530,12 +5756,19 @@
"As soon as the reconciliation is done, the invoice's state turns to “done†"
"(i.e. paid) in the system."
msgstr ""
+"Tan aviat com la reconciliació es fa, l'estat de les factures es converteix "
+"en \"realitzada\" (és a dir, pagada) en el sistema."
#. module: account
#: code:addons/account/invoice.py:997
#, python-format
+<<<<<<< TREE
msgid "Invoice '%s' is validated."
msgstr ""
+=======
+msgid "is validated."
+msgstr "està validada."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.chart.template:0
@@ -5546,12 +5779,12 @@
#. module: account
#: field:res.partner,last_reconciliation_date:0
msgid "Latest Reconciliation Date"
-msgstr ""
+msgstr "Data de l'última conciliació"
#. module: account
#: model:ir.model,name:account.model_account_analytic_line
msgid "Analytic Line"
-msgstr ""
+msgstr "LÃnia analÃtica"
#. module: account
#: field:product.template,taxes_id:0
@@ -5561,18 +5794,18 @@
#. module: account
#: view:account.addtmpl.wizard:0
msgid "Create an Account based on this template"
-msgstr ""
+msgstr "Crea un compte basat en aquesta plantilla"
#. module: account
#: view:account.account.type:0
#: view:account.tax.code:0
msgid "Reporting Configuration"
-msgstr ""
+msgstr "Configuració d'informes"
#. module: account
#: constraint:account.move.line:0
msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "La companyia ha de ser la mateixa pel compte i perÃode relacionat."
#. module: account
#: field:account.tax,type:0
@@ -5589,25 +5822,27 @@
#. module: account
#: report:account.vat.declaration:0
msgid "Tax Statement"
-msgstr ""
+msgstr "Declaració d'impostos"
#. module: account
#: model:ir.model,name:account.model_res_company
msgid "Companies"
-msgstr ""
+msgstr "Companyies"
#. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:546
#, python-format
msgid ""
"You cannot modify Company of account as its related record exist in Entry "
"Lines"
msgstr ""
+"No podeu modificar la companyia del compte perquè ja hi ha anotacions en "
+"aquest compte"
#. module: account
#: help:account.fiscalyear.close.state,fy_id:0
msgid "Select a fiscal year to close"
-msgstr ""
+msgstr "Seleccioneu un exercici fiscal per tancar"
#. module: account
#: help:account.chart.template,tax_template_ids:0
@@ -5717,27 +5952,27 @@
#. module: account
#: view:account.installer:0
msgid "Configure Your Accounting Chart"
-msgstr ""
+msgstr "Configureu el pla comptable"
#. module: account
#: view:account.payment.term.line:0
msgid " number of days: 30"
-msgstr ""
+msgstr " número de dies: 30"
#. module: account
#: help:account.analytic.line,currency_id:0
msgid "The related account currency if not equal to the company one."
-msgstr ""
+msgstr "La moneda comptable relacionada si no és igual a la de la companyia."
#. module: account
#: view:account.analytic.account:0
msgid "Current"
-msgstr ""
+msgstr "Actiu"
#. module: account
#: view:account.bank.statement:0
msgid "CashBox"
-msgstr ""
+msgstr "Caixa"
#. module: account
#: selection:account.tax,type:0
@@ -5747,7 +5982,7 @@
#. module: account
#: selection:account.report.general.ledger,sortby:0
msgid "Journal & Partner"
-msgstr ""
+msgstr "Diari i Empresa"
#. module: account
#: field:account.automatic.reconcile,power:0
@@ -5757,7 +5992,7 @@
#. module: account
#: field:account.invoice.refund,filter_refund:0
msgid "Refund Type"
-msgstr ""
+msgstr "Tipus d'abonament"
#. module: account
#: report:account.invoice:0
@@ -5772,7 +6007,7 @@
#. module: account
#: selection:account.account.type,report_type:0
msgid "Balance Sheet (Liability Accounts)"
-msgstr ""
+msgstr "Balanç de situació (comptes amb risc)"
#. module: account
#: field:account.invoice,internal_number:0
@@ -5786,11 +6021,13 @@
"Indicates if the amount of tax must be included in the base amount for the "
"computation of the next taxes"
msgstr ""
+"Indica si la suma de l'impost ha de ser inclòs en la quantitat base per al "
+"cà lcul dels impostos següents"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_partner_reconcile
msgid "Reconciliation: Go to Next Partner"
-msgstr ""
+msgstr "Reconciliació: Vés a següent empresa"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
@@ -5825,13 +6062,13 @@
#: selection:account.account.template,type:0
#: view:account.journal:0
msgid "Liquidity"
-msgstr ""
+msgstr "Liquiditat"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
#: model:ir.ui.menu,name:account.account_analytic_journal_entries
msgid "Analytic Journal Items"
-msgstr ""
+msgstr "Anotacions analÃtiques"
#. module: account
#: view:account.fiscalyear.close:0
@@ -5840,11 +6077,15 @@
"year. Note that you can run this wizard many times for the same fiscal year: "
"it will simply replace the old opening entries with the new ones."
msgstr ""
+"Aquest assistent generarà els assentaments de finalització d'exercici per a "
+"l'exercici fiscal seleccionat. Tingueu en compte que podeu executar aquest "
+"assistent diverses vegades per al mateix exercici fiscal: simplement es "
+"substitueixen els assentaments d'obertura vells pels nous."
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
msgid "Bank and Cash"
-msgstr ""
+msgstr "Banc i caixa"
#. module: account
#: model:ir.actions.act_window,help:account.action_analytic_entries_report
@@ -5854,30 +6095,36 @@
"the tool search to analyse information about analytic entries generated in "
"the system."
msgstr ""
+"Des d'aquesta vista, disposeu d'un anà lisi dels diferents assentaments "
+"analÃtics del compte analÃtic, que heu definit per ajustar-se a les seves "
+"necessitats del negoci. Utilitzeu l'eina de cerca per analitzar la "
+"informació sobre els assentaments analÃtics generats en el sistema."
#. module: account
#: sql_constraint:account.journal:0
msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "El nom del diari ha de ser únic per companyia!"
#. module: account
#: field:account.account.template,nocreate:0
msgid "Optional create"
-msgstr ""
+msgstr "Crea opcional"
#. module: account
-#: code:addons/account/invoice.py:406
-#: code:addons/account/invoice.py:506
-#: code:addons/account/invoice.py:1348
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
#, python-format
msgid "Can not find account chart for this company, Please Create account."
msgstr ""
+"No s'ha trobat un pla comptable per a aquesta companyia. Creeu un pla "
+"comptable."
#. module: account
#: code:addons/account/wizard/account_report_aged_partner_balance.py:57
#, python-format
msgid "Enter a Start date !"
-msgstr ""
+msgstr "Introduïu una data d'inici!"
#. module: account
#: report:account.invoice:0
@@ -5890,7 +6137,7 @@
#. module: account
#: model:ir.ui.menu,name:account.menu_dashboard_acc
msgid "Dashboard"
-msgstr ""
+msgstr "Taulell"
#. module: account
#: field:account.bank.statement,move_line_ids:0
@@ -5905,7 +6152,7 @@
#. module: account
#: view:wizard.multi.charts.accounts:0
msgid "Generate Your Accounting Chart from a Chart Template"
-msgstr ""
+msgstr "Genera el seu pla comptable des d'una plantilla de pla comptable"
#. module: account
#: view:account.account:0
@@ -5927,7 +6174,7 @@
#: view:account.tax.code.template:0
#: view:analytic.entries.report:0
msgid "Group By..."
-msgstr ""
+msgstr "Agrupa per..."
#. module: account
#: field:account.journal.column,readonly:0
@@ -5937,7 +6184,7 @@
#. module: account
#: model:ir.model,name:account.model_account_pl_report
msgid "Account Profit And Loss Report"
-msgstr ""
+msgstr "Compte de resultats (pèrdues i guanys)"
#. module: account
#: field:account.invoice.line,uos_id:0
@@ -5972,7 +6219,7 @@
#. module: account
#: view:account.entries.report:0
msgid "Reconciled"
-msgstr ""
+msgstr "Reconciliat"
#. module: account
#: report:account.invoice:0
@@ -5993,7 +6240,7 @@
#. module: account
#: view:account.bank.statement:0
msgid "Cash Transactions"
-msgstr ""
+msgstr "Transaccions en efectiur"
#. module: account
#: code:addons/account/wizard/account_state_open.py:37
@@ -6016,11 +6263,11 @@
#. module: account
#: model:ir.model,name:account.model_analytic_entries_report
msgid "Analytic Entries Statistics"
-msgstr ""
+msgstr "EstadÃstiques d'assentaments analÃtics"
#. module: account
-#: code:addons/account/account_analytic_line.py:143
-#: code:addons/account/account_move_line.py:905
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
#, python-format
msgid "Entries: "
msgstr "Assentaments: "
@@ -6028,10 +6275,10 @@
#. module: account
#: view:account.use.model:0
msgid "Create manual recurring entries in a chosen journal."
-msgstr ""
+msgstr "Crea manualment assentaments recurrents en un diari seleccionat."
#. module: account
-#: code:addons/account/account.py:1393
+#: code:addons/account/account.py:1407
#, python-format
msgid "Couldn't create move between different companies"
msgstr "No s'ha pogut crear moviment entre diferents companyies"
@@ -6047,6 +6294,13 @@
"account. From this view, you can create and manage the account types you "
"need for your company."
msgstr ""
+"Un tipus de compte és utilitzat per determinar com s'utilitza un compte en "
+"cada diari. El mètode per defecte d'un tipus de compte determina el procés "
+"per al tancament anual. Informes com el balanç i el de pèrdues i guanys "
+"utilitzen la categoria (perdudes/guanys o balanç). Per exemple, el tipus de "
+"compte pot ser associat a un compte d'actius, despeses o pagaments. Des "
+"d'aquesta vista, podeu crear i gestionar els tipus de compte necessaris per "
+"a la seva companyia."
#. module: account
#: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
@@ -6055,11 +6309,14 @@
"corresponds with the entries (or records) of that account in your accounting "
"system."
msgstr ""
+"La conciliació bancà ria consisteix en verificar que el seu extracte bancari "
+"correspon amb les entrades (o registres) d'aquest compte en el sistema "
+"comptable."
#. module: account
#: model:process.node,note:account.process_node_draftstatement0
msgid "State is draft"
-msgstr ""
+msgstr "L'estat és esborrany"
#. module: account
#: view:account.move.line:0
@@ -6069,7 +6326,7 @@
msgstr "Total deure"
#. module: account
-#: code:addons/account/account_move_line.py:781
+#: code:addons/account/account_move_line.py:772
#, python-format
msgid "Entry \"%s\" is not valid !"
msgstr "L'assentament \"%s\" no és và lid!"
@@ -6083,7 +6340,7 @@
#: report:account.vat.declaration:0
#: field:account.vat.declaration,based_on:0
msgid "Based On"
-msgstr ""
+msgstr "Basat en"
#. module: account
#: help:res.partner,property_account_receivable:0
@@ -6111,6 +6368,8 @@
msgid ""
"Please define the Reserve and Profit/Loss account for current user company !"
msgstr ""
+"Defineix el compte de reserves i pèrdues/guanys per a la companyia de "
+"l'usuari actual!"
#. module: account
#: help:account.journal,update_posted:0
@@ -6118,6 +6377,8 @@
"Check this box if you want to allow the cancellation the entries related to "
"this journal or of the invoice related to this journal"
msgstr ""
+"Marqueu aquesta casella si voleu permetre la cancel·lació dels assentaments "
+"relacionats amb aquest diari o de la factura relacionada amb aquest diari"
#. module: account
#: view:account.fiscalyear.close:0
@@ -6132,33 +6393,34 @@
#. module: account
#: view:account.payment.term.line:0
msgid " valuation: percent"
-msgstr ""
+msgstr " valoració: percentatge"
#. module: account
-#: code:addons/account/account.py:499
-#: code:addons/account/account.py:501
-#: code:addons/account/account.py:822
-#: code:addons/account/account.py:901
-#: code:addons/account/account.py:976
-#: code:addons/account/account.py:1204
-#: code:addons/account/account.py:1210
-#: code:addons/account/account.py:2095
-#: code:addons/account/account.py:2333
-#: code:addons/account/account_analytic_line.py:90
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account.py:509
+#: code:addons/account/account.py:511
+#: code:addons/account/account.py:836
+#: code:addons/account/account.py:915
+#: code:addons/account/account.py:990
+#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2357
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
#: code:addons/account/account_bank_statement.py:292
#: code:addons/account/account_bank_statement.py:305
#: code:addons/account/account_bank_statement.py:345
-#: code:addons/account/account_cash_statement.py:328
-#: code:addons/account/account_cash_statement.py:348
-#: code:addons/account/account_move_line.py:1176
-#: code:addons/account/account_move_line.py:1191
-#: code:addons/account/account_move_line.py:1193
-#: code:addons/account/invoice.py:785
-#: code:addons/account/invoice.py:815
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1197
+#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:1014
#: code:addons/account/wizard/account_invoice_refund.py:100
#: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
#: code:addons/account/wizard/account_use_model.py:44
#, python-format
msgid "Error !"
@@ -6195,12 +6457,18 @@
"reconcile in a series of accounts. It finds entries for each partner where "
"the amounts correspond."
msgstr ""
+"Perquè una factura es consideri pagada, les anotacions comptables de la "
+"factura han d'estar conciliades amb les seves contrapartides, normalment "
+"pagaments. Amb la funcionalitat de reconciliació automà tica, OpenERP "
+"realitza la seva pròpia recerca d'anotacions a conciliar en una sèrie de "
+"comptes. Troba les anotacions, per a cada empresa, quan les quantitats es "
+"corresponguin."
#. module: account
#: view:account.move:0
#: field:account.move,to_check:0
msgid "To Review"
-msgstr ""
+msgstr "Per revisa"
#. module: account
#: view:account.bank.statement:0
@@ -6209,11 +6477,16 @@
#: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
#: model:ir.ui.menu,name:account.menu_finance_entries
msgid "Journal Entries"
-msgstr ""
+msgstr "Assentaments comptables"
#. module: account
#: help:account.partner.ledger,page_split:0
msgid "Display Ledger Report with One partner per page"
+msgstr "Mostra el llibre major amb una empresa per pà gina."
+
+#. module: account
+#: report:account.general.ledger_landscape:0
+msgid "JRNL"
msgstr ""
#. module: account
@@ -6223,6 +6496,8 @@
"This report is an analysis done by a partner. It is a PDF report containing "
"one line per partner representing the cumulative credit balance"
msgstr ""
+"Aquest informe és un anà lisi realitzat per una empresa. És un informe PDF "
+"amb una lÃnia per cada empresa que representa el saldo acumulat de l'haver."
#. module: account
#: code:addons/account/wizard/account_validate_account_move.py:61
@@ -6230,6 +6505,8 @@
msgid ""
"Selected Entry Lines does not have any account move enties in draft state"
msgstr ""
+"Les anotacions seleccionades no tenen cap moviment comptable en estat "
+"esborrany"
#. module: account
#: selection:account.aged.trial.balance,target_move:0
@@ -6261,17 +6538,19 @@
msgid ""
"Error: The default UOM and the purchase UOM must be in the same category."
msgstr ""
+"Error: La UdM per defecte i la UdM de compra han d'estar en la mateixa "
+"categoria."
#. module: account
#: view:account.journal.select:0
msgid "Journal Select"
-msgstr ""
+msgstr "Seleccioneu diari"
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:65
+#: code:addons/account/wizard/account_change_currency.py:64
#, python-format
msgid "Currnt currency is not confirured properly !"
-msgstr ""
+msgstr "La moneda actual no està configurada correctament!"
#. module: account
#: model:ir.model,name:account.model_account_move_reconcile
@@ -6281,13 +6560,15 @@
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Taxes Fiscal Position"
-msgstr ""
+msgstr "Posició fiscal impostos"
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.report.general.ledger:0
#: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
#: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
#: model:ir.ui.menu,name:account.menu_general_ledger
msgid "General Ledger"
msgstr "Llibre major"
@@ -6295,7 +6576,7 @@
#. module: account
#: model:process.transition,note:account.process_transition_paymentorderbank0
msgid "The payment order is sent to the bank."
-msgstr ""
+msgstr "L'ordre de pagament ha estat enviada al banc."
#. module: account
#: view:account.balance.report:0
@@ -6305,6 +6586,9 @@
"allowing you to quickly check the balance of each of your accounts in a "
"single report"
msgstr ""
+"Aquest informe li permet imprimir o generar un pdf del seu balanç de sumes i "
+"saldos, permetent comprovar amb rapidesa el saldo de cadascuna dels seus "
+"comptes en un únic informe."
#. module: account
#: help:account.move,to_check:0
@@ -6312,6 +6596,8 @@
"Check this box if you are unsure of that journal entry and if you want to "
"note it as 'to be reviewed' by an accounting expert."
msgstr ""
+"Marqueu aquesta opció si no esteu segur d'aquest assentament i desitgeu "
+"marcar-ho com 'Per ser revisat' per un expert comptable."
#. module: account
#: help:account.installer.modules,account_voucher:0
@@ -6319,6 +6605,9 @@
"Account Voucher module includes all the basic requirements of Voucher "
"Entries for Bank, Cash, Sales, Purchase, Expenses, Contra, etc... "
msgstr ""
+"El mòdul de rebuts (justificants) comptables inclou tots els requisits "
+"bà sics de justificants bancaris, de caixa, vendes, compres, despeses, "
+"contrapartides, etc... "
#. module: account
#: view:account.chart.template:0
@@ -6328,7 +6617,7 @@
#. module: account
#: model:ir.model,name:account.model_account_tax_chart
msgid "Account tax chart"
-msgstr ""
+msgstr "Compte del pla d'impostos"
#. module: account
#: report:account.analytic.account.cost_ledger:0
@@ -6337,11 +6626,13 @@
#: report:account.general.journal:0
#: report:account.invoice:0
#: report:account.partner.balance:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Total:"
msgstr "Total:"
#. module: account
-#: code:addons/account/account.py:2050
+#: code:addons/account/account.py:2064
#, python-format
msgid ""
"You can specify year, month and date in the name of the model using the "
@@ -6353,6 +6644,13 @@
"\n"
"e.g. My model on %(date)s"
msgstr ""
+"Podeu indicar l'any, mes i data en el nom del model utilitzant les següents "
+"etiquetes :\n"
+"\n"
+"%(year)s: Per especificar l'any\n"
+"%(month)s: Per especificar el mes\n"
+"%(date)s: Data actual\n"
+"Exemple: El meu model a %(date)s"
#. module: account
#: model:ir.actions.act_window,name:account.action_aged_income
@@ -6362,7 +6660,7 @@
#. module: account
#: help:report.invoice.created,origin:0
msgid "Reference of the document that generated this invoice report."
-msgstr ""
+msgstr "Referència del document que ha generat aquest informe de factura."
#. module: account
#: field:account.tax.code,child_ids:0
@@ -6371,7 +6669,7 @@
msgstr "Codis fills"
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#: code:addons/account/wizard/account_invoice_refund.py:137
#, python-format
msgid "Data Insufficient !"
@@ -6391,7 +6689,7 @@
#. module: account
#: view:account.analytic.line:0
msgid "Sales"
-msgstr ""
+msgstr "Vendes"
#. module: account
#: view:account.journal.column:0
@@ -6411,6 +6709,8 @@
#: model:process.transition,note:account.process_transition_invoicemanually0
msgid "A statement with manual entries becomes a draft statement."
msgstr ""
+"Un extracte amb entrades manuals es converteix en un extracte en estat "
+"esborrany."
#. module: account
#: view:account.aged.trial.balance:0
@@ -6422,12 +6722,18 @@
"you request an interval of 30 days OpenERP generates an analysis of "
"creditors for the past month, past two months, and so on. "
msgstr ""
+"Saldos vençuts d'empresa és un informe més detallat dels efectes a cobrar "
+"per intervals. En obrir l'informe, OpenERP pregunta pel nom de la companyia, "
+"el perÃode fiscal, i la grandà ria de l'interval a analitzar (en dies). "
+"Després OpenERP calcula una taula del saldo deutor per perÃode. Aixà que si "
+"sol·liciteu un interval de 30 dies, OpenERP genera un anà lisi de tots els "
+"deutors en el mes passat, últims dos mesos, etc. "
#. module: account
#: field:account.invoice,origin:0
#: field:report.invoice.created,origin:0
msgid "Source Document"
-msgstr ""
+msgstr "Document d'origen"
#. module: account
#: help:account.account.type,sign:0
@@ -6442,12 +6748,12 @@
#. module: account
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
msgid "Unreconciled Entries"
-msgstr ""
+msgstr "Assentaments no conciliats"
#. module: account
#: model:ir.ui.menu,name:account.menu_menu_Bank_process
msgid "Statements Reconciliation"
-msgstr ""
+msgstr "Conciliació d'extractes"
#. module: account
#: report:account.invoice:0
@@ -6457,7 +6763,7 @@
#. module: account
#: help:account.tax,amount:0
msgid "For taxes of type percentage, enter % ratio between 0-1."
-msgstr ""
+msgstr "Per als impostos de tipus percentual, introduïu valors entre 0-1%."
#. module: account
#: model:ir.actions.act_window,help:account.action_subscription_form
@@ -6467,13 +6773,18 @@
"an agreement with a customer or a supplier. With Define Recurring Entries, "
"you can create such entries to automate the postings in the system."
msgstr ""
+"Un assentament recurrent és un assentament comptable que ocurreix de forma "
+"recurrent des d'una determinada data. Per exemple la signatura d'un "
+"contracte o un acord amb un client o proveïdor. Amb la definició "
+"d'assentaments recurrents, podeu crear aquests assentaments per automatitzar "
+"les anotacions comptables en el sistema."
#. module: account
#: field:account.entries.report,product_uom_id:0
#: view:analytic.entries.report:0
#: field:analytic.entries.report,product_uom_id:0
msgid "Product UOM"
-msgstr ""
+msgstr "UdM del producte"
#. module: account
#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
@@ -6483,6 +6794,11 @@
"basis. You can enter the coins that are in your cash box, and then post "
"entries when money comes in or goes out of the cash box."
msgstr ""
+"Un registre de caixa li permet gestionar els assentaments de caixa en els "
+"diaris de caixa. Aquesta funcionalitat proveeix d'una forma fà cil de "
+"realitzar el seguiment dels pagaments de caixa a diari. Podeu introduir les "
+"monedes que té en la seva caixa i després registrar els assentaments quan "
+"entren o surten diners de la caixa."
#. module: account
#: selection:account.automatic.reconcile,power:0
@@ -6506,7 +6822,7 @@
#. module: account
#: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
msgid "Monthly Turnover"
-msgstr ""
+msgstr "Volum mensual"
#. module: account
#: view:account.move:0
@@ -6524,6 +6840,12 @@
"Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
"generate analytic entries on the related account."
msgstr ""
+"El pla de comptes normals té una estructura predefinida pels requisits "
+"legals del paÃs. L'estructura del pla de comptes analÃtics hauria de "
+"reflectir les necessitats del seu negoci de cara a l'anà lisi de costos i "
+"ingressos. En general, s'estructuren per contractes, projectes, productes o "
+"departaments. La majoria de les operacions d'OpenERP (factures, fulls de "
+"servei, despeses, etc) generen assentaments analÃtics en el compte associat."
#. module: account
#: field:account.analytic.journal,line_ids:0
@@ -6532,12 +6854,14 @@
msgstr "LÃnies"
#. module: account
-#: code:addons/account/invoice.py:521
+#: code:addons/account/invoice.py:524
#, python-format
msgid ""
"Can not find account chart for this company in invoice line account, Please "
"Create account."
msgstr ""
+"No s'ha trobat un pla comptable per a aquesta companyia en el compte de la "
+"lÃnia de factura. Creeu un compte."
#. module: account
#: view:account.tax.template:0
@@ -6547,7 +6871,7 @@
#. module: account
#: view:account.journal.select:0
msgid "Are you sure you want to open Journal Entries?"
-msgstr ""
+msgstr "Esteu segur que voleu obrir els assentaments de diari?"
#. module: account
#: view:account.state.open:0
@@ -6576,7 +6900,7 @@
#. module: account
#: help:account.journal,default_debit_account_id:0
msgid "It acts as a default account for debit amount"
-msgstr ""
+msgstr "Actua com un compte per defecte per la quantitat del deure"
#. module: account
#: model:ir.module.module,description:account.module_meta_information
@@ -6602,6 +6926,26 @@
"module named account_voucher.\n"
" "
msgstr ""
+"Mòdul financer i comptable que cobreix:\n"
+" Comptabilitat general\n"
+" Comptabilitat analÃtica / de costos\n"
+" Gestió de tercers\n"
+" Gestió d'impostos\n"
+" Pressupostos\n"
+" Facturació de clients i proveïdors\n"
+" Extractes bancaris\n"
+" Conciliació per tercer\n"
+" Crea un taulell per a comptables que inclou:\n"
+" * Llista de pressupostos sense facturar\n"
+" * Grà fic de comptes vençuts a cobrar\n"
+" * Grà fic d'efectes a cobrar\n"
+"\n"
+"Els processos, com el manteniment del llibre major es realitza a través dels "
+"diaris financers definits\n"
+"(els assentaments s'agrupen per diari) per a un exercici fiscal determinat; "
+"i per la preparació de rebuts\n"
+"existeix un mòdul anomenat account_voucher.\n"
+" "
#. module: account
#: model:ir.actions.act_window,help:account.action_account_journal_period_tree
@@ -6609,6 +6953,9 @@
"You can search for individual account entries through useful information. To "
"search for account entries, open a journal, then select a record line."
msgstr ""
+"Podeu cercar un assentament comptable en concret a través d'informació útil. "
+"Per cercar assentaments comptables, obriu un diari i seleccioneu una "
+"anotació."
#. module: account
#: report:account.invoice:0
@@ -6644,12 +6991,12 @@
#: code:addons/account/report/account_partner_balance.py:115
#, python-format
msgid "Unknown Partner"
-msgstr ""
+msgstr "Empresa desconeguda"
#. module: account
#: view:account.bank.statement:0
msgid "Opening Balance"
-msgstr ""
+msgstr "Saldo d'obertura"
#. module: account
#: help:account.journal,centralisation:0
@@ -6665,7 +7012,7 @@
#. module: account
#: field:account.bank.statement,closing_date:0
msgid "Closed On"
-msgstr ""
+msgstr "Tancat el"
#. module: account
#: model:ir.model,name:account.model_account_bank_statement_line
@@ -6675,12 +7022,12 @@
#. module: account
#: field:account.automatic.reconcile,date2:0
msgid "Ending Date"
-msgstr ""
+msgstr "Data de finalització"
#. module: account
#: field:wizard.multi.charts.accounts,purchase_tax:0
msgid "Default Purchase Tax"
-msgstr ""
+msgstr "Impost de compra per defecte"
#. module: account
#: view:account.bank.statement:0
@@ -6693,6 +7040,9 @@
"Bank Account Number, Company bank account if Invoice is customer or supplier "
"refund, otherwise Partner bank account number."
msgstr ""
+"Número de compte bancari, compte bancari de la companyia si la factura és "
+"de client o un abonament proveïdor, en cas contrari número de compte bancari "
+"de l'empresa."
#. module: account
#: help:account.tax,domain:0
@@ -6706,10 +7056,11 @@
"personalitzada."
#. module: account
-#: code:addons/account/account.py:938
+#: code:addons/account/account.py:952
#, python-format
msgid "You should have chosen periods that belongs to the same company"
msgstr ""
+"HaurÃeu d'haver seleccionat perÃodes que pertanyin a la mateixa companyia"
#. module: account
#: field:account.fiscalyear.close,report_name:0
@@ -6729,12 +7080,12 @@
#. module: account
#: sql_constraint:account.journal:0
msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "El codi del diari ha de ser únic per companyia!"
#. module: account
#: field:account.bank.statement,ending_details_ids:0
msgid "Closing Cashbox"
-msgstr ""
+msgstr "Tancament de caixa"
#. module: account
#: view:account.journal:0
@@ -6754,6 +7105,9 @@
"the system to go through the reconciliation process, based on the latest day "
"it have been reconciled."
msgstr ""
+"Aquest camp mostra la següent empresa que serà triada automà ticament pel "
+"sistema, per passar pel procés de conciliació, basant-se en l'últim dia que "
+"ha estat conciliada."
#. module: account
#: field:account.move.line.reconcile.writeoff,comment:0
@@ -6769,7 +7123,7 @@
#. module: account
#: model:ir.model,name:account.model_account_use_model
msgid "Use model"
-msgstr ""
+msgstr "Utilitza el model"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_moves_purchase
@@ -6779,6 +7133,11 @@
"line of the expense account, OpenERP will propose to you automatically the "
"Tax related to this account and the counter-part \"Account Payable\"."
msgstr ""
+"Aquesta vista és utilitzada pels comptables per registrar assentaments "
+"massivament en OpenERP. Si voleu registrar una factura de proveïdor, "
+"comenceu introduint l'anotació del compte de despeses. OpenERP li proposarà "
+"automà ticament l'impost associat a aquest compte, i el \"compte a pagar\" de "
+"contrapartida."
#. module: account
#: help:res.company,property_reserve_and_surplus_account:0
@@ -6787,6 +7146,9 @@
"will be added, Loss : Amount will be deducted.), Which is calculated from "
"Profit & Loss Report"
msgstr ""
+"Aquest compte s'utilitza per transferir les Pèrdues/Guanys (si és un Guany: "
+"l'import serà afegit, Pèrdua: l'mport serà reduït), que es calcula en "
+"l'informe de Pèrdues i Guanys."
#. module: account
#: view:account.invoice.line:0
@@ -6810,20 +7172,20 @@
msgstr "Signe en informes"
#. module: account
-#: code:addons/account/account_cash_statement.py:249
+#: code:addons/account/account_cash_statement.py:250
#, python-format
msgid "You can not have two open register for the same journal"
-msgstr ""
+msgstr "No podeu tenir dos registres oberts per al mateix diari"
#. module: account
#: view:account.payment.term.line:0
msgid " day of the month= -1"
-msgstr ""
+msgstr " dia del mes= -1"
#. module: account
#: constraint:res.partner:0
msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Error! No podeu crear membres associats recursius."
#. module: account
#: help:account.journal,type:0
@@ -6835,11 +7197,17 @@
"Situation' to be used at the time of new fiscal year creation or end of year "
"entries generation."
msgstr ""
+"Seleccioneu 'Vendes' per al diari de vendes que serà utilitzat quan es "
+"creuïn factures. Seleccioneu 'Compres' per al diari a utilitzar quan "
+"s'aprovin les comandes de compra. Seleccioneu 'Efectiu' (Caixa) perquè "
+"s'utilitzi a l'hora de fer pagaments. Seleccioneu 'General' per a operacions "
+"miscel·là nies. Seleccioneu 'Situació obertura/tancament' per utilitzar-ho "
+"quan es crea un nou exercici fiscal o la generació del assentament de "
+"tancament."
#. module: account
#: report:account.invoice:0
#: view:account.invoice:0
-#: report:account.move.voucher:0
msgid "PRO-FORMA"
msgstr "PRO-FORMA"
@@ -6849,13 +7217,14 @@
"Helps you generate reminder letters for unpaid invoices, including multiple "
"levels of reminding and customized per-partner policies."
msgstr ""
+"Li ajuda a generar cartes recordatòries per a les factures pendents de "
+"pagament, incloent múltiples nivells de recordatori i polÃtiques "
+"personalitzades per empresa."
#. module: account
-#: selection:account.entries.report,move_line_state:0
-#: view:account.move.line:0
-#: selection:account.move.line,state:0
-msgid "Unbalanced"
-msgstr ""
+#: view:account.payment.term.line:0
+msgid " value amount: n.a"
+msgstr " import valor: n.a"
#. module: account
#: selection:account.move.line,centralisation:0
@@ -6869,6 +7238,7 @@
#. module: account
#: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
#: view:account.journal:0
#: field:account.journal,user_id:0
#: view:analytic.entries.report:0
@@ -6892,15 +7262,17 @@
"This field is used for payable and receivable journal entries. You can put "
"the limit date for the payment of this line."
msgstr ""
+"Aquest camp s'utilitza per a assentaments a pagar i a cobrar. Podeu "
+"introduir la data lÃmit per al pagament d'aquesta lÃnia."
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "Bad account !"
msgstr "Compte incorrecte!"
#. module: account
-#: code:addons/account/account.py:2777
+#: code:addons/account/account.py:2821
#: code:addons/account/installer.py:432
#, python-format
msgid "Sales Journal"
@@ -6910,7 +7282,7 @@
#: code:addons/account/wizard/account_move_journal.py:104
#, python-format
msgid "Open Journal Items !"
-msgstr ""
+msgstr "Assentaments oberts!"
#. module: account
#: model:ir.model,name:account.model_account_invoice_tax
@@ -6918,7 +7290,7 @@
msgstr "Impost de factura"
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid "No piece number !"
msgstr "Cap tros de número!"
@@ -6932,7 +7304,7 @@
#. module: account
#: model:ir.ui.menu,name:account.menu_manual_reconcile
msgid "Manual Reconciliation"
-msgstr ""
+msgstr "Conciliació manual"
#. module: account
#: report:account.overdue:0
@@ -6955,7 +7327,7 @@
#: view:account.invoice.cancel:0
#: model:ir.actions.act_window,name:account.action_account_invoice_cancel
msgid "Cancel Selected Invoices"
-msgstr ""
+msgstr "Cancela les factures seleccionades"
#. module: account
#: selection:account.entries.report,month:0
@@ -6964,7 +7336,7 @@
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "May"
-msgstr ""
+msgstr "Maig"
#. module: account
#: view:account.account:0
@@ -6992,7 +7364,7 @@
#. module: account
#: view:validate.account.move:0
msgid "Post Journal Entries of a Journal"
-msgstr ""
+msgstr "Publica assentaments de diari d'un diari"
#. module: account
#: view:product.product:0
@@ -7016,7 +7388,7 @@
#. module: account
#: model:process.node,note:account.process_node_supplierpaymentorder0
msgid "Payment of invoices"
-msgstr ""
+msgstr "Pagament de factures"
#. module: account
#: field:account.bank.statement.line,sequence:0
@@ -7034,7 +7406,7 @@
#. module: account
#: model:ir.model,name:account.model_account_bs_report
msgid "Account Balance Sheet Report"
-msgstr ""
+msgstr "Informe de balanç de situació"
#. module: account
#: help:account.tax,price_include:0
@@ -7054,17 +7426,17 @@
#. module: account
#: view:report.account_type.sales:0
msgid "Sales by Account type"
-msgstr ""
+msgstr "Vendes per tipus de compte"
#. module: account
#: help:account.invoice,move_id:0
msgid "Link to the automatically generated Journal Items."
-msgstr ""
+msgstr "Enllaç als assentaments generats automà ticament."
#. module: account
#: selection:account.installer,period:0
msgid "Monthly"
-msgstr ""
+msgstr "Mensualment"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_journal_view
@@ -7075,21 +7447,26 @@
"in which they will appear. Then you can create a new journal and link your "
"view to it."
msgstr ""
+"Aquà podeu personalitzar la vista d'un diari existent o crear una nova "
+"vista. Les vistes de diaris determinen la forma en la qual podeu registrar "
+"assentaments en els diaris. Seleccioneu els camps que desitgeu que apareguin "
+"en un diari i determineu la seqüència en què apareixen. Després podeu crear "
+"un diari nou i associar-li una vista."
#. module: account
#: view:account.payment.term.line:0
msgid " number of days: 14"
-msgstr ""
+msgstr " número de dies: 14"
#. module: account
#: view:analytic.entries.report:0
msgid " 7 Days "
-msgstr ""
+msgstr " 7 Dies "
#. module: account
#: field:account.partner.reconcile.process,progress:0
msgid "Progress"
-msgstr ""
+msgstr "Progrés"
#. module: account
#: field:account.account,parent_id:0
@@ -7100,7 +7477,7 @@
#. module: account
#: field:account.installer.modules,account_analytic_plans:0
msgid "Multiple Analytic Plans"
-msgstr ""
+msgstr "Plans analÃtics múltiples"
#. module: account
#: help:account.payment.term.line,days2:0
@@ -7116,7 +7493,7 @@
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_legal_statement
msgid "Legal Reports"
-msgstr ""
+msgstr "Informes legals"
#. module: account
#: field:account.tax.code,sum_period:0
@@ -7137,7 +7514,7 @@
#. module: account
#: model:ir.model,name:account.model_account_cashbox_line
msgid "CashBox Line"
-msgstr ""
+msgstr "LÃnia de caixa"
#. module: account
#: view:account.partner.ledger:0
@@ -7152,7 +7529,7 @@
#. module: account
#: report:account.account.balance.landscape:0
msgid "Year :"
-msgstr ""
+msgstr "Any:"
#. module: account
#: selection:account.tax.template,type:0
@@ -7160,17 +7537,17 @@
msgstr "Fix"
#. module: account
-#: code:addons/account/account.py:506
-#: code:addons/account/account.py:519
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
#: code:addons/account/account.py:532
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:927
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/invoice.py:714
-#: code:addons/account/invoice.py:717
-#: code:addons/account/invoice.py:720
+#: code:addons/account/account.py:546
+#: code:addons/account/account.py:654
+#: code:addons/account/account.py:941
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Warning !"
msgstr "Atenció!"
@@ -7178,13 +7555,13 @@
#. module: account
#: field:account.entries.report,move_line_state:0
msgid "State of Move Line"
-msgstr ""
+msgstr "Estat de lÃnia moviment"
#. module: account
#: model:ir.model,name:account.model_account_move_line_reconcile
#: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
msgid "Account move line reconcile"
-msgstr ""
+msgstr "Conciliar lÃnia moviment"
#. module: account
#: view:account.subscription.generate:0
@@ -7193,15 +7570,11 @@
msgstr "Calcula assentaments periòdics"
#. module: account
-#: report:account.move.voucher:0
-msgid "Amount (in words) :"
-msgstr ""
-
-#. module: account
#: field:account.bank.statement.line,partner_id:0
#: view:account.entries.report:0
#: field:account.entries.report,partner_id:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: field:account.invoice,partner_id:0
#: field:account.invoice.line,partner_id:0
@@ -7223,7 +7596,7 @@
#. module: account
#: help:account.change.currency,currency_id:0
msgid "Select a currency to apply on the invoice"
-msgstr ""
+msgstr "Seleccioneu una moneda per aplicar en la factura."
#. module: account
#: code:addons/account/wizard/account_invoice_refund.py:100
@@ -7232,10 +7605,10 @@
msgstr "No es pot %s factura esborrany/proforma/cancel.lada."
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "No Invoice Lines !"
-msgstr ""
+msgstr "No hi ha lÃnies de factura!"
#. module: account
#: view:account.bank.statement:0
@@ -7263,6 +7636,8 @@
"Select Fiscal Year which you want to remove entries for its End of year "
"entries journal"
msgstr ""
+"Seleccioneu l'exercici fiscal en que desitgeu eliminar assentaments del seu "
+"diari de final d'exercici."
#. module: account
#: field:account.tax.template,type_tax_use:0
@@ -7281,20 +7656,20 @@
msgstr "Mètode tancament"
#. module: account
-#: code:addons/account/invoice.py:359
+#: code:addons/account/invoice.py:360
#, python-format
msgid "Invoice '%s' is paid."
-msgstr ""
+msgstr "La factura '%s' està pagada."
#. module: account
#: model:process.node,note:account.process_node_electronicfile0
msgid "Automatic entry"
-msgstr ""
+msgstr "Assentament automà tic"
#. module: account
#: constraint:account.tax.code.template:0
msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
+msgstr "Error! No podeu crear codis d'impostos recursius."
#. module: account
#: view:account.invoice.line:0
@@ -7316,6 +7691,8 @@
"When monthly periods are created. The state is 'Draft'. At the end of "
"monthly period it is in 'Done' state."
msgstr ""
+"Quan es creen els perÃodes mensuals l'estat és 'Esborrany'. Al final del "
+"perÃode mensual està en estat 'Realitzat'."
#. module: account
#: report:account.analytic.account.inverted.balance:0
@@ -7344,7 +7721,7 @@
msgstr "Empresa associada"
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "You must first select a partner !"
msgstr "Primer heu de seleccionar una empresa!"
@@ -7358,19 +7735,19 @@
#. module: account
#: view:account.installer:0
msgid "Bank and Cash Accounts"
-msgstr ""
+msgstr "Comptes de caixa i banc"
#. module: account
#: view:account.invoice.report:0
#: field:account.invoice.report,residual:0
msgid "Total Residual"
-msgstr ""
+msgstr "Total residual"
#. module: account
#: model:process.node,note:account.process_node_invoiceinvoice0
#: model:process.node,note:account.process_node_supplierinvoiceinvoice0
msgid "Invoice's state is Open"
-msgstr ""
+msgstr "L'estat de la factura és Oberta"
#. module: account
#: model:ir.actions.act_window,help:account.action_tax_code_tree
@@ -7379,11 +7756,15 @@
"will see the taxes with codes related to your legal statement according to "
"your country."
msgstr ""
+"El pla d'impostos s'utilitza per generar els informes periòdics d'impostos. "
+"Veurà els impostos amb codis relatius als requisits legals d'acord al seu "
+"paÃs."
#. module: account
#: view:account.installer.modules:0
msgid "Add extra Accounting functionalities to the ones already installed."
msgstr ""
+"Afegeix funcionalitats comptables extres a les que ja té instal·lades."
#. module: account
#: report:account.analytic.account.cost_ledger:0
@@ -7396,12 +7777,12 @@
#. module: account
#: view:account.invoice:0
msgid "Proforma"
-msgstr ""
+msgstr "Proforma"
#. module: account
#: report:account.analytic.account.cost_ledger:0
msgid "J.C. /Move name"
-msgstr ""
+msgstr "Cod. diari/Nom mov."
#. module: account
#: model:ir.model,name:account.model_account_open_closed_fiscalyear
@@ -7409,11 +7790,11 @@
msgstr "Escolliu l'exercici fiscal"
#. module: account
-#: code:addons/account/account.py:2841
+#: code:addons/account/account.py:2885
#: code:addons/account/installer.py:495
#, python-format
msgid "Purchase Refund Journal"
-msgstr ""
+msgstr "Diari d'abonament de compres"
#. module: account
#: help:account.tax.template,amount:0
@@ -7432,11 +7813,13 @@
"Modify Invoice: Cancels the current invoice and creates a new copy of it "
"ready for editing."
msgstr ""
+"Modifica factura: Cancel·la la factura actual i crea una nova còpia "
+"preparada per editar."
#. module: account
#: model:ir.module.module,shortdesc:account.module_meta_information
msgid "Accounting and Financial Management"
-msgstr ""
+msgstr "Gestió comptable i financera"
#. module: account
#: field:account.automatic.reconcile,period_id:0
@@ -7445,6 +7828,7 @@
#: view:account.entries.report:0
#: field:account.entries.report,period_id:0
#: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: view:account.invoice.report:0
#: field:account.journal.period,period_id:0
@@ -7469,7 +7853,7 @@
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_generic_reporting
msgid "Generic Reporting"
-msgstr ""
+msgstr "Informes genèrics"
#. module: account
#: field:account.move.line.reconcile.writeoff,journal_id:0
@@ -7504,7 +7888,7 @@
#. module: account
#: view:account.entries.report:0
msgid "Int.Type"
-msgstr ""
+msgstr "Tipus intern"
#. module: account
#: field:account.move.line,tax_amount:0
@@ -7519,6 +7903,10 @@
"can easily generate refunds and reconcile them directly from the invoice "
"form."
msgstr ""
+"Amb les factures rectficatives (abonaments) a clients podeu gestionar les "
+"devolucions dels seus clients. Una factura rectificativa és un document que "
+"abona una factura completa o parcialment. Podeu generar fà cilment factures "
+"rectificatives i conciliar-les directament des del formulari de factura."
#. module: account
#: model:ir.actions.act_window,help:account.action_account_vat_declaration
@@ -7530,6 +7918,13 @@
"useful because it enables you to preview at any time the tax that you owe at "
"the start and end of the month or quarter."
msgstr ""
+"Aquest menú imprimeix una declaració d'IVA basada en factures o pagaments. "
+"Podeu seleccionar un o diversos perÃodes de l'exercici fiscal. La informació "
+"necessà ria per a la declaració d'impostos és generada per OpenERP a partir "
+"de les factures (o pagaments, en alguns països). Aquesta informació "
+"s'actualitza en temps real; la qual cosa és molt útil perquè li permet "
+"previsualizar en qualsevol moment els impostos a pagar al principi i al "
+"final del mes o trimestre."
#. module: account
#: report:account.invoice:0
@@ -7546,14 +7941,19 @@
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
msgid "Chart of Account"
-msgstr ""
+msgstr "Pla comptable"
#. module: account
#: model:process.node,name:account.process_node_paymententries0
#: model:process.transition,name:account.process_transition_reconcilepaid0
msgid "Payment"
-msgstr ""
+msgstr "Pagament"
#. module: account
#: help:account.bs.report,reserve_account_id:0
@@ -7562,6 +7962,9 @@
"added, Loss: Amount will be duducted), which is calculated from Profilt & "
"Loss Report"
msgstr ""
+"Aquest compte s'utilitza per transferir pèrdues/guanys (Guany: L'import serà "
+"afegit, Pèrdua: L'import serà deduït), que es calcula en l'informe de "
+"pèrdues i guanys."
#. module: account
#: help:account.move.line,blocked:0
@@ -7569,6 +7972,8 @@
"You can check this box to mark this journal item as a litigation with the "
"associated partner"
msgstr ""
+"Podeu marcar aquesta opció per indicar aquest assentament com un litigi amb "
+"l'empresa associada."
#. module: account
#: field:account.move.line,reconcile_partial_id:0
@@ -7579,28 +7984,28 @@
#. module: account
#: model:ir.model,name:account.model_account_analytic_inverted_balance
msgid "Account Analytic Inverted Balance"
-msgstr ""
+msgstr "Balanç analÃtic invertit"
#. module: account
#: model:ir.model,name:account.model_account_common_report
msgid "Account Common Report"
-msgstr ""
+msgstr "Informe comú"
#. module: account
#: model:process.transition,name:account.process_transition_filestatement0
msgid "Automatic import of the bank sta"
-msgstr ""
+msgstr "Importació automà tica de l'extracte bancari"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_journal_view
#: model:ir.ui.menu,name:account.menu_action_account_journal_view
msgid "Journal Views"
-msgstr ""
+msgstr "Vistes de diari"
#. module: account
#: model:ir.model,name:account.model_account_move_bank_reconcile
msgid "Move bank reconcile"
-msgstr ""
+msgstr "Concilia moviments banc"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_type_form
@@ -7609,7 +8014,7 @@
msgstr "Tipus de comptes"
#. module: account
-#: code:addons/account/invoice.py:897
+#: code:addons/account/invoice.py:905
#, python-format
msgid "Cannot create invoice move on centralised journal"
msgstr "No es pot crear un assentament de factura en un compte centralitzat"
@@ -7617,7 +8022,7 @@
#. module: account
#: field:account.account.type,report_type:0
msgid "P&L / BS Category"
-msgstr ""
+msgstr "Categoria Balanç / PiG"
#. module: account
#: view:account.automatic.reconcile:0
@@ -7642,12 +8047,12 @@
#. module: account
#: view:account.bank.statement:0
msgid "CashBox Balance"
-msgstr ""
+msgstr "Saldo de caixa"
#. module: account
#: model:ir.model,name:account.model_account_fiscalyear_close_state
msgid "Fiscalyear Close state"
-msgstr ""
+msgstr "Tanca l'estat del exercici fiscal"
#. module: account
#: field:account.invoice.refund,journal_id:0
@@ -7659,9 +8064,14 @@
#: report:account.account.balance:0
#: report:account.central.journal:0
#: report:account.general.journal:0
+#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Filter By"
-msgstr ""
+msgstr "Filtra per"
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree1
@@ -7671,13 +8081,17 @@
"sales orders or deliveries. You should only confirm them before sending them "
"to your customers."
msgstr ""
+"Amb les factures de client podeu crear i gestionar les factures de venda "
+"emeses als seus clients. OpenERP pot generar automà ticament factures "
+"esborrany des de les comandes o des d'albarans. Només haureu de confirmar-"
+"les abans de ser enviades als seus clients."
#. module: account
#: view:account.entries.report:0
#: view:board.board:0
#: model:ir.actions.act_window,name:account.action_company_analysis_tree
msgid "Company Analysis"
-msgstr ""
+msgstr "Anà lisi de la companyia"
#. module: account
#: help:account.invoice,account_id:0
@@ -7697,7 +8111,7 @@
msgstr "LÃnia de termini de pagament"
#. module: account
-#: code:addons/account/account.py:2794
+#: code:addons/account/account.py:2838
#: code:addons/account/installer.py:452
#, python-format
msgid "Purchase Journal"
@@ -7707,21 +8121,22 @@
#: view:account.invoice.refund:0
msgid "Refund Invoice: Creates the refund invoice, ready for editing."
msgstr ""
+"Factura rectficativa: Crea la factura d'abonament, preparada per editar-la."
#. module: account
#: field:account.invoice.line,price_subtotal:0
msgid "Subtotal"
-msgstr ""
+msgstr "Subtotal"
#. module: account
#: view:account.vat.declaration:0
msgid "Print Tax Statement"
-msgstr ""
+msgstr "Imprimeix declaració d'impostots"
#. module: account
#: view:account.model.line:0
msgid "Journal Entry Model Line"
-msgstr ""
+msgstr "LÃnia de model del assentament"
#. module: account
#: view:account.invoice:0
@@ -7736,13 +8151,13 @@
#: model:ir.ui.menu,name:account.menu_account_supplier
#: model:ir.ui.menu,name:account.menu_finance_payables
msgid "Suppliers"
-msgstr ""
+msgstr "Proveïdors"
#. module: account
#: constraint:account.move:0
msgid ""
"You cannot create more than one move per period on centralized journal"
-msgstr ""
+msgstr "No podeu crear més d'un apunt per perÃode a un diari centralitzat."
#. module: account
#: view:account.journal:0
@@ -7760,16 +8175,18 @@
"The residual amount on a receivable or payable of a journal entry expressed "
"in the company currency."
msgstr ""
+"L'import residual d'una anotació a cobrar o a pagar expressat en la moneda "
+"de la companyia."
#. module: account
#: view:account.payment.term.line:0
msgid " valuation: balance"
-msgstr ""
+msgstr " valoració: saldo"
#. module: account
#: view:account.tax.code:0
msgid "Statistics"
-msgstr ""
+msgstr "EstadÃstiques"
#. module: account
#: field:account.analytic.chart,from_date:0
@@ -7780,17 +8197,17 @@
#. module: account
#: model:ir.model,name:account.model_account_fiscalyear_close
msgid "Fiscalyear Close"
-msgstr ""
+msgstr "Tancament del exercici fiscal"
#. module: account
#: sql_constraint:account.account:0
msgid "The code of the account must be unique per company !"
-msgstr ""
+msgstr "El codi del compte ha de ser únic per companyia!"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
msgid "Unpaid Invoices"
-msgstr ""
+msgstr "Factures impagades"
#. module: account
#: field:account.move.line.reconcile,debit:0
@@ -7801,7 +8218,7 @@
#: view:board.board:0
#: model:ir.actions.act_window,name:account.action_treasory_graph
msgid "Treasury"
-msgstr ""
+msgstr "Tresoreria"
#. module: account
#: view:account.aged.trial.balance:0
@@ -7824,12 +8241,12 @@
#: model:ir.actions.act_window,name:account.action_account_analytic_chart
#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
msgid "Chart of Analytic Accounts"
-msgstr ""
+msgstr "Pla de comptes analÃtics"
#. module: account
#: model:ir.ui.menu,name:account.menu_configuration_misc
msgid "Miscellaneous"
-msgstr ""
+msgstr "Varis"
#. module: account
#: help:res.partner,debit:0
@@ -7840,7 +8257,7 @@
#: model:process.node,name:account.process_node_analytic0
#: model:process.node,name:account.process_node_analyticcost0
msgid "Analytic Costs"
-msgstr ""
+msgstr "Costos analÃtics"
#. module: account
#: field:account.analytic.journal,name:0
@@ -7863,10 +8280,12 @@
"The amount of the voucher must be the same amount as the one on the "
"statement line"
msgstr ""
+"L'import del rebut ha de ser del mateix import que el de la lÃnia del "
+"extracte"
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "Bad account!"
msgstr "Compte incorrecte!"
@@ -7874,13 +8293,13 @@
#. module: account
#: help:account.chart,fiscalyear:0
msgid "Keep empty for all open fiscal years"
-msgstr ""
+msgstr "Deixar-ho buit per obrir tots els exercicis fiscals."
#. module: account
-#: code:addons/account/account_move_line.py:1056
+#: code:addons/account/account_move_line.py:1062
#, python-format
msgid "The account move (%s) for centralisation has been confirmed!"
-msgstr ""
+msgstr "El moviment comptable (%s) per a centralització ha estat confirmat!"
#. module: account
#: help:account.move.line,amount_currency:0
@@ -7900,6 +8319,7 @@
#: field:account.entries.report,currency_id:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice,currency_id:0
#: field:account.invoice.report,currency_id:0
#: field:account.journal,currency:0
@@ -7923,11 +8343,14 @@
msgid ""
"Gives the sequence order when displaying a list of bank statement lines."
msgstr ""
+"Indiqueu l'ordre de seqüència quan es mostra una llista de lÃnies d'extracte "
+"bancari."
#. module: account
#: model:process.transition,note:account.process_transition_validentries0
msgid "Accountant validates the accounting entries coming from the invoice."
msgstr ""
+"El comptable valida els assentaments comptables provinents de la factura."
#. module: account
#: model:ir.actions.act_window,help:account.action_account_fiscalyear_form
@@ -7940,6 +8363,13 @@
"would be referred to as FY 2011. You are not obliged to follow the actual "
"calendar year."
msgstr ""
+"Defineix l'exercici fiscal de la seva companyia d'acord a les seves "
+"necessitats. Un exercici fiscal és un perÃode al final d'aquest es tanquen "
+"els comptes (normalment 12 mesos). L'exercici fiscal, normalment, és "
+"referencia amb l'any en el que acaba. Per exemple, si l'exercici fiscal "
+"d'una companyia acaba el 30 de novembre de 2013, llavors tot el que hi hagi "
+"entre l'1 de desembre de 2012 i el 30 de novembre de 2013 es referencia com "
+"EF2013. No esteu obligats a seguir l'any del calendari real."
#. module: account
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
@@ -7963,6 +8393,16 @@
"* The 'Paid' state is set automatically when invoice is paid. \n"
"* The 'Cancelled' state is used when user cancel invoice."
msgstr ""
+" * L'estat 'Esborrany' s'utilitza quan un usuari està introduint una nova "
+"factura sense confirmar. \n"
+"* L'estat 'Pro-forma' s'utilitza quan la factura és una Pro-forma sense "
+"número de factura. \n"
+"* L'estat 'Obert' s'utilitza quan l'usuari confirma una factura; es genera "
+"automà ticament un número de factura. Està en estat obert mentre l'usuari no "
+"paga la factura. \n"
+"* L'estat 'Pagat' s'estableix automà ticament quan es paga la factura. "
+" \n"
+"* L'estat 'Cancel·lat' s'utilitza quan l'usuari cancel·la la factura."
#. module: account
#: field:account.invoice.refund,period:0
@@ -7972,19 +8412,19 @@
#. module: account
#: model:ir.model,name:account.model_account_partner_balance
msgid "Print Account Partner Balance"
-msgstr ""
+msgstr "Imprimeix balanç comptable de l'empresa"
#. module: account
#: field:res.partner,contract_ids:0
msgid "Contracts"
-msgstr ""
+msgstr "Contractes"
#. module: account
#: field:account.cashbox.line,ending_id:0
#: field:account.cashbox.line,starting_id:0
#: field:account.entries.report,reconcile_id:0
msgid "unknown"
-msgstr ""
+msgstr "Desconegut"
#. module: account
#: field:account.fiscalyear.close,journal_id:0
@@ -7994,7 +8434,7 @@
#. module: account
#: model:process.transition,note:account.process_transition_customerinvoice0
msgid "Draft invoices are checked, validated and printed."
-msgstr ""
+msgstr "Factures en esborrany són comprovades, validades i impreses."
#. module: account
#: help:account.chart.template,property_reserve_and_surplus_account:0
@@ -8003,6 +8443,9 @@
"will be added, Loss: Amount will be deducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
+"Aquest compte s'utilitza per transferir les Pèrdues/Guanys (si és un Guany: "
+"Import serà afegit, Pèrdua: Import serà deduït), que es calcula en l'informe "
+"de Pèrdues i Guanys."
#. module: account
#: field:account.invoice,reference_type:0
@@ -8012,7 +8455,7 @@
#. module: account
#: view:account.analytic.cost.ledger.journal.report:0
msgid "Cost Ledger for period"
-msgstr ""
+msgstr "Resum de costos per perÃode"
#. module: account
#: help:account.tax,child_depend:0
@@ -8027,7 +8470,7 @@
#. module: account
#: selection:account.tax,applicable_type:0
msgid "Given by Python Code"
-msgstr ""
+msgstr "Calculat per codi Python"
#. module: account
#: field:account.analytic.journal,code:0
@@ -8041,13 +8484,16 @@
"the amount of this case into its parent. For example, set 1/-1 if you want "
"to add/substract it."
msgstr ""
+"Podeu indicar aquà el coeficient que s'utilitzarà quan es consolidi l'import "
+"d'aquest codi dins del seu pare. Per exemple, indiqueu 1/-1 si desitgeu "
+"sumar/restar l'import."
#. module: account
#: view:account.invoice:0
#: field:account.move.line,amount_residual:0
#: field:account.move.line,amount_residual_currency:0
msgid "Residual Amount"
-msgstr ""
+msgstr "Import residual"
#. module: account
#: field:account.invoice,move_lines:0
@@ -8074,19 +8520,21 @@
msgstr "PerÃode des de"
#. module: account
-#: code:addons/account/account.py:2817
+#: code:addons/account/account.py:2861
#: code:addons/account/installer.py:476
#, python-format
msgid "Sales Refund Journal"
-msgstr ""
+msgstr "Diari d'abonament de vendes"
#. module: account
-#: code:addons/account/account.py:927
+#: code:addons/account/account.py:941
#, python-format
msgid ""
"You cannot modify company of this period as its related record exist in "
"Entry Lines"
msgstr ""
+"No podeu modificar la companyia d'aquest perÃode perquè ja hi ha anotacions "
+"en aquest perÃode."
#. module: account
#: view:account.move:0
@@ -8098,17 +8546,17 @@
#. module: account
#: model:process.node,note:account.process_node_bankstatement0
msgid "Registered payment"
-msgstr ""
+msgstr "Pagament registrat"
#. module: account
#: view:account.fiscalyear.close.state:0
msgid "Close states of Fiscal year and periods"
-msgstr ""
+msgstr "Tancament d'estats d'exercicis i perÃodes fiscals"
#. module: account
#: view:account.analytic.line:0
msgid "Product Information"
-msgstr ""
+msgstr "Informació del producte"
#. module: account
#: report:account.analytic.account.journal:0
@@ -8127,13 +8575,13 @@
#. module: account
#: field:account.installer,purchase_tax:0
msgid "Purchase Tax(%)"
-msgstr ""
+msgstr "Impost de la compra (%)"
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "Please create some invoice lines."
-msgstr ""
+msgstr "Creeu algunes lÃnies de factura"
#. module: account
#: report:account.overdue:0
@@ -8143,10 +8591,10 @@
#. module: account
#: view:account.installer.modules:0
msgid "Configure Your Accounting Application"
-msgstr ""
+msgstr "Configureu l'aplicació de comptabilitat"
#. module: account
-#: code:addons/account/account.py:2820
+#: code:addons/account/account.py:2864
#: code:addons/account/installer.py:479
#, python-format
msgid "SCNJ"
@@ -8158,6 +8606,8 @@
"Analytic costs (timesheets, some purchased products, ...) come from analytic "
"accounts. These generate draft invoices."
msgstr ""
+"Els costos analÃtics (fulls de serveis, alguns productes comprats, ...) "
+"provenen dels comptes analÃtics. Aquests generen factures esborrany."
#. module: account
#: help:account.journal,view_id:0
@@ -8167,6 +8617,10 @@
"in which order. You can create your own view for a faster encoding in each "
"journal."
msgstr ""
+"Estableix la vista utilitzada quan s'escriuen o consulten assentaments en "
+"aquest diari. La vista li indica a OpenERP quins camps han de ser visibles, "
+"requerits o de només lectura, i en quin ordre. Podeu crear la seva pròpia "
+"vista en cada diari per introduir anotacions més rà pid."
#. module: account
#: field:account.period,date_stop:0
@@ -8177,29 +8631,31 @@
#. module: account
#: field:account.installer.modules,account_followup:0
msgid "Followups Management"
-msgstr ""
+msgstr "Gestió de seguiments"
#. module: account
#: report:account.account.balance:0
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: report:account.vat.declaration:0
msgid "Start Period"
-msgstr ""
+msgstr "PerÃode inicial"
#. module: account
-#: code:addons/account/account.py:2333
+#: code:addons/account/account.py:2357
#, python-format
msgid "Cannot locate parent code for template account!"
-msgstr ""
+msgstr "No es pot localitzar el codi pare per a la plantilla de comptes!"
#. module: account
#: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
msgid "Analysis Direction"
msgstr "Direcció anà lisi"
@@ -8228,9 +8684,10 @@
#: model:process.transition,note:account.process_transition_suppliervalidentries0
msgid "Accountant validates the accounting entries coming from the invoice. "
msgstr ""
+"El comptable valida els assentaments comptables provinents de la factura. "
#. module: account
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/invoice.py:1014
#, python-format
msgid ""
"You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8247,7 +8704,7 @@
#. module: account
#: view:account.invoice:0
msgid "Unpaid"
-msgstr ""
+msgstr "Impagada"
#. module: account
#: report:account.overdue:0
@@ -8257,37 +8714,48 @@
#. module: account
#: constraint:account.move.line:0
msgid "You can not create move line on view account."
-msgstr ""
+msgstr "No podeu crear un apunt en un compte de tipus \"Vista\"."
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:70
#, python-format
msgid "Current currency is not confirured properly !"
-msgstr ""
+msgstr "La moneda actual no està configurada correctament!"
#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree4
-msgid ""
-"With Supplier Refunds you can manage the credit notes you receive from your "
-"suppliers. A refund is a document that credits an invoice completely or "
-"partially. You can easily generate refunds and reconcile them directly from "
-"the invoice form."
-msgstr ""
+#: code:addons/account/account.py:952
+#: code:addons/account/account.py:954
+#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1411
+#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:120
+#: code:addons/account/wizard/account_report_common.py:126
+#, python-format
+msgid "Error"
+msgstr "Error"
#. module: account
#: view:account.account.template:0
msgid "Receivale Accounts"
-msgstr ""
-
-#. module: account
-#: report:account.move.voucher:0
-msgid "Particulars"
-msgstr ""
+msgstr "Comptes a cobrar"
#. module: account
#: selection:account.account.type,report_type:0
msgid "Profit & Loss (Income Accounts)"
-msgstr ""
+msgstr "Pèrdua i guanys (comptes d'ingressos)"
#. module: account
#: view:account.tax:0
@@ -8309,6 +8777,7 @@
#: field:account.entries.report,balance:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.move.line,balance:0
#: report:account.partner.balance:0
#: selection:account.payment.term.line,value:0
@@ -8317,18 +8786,27 @@
#: report:account.third_party_ledger_other:0
#: field:report.account.receivable,balance:0
#: field:report.aged.receivable,balance:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Balance"
msgstr "Saldo pendent"
#. module: account
#: model:process.node,note:account.process_node_supplierbankstatement0
msgid "Manually or automatically entered in the system"
-msgstr ""
+msgstr "Introduït manualment o automà ticament en el sistema"
#. module: account
#: report:account.account.balance:0
+#: report:account.general.ledger_landscape:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Display Account"
-msgstr ""
+msgstr "Mostra compte"
#. module: account
#: report:account.tax.code.entries:0
@@ -8338,12 +8816,12 @@
#. module: account
#: selection:account.invoice.refund,filter_refund:0
msgid "Modify"
-msgstr ""
+msgstr "Modifica"
#. module: account
#: view:account.account.type:0
msgid "Closing Method"
-msgstr ""
+msgstr "Mètode de tancament"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_partner_balance
@@ -8351,6 +8829,8 @@
"This report is analysis by partner. It is a PDF report containing one line "
"per partner representing the cumulative credit balance."
msgstr ""
+"Aquest informe és l'anà lisi per l'empresa. És un informe PDF que conté una "
+"lÃnia per empresa representant el saldo de crèdit acumulatiu."
#. module: account
#: selection:account.account,type:0
@@ -8364,7 +8844,7 @@
#: view:report.account_type.sales:0
#: view:report.hr.timesheet.invoice.journal:0
msgid "This Year"
-msgstr ""
+msgstr "Aquest any"
#. module: account
#: view:board.board:0
@@ -8386,12 +8866,19 @@
"the income account. OpenERP will propose to you automatically the Tax "
"related to this account and the counter-part \"Account receivable\"."
msgstr ""
+"Aquesta vista és utilitzada pels comptables per registrar assentaments "
+"massivament en OpenERP. Si voleu registrar una factura de client, "
+"seleccioneu el diari i el perÃode en la barra d'eines de cerca. Després, "
+"comenceu introduint l'anotació del compte d'ingressos. OpenERP li proposarà "
+"automà ticament l'impost associat a aquest compte, i el \"compte a cobrar\" "
+"de contrapartida."
#. module: account
#: code:addons/account/account_bank_statement.py:391
#, python-format
msgid "Cannot delete bank statement(s) which are already confirmed !"
msgstr ""
+"No es pot eliminar extracte/s bancari/s que ja estigui/n confirmat/s!"
#. module: account
#: code:addons/account/wizard/account_automatic_reconcile.py:152
@@ -8408,6 +8895,7 @@
#: model:process.transition,note:account.process_transition_entriesreconcile0
msgid "Accounting entries are the first input of the reconciliation."
msgstr ""
+"Els assentaments comptables són la primera entrada de la conciliació."
#. module: account
#: model:ir.actions.act_window,help:account.action_account_period_form
@@ -8419,11 +8907,12 @@
"closed or left open depending on your company's activities over a specific "
"period."
msgstr ""
-
-#. module: account
-#: report:account.move.voucher:0
-msgid "Receiver's Signature"
-msgstr ""
+"Aquà podeu definir un perÃode fiscal, un interval de temps dins de "
+"l'exercici fiscal de la seva companyia. Un perÃode comptable tÃpicament és "
+"un mes o un trimestre. Normalment, correspon als perÃodes de la declaració "
+"d'impostos. Creeu i gestioneu perÃodes aquà i decideix quin perÃode s'haurà "
+"de tancar o deixar obert depenent de les activitats de la seva companyia en "
+"un perÃode especÃfic."
#. module: account
#: report:account.general.ledger:0
@@ -8431,16 +8920,17 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Filters By"
-msgstr ""
+msgstr "Filtres per"
#. module: account
#: model:process.node,note:account.process_node_manually0
#: model:process.transition,name:account.process_transition_invoicemanually0
msgid "Manual entry"
-msgstr ""
+msgstr "Entrada manual"
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.line,move_id:0
#: field:analytic.entries.report,move_id:0
@@ -8448,7 +8938,7 @@
msgstr "Assent."
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "You can not change the tax, you should remove and recreate lines !"
msgstr "No es pot canviar l'impost, ha d'eliminar i recrear les lÃnies!"
@@ -8456,7 +8946,7 @@
#. module: account
#: report:account.central.journal:0
msgid "A/C No."
-msgstr ""
+msgstr "Nº compte"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
@@ -8468,6 +8958,7 @@
msgid ""
"Creates an account with the selected template under this existing parent."
msgstr ""
+"Crea una compte, amb la plantilla seleccionada, sota el pare existent."
#. module: account
#: selection:account.model.line,date_maturity:0
@@ -8492,7 +8983,7 @@
#. module: account
#: model:ir.actions.act_window,name:account.action_account_common_menu
msgid "Common Report"
-msgstr ""
+msgstr "Informe comú"
#. module: account
#: view:account.account:0
@@ -8507,13 +8998,15 @@
"The journal must have centralised counterpart without the Skipping draft "
"state option checked!"
msgstr ""
+"El diari ha de tenir una contrapartida centralitzada sense l'opció d'ometre "
+"l'estat esborrany marcat!"
#. module: account
#: model:process.node,note:account.process_node_paymententries0
#: model:process.transition,name:account.process_transition_paymentorderbank0
#: model:process.transition,name:account.process_transition_paymentreconcile0
msgid "Payment entries"
-msgstr ""
+msgstr "Assentaments de pagament"
#. module: account
#: selection:account.entries.report,month:0
@@ -8522,7 +9015,7 @@
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "July"
-msgstr ""
+msgstr "Juliol"
#. module: account
#: view:account.account:0
@@ -8537,20 +9030,21 @@
#. module: account
#: model:ir.model,name:account.model_account_analytic_balance
msgid "Account Analytic Balance"
-msgstr ""
+msgstr "Balanç del saldo analÃtic"
#. module: account
#: report:account.account.balance:0
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: report:account.vat.declaration:0
msgid "End Period"
-msgstr ""
+msgstr "PerÃode final"
#. module: account
#: field:account.aged.trial.balance,chart_account_id:0
@@ -8569,12 +9063,12 @@
#: field:account.report.general.ledger,chart_account_id:0
#: field:account.vat.declaration,chart_account_id:0
msgid "Chart of account"
-msgstr ""
+msgstr "Pla comptable"
#. module: account
#: field:account.move.line,date_maturity:0
msgid "Due date"
-msgstr ""
+msgstr "Data de venciment"
#. module: account
#: view:account.move.journal:0
@@ -8587,7 +9081,7 @@
msgstr "Subscripció de comptabilitat"
#. module: account
-#: code:addons/account/invoice.py:717
+#: code:addons/account/invoice.py:725
#, python-format
msgid ""
"Tax base different !\n"
@@ -8614,6 +9108,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_from:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_start:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -8626,6 +9121,7 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,date_from:0
+#: report:account.aged_trial_balance:0
msgid "Start Date"
msgstr "Data inicial"
@@ -8642,7 +9138,7 @@
msgstr "No conciliat"
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid "Bad total !"
msgstr "Total erroni!"
@@ -8663,6 +9159,15 @@
"open period. Close a period when you do not want to record new entries and "
"want to lock this period for tax related calculation."
msgstr ""
+"Un perÃode és una termini de temps fiscal durant la qual s'han de registrar "
+"en assentaments, les activitats relacionades amb la comptabilitat. "
+"Normalment, és un perÃode mensual però, depenent del paÃs i les necessitats "
+"de la seva companyia, podrÃeu utilitzar també perÃodes trimestrals (per "
+"exemple en Espanya les PIMES habitualment utilitzen perÃodes trimestrals). "
+"Tancar un perÃode impedeix registrar nous assentaments, qualsevol nou "
+"assentament haurà d'anotar-se en el següent perÃode obert. Tanca un perÃode "
+"quan no tingueu que escriure nous assentaments i desitgeu bloquejar aquest "
+"perÃode per motius relacionats amb el cà lcul d'impostos."
#. module: account
#: view:account.analytic.account:0
@@ -8673,12 +9178,12 @@
#: model:process.transition,name:account.process_transition_analyticinvoice0
#: model:process.transition,name:account.process_transition_supplieranalyticcost0
msgid "From analytic accounts"
-msgstr ""
+msgstr "Des de comptes analÃtics"
#. module: account
#: field:account.installer.modules,account_payment:0
msgid "Suppliers Payment Management"
-msgstr ""
+msgstr "Gestió dels pagaments a proveïdors"
#. module: account
#: field:account.period,name:0
@@ -8700,19 +9205,23 @@
msgstr "Actiu"
#. module: account
-#: code:addons/account/invoice.py:354
+#: code:addons/account/invoice.py:353
#, python-format
msgid "Unknown Error"
-msgstr ""
+msgstr "S'ha produït un error desconegut"
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid ""
"You cannot validate a non-balanced entry !\n"
"Make sure you have configured Payment Term properly !\n"
"It should contain atleast one Payment Term Line with type \"Balance\" !"
msgstr ""
+"No es pot confirmar un assentament desquadrat!\n"
+"Assegureu-vos d'haver configurat el termini de pagament correctament!\n"
+"Hauria de tenir, almenys, una lÃnia de termini de pagament de tipus "
+"\"Saldo\"!"
#. module: account
#: help:res.partner,property_account_payable:0
@@ -8738,7 +9247,7 @@
#. module: account
#: model:ir.model,name:account.model_validate_account_move
msgid "Validate Account Move"
-msgstr ""
+msgstr "Valida moviment comptable"
#. module: account
#: field:account.account,credit:0
@@ -8751,10 +9260,10 @@
#: field:account.entries.report,credit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,credit:0
#: field:account.move.line,credit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -8771,22 +9280,20 @@
"created. If you leave that field empty, it will use the same journal as the "
"current invoice."
msgstr ""
-
-#. module: account
-#: report:account.move.voucher:0
-msgid "Through :"
-msgstr ""
+"Podeu seleccionar aquà el diari a utilitzar per a la factura rectificativa "
+"(abonament) que es crearà . Si deixeu aquest camp buit, s'utilitzarà el "
+"mateix diari que la factura actual."
#. module: account
#: view:account.general.journal:0
#: model:ir.ui.menu,name:account.menu_account_general_journal
msgid "General Journals"
-msgstr ""
+msgstr "Diaris generals"
#. module: account
#: view:account.model:0
msgid "Journal Entry Model"
-msgstr ""
+msgstr "Model d'assentament"
#. module: account
#: code:addons/account/wizard/account_use_model.py:44
@@ -8796,6 +9303,9 @@
"payment term!\n"
"Please define partner on it!"
msgstr ""
+"La data de venciment, de l'anotació, generada per la lÃnia del model '%s' es "
+"basa en el termini de pagament de l'empresa.\n"
+"Si us plau, definiu l'empresa en ell!"
#. module: account
#: field:account.cashbox.line,number:0
@@ -8846,7 +9356,7 @@
#. module: account
#: field:account.invoice.report,currency_rate:0
msgid "Currency Rate"
-msgstr ""
+msgstr "Tipus de canvi"
#. module: account
#: help:account.payment.term.line,value_amount:0
@@ -8860,12 +9370,12 @@
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "April"
-msgstr ""
+msgstr "Abril"
#. module: account
#: view:account.move.line.reconcile.select:0
msgid "Open for Reconciliation"
-msgstr ""
+msgstr "Obre per a conciliació"
#. module: account
#: field:account.account,parent_left:0
@@ -8878,17 +9388,21 @@
"Refund invoice base on this type. You can not Modify and Cancel if the "
"invoice is already reconciled"
msgstr ""
+"Factura rectficativa (abonament) basada en aquest tipus. No podeu modificar "
+"i cancel·lar si la factura ja està conciliada."
#. module: account
#: help:account.installer.modules,account_analytic_plans:0
msgid ""
"Allows invoice lines to impact multiple analytic accounts simultaneously."
msgstr ""
+"Permet a les lÃnies de factura, impactar múltiples comptes analÃtics "
+"simultà niament."
#. module: account
#: field:account.installer,sale_tax:0
msgid "Sale Tax(%)"
-msgstr ""
+msgstr "Impost de venda (%)"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2
@@ -8919,6 +9433,9 @@
"and is the process of transferring debit and credit amounts from a journal "
"of original entry to a ledger book."
msgstr ""
+"El procés de validació d'assentaments, també anomenat 'assentar', "
+"transfereix els imports del deure i del haver de l'anotació original a un "
+"llibre major."
#. module: account
#: report:account.tax.code.entries:0
@@ -8941,13 +9458,15 @@
"This report allows you to print or generate a pdf of your general ledger "
"with details of all your account journals"
msgstr ""
+"Aquest informe li permet imprimir o generar un pdf del seu llibre major amb "
+"el detall de tots els seus diaris comptables."
#. module: account
#: selection:account.account,type:0
#: selection:account.account.template,type:0
#: selection:account.entries.report,type:0
msgid "Regular"
-msgstr ""
+msgstr "Regular"
#. module: account
#: view:account.account:0
@@ -8959,11 +9478,6 @@
msgstr "Tipus intern"
#. module: account
-#: report:account.move.voucher:0
-msgid "State:"
-msgstr ""
-
-#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_running
msgid "Running Subscriptions"
msgstr "Assentaments periòdics en procés"
@@ -8990,7 +9504,6 @@
#: view:account.move:0
#: selection:account.move,state:0
#: view:account.move.line:0
-#: report:account.move.voucher:0
msgid "Posted"
msgstr "Fixat"
@@ -9009,6 +9522,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_to:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_stop:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -9049,7 +9563,7 @@
#: code:addons/account/report/account_profit_loss.py:127
#, python-format
msgid "Net Profit"
-msgstr ""
+msgstr "Benefici net"
#. module: account
#: view:ir.sequence:0
@@ -9062,10 +9576,11 @@
msgstr "Aquest és un model per assentaments comptable recurrent"
#. module: account
-#: code:addons/account/account_analytic_line.py:100
+#: code:addons/account/account_analytic_line.py:99
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
+"No s'ha definit un compte d'ingressos per a aquest producte: \"%s\" (id:%d)"
#. module: account
#: report:account.general.ledger:0
@@ -9077,7 +9592,7 @@
#. module: account
#: view:account.payment.term.line:0
msgid " value amount: 0.02"
-msgstr ""
+msgstr " import valor: 0.02"
#. module: account
#: view:account.fiscalyear:0
@@ -9098,6 +9613,7 @@
#: field:report.account.sales,amount_total:0
#: field:report.account_type.sales,amount_total:0
#: field:report.invoice.created,amount_total:0
+#: report:account.aged_trial_balance:0
msgid "Total"
msgstr "Total"
@@ -9105,7 +9621,7 @@
#: code:addons/account/wizard/account_move_journal.py:97
#, python-format
msgid "Journal: All"
-msgstr ""
+msgstr "Diari: Tots"
#. module: account
#: field:account.account,company_id:0
@@ -9140,17 +9656,17 @@
#. module: account
#: model:ir.ui.menu,name:account.menu_action_subscription_form
msgid "Define Recurring Entries"
-msgstr ""
+msgstr "Defineix assentaments recurrents"
#. module: account
#: field:account.entries.report,date_maturity:0
msgid "Date Maturity"
-msgstr ""
+msgstr "Data de venciment"
#. module: account
#: help:account.bank.statement,total_entry_encoding:0
msgid "Total cash transactions"
-msgstr ""
+msgstr "Total transicions de caixa."
#. module: account
#: help:account.partner.reconcile.process,today_reconciled:0
@@ -9159,6 +9675,9 @@
"reconciliation process today. The current partner is counted as already "
"processed."
msgstr ""
+"Aquesta xifra representa el número total d'empreses que avui han passat a "
+"través del procés de conciliació. L'empresa actual es comptabilitza com que "
+"ja s'ha processat."
#. module: account
#: view:account.fiscalyear:0
@@ -9168,12 +9687,12 @@
#. module: account
#: field:account.tax.code.template,sign:0
msgid "Sign For Parent"
-msgstr ""
+msgstr "Signe per a pare"
#. module: account
#: model:ir.model,name:account.model_account_balance_report
msgid "Trial Balance Report"
-msgstr ""
+msgstr "Informe de sumes i saldos"
#. module: account
#: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
@@ -9185,6 +9704,8 @@
msgid ""
"Manual or automatic creation of payment entries according to the statements"
msgstr ""
+"Creació manual o automà tica dels assentaments de pagament d'acord amb els "
+"extractes"
#. module: account
#: view:account.invoice:0
@@ -9209,11 +9730,11 @@
#: field:account.report.general.ledger,period_to:0
#: field:account.vat.declaration,period_to:0
msgid "End period"
-msgstr ""
+msgstr "PerÃode final"
#. module: account
-#: code:addons/account/account_move_line.py:738
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:806
#: code:addons/account/wizard/account_invoice_state.py:44
#: code:addons/account/wizard/account_invoice_state.py:68
#: code:addons/account/wizard/account_report_balance_sheet.py:70
@@ -9231,32 +9752,34 @@
"This account will be used to value outgoing stock for the current product "
"category using cost price"
msgstr ""
-
-#. module: account
-#: report:account.move.voucher:0
-msgid "On Account of :"
-msgstr ""
-
-#. module: account
-#: view:account.automatic.reconcile:0
-#: view:account.move.line.reconcile.writeoff:0
-msgid "Write-Off Move"
-msgstr "Moviment de desajust"
+"Aquest compte s'utilitzarà per valorar l'estoc sortint per a la categoria de "
+"producte actual utilitzant el preu de cost."
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
+msgstr "Tancament"
#. module: account
#: model:process.node,note:account.process_node_paidinvoice0
msgid "Invoice's state is Done"
-msgstr ""
+msgstr "L'estat de la factura és Realitzada"
#. module: account
#: model:ir.model,name:account.model_report_account_sales
msgid "Report of the Sales by Account"
-msgstr ""
+msgstr "Informe de les vendes per compte"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Accounts Fiscal Position"
-msgstr ""
+msgstr "Comptes de posició fiscal"
#. module: account
#: report:account.invoice:0
@@ -9279,10 +9802,10 @@
#: field:account.entries.report,debit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,debit:0
#: field:account.move.line,debit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -9300,23 +9823,15 @@
#. module: account
#: constraint:account.account.template:0
msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
-#. module: account
-#: constraint:account.account.template:0
-msgid ""
-"You cannot create an account template! \n"
-"Make sure if the account template has parent then it should be type "
-"\"View\"! "
-msgstr ""
+msgstr "Error ! No es poden crear plantilles de comptes recursives."
#. module: account
#: view:account.subscription:0
msgid "Recurring"
-msgstr ""
+msgstr "Recurrent"
#. module: account
-#: code:addons/account/account_move_line.py:805
+#: code:addons/account/account_move_line.py:796
#, python-format
msgid "Entry is already reconciled"
msgstr "L'assentament ja està conciliat"
@@ -9337,7 +9852,7 @@
msgstr "Rang"
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid ""
"Can not create an automatic sequence for this piece !\n"
@@ -9381,7 +9896,7 @@
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "December"
-msgstr ""
+msgstr "Desembre"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
@@ -9403,7 +9918,7 @@
#. module: account
#: field:account.tax,applicable_type:0
msgid "Applicability"
-msgstr ""
+msgstr "Aplicació"
#. module: account
#: code:addons/account/wizard/account_move_journal.py:165
@@ -9421,16 +9936,18 @@
msgid ""
"Import of the statement in the system from a supplier or customer invoice"
msgstr ""
+"Importació de l'extracte en el sistema des d'una factura de proveïdor o "
+"client"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
msgid "Billing"
-msgstr ""
+msgstr "Facturació"
#. module: account
#: view:account.account:0
msgid "Parent Account"
-msgstr ""
+msgstr "Compte pare"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_journal_form
@@ -9442,6 +9959,13 @@
"may keep several types of specialized journals such as a cash journal, "
"purchase journal, sales journal..."
msgstr ""
+"Creeu i gestioneu els perÃodes de la seva companyia des d'aquest menú. "
+"S'utilitza un diari per registrar transaccions de totes les dades comptables "
+"relatives al dia a dia del negoci de la companyia utilitzant el sistema "
+"comptable de doble entrada. Depenent de la naturalesa de les seves "
+"activitats i el número de transaccions dià ries, una companyia pot tenir "
+"diversos tipus de diaris especialitzats com un diari de caixa, un diari de "
+"compra, un diari de venda, ..."
#. module: account
#: model:ir.model,name:account.model_account_analytic_chart
@@ -9456,14 +9980,14 @@
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
msgid "Statistic Reports"
-msgstr ""
+msgstr "Informes estadÃstics"
#. module: account
#: field:account.installer,progress:0
#: field:account.installer.modules,progress:0
#: field:wizard.multi.charts.accounts,progress:0
msgid "Configuration Progress"
-msgstr ""
+msgstr "Progrés de la configuració"
#. module: account
#: view:account.fiscal.position.template:0
@@ -9471,10 +9995,10 @@
msgstr "Mapa de relacions de comptes"
#. module: account
-#: code:addons/account/invoice.py:346
+#: code:addons/account/invoice.py:345
#, python-format
msgid "Invoice '%s' is waiting for validation."
-msgstr ""
+msgstr "La factura '%s' està esperant per ser validada."
#. module: account
#: selection:account.entries.report,month:0
@@ -9483,7 +10007,7 @@
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "November"
-msgstr ""
+msgstr "Novembre"
#. module: account
#: model:ir.model,name:account.model_account_installer_modules
@@ -9497,10 +10021,10 @@
"El compte d'ingressos o despeses relacionada amb el producte seleccionat."
#. module: account
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account_move_line.py:1123
#, python-format
msgid "The date of your Journal Entry is not in the defined period!"
-msgstr ""
+msgstr "La data del seu assentament no està en el perÃode definit!"
#. module: account
#: field:account.subscription,period_total:0
@@ -9516,7 +10040,7 @@
#. module: account
#: view:account.invoice:0
msgid "Search Invoice"
-msgstr ""
+msgstr "Cerca factura"
#. module: account
#: report:account.invoice:0
@@ -9550,7 +10074,7 @@
#: view:account.move:0
#: view:account.move.line:0
msgid "Accounting Documents"
-msgstr ""
+msgstr "Documents comptables"
#. module: account
#: model:ir.model,name:account.model_validate_account_move_lines
@@ -9566,17 +10090,17 @@
#. module: account
#: model:process.node,note:account.process_node_supplierpaidinvoice0
msgid "Invoice's state is Done."
-msgstr ""
+msgstr "L'estat de la factura és Realitzada."
#. module: account
#: model:process.transition,note:account.process_transition_reconcilepaid0
msgid "As soon as the reconciliation is done, the invoice can be paid."
-msgstr ""
+msgstr "Tan aviat com la conciliació es realitzi, la factura estarà pagada."
#. module: account
#: view:account.account.template:0
msgid "Search Account Templates"
-msgstr ""
+msgstr "Cerca plantilles de comptes"
#. module: account
#: view:account.invoice.tax:0
@@ -9601,8 +10125,9 @@
#: field:account.partner.ledger,result_selection:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
+#: report:account.aged_trial_balance:0
msgid "Partner's"
-msgstr ""
+msgstr "D'empreses"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscalyear_form
@@ -9617,6 +10142,8 @@
"If the active field is set to False, it will allow you to hide the analytic "
"journal without removing it."
msgstr ""
+"Si el camp actiu es desmarca, permet ocultar el diari analÃtic sense "
+"eliminar-l'ho."
#. module: account
#: field:account.analytic.line,ref:0
@@ -9636,7 +10163,7 @@
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "February"
-msgstr ""
+msgstr "Febrer"
#. module: account
#: field:account.bank.accounts.wizard,bank_account_id:0
@@ -9651,7 +10178,7 @@
#: model:ir.actions.act_window,name:account.action_account_central_journal
#: model:ir.model,name:account.model_account_central_journal
msgid "Account Central Journal"
-msgstr ""
+msgstr "Diari central comptable"
#. module: account
#: report:account.overdue:0
@@ -9666,7 +10193,7 @@
#. module: account
#: view:account.move.line:0
msgid "Search Journal Items"
-msgstr ""
+msgstr "Cerca lÃnies assentaments"
#. module: account
#: help:account.tax,base_sign:0
@@ -9683,7 +10210,7 @@
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Template Account Fiscal Mapping"
-msgstr ""
+msgstr "Plantilla d'assignació de comptes fiscals"
#. module: account
#: field:account.chart.template,property_account_expense:0
@@ -9693,7 +10220,7 @@
#. module: account
#: field:account.analytic.line,amount_currency:0
msgid "Amount currency"
-msgstr ""
+msgstr "Moneda de l'import"
#. module: account
#: code:addons/account/wizard/account_report_aged_partner_balance.py:55
@@ -9702,7 +10229,7 @@
msgstr "Heu d'introduir una longitud de perÃode que no pot ser 0 o inferior!"
#. module: account
-#: code:addons/account/account.py:501
+#: code:addons/account/account.py:511
#, python-format
msgid "You cannot remove an account which has account entries!. "
msgstr "No podeu eliminar un compte que conté assentaments comptables. "
@@ -9718,6 +10245,13 @@
"certain amount of information. They have to be certified by an external "
"auditor annually."
msgstr ""
+"Creeu i gestioneu els comptes que necessiteu per codificar el assentaments "
+"en els diaris. Un compte és part d'un pla de comptes que permet a la seva "
+"companyia registrar tot tipus de transaccions de crèdit i dèbit. Les "
+"companyies presenten els seus comptes anuals en dues parts principals: El "
+"balanç i el compte de pèrdues i guanys. Els comptes anuals d'una companyia "
+"són exigides per llei perquè contenen certa quantitat d'informació. Han de "
+"ser certificades per un auditor extern anualment."
#. module: account
#: help:account.move.line,amount_residual_currency:0
@@ -9725,6 +10259,7 @@
"The residual amount on a receivable or payable of a journal entry expressed "
"in its currency (maybe different of the company currency)."
msgstr ""
+<<<<<<< TREE
#~ msgid "Keep empty to use the period of the validation date."
#~ msgstr "Deixar-ho buit per utilitzar el perÃode de la data de validació."
@@ -11344,3 +11879,53 @@
#~ msgid "Account Reporting - Reporting"
#~ msgstr "Informe comptable - Informe"
+=======
+"L'import residual d'una anotació a cobrar o a pagar expressat en la seva "
+"moneda (pot ser diferent de la moneda de la companyia)."
+
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+msgid "Liabilities"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+msgid "Balance:"
+msgstr ""
+
+#. module: account
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+msgid "Particular"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Aged Trial Balance"
+msgstr "Balanç de comprovació anterior"
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Period Length(days)"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Account Total"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Not due"
+msgstr ""
+>>>>>>> MERGE-SOURCE
=== modified file 'account/i18n/cs.po'
--- account/i18n/cs.po 2011-07-16 04:57:05 +0000
+++ account/i18n/cs.po 2011-08-02 06:32:40 +0000
@@ -6,16 +6,28 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
+<<<<<<< TREE
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-07-15 02:11+0000\n"
"Last-Translator: Chronos <robie@xxxxxxxxxx>\n"
+=======
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2011-07-29 20:47+0000\n"
+"Last-Translator: Jan B. KrejÄÃ <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-07-16 04:56+0000\n"
"X-Generator: Launchpad (build 13405)\n"
"X-Poedit-Language: Czech\n"
+=======
+"X-Launchpad-Export-Date: 2011-07-30 05:30+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
+"X-Poedit-Language: Czech\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,6 +40,7 @@
msgstr "Ostatnà nastavenÃ"
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
#, python-format
msgid "No End of year journal defined for the fiscal year"
@@ -35,18 +48,20 @@
#. module: account
#: code:addons/account/account.py:516
+=======
+#: code:addons/account/account.py:516
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You cannot remove/deactivate an account which is set as a property to any "
"Partner."
msgstr ""
-"Nemůžete odstranit/deaktivovat úÄet, který je nastaven jako vlastnost "
-"některého partnera"
+"Nemůžete odstranit/deaktivovat úÄet, který je pÅ™iÅ™azen nÄ›kterému partnerovi"
#. module: account
#: view:account.move.reconcile:0
msgid "Journal Entry Reconcile"
-msgstr ""
+msgstr "Likvidace záznamu v knize"
#. module: account
#: field:account.installer.modules,account_voucher:0
@@ -71,12 +86,12 @@
#: code:addons/account/invoice.py:793
#, python-format
msgid "Please define sequence on invoice journal"
-msgstr "ProsÃm nadefinujte sekvenci knihy faktur"
+msgstr "ProsÃm nadefinujte ÄÃselnou Å™adu knihy faktur"
#. module: account
#: constraint:account.period:0
msgid "Error ! The duration of the Period(s) is/are invalid. "
-msgstr "Chyba! Délku obdobà (s) je / jsou neplatné. "
+msgstr "Chyba! Neplatná délka obdobÃ. "
#. module: account
#: field:account.analytic.line,currency_id:0
@@ -91,12 +106,16 @@
#. module: account
#: model:ir.model,name:account.model_report_aged_receivable
msgid "Aged Receivable Till Today"
+<<<<<<< TREE
msgstr "Splatné pohledávky do dneÅ¡nÃho dne"
+=======
+msgstr "Pohledávky splatné ke dnešku"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.partner.ledger,reconcil:0
msgid "Include Reconciled Entries"
-msgstr ""
+msgstr "Zahrnout zlikvidované záznamy"
#. module: account
#: view:account.pl.report:0
@@ -104,13 +123,17 @@
"The Profit and Loss report gives you an overview of your company profit and "
"loss in a single document"
msgstr ""
+<<<<<<< TREE
"Výkaz zisku a ztrát Vám dá pÅ™ehled o zisku a ztrátÄ› spoleÄnosti v jediném "
+=======
+"Výkaz zisku a ztráty Vám dá pÅ™ehled o zisku Äi ztrátÄ› spoleÄnosti v jediném "
+>>>>>>> MERGE-SOURCE
"dokumentu"
#. module: account
#: model:process.transition,name:account.process_transition_invoiceimport0
msgid "Import from invoice or payment"
-msgstr "Importovat z faktur nebo plateb"
+msgstr "Importovat z faktury nebo platby"
#. module: account
#: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -128,17 +151,27 @@
"If you unreconciliate transactions, you must also verify all the actions "
"that are linked to those transactions because they will not be disabled"
msgstr ""
+"Pokud zruÅ¡Ãte likvidaci transakcÃ, musÃte také zkontrolovat vÅ¡echny akce, "
+"které se k nim vážÃ, protože tyto nebudou zruÅ¡eny"
#. module: account
#: report:account.tax.code.entries:0
msgid "Accounting Entries-"
+<<<<<<< TREE
msgstr "ÚÄetnà zápisy-"
+=======
+msgstr "ÚÄetnà záznamy -"
+>>>>>>> MERGE-SOURCE
#. module: account
#: code:addons/account/account.py:1305
#, python-format
msgid "You can not delete posted movement: \"%s\"!"
+<<<<<<< TREE
msgstr "Nemůžet smazat vložené pohyby: \"%s\"!"
+=======
+msgstr "Nemůžet smazat zaúÄtované pohyby: \"%s\"!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.invoice:0
@@ -154,7 +187,11 @@
#: view:account.move.line.reconcile:0
#: view:account.move.line.reconcile.writeoff:0
msgid "Reconcile"
+<<<<<<< TREE
msgstr "VyrovnánÃ"
+=======
+msgstr "Likvidace"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.bank.statement.line,ref:0
@@ -169,7 +206,11 @@
#. module: account
#: view:account.open.closed.fiscalyear:0
msgid "Choose Fiscal Year "
+<<<<<<< TREE
msgstr "Vyberte Daňový rok "
+=======
+msgstr "VYberte fiskálnà rok "
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.payment.term,active:0
@@ -177,8 +218,13 @@
"If the active field is set to False, it will allow you to hide the payment "
"term without removing it."
msgstr ""
+<<<<<<< TREE
"Pokud je pole nastaveno na Nepravda, umožnà vám to skrýt platebnà obdobà bez "
"jejÃho odebránÃ."
+=======
+"Pokud je pole nastaveno na Nepravda, umožnà vám to skrýt platebnà obdobà bez "
+"jeho odebránÃ."
+>>>>>>> MERGE-SOURCE
#. module: account
#: code:addons/account/invoice.py:1436
@@ -195,12 +241,16 @@
#. module: account
#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
msgid "All Analytic Entries"
+<<<<<<< TREE
msgstr "Všechny analytické položky"
+=======
+msgstr "Všechny analytické záznamy"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
msgid "Invoices Created Within Past 15 Days"
-msgstr ""
+msgstr "Faktury vytvoÅ™ené v poslednÃch 15 dnech"
#. module: account
#: selection:account.account.type,sign:0
@@ -211,7 +261,11 @@
#: code:addons/account/wizard/account_move_journal.py:95
#, python-format
msgid "Journal: %s"
+<<<<<<< TREE
msgstr "DenÃk: %s"
+=======
+msgstr "Kniha: %s"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.analytic.journal,type:0
@@ -220,6 +274,9 @@
"invoice) to create analytic entries, OpenERP will look for a matching "
"journal of the same type."
msgstr ""
+"Udává typ analytické knihy. Pokud majà být pro dokument (např. fakturu) "
+"vytvoÅ™eny analytické položky, OpenERP bude hledet vyhovujÃcà knihu shodného "
+"typu."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -239,13 +296,18 @@
"No period defined for this date: %s !\n"
"Please create a fiscal year."
msgstr ""
+<<<<<<< TREE
"Nenà urÄena perioda pro tento datum: %s !\n"
"ProsÃme vytvoÅ™te daňový rok."
+=======
+"Pro toto datum: %s nenà definováno obdobÃ.\n"
+"ProsÃm vytvoÅ™te fiskálnà rok."
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_move_line_reconcile_select
msgid "Move line reconcile select"
-msgstr ""
+msgstr "Výběr likvidace pohybu"
#. module: account
#: help:account.model.line,sequence:0
@@ -253,6 +315,8 @@
"The sequence field is used to order the resources from lower sequences to "
"higher ones"
msgstr ""
+"Pole \"sequence\" je použito pro Å™azenà záznamů od nejnižšÃho ÄÃsla k "
+"nejvyÅ¡Å¡Ãmu"
#. module: account
#: help:account.tax.code,notprintable:0
@@ -261,17 +325,27 @@
"Check this box if you don't want any VAT related to this Tax Code to appear "
"on invoices"
msgstr ""
+"Zaškrtněte toto pole, pokud nechcete, aby se ve fakturách objevovalo k "
+"tomuto daňovému kódu žádné DPH"
#. module: account
#: code:addons/account/invoice.py:1224
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
+<<<<<<< TREE
msgstr "Faktura '%s' je ÄásteÄnÄ› zaplacená: %s%s of %s%s (%s%s zbývá)"
+=======
+msgstr "Faktura '%s' je zaplacená ÄásteÄnÄ›: %s%s z %s%s (zbývá %s%s)"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
msgid "Accounting entries are an input of the reconciliation."
+<<<<<<< TREE
msgstr "ÚÄetnà položky jsou vstupem vyrovnánÃ."
+=======
+msgstr "ÚÄetnà záznamy jsou vstupem likvidace"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
@@ -282,12 +356,20 @@
#: code:addons/account/account_move_line.py:1182
#, python-format
msgid "You can not add/modify entries in a closed journal."
+<<<<<<< TREE
msgstr "Nemůžete pÅ™ida/upravit položky v uzavÅ™eném denÃku."
+=======
+msgstr "Nemůžete přidávat/upravovat položky v uzavřené knize."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.bank.statement:0
msgid "Calculated Balance"
+<<<<<<< TREE
msgstr "SpoÄÃtat rozvahu"
+=======
+msgstr "VypoÄtený zůstatek"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
@@ -299,7 +381,11 @@
#. module: account
#: view:account.fiscalyear.close.state:0
msgid "Close Fiscalyear"
+<<<<<<< TREE
msgstr "UzavÅ™Ãt finaÄnà rok"
+=======
+msgstr "UzávÄ›rka fiskálnÃho roku"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.automatic.reconcile,allow_write_off:0
@@ -314,13 +400,13 @@
#. module: account
#: view:account.move.line:0
msgid "St."
-msgstr ""
+msgstr "Sv."
#. module: account
#: code:addons/account/invoice.py:532
#, python-format
msgid "Invoice line account company does not match with invoice company."
-msgstr ""
+msgstr "Firma řádku faktury nesouhlasàs firmou faktury"
#. module: account
#: field:account.journal.column,field:0
@@ -333,6 +419,8 @@
"Installs localized accounting charts to match as closely as possible the "
"accounting needs of your company based on your country."
msgstr ""
+"Nainstaluje lokalizované úÄtové rozvrhy, co nejlépe odpovÃdajÃcà úÄetnÃm "
+"potřebám vašà firmy a vašà země."
#. module: account
#: code:addons/account/wizard/account_move_journal.py:63
@@ -343,11 +431,15 @@
"You can create one in the menu: \n"
"Configuration/Financial Accounting/Accounts/Journals."
msgstr ""
+"Pro tuto firmu neexistuje úÄetnà kniha typu %s.\n"
+"\n"
+"Můžete ji vytvoÅ™it v nabÃdce:\n"
+"Konfigurace/FinanÄnà úÄetnictvÃ/ÚÄty/Knihy"
#. module: account
#: model:ir.model,name:account.model_account_unreconcile
msgid "Account Unreconcile"
-msgstr ""
+msgstr "Zrušit likvidaci"
#. module: account
#: view:product.product:0
@@ -377,6 +469,9 @@
"OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
"Cash Registers, or Customer/Supplier payments."
msgstr ""
+"Tento pohled je použÃván úÄetnÃmi pro hromadné vytvářenà záznamů. OpenERP "
+"vytvořà záznamy, když použijete bankovnà výpisy, pokladnu nebo platby "
+"klientů Äi dodavatelům."
#. module: account
#: model:ir.model,name:account.model_account_tax_template
@@ -397,12 +492,12 @@
#. module: account
#: selection:account.journal,type:0
msgid "Purchase Refund"
-msgstr ""
+msgstr "Dobropis přijatý"
#. module: account
#: selection:account.journal,type:0
msgid "Opening/Closing Situation"
-msgstr ""
+msgstr "PoÄáteÄnÃ/koneÄný stav"
#. module: account
#: help:account.journal,currency:0
@@ -412,7 +507,11 @@
#. module: account
#: field:account.open.closed.fiscalyear,fyear_id:0
msgid "Fiscal Year to Open"
+<<<<<<< TREE
msgstr "FinanÄnà rok k otevÅ™enÃ"
+=======
+msgstr "Fiskálnà rok k otevÅ™enÃ"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.journal,sequence_id:0
@@ -420,11 +519,16 @@
"This field contains the informatin related to the numbering of the journal "
"entries of this journal."
msgstr ""
+"Toto pole obsahuje informace souvisejÃcà s ÄÃslovánÃm záznamů této knihy."
#. module: account
#: field:account.journal,default_debit_account_id:0
msgid "Default Debit Account"
+<<<<<<< TREE
msgstr "Výchozà dluhový úÄet"
+=======
+msgstr "Výchozà debetnà úÄet"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.move:0
@@ -439,7 +543,11 @@
#. module: account
#: view:account.move.line.unreconcile.select:0
msgid "Open For Unreconciliation"
+<<<<<<< TREE
msgstr "OtevÅ™Ãt pro vyrovnánÃ"
+=======
+msgstr "OtevÅ™Ãt pro zruÅ¡enà likvidace"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.fiscal.position.template,chart_template_id:0
@@ -460,6 +568,9 @@
"it comes to 'Printed' state. When all transactions are done, it comes in "
"'Done' state."
msgstr ""
+"Když je vytvořen záznam v knize, jeho stav je \"Draft\". Když je vytištěn "
+"report, stav se změnà na \"Printed\". Když jsou hotovy všechny transakce, "
+"záznam přejde do stavu \"Done\"."
#. module: account
#: model:ir.actions.act_window,help:account.action_account_tax_chart
@@ -469,6 +580,10 @@
"amount of each area of the tax declaration for your country. It’s presented "
"in a hierarchical structure, which can be modified to fit your needs."
msgstr ""
+"Daňový pÅ™ehled je strom reprezentujÃcà strukturu daňových kódů Äi pÅ™Ãpadů, "
+"který zobrazuje aktuálnà daňovou situaci. Přehled zobrazuje výši všech "
+"oblastà daňového přiznánà pro vaši zemi. Je strukturován hierarchicky a může "
+"být podle potřeby upraven."
#. module: account
#: view:account.analytic.line:0
@@ -502,7 +617,11 @@
#: field:validate.account.move,journal_id:0
#, python-format
msgid "Journal"
+<<<<<<< TREE
msgstr "DenÃk"
+=======
+msgstr "Kniha"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_invoice_confirm
@@ -517,7 +636,11 @@
#. module: account
#: field:account.bank.statement,account_id:0
msgid "Account used in this journal"
+<<<<<<< TREE
msgstr "ÚÄet použitý v tomto denÃku"
+=======
+msgstr "ÚÄet použitý v této knize"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.aged.trial.balance,chart_account_id:0
@@ -536,17 +659,25 @@
#: help:account.report.general.ledger,chart_account_id:0
#: help:account.vat.declaration,chart_account_id:0
msgid "Select Charts of Accounts"
-msgstr ""
+msgstr "Vyberte úÄtový rozvrh"
#. module: account
#: view:product.product:0
msgid "Purchase Taxes"
+<<<<<<< TREE
msgstr "Daně nákupu"
+=======
+msgstr "Nákupnà daně"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_invoice_refund
msgid "Invoice Refund"
+<<<<<<< TREE
msgstr "Vrácenà faktury"
+=======
+msgstr "Dobropis vydaný"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.overdue:0
@@ -556,13 +687,17 @@
#. module: account
#: field:account.automatic.reconcile,unreconciled:0
msgid "Not reconciled transactions"
+<<<<<<< TREE
msgstr "Žádné vyrovnané transakce"
+=======
+msgstr "Nezlikvidované transakce"
+>>>>>>> MERGE-SOURCE
#. module: account
#: code:addons/account/account_cash_statement.py:349
#, python-format
msgid "CashBox Balance is not matching with Calculated Balance !"
-msgstr ""
+msgstr "Stav pokladny neodpovÃdá vypoÄtenému zůstatku!"
#. module: account
#: view:account.fiscal.position:0
@@ -575,12 +710,20 @@
#: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state
#: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
msgid "Close a Fiscal Year"
+<<<<<<< TREE
msgstr "UzavÅ™Ãt finanÄnà rok"
+=======
+msgstr "UzavÅ™Ãt fiskálnà rok"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
msgid "The accountant confirms the statement."
+<<<<<<< TREE
msgstr "ÚÄetnà potvrzuje pÅ™Ãkaz"
+=======
+msgstr "ÚÄetnà potvrzuje výpis."
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.balance.report,display_account:0
@@ -596,12 +739,20 @@
#. module: account
#: field:account.invoice.report,address_invoice_id:0
msgid "Invoice Address Name"
+<<<<<<< TREE
msgstr "Jméno adresy faktury"
+=======
+msgstr "Název pÅ™Ãjemce faktury"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.installer,period:0
msgid "3 Monthly"
+<<<<<<< TREE
msgstr "3 mÄ›sÃce"
+=======
+msgstr "KvartálnÃ"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.unreconcile.reconcile:0
@@ -609,6 +760,8 @@
"If you unreconciliate transactions, you must also verify all the actions "
"that are linked to those transactions because they will not be disable"
msgstr ""
+"Pokud zruÅ¡Ãte likvidaci transakcÃ, musÃte také zkontrolovat vÅ¡echny akce, "
+"které s nimi souvisejÃ, protože tyto nebudou zruÅ¡eny"
#. module: account
#: view:analytic.entries.report:0
@@ -618,7 +771,7 @@
#. module: account
#: field:ir.sequence,fiscal_ids:0
msgid "Sequences"
-msgstr "Posloupnosti"
+msgstr "ÄŒÃselné Å™ady"
#. module: account
#: view:account.fiscal.position.template:0
@@ -628,12 +781,20 @@
#. module: account
#: report:account.central.journal:0
msgid "Centralized Journal"
+<<<<<<< TREE
msgstr "Centralizovaný denÃk"
+=======
+msgstr "Centralizovaná kniha"
+>>>>>>> MERGE-SOURCE
#. module: account
#: sql_constraint:account.sequence.fiscalyear:0
msgid "Main Sequence must be different from current !"
+<<<<<<< TREE
msgstr "Hlavnà posloupnost musà být odlišná od aktuálnà !"
+=======
+msgstr "Hlavnà ÄÃselná Å™ada musà být odliÅ¡ná od souÄasné!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice.tax,tax_amount:0
@@ -645,18 +806,22 @@
#: code:addons/account/installer.py:434
#, python-format
msgid "SAJ"
-msgstr ""
+msgstr "KFV"
#. module: account
#: help:account.bank.statement,balance_end_real:0
msgid "closing balance entered by the cashbox verifier"
-msgstr ""
+msgstr "koneÄný zůstatek zadaný ověřovatelem pokladny"
#. module: account
#: view:account.period:0
#: view:account.period.close:0
msgid "Close Period"
+<<<<<<< TREE
msgstr "UkonÄit obdobÃ"
+=======
+msgstr "UzavÅ™Ãt obdobÃ"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_common_partner_report
@@ -666,19 +831,27 @@
#. module: account
#: field:account.fiscalyear.close,period_id:0
msgid "Opening Entries Period"
+<<<<<<< TREE
msgstr "Obdobà otvÃracÃch položek"
+=======
+msgstr "Obdobà poÄáteÄnÃch zůstatků"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_journal_period
msgid "Journal Period"
+<<<<<<< TREE
msgstr "Obdobà denÃku"
+=======
+msgstr "Obdobà knihy"
+>>>>>>> MERGE-SOURCE
#. module: account
#: code:addons/account/account_move_line.py:723
#: code:addons/account/account_move_line.py:767
#, python-format
msgid "To reconcile the entries company should be the same for all entries"
-msgstr ""
+msgstr "Při likvidaci záznamů by u všech měla být stejná firma"
#. module: account
#: view:account.account:0
@@ -690,12 +863,20 @@
#: model:ir.actions.act_window,name:account.action_aged_receivable
#, python-format
msgid "Receivable Accounts"
+<<<<<<< TREE
msgstr "ÚÄety pohledávek"
+=======
+msgstr "Pohledávky"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_report_general_ledger
msgid "General Ledger Report"
+<<<<<<< TREE
msgstr "ˇ"
+=======
+msgstr "Hlavnà kniha"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice:0
@@ -705,19 +886,36 @@
#. module: account
#: view:account.use.model:0
msgid "Are you sure you want to create entries?"
+<<<<<<< TREE
msgstr "Chcete opravdu vytvořit položky?"
+=======
+msgstr "Opravdu chcete vytvořit záznamy?"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.bank.accounts.wizard,account_type:0
msgid "Check"
+<<<<<<< TREE
msgstr "Zkontrolovat"
+=======
+msgstr "Šekový"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.partner.reconcile.process,today_reconciled:0
msgid "Partners Reconciled Today"
-msgstr ""
-
-#. module: account
+msgstr "Dnes likvidovanà partneři"
+
+#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_bank_statement.py:306
+#, python-format
+msgid "The statement balance is incorrect !\n"
+msgstr "Nesprávný zůstatek výpisu!\n"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
msgid "Percent"
@@ -864,6 +1062,7 @@
#. module: account
#: report:account.overdue:0
+#: report:account.aged_trial_balance:0
msgid "Due"
msgstr "Do"
@@ -916,7 +1115,11 @@
#. module: account
#: model:process.node,note:account.process_node_accountingstatemententries0
msgid "Bank statement"
+<<<<<<< TREE
msgstr "Bankovnà pÅ™Ãkaz"
+=======
+msgstr "Bankovnà výpis"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.analytic.line,move_id:0
@@ -955,6 +1158,10 @@
#: field:account.journal,code:0
#: report:account.partner.balance:0
#: field:account.period,code:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Code"
msgstr "Kód"
@@ -1072,7 +1279,11 @@
#. module: account
#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
msgid "Confirm statement"
+<<<<<<< TREE
msgstr "Potvrdit pÅ™Ãkaz"
+=======
+msgstr "Potvrdit výpis"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.fiscal.position.tax,tax_dest_id:0
@@ -1276,6 +1487,7 @@
#. module: account
#: model:ir.ui.menu,name:account.next_id_22
+#: report:account.aged_trial_balance:0
msgid "Partners"
msgstr "Partneři"
@@ -1286,7 +1498,11 @@
#: model:process.node,name:account.process_node_bankstatement0
#: model:process.node,name:account.process_node_supplierbankstatement0
msgid "Bank Statement"
+<<<<<<< TREE
msgstr "Bankovnà pÅ™Ãkaz"
+=======
+msgstr "Bankovnà výpis"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:res.partner:0
@@ -1373,6 +1589,9 @@
"entry per accounting document: invoice, refund, supplier payment, bank "
"statements, etc."
msgstr ""
+"Záznam v knize se skládá z položek, kde každá je debetnà nebo kreditnà "
+"transakcÃ. OpenERP automaticky vytvořà jeden záznam v knize pro každý úÄetnà "
+"dokument: fakturu, dobropis, platbu dodavateli, bankovnà výpis atd."
#. module: account
#: view:account.entries.report:0
@@ -1411,6 +1630,7 @@
msgstr "Anglosaské úÄetnictvÃ"
#. module: account
+<<<<<<< TREE
#: selection:account.account,type:0
#: selection:account.account.template,type:0
#: selection:account.bank.statement,state:0
@@ -1420,6 +1640,12 @@
#: selection:account.period,state:0
msgid "Closed"
msgstr "Uzavřeno"
+=======
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr "Přesun odpisu"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
@@ -1475,7 +1701,11 @@
#. module: account
#: view:account.bank.statement:0
msgid "Search Bank Statements"
+<<<<<<< TREE
msgstr "Hledat bankovnà pÅ™Ãkazy"
+=======
+msgstr "Hledat v bankovnÃch výpisech"
+>>>>>>> MERGE-SOURCE
#. module: account
#: sql_constraint:account.model.line:0
@@ -1499,7 +1729,11 @@
#: view:account.bank.statement:0
#: field:account.bank.statement,line_ids:0
msgid "Statement lines"
+<<<<<<< TREE
msgstr "Řádky pÅ™Ãkazů"
+=======
+msgstr "Řádky výpisu"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,help:account.action_bank_statement_tree
@@ -1511,6 +1745,10 @@
"the Payment column of a line, you can press F1 to open the reconciliation "
"form."
msgstr ""
+"Bankovnà výpis je souhrn vÅ¡ech transakcà v daném obdobà na bankovnÃm úÄtu. "
+"PoÄáteÄnà zůstatek je vyplnÄ›n automaticky, koneÄný byste mÄ›li najÃt na "
+"výpisu z banky. Když jste ve sloupci Platba v položce, stiskem F1 vyvoláte "
+"likvidaci."
#. module: account
#: report:account.analytic.account.cost_ledger:0
@@ -1596,12 +1834,16 @@
#. module: account
#: field:account.tax.code,sum:0
msgid "Year Sum"
+<<<<<<< TREE
msgstr "RoÄnà souÄet"
#. module: account
#: model:ir.actions.report.xml,name:account.report_account_voucher_new
msgid "Print Voucher"
msgstr ""
+=======
+msgstr "RoÄnà souÄet"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.change.currency:0
@@ -1668,12 +1910,16 @@
#. module: account
#: selection:account.partner.balance,display_partner:0
msgid "All Partners"
+<<<<<<< TREE
msgstr "Všichni partneři"
#. module: account
#: report:account.move.voucher:0
msgid "Ref. :"
msgstr ""
+=======
+msgstr "Všichni partneři"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.analytic.chart:0
@@ -1704,7 +1950,11 @@
#. module: account
#: model:process.node,name:account.process_node_draftstatement0
msgid "Draft statement"
+<<<<<<< TREE
msgstr "Návrh pÅ™Ãkazu"
+=======
+msgstr "Rozpracovaný výpis"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.tax:0
@@ -1887,12 +2137,16 @@
#: field:account.installer.modules,config_logo:0
#: field:wizard.multi.charts.accounts,config_logo:0
msgid "Image"
+<<<<<<< TREE
msgstr "Obrázek"
#. module: account
#: report:account.move.voucher:0
msgid "Canceled"
msgstr ""
+=======
+msgstr "Obrázek"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice:0
@@ -1916,6 +2170,8 @@
"be with same name as statement name. This allows the statement entries to "
"have the same references than the statement itself"
msgstr ""
+"Jestliže zadáte název jiný než \"/\", budou se stejně jmenovat i vytvořené "
+"úÄetnà záznamy."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_unreconcile
@@ -1948,7 +2204,7 @@
#. module: account
#: model:process.transition,note:account.process_transition_filestatement0
msgid "Import of the statement in the system from an electronic file"
-msgstr ""
+msgstr "Import výpisu v elektronické podobě."
#. module: account
#: model:process.node,name:account.process_node_importinvoice0
@@ -2125,6 +2381,11 @@
#: report:account.third_party_ledger_other:0
#: report:account.vat.declaration:0
#: model:ir.model,name:account.model_account_fiscalyear
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
msgid "Fiscal Year"
msgstr "Přestupný rok(Fiscal Year)"
@@ -2467,7 +2728,11 @@
#: model:ir.actions.act_window,name:account.action_bank_statement_tree
#: model:ir.ui.menu,name:account.menu_bank_statement_tree
msgid "Bank Statements"
+<<<<<<< TREE
msgstr "Bankovnà pÅ™Ãkazy"
+=======
+msgstr "Bankovnà výpisy"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.tax.template,applicable_type:0
@@ -2600,11 +2865,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Number:"
-msgstr ""
-
-#. module: account
#: selection:account.print.journal,sort_selection:0
msgid "Reference Number"
msgstr "ReferenÄnà ÄÃslo"
@@ -2651,7 +2911,7 @@
#: help:account.bank.statement,account_id:0
msgid ""
"used in statement reconciliation domain, but shouldn't be used elswhere."
-msgstr ""
+msgstr "použito v rámci likvidace výpisu, nemÄ›lo by se použÃvat jinde"
#. module: account
#: field:account.invoice.tax,base_amount:0
@@ -2830,6 +3090,7 @@
msgstr "Pohled"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
@@ -2837,6 +3098,9 @@
#. module: account
#: code:addons/account/account.py:2950
+=======
+#: code:addons/account/account.py:2950
+>>>>>>> MERGE-SOURCE
#: code:addons/account/installer.py:296
#, python-format
msgid "BNK"
@@ -2927,6 +3191,12 @@
msgstr ""
#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+#, python-format
+msgid "No End of year journal defined for the fiscal year"
+msgstr ""
+
+#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the expense account"
@@ -3036,11 +3306,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Journal:"
-msgstr ""
-
-#. module: account
#: view:account.bank.statement:0
#: selection:account.bank.statement,state:0
#: view:account.invoice:0
@@ -3084,12 +3349,16 @@
#. module: account
#: selection:account.subscription,period_type:0
msgid "year"
+<<<<<<< TREE
msgstr "rok"
#. module: account
#: report:account.move.voucher:0
msgid "Authorised Signatory"
msgstr ""
+=======
+msgstr "rok"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:validate.account.move.lines:0
@@ -3115,9 +3384,11 @@
msgstr "Přesuny"
#. module: account
-#: view:account.payment.term.line:0
-msgid " value amount: n.a"
-msgstr ""
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
+msgstr "Nevyrovnaný"
#. module: account
#: view:account.chart:0
@@ -3822,6 +4093,8 @@
"the system on document validation (invoices, bank statements...) and will be "
"created in 'Posted' state."
msgstr ""
+"RuÄnÄ› vytvoÅ™ené úÄetnà záznamy jsou typicky založeny jako nezaúÄtované. Toto "
+"jde pro vybrané knihy pÅ™eskakovat, takže založené záznamy se rovnou zaúÄtujÃ."
#. module: account
#: code:addons/account/account_analytic_line.py:90
@@ -3920,7 +4193,7 @@
#. module: account
#: model:process.node,note:account.process_node_importinvoice0
msgid "Statement from invoice or payment"
-msgstr ""
+msgstr "Výpis z faktury nebo platby"
#. module: account
#: view:account.payment.term.line:0
@@ -3952,7 +4225,7 @@
#. module: account
#: model:process.transition,note:account.process_transition_paymentorderreconcilation0
msgid "Bank statements are entered in the system."
-msgstr ""
+msgstr "Bankovnà výpisy jsou zadány do systému."
#. module: account
#: code:addons/account/wizard/account_reconcile.py:133
@@ -4049,6 +4322,15 @@
msgstr ""
#. module: account
+#: constraint:account.account:0
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error! \n"
+"You cannot define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
msgid "Account Analytic Cost Ledger For Journal Report"
msgstr ""
@@ -4124,6 +4406,7 @@
#: constraint:account.account:0
#: constraint:account.tax.code:0
msgid "Error ! You can not create recursive accounts."
+<<<<<<< TREE
msgstr "Chyba ! Nemůžete vytvoÅ™it rekurzivnà úÄty."
#. module: account
@@ -4132,6 +4415,9 @@
"You cannot create an account! \n"
"Make sure if the account has children then it should be type \"View\"!"
msgstr ""
+=======
+msgstr "Chyba ! Nemůžete vytvoÅ™it rekurzivnà úÄty."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.subscription.generate:0
@@ -4207,7 +4493,17 @@
#. module: account
#: report:account.account.balance.landscape:0
msgid "Account Balance -"
-msgstr "Zůstatek úÄtu -"
+<<<<<<< TREE
+msgstr "Zůstatek úÄtu -"
+=======
+msgstr "Zůstatek úÄtu -"
+
+#. module: account
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+msgstr "Faktura "
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.automatic.reconcile,date1:0
@@ -4301,7 +4597,7 @@
#. module: account
#: help:account.move.line,statement_id:0
msgid "The bank statement used for bank reconciliation"
-msgstr ""
+msgstr "Bankovnà výpis použitý pro likvidaci banky"
#. module: account
#: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
@@ -4355,6 +4651,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:952
#: code:addons/account/account.py:954
#: code:addons/account/account.py:1195
@@ -4378,6 +4675,15 @@
#, python-format
msgid "Error"
msgstr "Chyba"
+=======
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"With Supplier Refunds you can manage the credit notes you receive from your "
+"suppliers. A refund is a document that credits an invoice completely or "
+"partially. You can easily generate refunds and reconcile them directly from "
+"the invoice form."
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.analytic.Journal.report,date2:0
@@ -4511,6 +4817,11 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,target_move:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
msgid "Target Moves"
msgstr "CÃlové pohyby"
@@ -4627,6 +4938,8 @@
#: view:account.bs.report:0
#: model:ir.actions.act_window,name:account.action_account_bs_report
#: model:ir.ui.menu,name:account.menu_account_bs_report
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
msgid "Balance Sheet"
msgstr "Zůstatkový list"
@@ -4721,6 +5034,7 @@
msgstr "Daň z dÄ›tÃ"
#. module: account
+<<<<<<< TREE
#: constraint:account.move.line:0
msgid ""
"You can not create move line on receivable/payable account without partner"
@@ -4728,6 +5042,9 @@
#. module: account
#: code:addons/account/account.py:2081
+=======
+#: code:addons/account/account.py:2081
+>>>>>>> MERGE-SOURCE
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "No period found !"
@@ -5500,8 +5817,13 @@
#. module: account
#: code:addons/account/invoice.py:997
#, python-format
+<<<<<<< TREE
msgid "Invoice '%s' is validated."
msgstr ""
+=======
+msgid "is validated."
+msgstr "nenà platné."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.chart.template:0
@@ -5555,7 +5877,11 @@
#. module: account
#: report:account.vat.declaration:0
msgid "Tax Statement"
+<<<<<<< TREE
msgstr "Daňový pÅ™Ãkaz"
+=======
+msgstr "Daňový výkaz"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_res_company
@@ -6018,6 +6344,8 @@
"corresponds with the entries (or records) of that account in your accounting "
"system."
msgstr ""
+"Likvidace banky spoÄÃvá v kontrole, že bankovnà výpis odpovÃdá záznamům v "
+"úÄetnictvÃ."
#. module: account
#: model:process.node,note:account.process_node_draftstatement0
@@ -6179,6 +6507,11 @@
msgstr ""
#. module: account
+#: report:account.general.ledger_landscape:0
+msgid "JRNL"
+msgstr "JRNL"
+
+#. module: account
#: view:account.partner.balance:0
#: view:account.partner.ledger:0
msgid ""
@@ -6301,6 +6634,8 @@
#: report:account.general.journal:0
#: report:account.invoice:0
#: report:account.partner.balance:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Total:"
msgstr "Celkem:"
@@ -6374,7 +6709,7 @@
#. module: account
#: model:process.transition,note:account.process_transition_invoicemanually0
msgid "A statement with manual entries becomes a draft statement."
-msgstr ""
+msgstr "Výpis s ruÄnÄ› zadanými položkami je nastaven jako rozpracovaný."
#. module: account
#: view:account.aged.trial.balance:0
@@ -6409,7 +6744,11 @@
#. module: account
#: model:ir.ui.menu,name:account.menu_menu_Bank_process
msgid "Statements Reconciliation"
+<<<<<<< TREE
msgstr "Vyrovnánà pÅ™Ãkazů"
+=======
+msgstr "Likvidace výpisů"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.invoice:0
@@ -6531,7 +6870,11 @@
#: field:account.move.line,statement_id:0
#: model:process.process,name:account.process_process_statementprocess0
msgid "Statement"
+<<<<<<< TREE
msgstr "PÅ™Ãkaz"
+=======
+msgstr "Výpis"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.journal,default_debit_account_id:0
@@ -6627,7 +6970,7 @@
#. module: account
#: model:ir.model,name:account.model_account_bank_statement_line
msgid "Bank Statement Line"
-msgstr ""
+msgstr "Řádek bankovnÃho výpisu"
#. module: account
#: field:account.automatic.reconcile,date2:0
@@ -6804,11 +7147,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.entries.report,move_line_state:0
#: view:account.move.line:0
#: selection:account.move.line,state:0
msgid "Unbalanced"
msgstr "Nevyrovnaný"
+=======
+#: view:account.payment.term.line:0
+msgid " value amount: n.a"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.move.line,centralisation:0
@@ -7139,12 +7488,16 @@
#: view:account.subscription.generate:0
#: model:ir.model,name:account.model_account_subscription_generate
msgid "Subscription Compute"
+<<<<<<< TREE
msgstr "VypoÄÃtat pÅ™edpaltné"
#. module: account
#: report:account.move.voucher:0
msgid "Amount (in words) :"
msgstr ""
+=======
+msgstr "VypoÄÃtat pÅ™edpaltné"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.bank.statement.line,partner_id:0
@@ -7327,6 +7680,9 @@
"will see the taxes with codes related to your legal statement according to "
"your country."
msgstr ""
+"Tento daňový přehled sloužà k vytvářenà pravidelných daňových výkazů. "
+"UvidÃte v nÄ›m danÄ› a jejich kódy pÅ™ÃsluÅ¡ejÃcà k daňovým pÅ™iznánÃm podle vaÅ¡Ã "
+"zemÄ›."
#. module: account
#: view:account.installer.modules:0
@@ -7492,6 +7848,11 @@
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
msgid "Chart of Account"
msgstr ""
@@ -7607,6 +7968,10 @@
#: report:account.general.journal:0
#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Filter By"
msgstr "Filtrovat podle"
@@ -7663,7 +8028,11 @@
#. module: account
#: view:account.vat.declaration:0
msgid "Print Tax Statement"
+<<<<<<< TREE
msgstr "Tisknout daňový pÅ™Ãkaz"
+=======
+msgstr "Tisk daňového výkazu"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.model.line:0
@@ -7810,7 +8179,7 @@
msgid ""
"The amount of the voucher must be the same amount as the one on the "
"statement line"
-msgstr ""
+msgstr "Částka na dokladu musà odpovÃdat Äástce v řádku výpisu"
#. module: account
#: code:addons/account/account_move_line.py:1137
@@ -7869,7 +8238,7 @@
#: help:account.bank.statement.line,sequence:0
msgid ""
"Gives the sequence order when displaying a list of bank statement lines."
-msgstr ""
+msgstr "UrÄuje poÅ™adà v zobrazenà seznamu řádků výpisu"
#. module: account
#: model:process.transition,note:account.process_transition_validentries0
@@ -8146,6 +8515,7 @@
#. module: account
#: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
msgid "Analysis Direction"
msgstr ""
@@ -8210,23 +8580,43 @@
msgstr "Aktuálnà měna nenà správně nastavena !"
#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree4
-msgid ""
-"With Supplier Refunds you can manage the credit notes you receive from your "
-"suppliers. A refund is a document that credits an invoice completely or "
-"partially. You can easily generate refunds and reconcile them directly from "
-"the invoice form."
-msgstr ""
+#: code:addons/account/account.py:952
+#: code:addons/account/account.py:954
+#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1411
+#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:120
+#: code:addons/account/wizard/account_report_common.py:126
+#, python-format
+msgid "Error"
+msgstr "Chyba"
#. module: account
#: view:account.account.template:0
msgid "Receivale Accounts"
+<<<<<<< TREE
msgstr "PÅ™Ãjmové úÄty"
#. module: account
#: report:account.move.voucher:0
msgid "Particulars"
msgstr ""
+=======
+msgstr "PÅ™Ãjmové úÄty"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.account.type,report_type:0
@@ -8262,6 +8652,10 @@
#: report:account.third_party_ledger_other:0
#: field:report.account.receivable,balance:0
#: field:report.aged.receivable,balance:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Balance"
msgstr "Zůstatek"
@@ -8272,7 +8666,15 @@
#. module: account
#: report:account.account.balance:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+>>>>>>> MERGE-SOURCE
msgid "Display Account"
msgstr "Zobrazit úÄet"
@@ -8337,7 +8739,7 @@
#: code:addons/account/account_bank_statement.py:391
#, python-format
msgid "Cannot delete bank statement(s) which are already confirmed !"
-msgstr ""
+msgstr "Nelze smazat bankovnà výpis, který už byl potvrzen!"
#. module: account
#: code:addons/account/wizard/account_automatic_reconcile.py:152
@@ -8367,11 +8769,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Receiver's Signature"
-msgstr ""
-
-#. module: account
#: report:account.general.ledger:0
#: report:account.journal.period.print:0
#: report:account.third_party_ledger:0
@@ -8408,7 +8805,11 @@
#. module: account
#: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
msgid "Bank statements"
+<<<<<<< TREE
msgstr "Bankovnà pÅ™Ãkazy"
+=======
+msgstr "Bankovnà výpisy"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.addtmpl.wizard,cparent_id:0
@@ -8575,6 +8976,7 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,date_from:0
+#: report:account.aged_trial_balance:0
msgid "Start Date"
msgstr "PoÄáteÄnà datum"
@@ -8720,11 +9122,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Through :"
-msgstr ""
-
-#. module: account
#: view:account.general.journal:0
#: model:ir.ui.menu,name:account.menu_account_general_journal
msgid "General Journals"
@@ -8903,12 +9300,16 @@
#: field:account.account.template,type:0
#: field:account.entries.report,type:0
msgid "Internal Type"
+<<<<<<< TREE
msgstr "Vnitřnà typ"
#. module: account
#: report:account.move.voucher:0
msgid "State:"
msgstr ""
+=======
+msgstr "Vnitřnà typ"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_running
@@ -9045,6 +9446,7 @@
#: field:report.account.sales,amount_total:0
#: field:report.account_type.sales,amount_total:0
#: field:report.invoice.created,amount_total:0
+#: report:account.aged_trial_balance:0
msgid "Total"
msgstr "Celkem"
@@ -9125,13 +9527,13 @@
#. module: account
#: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
msgid "Draft statements"
-msgstr ""
+msgstr "Rozpracované výpisy"
#. module: account
#: model:process.transition,note:account.process_transition_statemententries0
msgid ""
"Manual or automatic creation of payment entries according to the statements"
-msgstr ""
+msgstr "Manuálnà nebo automatické vytvořenà záznamů o platbách podle výpisů"
#. module: account
#: view:account.invoice:0
@@ -9180,6 +9582,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: report:account.move.voucher:0
msgid "On Account of :"
msgstr ""
@@ -9189,6 +9592,17 @@
#: view:account.move.line.reconcile.writeoff:0
msgid "Write-Off Move"
msgstr "Přesun odpisu"
+=======
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
+msgstr "Uzavřeno"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.node,note:account.process_node_paidinvoice0
@@ -9247,6 +9661,7 @@
#. module: account
#: constraint:account.account.template:0
msgid "Error ! You can not create recursive account templates."
+<<<<<<< TREE
msgstr "Chyba ! Nemůžete vytvoÅ™it rekurzivnà šablony úÄtu."
#. module: account
@@ -9256,6 +9671,9 @@
"Make sure if the account template has parent then it should be type "
"\"View\"! "
msgstr ""
+=======
+msgstr "Chyba ! Nemůžete vytvoÅ™it rekurzivnà šablony úÄtu."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.subscription:0
@@ -9363,7 +9781,7 @@
#: model:process.transition,note:account.process_transition_invoiceimport0
msgid ""
"Import of the statement in the system from a supplier or customer invoice"
-msgstr ""
+msgstr "Import výpisu do systému z vydané nebo přijaté faktury"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
@@ -9543,6 +9961,7 @@
#: field:account.partner.ledger,result_selection:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
+#: report:account.aged_trial_balance:0
msgid "Partner's"
msgstr "Partneři"
@@ -9667,6 +10086,7 @@
"The residual amount on a receivable or payable of a journal entry expressed "
"in its currency (maybe different of the company currency)."
msgstr ""
+<<<<<<< TREE
#~ msgid "Generate entries before:"
#~ msgstr "Generovat položky před:"
@@ -9878,3 +10298,51 @@
#, python-format
#~ msgid "is validated."
#~ msgstr "nenà platné."
+=======
+
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+msgid "Liabilities"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+msgid "Balance:"
+msgstr ""
+
+#. module: account
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+msgid "Particular"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Aged Trial Balance"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Period Length(days)"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Account Total"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Not due"
+msgstr ""
+>>>>>>> MERGE-SOURCE
=== modified file 'account/i18n/da.po'
--- account/i18n/da.po 2011-04-29 05:56:18 +0000
+++ account/i18n/da.po 2011-08-02 06:32:40 +0000
@@ -7,15 +7,25 @@
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2010-11-22 07:21+0000\n"
+=======
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2011-01-19 12:00+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Martin Pihl <martinpihl@xxxxxxxxx>\n"
"Language-Team: Danish <da@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-29 05:05+0000\n"
"X-Generator: Launchpad (build 12758)\n"
+=======
+"X-Launchpad-Export-Date: 2011-07-23 05:36+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,13 +38,7 @@
msgstr "Andre indstillinger"
#. module: account
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#, python-format
-msgid "No End of year journal defined for the fiscal year"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:506
+#: code:addons/account/account.py:516
#, python-format
msgid ""
"You cannot remove/deactivate an account which is set as a property to any "
@@ -66,7 +70,7 @@
msgstr "Resterende"
#. module: account
-#: code:addons/account/invoice.py:785
+#: code:addons/account/invoice.py:793
#, python-format
msgid "Please define sequence on invoice journal"
msgstr ""
@@ -131,7 +135,7 @@
msgstr "Konto posteringer-"
#. module: account
-#: code:addons/account/account.py:1291
+#: code:addons/account/account.py:1305
#, python-format
msgid "You can not delete posted movement: \"%s\"!"
msgstr ""
@@ -175,7 +179,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1421
+#: code:addons/account/invoice.py:1436
#, python-format
msgid "Warning!"
msgstr ""
@@ -227,7 +231,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:901
+#: code:addons/account/account.py:915
#, python-form
Follow ups
