credativ team mailing list archive
-
credativ team
-
Mailing list archive
-
Message #04859
[Merge] lp:~therp-nl/openupgrade-addons/6.0-hr-project-stock into lp:openupgrade-addons
Stefan Rijnhart (Therp) has proposed merging lp:~therp-nl/openupgrade-addons/6.0-hr-project-stock into lp:openupgrade-addons.
Requested reviews:
OpenUpgrade Committers (openupgrade-committers)
For more details, see:
https://code.launchpad.net/~therp-nl/openupgrade-addons/6.0-hr-project-stock/+merge/109194
This branch adds support for migrating the following modules from OpenERP 5 to OpenERP 6.0:
account_analytic_analysis
account_analytic_default
account_analytic_plans
account_budget
account_payment
analytic_user_function
audittrail
base_iban
base_report_creator
base_report_designer
board
hr
hr_attendance
hr_contract
hr_expense
hr_timesheet
hr_timesheet_invoice
hr_timesheet_sheet
mrp
process
procurement
product
project
project_timesheet
purchase
purchase_analytic_plans
sale
sale_analytic_plans
sale_journal
stock
The scripts in this branch use some new API additions from in https://code.launchpad.net/~therp-nl/openupgrade-server/6.0-API_and_loading_improvements
--
The attached diff has been truncated due to its size.
https://code.launchpad.net/~therp-nl/openupgrade-addons/6.0-hr-project-stock/+merge/109194
Your team OpenUpgrade Committers is requested to review the proposed merge of lp:~therp-nl/openupgrade-addons/6.0-hr-project-stock into lp:openupgrade-addons.
=== modified file 'account/account.py'
--- account/account.py 2012-03-22 12:24:19 +0000
+++ account/account.py 2012-06-07 17:42:47 +0000
@@ -284,8 +284,12 @@
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 = {}
null_result = dict((fn, 0.0) for fn in field_names)
+=======
+ sums = {}
+>>>>>>> MERGE-SOURCE
if children_and_consolidated:
aml_query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
@@ -321,7 +325,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.pop(0)
@@ -341,6 +344,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
# as we have to relay on values computed before this is calculated separately than previous fields
if current.currency_id and current.exchange_rate and \
@@ -357,6 +361,13 @@
for id in ids:
res[id] = null_result
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 = {}
@@ -1460,7 +1471,12 @@
def _centralise(self, cr, uid, move, mode, context=None):
assert mode in ('debit', 'credit'), 'Invalid Mode' #to prevent sql injection
- currency_obj = self.pool.get('res.currency')
+<<<<<<< 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 = {}
@@ -1487,7 +1503,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,
@@ -1511,6 +1527,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,))
@@ -1539,6 +1556,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
#
@@ -1720,7 +1767,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):
@@ -2140,6 +2188,7 @@
cur_price_unit -= tax.amount
for tax in taxes:
+ amount = 0.0
if tax.type=='percent':
if tax.include_base_amount:
amount = cur_price_unit - (cur_price_unit / (1 + tax.amount))
@@ -3047,12 +3096,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'] = [('id','in',unconfigured_cmp)]
res['fields'][field]['selection'] = [('', '')]
if unconfigured_cmp:
cmp_select = [(line.id, line.name) for line in company_obj.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 check_created_journals(self, cr, uid, vals_journal, company_id, context=None):
@@ -3149,6 +3207,7 @@
'default_credit_account_id': _get_default_account(journal_type, 'credit'),
'default_debit_account_id': _get_default_account(journal_type, 'debit'),
}
+<<<<<<< TREE
journal_data.append(vals)
return journal_data
@@ -3161,6 +3220,40 @@
:param company_id: company_id selected from wizard.multi.charts.accounts.
:returns: True
"""
+=======
+ acc_cash_id = obj_acc.create(cr,uid,vals)
+
+ if obj_multi.seq_journal:
+ vals_seq={
+ 'name': _('Bank Journal ') + vals['name'],
+ 'code': 'account.journal',
+ }
+ seq_id = obj_sequence.create(cr,uid,vals_seq)
+
+ #create the bank journal
+ 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
+
+ if line.currency_id:
+ vals_journal['view_id'] = view_id_cur
+ vals_journal['currency'] = line.currency_id.id
+ else:
+ vals_journal['view_id'] = view_id_cash
+ vals_journal['default_credit_account_id'] = acc_cash_id
+ vals_journal['default_debit_account_id'] = acc_cash_id
+ obj_journal.create(cr, uid, vals_journal)
+ current_num += 1
+
+ #create the properties
+>>>>>>> MERGE-SOURCE
property_obj = self.pool.get('ir.property')
field_obj = self.pool.get('ir.model.fields')
todo_list = [
=== modified file 'account/account_analytic_line.py'
--- account/account_analytic_line.py 2012-02-13 18:07:41 +0000
+++ account/account_analytic_line.py 2012-06-07 17:42:47 +0000
@@ -65,13 +65,13 @@
# property_valuation_price_type property
def on_change_unit_amount(self, cr, uid, id, prod_id, quantity, company_id,
unit=False, journal_id=False, context=None):
- if context==None:
- context={}
+ if context is None:
+ context = {}
if not journal_id:
j_ids = self.pool.get('account.analytic.journal').search(cr, uid, [('type','=','purchase')])
journal_id = j_ids and j_ids[0] or False
if not journal_id or not prod_id:
- return {}
+ return {'value': {}}
product_obj = self.pool.get('product.product')
analytic_journal_obj =self.pool.get('account.analytic.journal')
product_price_type_obj = self.pool.get('product.price.type')
=== modified file 'account/account_invoice.py'
=== modified file 'account/account_move_line.py'
--- account/account_move_line.py 2012-03-06 16:10:40 +0000
+++ account/account_move_line.py 2012-06-07 17:42:47 +0000
@@ -228,8 +228,21 @@
# Compute simple values
data = super(account_move_line, self).default_get(cr, uid, fields, context=context)
# Starts: Manual entry from account.move form
+<<<<<<< TREE
if context.get('lines'):
total_new = context.get('balance', 0.00)
+=======
+ if context.get('lines',[]):
+ total_new = 0.00
+ 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]
+>>>>>>> MERGE-SOURCE
if context['journal']:
journal_data = journal_obj.browse(cr, uid, context['journal'], context=context)
if journal_data.type == 'purchase':
@@ -506,8 +519,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."),
@@ -553,9 +571,13 @@
'date_created': fields.date.context_today,
'state': 'draft',
'currency_id': _get_currency,
+<<<<<<< TREE
'journal_id': lambda self, cr, uid, c: c.get('journal_id', False),
'credit': 0.0,
'debit': 0.0,
+=======
+ 'journal_id': lambda self, cr, uid, c: c.get('journal_id', c.get('journal',False)),
+>>>>>>> MERGE-SOURCE
'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 2012-02-14 11:07:04 +0000
+++ account/account_view.xml 2012-06-07 17:42:47 +0000
@@ -464,7 +464,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">
@@ -634,7 +634,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">
@@ -1356,10 +1372,14 @@
</group>
<notebook colspan="4">
<page string="Journal Items">
+<<<<<<< TREE
<field name="balance" invisible="1"/>
<field colspan="4" name="line_id" nolabel="1" height="250" widget="one2many_list"
on_change="onchange_line_id(line_id)"
context="{'balance': balance , '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}">
+>>>>>>> MERGE-SOURCE
<form string="Journal Item">
<group col="6" colspan="4">
<field name="name"/>
=== modified file 'account/board_account_view.xml'
--- account/board_account_view.xml 2011-12-19 16:54:40 +0000
+++ account/board_account_view.xml 2012-06-07 17:42:47 +0000
@@ -1,6 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
+<<<<<<< TREE
+=======
+
+ <record id="note_account_type" model="board.note.type">
+ <field name="name">Accountants</field>
+ </record>
+
+>>>>>>> MERGE-SOURCE
<record id="action_aged_receivable" model="ir.actions.act_window">
<field name="name">Receivable Accounts</field>
<field name="res_model">report.account.receivable</field>
@@ -15,6 +23,7 @@
<field name="view_mode">graph,tree</field>
<field name="domain">[('type','=','income')]</field>
</record>
+<<<<<<< TREE
<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>
@@ -33,12 +42,46 @@
<field name="context">{'default_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>
+
+>>>>>>> MERGE-SOURCE
<record id="board_account_form" model="ir.ui.view">
<field name="name">board.account.form</field>
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Account Board">
+<<<<<<< TREE
<board style="2-1">
<column>
<action name="%(account.action_invoice_tree1)d" creatable="true" string="Draft Customer Invoices" domain="[('state','in',('draft','proforma2')), ('type','=','out_invoice')]"/>
@@ -48,6 +91,19 @@
<action name="%(action_treasory_graph)d" string="Treasury"/> <!--groups="account.group_account_manager,account.group_account_user"-->
</column>
</board>
+=======
+ <hpaned>
+ <child1>
+ <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>
+ <action colspan="4" height="220" name="%(action_treasory_graph)d" string="Treasury" groups="account.group_account_manager,account.group_account_user"/>
+ <action colspan="4" height="220" name="%(action_aged_receivable)d" string="Aged Receivables" groups="account.group_account_manager,account.group_account_user"/>
+ <!-- <action colspan="4" height="220" name="%(action_aged_income)d" string="Aged income"/> -->
+ </child2>
+ </hpaned>
+>>>>>>> MERGE-SOURCE
</form>
</field>
</record>
=== modified file 'account/i18n/account.pot'
--- account/i18n/account.pot 2012-02-08 01:08:30 +0000
+++ account/i18n/account.pot 2012-06-07 17:42:47 +0000
@@ -4,10 +4,17 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 6.1rc1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-02-08 00:35+0000\n"
+=======
+"Project-Id-Version: OpenERP Server 6.0.2\n"
+"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2011-05-09 10:18+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -32,8 +39,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:account.tax.code,sequence:0
msgid "Determine the display order in the report 'Accounting \\ Reporting \\ Generic Reporting \\ Taxes \\ Taxes Report'"
+=======
+#: code:addons/account/account.py:516
+#, python-format
+msgid "You cannot remove/deactivate an account which is set as a property to any Partner."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -60,6 +73,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:793
+#, python-format
+msgid "Please define sequence on invoice journal"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: constraint:account.period:0
msgid "Error ! The duration of the Period(s) is/are invalid. "
msgstr ""
@@ -106,8 +128,19 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: constraint:account.journal:0
msgid "Configuration error! The currency chosen should be shared by the default accounts too."
+=======
+#: report:account.tax.code.entries:0
+msgid "Accounting Entries-"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1305
+#, python-format
+msgid "You can not delete posted movement: \"%s\"!"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -146,7 +179,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1428
+=======
+#: code:addons/account/invoice.py:1436
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Warning!"
msgstr ""
@@ -201,6 +238,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:915
+#, python-format
+msgid "No period defined for this date: %s !\n"
+"Please create a fiscal year."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.model,name:account.model_account_move_line_reconcile_select
msgid "Move line reconcile select"
msgstr ""
@@ -212,7 +259,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1241
+=======
+#: code:addons/account/invoice.py:1224
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
msgstr ""
@@ -228,7 +279,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1200
+=======
+#: code:addons/account/account_move_line.py:1182
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not add/modify entries in a closed journal."
msgstr ""
@@ -271,7 +326,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:551
+=======
+#: code:addons/account/invoice.py:532
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invoice line account company does not match with invoice company."
msgstr ""
@@ -503,9 +562,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
msgid "Counterpart"
+=======
+#: code:addons/account/account_cash_statement.py:349
+#, python-format
+msgid "CashBox Balance is not matching with Calculated Balance !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -593,7 +658,12 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3116
+=======
+#: code:addons/account/account.py:2823
+#: code:addons/account/installer.py:434
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "SAJ"
msgstr ""
@@ -620,8 +690,13 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:750
#: code:addons/account/account_move_line.py:803
+=======
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "To reconcile the entries company should be the same for all entries"
msgstr ""
@@ -697,12 +772,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.invoice.refund,filter_refund:0
msgid "Refund Method"
msgstr ""
#. module: account
#: code:addons/account/wizard/account_change_currency.py:38
+=======
+#: code:addons/account/wizard/account_change_currency.py:38
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can only change currency for Draft Invoice !"
msgstr ""
@@ -823,8 +902,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.cashbox.line,pieces:0
msgid "Values"
+=======
+#: 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 !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -847,6 +932,7 @@
#. module: account
#: report:account.overdue:0
+#: report:account.aged_trial_balance:0
msgid "Due"
msgstr ""
@@ -951,15 +1037,28 @@
#: 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
+<<<<<<< TREE
#: code:addons/account/account.py:2268
#: code:addons/account/account_bank_statement.py:357
#: code:addons/account/account_invoice.py:73
#: code:addons/account/account_invoice.py:688
#: code:addons/account/account_move_line.py:173
+=======
+#: code:addons/account/account.py:2097
+#: code:addons/account/account_bank_statement.py:350
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:73
+#: code:addons/account/invoice.py:678
+#: code:addons/account/wizard/account_use_model.py:81
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Analytic Journal !"
msgstr ""
@@ -1161,14 +1260,23 @@
#. module: account
#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.tax.code.entries:0
+>>>>>>> MERGE-SOURCE
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Entry Label"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1129
+=======
+#: code:addons/account/account.py:990
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not modify/delete a journal with entries for this period !"
msgstr ""
@@ -1316,6 +1424,7 @@
#. module: account
#: model:ir.ui.menu,name:account.next_id_22
+#: report:account.aged_trial_balance:0
msgid "Partners"
msgstr ""
@@ -1339,6 +1448,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1277
+#, python-format
+msgid "You can not use this general account in this journal !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: selection:account.balance.report,display_account:0
#: selection:account.common.account.report,display_account:0
#: selection:account.partner.balance,display_partner:0
@@ -1420,6 +1538,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.account,type:0
#: selection:account.account.template,type:0
#: selection:account.bank.statement,state:0
@@ -1428,6 +1547,28 @@
#: selection:account.fiscalyear,state:0
#: selection:account.period,state:0
msgid "Closed"
+=======
+#: view:account.payment.term.line:0
+msgid "Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
+msgstr ""
+
+#. module: account
+#: 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 ""
+
+#. module: account
+#: field:account.installer.modules,account_anglo_saxon:0
+msgid "Anglo-Saxon Accounting"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -1584,12 +1725,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1429
#, python-format
msgid "You selected an Unit of Measure which is not compatible with the product."
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
msgstr ""
@@ -1600,6 +1744,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.analytic.account:0
msgid "Pending Accounts"
msgstr ""
@@ -1607,6 +1752,21 @@
#. module: account
#: view:account.tax.template:0
msgid "Tax Declaration"
+=======
+#: constraint:account.fiscalyear:0
+msgid "Error! You cannot define overlapping fiscal years"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:799
+#, python-format
+msgid "The account is not defined to be reconciled !"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,pieces:0
+msgid "Values"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -1625,6 +1785,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:806
+#, python-format
+msgid "You have to provide an account for the write off entry !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.model,name:account.model_account_common_journal_report
msgid "Account Common Journal Report"
msgstr ""
@@ -1651,7 +1820,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_cash_statement.py:292
+=======
+#: code:addons/account/account_cash_statement.py:329
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "User %s does not have rights to access %s journal !"
msgstr ""
@@ -1672,14 +1845,32 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:509
+#, python-format
+msgid "You cannot deactivate an account that contains account moves."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.move.line.reconcile,credit:0
msgid "Credit amount"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:407
#: code:addons/account/account.py:412
#: code:addons/account/account.py:429
+=======
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:529
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Error!"
msgstr ""
@@ -1830,6 +2021,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: constraint:account.move.line:0
msgid "The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal."
msgstr ""
@@ -1840,6 +2032,8 @@
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.invoice:0
#: view:report.invoice.created:0
msgid "Untaxed Amount"
@@ -1954,7 +2148,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1461
+=======
+#: code:addons/account/installer.py:348
+#, python-format
+msgid " Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1333
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no default default debit account defined \n"
"on journal \"%s\""
@@ -2014,7 +2218,12 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3119
+=======
+#: code:addons/account/account.py:2888
+#: code:addons/account/installer.py:498
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "ECNJ"
msgstr ""
@@ -2033,7 +2242,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:370
+=======
+#: code:addons/account/invoice.py:351
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no Accounting Journal of type Sale/Purchase defined!"
msgstr ""
@@ -2104,6 +2317,11 @@
#: field:accounting.report,fiscalyear_id:0
#: field:accounting.report,fiscalyear_id_cmp: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 ""
@@ -2231,7 +2449,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:572
+=======
+#: code:addons/account/invoice.py:552
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Can't find any account journal of %s type for this company.\n"
"\n"
@@ -2305,7 +2527,12 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3117
+=======
+#: code:addons/account/account.py:2840
+#: code:addons/account/installer.py:454
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "EXJ"
msgstr ""
@@ -2389,7 +2616,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:369
+=======
+#: code:addons/account/invoice.py:350
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -2405,6 +2636,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: 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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: report:account.journal.period.print:0
#: report:account.journal.period.print.sale.purchase:0
msgid "Label"
@@ -2435,7 +2675,12 @@
#. module: account
#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
#: report:account.overdue:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
@@ -2557,15 +2802,27 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1321
+=======
+#: code:addons/account/account.py:1195
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No sequence defined on the journal !"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2268
#: code:addons/account/account_invoice.py:688
#: code:addons/account/account_move_line.py:173
+=======
+#: code:addons/account/account.py:2097
+#: code:addons/account/account_bank_statement.py:350
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
+#: code:addons/account/wizard/account_use_model.py:81
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
msgstr ""
@@ -2616,6 +2873,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: selection:account.print.journal,sort_selection:0
+msgid "Reference Number"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: selection:account.entries.report,month:0
#: selection:account.invoice.report,month:0
#: selection:analytic.entries.report,month:0
@@ -2708,7 +2973,23 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:735
+=======
+#: help:account.partner.ledger,initial_balance:0
+#: help:account.report.general.ledger,initial_balance:0
+msgid "It adds initial balance row on report which display previous sum amount of debit/credit/balance"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+msgid "Analytic Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:836
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Tax base different!\n"
"Click on compute to update the tax base."
@@ -2847,8 +3128,13 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3363
#: code:addons/account/account_bank.py:90
+=======
+#: code:addons/account/account.py:2950
+#: code:addons/account/installer.py:296
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "BNK"
msgstr ""
@@ -2942,12 +3228,21 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
#, python-format
msgid "No End of year journal defined for the fiscal year"
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
+>>>>>>> MERGE-SOURCE
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the expense account"
@@ -2965,8 +3260,12 @@
#: field:account.common.report,journal_ids:0
#: report:account.general.journal:0
#: field:account.general.journal,journal_ids:0
+<<<<<<< TREE
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+>>>>>>> MERGE-SOURCE
#: view:account.journal.period:0
#: report:account.partner.balance:0
#: field:account.partner.balance,journal_ids:0
@@ -3033,7 +3332,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1332
+=======
+#: code:addons/account/invoice.py:1298
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Partner Defined !"
msgstr ""
@@ -3066,10 +3369,29 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,name:account.action_account_unreconcile
#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
msgid "Unreconcile Entries"
+=======
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.invoice:0
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_configuration_installer
+msgid "Accounting Chart Configuration"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -3108,21 +3430,48 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:product.product:0
msgid "Purchase Taxes"
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: 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
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:373
+#, python-format
+msgid "Cannot delete invoice(s) that are already opened or paid !"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance.landscape:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.actions.report.xml,name:account.account_transfers
msgid "Transfers"
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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.chart:0
msgid "Account charts"
msgstr ""
@@ -3156,6 +3505,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice.line:0
msgid "Quantity :"
msgstr ""
@@ -3168,6 +3518,22 @@
#. module: account
#: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
msgid "Print Sale/Purchase Journal"
+=======
+#: 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 ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Invoicing Data"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -3329,19 +3695,36 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2280
+=======
+#: code:addons/account/account.py:2109
+>>>>>>> MERGE-SOURCE
#, 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
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:837
+=======
+#: code:addons/account/account_move_line.py:801
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Some entries are already reconciled !"
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: 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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.tax:0
msgid "Account Tax"
msgstr ""
@@ -3445,7 +3828,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1153
+=======
+#: code:addons/account/account_move_line.py:1134
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Unable to change tax !"
msgstr ""
@@ -3456,8 +3843,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.invoice.refund,filter_refund:0
msgid "Create a draft Refund"
+=======
+#: 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:476
+#, python-format
+msgid "The Payment Term of Supplier does not have Payment Term Lines(Computation) defined !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -3791,6 +4190,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:722
+#, python-format
+msgid "Global taxes defined, but are not in invoice lines !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.entries.report,month:0
#: view:account.invoice.report:0
#: field:account.invoice.report,month:0
@@ -3857,7 +4265,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_analytic_line.py:93
+=======
+#: help:account.move,state:0
+msgid "All manually created new journal entry are usually in the state 'Unposted', but you can set the option to skip that state on the related journal. In that case, they will be behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in 'Posted' state."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:90
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -4028,8 +4445,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: sql_constraint:account.period:0
msgid "The name of the period must be unique per company!"
+=======
+#: code:addons/account/account.py:2081
+#: code:addons/account/wizard/account_use_model.py:69
+#, python-format
+msgid "Unable to find a valid period !"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Voucher No"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4081,6 +4510,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 ""
@@ -4108,8 +4544,24 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.journal,type:0
msgid "Bank and Cheques"
+=======
+#: 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
+#: code:addons/account/wizard/account_move_journal.py:165
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:55
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:57
+#, python-format
+msgid "UserError"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4143,6 +4595,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.payment.term.line:0
msgid "Example"
msgstr ""
@@ -4167,6 +4620,14 @@
msgstr ""
#. module: account
+=======
+#: constraint:account.account:0
+#: constraint:account.tax.code:0
+msgid "Error ! You can not create recursive accounts."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: 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
@@ -4205,7 +4666,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1567
+=======
+#: code:addons/account/invoice.py:73
+#, python-format
+msgid "You must define an analytic journal of type '%s' !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1411
+>>>>>>> MERGE-SOURCE
#, 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 ""
@@ -4237,8 +4708,19 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.ui.menu,name:account.menu_finance_configuration
msgid "Configuration"
+=======
+#: report:account.account.balance.landscape:0
+msgid "Account Balance -"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4285,6 +4767,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "My invoices"
msgstr ""
@@ -4292,6 +4775,12 @@
#. module: account
#: selection:account.bank.accounts.wizard,account_type:0
msgid "Check"
+=======
+#: 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."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4412,6 +4901,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1088
#: code:addons/account/account.py:1090
#: code:addons/account/account.py:1321
@@ -4434,6 +4924,20 @@
#: code:addons/account/wizard/account_report_common.py:150
#, python-format
msgid "Error"
+=======
+#: selection:account.account.type,report_type:0
+msgid "Balance Sheet (Assets Accounts)"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Third Party (Country)"
+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."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4451,8 +4955,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_account_partner_balance
msgid "This report is analysis by partner. It is a PDF report containing one line per partner representing the cumulative credit balance."
+=======
+#: code:addons/account/invoice.py:728
+#, python-format
+msgid "Taxes missing !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4528,7 +5038,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1351
+=======
+#: code:addons/account/account.py:1224
+>>>>>>> MERGE-SOURCE
#, 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."
@@ -4550,7 +5064,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1090
+=======
+#: code:addons/account/account.py:954
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Start period should be smaller then End period"
msgstr ""
@@ -4593,7 +5111,15 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,target_move:0
+<<<<<<< TREE
#: field:accounting.report,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
+>>>>>>> MERGE-SOURCE
msgid "Target Moves"
msgstr ""
@@ -4681,7 +5207,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1307
+=======
+#: code:addons/account/account.py:1181
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Integrity Error !"
msgstr ""
@@ -4713,8 +5243,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:account.financial.report,name:account.account_financial_report_balancesheet0
#: model:ir.ui.menu,name:account.menu_account_report_bs
+=======
+#: 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
+>>>>>>> MERGE-SOURCE
msgid "Balance Sheet"
msgstr ""
@@ -4812,8 +5350,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Template Tax Fiscal Position"
+=======
+#: code:addons/account/account.py:2081
+#: code:addons/account/wizard/account_use_model.py:69
+#, python-format
+msgid "No period found !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4884,8 +5429,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.payment.term.line:0
msgid "Amount Computation"
+=======
+#: code:addons/account/account.py:2940
+#: code:addons/account/installer.py:283
+#: code:addons/account/installer.py:295
+#, python-format
+msgid "Bank Journal "
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4909,6 +5462,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: 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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.model,name:account.model_account_common_account_report
msgid "Account Common Account Report"
msgstr ""
@@ -4966,6 +5528,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3446
#: code:addons/account/account_bank_statement.py:338
#: code:addons/account/account_invoice.py:427
@@ -4973,6 +5536,15 @@
#: code:addons/account/account_invoice.py:542
#: code:addons/account/account_invoice.py:550
#: code:addons/account/account_invoice.py:572
+=======
+#: code:addons/account/account_bank_statement.py:331
+#: 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
+>>>>>>> MERGE-SOURCE
#: code:addons/account/wizard/account_move_journal.py:63
#, python-format
msgid "Configuration Error !"
@@ -5038,12 +5610,32 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice.report:0
msgid "Customer Invoices And Refunds"
msgstr ""
#. module: account
#: field:account.analytic.line,amount_currency:0
+=======
+#: help:account.account.type,report_type:0
+msgid "According value related accounts will be display on respective reports (Balance Sheet Profit & Loss Account)"
+msgstr ""
+
+#. module: account
+#: field:account.report.general.ledger,sortby:0
+msgid "Sort By"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1340
+#, python-format
+msgid "There is no default default credit account defined \n"
+"on journal \"%s\""
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.entries.report,amount_currency:0
#: field:account.model.line,amount_currency:0
#: field:account.move.line,amount_currency:0
@@ -5195,7 +5787,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:759
+=======
+#: code:addons/account/account_move_line.py:729
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Already Reconciled!"
msgstr ""
@@ -5235,7 +5831,11 @@
#. module: account
#: view:account.move.line.reconcile:0
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:857
+=======
+#: code:addons/account/account_move_line.py:821
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Write-Off"
msgstr ""
@@ -5367,6 +5967,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/wizard/account_change_currency.py:59
+#, python-format
+msgid "New currency is not confirured properly !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.aged.trial.balance,filter:0
#: field:account.balance.report,filter:0
#: field:account.central.journal,filter:0
@@ -5386,6 +5995,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2256
#, python-format
msgid "You have a wrong expression \"%(...)s\" in your model !"
@@ -5399,12 +6009,20 @@
#. module: account
#: code:addons/account/account_move_line.py:1155
#: code:addons/account/account_move_line.py:1238
+=======
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not use an inactive account!"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:830
+=======
+#: code:addons/account/account_move_line.py:794
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entries are not of the same account or already reconciled ! "
msgstr ""
@@ -5439,9 +6057,19 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_bank_statement.py:402
#: code:addons/account/account_invoice.py:392
#: code:addons/account/wizard/account_period_close.py:51
+=======
+#: selection:account.automatic.reconcile,power:0
+msgid "7"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:391
+#: code:addons/account/invoice.py:373
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -5588,6 +6216,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "is validated."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.chart.template:0
#: field:account.chart.template,account_root_id:0
msgid "Root Account"
@@ -5657,6 +6294,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice.report:0
msgid "Open and Paid Invoices"
msgstr ""
@@ -5668,6 +6306,9 @@
#. module: account
#: code:addons/account/account.py:629
+=======
+#: code:addons/account/account.py:546
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not remove/desactivate an account which is set on a customer or supplier."
msgstr ""
@@ -5889,7 +6530,13 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:664
+=======
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You cannot change the owner company of an account that already contains journal items."
msgstr ""
@@ -6044,6 +6691,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:624
#, python-format
msgid "You can not remove an account containing journal items."
@@ -6052,6 +6700,10 @@
#. module: account
#: code:addons/account/account_analytic_line.py:145
#: code:addons/account/account_move_line.py:933
+=======
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entries: "
msgstr ""
@@ -6062,12 +6714,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:res.partner.bank,currency_id:0
msgid "Currency of the related account journal."
msgstr ""
#. module: account
#: code:addons/account/account.py:1563
+=======
+#: code:addons/account/account.py:1407
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Couldn't create move between different companies"
msgstr ""
@@ -6102,7 +6758,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:808
+=======
+#: code:addons/account/account_move_line.py:772
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entry \"%s\" is not valid !"
msgstr ""
@@ -6161,6 +6821,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:622
#: code:addons/account/account.py:624
#: code:addons/account/account.py:963
@@ -6186,6 +6847,33 @@
#: code:addons/account/wizard/account_invoice_refund.py:108
#: code:addons/account/wizard/account_invoice_refund.py:110
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
+=======
+#: 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: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
+>>>>>>> MERGE-SOURCE
#: code:addons/account/wizard/account_use_model.py:44
#, python-format
msgid "Error !"
@@ -6262,6 +6950,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1218
#, python-format
msgid "You can not do this modification on a reconciled entry! You can just change some non legal fields or you must unreconcile first!\n"
@@ -6277,6 +6966,13 @@
msgstr ""
#. module: account
+=======
+#: report:account.general.ledger_landscape:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: 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"
@@ -6322,9 +7018,13 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.bank.statement:0
#: code:addons/account/account.py:420
#: code:addons/account/account.py:432
+=======
+#: code:addons/account/wizard/account_change_currency.py:64
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Opening Balance"
msgstr ""
@@ -6396,11 +7096,17 @@
#: report:account.journal.period.print:0
#: report:account.journal.period.print.sale.purchase:0
#: report:account.partner.balance:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Total:"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2229
+=======
+#: code:addons/account/account.py:2064
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can specify year, month and date in the name of the model using the following labels:\n"
"\n"
@@ -6428,6 +7134,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.tax.template:0
msgid "Taxes used in Sales"
msgstr ""
@@ -6435,6 +7142,10 @@
#. module: account
#: code:addons/account/account_invoice.py:495
#: code:addons/account/wizard/account_invoice_refund.py:145
+=======
+#: code:addons/account/invoice.py:476
+#: code:addons/account/wizard/account_invoice_refund.py:137
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Data Insufficient !"
msgstr ""
@@ -6569,6 +7280,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: 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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.tax.template:0
msgid "Account Tax Template"
msgstr ""
@@ -6720,7 +7440,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1088
+=======
+#: code:addons/account/account.py:952
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You should have chosen periods that belongs to the same company"
msgstr ""
@@ -6834,6 +7558,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_fiscalyear_close.py:73
#, python-format
msgid "The periods to generate opening entries were not found"
@@ -6848,6 +7573,26 @@
#: code:addons/account/account.py:3121
#, python-format
msgid "OPEJ"
+=======
+#: code:addons/account/account_cash_statement.py:250
+#, python-format
+msgid "You can not have two open register for the same journal"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " day of the month= -1"
+msgstr ""
+
+#. module: account
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: account
+#: help:account.journal,type:0
+msgid "Select 'Sale' for Sale journal to be used at the time of making invoice. Select 'Purchase' for Purchase Journal to be used at the time of approving purchase order. Select 'Cash' to be used at the time of making payment. Select 'General' for miscellaneous operations. Select 'Opening/Closing Situation' to be used at the time of new fiscal year creation or end of year entries generation."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -6857,10 +7602,20 @@
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"
+=======
+#: help:account.installer.modules,account_followup:0
+msgid "Helps you generate reminder letters for unpaid invoices, including multiple levels of reminding and customized per-partner policies."
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " value amount: n.a"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -6880,9 +7635,19 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_fiscalyear_close.py:84
#, python-format
msgid "The journal must have default credit and debit 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
+#: field:analytic.entries.report,user_id:0
+msgid "User"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -6901,6 +7666,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.ui.menu,name:account.menu_multi_currency
msgid "Multi-Currencies"
msgstr ""
@@ -6912,12 +7678,20 @@
#. module: account
#: code:addons/account/account_move_line.py:1302
+=======
+#: code:addons/account/account_move_line.py:1277
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Bad account !"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3108
+=======
+#: code:addons/account/account.py:2821
+#: code:addons/account/installer.py:432
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Sales Journal"
msgstr ""
@@ -6934,7 +7708,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1277
+=======
+#: code:addons/account/account_move_line.py:1252
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No piece number !"
msgstr ""
@@ -7220,6 +7998,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:629
#: code:addons/account/account.py:642
#: code:addons/account/account.py:645
@@ -7232,6 +8011,19 @@
#: code:addons/account/account_move_line.py:97
#: code:addons/account/account_move_line.py:750
#: code:addons/account/account_move_line.py:803
+=======
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
+#: code:addons/account/account.py:532
+#: 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
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Warning !"
msgstr ""
@@ -7295,7 +8087,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:810
+=======
+#: code:addons/account/invoice.py:795
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Invoice Lines !"
msgstr ""
@@ -7360,7 +8156,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:379
+=======
+#: code:addons/account/invoice.py:360
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invoice '%s' is paid."
msgstr ""
@@ -7417,7 +8217,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1332
+=======
+#: code:addons/account/invoice.py:1298
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You must first select a partner !"
msgstr ""
@@ -7476,7 +8280,12 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3111
+=======
+#: code:addons/account/account.py:2885
+#: code:addons/account/installer.py:495
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Purchase Refund Journal"
msgstr ""
@@ -7614,6 +8423,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.aged.trial.balance,chart_account_id:0
#: field:account.balance.report,chart_account_id:0
#: field:account.central.journal,chart_account_id:0
@@ -7628,6 +8438,17 @@
#: field:account.report.general.ledger,chart_account_id:0
#: field:account.vat.declaration,chart_account_id:0
#: field:accounting.report,chart_account_id:0
+=======
+#: report:account.general.ledger:0
+#: 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
+>>>>>>> MERGE-SOURCE
msgid "Chart of Account"
msgstr ""
@@ -7701,8 +8522,19 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.payment.term.line:0
msgid " Value amount: n.a"
+=======
+#: code:addons/account/invoice.py:905
+#, python-format
+msgid "Cannot create invoice move on centralised journal"
+msgstr ""
+
+#. module: account
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -7744,9 +8576,17 @@
#: report:account.account.balance:0
#: report:account.central.journal:0
#: report:account.general.journal:0
+<<<<<<< TREE
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+>>>>>>> MERGE-SOURCE
#: 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 ""
@@ -7797,7 +8637,12 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3109
+=======
+#: code:addons/account/account.py:2838
+#: code:addons/account/installer.py:452
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Purchase Journal"
msgstr ""
@@ -7971,9 +8816,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:account.account.type,name:account.data_account_type_expense
#: model:account.financial.report,name:account.account_financial_report_expense0
msgid "Expense"
+=======
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
+#, python-format
+msgid "Bad account!"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -7982,7 +8834,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1105
+=======
+#: code:addons/account/account_move_line.py:1062
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "The account move (%s) for centralisation has been confirmed!"
msgstr ""
@@ -8189,12 +9045,26 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3110
+=======
+#: code:addons/account/account.py:2861
+#: code:addons/account/installer.py:476
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Sales Refund Journal"
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: 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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.move:0
#: view:account.move.line:0
#: view:account.payment.term:0
@@ -8236,7 +9106,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:810
+=======
+#: code:addons/account/invoice.py:795
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Please create some invoice lines."
msgstr ""
@@ -8252,7 +9126,12 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3118
+=======
+#: code:addons/account/account.py:2864
+#: code:addons/account/installer.py:479
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "SCNJ"
msgstr ""
@@ -8297,7 +9176,12 @@
#: report:account.general.journal:0
#: field:account.general.journal,period_from:0
#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
#: report:account.partner.balance:0
#: field:account.partner.balance,period_from:0
#: field:account.partner.ledger,period_from:0
@@ -8313,7 +9197,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:2357
+#, python-format
+msgid "Cannot locate parent code for template account!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
msgid "Analysis Direction"
msgstr ""
@@ -8344,6 +9238,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: 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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: report:account.overdue:0
msgid "Best regards."
msgstr ""
@@ -8364,13 +9267,44 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.account.type,report_type:0
msgid "P&L / BS Category"
-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."
+=======
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:70
+#, python-format
+msgid "Current currency is not confirured properly !"
+>>>>>>> MERGE-SOURCE
+msgstr ""
+
+#. module: account
+#: 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
@@ -8379,10 +9313,21 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
#: model:ir.actions.act_window,name:account.action_bank_statement_tree
#: model:ir.ui.menu,name:account.menu_bank_statement_tree
msgid "Bank Statements"
+=======
+#: selection:account.account.type,report_type:0
+msgid "Profit & Loss (Income Accounts)"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -8396,8 +9341,12 @@
#: field:account.entries.report,balance:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+<<<<<<< TREE
#: report:account.general.ledger_landscape:0
#: field:account.invoice,residual:0
+=======
+#: report:account.general.ledger_landscape:0
+>>>>>>> MERGE-SOURCE
#: field:account.move.line,balance:0
#: report:account.partner.balance:0
#: selection:account.payment.term.line,value:0
@@ -8408,6 +9357,10 @@
#: field:account.treasury.report,balance: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 ""
@@ -8418,7 +9371,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 ""
@@ -8480,6 +9441,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: report:account.general.ledger:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Filters By"
@@ -8502,7 +9468,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1153
+=======
+#: code:addons/account/account_move_line.py:1134
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not change the tax, you should remove and recreate lines !"
msgstr ""
@@ -8616,7 +9586,12 @@
#: report:account.general.journal:0
#: field:account.general.journal,period_to:0
#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
#: report:account.partner.balance:0
#: field:account.partner.balance,period_to:0
#: field:account.partner.ledger,period_to:0
@@ -8652,8 +9627,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: report:account.overdue:0
msgid "Maturity date"
+=======
+#: code:addons/account/invoice.py:725
+#, python-format
+msgid "Tax base different !\n"
+"Click on compute to update tax base"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -8686,8 +9668,12 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,date_from:0
+<<<<<<< TREE
#: field:accounting.report,date_from:0
#: field:accounting.report,date_from_cmp:0
+=======
+#: report:account.aged_trial_balance:0
+>>>>>>> MERGE-SOURCE
msgid "Start Date"
msgstr ""
@@ -8711,7 +9697,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:828
+=======
+#: code:addons/account/invoice.py:812
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Bad total !"
msgstr ""
@@ -8758,17 +9748,32 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:accounting.report:0
msgid "Comparison"
msgstr ""
#. module: account
#: code:addons/account/account_invoice.py:372
+=======
+#: code:addons/account/invoice.py:353
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Unknown Error"
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: 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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:res.partner,property_account_payable:0
msgid "This account will be used instead of the default one as the payable account for the current partner"
msgstr ""
@@ -8820,6 +9825,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.account.type,report_type:0
#: code:addons/account/account.py:181
#, python-format
@@ -8830,6 +9836,11 @@
#: constraint:account.account:0
msgid "Configuration Error! \n"
"You can not select an account type with a deferral method different of \"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
+=======
+#: view:account.general.journal:0
+#: model:ir.ui.menu,name:account.menu_account_general_journal
+msgid "General Journals"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -9092,7 +10103,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_analytic_line.py:102
+=======
+#: code:addons/account/account_analytic_line.py:99
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -9137,6 +10152,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 ""
@@ -9257,8 +10273,21 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: sql_constraint:account.journal:0
msgid "The code of the journal must be unique per company !"
+=======
+#: 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
+#: code:addons/account/wizard/account_state_open.py:37
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#: code:addons/account/wizard/account_validate_account_move.py:61
+#, python-format
+msgid "Warning"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -9268,6 +10297,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:wizard.multi.charts.accounts:0
msgid "Generate Your Chart of Accounts from a Chart Template"
msgstr ""
@@ -9281,6 +10311,16 @@
#: 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"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -9348,16 +10388,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.print.journal,sort_selection:0
msgid "Journal Entry Number"
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.subscription:0
msgid "Recurring"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:642
#, python-format
msgid "You cannot change the type of account from 'Closed' to any other type which contains journal items!"
@@ -9365,6 +10409,9 @@
#. module: account
#: code:addons/account/account_move_line.py:832
+=======
+#: code:addons/account/account_move_line.py:796
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entry is already reconciled"
msgstr ""
@@ -9385,6 +10432,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.analytic.line:0
msgid "Analytic Journal Items related to a purchase journal."
msgstr ""
@@ -9392,6 +10440,13 @@
#. module: account
#: help:account.account,type:0
msgid "The 'Internal Type' is used for features available on different types of accounts: view can not have journal items, consolidation are accounts that can have children accounts for multi-company consolidations, payable/receivable are for partners accounts (for debit/credit computations), closed for depreciated accounts."
+=======
+#: code:addons/account/account_move_line.py:1252
+#, python-format
+msgid "Can not create an automatic sequence for this piece !\n"
+"\n"
+"Put a sequence in the journal definition for automatic numbering or create a sequence manually for this piece."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -9527,7 +10582,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:364
+=======
+#: code:addons/account/invoice.py:345
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invoice '%s' is waiting for validation."
msgstr ""
@@ -9552,6 +10611,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1123
+#, python-format
+msgid "The date of your Journal Entry is not in the defined period!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.subscription,period_total:0
msgid "Number of Periods"
msgstr ""
@@ -9711,6 +10779,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 ""
@@ -9817,6 +10886,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:511
+#, python-format
+msgid "You cannot remove an account which has account entries!. "
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.actions.act_window,help:account.action_account_form
msgid "Create and manage the accounts you need to record journal entries. An account is part of a ledger allowing your company to register all kinds of debit and credit transactions. Companies present their annual accounts in two main parts: the balance sheet and the income statement (profit and loss account). The annual accounts of a company are required by law to disclose a certain amount of information. They have to be certified by an external auditor annually."
msgstr ""
@@ -9826,3 +10904,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 2012-05-17 06:07:33 +0000
+++ account/i18n/ar.po 2012-06-07 17:42:47 +0000
@@ -6,13 +6,20 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-04-29 12:51+0000\n"
"Last-Translator: kifcaliph <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: 2012-05-17 05:17+0000\n"
"X-Generator: Launchpad (build 15259)\n"
@@ -21,6 +28,10 @@
#: view:analytic.entries.report:0
msgid "last month"
msgstr "الشهر الماضي"
+=======
+"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
@@ -30,6 +41,7 @@
#. module: account
#: view:account.journal:0
msgid "Other Configuration"
+<<<<<<< TREE
msgstr "إعدادات أخرى"
#. module: account
@@ -40,6 +52,19 @@
msgstr ""
#. module: account
+=======
+msgstr "تعديلات أخرى"
+
+#. 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 "لايمكن الغاء/تعطيل حساب معد كخاص بأي طرف."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.move.reconcile:0
msgid "Journal Entry Reconcile"
msgstr "تسوية اليومية"
@@ -63,6 +88,15 @@
msgstr "متبقي"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:793
+#, python-format
+msgid "Please define sequence on invoice journal"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: constraint:account.period:0
msgid "Error ! The duration of the Period(s) is/are invalid. "
msgstr "خظأ! إن مدة الفترة أو الفترات غير صالحة "
@@ -86,7 +120,24 @@
#. module: account
#: model:ir.model,name:account.model_report_aged_receivable
msgid "Aged Receivable Till Today"
+<<<<<<< TREE
msgstr "فترة المقبوضات حتى اليوم"
+=======
+msgstr ""
+
+#. module: account
+#: field:account.partner.ledger,reconcil:0
+msgid "Include Reconciled Entries"
+msgstr ""
+
+#. module: account
+#: view:account.pl.report:0
+msgid ""
+"The Profit and Loss report gives you an overview of your company profit and "
+"loss in a single document"
+msgstr ""
+"تقرير المكسب و الخسارة يعطيك فكرة عامة عن مكسب و خسارة شركتك في ملف واحد"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_invoiceimport0
@@ -109,6 +160,7 @@
"If you unreconciliate transactions, you must also verify all the actions "
"that are linked to those transactions because they will not be disabled"
msgstr ""
+<<<<<<< TREE
"إذا كنت توافق على المعاملات ، يجب عليك أيضا التحقق من كافة الإجراءات التي "
"ترتبط بتلك المعاملات لأنه لن يكونوا غير مفعّلين"
@@ -117,6 +169,18 @@
msgid ""
"Configuration error! The currency chosen should be shared by the default "
"accounts too."
+=======
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Accounting Entries-"
+msgstr "المدخلات المحاسبية -"
+
+#. module: account
+#: code:addons/account/account.py:1305
+#, python-format
+msgid "You can not delete posted movement: \"%s\"!"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -159,7 +223,11 @@
"إزالتها."
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1428
+=======
+#: code:addons/account/invoice.py:1436
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Warning!"
msgstr "تحذير!"
@@ -216,7 +284,19 @@
#. module: account
#: model:ir.model,name:account.model_account_tax
msgid "account.tax"
+<<<<<<< TREE
msgstr "account.tax"
+=======
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:915
+#, python-format
+msgid ""
+"No period defined for this date: %s !\n"
+"Please create a fiscal year."
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_move_line_reconcile_select
@@ -234,7 +314,11 @@
"لتظهر على الفواتير."
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1241
+=======
+#: code:addons/account/invoice.py:1224
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
msgstr "فاتورة '%s' ستدفع علي الأجزاء التالية: %s%s of %s%s (%s%s المتبقي)"
@@ -250,7 +334,11 @@
msgstr "تقارير دولة بلجيكا"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1200
+=======
+#: code:addons/account/account_move_line.py:1182
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not add/modify entries in a closed journal."
msgstr "لايمكن اضافة/تعديل البيانات في سجل مقفل"
@@ -296,7 +384,11 @@
msgstr "شارع"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:551
+=======
+#: code:addons/account/invoice.py:532
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invoice line account company does not match with invoice company."
msgstr "الشركة في سطر حساب الفاتورة تختلف عن الشركة في الفاتورة"
@@ -561,10 +653,17 @@
msgstr "حركات لم تسوى"
#. module: account
+<<<<<<< TREE
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
msgid "Counterpart"
msgstr "نظير"
+=======
+#: code:addons/account/account_cash_statement.py:349
+#, python-format
+msgid "CashBox Balance is not matching with Calculated Balance !"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.fiscal.position:0
@@ -655,7 +754,12 @@
msgstr "مبلغ رمز الضريبة"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3116
+=======
+#: code:addons/account/account.py:2823
+#: code:addons/account/installer.py:434
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "SAJ"
msgstr "شباب العمال الاشتراكي."
@@ -682,8 +786,13 @@
msgstr "فترة السجل"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:750
#: code:addons/account/account_move_line.py:803
+=======
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "To reconcile the entries company should be the same for all entries"
msgstr "الشركة يجب ان تكون واحدة لجميع المدخلات حتى يمكن تسويتها"
@@ -758,6 +867,7 @@
#: model:ir.model,name:account.model_project_account_analytic_line
#, python-format
msgid "Analytic Entries by line"
+<<<<<<< TREE
msgstr "قيود تحليلية في سطور"
#. module: account
@@ -767,6 +877,12 @@
#. module: account
#: code:addons/account/wizard/account_change_currency.py:38
+=======
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:38
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can only change currency for Draft Invoice !"
msgstr "يمكن تغيير العملة في مسودة الفتورة"
@@ -889,6 +1005,7 @@
#. module: account
#: view:account.payment.term:0
msgid "Computation"
+<<<<<<< TREE
msgstr "أحسب/حساب"
#. module: account
@@ -900,6 +1017,22 @@
#: field:account.cashbox.line,pieces:0
msgid "Values"
msgstr "قيم"
+=======
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Next Partner to reconcile"
+msgstr ""
+
+#. module: account
+#: 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 ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice.report:0
@@ -921,6 +1054,7 @@
#. module: account
#: report:account.overdue:0
+#: report:account.aged_trial_balance:0
msgid "Due"
msgstr "مستحق"
@@ -1035,15 +1169,28 @@
#: 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
+<<<<<<< TREE
#: code:addons/account/account.py:2268
#: code:addons/account/account_bank_statement.py:357
#: code:addons/account/account_invoice.py:73
#: code:addons/account/account_invoice.py:688
#: code:addons/account/account_move_line.py:173
+=======
+#: code:addons/account/account.py:2097
+#: code:addons/account/account_bank_statement.py:350
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:73
+#: code:addons/account/invoice.py:678
+#: code:addons/account/wizard/account_use_model.py:81
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Analytic Journal !"
msgstr "لا يوجد يومية تحليلية !"
@@ -1263,14 +1410,23 @@
#. module: account
#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.tax.code.entries:0
+>>>>>>> MERGE-SOURCE
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Entry Label"
msgstr "تسمية القيد"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1129
+=======
+#: code:addons/account/account.py:990
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not modify/delete a journal with entries for this period !"
msgstr "لا يمكنك تعديل/مسح يومية بقيود لهذه الفترة"
@@ -1418,6 +1574,7 @@
#. module: account
#: model:ir.ui.menu,name:account.next_id_22
+#: report:account.aged_trial_balance:0
msgid "Partners"
msgstr "شركاء"
@@ -1438,7 +1595,17 @@
#. module: account
#: model:ir.actions.report.xml,name:account.account_central_journal
msgid "Central Journal"
+<<<<<<< TREE
msgstr "اليومية العامة"
+=======
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1277
+#, python-format
+msgid "You can not use this general account in this journal !"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.balance.report,display_account:0
@@ -1528,9 +1695,34 @@
#: model:ir.actions.act_window,name:account.action_invoice_tree4
#: model:ir.ui.menu,name:account.menu_action_invoice_tree4
msgid "Supplier Refunds"
+<<<<<<< TREE
msgstr "رد مال للمورد"
-
-#. module: account
+=======
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid ""
+"Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
+msgstr ""
+
+#. module: account
+#: 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 ""
+
+#. module: account
+#: field:account.installer.modules,account_anglo_saxon:0
+msgid "Anglo-Saxon Accounting"
+msgstr ""
+>>>>>>> MERGE-SOURCE
+
+#. module: account
+<<<<<<< TREE
#: selection:account.account,type:0
#: selection:account.account.template,type:0
#: selection:account.bank.statement,state:0
@@ -1540,6 +1732,12 @@
#: 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 ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
@@ -1708,6 +1906,7 @@
msgstr "جمع السنة"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1429
#, python-format
msgid ""
@@ -1715,6 +1914,8 @@
msgstr "لقد اخترت وحدة مقياس غير ملائمة للمنتج."
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
msgstr "هذا المعالج لتغيير العملة للفاتورة"
@@ -1726,6 +1927,7 @@
"Have a complete tree view of all journal items per account code by clicking "
"on an account."
msgstr ""
+<<<<<<< TREE
"اعرض لائحة بأسماء حسابات السنة المالية لشركتك وصنف بالمدة. لديك لائحة "
"كاملة لكل قيود دفتر الأستاذ على حسب رقم الحساب عن طريق الضغط على الحساب"
@@ -1738,6 +1940,24 @@
#: view:account.tax.template:0
msgid "Tax Declaration"
msgstr "الإعلان الضريبي"
+=======
+
+#. module: account
+#: constraint:account.fiscalyear:0
+msgid "Error! You cannot define overlapping fiscal years"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:799
+#, python-format
+msgid "The account is not defined to be reconciled !"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,pieces:0
+msgid "Values"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.journal.period,active:0
@@ -1754,7 +1974,17 @@
#. module: account
#: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
msgid "Receivables & Payables"
+<<<<<<< TREE
msgstr "المدينون و الدائنون"
+=======
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:806
+#, python-format
+msgid "You have to provide an account for the write off entry !"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_common_journal_report
@@ -1764,9 +1994,15 @@
#. module: account
#: selection:account.partner.balance,display_partner:0
msgid "All Partners"
+<<<<<<< TREE
msgstr "كل الشركاء"
#. module: account
+=======
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.analytic.chart:0
msgid "Analytic Account Charts"
msgstr "خرائط حساب تحليلي"
@@ -1783,7 +2019,11 @@
msgstr "مرجع العميل"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_cash_statement.py:292
+=======
+#: code:addons/account/account_cash_statement.py:329
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "User %s does not have rights to access %s journal !"
msgstr "المستخدم %s ليس لديه صلاحيات الكتابة و التحرير ليومية %s!"
@@ -1801,17 +2041,39 @@
#. module: account
#: view:account.tax:0
msgid "Tax Declaration: Credit Notes"
+<<<<<<< TREE
msgstr "الإعلان الضريبي: الأوراق الدائنة"
+=======
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:509
+#, python-format
+msgid "You cannot deactivate an account that contains account moves."
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.move.line.reconcile,credit:0
msgid "Credit amount"
+<<<<<<< TREE
msgstr "مبلغ الدائنون"
#. module: account
#: code:addons/account/account.py:407
#: code:addons/account/account.py:412
#: code:addons/account/account.py:429
+=======
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:529
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Error!"
msgstr "خطأ!"
@@ -1982,11 +2244,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_account_financial_report_tree
msgid "Makes a generic system to draw financial reports easily."
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.invoice:0
#: view:report.invoice.created:0
msgid "Untaxed Amount"
@@ -2104,10 +2369,23 @@
#: selection:account.invoice.report,state:0
#: selection:report.invoice.created,state:0
msgid "Pro-forma"
+<<<<<<< TREE
msgstr "كمسألة شكلية"
#. module: account
#: code:addons/account/account.py:1461
+=======
+msgstr ""
+
+#. module: account
+#: code:addons/account/installer.py:348
+#, python-format
+msgid " Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1333
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"There is no default default debit account defined \n"
@@ -2188,7 +2466,12 @@
msgstr "وصف"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3119
+=======
+#: code:addons/account/account.py:2888
+#: code:addons/account/installer.py:498
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "ECNJ"
msgstr "ECNJ"
@@ -2207,7 +2490,11 @@
msgstr "حساب الدخل"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:370
+=======
+#: code:addons/account/invoice.py:351
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no Accounting Journal of type Sale/Purchase defined!"
msgstr "لا يوجد دفتر يومية للمبيعات أو المشتريات معرف!"
@@ -2278,6 +2565,11 @@
#: field:accounting.report,fiscalyear_id:0
#: field:accounting.report,fiscalyear_id_cmp: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 "سنة مالية"
@@ -2411,7 +2703,11 @@
msgstr "كود الحساب الضريبي"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:572
+=======
+#: code:addons/account/invoice.py:552
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Can't find any account journal of %s type for this company.\n"
@@ -2502,7 +2798,12 @@
msgstr "إدخالات نماذج الحسابات"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3117
+=======
+#: code:addons/account/account.py:2840
+#: code:addons/account/installer.py:454
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "EXJ"
msgstr "EXJ"
@@ -2597,7 +2898,11 @@
msgstr "حسابات"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:369
+=======
+#: code:addons/account/invoice.py:350
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Configuration Error!"
msgstr "خطأ في الإعدادات!"
@@ -2610,7 +2915,19 @@
#. module: account
#: report:account.overdue:0
msgid "Date:"
+<<<<<<< TREE
msgstr "تاريخ:"
+=======
+msgstr ""
+
+#. module: account
+#: 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 ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.journal.period.print:0
@@ -2643,7 +2960,12 @@
#. module: account
#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
#: report:account.overdue:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
@@ -2777,15 +3099,27 @@
msgstr "سيقوم هذا المعالج بإنشاء قيود محاسبية تكرارية"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1321
+=======
+#: code:addons/account/account.py:1195
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No sequence defined on the journal !"
msgstr "لا يوجد مسلسل معرف لهذه اليومية !"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2268
#: code:addons/account/account_invoice.py:688
#: code:addons/account/account_move_line.py:173
+=======
+#: code:addons/account/account.py:2097
+#: code:addons/account/account_bank_statement.py:350
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
+#: code:addons/account/wizard/account_use_model.py:81
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
msgstr "عليك بتعريف يومية تحليلية في يومية '%s' !"
@@ -2835,7 +3169,16 @@
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
msgid "Payment entries are the second input of the reconciliation."
+<<<<<<< TREE
msgstr "قيود المدفوعات هي الإدخل الثاني للتسوية."
+=======
+msgstr ""
+
+#. module: account
+#: selection:account.print.journal,sort_selection:0
+msgid "Reference Number"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.entries.report,month:0
@@ -2939,10 +3282,31 @@
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
+<<<<<<< TREE
msgstr "الوضع المالي"
#. module: account
#: code:addons/account/account_invoice.py:735
+=======
+msgstr ""
+
+#. module: account
+#: help:account.partner.ledger,initial_balance:0
+#: help:account.report.general.ledger,initial_balance:0
+msgid ""
+"It adds initial balance row on report which display previous sum amount of "
+"debit/credit/balance"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+msgid "Analytic Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:836
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Tax base different!\n"
@@ -3096,8 +3460,13 @@
msgstr "عرض"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3363
#: code:addons/account/account_bank.py:90
+=======
+#: code:addons/account/account.py:2950
+#: code:addons/account/installer.py:296
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "BNK"
msgstr "بنك"
@@ -3214,6 +3583,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"
@@ -3231,8 +3606,12 @@
#: field:account.common.report,journal_ids:0
#: report:account.general.journal:0
#: field:account.general.journal,journal_ids:0
+<<<<<<< TREE
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+>>>>>>> MERGE-SOURCE
#: view:account.journal.period:0
#: report:account.partner.balance:0
#: field:account.partner.balance,journal_ids:0
@@ -3299,7 +3678,11 @@
msgstr "رصيد أول المدة"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1332
+=======
+#: code:addons/account/invoice.py:1298
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Partner Defined !"
msgstr "لا يوجد شريك معرف !"
@@ -3331,6 +3714,7 @@
msgid ""
"The amount expressed in the related account currency if not equal to the "
"company one."
+<<<<<<< TREE
msgstr "أُعربت الكمية في عملة الحساب المتعلق اذا لم تساوي لعملة الشركة."
#. module: account
@@ -3339,6 +3723,28 @@
#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
msgid "Unreconcile Entries"
msgstr "إلغاء تسوية القيود"
+=======
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.invoice:0
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_configuration_installer
+msgid "Accounting Chart Configuration"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.tax.code,notprintable:0
@@ -3376,23 +3782,51 @@
msgstr "سنة"
#. module: account
+<<<<<<< TREE
#: view:product.product:0
msgid "Purchase Taxes"
msgstr "ضرائب الشراء"
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: 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 ""
+<<<<<<< TREE
"كل قيود اليومية المختارة سيتم التحقق منها و ترحيلها. و هو ما يعني لأنك لن "
"تستطيع تعديل أي منها."
+=======
+
+#. module: account
+#: code:addons/account/invoice.py:373
+#, python-format
+msgid "Cannot delete invoice(s) that are already opened or paid !"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance.landscape:0
+msgid "Total :"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.report.xml,name:account.account_transfers
msgid "Transfers"
+<<<<<<< TREE
msgstr "تحويلات"
+=======
+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 ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.chart:0
@@ -3428,6 +3862,7 @@
"Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
"or 'Done' state!"
msgstr ""
+<<<<<<< TREE
"الفواتير المختارة لا يمكن إلغاءها حيث أنها ملغاة أو تمت من حيث الحالة!"
#. module: account
@@ -3443,6 +3878,26 @@
#. module: account
#: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
msgid "Print Sale/Purchase Journal"
+=======
+
+#. module: account
+#: 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 ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Invoicing Data"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -3607,7 +4062,11 @@
msgstr "قالب شجرة الحسابات"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2280
+=======
+#: code:addons/account/account.py:2109
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3619,10 +4078,26 @@
"الرجاء حدد شريك عليها!"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:837
+=======
+#: code:addons/account/account_move_line.py:801
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Some entries are already reconciled !"
+<<<<<<< TREE
msgstr "بعض القيود تمت تسويتها من قبل !"
+=======
+msgstr ""
+
+#. module: account
+#: 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 ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.tax:0
@@ -3733,7 +4208,11 @@
msgstr "عناصر تحليلية"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1153
+=======
+#: code:addons/account/account_move_line.py:1134
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Unable to change tax !"
msgstr "لا يمكن تغيير الضريبة !"
@@ -3741,11 +4220,29 @@
#. module: account
#: field:analytic.entries.report,nbr:0
msgid "#Entries"
+<<<<<<< TREE
msgstr "#القيود"
#. module: account
#: selection:account.invoice.refund,filter_refund:0
msgid "Create a draft Refund"
+=======
+msgstr ""
+
+#. module: account
+#: 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:476
+#, python-format
+msgid ""
+"The Payment Term of Supplier does not have Payment Term Lines(Computation) "
+"defined !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4104,7 +4601,17 @@
#. module: account
#: view:account.entries.report:0
msgid "Acc.Type"
+<<<<<<< TREE
msgstr "نوع الحساب"
+=======
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:722
+#, python-format
+msgid "Global taxes defined, but are not in invoice lines !"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.entries.report,month:0
@@ -4172,10 +4679,27 @@
#. module: account
#: field:account.tax,base_code_id:0
msgid "Account Base Code"
+<<<<<<< TREE
msgstr "رمز حساب الأساس"
#. module: account
#: code:addons/account/account_analytic_line.py:93
+=======
+msgstr ""
+
+#. module: account
+#: help:account.move,state:0
+msgid ""
+"All manually created new journal entry are usually in the state 'Unposted', "
+"but you can set the option to skip that state on the related journal. In "
+"that case, they will be behave as journal entries automatically created by "
+"the system on document validation (invoices, bank statements...) and will be "
+"created in 'Posted' state."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:90
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr "لا يوجد حساب مصروف معرف لهذا المنتج: \"%s\" (id:%d)"
@@ -4346,11 +4870,26 @@
#. module: account
#: view:account.tax.template:0
msgid "Credit Notes"
+<<<<<<< TREE
msgstr "أوراق دائنة"
#. module: account
#: sql_constraint:account.period:0
msgid "The name of the period must be unique per company!"
+=======
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2081
+#: code:addons/account/wizard/account_use_model.py:69
+#, python-format
+msgid "Unable to find a valid period !"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Voucher No"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4407,6 +4946,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 "يقدردفتر حساب للتكلفة التحليلية للحساب للتقرير اليومي"
@@ -4434,9 +4982,26 @@
msgstr "تغيير"
#. module: account
+<<<<<<< TREE
#: selection:account.journal,type:0
msgid "Bank and Cheques"
msgstr "البنك و الشيكات المصرفية"
+=======
+#: 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
+#: code:addons/account/wizard/account_move_journal.py:165
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:55
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:57
+#, python-format
+msgid "UserError"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.journal,type_control_ids:0
@@ -4466,6 +5031,7 @@
#. module: account
#: help:account.bank.statement,balance_end_cash:0
msgid "Closing balance based on cashBox"
+<<<<<<< TREE
msgstr "توازن الغلق بناءًا على خانة النقد"
#. module: account
@@ -4496,6 +5062,17 @@
msgstr ""
#. module: account
+=======
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+#: constraint:account.tax.code:0
+msgid "Error ! You can not create recursive accounts."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: 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
@@ -4531,10 +5108,23 @@
#. module: account
#: report:account.invoice:0
msgid "Cancelled Invoice"
+<<<<<<< TREE
msgstr "فاتورة ملغاة"
#. module: account
#: code:addons/account/account.py:1567
+=======
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:73
+#, python-format
+msgid "You must define an analytic journal of type '%s' !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1411
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Couldn't create move with currency different from the secondary currency of "
@@ -4571,6 +5161,7 @@
"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 ""
+<<<<<<< TREE
"سيتم التحقق من صلاحية كل مدخلات حساب السجل في هذه اليومية والفترة. يعني ذلك "
"انك غير قادر على تعديل حقول محاسبتها بعد الآن."
@@ -4578,6 +5169,19 @@
#: model:ir.ui.menu,name:account.menu_finance_configuration
msgid "Configuration"
msgstr "إعدادات"
+=======
+
+#. module: account
+#: report:account.account.balance.landscape:0
+msgid "Account Balance -"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.automatic.reconcile,date1:0
@@ -4621,6 +5225,7 @@
#: view:report.invoice.created:0
#: field:res.partner,invoice_ids:0
msgid "Invoices"
+<<<<<<< TREE
msgstr "الفواتير"
#. module: account
@@ -4632,6 +5237,17 @@
#: selection:account.bank.accounts.wizard,account_type:0
msgid "Check"
msgstr "تأكيد"
+=======
+msgstr ""
+
+#. module: account
+#: 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."
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice:0
@@ -4753,6 +5369,7 @@
#: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
#, python-format
msgid "Journal Items"
+<<<<<<< TREE
msgstr "عناصر اليومية"
#. module: account
@@ -4779,6 +5396,28 @@
#, python-format
msgid "Error"
msgstr "خطأ"
+=======
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "Balance Sheet (Assets Accounts)"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Third Party (Country)"
+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 ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.analytic.balance,date2:0
@@ -4795,10 +5434,16 @@
msgstr "تفاصيل البنك"
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_account_partner_balance
msgid ""
"This report is analysis by partner. It is a PDF report containing one line "
"per partner representing the cumulative credit balance."
+=======
+#: code:addons/account/invoice.py:728
+#, python-format
+msgid "Taxes missing !"
+>>>>>>> MERGE-SOURCE
msgstr ""
"قد تم تحليل هذا التقرير بواسطة الشريك. وهي تقرير تنسيق وثيقة محمولة تشتمل "
"على خط واحد لكل شريك يمثل توازن الدين التراكمي."
@@ -4874,6 +5519,7 @@
#. module: account
#: view:account.period:0
msgid "To Close"
+<<<<<<< TREE
msgstr "للغلق"
#. module: account
@@ -4883,6 +5529,17 @@
#. module: account
#: code:addons/account/account.py:1351
+=======
+msgstr ""
+
+#. module: account
+#: field:account.journal,allow_date:0
+msgid "Check Date not in the Period"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1224
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You can not modify a posted entry of this journal !\n"
@@ -4908,7 +5565,11 @@
msgstr "الحسابات الضريبية للانتاج"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1090
+=======
+#: code:addons/account/account.py:954
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Start period should be smaller then End period"
msgstr "بداية الفترة يجب أن تكون أقل من نهاية الفترة"
@@ -4955,7 +5616,15 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,target_move:0
+<<<<<<< TREE
#: field:accounting.report,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
+>>>>>>> MERGE-SOURCE
msgid "Target Moves"
msgstr "تحركات الهدف"
@@ -5047,7 +5716,11 @@
msgstr "الخط 1:"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1307
+=======
+#: code:addons/account/account.py:1181
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Integrity Error !"
msgstr "خطأ بالسلامة !"
@@ -5079,8 +5752,16 @@
msgstr "نتيجة التسوية"
#. module: account
+<<<<<<< TREE
#: model:account.financial.report,name:account.account_financial_report_balancesheet0
#: model:ir.ui.menu,name:account.menu_account_report_bs
+=======
+#: 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
+>>>>>>> MERGE-SOURCE
msgid "Balance Sheet"
msgstr "الميزانية العمومية"
@@ -5175,12 +5856,23 @@
#: field:account.tax,child_depend:0
#: field:account.tax.template,child_depend:0
msgid "Tax on Children"
+<<<<<<< TREE
msgstr "الضرايب على الأطفال"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Template Tax Fiscal Position"
msgstr "الوضع المالي للقالب الضريبي"
+=======
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2081
+#: code:addons/account/wizard/account_use_model.py:69
+#, python-format
+msgid "No period found !"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.journal,update_posted:0
@@ -5254,9 +5946,18 @@
"الأيام = 22، يوم من شهر = -1، ثم تاريخ الاستحقاق هو 28/02."
#. module: account
+<<<<<<< TREE
#: view:account.payment.term.line:0
msgid "Amount Computation"
msgstr "حساب المبلغ"
+=======
+#: code:addons/account/account.py:2940
+#: code:addons/account/installer.py:283
+#: code:addons/account/installer.py:295
+#, python-format
+msgid "Bank Journal "
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.journal:0
@@ -5276,7 +5977,19 @@
#: field:account.analytic.inverted.balance,date1:0
#: field:account.analytic.journal.report,date1:0
msgid "Start of period"
+<<<<<<< TREE
msgstr "بداية الفترة"
+=======
+msgstr ""
+
+#. module: account
+#: 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 ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_common_account_report
@@ -5337,6 +6050,7 @@
msgstr "قيود اليومية الختامية للسنة"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3446
#: code:addons/account/account_bank_statement.py:338
#: code:addons/account/account_invoice.py:427
@@ -5344,6 +6058,15 @@
#: code:addons/account/account_invoice.py:542
#: code:addons/account/account_invoice.py:550
#: code:addons/account/account_invoice.py:572
+=======
+#: code:addons/account/account_bank_statement.py:331
+#: 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
+>>>>>>> MERGE-SOURCE
#: code:addons/account/wizard/account_move_journal.py:63
#, python-format
msgid "Configuration Error !"
@@ -5411,6 +6134,7 @@
#: model:ir.actions.act_window,name:account.action_account_analytic_account_form
#: model:ir.ui.menu,name:account.account_analytic_def_account
msgid "Analytic Accounts"
+<<<<<<< TREE
msgstr "حسابات تحليلية"
#. module: account
@@ -5420,6 +6144,31 @@
#. module: account
#: field:account.analytic.line,amount_currency:0
+=======
+msgstr ""
+
+#. module: account
+#: help:account.account.type,report_type:0
+msgid ""
+"According value related accounts will be display on respective reports "
+"(Balance Sheet Profit & Loss Account)"
+msgstr ""
+
+#. module: account
+#: field:account.report.general.ledger,sortby:0
+msgid "Sort By"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1340
+#, python-format
+msgid ""
+"There is no default default credit account defined \n"
+"on journal \"%s\""
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.entries.report,amount_currency:0
#: field:account.model.line,amount_currency:0
#: field:account.move.line,amount_currency:0
@@ -5590,7 +6339,11 @@
msgstr "إنشاء القيود الإفتتاحية"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:759
+=======
+#: code:addons/account/account_move_line.py:729
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Already Reconciled!"
msgstr "تمت تسويتها!"
@@ -5630,7 +6383,11 @@
#. module: account
#: view:account.move.line.reconcile:0
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:857
+=======
+#: code:addons/account/account_move_line.py:821
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Write-Off"
msgstr "إلغاء"
@@ -5779,7 +6536,17 @@
#: view:account.invoice.report:0
#: field:account.invoice.report,nbr:0
msgid "# of Lines"
+<<<<<<< TREE
msgstr "عدد السطور"
+=======
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:59
+#, python-format
+msgid "New currency is not confirured properly !"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.aged.trial.balance,filter:0
@@ -5798,6 +6565,7 @@
#: field:accounting.report,filter:0
#: field:accounting.report,filter_cmp:0
msgid "Filter by"
+<<<<<<< TREE
msgstr "ترشيح بـ"
#. module: account
@@ -5814,12 +6582,23 @@
#. module: account
#: code:addons/account/account_move_line.py:1155
#: code:addons/account/account_move_line.py:1238
+=======
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not use an inactive account!"
msgstr "لا يمكنك إستخدام حساب غير نشط!"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:830
+=======
+#: code:addons/account/account_move_line.py:794
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entries are not of the same account or already reconciled ! "
msgstr "المدخلات ليست من نفس الحساب او تم تسويتها بالفعل ! "
@@ -5851,12 +6630,25 @@
#. module: account
#: field:account.payment.term.line,days:0
msgid "Number of Days"
+<<<<<<< TREE
msgstr "عدد الأيام"
#. module: account
#: code:addons/account/account_bank_statement.py:402
#: code:addons/account/account_invoice.py:392
#: code:addons/account/wizard/account_period_close.py:51
+=======
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "7"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:391
+#: code:addons/account/invoice.py:373
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invalid action !"
msgstr "إجراء خاطئ!"
@@ -6019,7 +6811,16 @@
"As soon as the reconciliation is done, the invoice's state turns to “done” "
"(i.e. paid) in the system."
msgstr ""
+<<<<<<< TREE
"حالما اتمام التسوية, حالة الفاتورة تُحول إلى \"تم\" (مثال: مدفوع) في النظام."
+=======
+
+#. module: account
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "is validated."
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.chart.template:0
@@ -6092,6 +6893,7 @@
#. module: account
#: model:ir.model,name:account.model_res_company
msgid "Companies"
+<<<<<<< TREE
msgstr "الشركات"
#. module: account
@@ -6106,6 +6908,12 @@
#. module: account
#: code:addons/account/account.py:629
+=======
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:546
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You can not remove/desactivate an account which is set on a customer or "
@@ -6352,7 +7160,13 @@
msgstr "إنشاء إختياري"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:664
+=======
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You cannot change the owner company of an account that already contains "
@@ -6517,8 +7331,13 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_analytic_line.py:145
#: code:addons/account/account_move_line.py:933
+=======
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entries: "
msgstr "القيود: "
@@ -6534,7 +7353,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1563
+=======
+#: code:addons/account/account.py:1407
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Couldn't create move between different companies"
msgstr "غير قادر على انشاء تحرك بين الشركات المختلفة"
@@ -6586,7 +7409,11 @@
msgstr "إجمالي الخصم"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:808
+=======
+#: code:addons/account/account_move_line.py:772
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entry \"%s\" is not valid !"
msgstr "المدخل \"%s\" غير صالح !"
@@ -6647,6 +7474,7 @@
#. module: account
#: model:process.transition.action,name:account.process_transition_action_createentries0
msgid "Create entry"
+<<<<<<< TREE
msgstr "إنشاء قيد"
#. module: account
@@ -6682,6 +7510,41 @@
#: code:addons/account/wizard/account_invoice_refund.py:108
#: code:addons/account/wizard/account_invoice_refund.py:110
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
+=======
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " valuation: percent"
+msgstr ""
+
+#. module: account
+#: 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: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
+>>>>>>> MERGE-SOURCE
#: code:addons/account/wizard/account_use_model.py:44
#, python-format
msgid "Error !"
@@ -6779,6 +7642,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
#: report:account.third_party_ledger:0
@@ -6787,6 +7651,13 @@
msgstr "اليومية"
#. module: account
+=======
+#: report:account.general.ledger_landscape:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.partner.balance:0
#: view:account.partner.ledger:0
msgid ""
@@ -6840,9 +7711,13 @@
msgstr "اختيار اليومية"
#. module: account
+<<<<<<< TREE
#: view:account.bank.statement:0
#: code:addons/account/account.py:420
#: code:addons/account/account.py:432
+=======
+#: code:addons/account/wizard/account_change_currency.py:64
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Opening Balance"
msgstr "رصيد أول المدة"
@@ -6925,11 +7800,17 @@
#: report:account.journal.period.print:0
#: report:account.journal.period.print.sale.purchase:0
#: report:account.partner.balance:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Total:"
msgstr "الإجمالي:"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2229
+=======
+#: code:addons/account/account.py:2064
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You can specify year, month and date in the name of the model using the "
@@ -6964,8 +7845,13 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:495
#: code:addons/account/wizard/account_invoice_refund.py:145
+=======
+#: code:addons/account/invoice.py:476
+#: code:addons/account/wizard/account_invoice_refund.py:137
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Data Insufficient !"
msgstr "بيانات غير كافية !"
@@ -7131,7 +8017,19 @@
#: field:account.analytic.journal,line_ids:0
#: field:account.tax.code,line_ids:0
msgid "Lines"
+<<<<<<< TREE
msgstr "سطور"
+=======
+msgstr ""
+
+#. module: account
+#: 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 ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.tax.template:0
@@ -7300,7 +8198,11 @@
"لإنشاء ضرائب محددة في مجال مخصص."
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1088
+=======
+#: code:addons/account/account.py:952
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You should have chosen periods that belongs to the same company"
msgstr "ينبغي عليك اختيار الفترات التي تمتد الى نفس الشركة"
@@ -7424,6 +8326,7 @@
#. module: account
#: field:account.financial.report,sign:0
msgid "Sign on Reports"
+<<<<<<< TREE
msgstr "إمضاء التقرير"
#. module: account
@@ -7441,6 +8344,35 @@
#: code:addons/account/account.py:3121
#, python-format
msgid "OPEJ"
+=======
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:250
+#, python-format
+msgid "You can not have two open register for the same journal"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " day of the month= -1"
+msgstr ""
+
+#. module: account
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: account
+#: help:account.journal,type:0
+msgid ""
+"Select 'Sale' for Sale journal to be used at the time of making invoice. "
+"Select 'Purchase' for Purchase Journal to be used at the time of approving "
+"purchase order. Select 'Cash' to be used at the time of making payment. "
+"Select 'General' for miscellaneous operations. Select 'Opening/Closing "
+"Situation' to be used at the time of new fiscal year creation or end of year "
+"entries generation."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -7450,11 +8382,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 "غير متوازن"
+=======
+#: view:account.payment.term.line:0
+msgid " value amount: n.a"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.move.line,centralisation:0
@@ -7473,10 +8411,21 @@
msgstr "معلومات خيارية"
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_fiscalyear_close.py:84
#, python-format
msgid "The journal must have default credit and debit account"
msgstr "دفتر اليومية يجب أن يتضمن حساب إفتراضي دائن و أخر مدين"
+=======
+#: 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
+#: field:analytic.entries.report,user_id:0
+msgid "User"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.general.journal:0
@@ -7494,6 +8443,7 @@
"This field is used for payable and receivable journal entries. You can put "
"the limit date for the payment of this line."
msgstr ""
+<<<<<<< TREE
"يُستخدم هذا الحقل لمدخلات اليومية للدائنين والمدينون. يمكنك ان تضع موعد محدد "
"للدفع لهذا الخط"
@@ -7509,12 +8459,22 @@
#. module: account
#: code:addons/account/account_move_line.py:1302
+=======
+
+#. module: account
+#: code:addons/account/account_move_line.py:1277
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Bad account !"
msgstr "حساب سئ !"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3108
+=======
+#: code:addons/account/account.py:2821
+#: code:addons/account/installer.py:432
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Sales Journal"
msgstr "يومية المبيعات"
@@ -7531,7 +8491,11 @@
msgstr "ضريبة الفاتورة"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1277
+=======
+#: code:addons/account/account_move_line.py:1252
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No piece number !"
msgstr "لا يوجد رقم للقطعة !"
@@ -7850,6 +8814,7 @@
msgstr "ثابت"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:629
#: code:addons/account/account.py:642
#: code:addons/account/account.py:645
@@ -7862,6 +8827,19 @@
#: code:addons/account/account_move_line.py:97
#: code:addons/account/account_move_line.py:750
#: code:addons/account/account_move_line.py:803
+=======
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
+#: code:addons/account/account.py:532
+#: 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
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Warning !"
msgstr "تحذير !"
@@ -7880,9 +8858,15 @@
#: view:account.subscription.generate:0
#: model:ir.model,name:account.model_account_subscription_generate
msgid "Subscription Compute"
+<<<<<<< TREE
msgstr "حساب الإشتراك"
#. module: account
+=======
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.bank.statement.line,partner_id:0
#: view:account.entries.report:0
#: field:account.entries.report,partner_id:0
@@ -7926,7 +8910,11 @@
msgstr "لايمكن السجل %s/الشكلية/الغاء الفاتورة."
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:810
+=======
+#: code:addons/account/invoice.py:795
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Invoice Lines !"
msgstr "لا سطور للفاتورة !"
@@ -8001,7 +8989,11 @@
msgstr "طريقة التأجيل"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:379
+=======
+#: code:addons/account/invoice.py:360
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invoice '%s' is paid."
msgstr "تم دفع الفاتورة ‘%s‘."
@@ -8067,7 +9059,11 @@
msgstr "شريك متحد"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1332
+=======
+#: code:addons/account/invoice.py:1298
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You must first select a partner !"
msgstr "يجب عليك اولاً اختيار شريك !"
@@ -8137,7 +9133,12 @@
msgstr "اختار السنة المالية"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3111
+=======
+#: code:addons/account/account.py:2885
+#: code:addons/account/installer.py:495
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Purchase Refund Journal"
msgstr "يومية تسديد الشراء"
@@ -8303,6 +9304,7 @@
msgstr "عملة الشركة"
#. module: account
+<<<<<<< TREE
#: field:account.aged.trial.balance,chart_account_id:0
#: field:account.balance.report,chart_account_id:0
#: field:account.central.journal,chart_account_id:0
@@ -8317,6 +9319,17 @@
#: field:account.report.general.ledger,chart_account_id:0
#: field:account.vat.declaration,chart_account_id:0
#: field:accounting.report,chart_account_id:0
+=======
+#: report:account.general.ledger:0
+#: 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
+>>>>>>> MERGE-SOURCE
msgid "Chart of Account"
msgstr "شجرة الحساب"
@@ -8392,11 +9405,25 @@
#: model:ir.actions.act_window,name:account.action_account_type_form
#: model:ir.ui.menu,name:account.menu_action_account_type_form
msgid "Account Types"
+<<<<<<< TREE
msgstr "أنواع الحساب"
#. module: account
#: view:account.payment.term.line:0
msgid " Value amount: n.a"
+=======
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:905
+#, python-format
+msgid "Cannot create invoice move on centralised journal"
+msgstr ""
+
+#. module: account
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -8444,9 +9471,17 @@
#: report:account.account.balance:0
#: report:account.central.journal:0
#: report:account.general.journal:0
+<<<<<<< TREE
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+>>>>>>> MERGE-SOURCE
#: 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 "ترشيح بـ"
@@ -8505,7 +9540,12 @@
msgstr "سطر شروط السداد"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3109
+=======
+#: code:addons/account/account.py:2838
+#: code:addons/account/installer.py:452
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Purchase Journal"
msgstr "يومية المشتريات"
@@ -8686,10 +9726,18 @@
msgstr "يجب ان تكون كمية الايصال نفس كمية الايصال في خط البيان"
#. module: account
+<<<<<<< TREE
#: model:account.account.type,name:account.data_account_type_expense
#: model:account.financial.report,name:account.account_financial_report_expense0
msgid "Expense"
msgstr "مصروف"
+=======
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
+#, python-format
+msgid "Bad account!"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.chart,fiscalyear:0
@@ -8697,7 +9745,11 @@
msgstr "اتركه فارغ لكل السنوات المالية المفتوحة"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1105
+=======
+#: code:addons/account/account_move_line.py:1062
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "The account move (%s) for centralisation has been confirmed!"
msgstr "تم تأكيد تحرك الحساب (%s) للمركزية!"
@@ -8939,10 +9991,27 @@
msgstr "من الفترة"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3110
+=======
+#: code:addons/account/account.py:2861
+#: code:addons/account/installer.py:476
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Sales Refund Journal"
+<<<<<<< TREE
msgstr "يومية رد المبيعات"
+=======
+msgstr ""
+
+#. module: account
+#: 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 ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.move:0
@@ -8986,7 +10055,11 @@
msgstr "ضريبة المشتريات (%)"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:810
+=======
+#: code:addons/account/invoice.py:795
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Please create some invoice lines."
msgstr "قم بإنشاء سطور للفاتورة."
@@ -8994,6 +10067,7 @@
#. module: account
#: report:account.overdue:0
msgid "Dear Sir/Madam,"
+<<<<<<< TREE
msgstr "عزيزي سيدي / سيدتي،"
#. module: account
@@ -9003,6 +10077,18 @@
#. module: account
#: code:addons/account/account.py:3118
+=======
+msgstr ""
+
+#. module: account
+#: view:account.installer.modules:0
+msgid "Configure Your Accounting Application"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2864
+#: code:addons/account/installer.py:479
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "SCNJ"
msgstr "SCNJ"
@@ -9058,7 +10144,12 @@
#: report:account.general.journal:0
#: field:account.general.journal,period_from:0
#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
#: report:account.partner.balance:0
#: field:account.partner.balance,period_from:0
#: field:account.partner.ledger,period_from:0
@@ -9071,10 +10162,21 @@
#: field:accounting.report,period_from:0
#: field:accounting.report,period_from_cmp:0
msgid "Start Period"
+<<<<<<< TREE
msgstr "بداية الفترة"
+=======
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2357
+#, python-format
+msgid "Cannot locate parent code for template account!"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
msgid "Analysis Direction"
msgstr "إتجاه التحليل"
@@ -9102,7 +10204,19 @@
#. module: account
#: model:process.transition,note:account.process_transition_suppliervalidentries0
msgid "Accountant validates the accounting entries coming from the invoice. "
+<<<<<<< TREE
msgstr "يتحقق المحاسب من صلاحية المدخلات المحاسبية الآتية من الفاتورة. "
+=======
+msgstr ""
+
+#. module: account
+#: 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 ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.overdue:0
@@ -9122,20 +10236,51 @@
#. module: account
#: report:account.overdue:0
msgid "Document: Customer account statement"
+<<<<<<< TREE
msgstr "مستند: كشف حساب عميل"
#. module: account
#: field:account.account.type,report_type:0
msgid "P&L / BS Category"
msgstr "فئة P&L / BS"
-
-#. 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
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:70
+#, python-format
+msgid "Current currency is not confirured properly !"
+msgstr ""
+>>>>>>> MERGE-SOURCE
+
+#. module: account
+#: 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 ""
"مع المسترد من المورد يمكنك إدارة مذكرات الائتمان التي تتلقاها من الموردين "
"الخاصين بك. والمبلغ عبارة عن وثيقة التي تعتمد الفاتورة كليا أو جزئيا. يمكنك "
@@ -9144,6 +10289,7 @@
#. module: account
#: view:account.account.template:0
msgid "Receivale Accounts"
+<<<<<<< TREE
msgstr "حسابات المدينون"
#. module: account
@@ -9152,6 +10298,20 @@
#: model:ir.ui.menu,name:account.menu_bank_statement_tree
msgid "Bank Statements"
msgstr "كشوف حساب البنك"
+=======
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "Profit & Loss (Income Accounts)"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.account,balance:0
@@ -9164,8 +10324,12 @@
#: field:account.entries.report,balance:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+<<<<<<< TREE
#: report:account.general.ledger_landscape:0
#: field:account.invoice,residual:0
+=======
+#: report:account.general.ledger_landscape:0
+>>>>>>> MERGE-SOURCE
#: field:account.move.line,balance:0
#: report:account.partner.balance:0
#: selection:account.payment.term.line,value:0
@@ -9176,6 +10340,10 @@
#: field:account.treasury.report,balance: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 "الرصيد"
@@ -9186,7 +10354,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 "عرض الحساب"
@@ -9262,12 +10438,19 @@
"closed or left open depending on your company's activities over a specific "
"period."
msgstr ""
+<<<<<<< TREE
"يمكنك هنا تحديد فترة مالية، فترة من الزمن في السنة المالية للشركة. الفترة "
"المحاسبية عادة هي الشهر أو ربع. وهو يقابل عادة إلى فترات من الاقرار الضريبي. "
"إنشاء وإدارة فترات من هنا ويقرر ما إذا كان يجب إغلاق الفترة أو ترك الباب "
"مفتوحا تبعا لأنشطة الشركة خلال فترة محددة."
#. module: account
+=======
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Filters By"
@@ -9290,7 +10473,11 @@
msgstr "نقل"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1153
+=======
+#: code:addons/account/account_move_line.py:1134
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not change the tax, you should remove and recreate lines !"
msgstr "لا يمكنك تغيير الضريبة, يجب عليك ازالة واعادة انشاء الخطوط !"
@@ -9410,7 +10597,12 @@
#: report:account.general.journal:0
#: field:account.general.journal,period_to:0
#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
#: report:account.partner.balance:0
#: field:account.partner.balance,period_to:0
#: field:account.partner.ledger,period_to:0
@@ -9451,9 +10643,18 @@
msgstr "إشتراك الحساب"
#. module: account
+<<<<<<< TREE
#: report:account.overdue:0
msgid "Maturity date"
msgstr "تاريخ الإستحقاق"
+=======
+#: code:addons/account/invoice.py:725
+#, python-format
+msgid ""
+"Tax base different !\n"
+"Click on compute to update tax base"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.subscription:0
@@ -9485,8 +10686,12 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,date_from:0
+<<<<<<< TREE
#: field:accounting.report,date_from:0
#: field:accounting.report,date_from_cmp:0
+=======
+#: report:account.aged_trial_balance:0
+>>>>>>> MERGE-SOURCE
msgid "Start Date"
msgstr "تاريخ البدء"
@@ -9512,7 +10717,11 @@
msgstr "غير مسوي"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:828
+=======
+#: code:addons/account/invoice.py:812
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Bad total !"
msgstr "إجمالي سئ!"
@@ -9569,6 +10778,7 @@
#: field:account.payment.term,active:0
#: field:account.tax,active:0
msgid "Active"
+<<<<<<< TREE
msgstr "نشِط"
#. module: account
@@ -9578,9 +10788,28 @@
#. module: account
#: code:addons/account/account_invoice.py:372
+=======
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:353
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Unknown Error"
+<<<<<<< TREE
msgstr "خطأ غير معروف"
+=======
+msgstr ""
+
+#. module: account
+#: 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 ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:res.partner,property_account_payable:0
@@ -9642,6 +10871,7 @@
"هذا الحقل فارغاً, سيستخدم اليومية نفسها كفاتورة حالية."
#. module: account
+<<<<<<< TREE
#: selection:account.account.type,report_type:0
#: code:addons/account/account.py:181
#, python-format
@@ -9654,6 +10884,11 @@
"Configuration Error! \n"
"You can not select an account type with a deferral method different of "
"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
+=======
+#: view:account.general.journal:0
+#: model:ir.ui.menu,name:account.menu_account_general_journal
+msgid "General Journals"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -9846,9 +11081,15 @@
#: field:account.account.template,type:0
#: field:account.entries.report,type:0
msgid "Internal Type"
+<<<<<<< TREE
msgstr "النوع الداخلي"
#. module: account
+=======
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.actions.act_window,name:account.action_subscription_form_running
msgid "Running Subscriptions"
msgstr "إدارة الإشتراكات"
@@ -9927,6 +11168,7 @@
#. module: account
#: view:ir.sequence:0
msgid "Fiscal Year Sequences"
+<<<<<<< TREE
msgstr "مسلسل السنوات المالية"
#. module: account
@@ -9936,6 +11178,17 @@
#. module: account
#: code:addons/account/account_analytic_line.py:102
+=======
+msgstr ""
+
+#. module: account
+#: help:account.model,name:0
+msgid "This is a model for recurring accounting entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:99
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr "لا يوجد حساب دخل معرّف لهذا المنتج: \"%s\" (id:%d)"
@@ -9980,6 +11233,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 "الإجمالي"
@@ -10106,9 +11360,23 @@
msgstr "نهاية الفترة"
#. module: account
+<<<<<<< TREE
#: sql_constraint:account.journal:0
msgid "The code of the journal must be unique per company !"
msgstr "يجب ان يكون الكود لليومية فريد لكل شركة !"
+=======
+#: 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
+#: code:addons/account/wizard/account_state_open.py:37
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#: code:addons/account/wizard/account_validate_account_move.py:61
+#, python-format
+msgid "Warning"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:product.category,property_account_expense_categ:0
@@ -10117,6 +11385,7 @@
"This account will be used to value outgoing stock for the current product "
"category using cost price"
msgstr ""
+<<<<<<< TREE
"وسيتم استخدام هذا الحساب لقيمة الأسهم الصادرة لفئة من فئات المنتجات الحالية "
"باستخدام سعر التكلفة"
@@ -10141,6 +11410,19 @@
#: view:account.move.line.reconcile.writeoff:0
msgid "Write-Off Move"
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 ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.node,note:account.process_node_paidinvoice0
@@ -10207,11 +11489,14 @@
msgstr "خطأ ! لا يمكنك انشاء قوالب الحاسب العودية."
#. module: account
+<<<<<<< TREE
#: selection:account.print.journal,sort_selection:0
msgid "Journal Entry Number"
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.subscription:0
msgid "Recurring"
msgstr "متكرّر"
@@ -10225,7 +11510,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:832
+=======
+#: code:addons/account/account_move_line.py:796
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entry is already reconciled"
msgstr "قيد اليومية مسوي بالفعل"
@@ -10251,7 +11540,12 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:account.account,type:0
+=======
+#: code:addons/account/account_move_line.py:1252
+#, python-format
+>>>>>>> MERGE-SOURCE
msgid ""
"The 'Internal Type' is used for features available on different types of "
"accounts: view can not have journal items, consolidation are accounts that "
@@ -10410,7 +11704,11 @@
msgstr "مقابلة الحسابات"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:364
+=======
+#: code:addons/account/invoice.py:345
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invoice '%s' is waiting for validation."
msgstr "الفاتورة '%s' منتظرة للتحقق."
@@ -10432,7 +11730,17 @@
#. module: account
#: help:account.invoice.line,account_id:0
msgid "The income or expense account related to the selected product."
+<<<<<<< TREE
msgstr "الدخل أو المصروف المرتبط للمنتج المختار."
+=======
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1123
+#, python-format
+msgid "The date of your Journal Entry is not in the defined period!"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.subscription,period_total:0
@@ -10606,6 +11914,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 "الشريك"
@@ -10720,7 +12029,17 @@
#: code:addons/account/wizard/account_report_aged_partner_balance.py:56
#, python-format
msgid "You must enter a period length that cannot be 0 or below !"
+<<<<<<< TREE
msgstr "لابد من إدخال الفترة علي ألا تكون صفر أو أقل"
+=======
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:511
+#, python-format
+msgid "You cannot remove an account which has account entries!. "
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,help:account.action_account_form
@@ -10745,5 +12064,54 @@
"The residual amount on a receivable or payable of a journal entry expressed "
"in its currency (maybe different of the company currency)."
msgstr ""
+<<<<<<< TREE
"المبلغ المتبقي على الدائن أو المدين لقيد اليومية معبر عنها بعملتها (ربما "
"تكون مختلفة لعملة الشركة)."
+=======
+
+#. 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 2012-05-17 06:07:33 +0000
+++ account/i18n/bg.po 2012-06-07 17:42:47 +0000
@@ -6,13 +6,20 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-04-28 02:09+0000\n"
"Last-Translator: Rado Serafimov <rserafimov@xxxxxxxxx>\n"
+=======
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2011-04-01 09:39+0000\n"
+"Last-Translator: Dimitar Markov <dimitar.markov@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: 2012-05-17 05:18+0000\n"
"X-Generator: Launchpad (build 15259)\n"
@@ -21,6 +28,10 @@
#: view:analytic.entries.report:0
msgid "last month"
msgstr "предходен месец"
+=======
+"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
@@ -33,7 +44,12 @@
msgstr "Други настройки"
#. module: account
+<<<<<<< TREE
#: help:account.tax.code,sequence:0
+=======
+#: code:addons/account/account.py:516
+#, python-format
+>>>>>>> MERGE-SOURCE
msgid ""
"Determine the display order in the report 'Accounting \\ Reporting \\ "
"Generic Reporting \\ Taxes \\ Taxes Report'"
@@ -65,6 +81,15 @@
msgstr "Остатък"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:793
+#, python-format
+msgid "Please define sequence on invoice journal"
+msgstr "Моля зядайте последователност за дневник фактури"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: constraint:account.period:0
msgid "Error ! The duration of the Period(s) is/are invalid. "
msgstr "Грешка ! Продължителността на периода(те) е(са) невалиден(и). "
@@ -111,6 +136,7 @@
"If you unreconciliate transactions, you must also verify all the actions "
"that are linked to those transactions because they will not be disabled"
msgstr ""
+<<<<<<< TREE
"В случай че анулирате съответствието на транзакции,моля да проверите всички "
"действия свързани с тези транзакции, тъй като тези действия няма да бъдат "
"премахнати автоматично"
@@ -123,6 +149,21 @@
msgstr ""
"Грешка в настройките! Избраната валута следва да се ползва и от стандартно "
"настроените сметки."
+=======
+"Ако върнете изравняване на транзакции, трябва да проверите всички действия "
+"свързани с тези транзакции понеже те няма да бъдат премахнати"
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Accounting Entries-"
+msgstr "Счетоводни записи-"
+
+#. module: account
+#: code:addons/account/account.py:1305
+#, python-format
+msgid "You can not delete posted movement: \"%s\"!"
+msgstr "Не може да изтриете публикувано движение: \"%s\"!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.invoice:0
@@ -164,7 +205,11 @@
"без да го изтривате."
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1428
+=======
+#: code:addons/account/invoice.py:1436
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Warning!"
msgstr "Предупреждение!"
@@ -225,6 +270,19 @@
msgstr "account.tax"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:915
+#, python-format
+msgid ""
+"No period defined for this date: %s !\n"
+"Please create a fiscal year."
+msgstr ""
+"За тази дата не е дефиниран период: %s !\n"
+"Моля, създайте фискална година!"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.model,name:account.model_account_move_line_reconcile_select
msgid "Move line reconcile select"
msgstr ""
@@ -239,7 +297,11 @@
"Отметнете ако не искате в тази фактура да участват ДДС свързани данъци"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1241
+=======
+#: code:addons/account/invoice.py:1224
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
msgstr "Фактура '%s' е частично платена: %s%s от %s%s (%s%s остатък)"
@@ -255,7 +317,11 @@
msgstr "Белгийски отчети"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1200
+=======
+#: code:addons/account/account_move_line.py:1182
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not add/modify entries in a closed journal."
msgstr "Не може да добавяте/променяте записи в закрит дневник."
@@ -305,7 +371,11 @@
msgstr "Ул."
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:551
+=======
+#: code:addons/account/invoice.py:532
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invoice line account company does not match with invoice company."
msgstr ""
@@ -570,10 +640,17 @@
msgstr "Няма обединяващи транзакции"
#. module: account
+<<<<<<< TREE
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
msgid "Counterpart"
msgstr "Съконтрагент"
+=======
+#: code:addons/account/account_cash_statement.py:349
+#, python-format
+msgid "CashBox Balance is not matching with Calculated Balance !"
+msgstr "Балансът в касата не отговаря на изчисления баланс!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.fiscal.position:0
@@ -665,7 +742,12 @@
msgstr "Сума за данъчен код"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3116
+=======
+#: code:addons/account/account.py:2823
+#: code:addons/account/installer.py:434
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "SAJ"
msgstr ""
@@ -692,8 +774,13 @@
msgstr "Период на дневник"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:750
#: code:addons/account/account_move_line.py:803
+=======
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "To reconcile the entries company should be the same for all entries"
msgstr ""
@@ -773,12 +860,16 @@
msgstr "Аналитични записи по редове"
#. module: account
+<<<<<<< TREE
#: field:account.invoice.refund,filter_refund:0
msgid "Refund Method"
msgstr "Метод за възстановяване на сума"
#. module: account
#: code:addons/account/wizard/account_change_currency.py:38
+=======
+#: code:addons/account/wizard/account_change_currency.py:38
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can only change currency for Draft Invoice !"
msgstr "Можете да сменяте валутата само на фактури в статус проект (чернова)"
@@ -917,9 +1008,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.cashbox.line,pieces:0
msgid "Values"
msgstr "Стойности"
+=======
+#: 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 ""
+"Не може да извършите това върху потвърден запис ! Моля отбележете че може "
+"само да промените само някои неважни полета !"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice.report:0
@@ -941,6 +1043,7 @@
#. module: account
#: report:account.overdue:0
+#: report:account.aged_trial_balance:0
msgid "Due"
msgstr "За плащане"
@@ -1056,15 +1159,28 @@
#: 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
+<<<<<<< TREE
#: code:addons/account/account.py:2268
#: code:addons/account/account_bank_statement.py:357
#: code:addons/account/account_invoice.py:73
#: code:addons/account/account_invoice.py:688
#: code:addons/account/account_move_line.py:173
+=======
+#: code:addons/account/account.py:2097
+#: code:addons/account/account_bank_statement.py:350
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:73
+#: code:addons/account/invoice.py:678
+#: code:addons/account/wizard/account_use_model.py:81
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Analytic Journal !"
msgstr "Няма аналитичен дневник !"
@@ -1289,14 +1405,23 @@
#. module: account
#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.tax.code.entries:0
+>>>>>>> MERGE-SOURCE
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Entry Label"
msgstr "Етикет на запис"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1129
+=======
+#: code:addons/account/account.py:990
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not modify/delete a journal with entries for this period !"
msgstr "Не може да променяте/изтривате дневник със записи от този период !"
@@ -1445,6 +1570,7 @@
#. module: account
#: model:ir.ui.menu,name:account.next_id_22
+#: report:account.aged_trial_balance:0
msgid "Partners"
msgstr "Партньори"
@@ -1468,6 +1594,15 @@
msgstr "Централен дневник"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1277
+#, python-format
+msgid "You can not use this general account in this journal !"
+msgstr "Не може да използвате главна сметка за този дневник !"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: selection:account.balance.report,display_account:0
#: selection:account.common.account.report,display_account:0
#: selection:account.partner.balance,display_partner:0
@@ -1555,6 +1690,7 @@
msgstr "Обезщетения на доставчик"
#. module: account
+<<<<<<< TREE
#: selection:account.account,type:0
#: selection:account.account.template,type:0
#: selection:account.bank.statement,state:0
@@ -1564,6 +1700,35 @@
#: selection:account.period,state:0
msgid "Closed"
msgstr "Приключен"
+=======
+#: view:account.payment.term.line:0
+msgid ""
+"Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
+msgstr ""
+
+#. module: account
+#: 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 ""
+"Не може да се създаде фактурата!\n"
+"Определените условия на плащане връщат по-голямо изчислено количество от "
+"общото фактурираната сума."
+
+#. module: account
+#: field:account.installer.modules,account_anglo_saxon:0
+msgid "Anglo-Saxon Accounting"
+msgstr "Англо-Саксонско счетоводство"
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr "Движение на отписване"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
@@ -1735,6 +1900,7 @@
msgstr "Годишна сума"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1429
#, python-format
msgid ""
@@ -1742,6 +1908,8 @@
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
msgstr "Този помощник ще промени валутата на фактурата"
@@ -1758,6 +1926,7 @@
"кликане върху сметката."
#. module: account
+<<<<<<< TREE
#: view:account.analytic.account:0
msgid "Pending Accounts"
msgstr ""
@@ -1766,6 +1935,22 @@
#: view:account.tax.template:0
msgid "Tax Declaration"
msgstr "Данъчна декларация"
+=======
+#: constraint:account.fiscalyear:0
+msgid "Error! You cannot define overlapping fiscal years"
+msgstr "Грешка! Не можете да дефинирате застъпващи се финансови години."
+
+#. module: account
+#: code:addons/account/account_move_line.py:799
+#, python-format
+msgid "The account is not defined to be reconciled !"
+msgstr "Сметката не е посочена за равняване!"
+
+#. module: account
+#: field:account.cashbox.line,pieces:0
+msgid "Values"
+msgstr "Стойности"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.journal.period,active:0
@@ -1785,6 +1970,15 @@
msgstr "Приходни и разходни"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:806
+#, python-format
+msgid "You have to provide an account for the write off entry !"
+msgstr "Трябва да изберете сметка за записа на отписването !"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.model,name:account.model_account_common_journal_report
msgid "Account Common Journal Report"
msgstr "Справка по сметка от Журнала"
@@ -1811,7 +2005,11 @@
msgstr "Отпратка към клиент:"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_cash_statement.py:292
+=======
+#: code:addons/account/account_cash_statement.py:329
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "User %s does not have rights to access %s journal !"
msgstr ""
@@ -1832,14 +2030,32 @@
msgstr "Данъчна декларация: кредитни известия"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:509
+#, python-format
+msgid "You cannot deactivate an account that contains account moves."
+msgstr "Не можете да деактивирате сметка която съдържа движения."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.move.line.reconcile,credit:0
msgid "Credit amount"
msgstr "Сума на кредит"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:407
#: code:addons/account/account.py:412
#: code:addons/account/account.py:429
+=======
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr "Не може да създадете ред за движение в приключена сметка."
+
+#. module: account
+#: code:addons/account/account.py:529
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Error!"
msgstr ""
@@ -2001,6 +2217,7 @@
msgstr "Изображение"
#. module: account
+<<<<<<< TREE
#: constraint:account.move.line:0
msgid ""
"The selected account of your Journal Entry forces to provide a secondary "
@@ -2014,6 +2231,8 @@
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.invoice:0
#: view:report.invoice.created:0
msgid "Untaxed Amount"
@@ -2134,7 +2353,17 @@
msgstr "Про-форма"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1461
+=======
+#: code:addons/account/installer.py:348
+#, python-format
+msgid " Journal"
+msgstr " Дневник"
+
+#. module: account
+#: code:addons/account/account.py:1333
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"There is no default default debit account defined \n"
@@ -2207,7 +2436,12 @@
msgstr "Описание"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3119
+=======
+#: code:addons/account/account.py:2888
+#: code:addons/account/installer.py:498
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "ECNJ"
msgstr ""
@@ -2226,7 +2460,11 @@
msgstr "Приходна сметка"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:370
+=======
+#: code:addons/account/invoice.py:351
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no Accounting Journal of type Sale/Purchase defined!"
msgstr "Няма счетоводен дневник за продажби/покупки!"
@@ -2297,6 +2535,11 @@
#: field:accounting.report,fiscalyear_id:0
#: field:accounting.report,fiscalyear_id_cmp: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 "Финансова година"
@@ -2430,7 +2673,11 @@
msgstr "Данъчен код"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:572
+=======
+#: code:addons/account/invoice.py:552
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Can't find any account journal of %s type for this company.\n"
@@ -2511,7 +2758,12 @@
msgstr "Запис на модела на сметка"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3117
+=======
+#: code:addons/account/account.py:2840
+#: code:addons/account/installer.py:454
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "EXJ"
msgstr ""
@@ -2609,7 +2861,11 @@
msgstr "Сметки"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:369
+=======
+#: code:addons/account/invoice.py:350
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Configuration Error!"
msgstr "Грешка при настройване!"
@@ -2625,6 +2881,17 @@
msgstr "Дата:"
#. module: account
+<<<<<<< TREE
+=======
+#: 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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: report:account.journal.period.print:0
#: report:account.journal.period.print.sale.purchase:0
msgid "Label"
@@ -2655,7 +2922,12 @@
#. module: account
#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
#: report:account.overdue:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
@@ -2784,15 +3056,27 @@
msgstr "Този помощник ще създаде повтарящи се счетоводни записи"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1321
+=======
+#: code:addons/account/account.py:1195
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No sequence defined on the journal !"
msgstr "Не са зададени последоватености за този дневник !"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2268
#: code:addons/account/account_invoice.py:688
#: code:addons/account/account_move_line.py:173
+=======
+#: code:addons/account/account.py:2097
+#: code:addons/account/account_bank_statement.py:350
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
+#: code:addons/account/wizard/account_use_model.py:81
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
msgstr "Трябва да зададете аналитичен дневник в '%s' дневник!"
@@ -2845,6 +3129,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: selection:account.print.journal,sort_selection:0
+msgid "Reference Number"
+msgstr "Референтен номер"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: selection:account.entries.report,month:0
#: selection:account.invoice.report,month:0
#: selection:analytic.entries.report,month:0
@@ -2948,7 +3240,25 @@
msgstr "Фискална позиция"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:735
+=======
+#: help:account.partner.ledger,initial_balance:0
+#: help:account.report.general.ledger,initial_balance:0
+msgid ""
+"It adds initial balance row on report which display previous sum amount of "
+"debit/credit/balance"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+msgid "Analytic Entries"
+msgstr "Аналитични записи"
+
+#. module: account
+#: code:addons/account/account.py:836
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Tax base different!\n"
@@ -3102,8 +3412,13 @@
msgstr "Изглед"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3363
#: code:addons/account/account_bank.py:90
+=======
+#: code:addons/account/account.py:2950
+#: code:addons/account/installer.py:296
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "BNK"
msgstr ""
@@ -3203,12 +3518,21 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
#, python-format
msgid "No End of year journal defined for the fiscal year"
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
+>>>>>>> MERGE-SOURCE
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the expense account"
@@ -3226,8 +3550,12 @@
#: field:account.common.report,journal_ids:0
#: report:account.general.journal:0
#: field:account.general.journal,journal_ids:0
+<<<<<<< TREE
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+>>>>>>> MERGE-SOURCE
#: view:account.journal.period:0
#: report:account.partner.balance:0
#: field:account.partner.balance,journal_ids:0
@@ -3294,7 +3622,11 @@
msgstr "Начален баланс"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1332
+=======
+#: code:addons/account/invoice.py:1298
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Partner Defined !"
msgstr "Не е зададен партньор !"
@@ -3329,11 +3661,31 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,name:account.action_account_unreconcile
#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
msgid "Unreconcile Entries"
msgstr "Връщане приравняване на записи"
+=======
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.invoice:0
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Draft"
+msgstr "Проект"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_configuration_installer
+msgid "Accounting Chart Configuration"
+msgstr "Настройки на Сметкоплан"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.tax.code,notprintable:0
@@ -3371,11 +3723,14 @@
msgstr "година"
#. module: account
+<<<<<<< TREE
#: view:product.product:0
msgid "Purchase Taxes"
msgstr "Данъци на поръчка"
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:validate.account.move.lines:0
msgid ""
"All selected journal entries will be validated and posted. It means you "
@@ -3383,11 +3738,35 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:373
+#, python-format
+msgid "Cannot delete invoice(s) that are already opened or paid !"
+msgstr "Не може да изтриете фактура(и) които вече са отворени или платени !"
+
+#. module: account
+#: report:account.account.balance.landscape:0
+msgid "Total :"
+msgstr "Общо :"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.actions.report.xml,name:account.account_transfers
msgid "Transfers"
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 "Небалансиран"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.chart:0
msgid "Account charts"
msgstr "Диаграми на сметки"
@@ -3425,6 +3804,7 @@
"състояние \"Отменени\" или \"Готови\"!"
#. module: account
+<<<<<<< TREE
#: view:account.invoice.line:0
msgid "Quantity :"
msgstr ""
@@ -3438,6 +3818,27 @@
#: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
msgid "Print Sale/Purchase Journal"
msgstr ""
+=======
+#: 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 ""
+"Не може да бъде променян вида на сметката, от'%s' на '%s', тъй като съдържа "
+"записи!"
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+msgid "Counterpart"
+msgstr "Съконтрагент"
+
+#. module: account
+#: view:account.journal:0
+msgid "Invoicing Data"
+msgstr "Данни за факуриране"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice.report,state:0
@@ -3603,7 +4004,11 @@
msgstr "Диаграма на шаблони на сметка"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2280
+=======
+#: code:addons/account/account.py:2109
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3612,12 +4017,27 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:837
+=======
+#: code:addons/account/account_move_line.py:801
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Some entries are already reconciled !"
msgstr "Някой записи вече са били приравнени !"
#. module: account
+<<<<<<< TREE
+=======
+#: 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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.tax:0
msgid "Account Tax"
msgstr "Сметка за данък"
@@ -3727,7 +4147,11 @@
msgstr "Аналитични артикули"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1153
+=======
+#: code:addons/account/account_move_line.py:1134
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Unable to change tax !"
msgstr "Не може да се сменя данъка !"
@@ -3738,9 +4162,27 @@
msgstr "#Записи"
#. module: account
+<<<<<<< TREE
#: selection:account.invoice.refund,filter_refund:0
msgid "Create a draft Refund"
msgstr ""
+=======
+#: 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:476
+#, python-format
+msgid ""
+"The Payment Term of Supplier does not have Payment Term Lines(Computation) "
+"defined !"
+msgstr ""
+"Условията за плащане на доставчика нямат зададени редове за условия за "
+"плащане (изчисление) !"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.state.open:0
@@ -4094,6 +4536,15 @@
msgstr "Вид сметка"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:722
+#, python-format
+msgid "Global taxes defined, but are not in invoice lines !"
+msgstr "Общите данъци са зададени, но не са в редовете на фактурата !"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.entries.report,month:0
#: view:account.invoice.report:0
#: field:account.invoice.report,month:0
@@ -4162,7 +4613,21 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_analytic_line.py:93
+=======
+#: help:account.move,state:0
+msgid ""
+"All manually created new journal entry are usually in the state 'Unposted', "
+"but you can set the option to skip that state on the related journal. In "
+"that case, they will be behave as journal entries automatically created by "
+"the system on document validation (invoices, bank statements...) and will be "
+"created in 'Posted' state."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:90
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr "Няма зададена сметка разходи за този продукт: \"%s\" (id:%d)"
@@ -4334,9 +4799,22 @@
msgstr "кредитни известия"
#. module: account
+<<<<<<< TREE
#: sql_constraint:account.period:0
msgid "The name of the period must be unique per company!"
msgstr ""
+=======
+#: code:addons/account/account.py:2081
+#: code:addons/account/wizard/account_use_model.py:69
+#, python-format
+msgid "Unable to find a valid period !"
+msgstr "Не може да бъде намерен валиден период !"
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Voucher No"
+msgstr "Разписка No"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:wizard.multi.charts.accounts:0
@@ -4392,6 +4870,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 ""
@@ -4419,9 +4906,26 @@
msgstr "Промяна"
#. module: account
+<<<<<<< TREE
#: selection:account.journal,type:0
msgid "Bank and Cheques"
msgstr ""
+=======
+#: 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
+#: code:addons/account/wizard/account_move_journal.py:165
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:55
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:57
+#, python-format
+msgid "UserError"
+msgstr "Потребителска грешка"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.journal,type_control_ids:0
@@ -4459,6 +4963,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:828
#, python-format
msgid ""
@@ -4481,6 +4986,8 @@
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: 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
@@ -4519,7 +5026,17 @@
msgstr "Отменена фактура"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1567
+=======
+#: code:addons/account/invoice.py:73
+#, python-format
+msgid "You must define an analytic journal of type '%s' !"
+msgstr "Трябва да зададете аналитичен дневник от вид '%s' !"
+
+#. module: account
+#: code:addons/account/account.py:1411
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Couldn't create move with currency different from the secondary currency of "
@@ -4556,9 +5073,21 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.ui.menu,name:account.menu_finance_configuration
msgid "Configuration"
msgstr "Настройка"
+=======
+#: report:account.account.balance.landscape:0
+msgid "Account Balance -"
+msgstr "Баланс по сметка -"
+
+#. module: account
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+msgstr "Фактура "
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.automatic.reconcile,date1:0
@@ -4605,8 +5134,16 @@
msgstr "Фактури"
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "My invoices"
+=======
+#: 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."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4737,6 +5274,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1088
#: code:addons/account/account.py:1090
#: code:addons/account/account.py:1321
@@ -4760,6 +5298,25 @@
#, python-format
msgid "Error"
msgstr "Грешка"
+=======
+#: selection:account.account.type,report_type:0
+msgid "Balance Sheet (Assets Accounts)"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Third Party (Country)"
+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 ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.analytic.balance,date2:0
@@ -4776,11 +5333,18 @@
msgstr "Детайли за банката"
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_account_partner_balance
msgid ""
"This report is analysis by partner. It is a PDF report containing one line "
"per partner representing the cumulative credit balance."
msgstr ""
+=======
+#: code:addons/account/invoice.py:728
+#, python-format
+msgid "Taxes missing !"
+msgstr "Липсват данъци !"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,help:account.action_account_analytic_journal_tree
@@ -4859,7 +5423,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1351
+=======
+#: code:addons/account/account.py:1224
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You can not modify a posted entry of this journal !\n"
@@ -4885,7 +5453,11 @@
msgstr "Подчинени сметки за данъци"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1090
+=======
+#: code:addons/account/account.py:954
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Start period should be smaller then End period"
msgstr ""
@@ -4932,7 +5504,15 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,target_move:0
+<<<<<<< TREE
#: field:accounting.report,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
+>>>>>>> MERGE-SOURCE
msgid "Target Moves"
msgstr "Целеви движения"
@@ -5025,7 +5605,11 @@
msgstr "Ред 1:"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1307
+=======
+#: code:addons/account/account.py:1181
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Integrity Error !"
msgstr "Грешка за цялостност !"
@@ -5057,8 +5641,16 @@
msgstr "Резултат от изравняване"
#. module: account
+<<<<<<< TREE
#: model:account.financial.report,name:account.account_financial_report_balancesheet0
#: model:ir.ui.menu,name:account.menu_account_report_bs
+=======
+#: 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
+>>>>>>> MERGE-SOURCE
msgid "Balance Sheet"
msgstr "Баланс"
@@ -5156,11 +5748,21 @@
msgstr "Данък върху подчинени"
#. module: account
+<<<<<<< TREE
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Template Tax Fiscal Position"
msgstr ""
#. module: account
+=======
+#: code:addons/account/account.py:2081
+#: code:addons/account/wizard/account_use_model.py:69
+#, python-format
+msgid "No period found !"
+msgstr "Не е намерен период !"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.journal,update_posted:0
msgid "Allow Cancelling Entries"
msgstr "Позволи отказване от записи"
@@ -5232,9 +5834,18 @@
"Дата=15.01, Брой дни=22, Ден от месеца=-1, тогава дата на изпъление е 28.02."
#. module: account
+<<<<<<< TREE
#: view:account.payment.term.line:0
msgid "Amount Computation"
msgstr "Пресмятане на количество"
+=======
+#: code:addons/account/account.py:2940
+#: code:addons/account/installer.py:283
+#: code:addons/account/installer.py:295
+#, python-format
+msgid "Bank Journal "
+msgstr "Банков дневник "
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.journal:0
@@ -5257,6 +5868,19 @@
msgstr "Начало на период"
#. module: account
+<<<<<<< TREE
+=======
+#: 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 ""
+"Не може да извършите това върху приравнен запис ! Моля отбележете че може "
+"само да промените само някои неважни полета !"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.model,name:account.model_account_common_account_report
msgid "Account Common Account Report"
msgstr ""
@@ -5315,6 +5939,7 @@
msgstr "Днвеник за записи в края на годината"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3446
#: code:addons/account/account_bank_statement.py:338
#: code:addons/account/account_invoice.py:427
@@ -5322,6 +5947,15 @@
#: code:addons/account/account_invoice.py:542
#: code:addons/account/account_invoice.py:550
#: code:addons/account/account_invoice.py:572
+=======
+#: code:addons/account/account_bank_statement.py:331
+#: 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
+>>>>>>> MERGE-SOURCE
#: code:addons/account/wizard/account_move_journal.py:63
#, python-format
msgid "Configuration Error !"
@@ -5390,12 +6024,35 @@
msgstr "Аналитични сметки"
#. module: account
+<<<<<<< TREE
#: view:account.invoice.report:0
msgid "Customer Invoices And Refunds"
msgstr ""
#. module: account
#: field:account.analytic.line,amount_currency:0
+=======
+#: help:account.account.type,report_type:0
+msgid ""
+"According value related accounts will be display on respective reports "
+"(Balance Sheet Profit & Loss Account)"
+msgstr ""
+
+#. module: account
+#: field:account.report.general.ledger,sortby:0
+msgid "Sort By"
+msgstr "Сортиране по"
+
+#. module: account
+#: code:addons/account/account.py:1340
+#, python-format
+msgid ""
+"There is no default default credit account defined \n"
+"on journal \"%s\""
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.entries.report,amount_currency:0
#: field:account.model.line,amount_currency:0
#: field:account.move.line,amount_currency:0
@@ -5561,7 +6218,11 @@
msgstr "Създаване на начални записи"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:759
+=======
+#: code:addons/account/account_move_line.py:729
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Already Reconciled!"
msgstr "Вече равнено!"
@@ -5601,7 +6262,11 @@
#. module: account
#: view:account.move.line.reconcile:0
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:857
+=======
+#: code:addons/account/account_move_line.py:821
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Write-Off"
msgstr "Отписване"
@@ -5743,6 +6408,15 @@
msgstr "# Редове"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/wizard/account_change_currency.py:59
+#, python-format
+msgid "New currency is not confirured properly !"
+msgstr "Новата валута не е настроена правилно!"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.aged.trial.balance,filter:0
#: field:account.balance.report,filter:0
#: field:account.central.journal,filter:0
@@ -5762,6 +6436,7 @@
msgstr "Подреждане по"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2256
#, python-format
msgid "You have a wrong expression \"%(...)s\" in your model !"
@@ -5775,12 +6450,20 @@
#. module: account
#: code:addons/account/account_move_line.py:1155
#: code:addons/account/account_move_line.py:1238
+=======
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not use an inactive account!"
msgstr "Не може да използвате неактивна сметка!"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:830
+=======
+#: code:addons/account/account_move_line.py:794
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entries are not of the same account or already reconciled ! "
msgstr "Записите не са от същата сметка или не са изравнени ! "
@@ -5815,9 +6498,19 @@
msgstr "Брой дни"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_bank_statement.py:402
#: code:addons/account/account_invoice.py:392
#: code:addons/account/wizard/account_period_close.py:51
+=======
+#: selection:account.automatic.reconcile,power:0
+msgid "7"
+msgstr "7"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:391
+#: code:addons/account/invoice.py:373
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invalid action !"
msgstr "Невалидно действие !"
@@ -5976,6 +6669,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "is validated."
+msgstr "е валидирано."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.chart.template:0
#: field:account.chart.template,account_root_id:0
msgid "Root Account"
@@ -6049,6 +6751,7 @@
msgstr "Предприятия"
#. module: account
+<<<<<<< TREE
#: view:account.invoice.report:0
msgid "Open and Paid Invoices"
msgstr ""
@@ -6060,6 +6763,9 @@
#. module: account
#: code:addons/account/account.py:629
+=======
+#: code:addons/account/account.py:546
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You can not remove/desactivate an account which is set on a customer or "
@@ -6301,7 +7007,13 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:664
+=======
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You cannot change the owner company of an account that already contains "
@@ -6462,6 +7174,7 @@
msgstr "Статистика на аналитични записи"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:624
#, python-format
msgid "You can not remove an account containing journal items."
@@ -6470,6 +7183,10 @@
#. module: account
#: code:addons/account/account_analytic_line.py:145
#: code:addons/account/account_move_line.py:933
+=======
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entries: "
msgstr "Записи: "
@@ -6480,12 +7197,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:res.partner.bank,currency_id:0
msgid "Currency of the related account journal."
msgstr ""
#. module: account
#: code:addons/account/account.py:1563
+=======
+#: code:addons/account/account.py:1407
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Couldn't create move between different companies"
msgstr "Не може да създаде движение между различни фирми"
@@ -6530,7 +7251,11 @@
msgstr "Общ дебит"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:808
+=======
+#: code:addons/account/account_move_line.py:772
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entry \"%s\" is not valid !"
msgstr "Запис \"%s\" е невалиден !"
@@ -6599,6 +7324,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:622
#: code:addons/account/account.py:624
#: code:addons/account/account.py:963
@@ -6624,6 +7350,33 @@
#: code:addons/account/wizard/account_invoice_refund.py:108
#: code:addons/account/wizard/account_invoice_refund.py:110
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
+=======
+#: 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: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
+>>>>>>> MERGE-SOURCE
#: code:addons/account/wizard/account_use_model.py:44
#, python-format
msgid "Error !"
@@ -6708,6 +7461,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1218
#, python-format
msgid ""
@@ -6725,6 +7479,13 @@
msgstr ""
#. module: account
+=======
+#: report:account.general.ledger_landscape:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.partner.balance:0
#: view:account.partner.ledger:0
msgid ""
@@ -6777,9 +7538,13 @@
msgstr "Избор на дневник"
#. module: account
+<<<<<<< TREE
#: view:account.bank.statement:0
#: code:addons/account/account.py:420
#: code:addons/account/account.py:432
+=======
+#: code:addons/account/wizard/account_change_currency.py:64
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Opening Balance"
msgstr "Начален баланс"
@@ -6858,11 +7623,17 @@
#: report:account.journal.period.print:0
#: report:account.journal.period.print.sale.purchase:0
#: report:account.partner.balance:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Total:"
msgstr "Общо:"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2229
+=======
+#: code:addons/account/account.py:2064
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You can specify year, month and date in the name of the model using the "
@@ -6900,6 +7671,7 @@
msgstr "Подчинени кодове"
#. module: account
+<<<<<<< TREE
#: view:account.tax.template:0
msgid "Taxes used in Sales"
msgstr ""
@@ -6907,6 +7679,10 @@
#. module: account
#: code:addons/account/account_invoice.py:495
#: code:addons/account/wizard/account_invoice_refund.py:145
+=======
+#: code:addons/account/invoice.py:476
+#: code:addons/account/wizard/account_invoice_refund.py:137
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Data Insufficient !"
msgstr "Недостатъчни данни !"
@@ -7061,6 +7837,17 @@
msgstr "Редове"
#. module: account
+<<<<<<< TREE
+=======
+#: 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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.tax.template:0
msgid "Account Tax Template"
msgstr "Шаблон за сметка за данък"
@@ -7226,7 +8013,11 @@
"програмистите да създадат специфичен данък в потребителски домейн."
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1088
+=======
+#: code:addons/account/account.py:952
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You should have chosen periods that belongs to the same company"
msgstr ""
@@ -7347,6 +8138,7 @@
msgstr "Подпис върху справки"
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_fiscalyear_close.py:73
#, python-format
msgid "The periods to generate opening entries were not found"
@@ -7361,6 +8153,32 @@
#: code:addons/account/account.py:3121
#, python-format
msgid "OPEJ"
+=======
+#: code:addons/account/account_cash_statement.py:250
+#, python-format
+msgid "You can not have two open register for the same journal"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " day of the month= -1"
+msgstr " ден от месеца= -1"
+
+#. module: account
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Грешка ! Не може да създадете рекурсивно свързани членове"
+
+#. module: account
+#: help:account.journal,type:0
+msgid ""
+"Select 'Sale' for Sale journal to be used at the time of making invoice. "
+"Select 'Purchase' for Purchase Journal to be used at the time of approving "
+"purchase order. Select 'Cash' to be used at the time of making payment. "
+"Select 'General' for miscellaneous operations. Select 'Opening/Closing "
+"Situation' to be used at the time of new fiscal year creation or end of year "
+"entries generation."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -7370,11 +8188,24 @@
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 "Небалансиран"
+=======
+#: help:account.installer.modules,account_followup:0
+msgid ""
+"Helps you generate reminder letters for unpaid invoices, including multiple "
+"levels of reminding and customized per-partner policies."
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " value amount: n.a"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.move.line,centralisation:0
@@ -7393,10 +8224,21 @@
msgstr "Допълнителна информация"
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_fiscalyear_close.py:84
#, python-format
msgid "The journal must have default credit and debit account"
msgstr "Дневника трябва да има сметки по подрабиране за кредит и дебит"
+=======
+#: 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
+#: field:analytic.entries.report,user_id:0
+msgid "User"
+msgstr "Потребител"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.general.journal:0
@@ -7418,6 +8260,7 @@
"крайна дата за плащането на този ред."
#. module: account
+<<<<<<< TREE
#: model:ir.ui.menu,name:account.menu_multi_currency
msgid "Multi-Currencies"
msgstr ""
@@ -7429,12 +8272,20 @@
#. module: account
#: code:addons/account/account_move_line.py:1302
+=======
+#: code:addons/account/account_move_line.py:1277
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Bad account !"
msgstr "Грешна сметка !"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3108
+=======
+#: code:addons/account/account.py:2821
+#: code:addons/account/installer.py:432
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Sales Journal"
msgstr "Дневник продажби"
@@ -7451,7 +8302,11 @@
msgstr "Данък на фактура"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1277
+=======
+#: code:addons/account/account_move_line.py:1252
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No piece number !"
msgstr "Няма номер на цена !"
@@ -7766,6 +8621,7 @@
msgstr "Фиксиран"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:629
#: code:addons/account/account.py:642
#: code:addons/account/account.py:645
@@ -7778,6 +8634,19 @@
#: code:addons/account/account_move_line.py:97
#: code:addons/account/account_move_line.py:750
#: code:addons/account/account_move_line.py:803
+=======
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
+#: code:addons/account/account.py:532
+#: 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
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Warning !"
msgstr "Предупреждение !"
@@ -7842,7 +8711,11 @@
msgstr "Не може да %s проект/проформа/отказ на фактура"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:810
+=======
+#: code:addons/account/invoice.py:795
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Invoice Lines !"
msgstr "Няма фактурни редове!"
@@ -7916,7 +8789,11 @@
msgstr "Отложен метод"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:379
+=======
+#: code:addons/account/invoice.py:360
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invoice '%s' is paid."
msgstr "Фактура '%s' е платена."
@@ -7980,7 +8857,11 @@
msgstr "Асоцииран партньор"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1332
+=======
+#: code:addons/account/invoice.py:1298
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You must first select a partner !"
msgstr "Първо трябва да изберете партньор !"
@@ -8048,7 +8929,12 @@
msgstr "Изберете финансова година"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3111
+=======
+#: code:addons/account/account.py:2885
+#: code:addons/account/installer.py:495
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Purchase Refund Journal"
msgstr "Дневник обезщетения за покупки"
@@ -8206,6 +9092,7 @@
msgstr "Валута на компанията"
#. module: account
+<<<<<<< TREE
#: field:account.aged.trial.balance,chart_account_id:0
#: field:account.balance.report,chart_account_id:0
#: field:account.central.journal,chart_account_id:0
@@ -8220,6 +9107,17 @@
#: field:account.report.general.ledger,chart_account_id:0
#: field:account.vat.declaration,chart_account_id:0
#: field:accounting.report,chart_account_id:0
+=======
+#: report:account.general.ledger:0
+#: 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
+>>>>>>> MERGE-SOURCE
msgid "Chart of Account"
msgstr "Сметкоплан"
@@ -8298,8 +9196,20 @@
msgstr "Видове сметки"
#. module: account
+<<<<<<< TREE
#: view:account.payment.term.line:0
msgid " Value amount: n.a"
+=======
+#: code:addons/account/invoice.py:905
+#, python-format
+msgid "Cannot create invoice move on centralised journal"
+msgstr ""
+"Не може да бъде създадено движение на фактура върху централизиран дневник"
+
+#. module: account
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -8347,9 +9257,17 @@
#: report:account.account.balance:0
#: report:account.central.journal:0
#: report:account.general.journal:0
+<<<<<<< TREE
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+>>>>>>> MERGE-SOURCE
#: 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 "Филтриране по"
@@ -8405,7 +9323,12 @@
msgstr "Ред на условие за плащане"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3109
+=======
+#: code:addons/account/account.py:2838
+#: code:addons/account/installer.py:452
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Purchase Journal"
msgstr "Дневник за поръчки"
@@ -8586,10 +9509,18 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:account.account.type,name:account.data_account_type_expense
#: model:account.financial.report,name:account.account_financial_report_expense0
msgid "Expense"
msgstr "Разход"
+=======
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
+#, python-format
+msgid "Bad account!"
+msgstr "Грешна сметка!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.chart,fiscalyear:0
@@ -8597,7 +9528,11 @@
msgstr "Оставете празно за всички отворени данъчни години"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1105
+=======
+#: code:addons/account/account_move_line.py:1062
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "The account move (%s) for centralisation has been confirmed!"
msgstr "Движение по сметка (%s) за централизиране е потвърдено!"
@@ -8831,12 +9766,28 @@
msgstr "Период от"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3110
+=======
+#: code:addons/account/account.py:2861
+#: code:addons/account/installer.py:476
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Sales Refund Journal"
msgstr "Дневник обезщетения за продажби"
#. module: account
+<<<<<<< TREE
+=======
+#: 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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.move:0
#: view:account.move.line:0
#: view:account.payment.term:0
@@ -8878,7 +9829,11 @@
msgstr "Данък покупка (%)"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:810
+=======
+#: code:addons/account/invoice.py:795
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Please create some invoice lines."
msgstr ""
@@ -8894,7 +9849,12 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3118
+=======
+#: code:addons/account/account.py:2864
+#: code:addons/account/installer.py:479
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "SCNJ"
msgstr ""
@@ -8949,7 +9909,12 @@
#: report:account.general.journal:0
#: field:account.general.journal,period_from:0
#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
#: report:account.partner.balance:0
#: field:account.partner.balance,period_from:0
#: field:account.partner.ledger,period_from:0
@@ -8965,7 +9930,17 @@
msgstr "Начало на период"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:2357
+#, python-format
+msgid "Cannot locate parent code for template account!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
msgid "Analysis Direction"
msgstr "Ръководтсво за анализ"
@@ -8996,6 +9971,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: 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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: report:account.overdue:0
msgid "Best regards."
msgstr "С уважение"
@@ -9021,6 +10007,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_invoice_tree4
msgid ""
"With Supplier Refunds you can manage the credit notes you receive from your "
@@ -9028,6 +10015,37 @@
"partially. You can easily generate refunds and reconcile them directly from "
"the invoice form."
msgstr ""
+=======
+#: code:addons/account/wizard/account_change_currency.py:70
+#, python-format
+msgid "Current currency is not confirured properly !"
+msgstr "Текущата валута не настроена правилно!"
+
+#. module: account
+#: 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 "Грешка"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.account.template:0
@@ -9035,11 +10053,23 @@
msgstr "Сметки вземания"
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
#: 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 "Банкови извлечения"
+=======
+#: selection:account.account.type,report_type:0
+msgid "Profit & Loss (Income Accounts)"
+msgstr "Печалба и загуби (приходни сметки)"
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Запазете празно за да изпозвате сметката за приходи"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.account,balance:0
@@ -9052,8 +10082,12 @@
#: field:account.entries.report,balance:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+<<<<<<< TREE
#: report:account.general.ledger_landscape:0
#: field:account.invoice,residual:0
+=======
+#: report:account.general.ledger_landscape:0
+>>>>>>> MERGE-SOURCE
#: field:account.move.line,balance:0
#: report:account.partner.balance:0
#: selection:account.payment.term.line,value:0
@@ -9064,6 +10098,10 @@
#: field:account.treasury.report,balance: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 "Баланс"
@@ -9074,7 +10112,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 "Показване на сметка"
@@ -9147,6 +10193,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: report:account.general.ledger:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Filters By"
@@ -9169,7 +10220,11 @@
msgstr "Преместване"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1153
+=======
+#: code:addons/account/account_move_line.py:1134
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not change the tax, you should remove and recreate lines !"
msgstr ""
@@ -9292,7 +10347,12 @@
#: report:account.general.journal:0
#: field:account.general.journal,period_to:0
#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
#: report:account.partner.balance:0
#: field:account.partner.balance,period_to:0
#: field:account.partner.ledger,period_to:0
@@ -9333,9 +10393,20 @@
msgstr "Абонамент за сметка"
#. module: account
+<<<<<<< TREE
#: report:account.overdue:0
msgid "Maturity date"
msgstr "Дата на падеж"
+=======
+#: code:addons/account/invoice.py:725
+#, python-format
+msgid ""
+"Tax base different !\n"
+"Click on compute to update tax base"
+msgstr ""
+"Различна база на данък !\n"
+"Натиснета на Изчисляване за обновяване на базата на данъка"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.subscription:0
@@ -9367,8 +10438,12 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,date_from:0
+<<<<<<< TREE
#: field:accounting.report,date_from:0
#: field:accounting.report,date_from_cmp:0
+=======
+#: report:account.aged_trial_balance:0
+>>>>>>> MERGE-SOURCE
msgid "Start Date"
msgstr "Начална дата"
@@ -9394,7 +10469,11 @@
msgstr "Неприравнен"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:828
+=======
+#: code:addons/account/invoice.py:812
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Bad total !"
msgstr "Грешна обща сума !"
@@ -9448,17 +10527,33 @@
msgstr "Активен"
#. module: account
+<<<<<<< TREE
#: view:accounting.report:0
msgid "Comparison"
msgstr ""
#. module: account
#: code:addons/account/account_invoice.py:372
+=======
+#: code:addons/account/invoice.py:353
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Unknown Error"
msgstr "Непозната грешка"
#. module: account
+<<<<<<< TREE
+=======
+#: 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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:res.partner,property_account_payable:0
msgid ""
"This account will be used instead of the default one as the payable account "
@@ -9517,6 +10612,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.account.type,report_type:0
#: code:addons/account/account.py:181
#, python-format
@@ -9529,6 +10625,11 @@
"Configuration Error! \n"
"You can not select an account type with a deferral method different of "
"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
+=======
+#: view:account.general.journal:0
+#: model:ir.ui.menu,name:account.menu_account_general_journal
+msgid "General Journals"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -9801,7 +10902,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_analytic_line.py:102
+=======
+#: code:addons/account/account_analytic_line.py:99
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr "Няма зададена приходна сметка за продукта: \"%s\" (id:%d)"
@@ -9846,6 +10951,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 "Общо"
@@ -9970,9 +11076,23 @@
msgstr "Край на периода"
#. module: account
+<<<<<<< TREE
#: sql_constraint:account.journal:0
msgid "The code of the journal must be unique per company !"
msgstr "Кодът на дневника трябва да бъде уникален за всяко предприятие!"
+=======
+#: 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
+#: code:addons/account/wizard/account_state_open.py:37
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#: code:addons/account/wizard/account_validate_account_move.py:61
+#, python-format
+msgid "Warning"
+msgstr "Предупреждение"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:product.category,property_account_expense_categ:0
@@ -9983,6 +11103,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:wizard.multi.charts.accounts:0
msgid "Generate Your Chart of Accounts from a Chart Template"
msgstr ""
@@ -10000,6 +11121,17 @@
#: 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 "Приключен"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.node,note:account.process_node_paidinvoice0
@@ -10066,16 +11198,20 @@
msgstr "Грешка! Не може да създавате рекурсивни шаблони за сметки."
#. module: account
+<<<<<<< TREE
#: selection:account.print.journal,sort_selection:0
msgid "Journal Entry Number"
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.subscription:0
msgid "Recurring"
msgstr "Повтарящо се"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:642
#, python-format
msgid ""
@@ -10085,6 +11221,9 @@
#. module: account
#: code:addons/account/account_move_line.py:832
+=======
+#: code:addons/account/account_move_line.py:796
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entry is already reconciled"
msgstr "Записа вече е приравнен"
@@ -10105,12 +11244,17 @@
msgstr "Обхват"
#. module: account
+<<<<<<< TREE
#: view:account.analytic.line:0
msgid "Analytic Journal Items related to a purchase journal."
msgstr ""
#. module: account
#: help:account.account,type:0
+=======
+#: code:addons/account/account_move_line.py:1252
+#, python-format
+>>>>>>> MERGE-SOURCE
msgid ""
"The 'Internal Type' is used for features available on different types of "
"accounts: view can not have journal items, consolidation are accounts that "
@@ -10264,7 +11408,11 @@
msgstr "Свързване на сметки"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:364
+=======
+#: code:addons/account/invoice.py:345
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invoice '%s' is waiting for validation."
msgstr "Фактура '%s' очаква проверка."
@@ -10289,6 +11437,15 @@
msgstr "Сметката за приходи или разходи свързана с избрания продукт."
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1123
+#, python-format
+msgid "The date of your Journal Entry is not in the defined period!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.subscription,period_total:0
msgid "Number of Periods"
msgstr "Брой периоди"
@@ -10460,6 +11617,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 ""
@@ -10574,6 +11732,16 @@
"Трябва да въведете дължина на период, която не може да бъде 0 или по-малко."
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:511
+#, python-format
+msgid "You cannot remove an account which has account entries!. "
+msgstr ""
+"Не може да бъде премахната сметка в която има счетоводни записвания! "
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.actions.act_window,help:account.action_account_form
msgid ""
"Create and manage the accounts you need to record journal entries. An "
@@ -10591,3 +11759,73 @@
"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 ""
+
+#~ 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 "Състояние:"
=== modified file 'account/i18n/br.po'
--- account/i18n/br.po 2012-05-17 06:07:33 +0000
+++ account/i18n/br.po 2012-06-07 17:42:47 +0000
@@ -7,13 +7,19 @@
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-02-17 09:10+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: 2012-05-17 05:18+0000\n"
"X-Generator: Launchpad (build 15259)\n"
@@ -22,6 +28,10 @@
#: view:analytic.entries.report:0
msgid "last month"
msgstr ""
+=======
+"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
@@ -34,7 +44,12 @@
msgstr "Kefluniadur all"
#. module: account
+<<<<<<< TREE
#: help:account.tax.code,sequence:0
+=======
+#: code:addons/account/account.py:516
+#, python-format
+>>>>>>> MERGE-SOURCE
msgid ""
"Determine the display order in the report 'Accounting \\ Reporting \\ "
"Generic Reporting \\ Taxes \\ Taxes Report'"
@@ -64,6 +79,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:793
+#, python-format
+msgid "Please define sequence on invoice journal"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: constraint:account.period:0
msgid "Error ! The duration of the Period(s) is/are invalid. "
msgstr ""
@@ -112,10 +136,21 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: constraint:account.journal:0
msgid ""
"Configuration error! The currency chosen should be shared by the default "
"accounts too."
+=======
+#: report:account.tax.code.entries:0
+msgid "Accounting Entries-"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1305
+#, python-format
+msgid "You can not delete posted movement: \"%s\"!"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -156,7 +191,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1428
+=======
+#: code:addons/account/invoice.py:1436
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Warning!"
msgstr ""
@@ -214,6 +253,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:915
+#, python-format
+msgid ""
+"No period defined for this date: %s !\n"
+"Please create a fiscal year."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.model,name:account.model_account_move_line_reconcile_select
msgid "Move line reconcile select"
msgstr ""
@@ -227,7 +277,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1241
+=======
+#: code:addons/account/invoice.py:1224
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
msgstr ""
@@ -243,7 +297,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1200
+=======
+#: code:addons/account/account_move_line.py:1182
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not add/modify entries in a closed journal."
msgstr "N'hallit ket ouzhpennañ/kemmañ enmontoù en ur marilh serr"
@@ -289,7 +347,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:551
+=======
+#: code:addons/account/invoice.py:532
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invoice line account company does not match with invoice company."
msgstr ""
@@ -539,9 +601,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
msgid "Counterpart"
+=======
+#: code:addons/account/account_cash_statement.py:349
+#, python-format
+msgid "CashBox Balance is not matching with Calculated Balance !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -631,7 +699,12 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3116
+=======
+#: code:addons/account/account.py:2823
+#: code:addons/account/installer.py:434
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "SAJ"
msgstr ""
@@ -658,8 +731,13 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:750
#: code:addons/account/account_move_line.py:803
+=======
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "To reconcile the entries company should be the same for all entries"
msgstr ""
@@ -737,12 +815,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.invoice.refund,filter_refund:0
msgid "Refund Method"
msgstr ""
#. module: account
#: code:addons/account/wizard/account_change_currency.py:38
+=======
+#: code:addons/account/wizard/account_change_currency.py:38
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can only change currency for Draft Invoice !"
msgstr ""
@@ -871,8 +953,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.cashbox.line,pieces:0
msgid "Values"
+=======
+#: 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 !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -895,6 +985,7 @@
#. module: account
#: report:account.overdue:0
+#: report:account.aged_trial_balance:0
msgid "Due"
msgstr ""
@@ -1006,15 +1097,28 @@
#: 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
+<<<<<<< TREE
#: code:addons/account/account.py:2268
#: code:addons/account/account_bank_statement.py:357
#: code:addons/account/account_invoice.py:73
#: code:addons/account/account_invoice.py:688
#: code:addons/account/account_move_line.py:173
+=======
+#: code:addons/account/account.py:2097
+#: code:addons/account/account_bank_statement.py:350
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:73
+#: code:addons/account/invoice.py:678
+#: code:addons/account/wizard/account_use_model.py:81
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Analytic Journal !"
msgstr ""
@@ -1229,14 +1333,23 @@
#. module: account
#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.tax.code.entries:0
+>>>>>>> MERGE-SOURCE
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Entry Label"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1129
+=======
+#: code:addons/account/account.py:990
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not modify/delete a journal with entries for this period !"
msgstr ""
@@ -1384,6 +1497,7 @@
#. module: account
#: model:ir.ui.menu,name:account.next_id_22
+#: report:account.aged_trial_balance:0
msgid "Partners"
msgstr ""
@@ -1407,6 +1521,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1277
+#, python-format
+msgid "You can not use this general account in this journal !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: selection:account.balance.report,display_account:0
#: selection:account.common.account.report,display_account:0
#: selection:account.partner.balance,display_partner:0
@@ -1494,6 +1617,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.account,type:0
#: selection:account.account.template,type:0
#: selection:account.bank.statement,state:0
@@ -1502,6 +1626,31 @@
#: selection:account.fiscalyear,state:0
#: selection:account.period,state:0
msgid "Closed"
+=======
+#: view:account.payment.term.line:0
+msgid ""
+"Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
+msgstr ""
+
+#. module: account
+#: 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 ""
+
+#. module: account
+#: field:account.installer.modules,account_anglo_saxon:0
+msgid "Anglo-Saxon Accounting"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -1666,6 +1815,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1429
#, python-format
msgid ""
@@ -1673,6 +1823,8 @@
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
msgstr ""
@@ -1686,6 +1838,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.analytic.account:0
msgid "Pending Accounts"
msgstr ""
@@ -1693,6 +1846,21 @@
#. module: account
#: view:account.tax.template:0
msgid "Tax Declaration"
+=======
+#: constraint:account.fiscalyear:0
+msgid "Error! You cannot define overlapping fiscal years"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:799
+#, python-format
+msgid "The account is not defined to be reconciled !"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,pieces:0
+msgid "Values"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -1713,6 +1881,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:806
+#, python-format
+msgid "You have to provide an account for the write off entry !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.model,name:account.model_account_common_journal_report
msgid "Account Common Journal Report"
msgstr ""
@@ -1739,7 +1916,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_cash_statement.py:292
+=======
+#: code:addons/account/account_cash_statement.py:329
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "User %s does not have rights to access %s journal !"
msgstr ""
@@ -1760,14 +1941,32 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:509
+#, python-format
+msgid "You cannot deactivate an account that contains account moves."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.move.line.reconcile,credit:0
msgid "Credit amount"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:407
#: code:addons/account/account.py:412
#: code:addons/account/account.py:429
+=======
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:529
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Error!"
msgstr ""
@@ -1927,6 +2126,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: constraint:account.move.line:0
msgid ""
"The selected account of your Journal Entry forces to provide a secondary "
@@ -1940,6 +2140,8 @@
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.invoice:0
#: view:report.invoice.created:0
msgid "Untaxed Amount"
@@ -2058,7 +2260,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1461
+=======
+#: code:addons/account/installer.py:348
+#, python-format
+msgid " Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1333
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"There is no default default debit account defined \n"
@@ -2131,7 +2343,12 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3119
+=======
+#: code:addons/account/account.py:2888
+#: code:addons/account/installer.py:498
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "ECNJ"
msgstr ""
@@ -2150,7 +2367,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:370
+=======
+#: code:addons/account/invoice.py:351
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no Accounting Journal of type Sale/Purchase defined!"
msgstr ""
@@ -2221,6 +2442,11 @@
#: field:accounting.report,fiscalyear_id:0
#: field:accounting.report,fiscalyear_id_cmp: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 ""
@@ -2354,7 +2580,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:572
+=======
+#: code:addons/account/invoice.py:552
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Can't find any account journal of %s type for this company.\n"
@@ -2435,7 +2665,12 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3117
+=======
+#: code:addons/account/account.py:2840
+#: code:addons/account/installer.py:454
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "EXJ"
msgstr ""
@@ -2526,7 +2761,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:369
+=======
+#: code:addons/account/invoice.py:350
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -2542,6 +2781,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: 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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: report:account.journal.period.print:0
#: report:account.journal.period.print.sale.purchase:0
msgid "Label"
@@ -2572,7 +2822,12 @@
#. module: account
#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
#: report:account.overdue:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
@@ -2700,15 +2955,27 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1321
+=======
+#: code:addons/account/account.py:1195
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No sequence defined on the journal !"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2268
#: code:addons/account/account_invoice.py:688
#: code:addons/account/account_move_line.py:173
+=======
+#: code:addons/account/account.py:2097
+#: code:addons/account/account_bank_statement.py:350
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
+#: code:addons/account/wizard/account_use_model.py:81
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
msgstr ""
@@ -2761,6 +3028,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: selection:account.print.journal,sort_selection:0
+msgid "Reference Number"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: selection:account.entries.report,month:0
#: selection:account.invoice.report,month:0
#: selection:analytic.entries.report,month:0
@@ -2861,7 +3136,25 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:735
+=======
+#: help:account.partner.ledger,initial_balance:0
+#: help:account.report.general.ledger,initial_balance:0
+msgid ""
+"It adds initial balance row on report which display previous sum amount of "
+"debit/credit/balance"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+msgid "Analytic Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:836
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Tax base different!\n"
@@ -3008,8 +3301,13 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3363
#: code:addons/account/account_bank.py:90
+=======
+#: code:addons/account/account.py:2950
+#: code:addons/account/installer.py:296
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "BNK"
msgstr ""
@@ -3109,12 +3407,21 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
#, python-format
msgid "No End of year journal defined for the fiscal year"
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
+>>>>>>> MERGE-SOURCE
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the expense account"
@@ -3132,8 +3439,12 @@
#: field:account.common.report,journal_ids:0
#: report:account.general.journal:0
#: field:account.general.journal,journal_ids:0
+<<<<<<< TREE
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+>>>>>>> MERGE-SOURCE
#: view:account.journal.period:0
#: report:account.partner.balance:0
#: field:account.partner.balance,journal_ids:0
@@ -3200,7 +3511,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1332
+=======
+#: code:addons/account/invoice.py:1298
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Partner Defined !"
msgstr ""
@@ -3235,10 +3550,29 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,name:account.action_account_unreconcile
#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
msgid "Unreconcile Entries"
+=======
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.invoice:0
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_configuration_installer
+msgid "Accounting Chart Configuration"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -3277,11 +3611,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:product.product:0
msgid "Purchase Taxes"
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:validate.account.move.lines:0
msgid ""
"All selected journal entries will be validated and posted. It means you "
@@ -3289,11 +3626,35 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:373
+#, python-format
+msgid "Cannot delete invoice(s) that are already opened or paid !"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance.landscape:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.actions.report.xml,name:account.account_transfers
msgid "Transfers"
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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.chart:0
msgid "Account charts"
msgstr ""
@@ -3329,6 +3690,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice.line:0
msgid "Quantity :"
msgstr ""
@@ -3341,6 +3703,24 @@
#. module: account
#: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
msgid "Print Sale/Purchase Journal"
+=======
+#: 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 ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Invoicing Data"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -3505,7 +3885,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2280
+=======
+#: code:addons/account/account.py:2109
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3514,12 +3898,27 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:837
+=======
+#: code:addons/account/account_move_line.py:801
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Some entries are already reconciled !"
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: 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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.tax:0
msgid "Account Tax"
msgstr ""
@@ -3626,7 +4025,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1153
+=======
+#: code:addons/account/account_move_line.py:1134
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Unable to change tax !"
msgstr ""
@@ -3637,8 +4040,23 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.invoice.refund,filter_refund:0
msgid "Create a draft Refund"
+=======
+#: 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:476
+#, python-format
+msgid ""
+"The Payment Term of Supplier does not have Payment Term Lines(Computation) "
+"defined !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -3993,6 +4411,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:722
+#, python-format
+msgid "Global taxes defined, but are not in invoice lines !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.entries.report,month:0
#: view:account.invoice.report:0
#: field:account.invoice.report,month:0
@@ -4061,7 +4488,21 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_analytic_line.py:93
+=======
+#: help:account.move,state:0
+msgid ""
+"All manually created new journal entry are usually in the state 'Unposted', "
+"but you can set the option to skip that state on the related journal. In "
+"that case, they will be behave as journal entries automatically created by "
+"the system on document validation (invoices, bank statements...) and will be "
+"created in 'Posted' state."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:90
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -4233,8 +4674,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: sql_constraint:account.period:0
msgid "The name of the period must be unique per company!"
+=======
+#: code:addons/account/account.py:2081
+#: code:addons/account/wizard/account_use_model.py:69
+#, python-format
+msgid "Unable to find a valid period !"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Voucher No"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4291,6 +4744,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 ""
@@ -4318,8 +4780,24 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.journal,type:0
msgid "Bank and Cheques"
+=======
+#: 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
+#: code:addons/account/wizard/account_move_journal.py:165
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:55
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:57
+#, python-format
+msgid "UserError"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4358,6 +4836,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:828
#, python-format
msgid ""
@@ -4378,6 +4857,8 @@
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: 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
@@ -4416,7 +4897,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1567
+=======
+#: code:addons/account/invoice.py:73
+#, python-format
+msgid "You must define an analytic journal of type '%s' !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1411
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Couldn't create move with currency different from the secondary currency of "
@@ -4453,8 +4944,19 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.ui.menu,name:account.menu_finance_configuration
msgid "Configuration"
+=======
+#: report:account.account.balance.landscape:0
+msgid "Account Balance -"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4502,6 +5004,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "My invoices"
msgstr ""
@@ -4509,6 +5012,13 @@
#. module: account
#: selection:account.bank.accounts.wizard,account_type:0
msgid "Check"
+=======
+#: 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."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4634,6 +5144,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1088
#: code:addons/account/account.py:1090
#: code:addons/account/account.py:1321
@@ -4656,6 +5167,24 @@
#: code:addons/account/wizard/account_report_common.py:150
#, python-format
msgid "Error"
+=======
+#: selection:account.account.type,report_type:0
+msgid "Balance Sheet (Assets Accounts)"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Third Party (Country)"
+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."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4673,10 +5202,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_account_partner_balance
msgid ""
"This report is analysis by partner. It is a PDF report containing one line "
"per partner representing the cumulative credit balance."
+=======
+#: code:addons/account/invoice.py:728
+#, python-format
+msgid "Taxes missing !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4756,7 +5291,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1351
+=======
+#: code:addons/account/account.py:1224
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You can not modify a posted entry of this journal !\n"
@@ -4780,7 +5319,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1090
+=======
+#: code:addons/account/account.py:954
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Start period should be smaller then End period"
msgstr ""
@@ -4825,7 +5368,15 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,target_move:0
+<<<<<<< TREE
#: field:accounting.report,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
+>>>>>>> MERGE-SOURCE
msgid "Target Moves"
msgstr ""
@@ -4917,7 +5468,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1307
+=======
+#: code:addons/account/account.py:1181
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Integrity Error !"
msgstr ""
@@ -4949,8 +5504,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:account.financial.report,name:account.account_financial_report_balancesheet0
#: model:ir.ui.menu,name:account.menu_account_report_bs
+=======
+#: 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
+>>>>>>> MERGE-SOURCE
msgid "Balance Sheet"
msgstr ""
@@ -5048,8 +5611,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Template Tax Fiscal Position"
+=======
+#: code:addons/account/account.py:2081
+#: code:addons/account/wizard/account_use_model.py:69
+#, python-format
+msgid "No period found !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -5122,8 +5692,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.payment.term.line:0
msgid "Amount Computation"
+=======
+#: code:addons/account/account.py:2940
+#: code:addons/account/installer.py:283
+#: code:addons/account/installer.py:295
+#, python-format
+msgid "Bank Journal "
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -5147,6 +5725,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: 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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.model,name:account.model_account_common_account_report
msgid "Account Common Account Report"
msgstr ""
@@ -5205,6 +5794,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3446
#: code:addons/account/account_bank_statement.py:338
#: code:addons/account/account_invoice.py:427
@@ -5212,6 +5802,15 @@
#: code:addons/account/account_invoice.py:542
#: code:addons/account/account_invoice.py:550
#: code:addons/account/account_invoice.py:572
+=======
+#: code:addons/account/account_bank_statement.py:331
+#: 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
+>>>>>>> MERGE-SOURCE
#: code:addons/account/wizard/account_move_journal.py:63
#, python-format
msgid "Configuration Error !"
@@ -5280,12 +5879,35 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice.report:0
msgid "Customer Invoices And Refunds"
msgstr ""
#. module: account
#: field:account.analytic.line,amount_currency:0
+=======
+#: help:account.account.type,report_type:0
+msgid ""
+"According value related accounts will be display on respective reports "
+"(Balance Sheet Profit & Loss Account)"
+msgstr ""
+
+#. module: account
+#: field:account.report.general.ledger,sortby:0
+msgid "Sort By"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1340
+#, python-format
+msgid ""
+"There is no default default credit account defined \n"
+"on journal \"%s\""
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.entries.report,amount_currency:0
#: field:account.model.line,amount_currency:0
#: field:account.move.line,amount_currency:0
@@ -5448,7 +6070,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:759
+=======
+#: code:addons/account/account_move_line.py:729
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Already Reconciled!"
msgstr ""
@@ -5488,7 +6114,11 @@
#. module: account
#: view:account.move.line.reconcile:0
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:857
+=======
+#: code:addons/account/account_move_line.py:821
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Write-Off"
msgstr ""
@@ -5630,6 +6260,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/wizard/account_change_currency.py:59
+#, python-format
+msgid "New currency is not confirured properly !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.aged.trial.balance,filter:0
#: field:account.balance.report,filter:0
#: field:account.central.journal,filter:0
@@ -5649,6 +6288,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2256
#, python-format
msgid "You have a wrong expression \"%(...)s\" in your model !"
@@ -5662,12 +6302,20 @@
#. module: account
#: code:addons/account/account_move_line.py:1155
#: code:addons/account/account_move_line.py:1238
+=======
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not use an inactive account!"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:830
+=======
+#: code:addons/account/account_move_line.py:794
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entries are not of the same account or already reconciled ! "
msgstr ""
@@ -5702,9 +6350,19 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_bank_statement.py:402
#: code:addons/account/account_invoice.py:392
#: code:addons/account/wizard/account_period_close.py:51
+=======
+#: selection:account.automatic.reconcile,power:0
+msgid "7"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:391
+#: code:addons/account/invoice.py:373
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -5863,6 +6521,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "is validated."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.chart.template:0
#: field:account.chart.template,account_root_id:0
msgid "Root Account"
@@ -5936,6 +6603,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice.report:0
msgid "Open and Paid Invoices"
msgstr ""
@@ -5947,6 +6615,9 @@
#. module: account
#: code:addons/account/account.py:629
+=======
+#: code:addons/account/account.py:546
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You can not remove/desactivate an account which is set on a customer or "
@@ -6182,7 +6853,13 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:664
+=======
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You cannot change the owner company of an account that already contains "
@@ -6341,6 +7018,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:624
#, python-format
msgid "You can not remove an account containing journal items."
@@ -6349,6 +7027,10 @@
#. module: account
#: code:addons/account/account_analytic_line.py:145
#: code:addons/account/account_move_line.py:933
+=======
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entries: "
msgstr ""
@@ -6359,12 +7041,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:res.partner.bank,currency_id:0
msgid "Currency of the related account journal."
msgstr ""
#. module: account
#: code:addons/account/account.py:1563
+=======
+#: code:addons/account/account.py:1407
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Couldn't create move between different companies"
msgstr ""
@@ -6409,7 +7095,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:808
+=======
+#: code:addons/account/account_move_line.py:772
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entry \"%s\" is not valid !"
msgstr ""
@@ -6474,6 +7164,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:622
#: code:addons/account/account.py:624
#: code:addons/account/account.py:963
@@ -6499,6 +7190,33 @@
#: code:addons/account/wizard/account_invoice_refund.py:108
#: code:addons/account/wizard/account_invoice_refund.py:110
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
+=======
+#: 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: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
+>>>>>>> MERGE-SOURCE
#: code:addons/account/wizard/account_use_model.py:44
#, python-format
msgid "Error !"
@@ -6583,6 +7301,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1218
#, python-format
msgid ""
@@ -6600,6 +7319,13 @@
msgstr ""
#. module: account
+=======
+#: report:account.general.ledger_landscape:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.partner.balance:0
#: view:account.partner.ledger:0
msgid ""
@@ -6649,9 +7375,13 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.bank.statement:0
#: code:addons/account/account.py:420
#: code:addons/account/account.py:432
+=======
+#: code:addons/account/wizard/account_change_currency.py:64
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Opening Balance"
msgstr ""
@@ -6730,11 +7460,17 @@
#: report:account.journal.period.print:0
#: report:account.journal.period.print.sale.purchase:0
#: report:account.partner.balance:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Total:"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2229
+=======
+#: code:addons/account/account.py:2064
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You can specify year, month and date in the name of the model using the "
@@ -6764,6 +7500,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.tax.template:0
msgid "Taxes used in Sales"
msgstr ""
@@ -6771,6 +7508,10 @@
#. module: account
#: code:addons/account/account_invoice.py:495
#: code:addons/account/wizard/account_invoice_refund.py:145
+=======
+#: code:addons/account/invoice.py:476
+#: code:addons/account/wizard/account_invoice_refund.py:137
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Data Insufficient !"
msgstr ""
@@ -6925,6 +7666,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: 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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.tax.template:0
msgid "Account Tax Template"
msgstr ""
@@ -7085,7 +7837,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1088
+=======
+#: code:addons/account/account.py:952
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You should have chosen periods that belongs to the same company"
msgstr ""
@@ -7206,6 +7962,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_fiscalyear_close.py:73
#, python-format
msgid "The periods to generate opening entries were not found"
@@ -7220,6 +7977,32 @@
#: code:addons/account/account.py:3121
#, python-format
msgid "OPEJ"
+=======
+#: code:addons/account/account_cash_statement.py:250
+#, python-format
+msgid "You can not have two open register for the same journal"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " day of the month= -1"
+msgstr ""
+
+#. module: account
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: account
+#: help:account.journal,type:0
+msgid ""
+"Select 'Sale' for Sale journal to be used at the time of making invoice. "
+"Select 'Purchase' for Purchase Journal to be used at the time of approving "
+"purchase order. Select 'Cash' to be used at the time of making payment. "
+"Select 'General' for miscellaneous operations. Select 'Opening/Closing "
+"Situation' to be used at the time of new fiscal year creation or end of year "
+"entries generation."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -7229,10 +8012,22 @@
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"
+=======
+#: help:account.installer.modules,account_followup:0
+msgid ""
+"Helps you generate reminder letters for unpaid invoices, including multiple "
+"levels of reminding and customized per-partner policies."
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " value amount: n.a"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -7252,9 +8047,19 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_fiscalyear_close.py:84
#, python-format
msgid "The journal must have default credit and debit 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
+#: field:analytic.entries.report,user_id:0
+msgid "User"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -7275,6 +8080,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.ui.menu,name:account.menu_multi_currency
msgid "Multi-Currencies"
msgstr ""
@@ -7286,12 +8092,20 @@
#. module: account
#: code:addons/account/account_move_line.py:1302
+=======
+#: code:addons/account/account_move_line.py:1277
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Bad account !"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3108
+=======
+#: code:addons/account/account.py:2821
+#: code:addons/account/installer.py:432
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Sales Journal"
msgstr ""
@@ -7308,7 +8122,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1277
+=======
+#: code:addons/account/account_move_line.py:1252
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No piece number !"
msgstr ""
@@ -7617,6 +8435,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:629
#: code:addons/account/account.py:642
#: code:addons/account/account.py:645
@@ -7629,6 +8448,19 @@
#: code:addons/account/account_move_line.py:97
#: code:addons/account/account_move_line.py:750
#: code:addons/account/account_move_line.py:803
+=======
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
+#: code:addons/account/account.py:532
+#: 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
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Warning !"
msgstr ""
@@ -7693,7 +8525,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:810
+=======
+#: code:addons/account/invoice.py:795
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Invoice Lines !"
msgstr ""
@@ -7767,7 +8603,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:379
+=======
+#: code:addons/account/invoice.py:360
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invoice '%s' is paid."
msgstr ""
@@ -7829,7 +8669,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1332
+=======
+#: code:addons/account/invoice.py:1298
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You must first select a partner !"
msgstr ""
@@ -7897,7 +8741,12 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3111
+=======
+#: code:addons/account/account.py:2885
+#: code:addons/account/installer.py:495
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Purchase Refund Journal"
msgstr ""
@@ -8053,6 +8902,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.aged.trial.balance,chart_account_id:0
#: field:account.balance.report,chart_account_id:0
#: field:account.central.journal,chart_account_id:0
@@ -8067,6 +8917,17 @@
#: field:account.report.general.ledger,chart_account_id:0
#: field:account.vat.declaration,chart_account_id:0
#: field:accounting.report,chart_account_id:0
+=======
+#: report:account.general.ledger:0
+#: 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
+>>>>>>> MERGE-SOURCE
msgid "Chart of Account"
msgstr ""
@@ -8143,8 +9004,19 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.payment.term.line:0
msgid " Value amount: n.a"
+=======
+#: code:addons/account/invoice.py:905
+#, python-format
+msgid "Cannot create invoice move on centralised journal"
+msgstr ""
+
+#. module: account
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -8192,9 +9064,17 @@
#: report:account.account.balance:0
#: report:account.central.journal:0
#: report:account.general.journal:0
+<<<<<<< TREE
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+>>>>>>> MERGE-SOURCE
#: 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 ""
@@ -8250,7 +9130,12 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3109
+=======
+#: code:addons/account/account.py:2838
+#: code:addons/account/installer.py:452
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Purchase Journal"
msgstr ""
@@ -8430,9 +9315,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:account.account.type,name:account.data_account_type_expense
#: model:account.financial.report,name:account.account_financial_report_expense0
msgid "Expense"
+=======
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
+#, python-format
+msgid "Bad account!"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -8441,7 +9333,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1105
+=======
+#: code:addons/account/account_move_line.py:1062
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "The account move (%s) for centralisation has been confirmed!"
msgstr ""
@@ -8672,12 +9568,28 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3110
+=======
+#: code:addons/account/account.py:2861
+#: code:addons/account/installer.py:476
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Sales Refund Journal"
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: 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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.move:0
#: view:account.move.line:0
#: view:account.payment.term:0
@@ -8719,7 +9631,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:810
+=======
+#: code:addons/account/invoice.py:795
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Please create some invoice lines."
msgstr ""
@@ -8735,7 +9651,12 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3118
+=======
+#: code:addons/account/account.py:2864
+#: code:addons/account/installer.py:479
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "SCNJ"
msgstr ""
@@ -8786,7 +9707,12 @@
#: report:account.general.journal:0
#: field:account.general.journal,period_from:0
#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
#: report:account.partner.balance:0
#: field:account.partner.balance,period_from:0
#: field:account.partner.ledger,period_from:0
@@ -8802,7 +9728,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:2357
+#, python-format
+msgid "Cannot locate parent code for template account!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
msgid "Analysis Direction"
msgstr ""
@@ -8833,6 +9769,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: 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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: report:account.overdue:0
msgid "Best regards."
msgstr ""
@@ -8853,17 +9800,44 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.account.type,report_type:0
msgid "P&L / BS Category"
-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."
+=======
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:70
+#, python-format
+msgid "Current currency is not confirured properly !"
+>>>>>>> MERGE-SOURCE
+msgstr ""
+
+#. module: account
+#: 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
@@ -8872,10 +9846,21 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
#: model:ir.actions.act_window,name:account.action_bank_statement_tree
#: model:ir.ui.menu,name:account.menu_bank_statement_tree
msgid "Bank Statements"
+=======
+#: selection:account.account.type,report_type:0
+msgid "Profit & Loss (Income Accounts)"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -8889,8 +9874,12 @@
#: field:account.entries.report,balance:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+<<<<<<< TREE
#: report:account.general.ledger_landscape:0
#: field:account.invoice,residual:0
+=======
+#: report:account.general.ledger_landscape:0
+>>>>>>> MERGE-SOURCE
#: field:account.move.line,balance:0
#: report:account.partner.balance:0
#: selection:account.payment.term.line,value:0
@@ -8901,6 +9890,10 @@
#: field:account.treasury.report,balance: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 ""
@@ -8911,7 +9904,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 ""
@@ -8984,6 +9985,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: report:account.general.ledger:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Filters By"
@@ -9006,7 +10012,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1153
+=======
+#: code:addons/account/account_move_line.py:1134
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not change the tax, you should remove and recreate lines !"
msgstr ""
@@ -9126,7 +10136,12 @@
#: report:account.general.journal:0
#: field:account.general.journal,period_to:0
#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
#: report:account.partner.balance:0
#: field:account.partner.balance,period_to:0
#: field:account.partner.ledger,period_to:0
@@ -9167,8 +10182,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: report:account.overdue:0
msgid "Maturity date"
+=======
+#: code:addons/account/invoice.py:725
+#, python-format
+msgid ""
+"Tax base different !\n"
+"Click on compute to update tax base"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -9201,8 +10224,12 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,date_from:0
+<<<<<<< TREE
#: field:accounting.report,date_from:0
#: field:accounting.report,date_from_cmp:0
+=======
+#: report:account.aged_trial_balance:0
+>>>>>>> MERGE-SOURCE
msgid "Start Date"
msgstr ""
@@ -9228,7 +10255,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:828
+=======
+#: code:addons/account/invoice.py:812
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Bad total !"
msgstr ""
@@ -9282,17 +10313,33 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:accounting.report:0
msgid "Comparison"
msgstr ""
#. module: account
#: code:addons/account/account_invoice.py:372
+=======
+#: code:addons/account/invoice.py:353
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Unknown Error"
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: 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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:res.partner,property_account_payable:0
msgid ""
"This account will be used instead of the default one as the payable account "
@@ -9349,6 +10396,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.account.type,report_type:0
#: code:addons/account/account.py:181
#, python-format
@@ -9361,6 +10409,11 @@
"Configuration Error! \n"
"You can not select an account type with a deferral method different of "
"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
+=======
+#: view:account.general.journal:0
+#: model:ir.ui.menu,name:account.menu_account_general_journal
+msgid "General Journals"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -9633,7 +10686,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_analytic_line.py:102
+=======
+#: code:addons/account/account_analytic_line.py:99
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -9678,6 +10735,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 ""
@@ -9802,8 +10860,21 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: sql_constraint:account.journal:0
msgid "The code of the journal must be unique per company !"
+=======
+#: 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
+#: code:addons/account/wizard/account_state_open.py:37
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#: code:addons/account/wizard/account_validate_account_move.py:61
+#, python-format
+msgid "Warning"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -9815,6 +10886,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:wizard.multi.charts.accounts:0
msgid "Generate Your Chart of Accounts from a Chart Template"
msgstr ""
@@ -9831,6 +10903,16 @@
#: 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"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -9898,16 +10980,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.print.journal,sort_selection:0
msgid "Journal Entry Number"
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.subscription:0
msgid "Recurring"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:642
#, python-format
msgid ""
@@ -9917,6 +11003,9 @@
#. module: account
#: code:addons/account/account_move_line.py:832
+=======
+#: code:addons/account/account_move_line.py:796
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entry is already reconciled"
msgstr ""
@@ -9937,12 +11026,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.analytic.line:0
msgid "Analytic Journal Items related to a purchase journal."
msgstr ""
#. module: account
#: help:account.account,type:0
+=======
+#: code:addons/account/account_move_line.py:1252
+#, python-format
+>>>>>>> MERGE-SOURCE
msgid ""
"The 'Internal Type' is used for features available on different types of "
"accounts: view can not have journal items, consolidation are accounts that "
@@ -10096,7 +11190,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:364
+=======
+#: code:addons/account/invoice.py:345
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invoice '%s' is waiting for validation."
msgstr ""
@@ -10121,6 +11219,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1123
+#, python-format
+msgid "The date of your Journal Entry is not in the defined period!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.subscription,period_total:0
msgid "Number of Periods"
msgstr ""
@@ -10292,6 +11399,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 ""
@@ -10405,6 +11513,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:511
+#, python-format
+msgid "You cannot remove an account which has account entries!. "
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.actions.act_window,help:account.action_account_form
msgid ""
"Create and manage the accounts you need to record journal entries. An "
@@ -10422,3 +11539,49 @@
"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/bs.po'
--- account/i18n/bs.po 2012-05-17 06:07:33 +0000
+++ account/i18n/bs.po 2012-06-07 17:42:47 +0000
@@ -6,13 +6,20 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-04-18 19:45+0000\n"
"Last-Translator: Haris Kovacevic <haris.kovacevic@xxxxxxxxxx>\n"
+=======
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2011-01-19 12:00+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@xxxxxxxxxxx>\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: 2012-05-17 05:18+0000\n"
"X-Generator: Launchpad (build 15259)\n"
@@ -21,6 +28,10 @@
#: view:analytic.entries.report:0
msgid "last month"
msgstr "prošlog mjeseca"
+=======
+"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
@@ -30,10 +41,18 @@
#. module: account
#: view:account.journal:0
msgid "Other Configuration"
+<<<<<<< TREE
msgstr "Ostale konfiguracije"
#. module: account
#: help:account.tax.code,sequence:0
+=======
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:516
+#, python-format
+>>>>>>> MERGE-SOURCE
msgid ""
"Determine the display order in the report 'Accounting \\ Reporting \\ "
"Generic Reporting \\ Taxes \\ Taxes Report'"
@@ -65,6 +84,15 @@
msgstr "Ostatak"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:793
+#, python-format
+msgid "Please define sequence on invoice journal"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: constraint:account.period:0
msgid "Error ! The duration of the Period(s) is/are invalid. "
msgstr "Greška ! Trajanje razdoblja je pogrešno. "
@@ -113,10 +141,21 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: constraint:account.journal:0
msgid ""
"Configuration error! The currency chosen should be shared by the default "
"accounts too."
+=======
+#: report:account.tax.code.entries:0
+msgid "Accounting Entries-"
+msgstr "Računovodstvene stavke-"
+
+#. module: account
+#: code:addons/account/account.py:1305
+#, python-format
+msgid "You can not delete posted movement: \"%s\"!"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -157,7 +196,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1428
+=======
+#: code:addons/account/invoice.py:1436
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Warning!"
msgstr "Upozorenje!"
@@ -215,6 +258,17 @@
msgstr "account.tax"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:915
+#, python-format
+msgid ""
+"No period defined for this date: %s !\n"
+"Please create a fiscal year."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.model,name:account.model_account_move_line_reconcile_select
msgid "Move line reconcile select"
msgstr ""
@@ -230,7 +284,11 @@
"pojavljuje na fakturama."
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1241
+=======
+#: code:addons/account/invoice.py:1224
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
msgstr ""
@@ -246,7 +304,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1200
+=======
+#: code:addons/account/account_move_line.py:1182
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not add/modify entries in a closed journal."
msgstr ""
@@ -292,7 +354,11 @@
msgstr "St."
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:551
+=======
+#: code:addons/account/invoice.py:532
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invoice line account company does not match with invoice company."
msgstr ""
@@ -542,9 +608,15 @@
msgstr "Neusklađene transakcije"
#. module: account
+<<<<<<< TREE
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
msgid "Counterpart"
+=======
+#: code:addons/account/account_cash_statement.py:349
+#, python-format
+msgid "CashBox Balance is not matching with Calculated Balance !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -636,7 +708,12 @@
msgstr "Iznos šifre poreza"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3116
+=======
+#: code:addons/account/account.py:2823
+#: code:addons/account/installer.py:434
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "SAJ"
msgstr ""
@@ -663,8 +740,13 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:750
#: code:addons/account/account_move_line.py:803
+=======
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "To reconcile the entries company should be the same for all entries"
msgstr ""
@@ -742,12 +824,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.invoice.refund,filter_refund:0
msgid "Refund Method"
msgstr ""
#. module: account
#: code:addons/account/wizard/account_change_currency.py:38
+=======
+#: code:addons/account/wizard/account_change_currency.py:38
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can only change currency for Draft Invoice !"
msgstr ""
@@ -876,8 +962,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.cashbox.line,pieces:0
msgid "Values"
+=======
+#: 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 !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -900,6 +994,7 @@
#. module: account
#: report:account.overdue:0
+#: report:account.aged_trial_balance:0
msgid "Due"
msgstr "Krajnji rok"
@@ -1011,15 +1106,28 @@
#: 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
+<<<<<<< TREE
#: code:addons/account/account.py:2268
#: code:addons/account/account_bank_statement.py:357
#: code:addons/account/account_invoice.py:73
#: code:addons/account/account_invoice.py:688
#: code:addons/account/account_move_line.py:173
+=======
+#: code:addons/account/account.py:2097
+#: code:addons/account/account_bank_statement.py:350
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:73
+#: code:addons/account/invoice.py:678
+#: code:addons/account/wizard/account_use_model.py:81
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Analytic Journal !"
msgstr ""
@@ -1234,14 +1342,23 @@
#. module: account
#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.tax.code.entries:0
+>>>>>>> MERGE-SOURCE
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Entry Label"
msgstr "Oznaka stavke"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1129
+=======
+#: code:addons/account/account.py:990
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not modify/delete a journal with entries for this period !"
msgstr ""
@@ -1389,6 +1506,7 @@
#. module: account
#: model:ir.ui.menu,name:account.next_id_22
+#: report:account.aged_trial_balance:0
msgid "Partners"
msgstr ""
@@ -1412,6 +1530,15 @@
msgstr "Glavni nalog za knjiženje"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1277
+#, python-format
+msgid "You can not use this general account in this journal !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: selection:account.balance.report,display_account:0
#: selection:account.common.account.report,display_account:0
#: selection:account.partner.balance,display_partner:0
@@ -1499,6 +1626,7 @@
msgstr "Povrat dobavljaču"
#. module: account
+<<<<<<< TREE
#: selection:account.account,type:0
#: selection:account.account.template,type:0
#: selection:account.bank.statement,state:0
@@ -1508,6 +1636,32 @@
#: selection:account.period,state:0
msgid "Closed"
msgstr "Zatvoreno"
+=======
+#: view:account.payment.term.line:0
+msgid ""
+"Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
+msgstr ""
+
+#. module: account
+#: 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 ""
+
+#. module: account
+#: field:account.installer.modules,account_anglo_saxon:0
+msgid "Anglo-Saxon Accounting"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr "Otpiši prijenos"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
@@ -1671,6 +1825,7 @@
msgstr "Godišnja suma"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1429
#, python-format
msgid ""
@@ -1678,6 +1833,8 @@
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
msgstr ""
@@ -1691,6 +1848,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.analytic.account:0
msgid "Pending Accounts"
msgstr ""
@@ -1699,6 +1857,22 @@
#: view:account.tax.template:0
msgid "Tax Declaration"
msgstr "Porezni iskaz"
+=======
+#: constraint:account.fiscalyear:0
+msgid "Error! You cannot define overlapping fiscal years"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:799
+#, python-format
+msgid "The account is not defined to be reconciled !"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,pieces:0
+msgid "Values"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.journal.period,active:0
@@ -1718,6 +1892,15 @@
msgstr "Potraživanja i dugovanja"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:806
+#, python-format
+msgid "You have to provide an account for the write off entry !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.model,name:account.model_account_common_journal_report
msgid "Account Common Journal Report"
msgstr ""
@@ -1744,7 +1927,11 @@
msgstr "Referenca kupca"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_cash_statement.py:292
+=======
+#: code:addons/account/account_cash_statement.py:329
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "User %s does not have rights to access %s journal !"
msgstr ""
@@ -1765,14 +1952,32 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:509
+#, python-format
+msgid "You cannot deactivate an account that contains account moves."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.move.line.reconcile,credit:0
msgid "Credit amount"
msgstr "Iznos potraživanja"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:407
#: code:addons/account/account.py:412
#: code:addons/account/account.py:429
+=======
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:529
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Error!"
msgstr ""
@@ -1934,6 +2139,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: constraint:account.move.line:0
msgid ""
"The selected account of your Journal Entry forces to provide a secondary "
@@ -1947,6 +2153,8 @@
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.invoice:0
#: view:report.invoice.created:0
msgid "Untaxed Amount"
@@ -2067,7 +2275,17 @@
msgstr "Predračun"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1461
+=======
+#: code:addons/account/installer.py:348
+#, python-format
+msgid " Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1333
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"There is no default default debit account defined \n"
@@ -2140,7 +2358,12 @@
msgstr "Opis"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3119
+=======
+#: code:addons/account/account.py:2888
+#: code:addons/account/installer.py:498
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "ECNJ"
msgstr ""
@@ -2159,7 +2382,11 @@
msgstr "Konto prihoda"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:370
+=======
+#: code:addons/account/invoice.py:351
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no Accounting Journal of type Sale/Purchase defined!"
msgstr ""
@@ -2230,6 +2457,11 @@
#: field:accounting.report,fiscalyear_id:0
#: field:accounting.report,fiscalyear_id_cmp: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"
@@ -2363,7 +2595,11 @@
msgstr "Šifra poreza"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:572
+=======
+#: code:addons/account/invoice.py:552
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Can't find any account journal of %s type for this company.\n"
@@ -2444,7 +2680,12 @@
msgstr "Stavke računa modela"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3117
+=======
+#: code:addons/account/account.py:2840
+#: code:addons/account/installer.py:454
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "EXJ"
msgstr ""
@@ -2540,7 +2781,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:369
+=======
+#: code:addons/account/invoice.py:350
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -2556,6 +2801,17 @@
msgstr "Datum:"
#. module: account
+<<<<<<< TREE
+=======
+#: 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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: report:account.journal.period.print:0
#: report:account.journal.period.print.sale.purchase:0
msgid "Label"
@@ -2586,7 +2842,12 @@
#. module: account
#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
#: report:account.overdue:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
@@ -2714,15 +2975,27 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1321
+=======
+#: code:addons/account/account.py:1195
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No sequence defined on the journal !"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2268
#: code:addons/account/account_invoice.py:688
#: code:addons/account/account_move_line.py:173
+=======
+#: code:addons/account/account.py:2097
+#: code:addons/account/account_bank_statement.py:350
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
+#: code:addons/account/wizard/account_use_model.py:81
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
msgstr ""
@@ -2775,6 +3048,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: selection:account.print.journal,sort_selection:0
+msgid "Reference Number"
+msgstr "Broj reference"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: selection:account.entries.report,month:0
#: selection:account.invoice.report,month:0
#: selection:analytic.entries.report,month:0
@@ -2875,7 +3156,25 @@
msgstr "Fiskalna pozicija"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:735
+=======
+#: help:account.partner.ledger,initial_balance:0
+#: help:account.report.general.ledger,initial_balance:0
+msgid ""
+"It adds initial balance row on report which display previous sum amount of "
+"debit/credit/balance"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+msgid "Analytic Entries"
+msgstr "Analitičke stavke"
+
+#. module: account
+#: code:addons/account/account.py:836
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Tax base different!\n"
@@ -3029,8 +3328,13 @@
msgstr "Prikaz"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3363
#: code:addons/account/account_bank.py:90
+=======
+#: code:addons/account/account.py:2950
+#: code:addons/account/installer.py:296
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "BNK"
msgstr ""
@@ -3130,12 +3434,21 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
#, python-format
msgid "No End of year journal defined for the fiscal year"
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
+>>>>>>> MERGE-SOURCE
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the expense account"
@@ -3153,8 +3466,12 @@
#: field:account.common.report,journal_ids:0
#: report:account.general.journal:0
#: field:account.general.journal,journal_ids:0
+<<<<<<< TREE
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+>>>>>>> MERGE-SOURCE
#: view:account.journal.period:0
#: report:account.partner.balance:0
#: field:account.partner.balance,journal_ids:0
@@ -3221,7 +3538,11 @@
msgstr "Početni saldo"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1332
+=======
+#: code:addons/account/invoice.py:1298
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Partner Defined !"
msgstr ""
@@ -3256,11 +3577,31 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,name:account.action_account_unreconcile
#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
msgid "Unreconcile Entries"
msgstr "Poništi usklađivanje stavki"
+=======
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.invoice:0
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Draft"
+msgstr "U pripremi"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_configuration_installer
+msgid "Accounting Chart Configuration"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.tax.code,notprintable:0
@@ -3298,11 +3639,14 @@
msgstr "Godina"
#. module: account
+<<<<<<< TREE
#: view:product.product:0
msgid "Purchase Taxes"
msgstr "Porezi nabave"
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:validate.account.move.lines:0
msgid ""
"All selected journal entries will be validated and posted. It means you "
@@ -3310,11 +3654,35 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:373
+#, python-format
+msgid "Cannot delete invoice(s) that are already opened or paid !"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance.landscape:0
+msgid "Total :"
+msgstr "Ukupno :"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.actions.report.xml,name:account.account_transfers
msgid "Transfers"
msgstr "Prijenosi"
#. 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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.chart:0
msgid "Account charts"
msgstr "Kontni plan"
@@ -3350,6 +3718,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice.line:0
msgid "Quantity :"
msgstr ""
@@ -3362,6 +3731,24 @@
#. module: account
#: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
msgid "Print Sale/Purchase Journal"
+=======
+#: 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 ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Invoicing Data"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -3527,7 +3914,11 @@
msgstr "Predložak kontnog plana"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2280
+=======
+#: code:addons/account/account.py:2109
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3536,12 +3927,27 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:837
+=======
+#: code:addons/account/account_move_line.py:801
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Some entries are already reconciled !"
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: 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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.tax:0
msgid "Account Tax"
msgstr "Konto poreza"
@@ -3651,7 +4057,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1153
+=======
+#: code:addons/account/account_move_line.py:1134
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Unable to change tax !"
msgstr ""
@@ -3662,8 +4072,23 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.invoice.refund,filter_refund:0
msgid "Create a draft Refund"
+=======
+#: 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:476
+#, python-format
+msgid ""
+"The Payment Term of Supplier does not have Payment Term Lines(Computation) "
+"defined !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4018,6 +4443,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:722
+#, python-format
+msgid "Global taxes defined, but are not in invoice lines !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.entries.report,month:0
#: view:account.invoice.report:0
#: field:account.invoice.report,month:0
@@ -4086,7 +4520,21 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_analytic_line.py:93
+=======
+#: help:account.move,state:0
+msgid ""
+"All manually created new journal entry are usually in the state 'Unposted', "
+"but you can set the option to skip that state on the related journal. In "
+"that case, they will be behave as journal entries automatically created by "
+"the system on document validation (invoices, bank statements...) and will be "
+"created in 'Posted' state."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:90
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -4258,8 +4706,15 @@
msgstr "Knjižna odobrenja"
#. module: account
+<<<<<<< TREE
#: sql_constraint:account.period:0
msgid "The name of the period must be unique per company!"
+=======
+#: code:addons/account/account.py:2081
+#: code:addons/account/wizard/account_use_model.py:69
+#, python-format
+msgid "Unable to find a valid period !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4316,6 +4771,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 ""
@@ -4343,8 +4807,24 @@
msgstr "Promjeni"
#. module: account
+<<<<<<< TREE
#: selection:account.journal,type:0
msgid "Bank and Cheques"
+=======
+#: 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
+#: code:addons/account/wizard/account_move_journal.py:165
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:55
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:57
+#, python-format
+msgid "UserError"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4383,6 +4863,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:828
#, python-format
msgid ""
@@ -4403,6 +4884,8 @@
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: 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
@@ -4441,7 +4924,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1567
+=======
+#: code:addons/account/invoice.py:73
+#, python-format
+msgid "You must define an analytic journal of type '%s' !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1411
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Couldn't create move with currency different from the secondary currency of "
@@ -4478,9 +4971,21 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.ui.menu,name:account.menu_finance_configuration
msgid "Configuration"
msgstr "Postavke"
+=======
+#: report:account.account.balance.landscape:0
+msgid "Account Balance -"
+msgstr "Saldo računa -"
+
+#. module: account
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.automatic.reconcile,date1:0
@@ -4527,6 +5032,7 @@
msgstr "Fakture"
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "My invoices"
msgstr ""
@@ -4534,6 +5040,13 @@
#. module: account
#: selection:account.bank.accounts.wizard,account_type:0
msgid "Check"
+=======
+#: 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."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4659,6 +5172,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1088
#: code:addons/account/account.py:1090
#: code:addons/account/account.py:1321
@@ -4681,6 +5195,24 @@
#: code:addons/account/wizard/account_report_common.py:150
#, python-format
msgid "Error"
+=======
+#: selection:account.account.type,report_type:0
+msgid "Balance Sheet (Assets Accounts)"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Third Party (Country)"
+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."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4698,10 +5230,16 @@
msgstr "Detalji banke"
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_account_partner_balance
msgid ""
"This report is analysis by partner. It is a PDF report containing one line "
"per partner representing the cumulative credit balance."
+=======
+#: code:addons/account/invoice.py:728
+#, python-format
+msgid "Taxes missing !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4781,7 +5319,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1351
+=======
+#: code:addons/account/account.py:1224
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You can not modify a posted entry of this journal !\n"
@@ -4805,7 +5347,11 @@
msgstr "Konta potporeza."
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1090
+=======
+#: code:addons/account/account.py:954
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Start period should be smaller then End period"
msgstr ""
@@ -4852,7 +5398,15 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,target_move:0
+<<<<<<< TREE
#: field:accounting.report,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
+>>>>>>> MERGE-SOURCE
msgid "Target Moves"
msgstr "Cilj prijenosa"
@@ -4944,7 +5498,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1307
+=======
+#: code:addons/account/account.py:1181
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Integrity Error !"
msgstr ""
@@ -4976,8 +5534,16 @@
msgstr "Rezultat poravnjavanja"
#. module: account
+<<<<<<< TREE
#: model:account.financial.report,name:account.account_financial_report_balancesheet0
#: model:ir.ui.menu,name:account.menu_account_report_bs
+=======
+#: 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
+>>>>>>> MERGE-SOURCE
msgid "Balance Sheet"
msgstr ""
@@ -5075,8 +5641,15 @@
msgstr "Dječiji porez"
#. module: account
+<<<<<<< TREE
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Template Tax Fiscal Position"
+=======
+#: code:addons/account/account.py:2081
+#: code:addons/account/wizard/account_use_model.py:69
+#, python-format
+msgid "No period found !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -5151,8 +5724,16 @@
"dana=22, dan u mjesecu=-1, onda je datum dospjeća 28.02."
#. module: account
+<<<<<<< TREE
#: view:account.payment.term.line:0
msgid "Amount Computation"
+=======
+#: code:addons/account/account.py:2940
+#: code:addons/account/installer.py:283
+#: code:addons/account/installer.py:295
+#, python-format
+msgid "Bank Journal "
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -5176,6 +5757,17 @@
msgstr "Početak razdoblja"
#. module: account
+<<<<<<< TREE
+=======
+#: 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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.model,name:account.model_account_common_account_report
msgid "Account Common Account Report"
msgstr ""
@@ -5234,6 +5826,7 @@
msgstr "Dnevnik knjiženja završetka godine"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3446
#: code:addons/account/account_bank_statement.py:338
#: code:addons/account/account_invoice.py:427
@@ -5241,6 +5834,15 @@
#: code:addons/account/account_invoice.py:542
#: code:addons/account/account_invoice.py:550
#: code:addons/account/account_invoice.py:572
+=======
+#: code:addons/account/account_bank_statement.py:331
+#: 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
+>>>>>>> MERGE-SOURCE
#: code:addons/account/wizard/account_move_journal.py:63
#, python-format
msgid "Configuration Error !"
@@ -5309,12 +5911,35 @@
msgstr "Analitički računi"
#. module: account
+<<<<<<< TREE
#: view:account.invoice.report:0
msgid "Customer Invoices And Refunds"
msgstr ""
#. module: account
#: field:account.analytic.line,amount_currency:0
+=======
+#: help:account.account.type,report_type:0
+msgid ""
+"According value related accounts will be display on respective reports "
+"(Balance Sheet Profit & Loss Account)"
+msgstr ""
+
+#. module: account
+#: field:account.report.general.ledger,sortby:0
+msgid "Sort By"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1340
+#, python-format
+msgid ""
+"There is no default default credit account defined \n"
+"on journal \"%s\""
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.entries.report,amount_currency:0
#: field:account.model.line,amount_currency:0
#: field:account.move.line,amount_currency:0
@@ -5479,7 +6104,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:759
+=======
+#: code:addons/account/account_move_line.py:729
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Already Reconciled!"
msgstr ""
@@ -5519,7 +6148,11 @@
#. module: account
#: view:account.move.line.reconcile:0
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:857
+=======
+#: code:addons/account/account_move_line.py:821
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Write-Off"
msgstr "Otpis"
@@ -5661,6 +6294,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/wizard/account_change_currency.py:59
+#, python-format
+msgid "New currency is not confirured properly !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.aged.trial.balance,filter:0
#: field:account.balance.report,filter:0
#: field:account.central.journal,filter:0
@@ -5680,6 +6322,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2256
#, python-format
msgid "You have a wrong expression \"%(...)s\" in your model !"
@@ -5693,12 +6336,20 @@
#. module: account
#: code:addons/account/account_move_line.py:1155
#: code:addons/account/account_move_line.py:1238
+=======
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not use an inactive account!"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:830
+=======
+#: code:addons/account/account_move_line.py:794
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entries are not of the same account or already reconciled ! "
msgstr ""
@@ -5733,9 +6384,19 @@
msgstr "Broj dana"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_bank_statement.py:402
#: code:addons/account/account_invoice.py:392
#: code:addons/account/wizard/account_period_close.py:51
+=======
+#: selection:account.automatic.reconcile,power:0
+msgid "7"
+msgstr "7"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:391
+#: code:addons/account/invoice.py:373
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -5894,6 +6555,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "is validated."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.chart.template:0
#: field:account.chart.template,account_root_id:0
msgid "Root Account"
@@ -5967,6 +6637,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice.report:0
msgid "Open and Paid Invoices"
msgstr ""
@@ -5978,6 +6649,9 @@
#. module: account
#: code:addons/account/account.py:629
+=======
+#: code:addons/account/account.py:546
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You can not remove/desactivate an account which is set on a customer or "
@@ -6217,7 +6891,13 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:664
+=======
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You cannot change the owner company of an account that already contains "
@@ -6376,6 +7056,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:624
#, python-format
msgid "You can not remove an account containing journal items."
@@ -6384,6 +7065,10 @@
#. module: account
#: code:addons/account/account_analytic_line.py:145
#: code:addons/account/account_move_line.py:933
+=======
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entries: "
msgstr ""
@@ -6394,12 +7079,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:res.partner.bank,currency_id:0
msgid "Currency of the related account journal."
msgstr ""
#. module: account
#: code:addons/account/account.py:1563
+=======
+#: code:addons/account/account.py:1407
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Couldn't create move between different companies"
msgstr ""
@@ -6444,7 +7133,11 @@
msgstr "Ukupan dug"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:808
+=======
+#: code:addons/account/account_move_line.py:772
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entry \"%s\" is not valid !"
msgstr ""
@@ -6513,6 +7206,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:622
#: code:addons/account/account.py:624
#: code:addons/account/account.py:963
@@ -6538,6 +7232,33 @@
#: code:addons/account/wizard/account_invoice_refund.py:108
#: code:addons/account/wizard/account_invoice_refund.py:110
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
+=======
+#: 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: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
+>>>>>>> MERGE-SOURCE
#: code:addons/account/wizard/account_use_model.py:44
#, python-format
msgid "Error !"
@@ -6622,6 +7343,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1218
#, python-format
msgid ""
@@ -6639,6 +7361,13 @@
msgstr ""
#. module: account
+=======
+#: report:account.general.ledger_landscape:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.partner.balance:0
#: view:account.partner.ledger:0
msgid ""
@@ -6688,9 +7417,13 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.bank.statement:0
#: code:addons/account/account.py:420
#: code:addons/account/account.py:432
+=======
+#: code:addons/account/wizard/account_change_currency.py:64
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Opening Balance"
msgstr ""
@@ -6769,11 +7502,17 @@
#: report:account.journal.period.print:0
#: report:account.journal.period.print.sale.purchase:0
#: report:account.partner.balance:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Total:"
msgstr "Ukupno:"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2229
+=======
+#: code:addons/account/account.py:2064
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You can specify year, month and date in the name of the model using the "
@@ -6803,6 +7542,7 @@
msgstr "Podšifre"
#. module: account
+<<<<<<< TREE
#: view:account.tax.template:0
msgid "Taxes used in Sales"
msgstr ""
@@ -6810,6 +7550,10 @@
#. module: account
#: code:addons/account/account_invoice.py:495
#: code:addons/account/wizard/account_invoice_refund.py:145
+=======
+#: code:addons/account/invoice.py:476
+#: code:addons/account/wizard/account_invoice_refund.py:137
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Data Insufficient !"
msgstr ""
@@ -6964,6 +7708,17 @@
msgstr "Retci"
#. module: account
+<<<<<<< TREE
+=======
+#: 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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.tax.template:0
msgid "Account Tax Template"
msgstr "Predložak poreznog računa"
@@ -7129,7 +7884,11 @@
"razvijateljima da stvaraju posebne poreze u vlastitoj domeni."
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1088
+=======
+#: code:addons/account/account.py:952
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You should have chosen periods that belongs to the same company"
msgstr ""
@@ -7250,6 +8009,7 @@
msgstr "Predznak u izvješćima"
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_fiscalyear_close.py:73
#, python-format
msgid "The periods to generate opening entries were not found"
@@ -7264,6 +8024,32 @@
#: code:addons/account/account.py:3121
#, python-format
msgid "OPEJ"
+=======
+#: code:addons/account/account_cash_statement.py:250
+#, python-format
+msgid "You can not have two open register for the same journal"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " day of the month= -1"
+msgstr ""
+
+#. module: account
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: account
+#: help:account.journal,type:0
+msgid ""
+"Select 'Sale' for Sale journal to be used at the time of making invoice. "
+"Select 'Purchase' for Purchase Journal to be used at the time of approving "
+"purchase order. Select 'Cash' to be used at the time of making payment. "
+"Select 'General' for miscellaneous operations. Select 'Opening/Closing "
+"Situation' to be used at the time of new fiscal year creation or end of year "
+"entries generation."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -7273,10 +8059,22 @@
msgstr "PRO-FORMA"
#. module: account
+<<<<<<< TREE
#: selection:account.entries.report,move_line_state:0
#: view:account.move.line:0
#: selection:account.move.line,state:0
msgid "Unbalanced"
+=======
+#: help:account.installer.modules,account_followup:0
+msgid ""
+"Helps you generate reminder letters for unpaid invoices, including multiple "
+"levels of reminding and customized per-partner policies."
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " value amount: n.a"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -7296,10 +8094,21 @@
msgstr "Dodatne informacije"
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_fiscalyear_close.py:84
#, python-format
msgid "The journal must have default credit and debit account"
msgstr ""
+=======
+#: 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
+#: field:analytic.entries.report,user_id:0
+msgid "User"
+msgstr "Korisnik"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.general.journal:0
@@ -7319,6 +8128,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.ui.menu,name:account.menu_multi_currency
msgid "Multi-Currencies"
msgstr ""
@@ -7330,12 +8140,20 @@
#. module: account
#: code:addons/account/account_move_line.py:1302
+=======
+#: code:addons/account/account_move_line.py:1277
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Bad account !"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3108
+=======
+#: code:addons/account/account.py:2821
+#: code:addons/account/installer.py:432
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Sales Journal"
msgstr ""
@@ -7352,7 +8170,11 @@
msgstr "Porez fakture"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1277
+=======
+#: code:addons/account/account_move_line.py:1252
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No piece number !"
msgstr ""
@@ -7667,6 +8489,7 @@
msgstr "Fiksno"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:629
#: code:addons/account/account.py:642
#: code:addons/account/account.py:645
@@ -7679,6 +8502,19 @@
#: code:addons/account/account_move_line.py:97
#: code:addons/account/account_move_line.py:750
#: code:addons/account/account_move_line.py:803
+=======
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
+#: code:addons/account/account.py:532
+#: 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
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Warning !"
msgstr ""
@@ -7743,7 +8579,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:810
+=======
+#: code:addons/account/invoice.py:795
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Invoice Lines !"
msgstr ""
@@ -7817,7 +8657,11 @@
msgstr "Način odgode"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:379
+=======
+#: code:addons/account/invoice.py:360
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invoice '%s' is paid."
msgstr ""
@@ -7881,7 +8725,11 @@
msgstr "Vezani partner"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1332
+=======
+#: code:addons/account/invoice.py:1298
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You must first select a partner !"
msgstr ""
@@ -7949,7 +8797,12 @@
msgstr "Odaberite fiskalnu godinu"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3111
+=======
+#: code:addons/account/account.py:2885
+#: code:addons/account/installer.py:495
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Purchase Refund Journal"
msgstr ""
@@ -8107,6 +8960,7 @@
msgstr "Valuta preduzeća"
#. module: account
+<<<<<<< TREE
#: field:account.aged.trial.balance,chart_account_id:0
#: field:account.balance.report,chart_account_id:0
#: field:account.central.journal,chart_account_id:0
@@ -8121,6 +8975,17 @@
#: field:account.report.general.ledger,chart_account_id:0
#: field:account.vat.declaration,chart_account_id:0
#: field:accounting.report,chart_account_id:0
+=======
+#: report:account.general.ledger:0
+#: 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
+>>>>>>> MERGE-SOURCE
msgid "Chart of Account"
msgstr ""
@@ -8197,8 +9062,19 @@
msgstr "Tipovi konta"
#. module: account
+<<<<<<< TREE
#: view:account.payment.term.line:0
msgid " Value amount: n.a"
+=======
+#: code:addons/account/invoice.py:905
+#, python-format
+msgid "Cannot create invoice move on centralised journal"
+msgstr ""
+
+#. module: account
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -8246,9 +9122,17 @@
#: report:account.account.balance:0
#: report:account.central.journal:0
#: report:account.general.journal:0
+<<<<<<< TREE
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+>>>>>>> MERGE-SOURCE
#: 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 ""
@@ -8304,7 +9188,12 @@
msgstr "Redak uvjeta plaćanja"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3109
+=======
+#: code:addons/account/account.py:2838
+#: code:addons/account/installer.py:452
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Purchase Journal"
msgstr ""
@@ -8485,10 +9374,18 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:account.account.type,name:account.data_account_type_expense
#: model:account.financial.report,name:account.account_financial_report_expense0
msgid "Expense"
msgstr "Trošak"
+=======
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
+#, python-format
+msgid "Bad account!"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.chart,fiscalyear:0
@@ -8496,7 +9393,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1105
+=======
+#: code:addons/account/account_move_line.py:1062
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "The account move (%s) for centralisation has been confirmed!"
msgstr ""
@@ -8729,12 +9630,28 @@
msgstr "Razdoblje od"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3110
+=======
+#: code:addons/account/account.py:2861
+#: code:addons/account/installer.py:476
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Sales Refund Journal"
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: 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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.move:0
#: view:account.move.line:0
#: view:account.payment.term:0
@@ -8776,7 +9693,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:810
+=======
+#: code:addons/account/invoice.py:795
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Please create some invoice lines."
msgstr ""
@@ -8792,7 +9713,12 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3118
+=======
+#: code:addons/account/account.py:2864
+#: code:addons/account/installer.py:479
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "SCNJ"
msgstr ""
@@ -8843,7 +9769,12 @@
#: report:account.general.journal:0
#: field:account.general.journal,period_from:0
#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
#: report:account.partner.balance:0
#: field:account.partner.balance,period_from:0
#: field:account.partner.ledger,period_from:0
@@ -8859,7 +9790,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:2357
+#, python-format
+msgid "Cannot locate parent code for template account!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
msgid "Analysis Direction"
msgstr "Smjer analiza"
@@ -8890,6 +9831,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: 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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: report:account.overdue:0
msgid "Best regards."
msgstr "Sve najbolje."
@@ -8910,17 +9862,44 @@
msgstr "Dokument: Izvještaj konta kupca"
#. module: account
+<<<<<<< TREE
#: field:account.account.type,report_type:0
msgid "P&L / BS Category"
-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."
+=======
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:70
+#, python-format
+msgid "Current currency is not confirured properly !"
+>>>>>>> MERGE-SOURCE
+msgstr ""
+
+#. module: account
+#: 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
@@ -8929,11 +9908,23 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
#: 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 ""
+=======
+#: selection:account.account.type,report_type:0
+msgid "Profit & Loss (Income Accounts)"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Ne popunjavati za upotrebu računa za prihod"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.account,balance:0
@@ -8946,8 +9937,12 @@
#: field:account.entries.report,balance:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+<<<<<<< TREE
#: report:account.general.ledger_landscape:0
#: field:account.invoice,residual:0
+=======
+#: report:account.general.ledger_landscape:0
+>>>>>>> MERGE-SOURCE
#: field:account.move.line,balance:0
#: report:account.partner.balance:0
#: selection:account.payment.term.line,value:0
@@ -8958,6 +9953,10 @@
#: field:account.treasury.report,balance: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"
@@ -8968,7 +9967,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 ""
@@ -9041,6 +10048,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: report:account.general.ledger:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Filters By"
@@ -9063,7 +10075,11 @@
msgstr "Prijenos"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1153
+=======
+#: code:addons/account/account_move_line.py:1134
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not change the tax, you should remove and recreate lines !"
msgstr ""
@@ -9183,7 +10199,12 @@
#: report:account.general.journal:0
#: field:account.general.journal,period_to:0
#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
#: report:account.partner.balance:0
#: field:account.partner.balance,period_to:0
#: field:account.partner.ledger,period_to:0
@@ -9224,9 +10245,18 @@
msgstr "Konto pretplate"
#. module: account
+<<<<<<< TREE
#: report:account.overdue:0
msgid "Maturity date"
msgstr "Datum dospijeća"
+=======
+#: code:addons/account/invoice.py:725
+#, python-format
+msgid ""
+"Tax base different !\n"
+"Click on compute to update tax base"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.subscription:0
@@ -9258,8 +10288,12 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,date_from:0
+<<<<<<< TREE
#: field:accounting.report,date_from:0
#: field:accounting.report,date_from_cmp:0
+=======
+#: report:account.aged_trial_balance:0
+>>>>>>> MERGE-SOURCE
msgid "Start Date"
msgstr "Početni datum"
@@ -9285,7 +10319,11 @@
msgstr "Neusklađen"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:828
+=======
+#: code:addons/account/invoice.py:812
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Bad total !"
msgstr ""
@@ -9339,17 +10377,33 @@
msgstr "Aktivan"
#. module: account
+<<<<<<< TREE
#: view:accounting.report:0
msgid "Comparison"
msgstr ""
#. module: account
#: code:addons/account/account_invoice.py:372
+=======
+#: code:addons/account/invoice.py:353
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Unknown Error"
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: 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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:res.partner,property_account_payable:0
msgid ""
"This account will be used instead of the default one as the payable account "
@@ -9408,6 +10462,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.account.type,report_type:0
#: code:addons/account/account.py:181
#, python-format
@@ -9420,6 +10475,11 @@
"Configuration Error! \n"
"You can not select an account type with a deferral method different of "
"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
+=======
+#: view:account.general.journal:0
+#: model:ir.ui.menu,name:account.menu_account_general_journal
+msgid "General Journals"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -9692,7 +10752,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_analytic_line.py:102
+=======
+#: code:addons/account/account_analytic_line.py:99
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -9737,6 +10801,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"
@@ -9861,8 +10926,21 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: sql_constraint:account.journal:0
msgid "The code of the journal must be unique per company !"
+=======
+#: 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
+#: code:addons/account/wizard/account_state_open.py:37
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#: code:addons/account/wizard/account_validate_account_move.py:61
+#, python-format
+msgid "Warning"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -9874,6 +10952,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:wizard.multi.charts.accounts:0
msgid "Generate Your Chart of Accounts from a Chart Template"
msgstr ""
@@ -9891,6 +10970,17 @@
#: 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"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.node,note:account.process_node_paidinvoice0
@@ -9957,16 +11047,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.print.journal,sort_selection:0
msgid "Journal Entry Number"
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.subscription:0
msgid "Recurring"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:642
#, python-format
msgid ""
@@ -9976,6 +11070,9 @@
#. module: account
#: code:addons/account/account_move_line.py:832
+=======
+#: code:addons/account/account_move_line.py:796
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entry is already reconciled"
msgstr ""
@@ -9996,12 +11093,17 @@
msgstr "Raspon"
#. module: account
+<<<<<<< TREE
#: view:account.analytic.line:0
msgid "Analytic Journal Items related to a purchase journal."
msgstr ""
#. module: account
#: help:account.account,type:0
+=======
+#: code:addons/account/account_move_line.py:1252
+#, python-format
+>>>>>>> MERGE-SOURCE
msgid ""
"The 'Internal Type' is used for features available on different types of "
"accounts: view can not have journal items, consolidation are accounts that "
@@ -10155,7 +11257,11 @@
msgstr "Mapiranje konta"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:364
+=======
+#: code:addons/account/invoice.py:345
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invoice '%s' is waiting for validation."
msgstr ""
@@ -10180,6 +11286,15 @@
msgstr "Račun prihoda ili troškova vezan za odabrani proizvod."
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1123
+#, python-format
+msgid "The date of your Journal Entry is not in the defined period!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.subscription,period_total:0
msgid "Number of Periods"
msgstr "Broj perioda"
@@ -10351,6 +11466,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 ""
@@ -10464,6 +11580,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:511
+#, python-format
+msgid "You cannot remove an account which has account entries!. "
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.actions.act_window,help:account.action_account_form
msgid ""
"Create and manage the accounts you need to record journal entries. An "
@@ -10481,3 +11606,49 @@
"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 "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 ""
=== modified file 'account/i18n/ca.po'
--- account/i18n/ca.po 2012-05-17 06:07:33 +0000
+++ account/i18n/ca.po 2012-06-07 17:42:47 +0000
@@ -6,13 +6,20 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-02-17 09:10+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
+=======
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2011-08-17 00:34+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: 2012-05-17 05:18+0000\n"
"X-Generator: Launchpad (build 15259)\n"
@@ -21,6 +28,10 @@
#: view:analytic.entries.report:0
msgid "last month"
msgstr ""
+=======
+"X-Launchpad-Export-Date: 2011-08-18 05:10+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -30,19 +41,42 @@
#. module: account
#: view:account.journal:0
msgid "Other Configuration"
+<<<<<<< TREE
msgstr "Altra configuració"
#. module: account
#: help:account.tax.code,sequence:0
+=======
+msgstr "Altra configuració"
+
+#. module: account
+#: code:addons/account/account.py:516
+#, python-format
+>>>>>>> MERGE-SOURCE
msgid ""
+<<<<<<< TREE
"Determine the display order in the report 'Accounting \\ Reporting \\ "
"Generic Reporting \\ Taxes \\ Taxes Report'"
msgstr ""
+=======
+"You cannot remove/deactivate an account which is set as a property to any "
+"Partner."
+msgstr "No podeu suprimir/desactivar un compte vinculat a una empresa"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.move.reconcile:0
msgid "Journal Entry Reconcile"
-msgstr "Concilia l'assentament comptable"
+<<<<<<< TREE
+msgstr "Concilia l'assentament comptable"
+=======
+msgstr "Concilia l'assentament comptable"
+
+#. module: account
+#: field:account.installer.modules,account_voucher:0
+msgid "Voucher Management"
+msgstr "Gestió de rebuts"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.account:0
@@ -63,6 +97,15 @@
msgstr "Pendent"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:793
+#, python-format
+msgid "Please define sequence on invoice journal"
+msgstr "Definiu una seqüència en el diari de la factura"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: constraint:account.period:0
msgid "Error ! The duration of the Period(s) is/are invalid. "
msgstr "Error! La durada del període(s) no és vàlid. "
@@ -75,6 +118,7 @@
#. module: account
#: view:account.tax:0
msgid "Children Definition"
+<<<<<<< TREE
msgstr "Definició de fills"
#. module: account
@@ -82,6 +126,9 @@
#, python-format
msgid "Journal item \"%s\" is not valid."
msgstr ""
+=======
+msgstr "Definició de fills"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_report_aged_receivable
@@ -89,6 +136,23 @@
msgstr "A cobrar anteriors fins avui"
#. module: account
+<<<<<<< TREE
+=======
+#: field:account.partner.ledger,reconcil:0
+msgid "Include Reconciled Entries"
+msgstr "Incloure assentaments conciliats"
+
+#. module: account
+#: view:account.pl.report:0
+msgid ""
+"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
+>>>>>>> MERGE-SOURCE
#: model:process.transition,name:account.process_transition_invoiceimport0
msgid "Import from invoice or payment"
msgstr "Importa des de factura o pagament"
@@ -109,6 +173,7 @@
"If you unreconciliate transactions, you must also verify all the actions "
"that are linked to those transactions because they will not be disabled"
msgstr ""
+<<<<<<< TREE
"Si desconcileu transaccions, heu de verificar totes les accions relacionades "
"amb aquestes perquè no es desactivaran."
@@ -118,6 +183,21 @@
"Configuration error! The currency chosen should be shared by the default "
"accounts too."
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
+msgid "Accounting Entries-"
+msgstr "Assentaments comptables"
+
+#. module: account
+#: code:addons/account/account.py:1305
+#, python-format
+msgid "You can not delete posted movement: \"%s\"!"
+msgstr "No podeu eliminar el moviment fixat: \"%s\"!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.invoice:0
@@ -159,9 +239,14 @@
"eliminar-ho."
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1428
+=======
+#: code:addons/account/invoice.py:1436
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Warning!"
+<<<<<<< TREE
msgstr "Avís!"
#. module: account
@@ -169,6 +254,9 @@
#, python-format
msgid "Miscellaneous Journal"
msgstr ""
+=======
+msgstr "Avís!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.fiscal.position.account,account_src_id:0
@@ -220,9 +308,35 @@
msgstr "account.tax"
#. module: account
+<<<<<<< TREE
+=======
+#: 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
+>>>>>>> MERGE-SOURCE
#: model:ir.model,name:account.model_account_move_line_reconcile_select
msgid "Move line reconcile select"
-msgstr "Selecciona conciliació de la línia moviment"
+<<<<<<< TREE
+msgstr "Selecciona conciliació de la línia moviment"
+=======
+msgstr "Selecciona conciliació de la línia moviment"
+
+#. module: account
+#: help:account.model.line,sequence:0
+msgid ""
+"The sequence field is used to order the resources from lower sequences to "
+"higher ones"
+msgstr ""
+"El camp seqüència s'utilitza per ordenar els recursos de menor a major "
+"seqüència."
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.tax.code,notprintable:0
@@ -235,7 +349,11 @@
"d'impost aparegui en les factures."
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1241
+=======
+#: code:addons/account/invoice.py:1224
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
msgstr "Factura '%s' està pagada parcialment: %s%s de %s%s (%s%s restant)"
@@ -251,18 +369,28 @@
msgstr "Informes Belgues"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1200
+=======
+#: code:addons/account/account_move_line.py:1182
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not add/modify entries in a closed journal."
msgstr "No podeu afegir/modificar assentaments en un diari tancat."
#. module: account
+<<<<<<< TREE
#: help:account.account,user_type:0
msgid ""
"Account Type is used for information purpose, to generate country-specific "
"legal reports, and set the rules to close a fiscal year and generate opening "
"entries."
msgstr ""
+=======
+#: view:account.bank.statement:0
+msgid "Calculated Balance"
+msgstr "Balanç calculat"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.overdue:0
@@ -297,7 +425,11 @@
msgstr "Est."
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:551
+=======
+#: code:addons/account/invoice.py:532
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invoice line account company does not match with invoice company."
msgstr ""
@@ -372,6 +504,7 @@
"OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
"Cash Registers, or Customer/Supplier payments."
msgstr ""
+<<<<<<< TREE
"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."
@@ -380,6 +513,11 @@
#: constraint:account.move.line:0
msgid "You can not create journal items on an account of type view."
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."
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_tax_template
@@ -545,12 +683,16 @@
#: help:account.vat.declaration,chart_account_id:0
#: help:accounting.report,chart_account_id:0
msgid "Select Charts of Accounts"
+<<<<<<< TREE
msgstr "Seleccioneu el pla comptable"
#. module: account
#: sql_constraint:res.company:0
msgid "The company name must be unique !"
msgstr ""
+=======
+msgstr "Seleccioneu el pla comptable"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_invoice_refund
@@ -568,10 +710,17 @@
msgstr "Transaccions no conciliades"
#. module: account
+<<<<<<< TREE
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
msgid "Counterpart"
msgstr "Contrapartida"
+=======
+#: code:addons/account/account_cash_statement.py:349
+#, python-format
+msgid "CashBox Balance is not matching with Calculated Balance !"
+msgstr "El saldo del diari de caixa no concorda amb el saldo calculat !"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.fiscal.position:0
@@ -649,6 +798,7 @@
#. module: account
#: sql_constraint:account.sequence.fiscalyear:0
msgid "Main Sequence must be different from current !"
+<<<<<<< TREE
msgstr "La seqüència principal ha de ser diferent de l'actual!"
#. module: account
@@ -656,6 +806,9 @@
#, python-format
msgid "No period found or more than one period found for the given date."
msgstr ""
+=======
+msgstr "La seqüència principal ha de ser diferent de l'actual!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice.tax,tax_amount:0
@@ -663,12 +816,25 @@
msgstr "Import codi impost"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3116
+=======
+#: code:addons/account/account.py:2823
+#: code:addons/account/installer.py:434
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "SAJ"
msgstr "VENDA"
#. module: account
+<<<<<<< TREE
+=======
+#: help:account.bank.statement,balance_end_real:0
+msgid "closing balance entered by the cashbox verifier"
+msgstr "tancant el balanç introduït pel verificador de caixa"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.period:0
#: view:account.period.close:0
msgid "Close Period"
@@ -690,8 +856,13 @@
msgstr "Diari del període"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:750
#: code:addons/account/account_move_line.py:803
+=======
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "To reconcile the entries company should be the same for all entries"
msgstr ""
@@ -733,13 +904,20 @@
msgstr "Esteu segurs que voleu crear els assentaments?"
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "Print Invoice"
msgstr "Imprimeix factura"
+=======
+#: selection:account.bank.accounts.wizard,account_type:0
+msgid "Check"
+msgstr "Comprova"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.partner.reconcile.process,today_reconciled:0
msgid "Partners Reconciled Today"
+<<<<<<< TREE
msgstr "Empreses conciliades avui"
#. module: account
@@ -751,6 +929,15 @@
#: selection:account.financial.report,display_detail:0
msgid "Display children with hierarchy"
msgstr ""
+=======
+msgstr "Empreses conciliades avui"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:306
+#, python-format
+msgid "The statement balance is incorrect !\n"
+msgstr "El balanç de l'extracte bancari és incorrecte!\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.payment.term.line,value:0
@@ -768,23 +955,31 @@
#: model:ir.model,name:account.model_project_account_analytic_line
#, python-format
msgid "Analytic Entries by line"
+<<<<<<< TREE
msgstr "Assentaments analítics per línia"
#. module: account
#: field:account.invoice.refund,filter_refund:0
msgid "Refund Method"
msgstr ""
+=======
+msgstr "Assentaments analítics per línia"
+>>>>>>> MERGE-SOURCE
#. module: account
#: code:addons/account/wizard/account_change_currency.py:38
#, python-format
msgid "You can only change currency for Draft Invoice !"
+<<<<<<< TREE
msgstr "Només podeu canviar la moneda per a factures a l'esborrany!"
#. module: account
#: model:ir.ui.menu,name:account.menu_account_report
msgid "Financial Report"
msgstr ""
+=======
+msgstr "Només podeu canviar la moneda per a factures a l'esborrany!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.analytic.journal:0
@@ -845,7 +1040,16 @@
#. module: account
#: model:ir.model,name:account.model_account_automatic_reconcile
msgid "Automatic Reconcile"
-msgstr "Conciliació automàtica"
+<<<<<<< TREE
+msgstr "Conciliació automàtica"
+=======
+msgstr "Conciliació automàtica"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Due date Computation"
+msgstr "Càlcul de la data de venciment"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.analytic.account.quantity_cost_ledger:0
@@ -903,14 +1107,31 @@
msgstr "Càlcul"
#. module: account
+<<<<<<< TREE
#: selection:account.invoice.refund,filter_refund:0
msgid "Cancel: refund invoice and reconcile"
msgstr ""
+=======
+#: view:account.move.line:0
+msgid "Next Partner to reconcile"
+msgstr "Propera empresa a conciliar"
+>>>>>>> MERGE-SOURCE
#. module: account
+<<<<<<< TREE
#: field:account.cashbox.line,pieces:0
msgid "Values"
msgstr "Valors"
+=======
+#: 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 ""
+"No podeu fer aquesta modificació en un assentament confirmat! ¡Observeu que "
+"només podeu canviar alguns camps no importants!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice.report:0
@@ -932,10 +1153,12 @@
#. module: account
#: report:account.overdue:0
+#: report:account.aged_trial_balance:0
msgid "Due"
msgstr "Degut"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1345
#, python-format
msgid ""
@@ -950,6 +1173,12 @@
"This account does not allow reconciliation! You should update the account "
"definition to change this."
msgstr ""
+=======
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_total_tax:0
+msgid "Total With Tax"
+msgstr "Total amb impostos"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice:0
@@ -1012,6 +1241,7 @@
"amount.If the tax account is base tax code, this field will contain the "
"basic amount(without tax)."
msgstr ""
+<<<<<<< TREE
"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)."
@@ -1021,6 +1251,11 @@
#, python-format
msgid "I can not locate a parent code for the template account!"
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)."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.analytic.line:0
@@ -1046,15 +1281,28 @@
#: 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
+<<<<<<< TREE
#: code:addons/account/account.py:2268
#: code:addons/account/account_bank_statement.py:357
#: code:addons/account/account_invoice.py:73
#: code:addons/account/account_invoice.py:688
#: code:addons/account/account_move_line.py:173
+=======
+#: code:addons/account/account.py:2097
+#: code:addons/account/account_bank_statement.py:350
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:73
+#: code:addons/account/invoice.py:678
+#: code:addons/account/wizard/account_use_model.py:81
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Analytic Journal !"
msgstr "No diari analític!"
@@ -1090,6 +1338,7 @@
msgstr "Mode horitzontal"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:645
#, python-format
msgid ""
@@ -1101,6 +1350,11 @@
#: field:account.report.general.ledger,sortby:0
msgid "Sort by"
msgstr ""
+=======
+#: view:board.board:0
+msgid "Customer Invoices to Approve"
+msgstr "Factures de client per aprovar"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.fiscalyear.close,fy_id:0
@@ -1113,6 +1367,7 @@
"These types are defined according to your country. The type contains more "
"information about the account and its specificities."
msgstr ""
+<<<<<<< TREE
"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."
@@ -1123,6 +1378,11 @@
msgid ""
"You have to provide an account for the write off/exchange difference entry !"
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."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.tax:0
@@ -1138,7 +1398,16 @@
#: 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 "Registres de caixa"
+<<<<<<< TREE
+msgstr "Registres de caixa"
+=======
+msgstr "Registres de caixa"
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "Profit & Loss (Expense Accounts)"
+msgstr "Pèrdues i Guanys (comptes de despeses)"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.analytic.account.journal:0
@@ -1156,12 +1425,16 @@
#. module: account
#: view:account.subscription.generate:0
msgid "Generate Entries before:"
+<<<<<<< TREE
msgstr "Genera els assentaments abans:"
#. module: account
#: view:account.move.line:0
msgid "Unbalanced Journal Items"
msgstr ""
+=======
+msgstr "Genera els assentaments abans:"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:account.account.type,name:account.data_account_type_bank
@@ -1179,6 +1452,7 @@
#. module: account
#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
msgid "Confirm statement"
+<<<<<<< TREE
msgstr "Confirma extracte"
#. module: account
@@ -1187,6 +1461,9 @@
"Total amount (in Secondary currency) for transactions held in secondary "
"currency for this account."
msgstr ""
+=======
+msgstr "Confirma extracte"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.fiscal.position.tax,tax_dest_id:0
@@ -1212,6 +1489,7 @@
"purchase orders or receipts. This way, you can control the invoice from your "
"supplier according to what you purchased or received."
msgstr ""
+<<<<<<< TREE
"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 "
@@ -1222,10 +1500,17 @@
#: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
msgid "Tax Code Templates"
msgstr "Plantilles codis d'impostos"
+=======
+"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."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice.cancel:0
msgid "Cancel Invoices"
+<<<<<<< TREE
msgstr "Cancel·la factures"
#. module: account
@@ -1237,6 +1522,14 @@
#: view:account.tax.template:0
msgid "Taxes used in Purchases"
msgstr ""
+=======
+msgstr "Cancel·la factures"
+
+#. module: account
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconciliation transactions"
+msgstr "Transaccions de no conciliació"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice.tax,tax_code_id:0
@@ -1276,14 +1569,23 @@
#. module: account
#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.tax.code.entries:0
+>>>>>>> MERGE-SOURCE
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Entry Label"
msgstr "Etiqueta assentament"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1129
+=======
+#: code:addons/account/account.py:990
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not modify/delete a journal with entries for this period !"
msgstr ""
@@ -1373,12 +1675,16 @@
#: code:addons/account/wizard/account_report_common.py:144
#, python-format
msgid "Select a starting and an ending period"
+<<<<<<< TREE
msgstr "Seleccioneu un període inicial i final"
#. module: account
#: model:account.financial.report,name:account.account_financial_report_profitandloss0
msgid "Profit and Loss"
msgstr ""
+=======
+msgstr "Seleccioneu un període inicial i final"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_account_template
@@ -1388,7 +1694,16 @@
#. module: account
#: view:account.tax.code.template:0
msgid "Search tax template"
-msgstr "Cerca plantilla impostos"
+<<<<<<< TREE
+msgstr "Cerca plantilla impostos"
+=======
+msgstr "Cerca plantilla impostos"
+
+#. module: account
+#: report:account.invoice:0
+msgid "Your Reference"
+msgstr "La vostra referència"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.move.reconcile:0
@@ -1432,6 +1747,7 @@
#. module: account
#: model:ir.ui.menu,name:account.next_id_22
+#: report:account.aged_trial_balance:0
msgid "Partners"
msgstr "Empreses"
@@ -1455,6 +1771,15 @@
msgstr "Diari central"
#. module: account
+<<<<<<< TREE
+=======
+#: 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!"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: selection:account.balance.report,display_account:0
#: selection:account.common.account.report,display_account:0
#: selection:account.partner.balance,display_partner:0
@@ -1525,6 +1850,7 @@
#. module: account
#: view:account.entries.report:0
msgid "# of Entries "
+<<<<<<< TREE
msgstr "Nombre d'assentaments "
#. module: account
@@ -1533,6 +1859,9 @@
"By unchecking the active field, you may hide a fiscal position without "
"deleting it."
msgstr ""
+=======
+msgstr "Nombre d'assentaments "
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_temp_range
@@ -1546,6 +1875,7 @@
msgstr "Factures rectificatives (abonament) de proveïdor"
#. module: account
+<<<<<<< TREE
#: selection:account.account,type:0
#: selection:account.account.template,type:0
#: selection:account.bank.statement,state:0
@@ -1555,6 +1885,36 @@
#: selection:account.period,state:0
msgid "Closed"
msgstr "Tancament"
+=======
+#: view:account.payment.term.line:0
+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: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 "Comptabilitat anglosaxona"
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr "Moviment de desajust"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
@@ -1567,6 +1927,14 @@
msgstr "Plantilla per posició fiscal"
#. module: account
+<<<<<<< TREE
+=======
+#: model:account.tax.code,name:account.account_tax_code_0
+msgid "Tax Code Test"
+msgstr "Test codi impost"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.automatic.reconcile,reconciled:0
msgid "Reconciled transactions"
msgstr "Transaccions conciliades"
@@ -1611,6 +1979,8 @@
#: view:account.move.line:0
msgid "Unposted Journal Items"
msgstr ""
+"Valors deure o haver incorrectes en el model (deure + haver ha de ser major "
+"que \"0\")!"
#. module: account
#: view:account.chart.template:0
@@ -1693,7 +2063,16 @@
#. module: account
#: view:account.invoice:0
msgid "Responsible"
-msgstr "Responsable"
+<<<<<<< TREE
+msgstr "Responsable"
+=======
+msgstr "Responsable"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Sub-Total :"
+msgstr "Subtotal :"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
@@ -1712,6 +2091,7 @@
#. module: account
#: model:ir.ui.menu,name:account.periodical_processing_invoicing
msgid "Invoicing"
+<<<<<<< TREE
msgstr "Facturació"
#. module: account
@@ -1719,6 +2099,20 @@
#, python-format
msgid "Unknown Partner"
msgstr "Empresa desconeguda"
+=======
+msgstr "Facturació"
+
+#. module: account
+#: field:account.chart.template,tax_code_root_id:0
+msgid "Root Tax Code"
+msgstr "Codi impost arrel"
+
+#. module: account
+#: field:account.partner.ledger,initial_balance:0
+#: field:account.report.general.ledger,initial_balance:0
+msgid "Include initial balances"
+msgstr "Incloure balanços inicials"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.tax.code,sum:0
@@ -1726,6 +2120,7 @@
msgstr "Suma de l'any"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1429
#, python-format
msgid ""
@@ -1734,6 +2129,8 @@
"Heu seleccionat una unitat de mesura que no és compatible amb el producte."
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
msgstr "Aquest assistent canviarà la moneda de la factura"
@@ -1745,6 +2142,7 @@
"Have a complete tree view of all journal items per account code by clicking "
"on an account."
msgstr ""
+<<<<<<< TREE
"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."
@@ -1758,6 +2156,27 @@
#: view:account.tax.template:0
msgid "Tax Declaration"
msgstr "Declaració d'impostos"
+=======
+"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 "Error! No podeu definir exercicis fiscals que es superposin"
+
+#. module: account
+#: 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!"
+
+#. module: account
+#: field:account.cashbox.line,pieces:0
+msgid "Values"
+msgstr "Valors"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.journal.period,active:0
@@ -1779,6 +2198,15 @@
msgstr "Comptes a cobrar i pagar"
#. module: account
+<<<<<<< TREE
+=======
+#: 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!"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.model,name:account.model_account_common_journal_report
msgid "Account Common Journal Report"
msgstr "Comptabilitat. Informe diari comú"
@@ -1805,7 +2233,11 @@
msgstr "Ref. client:"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_cash_statement.py:292
+=======
+#: code:addons/account/account_cash_statement.py:329
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "User %s does not have rights to access %s journal !"
msgstr "L'usuari %s no te drets per accedir al diari %s !"
@@ -1823,7 +2255,17 @@
#. module: account
#: view:account.tax:0
msgid "Tax Declaration: Credit Notes"
-msgstr "Declaració d'impostos: Factures rectficatives"
+<<<<<<< TREE
+msgstr "Declaració d'impostos: Factures rectficatives"
+=======
+msgstr "Declaració d'impostos: Factures rectficatives"
+
+#. module: account
+#: 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."
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.move.line.reconcile,credit:0
@@ -1831,12 +2273,35 @@
msgstr "Import haver"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:407
#: code:addons/account/account.py:412
#: code:addons/account/account.py:429
+=======
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr "No podeu crear una línia de moviment en un compte tancat."
+
+#. module: account
+#: code:addons/account/account.py:529
+>>>>>>> MERGE-SOURCE
#, python-format
+<<<<<<< TREE
msgid "Error!"
msgstr ""
+=======
+msgid ""
+"You cannot change the type of account from 'Closed' to any other type which "
+"contains account entries!"
+msgstr ""
+"No podeu canviar el tipus de compte de 'Tancat' a qualsevol altre tipus si "
+"conté assentaments comptables!"
+
+#. module: account
+#: view:res.company:0
+msgid "Reserve And Profit/Loss Account"
+msgstr "Compte de reserves i pèrdues/guanys"
+>>>>>>> MERGE-SOURCE
#. module: account
#: sql_constraint:account.move.line:0
@@ -1866,9 +2331,15 @@
msgstr "Assentaments per línia"
#. module: account
+<<<<<<< TREE
#: field:account.vat.declaration,based_on:0
msgid "Based on"
msgstr ""
+=======
+#: report:account.tax.code.entries:0
+msgid "A/c Code"
+msgstr "Codi del compte"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice,move_id:0
@@ -1898,12 +2369,16 @@
#. module: account
#: constraint:res.company:0
msgid "Error! You can not create recursive companies."
+<<<<<<< TREE
msgstr "Error! No podeu crear companyies recursives."
#. module: account
#: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
msgid "Sale/Purchase Journal"
msgstr ""
+=======
+msgstr "Error! No podeu crear companyies recursives."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.analytic.account:0
@@ -1939,12 +2414,24 @@
msgstr "/"
#. module: account
+<<<<<<< TREE
#: help:res.company,property_reserve_and_surplus_account:0
msgid ""
"This account is used for transferring Profit/Loss (If It is Profit: Amount "
"will be added, Loss : Amount will be deducted.), as calculated in Profit & "
"Loss Report"
+=======
+#: field:account.bs.report,reserve_account_id:0
+msgid "Reserve & Profit/Loss Account"
+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"
+>>>>>>> MERGE-SOURCE
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
@@ -1987,15 +2474,22 @@
"estigui dins de les dates del període."
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:73
#, python-format
msgid "You must define an analytic journal of type '%s'!"
msgstr ""
+=======
+#: model:ir.actions.act_window,name:account.action_account_pl_report
+msgid "Account Profit And Loss"
+msgstr "Compte de pèrdues i guanys"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.installer,config_logo:0
#: field:wizard.multi.charts.accounts,config_logo:0
msgid "Image"
+<<<<<<< TREE
msgstr "Imatge"
#. module: account
@@ -2010,6 +2504,9 @@
#: model:ir.actions.act_window,help:account.action_account_financial_report_tree
msgid "Makes a generic system to draw financial reports easily."
msgstr ""
+=======
+msgstr "Imatge"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice:0
@@ -2023,6 +2520,7 @@
"If the active field is set to False, it will allow you to hide the tax "
"without removing it."
msgstr ""
+<<<<<<< TREE
"Si el camp actiu està desmarcat, permetrà ocultar l'impost sense eliminar-lo."
#. module: account
@@ -2052,6 +2550,27 @@
#: report:account.journal.period.print.sale.purchase:0
msgid "VAT Declaration"
msgstr ""
+=======
+"Si el camp actiu està desmarcat, permetrà ocultar l'impost sense eliminar-lo."
+
+#. module: account
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+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
+#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
+#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
+msgid "Unreconcile Entries"
+msgstr "Trenca conciliació dels assentaments"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.move.reconcile,line_partial_ids:0
@@ -2133,7 +2652,17 @@
msgstr "Pro-forma"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1461
+=======
+#: code:addons/account/installer.py:348
+#, python-format
+msgid " Journal"
+msgstr " Diari"
+
+#. module: account
+#: code:addons/account/account.py:1333
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"There is no default default debit account defined \n"
@@ -2161,6 +2690,7 @@
#. module: account
#: view:account.chart.template:0
msgid "Search Chart of Account Templates"
+<<<<<<< TREE
msgstr "Cerca plantilles de pla comptable"
#. module: account
@@ -2184,6 +2714,9 @@
#: report:account.invoice:0
msgid "Customer Code"
msgstr ""
+=======
+msgstr "Cerca plantilles de pla comptable"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.installer:0
@@ -2216,7 +2749,12 @@
msgstr "Descripció"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3119
+=======
+#: code:addons/account/account.py:2888
+#: code:addons/account/installer.py:498
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "ECNJ"
msgstr "ECNJ"
@@ -2235,7 +2773,11 @@
msgstr "Compte d'ingressos"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:370
+=======
+#: code:addons/account/invoice.py:351
+>>>>>>> MERGE-SOURCE
#, 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!"
@@ -2306,6 +2848,11 @@
#: field:accounting.report,fiscalyear_id:0
#: field:accounting.report,fiscalyear_id_cmp: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"
@@ -2427,7 +2974,19 @@
#: model:process.node,note:account.process_node_draftinvoices0
#: model:process.node,note:account.process_node_supplierdraftinvoices0
msgid "Draft state of an invoice"
-msgstr "Estat esborrany d'una factura"
+<<<<<<< TREE
+msgstr "Estat esborrany d'una factura"
+=======
+msgstr "Estat esborrany d'una factura"
+
+#. module: account
+#: help:account.account,reconcile:0
+msgid ""
+"Check this if the user is allowed to reconcile entries in this account."
+msgstr ""
+"Marqueu aquesta opció si l'usuari se li permet conciliar assentaments en "
+"aquest compte."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.partner.reconcile.process:0
@@ -2441,7 +3000,11 @@
msgstr "Codi impost comptable"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:572
+=======
+#: code:addons/account/invoice.py:552
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Can't find any account journal of %s type for this company.\n"
@@ -2449,6 +3012,7 @@
"You can create one in the menu: \n"
"Configuration\\Financial Accounting\\Accounts\\Journals."
msgstr ""
+<<<<<<< TREE
"No es troba cap diari del tipus %s per a aquesta companyia.\n"
"\n"
"Heu de crear un en el menú: \n"
@@ -2464,6 +3028,12 @@
#: view:account.entries.report:0
msgid "Unreconciled entries"
msgstr "Assentaments no conciliats"
+=======
+"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."
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice.tax,base_code_id:0
@@ -2533,7 +3103,12 @@
msgstr "Líniees de model d'assentament"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3117
+=======
+#: code:addons/account/account.py:2840
+#: code:addons/account/installer.py:454
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "EXJ"
msgstr "DESPESA"
@@ -2596,9 +3171,15 @@
"específic"
#. module: account
+<<<<<<< TREE
#: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
msgid "Account move line reconcile (writeoff)"
msgstr ""
+=======
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr "Error! No podeu crear categories recursives."
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:account.account.type,name:account.account_type_tax
@@ -2633,7 +3214,11 @@
msgstr "Comptes"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:369
+=======
+#: code:addons/account/invoice.py:350
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Configuration Error!"
msgstr "Error de configuració!"
@@ -2649,6 +3234,18 @@
msgstr "Data:"
#. module: account
+<<<<<<< TREE
+=======
+#: 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
+>>>>>>> MERGE-SOURCE
#: report:account.journal.period.print:0
#: report:account.journal.period.print.sale.purchase:0
msgid "Label"
@@ -2679,7 +3276,12 @@
#. module: account
#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
#: report:account.overdue:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
@@ -2690,6 +3292,7 @@
#: help:account.move.line,tax_code_id:0
msgid "The Account can either be a base tax code or a tax code account."
msgstr ""
+<<<<<<< TREE
"El compte pot ser o bé un compte d'un codi d'impost base o bé d'un codi "
"d'impost."
@@ -2697,6 +3300,10 @@
#: sql_constraint:account.model.line:0
msgid "Wrong credit or debit value in model, they must be positive!"
msgstr ""
+=======
+"El compte pot ser o bé un compte d'un codi d'impost base o bé d'un codi "
+"d'impost."
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.ui.menu,name:account.menu_automatic_reconcile
@@ -2715,6 +3322,16 @@
msgstr "Codi base reintegrament"
#. module: account
+<<<<<<< TREE
+=======
+#: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
+#: 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 "Extractes bancaris"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: selection:account.tax.template,applicable_type:0
msgid "True"
msgstr "Cert"
@@ -2726,12 +3343,16 @@
#: view:account.move.line:0
#: view:accounting.report:0
msgid "Dates"
+<<<<<<< TREE
msgstr "Dates"
#. module: account
#: field:account.chart.template,parent_id:0
msgid "Parent Chart Template"
msgstr ""
+=======
+msgstr "Dates"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.tax,parent_id:0
@@ -2765,12 +3386,16 @@
#: model:process.transition,name:account.process_transition_entriesreconcile0
#: model:process.transition,name:account.process_transition_supplierentriesreconcile0
msgid "Accounting entries"
+<<<<<<< TREE
msgstr "Assentaments comptables"
#. module: account
#: field:account.invoice,reference_type:0
msgid "Communication Type"
msgstr ""
+=======
+msgstr "Assentaments comptables"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice.line,discount:0
@@ -2796,12 +3421,16 @@
#: 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"
+<<<<<<< TREE
msgstr "Configuració financera per una nova companyia"
#. module: account
#: view:account.installer:0
msgid "Configure Your Chart of Accounts"
msgstr ""
+=======
+msgstr "Configuració financera per una nova companyia"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
@@ -2816,15 +3445,27 @@
msgstr "Aquest assistent crearà assentaments comptables recursius"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1321
+=======
+#: code:addons/account/account.py:1195
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No sequence defined on the journal !"
msgstr "No s'ha definit una seqüència en el diari !"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2268
#: code:addons/account/account_invoice.py:688
#: code:addons/account/account_move_line.py:173
+=======
+#: code:addons/account/account.py:2097
+#: code:addons/account/account_bank_statement.py:350
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
+#: code:addons/account/wizard/account_use_model.py:81
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
msgstr "Heu de definir un diari analític al diari '%s'!"
@@ -2869,12 +3510,32 @@
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "August"
-msgstr "Agost"
+<<<<<<< TREE
+msgstr "Agost"
+=======
+msgstr "Agost"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:307
+#, python-format
+msgid ""
+"The expected balance (%.2f) is different than the computed one. (%.2f)"
+msgstr "El balanç previst (%.2f) és diferent del calculat. (%.2f)"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
msgid "Payment entries are the second input of the reconciliation."
-msgstr "Les entrades de pagament són la segona entrada de la reconciliació."
+<<<<<<< TREE
+msgstr "Les entrades de pagament són la segona entrada de la reconciliació."
+=======
+msgstr "Les entrades de pagament són la segona entrada de la reconciliació."
+
+#. module: account
+#: selection:account.print.journal,sort_selection:0
+msgid "Reference Number"
+msgstr "Número de referència"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.entries.report,month:0
@@ -2942,6 +3603,7 @@
#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
+<<<<<<< TREE
msgstr "Impost de venda per defecte"
#. module: account
@@ -2949,6 +3611,9 @@
#, python-format
msgid "Invoice '%s' is validated."
msgstr "Factura '%s' és validada."
+=======
+msgstr "Impost de venda per defecte"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.model.line,date_maturity:0
@@ -2986,7 +3651,27 @@
msgstr "Posició fiscal"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:735
+=======
+#: help:account.partner.ledger,initial_balance:0
+#: help:account.report.general.ledger,initial_balance:0
+msgid ""
+"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
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+msgid "Analytic Entries"
+msgstr "Entrades analítiques"
+
+#. module: account
+#: code:addons/account/account.py:836
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Tax base different!\n"
@@ -3034,6 +3719,7 @@
#. module: account
#: view:account.change.currency:0
msgid "Invoice Currency"
+<<<<<<< TREE
msgstr "Moneda de la factura"
#. module: account
@@ -3041,6 +3727,9 @@
#: model:ir.ui.menu,name:account.menu_account_financial_reports_tree
msgid "Account Reports"
msgstr ""
+=======
+msgstr "Moneda de la factura"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.payment.term,line_ids:0
@@ -3101,6 +3790,7 @@
#. module: account
#: selection:account.tax,applicable_type:0
msgid "Always"
+<<<<<<< TREE
msgstr "Sempre"
#. module: account
@@ -3108,6 +3798,9 @@
#: view:analytic.entries.report:0
msgid "Month-1"
msgstr ""
+=======
+msgstr "Sempre"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.analytic.line:0
@@ -3140,8 +3833,13 @@
msgstr "Vista"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3363
#: code:addons/account/account_bank.py:90
+=======
+#: code:addons/account/account.py:2950
+#: code:addons/account/installer.py:296
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "BNK"
msgstr "BANC"
@@ -3184,7 +3882,16 @@
#. module: account
#: help:account.journal.column,sequence:0
msgid "Gives the sequence order to journal column."
-msgstr "Indica l'ordre de seqüència de la columna del diari."
+<<<<<<< TREE
+msgstr "Indica l'ordre de seqüència de la columna del diari."
+=======
+msgstr "Indica l'ordre de seqüència de la columna del diari."
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Tax Declaration"
+msgstr "Declaració d'impostos"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.account,currency_id:0
@@ -3223,12 +3930,16 @@
#. module: account
#: model:ir.model,name:account.model_account_unreconcile_reconcile
msgid "Account Unreconcile Reconcile"
+<<<<<<< TREE
msgstr "Concilia el compte desconciliat"
#. module: account
#: sql_constraint:account.tax:0
msgid "The description must be unique per company!"
msgstr ""
+=======
+msgstr "Concilia el compte desconciliat"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.account.type,close_method:0
@@ -3243,6 +3954,7 @@
" 'Unreconciled' will copy only the journal items that were unreconciled on "
"the first day of the new fiscal year."
msgstr ""
+<<<<<<< TREE
"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"
@@ -3258,6 +3970,23 @@
#, 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"
+=======
+"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"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.tax:0
@@ -3277,8 +4006,12 @@
#: field:account.common.report,journal_ids:0
#: report:account.general.journal:0
#: field:account.general.journal,journal_ids:0
+<<<<<<< TREE
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+>>>>>>> MERGE-SOURCE
#: view:account.journal.period:0
#: report:account.partner.balance:0
#: field:account.partner.balance,journal_ids:0
@@ -3325,12 +4058,16 @@
#: view:account.installer:0
#: view:wizard.multi.charts.accounts:0
msgid "Accounting Application Configuration"
+<<<<<<< TREE
msgstr "Configuració de l'aplicació de comptabilitat"
#. module: account
#: view:account.payment.term.line:0
msgid " Value amount: 0.02"
msgstr ""
+=======
+msgstr "Configuració de l'aplicació de comptabilitat"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.open_board_account
@@ -3345,7 +4082,11 @@
msgstr "Saldo inicial"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1332
+=======
+#: code:addons/account/invoice.py:1298
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Partner Defined !"
msgstr "No s'ha definit empresa!"
@@ -3378,6 +4119,7 @@
"The amount expressed in the related account currency if not equal to the "
"company one."
msgstr ""
+<<<<<<< TREE
"L'import expressat en la moneda comptable relacionada no és igual al de la "
"companyia."
@@ -3387,6 +4129,29 @@
#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
msgid "Unreconcile Entries"
msgstr "Trenca conciliació dels assentaments"
+=======
+"L'import expressat en la moneda comptable relacionada no és igual al de la "
+"companyia."
+
+#. module: account
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.invoice:0
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Draft"
+msgstr "Esborrany"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_configuration_installer
+msgid "Accounting Chart Configuration"
+msgstr "Configuració del pla comptable"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.tax.code,notprintable:0
@@ -3398,6 +4163,7 @@
#: report:account.vat.declaration:0
#: field:account.vat.declaration,chart_tax_id:0
msgid "Chart of Tax"
+<<<<<<< TREE
msgstr "Pla dels impostos"
#. module: account
@@ -3405,6 +4171,9 @@
#, python-format
msgid "The closing balance should be the same than the computed balance!"
msgstr ""
+=======
+msgstr "Pla dels impostos"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.journal:0
@@ -3424,18 +4193,37 @@
msgstr "any"
#. module: account
+<<<<<<< TREE
#: view:product.product:0
msgid "Purchase Taxes"
msgstr "Impostos de compres"
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: 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."
+<<<<<<< TREE
+"Tots els assentaments seleccionats seran validats i assentats. Això "
+"significa que ja no podreu modificar els camps comptables."
+=======
+"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:373
+#, python-format
+msgid "Cannot delete invoice(s) that are already opened or paid !"
+msgstr "No es poden esborrar factures obertes o pagades!"
+
+#. module: account
+#: report:account.account.balance.landscape:0
+msgid "Total :"
+msgstr "Total :"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.report.xml,name:account.account_transfers
@@ -3443,6 +4231,16 @@
msgstr "Transferències"
#. 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 "desquadrat"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.chart:0
msgid "Account charts"
msgstr "Resums de compte"
@@ -3453,6 +4251,14 @@
msgstr "Import impostos"
#. module: account
+<<<<<<< TREE
+=======
+#: view:account.installer:0
+msgid "Your bank and cash accounts"
+msgstr "Comptes bancaris i de caixa"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.move:0
msgid "Search Move"
msgstr "Cerca moviment"
@@ -3476,6 +4282,7 @@
"Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
"or 'Done' state!"
msgstr ""
+<<<<<<< TREE
"La/es factura/es seleccionada/es no es pot/den cancel·lar ja que està en "
"estat 'Cancel·lat' o 'Realitzat'!"
@@ -3493,6 +4300,31 @@
#: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
msgid "Print Sale/Purchase Journal"
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:532
+#, python-format
+msgid ""
+"You cannot change the type of account from '%s' to '%s' type as it contains "
+"account entries!"
+msgstr ""
+"No podeu canviar el tipus de compte de '%s' a '%s' si conté assentaments "
+"comptables!"
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+msgid "Counterpart"
+msgstr "Contrapartida"
+
+#. module: account
+#: view:account.journal:0
+msgid "Invoicing Data"
+msgstr "Dades de facturació"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice.report,state:0
@@ -3503,7 +4335,19 @@
#: view:account.invoice.report:0
#: field:account.invoice.report,categ_id:0
msgid "Category of Product"
-msgstr "Categoria del producte"
+<<<<<<< TREE
+msgstr "Categoria del producte"
+=======
+msgstr "Categoria del producte"
+
+#. module: account
+#: view:account.move:0
+#: field:account.move,narration:0
+#: view:account.move.line:0
+#: field:account.move.line,narration:0
+msgid "Narration"
+msgstr "Notes"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.addtmpl.wizard:0
@@ -3514,6 +4358,7 @@
#. module: account
#: model:ir.model,name:account.model_report_account_type_sales
msgid "Report of the Sales by Account Type"
+<<<<<<< TREE
msgstr "Informe de les vendes per tipus de compte"
#. module: account
@@ -3525,6 +4370,9 @@
#: sql_constraint:res.currency:0
msgid "The currency code must be unique per company!"
msgstr ""
+=======
+msgstr "Informe de les vendes per tipus de compte"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.account.type,close_method:0
@@ -3532,6 +4380,7 @@
msgstr "Detall"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:839
#, python-format
msgid ""
@@ -3540,6 +4389,11 @@
"amount greater than the total invoiced amount. The latest line of your "
"payment term must be of type 'balance' to avoid rounding issues."
msgstr ""
+=======
+#: field:account.installer,bank_accounts_id:0
+msgid "Your Bank and Cash Accounts"
+msgstr "Els seus comptes de banc i caixa"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.invoice:0
@@ -3659,7 +4513,11 @@
msgstr "Plantilla del pla comptable"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2280
+=======
+#: code:addons/account/account.py:2109
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3671,12 +4529,29 @@
"definiu l'empresa en ell!"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:837
+=======
+#: code:addons/account/account_move_line.py:801
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Some entries are already reconciled !"
msgstr "Alguns assentaments ja estan conciliats!"
#. module: account
+<<<<<<< TREE
+=======
+#: 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
+>>>>>>> MERGE-SOURCE
#: view:account.tax:0
msgid "Account Tax"
msgstr "Compte d'impostos"
@@ -3703,12 +4578,16 @@
#: selection:accounting.report,filter:0
#: selection:accounting.report,filter_cmp:0
msgid "No Filters"
+<<<<<<< TREE
msgstr "Sense filtres"
#. module: account
#: view:account.invoice.report:0
msgid "Pro-forma Invoices"
msgstr ""
+=======
+msgstr "Sense filtres"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:res.partner:0
@@ -3758,6 +4637,16 @@
msgstr "Compte a pagar"
#. module: account
+<<<<<<< TREE
+=======
+#: constraint:account.move:0
+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
+>>>>>>> MERGE-SOURCE
#: model:process.node,name:account.process_node_supplierpaymentorder0
msgid "Payment Order"
msgstr "Ordre de pagament"
@@ -3787,7 +4676,11 @@
msgstr "Anotacions analítiques"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1153
+=======
+#: code:addons/account/account_move_line.py:1134
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Unable to change tax !"
msgstr "No ha estat possible canviar l'impost!"
@@ -3795,12 +4688,34 @@
#. module: account
#: field:analytic.entries.report,nbr:0
msgid "#Entries"
+<<<<<<< TREE
msgstr "Núm. assentament"
#. module: account
#: selection:account.invoice.refund,filter_refund:0
msgid "Create a draft Refund"
msgstr ""
+=======
+msgstr "Núm. assentament"
+
+#. module: account
+#: 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:476
+#, python-format
+msgid ""
+"The Payment Term of Supplier does not have Payment Term Lines(Computation) "
+"defined !"
+msgstr ""
+"El termini de pagament dels proveïdors no té línies de termini de pagament "
+"(Càlcul) definides!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.state.open:0
@@ -3815,6 +4730,7 @@
#. module: account
#: view:account.fiscal.position:0
msgid "Mapping"
+<<<<<<< TREE
msgstr "Correspondència"
#. module: account
@@ -3825,6 +4741,9 @@
"centralised counterpart box in the related journal from the configuration "
"menu."
msgstr ""
+=======
+msgstr "Correspondència"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.account,name:0
@@ -3842,6 +4761,7 @@
#. module: account
#: model:ir.model,name:account.model_account_aged_trial_balance
msgid "Account Aged Trial balance Report"
+<<<<<<< TREE
msgstr "Informe de comprovació de venciments en el balanç"
#. module: account
@@ -3849,6 +4769,9 @@
#, python-format
msgid "You can not create journal items on a closed account %s %s"
msgstr ""
+=======
+msgstr "Informe de comprovació de venciments en el balanç"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.move.line,date:0
@@ -3870,6 +4793,7 @@
#. module: account
#: help:account.journal,analytic_journal_id:0
msgid "Journal for analytic entries"
+<<<<<<< TREE
msgstr "Diari d'assentaments analítics"
#. module: account
@@ -3891,6 +4815,9 @@
"The fiscalyear, periods or chart of account chosen have to belong to the "
"same company."
msgstr ""
+=======
+msgstr "Diari d'assentaments analítics"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.todo.category,name:account.category_accounting_configuration
@@ -3917,6 +4844,7 @@
"Print Report with the currency column if the currency is different then the "
"company currency"
msgstr ""
+<<<<<<< TREE
"Imprimeix informe amb la columna de la moneda, si la moneda és diferent de "
"la moneda de la companyia."
@@ -3926,6 +4854,10 @@
"Value of Loss or Gain due to changes in exchange rate when doing multi-"
"currency transactions."
msgstr ""
+=======
+"Imprimeix informe amb la columna de la moneda, si la moneda és diferent de "
+"la moneda de la companyia."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.analytic.line:0
@@ -3979,17 +4911,37 @@
msgstr "Validar"
#. module: account
+<<<<<<< TREE
#: report:account.analytic.account.cost_ledger:0
#: report:account.analytic.account.quantity_cost_ledger:0
#: model:ir.actions.act_window,name:account.action_account_analytic_cost
#: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
msgid "Cost Ledger"
msgstr "Cost comptable"
+=======
+#: 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\")!"
+>>>>>>> MERGE-SOURCE
#. module: account
+<<<<<<< TREE
#: model:account.financial.report,name:account.account_financial_report_assets0
msgid "Assets"
msgstr "Actius"
+=======
+#: model:ir.actions.act_window,help:account.action_account_invoice_report_all
+msgid ""
+"From this report, you can have an overview of the amount invoiced to your "
+"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."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice.confirm:0
@@ -4038,17 +4990,33 @@
msgstr "Saldo analític"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/report/account_balance_sheet.py:76
+#: code:addons/account/report/account_balance_sheet.py:122
+#: code:addons/account/report/account_profit_loss.py:76
+#: code:addons/account/report/account_profit_loss.py:124
+#, python-format
+msgid "Net Loss"
+msgstr "Pèrdues netes"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.account,active:0
msgid ""
"If the active field is set to False, it will allow you to hide the account "
"without removing it."
msgstr ""
+<<<<<<< TREE
"Si el camp actiu es desmarca, permet ocultar el compte sense eliminar-lo."
#. module: account
#: view:account.move.line:0
msgid "Posted Journal Items"
msgstr ""
+=======
+"Si el camp actiu es desmarca, permet ocultar el compte sense eliminar-lo."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.tax.template:0
@@ -4058,6 +5026,7 @@
#. module: account
#: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
msgid "Draft Entries"
+<<<<<<< TREE
msgstr "Assentaments en esborrany"
#. module: account
@@ -4069,6 +5038,9 @@
#: view:account.payment.term.line:0
msgid " Number of Days: 30"
msgstr ""
+=======
+msgstr "Assentaments en esborrany"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.account,shortcut:0
@@ -4163,7 +5135,17 @@
#. module: account
#: view:account.entries.report:0
msgid "Acc.Type"
-msgstr "Tipus de compte"
+<<<<<<< TREE
+msgstr "Tipus de compte"
+=======
+msgstr "Tipus de compte"
+
+#. module: account
+#: 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!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.entries.report,month:0
@@ -4209,6 +5191,7 @@
#. module: account
#: view:account.analytic.account:0
msgid "Overdue Account"
+<<<<<<< TREE
msgstr "Compta d'endarreriments"
#. module: account
@@ -4217,6 +5200,9 @@
#, python-format
msgid "Balance Sheet (Liability account)"
msgstr ""
+=======
+msgstr "Compta d'endarreriments"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.invoice,date_invoice:0
@@ -4231,10 +5217,32 @@
#. module: account
#: field:account.tax,base_code_id:0
msgid "Account Base Code"
+<<<<<<< TREE
msgstr "Codi base del compte"
#. module: account
#: code:addons/account/account_analytic_line.py:93
+=======
+msgstr "Codi base del compte"
+
+#. module: account
+#: help:account.move,state:0
+msgid ""
+"All manually created new journal entry are usually in the state 'Unposted', "
+"but you can set the option to skip that state on the related journal. In "
+"that case, they will be behave as journal entries automatically created by "
+"the system on document validation (invoices, bank statements...) and will be "
+"created in 'Posted' state."
+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:90
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -4278,7 +5286,16 @@
#, python-format
msgid "Statement %s is confirmed, journal items are created."
msgstr ""
-"S'ha confirmat l'extracte %s, s'han creat els assentaments comptables."
+<<<<<<< TREE
+"S'ha confirmat l'extracte %s, s'han creat els assentaments comptables."
+=======
+"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 "Error! La durada de l'exercici fiscal no és vàlida. "
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:report.aged.receivable,name:0
@@ -4333,17 +5350,30 @@
#. module: account
#: model:process.node,note:account.process_node_importinvoice0
msgid "Statement from invoice or payment"
-msgstr "Extracte des de factura o pagament"
+<<<<<<< TREE
+msgstr "Extracte des de factura o pagament"
+=======
+msgstr "Extracte des de factura o pagament"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " day of the month: 0"
+msgstr " dia del mes: 0"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_chart
msgid "Account chart"
+<<<<<<< TREE
msgstr "Pla comptable"
#. module: account
#: selection:account.financial.report,style_overwrite:0
msgid "Main Title 1 (bold, underlined)"
msgstr ""
+=======
+msgstr "Pla comptable"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.analytic.account.balance:0
@@ -4359,12 +5389,16 @@
#. module: account
#: model:ir.model,name:account.model_account_invoice_report
msgid "Invoices Statistics"
+<<<<<<< TREE
msgstr "Estadístiques de factures"
#. module: account
#: field:account.account,exchange_rate:0
msgid "Exchange Rate"
msgstr ""
+=======
+msgstr "Estadístiques de factures"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,note:account.process_transition_paymentorderreconcilation0
@@ -4375,7 +5409,17 @@
#: code:addons/account/wizard/account_reconcile.py:133
#, python-format
msgid "Reconcile Writeoff"
-msgstr "Desfés conciliació"
+<<<<<<< TREE
+msgstr "Desfés conciliació"
+=======
+msgstr "Desfés conciliació"
+
+#. module: account
+#: field:account.model.line,date_maturity:0
+#: report:account.overdue:0
+msgid "Maturity date"
+msgstr "Data venciment"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:report.account.receivable:0
@@ -4392,17 +5436,30 @@
#: code:addons/account/report/common_report_header.py:92
#, python-format
msgid "Not implemented"
+<<<<<<< TREE
msgstr "No s'ha implementat"
#. module: account
#: field:account.chart.template,visible:0
msgid "Can be Visible?"
msgstr ""
+=======
+msgstr "No s'ha implementat"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_journal_select
msgid "Account Journal Select"
-msgstr "Seleccioneu compte de diari"
+<<<<<<< TREE
+msgstr "Seleccioneu compte de diari"
+=======
+msgstr "Seleccioneu compte de diari"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Print Invoice"
+msgstr "Imprimeix factura"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.tax.template:0
@@ -4410,9 +5467,22 @@
msgstr "Factures rectificatives (abonament)"
#. module: account
+<<<<<<< TREE
#: sql_constraint:account.period:0
msgid "The name of the period must be unique per company!"
msgstr ""
+=======
+#: code:addons/account/account.py:2081
+#: code:addons/account/wizard/account_use_model.py:69
+#, python-format
+msgid "Unable to find a valid period !"
+msgstr "No es troba un període vàlid !"
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Voucher No"
+msgstr "Núm. de val"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:wizard.multi.charts.accounts:0
@@ -4422,6 +5492,7 @@
#. module: account
#: view:account.unreconcile:0
msgid "Unreconciliate transactions"
+<<<<<<< TREE
msgstr "Transaccions no conciliades"
#. module: account
@@ -4432,6 +5503,9 @@
"you want to generate accounts of this template only when loading its child "
"template."
msgstr ""
+=======
+msgstr "Transaccions no conciliades"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.use.model:0
@@ -4468,6 +5542,18 @@
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 ""
+"Error de configuració!\n"
+"No podeu definir fills d'un compte de tipus intern diferent al tipus "
+"\"Vista\"! "
+
+#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
msgid "Account Analytic Cost Ledger For Journal Report"
msgstr "Llibre de costos analítics per informe diari"
@@ -4476,6 +5562,7 @@
#: model:ir.actions.act_window,name:account.action_model_form
#: model:ir.ui.menu,name:account.menu_action_model_form
msgid "Recurring Models"
+<<<<<<< TREE
msgstr "Models recursius"
#. module: account
@@ -4483,6 +5570,9 @@
#, python-format
msgid "Encoding error"
msgstr ""
+=======
+msgstr "Models recursius"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.automatic.reconcile,power:0
@@ -4495,9 +5585,26 @@
msgstr "Canvia"
#. module: account
+<<<<<<< TREE
#: selection:account.journal,type:0
msgid "Bank and Cheques"
msgstr "Banc i xecs"
+=======
+#: 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
+#: code:addons/account/wizard/account_move_journal.py:165
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:55
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:57
+#, python-format
+msgid "UserError"
+msgstr "Error d'usuari"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.journal,type_control_ids:0
@@ -4507,7 +5614,16 @@
#. module: account
#: help:account.journal,default_credit_account_id:0
msgid "It acts as a default account for credit amount"
-msgstr "Actua com un compte per defecte per als imports en l'haver"
+<<<<<<< TREE
+msgstr "Actua com un compte per defecte per als imports en l'haver"
+=======
+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 "Considerar assentaments conciliats."
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.action_validate_account_move_line
@@ -4527,14 +5643,19 @@
#. module: account
#: help:account.bank.statement,balance_end_cash:0
msgid "Closing balance based on cashBox"
+<<<<<<< TREE
msgstr "Saldo del tancament basat en la caixa."
#. module: account
#: view:account.payment.term.line:0
msgid "Example"
msgstr ""
+=======
+msgstr "Saldo del tancament basat en la caixa."
+>>>>>>> MERGE-SOURCE
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:828
#, python-format
msgid ""
@@ -4557,6 +5678,14 @@
msgstr ""
#. module: account
+=======
+#: constraint:account.account:0
+#: constraint:account.tax.code:0
+msgid "Error ! You can not create recursive accounts."
+msgstr "Error! No es poden crear comptes recursius."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: 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
@@ -4592,16 +5721,30 @@
#. module: account
#: report:account.invoice:0
msgid "Cancelled Invoice"
+<<<<<<< TREE
msgstr "Factura cancel·lada"
#. module: account
#: code:addons/account/account.py:1567
+=======
+msgstr "Factura cancel·lada"
+
+#. module: account
+#: code:addons/account/invoice.py:73
+#, python-format
+msgid "You must define an analytic journal of type '%s' !"
+msgstr "Heu de definir un diari analític de tipus «%s»!"
+
+#. module: account
+#: code:addons/account/account.py:1411
+>>>>>>> MERGE-SOURCE
#, 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 ""
+<<<<<<< TREE
"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"
@@ -4610,6 +5753,11 @@
#: selection:account.bank.statement,state:0
msgid "New"
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"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice.refund,date:0
@@ -4633,6 +5781,7 @@
"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 ""
+<<<<<<< TREE
"Tots els assentaments en esborrany d'aquest diari i període seran validats. "
"Això significa que ja no podreu modificar els camps comptables."
@@ -4640,6 +5789,21 @@
#: model:ir.ui.menu,name:account.menu_finance_configuration
msgid "Configuration"
msgstr "Configuració"
+=======
+"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
+msgid "Account Balance -"
+msgstr "Balanç compte -"
+
+#. module: account
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+msgstr "Factura "
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.automatic.reconcile,date1:0
@@ -4688,8 +5852,16 @@
msgstr "Factures"
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "My invoices"
+=======
+#: 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."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4708,12 +5880,16 @@
#. module: account
#: view:account.invoice.report:0
msgid "Invoiced"
+<<<<<<< TREE
msgstr "Facturat"
#. module: account
#: view:account.move:0
msgid "Posted Journal Entries"
msgstr ""
+=======
+msgstr "Facturat"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.use.model:0
@@ -4741,6 +5917,7 @@
#. module: account
#: view:account.addtmpl.wizard:0
msgid "Add"
+<<<<<<< TREE
msgstr "Afegeix"
#. module: account
@@ -4748,6 +5925,19 @@
#: report:account.overdue:0
msgid "Paid"
msgstr "Pagat"
+=======
+msgstr "Afegeix"
+
+#. module: account
+#: help:account.invoice,date_invoice:0
+msgid "Keep empty to use the current date"
+msgstr "Deixa-ho buit per utilitzar la data actual."
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Cheques"
+msgstr "Banc i xecs"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.period.close:0
@@ -4762,6 +5952,7 @@
#. module: account
#: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
msgid "Draft invoices are validated. "
+<<<<<<< TREE
msgstr "Factures en esborrany són validades. "
#. module: account
@@ -4782,6 +5973,9 @@
#: view:account.move:0
msgid "Journal Entries to Review"
msgstr ""
+=======
+msgstr "Factures en esborrany són validades. "
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.bank.statement:0
@@ -4817,6 +6011,7 @@
#: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
#, python-format
msgid "Journal Items"
+<<<<<<< TREE
msgstr "Apunts comptables"
#. module: account
@@ -4843,6 +6038,33 @@
#, python-format
msgid "Error"
msgstr "Error"
+=======
+msgstr "Apunts comptables"
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "Balance Sheet (Assets Accounts)"
+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 ""
+"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."
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.analytic.balance,date2:0
@@ -4859,6 +6081,7 @@
msgstr "Detalls del banc"
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_account_partner_balance
msgid ""
"This report is analysis by partner. It is a PDF report containing one line "
@@ -4866,6 +6089,12 @@
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."
+=======
+#: code:addons/account/invoice.py:728
+#, python-format
+msgid "Taxes missing !"
+msgstr "Falten impostos!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,help:account.action_account_analytic_journal_tree
@@ -4881,6 +6110,8 @@
#: sql_constraint:account.invoice:0
msgid "Invoice Number must be unique per Company!"
msgstr ""
+"Marqueu aquesta opció si el diari s'utilitzarà per a factures rectificatives "
+"(abonaments)."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_receivable_graph
@@ -4929,16 +6160,21 @@
#: model:ir.actions.act_window,name:account.action_account_vat_declaration
#: model:ir.model,name:account.model_account_vat_declaration
msgid "Account Vat Declaration"
+<<<<<<< TREE
msgstr "Compte declaració d'IVA"
#. module: account
#: report:account.invoice:0
msgid "Price"
msgstr "Preu"
+=======
+msgstr "Compte declaració d'IVA"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.period:0
msgid "To Close"
+<<<<<<< TREE
msgstr "Per tancar"
#. module: account
@@ -4948,6 +6184,17 @@
#. module: account
#: code:addons/account/account.py:1351
+=======
+msgstr "Per tancar"
+
+#. module: account
+#: field:account.journal,allow_date:0
+msgid "Check Date not in the Period"
+msgstr "Comprova la data, no està en el període"
+
+#. module: account
+#: code:addons/account/account.py:1224
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You can not modify a posted entry of this journal !\n"
@@ -4974,9 +6221,14 @@
msgstr "Comptes impostos filles"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1090
+=======
+#: code:addons/account/account.py:954
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Start period should be smaller then End period"
+<<<<<<< TREE
msgstr "El període inicial ha de ser més petit que el període final"
#. module: account
@@ -4988,6 +6240,14 @@
msgstr ""
"Marqueu aquesta opció si el preu que utilitza en el producte i en les "
"factures inclou aquest impost."
+=======
+msgstr "El període inicial ha de ser més petit que el període final"
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "5"
+msgstr "5"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.analytic.account.balance:0
@@ -5021,7 +6281,15 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,target_move:0
+<<<<<<< TREE
#: field:accounting.report,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
+>>>>>>> MERGE-SOURCE
msgid "Target Moves"
msgstr "Moviments destí"
@@ -5114,7 +6382,11 @@
msgstr "Línia 1:"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1307
+=======
+#: code:addons/account/account.py:1181
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Integrity Error !"
msgstr "Error d'integritat!"
@@ -5130,6 +6402,20 @@
msgstr "mes"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_bank_statement.py:293
+#, python-format
+msgid "Journal Item \"%s\" is not valid"
+msgstr "L'anotació \"%s\" no és vàlida"
+
+#. module: account
+#: view:account.payment.term:0
+msgid "Description on invoices"
+msgstr "Descripció en factures"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.partner.reconcile.process,next_partner_id:0
msgid "Next Partner to Reconcile"
msgstr "Següent empresa per concilia"
@@ -5146,9 +6432,18 @@
msgstr "Resultat de conciliació"
#. module: account
+<<<<<<< TREE
#: model:account.financial.report,name:account.account_financial_report_balancesheet0
#: model:ir.ui.menu,name:account.menu_account_report_bs
+=======
+#: 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
+>>>>>>> MERGE-SOURCE
msgid "Balance Sheet"
+<<<<<<< TREE
msgstr "Balanç de situació"
#. module: account
@@ -5161,6 +6456,9 @@
#: field:account.journal,allow_date:0
msgid "Check Date in Period"
msgstr ""
+=======
+msgstr "Balanç de situació"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.ui.menu,name:account.final_accounting_reports
@@ -5236,7 +6534,20 @@
#: model:process.transition,name:account.process_transition_suppliervalidentries0
#: model:process.transition,name:account.process_transition_validentries0
msgid "Validation"
-msgstr "Validació"
+<<<<<<< TREE
+msgstr "Validació"
+=======
+msgstr "Validació"
+
+#. module: account
+#: help:account.invoice,reconciled:0
+msgid ""
+"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."
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.tax,child_depend:0
@@ -5245,9 +6556,17 @@
msgstr "Impost en fills"
#. module: account
+<<<<<<< TREE
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Template Tax Fiscal Position"
msgstr "Plantilla posició fiscal impost"
+=======
+#: code:addons/account/account.py:2081
+#: code:addons/account/wizard/account_use_model.py:69
+#, python-format
+msgid "No period found !"
+msgstr "No s'ha trobat període!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.journal,update_posted:0
@@ -5257,12 +6576,16 @@
#. module: account
#: field:account.tax.code,sign:0
msgid "Coefficent for parent"
+<<<<<<< TREE
msgstr "Coeficient per a pare"
#. module: account
#: view:account.analytic.account:0
msgid "Analytic Accounts with a past deadline."
msgstr ""
+=======
+msgstr "Coeficient per a pare"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.partner.balance:0
@@ -5287,9 +6610,15 @@
msgstr "Utilitzeu aquest codi per a la declaració de l'IVA."
#. module: account
+<<<<<<< TREE
#: field:account.partner.reconcile.process,progress:0
msgid "Progress"
msgstr "Progrés"
+=======
+#: view:account.move.line:0
+msgid "Debit/Credit"
+msgstr "Deure/Haver"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:report.hr.timesheet.invoice.journal:0
@@ -5321,9 +6650,18 @@
"Número de dies=22, Dia de mes=-1, llavors la data de venciment és 28/02."
#. module: account
+<<<<<<< TREE
#: view:account.payment.term.line:0
msgid "Amount Computation"
msgstr "Càlcul del import"
+=======
+#: code:addons/account/account.py:2940
+#: code:addons/account/installer.py:283
+#: code:addons/account/installer.py:295
+#, python-format
+msgid "Bank Journal "
+msgstr "Diari bancari "
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.journal:0
@@ -5346,6 +6684,19 @@
msgstr "Inici del període"
#. module: account
+<<<<<<< TREE
+=======
+#: 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 ""
+"No podeu fer aquesta modificació en un assentament conciliat! Observeu que "
+"només podeu canviar alguns camps no importants!"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.model,name:account.model_account_common_account_report
msgid "Account Common Account Report"
msgstr "Informe comptable comú"
@@ -5404,6 +6755,7 @@
msgstr "Diari assentaments tancament d'exercici"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3446
#: code:addons/account/account_bank_statement.py:338
#: code:addons/account/account_invoice.py:427
@@ -5411,6 +6763,15 @@
#: code:addons/account/account_invoice.py:542
#: code:addons/account/account_invoice.py:550
#: code:addons/account/account_invoice.py:572
+=======
+#: code:addons/account/account_bank_statement.py:331
+#: 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
+>>>>>>> MERGE-SOURCE
#: code:addons/account/wizard/account_move_journal.py:63
#, python-format
msgid "Configuration Error !"
@@ -5456,12 +6817,16 @@
#: model:ir.actions.act_window,name:account.action_account_change_currency
#: model:ir.model,name:account.model_account_change_currency
msgid "Change Currency"
+<<<<<<< TREE
msgstr "Canvia la moneda"
#. module: account
#: view:account.invoice:0
msgid "This action will erase taxes"
msgstr ""
+=======
+msgstr "Canvia la moneda"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.node,note:account.process_node_accountingentries0
@@ -5472,7 +6837,16 @@
#. module: account
#: view:account.invoice:0
msgid "Payment Date"
-msgstr "Data de pagament"
+<<<<<<< TREE
+msgstr "Data de pagament"
+=======
+msgstr "Data de pagament"
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "6"
+msgstr "6"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.analytic.account:0
@@ -5482,12 +6856,39 @@
msgstr "Comptes analítics"
#. module: account
+<<<<<<< TREE
#: view:account.invoice.report:0
msgid "Customer Invoices And Refunds"
msgstr ""
#. module: account
#: field:account.analytic.line,amount_currency:0
+=======
+#: help:account.account.type,report_type:0
+msgid ""
+"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 "Ordena per"
+
+#. module: account
+#: 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
+>>>>>>> MERGE-SOURCE
#: field:account.entries.report,amount_currency:0
#: field:account.model.line,amount_currency:0
#: field:account.move.line,amount_currency:0
@@ -5527,6 +6928,7 @@
#. module: account
#: view:account.move.line:0
msgid "Number (Move)"
+<<<<<<< TREE
msgstr "Número (moviment)"
#. module: account
@@ -5538,6 +6940,9 @@
#: selection:account.financial.report,style_overwrite:0
msgid "Normal Text"
msgstr ""
+=======
+msgstr "Número (moviment)"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice.refund:0
@@ -5601,6 +7006,7 @@
#. module: account
#: view:account.bank.statement:0
msgid "Open CashBox"
+<<<<<<< TREE
msgstr "Obre caixa"
#. module: account
@@ -5615,6 +7021,9 @@
"No fiscal year defined for this date !\n"
"Please create one from the configuration of the accounting menu."
msgstr ""
+=======
+msgstr "Obre caixa"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.move.line.reconcile:0
@@ -5633,9 +7042,15 @@
msgstr "Vàlid fins"
#. module: account
+<<<<<<< TREE
#: view:account.journal:0
msgid "Invoicing Data"
msgstr "Dades de facturació"
+=======
+#: view:board.board:0
+msgid "Aged Receivables"
+msgstr "A cobrar vençuts"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
@@ -5660,7 +7075,11 @@
msgstr "Genera assentaments d'obertura"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:759
+=======
+#: code:addons/account/account_move_line.py:729
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Already Reconciled!"
msgstr "Ja està conciliat!"
@@ -5674,6 +7093,8 @@
#: view:account.payment.term.line:0
msgid "Due Date Computation"
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
@@ -5700,7 +7121,11 @@
#. module: account
#: view:account.move.line.reconcile:0
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:857
+=======
+#: code:addons/account/account_move_line.py:821
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Write-Off"
msgstr "Desajust"
@@ -5750,10 +7175,20 @@
msgstr "Compte n°"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:88
#, python-format
msgid "Free Reference"
msgstr "Referència lliure"
+=======
+#: help:account.installer.modules,account_payment:0
+msgid ""
+"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."
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.payment.term.line,value:0
@@ -5850,7 +7285,17 @@
#: view:account.invoice.report:0
#: field:account.invoice.report,nbr:0
msgid "# of Lines"
-msgstr "# de línies"
+<<<<<<< TREE
+msgstr "# de línies"
+=======
+msgstr "# de línies"
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:59
+#, python-format
+msgid "New currency is not confirured properly !"
+msgstr "La nova moneda no està configurada correctament!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.aged.trial.balance,filter:0
@@ -5869,6 +7314,7 @@
#: field:accounting.report,filter:0
#: field:accounting.report,filter_cmp:0
msgid "Filter by"
+<<<<<<< TREE
msgstr "Filtra per"
#. module: account
@@ -5885,12 +7331,23 @@
#. module: account
#: code:addons/account/account_move_line.py:1155
#: code:addons/account/account_move_line.py:1238
+=======
+msgstr "Filtra per"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can not use an inactive account!"
msgstr "No podeu utilitzar un compte inactiu!"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:830
+=======
+#: code:addons/account/account_move_line.py:794
+>>>>>>> MERGE-SOURCE
#, 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! "
@@ -5917,7 +7374,17 @@
#: 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 "Compte del diari general"
+<<<<<<< TREE
+msgstr "Compte del diari general"
+=======
+msgstr "Compte del diari general"
+
+#. module: account
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
+msgid "No Filter"
+msgstr "Sense filtre"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.payment.term.line,days:0
@@ -5925,9 +7392,19 @@
msgstr "Número de dies"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_bank_statement.py:402
#: code:addons/account/account_invoice.py:392
#: code:addons/account/wizard/account_period_close.py:51
+=======
+#: selection:account.automatic.reconcile,power:0
+msgid "7"
+msgstr "7"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:391
+#: code:addons/account/invoice.py:373
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invalid action !"
msgstr "Acció no vàlida!"
@@ -5939,9 +7416,15 @@
msgstr "Període: %s"
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,name:account.action_review_financial_journals_installer
msgid "Review your Financial Journals"
msgstr ""
+=======
+#: model:ir.model,name:account.model_account_fiscal_position_tax_template
+msgid "Template Tax Fiscal Position"
+msgstr "Plantilla posició fiscal impost"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.tax,name:0
@@ -5973,9 +7456,15 @@
msgstr "Factures rectificatives (abonament) de client"
#. module: account
+<<<<<<< TREE
#: field:account.account,foreign_balance:0
msgid "Foreign Balance"
msgstr ""
+=======
+#: view:account.payment.term.line:0
+msgid "Amount Computation"
+msgstr "Càlcul del import"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.journal.period,name:0
@@ -6005,6 +7494,7 @@
"Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
"Forma' state!"
msgstr ""
+<<<<<<< TREE
"La/es factura/es seleccionada/es no es pot/den confirmar ja que no està/n en "
"estat 'Esborrany' o 'Pro-forma'!"
@@ -6012,6 +7502,10 @@
#: view:account.subscription:0
msgid "Running Subscription"
msgstr ""
+=======
+"La/es factura/es seleccionada/es no es pot/den confirmar ja que no està/n en "
+"estat 'Esborrany' o 'Pro-forma'!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.invoice:0
@@ -6073,12 +7567,30 @@
#. module: account
#: field:account.entries.report,date_created:0
msgid "Date Created"
+<<<<<<< TREE
msgstr "Data de creació"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
msgid "account.analytic.line.extended"
msgstr "account.analytic.line.extended"
+=======
+msgstr "Data de creació"
+
+#. module: account
+#: field:account.payment.term.line,value_amount:0
+msgid "Value Amount"
+msgstr "Valor import"
+
+#. module: account
+#: help:account.journal,code:0
+msgid ""
+"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."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice:0
@@ -6091,8 +7603,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."
+<<<<<<< TREE
+"Tan aviat com la reconciliació es fa, l'estat de les factures es converteix "
+"en \"realitzada\" (és a dir, pagada) en el sistema."
+=======
+"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
+msgid "is validated."
+msgstr "està validada."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.chart.template:0
@@ -6134,7 +7657,16 @@
#: view:account.account.type:0
#: view:account.tax.code:0
msgid "Reporting Configuration"
-msgstr "Configuració d'informes"
+<<<<<<< TREE
+msgstr "Configuració d'informes"
+=======
+msgstr "Configuració d'informes"
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr "La companyia ha de ser la mateixa pel compte i període relacionat."
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.tax,type:0
@@ -6165,6 +7697,7 @@
#. module: account
#: model:ir.model,name:account.model_res_company
msgid "Companies"
+<<<<<<< TREE
msgstr "Companyies"
#. module: account
@@ -6179,11 +7712,19 @@
#. module: account
#: code:addons/account/account.py:629
+=======
+msgstr "Companyies"
+
+#. module: account
+#: code:addons/account/account.py:546
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You can not remove/desactivate an account which is set on a customer or "
"supplier."
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
@@ -6281,6 +7822,19 @@
msgstr "Compte haver per defecte"
#. module: account
+<<<<<<< TREE
+=======
+#: view:account.installer:0
+msgid "Configure Your Accounting Chart"
+msgstr "Configureu el pla comptable"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " number of days: 30"
+msgstr " número de dies: 30"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.analytic.line,currency_id:0
msgid "The related account currency if not equal to the company one."
msgstr "La moneda comptable relacionada si no és igual a la de la companyia."
@@ -6293,12 +7847,16 @@
#. module: account
#: view:account.bank.statement:0
msgid "CashBox"
+<<<<<<< TREE
msgstr "Caixa"
#. module: account
#: model:account.account.type,name:account.account_type_cash_equity
msgid "Equity"
msgstr "Patrimoni"
+=======
+msgstr "Caixa"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.tax,type:0
@@ -6316,10 +7874,16 @@
msgstr "Força"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3368
#, python-format
msgid "Cannot generate an unused journal code."
msgstr ""
+=======
+#: field:account.invoice.refund,filter_refund:0
+msgid "Refund Type"
+msgstr "Tipus d'abonament"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:project.account.analytic.line:0
@@ -6327,6 +7891,14 @@
msgstr "Veure línies comptables analítiques"
#. module: account
+<<<<<<< TREE
+=======
+#: selection:account.account.type,report_type:0
+msgid "Balance Sheet (Liability Accounts)"
+msgstr "Balanç de situació (comptes amb risc)"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.invoice,internal_number:0
#: field:report.invoice.created,number:0
msgid "Invoice Number"
@@ -6427,12 +7999,20 @@
msgstr "Crea opcional"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:664
+=======
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You cannot change the owner company of an account that already contains "
"journal items."
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:58
@@ -6464,6 +8044,14 @@
msgstr "Centralització"
#. module: account
+<<<<<<< TREE
+=======
+#: view:wizard.multi.charts.accounts:0
+msgid "Generate Your Accounting Chart from a Chart Template"
+msgstr "Genera el seu pla comptable des d'una plantilla de pla comptable"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.account:0
#: view:account.account.template:0
#: view:account.analytic.account:0
@@ -6492,9 +8080,15 @@
msgstr "Només lectura"
#. module: account
+<<<<<<< TREE
#: view:account.payment.term.line:0
msgid " Valuation: Balance"
msgstr ""
+=======
+#: model:ir.model,name:account.model_account_pl_report
+msgid "Account Profit And Loss Report"
+msgstr "Compte de resultats (pèrdues i guanys)"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice.line,uos_id:0
@@ -6585,6 +8179,7 @@
#. module: account
#: model:ir.model,name:account.model_analytic_entries_report
msgid "Analytic Entries Statistics"
+<<<<<<< TREE
msgstr "Estadístiques d'assentaments analítics"
#. module: account
@@ -6592,10 +8187,18 @@
#, python-format
msgid "You can not remove an account containing journal items."
msgstr ""
+=======
+msgstr "Estadístiques d'assentaments analítics"
+>>>>>>> MERGE-SOURCE
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_analytic_line.py:145
#: code:addons/account/account_move_line.py:933
+=======
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entries: "
msgstr "Assentaments: "
@@ -6603,15 +8206,23 @@
#. module: account
#: view:account.use.model:0
msgid "Create manual recurring entries in a chosen journal."
+<<<<<<< TREE
msgstr "Crea manualment assentaments recurrents en un diari seleccionat."
#. module: account
#: help:res.partner.bank,currency_id:0
msgid "Currency of the related account journal."
msgstr ""
+=======
+msgstr "Crea manualment assentaments recurrents en un diari seleccionat."
+>>>>>>> MERGE-SOURCE
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1563
+=======
+#: code:addons/account/account.py:1407
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Couldn't create move between different companies"
msgstr "No s'ha pogut crear moviment entre diferents companyies"
@@ -6627,6 +8238,7 @@
"account. From this view, you can create and manage the account types you "
"need for your company."
msgstr ""
+<<<<<<< TREE
"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 "
@@ -6641,6 +8253,15 @@
#, python-format
msgid "Balance Sheet (Asset account)"
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."
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
@@ -6666,7 +8287,11 @@
msgstr "Total deure"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:808
+=======
+#: code:addons/account/account_move_line.py:772
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entry \"%s\" is not valid !"
msgstr "L'assentament \"%s\" no és vàlid!"
@@ -6677,6 +8302,7 @@
msgstr "Fax :"
#. module: account
+<<<<<<< TREE
#: view:wizard.multi.charts.accounts:0
msgid ""
"This will automatically configure your chart of accounts, bank accounts, "
@@ -6684,6 +8310,12 @@
msgstr ""
"Permet configurar automàticament el vostre pla comptable, comptes de bancs, "
"impostos i diaris segons la plantilla seleccionada"
+=======
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,based_on:0
+msgid "Based On"
+msgstr "Basat en"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:res.partner,property_account_receivable:0
@@ -6709,6 +8341,8 @@
#: view:account.entries.report:0
msgid "Journal Entries with period in current period"
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
@@ -6730,13 +8364,20 @@
msgstr "Crea assentament"
#. module: account
+<<<<<<< TREE
#: selection:account.account.type,report_type:0
#: code:addons/account/account.py:182
#, python-format
msgid "Profit & Loss (Expense account)"
msgstr ""
+=======
+#: view:account.payment.term.line:0
+msgid " valuation: percent"
+msgstr " valoració: percentatge"
+>>>>>>> MERGE-SOURCE
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:622
#: code:addons/account/account.py:624
#: code:addons/account/account.py:963
@@ -6762,6 +8403,33 @@
#: code:addons/account/wizard/account_invoice_refund.py:108
#: code:addons/account/wizard/account_invoice_refund.py:110
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
+=======
+#: 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: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
+>>>>>>> MERGE-SOURCE
#: code:addons/account/wizard/account_use_model.py:44
#, python-format
msgid "Error !"
@@ -6826,6 +8494,7 @@
#: view:account.move:0
#: field:account.move,to_check:0
msgid "To Review"
+<<<<<<< TREE
msgstr "Per revisa"
#. module: account
@@ -6836,6 +8505,9 @@
"row to display the amount of debit/credit/balance that precedes the filter "
"you've set."
msgstr ""
+=======
+msgstr "Per revisa"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.bank.statement:0
@@ -6849,6 +8521,7 @@
#. module: account
#: help:account.partner.ledger,page_split:0
msgid "Display Ledger Report with One partner per page"
+<<<<<<< TREE
msgstr "Mostra el llibre major amb una empresa per pàgina."
#. module: account
@@ -6859,6 +8532,14 @@
"some non legal fields or you must unreconcile first!\n"
"%s"
msgstr ""
+=======
+msgstr "Mostra el llibre major amb una empresa per pàgina."
+
+#. module: account
+#: report:account.general.ledger_landscape:0
+msgid "JRNL"
+msgstr "LLIBRE"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.general.ledger:0
@@ -6924,12 +8605,21 @@
msgstr "Seleccioneu diari"
#. module: account
+<<<<<<< TREE
#: view:account.bank.statement:0
#: code:addons/account/account.py:420
#: code:addons/account/account.py:432
+=======
+#: code:addons/account/wizard/account_change_currency.py:64
+>>>>>>> MERGE-SOURCE
#, python-format
+<<<<<<< TREE
msgid "Opening Balance"
msgstr "Saldo d'obertura"
+=======
+msgid "Currnt currency is not confirured properly !"
+msgstr "La moneda actual no està configurada correctament!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_move_reconcile
@@ -6982,6 +8672,9 @@
#: field:wizard.multi.charts.accounts,complete_tax_set:0
msgid "Complete Set of Taxes"
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
@@ -6991,6 +8684,7 @@
#. module: account
#: model:ir.model,name:account.model_account_tax_chart
msgid "Account tax chart"
+<<<<<<< TREE
msgstr "Compte del pla d'impostos"
#. module: account
@@ -7000,6 +8694,9 @@
"Please define BIC/Swift code on bank for bank type IBAN Account to make "
"valid payments"
msgstr ""
+=======
+msgstr "Compte del pla d'impostos"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.analytic.account.cost_ledger:0
@@ -7010,11 +8707,17 @@
#: report:account.journal.period.print:0
#: report:account.journal.period.print.sale.purchase:0
#: report:account.partner.balance:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
msgid "Total:"
msgstr "Total:"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2229
+=======
+#: code:addons/account/account.py:2064
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You can specify year, month and date in the name of the model using the "
@@ -7051,6 +8754,7 @@
msgstr "Codis fills"
#. module: account
+<<<<<<< TREE
#: view:account.tax.template:0
msgid "Taxes used in Sales"
msgstr ""
@@ -7058,6 +8762,10 @@
#. module: account
#: code:addons/account/account_invoice.py:495
#: code:addons/account/wizard/account_invoice_refund.py:145
+=======
+#: code:addons/account/invoice.py:476
+#: code:addons/account/wizard/account_invoice_refund.py:137
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Data Insufficient !"
msgstr "Dades insuficients!"
@@ -7129,6 +8837,7 @@
#: field:account.invoice,origin:0
#: field:report.invoice.created,origin:0
msgid "Source Document"
+<<<<<<< TREE
msgstr "Document d'origen"
#. module: account
@@ -7140,6 +8849,21 @@
#. module: account
#: selection:account.partner.ledger,filter:0
#: code:addons/account/report/account_partner_ledger.py:59
+=======
+msgstr "Document d'origen"
+
+#. module: account
+#: help:account.account.type,sign:0
+msgid ""
+"Allows you to change the sign of the balance amount displayed in the "
+"reports, so that you can see positive figures instead of negative ones in "
+"expenses accounts."
+msgstr ""
+"Permet canviar el signe del saldo que es mostra en els informes, per tal que "
+"pugui veure xifres positives en comptes de negatives en comptes de despeses."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
#, python-format
msgid "Unreconciled Entries"
@@ -7148,12 +8872,16 @@
#. module: account
#: model:ir.ui.menu,name:account.menu_menu_Bank_process
msgid "Statements Reconciliation"
+<<<<<<< TREE
msgstr "Conciliació d'extractes"
#. module: account
#: model:ir.model,name:account.model_accounting_report
msgid "Accounting Report"
msgstr ""
+=======
+msgstr "Conciliació d'extractes"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.invoice:0
@@ -7173,6 +8901,7 @@
"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 ""
+<<<<<<< TREE
"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ó "
@@ -7183,6 +8912,13 @@
#: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
msgid "Financial Reports Hierarchy"
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."
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.entries.report,product_uom_id:0
@@ -7199,11 +8935,24 @@
"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."
+<<<<<<< TREE
+"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."
+=======
+"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
+msgid "9"
+msgstr "9"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.invoice.refund,date:0
@@ -7226,12 +8975,45 @@
msgstr "Línies analítiques"
#. module: account
+<<<<<<< TREE
+=======
+#: model:ir.actions.act_window,help:account.action_account_analytic_account_tree2
+msgid ""
+"The normal chart of accounts has a structure defined by the legal "
+"requirement of the country. The analytic chart of account structure should "
+"reflect your own business needs in term of costs/revenues reporting. They "
+"are usually structured by contracts, projects, products or departements. "
+"Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
+"generate analytic entries on the related account."
+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
+>>>>>>> MERGE-SOURCE
#: field:account.analytic.journal,line_ids:0
#: field:account.tax.code,line_ids:0
msgid "Lines"
msgstr "Línies"
#. module: account
+<<<<<<< TREE
+=======
+#: 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
+>>>>>>> MERGE-SOURCE
#: view:account.tax.template:0
msgid "Account Tax Template"
msgstr "Plantilla d'impost"
@@ -7287,7 +9069,56 @@
#. module: account
#: help:account.journal,default_debit_account_id:0
msgid "It acts as a default account for debit amount"
-msgstr "Actua com un compte per defecte per la quantitat del deure"
+<<<<<<< TREE
+msgstr "Actua com un compte per defecte per la quantitat del deure"
+=======
+msgstr "Actua com un compte per defecte per la quantitat del deure"
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Financial and accounting module that covers:\n"
+" General accountings\n"
+" Cost / Analytic accounting\n"
+" Third party accounting\n"
+" Taxes management\n"
+" Budgets\n"
+" Customer and Supplier Invoices\n"
+" Bank statements\n"
+" Reconciliation process by partner\n"
+" Creates a dashboard for accountants that includes:\n"
+" * List of uninvoiced quotations\n"
+" * Graph of aged receivables\n"
+" * Graph of aged incomes\n"
+"\n"
+"The processes like maintaining of general ledger is done through the defined "
+"financial Journals (entry move line or\n"
+"grouping is maintained through journal) for a particular financial year and "
+"for preparation of vouchers there is a\n"
+"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"
+" "
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,help:account.action_account_journal_period_tree
@@ -7295,6 +9126,7 @@
"You can search for individual account entries through useful information. To "
"search for account entries, open a journal, then select a record line."
msgstr ""
+<<<<<<< TREE
"Podeu cercar un assentament comptable en concret a través d'informació útil. "
"Per cercar assentaments comptables, obriu un diari i seleccioneu una "
"anotació."
@@ -7308,6 +9140,11 @@
#: help:account.payment.term.line,value_amount:0
msgid "For percent enter a ratio between 0-1."
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ó."
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.invoice:0
@@ -7344,9 +9181,21 @@
msgstr "D'acord"
#. module: account
+<<<<<<< TREE
#: field:account.chart.template,tax_code_root_id:0
msgid "Root Tax Code"
msgstr "Codi impost arrel"
+=======
+#: code:addons/account/report/account_partner_balance.py:115
+#, python-format
+msgid "Unknown Partner"
+msgstr "Empresa desconeguda"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Opening Balance"
+msgstr "Saldo d'obertura"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.journal,centralisation:0
@@ -7377,12 +9226,16 @@
#. module: account
#: field:wizard.multi.charts.accounts,purchase_tax:0
msgid "Default Purchase Tax"
+<<<<<<< TREE
msgstr "Impost de compra per defecte"
#. module: account
#: field:account.chart.template,property_account_income_opening:0
msgid "Opening Entries Income Account"
msgstr ""
+=======
+msgstr "Impost de compra per defecte"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.bank.statement:0
@@ -7390,6 +9243,19 @@
msgstr "Confirmat"
#. module: account
+<<<<<<< TREE
+=======
+#: help:account.invoice,partner_bank_id:0
+msgid ""
+"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
+>>>>>>> MERGE-SOURCE
#: help:account.tax,domain:0
#: help:account.tax.template,domain:0
msgid ""
@@ -7401,16 +9267,24 @@
"personalitzada."
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1088
+=======
+#: code:addons/account/account.py:952
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You should have chosen periods that belongs to the same company"
msgstr ""
+<<<<<<< TREE
"Hauríeu d'haver seleccionat períodes que pertanyin a la mateixa companyia"
#. module: account
#: model:ir.actions.act_window,name:account.action_review_payment_terms_installer
msgid "Review your Payment Terms"
msgstr ""
+=======
+"Hauríeu d'haver seleccionat períodes que pertanyin a la mateixa companyia"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.fiscalyear.close,report_name:0
@@ -7433,6 +9307,7 @@
msgstr "Informe"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:759
#: code:addons/account/account_move_line.py:842
#: code:addons/account/wizard/account_invoice_state.py:44
@@ -7448,6 +9323,11 @@
#: model:ir.actions.act_window,name:account.action_analytic_open
msgid "Contracts/Analytic Accounts"
msgstr ""
+=======
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "El codi del diari ha de ser únic per companyia!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.bank.statement,ending_details_ids:0
@@ -7491,6 +9371,7 @@
#. module: account
#: model:ir.model,name:account.model_account_use_model
msgid "Use model"
+<<<<<<< TREE
msgstr "Utilitza el model"
#. module: account
@@ -7498,6 +9379,9 @@
#, python-format
msgid "Unable to adapt the initial balance (negative value)!"
msgstr ""
+=======
+msgstr "Utilitza el model"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,help:account.action_account_moves_purchase
@@ -7507,11 +9391,30 @@
"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."
+<<<<<<< TREE
+"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."
+=======
+"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
+msgid ""
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"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."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice.line:0
@@ -7531,6 +9434,7 @@
msgstr "Signe en informes"
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_fiscalyear_close.py:73
#, python-format
msgid "The periods to generate opening entries were not found"
@@ -7545,7 +9449,40 @@
#: code:addons/account/account.py:3121
#, python-format
msgid "OPEJ"
+=======
+#: code:addons/account/account_cash_statement.py:250
+#, python-format
+msgid "You can not have two open register for the same journal"
+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 " dia del mes= -1"
+
+#. module: account
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Error! No podeu crear membres associats recursius."
+
+#. module: account
+#: help:account.journal,type:0
+msgid ""
+"Select 'Sale' for Sale journal to be used at the time of making invoice. "
+"Select 'Purchase' for Purchase Journal to be used at the time of approving "
+"purchase order. Select 'Cash' to be used at the time of making payment. "
+"Select 'General' for miscellaneous operations. Select 'Opening/Closing "
+"Situation' to be used at the time of new fiscal year creation or end of year "
+"entries generation."
+>>>>>>> MERGE-SOURCE
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
@@ -7554,11 +9491,27 @@
msgstr "PRO-FORMA"
#. 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 "desquadrat"
+=======
+#: help:account.installer.modules,account_followup:0
+msgid ""
+"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
+#: view:account.payment.term.line:0
+msgid " value amount: n.a"
+msgstr " import valor: n.a"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.move.line,centralisation:0
@@ -7577,10 +9530,21 @@
msgstr "Informació opcional"
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_fiscalyear_close.py:84
#, python-format
msgid "The journal must have default credit and debit account"
msgstr "El diari ha de tenir un compte haver i deure per defecte."
+=======
+#: 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
+#: field:analytic.entries.report,user_id:0
+msgid "User"
+msgstr "Usuari"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.general.journal:0
@@ -7598,6 +9562,7 @@
"This field is used for payable and receivable journal entries. You can put "
"the limit date for the payment of this line."
msgstr ""
+<<<<<<< TREE
"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."
@@ -7613,12 +9578,24 @@
#. module: account
#: code:addons/account/account_move_line.py:1302
+=======
+"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:1277
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Bad account !"
msgstr "Compte incorrecte!"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3108
+=======
+#: code:addons/account/account.py:2821
+#: code:addons/account/installer.py:432
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Sales Journal"
msgstr "Diari de vendes"
@@ -7635,7 +9612,11 @@
msgstr "Impost de factura"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1277
+=======
+#: code:addons/account/account_move_line.py:1252
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No piece number !"
msgstr "Cap tros de número!"
@@ -7700,6 +9681,7 @@
#: view:account.invoice.cancel:0
#: model:ir.actions.act_window,name:account.action_account_invoice_cancel
msgid "Cancel Selected Invoices"
+<<<<<<< TREE
msgstr "Cancela les factures seleccionades"
#. module: account
@@ -7716,6 +9698,9 @@
"terms for each letter. Each customer or supplier can be assigned to one of "
"these payment terms."
msgstr ""
+=======
+msgstr "Cancela les factures seleccionades"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.entries.report,month:0
@@ -7832,6 +9817,7 @@
msgstr "Seqüència"
#. module: account
+<<<<<<< TREE
#: constraint:product.category:0
msgid "Error ! You cannot create recursive categories."
msgstr ""
@@ -7845,6 +9831,21 @@
#: view:account.financial.report:0
msgid "Parent Report"
msgstr ""
+=======
+#: model:ir.model,name:account.model_account_bs_report
+msgid "Account Balance Sheet Report"
+msgstr "Informe de balanç de situació"
+
+#. module: account
+#: help:account.tax,price_include:0
+#: help:account.tax.template,price_include:0
+msgid ""
+"Check this if the price you use on the product and invoices includes this "
+"tax."
+msgstr ""
+"Marqueu aquesta opció si el preu que utilitza en el producte i en les "
+"factures inclou aquest impost."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.state.open:0
@@ -7882,9 +9883,15 @@
"un diari nou i associar-li una vista."
#. module: account
+<<<<<<< TREE
#: model:account.account.type,name:account.data_account_type_asset
msgid "Asset"
msgstr "Actiu"
+=======
+#: view:account.payment.term.line:0
+msgid " number of days: 14"
+msgstr " número de dies: 14"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:analytic.entries.report:0
@@ -7892,9 +9899,15 @@
msgstr " 7 Dies "
#. module: account
+<<<<<<< TREE
#: field:account.bank.statement,balance_end:0
msgid "Computed Balance"
msgstr ""
+=======
+#: field:account.partner.reconcile.process,progress:0
+msgid "Progress"
+msgstr "Progrés"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.account,parent_id:0
@@ -7903,6 +9916,14 @@
msgstr "Pare"
#. module: account
+<<<<<<< TREE
+=======
+#: field:account.installer.modules,account_analytic_plans:0
+msgid "Multiple Analytic Plans"
+msgstr "Plans analítics múltiples"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.payment.term.line,days2:0
msgid ""
"Day of the month, set -1 for the last day of the current month. If it's "
@@ -7950,11 +9971,20 @@
msgstr "Llibre major d'empresa"
#. module: account
+<<<<<<< TREE
+=======
+#: report:account.account.balance.landscape:0
+msgid "Year :"
+msgstr "Any:"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: selection:account.tax.template,type:0
msgid "Fixed"
msgstr "Fix"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:629
#: code:addons/account/account.py:642
#: code:addons/account/account.py:645
@@ -7967,6 +9997,19 @@
#: code:addons/account/account_move_line.py:97
#: code:addons/account/account_move_line.py:750
#: code:addons/account/account_move_line.py:803
+=======
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
+#: code:addons/account/account.py:532
+#: 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
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Warning !"
msgstr "Atenció!"
@@ -8015,6 +10058,7 @@
#. module: account
#: help:account.change.currency,currency_id:0
msgid "Select a currency to apply on the invoice"
+<<<<<<< TREE
msgstr "Seleccioneu una moneda per aplicar en la factura."
#. module: account
@@ -8023,6 +10067,9 @@
msgid ""
"The bank account defined on the selected chart of accounts hasn't a code."
msgstr ""
+=======
+msgstr "Seleccioneu una moneda per aplicar en la factura."
+>>>>>>> MERGE-SOURCE
#. module: account
#: code:addons/account/wizard/account_invoice_refund.py:108
@@ -8031,15 +10078,23 @@
msgstr "No es pot %s factura esborrany/proforma/cancel.lada."
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:810
+=======
+#: code:addons/account/invoice.py:795
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Invoice Lines !"
+<<<<<<< TREE
msgstr "No hi ha línies de factura!"
#. module: account
#: view:account.financial.report:0
msgid "Report Type"
msgstr ""
+=======
+msgstr "No hi ha línies de factura!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.analytic.account:0
@@ -8109,7 +10164,11 @@
msgstr "Mètode tancament"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:379
+=======
+#: code:addons/account/invoice.py:360
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invoice '%s' is paid."
msgstr "La factura '%s' està pagada."
@@ -8122,7 +10181,16 @@
#. module: account
#: constraint:account.tax.code.template:0
msgid "Error ! You can not create recursive Tax Codes."
-msgstr "Error! No podeu crear codis d'impostos recursius."
+<<<<<<< TREE
+msgstr "Error! No podeu crear codis d'impostos recursius."
+=======
+msgstr "Error! No podeu crear codis d'impostos recursius."
+
+#. module: account
+#: view:account.invoice.line:0
+msgid "Line"
+msgstr "Línia"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.journal,group_invoice_lines:0
@@ -8175,7 +10243,11 @@
msgstr "Empresa associada"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1332
+=======
+#: code:addons/account/invoice.py:1298
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You must first select a partner !"
msgstr "Primer heu de seleccionar una empresa!"
@@ -8187,6 +10259,7 @@
msgstr "Informació addicional"
#. module: account
+<<<<<<< TREE
#: help:account.invoice,state:0
msgid ""
" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
@@ -8199,6 +10272,11 @@
"related journal entries may or may not be reconciled. \n"
"* The 'Cancelled' state is used when user cancel invoice."
msgstr ""
+=======
+#: view:account.installer:0
+msgid "Bank and Cash Accounts"
+msgstr "Comptes de caixa i banc"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice.report:0
@@ -8229,6 +10307,7 @@
msgid ""
"Can not find a chart of accounts for this company, you should create one."
msgstr ""
+"Afegeix funcionalitats comptables extres a les que ja té instal·lades."
#. module: account
#: view:account.invoice:0
@@ -8246,7 +10325,12 @@
msgstr "Escolliu l'exercici fiscal"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3111
+=======
+#: code:addons/account/account.py:2885
+#: code:addons/account/installer.py:495
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Purchase Refund Journal"
msgstr "Diari d'abonament de compres"
@@ -8273,8 +10357,18 @@
"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."
+<<<<<<< TREE
+"Modifica factura: Cancel·la la factura actual i crea una nova còpia "
+"preparada per editar."
+=======
+"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 "Gestió comptable i financera"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.automatic.reconcile,period_id:0
@@ -8418,6 +10512,7 @@
msgstr "Divisa de la companyia"
#. module: account
+<<<<<<< TREE
#: field:account.aged.trial.balance,chart_account_id:0
#: field:account.balance.report,chart_account_id:0
#: field:account.central.journal,chart_account_id:0
@@ -8432,6 +10527,17 @@
#: field:account.report.general.ledger,chart_account_id:0
#: field:account.vat.declaration,chart_account_id:0
#: field:accounting.report,chart_account_id:0
+=======
+#: report:account.general.ledger:0
+#: 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
+>>>>>>> MERGE-SOURCE
msgid "Chart of Account"
msgstr "Pla comptable"
@@ -8442,10 +10548,22 @@
msgstr "Pagament"
#. module: account
+<<<<<<< TREE
#: field:account.bank.statement,balance_end_real:0
#: field:account.treasury.report,ending_balance:0
msgid "Ending Balance"
msgstr "Saldo final"
+=======
+#: help:account.bs.report,reserve_account_id:0
+msgid ""
+"This Account is used for transfering Profit/Loss (Profit: Amount will be "
+"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."
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.move.line,blocked:0
@@ -8470,6 +10588,7 @@
#. module: account
#: model:ir.model,name:account.model_account_common_report
msgid "Account Common Report"
+<<<<<<< TREE
msgstr "Informe comú"
#. module: account
@@ -8485,6 +10604,9 @@
"No period defined for this date: %s !\n"
"Please create one."
msgstr ""
+=======
+msgstr "Informe comú"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_filestatement0
@@ -8510,9 +10632,21 @@
msgstr "Tipus de comptes"
#. module: account
+<<<<<<< TREE
#: view:account.payment.term.line:0
msgid " Value amount: n.a"
msgstr ""
+=======
+#: 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"
+
+#. module: account
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr "Categoria Balanç / PiG"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.automatic.reconcile:0
@@ -8535,6 +10669,7 @@
msgstr "Compte a cobrar"
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid ""
"This button only appears when the state of the invoice is 'paid' (showing "
@@ -8544,6 +10679,11 @@
"You should press this button to re-open it and let it continue its normal "
"process after having resolved the eventual exceptions it may have created."
msgstr ""
+=======
+#: view:account.bank.statement:0
+msgid "CashBox Balance"
+msgstr "Saldo de caixa"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_fiscalyear_close_state
@@ -8559,9 +10699,17 @@
#: report:account.account.balance:0
#: report:account.central.journal:0
#: report:account.general.journal:0
+<<<<<<< TREE
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+>>>>>>> MERGE-SOURCE
#: 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 "Filtra per"
@@ -8573,6 +10721,7 @@
"sales orders or deliveries. You should only confirm them before sending them "
"to your customers."
msgstr ""
+<<<<<<< TREE
"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-"
@@ -8584,6 +10733,12 @@
msgid ""
"In order to close a period, you must first post related journal entries."
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."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.entries.report:0
@@ -8621,7 +10776,12 @@
msgstr "Línia de termini de pagament"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3109
+=======
+#: code:addons/account/account.py:2838
+#: code:addons/account/installer.py:452
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Purchase Journal"
msgstr "Diari de compres"
@@ -8660,7 +10820,17 @@
#: model:ir.ui.menu,name:account.menu_account_supplier
#: model:ir.ui.menu,name:account.menu_finance_payables
msgid "Suppliers"
-msgstr "Proveïdors"
+<<<<<<< TREE
+msgstr "Proveïdors"
+=======
+msgstr "Proveïdors"
+
+#. module: account
+#: constraint:account.move:0
+msgid ""
+"You cannot create more than one move per period on centralized journal"
+msgstr "No podeu crear més d'un apunt per període a un diari centralitzat."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.journal:0
@@ -8678,8 +10848,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."
+<<<<<<< TREE
+"L'import residual d'una anotació a cobrar o a pagar expressat en la moneda "
+"de la companyia."
+=======
+"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 " valoració: saldo"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.tax.code:0
@@ -8706,6 +10886,7 @@
#: view:account.invoice:0
#: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
msgid "Unpaid Invoices"
+<<<<<<< TREE
msgstr "Factures impagades"
#. module: account
@@ -8713,6 +10894,9 @@
#, python-format
msgid "The payment term of supplier does not have a payment term line!"
msgstr ""
+=======
+msgstr "Factures impagades"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.move.line.reconcile,debit:0
@@ -8742,6 +10926,7 @@
msgstr "Comptes permeses (buit per cap control)"
#. module: account
+<<<<<<< TREE
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Template Account Fiscal Mapping"
msgstr "Plantilla d'assignació de comptes fiscals"
@@ -8750,6 +10935,13 @@
#: view:board.board:0
msgid "Draft Customer Invoices"
msgstr "Factures de client esborran
