credativ team mailing list archive
-
credativ team
-
Mailing list archive
-
Message #05144
[Merge] lp:~credativ/openobject-addons/6.1-lp-1033731 into lp:openobject-addons
Richard Lewis has proposed merging lp:~credativ/openobject-addons/6.1-lp-1033731 into lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
Bug #1033731 in OpenERP Addons: "JIT does not work with PHANTOM, make_to_order + produce"
https://bugs.launchpad.net/openobject-addons/+bug/1033731
For more details, see:
https://code.launchpad.net/~credativ/openobject-addons/6.1-lp-1033731/+merge/158120
--
The attached diff has been truncated due to its size.
https://code.launchpad.net/~credativ/openobject-addons/6.1-lp-1033731/+merge/158120
Your team credativ is subscribed to branch lp:~credativ/openobject-addons/6.1-lp-1033731.
=== modified file 'account/account.py'
--- account/account.py 2013-04-04 09:52:57 +0000
+++ account/account.py 2013-04-10 14:12:36 +0000
@@ -1350,14 +1350,32 @@
def button_cancel(self, cr, uid, ids, context=None):
for line in self.browse(cr, uid, ids, context=context):
+<<<<<<< TREE
if not line.journal_id.update_posted:
raise osv.except_osv(_('Error!'), _('You cannot modify a posted entry of this journal.\nFirst you should set the journal to allow cancelling entries.'))
+=======
+ if line.period_id.state == 'done':
+ raise osv.except_osv(_('Error !'), _('You can not modify a posted entry of closed periods'))
+ elif not line.journal_id.update_posted:
+ raise osv.except_osv(_('Error !'), _('You can not modify a posted entry of this journal !\nYou should set the journal to allow cancelling entries if you want to do that.'))
+>>>>>>> MERGE-SOURCE
if ids:
cr.execute('UPDATE account_move '\
'SET state=%s '\
'WHERE id IN %s', ('draft', tuple(ids),))
return True
+<<<<<<< TREE
+=======
+ def onchange_line_id(self, cr, uid, ids, line_ids, context=None):
+ balance = 0.0
+ line_ids = [ line for line in line_ids if not (isinstance(line, (tuple, list)) and line and line[0] == 2) ]
+ line_ids = self.resolve_o2m_commands_to_record_dicts(cr, uid, 'line_id', line_ids, context=context)
+ for line in line_ids:
+ balance += (line['debit'] or 0.00)- (line['credit'] or 0.00)
+ return {'value': {'balance': balance}}
+
+>>>>>>> MERGE-SOURCE
def write(self, cr, uid, ids, vals, context=None):
if context is None:
context = {}
@@ -3415,9 +3433,19 @@
# write values of default taxes for product as super user
if obj_wizard.sale_tax and taxes_ref:
+<<<<<<< TREE
ir_values_obj.set_default(cr, SUPERUSER_ID, 'product.product', "taxes_id", [taxes_ref[obj_wizard.sale_tax.id]], for_all_users=True, company_id=company_id)
+=======
+ ir_values_obj.set(cr, 1, key='default', key2=False, name="taxes_id", company=company_id,
+ models =[('product.product',False)], value=[taxes_ref[obj_wizard.sale_tax.id]])
+>>>>>>> MERGE-SOURCE
if obj_wizard.purchase_tax and taxes_ref:
+<<<<<<< TREE
ir_values_obj.set_default(cr, SUPERUSER_ID, 'product.product', "supplier_taxes_id", [taxes_ref[obj_wizard.purchase_tax.id]], for_all_users=True, company_id=company_id)
+=======
+ ir_values_obj.set(cr, 1, key='default', key2=False, name="supplier_taxes_id", company=company_id,
+ models =[('product.product',False)], value=[taxes_ref[obj_wizard.purchase_tax.id]])
+>>>>>>> MERGE-SOURCE
# Create Bank journals
self._create_bank_journals_from_o2m(cr, uid, obj_wizard, company_id, acc_template_ref, context=context)
=== modified file 'account/account_invoice.py'
--- account/account_invoice.py 2013-03-29 10:55:46 +0000
+++ account/account_invoice.py 2013-04-10 14:12:36 +0000
@@ -91,13 +91,25 @@
def _amount_residual(self, cr, uid, ids, name, args, context=None):
result = {}
for invoice in self.browse(cr, uid, ids, context=context):
+ checked_partial_rec_ids = []
result[invoice.id] = 0.0
if invoice.move_id:
+<<<<<<< TREE
for m in invoice.move_id.line_id:
if m.account_id.type in ('receivable','payable'):
result[invoice.id] += m.amount_residual_currency
#prevent the residual amount on the invoice to be less than 0
result[invoice.id] = max(result[invoice.id], 0.0)
+=======
+ for move_line in invoice.move_id.line_id:
+ if move_line.account_id.type in ('receivable','payable'):
+ if move_line.reconcile_partial_id:
+ partial_reconcile_id = move_line.reconcile_partial_id.id
+ if partial_reconcile_id in checked_partial_rec_ids:
+ continue
+ checked_partial_rec_ids.append(partial_reconcile_id)
+ result[invoice.id] += move_line.amount_residual_currency
+>>>>>>> MERGE-SOURCE
return result
# Give Journal Items related to the payment reconciled to this invoice
@@ -849,6 +861,8 @@
line2[tmp]['credit'] = (am < 0) and -am or 0.0
line2[tmp]['tax_amount'] += l['tax_amount']
line2[tmp]['analytic_lines'] += l['analytic_lines']
+ line2[tmp]['amount_currency'] += l['amount_currency']
+ line2[tmp]['quantity'] += l['quantity']
else:
line2[tmp] = l
line = []
@@ -1458,6 +1472,12 @@
a = res.property_account_expense.id
if not a:
a = res.categ_id.property_account_expense_categ.id
+
+ if context.get('account_id',False):
+ # this is set by onchange_account_id() to force the account choosen by the
+ # user - to get defaults taxes when product have no tax defined.
+ a = context['account_id']
+
a = fpos_obj.map_account(cr, uid, fpos, a)
if a:
result['account_id'] = a
@@ -1584,6 +1604,7 @@
return {}
unique_tax_ids = []
fpos = fposition_id and self.pool.get('account.fiscal.position').browse(cr, uid, fposition_id) or False
+<<<<<<< TREE
account = self.pool.get('account.account').browse(cr, uid, account_id)
if not product_id:
taxes = account.tax_ids
@@ -1595,6 +1616,22 @@
if product_change_result and 'value' in product_change_result and 'invoice_line_tax_id' in product_change_result['value']:
unique_tax_ids = product_change_result['value']['invoice_line_tax_id']
return {'value':{'invoice_line_tax_id': unique_tax_ids}}
+=======
+ account = self.pool.get('account.account').browse(cr, uid, account_id)
+ if not product_id:
+ taxes = account.tax_ids
+ unique_tax_ids = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, taxes)
+ else:
+ # force user choosen account in context to allow product_id_change()
+ # to fallback to the this accounts in case product has no taxes defined.
+ context = {'account_id': account_id}
+ product_change_result = self.product_id_change(cr, uid, ids, product_id, False, type=inv_type,
+ partner_id=partner_id, fposition_id=fposition_id, context=context,
+ company_id=account.company_id.id)
+ if product_change_result and 'value' in product_change_result and 'invoice_line_tax_id' in product_change_result['value']:
+ unique_tax_ids = product_change_result['value']['invoice_line_tax_id']
+ return {'value':{'invoice_line_tax_id': unique_tax_ids}}
+>>>>>>> MERGE-SOURCE
account_invoice_line()
=== modified file 'account/account_move_line.py'
--- account/account_move_line.py 2013-03-26 09:34:13 +0000
+++ account/account_move_line.py 2013-04-10 14:12:36 +0000
@@ -208,8 +208,8 @@
def convert_to_period(self, cr, uid, context=None):
if context is None:
context = {}
- period_obj = self.pool.get('account.period')
#check if the period_id changed in the context from client side
+<<<<<<< TREE
if context.get('period_id', False):
period_id = context.get('period_id')
if type(period_id) == str:
@@ -217,6 +217,12 @@
context.update({
'period_id': ids and ids[0] or False
})
+=======
+ period_id = context.get('period_id')
+ if isinstance(period_id, basestring):
+ ids = self.pool.get('account.period').search(cr, uid, [('name', 'ilike', period_id)])
+ context['period_id'] = ids and ids[0] or False
+>>>>>>> MERGE-SOURCE
return context
def _default_get(self, cr, uid, fields, context=None):
@@ -725,6 +731,7 @@
# writeoff; entry generated for the difference between the lines
#
def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
+<<<<<<< TREE
if context is None:
context = {}
if context and context.get('next_partner_only', False):
@@ -734,10 +741,45 @@
partner = partner[0]
else:
partner = context.get('partner_id', False)
+=======
+ partner_domain = self._partner_domain(cr, uid, offset, context=context)
+ if partner_domain is None:
+ return []
+ args.extend(partner_domain)
+ return super(account_move_line, self).search(cr, uid, args, offset, limit, order, context, count)
+
+ def read_group(self, cr, uid, domain, fields, groupby, offset=0,
+ limit=None, context=None, orderby=False):
+ partner_domain = self._partner_domain(
+ cr, uid, offset, context=context)
+ if partner_domain is None:
+ # Always false domain, to return an empty groupby (no
+ # groups). Should create an empty groupby directly but no
+ # API and can't be arsed.
+ partner_domain = [('move_id', '=', False)]
+ domain.extend(partner_domain)
+ return super(account_move_line, self).read_group(
+ cr, uid, domain, fields, groupby,
+ offset, limit, context, orderby)
+
+ def _partner_domain(self, cr, uid, offset, context=None):
+ """ Returns a (complete) domain for the next partner with
+ unreconciled entries, to add to the existing domain.
+
+ May return an empty list if there is no filtering to be done
+ (``next_partner_only`` is not enabled).
+
+ Will return ``None`` if there is no partner with unreconciled
+ entries left, for the caller to handle as desired.
+ """
+ if context and context.get('next_partner_only'):
+ partner = context.get('partner_id', False) \
+ or self.get_next_partner_only(cr, uid, offset, context)
+>>>>>>> MERGE-SOURCE
if not partner:
- return []
- args.append(('partner_id', '=', partner[0]))
- return super(account_move_line, self).search(cr, uid, args, offset, limit, order, context, count)
+ return None
+ return [('partner_id', '=', partner[0])]
+ return []
def list_partners_to_reconcile(self, cr, uid, context=None):
cr.execute(
@@ -769,8 +811,7 @@
total = 0.0
merges_rec = []
company_list = []
- if context is None:
- context = {}
+
for line in self.browse(cr, uid, ids, context=context):
if company_list and not line.company_id.id in company_list:
raise osv.except_osv(_('Warning!'), _('To reconcile the entries company should be the same for all entries.'))
@@ -840,10 +881,7 @@
writeoff = debit - credit
# Ifdate_p in context => take this date
- if context.has_key('date_p') and context['date_p']:
- date=context['date_p']
- else:
- date = time.strftime('%Y-%m-%d')
+ date = context.get('date_p') or time.strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
cr.execute('SELECT account_id, reconcile_id '\
'FROM account_move_line '\
=== modified file 'account/account_report.xml'
--- account/account_report.xml 2013-02-22 15:59:32 +0000
+++ account/account_report.xml 2013-04-10 14:12:36 +0000
@@ -2,6 +2,8 @@
<openerp>
<data>
<report auto="False" id="account_general_ledger" menu="False" model="account.account" name="account.general.ledger" rml="account/report/account_general_ledger.rml" string="General Ledger"/>
+ <report auto="False" id="account_financial_report" menu="False" model="account.financial.report" name="account.financial.report" rml="account/report/account_financial_report.rml" string="Financial Report"/>
+ <report auto="False" id="account_aged_partner_balance" menu="False" model="res.partner" name="account.aged_trial_balance" rml="account/report/account_aged_partner_balance.rml" string="Aged Partner Balance"/>
<report auto="False" id="account_general_ledger_landscape" menu="False" model="account.account" name="account.general.ledger_landscape" rml="account/report/account_general_ledger_landscape.rml" string="General Ledger"/>
<report auto="False" id="account_3rdparty_ledger" menu="False" model="res.partner" name="account.third_party_ledger" rml="account/report/account_partner_ledger.rml" string="Partner Ledger"/>
<report auto="False" id="account_3rdparty_ledger_other" menu="False" model="res.partner" name="account.third_party_ledger_other" rml="account/report/account_partner_ledger_other.rml" string="Partner Ledger"/>
@@ -16,7 +18,7 @@
auto="False"
id="account_invoices"
model="account.invoice"
- name="account.invoice"
+ name="account.invoice"
rml="account/report/account_print_invoice.rml"
string="Invoices"
attachment="(object.state in ('open','paid')) and ('INV'+(object.number or '').replace('/','')+'.pdf')"
=== modified file 'account/account_view.xml'
--- account/account_view.xml 2013-03-14 11:27:40 +0000
+++ account/account_view.xml 2013-04-10 14:12:36 +0000
@@ -980,9 +980,49 @@
<field name="domain">[('parent_id','=',False)]</field>
<field name="view_type">tree</field>
<field name="view_id" ref="view_tax_code_tree"/>
+<<<<<<< TREE
</record>
<!-- Journal Items -->
+=======
+ <field name="help">The chart of taxes is used to generate your periodical tax statement. You will see the taxes with codes related to your legal statement according to your country.</field>
+ </record>
+
+ <!--
+ Entries lines
+ -->
+
+ <record id="view_move_line_tree" model="ir.ui.view">
+ <field name="name">account.move.line.tree</field>
+ <field name="model">account.move.line</field>
+ <field name="type">tree</field>
+ <field eval="4" name="priority"/>
+ <field name="arch" type="xml">
+ <tree colors="red:state == 'draft';black:state == 'valid'" string="Journal Items" editable="top" on_write="on_create_write">
+ <field name="date"/>
+ <field name="period_id"/>
+ <field name="move_id"/>
+ <field name="ref"/>
+ <field name="invoice"/>
+ <field name="name"/>
+ <field name="partner_id" on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"/>
+ <field name="account_id" domain="[('journal_id','=',journal_id), ('company_id', '=', company_id)]"/>
+ <field name="journal_id"/>
+ <field name="debit" sum="Total debit"/>
+ <field name="credit" sum="Total credit"/>
+ <field name="account_tax_id" groups="base.group_extended"/>
+ <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
+ <field name="amount_currency" groups="base.group_extended" attrs="{'readonly':[('state','=','valid')]}"/>
+ <field name="currency_id" groups="base.group_extended" attrs="{'readonly':[('state','=','valid')]}"/>
+ <field name="reconcile_partial_id" groups="base.group_extended"/>
+ <field name="reconcile_id"/>
+ <field name="state"/>
+ <field name="company_id" invisible="True"/>
+ </tree>
+ </field>
+ </record>
+
+>>>>>>> MERGE-SOURCE
<record id="view_move_line_form" model="ir.ui.view">
<field name="name">account.move.line.form</field>
<field name="model">account.move.line</field>
=== modified file 'account/i18n/account.pot'
--- account/i18n/account.pot 2013-03-14 11:27:40 +0000
+++ account/i18n/account.pot 2013-04-10 14:12:36 +0000
@@ -4,10 +4,19 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 7.0alpha\n"
+=======
+"Project-Id-Version: OpenERP Server 6.1\n"
+>>>>>>> MERGE-SOURCE
"Report-Msgid-Bugs-To: \n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-12-21 17:04+0000\n"
+=======
+"POT-Creation-Date: 2012-10-23 11:48+0000\n"
+"PO-Revision-Date: 2012-10-23 11:48+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -77,6 +86,11 @@
msgstr ""
#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Aged Trial Balance"
+msgstr ""
+
+#. module: account
#: view:account.move:0
#: view:account.move.line:0
msgid "Total Debit"
@@ -106,8 +120,12 @@
#: field:account.move,ref:0
#: field:account.move.line,ref:0
#: field:account.subscription,ref:0
+<<<<<<< TREE
#: xsl:account.transfer:0
#: field:cash.box.in,ref:0
+=======
+#: xsl:account.transfer:0
+>>>>>>> MERGE-SOURCE
msgid "Reference"
msgstr ""
@@ -117,6 +135,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:641
#: code:addons/account/account.py:686
#: code:addons/account/account.py:781
@@ -136,12 +155,19 @@
#: 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
+=======
+#: code:addons/account/account_invoice.py:1430
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Warning!"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3149
+=======
+#: code:addons/account/account.py:3129
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Miscellaneous Journal"
msgstr ""
@@ -206,6 +232,21 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: help:account.tax.code,notprintable:0
+#: help:account.tax.code.template,notprintable:0
+msgid "Check this box if you don't want any VAT related to this Tax Code to appear on invoices"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1254
+#, python-format
+msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
msgid "Accounting entries are an input of the reconciliation."
msgstr ""
@@ -216,6 +257,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:mail.message.subtype,name:account.mt_invoice_validated
msgid "Validated"
msgstr ""
@@ -223,6 +265,11 @@
#. module: account
#: model:account.account.type,name:account.account_type_income_view1
msgid "Income View"
+=======
+#: code:addons/account/account_move_line.py:1215
+#, python-format
+msgid "You can not add/modify entries in a closed journal."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -257,6 +304,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_invoice_tree3
msgid "<p class=\"oe_view_nocontent_create\">\n"
" Click to create a customer refund. \n"
@@ -268,6 +316,21 @@
" can generate it directly from the related customer invoice.\n"
" </p>\n"
" "
+=======
+#: view:account.move.line:0
+msgid "St."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:560
+#, python-format
+msgid "Invoice line account company does not match with invoice company."
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,field:0
+msgid "Field Name"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -546,6 +609,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#. openerp-web
#: code:addons/account/static/src/xml/account_move_reconciliation.xml:31
#, python-format
@@ -559,6 +623,24 @@
#. module: account
#: selection:account.config.settings,period:0
+=======
+#: report:account.account.balance:0
+#: selection:account.balance.report,display_account:0
+#: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
+#: selection:account.report.general.ledger,display_account:0
+#: selection:account.tax,type_tax_use:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "All"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,address_invoice_id:0
+msgid "Invoice Address Name"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: selection:account.installer,period:0
msgid "3 Monthly"
msgstr ""
@@ -597,6 +679,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_change_currency.py:64
#: code:addons/account/wizard/account_change_currency.py:70
#, python-format
@@ -610,6 +693,9 @@
#. module: account
#: code:addons/account/account_move_line.py:1157
+=======
+#: code:addons/account/account_move_line.py:1266
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No period found or more than one period found for the given date."
msgstr ""
@@ -620,7 +706,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3153
+=======
+#: code:addons/account/account.py:3133
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "SAJ"
msgstr ""
@@ -658,6 +748,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: constraint:account.move:0
msgid "You cannot create more than one move per period on a centralized journal."
msgstr ""
@@ -665,6 +756,12 @@
#. module: account
#: help:account.tax,account_analytic_paid_id:0
msgid "Set the analytic account that will be used by default on the invoice tax lines for refunds. Leave empty if you don't want to use an analytic account on the invoice tax lines by default."
+=======
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#, python-format
+msgid "To reconcile the entries company should be the same for all entries"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -673,7 +770,13 @@
#: selection:account.common.partner.report,result_selection:0
#: selection:account.partner.balance,result_selection:0
#: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:372
#: code:addons/account/report/account_partner_balance.py:297
+<<<<<<< TREE
+=======
+#: code:addons/account/report/account_partner_ledger.py:395
+#: model:ir.actions.act_window,name:account.action_aged_receivable
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Receivable Accounts"
msgstr ""
@@ -754,6 +857,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/wizard/account_change_currency.py:38
+#, python-format
+msgid "You can only change currency for Draft Invoice !"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
+>>>>>>> MERGE-SOURCE
#: model:ir.ui.menu,name:account.menu_account_report
msgid "Financial Report"
msgstr ""
@@ -775,7 +888,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:798
+=======
+#: code:addons/account/account_invoice.py:747
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Taxes are missing!\n"
"Click on compute button."
@@ -899,11 +1016,13 @@
msgstr ""
#. module: account
+#: report:account.aged_trial_balance:0
#: report:account.overdue:0
msgid "Due"
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,purchase_journal_id:0
msgid "Purchase journal"
msgstr ""
@@ -914,6 +1033,16 @@
msgstr ""
#. module: account
+=======
+#: code:addons/account/account.py:1353
+#, python-format
+msgid "You cannot validate this journal entry because account \"%s\" does not belong to chart of accounts \"%s\"!"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.move:0
+>>>>>>> MERGE-SOURCE
#: view:validate.account.move:0
#: view:validate.account.move.lines:0
msgid "Approve"
@@ -982,6 +1111,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:2613
+#, python-format
+msgid "I can not locate a parent code for the template account!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.analytic.line:0
msgid "Purchases"
msgstr ""
@@ -1009,6 +1147,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.config.settings:0
msgid "Features"
msgstr ""
@@ -1016,9 +1155,18 @@
#. module: account
#: code:addons/account/account.py:2298
#: code:addons/account/account_bank_statement.py:423
+=======
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_bank_statement.py:357
+>>>>>>> MERGE-SOURCE
#: code:addons/account/account_invoice.py:73
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:748
#: code:addons/account/account_move_line.py:195
+=======
+#: code:addons/account/account_invoice.py:697
+#: code:addons/account/account_move_line.py:173
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Analytic Journal !"
msgstr ""
@@ -1081,12 +1229,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "Refund "
msgstr ""
#. module: account
#: code:addons/account/account_analytic_line.py:90
+=======
+#: code:addons/account/account_move_line.py:856
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
msgstr ""
@@ -1130,7 +1282,11 @@
#. module: account
#: model:account.account.type,name:account.data_account_type_bank
#: selection:account.bank.accounts.wizard,account_type:0
+<<<<<<< TREE
#: code:addons/account/account.py:3044
+=======
+#: code:addons/account/account.py:3020
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Bank"
msgstr ""
@@ -1227,6 +1383,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1317
+#, python-format
+msgid "You can not use this general account in this journal, check the tab 'Entry Controls' on the related journal !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.move.line.reconcile,trans_nbr:0
msgid "# of Transaction"
msgstr ""
@@ -1240,6 +1405,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:1136
+#, python-format
+msgid "You can not modify/delete a journal with entries for this period !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.invoice,origin:0
#: help:account.invoice.line,origin:0
msgid "Reference of the document that produced this invoice."
@@ -1323,7 +1497,12 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_financial_report.py:70
+<<<<<<< TREE
+#: code:addons/account/wizard/account_financial_report.py:70
+=======
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Select a starting and an ending period"
msgstr ""
@@ -1390,6 +1569,7 @@
msgstr ""
#. module: account
+#: report:account.aged_trial_balance:0
#: model:ir.ui.menu,name:account.next_id_22
msgid "Partners"
msgstr ""
@@ -1428,8 +1608,10 @@
msgstr ""
#. module: account
+#: report:account.account.balance:0
#: selection:account.balance.report,display_account:0
#: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
#: selection:account.partner.balance,display_partner:0
#: selection:account.report.general.ledger,display_account:0
msgid "With balance is not equal to 0"
@@ -1448,6 +1630,90 @@
msgstr ""
#. module: account
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid "\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello${object.address_invoice_id.name and ' ' or ''}${object.address_invoice_id.name or ''},</p>\n"
+" \n"
+" <p>A new invoice is available for ${object.partner_id.name}: </p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" <strong>REFERENCES</strong><br />\n"
+" Invoice number: <strong>${object.number}</strong><br />\n"
+" Invoice total: <strong>${object.amount_total} ${object.currency_id.name}</strong><br />\n"
+" Invoice date: ${object.date_invoice}<br />\n"
+" % if object.origin:\n"
+" Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" Your contact: <a href=\"mailto:${object.user_id.user_email or ''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+" </p> \n"
+" \n"
+" <p>\n"
+" You can view the invoice document, download it and pay online using the following link:\n"
+" </p>\n"
+" <a style=\"display:block; width: 150px; height:20px; margin-left: 120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat no-repeat;\" \n"
+" href=\"${ctx.get('edi_web_url_view') or ''}\">View Invoice</a>\n"
+" \n"
+" % if object.company_id.paypal_account and object.type in ('out_invoice', 'in_refund'):\n"
+" <% \n"
+" comp_name = quote(object.company_id.name)\n"
+" inv_number = quote(object.number)\n"
+" paypal_account = quote(object.company_id.paypal_account)\n"
+" inv_amount = quote(str(object.amount_total))\n"
+" cur_name = quote(object.currency_id.name)\n"
+" paypal_url = \"https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s&\"; \\\n"
+" \"invoice=%s&amount=%s&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
+" (paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)\n"
+" %>\n"
+" <br/>\n"
+" <p>It is also possible to directly pay with Paypal:</p>\n"
+" <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+" <img class=\"oe_edi_paypal_button\" src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+" </a>\n"
+" % endif\n"
+" \n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: #DDD;\">\n"
+" <strong style=\"text-transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; \">\n"
+" Phone: ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web : <a href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger
msgid "Account Analytic Cost Ledger"
msgstr ""
@@ -1673,6 +1939,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,group_analytic_accounting:0
msgid "Analytic accounting"
msgstr ""
@@ -1685,6 +1952,16 @@
#. module: account
#: help:res.company,tax_calculation_rounding_method:0
msgid "If you select 'Round per Line' : for each tax, the tax amount will first be computed and rounded for each PO/SO/invoice line and then these rounded amounts will be summed, leading to the total amount for that tax. If you select 'Round Globally': for each tax, the tax amount will be computed for each PO/SO/invoice line, then these amounts will be summed and eventually this total tax amount will be rounded. If you sell with tax included, you should choose 'Round per line' because you certainly want the sum of your tax-included line subtotals to be equal to the total amount with taxes."
+=======
+#: field:wizard.multi.charts.accounts,seq_journal:0
+msgid "Separated Journal Sequences"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,user_id:0
+#: view:account.invoice:0
+msgid "Responsible"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -1728,6 +2005,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:1431
+#, 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 ""
@@ -1806,6 +2092,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:account.tax,base_code_id:0
#: help:account.tax,ref_base_code_id:0
#: help:account.tax,ref_tax_code_id:0
@@ -1815,6 +2102,11 @@
#: help:account.tax.template,ref_tax_code_id:0
#: help:account.tax.template,tax_code_id:0
msgid "Use this code for the tax declaration."
+=======
+#: code:addons/account/account_cash_statement.py:293
+#, python-format
+msgid "User %s does not have rights to access %s journal !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -2039,6 +2331,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:656
#, python-format
msgid "You cannot change the type of account to '%s' type as it contains journal items!"
@@ -2064,6 +2357,27 @@
#. module: account
#: sql_constraint:account.fiscal.position.tax:0
msgid "A tax fiscal position could be defined only once time on same taxes."
+=======
+#: code:addons/account/installer.py:94
+#, python-format
+msgid "No unconfigured company !"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "/"
+msgstr ""
+
+#. 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.), as calculated in Profit & Loss Report"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_reconciliation0
+#: model:process.node,note:account.process_node_supplierreconciliation0
+msgid "Comparison between accounting and payment entries"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -2168,12 +2482,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_move_bank_reconcile.py:53
#, python-format
msgid "Standard Encoding"
msgstr ""
#. module: account
+=======
+#: xsl:account.transfer:0
+msgid "Partner ID"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.journal.select:0
#: view:project.account.analytic.line:0
msgid "Open Entries"
@@ -2244,6 +2566,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:1478
+#, python-format
+msgid "There is no default default debit account defined \n"
+"on journal \"%s\""
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.account.template,type:0
#: help:account.entries.report,type:0
msgid "This type is used to differentiate types with special effects in OpenERP: view can not have entries, 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."
@@ -2255,6 +2587,22 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1292
+#, python-format
+msgid "Can not create an automatic sequence for this piece!\n"
+"Put a sequence in the journal definition for automatic numbering or create a sequence manually for this piece."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:787
+#, python-format
+msgid "You can not modify the company of this journal as its related record exist in journal items"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: report:account.invoice:0
msgid "Customer Code"
msgstr ""
@@ -2277,9 +2625,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.tax,price_include:0
#: field:account.tax.template,price_include:0
msgid "Tax Included in Price"
+=======
+#: code:addons/account/account.py:3136
+#, python-format
+msgid "ECNJ"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -2296,8 +2650,19 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:account.config.settings,default_sale_tax:0
msgid "This sale tax will be assigned by default on new products."
+=======
+#: code:addons/account/account_invoice.py:379
+#, python-format
+msgid "There is no Accounting Journal of type Sale/Purchase defined!"
+msgstr ""
+
+#. module: account
+#: view:product.category:0
+msgid "Accounting Properties"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -2325,6 +2690,7 @@
#. module: account
#: report:account.account.balance:0
#: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
#: field:account.balance.report,fiscalyear_id:0
#: report:account.central.journal:0
#: field:account.central.journal,fiscalyear_id:0
@@ -2335,7 +2701,11 @@
#: view:account.config.settings:0
#: view:account.entries.report:0
#: field:account.entries.report,fiscalyear_id:0
+<<<<<<< TREE
#: view:account.fiscalyear:0
+=======
+#: report:account.financial.report:0
+>>>>>>> MERGE-SOURCE
#: field:account.fiscalyear,name:0
#: report:account.general.journal:0
#: field:account.general.journal,fiscalyear_id:0
@@ -2393,12 +2763,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.addtmpl.wizard:0
msgid "Create an Account Based on this Template"
msgstr ""
#. module: account
#: code:addons/account/account_invoice.py:905
+=======
+#: code:addons/account/account.py:1485
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Cannot create the invoice.\n"
"The related payment term is probably misconfigured as it gives a computed amount greater than the total invoiced amount. In order to avoid rounding issues, the latest line of your payment term must be of type 'balance'."
@@ -2416,7 +2790,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_bank_statement.py:477
+=======
+#: code:addons/account/account_bank_statement.py:403
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "In order to delete a bank statement, you must first cancel it to delete related journal items."
msgstr ""
@@ -2486,6 +2864,18 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:581
+#, python-format
+msgid "Can't find any account journal of %s type for this company.\n"
+"\n"
+"You can create one in the menu: \n"
+"Configuration\\Financial Accounting\\Accounts\\Journals."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:account.payment.term,name:account.account_payment_term_advance
#: model:account.payment.term,note:account.account_payment_term_advance
msgid "30% Advance End 30 Days"
@@ -2546,7 +2936,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3154
+=======
+#: code:addons/account/account.py:3134
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "EXJ"
msgstr ""
@@ -2608,7 +3002,10 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:account.account.type,name:account.conf_account_type_tax
+=======
+>>>>>>> MERGE-SOURCE
#: report:account.invoice:0
#: field:account.invoice,amount_tax:0
#: report:account.journal.period.print.sale.purchase:0
@@ -2631,12 +3028,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,default_purchase_tax:0
#: field:account.config.settings,purchase_tax:0
msgid "Default purchase tax"
msgstr ""
#. module: account
+=======
+#: report:account.aged_trial_balance:0
+msgid "Not due"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.account:0
#: field:account.financial.report,account_ids:0
#: selection:account.financial.report,type:0
@@ -2650,6 +3055,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3493
#: code:addons/account/account_bank_statement.py:404
#: code:addons/account/account_invoice.py:386
@@ -2659,6 +3065,9 @@
#: code:addons/account/account_invoice.py:609
#: code:addons/account/account_invoice.py:631
#: code:addons/account/account_move_line.py:535
+=======
+#: code:addons/account/account_invoice.py:378
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -2798,6 +3207,7 @@
#. module: account
#: view:account.aged.trial.balance:0
#: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
#: model:ir.ui.menu,name:account.menu_aged_trial_balance
msgid "Aged Partner Balance"
msgstr ""
@@ -2809,11 +3219,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: constraint:account.move.line:0
msgid "Account and Period must belong to the same company."
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: field:account.invoice.line,discount:0
msgid "Discount (%)"
msgstr ""
@@ -2855,8 +3268,18 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1411
+=======
+#: view:account.use.model:0
+msgid "This wizard will create recurring accounting entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1329
+>>>>>>> MERGE-SOURCE
#, python-format
+<<<<<<< TREE
msgid "You cannot delete a posted journal entry \"%s\"."
msgstr ""
@@ -2874,6 +3297,15 @@
#: code:addons/account/account.py:2298
#: code:addons/account/account_invoice.py:748
#: code:addons/account/account_move_line.py:195
+=======
+msgid "No sequence defined on the journal !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
+#: code:addons/account/account_move_line.py:173
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
msgstr ""
@@ -2929,6 +3361,11 @@
msgstr ""
#. module: account
+#: field:accounting.report,debit_credit:0
+msgid "Display Debit/Credit Columns"
+msgstr ""
+
+#. module: account
#: selection:account.entries.report,month:0
#: selection:account.invoice.report,month:0
#: selection:analytic.entries.report,month:0
@@ -2987,11 +3424,29 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:401
+#, python-format
+msgid "You can not delete an invoice which is open or paid. We suggest you to refund it instead."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:1025
+#, python-format
+msgid "Invoice '%s' is validated."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.model.line,date_maturity:0
msgid "The maturity date of the generated entries for this model. You can choose between the creation date or the creation date of the entries plus the partner payment terms."
msgstr ""
@@ -3021,7 +3476,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:795
+=======
+#: code:addons/account/account_invoice.py:744
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Tax base different!\n"
"Click on compute to update the tax base."
@@ -3170,8 +3629,13 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3412
#: code:addons/account/account_bank.py:95
+=======
+#: code:addons/account/account.py:3380
+#: code:addons/account/account_bank.py:90
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "BNK"
msgstr ""
@@ -3415,7 +3879,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1428
+=======
+#: code:addons/account/account_invoice.py:1345
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Partner Defined !"
msgstr ""
@@ -3487,6 +3955,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_cash_statement.py:315
+#, python-format
+msgid "The closing balance should be the same than the computed balance!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.journal:0
msgid "Search Account Journal"
msgstr ""
@@ -3593,6 +4070,7 @@
#. module: account
#: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
msgid "Period Length (days)"
msgstr ""
@@ -3654,8 +4132,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:account.config.settings,default_purchase_tax:0
msgid "This purchase tax will be assigned by default on new products."
+=======
+#: code:addons/account/account_invoice.py:850
+#, python-format
+msgid "Can not create the invoice !\n"
+"The related payment term is probably misconfigured as it gives a computed amount greater than the total invoiced amount. The latest line of your payment term must be of type 'balance' to avoid rounding issues."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -3664,9 +4149,23 @@
msgstr ""
#. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
#: report:account.central.journal:0
+<<<<<<< TREE
#: view:account.config.settings:0
+=======
+#: report:account.financial.report:0
+#: report:account.general.journal:0
+>>>>>>> MERGE-SOURCE
#: report:account.general.ledger:0
+<<<<<<< TREE
+=======
+#: report:account.general.ledger_landscape:0
+#: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+>>>>>>> MERGE-SOURCE
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
@@ -3682,8 +4181,19 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.model,name:account.model_account_journal_cashbox_line
msgid "account.journal.cashbox.line"
+=======
+#: field:account.journal,centralisation:0
+msgid "Centralised counterpart"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:575
+#, python-format
+msgid "You can not create journal items on a \"view\" account %s %s"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -3734,7 +4244,13 @@
#: selection:account.vat.declaration,filter:0
#: selection:accounting.report,filter:0
#: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
#: field:analytic.entries.report,date:0
+#, python-format
msgid "Date"
msgstr ""
@@ -3750,24 +4266,51 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: view:account.analytic.line: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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.chart.template:0
msgid "Chart of Accounts Template"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2310
+=======
+#: code:addons/account/account.py:2297
+>>>>>>> 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
#: selection:account.balance.report,display_account:0
#: selection:account.common.account.report,display_account:0
#: selection:account.report.general.ledger,display_account:0
#: selection:account.tax,type_tax_use:0
#: selection:account.tax.template,type_tax_use:0
msgid "All"
+=======
+#: code:addons/account/account_move_line.py:846
+#, python-format
+msgid "Some entries are already reconciled !"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Account Tax"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -3791,6 +4334,8 @@
#: selection:account.vat.declaration,filter:0
#: selection:accounting.report,filter:0
#: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
msgid "No Filters"
msgstr ""
@@ -3876,6 +4421,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: report:account.aged_trial_balance:0
+msgid "Account Total"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1168
+#, python-format
+msgid "Unable to change tax !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:analytic.entries.report,nbr:0
msgid "#Entries"
msgstr ""
@@ -3891,8 +4450,19 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,complete_tax_set:0
msgid "Complete set of taxes"
+=======
+#: view:account.fiscal.position:0
+msgid "Mapping"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:932
+#, python-format
+msgid "You cannot create an invoice on a centralised journal. Uncheck the centralised counterpart box in the related journal from the configuration menu."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -3900,6 +4470,7 @@
#: field:account.account.template,name:0
#: report:account.analytic.account.inverted.balance:0
#: field:account.chart.template,name:0
+#: report:account.financial.report:0
#: field:account.model.line,name:0
#: field:account.move.line,name:0
#: field:account.move.reconcile,name:0
@@ -3908,7 +4479,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/installer.py:94
+=======
+#: model:ir.model,name:account.model_account_aged_trial_balance
+msgid "Account Aged Trial balance Report"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:582
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No unconfigured company !"
msgstr ""
@@ -4194,7 +4774,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_bank_statement.py:423
+=======
+#: selection:account.automatic.reconcile,power:0
+msgid "3"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:97
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You have to assign an analytic journal on the '%s' journal!"
msgstr ""
@@ -4242,6 +4831,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:668
#, python-format
msgid "You cannot change the code of account which contains journal items!"
@@ -4264,6 +4854,12 @@
#: view:analytic.entries.report:0
#: field:analytic.entries.report,product_uom_id:0
msgid "Product Unit of Measure"
+=======
+#: code:addons/account/account_move_line.py:1231
+#, python-format
+msgid "You can not do this modification on a confirmed entry! You can just change some non legal fields or you must unconfirm the journal entry first! \n"
+"%s"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4315,7 +4911,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:867
+=======
+#: code:addons/account/account_analytic_line.py:91
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You have to provide an account for the write off/exchange difference entry."
msgstr ""
@@ -4380,6 +4980,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/installer.py:94
#, python-format
msgid "There is currently no company without chart of account. The wizard will therefore not be executed."
@@ -4391,6 +4992,13 @@
msgstr ""
#. module: account
+=======
+#: help:product.template,property_account_expense:0
+msgid "This account will be used for invoices instead of the default one to value expenses for the current product"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.model,name:account.model_account_chart
msgid "Account chart"
msgstr ""
@@ -4511,6 +5119,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: constraint:account.account:0
msgid "Error!\n"
"You cannot create an account which has parent account of different company."
@@ -4518,6 +5127,9 @@
#. module: account
#: code:addons/account/account_invoice.py:631
+=======
+#: code:addons/account/account.py:1082
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Cannot find any account journal of %s type for this company.\n"
"\n"
@@ -4547,12 +5159,28 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.tax:0
msgid "Children/Sub Taxes"
msgstr ""
#. module: account
#: xsl:account.transfer:0
+=======
+#: code:addons/account/account_move_line.py:1266
+#, python-format
+msgid "Encoding error"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "4"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: xsl:account.transfer:0
+>>>>>>> MERGE-SOURCE
msgid "Change"
msgstr ""
@@ -4579,6 +5207,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:account.config.settings,group_proforma_invoices:0
msgid "Allows you to put invoices in pro-forma state."
msgstr ""
@@ -4596,6 +5225,32 @@
#. module: account
#: code:addons/account/account.py:3346
+=======
+#: help:account.bank.statement,balance_end_cash:0
+msgid "Closing balance based on cashBox"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Example"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:839
+#, python-format
+msgid "Please verify the price of the invoice !\n"
+"The real total does not match the computed total."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3316
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Purchase Tax %.2f%%"
msgstr ""
@@ -4620,6 +5275,18 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: selection:account.bank.statement.line,type:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/account_invoice.py:346
+#, python-format
+msgid "Customer"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.bank.statement:0
msgid "Confirmed"
msgstr ""
@@ -4630,8 +5297,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "My Invoices"
+=======
+#: code:addons/account/account.py:1584
+#, 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."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4651,22 +5324,39 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "Invoice "
msgstr ""
#. module: account
+=======
+#: view:validate.account.move:0
+msgid "All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.chart.template,property_account_income:0
msgid "Income Account on Product Template"
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:account.journal.period,state:0
msgid "When journal period is created. The status is 'Draft'. If a report is printed it comes to 'Printed' status. When all transactions are done, it comes in 'Done' status."
msgstr ""
#. module: account
#: code:addons/account/account.py:3157
+=======
+#: code:addons/account/account.py:3137
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "MISC"
msgstr ""
@@ -4681,11 +5371,13 @@
#: view:account.tax:0
#: view:account.tax.template:0
#: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
#: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
#: model:ir.actions.act_window,name:account.action_invoice_tree
#: model:ir.actions.report.xml,name:account.account_invoices
#: view:report.invoice.created:0
#: field:res.partner,invoice_ids:0
+#, python-format
msgid "Invoices"
msgstr ""
@@ -4830,6 +5522,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:894
#, python-format
msgid "Please verify the price of the invoice !\n"
@@ -4850,6 +5543,53 @@
#: view:account.bank.statement:0
#: field:account.journal,cash_control:0
msgid "Cash Control"
+=======
+#: view:account.move:0
+#: view:account.move.line:0
+#: code:addons/account/wizard/account_move_journal.py:153
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
+#: model:ir.actions.act_window,name:account.act_account_move_to_account_move_line_open
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move
+#: model:ir.actions.act_window,name:account.action_account_manual_reconcile
+#: model:ir.actions.act_window,name:account.action_account_moves_all_a
+#: model:ir.actions.act_window,name:account.action_account_moves_bank
+#: model:ir.actions.act_window,name:account.action_account_moves_purchase
+#: model:ir.actions.act_window,name:account.action_account_moves_sale
+#: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
+#: model:ir.actions.act_window,name:account.action_move_line_tree1
+#: model:ir.actions.act_window,name:account.action_tax_code_line_open
+#: model:ir.model,name:account.model_account_move_line
+#: model:ir.ui.menu,name:account.menu_action_account_moves_all
+#: model:ir.ui.menu,name:account.menu_action_account_moves_bank
+#: model:ir.ui.menu,name:account.menu_eaction_account_moves_purchase
+#: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
+#, python-format
+msgid "Journal Items"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
+#: 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_financial_report.py:70
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
+#, python-format
+msgid "Error"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4939,6 +5679,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:1361
+#, 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."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.ui.menu,name:account.account_template_folder
msgid "Templates"
msgstr ""
@@ -4954,6 +5704,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:1097
+#, python-format
+msgid "Start period should be smaller then End period"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: 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."
@@ -4967,6 +5726,7 @@
#. module: account
#: report:account.account.balance:0
#: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
#: field:account.balance.report,target_move:0
#: report:account.central.journal:0
#: field:account.central.journal,target_move:0
@@ -5015,6 +5775,8 @@
#: view:account.invoice:0
#: field:account.invoice,payment_ids:0
#: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
msgid "Payments"
msgstr ""
@@ -5062,8 +5824,24 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:account.invoice,sent:0
msgid "It indicates that the invoice has been sent."
+=======
+#: field:account.bank.statement,starting_details_ids:0
+msgid "Opening Cashbox"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Line 1:"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1315
+#, python-format
+msgid "Integrity Error !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -5321,6 +6099,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.bank.statement:0
#: selection:account.bank.statement,state:0
#: view:account.fiscalyear:0
@@ -5330,6 +6109,10 @@
#: selection:account.period,state:0
#: selection:report.invoice.created,state:0
msgid "Open"
+=======
+#: field:account.bank.statement.line,name:0
+msgid "Communication"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -5380,6 +6163,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "Draft Refund "
msgstr ""
@@ -5391,6 +6175,21 @@
#. module: account
#: view:account.payment.term.line:0
+=======
+#: code:addons/account/account.py:3463
+#: code:addons/account/account_bank_statement.py:338
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
+#: code:addons/account/wizard/account_move_journal.py:63
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.payment.term.line,value_amount:0
msgid "Amount To Pay"
msgstr ""
@@ -5456,7 +6255,6 @@
msgstr ""
#. module: account
-#: field:account.analytic.line,amount_currency:0
#: field:account.entries.report,amount_currency:0
#: field:account.model.line,amount_currency:0
#: field:account.move.line,amount_currency:0
@@ -5592,6 +6390,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:775
+#, python-format
+msgid "Already Reconciled!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.tax,type:0
msgid "The computation method for the tax amount."
msgstr ""
@@ -5620,14 +6427,22 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1120
+=======
+#: code:addons/account/account_move_line.py:1229
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Move name (id): %s (%s)"
msgstr ""
#. module: account
#: view:account.move.line.reconcile:0
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:882
+=======
+#: code:addons/account/account_move_line.py:871
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Write-Off"
msgstr ""
@@ -5653,7 +6468,11 @@
#: view:account.config.settings:0
#: view:account.invoice:0
#: view:account.invoice.report:0
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:363
+=======
+#: code:addons/account/account_invoice.py:348
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Supplier"
msgstr ""
@@ -5683,7 +6502,9 @@
#: selection:account.common.partner.report,result_selection:0
#: selection:account.partner.balance,result_selection:0
#: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
#: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
#, python-format
msgid "Receivable and Payable Accounts"
msgstr ""
@@ -5780,17 +6601,31 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2286
+=======
+#: code:addons/account/account.py:2273
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You have a wrong expression \"%(...)s\" in your model !"
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.tax.template:0
msgid "Compute Code for Taxes Included Prices"
msgstr ""
#. module: account
+=======
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
+#, python-format
+msgid "You can not use an inactive account!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.bank.statement,balance_end:0
msgid "Balance as calculated based on Starting Balance and transaction lines"
msgstr ""
@@ -5823,6 +6658,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1321
#, python-format
msgid "You cannot validate this journal entry because account \"%s\" does not belong to chart of accounts \"%s\"."
@@ -5836,6 +6672,24 @@
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Template Tax Fiscal Position"
+=======
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
+#: code:addons/account/wizard/account_period_close.py:51
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:102
+#, python-format
+msgid "Period: %s"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_review_financial_journals_installer
+msgid "Review your Financial Journals"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -5878,6 +6732,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/wizard/account_report_common.py:151
+#, python-format
+msgid "not implemented"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.journal,company_id:0
msgid "Company related to this journal"
msgstr ""
@@ -5906,6 +6769,8 @@
#. module: account
#: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
msgid "Past"
msgstr ""
@@ -6194,6 +7059,8 @@
#. module: account
#: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
msgid "Journal & Partner"
msgstr ""
@@ -6203,7 +7070,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3417
+=======
+#: code:addons/account/account.py:3385
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Cannot generate an unused journal code."
msgstr ""
@@ -6246,6 +7117,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:account.invoice,date_due:0
msgid "If you use payment terms, the due date will be computed automatically at the generation of accounting entries. The payment term may compute several due dates, for example 50% now and 50% in one month, but if you want to force a due date, make sure that the payment term is not set on the invoice. If you keep the payment term and the due date empty, it means direct payment."
msgstr ""
@@ -6254,6 +7126,11 @@
#: code:addons/account/account.py:414
#, python-format
msgid "There is no opening/closing period defined, please create one to set the initial balance."
+=======
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -6471,8 +7348,19 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_analytic_line.py:142
#: code:addons/account/account_move_line.py:958
+=======
+#: code:addons/account/account.py:624
+#, python-format
+msgid "You can not remove an account containing journal items."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entries: "
msgstr ""
@@ -6483,8 +7371,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: constraint:account.move.line:0
msgid "You cannot provide a secondary currency if it is the same than the company one."
+=======
+#: code:addons/account/account.py:1580
+#, python-format
+msgid "Couldn't create move between different companies"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -6506,12 +7400,23 @@
#. module: account
#: view:account.move.line:0
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1058
+#, python-format
+>>>>>>> MERGE-SOURCE
msgid "Total debit"
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.move.line:0
msgid "Next Partner Entries to reconcile"
+=======
+#: code:addons/account/account_move_line.py:824
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -6563,6 +7468,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.bank.statement,total_entry_encoding:0
msgid "Total Transactions"
msgstr ""
@@ -6576,6 +7482,35 @@
#. module: account
#: code:addons/account/account.py:1024
#: code:addons/account/account_move_line.py:1108
+=======
+#: code:addons/account/account.py:622
+#: code:addons/account/account.py:624
+#: code:addons/account/account.py:963
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account_bank_statement.py:301
+#: code:addons/account/account_bank_statement.py:314
+#: code:addons/account/account_bank_statement.py:352
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
+#: 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/wizard/account_use_model.py:44
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Error !"
msgstr ""
@@ -6603,6 +7538,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
+#, python-format
+msgid "Error :"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.analytic.line:0
msgid "Project line"
msgstr ""
@@ -6661,6 +7606,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1233
+#, 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"
+"%s"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
#: report:account.third_party_ledger:0
@@ -6778,6 +7733,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: constraint:account.journal:0
msgid "Configuration error!\n"
"The currency chosen should be shared by the default accounts too."
@@ -6785,6 +7741,9 @@
#. module: account
#: code:addons/account/account.py:2256
+=======
+#: code:addons/account/account.py:2246
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You can specify year, month and date in the name of the model using the following labels:\n"
"\n"
@@ -6828,6 +7787,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:504
+#: code:addons/account/wizard/account_invoice_refund.py:145
+#, python-format
+msgid "Data Insufficient !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.actions.act_window,name:account.action_invoice_tree1
#: model:ir.ui.menu,name:account.menu_action_invoice_tree1
msgid "Customer Invoices"
@@ -6877,6 +7846,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:account.config.settings,company_footer:0
msgid "Bank accounts as printed in the footer of each printed document"
msgstr ""
@@ -6885,6 +7855,24 @@
#: constraint:account.account:0
msgid "Configuration Error!\n"
"You cannot define children to an account with internal type different of \"View\"."
+=======
+#: code:addons/account/account.py:1449
+#, python-format
+msgid "You can not delete a posted journal entry \"%s\"!"
+msgstr ""
+
+#. module: account
+#: selection:account.partner.ledger,filter:0
+#: code:addons/account/report/account_partner_ledger.py:60
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
+#, python-format
+msgid "Unreconciled Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_menu_Bank_process
+msgid "Statements Reconciliation"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -6951,13 +7939,29 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
+#, python-format
+msgid "Can not find a chart of account, you should create one from the configuration of the accounting menu."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.chart.template,property_account_expense_opening:0
msgid "Opening Entries Expense Account"
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "Customer Reference"
+=======
+#: code:addons/account/account_move_line.py:1014
+#, python-format
+msgid "Accounting Entries"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -6995,6 +7999,11 @@
msgstr ""
#. module: account
+#: help:accounting.report,debit_credit:0
+msgid "This option allow you to get more details about your the way your balances are computed. Because it is space consumming, we do not allow to use it while doing a comparison"
+msgstr ""
+
+#. module: account
#: help:account.payment.term.line,value_amount:0
msgid "For percent enter a ratio between 0-1."
msgstr ""
@@ -7089,9 +8098,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.invoice,reference:0
#: field:account.invoice.line,invoice_id:0
msgid "Invoice Reference"
+=======
+#: code:addons/account/account.py:1095
+#, python-format
+msgid "You should have chosen periods that belongs to the same company"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_review_payment_terms_installer
+msgid "Review your Payment Terms"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -7120,8 +8140,18 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#. openerp-web
#: code:addons/account/static/src/js/account_move_reconciliation.js:90
+=======
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
+#: code:addons/account/wizard/account_invoice_state.py:44
+#: code:addons/account/wizard/account_invoice_state.py:68
+#: 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
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Warning"
msgstr ""
@@ -7201,6 +8231,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_account_analytic_account_tree2
msgid "<p>\n"
" Click to add a new analytic account.\n"
@@ -7216,6 +8247,11 @@
" related account.\n"
" </p>\n"
" "
+=======
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#, python-format
+msgid "The periods to generate opening entries were not found"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -7224,7 +8260,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3158
+=======
+#: code:addons/account/account.py:3138
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "OPEJ"
msgstr ""
@@ -7259,6 +8299,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.analytic.line:0
#: field:account.bank.statement,user_id:0
#: view:account.journal:0
@@ -7266,6 +8307,17 @@
#: view:analytic.entries.report:0
#: field:analytic.entries.report,user_id:0
msgid "User"
+=======
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
+#, python-format
+msgid "The journal must have default credit and debit account"
+msgstr ""
+
+#. module: account
+#: report:account.general.journal:0
+#: xsl:account.transfer:0
+msgid ":"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -7289,7 +8341,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3145
+=======
+#: code:addons/account/account_move_line.py:1317
+#, python-format
+msgid "Bad account !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3125
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Sales Journal"
msgstr ""
@@ -7300,7 +8362,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1186
+=======
+#: code:addons/account/account_move_line.py:1292
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No piece number !"
msgstr ""
@@ -7355,7 +8421,11 @@
#. module: account
#: selection:account.move.line,centralisation:0
+<<<<<<< TREE
#: code:addons/account/account.py:1502
+=======
+#: code:addons/account/account.py:1535
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Currency Adjustment"
msgstr ""
@@ -7386,7 +8456,25 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:792
+=======
+#: view:account.account:0
+#: view:account.account.template:0
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
+#: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
+#, python-format
+msgid "Payable Accounts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:741
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Global taxes defined, but they are not in invoice lines !"
msgstr ""
@@ -7441,7 +8529,11 @@
#: selection:account.bank.accounts.wizard,account_type:0
#: selection:account.entries.report,type:0
#: selection:account.journal,type:0
+<<<<<<< TREE
#: code:addons/account/account.py:3044
+=======
+#: code:addons/account/account.py:3020
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Cash"
msgstr ""
@@ -7453,8 +8545,30 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:account.invoice.refund,filter_refund:0
msgid "Refund base on this type. You can not Modify and Cancel if the invoice is already reconciled"
+=======
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
+#: code:addons/account/wizard/account_move_journal.py:165
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:56
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
+#, python-format
+msgid "UserError"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -7592,9 +8706,25 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:653
#: code:addons/account/account.py:656
#: code:addons/account/account.py:668
+=======
+#: code:addons/account/account.py:629
+#: code:addons/account/account.py:642
+#: code:addons/account/account.py:645
+#: code:addons/account/account.py:664
+#: code:addons/account/account.py:787
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
+#: code:addons/account/account_move_line.py:97
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Warning !"
msgstr ""
@@ -7662,7 +8792,23 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:873
+=======
+#: code:addons/account/account.py:3463
+#, python-format
+msgid "The bank account defined on the selected chart of accounts hasn't a code."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:108
+#, python-format
+msgid "Can not %s draft/proforma/cancel invoice."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:821
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Invoice Lines !"
msgstr ""
@@ -7701,11 +8847,38 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:388
+#, python-format
+msgid "Invoice '%s' is paid."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:process.node,note:account.process_node_electronicfile0
msgid "Automatic entry"
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr ""
+
+#. module: account
+#: help:product.template,property_account_income:0
+msgid "This account will be used for invoices instead of the default one to value sales for the current product"
+msgstr ""
+
+#. module: account
+#: help:account.journal,group_invoice_lines:0
+msgid "If this box is checked, the system will try to group the accounting lines when generating them from invoices."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.account,reconcile:0
msgid "Check this box if this account allows reconciliation of journal items."
msgstr ""
@@ -7732,7 +8905,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1428
+=======
+#: code:addons/account/account_invoice.py:1345
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You must first select a partner !"
msgstr ""
@@ -7761,6 +8938,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.analytic.account:0
#: view:account.bank.statement:0
#: field:account.bank.statement,state:0
@@ -7792,6 +8970,16 @@
#. module: account
#: view:account.config.settings:0
msgid "No Fiscal Year Defined for This Company"
+=======
+#: model:ir.actions.act_window,help:account.action_tax_code_tree
+msgid "The chart of taxes is used to generate your periodical tax statement. You will see the taxes with codes related to your legal statement according to your country."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:437
+#, python-format
+msgid "Can not find a chart of accounts for this company, you should create one."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -7810,7 +8998,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3148
+=======
+#: code:addons/account/account.py:3128
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Purchase Refund Journal"
msgstr ""
@@ -7904,6 +9096,25 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: help:res.partner,property_payment_term:0
+msgid "This payment term will be used instead of the default one for the current partner"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1042
+#, python-format
+msgid "You can not cancel an invoice which is partially paid! You need to unreconcile related payment entries first!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.chart.template,property_account_income_categ:0
msgid "Income Category Account"
msgstr ""
@@ -7981,6 +9192,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.journal,centralisation:0
msgid "Centralized Counterpart"
msgstr ""
@@ -7988,6 +9200,10 @@
#. module: account
#: help:account.move.line,blocked:0
msgid "You can check this box to mark this journal item as a litigation with the associated partner"
+=======
+#: help:product.category,property_account_income_categ:0
+msgid "This account will be used for invoices to value sales for the current product category"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -8007,11 +9223,24 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice.refund:0
msgid "Use this option if you want to cancel an invoice and create a new\n"
" one. The credit note will be created, validated and reconciled\n"
" with the current invoice. A new, draft, invoice will be created \n"
" so that you can edit it."
+=======
+#: view:account.invoice.report:0
+#: view:analytic.entries.report:0
+msgid "current month"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1057
+#, python-format
+msgid "No period defined for this date: %s !\n"
+"Please create one."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -8110,10 +9339,12 @@
#. module: account
#: report:account.account.balance:0
#: report:account.central.journal:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
msgid "Filter By"
msgstr ""
@@ -8124,10 +9355,9 @@
msgstr ""
#. module: account
-#: view:account.entries.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:account.action_company_analysis_tree
-msgid "Company Analysis"
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
+#, python-format
+msgid "The entries to reconcile should belong to the same company"
msgstr ""
#. module: account
@@ -8136,7 +9366,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3343
+=======
+#: code:addons/account/account.py:3313
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Tax %.2f%%"
msgstr ""
@@ -8154,7 +9388,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3146
+=======
+#: code:addons/account/account.py:3126
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Purchase Journal"
msgstr ""
@@ -8238,6 +9476,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:504
+#, python-format
+msgid "The payment term of supplier does not have a payment term line!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.move.line.reconcile,debit:0
msgid "Debit amount"
msgstr ""
@@ -8265,6 +9512,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,sale_tax_rate:0
msgid "Sales tax (%)"
msgstr ""
@@ -8291,6 +9539,20 @@
#. module: account
#: view:account.journal:0
+=======
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
+#: model:ir.actions.act_window,name:account.action_account_analytic_chart
+#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
+msgid "Chart of Analytic Accounts"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Draft Customer Invoices"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.ui.menu,name:account.menu_configuration_misc
msgid "Miscellaneous"
msgstr ""
@@ -8336,6 +9598,11 @@
msgstr ""
#. module: account
+#: help:account.move.line,blocked:0
+msgid "You can check this box to mark this journal item as a litigation with the associated partner"
+msgstr ""
+
+#. module: account
#: help:account.invoice,internal_number:0
msgid "Unique number of the invoice, computed automatically when the invoice is created."
msgstr ""
@@ -8352,12 +9619,25 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1120
+#, python-format
+msgid "The account move (%s) for centralisation has been confirmed!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.move.line,amount_currency:0
msgid "The amount expressed in an optional other currency if it is a multi-currency entry."
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1009
+=======
+#: code:addons/account/account.py:1315
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "The account move (%s) for centralisation has been confirmed."
msgstr ""
@@ -8414,7 +9694,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2286
+=======
+#: field:account.invoice,address_contact_id:0
+msgid "Contact Address"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2273
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Wrong model !"
msgstr ""
@@ -8463,7 +9752,11 @@
#. module: account
#: field:account.fiscalyear.close,journal_id:0
+<<<<<<< TREE
#: code:addons/account/account.py:3150
+=======
+#: code:addons/account/account.py:3130
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Opening Entries Journal"
msgstr ""
@@ -8474,9 +9767,25 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.bank.statement,message_is_follower:0
#: field:account.invoice,message_is_follower:0
msgid "Is a Follower"
+=======
+#: help:account.chart.template,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 Profilt & Loss Report"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:819
+#, python-format
+msgid "Please define sequence on the journal related to this invoice."
+>>>>>>> MERGE-SOURCE
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reference_type:0
+msgid "Reference Type"
msgstr ""
#. module: account
@@ -8549,12 +9858,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.cashbox.line,pieces:0
msgid "Unit of Currency"
msgstr ""
#. module: account
#: code:addons/account/account.py:3147
+=======
+#: code:addons/account/account.py:3127
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Sales Refund Journal"
msgstr ""
@@ -8618,7 +9931,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:873
+=======
+#: code:addons/account/account_invoice.py:821
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Please create some invoice lines."
msgstr ""
@@ -8635,7 +9952,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3155
+=======
+#: code:addons/account/account.py:3135
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "SCNJ"
msgstr ""
@@ -8690,6 +10011,7 @@
#: field:account.common.journal.report,period_from:0
#: field:account.common.partner.report,period_from:0
#: field:account.common.report,period_from:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
#: field:account.general.journal,period_from:0
#: report:account.general.ledger:0
@@ -8715,6 +10037,7 @@
#. module: account
#: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
msgid "Analysis Direction"
msgstr ""
@@ -8730,6 +10053,11 @@
#. module: account
#: view:account.move.line:0
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1061
+#, python-format
+>>>>>>> MERGE-SOURCE
msgid "Total credit"
msgstr ""
@@ -8754,6 +10082,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,purchase_refund_sequence_prefix:0
msgid "Supplier credit note sequence"
msgstr ""
@@ -8788,6 +10117,17 @@
#: code:addons/account/account_move_line.py:827
#, python-format
msgid "To reconcile the entries company should be the same for all entries."
+=======
+#: xsl:account.transfer:0
+msgid "Document"
+msgstr ""
+
+#. module: account
+#: 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"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -8799,6 +10139,7 @@
#: report:account.analytic.account.inverted.balance:0
#: report:account.central.journal:0
#: field:account.entries.report,balance:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
@@ -8847,6 +10188,25 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: view:account.analytic.account:0
+msgid "Contract Data"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_sale
+msgid "This view is used by accountants in order to record entries massively in OpenERP. If you want to record a customer invoice, select the journal and the period in the search toolbar. Then, start by recording the entry line of the income account. OpenERP will propose to you automatically the Tax related to this account and the counter-part \"Account receivable\"."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#, python-format
+msgid "You must select accounts to reconcile"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:process.transition,note:account.process_transition_entriesreconcile0
msgid "Accounting entries are the first input of the reconciliation."
msgstr ""
@@ -8857,7 +10217,6 @@
msgstr ""
#. module: account
-#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Filters By"
msgstr ""
@@ -8886,9 +10245,13 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_bank_statement.py:477
#: code:addons/account/account_invoice.py:458
#: code:addons/account/wizard/account_period_close.py:51
+=======
+#: code:addons/account/account_move_line.py:1168
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -8962,6 +10325,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,default_sale_tax:0
#: field:account.config.settings,sale_tax:0
msgid "Default sale tax"
@@ -8974,6 +10338,15 @@
#. module: account
#: code:addons/account/account.py:1547
+=======
+#: view:account.account:0
+#: field:account.account,child_consol_ids:0
+msgid "Consolidated Children"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Cannot create moves for different companies."
msgstr ""
@@ -9020,6 +10393,22 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: view:account.entries.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_company_analysis_tree
+msgid "Company Analysis"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:412
+#, python-format
+msgid "No opening/closing period defined, please create one to set the initial balance!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: report:account.account.balance:0
#: field:account.aged.trial.balance,period_to:0
#: field:account.balance.report,period_to:0
@@ -9029,6 +10418,7 @@
#: field:account.common.journal.report,period_to:0
#: field:account.common.partner.report,period_to:0
#: field:account.common.report,period_to:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
#: field:account.general.journal,period_to:0
#: report:account.general.ledger:0
@@ -9048,11 +10438,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:account.account.type,name:account.account_type_expense_view1
msgid "Expense View"
msgstr ""
#. module: account
+=======
+#: code:addons/account/installer.py:94
+#, python-format
+msgid "There are currently no company without chart of account. The wizard will therefore not be executed."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.move.line,date_maturity:0
msgid "Due date"
msgstr ""
@@ -9093,6 +10492,7 @@
#. module: account
#: report:account.account.balance:0
#: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
#: field:account.balance.report,date_from:0
#: report:account.central.journal:0
#: field:account.central.journal,date_from:0
@@ -9100,6 +10500,7 @@
#: field:account.common.journal.report,date_from:0
#: field:account.common.partner.report,date_from:0
#: field:account.common.report,date_from:0
+#: report:account.financial.report:0
#: field:account.fiscalyear,date_start:0
#: report:account.general.journal:0
#: field:account.general.journal,date_from:0
@@ -9146,7 +10547,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:894
+=======
+#: code:addons/account/account_invoice.py:839
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Bad total !"
msgstr ""
@@ -9220,7 +10625,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1122
+=======
+#: code:addons/account/account_invoice.py:381
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You cannot do this modification on a confirmed entry. You can just change some non legal fields or you must unconfirm the journal entry first.\n"
"%s."
@@ -9269,6 +10678,7 @@
#: report:account.analytic.account.inverted.balance:0
#: report:account.central.journal:0
#: field:account.entries.report,credit:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
@@ -9352,9 +10762,16 @@
#: view:accounting.report:0
#: selection:accounting.report,filter:0
#: selection:accounting.report,filter_cmp:0
+<<<<<<< TREE
#: model:ir.actions.act_window,name:account.action_account_period
#: model:ir.ui.menu,name:account.menu_action_account_period
+=======
+#: code:addons/account/report/common_report_header.py:99
+#: model:ir.actions.act_window,name:account.action_account_period_form
+#: model:ir.ui.menu,name:account.menu_action_account_period_form
+>>>>>>> MERGE-SOURCE
#: model:ir.ui.menu,name:account.next_id_23
+#, python-format
msgid "Periods"
msgstr ""
@@ -9497,6 +10914,7 @@
#: field:account.common.journal.report,date_to:0
#: field:account.common.partner.report,date_to:0
#: field:account.common.report,date_to:0
+#: report:account.financial.report:0
#: field:account.fiscalyear,date_stop:0
#: report:account.general.journal:0
#: field:account.general.journal,date_to:0
@@ -9545,6 +10963,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_analytic_line.py:100
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.account,unrealized_gain_loss:0
#: model:ir.actions.act_window,name:account.action_account_gain_loss
#: model:ir.ui.menu,name:account.menu_unrealized_gains_losses
@@ -9569,6 +11001,7 @@
msgstr ""
#. module: account
+#: report:account.aged_trial_balance:0
#: report:account.analytic.account.balance:0
#: report:account.analytic.account.inverted.balance:0
#: report:account.analytic.account.quantity_cost_ledger:0
@@ -9598,6 +11031,7 @@
#. module: account
#: field:account.account,company_id:0
+#: report:account.account.balance:0
#: field:account.aged.trial.balance,company_id:0
#: field:account.analytic.journal,company_id:0
#: field:account.balance.report,company_id:0
@@ -9613,7 +11047,9 @@
#: field:account.entries.report,company_id:0
#: field:account.fiscal.position,company_id:0
#: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
#: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,company_id:0
#: field:account.invoice,company_id:0
#: field:account.invoice.line,company_id:0
@@ -9622,6 +11058,8 @@
#: field:account.invoice.tax,company_id:0
#: field:account.journal,company_id:0
#: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
#: field:account.model,company_id:0
#: field:account.move,company_id:0
#: field:account.move.line,company_id:0
@@ -9733,6 +11171,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: view:wizard.multi.charts.accounts:0
+msgid "Generate Your Chart of Accounts from a Chart Template"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: 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. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs."
msgstr ""
@@ -9786,6 +11232,7 @@
#: report:account.analytic.account.inverted.balance:0
#: report:account.central.journal:0
#: field:account.entries.report,debit:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
@@ -9814,6 +11261,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:account.model.line,quantity:0
msgid "The optional quantity on entries."
msgstr ""
@@ -9821,6 +11269,39 @@
#. module: account
#: field:account.automatic.reconcile,reconciled:0
msgid "Reconciled transactions"
+=======
+#: help:product.category,property_account_expense_categ:0
+msgid "This account will be used for invoices to value expenses for the current product category"
+msgstr ""
+
+#. module: account
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr ""
+
+#. module: account
+#: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
+msgid "Journal Entry Number"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Recurring"
+msgstr ""
+
+#. module: account
+#: 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!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:843
+#, python-format
+msgid "Entry is already reconciled"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -9855,8 +11336,10 @@
msgstr ""
#. module: account
+#: report:account.account.balance:0
#: selection:account.balance.report,display_account:0
#: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
#: selection:account.report.general.ledger,display_account:0
msgid "With movements"
msgstr ""
@@ -9944,6 +11427,21 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
+msgid "Statistic Reports"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
+#, python-format
+msgid "Bad account!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.print.journal,sort_selection:0
msgid "Entries Sorted by"
msgstr ""
@@ -9961,6 +11459,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_tax_code_list
msgid "<p class=\"oe_view_nocontent_create\">\n"
" Click to define a new tax code.\n"
@@ -9971,6 +11470,11 @@
" one or several tax code.\n"
" </p>\n"
" "
+=======
+#: code:addons/account/account_invoice.py:373
+#, python-format
+msgid "Invoice '%s' is waiting for validation."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -10007,6 +11511,12 @@
msgstr ""
#. module: account
+#: code:addons/account/account.py:1359
+#, python-format
+msgid "You can not modify a posted entry of closed periods"
+msgstr ""
+
+#. module: account
#: report:account.general.journal:0
#: model:ir.actions.report.xml,name:account.account_general_journal
msgid "General Journal"
@@ -10113,6 +11623,7 @@
#. module: account
#: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
#: field:account.common.partner.report,result_selection:0
#: report:account.partner.balance:0
#: field:account.partner.balance,result_selection:0
@@ -10193,6 +11704,8 @@
#. module: account
#: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
msgid "Future"
msgstr ""
@@ -10224,11 +11737,19 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:res.partner,property_payment_term:0
msgid "Customer Payment Term"
msgstr ""
#. module: account
+=======
+#: field:account.analytic.line,amount_currency:0
+msgid "Amount currency"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:accounting.report,label_filter:0
msgid "This label will be displayed on report to show the balance computed for the given comparison filter."
msgstr ""
=== modified file 'account/i18n/ar.po'
--- account/i18n/ar.po 2013-04-05 11:10:48 +0000
+++ account/i18n/ar.po 2013-04-10 14:12:36 +0000
@@ -6,15 +6,32 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-12-15 22:53+0000\n"
"Last-Translator: gehad shaat <gehad.shaath@xxxxxxxxx>\n"
+=======
+"POT-Creation-Date: 2012-10-23 11:48+0000\n"
+"PO-Revision-Date: 2012-11-16 20:07+0000\n"
+"Last-Translator: kifcaliph <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: 2013-03-16 05:12+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2012-11-17 05:06+0000\n"
+"X-Generator: Launchpad (build 16278)\n"
+
+#. module: account
+#: view:account.invoice.report:0
+#: view:analytic.entries.report:0
+msgid "last month"
+msgstr "الشهر الماضي"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -83,12 +100,18 @@
msgstr "حساب غير صالح!"
#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Aged Trial Balance"
+msgstr "ميزان المراجعة القديم"
+
+#. module: account
#: view:account.move:0
#: view:account.move.line:0
msgid "Total Debit"
msgstr "مجموع المدين"
#. module: account
+<<<<<<< TREE
#: constraint:account.account.template:0
msgid ""
"Error!\n"
@@ -99,6 +122,33 @@
#. module: account
#. openerp-web
+=======
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconciliate transactions, you must also verify all the actions "
+"that are linked to those transactions because they will not be disabled"
+msgstr ""
+"إذا كنت توافق على المعاملات ، يجب عليك أيضا التحقق من كافة الإجراءات التي "
+"ترتبط بتلك المعاملات لأنه لن يكونوا غير مفعّلين"
+
+#. module: account
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"خطأ في الإعدادات! يجب أن تكون العملة المختارة مشتركة للحسابات الإفتراضية "
+"أيضأً."
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.line,origin:0
+msgid "Origin"
+msgstr "المصدر"
+
+#. module: account
+#: view:account.account:0
+>>>>>>> MERGE-SOURCE
#: view:account.automatic.reconcile:0
#: field:account.move.line,reconcile_id:0
#: view:account.move.line.reconcile:0
@@ -115,8 +165,12 @@
#: field:account.move,ref:0
#: field:account.move.line,ref:0
#: field:account.subscription,ref:0
+<<<<<<< TREE
#: xsl:account.transfer:0
#: field:cash.box.in,ref:0
+=======
+#: xsl:account.transfer:0
+>>>>>>> MERGE-SOURCE
msgid "Reference"
msgstr "المرجع"
@@ -130,6 +184,7 @@
"إزالتها."
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:641
#: code:addons/account/account.py:686
#: code:addons/account/account.py:781
@@ -148,12 +203,19 @@
#: 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
+=======
+#: code:addons/account/account_invoice.py:1430
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Warning!"
msgstr "تحذير!"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3159
+=======
+#: code:addons/account/account.py:3129
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Miscellaneous Journal"
msgstr "يومية ممتنوعة"
@@ -196,9 +258,16 @@
msgstr "عمود الأسماء"
#. module: account
+<<<<<<< TREE
#: help:account.config.settings,code_digits:0
msgid "No. of digits to use for account code"
msgstr "عدد الأرقام التي يتم استخدامها لرمز الحساب"
+=======
+#: code:addons/account/wizard/account_move_journal.py:95
+#, python-format
+msgid "Journal: %s"
+msgstr "دفتر اليومية: %s"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.analytic.journal,type:0
@@ -230,6 +299,25 @@
msgstr "انقل السطر و اختر الموازنة"
#. module: account
+<<<<<<< TREE
+=======
+#: help:account.tax.code,notprintable:0
+#: help:account.tax.code.template,notprintable:0
+msgid ""
+"Check this box if you don't want any VAT related to this Tax Code to appear "
+"on invoices"
+msgstr ""
+"تحقق من هذا المربع اذا كنت لاتريد ضريبة القيمة المضافة المتعلقة بكود الضريبه "
+"لتظهر على الفواتير."
+
+#. module: account
+#: code:addons/account/account_invoice.py:1254
+#, 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 المتبقي)"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
msgid "Accounting entries are an input of the reconciliation."
msgstr "سيتم استخدام القيود المحاسبية أثناء التسوية."
@@ -240,6 +328,7 @@
msgstr "تقارير دولة بلجيكا"
#. module: account
+<<<<<<< TREE
#: model:mail.message.subtype,name:account.mt_invoice_validated
msgid "Validated"
msgstr ""
@@ -248,6 +337,12 @@
#: model:account.account.type,name:account.account_type_income_view1
msgid "Income View"
msgstr ""
+=======
+#: code:addons/account/account_move_line.py:1215
+#, python-format
+msgid "You can not add/modify entries in a closed journal."
+msgstr "لايمكن اضافة أو تعديل البيانات في دفتر يومية مقفل."
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.account,user_type:0
@@ -256,6 +351,7 @@
"legal reports, and set the rules to close a fiscal year and generate opening "
"entries."
msgstr ""
+<<<<<<< TREE
"يستخدم نوع الحساب لغرض الاستعلام، لتوليد تقارير قانونية خاصة ببلد معين, "
"ولتحديد قواعد إنهاء عام مالي و توليد إدخالات افتتاحية."
@@ -271,6 +367,15 @@
"sales, purchase, expense, contra, etc.\n"
" This installs the module account_voucher."
msgstr ""
+=======
+"يستخدم نوع الحساب لغرض الاستعلام، لتوليد تقارير قانونية خاصة ببلد معين, "
+"ولتحديد قواعد إنهاء عام مالي و توليد إدخالات افتتاحية."
+
+#. module: account
+#: report:account.overdue:0
+msgid "Sub-Total :"
+msgstr "جزئي:"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
@@ -288,6 +393,7 @@
msgstr "اختر الفترة للتحليل"
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_invoice_tree3
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -302,6 +408,22 @@
" </p>\n"
" "
msgstr ""
+=======
+#: view:account.move.line:0
+msgid "St."
+msgstr "شارع"
+
+#. module: account
+#: code:addons/account/account_invoice.py:560
+#, python-format
+msgid "Invoice line account company does not match with invoice company."
+msgstr "الشركة في سطر حساب الفاتورة تختلف عن الشركة في الفاتورة"
+
+#. module: account
+#: field:account.journal.column,field:0
+msgid "Field Name"
+msgstr "اسم الحقل"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.installer,charts:0
@@ -309,7 +431,25 @@
"Installs localized accounting charts to match as closely as possible the "
"accounting needs of your company based on your country."
msgstr ""
-"يقوم بتثبيت دليل محاسبي متوافق مع احتياجات مؤسستك حسب قوانين وأنظمة بلدك."
+<<<<<<< TREE
+"يقوم بتثبيت دليل محاسبي متوافق مع احتياجات مؤسستك حسب قوانين وأنظمة بلدك."
+=======
+"يقوم بتثبيت دليل محاسبي متوافق مع احتياجات مؤسستك حسب قوانين وأنظمة بلدك."
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:63
+#, python-format
+msgid ""
+"Can't find any account journal of %s type for this company.\n"
+"\n"
+"You can create one in the menu: \n"
+"Configuration/Financial Accounting/Accounts/Journals."
+msgstr ""
+"لايمكن العثور على دفتر حسابات من النوع %s لهذه الشركة.\n"
+"\n"
+"يمكنك إضافة دفتر من القائمة:\n"
+"إعدادات > حسابات مالية > حسابات > دفاتر"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_unreconcile
@@ -333,6 +473,7 @@
"leave the automatic formatting, it will be computed based on the financial "
"reports hierarchy (auto-computed field 'level')."
msgstr ""
+<<<<<<< TREE
"يمكنك هنا إعداد التنسيق الذى ترىد ان يظهر به هذا السجل. إذا تركت التنسيق "
"الآلي, سيتم تعيينه آلياً بناءً على هيكل التقارير المالية."
@@ -346,6 +487,15 @@
#, python-format
msgid "You must define an analytic journal of type '%s'!"
msgstr "يجب تعريف دفتر يومية تحليلي من نوع '%s'!"
+=======
+"يمكنك هنا إعداد التنسيق الذى ترىد ان يظهر به هذا السجل. إذا تركت التنسيق "
+"الآلي, سيتم تعيينه آلياً بناءً على هيكل التقارير المالية."
+
+#. module: account
+#: view:account.installer:0
+msgid "Configure"
+msgstr "إعداد"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.entries.report,month:0
@@ -357,6 +507,7 @@
msgstr "يونيو/حزيران"
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_automatic_reconcile.py:148
#, python-format
msgid "You must select accounts to reconcile."
@@ -380,6 +531,27 @@
#: view:account.invoice:0
msgid "Responsible"
msgstr "مسئول"
+=======
+#: model:ir.actions.act_window,help:account.action_account_moves_bank
+msgid ""
+"This view is used by accountants in order to record entries massively in "
+"OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
+"Cash Registers, or Customer/Supplier payments."
+msgstr ""
+"طريقة العرض هذه يتم استخدامها بواسطة المحاسبين لإدخال مجموعة بيانات دفعة "
+"واحدة. أما بنود الدفتر يتم إنشاءها في حالة استخدام كشف حساف، تسجيل نقدية أو "
+"مدفوعات مورد/عميل."
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr "لا يمكنك إنشاء عناصر يومية علي حساب من نوع ’عرض’."
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "account.tax.template"
+msgstr "account.tax.template"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_bank_accounts_wizard
@@ -475,12 +647,16 @@
#. module: account
#: help:account.model.line,amount_currency:0
msgid "The amount expressed in an optional other currency."
+<<<<<<< TREE
msgstr "قيمة المبلغ بعملة اختيارية أخرى."
#. module: account
#: view:account.journal:0
msgid "Available Coins"
msgstr ""
+=======
+msgstr "قيمة المبلغ بعملة اختيارية أخرى."
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:accounting.report,enable_filter:0
@@ -528,12 +704,16 @@
#. module: account
#: field:account.addtmpl.wizard,cparent_id:0
msgid "Parent target"
+<<<<<<< TREE
msgstr "الهدف الرئيسي"
#. module: account
#: help:account.invoice.line,sequence:0
msgid "Gives the sequence of this line when displaying the invoice."
msgstr "يعطي التسلسل لهذا الخط عند اظهار الفاتورة"
+=======
+msgstr "الهدف الرئيسي"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.bank.statement,account_id:0
@@ -598,6 +778,7 @@
msgstr "الحساب يؤكد الكشف"
#. module: account
+<<<<<<< TREE
#. openerp-web
#: code:addons/account/static/src/xml/account_move_reconciliation.xml:31
#, python-format
@@ -611,6 +792,24 @@
#. module: account
#: selection:account.config.settings,period:0
+=======
+#: report:account.account.balance:0
+#: selection:account.balance.report,display_account:0
+#: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
+#: selection:account.report.general.ledger,display_account:0
+#: selection:account.tax,type_tax_use:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "All"
+msgstr "الكل"
+
+#. module: account
+#: field:account.invoice.report,address_invoice_id:0
+msgid "Invoice Address Name"
+msgstr "اسم عنوان الفاتورة"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: selection:account.installer,period:0
msgid "3 Monthly"
msgstr "ربع سنوي"
@@ -651,6 +850,7 @@
msgstr "المسلسل الرئيسي لابد أن يختلف من الحالي !"
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_change_currency.py:64
#: code:addons/account/wizard/account_change_currency.py:70
#, python-format
@@ -664,6 +864,9 @@
#. module: account
#: code:addons/account/account_move_line.py:1159
+=======
+#: code:addons/account/account_move_line.py:1266
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No period found or more than one period found for the given date."
msgstr "لا توجد نقطة فاصلة في التاريخ أو توجد أكثر من نقطة."
@@ -674,7 +877,11 @@
msgstr "تقرير المبيعات حسب نوع الحساب"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3163
+=======
+#: code:addons/account/account.py:3133
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "SAJ"
msgstr "شباب العمال الاشتراكي."
@@ -714,6 +921,7 @@
msgstr "فترة السجل"
#. module: account
+<<<<<<< TREE
#: constraint:account.move:0
msgid ""
"You cannot create more than one move per period on a centralized journal."
@@ -726,6 +934,13 @@
"lines for refunds. Leave empty if you don't want to use an analytic account "
"on the invoice tax lines by default."
msgstr ""
+=======
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#, python-format
+msgid "To reconcile the entries company should be the same for all entries"
+msgstr "الشركة يجب ان تكون واحدة لجميع المدخلات حتى يمكن تسويتها"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.account:0
@@ -733,7 +948,13 @@
#: selection:account.common.partner.report,result_selection:0
#: selection:account.partner.balance,result_selection:0
#: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:372
#: code:addons/account/report/account_partner_balance.py:297
+<<<<<<< TREE
+=======
+#: code:addons/account/report/account_partner_ledger.py:395
+#: model:ir.actions.act_window,name:account.action_aged_receivable
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Receivable Accounts"
msgstr "حسابات مدينة"
@@ -822,6 +1043,16 @@
msgstr "طريقة إعادة المال"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/wizard/account_change_currency.py:38
+#, python-format
+msgid "You can only change currency for Draft Invoice !"
+msgstr "يمكن تغيير العملة في مسودة الفتورة"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
+>>>>>>> MERGE-SOURCE
#: model:ir.ui.menu,name:account.menu_account_report
msgid "Financial Report"
msgstr "التقرير المالي"
@@ -844,7 +1075,11 @@
msgstr "نوع"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:794
+=======
+#: code:addons/account/account_invoice.py:747
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Taxes are missing!\n"
@@ -879,7 +1114,16 @@
#: view:account.unreconcile.reconcile:0
#: model:ir.model,name:account.model_account_move_line_unreconcile_select
msgid "Unreconciliation"
-msgstr "إلغاء التسوية"
+<<<<<<< TREE
+msgstr "إلغاء التسوية"
+=======
+msgstr "إلغاء التسوية"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
+msgstr "عند 14 يوم صافي 2%، والمبلغ المتبقي عند 30 يوم نهاية الشهر"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_analytic_journal_report
@@ -908,9 +1152,22 @@
msgstr "نقل اسم/ j.c."
#. module: account
+<<<<<<< TREE
#: view:account.account:0
msgid "Account Code and Name"
msgstr "رمز واسم الحساب"
+=======
+#: model:ir.actions.act_window,help:account.action_account_gain_loss
+msgid ""
+"When doing multi-currency transactions, you may loose or gain some amount "
+"due to changes of exchange rate. This menu gives you a forecast of the Gain "
+"or Loss you'd realized if those transactions were ended today. Only for "
+"accounts having a secondary currency set."
+msgstr ""
+"عند القيام بعمليات متعددة العملات، قد تكسب أو تخسر قليلاً بسبب التغيرات في "
+"سعر الصرف. توفر لك هذه القائمة توقعات بالمكسب أو الخسارة اللتان كنت ستحققهما "
+"في حالة إتمام هذه العمليات اليوم (للحسابات التي لها عملة ثانوية فقط)."
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.entries.report,month:0
@@ -979,11 +1236,13 @@
msgstr "إنشاء فترة 3 اشهر"
#. module: account
+#: report:account.aged_trial_balance:0
#: report:account.overdue:0
msgid "Due"
msgstr "مستحق"
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,purchase_journal_id:0
msgid "Purchase journal"
msgstr "يومية المشتريات"
@@ -994,6 +1253,20 @@
msgstr ""
#. module: account
+=======
+#: code:addons/account/account.py:1353
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"!"
+msgstr ""
+"لا يمكنك التحقق من صحة قيد اليومية لأن الحساب \"%s\" لاينتمى إلى الدليل "
+"المحاسبي \"%s\"!"
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.move:0
+>>>>>>> MERGE-SOURCE
#: view:validate.account.move:0
#: view:validate.account.move.lines:0
msgid "Approve"
@@ -1068,6 +1341,15 @@
"المبلغ الرئيسي (دون الضريبة)."
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:2613
+#, python-format
+msgid "I can not locate a parent code for the template account!"
+msgstr "لا أستطيع تحديد النرميز الأصلي للحساب النموذجي!"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.analytic.line:0
msgid "Purchases"
msgstr "مشتريات"
@@ -1095,6 +1377,7 @@
msgstr "رمز"
#. module: account
+<<<<<<< TREE
#: view:account.config.settings:0
msgid "Features"
msgstr "مزايا"
@@ -1105,6 +1388,13 @@
#: code:addons/account/account_invoice.py:74
#: code:addons/account/account_invoice.py:744
#: code:addons/account/account_move_line.py:195
+=======
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_bank_statement.py:357
+#: code:addons/account/account_invoice.py:73
+#: code:addons/account/account_invoice.py:697
+#: code:addons/account/account_move_line.py:173
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Analytic Journal !"
msgstr "لا يوجد يومية تحليلية !"
@@ -1164,6 +1454,23 @@
msgstr "وضع أفقي"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:645
+#, python-format
+msgid ""
+"You cannot change the type of account from '%s' to '%s' type as it contains "
+"journal items!"
+msgstr ""
+"لا يمكنك تغيير نوع الحساب من نوع '%s' إلى نوع '%s' لأنه يحتوي على سجلات!"
+
+#. module: account
+#: field:account.report.general.ledger,sortby:0
+msgid "Sort by"
+msgstr "ترتيب حسب"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.fiscalyear.close,fy_id:0
msgid "Select a Fiscal year to close"
msgstr "اختيار السنة المالية للاقفال"
@@ -1178,15 +1485,25 @@
"وخصوصياتها."
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "Refund "
msgstr "استرداد "
#. module: account
#: code:addons/account/account_analytic_line.py:90
+=======
+#: code:addons/account/account_move_line.py:856
+>>>>>>> MERGE-SOURCE
#, python-format
+<<<<<<< TREE
msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
msgstr ""
+=======
+msgid ""
+"You have to provide an account for the write off/exchange difference entry !"
+msgstr "لابد من توفير حساب لإدخال تخفيض/ سعر التحويل!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.tax:0
@@ -1206,6 +1523,7 @@
msgstr "سجلات النقدية"
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,sale_refund_journal_id:0
msgid "Sale refund journal"
msgstr "يومية استرداد المبيعات"
@@ -1227,11 +1545,38 @@
" </p>\n"
" "
msgstr ""
+=======
+#: report:account.analytic.account.journal:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "-"
+msgstr "-"
+
+#. module: account
+#: view:account.analytic.account:0
+#: model:res.groups,name:account.group_account_manager
+msgid "Manager"
+msgstr "مدير"
+
+#. module: account
+#: view:account.subscription.generate:0
+msgid "Generate Entries before:"
+msgstr "تكوين المدخلات قبل:"
+
+#. module: account
+#: view:account.move.line:0
+msgid "Unbalanced Journal Items"
+msgstr "قيود دفتر اليومية غير متوازنة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:account.account.type,name:account.data_account_type_bank
#: selection:account.bank.accounts.wizard,account_type:0
+<<<<<<< TREE
#: code:addons/account/account.py:3054
+=======
+#: code:addons/account/account.py:3020
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Bank"
msgstr "مصرف"
@@ -1277,6 +1622,26 @@
msgstr "مركزية الدين"
#. module: account
+<<<<<<< TREE
+=======
+#: view:report.account_type.sales:0
+msgid "All Months Sales by type"
+msgstr "مبيعات جميع الأشهر حسب نوعها"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree2
+msgid ""
+"With Supplier Invoices you can enter and manage invoices issued by your "
+"suppliers. OpenERP can also generate draft invoices automatically from "
+"purchase orders or receipts. This way, you can control the invoice from your "
+"supplier according to what you purchased or received."
+msgstr ""
+"يمكنك مع المزود ان اتدخل وتدير الفواتير المصدرة من مزوداتك. يمكن انتاج "
+"فواتير مسودة بفتح erp تلقائيًا من اوامر المشترى او الاستلامات. بتلك الطريقة, "
+"يمكنك التحكم في الفاتورة من مزودك طبقًا لما اشتريته او استقبلته."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
#: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
msgid "Tax Code Templates"
@@ -1335,6 +1700,19 @@
msgstr "الحركة لخط هذا القيد"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1317
+#, python-format
+msgid ""
+"You can not use this general account in this journal, check the tab 'Entry "
+"Controls' on the related journal !"
+msgstr ""
+"لا يمكنك استخدام هذا الحساب العام في دفتر اليومية هذا. تحقق من شريط \"ضوابط "
+"الإدخال\" في دفتر اليومية."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.move.line.reconcile,trans_nbr:0
msgid "# of Transaction"
msgstr "عدد الحركات"
@@ -1348,6 +1726,15 @@
msgstr "تسمية القيد"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:1136
+#, python-format
+msgid "You can not modify/delete a journal with entries for this period !"
+msgstr "لا يمكنك تعديل/مسح يومية بقيود لهذه الفترة"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.invoice,origin:0
#: help:account.invoice.line,origin:0
msgid "Reference of the document that produced this invoice."
@@ -1431,7 +1818,12 @@
msgstr "الضرائب"
#. module: account
-#: code:addons/account/wizard/account_financial_report.py:70
+<<<<<<< TREE
+#: code:addons/account/wizard/account_financial_report.py:70
+=======
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Select a starting and an ending period"
msgstr "اختر بداية و نهاية للفترة"
@@ -1498,6 +1890,7 @@
msgstr "تحليل عناصر اليومية"
#. module: account
+#: report:account.aged_trial_balance:0
#: model:ir.ui.menu,name:account.next_id_22
msgid "Partners"
msgstr "شركاء"
@@ -1540,8 +1933,10 @@
msgstr ""
#. module: account
+#: report:account.account.balance:0
#: selection:account.balance.report,display_account:0
#: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
#: selection:account.partner.balance,display_partner:0
#: selection:account.report.general.ledger,display_account:0
msgid "With balance is not equal to 0"
@@ -1563,6 +1958,121 @@
msgstr "بحث الضرائب"
#. module: account
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello${object.address_invoice_id.name and ' ' or "
+"''}${object.address_invoice_id.name or ''},</p>\n"
+" \n"
+" <p>A new invoice is available for ${object.partner_id.name}: </p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" <strong>REFERENCES</strong><br />\n"
+" Invoice number: <strong>${object.number}</strong><br />\n"
+" Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+" Invoice date: ${object.date_invoice}<br />\n"
+" % if object.origin:\n"
+" Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" Your contact: <a "
+"href=\"mailto:${object.user_id.user_email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+" </p> \n"
+" \n"
+" <p>\n"
+" You can view the invoice document, download it and pay online using the "
+"following link:\n"
+" </p>\n"
+" <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\" \n"
+" href=\"${ctx.get('edi_web_url_view') or ''}\">View "
+"Invoice</a>\n"
+" \n"
+" % if object.company_id.paypal_account and object.type in ('out_invoice', "
+"'in_refund'):\n"
+" <% \n"
+" comp_name = quote(object.company_id.name)\n"
+" inv_number = quote(object.number)\n"
+" paypal_account = quote(object.company_id.paypal_account)\n"
+" inv_amount = quote(str(object.amount_total))\n"
+" cur_name = quote(object.currency_id.name)\n"
+" paypal_url = \"https://www.paypal.com/cgi-";
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s&"
+"\" \\\n"
+" "
+"\"invoice=%s&amount=%s&currency_code=%s&button_subtype=services&a"
+"mp;no_note=1&bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
+"\n"
+" %>\n"
+" <br/>\n"
+" <p>It is also possible to directly pay with Paypal:</p>\n"
+" <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+" <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+" </a>\n"
+" % endif\n"
+" \n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone: ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web : <a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger
msgid "Account Analytic Cost Ledger"
msgstr "حساب تحليل تكاليف الأستاذ"
@@ -1781,11 +2291,19 @@
msgstr "فاتورة"
#. module: account
+<<<<<<< TREE
#: field:account.move,balance:0
msgid "balance"
msgstr "الرصيد"
#. module: account
+=======
+#: field:account.move,balance:0
+msgid "balance"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:process.node,note:account.process_node_analytic0
#: model:process.node,note:account.process_node_analyticcost0
msgid "Analytic costs to invoice"
@@ -1797,6 +2315,7 @@
msgstr "مسلسل السنة المالية"
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,group_analytic_accounting:0
msgid "Analytic accounting"
msgstr "المحاسبة التحليلية"
@@ -1818,6 +2337,17 @@
"should choose 'Round per line' because you certainly want the sum of your "
"tax-included line subtotals to be equal to the total amount with taxes."
msgstr ""
+=======
+#: field:wizard.multi.charts.accounts,seq_journal:0
+msgid "Separated Journal Sequences"
+msgstr "مسلسلات اليومية منفصلة"
+
+#. module: account
+#: field:account.bank.statement,user_id:0
+#: view:account.invoice:0
+msgid "Responsible"
+msgstr "مسئول"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
@@ -1862,6 +2392,16 @@
msgstr "جمع السنة"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:1431
+#, 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 "هذا المعالج لتغيير العملة للفاتورة"
@@ -1876,6 +2416,7 @@
#. module: account
#: view:account.analytic.account:0
msgid "Pending Accounts"
+<<<<<<< TREE
msgstr "حسابات معلقة"
#. module: account
@@ -1885,6 +2426,11 @@
#. module: account
#: report:account.journal.period.print.sale.purchase:0
+=======
+msgstr "حسابات معلقة"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.tax.template:0
msgid "Tax Declaration"
msgstr "الإعلان الضريبي"
@@ -1943,6 +2489,7 @@
msgstr "مرجع العميل"
#. module: account
+<<<<<<< TREE
#: help:account.tax,base_code_id:0
#: help:account.tax,ref_base_code_id:0
#: help:account.tax,ref_tax_code_id:0
@@ -1953,6 +2500,12 @@
#: help:account.tax.template,tax_code_id:0
msgid "Use this code for the tax declaration."
msgstr "استخدم هذا الرمز للإقرار الضريبي"
+=======
+#: code:addons/account/account_cash_statement.py:293
+#, python-format
+msgid "User %s does not have rights to access %s journal !"
+msgstr "المستخدم %s ليس لديه صلاحيات الكتابة و التحرير ليومية %s!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.period,special:0
@@ -2191,9 +2744,25 @@
msgstr "فئة المنتج"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:656
#, python-format
+=======
+#: code:addons/account/installer.py:94
+#, python-format
+msgid "No unconfigured company !"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "/"
+msgstr "/"
+
+#. module: account
+#: help:res.company,property_reserve_and_surplus_account:0
+>>>>>>> MERGE-SOURCE
msgid ""
+<<<<<<< TREE
"You cannot change the type of account to '%s' type as it contains journal "
"items!"
msgstr ""
@@ -2219,6 +2788,20 @@
#: sql_constraint:account.fiscal.position.tax:0
msgid "A tax fiscal position could be defined only once time on same taxes."
msgstr ""
+=======
+"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"
+msgstr ""
+"يستخدم هذا الحساب لتحويل الربح والخسارة (في حالة الربح: سيتم إضافة المبلغ، "
+"الخسارة: سيتم خصم المبلغ)، حسب تقرير الأرباح والخسائر"
+
+#. module: account
+#: model:process.node,note:account.process_node_reconciliation0
+#: model:process.node,note:account.process_node_supplierreconciliation0
+msgid "Comparison between accounting and payment entries"
+msgstr "مقارنة الحسابات مع قيود المدفوعات"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.tax:0
@@ -2248,8 +2831,13 @@
#. openerp-web
#: code:addons/account/static/src/xml/account_move_reconciliation.xml:8
#, python-format
+<<<<<<< TREE
msgid "Good job!"
msgstr ""
+=======
+msgid "You must define an analytic journal of type '%s'!"
+msgstr "يجب تعريف دفتر يومية تحليلي من نوع '%s'!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.config.settings,module_account_asset:0
@@ -2275,8 +2863,18 @@
"currency. You should remove the secondary currency on the account or select "
"a multi-currency view on the journal."
msgstr ""
-"الحساب المحدد لقيد اليومية يجبرك علي توفير عملة ثانوية. يجب إزالة العملة "
-"الثانوية على الحساب أو تحديد طريقة عرض العملات في اليومية."
+<<<<<<< TREE
+"الحساب المحدد لقيد اليومية يجبرك علي توفير عملة ثانوية. يجب إزالة العملة "
+"الثانوية على الحساب أو تحديد طريقة عرض العملات في اليومية."
+=======
+"الحساب المحدد لقيد اليومية يجبرك علي توفير عملة ثانوية. يجب إزالة العملة "
+"الثانوية على الحساب أو تحديد طريقة عرض العملات في اليومية."
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_financial_report_tree
+msgid "Makes a generic system to draw financial reports easily."
+msgstr "ينشئ نظاماً عاماً لاستخلاص التقارير المالية بسهولة."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice:0
@@ -2300,6 +2898,7 @@
#. module: account
#: selection:account.financial.report,style_overwrite:0
msgid "Italic Text (smaller)"
+<<<<<<< TREE
msgstr "نص مائل (أصغر)"
#. module: account
@@ -2308,6 +2907,9 @@
"If you want the journal should be control at opening/closing, check this "
"option"
msgstr "اذا كنت تريد التحكم باليومية عند الفتح/اللإغلاق، اختر هذا الخيار."
+=======
+msgstr "نص مائل (أصغر)"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.bank.statement:0
@@ -2320,7 +2922,16 @@
#: selection:account.subscription,state:0
#: selection:report.invoice.created,state:0
msgid "Draft"
+<<<<<<< TREE
msgstr "مسودة"
+=======
+msgstr "مسودّة"
+
+#. module: account
+#: report:account.journal.period.print.sale.purchase:0
+msgid "VAT Declaration"
+msgstr "إعلان ضريبة القيمة المضافة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.move.reconcile,line_partial_ids:0
@@ -2340,6 +2951,11 @@
msgstr "الترميز المعياري"
#. module: account
+#: xsl:account.transfer:0
+msgid "Partner ID"
+msgstr ""
+
+#. module: account
#: view:account.journal.select:0
#: view:project.account.analytic.line:0
msgid "Open Entries"
@@ -2393,6 +3009,7 @@
#. module: account
#: code:addons/account/account_cash_statement.py:256
#, python-format
+<<<<<<< TREE
msgid "You do not have rights to open this %s journal !"
msgstr "ليس لديك الصلاحيات لفتح هذه %s اليومية!"
@@ -2400,6 +3017,10 @@
#: model:res.groups,name:account.group_supplier_inv_check_total
msgid "Check Total on supplier invoices"
msgstr "افحص المجموع لفواتير المورد"
+=======
+msgid "You have to assign an analytic journal on the '%s' journal!"
+msgstr "لديك تعيين تحليل اليومية علي'%s' دفتر اليومية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.invoice,state:0
@@ -2410,6 +3031,19 @@
msgstr "كمسألة شكلية"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:1478
+#, python-format
+msgid ""
+"There is no default default debit account defined \n"
+"on journal \"%s\""
+msgstr ""
+"لا يوجد حساب إفتراضي معرف \n"
+"في دفتر يومية الـ \"%s\""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.account.template,type:0
#: help:account.entries.report,type:0
msgid ""
@@ -2430,9 +3064,45 @@
msgstr "بحث قوالب دليل الحسابات"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1292
+#, python-format
+msgid ""
+"Can not create an automatic sequence for this piece!\n"
+"Put a sequence in the journal definition for automatic numbering or create a "
+"sequence manually for this piece."
+msgstr ""
+"لم يتم التمكن من إنشاء تسلسل تلقائي لهذه القطعة!\n"
+"ضع تسلسل في تعريف السجل للترقيم التلقائي أو أنشيئ التسلسل يدويا لهذه القطعة."
+
+#. module: account
+#: code:addons/account/account.py:787
+#, python-format
+msgid ""
+"You can not modify the company of this journal as its related record exist "
+"in journal items"
+msgstr "لا يمكن تعديل الشركه المتسجله في المجله والموجوده في البنود اليوميه"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: report:account.invoice:0
msgid "Customer Code"
-msgstr "رمز العميل"
+<<<<<<< TREE
+msgstr "رمز العميل"
+=======
+msgstr "رمز العميل"
+
+#. module: account
+#: view:account.installer:0
+msgid ""
+"The default Chart of Accounts is matching your country selection. If no "
+"certified Chart of Accounts exists for your specified country, a generic one "
+"can be installed and will be selected by default."
+msgstr ""
+"تطابق المخطط الافتراضي للحسابات لاختيارك البلد. اذا لم يوجد مخطط موثق "
+"للحسابات لبلدك المحدد, يمكن تثبت مخطط عام وسيختار افتراضيًا."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.account.type:0
@@ -2452,10 +3122,17 @@
msgstr "وصف"
#. module: account
+<<<<<<< TREE
#: field:account.tax,price_include:0
#: field:account.tax.template,price_include:0
msgid "Tax Included in Price"
msgstr "السعر شامل الضريبة"
+=======
+#: code:addons/account/account.py:3136
+#, python-format
+msgid "ECNJ"
+msgstr "ECNJ"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.subscription:0
@@ -2471,9 +3148,21 @@
msgstr "حساب الدخل"
#. module: account
+<<<<<<< TREE
#: help:account.config.settings,default_sale_tax:0
msgid "This sale tax will be assigned by default on new products."
msgstr "سيتم اختيار ضريبة المبيعات هذه افتراضيا للمنتجات الجديدة"
+=======
+#: code:addons/account/account_invoice.py:379
+#, python-format
+msgid "There is no Accounting Journal of type Sale/Purchase defined!"
+msgstr "لا يوجد دفتر يومية للمبيعات أو المشتريات معرف!"
+
+#. module: account
+#: view:product.category:0
+msgid "Accounting Properties"
+msgstr "خصائص محاسبية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.general.ledger_landscape:0
@@ -2500,6 +3189,7 @@
#. module: account
#: report:account.account.balance:0
#: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
#: field:account.balance.report,fiscalyear_id:0
#: report:account.central.journal:0
#: field:account.central.journal,fiscalyear_id:0
@@ -2510,7 +3200,11 @@
#: view:account.config.settings:0
#: view:account.entries.report:0
#: field:account.entries.report,fiscalyear_id:0
+<<<<<<< TREE
#: view:account.fiscalyear:0
+=======
+#: report:account.financial.report:0
+>>>>>>> MERGE-SOURCE
#: field:account.fiscalyear,name:0
#: report:account.general.journal:0
#: field:account.general.journal,fiscalyear_id:0
@@ -2567,6 +3261,7 @@
#. module: account
#: field:account.invoice.report,account_line_id:0
msgid "Account Line"
+<<<<<<< TREE
msgstr "سطر الحساب"
#. module: account
@@ -2576,6 +3271,12 @@
#. module: account
#: code:addons/account/account_invoice.py:901
+=======
+msgstr "سطر الحساب"
+
+#. module: account
+#: code:addons/account/account.py:1485
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Cannot create the invoice.\n"
@@ -2583,10 +3284,15 @@
"amount greater than the total invoiced amount. In order to avoid rounding "
"issues, the latest line of your payment term must be of type 'balance'."
msgstr ""
+<<<<<<< TREE
"لا يمكن إنشاء الفاتورة.\n"
"من الممكن أن تكون شروط الدفع المتعلقة بالفاتورة غير معدة بطريقة صحيحة لأنها "
"تعطي قيمة أكبر من المجموع الكلي للفاتورة. لتفادي هذه المشكلة يجب أن يكون أخر "
"خط من شروط الدفع من نوع 'رصيد'."
+=======
+"إعداد يوميات المحاسبة. لحسابات البنوك، ينصح بإستخدام قسم \"إعداد حسابات "
+"البنك\" فهذا سينتج الحسابات و اليوميات تلقائياً."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.move:0
@@ -2600,7 +3306,11 @@
msgstr "المسلسل الرئيسي"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_bank_statement.py:477
+=======
+#: code:addons/account/account_bank_statement.py:403
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"In order to delete a bank statement, you must first cancel it to delete "
@@ -2673,6 +3383,23 @@
msgstr "كود الحساب الضريبي"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:581
+#, python-format
+msgid ""
+"Can't find any account journal of %s type for this company.\n"
+"\n"
+"You can create one in the menu: \n"
+"Configuration\\Financial Accounting\\Accounts\\Journals."
+msgstr ""
+"لم يتمكن من إيجاد حساب يومية لنوع %s لهذه الشركة.\n"
+"\n"
+"يمكنك إنشاء واحد من القائمة: \n"
+"Configuration\\Financial Accounting\\Accounts\\Journals."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:account.payment.term,name:account.account_payment_term_advance
#: model:account.payment.term,note:account.account_payment_term_advance
msgid "30% Advance End 30 Days"
@@ -2733,7 +3460,11 @@
msgstr "إدخالات نماذج الحسابات"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3164
+=======
+#: code:addons/account/account.py:3134
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "EXJ"
msgstr "EXJ"
@@ -2807,7 +3538,10 @@
msgstr "سطر حركة حساب التسوية (إلغاء)"
#. module: account
+<<<<<<< TREE
#: model:account.account.type,name:account.conf_account_type_tax
+=======
+>>>>>>> MERGE-SOURCE
#: report:account.invoice:0
#: field:account.invoice,amount_tax:0
#: report:account.journal.period.print.sale.purchase:0
@@ -2830,12 +3564,20 @@
msgstr "حساب تحليلي"
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,default_purchase_tax:0
#: field:account.config.settings,purchase_tax:0
msgid "Default purchase tax"
msgstr "ضريبة الشراء الافتراضية"
#. module: account
+=======
+#: report:account.aged_trial_balance:0
+msgid "Not due"
+msgstr "غير مستحق"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.account:0
#: field:account.financial.report,account_ids:0
#: selection:account.financial.report,type:0
@@ -2849,6 +3591,7 @@
msgstr "حسابات"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3503
#: code:addons/account/account_bank_statement.py:404
#: code:addons/account/account_invoice.py:378
@@ -2858,6 +3601,9 @@
#: code:addons/account/account_invoice.py:605
#: code:addons/account/account_invoice.py:627
#: code:addons/account/account_move_line.py:535
+=======
+#: code:addons/account/account_invoice.py:378
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Configuration Error!"
msgstr "خطأ في الإعدادات!"
@@ -2929,6 +3675,7 @@
#. module: account
#: sql_constraint:account.model.line:0
msgid "Wrong credit or debit value in model, they must be positive!"
+<<<<<<< TREE
msgstr "خطا في قيمة حساب المدين/الدائن في النموذج,يجب ان يكونوا ايجابيين"
#. module: account
@@ -2936,6 +3683,9 @@
#: model:process.node,note:account.process_node_supplierreconciliation0
msgid "Comparison between accounting and payment entries"
msgstr "مقارنة الحسابات مع قيود المدفوعات"
+=======
+msgstr "خطا في قيمة حساب المدين/الدائن في النموذج,يجب ان يكونوا ايجابيين"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.ui.menu,name:account.menu_automatic_reconcile
@@ -2999,8 +3749,27 @@
msgstr "حساب الضرائب الرئيسي"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/wizard/account_change_currency.py:59
+#, python-format
+msgid "New currency is not configured properly !"
+msgstr "لم يتم تكوين العملة الجديدة بشكل صحيح"
+
+#. module: account
+#: view:account.subscription.generate:0
+msgid ""
+"Automatically generate entries based on what has been entered in the system "
+"before a specific date."
+msgstr ""
+"إنشاء قيود اليومية تلقائياً علي أساس ما تم إدخاله في النظام قبل التاريخ "
+"المحدد."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.aged.trial.balance:0
#: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
#: model:ir.ui.menu,name:account.menu_aged_trial_balance
msgid "Aged Partner Balance"
msgstr "رصيد الشريك العمري"
@@ -3012,11 +3781,14 @@
msgstr "قيود المحاسبة"
#. module: account
+<<<<<<< TREE
#: constraint:account.move.line:0
msgid "Account and Period must belong to the same company."
msgstr "الحساب و المدة يجب أن تنتمي لنفس الشركة."
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: field:account.invoice.line,discount:0
msgid "Discount (%)"
msgstr "الخصم (%)"
@@ -3036,6 +3808,7 @@
"تلك الحالة."
#. module: account
+<<<<<<< TREE
#: field:account.move.line.reconcile,writeoff:0
msgid "Write-Off amount"
msgstr "مبلغ ملغي"
@@ -3060,6 +3833,17 @@
#, python-format
msgid "You should choose the periods that belong to the same company."
msgstr "يجب اختيار الفترات التي تنتمي لنفس الشركة"
+=======
+#: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
+#: model:ir.ui.menu,name:account.menu_act_ir_actions_bleble
+msgid "New Company Financial Setting"
+msgstr "الإعدادات المالية للشركة الجديدة"
+
+#. module: account
+#: view:account.installer:0
+msgid "Configure Your Chart of Accounts"
+msgstr "تكوين مخططاتك الحسابية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
@@ -3069,8 +3853,18 @@
msgstr "المبيعات بعرض الحسابات"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1411
+=======
+#: view:account.use.model:0
+msgid "This wizard will create recurring accounting entries"
+msgstr "سيقوم هذا المعالج بإنشاء قيود محاسبية تكرارية"
+
+#. module: account
+#: code:addons/account/account.py:1329
+>>>>>>> MERGE-SOURCE
#, python-format
+<<<<<<< TREE
msgid "You cannot delete a posted journal entry \"%s\"."
msgstr ""
@@ -3088,6 +3882,15 @@
#: code:addons/account/account.py:2308
#: code:addons/account/account_invoice.py:744
#: code:addons/account/account_move_line.py:195
+=======
+msgid "No sequence defined on the journal !"
+msgstr "لا يوجد مسلسل معرف لهذه اليومية !"
+
+#. module: account
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
+#: code:addons/account/account_move_line.py:173
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
msgstr "عليك بتعريف يومية تحليلية في يومية '%s' !"
@@ -3105,8 +3908,13 @@
#, python-format
msgid ""
"You need an Opening journal with centralisation checked to set the initial "
+<<<<<<< TREE
"balance."
msgstr ""
+=======
+"balance!"
+msgstr "انت تحتاج ليوميه إفتتاحية شاملة علامة المركزيه لضبط الرصيد المبدئي!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.action_tax_code_list
@@ -3147,6 +3955,11 @@
msgstr "عرض خانة الدائن/المدين"
#. module: account
+#: field:accounting.report,debit_credit:0
+msgid "Display Debit/Credit Columns"
+msgstr ""
+
+#. module: account
#: selection:account.entries.report,month:0
#: selection:account.invoice.report,month:0
#: selection:analytic.entries.report,month:0
@@ -3210,11 +4023,31 @@
msgstr "مبلغ الرمز الرئيسي"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:401
+#, python-format
+msgid ""
+"You can not delete an invoice which is open or paid. We suggest you to "
+"refund it instead."
+msgstr "لا يمكنك حذف فاتورة مفتوحة او تم دفعها. يمكنك القيام بعملية رد."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
msgstr "ضريبة البيع الإفتراضية"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:1025
+#, python-format
+msgid "Invoice '%s' is validated."
+msgstr "يتم التحقق من صحة الفاتورة '%s'"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.model.line,date_maturity:0
msgid ""
"The maturity date of the generated entries for this model. You can choose "
@@ -3249,7 +4082,11 @@
msgstr "الوضع المالي"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:791
+=======
+#: code:addons/account/account_invoice.py:744
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Tax base different!\n"
@@ -3412,8 +4249,13 @@
msgstr "عرض"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3422
#: code:addons/account/account_bank.py:95
+=======
+#: code:addons/account/account.py:3380
+#: code:addons/account/account_bank.py:90
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "BNK"
msgstr "بنك"
@@ -3434,9 +4276,20 @@
msgstr "ملف إالكتروني"
#. module: account
+<<<<<<< TREE
#: field:account.move.line,reconcile:0
msgid "Reconcile Ref"
msgstr ""
+=======
+#: view:res.partner:0
+msgid "Customer Credit"
+msgstr "دين العميل"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " Day of the Month: 0"
+msgstr " يوم من الشهر"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.config.settings,has_chart_of_accounts:0
@@ -3563,12 +4416,26 @@
#: model:ir.actions.act_window,name:account.action_account_chart_template_form
#: model:ir.ui.menu,name:account.menu_action_account_chart_template_form
msgid "Chart of Accounts Templates"
+<<<<<<< TREE
msgstr "قوالب الدليل المحاسبي"
#. module: account
#: view:account.bank.statement:0
msgid "Transactions"
msgstr ""
+=======
+msgstr "قوالب شجرة الحسابات"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
+msgid "Generate Chart of Accounts from a Chart Template"
+msgstr "إنشاء شجرة حسابات من قالب"
+
+#. module: account
+#: view:report.account.sales:0
+msgid "This months' Sales by type"
+msgstr "هذه شهور المبيعات وفقا لنوع"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_unreconcile_reconcile
@@ -3667,6 +4534,7 @@
msgstr "إعداد برنامج المحاسبة"
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,name:account.action_account_vat_declaration
msgid "Account Tax Declaration"
msgstr "الإقرار الضريبي للحساب"
@@ -3689,6 +4557,17 @@
"centralized counterpart box in the related journal from the configuration "
"menu."
msgstr ""
+=======
+#: view:account.payment.term.line:0
+msgid " Value amount: 0.02"
+msgstr " قيمة الرصيد:0.02"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr "شاشة الحسابات"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.bank.statement,balance_start:0
@@ -3697,7 +4576,11 @@
msgstr "رصيد أول المدة"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1434
+=======
+#: code:addons/account/account_invoice.py:1345
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Partner Defined !"
msgstr "لا يوجد شريك معرف !"
@@ -3778,6 +4661,15 @@
msgstr "خريطة الضريبة"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_cash_statement.py:315
+#, python-format
+msgid "The closing balance should be the same than the computed balance!"
+msgstr "الرصيد الختامي ينبغي ان يكون نفس الرصيد المحسوب"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.journal:0
msgid "Search Account Journal"
msgstr "بحث يومية الحساب"
@@ -3891,13 +4783,30 @@
msgstr "مسودة للفاتورة"
#. module: account
+<<<<<<< TREE
#: view:account.config.settings:0
msgid "Options"
msgstr "خيارات"
+=======
+#: code:addons/account/wizard/account_invoice_state.py:68
+#, python-format
+msgid ""
+"Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
+"or 'Done' state!"
+msgstr ""
+"الفواتير المختارة لا يمكن إلغاءها حيث أنها ملغاة أو تمت من حيث الحالة!"
+
+#. module: account
+#: view:account.invoice.line:0
+msgid "Quantity :"
+msgstr "الكمية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
msgid "Period Length (days)"
+<<<<<<< TREE
msgstr "طول الفترة (أيام)"
#. module: account
@@ -3907,6 +4816,9 @@
"You cannot modify a posted entry of this journal.\n"
"First you should set the journal to allow cancelling entries."
msgstr ""
+=======
+msgstr "طول الفترة (أيام)"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
@@ -3954,7 +4866,16 @@
#. module: account
#: view:account.move.line:0
msgid "Unreconciled Journal Items"
-msgstr "بنود يوميه لم تتم تسويتها"
+<<<<<<< TREE
+msgstr "بنود يوميه لم تتم تسويتها"
+=======
+msgstr "بنود يوميه لم تتم تسويتها"
+
+#. module: account
+#: sql_constraint:res.currency:0
+msgid "The currency code must be unique per company!"
+msgstr "رمز العملة يجب ان يكون فريدا لكل شركة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.account.type,close_method:0
@@ -3962,9 +4883,24 @@
msgstr "تفاصيل"
#. module: account
+<<<<<<< TREE
#: help:account.config.settings,default_purchase_tax:0
msgid "This purchase tax will be assigned by default on new products."
msgstr "ضريبة الشراء هذه سيتم استخدامها افتراضيا للمنتجات الجديدة."
+=======
+#: code:addons/account/account_invoice.py:850
+#, python-format
+msgid ""
+"Can not create the invoice !\n"
+"The related payment term is probably misconfigured as it gives a computed "
+"amount greater than the total invoiced amount. The latest line of your "
+"payment term must be of type 'balance' to avoid rounding issues."
+msgstr ""
+"لا يمكن انشاء الفاتوره !\n"
+"شروط الدفع من المحتمل أن تكون غير مضبوطه لانه يعطي الكميه المحسوبه اكبر من "
+"المبلغ الاجمالي في الفاتوره. أخر سطر من شروط الدفع يجب ان يكون من نوع \" "
+"المتوازن\" لتجنب مشاكل تقريب الأرقام."
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.invoice:0
@@ -3972,9 +4908,23 @@
msgstr "ضريبة القيمة المضافة:"
#. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
#: report:account.central.journal:0
+<<<<<<< TREE
#: view:account.config.settings:0
+=======
+#: report:account.financial.report:0
+#: report:account.general.journal:0
+>>>>>>> MERGE-SOURCE
#: report:account.general.ledger:0
+<<<<<<< TREE
+=======
+#: report:account.general.ledger_landscape:0
+#: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+>>>>>>> MERGE-SOURCE
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
@@ -3990,9 +4940,21 @@
msgstr "( إذا لم تختار فترة فسيتم أخذ كل الفترات المفتوحة )"
#. module: account
+<<<<<<< TREE
#: model:ir.model,name:account.model_account_journal_cashbox_line
msgid "account.journal.cashbox.line"
msgstr ""
+=======
+#: field:account.journal,centralisation:0
+msgid "Centralised counterpart"
+msgstr "النظير المركزي"
+
+#. module: account
+#: code:addons/account/account_move_line.py:575
+#, python-format
+msgid "You can not create journal items on a \"view\" account %s %s"
+msgstr "لا يمكن انشاء وحدات يوميه علي \"عرض \"الحساب%s%s"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_partner_reconcile_process
@@ -4042,7 +5004,13 @@
#: selection:account.vat.declaration,filter:0
#: selection:accounting.report,filter:0
#: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
#: field:analytic.entries.report,date:0
+#, python-format
msgid "Date"
msgstr "تاريخ"
@@ -4058,12 +5026,28 @@
msgstr "إلغاء التسوية"
#. module: account
+<<<<<<< TREE
+=======
+#: view:account.analytic.line: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 "مستخدم"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.chart.template:0
msgid "Chart of Accounts Template"
msgstr "قالب الدليل المحاسبي"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2320
+=======
+#: code:addons/account/account.py:2297
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4075,6 +5059,7 @@
"الرجاء حدد شريك عليها!"
#. module: account
+<<<<<<< TREE
#: selection:account.balance.report,display_account:0
#: selection:account.common.account.report,display_account:0
#: selection:account.report.general.ledger,display_account:0
@@ -4082,6 +5067,17 @@
#: selection:account.tax.template,type_tax_use:0
msgid "All"
msgstr "الكل"
+=======
+#: code:addons/account/account_move_line.py:846
+#, python-format
+msgid "Some entries are already reconciled !"
+msgstr "بعض القيود تمت تسويتها من قبل !"
+
+#. module: account
+#: view:account.tax:0
+msgid "Account Tax"
+msgstr "حساب الضرائب"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
@@ -4104,6 +5100,8 @@
#: selection:account.vat.declaration,filter:0
#: selection:accounting.report,filter:0
#: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
msgid "No Filters"
msgstr "لا مرشحات"
@@ -4203,11 +5201,33 @@
msgstr "عناصر تحليلية"
#. module: account
+<<<<<<< TREE
+=======
+#: report:account.aged_trial_balance:0
+msgid "Account Total"
+msgstr "حساب إجمالي"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1168
+#, python-format
+msgid "Unable to change tax !"
+msgstr "لا يمكن تغيير الضريبة !"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:analytic.entries.report,nbr:0
msgid "#Entries"
msgstr "#القيود"
#. module: account
+<<<<<<< TREE
+=======
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft Refund"
+msgstr "إنشاء مشروع استرداد"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.state.open:0
msgid "Open Invoice"
msgstr "فاتورة غير مسددة"
@@ -4218,15 +5238,32 @@
msgstr "رمز عامل الضرب للضريبة"
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,complete_tax_set:0
msgid "Complete set of taxes"
+=======
+#: view:account.fiscal.position:0
+msgid "Mapping"
+msgstr "مقابلة"
+
+#. module: account
+#: code:addons/account/account_invoice.py:932
+#, python-format
+msgid ""
+"You cannot create an invoice on a centralised journal. Uncheck the "
+"centralised counterpart box in the related journal from the configuration "
+"menu."
+>>>>>>> MERGE-SOURCE
msgstr ""
+"لا يمكن إنشاء فاتوره في يوميه مركزيه. قم بإلغاء التحديد علي مربع المناظره "
+"المركزيه المتعلق بقيد اليوميه من قائمة الإعدادت."
#. module: account
#: field:account.account,name:0
#: field:account.account.template,name:0
#: report:account.analytic.account.inverted.balance:0
#: field:account.chart.template,name:0
+#: report:account.financial.report:0
#: field:account.model.line,name:0
#: field:account.move.line,name:0
#: field:account.move.reconcile,name:0
@@ -4235,8 +5272,18 @@
msgstr "اسم"
#. module: account
+<<<<<<< TREE
#: code:addons/account/installer.py:94
+=======
+#: model:ir.model,name:account.model_account_aged_trial_balance
+msgid "Account Aged Trial balance Report"
+msgstr "ميزان المراجعة للحسابات المعمرة"
+
+#. module: account
+#: code:addons/account/account_move_line.py:582
+>>>>>>> MERGE-SOURCE
#, python-format
+<<<<<<< TREE
msgid "No unconfigured company !"
msgstr "لا يوجد شركات لم يتم إعدادها!"
@@ -4244,6 +5291,10 @@
#: field:res.company,expects_chart_of_accounts:0
msgid "Expects a Chart of Accounts"
msgstr ""
+=======
+msgid "You can not create journal items on a closed account %s %s"
+msgstr "لا يمكن انشاء عناصر اليومية لحساب مغلق%s%s"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.move.line,date:0
@@ -4260,12 +5311,16 @@
#: model:ir.actions.act_window,name:account.action_bank_tree
#: model:ir.ui.menu,name:account.menu_action_bank_tree
msgid "Setup your Bank Accounts"
+<<<<<<< TREE
msgstr "اعداد الحسابات المصرفية الخاصة بك"
#. module: account
#: xsl:account.transfer:0
msgid "Partner ID"
msgstr ""
+=======
+msgstr "اعداد الحسابات المصرفية الخاصة بك"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.bank.statement,message_ids:0
@@ -4297,6 +5352,7 @@
"The fiscalyear, periods or chart of account chosen have to belong to the "
"same company."
msgstr ""
+<<<<<<< TREE
"السنة المالية.الفترات او المخطط للحساب تختار علي ان تنتمي إلى نفس الشركة"
#. module: account
@@ -4319,6 +5375,12 @@
#: model:ir.actions.act_window,name:account.open_board_account
#: model:ir.ui.menu,name:account.menu_account_config
#: model:ir.ui.menu,name:account.menu_board_account
+=======
+"السنة المالية.الفترات او المخطط للحساب تختار علي ان تنتمي إلى نفس الشركة"
+
+#. module: account
+#: model:ir.actions.todo.category,name:account.category_accounting_configuration
+>>>>>>> MERGE-SOURCE
#: model:ir.ui.menu,name:account.menu_finance
#: model:ir.ui.menu,name:account.menu_finance_reporting
#: model:process.node,name:account.process_node_accountingentries0
@@ -4332,6 +5394,7 @@
#. module: account
#: view:account.entries.report:0
msgid "Journal Entries with period in current year"
+<<<<<<< TREE
msgstr "قيود اليومية مع فترة في العام الحالي"
#. module: account
@@ -4345,6 +5408,19 @@
#, python-format
msgid "Insufficient Data!"
msgstr "لا يوجد معلومات كافية!"
+=======
+msgstr "قيود اليومية مع فترة في العام الحالي"
+
+#. module: account
+#: help:account.central.journal,amount_currency:0
+#: help:account.common.journal.report,amount_currency:0
+#: help:account.general.journal,amount_currency:0
+#: help:account.print.journal,amount_currency:0
+msgid ""
+"Print Report with the currency column if the currency is different then the "
+"company currency"
+msgstr "طباعة التقرير مع عمود العملة إذا كانت العملة مختلفة ثم عملة شركة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.account,unrealized_gain_loss:0
@@ -4489,12 +5565,16 @@
#. module: account
#: view:account.move.line:0
msgid "Posted Journal Items"
+<<<<<<< TREE
msgstr "نشر عناصر اليومية"
#. module: account
#: field:account.move.line,blocked:0
msgid "No Follow-up"
msgstr ""
+=======
+msgstr "نشر عناصر اليومية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.tax.template:0
@@ -4504,6 +5584,7 @@
#. module: account
#: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
msgid "Draft Entries"
+<<<<<<< TREE
msgstr "القيود المسودة"
#. module: account
@@ -4513,6 +5594,19 @@
"9.99 EUR, whereas a decimal precision of 4 will allow journal entries like: "
"0.0231 EUR."
msgstr ""
+=======
+msgstr "مسودة المدخلات"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " Day of the Month= -1"
+msgstr " يوم في الشهر = -١"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " Number of Days: 30"
+msgstr " عدد الأيام: ٣٠"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.account,shortcut:0
@@ -4521,6 +5615,14 @@
msgstr "إختصار"
#. module: account
+<<<<<<< TREE
+=======
+#: constraint:account.fiscalyear:0
+msgid "Error! The start date of the fiscal year must be before his end date."
+msgstr "خطأ! يجب أن يكون تاريخ بدء السنة المالية يكون قبل تاريخ نهايتها"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.account:0
#: field:account.account,user_type:0
#: view:account.account.template:0
@@ -4547,10 +5649,28 @@
msgstr "إلغاء الفواتير المختارة"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_bank_statement.py:423
+=======
+#: selection:account.automatic.reconcile,power:0
+msgid "3"
+msgstr "٣"
+
+#. module: account
+#: code:addons/account/account_move_line.py:97
+>>>>>>> MERGE-SOURCE
#, python-format
+<<<<<<< TREE
msgid "You have to assign an analytic journal on the '%s' journal!"
msgstr "لديك تعيين تحليل اليومية علي'%s' دفتر اليومية"
+=======
+msgid ""
+"You haven't supplied enough argument to compute the initial balance, please "
+"select a period and journal in the context."
+msgstr ""
+"لم تكن قد قدمت الوسيطه الكافيه لحساب التوازن المبدأي من فضلك اختار الفتره "
+"وقيد اليوميه علي هذا السياق"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,note:account.process_transition_supplieranalyticcost0
@@ -4607,6 +5727,7 @@
msgstr "شهر"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:668
#, python-format
msgid "You cannot change the code of account which contains journal items!"
@@ -4620,6 +5741,9 @@
#. module: account
#: code:addons/account/account_invoice.py:583
#: code:addons/account/account_invoice.py:598
+=======
+#: code:addons/account/account_move_line.py:1231
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Cannot find a chart of account, you should create one from Settings\\"
@@ -4632,10 +5756,13 @@
#: field:analytic.entries.report,product_uom_id:0
msgid "Product Unit of Measure"
msgstr ""
+"انت لا تستطيع عمل هذا التعديل علي تأكيد الدخول! انت تستطيع تغير بعض الحقول "
+"الغير قانونيه تماما او يجب عدم تعديل ادخال القيود اليوميه اولا! %s"
#. module: account
#: field:res.company,paypal_account:0
msgid "Paypal Account"
+<<<<<<< TREE
msgstr "حساب باي بال"
#. module: account
@@ -4647,6 +5774,9 @@
#: selection:account.journal,type:0
msgid "Bank and Checks"
msgstr ""
+=======
+msgstr "حساب باي بال"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.account.template,note:0
@@ -4656,7 +5786,16 @@
#. module: account
#: selection:account.financial.report,sign:0
msgid "Reverse balance sign"
-msgstr "عكس علامة التوازن"
+<<<<<<< TREE
+msgstr "عكس علامة التوازن"
+=======
+msgstr "عكس علامة التوازن"
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Overdue Account"
+msgstr "حساب المتأخرات"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.account.type,report_type:0
@@ -4682,7 +5821,11 @@
msgstr "رمز حساب الأساس"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:867
+=======
+#: code:addons/account/account_analytic_line.py:91
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You have to provide an account for the write off/exchange difference entry."
@@ -4736,6 +5879,7 @@
#. openerp-web
#: code:addons/account/static/src/xml/account_move_reconciliation.xml:24
#, python-format
+<<<<<<< TREE
msgid "Last Reconciliation:"
msgstr "آخر تسوية:"
@@ -4743,6 +5887,34 @@
#: selection:account.move.line,state:0
msgid "Balanced"
msgstr "متوازن"
+=======
+msgid "End of Fiscal Year Entry"
+msgstr "قيد نهاية السنة المالية"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodical Processing"
+msgstr "المعالجة الدورية"
+
+#. module: account
+#: constraint:account.analytic.line:0
+msgid "You can not create analytic line on view account."
+msgstr "لا يمكنك إنشاء سطر تحليلي في حساب للعرض."
+
+#. module: account
+#: help:account.move.line,state:0
+msgid ""
+"When new move line is created the state will be 'Draft'.\n"
+"* When all the payments are done it will be in 'Valid' state."
+msgstr ""
+"عندما يتم إنشاء حركة سطر جديد تكون الحالة \"مسودة\".\n"
+"* عندما يتم إنتهاء جميع الأقساط ستكون الحالة \"صالحة\"."
+
+#. module: account
+#: field:account.journal,view_id:0
+msgid "Display Mode"
+msgstr "نمط العرض"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.node,note:account.process_node_importinvoice0
@@ -4750,6 +5922,7 @@
msgstr "بيان من الفاتورة أو الدفع"
#. module: account
+<<<<<<< TREE
#: code:addons/account/installer.py:94
#, python-format
msgid ""
@@ -4763,6 +5936,15 @@
msgstr "ضبط خيارات المحاسبة"
#. module: account
+=======
+#: help:product.template,property_account_expense:0
+msgid ""
+"This account will be used for invoices instead of the default one to value "
+"expenses for the current product"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.model,name:account.model_account_chart
msgid "Account chart"
msgstr "خريطة الحساب"
@@ -4849,6 +6031,7 @@
#. module: account
#: sql_constraint:account.period:0
msgid "The name of the period must be unique per company!"
+<<<<<<< TREE
msgstr "اسم الفترة يجب ان يكون فريد لكل شركة"
#. module: account
@@ -4860,6 +6043,9 @@
#: view:account.tax:0
msgid "Tax Computation"
msgstr "حساب الضرائب"
+=======
+msgstr "اسم الفترة يجب ان يكون فريد لكل شركة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:wizard.multi.charts.accounts:0
@@ -4874,9 +6060,15 @@
"you want to generate accounts of this template only when loading its child "
"template."
msgstr ""
+<<<<<<< TREE
"أزل هذا الخيار إذا كنت لا ترغب في استخدام هذه القالب عند إنشاء دليل محاسبي "
"جديد من قالب. فائدة هذه الخيار أنه يسمح لك بإنشاء حسابات بناء على هذه القالب "
"فقط في حالة تحميل القالب الفرعي."
+=======
+"وضع هذا للخطأ لو انك لا تريد هذا النموذج لكي يستخدم منشطا في المعالجة التي "
+"تنشأ رسم البياني المحاسبي من النموذج . هذا يكون مفيد عندما تريد انشاء حسابات "
+"من هذا النموذج فقط عندما يتم تحميل النموذج الصغير"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.use.model:0
@@ -4887,6 +6079,7 @@
#: field:account.account,reconcile:0
#: field:account.account.template,reconcile:0
msgid "Allow Reconciliation"
+<<<<<<< TREE
msgstr "السماح بالتسوية"
#. module: account
@@ -4898,13 +6091,24 @@
#. module: account
#: code:addons/account/account_invoice.py:627
+=======
+msgstr "السماح بالتسوية"
+
+#. module: account
+#: code:addons/account/account.py:1082
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
+<<<<<<< TREE
"Cannot find any account journal of %s type for this company.\n"
"\n"
"You can create one in the menu: \n"
"Configuration\\Journals\\Journals."
msgstr ""
+=======
+"You can not modify company of this period as some journal items exists."
+msgstr "لا يمكنك تعديل الشركة لهذه الفترة حيث ان بعض عناصر اليومية موجودة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.vat.declaration:0
@@ -4928,12 +6132,28 @@
msgstr "نماذج التكرارات"
#. module: account
+<<<<<<< TREE
#: view:account.tax:0
msgid "Children/Sub Taxes"
msgstr "ضرائب فرعية"
#. module: account
#: xsl:account.transfer:0
+=======
+#: code:addons/account/account_move_line.py:1266
+#, python-format
+msgid "Encoding error"
+msgstr "خطا الترميز"
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "4"
+msgstr "٤"
+
+#. module: account
+#: view:account.invoice:0
+#: xsl:account.transfer:0
+>>>>>>> MERGE-SOURCE
msgid "Change"
msgstr "تغيير"
@@ -4960,6 +6180,7 @@
msgstr "ملغي"
#. module: account
+<<<<<<< TREE
#: help:account.config.settings,group_proforma_invoices:0
msgid "Allows you to put invoices in pro-forma state."
msgstr "يسمح لك بوضع الفواتير في حالة 'فاتورة مبدأية'."
@@ -4972,15 +6193,43 @@
#. module: account
#: help:account.partner.ledger,amount_currency:0
#: help:account.report.general.ledger,amount_currency:0
+=======
+#: help:account.bank.statement,balance_end_cash:0
+msgid "Closing balance based on cashBox"
+msgstr "توازن الغلق بناءًا على خانة النقد"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Example"
+msgstr "مثال"
+
+#. module: account
+#: code:addons/account/account_invoice.py:839
+#, python-format
+>>>>>>> MERGE-SOURCE
msgid ""
"It adds the currency column on report if the currency differs from the "
"company currency."
msgstr ""
+<<<<<<< TREE
"تقوم باضافة خانة العملة في التقرير اذا كانت العملة مختلفة عن العملة "
"الافتراضية للشركة."
#. module: account
#: code:addons/account/account.py:3356
+=======
+"الرجاء تعريف قيمة الفاتورة !\n"
+"الإجمالي الحقيقي غير متوافق مع الإجمالي المحسوب."
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "لإستخدام حساب الدخل اتركه فارغ"
+
+#. module: account
+#: code:addons/account/account.py:3316
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Purchase Tax %.2f%%"
msgstr "ضريبة الشراء %0.2f%%"
@@ -5005,6 +6254,18 @@
msgstr "تخصيص الحساب"
#. module: account
+<<<<<<< TREE
+=======
+#: selection:account.bank.statement.line,type:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/account_invoice.py:346
+#, python-format
+msgid "Customer"
+msgstr "عميل"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.bank.statement:0
msgid "Confirmed"
msgstr "مؤكد"
@@ -5015,9 +6276,21 @@
msgstr "فاتورة ملغاة"
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "My Invoices"
msgstr "فواتيري"
+=======
+#: code:addons/account/account.py:1584
+#, 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 ""
+"لا يمكن أن تنشأ هذه الخطوة مع عملة مختلفة عن العملة الثانوية من حساب \"%s - "
+"%s\". مسح حقل العملة الثانوية للتعريف حساب إذا كنت ترغب في قبول جميع العملات."
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.bank.statement,state:0
@@ -5036,16 +6309,34 @@
msgstr "اعادة كود الضرائب"
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "Invoice "
msgstr "فاتورة "
#. module: account
+=======
+#: view:validate.account.move:0
+msgid ""
+"All draft account entries in this journal and period will be validated. It "
+"means you won't be able to modify their accounting fields anymore."
+msgstr ""
+"سيتم التحقق من صلاحية كل مدخلات حساب السجل في هذه اليومية والفترة. يعني ذلك "
+"انك غير قادر على تعديل حقول محاسبتها بعد الآن."
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_configuration
+msgid "Configuration"
+msgstr "إعدادات"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.chart.template,property_account_income:0
msgid "Income Account on Product Template"
msgstr "الحساب الوارد على القالب المنتج"
#. module: account
+<<<<<<< TREE
#: help:account.journal.period,state:0
msgid ""
"When journal period is created. The status is 'Draft'. If a report is "
@@ -5055,9 +6346,28 @@
#. module: account
#: code:addons/account/account.py:3167
+=======
+#: code:addons/account/account.py:3137
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "MISC"
-msgstr "متفرقات"
+<<<<<<< TREE
+msgstr "متفرقات"
+=======
+msgstr "متفرقات"
+
+#. module: account
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+msgstr ""
+"$(الموضوع-معرف_الشركة.الاسم)الفاتورة$(المرجع$(الموضوع.الرقم او 'n/a'))"
+
+#. module: account
+#: help:res.partner,last_reconciliation_date:0
+msgid ""
+"Date on which the partner accounting entries were reconciled last time"
+msgstr "تاريخ توفيق المدخلات المحاسبية للشريك في المرة الاخيرة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.fiscalyear.close,fy2_id:0
@@ -5069,18 +6379,26 @@
#: view:account.tax:0
#: view:account.tax.template:0
#: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
#: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
#: model:ir.actions.act_window,name:account.action_invoice_tree
#: model:ir.actions.report.xml,name:account.account_invoices
#: view:report.invoice.created:0
#: field:res.partner,invoice_ids:0
+#, python-format
msgid "Invoices"
msgstr "الفواتير"
#. module: account
+<<<<<<< TREE
#: help:account.config.settings,expects_chart_of_accounts:0
msgid "Check this box if this company is a legal entity."
msgstr "علم هذا المربع اذا كانت الشركة كيان قانوني."
+=======
+#: view:account.invoice:0
+msgid "My invoices"
+msgstr "الفواتير"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:account.account.type,name:account.conf_account_type_chk
@@ -5196,8 +6514,13 @@
"Set the account that will be set by default on invoice tax lines for "
"invoices. Leave empty to use the expense account."
msgstr ""
+<<<<<<< TREE
"عرف الحساب الذي سوف يستخدم افتراضيا على صنف (خط) الضريبة في الفاتورة. اتركه "
"فارغا لاستخدام حساب المصاريف."
+=======
+"خطأ في الإعدادات!\n"
+" لاتستطيع تعريف أطفال لحساب من نوع داخلي مختلف ل\"العرض\"! "
+>>>>>>> MERGE-SOURCE
#. module: account
#: code:addons/account/account.py:890
@@ -5208,12 +6531,16 @@
#. module: account
#: view:account.move:0
msgid "Journal Entries to Review"
+<<<<<<< TREE
msgstr "لاستعراض قيود اليومية"
#. module: account
#: selection:res.company,tax_calculation_rounding_method:0
msgid "Round Globally"
msgstr ""
+=======
+msgstr "لاستعراض قيود اليومية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.bank.statement:0
@@ -5227,6 +6554,7 @@
msgstr "التطبيق الضريبي"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:890
#, python-format
msgid ""
@@ -5249,6 +6577,54 @@
#: field:account.journal,cash_control:0
msgid "Cash Control"
msgstr ""
+=======
+#: view:account.move:0
+#: view:account.move.line:0
+#: code:addons/account/wizard/account_move_journal.py:153
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
+#: model:ir.actions.act_window,name:account.act_account_move_to_account_move_line_open
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move
+#: model:ir.actions.act_window,name:account.action_account_manual_reconcile
+#: model:ir.actions.act_window,name:account.action_account_moves_all_a
+#: model:ir.actions.act_window,name:account.action_account_moves_bank
+#: model:ir.actions.act_window,name:account.action_account_moves_purchase
+#: model:ir.actions.act_window,name:account.action_account_moves_sale
+#: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
+#: model:ir.actions.act_window,name:account.action_move_line_tree1
+#: model:ir.actions.act_window,name:account.action_tax_code_line_open
+#: model:ir.model,name:account.model_account_move_line
+#: model:ir.ui.menu,name:account.menu_action_account_moves_all
+#: model:ir.ui.menu,name:account.menu_action_account_moves_bank
+#: model:ir.ui.menu,name:account.menu_eaction_account_moves_purchase
+#: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
+#, python-format
+msgid "Journal Items"
+msgstr "عناصر اليومية"
+
+#. module: account
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
+#: 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_financial_report.py:70
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
+#, python-format
+msgid "Error"
+msgstr "خطأ"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.analytic.balance,date2:0
@@ -5291,6 +6667,7 @@
"From this view, have an analysis of your treasury. It sums the balance of "
"every accounting entries made on liquidity accounts per period."
msgstr ""
+<<<<<<< TREE
"بمجرد النظر تحليل الماليه الخاصة بك. يجمع هذا التوازن من كل القيود الحسابيه "
"الصادره ف فتره سيوله الحسابات"
@@ -5298,6 +6675,10 @@
#: model:res.groups,name:account.group_account_manager
msgid "Financial Manager"
msgstr "المدير المالي"
+=======
+"بمجرد النظر تحليل الماليه الخاصة بك. يجمع هذا التوازن من كل القيود الحسابيه "
+"الصادره ف فتره سيوله الحسابات"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.journal,group_invoice_lines:0
@@ -5315,10 +6696,16 @@
msgstr "حركات"
#. module: account
+<<<<<<< TREE
#: field:account.bank.statement,details_ids:0
#: view:account.journal:0
msgid "CashBox Lines"
msgstr ""
+=======
+#: view:report.hr.timesheet.invoice.journal:0
+msgid "Sale journal in this month"
+msgstr "مبيع اليومية لهذا الشهر"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_vat_declaration
@@ -5342,7 +6729,22 @@
#. module: account
#: field:account.treasury.report,date:0
msgid "Beginning of Period Date"
-msgstr "بداية تاريخ الفترة"
+<<<<<<< TREE
+msgstr "بداية تاريخ الفترة"
+=======
+msgstr "بداية تاريخ الفترة"
+
+#. module: account
+#: code:addons/account/account.py:1361
+#, 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."
+msgstr ""
+"لايمكنك تعديل المدخل المسجل لهذه اليومية !\n"
+"يجب ان تخصص اليومية لتسمح بإالغاء المدخلات اذا كنت تريد ذلك."
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.ui.menu,name:account.account_template_folder
@@ -5360,6 +6762,15 @@
msgstr "الحسابات الضريبية للانتاج"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:1097
+#, python-format
+msgid "Start period should be smaller then End period"
+msgstr "بداية الفترة يجب أن تكون أقل من نهاية الفترة"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.tax,price_include:0
#: help:account.tax.template,price_include:0
msgid ""
@@ -5377,6 +6788,7 @@
#. module: account
#: report:account.account.balance:0
#: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
#: field:account.balance.report,target_move:0
#: report:account.central.journal:0
#: field:account.central.journal,target_move:0
@@ -5405,6 +6817,7 @@
msgstr "تحركات الهدف"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1416
#, python-format
msgid ""
@@ -5416,6 +6829,12 @@
#: help:account.cashbox.line,number_opening:0
msgid "Opening Unit Numbers"
msgstr ""
+=======
+#: model:account.payment.term,name:account.account_payment_term_net
+#: model:account.payment.term,note:account.account_payment_term_net
+msgid "30 Net Days"
+msgstr "صافي ٣٠ يوم"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.subscription,period_type:0
@@ -5426,6 +6845,8 @@
#: view:account.invoice:0
#: field:account.invoice,payment_ids:0
#: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
msgid "Payments"
msgstr "مدفوعات"
@@ -5463,7 +6884,22 @@
#: field:account.financial.report,children_ids:0
#: model:ir.model,name:account.model_account_financial_report
msgid "Account Report"
-msgstr "تقرير الحساب"
+<<<<<<< TREE
+msgstr "تقرير الحساب"
+=======
+msgstr "تقرير الحساب"
+
+#. module: account
+#: field:account.journal.column,name:0
+msgid "Column Name"
+msgstr "اسم العامود"
+
+#. module: account
+#: view:account.general.journal:0
+msgid ""
+"This report gives you an overview of the situation of your general journals"
+msgstr "يعطيك هذا التقرير لمحة عامة للموقف من اليوميات العامة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.entries.report,year:0
@@ -5479,9 +6915,26 @@
msgstr "سنة"
#. module: account
+<<<<<<< TREE
#: help:account.invoice,sent:0
msgid "It indicates that the invoice has been sent."
msgstr "هذا يشير أن الفاتورة قد تم ارسالها."
+=======
+#: field:account.bank.statement,starting_details_ids:0
+msgid "Opening Cashbox"
+msgstr "فتح صندوق النقد"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Line 1:"
+msgstr "الخط 1:"
+
+#. module: account
+#: code:addons/account/account.py:1315
+#, python-format
+msgid "Integrity Error !"
+msgstr "خطأ بالسلامة !"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.tax.template,description:0
@@ -5670,6 +7123,14 @@
msgstr "مسمى للأم"
#. module: account
+<<<<<<< TREE
+=======
+#: view:account.analytic.account:0
+msgid "Analytic Accounts with a past deadline."
+msgstr "تحليل الحسابات المرتبطه بالموعد النهائي السابق"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: report:account.partner.balance:0
msgid "(Account/Partner) Name"
msgstr "اسم (الحساب/الشريك)"
@@ -5761,6 +7222,7 @@
msgstr "تقرير الحساب/الحساب المشترك"
#. module: account
+<<<<<<< TREE
#: view:account.analytic.account:0
#: view:account.bank.statement:0
#: selection:account.bank.statement,state:0
@@ -5772,6 +7234,11 @@
#: selection:report.invoice.created,state:0
msgid "Open"
msgstr "فتح"
+=======
+#: field:account.bank.statement.line,name:0
+msgid "Communication"
+msgstr "إتصالات"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.config.settings:0
@@ -5791,12 +7258,16 @@
#: field:account.partner.ledger,initial_balance:0
#: field:account.report.general.ledger,initial_balance:0
msgid "Include Initial Balances"
+<<<<<<< TREE
msgstr "نشمل الارصدة الابتدائية"
#. module: account
#: view:account.invoice.tax:0
msgid "Tax Codes"
msgstr "رموز الضريبة"
+=======
+msgstr "نشمل الارصدة الابتدائية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.invoice,type:0
@@ -5806,6 +7277,15 @@
msgstr "رد مال للعميل"
#. module: account
+<<<<<<< TREE
+=======
+#: constraint:account.move:0
+msgid ""
+"You can not create more than one move per period on centralized journal"
+msgstr "لا يمكنك إنشاء أكثر من حركة لكل فترة في يومية مركزية"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.tax,ref_tax_sign:0
#: field:account.tax,tax_sign:0
#: field:account.tax.template,ref_tax_sign:0
@@ -5819,11 +7299,20 @@
msgstr "أُنشأ تقرير الفواتير في خلال اخر 15 يومًا"
#. module: account
+<<<<<<< TREE
+=======
+#: view:account.payment.term.line:0
+msgid " Number of Days: 14"
+msgstr " عدد الايام:14"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.fiscalyear,end_journal_period_id:0
msgid "End of Year Entries Journal"
msgstr "قيود اليومية الختامية للسنة"
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "Draft Refund "
msgstr ""
@@ -5835,6 +7324,21 @@
#. module: account
#: view:account.payment.term.line:0
+=======
+#: code:addons/account/account.py:3463
+#: code:addons/account/account_bank_statement.py:338
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
+#: code:addons/account/wizard/account_move_journal.py:63
+#, python-format
+msgid "Configuration Error !"
+msgstr "خطأ في الإعدادات!"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.payment.term.line,value_amount:0
msgid "Amount To Pay"
msgstr "المبلغ للدفع"
@@ -5876,6 +7380,14 @@
msgstr "تغيير العملة"
#. module: account
+<<<<<<< TREE
+=======
+#: view:account.invoice:0
+msgid "This action will erase taxes"
+msgstr "هذا الفعل سوف يمحو الضرائب"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:process.node,note:account.process_node_accountingentries0
#: model:process.node,note:account.process_node_supplieraccountingentries0
msgid "Accounting entries."
@@ -5905,7 +7417,6 @@
msgstr "فواتير العملاء، والمبالغ المستردة"
#. module: account
-#: field:account.analytic.line,amount_currency:0
#: field:account.entries.report,amount_currency:0
#: field:account.model.line,amount_currency:0
#: field:account.move.line,amount_currency:0
@@ -5938,6 +7449,14 @@
msgstr "رقم (حركة)"
#. module: account
+<<<<<<< TREE
+=======
+#: view:analytic.entries.report:0
+msgid "Analytic Entries during last 7 days"
+msgstr "قيود تحليلية خلال اخر 7 أيام"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: selection:account.financial.report,style_overwrite:0
msgid "Normal Text"
msgstr "نص عادي"
@@ -6005,7 +7524,21 @@
#. module: account
#: selection:account.financial.report,style_overwrite:0
msgid "Automatic formatting"
-msgstr "تنسيق تلقائي"
+<<<<<<< TREE
+msgstr "تنسيق تلقائي"
+=======
+msgstr "تنسيق تلقائي"
+
+#. module: account
+#: code:addons/account/account.py:963
+#, python-format
+msgid ""
+"No fiscal year defined for this date !\n"
+"Please create one from the configuration of the accounting menu."
+msgstr ""
+"لا يوجد سنة مالية محددة بهذا التاريخ.الرجاء انشاء واحدة من تكوين في قائمة "
+"المحاسبة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.move.line.reconcile:0
@@ -6047,6 +7580,15 @@
msgstr "إنشاء القيود الإفتتاحية"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:775
+#, python-format
+msgid "Already Reconciled!"
+msgstr "تمت تسويتها!"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.tax,type:0
msgid "The computation method for the tax amount."
msgstr "منهج المحاسبة للمبلغ الضريبي."
@@ -6075,14 +7617,22 @@
msgstr "حسابات فرعية"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1120
+=======
+#: code:addons/account/account_move_line.py:1229
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Move name (id): %s (%s)"
msgstr "نقل اسم(معرف):%s(%s)"
#. module: account
#: view:account.move.line.reconcile:0
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:882
+=======
+#: code:addons/account/account_move_line.py:871
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Write-Off"
msgstr "إلغاء"
@@ -6108,7 +7658,11 @@
#: view:account.config.settings:0
#: view:account.invoice:0
#: view:account.invoice.report:0
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:355
+=======
+#: code:addons/account/account_invoice.py:348
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Supplier"
msgstr "مورِّد"
@@ -6128,7 +7682,11 @@
msgstr "الحساب"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:92
+=======
+#: code:addons/account/account_invoice.py:91
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Free Reference"
msgstr "مرجع حر"
@@ -6138,7 +7696,9 @@
#: selection:account.common.partner.report,result_selection:0
#: selection:account.partner.balance,result_selection:0
#: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
#: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
#, python-format
msgid "Receivable and Payable Accounts"
msgstr "حسابات الدائنون و المدينون"
@@ -6247,9 +7807,14 @@
msgstr "ترشيح بـ"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2296
+=======
+#: code:addons/account/account.py:2273
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You have a wrong expression \"%(...)s\" in your model !"
+<<<<<<< TREE
msgstr "لديك تعبير خاطئ\"%(...)s\"في نموذجك"
#. module: account
@@ -6258,14 +7823,34 @@
msgstr "احسب الكود للضرائب مشتملة على القيم"
#. module: account
+=======
+msgstr "لديك تعبير خاطئ\"%(...)s\"في نموذجك"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
+#, python-format
+msgid "You can not use an inactive account!"
+msgstr "لا يمكنك إستخدام حساب غير نشط!"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.bank.statement,balance_end:0
msgid "Balance as calculated based on Starting Balance and transaction lines"
msgstr "الرصيد محسوب علي اساس بدايه الرصيد و المعاملات الحسابيه التي تمت"
#. module: account
+<<<<<<< TREE
#: field:account.journal,loss_account_id:0
msgid "Loss Account"
msgstr "حساب الخسارة"
+=======
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#, python-format
+msgid "Current currency is not configured properly !"
+msgstr "العملة الحالية غير معرفة بشكل صحيح"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.tax,account_collected_id:0
@@ -6295,12 +7880,32 @@
msgstr "عدد الأيام"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1321
#, python-format
msgid ""
"You cannot validate this journal entry because account \"%s\" does not "
"belong to chart of accounts \"%s\"."
msgstr ""
+=======
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
+#: code:addons/account/wizard/account_period_close.py:51
+#, python-format
+msgid "Invalid action !"
+msgstr "إجراء خاطئ!"
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:102
+#, python-format
+msgid "Period: %s"
+msgstr "فترة : %s"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_review_financial_journals_installer
+msgid "Review your Financial Journals"
+msgstr "مراجعه القيود اليوميه الماليه الخاصه بك"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.financial.report:0
@@ -6352,6 +7957,15 @@
msgstr "عامل المضاعفة لكود القاعدة"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/wizard/account_report_common.py:151
+#, python-format
+msgid "not implemented"
+msgstr "غير مطبق"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.journal,company_id:0
msgid "Company related to this journal"
msgstr "الشركات المرتبطة بهذه اليومية"
@@ -6380,10 +7994,25 @@
#. module: account
#: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
msgid "Past"
msgstr "سابق"
#. module: account
+<<<<<<< TREE
+=======
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+"خطأ في الإعدادات!\n"
+"لا يمكنك تحديد فرع لحساب مع نوع داخلي مختلف من \"عرض\"! "
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:res.partner.bank,journal_id:0
msgid ""
"This journal will be created automatically for this bank account when you "
@@ -6464,9 +8093,21 @@
#. module: account
#: field:wizard.multi.charts.accounts,sale_tax_rate:0
msgid "Sales Tax(%)"
-msgstr "ضريبة المبيعات(%)"
-
-#. module: account
+<<<<<<< TREE
+msgstr "ضريبة المبيعات(%)"
+
+#. module: account
+=======
+msgstr "ضريبة المبيعات(%)"
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+msgid "Create an Account based on this template"
+msgstr "انشأ حساب مبنيًا على هذا القالب"
+
+#. module: account
+#: view:account.account.type:0
+>>>>>>> MERGE-SOURCE
#: view:account.tax.code:0
msgid "Reporting Configuration"
msgstr "إعدادات التقارير"
@@ -6531,9 +8172,18 @@
msgstr "عرض الفرع الثابت"
#. module: account
+<<<<<<< TREE
#: view:account.config.settings:0
msgid "Bank & Cash"
msgstr ""
+=======
+#: code:addons/account/account.py:629
+#, python-format
+msgid ""
+"You can not remove/desactivate an account which is set on a customer or "
+"supplier."
+msgstr "لا يمكنك إزالة / إلغاء حساب الذي تم تعيينه كأحد العملاء أو الموردين."
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.fiscalyear.close.state,fy_id:0
@@ -6615,6 +8265,7 @@
#. module: account
#: constraint:account.move.line:0
+<<<<<<< TREE
msgid "You cannot create journal items on closed account."
msgstr "لا يمكنك إنشاء يومية أصناف لحساب مغلق."
@@ -6623,6 +8274,10 @@
#, python-format
msgid "Invoice line account's company and invoice's compnay does not match."
msgstr ""
+=======
+msgid "Company must be the same for its related account and period."
+msgstr "يجب ان تكون الشركة هي نفسها لها الصلة بحسابها و فترتها."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice:0
@@ -6659,6 +8314,7 @@
#: model:account.account.type,name:account.account_type_cash_equity
#: model:account.account.type,name:account.conf_account_type_equity
msgid "Equity"
+<<<<<<< TREE
msgstr "الأسهم"
#. module: account
@@ -6671,6 +8327,9 @@
#, python-format
msgid "Please check that the field 'Journal' is set on the Bank Statement"
msgstr ""
+=======
+msgstr "الأسهم"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.tax,type:0
@@ -6684,6 +8343,8 @@
#. module: account
#: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
msgid "Journal & Partner"
msgstr "يومية و شريك"
@@ -6693,7 +8354,11 @@
msgstr "طاقة"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3427
+=======
+#: code:addons/account/account.py:3385
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Cannot generate an unused journal code."
msgstr "لا يمكن انشاء رمز قيد يوميه غير مستخدم"
@@ -6740,6 +8405,7 @@
msgstr "نوع قابل للتطبيق"
#. module: account
+<<<<<<< TREE
#: help:account.invoice,date_due:0
msgid ""
"If you use payment terms, the due date will be computed automatically at the "
@@ -6756,6 +8422,12 @@
"There is no opening/closing period defined, please create one to set the "
"initial balance."
msgstr ""
+=======
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "مرجع الفاتورة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.tax.template,sequence:0
@@ -6852,7 +8524,17 @@
msgid ""
"You cannot change the owner company of an account that already contains "
"journal items."
-msgstr "لا يمكنك تغيير شركة مالكة لحساب يحتوي بالفعل علي عناصر يومية."
+<<<<<<< TREE
+msgstr "لا يمكنك تغيير شركة مالكة لحساب يحتوي بالفعل علي عناصر يومية."
+=======
+msgstr "لا يمكنك تغيير شركة مالكة لحساب يحتوي بالفعل علي عناصر يومية."
+
+#. module: account
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
+#, python-format
+msgid "Enter a Start date !"
+msgstr "أدخل تاريخ البدء !"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.invoice:0
@@ -6896,6 +8578,7 @@
msgstr "تجميع حسب..."
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1024
#, python-format
msgid ""
@@ -6904,6 +8587,16 @@
msgstr ""
"لا يوجد هناك فترة معرفة لهذا التاريخ: %s.\n"
"الرجاء إنشاء فترة لهذا التاريخ"
+=======
+#: field:account.journal.column,readonly:0
+msgid "Readonly"
+msgstr "للقراءة فقط"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " Valuation: Balance"
+msgstr " تقييم: الميزانية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.analytic.line,product_uom_id:0
@@ -6944,6 +8637,15 @@
msgstr "يومية تحليلية"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:622
+#, python-format
+msgid "You can not desactivate an account that contains some journal items."
+msgstr "لا يمكنك الغاء حساب يحتوي علي بعض عناصر اليومية"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.entries.report:0
msgid "Reconciled"
msgstr "تمت تسويته"
@@ -6974,11 +8676,19 @@
msgstr "حساب التصنيف الممتد"
#. module: account
+<<<<<<< TREE
#: sql_constraint:account.tax:0
msgid "Tax Name must be unique per company!"
msgstr "الاسم الضريبي لكل شركة يجب أن يكون غير متكرر!"
#. module: account
+=======
+#: sql_constraint:account.tax:0
+msgid "Tax Name must be unique per company!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.bank.statement:0
msgid "Cash Transactions"
msgstr "معاملات النقدية"
@@ -7006,8 +8716,19 @@
msgstr "إحصائيات القيود التحليلية"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_analytic_line.py:142
#: code:addons/account/account_move_line.py:958
+=======
+#: code:addons/account/account.py:624
+#, python-format
+msgid "You can not remove an account containing journal items."
+msgstr "لا يمكنك حذف حساب يحتوي علي عناصر اليومية."
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entries: "
msgstr "القيود: "
@@ -7015,10 +8736,23 @@
#. module: account
#: help:res.partner.bank,currency_id:0
msgid "Currency of the related account journal."
+<<<<<<< TREE
msgstr "العملة لها علاقة بحساب اليومية."
#. module: account
#: constraint:account.move.line:0
+=======
+msgstr "العملة لها علاقة بحساب اليومية."
+
+#. module: account
+#: code:addons/account/account.py:1580
+#, python-format
+msgid "Couldn't create move between different companies"
+msgstr "غير قادر على انشاء تحرك بين الشركات المختلفة"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_type_form
+>>>>>>> MERGE-SOURCE
msgid ""
"You cannot provide a secondary currency if it is the same than the company "
"one."
@@ -7034,7 +8768,21 @@
#: code:addons/account/account.py:190
#, python-format
msgid "Balance Sheet (Asset account)"
-msgstr "الميزانية العمومية(حساب الاصول)"
+<<<<<<< TREE
+msgstr "الميزانية العمومية(حساب الاصول)"
+=======
+msgstr "الميزانية العمومية(حساب الاصول)"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
+msgid ""
+"Bank Reconciliation consists of verifying that your bank statement "
+"corresponds with the entries (or records) of that account in your accounting "
+"system."
+msgstr ""
+"يتكون تسوية البنك من تحديد أن بيان البنك الخاص بك متطابق مع المدخلات (او "
+"التسجيلات) للحساب في نظام المحاسبة الخاصة بك."
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.node,note:account.process_node_draftstatement0
@@ -7043,13 +8791,25 @@
#. module: account
#: view:account.move.line:0
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1058
+#, python-format
+>>>>>>> MERGE-SOURCE
msgid "Total debit"
msgstr "إجمالي الخصم"
#. module: account
+<<<<<<< TREE
#: view:account.move.line:0
msgid "Next Partner Entries to reconcile"
msgstr "قيود اليوميه للشريك القادمه للتطابق"
+=======
+#: code:addons/account/account_move_line.py:824
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "المدخل \"%s\" غير صالح !"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.invoice:0
@@ -7105,6 +8865,7 @@
#: code:addons/account/account.py:189
#, python-format
msgid "Profit & Loss (Expense account)"
+<<<<<<< TREE
msgstr "الأرباح و الخسائر (حساب المصاريف)"
#. module: account
@@ -7121,6 +8882,38 @@
#. module: account
#: code:addons/account/account.py:1024
#: code:addons/account/account_move_line.py:1108
+=======
+msgstr "الأرباح و الخسائر (حساب المصاريف)"
+
+#. module: account
+#: code:addons/account/account.py:622
+#: code:addons/account/account.py:624
+#: code:addons/account/account.py:963
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account_bank_statement.py:301
+#: code:addons/account/account_bank_statement.py:314
+#: code:addons/account/account_bank_statement.py:352
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
+#: 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/wizard/account_use_model.py:44
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Error !"
msgstr "خطأ !"
@@ -7148,6 +8941,16 @@
msgstr "مطبوع"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
+#, python-format
+msgid "Error :"
+msgstr "خطأ :"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.analytic.line:0
msgid "Project line"
msgstr "خط المشروع"
@@ -7220,6 +9023,18 @@
msgstr "إعرض تقرير ليدجر مع شريك واحد لكل صفحة"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1233
+#, 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"
+"%s"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
#: report:account.third_party_ledger:0
@@ -7310,6 +9125,7 @@
#: field:account.chart.template,complete_tax_set:0
#: field:wizard.multi.charts.accounts,complete_tax_set:0
msgid "Complete Set of Taxes"
+<<<<<<< TREE
msgstr "مجموعة كاملة من الضرائب"
#. module: account
@@ -7318,6 +9134,9 @@
msgid ""
"Selected Entry Lines does not have any account move enties in draft state."
msgstr ""
+=======
+msgstr "مجموعة كاملة من الضرائب"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.chart.template:0
@@ -7342,6 +9161,7 @@
msgstr "الإجمالي:"
#. module: account
+<<<<<<< TREE
#: constraint:account.journal:0
msgid ""
"Configuration error!\n"
@@ -7350,6 +9170,9 @@
#. module: account
#: code:addons/account/account.py:2266
+=======
+#: code:addons/account/account.py:2246
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You can specify year, month and date in the name of the model using the "
@@ -7393,7 +9216,18 @@
#. module: account
#: view:account.tax.template:0
msgid "Taxes used in Sales"
-msgstr "الضرائب المستخدمة في المبيعات"
+<<<<<<< TREE
+msgstr "الضرائب المستخدمة في المبيعات"
+=======
+msgstr "الضرائب المستخدمة في المبيعات"
+
+#. module: account
+#: code:addons/account/account_invoice.py:504
+#: code:addons/account/wizard/account_invoice_refund.py:145
+#, python-format
+msgid "Data Insufficient !"
+msgstr "بيانات غير كافية !"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree1
@@ -7457,6 +9291,7 @@
msgstr "مستند المصدر"
#. module: account
+<<<<<<< TREE
#: help:account.config.settings,company_footer:0
msgid "Bank accounts as printed in the footer of each printed document"
msgstr "حسابات البنك كما هو مطبوع على أسفل الوثائق المطبوعة"
@@ -7468,16 +9303,42 @@
"You cannot define children to an account with internal type different of "
"\"View\"."
msgstr ""
-
-#. module: account
+=======
+#: code:addons/account/account.py:1449
+#, python-format
+msgid "You can not delete a posted journal entry \"%s\"!"
+msgstr "لا يمكنك إزالة قيد يومية مرحل \"%s\" !"
+>>>>>>> MERGE-SOURCE
+
+#. module: account
+<<<<<<< TREE
+=======
+#: selection:account.partner.ledger,filter:0
+#: code:addons/account/report/account_partner_ledger.py:60
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
+#, python-format
+msgid "Unreconciled Entries"
+msgstr "قيود غير مسواه"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_menu_Bank_process
+msgid "Statements Reconciliation"
+msgstr "تسوية القوائم"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.model,name:account.model_accounting_report
msgid "Accounting Report"
+<<<<<<< TREE
msgstr "تقارير محاسبية"
#. module: account
#: field:account.analytic.line,currency_id:0
msgid "Account Currency"
msgstr "العملة للحساب"
+=======
+msgstr "تقارير محاسبية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.invoice:0
@@ -7500,7 +9361,40 @@
#. module: account
#: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
msgid "Financial Reports Hierarchy"
-msgstr "التسلسل الهرمي للتقارير المالية"
+<<<<<<< TREE
+msgstr "التسلسل الهرمي للتقارير المالية"
+=======
+msgstr "التسلسل الهرمي للتقارير المالية"
+
+#. module: account
+#: field:account.entries.report,product_uom_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,product_uom_id:0
+msgid "Product UOM"
+msgstr "وحدة قياس المنتج"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
+msgid ""
+"A Cash Register allows you to manage cash entries in your cash journals. "
+"This feature provides an easy way to follow up cash payments on a daily "
+"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 ""
+"يسمح لك سجل النقد لإدارة مدخلات النقدية في اليوميات النقدية الخاصة بك. توفر "
+"هذه الميزة وسيلة سهلة لمتابعة المدفوعات النقدية على أساس يومي. يمكنك إدخال "
+"القطع النقدية التي هي في صندوق النقد، ثم تسجيل المدخلات عندما يأتي المال أو "
+"يذهب في الخروج من مربع النقدية."
+
+#. module: account
+#: help:account.invoice.refund,date:0
+msgid ""
+"This date will be used as the invoice date for Refund Invoice and Period "
+"will be chosen accordingly!"
+msgstr ""
+"وسيتم استخدام هذا التاريخ كموعدا للفاتورة لاسترداد الفاتورة وسوف يتم اختيار "
+"المدة وفقا لذلك!"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
@@ -7535,21 +9429,49 @@
msgstr "هل انت متأكد أنك تريد فتح هذه الفاتورة ؟"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
+#, python-format
+msgid ""
+"Can not find a chart of account, you should create one from the "
+"configuration of the accounting menu."
+msgstr ""
+"لا يمكن العثور علي الرسم البياني المحاسبي, يجب ان تنشأ واحد من تشكيل القائمة "
+"الحسابيه"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.chart.template,property_account_expense_opening:0
msgid "Opening Entries Expense Account"
+<<<<<<< TREE
msgstr "قتح قيود حساب المصروف"
#. module: account
#: view:account.invoice:0
msgid "Customer Reference"
msgstr ""
-
-#. module: account
+=======
+msgstr "قتح قيود حساب المصروف"
+>>>>>>> MERGE-SOURCE
+
+#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1014
+#, python-format
+msgid "Accounting Entries"
+msgstr "مدخلات المحاسبة"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.account.template,parent_id:0
msgid "Parent Account Template"
msgstr "قالب حساب رئيسي"
#. module: account
+<<<<<<< TREE
#: report:account.invoice:0
msgid "Price"
msgstr "السعر"
@@ -7559,6 +9481,11 @@
#: field:account.bank.statement,closing_details_ids:0
msgid "Closing Cashbox Lines"
msgstr ""
+=======
+#: model:ir.actions.act_window,name:account.action_account_configuration_installer
+msgid "Install your Chart of Accounts"
+msgstr "تنصيب دليلك المحاسبي"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.bank.statement:0
@@ -7576,7 +9503,19 @@
#. module: account
#: view:account.entries.report:0
msgid "Posted entries"
-msgstr "قيود مرحلة"
+<<<<<<< TREE
+msgstr "قيود مرحلة"
+=======
+msgstr "قيود مرحلة"
+
+#. module: account
+#: help:accounting.report,debit_credit:0
+msgid ""
+"This option allow you to get more details about your the way your balances "
+"are computed. Because it is space consumming, we do not allow to use it "
+"while doing a comparison"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.payment.term.line,value_amount:0
@@ -7594,12 +9533,16 @@
#. module: account
#: view:account.invoice.report:0
msgid "Group by year of Invoice Date"
+<<<<<<< TREE
msgstr "تجميع حسب السنة لتاريخ الفاتورة"
#. module: account
#: field:account.config.settings,purchase_tax_rate:0
msgid "Purchase tax (%)"
msgstr "ضريبة الشراء (%)"
+=======
+msgstr "تجميع حسب السنة لتاريخ الفاتورة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:res.partner,credit:0
@@ -7659,12 +9602,16 @@
#. module: account
#: field:account.chart.template,property_account_income_opening:0
msgid "Opening Entries Income Account"
+<<<<<<< TREE
msgstr "فتح قيود حساب الدخل"
#. module: account
#: field:account.config.settings,group_proforma_invoices:0
msgid "Allow pro-forma invoices"
msgstr "السماح للفواتير المبدأية"
+=======
+msgstr "فتح قيود حساب الدخل"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.bank.statement:0
@@ -7682,10 +9629,22 @@
"لإنشاء ضرائب محددة في مجال مخصص."
#. module: account
+<<<<<<< TREE
#: field:account.invoice,reference:0
#: field:account.invoice.line,invoice_id:0
msgid "Invoice Reference"
msgstr "مرجع الفاتورة"
+=======
+#: code:addons/account/account.py:1095
+#, python-format
+msgid "You should have chosen periods that belongs to the same company"
+msgstr "ينبغي عليك اختيار الفترات التي تمتد الى نفس الشركة"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_review_payment_terms_installer
+msgid "Review your Payment Terms"
+msgstr "معاينة شروط الدفع"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.fiscalyear.close,report_name:0
@@ -7698,9 +9657,15 @@
msgstr "إنشاء قيود"
#. module: account
+<<<<<<< TREE
#: model:ir.model,name:account.model_cash_box_out
msgid "cash.box.out"
msgstr ""
+=======
+#: view:res.partner:0
+msgid "Information About the Bank"
+msgstr "معلومات عن البنك"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.config.settings,currency_id:0
@@ -7713,9 +9678,19 @@
msgstr "التقارير"
#. module: account
+<<<<<<< TREE
#. openerp-web
#: code:addons/account/account_move_line.py:783
#: code:addons/account/static/src/js/account_move_reconciliation.js:90
+=======
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
+#: code:addons/account/wizard/account_invoice_state.py:44
+#: code:addons/account/wizard/account_invoice_state.py:68
+#: 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
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Warning"
msgstr "تحذير"
@@ -7723,7 +9698,16 @@
#. module: account
#: model:ir.actions.act_window,name:account.action_analytic_open
msgid "Contracts/Analytic Accounts"
-msgstr "العقود /الحسابات التحليليه"
+<<<<<<< TREE
+msgstr "العقود /الحسابات التحليليه"
+=======
+msgstr "العقود /الحسابات التحليليه"
+
+#. module: account
+#: field:account.bank.statement,ending_details_ids:0
+msgid "Closing Cashbox"
+msgstr "غلق صندوق النقدية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.journal:0
@@ -7781,6 +9765,14 @@
#. module: account
#: code:addons/account/account.py:1452
#, python-format
+<<<<<<< TREE
+=======
+msgid "Unable to adapt the initial balance (negative value)!"
+msgstr "لم يتم قبول الرصيد الإفتتاحي (قيمة سالبة)!"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_purchase
+>>>>>>> MERGE-SOURCE
msgid ""
"There is no default credit account defined \n"
"on journal \"%s\"."
@@ -7804,6 +9796,7 @@
msgstr "إمضاء التقرير"
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_account_analytic_account_tree2
msgid ""
"<p>\n"
@@ -7823,6 +9816,12 @@
" </p>\n"
" "
msgstr ""
+=======
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#, python-format
+msgid "The periods to generate opening entries were not found"
+msgstr "الفترات لانشاء قيود الافتتاحيه لاتوجد"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:account.account.type,name:account.data_account_type_view
@@ -7830,7 +9829,11 @@
msgstr "جذور / عرض او نظره"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3168
+=======
+#: code:addons/account/account.py:3138
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "OPEJ"
msgstr ""
@@ -7865,6 +9868,7 @@
msgstr "معلومات خيارية"
#. module: account
+<<<<<<< TREE
#: view:account.analytic.line:0
#: field:account.bank.statement,user_id:0
#: view:account.journal:0
@@ -7873,6 +9877,18 @@
#: field:analytic.entries.report,user_id:0
msgid "User"
msgstr "مستخدم"
+=======
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
+#, python-format
+msgid "The journal must have default credit and debit account"
+msgstr "دفتر اليومية يجب أن يتضمن حساب إفتراضي دائن و أخر مدين"
+
+#. module: account
+#: report:account.general.journal:0
+#: xsl:account.transfer:0
+msgid ":"
+msgstr ":"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.account,currency_mode:0
@@ -7899,7 +9915,17 @@
msgstr "تاريخ الاستحقاق"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3155
+=======
+#: code:addons/account/account_move_line.py:1317
+#, python-format
+msgid "Bad account !"
+msgstr "حساب سئ !"
+
+#. module: account
+#: code:addons/account/account.py:3125
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Sales Journal"
msgstr "يومية المبيعات"
@@ -7910,7 +9936,11 @@
msgstr "ضريبة الفاتورة"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1188
+=======
+#: code:addons/account/account_move_line.py:1292
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No piece number !"
msgstr "لا يوجد رقم للقطعة !"
@@ -7938,6 +9968,7 @@
#. module: account
#: view:account.move:0
msgid "Unposted Journal Entries"
+<<<<<<< TREE
msgstr "قيود يومية غير مرحلة"
#. module: account
@@ -7946,6 +9977,9 @@
"This date will be used as the invoice date for credit note and period will "
"be chosen accordingly!"
msgstr ""
+=======
+msgstr "قيود يومية غير مرحلة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:product.template:0
@@ -7978,7 +10012,11 @@
#. module: account
#: selection:account.move.line,centralisation:0
+<<<<<<< TREE
#: code:addons/account/account.py:1503
+=======
+#: code:addons/account/account.py:1535
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Currency Adjustment"
msgstr "تعديل العملة"
@@ -7999,8 +10037,25 @@
msgid ""
"This field is used to generate legal reports: profit and loss, balance sheet."
msgstr ""
-"يستخدم هذا الحقل لإعداد التقارير القانونية: الأرباح و الخسائر و الميزانية "
-"العمومية."
+<<<<<<< TREE
+"يستخدم هذا الحقل لإعداد التقارير القانونية: الأرباح و الخسائر و الميزانية "
+"العمومية."
+=======
+"يستخدم هذا الحقل لإعداد التقارير القانونية: الأرباح و الخسائر و الميزانية "
+"العمومية."
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_review_payment_terms_installer
+msgid ""
+"Payment terms define the conditions to pay a customer or supplier invoice in "
+"one or several payments. Customers periodic reminders will use the payment "
+"terms for each letter. Each customer or supplier can be assigned to one of "
+"these payment terms."
+msgstr ""
+"شروط الدفع هي من شروط دفع العميل او المورد للفاتوره في واحد او مدفوعات "
+"عديده . تذكير العملاء المتكررين سوف يستخدموا شروط الدفع لكل حرف. كل عميل او "
+"مورد يمكن ان يرمز لواحده من هذه شروط الدفع"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.entries.report,month:0
@@ -8012,7 +10067,25 @@
msgstr "مايو"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:788
+=======
+#: view:account.account:0
+#: view:account.account.template:0
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
+#: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
+#, python-format
+msgid "Payable Accounts"
+msgstr "حسابات الدائنون"
+
+#. module: account
+#: code:addons/account/account_invoice.py:741
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Global taxes defined, but they are not in invoice lines !"
msgstr "الضرائب العلميه المحدده لكنها لا تكون في اسطر الفاتوره"
@@ -8027,12 +10100,16 @@
msgid ""
"The sequence field is used to order the resources from lower sequences to "
"higher ones."
+<<<<<<< TREE
msgstr "تسلسل الحقل يستخدم لترتيب الموارد من ادني تسلسل الي الاعلي منها"
#. module: account
#: field:account.move.line,amount_residual_currency:0
msgid "Residual Amount in Currency"
msgstr ""
+=======
+msgstr "تسلسل الحقل يستخدم لترتيب الموارد من ادني تسلسل الي الاعلي منها"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -8069,7 +10146,11 @@
#: selection:account.bank.accounts.wizard,account_type:0
#: selection:account.entries.report,type:0
#: selection:account.journal,type:0
+<<<<<<< TREE
#: code:addons/account/account.py:3054
+=======
+#: code:addons/account/account.py:3020
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Cash"
msgstr "نقدي"
@@ -8081,11 +10162,34 @@
msgstr "وجهة الحساب"
#. module: account
+<<<<<<< TREE
#: help:account.invoice.refund,filter_refund:0
msgid ""
"Refund base on this type. You can not Modify and Cancel if the invoice is "
"already reconciled"
msgstr ""
+=======
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
+#: code:addons/account/wizard/account_move_journal.py:165
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:56
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
+#, python-format
+msgid "UserError"
+msgstr "خطأ مستخدم"
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "فواتير الدفع"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.bank.statement.line,sequence:0
@@ -8101,18 +10205,31 @@
msgstr "مسلسل"
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,paypal_account:0
msgid "Paypal account"
msgstr ""
+=======
+#: constraint:product.category:0
+msgid "Error ! You cannot create recursive categories."
+msgstr "خطأ ! لا يمكن إنشاء فئات متداخلة."
+>>>>>>> MERGE-SOURCE
#. module: account
+<<<<<<< TREE
#: selection:account.print.journal,sort_selection:0
msgid "Journal Entry Number"
msgstr "رقم قيد اليومية"
+=======
+#: help:account.model.line,quantity:0
+msgid "The optional quantity on entries."
+msgstr "كمية اختيارية للقيود."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.financial.report:0
msgid "Parent Report"
+<<<<<<< TREE
msgstr "تقرير رئيسي"
#. module: account
@@ -8129,6 +10246,19 @@
#: model:ir.model,name:account.model_cash_box_in
msgid "cash.box.in"
msgstr ""
+=======
+msgstr "تقرير رئيسي"
+
+#. module: account
+#: view:account.state.open:0
+msgid "Yes"
+msgstr "نعم"
+
+#. module: account
+#: view:report.account_type.sales:0
+msgid "Sales by Account type"
+msgstr "المبيعات حسب نوع الحساب"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.invoice,move_id:0
@@ -8154,6 +10284,7 @@
#. module: account
#: field:account.bank.statement,balance_end:0
msgid "Computed Balance"
+<<<<<<< TREE
msgstr "ميزانية محسوبة"
#. module: account
@@ -8162,6 +10293,9 @@
#, python-format
msgid "You must choose at least one record."
msgstr ""
+=======
+msgstr "ميزانية محسوبة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.account,parent_id:0
@@ -8238,9 +10372,25 @@
msgstr "ثابت"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:653
#: code:addons/account/account.py:656
#: code:addons/account/account.py:668
+=======
+#: code:addons/account/account.py:629
+#: code:addons/account/account.py:642
+#: code:addons/account/account.py:645
+#: code:addons/account/account.py:664
+#: code:addons/account/account.py:787
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
+#: code:addons/account/account_move_line.py:97
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Warning !"
msgstr "تحذير !"
@@ -8308,7 +10458,24 @@
msgstr "اختر عملة للفاتورة"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:869
+=======
+#: code:addons/account/account.py:3463
+#, python-format
+msgid ""
+"The bank account defined on the selected chart of accounts hasn't a code."
+msgstr "حساب المصرف المعرف في الدليل المحاسبي المحدد ليس لديه رمز."
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:108
+#, python-format
+msgid "Can not %s draft/proforma/cancel invoice."
+msgstr "لايمكن السجل %s/الشكلية/الغاء الفاتورة."
+
+#. module: account
+#: code:addons/account/account_invoice.py:821
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Invoice Lines !"
msgstr "لا سطور للفاتورة !"
@@ -8346,20 +10513,85 @@
msgstr "حالة خطوط المدخلات للحاسب غير صالحة."
#. 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 accounts structure should "
+"reflect your own business needs in term of costs/revenues reporting. They "
+"are usually structured by contracts, projects, products or departements. "
+"Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
+"generate analytic entries on the related account."
+msgstr ""
+"الرسم البياني المحاسبي الطبيعي هو بناء يحدد عن طريق المتطلبات القانونيه "
+"للبلد . تحليل بناء الرسم البياني المحاسبي يجب ان يعكس احتياجات العمل الخاص "
+"بك من تقارير التكاليف والايرادات . الهيكل التنظيمي يكون عادتا من العقود "
+"والمشاريع والمنتجات او الاقسام . معظم العمليات المفتوحة (البورصه) (الفواتير -"
+"المصروفات-الجدول الزمني).تنشا قيود تحليليه متعلقه بالحساب"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.account.type,close_method:0
msgid "Deferral Method"
msgstr "طريقة التأجيل"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:388
+#, python-format
+msgid "Invoice '%s' is paid."
+msgstr "تم دفع الفاتورة ‘%s‘."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:process.node,note:account.process_node_electronicfile0
msgid "Automatic entry"
msgstr "مدخل تلقائي"
#. module: account
+<<<<<<< TREE
+=======
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr "خطأ ! لايمكنك انشاء اكواد ضريبية عودية."
+
+#. module: account
+#: help:product.template,property_account_income:0
+msgid ""
+"This account will be used for invoices instead of the default one to value "
+"sales for the current product"
+msgstr ""
+
+#. module: account
+#: help:account.journal,group_invoice_lines:0
+msgid ""
+"If this box is checked, the system will try to group the accounting lines "
+"when generating them from invoices."
+msgstr ""
+"اذا تم تحديد هذه الخانة, سيحاول النظام بتجميع خطوط المحاسبة عند انشائهم من "
+"الفواتير."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.account,reconcile:0
msgid ""
"Check this box if this account allows reconciliation of journal items."
-msgstr "فحص هذا الصندوق لو ان هذا الحساب يسمح بتحقيق الملائمه للبنود اليوميه"
+<<<<<<< TREE
+msgstr "فحص هذا الصندوق لو ان هذا الحساب يسمح بتحقيق الملائمه للبنود اليوميه"
+=======
+msgstr "فحص هذا الصندوق لو ان هذا الحساب يسمح بتحقيق الملائمه للبنود اليوميه"
+
+#. module: account
+#: help:account.period,state:0
+msgid ""
+"When monthly periods are created. The state is 'Draft'. At the end of "
+"monthly period it is in 'Done' state."
+msgstr ""
+"عندما يتم إنشاء فترات شهرية. الحالة هي \"السحب\". في نهاية الفترة الشهرية "
+"تكون في حالة \"تم\"."
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.analytic.account.inverted.balance:0
@@ -8379,12 +10611,24 @@
msgstr "قيود تحليلية"
#. module: account
+<<<<<<< TREE
+=======
+#: view:report.account_type.sales:0
+msgid "This Months Sales by type"
+msgstr "مبيعات هذه الشهور وفقا للنوع"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.analytic.account:0
msgid "Associated Partner"
msgstr "شريك متحد"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1434
+=======
+#: code:addons/account/account_invoice.py:1345
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You must first select a partner !"
msgstr "يجب عليك اولاً اختيار شريك !"
@@ -8395,6 +10639,31 @@
msgstr "معلومات أضافية"
#. module: account
+<<<<<<< TREE
+=======
+#: help:account.invoice,state:0
+msgid ""
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"Invoice. \n"
+"* The 'Pro-forma' when invoice is in Pro-forma state,invoice does not have "
+"an invoice number. \n"
+"* The 'Open' state is used when user create invoice,a invoice number is "
+"generated.Its in open state till user does not pay invoice. \n"
+"* The 'Paid' state is set automatically when the invoice is paid. Its "
+"related journal entries may or may not be reconciled. \n"
+"* The 'Cancelled' state is used when user cancel invoice."
+msgstr ""
+" حاله المسوده بتتعمل لما المستخدم يكون يعمل فاتوره جديده و مش متأكد منها.\n"
+"الفاتوره المبدئيه بتتعمل لما يكون الاتفاق مبدئيومش بيكون ليها رقم.\n"
+"الحاله المفتوحه لما المستخدم يعمل فاتوره ويكون ليها رقم وتفضل مفتوحه طالما "
+"ثمن الفاتوره متسددتش.\n"
+" تتحول اوتوماتيكي لفاتوره مسدده لما العميل يسدد ثمنها وممكن تتعدل القيود "
+"اليوميه المتعلقه بيها.\n"
+"حاله الالغاء هي تستخدم لما العميل يلغي فاتوره."
+
+#. module: account
+#: view:account.invoice.report:0
+>>>>>>> MERGE-SOURCE
#: field:account.invoice.report,residual:0
#: field:account.invoice.report,user_currency_residual:0
msgid "Total Residual"
@@ -8412,6 +10681,7 @@
msgstr "حالة الفاتورة هي مفتوحة"
#. module: account
+<<<<<<< TREE
#: view:account.analytic.account:0
#: view:account.bank.statement:0
#: field:account.bank.statement,state:0
@@ -8444,6 +10714,23 @@
#: view:account.config.settings:0
msgid "No Fiscal Year Defined for This Company"
msgstr "لا يوجد سنة مالية معرفة لهذه الشركة"
+=======
+#: model:ir.actions.act_window,help:account.action_tax_code_tree
+msgid ""
+"The chart of taxes is used to generate your periodical tax statement. You "
+"will see the taxes with codes related to your legal statement according to "
+"your country."
+msgstr ""
+"ويستخدم الرسم البياني للضرائب لإنشاء البيان الضريبي الدوري الخاص بك. سترى "
+"الضرائب مع اكواد تتعلق بالبيان القانوني وفقاً لبلدكم."
+
+#. module: account
+#: code:addons/account/account_invoice.py:437
+#, python-format
+msgid ""
+"Can not find a chart of accounts for this company, you should create one."
+msgstr "لم نستطع ايجاد اي دليل محاسبي لحسابات هذه الشركة، يجب انشاء واحدة."
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.invoice:0
@@ -8465,7 +10752,11 @@
"التالية."
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3158
+=======
+#: code:addons/account/account.py:3128
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Purchase Refund Journal"
msgstr "يومية تسديد الشراء"
@@ -8489,6 +10780,7 @@
#. module: account
#: view:account.invoice.report:0
msgid "Group by Invoice Date"
+<<<<<<< TREE
msgstr "رتب حسب تاريخ الفاتورة"
#. module: account
@@ -8498,6 +10790,12 @@
#. module: account
#: help:account.config.settings,module_account_followup:0
+=======
+msgstr "رتب حسب تاريخ الفاتورة"
+
+#. module: account
+#: view:account.invoice.refund:0
+>>>>>>> MERGE-SOURCE
msgid ""
"This allows to automate letters for unpaid invoices, with multi-level "
"recalls.\n"
@@ -8565,6 +10863,31 @@
msgstr "شطب اليومية"
#. module: account
+<<<<<<< TREE
+=======
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for the current "
+"partner"
+msgstr "سيُستخدم فترة الدفع هذا بدلاً من الفترة الافتراضية للشريك الحالي"
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Compute Code for Taxes included prices"
+msgstr "احسب الكود للضرائب مشتملة على القيم"
+
+#. module: account
+#: code:addons/account/account_invoice.py:1042
+#, python-format
+msgid ""
+"You can not cancel an invoice which is partially paid! You need to "
+"unreconcile related payment entries first!"
+msgstr ""
+"انك لا تستطيع الغاءالفاتوره التي تم دفع جزء منها !انك تحتاج عدم توفيق متعلق "
+"بقيود الدفع اولا"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.chart.template,property_account_income_categ:0
msgid "Income Category Account"
msgstr "حساب التصنيف الوارد"
@@ -8591,11 +10914,46 @@
msgstr "المبلغ الاساسي/الضريبة"
#. module: account
+<<<<<<< TREE
#: view:account.open.closed.fiscalyear:0
msgid ""
"This wizard will remove the end of year journal entries of selected fiscal "
"year. Note that you can run this wizard many times for the same fiscal year."
msgstr ""
+=======
+#: view:account.payment.term.line:0
+msgid " Valuation: Percent"
+msgstr " تقييم: النسبة المئوية"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree3
+msgid ""
+"With Customer Refunds you can manage the credit notes for your customers. 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
+#: model:ir.actions.act_window,help:account.action_account_vat_declaration
+msgid ""
+"This menu print a VAT declaration based on invoices or payments. You can "
+"select one or several periods of the fiscal year. Information required for a "
+"tax declaration is automatically generated by OpenERP from invoices (or "
+"payments, in some countries). This data is updated in real time. That’s very "
+"useful because it enables you to preview at any time the tax that you owe at "
+"the start and end of the month or quarter."
+msgstr ""
+"تطبع هذه القائمة إعلان ضريبة القيمة المضافة على أساس الفواتير أو المدفوعات. "
+"يمكنك اختيار واحد أو عدة فترات من السنة المالية. يتم إنشاؤها تلقائيا "
+"المعلومات المطلوبة للحصول على الإقرار الضريبي من قبل OpenERP من الفواتير (أو "
+"دفعات، في بعض البلدان). ويتم تحديث هذه البيانات في الوقت الحقيقي. وهذا مفيد "
+"جدا لأنه يتيح لك معاينة في أي وقت من الضرائب التي مدينون لكم في بداية ونهاية "
+"الشهر الجاري أو الربع."
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.invoice:0
@@ -8641,21 +10999,23 @@
#: field:account.bank.statement,balance_end_real:0
#: field:account.treasury.report,ending_balance:0
msgid "Ending Balance"
+<<<<<<< TREE
msgstr "رصيد ختامي"
#. module: account
#: field:account.journal,centralisation:0
msgid "Centralized Counterpart"
msgstr ""
+=======
+msgstr "رصيد ختامي"
+>>>>>>> MERGE-SOURCE
#. module: account
-#: help:account.move.line,blocked:0
+#: help:product.category,property_account_income_categ:0
msgid ""
-"You can check this box to mark this journal item as a litigation with the "
-"associated partner"
+"This account will be used for invoices to value sales for the current "
+"product category"
msgstr ""
-"ويمكنك التحقق من هذه الخانة لوضع علامة على بند اليومية باعتبارها التقاضي مع "
-"الشريك المتحد"
#. module: account
#: field:account.move.line,reconcile_partial_id:0
@@ -8674,7 +11034,18 @@
msgstr "تقرير مشترك للحساب"
#. module: account
+<<<<<<< TREE
#: view:account.invoice.refund:0
+=======
+#: view:account.invoice.report:0
+#: view:analytic.entries.report:0
+msgid "current month"
+msgstr "الشهر الجاري"
+
+#. module: account
+#: code:addons/account/account.py:1057
+#, python-format
+>>>>>>> MERGE-SOURCE
msgid ""
"Use this option if you want to cancel an invoice and create a new\n"
" one. The credit note will be created, "
@@ -8683,6 +11054,8 @@
"invoice will be created \n"
" so that you can edit it."
msgstr ""
+"لايوجد فترة معرفةلهذا التاريخ:%s!\n"
+"قم بإنشاء واحدة."
#. module: account
#: model:process.transition,name:account.process_transition_filestatement0
@@ -8713,6 +11086,7 @@
msgstr "أنواع الحساب"
#. module: account
+<<<<<<< TREE
#: model:email.template,subject:account.email_template_edi_invoice
msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
msgstr ""
@@ -8729,6 +11103,11 @@
#: field:account.account.type,report_type:0
msgid "P&L / BS Category"
msgstr "فئة P&L / BS"
+=======
+#: view:account.payment.term.line:0
+msgid " Value amount: n.a"
+msgstr " قيمة المبلغ: غير معروف"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.automatic.reconcile:0
@@ -8792,10 +11171,12 @@
#. module: account
#: report:account.account.balance:0
#: report:account.central.journal:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
msgid "Filter By"
msgstr "ترشيح بـ"
@@ -8804,14 +11185,17 @@
#, python-format
msgid ""
"In order to close a period, you must first post related journal entries."
+<<<<<<< TREE
+msgstr "لكي تغلق الفتره يجب ان تعمل قيود يوميه متعلقه بالفتره"
+=======
msgstr "لكي تغلق الفتره يجب ان تعمل قيود يوميه متعلقه بالفتره"
#. module: account
-#: view:account.entries.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:account.action_company_analysis_tree
-msgid "Company Analysis"
-msgstr "تحليل الشركة"
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
+#, python-format
+msgid "The entries to reconcile should belong to the same company"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.invoice,account_id:0
@@ -8819,10 +11203,23 @@
msgstr "يستخدم حساب الشريك لهذه الفاتورة."
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3353
+=======
+#: code:addons/account/account.py:3313
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Tax %.2f%%"
-msgstr "ضرائب %.2f%%"
+<<<<<<< TREE
+msgstr "ضرائب %.2f%%"
+=======
+msgstr "ضرائب %.2f%%"
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Contacts"
+msgstr "جهات الاتصال"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.tax.code,parent_id:0
@@ -8837,7 +11234,11 @@
msgstr "سطر شروط السداد"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3156
+=======
+#: code:addons/account/account.py:3126
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Purchase Journal"
msgstr "يومية المشتريات"
@@ -8927,6 +11328,15 @@
msgstr "فواتير غير مدفوعة"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:504
+#, python-format
+msgid "The payment term of supplier does not have a payment term line!"
+msgstr "مصطلح الدفع للمورد ليس لديه خط دفع الأجل!"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.move.line.reconcile,debit:0
msgid "Debit amount"
msgstr "المبلغ المدين"
@@ -8954,6 +11364,7 @@
msgstr "سمحت الحسابات (فارغة لأية سيطرة)"
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,sale_tax_rate:0
msgid "Sales tax (%)"
msgstr "ضريبة المبيعات (%)"
@@ -8981,6 +11392,18 @@
" </p>\n"
" "
msgstr ""
+=======
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
+#: model:ir.actions.act_window,name:account.action_account_analytic_chart
+#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
+msgid "Chart of Analytic Accounts"
+msgstr "شجرة الحسابات التحليلية"
+
+#. module: account
+#: view:board.board:0
+msgid "Draft Customer Invoices"
+msgstr "مسوده قوائم حساب العملاء"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.journal:0
@@ -9007,14 +11430,21 @@
msgstr "اسم اليومية"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:832
#, python-format
msgid "Entry \"%s\" is not valid !"
msgstr "المدخل \"%s\" غير صالح !"
+=======
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr "قيود اليوميه للشريك القادمه للتطابق"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.financial.report,style_overwrite:0
msgid "Smallest Text"
+<<<<<<< TREE
msgstr "أصغر نص"
#. module: account
@@ -9025,6 +11455,9 @@
msgstr ""
"هذا يسمح لك بكتابة الشيكات وطباعتها.\n"
" هذا سيقوم بتنصيب account_check_writing module"
+=======
+msgstr "أصغر نص"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:res.groups,name:account.group_account_invoice
@@ -9032,6 +11465,15 @@
msgstr "الفواتير و المدفوعات"
#. module: account
+#: help:account.move.line,blocked:0
+msgid ""
+"You can check this box to mark this journal item as a litigation with the "
+"associated partner"
+msgstr ""
+"ويمكنك التحقق من هذه الخانة لوضع علامة على بند اليومية باعتبارها التقاضي مع "
+"الشريك المتحد"
+
+#. module: account
#: help:account.invoice,internal_number:0
msgid ""
"Unique number of the invoice, computed automatically when the invoice is "
@@ -9050,6 +11492,15 @@
msgstr "اتركه فارغ لكل السنوات المالية المفتوحة"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1120
+#, python-format
+msgid "The account move (%s) for centralisation has been confirmed!"
+msgstr "تم تأكيد تحرك الحساب (%s) للمركزية!"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.move.line,amount_currency:0
msgid ""
"The amount expressed in an optional other currency if it is a multi-currency "
@@ -9057,10 +11508,17 @@
msgstr "تم التعبير عن المبلغ في عملة اخرى اختيارية اذا كانت مدخل عملة متعدد."
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1009
+=======
+#: code:addons/account/account.py:1315
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "The account move (%s) for centralisation has been confirmed."
msgstr ""
+"لايسمح لك باعطاء صلاحيه لقيود غير متوازنه\n"
+"تأكد انك قمت بشروط الدفع بشكل صحيح\n"
+"اخر سطر من شروط الدفع يجب ان يكون من نوع المتوازن"
#. module: account
#: report:account.analytic.account.journal:0
@@ -9118,9 +11576,19 @@
msgstr "قيود مسواه"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2296
+=======
+#: field:account.invoice,address_contact_id:0
+msgid "Contact Address"
+msgstr "عنوان جهة الإتصال"
+
+#. module: account
+#: code:addons/account/account.py:2273
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Wrong model !"
+<<<<<<< TREE
msgstr "نموذج خاطئ !"
#. module: account
@@ -9128,6 +11596,9 @@
#: view:account.tax.template:0
msgid "Tax Template"
msgstr "نموذج الضريبة"
+=======
+msgstr "نموذج خاطئ !"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice.refund,period:0
@@ -9179,7 +11650,11 @@
#. module: account
#: field:account.fiscalyear.close,journal_id:0
+<<<<<<< TREE
#: code:addons/account/account.py:3160
+=======
+#: code:addons/account/account.py:3130
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Opening Entries Journal"
msgstr "يومية القيود الإفتتاحية"
@@ -9190,16 +11665,39 @@
msgstr "تم التعليم و التحقق و طباعة الفواتير المؤقتة"
#. module: account
+<<<<<<< TREE
#: field:account.bank.statement,message_is_follower:0
#: field:account.invoice,message_is_follower:0
msgid "Is a Follower"
msgstr ""
+=======
+#: help:account.chart.template,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 "
+"Profilt & Loss Report"
+msgstr ""
+"ويستخدم هذا الحساب لتحويل الربح / الخسارة (إذا كان الربح: سيتم إضافة المبلغ، "
+"الخسارة: سيتم خصم المبلغ.)، والذي يحسب من تقرير الربح والخسارة"
+
+#. module: account
+#: code:addons/account/account_invoice.py:819
+#, python-format
+msgid "Please define sequence on the journal related to this invoice."
+msgstr "من فضلك حدد تسلسل دفاتير اليومية التي لها علاقة بهذه الفاتورة"
+
+#. module: account
+#: field:account.invoice,reference_type:0
+msgid "Reference Type"
+msgstr "نوع المرجع"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.move:0
#: field:account.move,narration:0
#: field:account.move.line,narration:0
msgid "Internal Note"
+<<<<<<< TREE
msgstr "ملاحظة داخلية"
#. module: account
@@ -9214,6 +11712,19 @@
#: field:account.config.settings,has_fiscal_year:0
msgid "Company has a fiscal year"
msgstr "الشركة لديها سنة مالية"
+=======
+msgstr "ملاحظة داخلية"
+
+#. module: account
+#: view:report.account.sales:0
+msgid "This year's Sales by type"
+msgstr "مبيعات هذه السنة وفقا للنوع"
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "Cost Ledger for period"
+msgstr "أستاذ التكاليف لفترة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.tax,child_depend:0
@@ -9254,6 +11765,14 @@
msgstr "سطور القيود"
#. module: account
+<<<<<<< TREE
+=======
+#: model:ir.actions.act_window,name:account.action_view_financial_accounts_installer
+msgid "Review your Financial Accounts"
+msgstr "معاينة حساباتك المالية"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.actions.act_window,name:account.action_open_journal_button
msgid "Open Journal"
msgstr "فتح اليومية"
@@ -9271,12 +11790,16 @@
msgstr "من الفترة"
#. module: account
+<<<<<<< TREE
#: field:account.cashbox.line,pieces:0
msgid "Unit of Currency"
msgstr ""
#. module: account
#: code:addons/account/account.py:3157
+=======
+#: code:addons/account/account.py:3127
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Sales Refund Journal"
msgstr "يومية رد المبيعات"
@@ -9342,7 +11865,11 @@
msgstr "ضريبة المشتريات (%)"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:869
+=======
+#: code:addons/account/account_invoice.py:821
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Please create some invoice lines."
msgstr "قم بإنشاء سطور للفاتورة."
@@ -9361,7 +11888,11 @@
msgstr "عرض التفاصيل"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3165
+=======
+#: code:addons/account/account.py:3135
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "SCNJ"
msgstr "SCNJ"
@@ -9408,12 +11939,16 @@
#: model:ir.actions.act_window,name:account.action_account_report
#: model:ir.ui.menu,name:account.menu_account_reports
msgid "Financial Reports"
+<<<<<<< TREE
msgstr "تقارير مالية"
#. module: account
#: model:account.account.type,name:account.account_type_liability_view1
msgid "Liability View"
msgstr "عرض الخصوم"
+=======
+msgstr "تقارير مالية"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.account.balance:0
@@ -9425,6 +11960,7 @@
#: field:account.common.journal.report,period_from:0
#: field:account.common.partner.report,period_from:0
#: field:account.common.report,period_from:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
#: field:account.general.journal,period_from:0
#: report:account.general.ledger:0
@@ -9450,6 +11986,7 @@
#. module: account
#: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
msgid "Analysis Direction"
msgstr "إتجاه التحليل"
@@ -9465,6 +12002,11 @@
#. module: account
#: view:account.move.line:0
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1061
+#, python-format
+>>>>>>> MERGE-SOURCE
msgid "Total credit"
msgstr "إجمالي الإئتمان"
@@ -9489,6 +12031,7 @@
msgstr "حسابات المدينون"
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,purchase_refund_sequence_prefix:0
msgid "Supplier credit note sequence"
msgstr "تسلسل اشعار رصيد المورد"
@@ -9527,6 +12070,18 @@
#, python-format
msgid "To reconcile the entries company should be the same for all entries."
msgstr "لتسوية القيود, الشركة يجب أن تكون نفسها لكل القيود المختارة."
+=======
+#: xsl:account.transfer:0
+msgid "Document"
+msgstr "مستند"
+
+#. module: account
+#: 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 "كشوف حساب البنك"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.account,balance:0
@@ -9537,6 +12092,7 @@
#: report:account.analytic.account.inverted.balance:0
#: report:account.central.journal:0
#: field:account.entries.report,balance:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
@@ -9585,6 +12141,35 @@
msgstr "الدليل"
#. module: account
+<<<<<<< TREE
+=======
+#: view:account.analytic.account:0
+msgid "Contract Data"
+msgstr "بيانات العقد"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_sale
+msgid ""
+"This view is used by accountants in order to record entries massively in "
+"OpenERP. If you want to record a customer invoice, select the journal and "
+"the period in the search toolbar. Then, start by recording the entry line of "
+"the income account. OpenERP will propose to you automatically the Tax "
+"related to this account and the counter-part \"Account receivable\"."
+msgstr ""
+"ويستخدم هذا العرض من قبل المحاسبين من أجل تسجيل المدخلات على نطاق واسع في "
+"OpenERP. إذا كنت تريد أن تسجل فاتورة العملاء، واختيار يومية وفترة في شريط "
+"أدوات البحث. ثم، تبدأ من خلال تسجيل دخول خط لحساب الإيرادات. سيقترح OpenERP "
+" عليكم تلقائيا الضريبة المتعلقة بهذا الحساب وحساب جزء \"المستحق من "
+"الحسابات\"."
+
+#. module: account
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#, python-format
+msgid "You must select accounts to reconcile"
+msgstr "يجب إختيار الحسابات للتسوية"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:process.transition,note:account.process_transition_entriesreconcile0
msgid "Accounting entries are the first input of the reconciliation."
msgstr "قيود المحاسبة هي أول المدخلات للتسوية."
@@ -9595,7 +12180,6 @@
msgstr "إنشاء القيود الإفتتاحية للسنة المالية"
#. module: account
-#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Filters By"
msgstr "ترشيح بـ"
@@ -9624,11 +12208,25 @@
msgstr "نقل"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_bank_statement.py:477
#: code:addons/account/wizard/account_period_close.py:51
+=======
+#: code:addons/account/account_move_line.py:1168
+>>>>>>> MERGE-SOURCE
#, python-format
+<<<<<<< TREE
msgid "Invalid Action!"
msgstr ""
+=======
+msgid "You can not change the tax, you should remove and recreate lines !"
+msgstr "لا يمكنك تغيير الضريبة, يجب عليك ازالة واعادة انشاء الخطوط !"
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "Analytic Entries of last 365 days"
+msgstr "قيود تحليلية لآخر ٣٦٥ يوم"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.bank.statement:0
@@ -9709,6 +12307,7 @@
msgstr "تقرير مشترك"
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,default_sale_tax:0
#: field:account.config.settings,sale_tax:0
msgid "Default sale tax"
@@ -9721,6 +12320,15 @@
#. module: account
#: code:addons/account/account.py:1549
+=======
+#: view:account.account:0
+#: field:account.account,child_consol_ids:0
+msgid "Consolidated Children"
+msgstr "فرعي موحد"
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Cannot create moves for different companies."
msgstr ""
@@ -9767,6 +12375,24 @@
msgstr "رصيد الحساب التحليلي"
#. module: account
+<<<<<<< TREE
+=======
+#: view:account.entries.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_company_analysis_tree
+msgid "Company Analysis"
+msgstr "تحليل الشركة"
+
+#. module: account
+#: code:addons/account/account.py:412
+#, python-format
+msgid ""
+"No opening/closing period defined, please create one to set the initial "
+"balance!"
+msgstr "لا يوجد فتح/اغلاق فترة محددة,لرجاء إنشاء واحد لضبط الرصيد الأولي"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: report:account.account.balance:0
#: field:account.aged.trial.balance,period_to:0
#: field:account.balance.report,period_to:0
@@ -9776,6 +12402,7 @@
#: field:account.common.journal.report,period_to:0
#: field:account.common.partner.report,period_to:0
#: field:account.common.report,period_to:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
#: field:account.general.journal,period_to:0
#: report:account.general.ledger:0
@@ -9795,11 +12422,22 @@
msgstr "نهاية الفترة"
#. module: account
+<<<<<<< TREE
#: model:account.account.type,name:account.account_type_expense_view1
msgid "Expense View"
msgstr ""
#. module: account
+=======
+#: code:addons/account/installer.py:94
+#, python-format
+msgid ""
+"There are currently no company without chart of account. The wizard will "
+"therefore not be executed."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.move.line,date_maturity:0
msgid "Due date"
msgstr "تاريخ الاستحقاق"
@@ -9849,6 +12487,7 @@
#. module: account
#: report:account.account.balance:0
#: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
#: field:account.balance.report,date_from:0
#: report:account.central.journal:0
#: field:account.central.journal,date_from:0
@@ -9856,6 +12495,7 @@
#: field:account.common.journal.report,date_from:0
#: field:account.common.partner.report,date_from:0
#: field:account.common.report,date_from:0
+#: report:account.financial.report:0
#: field:account.fiscalyear,date_start:0
#: report:account.general.journal:0
#: field:account.general.journal,date_from:0
@@ -9906,7 +12546,11 @@
msgstr "غير مسوي"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:890
+=======
+#: code:addons/account/account_invoice.py:839
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Bad total !"
msgstr "إجمالي سئ!"
@@ -9997,7 +12641,11 @@
msgstr "مقارنة"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1122
+=======
+#: code:addons/account/account_invoice.py:381
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You cannot do this modification on a confirmed entry. You can just change "
@@ -10053,6 +12701,7 @@
#: report:account.analytic.account.inverted.balance:0
#: report:account.central.journal:0
#: field:account.entries.report,credit:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
@@ -10070,6 +12719,7 @@
msgstr "دائن"
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "Draft Invoice "
msgstr ""
@@ -10078,6 +12728,34 @@
#: model:ir.ui.menu,name:account.menu_account_general_journal
msgid "General Journals"
msgstr "اليوميات العامة"
+=======
+#: help:account.invoice.refund,journal_id:0
+msgid ""
+"You can select here the journal to use for the refund invoice that will be "
+"created. If you leave that field empty, it will use the same journal as the "
+"current invoice."
+msgstr ""
+"يمكنك هنا اختيار اليومية لتستخدمها في تسديد الفاتورة التي ستُنشأ. اذا تركت "
+"هذا الحقل فارغاً, سيستخدم اليومية نفسها كفاتورة حالية."
+
+#. module: account
+#: selection:account.account.type,report_type:0
+#: code:addons/account/account.py:181
+#, python-format
+msgid "Profit & Loss (Income account)"
+msgstr "الأرباح و الخسائر(حساب الدخل)"
+
+#. module: account
+#: 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\"! "
+msgstr ""
+"التكوين الخطأ!\n"
+"لا يمكنك اختيار نوع الحساب باستخدام طريقة التأجيل المختلفه \"عدم "
+"المساواه\" للحسابات من النوع الداخلي \"الدفع / القبض\" "
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.model:0
@@ -10105,11 +12783,17 @@
msgstr "عام"
#. module: account
+<<<<<<< TREE
#: view:account.invoice.report:0
#: field:account.invoice.report,price_total:0
#: field:account.invoice.report,user_currency_price_total:0
msgid "Total Without Tax"
msgstr "الإجمالي دون الضرائب"
+=======
+#: view:analytic.entries.report:0
+msgid "Analytic Entries of last 30 days"
+msgstr "قيود تحليلة لاخر 30 يوما"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.aged.trial.balance,filter:0
@@ -10136,9 +12820,16 @@
#: view:accounting.report:0
#: selection:accounting.report,filter:0
#: selection:accounting.report,filter_cmp:0
+<<<<<<< TREE
#: model:ir.actions.act_window,name:account.action_account_period
#: model:ir.ui.menu,name:account.menu_action_account_period
+=======
+#: code:addons/account/report/common_report_header.py:99
+#: model:ir.actions.act_window,name:account.action_account_period_form
+#: model:ir.ui.menu,name:account.menu_action_account_period_form
+>>>>>>> MERGE-SOURCE
#: model:ir.ui.menu,name:account.next_id_23
+#, python-format
msgid "Periods"
msgstr "فترات"
@@ -10167,6 +12858,7 @@
#. module: account
#: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0
msgid "Profit (Loss) to report"
+<<<<<<< TREE
msgstr "تقرير للربح (الخسارة) المقدم"
#. module: account
@@ -10174,6 +12866,9 @@
#, python-format
msgid "There is no Sale/Purchase Journal(s) defined."
msgstr "لا يوجد يوميات بيع/شراء معرفة"
+=======
+msgstr "تقرير للربح (الخسارة) المقدم"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.move.line.reconcile.select:0
@@ -10223,6 +12918,18 @@
"تحويل مبالغ الخصم والائتمان من اليومية من الدخول الأصلي لكتاب الأستاذ."
#. module: account
+<<<<<<< TREE
+=======
+#: help:account.bank.statement,state:0
+msgid ""
+"When new statement is created the state will be 'Draft'.\n"
+"And after getting confirmation from the bank it will be in 'Confirmed' state."
+msgstr ""
+"عندما يتم انشاء بيانا جديدا فان هذا يكون في حاله المسوده\n"
+"وبعد الحصول علي تأكيد من المصرف البنكي سيكون في حاله مؤكده"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.model,name:account.model_account_period
msgid "Account period"
msgstr "فترة الحساب"
@@ -10285,6 +12992,7 @@
#: field:account.common.journal.report,date_to:0
#: field:account.common.partner.report,date_to:0
#: field:account.common.report,date_to:0
+#: report:account.financial.report:0
#: field:account.fiscalyear,date_stop:0
#: report:account.general.journal:0
#: field:account.general.journal,date_to:0
@@ -10330,7 +13038,22 @@
#. module: account
#: selection:account.financial.report,display_detail:0
msgid "No detail"
-msgstr "لا تفاصيل"
+<<<<<<< TREE
+msgstr "لا تفاصيل"
+=======
+msgstr "لا تفاصيل"
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:100
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgstr "لا يوجد حساب دخل معرّف لهذا المنتج: \"%s\" (id:%d)"
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr "لا يمنك إنشاء عناصر يومية في حساب مغلق."
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.account,unrealized_gain_loss:0
@@ -10346,10 +13069,16 @@
msgstr "حالات"
#. module: account
+<<<<<<< TREE
#: help:product.category,property_account_income_categ:0
#: help:product.template,property_account_income:0
msgid "This account will be used to value outgoing stock using sale price."
msgstr ""
+=======
+#: model:ir.actions.server,name:account.ir_actions_server_edi_invoice
+msgid "Auto-email confirmed invoices"
+msgstr "رسائل لتأكيد الفواتير"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.invoice,check_total:0
@@ -10357,6 +13086,7 @@
msgstr "إجمالي المحقق"
#. module: account
+#: report:account.aged_trial_balance:0
#: report:account.analytic.account.balance:0
#: report:account.analytic.account.inverted.balance:0
#: report:account.analytic.account.quantity_cost_ledger:0
@@ -10386,6 +13116,7 @@
#. module: account
#: field:account.account,company_id:0
+#: report:account.account.balance:0
#: field:account.aged.trial.balance,company_id:0
#: field:account.analytic.journal,company_id:0
#: field:account.balance.report,company_id:0
@@ -10401,7 +13132,9 @@
#: field:account.entries.report,company_id:0
#: field:account.fiscal.position,company_id:0
#: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
#: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,company_id:0
#: field:account.invoice,company_id:0
#: field:account.invoice.line,company_id:0
@@ -10410,6 +13143,8 @@
#: field:account.invoice.tax,company_id:0
#: field:account.journal,company_id:0
#: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
#: field:account.model,company_id:0
#: field:account.move,company_id:0
#: field:account.move.line,company_id:0
@@ -10529,6 +13264,14 @@
msgstr "يجب ان يكون الكود لليومية فريد لكل شركة !"
#. module: account
+<<<<<<< TREE
+=======
+#: view:wizard.multi.charts.accounts:0
+msgid "Generate Your Chart of Accounts from a Chart Template"
+msgstr "انشاء دليل الحسابات من قالب للدليل"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: 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 "
@@ -10585,6 +13328,7 @@
#: report:account.analytic.account.inverted.balance:0
#: report:account.central.journal:0
#: field:account.entries.report,debit:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
@@ -10613,6 +13357,7 @@
msgstr "سطور الفاتورة"
#. module: account
+<<<<<<< TREE
#: help:account.model.line,quantity:0
msgid "The optional quantity on entries."
msgstr "كمية اختيارية للقيود."
@@ -10621,6 +13366,46 @@
#: field:account.automatic.reconcile,reconciled:0
msgid "Reconciled transactions"
msgstr "معاملات تمت تسويتها"
+=======
+#: help:product.category,property_account_expense_categ:0
+msgid ""
+"This account will be used for invoices to value expenses for the current "
+"product category"
+msgstr ""
+
+#. module: account
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr "خطأ ! لا يمكنك انشاء قوالب الحاسب العودية."
+
+#. module: account
+#: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
+msgid "Journal Entry Number"
+msgstr "رقم قيد اليومية"
+
+#. module: account
+#: view:account.subscription:0
+msgid "Recurring"
+msgstr "متكرّر"
+
+#. module: account
+#: 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!"
+msgstr ""
+"انك لا تستطيع تغير نوع الحساب من حساب مقفل الي اي نوع اخر الذي يحتوي علي "
+"عناصر قيود اليوميه"
+
+#. module: account
+#: code:addons/account/account_move_line.py:843
+#, python-format
+msgid "Entry is already reconciled"
+msgstr "قيد اليومية مسوي بالفعل"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_report_account_receivable
@@ -10659,8 +13444,10 @@
msgstr ""
#. module: account
+#: report:account.account.balance:0
#: selection:account.balance.report,display_account:0
#: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
#: selection:account.report.general.ledger,display_account:0
msgid "With movements"
msgstr "مع حركات"
@@ -10676,12 +13463,21 @@
msgstr "يدوي"
#. module: account
+<<<<<<< TREE
#: help:account.move,balance:0
msgid ""
"This is a field only used for internal purpose and shouldn't be displayed"
msgstr "هذا الحقل يستخدم لأسباب داخلية و لا يجب عرضه"
#. module: account
+=======
+#: help:account.move,balance:0
+msgid ""
+"This is a field only used for internal purpose and shouldn't be displayed"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: selection:account.entries.report,month:0
#: selection:account.invoice.report,month:0
#: selection:analytic.entries.report,month:0
@@ -10693,6 +13489,7 @@
#. module: account
#: view:account.invoice.report:0
msgid "Group by month of Invoice Date"
+<<<<<<< TREE
msgstr "مجموعة من شهر تاريخ الفاتورة"
#. module: account
@@ -10700,6 +13497,9 @@
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)."
msgstr ""
+=======
+msgstr "مجموعة من شهر تاريخ الفاتورة"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
@@ -10735,9 +13535,31 @@
msgstr "حساب رئيسي"
#. module: account
+<<<<<<< TREE
#: view:report.account.receivable:0
msgid "Accounts by Type"
msgstr "الحسابات حسب النوع"
+=======
+#: model:ir.actions.act_window,help:account.action_account_journal_form
+msgid ""
+"Create and manage your company's journals from this menu. A journal is used "
+"to record transactions of all accounting data related to the day-to-day "
+"business of your company using double-entry bookkeeping system. Depending on "
+"the nature of its activities and the number of daily transactions, a company "
+"may keep several types of specialized journals such as a cash journal, "
+"purchase journal, sales journal..."
+msgstr ""
+"إنشاء و إدارة يوميات الشركة من هذه القائمة. قيد اليومية يستخدم لتسجيل "
+"المعاملات اليومية لجميع البيانات المحاسبية ذات الصلة للأعمال اليومية للشركة "
+"باستخدام نظام القيد المزدوج. إعتمادا على طبيعة أنشطتها وعدد المعاملات "
+"اليومية، يمكن للشركة الحفاظ على أنواع عدة من دفاتر اليومية المتخصصة مثل "
+"يومية النقدية ، و يومية المشتريات، و يومية المبيعات..."
+
+#. module: account
+#: view:account.payment.term:0
+msgid "Description On Invoices"
+msgstr "الوصف في الفاتوره"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_account_analytic_chart
@@ -10750,6 +13572,21 @@
msgstr "المبلغ المتبقي المستحق"
#. module: account
+<<<<<<< TREE
+=======
+#: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
+msgid "Statistic Reports"
+msgstr "تقارير إحصائية"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
+#, python-format
+msgid "Bad account!"
+msgstr "حساب سئ!"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.print.journal,sort_selection:0
msgid "Entries Sorted by"
msgstr "قيود يوميه مصنفه حسب"
@@ -10769,6 +13606,7 @@
msgstr "مقابلة الحسابات"
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_tax_code_list
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -10784,6 +13622,12 @@
" </p>\n"
" "
msgstr ""
+=======
+#: code:addons/account/account_invoice.py:373
+#, python-format
+msgid "Invoice '%s' is waiting for validation."
+msgstr "الفاتورة '%s' منتظرة للتحقق."
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.entries.report,month:0
@@ -10795,6 +13639,7 @@
msgstr "نوفمبر/تشرين الثاني"
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_account_moves_all_a
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -10810,6 +13655,11 @@
" </p>\n"
" "
msgstr ""
+=======
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: refund invoice, reconcile and create a new draft invoice"
+msgstr "تعديل : فاتوره مبلغ معاد , التوفيق وانشاء مسوده فاتوره جديده"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.invoice.line,account_id:0
@@ -10822,6 +13672,12 @@
msgstr "تنصيب نماذج رسوم اضافية"
#. module: account
+#: code:addons/account/account.py:1359
+#, python-format
+msgid "You can not modify a posted entry of closed periods"
+msgstr ""
+
+#. module: account
#: report:account.general.journal:0
#: model:ir.actions.report.xml,name:account.account_general_journal
msgid "General Journal"
@@ -10931,6 +13787,7 @@
#. module: account
#: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
#: field:account.common.partner.report,result_selection:0
#: report:account.partner.balance:0
#: field:account.partner.balance,result_selection:0
@@ -11015,6 +13872,8 @@
#. module: account
#: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
msgid "Future"
msgstr "مستقبل"
@@ -11046,11 +13905,19 @@
msgstr "حساب المصروفات من قالب المنتجات"
#. module: account
+<<<<<<< TREE
#: field:res.partner,property_payment_term:0
msgid "Customer Payment Term"
msgstr ""
#. module: account
+=======
+#: field:account.analytic.line,amount_currency:0
+msgid "Amount currency"
+msgstr "مبلغ العملة"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:accounting.report,label_filter:0
msgid ""
"This label will be displayed on report to show the balance computed for the "
@@ -11072,6 +13939,7 @@
msgstr ""
"المبلغ المتبقي على الدائن أو المدين لقيد اليومية معبر عنها بعملتها (ربما "
"تكون مختلفة لعملة الشركة)."
+<<<<<<< TREE
#~ msgid "Print Taxes Report"
#~ msgstr "طباعة تقرير الضرائب"
@@ -13756,3 +16624,68 @@
#, python-format
#~ msgid "Supplier invoice"
#~ msgstr "فاتورة المورد"
+=======
+
+#~ msgid "Starting Date"
+#~ msgstr "تاريخ الإبتداء"
+
+#~ msgid "Ending Date"
+#~ msgstr "تاريخ الانتهاء"
+
+#~ msgid ""
+#~ "This account will be used to value outgoing stock for the current product "
+#~ "category using sale price"
+#~ msgstr ""
+#~ "سيستخدم هذا الحساب ليقيم الاوراق المالية المنصرفة لصنف المنتج الحالي "
+#~ "بإستخدام سعر البيع"
+
+#, python-format
+#~ msgid "Entries are not of the same account or already reconciled ! "
+#~ msgstr "المدخلات ليست من نفس الحساب او تم تسويتها بالفعل ! "
+
+#~ msgid ""
+#~ "The amount of the voucher must be the same amount as the one on the "
+#~ "statement line"
+#~ msgstr "يجب ان تكون كمية الايصال نفس كمية الايصال في خط البيان"
+
+#~ msgid ""
+#~ "This account will be used to value outgoing stock for the current product "
+#~ "category using cost price"
+#~ msgstr ""
+#~ "وسيتم استخدام هذا الحساب لقيمة الأسهم الصادرة لفئة من فئات المنتجات الحالية "
+#~ "باستخدام سعر التكلفة"
+
+#~ msgid "Communication Type"
+#~ msgstr "نوع الاتصال"
+
+#~ msgid "Error ! You cannot create recursive associated members."
+#~ msgstr "خطأ ! لا يمكنك إنشاء أعضاء مرتبطين و متداخلين."
+
+#~ msgid "Invalid BBA Structured Communication !"
+#~ msgstr "خطأ في إتصال قاعدة البيانات"
+
+#, python-format
+#~ msgid ""
+#~ "This account does not allow reconciliation! You should update the account "
+#~ "definition to change this."
+#~ msgstr ""
+#~ "هذا الحساب لا يسمح بالتسوية! يجب أن تقوم بتحديث تعريف الحساب لتغيير ذلك."
+
+#~ msgid "The description must be unique per company!"
+#~ msgstr "وصف لكل شركة يجب ان تكون فريد!"
+
+#~ msgid "The RIB and/or IBAN is not valid"
+#~ msgstr "رقم الحساب RIB أو IBAN غير صحيح"
+
+#~ msgid ""
+#~ "\n"
+#~ "Please define BIC/Swift code on bank for bank type IBAN Account to make "
+#~ "valid payments"
+#~ msgstr ""
+#~ "\n"
+#~ "رجاءً حدد كود البنك (BIC/Swift) لحسابات البنوك من نوع IBAN وذلك لإجراء "
+#~ "عمليات مقبولة."
+
+#~ msgid "Entry Date"
+#~ msgstr "ادخال الناريخ"
+>>>>>>> MERGE-SOURCE
=== modified file 'account/i18n/bg.po'
--- account/i18n/bg.po 2013-04-05 11:10:48 +0000
+++ account/i18n/bg.po 2013-04-10 14:12:36 +0000
@@ -6,15 +6,32 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-05-10 17:28+0000\n"
"Last-Translator: Dimitar Markov <dimitar.markov@xxxxxxxxx>\n"
+=======
+"POT-Creation-Date: 2012-10-23 11:48+0000\n"
+"PO-Revision-Date: 2012-08-27 22:17+0000\n"
+"Last-Translator: Svetoslav <svetoslav80@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: 2013-03-16 05:12+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-24 05:44+0000\n"
+"X-Generator: Launchpad (build 16179)\n"
+
+#. module: account
+#: view:account.invoice.report:0
+#: view:analytic.entries.report:0
+msgid "last month"
+msgstr "предходен месец"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -83,6 +100,11 @@
msgstr ""
#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Aged Trial Balance"
+msgstr "Стар пробен баланс"
+
+#. module: account
#: view:account.move:0
#: view:account.move.line:0
msgid "Total Debit"
@@ -113,8 +135,12 @@
#: field:account.move,ref:0
#: field:account.move.line,ref:0
#: field:account.subscription,ref:0
+<<<<<<< TREE
#: xsl:account.transfer:0
#: field:cash.box.in,ref:0
+=======
+#: xsl:account.transfer:0
+>>>>>>> MERGE-SOURCE
msgid "Reference"
msgstr "Означение"
@@ -128,6 +154,7 @@
"без да го изтривате."
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:641
#: code:addons/account/account.py:686
#: code:addons/account/account.py:781
@@ -146,14 +173,22 @@
#: 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
+=======
+#: code:addons/account/account_invoice.py:1430
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Warning!"
msgstr "Предупреждение!"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3159
+=======
+#: code:addons/account/account.py:3129
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Miscellaneous Journal"
+<<<<<<< TREE
msgstr "Различни дневници"
#. module: account
@@ -164,6 +199,9 @@
"which is set after generating opening entries from 'Generate Opening "
"Entries'."
msgstr ""
+=======
+msgstr "Различни дневници"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.fiscal.position.account,account_src_id:0
@@ -191,12 +229,16 @@
#. module: account
#: field:accounting.report,label_filter:0
msgid "Column Label"
+<<<<<<< TREE
msgstr "Име на колона"
#. module: account
#: help:account.config.settings,code_digits:0
msgid "No. of digits to use for account code"
msgstr ""
+=======
+msgstr "Име на колона"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.analytic.journal,type:0
@@ -229,6 +271,24 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: help:account.tax.code,notprintable:0
+#: help:account.tax.code.template,notprintable:0
+msgid ""
+"Check this box if you don't want any VAT related to this Tax Code to appear "
+"on invoices"
+msgstr ""
+"Отметнете ако не искате в тази фактура да участват ДДС свързани данъци"
+
+#. module: account
+#: code:addons/account/account_invoice.py:1254
+#, python-format
+msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
+msgstr "Фактура '%s' е частично платена: %s%s от %s%s (%s%s остатък)"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
msgid "Accounting entries are an input of the reconciliation."
msgstr ""
@@ -239,6 +299,7 @@
msgstr "Белгийски отчети"
#. module: account
+<<<<<<< TREE
#: model:mail.message.subtype,name:account.mt_invoice_validated
msgid "Validated"
msgstr ""
@@ -247,6 +308,12 @@
#: model:account.account.type,name:account.account_type_income_view1
msgid "Income View"
msgstr ""
+=======
+#: code:addons/account/account_move_line.py:1215
+#, python-format
+msgid "You can not add/modify entries in a closed journal."
+msgstr "Не може да добавяте/променяте записи в закрит дневник."
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.account,user_type:0
@@ -289,6 +356,7 @@
msgstr "Изберете период за анализ"
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_invoice_tree3
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -302,6 +370,16 @@
" can generate it directly from the related customer invoice.\n"
" </p>\n"
" "
+=======
+#: view:account.move.line:0
+msgid "St."
+msgstr "Ул."
+
+#. module: account
+#: code:addons/account/account_invoice.py:560
+#, python-format
+msgid "Invoice line account company does not match with invoice company."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -601,6 +679,7 @@
msgstr "Счетоводителят потвърждава декларацията."
#. module: account
+<<<<<<< TREE
#. openerp-web
#: code:addons/account/static/src/xml/account_move_reconciliation.xml:31
#, python-format
@@ -614,6 +693,24 @@
#. module: account
#: selection:account.config.settings,period:0
+=======
+#: report:account.account.balance:0
+#: selection:account.balance.report,display_account:0
+#: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
+#: selection:account.report.general.ledger,display_account:0
+#: selection:account.tax,type_tax_use:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "All"
+msgstr "Всички"
+
+#. module: account
+#: field:account.invoice.report,address_invoice_id:0
+msgid "Invoice Address Name"
+msgstr "Име на адрес по фактура"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: selection:account.installer,period:0
msgid "3 Monthly"
msgstr "Тримесечно"
@@ -654,6 +751,7 @@
msgstr "Главната последователност трябва да е различна от настоящата!"
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_change_currency.py:64
#: code:addons/account/wizard/account_change_currency.py:70
#, python-format
@@ -667,6 +765,9 @@
#. module: account
#: code:addons/account/account_move_line.py:1159
+=======
+#: code:addons/account/account_move_line.py:1266
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No period found or more than one period found for the given date."
msgstr "Липса на период или множество намерени периоди за тази дата."
@@ -677,7 +778,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3163
+=======
+#: code:addons/account/account.py:3133
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "SAJ"
msgstr ""
@@ -717,6 +822,7 @@
msgstr "Период на дневник"
#. module: account
+<<<<<<< TREE
#: constraint:account.move:0
msgid ""
"You cannot create more than one move per period on a centralized journal."
@@ -728,6 +834,12 @@
"Set the analytic account that will be used by default on the invoice tax "
"lines for refunds. Leave empty if you don't want to use an analytic account "
"on the invoice tax lines by default."
+=======
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#, python-format
+msgid "To reconcile the entries company should be the same for all entries"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -736,7 +848,13 @@
#: selection:account.common.partner.report,result_selection:0
#: selection:account.partner.balance,result_selection:0
#: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:372
#: code:addons/account/report/account_partner_balance.py:297
+<<<<<<< TREE
+=======
+#: code:addons/account/report/account_partner_ledger.py:395
+#: model:ir.actions.act_window,name:account.action_aged_receivable
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Receivable Accounts"
msgstr "Приходни сметки"
@@ -823,6 +941,16 @@
msgstr "Метод за възстановяване на сума"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/wizard/account_change_currency.py:38
+#, python-format
+msgid "You can only change currency for Draft Invoice !"
+msgstr "Можете да сменяте валутата само на фактури в статус проект (чернова)"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
+>>>>>>> MERGE-SOURCE
#: model:ir.ui.menu,name:account.menu_account_report
msgid "Financial Report"
msgstr "Финансов отчет"
@@ -845,7 +973,11 @@
msgstr "Тип"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:794
+=======
+#: code:addons/account/account_invoice.py:747
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Taxes are missing!\n"
@@ -980,11 +1112,13 @@
msgstr "Раздели на тримесечни периоди"
#. module: account
+#: report:account.aged_trial_balance:0
#: report:account.overdue:0
msgid "Due"
msgstr "За плащане"
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,purchase_journal_id:0
msgid "Purchase journal"
msgstr ""
@@ -995,6 +1129,20 @@
msgstr ""
#. module: account
+=======
+#: code:addons/account/account.py:1353
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"!"
+msgstr ""
+"Не можете да потвърдите този запис в дневника, тъй като сметка \"%s\" не "
+"принадлежи към сметкоплан \"%s\"!"
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.move:0
+>>>>>>> MERGE-SOURCE
#: view:validate.account.move:0
#: view:validate.account.move.lines:0
msgid "Approve"
@@ -1066,6 +1214,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:2613
+#, python-format
+msgid "I can not locate a parent code for the template account!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.analytic.line:0
msgid "Purchases"
msgstr "Покупки"
@@ -1093,6 +1250,7 @@
msgstr "Код"
#. module: account
+<<<<<<< TREE
#: view:account.config.settings:0
msgid "Features"
msgstr ""
@@ -1103,6 +1261,13 @@
#: code:addons/account/account_invoice.py:74
#: code:addons/account/account_invoice.py:744
#: code:addons/account/account_move_line.py:195
+=======
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_bank_statement.py:357
+#: code:addons/account/account_invoice.py:73
+#: code:addons/account/account_invoice.py:697
+#: code:addons/account/account_move_line.py:173
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Analytic Journal !"
msgstr "Няма аналитичен дневник !"
@@ -1174,12 +1339,16 @@
"повече информация за съответното счетоводство и неговите спицифики."
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "Refund "
msgstr ""
#. module: account
#: code:addons/account/account_analytic_line.py:90
+=======
+#: code:addons/account/account_move_line.py:856
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
msgstr ""
@@ -1227,7 +1396,11 @@
#. module: account
#: model:account.account.type,name:account.data_account_type_bank
#: selection:account.bank.accounts.wizard,account_type:0
+<<<<<<< TREE
#: code:addons/account/account.py:3054
+=======
+#: code:addons/account/account.py:3020
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Bank"
msgstr "Банка"
@@ -1329,6 +1502,19 @@
msgstr "Движение по този ред от запис"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1317
+#, python-format
+msgid ""
+"You can not use this general account in this journal, check the tab 'Entry "
+"Controls' on the related journal !"
+msgstr ""
+"Не можете да използвате общата сметка с този дневник. Отметнете полето "
+"'Контрол на записите' в съответния дневник"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.move.line.reconcile,trans_nbr:0
msgid "# of Transaction"
msgstr "# от транзакция"
@@ -1342,6 +1528,15 @@
msgstr "Етикет на запис"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:1136
+#, python-format
+msgid "You can not modify/delete a journal with entries for this period !"
+msgstr "Не може да променяте/изтривате дневник със записи от този период !"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.invoice,origin:0
#: help:account.invoice.line,origin:0
msgid "Reference of the document that produced this invoice."
@@ -1426,7 +1621,12 @@
msgstr "Данъци"
#. module: account
-#: code:addons/account/wizard/account_financial_report.py:70
+<<<<<<< TREE
+#: code:addons/account/wizard/account_financial_report.py:70
+=======
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Select a starting and an ending period"
msgstr "Задайте начален и краен период"
@@ -1493,6 +1693,7 @@
msgstr "Анализ на журналните единици"
#. module: account
+#: report:account.aged_trial_balance:0
#: model:ir.ui.menu,name:account.next_id_22
msgid "Partners"
msgstr "Партньори"
@@ -1533,8 +1734,10 @@
msgstr ""
#. module: account
+#: report:account.account.balance:0
#: selection:account.balance.report,display_account:0
#: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
#: selection:account.partner.balance,display_partner:0
#: selection:account.report.general.ledger,display_account:0
msgid "With balance is not equal to 0"
@@ -1554,6 +1757,121 @@
msgstr "Търсене на данък"
#. module: account
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello${object.address_invoice_id.name and ' ' or "
+"''}${object.address_invoice_id.name or ''},</p>\n"
+" \n"
+" <p>A new invoice is available for ${object.partner_id.name}: </p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" <strong>REFERENCES</strong><br />\n"
+" Invoice number: <strong>${object.number}</strong><br />\n"
+" Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+" Invoice date: ${object.date_invoice}<br />\n"
+" % if object.origin:\n"
+" Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" Your contact: <a "
+"href=\"mailto:${object.user_id.user_email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+" </p> \n"
+" \n"
+" <p>\n"
+" You can view the invoice document, download it and pay online using the "
+"following link:\n"
+" </p>\n"
+" <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\" \n"
+" href=\"${ctx.get('edi_web_url_view') or ''}\">View "
+"Invoice</a>\n"
+" \n"
+" % if object.company_id.paypal_account and object.type in ('out_invoice', "
+"'in_refund'):\n"
+" <% \n"
+" comp_name = quote(object.company_id.name)\n"
+" inv_number = quote(object.number)\n"
+" paypal_account = quote(object.company_id.paypal_account)\n"
+" inv_amount = quote(str(object.amount_total))\n"
+" cur_name = quote(object.currency_id.name)\n"
+" paypal_url = \"https://www.paypal.com/cgi-";
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s&"
+"\" \\\n"
+" "
+"\"invoice=%s&amount=%s&currency_code=%s&button_subtype=services&a"
+"mp;no_note=1&bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
+"\n"
+" %>\n"
+" <br/>\n"
+" <p>It is also possible to directly pay with Paypal:</p>\n"
+" <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+" <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+" </a>\n"
+" % endif\n"
+" \n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone: ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web : <a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger
msgid "Account Analytic Cost Ledger"
msgstr ""
@@ -1786,6 +2104,7 @@
msgstr "Последователност на финансовата година"
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,group_analytic_accounting:0
msgid "Analytic accounting"
msgstr ""
@@ -1807,6 +2126,17 @@
"should choose 'Round per line' because you certainly want the sum of your "
"tax-included line subtotals to be equal to the total amount with taxes."
msgstr ""
+=======
+#: field:wizard.multi.charts.accounts,seq_journal:0
+msgid "Separated Journal Sequences"
+msgstr "Разделени журнални последователности"
+
+#. module: account
+#: field:account.bank.statement,user_id:0
+#: view:account.invoice:0
+msgid "Responsible"
+msgstr "Отговорник"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
@@ -1851,6 +2181,16 @@
msgstr "Годишна сума"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:1431
+#, 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 "Този помощник ще промени валутата на фактурата"
@@ -1932,6 +2272,7 @@
msgstr "Отпратка към клиент:"
#. module: account
+<<<<<<< TREE
#: help:account.tax,base_code_id:0
#: help:account.tax,ref_base_code_id:0
#: help:account.tax,ref_tax_code_id:0
@@ -1941,6 +2282,11 @@
#: help:account.tax.template,ref_tax_code_id:0
#: help:account.tax.template,tax_code_id:0
msgid "Use this code for the tax declaration."
+=======
+#: code:addons/account/account_cash_statement.py:293
+#, python-format
+msgid "User %s does not have rights to access %s journal !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -2178,8 +2524,23 @@
msgstr "Продуктова категория"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:656
#, python-format
+=======
+#: code:addons/account/installer.py:94
+#, python-format
+msgid "No unconfigured company !"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "/"
+msgstr "/"
+
+#. module: account
+#: help:res.company,property_reserve_and_surplus_account:0
+>>>>>>> MERGE-SOURCE
msgid ""
"You cannot change the type of account to '%s' type as it contains journal "
"items!"
@@ -2318,12 +2679,20 @@
msgstr "Финансова година"
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_move_bank_reconcile.py:53
#, python-format
msgid "Standard Encoding"
msgstr "Стандартно кодиране"
#. module: account
+=======
+#: xsl:account.transfer:0
+msgid "Partner ID"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.journal.select:0
#: view:project.account.analytic.line:0
msgid "Open Entries"
@@ -2394,6 +2763,17 @@
msgstr "Про-форма"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:1478
+#, python-format
+msgid ""
+"There is no default default debit account defined \n"
+"on journal \"%s\""
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.account.template,type:0
#: help:account.entries.report,type:0
msgid ""
@@ -2410,6 +2790,26 @@
msgstr "Търсене в шаблони за сметкоплан"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1292
+#, python-format
+msgid ""
+"Can not create an automatic sequence for this piece!\n"
+"Put a sequence in the journal definition for automatic numbering or create a "
+"sequence manually for this piece."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:787
+#, python-format
+msgid ""
+"You can not modify the company of this journal as its related record exist "
+"in journal items"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: report:account.invoice:0
msgid "Customer Code"
msgstr ""
@@ -2432,10 +2832,17 @@
msgstr "Описание"
#. module: account
+<<<<<<< TREE
#: field:account.tax,price_include:0
#: field:account.tax.template,price_include:0
msgid "Tax Included in Price"
msgstr "Данъци включени в цената"
+=======
+#: code:addons/account/account.py:3136
+#, python-format
+msgid "ECNJ"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.subscription:0
@@ -2451,11 +2858,25 @@
msgstr "Приходна сметка"
#. module: account
+<<<<<<< TREE
#: help:account.config.settings,default_sale_tax:0
msgid "This sale tax will be assigned by default on new products."
msgstr ""
#. module: account
+=======
+#: code:addons/account/account_invoice.py:379
+#, python-format
+msgid "There is no Accounting Journal of type Sale/Purchase defined!"
+msgstr "Няма счетоводен дневник за продажби/покупки!"
+
+#. module: account
+#: view:product.category:0
+msgid "Accounting Properties"
+msgstr "Счетоводни свойства"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.journal.period.print.sale.purchase:0
@@ -2480,6 +2901,7 @@
#. module: account
#: report:account.account.balance:0
#: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
#: field:account.balance.report,fiscalyear_id:0
#: report:account.central.journal:0
#: field:account.central.journal,fiscalyear_id:0
@@ -2490,7 +2912,11 @@
#: view:account.config.settings:0
#: view:account.entries.report:0
#: field:account.entries.report,fiscalyear_id:0
+<<<<<<< TREE
#: view:account.fiscalyear:0
+=======
+#: report:account.financial.report:0
+>>>>>>> MERGE-SOURCE
#: field:account.fiscalyear,name:0
#: report:account.general.journal:0
#: field:account.general.journal,fiscalyear_id:0
@@ -2550,12 +2976,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.addtmpl.wizard:0
msgid "Create an Account Based on this Template"
msgstr "Създаване на сметка според този шаблон"
#. module: account
#: code:addons/account/account_invoice.py:901
+=======
+#: code:addons/account/account.py:1485
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Cannot create the invoice.\n"
@@ -2576,7 +3006,11 @@
msgstr "Основна последователност"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_bank_statement.py:477
+=======
+#: code:addons/account/account_bank_statement.py:403
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"In order to delete a bank statement, you must first cancel it to delete "
@@ -2648,6 +3082,19 @@
msgstr "Данъчен код"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:581
+#, python-format
+msgid ""
+"Can't find any account journal of %s type for this company.\n"
+"\n"
+"You can create one in the menu: \n"
+"Configuration\\Financial Accounting\\Accounts\\Journals."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:account.payment.term,name:account.account_payment_term_advance
#: model:account.payment.term,note:account.account_payment_term_advance
msgid "30% Advance End 30 Days"
@@ -2708,7 +3155,11 @@
msgstr "Запис на модела на сметка"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3164
+=======
+#: code:addons/account/account.py:3134
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "EXJ"
msgstr ""
@@ -2783,7 +3234,10 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:account.account.type,name:account.conf_account_type_tax
+=======
+>>>>>>> MERGE-SOURCE
#: report:account.invoice:0
#: field:account.invoice,amount_tax:0
#: report:account.journal.period.print.sale.purchase:0
@@ -2806,12 +3260,20 @@
msgstr "Аналитична сметка"
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,default_purchase_tax:0
#: field:account.config.settings,purchase_tax:0
msgid "Default purchase tax"
msgstr ""
#. module: account
+=======
+#: report:account.aged_trial_balance:0
+msgid "Not due"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.account:0
#: field:account.financial.report,account_ids:0
#: selection:account.financial.report,type:0
@@ -2825,6 +3287,7 @@
msgstr "Сметки"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3503
#: code:addons/account/account_bank_statement.py:404
#: code:addons/account/account_invoice.py:378
@@ -2834,6 +3297,9 @@
#: code:addons/account/account_invoice.py:605
#: code:addons/account/account_invoice.py:627
#: code:addons/account/account_move_line.py:535
+=======
+#: code:addons/account/account_invoice.py:378
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Configuration Error!"
msgstr "Грешка при настройване!"
@@ -2978,6 +3444,7 @@
#. module: account
#: view:account.aged.trial.balance:0
#: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
#: model:ir.ui.menu,name:account.menu_aged_trial_balance
msgid "Aged Partner Balance"
msgstr "Стар партньорски баланс"
@@ -2989,11 +3456,14 @@
msgstr "Счетоводни записи"
#. module: account
+<<<<<<< TREE
#: constraint:account.move.line:0
msgid "Account and Period must belong to the same company."
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: field:account.invoice.line,discount:0
msgid "Discount (%)"
msgstr "Отстъпка (%)"
@@ -3041,8 +3511,18 @@
msgstr "Продажби по сметка"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1411
+=======
+#: view:account.use.model:0
+msgid "This wizard will create recurring accounting entries"
+msgstr "Този помощник ще създаде повтарящи се счетоводни записи"
+
+#. module: account
+#: code:addons/account/account.py:1329
+>>>>>>> MERGE-SOURCE
#, python-format
+<<<<<<< TREE
msgid "You cannot delete a posted journal entry \"%s\"."
msgstr ""
@@ -3060,6 +3540,15 @@
#: code:addons/account/account.py:2308
#: code:addons/account/account_invoice.py:744
#: code:addons/account/account_move_line.py:195
+=======
+msgid "No sequence defined on the journal !"
+msgstr "Не са зададени последоватености за този дневник !"
+
+#. module: account
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
+#: code:addons/account/account_move_line.py:173
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
msgstr "Трябва да зададете аналитичен дневник в '%s' дневник!"
@@ -3119,6 +3608,11 @@
msgstr ""
#. module: account
+#: field:accounting.report,debit_credit:0
+msgid "Display Debit/Credit Columns"
+msgstr ""
+
+#. module: account
#: selection:account.entries.report,month:0
#: selection:account.invoice.report,month:0
#: selection:analytic.entries.report,month:0
@@ -3180,11 +3674,31 @@
msgstr "Сума по основен код"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:401
+#, python-format
+msgid ""
+"You can not delete an invoice which is open or paid. We suggest you to "
+"refund it instead."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
msgstr "Данък продажба по подразбиране"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:1025
+#, python-format
+msgid "Invoice '%s' is validated."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.model.line,date_maturity:0
msgid ""
"The maturity date of the generated entries for this model. You can choose "
@@ -3220,7 +3734,11 @@
msgstr "Фискална позиция"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:791
+=======
+#: code:addons/account/account_invoice.py:744
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Tax base different!\n"
@@ -3381,8 +3899,13 @@
msgstr "Изглед"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3422
#: code:addons/account/account_bank.py:95
+=======
+#: code:addons/account/account.py:3380
+#: code:addons/account/account_bank.py:90
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "BNK"
msgstr ""
@@ -3653,7 +4176,11 @@
msgstr "Начален баланс"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1434
+=======
+#: code:addons/account/account_invoice.py:1345
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Partner Defined !"
msgstr "Не е зададен партньор !"
@@ -3734,6 +4261,15 @@
msgstr "Графика на данък"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_cash_statement.py:315
+#, python-format
+msgid "The closing balance should be the same than the computed balance!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.journal:0
msgid "Search Account Journal"
msgstr ""
@@ -3849,6 +4385,7 @@
#. module: account
#: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
msgid "Period Length (days)"
msgstr ""
@@ -3912,8 +4449,18 @@
msgstr "Подробно"
#. module: account
+<<<<<<< TREE
#: help:account.config.settings,default_purchase_tax:0
msgid "This purchase tax will be assigned by default on new products."
+=======
+#: code:addons/account/account_invoice.py:850
+#, python-format
+msgid ""
+"Can not create the invoice !\n"
+"The related payment term is probably misconfigured as it gives a computed "
+"amount greater than the total invoiced amount. The latest line of your "
+"payment term must be of type 'balance' to avoid rounding issues."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -3922,9 +4469,23 @@
msgstr "ДДС :"
#. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
#: report:account.central.journal:0
+<<<<<<< TREE
#: view:account.config.settings:0
+=======
+#: report:account.financial.report:0
+#: report:account.general.journal:0
+>>>>>>> MERGE-SOURCE
#: report:account.general.ledger:0
+<<<<<<< TREE
+=======
+#: report:account.general.ledger_landscape:0
+#: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+>>>>>>> MERGE-SOURCE
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
@@ -3940,8 +4501,19 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.model,name:account.model_account_journal_cashbox_line
msgid "account.journal.cashbox.line"
+=======
+#: field:account.journal,centralisation:0
+msgid "Centralised counterpart"
+msgstr "Централизирано копие"
+
+#. module: account
+#: code:addons/account/account_move_line.py:575
+#, python-format
+msgid "You can not create journal items on a \"view\" account %s %s"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -3994,7 +4566,13 @@
#: selection:account.vat.declaration,filter:0
#: selection:accounting.report,filter:0
#: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
#: field:analytic.entries.report,date:0
+#, python-format
msgid "Date"
msgstr "Дата"
@@ -4010,12 +4588,28 @@
msgstr "Връщане приравняване"
#. module: account
+<<<<<<< TREE
+=======
+#: view:account.analytic.line: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 "Потребител"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.chart.template:0
msgid "Chart of Accounts Template"
msgstr "Диаграма на шаблони на сметка"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2320
+=======
+#: code:addons/account/account.py:2297
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4024,6 +4618,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.balance.report,display_account:0
#: selection:account.common.account.report,display_account:0
#: selection:account.report.general.ledger,display_account:0
@@ -4031,6 +4626,17 @@
#: selection:account.tax.template,type_tax_use:0
msgid "All"
msgstr "Всички"
+=======
+#: code:addons/account/account_move_line.py:846
+#, python-format
+msgid "Some entries are already reconciled !"
+msgstr "Някой записи вече са били приравнени !"
+
+#. module: account
+#: view:account.tax:0
+msgid "Account Tax"
+msgstr "Сметка за данък"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
@@ -4053,6 +4659,8 @@
#: selection:account.vat.declaration,filter:0
#: selection:accounting.report,filter:0
#: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
msgid "No Filters"
msgstr ""
@@ -4149,6 +4757,20 @@
msgstr "Аналитични артикули"
#. module: account
+<<<<<<< TREE
+=======
+#: report:account.aged_trial_balance:0
+msgid "Account Total"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1168
+#, python-format
+msgid "Unable to change tax !"
+msgstr "Не може да се сменя данъка !"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:analytic.entries.report,nbr:0
msgid "#Entries"
msgstr "#Записи"
@@ -4164,8 +4786,22 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,complete_tax_set:0
msgid "Complete set of taxes"
+=======
+#: view:account.fiscal.position:0
+msgid "Mapping"
+msgstr "Планиране"
+
+#. module: account
+#: code:addons/account/account_invoice.py:932
+#, python-format
+msgid ""
+"You cannot create an invoice on a centralised journal. Uncheck the "
+"centralised counterpart box in the related journal from the configuration "
+"menu."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4173,6 +4809,7 @@
#: field:account.account.template,name:0
#: report:account.analytic.account.inverted.balance:0
#: field:account.chart.template,name:0
+#: report:account.financial.report:0
#: field:account.model.line,name:0
#: field:account.move.line,name:0
#: field:account.move.reconcile,name:0
@@ -4181,7 +4818,16 @@
msgstr "Име"
#. module: account
+<<<<<<< TREE
#: code:addons/account/installer.py:94
+=======
+#: model:ir.model,name:account.model_account_aged_trial_balance
+msgid "Account Aged Trial balance Report"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:582
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No unconfigured company !"
msgstr ""
@@ -4485,7 +5131,16 @@
msgstr "Отмяна на избраните фактури"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_bank_statement.py:423
+=======
+#: selection:account.automatic.reconcile,power:0
+msgid "3"
+msgstr "3"
+
+#. module: account
+#: code:addons/account/account_move_line.py:97
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You have to assign an analytic journal on the '%s' journal!"
msgstr ""
@@ -4539,6 +5194,7 @@
msgstr "Месец"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:668
#, python-format
msgid "You cannot change the code of account which contains journal items!"
@@ -4552,6 +5208,9 @@
#. module: account
#: code:addons/account/account_invoice.py:583
#: code:addons/account/account_invoice.py:598
+=======
+#: code:addons/account/account_move_line.py:1231
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Cannot find a chart of account, you should create one from Settings\\"
@@ -4614,7 +5273,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:867
+=======
+#: code:addons/account/account_analytic_line.py:91
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You have to provide an account for the write off/exchange difference entry."
@@ -4680,6 +5343,7 @@
msgstr "Извлечение от фактура или плащане"
#. module: account
+<<<<<<< TREE
#: code:addons/account/installer.py:94
#, python-format
msgid ""
@@ -4693,6 +5357,15 @@
msgstr ""
#. module: account
+=======
+#: help:product.template,property_account_expense:0
+msgid ""
+"This account will be used for invoices instead of the default one to value "
+"expenses for the current product"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.model,name:account.model_account_chart
msgid "Account chart"
msgstr ""
@@ -4817,6 +5490,7 @@
msgstr "Разрешаване на приравняване"
#. module: account
+<<<<<<< TREE
#: constraint:account.account:0
msgid ""
"Error!\n"
@@ -4825,6 +5499,9 @@
#. module: account
#: code:addons/account/account_invoice.py:627
+=======
+#: code:addons/account/account.py:1082
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Cannot find any account journal of %s type for this company.\n"
@@ -4855,12 +5532,28 @@
msgstr "Повтарящи се модели"
#. module: account
+<<<<<<< TREE
#: view:account.tax:0
msgid "Children/Sub Taxes"
+=======
+#: code:addons/account/account_move_line.py:1266
+#, python-format
+msgid "Encoding error"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
-#: xsl:account.transfer:0
+<<<<<<< TREE
+#: xsl:account.transfer:0
+=======
+#: selection:account.automatic.reconcile,power:0
+msgid "4"
+msgstr "4"
+
+#. module: account
+#: view:account.invoice:0
+#: xsl:account.transfer:0
+>>>>>>> MERGE-SOURCE
msgid "Change"
msgstr "Промяна"
@@ -4887,6 +5580,7 @@
msgstr "Отменено"
#. module: account
+<<<<<<< TREE
#: help:account.config.settings,group_proforma_invoices:0
msgid "Allows you to put invoices in pro-forma state."
msgstr ""
@@ -4899,13 +5593,41 @@
#. module: account
#: help:account.partner.ledger,amount_currency:0
#: help:account.report.general.ledger,amount_currency:0
+=======
+#: help:account.bank.statement,balance_end_cash:0
+msgid "Closing balance based on cashBox"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Example"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:839
+#, python-format
+>>>>>>> MERGE-SOURCE
msgid ""
"It adds the currency column on report if the currency differs from the "
"company currency."
msgstr ""
+<<<<<<< TREE
#. module: account
#: code:addons/account/account.py:3356
+=======
+"Моля проверете цената на фактурата !\n"
+"Истинска обща сума не отговаря на изчислената."
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr "Запазете празно за да изпозвате сметката за приходи"
+
+#. module: account
+#: code:addons/account/account.py:3316
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Purchase Tax %.2f%%"
msgstr ""
@@ -4930,6 +5652,18 @@
msgstr "Свързване на сметки"
#. module: account
+<<<<<<< TREE
+=======
+#: selection:account.bank.statement.line,type:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/account_invoice.py:346
+#, python-format
+msgid "Customer"
+msgstr "Клиент"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.bank.statement:0
msgid "Confirmed"
msgstr "Потвърден"
@@ -4940,8 +5674,17 @@
msgstr "Отменена фактура"
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "My Invoices"
+=======
+#: code:addons/account/account.py:1584
+#, 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."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4961,16 +5704,32 @@
msgstr "Код за обезщетение от данък"
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "Invoice "
msgstr "Фактура "
#. module: account
+=======
+#: view:validate.account.move:0
+msgid ""
+"All draft account entries in this journal and period will be validated. It "
+"means you won't be able to modify their accounting fields anymore."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_configuration
+msgid "Configuration"
+msgstr "Настройка"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.chart.template,property_account_income:0
msgid "Income Account on Product Template"
msgstr "Сметка приход в шаблона за продукт"
#. module: account
+<<<<<<< TREE
#: help:account.journal.period,state:0
msgid ""
"When journal period is created. The status is 'Draft'. If a report is "
@@ -4980,6 +5739,9 @@
#. module: account
#: code:addons/account/account.py:3167
+=======
+#: code:addons/account/account.py:3137
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "MISC"
msgstr ""
@@ -4994,11 +5756,13 @@
#: view:account.tax:0
#: view:account.tax.template:0
#: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
#: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
#: model:ir.actions.act_window,name:account.action_invoice_tree
#: model:ir.actions.report.xml,name:account.account_invoices
#: view:report.invoice.created:0
#: field:res.partner,invoice_ids:0
+#, python-format
msgid "Invoices"
msgstr "Фактури"
@@ -5148,6 +5912,7 @@
msgstr "Бланка за данък"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:890
#, python-format
msgid ""
@@ -5170,6 +5935,54 @@
#: field:account.journal,cash_control:0
msgid "Cash Control"
msgstr ""
+=======
+#: view:account.move:0
+#: view:account.move.line:0
+#: code:addons/account/wizard/account_move_journal.py:153
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
+#: model:ir.actions.act_window,name:account.act_account_move_to_account_move_line_open
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move
+#: model:ir.actions.act_window,name:account.action_account_manual_reconcile
+#: model:ir.actions.act_window,name:account.action_account_moves_all_a
+#: model:ir.actions.act_window,name:account.action_account_moves_bank
+#: model:ir.actions.act_window,name:account.action_account_moves_purchase
+#: model:ir.actions.act_window,name:account.action_account_moves_sale
+#: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
+#: model:ir.actions.act_window,name:account.action_move_line_tree1
+#: model:ir.actions.act_window,name:account.action_tax_code_line_open
+#: model:ir.model,name:account.model_account_move_line
+#: model:ir.ui.menu,name:account.menu_action_account_moves_all
+#: model:ir.ui.menu,name:account.menu_action_account_moves_bank
+#: model:ir.ui.menu,name:account.menu_eaction_account_moves_purchase
+#: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
+#, python-format
+msgid "Journal Items"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
+#: 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_financial_report.py:70
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
+#, python-format
+msgid "Error"
+msgstr "Грешка"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.analytic.balance,date2:0
@@ -5262,6 +6075,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:1361
+#, 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."
+msgstr ""
+"Не може да променяте запис от този дневник !\n"
+"Ако искате това трябва да настроите дневника да разрешава отказ на записи."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.ui.menu,name:account.account_template_folder
msgid "Templates"
msgstr "Шаблони"
@@ -5277,6 +6104,15 @@
msgstr "Подчинени сметки за данъци"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:1097
+#, python-format
+msgid "Start period should be smaller then End period"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.tax,price_include:0
#: help:account.tax.template,price_include:0
msgid ""
@@ -5294,6 +6130,7 @@
#. module: account
#: report:account.account.balance:0
#: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
#: field:account.balance.report,target_move:0
#: report:account.central.journal:0
#: field:account.central.journal,target_move:0
@@ -5343,6 +6180,8 @@
#: view:account.invoice:0
#: field:account.invoice,payment_ids:0
#: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
msgid "Payments"
msgstr "Плащания"
@@ -5398,6 +6237,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: view:account.payment.term.line:0
+msgid "Line 1:"
+msgstr "Ред 1:"
+
+#. module: account
+#: code:addons/account/account.py:1315
+#, python-format
+msgid "Integrity Error !"
+msgstr "Грешка за цялостност !"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.tax.template,description:0
msgid "Internal Name"
msgstr "Вътрешно име"
@@ -5669,6 +6522,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.analytic.account:0
#: view:account.bank.statement:0
#: selection:account.bank.statement,state:0
@@ -5680,6 +6534,11 @@
#: selection:report.invoice.created,state:0
msgid "Open"
msgstr "Отваряне"
+=======
+#: field:account.bank.statement.line,name:0
+msgid "Communication"
+msgstr "Комуникация"
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.config.settings:0
@@ -5732,6 +6591,7 @@
msgstr "Днвеник за записи в края на годината"
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "Draft Refund "
msgstr ""
@@ -5743,6 +6603,21 @@
#. module: account
#: view:account.payment.term.line:0
+=======
+#: code:addons/account/account.py:3463
+#: code:addons/account/account_bank_statement.py:338
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
+#: code:addons/account/wizard/account_move_journal.py:63
+#, python-format
+msgid "Configuration Error !"
+msgstr "Грешка при настройване!"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.payment.term.line,value_amount:0
msgid "Amount To Pay"
msgstr ""
@@ -5811,7 +6686,6 @@
msgstr ""
#. module: account
-#: field:account.analytic.line,amount_currency:0
#: field:account.entries.report,amount_currency:0
#: field:account.model.line,amount_currency:0
#: field:account.move.line,amount_currency:0
@@ -5951,6 +6825,15 @@
msgstr "Създаване на начални записи"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:775
+#, python-format
+msgid "Already Reconciled!"
+msgstr "Вече равнено!"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.tax,type:0
msgid "The computation method for the tax amount."
msgstr "Метода на изчисление на сумата на данъка"
@@ -5979,14 +6862,22 @@
msgstr "Подчинени сметки"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1120
+=======
+#: code:addons/account/account_move_line.py:1229
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Move name (id): %s (%s)"
msgstr ""
#. module: account
#: view:account.move.line.reconcile:0
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:882
+=======
+#: code:addons/account/account_move_line.py:871
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Write-Off"
msgstr "Отписване"
@@ -6012,7 +6903,11 @@
#: view:account.config.settings:0
#: view:account.invoice:0
#: view:account.invoice.report:0
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:355
+=======
+#: code:addons/account/account_invoice.py:348
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Supplier"
msgstr "Доставчик"
@@ -6032,7 +6927,11 @@
msgstr "Сметка n°"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:92
+=======
+#: code:addons/account/account_invoice.py:91
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Free Reference"
msgstr "Свободна отпратка"
@@ -6042,7 +6941,9 @@
#: selection:account.common.partner.report,result_selection:0
#: selection:account.partner.balance,result_selection:0
#: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
#: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
#, python-format
msgid "Receivable and Payable Accounts"
msgstr "Сметки за получаване и плащане"
@@ -6146,17 +7047,31 @@
msgstr "Подреждане по"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2296
+=======
+#: code:addons/account/account.py:2273
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You have a wrong expression \"%(...)s\" in your model !"
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.tax.template:0
msgid "Compute Code for Taxes Included Prices"
msgstr "Изчисляващ код за данъци, включени в цените"
#. module: account
+=======
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
+#, python-format
+msgid "You can not use an inactive account!"
+msgstr "Не може да използвате неактивна сметка!"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.bank.statement,balance_end:0
msgid "Balance as calculated based on Starting Balance and transaction lines"
msgstr ""
@@ -6194,6 +7109,7 @@
msgstr "Брой дни"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1321
#, python-format
msgid ""
@@ -6209,6 +7125,24 @@
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Template Tax Fiscal Position"
+=======
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
+#: code:addons/account/wizard/account_period_close.py:51
+#, python-format
+msgid "Invalid action !"
+msgstr "Невалидно действие !"
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:102
+#, python-format
+msgid "Period: %s"
+msgstr "Период: %s"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_review_financial_journals_installer
+msgid "Review your Financial Journals"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -6251,6 +7185,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/wizard/account_report_common.py:151
+#, python-format
+msgid "not implemented"
+msgstr "не е реализирано"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.journal,company_id:0
msgid "Company related to this journal"
msgstr "Предприятие свързано с този дневник"
@@ -6279,6 +7222,8 @@
#. module: account
#: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
msgid "Past"
msgstr "Предишен"
@@ -6578,6 +7523,8 @@
#. module: account
#: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
msgid "Journal & Partner"
msgstr "Дневник и партньор"
@@ -6587,7 +7534,11 @@
msgstr "Степенуване"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3427
+=======
+#: code:addons/account/account.py:3385
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Cannot generate an unused journal code."
msgstr ""
@@ -6634,6 +7585,7 @@
msgstr "Приложими видове"
#. module: account
+<<<<<<< TREE
#: help:account.invoice,date_due:0
msgid ""
"If you use payment terms, the due date will be computed automatically at the "
@@ -6650,6 +7602,12 @@
"There is no opening/closing period defined, please create one to set the "
"initial balance."
msgstr ""
+=======
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr "Отпратка на фактура"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.tax.template,sequence:0
@@ -6890,8 +7848,19 @@
msgstr "Статистика на аналитични записи"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_analytic_line.py:142
#: code:addons/account/account_move_line.py:958
+=======
+#: code:addons/account/account.py:624
+#, python-format
+msgid "You can not remove an account containing journal items."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entries: "
msgstr "Записи: "
@@ -6902,7 +7871,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: constraint:account.move.line:0
+=======
+#: code:addons/account/account.py:1580
+#, python-format
+msgid "Couldn't create move between different companies"
+msgstr "Не може да създаде движение между различни фирми"
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_type_form
+>>>>>>> MERGE-SOURCE
msgid ""
"You cannot provide a secondary currency if it is the same than the company "
"one."
@@ -6927,13 +7906,25 @@
#. module: account
#: view:account.move.line:0
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1058
+#, python-format
+>>>>>>> MERGE-SOURCE
msgid "Total debit"
msgstr "Общ дебит"
#. module: account
+<<<<<<< TREE
#: view:account.move.line:0
msgid "Next Partner Entries to reconcile"
msgstr ""
+=======
+#: code:addons/account/account_move_line.py:824
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr "Запис \"%s\" е невалиден !"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.invoice:0
@@ -6990,6 +7981,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.bank.statement,total_entry_encoding:0
msgid "Total Transactions"
msgstr ""
@@ -7003,6 +7995,35 @@
#. module: account
#: code:addons/account/account.py:1024
#: code:addons/account/account_move_line.py:1108
+=======
+#: code:addons/account/account.py:622
+#: code:addons/account/account.py:624
+#: code:addons/account/account.py:963
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account_bank_statement.py:301
+#: code:addons/account/account_bank_statement.py:314
+#: code:addons/account/account_bank_statement.py:352
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
+#: 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/wizard/account_use_model.py:44
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Error !"
msgstr "Грешка!"
@@ -7030,6 +8051,16 @@
msgstr "Отпечатан"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
+#, python-format
+msgid "Error :"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.analytic.line:0
msgid "Project line"
msgstr "Ред от проект"
@@ -7096,6 +8127,18 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1233
+#, 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"
+"%s"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
#: report:account.third_party_ledger:0
@@ -7216,6 +8259,7 @@
msgstr "Общо:"
#. module: account
+<<<<<<< TREE
#: constraint:account.journal:0
msgid ""
"Configuration error!\n"
@@ -7224,6 +8268,9 @@
#. module: account
#: code:addons/account/account.py:2266
+=======
+#: code:addons/account/account.py:2246
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You can specify year, month and date in the name of the model using the "
@@ -7278,6 +8325,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:504
+#: code:addons/account/wizard/account_invoice_refund.py:145
+#, python-format
+msgid "Data Insufficient !"
+msgstr "Недостатъчни данни !"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.actions.act_window,name:account.action_invoice_tree1
#: model:ir.ui.menu,name:account.menu_action_invoice_tree1
msgid "Customer Invoices"
@@ -7334,16 +8391,35 @@
msgstr "Документ източник"
#. module: account
+<<<<<<< TREE
#: help:account.config.settings,company_footer:0
msgid "Bank accounts as printed in the footer of each printed document"
+=======
+#: code:addons/account/account.py:1449
+#, python-format
+msgid "You can not delete a posted journal entry \"%s\"!"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
+<<<<<<< TREE
#: constraint:account.account:0
msgid ""
"Configuration Error!\n"
"You cannot define children to an account with internal type different of "
"\"View\"."
+=======
+#: selection:account.partner.ledger,filter:0
+#: code:addons/account/report/account_partner_ledger.py:60
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
+#, python-format
+msgid "Unreconciled Entries"
+msgstr "Неравнени записи"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_menu_Bank_process
+msgid "Statements Reconciliation"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -7412,14 +8488,33 @@
msgstr "Сигурни ли сте че искате да отворите тази фактура?"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
+#, python-format
+msgid ""
+"Can not find a chart of account, you should create one from the "
+"configuration of the accounting menu."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.chart.template,property_account_expense_opening:0
msgid "Opening Entries Expense Account"
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "Customer Reference"
msgstr ""
+=======
+#: code:addons/account/account_move_line.py:1014
+#, python-format
+msgid "Accounting Entries"
+msgstr "Записи на сметка"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.account.template,parent_id:0
@@ -7456,6 +8551,14 @@
msgstr ""
#. module: account
+#: help:accounting.report,debit_credit:0
+msgid ""
+"This option allow you to get more details about your the way your balances "
+"are computed. Because it is space consumming, we do not allow to use it "
+"while doing a comparison"
+msgstr ""
+
+#. module: account
#: help:account.payment.term.line,value_amount:0
msgid "For percent enter a ratio between 0-1."
msgstr ""
@@ -7560,10 +8663,22 @@
"програмистите да създадат специфичен данък в потребителски домейн."
#. module: account
+<<<<<<< TREE
#: field:account.invoice,reference:0
#: field:account.invoice.line,invoice_id:0
msgid "Invoice Reference"
msgstr "Отпратка на фактура"
+=======
+#: code:addons/account/account.py:1095
+#, python-format
+msgid "You should have chosen periods that belongs to the same company"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_review_payment_terms_installer
+msgid "Review your Payment Terms"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.fiscalyear.close,report_name:0
@@ -7591,9 +8706,19 @@
msgstr "Справки"
#. module: account
+<<<<<<< TREE
#. openerp-web
#: code:addons/account/account_move_line.py:783
#: code:addons/account/static/src/js/account_move_reconciliation.js:90
+=======
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
+#: code:addons/account/wizard/account_invoice_state.py:44
+#: code:addons/account/wizard/account_invoice_state.py:68
+#: 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
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Warning"
msgstr "Предупреждение"
@@ -7680,6 +8805,7 @@
msgstr "Подпис върху справки"
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_account_analytic_account_tree2
msgid ""
"<p>\n"
@@ -7698,6 +8824,11 @@
" related account.\n"
" </p>\n"
" "
+=======
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#, python-format
+msgid "The periods to generate opening entries were not found"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -7706,7 +8837,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3168
+=======
+#: code:addons/account/account.py:3138
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "OPEJ"
msgstr ""
@@ -7741,6 +8876,7 @@
msgstr "Допълнителна информация"
#. module: account
+<<<<<<< TREE
#: view:account.analytic.line:0
#: field:account.bank.statement,user_id:0
#: view:account.journal:0
@@ -7749,6 +8885,18 @@
#: field:analytic.entries.report,user_id:0
msgid "User"
msgstr "Потребител"
+=======
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
+#, python-format
+msgid "The journal must have default credit and debit account"
+msgstr "Дневника трябва да има сметки по подрабиране за кредит и дебит"
+
+#. module: account
+#: report:account.general.journal:0
+#: xsl:account.transfer:0
+msgid ":"
+msgstr ":"
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.account,currency_mode:0
@@ -7775,7 +8923,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3155
+=======
+#: code:addons/account/account_move_line.py:1317
+#, python-format
+msgid "Bad account !"
+msgstr "Грешна сметка !"
+
+#. module: account
+#: code:addons/account/account.py:3125
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Sales Journal"
msgstr "Дневник продажби"
@@ -7786,7 +8944,11 @@
msgstr "Данък на фактура"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1188
+=======
+#: code:addons/account/account_move_line.py:1292
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No piece number !"
msgstr "Няма номер на цена !"
@@ -7850,7 +9012,11 @@
#. module: account
#: selection:account.move.line,centralisation:0
+<<<<<<< TREE
#: code:addons/account/account.py:1503
+=======
+#: code:addons/account/account.py:1535
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Currency Adjustment"
msgstr ""
@@ -7882,7 +9048,25 @@
msgstr "Май"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:788
+=======
+#: view:account.account:0
+#: view:account.account.template:0
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
+#: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
+#, python-format
+msgid "Payable Accounts"
+msgstr "Разплащателни сметки"
+
+#. module: account
+#: code:addons/account/account_invoice.py:741
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Global taxes defined, but they are not in invoice lines !"
msgstr ""
@@ -7939,7 +9123,11 @@
#: selection:account.bank.accounts.wizard,account_type:0
#: selection:account.entries.report,type:0
#: selection:account.journal,type:0
+<<<<<<< TREE
#: code:addons/account/account.py:3054
+=======
+#: code:addons/account/account.py:3020
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Cash"
msgstr "В брой"
@@ -7951,11 +9139,34 @@
msgstr "Предназначение на Сметката"
#. module: account
+<<<<<<< TREE
#: help:account.invoice.refund,filter_refund:0
msgid ""
"Refund base on this type. You can not Modify and Cancel if the invoice is "
"already reconciled"
msgstr ""
+=======
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
+#: code:addons/account/wizard/account_move_journal.py:165
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:56
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
+#, python-format
+msgid "UserError"
+msgstr "Потребителска грешка"
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr "Плащане на фактури"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.bank.statement.line,sequence:0
@@ -8106,9 +9317,25 @@
msgstr "Фиксиран"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:653
#: code:addons/account/account.py:656
#: code:addons/account/account.py:668
+=======
+#: code:addons/account/account.py:629
+#: code:addons/account/account.py:642
+#: code:addons/account/account.py:645
+#: code:addons/account/account.py:664
+#: code:addons/account/account.py:787
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
+#: code:addons/account/account_move_line.py:97
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Warning !"
msgstr "Предупреждение !"
@@ -8176,7 +9403,24 @@
msgstr "Изберете валута за фактурата"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:869
+=======
+#: code:addons/account/account.py:3463
+#, python-format
+msgid ""
+"The bank account defined on the selected chart of accounts hasn't a code."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:108
+#, python-format
+msgid "Can not %s draft/proforma/cancel invoice."
+msgstr "Не може да %s проект/проформа/отказ на фактура"
+
+#. module: account
+#: code:addons/account/account_invoice.py:821
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Invoice Lines !"
msgstr "Няма фактурни редове!"
@@ -8218,11 +9462,44 @@
msgstr "Отложен метод"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:388
+#, python-format
+msgid "Invoice '%s' is paid."
+msgstr "Фактура '%s' е платена."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:process.node,note:account.process_node_electronicfile0
msgid "Automatic entry"
msgstr "Автоматичен запис"
#. module: account
+<<<<<<< TREE
+=======
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr "Грешка! Не можете да създадете рекурсивни данъчни кодове."
+
+#. module: account
+#: help:product.template,property_account_income:0
+msgid ""
+"This account will be used for invoices instead of the default one to value "
+"sales for the current product"
+msgstr ""
+
+#. module: account
+#: help:account.journal,group_invoice_lines:0
+msgid ""
+"If this box is checked, the system will try to group the accounting lines "
+"when generating them from invoices."
+msgstr ""
+"Ако е отметнато системата ще се опита да групира редовете на сметката при "
+"генерирането им от фактури."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.account,reconcile:0
msgid ""
"Check this box if this account allows reconciliation of journal items."
@@ -8251,7 +9528,11 @@
msgstr "Асоцииран партньор"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1434
+=======
+#: code:addons/account/account_invoice.py:1345
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You must first select a partner !"
msgstr "Първо трябва да изберете партньор !"
@@ -8279,6 +9560,7 @@
msgstr "Състояние на фактура -- отворено"
#. module: account
+<<<<<<< TREE
#: view:account.analytic.account:0
#: view:account.bank.statement:0
#: field:account.bank.statement,state:0
@@ -8310,6 +9592,20 @@
#. module: account
#: view:account.config.settings:0
msgid "No Fiscal Year Defined for This Company"
+=======
+#: model:ir.actions.act_window,help:account.action_tax_code_tree
+msgid ""
+"The chart of taxes is used to generate your periodical tax statement. You "
+"will see the taxes with codes related to your legal statement according to "
+"your country."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:437
+#, python-format
+msgid ""
+"Can not find a chart of accounts for this company, you should create one."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -8332,7 +9628,11 @@
"изчисляването на следващите данъци."
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3158
+=======
+#: code:addons/account/account.py:3128
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Purchase Refund Journal"
msgstr "Дневник обезщетения за покупки"
@@ -8430,6 +9730,31 @@
msgstr "Отписване от дневник"
#. module: account
+<<<<<<< TREE
+=======
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for the current "
+"partner"
+msgstr ""
+"За текущия партньор ще бъде използвано това плащане вместо това по "
+"подразбиране"
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Compute Code for Taxes included prices"
+msgstr "Изчисляващ код за данъци, включени в цените"
+
+#. module: account
+#: code:addons/account/account_invoice.py:1042
+#, python-format
+msgid ""
+"You can not cancel an invoice which is partially paid! You need to "
+"unreconcile related payment entries first!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.chart.template,property_account_income_categ:0
msgid "Income Category Account"
msgstr "Категория на сметка за приходи"
@@ -8509,18 +9834,20 @@
msgstr "Краен баланс"
#. module: account
+<<<<<<< TREE
#: field:account.journal,centralisation:0
msgid "Centralized Counterpart"
msgstr ""
#. module: account
#: help:account.move.line,blocked:0
+=======
+#: help:product.category,property_account_income_categ:0
+>>>>>>> MERGE-SOURCE
msgid ""
-"You can check this box to mark this journal item as a litigation with the "
-"associated partner"
+"This account will be used for invoices to value sales for the current "
+"product category"
msgstr ""
-"Отметнете за да отбележете дневниковия артикул като жалба с асоциирания "
-"партньор"
#. module: account
#: field:account.move.line,reconcile_partial_id:0
@@ -8539,7 +9866,18 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice.refund:0
+=======
+#: view:account.invoice.report:0
+#: view:analytic.entries.report:0
+msgid "current month"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1057
+#, python-format
+>>>>>>> MERGE-SOURCE
msgid ""
"Use this option if you want to cancel an invoice and create a new\n"
" one. The credit note will be created, "
@@ -8657,10 +9995,12 @@
#. module: account
#: report:account.account.balance:0
#: report:account.central.journal:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
msgid "Filter By"
msgstr "Филтриране по"
@@ -8672,11 +10012,10 @@
msgstr ""
#. module: account
-#: view:account.entries.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:account.action_company_analysis_tree
-msgid "Company Analysis"
-msgstr "Анализ на предприятие"
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
+#, python-format
+msgid "The entries to reconcile should belong to the same company"
+msgstr ""
#. module: account
#: help:account.invoice,account_id:0
@@ -8684,7 +10023,11 @@
msgstr "Партньорска сметка използвана за тази фактура"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3353
+=======
+#: code:addons/account/account.py:3313
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Tax %.2f%%"
msgstr ""
@@ -8702,7 +10045,11 @@
msgstr "Ред на условие за плащане"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3156
+=======
+#: code:addons/account/account.py:3126
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Purchase Journal"
msgstr "Дневник за поръчки"
@@ -8791,6 +10138,15 @@
msgstr "Неплатени фактури"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:504
+#, python-format
+msgid "The payment term of supplier does not have a payment term line!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.move.line.reconcile,debit:0
msgid "Debit amount"
msgstr "Сума дебит"
@@ -8818,6 +10174,7 @@
msgstr "Позволени сметки (при празно без контрол)"
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,sale_tax_rate:0
msgid "Sales tax (%)"
msgstr ""
@@ -8848,6 +10205,20 @@
#. module: account
#: view:account.journal:0
+=======
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
+#: model:ir.actions.act_window,name:account.action_account_analytic_chart
+#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
+msgid "Chart of Analytic Accounts"
+msgstr "Аналитичен сметкоплан"
+
+#. module: account
+#: view:board.board:0
+msgid "Draft Customer Invoices"
+msgstr "Проект на фактура за клиент"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.ui.menu,name:account.menu_configuration_misc
msgid "Miscellaneous"
msgstr "Разни"
@@ -8894,6 +10265,15 @@
msgstr ""
#. module: account
+#: help:account.move.line,blocked:0
+msgid ""
+"You can check this box to mark this journal item as a litigation with the "
+"associated partner"
+msgstr ""
+"Отметнете за да отбележете дневниковия артикул като жалба с асоциирания "
+"партньор"
+
+#. module: account
#: help:account.invoice,internal_number:0
msgid ""
"Unique number of the invoice, computed automatically when the invoice is "
@@ -8913,6 +10293,15 @@
msgstr "Оставете празно за всички отворени данъчни години"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1120
+#, python-format
+msgid "The account move (%s) for centralisation has been confirmed!"
+msgstr "Движение по сметка (%s) за централизиране е потвърдено!"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.move.line,amount_currency:0
msgid ""
"The amount expressed in an optional other currency if it is a multi-currency "
@@ -8921,7 +10310,11 @@
"Сумата изразена във възможна друга валута ако записа е в повече валути"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1009
+=======
+#: code:addons/account/account.py:1315
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "The account move (%s) for centralisation has been confirmed."
msgstr ""
@@ -8982,7 +10375,16 @@
msgstr "Обединени записи"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2296
+=======
+#: field:account.invoice,address_contact_id:0
+msgid "Contact Address"
+msgstr "Адрес за контакт"
+
+#. module: account
+#: code:addons/account/account.py:2273
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Wrong model !"
msgstr ""
@@ -9038,7 +10440,11 @@
#. module: account
#: field:account.fiscalyear.close,journal_id:0
+<<<<<<< TREE
#: code:addons/account/account.py:3160
+=======
+#: code:addons/account/account.py:3130
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Opening Entries Journal"
msgstr "Отваряне на Журнал със записи"
@@ -9049,10 +10455,29 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.bank.statement,message_is_follower:0
#: field:account.invoice,message_is_follower:0
msgid "Is a Follower"
-msgstr ""
+=======
+#: help:account.chart.template,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 "
+"Profilt & Loss Report"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:819
+#, python-format
+msgid "Please define sequence on the journal related to this invoice."
+>>>>>>> MERGE-SOURCE
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reference_type:0
+msgid "Reference Type"
+msgstr "Вид отпратка"
#. module: account
#: view:account.move:0
@@ -9130,12 +10555,16 @@
msgstr "Период от"
#. module: account
+<<<<<<< TREE
#: field:account.cashbox.line,pieces:0
msgid "Unit of Currency"
msgstr ""
#. module: account
#: code:addons/account/account.py:3157
+=======
+#: code:addons/account/account.py:3127
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Sales Refund Journal"
msgstr "Дневник обезщетения за продажби"
@@ -9201,7 +10630,11 @@
msgstr "Данък покупка (%)"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:869
+=======
+#: code:addons/account/account_invoice.py:821
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Please create some invoice lines."
msgstr ""
@@ -9220,7 +10653,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3165
+=======
+#: code:addons/account/account.py:3135
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "SCNJ"
msgstr ""
@@ -9282,6 +10719,7 @@
#: field:account.common.journal.report,period_from:0
#: field:account.common.partner.report,period_from:0
#: field:account.common.report,period_from:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
#: field:account.general.journal,period_from:0
#: report:account.general.ledger:0
@@ -9307,6 +10745,7 @@
#. module: account
#: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
msgid "Analysis Direction"
msgstr "Ръководтсво за анализ"
@@ -9322,6 +10761,11 @@
#. module: account
#: view:account.move.line:0
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1061
+#, python-format
+>>>>>>> MERGE-SOURCE
msgid "Total credit"
msgstr "Общо кредит"
@@ -9346,6 +10790,7 @@
msgstr "Сметки вземания"
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,purchase_refund_sequence_prefix:0
msgid "Supplier credit note sequence"
msgstr ""
@@ -9384,6 +10829,18 @@
#, python-format
msgid "To reconcile the entries company should be the same for all entries."
msgstr ""
+=======
+#: xsl:account.transfer:0
+msgid "Document"
+msgstr "Документ"
+
+#. module: account
+#: 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 "Банкови извлечения"
+>>>>>>> MERGE-SOURCE
#. module: account
#: field:account.account,balance:0
@@ -9394,6 +10851,7 @@
#: report:account.analytic.account.inverted.balance:0
#: report:account.central.journal:0
#: field:account.entries.report,balance:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
@@ -9442,6 +10900,30 @@
msgstr "Легенда"
#. module: account
+<<<<<<< TREE
+=======
+#: view:account.analytic.account:0
+msgid "Contract Data"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_sale
+msgid ""
+"This view is used by accountants in order to record entries massively in "
+"OpenERP. If you want to record a customer invoice, select the journal and "
+"the period in the search toolbar. Then, start by recording the entry line of "
+"the income account. OpenERP will propose to you automatically the Tax "
+"related to this account and the counter-part \"Account receivable\"."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#, python-format
+msgid "You must select accounts to reconcile"
+msgstr "Трябва да изберете сметки за изравняване"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:process.transition,note:account.process_transition_entriesreconcile0
msgid "Accounting entries are the first input of the reconciliation."
msgstr ""
@@ -9452,7 +10934,6 @@
msgstr "Генериране на начални записи за финансова година"
#. module: account
-#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Filters By"
msgstr "Филтри по"
@@ -9481,8 +10962,12 @@
msgstr "Преместване"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_bank_statement.py:477
#: code:addons/account/wizard/account_period_close.py:51
+=======
+#: code:addons/account/account_move_line.py:1168
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -9566,6 +11051,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,default_sale_tax:0
#: field:account.config.settings,sale_tax:0
msgid "Default sale tax"
@@ -9578,6 +11064,15 @@
#. module: account
#: code:addons/account/account.py:1549
+=======
+#: view:account.account:0
+#: field:account.account,child_consol_ids:0
+msgid "Consolidated Children"
+msgstr "Косолидирани подчинени сметки"
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Cannot create moves for different companies."
msgstr ""
@@ -9624,6 +11119,24 @@
msgstr "Баланс на аналитична сметка"
#. module: account
+<<<<<<< TREE
+=======
+#: view:account.entries.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_company_analysis_tree
+msgid "Company Analysis"
+msgstr "Анализ на предприятие"
+
+#. module: account
+#: code:addons/account/account.py:412
+#, python-format
+msgid ""
+"No opening/closing period defined, please create one to set the initial "
+"balance!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: report:account.account.balance:0
#: field:account.aged.trial.balance,period_to:0
#: field:account.balance.report,period_to:0
@@ -9633,6 +11146,7 @@
#: field:account.common.journal.report,period_to:0
#: field:account.common.partner.report,period_to:0
#: field:account.common.report,period_to:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
#: field:account.general.journal,period_to:0
#: report:account.general.ledger:0
@@ -9652,11 +11166,22 @@
msgstr "Краен период"
#. module: account
+<<<<<<< TREE
#: model:account.account.type,name:account.account_type_expense_view1
msgid "Expense View"
msgstr ""
#. module: account
+=======
+#: code:addons/account/installer.py:94
+#, python-format
+msgid ""
+"There are currently no company without chart of account. The wizard will "
+"therefore not be executed."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.move.line,date_maturity:0
msgid "Due date"
msgstr "Падежна дата"
@@ -9702,6 +11227,7 @@
#. module: account
#: report:account.account.balance:0
#: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
#: field:account.balance.report,date_from:0
#: report:account.central.journal:0
#: field:account.central.journal,date_from:0
@@ -9709,6 +11235,7 @@
#: field:account.common.journal.report,date_from:0
#: field:account.common.partner.report,date_from:0
#: field:account.common.report,date_from:0
+#: report:account.financial.report:0
#: field:account.fiscalyear,date_start:0
#: report:account.general.journal:0
#: field:account.general.journal,date_from:0
@@ -9757,7 +11284,11 @@
msgstr "Неприравнен"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:890
+=======
+#: code:addons/account/account_invoice.py:839
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Bad total !"
msgstr "Грешна обща сума !"
@@ -9842,7 +11373,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1122
+=======
+#: code:addons/account/account_invoice.py:381
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You cannot do this modification on a confirmed entry. You can just change "
@@ -9899,6 +11434,7 @@
#: report:account.analytic.account.inverted.balance:0
#: report:account.central.journal:0
#: field:account.entries.report,credit:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
@@ -9982,9 +11518,16 @@
#: view:accounting.report:0
#: selection:accounting.report,filter:0
#: selection:accounting.report,filter_cmp:0
+<<<<<<< TREE
#: model:ir.actions.act_window,name:account.action_account_period
#: model:ir.ui.menu,name:account.menu_action_account_period
+=======
+#: code:addons/account/report/common_report_header.py:99
+#: model:ir.actions.act_window,name:account.action_account_period_form
+#: model:ir.ui.menu,name:account.menu_action_account_period_form
+>>>>>>> MERGE-SOURCE
#: model:ir.ui.menu,name:account.next_id_23
+#, python-format
msgid "Periods"
msgstr "Периоди"
@@ -10129,6 +11672,7 @@
#: field:account.common.journal.report,date_to:0
#: field:account.common.partner.report,date_to:0
#: field:account.common.report,date_to:0
+#: report:account.financial.report:0
#: field:account.fiscalyear,date_stop:0
#: report:account.general.journal:0
#: field:account.general.journal,date_to:0
@@ -10177,6 +11721,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_analytic_line.py:100
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgstr "Няма зададена приходна сметка за продукта: \"%s\" (id:%d)"
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.account,unrealized_gain_loss:0
#: model:ir.actions.act_window,name:account.action_account_gain_loss
#: model:ir.ui.menu,name:account.menu_unrealized_gains_losses
@@ -10201,6 +11759,7 @@
msgstr ""
#. module: account
+#: report:account.aged_trial_balance:0
#: report:account.analytic.account.balance:0
#: report:account.analytic.account.inverted.balance:0
#: report:account.analytic.account.quantity_cost_ledger:0
@@ -10230,6 +11789,7 @@
#. module: account
#: field:account.account,company_id:0
+#: report:account.account.balance:0
#: field:account.aged.trial.balance,company_id:0
#: field:account.analytic.journal,company_id:0
#: field:account.balance.report,company_id:0
@@ -10245,7 +11805,9 @@
#: field:account.entries.report,company_id:0
#: field:account.fiscal.position,company_id:0
#: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
#: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,company_id:0
#: field:account.invoice,company_id:0
#: field:account.invoice.line,company_id:0
@@ -10254,6 +11816,8 @@
#: field:account.invoice.tax,company_id:0
#: field:account.journal,company_id:0
#: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
#: field:account.model,company_id:0
#: field:account.move,company_id:0
#: field:account.move.line,company_id:0
@@ -10371,6 +11935,14 @@
msgstr "Кодът на дневника трябва да бъде уникален за всяко предприятие!"
#. module: account
+<<<<<<< TREE
+=======
+#: view:wizard.multi.charts.accounts:0
+msgid "Generate Your Chart of Accounts from a Chart Template"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: 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 "
@@ -10427,6 +11999,7 @@
#: report:account.analytic.account.inverted.balance:0
#: report:account.central.journal:0
#: field:account.entries.report,debit:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
@@ -10455,6 +12028,7 @@
msgstr "Редове на фактура"
#. module: account
+<<<<<<< TREE
#: help:account.model.line,quantity:0
msgid "The optional quantity on entries."
msgstr ""
@@ -10463,6 +12037,44 @@
#: field:account.automatic.reconcile,reconciled:0
msgid "Reconciled transactions"
msgstr "Приравнени транзаикции"
+=======
+#: help:product.category,property_account_expense_categ:0
+msgid ""
+"This account will be used for invoices to value expenses for the current "
+"product category"
+msgstr ""
+
+#. module: account
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr "Грешка! Не може да създавате рекурсивни шаблони за сметки."
+
+#. module: account
+#: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
+msgid "Journal Entry Number"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Recurring"
+msgstr "Повтарящо се"
+
+#. module: account
+#: 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!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:843
+#, python-format
+msgid "Entry is already reconciled"
+msgstr "Записа вече е приравнен"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:ir.model,name:account.model_report_account_receivable
@@ -10501,8 +12113,10 @@
msgstr ""
#. module: account
+#: report:account.account.balance:0
#: selection:account.balance.report,display_account:0
#: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
#: selection:account.report.general.ledger,display_account:0
msgid "With movements"
msgstr "С движения"
@@ -10592,6 +12206,21 @@
msgstr "Оставащо сума от задължения"
#. module: account
+<<<<<<< TREE
+=======
+#: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
+msgid "Statistic Reports"
+msgstr "Статистически отчети"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
+#, python-format
+msgid "Bad account!"
+msgstr "Грешна сметка!"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.print.journal,sort_selection:0
msgid "Entries Sorted by"
msgstr ""
@@ -10611,6 +12240,7 @@
msgstr "Свързване на сметки"
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_tax_code_list
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -10626,6 +12256,12 @@
" </p>\n"
" "
msgstr ""
+=======
+#: code:addons/account/account_invoice.py:373
+#, python-format
+msgid "Invoice '%s' is waiting for validation."
+msgstr "Фактура '%s' очаква проверка."
+>>>>>>> MERGE-SOURCE
#. module: account
#: selection:account.entries.report,month:0
@@ -10664,6 +12300,12 @@
msgstr ""
#. module: account
+#: code:addons/account/account.py:1359
+#, python-format
+msgid "You can not modify a posted entry of closed periods"
+msgstr ""
+
+#. module: account
#: report:account.general.journal:0
#: model:ir.actions.report.xml,name:account.account_general_journal
msgid "General Journal"
@@ -10773,6 +12415,7 @@
#. module: account
#: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
#: field:account.common.partner.report,result_selection:0
#: report:account.partner.balance:0
#: field:account.partner.balance,result_selection:0
@@ -10855,6 +12498,8 @@
#. module: account
#: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
msgid "Future"
msgstr "Бъдеще"
@@ -10886,11 +12531,19 @@
msgstr "Сметка разходи в шаблона за продукт"
#. module: account
+<<<<<<< TREE
#: field:res.partner,property_payment_term:0
msgid "Customer Payment Term"
msgstr ""
#. module: account
+=======
+#: field:account.analytic.line,amount_currency:0
+msgid "Amount currency"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:accounting.report,label_filter:0
msgid ""
"This label will be displayed on report to show the balance computed for the "
@@ -10908,6 +12561,7 @@
"The residual amount on a receivable or payable of a journal entry expressed "
"in its currency (maybe different of the company currency)."
msgstr ""
+<<<<<<< TREE
#, python-format
#~ msgid ""
@@ -12769,3 +14423,23 @@
#~ msgstr ""
#~ "Не можете да използвате общата сметка с този дневник. Отметнете полето "
#~ "'Контрол на записите' в съответния дневник"
+=======
+
+#, python-format
+#~ msgid "Entries are not of the same account or already reconciled ! "
+#~ msgstr "Записите не са от същата сметка или не са изравнени ! "
+
+#~ msgid "Starting Date"
+#~ msgstr "Начална дата"
+
+#~ msgid "Ending Date"
+#~ msgstr "Дата на приключване"
+
+#, python-format
+#~ msgid ""
+#~ "This account does not allow reconciliation! You should update the account "
+#~ "definition to change this."
+#~ msgstr ""
+#~ "Тази сметка не поддържа равняване. Можете да промените това като редактирате "
+#~ "параметрите на сметката."
+>>>>>>> MERGE-SOURCE
=== modified file 'account/i18n/br.po'
--- account/i18n/br.po 2013-04-05 11:10:48 +0000
+++ account/i18n/br.po 2013-04-10 14:12:36 +0000
@@ -7,15 +7,31 @@
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2010-12-12 09:25+0000\n"
+=======
+"POT-Creation-Date: 2012-10-23 11:48+0000\n"
+"PO-Revision-Date: 2012-02-17 09:10+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: 2013-03-16 05:12+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-24 05:44+0000\n"
+"X-Generator: Launchpad (build 16179)\n"
+
+#. module: account
+#: view:account.invoice.report:0
+#: view:analytic.entries.report:0
+msgid "last month"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -82,6 +98,11 @@
msgstr ""
#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Aged Trial Balance"
+msgstr ""
+
+#. module: account
#: view:account.move:0
#: view:account.move.line:0
msgid "Total Debit"
@@ -112,8 +133,12 @@
#: field:account.move,ref:0
#: field:account.move.line,ref:0
#: field:account.subscription,ref:0
+<<<<<<< TREE
#: xsl:account.transfer:0
#: field:cash.box.in,ref:0
+=======
+#: xsl:account.transfer:0
+>>>>>>> MERGE-SOURCE
msgid "Reference"
msgstr "Daveenn"
@@ -125,6 +150,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:641
#: code:addons/account/account.py:686
#: code:addons/account/account.py:781
@@ -143,12 +169,19 @@
#: 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
+=======
+#: code:addons/account/account_invoice.py:1430
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Warning!"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3159
+=======
+#: code:addons/account/account.py:3129
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Miscellaneous Journal"
msgstr ""
@@ -223,6 +256,23 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: help:account.tax.code,notprintable:0
+#: help:account.tax.code.template,notprintable:0
+msgid ""
+"Check this box if you don't want any VAT related to this Tax Code to appear "
+"on invoices"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1254
+#, python-format
+msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
msgid "Accounting entries are an input of the reconciliation."
msgstr ""
@@ -233,6 +283,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:mail.message.subtype,name:account.mt_invoice_validated
msgid "Validated"
msgstr ""
@@ -241,6 +292,12 @@
#: model:account.account.type,name:account.account_type_income_view1
msgid "Income View"
msgstr ""
+=======
+#: code:addons/account/account_move_line.py:1215
+#, python-format
+msgid "You can not add/modify entries in a closed journal."
+msgstr "N'hallit ket ouzhpennañ/kemmañ enmontoù en ur marilh serr"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.account,user_type:0
@@ -279,6 +336,7 @@
msgstr "Diuzañ ar prantad dielfennañ"
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_invoice_tree3
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -292,6 +350,21 @@
" can generate it directly from the related customer invoice.\n"
" </p>\n"
" "
+=======
+#: view:account.move.line:0
+msgid "St."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:560
+#, python-format
+msgid "Invoice line account company does not match with invoice company."
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,field:0
+msgid "Field Name"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -586,6 +659,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#. openerp-web
#: code:addons/account/static/src/xml/account_move_reconciliation.xml:31
#, python-format
@@ -599,6 +673,24 @@
#. module: account
#: selection:account.config.settings,period:0
+=======
+#: report:account.account.balance:0
+#: selection:account.balance.report,display_account:0
+#: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
+#: selection:account.report.general.ledger,display_account:0
+#: selection:account.tax,type_tax_use:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "All"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,address_invoice_id:0
+msgid "Invoice Address Name"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: selection:account.installer,period:0
msgid "3 Monthly"
msgstr ""
@@ -639,6 +731,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_change_currency.py:64
#: code:addons/account/wizard/account_change_currency.py:70
#, python-format
@@ -652,6 +745,9 @@
#. module: account
#: code:addons/account/account_move_line.py:1159
+=======
+#: code:addons/account/account_move_line.py:1266
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No period found or more than one period found for the given date."
msgstr ""
@@ -662,7 +758,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3163
+=======
+#: code:addons/account/account.py:3133
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "SAJ"
msgstr ""
@@ -702,6 +802,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: constraint:account.move:0
msgid ""
"You cannot create more than one move per period on a centralized journal."
@@ -713,6 +814,12 @@
"Set the analytic account that will be used by default on the invoice tax "
"lines for refunds. Leave empty if you don't want to use an analytic account "
"on the invoice tax lines by default."
+=======
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#, python-format
+msgid "To reconcile the entries company should be the same for all entries"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -721,7 +828,13 @@
#: selection:account.common.partner.report,result_selection:0
#: selection:account.partner.balance,result_selection:0
#: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:372
#: code:addons/account/report/account_partner_balance.py:297
+<<<<<<< TREE
+=======
+#: code:addons/account/report/account_partner_ledger.py:395
+#: model:ir.actions.act_window,name:account.action_aged_receivable
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Receivable Accounts"
msgstr ""
@@ -806,6 +919,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/wizard/account_change_currency.py:38
+#, python-format
+msgid "You can only change currency for Draft Invoice !"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
+>>>>>>> MERGE-SOURCE
#: model:ir.ui.menu,name:account.menu_account_report
msgid "Financial Report"
msgstr ""
@@ -828,7 +951,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:794
+=======
+#: code:addons/account/account_invoice.py:747
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Taxes are missing!\n"
@@ -960,11 +1087,13 @@
msgstr ""
#. module: account
+#: report:account.aged_trial_balance:0
#: report:account.overdue:0
msgid "Due"
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,purchase_journal_id:0
msgid "Purchase journal"
msgstr ""
@@ -975,6 +1104,18 @@
msgstr ""
#. module: account
+=======
+#: code:addons/account/account.py:1353
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"!"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.move:0
+>>>>>>> MERGE-SOURCE
#: view:validate.account.move:0
#: view:validate.account.move.lines:0
msgid "Approve"
@@ -1046,6 +1187,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:2613
+#, python-format
+msgid "I can not locate a parent code for the template account!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.analytic.line:0
msgid "Purchases"
msgstr ""
@@ -1073,6 +1223,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.config.settings:0
msgid "Features"
msgstr ""
@@ -1083,6 +1234,13 @@
#: code:addons/account/account_invoice.py:74
#: code:addons/account/account_invoice.py:744
#: code:addons/account/account_move_line.py:195
+=======
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_bank_statement.py:357
+#: code:addons/account/account_invoice.py:73
+#: code:addons/account/account_invoice.py:697
+#: code:addons/account/account_move_line.py:173
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Analytic Journal !"
msgstr ""
@@ -1152,12 +1310,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "Refund "
msgstr ""
#. module: account
#: code:addons/account/account_analytic_line.py:90
+=======
+#: code:addons/account/account_move_line.py:856
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
msgstr ""
@@ -1205,7 +1367,11 @@
#. module: account
#: model:account.account.type,name:account.data_account_type_bank
#: selection:account.bank.accounts.wizard,account_type:0
+<<<<<<< TREE
#: code:addons/account/account.py:3054
+=======
+#: code:addons/account/account.py:3020
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Bank"
msgstr ""
@@ -1307,6 +1473,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1317
+#, python-format
+msgid ""
+"You can not use this general account in this journal, check the tab 'Entry "
+"Controls' on the related journal !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.move.line.reconcile,trans_nbr:0
msgid "# of Transaction"
msgstr ""
@@ -1320,6 +1497,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:1136
+#, python-format
+msgid "You can not modify/delete a journal with entries for this period !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.invoice,origin:0
#: help:account.invoice.line,origin:0
msgid "Reference of the document that produced this invoice."
@@ -1403,7 +1589,12 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_financial_report.py:70
+<<<<<<< TREE
+#: code:addons/account/wizard/account_financial_report.py:70
+=======
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Select a starting and an ending period"
msgstr ""
@@ -1470,6 +1661,7 @@
msgstr ""
#. module: account
+#: report:account.aged_trial_balance:0
#: model:ir.ui.menu,name:account.next_id_22
msgid "Partners"
msgstr ""
@@ -1510,8 +1702,10 @@
msgstr ""
#. module: account
+#: report:account.account.balance:0
#: selection:account.balance.report,display_account:0
#: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
#: selection:account.partner.balance,display_partner:0
#: selection:account.report.general.ledger,display_account:0
msgid "With balance is not equal to 0"
@@ -1531,6 +1725,121 @@
msgstr ""
#. module: account
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello${object.address_invoice_id.name and ' ' or "
+"''}${object.address_invoice_id.name or ''},</p>\n"
+" \n"
+" <p>A new invoice is available for ${object.partner_id.name}: </p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" <strong>REFERENCES</strong><br />\n"
+" Invoice number: <strong>${object.number}</strong><br />\n"
+" Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+" Invoice date: ${object.date_invoice}<br />\n"
+" % if object.origin:\n"
+" Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" Your contact: <a "
+"href=\"mailto:${object.user_id.user_email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+" </p> \n"
+" \n"
+" <p>\n"
+" You can view the invoice document, download it and pay online using the "
+"following link:\n"
+" </p>\n"
+" <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\" \n"
+" href=\"${ctx.get('edi_web_url_view') or ''}\">View "
+"Invoice</a>\n"
+" \n"
+" % if object.company_id.paypal_account and object.type in ('out_invoice', "
+"'in_refund'):\n"
+" <% \n"
+" comp_name = quote(object.company_id.name)\n"
+" inv_number = quote(object.number)\n"
+" paypal_account = quote(object.company_id.paypal_account)\n"
+" inv_amount = quote(str(object.amount_total))\n"
+" cur_name = quote(object.currency_id.name)\n"
+" paypal_url = \"https://www.paypal.com/cgi-";
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s&"
+"\" \\\n"
+" "
+"\"invoice=%s&amount=%s&currency_code=%s&button_subtype=services&a"
+"mp;no_note=1&bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
+"\n"
+" %>\n"
+" <br/>\n"
+" <p>It is also possible to directly pay with Paypal:</p>\n"
+" <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+" <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+" </a>\n"
+" % endif\n"
+" \n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone: ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web : <a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger
msgid "Account Analytic Cost Ledger"
msgstr ""
@@ -1763,6 +2072,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,group_analytic_accounting:0
msgid "Analytic accounting"
msgstr ""
@@ -1783,6 +2093,16 @@
"this total tax amount will be rounded. If you sell with tax included, you "
"should choose 'Round per line' because you certainly want the sum of your "
"tax-included line subtotals to be equal to the total amount with taxes."
+=======
+#: field:wizard.multi.charts.accounts,seq_journal:0
+msgid "Separated Journal Sequences"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,user_id:0
+#: view:account.invoice:0
+msgid "Responsible"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -1828,6 +2148,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:1431
+#, 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 ""
@@ -1909,6 +2239,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:account.tax,base_code_id:0
#: help:account.tax,ref_base_code_id:0
#: help:account.tax,ref_tax_code_id:0
@@ -1918,6 +2249,11 @@
#: help:account.tax.template,ref_tax_code_id:0
#: help:account.tax.template,tax_code_id:0
msgid "Use this code for the tax declaration."
+=======
+#: code:addons/account/account_cash_statement.py:293
+#, python-format
+msgid "User %s does not have rights to access %s journal !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -2155,8 +2491,23 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:656
#, python-format
+=======
+#: code:addons/account/installer.py:94
+#, python-format
+msgid "No unconfigured company !"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "/"
+msgstr ""
+
+#. module: account
+#: help:res.company,property_reserve_and_surplus_account:0
+>>>>>>> MERGE-SOURCE
msgid ""
"You cannot change the type of account to '%s' type as it contains journal "
"items!"
@@ -2295,12 +2646,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_move_bank_reconcile.py:53
#, python-format
msgid "Standard Encoding"
msgstr ""
#. module: account
+=======
+#: xsl:account.transfer:0
+msgid "Partner ID"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.journal.select:0
#: view:project.account.analytic.line:0
msgid "Open Entries"
@@ -2371,6 +2730,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:1478
+#, python-format
+msgid ""
+"There is no default default debit account defined \n"
+"on journal \"%s\""
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.account.template,type:0
#: help:account.entries.report,type:0
msgid ""
@@ -2387,6 +2757,26 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1292
+#, python-format
+msgid ""
+"Can not create an automatic sequence for this piece!\n"
+"Put a sequence in the journal definition for automatic numbering or create a "
+"sequence manually for this piece."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:787
+#, python-format
+msgid ""
+"You can not modify the company of this journal as its related record exist "
+"in journal items"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: report:account.invoice:0
msgid "Customer Code"
msgstr ""
@@ -2409,9 +2799,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.tax,price_include:0
#: field:account.tax.template,price_include:0
msgid "Tax Included in Price"
+=======
+#: code:addons/account/account.py:3136
+#, python-format
+msgid "ECNJ"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -2428,8 +2824,19 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:account.config.settings,default_sale_tax:0
msgid "This sale tax will be assigned by default on new products."
+=======
+#: code:addons/account/account_invoice.py:379
+#, python-format
+msgid "There is no Accounting Journal of type Sale/Purchase defined!"
+msgstr ""
+
+#. module: account
+#: view:product.category:0
+msgid "Accounting Properties"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -2457,6 +2864,7 @@
#. module: account
#: report:account.account.balance:0
#: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
#: field:account.balance.report,fiscalyear_id:0
#: report:account.central.journal:0
#: field:account.central.journal,fiscalyear_id:0
@@ -2467,7 +2875,11 @@
#: view:account.config.settings:0
#: view:account.entries.report:0
#: field:account.entries.report,fiscalyear_id:0
+<<<<<<< TREE
#: view:account.fiscalyear:0
+=======
+#: report:account.financial.report:0
+>>>>>>> MERGE-SOURCE
#: field:account.fiscalyear,name:0
#: report:account.general.journal:0
#: field:account.general.journal,fiscalyear_id:0
@@ -2527,12 +2939,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.addtmpl.wizard:0
msgid "Create an Account Based on this Template"
msgstr ""
#. module: account
#: code:addons/account/account_invoice.py:901
+=======
+#: code:addons/account/account.py:1485
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Cannot create the invoice.\n"
@@ -2553,7 +2969,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_bank_statement.py:477
+=======
+#: code:addons/account/account_bank_statement.py:403
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"In order to delete a bank statement, you must first cancel it to delete "
@@ -2625,6 +3045,19 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:581
+#, python-format
+msgid ""
+"Can't find any account journal of %s type for this company.\n"
+"\n"
+"You can create one in the menu: \n"
+"Configuration\\Financial Accounting\\Accounts\\Journals."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:account.payment.term,name:account.account_payment_term_advance
#: model:account.payment.term,note:account.account_payment_term_advance
msgid "30% Advance End 30 Days"
@@ -2685,7 +3118,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3164
+=======
+#: code:addons/account/account.py:3134
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "EXJ"
msgstr ""
@@ -2755,7 +3192,10 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:account.account.type,name:account.conf_account_type_tax
+=======
+>>>>>>> MERGE-SOURCE
#: report:account.invoice:0
#: field:account.invoice,amount_tax:0
#: report:account.journal.period.print.sale.purchase:0
@@ -2778,12 +3218,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,default_purchase_tax:0
#: field:account.config.settings,purchase_tax:0
msgid "Default purchase tax"
msgstr ""
#. module: account
+=======
+#: report:account.aged_trial_balance:0
+msgid "Not due"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.account:0
#: field:account.financial.report,account_ids:0
#: selection:account.financial.report,type:0
@@ -2797,6 +3245,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3503
#: code:addons/account/account_bank_statement.py:404
#: code:addons/account/account_invoice.py:378
@@ -2806,6 +3255,9 @@
#: code:addons/account/account_invoice.py:605
#: code:addons/account/account_invoice.py:627
#: code:addons/account/account_move_line.py:535
+=======
+#: code:addons/account/account_invoice.py:378
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -2949,6 +3401,7 @@
#. module: account
#: view:account.aged.trial.balance:0
#: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
#: model:ir.ui.menu,name:account.menu_aged_trial_balance
msgid "Aged Partner Balance"
msgstr ""
@@ -2960,11 +3413,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: constraint:account.move.line:0
msgid "Account and Period must belong to the same company."
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: field:account.invoice.line,discount:0
msgid "Discount (%)"
msgstr ""
@@ -3012,8 +3468,18 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1411
+=======
+#: view:account.use.model:0
+msgid "This wizard will create recurring accounting entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1329
+>>>>>>> MERGE-SOURCE
#, python-format
+<<<<<<< TREE
msgid "You cannot delete a posted journal entry \"%s\"."
msgstr ""
@@ -3031,6 +3497,15 @@
#: code:addons/account/account.py:2308
#: code:addons/account/account_invoice.py:744
#: code:addons/account/account_move_line.py:195
+=======
+msgid "No sequence defined on the journal !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
+#: code:addons/account/account_move_line.py:173
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
msgstr ""
@@ -3090,6 +3565,11 @@
msgstr ""
#. module: account
+#: field:accounting.report,debit_credit:0
+msgid "Display Debit/Credit Columns"
+msgstr ""
+
+#. module: account
#: selection:account.entries.report,month:0
#: selection:account.invoice.report,month:0
#: selection:analytic.entries.report,month:0
@@ -3151,11 +3631,31 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:401
+#, python-format
+msgid ""
+"You can not delete an invoice which is open or paid. We suggest you to "
+"refund it instead."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:1025
+#, python-format
+msgid "Invoice '%s' is validated."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.model.line,date_maturity:0
msgid ""
"The maturity date of the generated entries for this model. You can choose "
@@ -3188,7 +3688,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:791
+=======
+#: code:addons/account/account_invoice.py:744
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Tax base different!\n"
@@ -3344,8 +3848,13 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3422
#: code:addons/account/account_bank.py:95
+=======
+#: code:addons/account/account.py:3380
+#: code:addons/account/account_bank.py:90
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "BNK"
msgstr ""
@@ -3616,7 +4125,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1434
+=======
+#: code:addons/account/account_invoice.py:1345
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Partner Defined !"
msgstr ""
@@ -3697,6 +4210,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_cash_statement.py:315
+#, python-format
+msgid "The closing balance should be the same than the computed balance!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.journal:0
msgid "Search Account Journal"
msgstr ""
@@ -3812,6 +4334,7 @@
#. module: account
#: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
msgid "Period Length (days)"
msgstr ""
@@ -3875,8 +4398,18 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:account.config.settings,default_purchase_tax:0
msgid "This purchase tax will be assigned by default on new products."
+=======
+#: code:addons/account/account_invoice.py:850
+#, python-format
+msgid ""
+"Can not create the invoice !\n"
+"The related payment term is probably misconfigured as it gives a computed "
+"amount greater than the total invoiced amount. The latest line of your "
+"payment term must be of type 'balance' to avoid rounding issues."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -3885,9 +4418,23 @@
msgstr ""
#. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
#: report:account.central.journal:0
+<<<<<<< TREE
#: view:account.config.settings:0
+=======
+#: report:account.financial.report:0
+#: report:account.general.journal:0
+>>>>>>> MERGE-SOURCE
#: report:account.general.ledger:0
+<<<<<<< TREE
+=======
+#: report:account.general.ledger_landscape:0
+#: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+>>>>>>> MERGE-SOURCE
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
@@ -3903,8 +4450,19 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.model,name:account.model_account_journal_cashbox_line
msgid "account.journal.cashbox.line"
+=======
+#: field:account.journal,centralisation:0
+msgid "Centralised counterpart"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:575
+#, python-format
+msgid "You can not create journal items on a \"view\" account %s %s"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -3955,7 +4513,13 @@
#: selection:account.vat.declaration,filter:0
#: selection:accounting.report,filter:0
#: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
#: field:analytic.entries.report,date:0
+#, python-format
msgid "Date"
msgstr ""
@@ -3971,12 +4535,28 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: view:account.analytic.line: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 ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.chart.template:0
msgid "Chart of Accounts Template"
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2320
+=======
+#: code:addons/account/account.py:2297
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3985,12 +4565,23 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: selection:account.balance.report,display_account:0
#: selection:account.common.account.report,display_account:0
#: selection:account.report.general.ledger,display_account:0
#: selection:account.tax,type_tax_use:0
#: selection:account.tax.template,type_tax_use:0
msgid "All"
+=======
+#: code:addons/account/account_move_line.py:846
+#, python-format
+msgid "Some entries are already reconciled !"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Account Tax"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4014,6 +4605,8 @@
#: selection:account.vat.declaration,filter:0
#: selection:accounting.report,filter:0
#: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
msgid "No Filters"
msgstr ""
@@ -4107,6 +4700,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: report:account.aged_trial_balance:0
+msgid "Account Total"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1168
+#, python-format
+msgid "Unable to change tax !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:analytic.entries.report,nbr:0
msgid "#Entries"
msgstr ""
@@ -4122,8 +4729,22 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,complete_tax_set:0
msgid "Complete set of taxes"
+=======
+#: view:account.fiscal.position:0
+msgid "Mapping"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:932
+#, python-format
+msgid ""
+"You cannot create an invoice on a centralised journal. Uncheck the "
+"centralised counterpart box in the related journal from the configuration "
+"menu."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4131,6 +4752,7 @@
#: field:account.account.template,name:0
#: report:account.analytic.account.inverted.balance:0
#: field:account.chart.template,name:0
+#: report:account.financial.report:0
#: field:account.model.line,name:0
#: field:account.move.line,name:0
#: field:account.move.reconcile,name:0
@@ -4139,7 +4761,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/installer.py:94
+=======
+#: model:ir.model,name:account.model_account_aged_trial_balance
+msgid "Account Aged Trial balance Report"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:582
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No unconfigured company !"
msgstr ""
@@ -4443,7 +5074,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_bank_statement.py:423
+=======
+#: selection:account.automatic.reconcile,power:0
+msgid "3"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:97
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You have to assign an analytic journal on the '%s' journal!"
msgstr ""
@@ -4497,6 +5137,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:668
#, python-format
msgid "You cannot change the code of account which contains journal items!"
@@ -4510,6 +5151,9 @@
#. module: account
#: code:addons/account/account_invoice.py:583
#: code:addons/account/account_invoice.py:598
+=======
+#: code:addons/account/account_move_line.py:1231
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Cannot find a chart of account, you should create one from Settings\\"
@@ -4572,7 +5216,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:867
+=======
+#: code:addons/account/account_analytic_line.py:91
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You have to provide an account for the write off/exchange difference entry."
@@ -4638,6 +5286,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/installer.py:94
#, python-format
msgid ""
@@ -4651,6 +5300,15 @@
msgstr ""
#. module: account
+=======
+#: help:product.template,property_account_expense:0
+msgid ""
+"This account will be used for invoices instead of the default one to value "
+"expenses for the current product"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.model,name:account.model_account_chart
msgid "Account chart"
msgstr ""
@@ -4775,6 +5433,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: constraint:account.account:0
msgid ""
"Error!\n"
@@ -4783,6 +5442,9 @@
#. module: account
#: code:addons/account/account_invoice.py:627
+=======
+#: code:addons/account/account.py:1082
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Cannot find any account journal of %s type for this company.\n"
@@ -4813,12 +5475,28 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.tax:0
msgid "Children/Sub Taxes"
msgstr ""
#. module: account
#: xsl:account.transfer:0
+=======
+#: code:addons/account/account_move_line.py:1266
+#, python-format
+msgid "Encoding error"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "4"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: xsl:account.transfer:0
+>>>>>>> MERGE-SOURCE
msgid "Change"
msgstr ""
@@ -4845,6 +5523,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:account.config.settings,group_proforma_invoices:0
msgid "Allows you to put invoices in pro-forma state."
msgstr ""
@@ -4857,13 +5536,42 @@
#. module: account
#: help:account.partner.ledger,amount_currency:0
#: help:account.report.general.ledger,amount_currency:0
+=======
+#: help:account.bank.statement,balance_end_cash:0
+msgid "Closing balance based on cashBox"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Example"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:839
+#, python-format
+>>>>>>> MERGE-SOURCE
msgid ""
+<<<<<<< TREE
"It adds the currency column on report if the currency differs from the "
"company currency."
msgstr ""
#. module: account
#: code:addons/account/account.py:3356
+=======
+"Please verify the price of the invoice !\n"
+"The real total does not match the computed total."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3316
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Purchase Tax %.2f%%"
msgstr ""
@@ -4888,6 +5596,18 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: selection:account.bank.statement.line,type:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/account_invoice.py:346
+#, python-format
+msgid "Customer"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.bank.statement:0
msgid "Confirmed"
msgstr ""
@@ -4898,8 +5618,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "My Invoices"
+=======
+#: code:addons/account/account.py:1584
+#, 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."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -4919,16 +5648,32 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "Invoice "
msgstr ""
#. module: account
+=======
+#: view:validate.account.move:0
+msgid ""
+"All draft account entries in this journal and period will be validated. It "
+"means you won't be able to modify their accounting fields anymore."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.chart.template,property_account_income:0
msgid "Income Account on Product Template"
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:account.journal.period,state:0
msgid ""
"When journal period is created. The status is 'Draft'. If a report is "
@@ -4938,6 +5683,9 @@
#. module: account
#: code:addons/account/account.py:3167
+=======
+#: code:addons/account/account.py:3137
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "MISC"
msgstr ""
@@ -4952,11 +5700,13 @@
#: view:account.tax:0
#: view:account.tax.template:0
#: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
#: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
#: model:ir.actions.act_window,name:account.action_invoice_tree
#: model:ir.actions.report.xml,name:account.account_invoices
#: view:report.invoice.created:0
#: field:res.partner,invoice_ids:0
+#, python-format
msgid "Invoices"
msgstr ""
@@ -5106,6 +5856,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:890
#, python-format
msgid ""
@@ -5127,6 +5878,53 @@
#: view:account.bank.statement:0
#: field:account.journal,cash_control:0
msgid "Cash Control"
+=======
+#: view:account.move:0
+#: view:account.move.line:0
+#: code:addons/account/wizard/account_move_journal.py:153
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
+#: model:ir.actions.act_window,name:account.act_account_move_to_account_move_line_open
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move
+#: model:ir.actions.act_window,name:account.action_account_manual_reconcile
+#: model:ir.actions.act_window,name:account.action_account_moves_all_a
+#: model:ir.actions.act_window,name:account.action_account_moves_bank
+#: model:ir.actions.act_window,name:account.action_account_moves_purchase
+#: model:ir.actions.act_window,name:account.action_account_moves_sale
+#: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
+#: model:ir.actions.act_window,name:account.action_move_line_tree1
+#: model:ir.actions.act_window,name:account.action_tax_code_line_open
+#: model:ir.model,name:account.model_account_move_line
+#: model:ir.ui.menu,name:account.menu_action_account_moves_all
+#: model:ir.ui.menu,name:account.menu_action_account_moves_bank
+#: model:ir.ui.menu,name:account.menu_eaction_account_moves_purchase
+#: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
+#, python-format
+msgid "Journal Items"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
+#: 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_financial_report.py:70
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
+#, python-format
+msgid "Error"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -5220,6 +6018,18 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:1361
+#, 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."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.ui.menu,name:account.account_template_folder
msgid "Templates"
msgstr ""
@@ -5235,6 +6045,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:1097
+#, python-format
+msgid "Start period should be smaller then End period"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.tax,price_include:0
#: help:account.tax.template,price_include:0
msgid ""
@@ -5250,6 +6069,7 @@
#. module: account
#: report:account.account.balance:0
#: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
#: field:account.balance.report,target_move:0
#: report:account.central.journal:0
#: field:account.central.journal,target_move:0
@@ -5299,6 +6119,8 @@
#: view:account.invoice:0
#: field:account.invoice,payment_ids:0
#: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
msgid "Payments"
msgstr ""
@@ -5349,8 +6171,24 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:account.invoice,sent:0
msgid "It indicates that the invoice has been sent."
+=======
+#: field:account.bank.statement,starting_details_ids:0
+msgid "Opening Cashbox"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Line 1:"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1315
+#, python-format
+msgid "Integrity Error !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -5623,6 +6461,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.analytic.account:0
#: view:account.bank.statement:0
#: selection:account.bank.statement,state:0
@@ -5633,6 +6472,10 @@
#: selection:account.period,state:0
#: selection:report.invoice.created,state:0
msgid "Open"
+=======
+#: field:account.bank.statement.line,name:0
+msgid "Communication"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -5686,6 +6529,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "Draft Refund "
msgstr ""
@@ -5697,6 +6541,21 @@
#. module: account
#: view:account.payment.term.line:0
+=======
+#: code:addons/account/account.py:3463
+#: code:addons/account/account_bank_statement.py:338
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
+#: code:addons/account/wizard/account_move_journal.py:63
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.payment.term.line,value_amount:0
msgid "Amount To Pay"
msgstr ""
@@ -5765,7 +6624,6 @@
msgstr ""
#. module: account
-#: field:account.analytic.line,amount_currency:0
#: field:account.entries.report,amount_currency:0
#: field:account.model.line,amount_currency:0
#: field:account.move.line,amount_currency:0
@@ -5905,6 +6763,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:775
+#, python-format
+msgid "Already Reconciled!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.tax,type:0
msgid "The computation method for the tax amount."
msgstr ""
@@ -5933,14 +6800,22 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1120
+=======
+#: code:addons/account/account_move_line.py:1229
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Move name (id): %s (%s)"
msgstr ""
#. module: account
#: view:account.move.line.reconcile:0
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:882
+=======
+#: code:addons/account/account_move_line.py:871
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Write-Off"
msgstr ""
@@ -5966,7 +6841,11 @@
#: view:account.config.settings:0
#: view:account.invoice:0
#: view:account.invoice.report:0
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:355
+=======
+#: code:addons/account/account_invoice.py:348
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Supplier"
msgstr ""
@@ -5986,7 +6865,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:92
+=======
+#: code:addons/account/account_invoice.py:91
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Free Reference"
msgstr ""
@@ -5996,7 +6879,9 @@
#: selection:account.common.partner.report,result_selection:0
#: selection:account.partner.balance,result_selection:0
#: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
#: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
#, python-format
msgid "Receivable and Payable Accounts"
msgstr ""
@@ -6100,17 +6985,31 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2296
+=======
+#: code:addons/account/account.py:2273
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You have a wrong expression \"%(...)s\" in your model !"
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.tax.template:0
msgid "Compute Code for Taxes Included Prices"
msgstr ""
#. module: account
+=======
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
+#, python-format
+msgid "You can not use an inactive account!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.bank.statement,balance_end:0
msgid "Balance as calculated based on Starting Balance and transaction lines"
msgstr ""
@@ -6148,6 +7047,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1321
#, python-format
msgid ""
@@ -6163,6 +7063,24 @@
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Template Tax Fiscal Position"
+=======
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
+#: code:addons/account/wizard/account_period_close.py:51
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:102
+#, python-format
+msgid "Period: %s"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_review_financial_journals_installer
+msgid "Review your Financial Journals"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -6205,6 +7123,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/wizard/account_report_common.py:151
+#, python-format
+msgid "not implemented"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.journal,company_id:0
msgid "Company related to this journal"
msgstr ""
@@ -6233,6 +7160,8 @@
#. module: account
#: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
msgid "Past"
msgstr ""
@@ -6531,6 +7460,8 @@
#. module: account
#: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
msgid "Journal & Partner"
msgstr ""
@@ -6540,7 +7471,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3427
+=======
+#: code:addons/account/account.py:3385
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Cannot generate an unused journal code."
msgstr ""
@@ -6585,6 +7520,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:account.invoice,date_due:0
msgid ""
"If you use payment terms, the due date will be computed automatically at the "
@@ -6600,6 +7536,11 @@
msgid ""
"There is no opening/closing period defined, please create one to set the "
"initial balance."
+=======
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -6836,8 +7777,19 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_analytic_line.py:142
#: code:addons/account/account_move_line.py:958
+=======
+#: code:addons/account/account.py:624
+#, python-format
+msgid "You can not remove an account containing journal items."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Entries: "
msgstr ""
@@ -6848,7 +7800,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: constraint:account.move.line:0
+=======
+#: code:addons/account/account.py:1580
+#, python-format
+msgid "Couldn't create move between different companies"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_type_form
+>>>>>>> MERGE-SOURCE
msgid ""
"You cannot provide a secondary currency if it is the same than the company "
"one."
@@ -6873,12 +7835,23 @@
#. module: account
#: view:account.move.line:0
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1058
+#, python-format
+>>>>>>> MERGE-SOURCE
msgid "Total debit"
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.move.line:0
msgid "Next Partner Entries to reconcile"
+=======
+#: code:addons/account/account_move_line.py:824
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -6934,6 +7907,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.bank.statement,total_entry_encoding:0
msgid "Total Transactions"
msgstr ""
@@ -6947,6 +7921,35 @@
#. module: account
#: code:addons/account/account.py:1024
#: code:addons/account/account_move_line.py:1108
+=======
+#: code:addons/account/account.py:622
+#: code:addons/account/account.py:624
+#: code:addons/account/account.py:963
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account_bank_statement.py:301
+#: code:addons/account/account_bank_statement.py:314
+#: code:addons/account/account_bank_statement.py:352
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
+#: 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/wizard/account_use_model.py:44
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Error !"
msgstr ""
@@ -6974,6 +7977,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
+#, python-format
+msgid "Error :"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.analytic.line:0
msgid "Project line"
msgstr ""
@@ -7040,6 +8053,18 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1233
+#, 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"
+"%s"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
#: report:account.third_party_ledger:0
@@ -7160,6 +8185,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: constraint:account.journal:0
msgid ""
"Configuration error!\n"
@@ -7168,6 +8194,9 @@
#. module: account
#: code:addons/account/account.py:2266
+=======
+#: code:addons/account/account.py:2246
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You can specify year, month and date in the name of the model using the "
@@ -7214,6 +8243,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:504
+#: code:addons/account/wizard/account_invoice_refund.py:145
+#, python-format
+msgid "Data Insufficient !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.actions.act_window,name:account.action_invoice_tree1
#: model:ir.ui.menu,name:account.menu_action_invoice_tree1
msgid "Customer Invoices"
@@ -7270,6 +8309,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:account.config.settings,company_footer:0
msgid "Bank accounts as printed in the footer of each printed document"
msgstr ""
@@ -7280,6 +8320,24 @@
"Configuration Error!\n"
"You cannot define children to an account with internal type different of "
"\"View\"."
+=======
+#: code:addons/account/account.py:1449
+#, python-format
+msgid "You can not delete a posted journal entry \"%s\"!"
+msgstr ""
+
+#. module: account
+#: selection:account.partner.ledger,filter:0
+#: code:addons/account/report/account_partner_ledger.py:60
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
+#, python-format
+msgid "Unreconciled Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_menu_Bank_process
+msgid "Statements Reconciliation"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -7348,13 +8406,31 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
+#, python-format
+msgid ""
+"Can not find a chart of account, you should create one from the "
+"configuration of the accounting menu."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.chart.template,property_account_expense_opening:0
msgid "Opening Entries Expense Account"
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "Customer Reference"
+=======
+#: code:addons/account/account_move_line.py:1014
+#, python-format
+msgid "Accounting Entries"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -7392,6 +8468,14 @@
msgstr ""
#. module: account
+#: help:accounting.report,debit_credit:0
+msgid ""
+"This option allow you to get more details about your the way your balances "
+"are computed. Because it is space consumming, we do not allow to use it "
+"while doing a comparison"
+msgstr ""
+
+#. module: account
#: help:account.payment.term.line,value_amount:0
msgid "For percent enter a ratio between 0-1."
msgstr ""
@@ -7491,9 +8575,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.invoice,reference:0
#: field:account.invoice.line,invoice_id:0
msgid "Invoice Reference"
+=======
+#: code:addons/account/account.py:1095
+#, python-format
+msgid "You should have chosen periods that belongs to the same company"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_review_payment_terms_installer
+msgid "Review your Payment Terms"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -7522,9 +8617,19 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#. openerp-web
#: code:addons/account/account_move_line.py:783
#: code:addons/account/static/src/js/account_move_reconciliation.js:90
+=======
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
+#: code:addons/account/wizard/account_invoice_state.py:44
+#: code:addons/account/wizard/account_invoice_state.py:68
+#: 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
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Warning"
msgstr ""
@@ -7611,6 +8716,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_account_analytic_account_tree2
msgid ""
"<p>\n"
@@ -7629,6 +8735,11 @@
" related account.\n"
" </p>\n"
" "
+=======
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#, python-format
+msgid "The periods to generate opening entries were not found"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -7637,7 +8748,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3168
+=======
+#: code:addons/account/account.py:3138
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "OPEJ"
msgstr ""
@@ -7672,6 +8787,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.analytic.line:0
#: field:account.bank.statement,user_id:0
#: view:account.journal:0
@@ -7679,6 +8795,17 @@
#: view:analytic.entries.report:0
#: field:analytic.entries.report,user_id:0
msgid "User"
+=======
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
+#, python-format
+msgid "The journal must have default credit and debit account"
+msgstr ""
+
+#. module: account
+#: report:account.general.journal:0
+#: xsl:account.transfer:0
+msgid ":"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -7704,7 +8831,17 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3155
+=======
+#: code:addons/account/account_move_line.py:1317
+#, python-format
+msgid "Bad account !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3125
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Sales Journal"
msgstr ""
@@ -7715,7 +8852,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1188
+=======
+#: code:addons/account/account_move_line.py:1292
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No piece number !"
msgstr ""
@@ -7779,7 +8920,11 @@
#. module: account
#: selection:account.move.line,centralisation:0
+<<<<<<< TREE
#: code:addons/account/account.py:1503
+=======
+#: code:addons/account/account.py:1535
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Currency Adjustment"
msgstr ""
@@ -7811,7 +8956,25 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:788
+=======
+#: view:account.account:0
+#: view:account.account.template:0
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
+#: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
+#, python-format
+msgid "Payable Accounts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:741
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Global taxes defined, but they are not in invoice lines !"
msgstr ""
@@ -7868,7 +9031,11 @@
#: selection:account.bank.accounts.wizard,account_type:0
#: selection:account.entries.report,type:0
#: selection:account.journal,type:0
+<<<<<<< TREE
#: code:addons/account/account.py:3054
+=======
+#: code:addons/account/account.py:3020
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Cash"
msgstr ""
@@ -7880,10 +9047,32 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:account.invoice.refund,filter_refund:0
msgid ""
"Refund base on this type. You can not Modify and Cancel if the invoice is "
"already reconciled"
+=======
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
+#: code:addons/account/wizard/account_move_journal.py:165
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:56
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
+#, python-format
+msgid "UserError"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -8029,9 +9218,25 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:653
#: code:addons/account/account.py:656
#: code:addons/account/account.py:668
+=======
+#: code:addons/account/account.py:629
+#: code:addons/account/account.py:642
+#: code:addons/account/account.py:645
+#: code:addons/account/account.py:664
+#: code:addons/account/account.py:787
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
+#: code:addons/account/account_move_line.py:97
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Warning !"
msgstr ""
@@ -8099,7 +9304,24 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:869
+=======
+#: code:addons/account/account.py:3463
+#, python-format
+msgid ""
+"The bank account defined on the selected chart of accounts hasn't a code."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:108
+#, python-format
+msgid "Can not %s draft/proforma/cancel invoice."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:821
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Invoice Lines !"
msgstr ""
@@ -8141,11 +9363,42 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:388
+#, python-format
+msgid "Invoice '%s' is paid."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:process.node,note:account.process_node_electronicfile0
msgid "Automatic entry"
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr ""
+
+#. module: account
+#: help:product.template,property_account_income:0
+msgid ""
+"This account will be used for invoices instead of the default one to value "
+"sales for the current product"
+msgstr ""
+
+#. module: account
+#: help:account.journal,group_invoice_lines:0
+msgid ""
+"If this box is checked, the system will try to group the accounting lines "
+"when generating them from invoices."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.account,reconcile:0
msgid ""
"Check this box if this account allows reconciliation of journal items."
@@ -8174,7 +9427,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:1434
+=======
+#: code:addons/account/account_invoice.py:1345
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You must first select a partner !"
msgstr ""
@@ -8202,6 +9459,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.analytic.account:0
#: view:account.bank.statement:0
#: field:account.bank.statement,state:0
@@ -8233,6 +9491,20 @@
#. module: account
#: view:account.config.settings:0
msgid "No Fiscal Year Defined for This Company"
+=======
+#: model:ir.actions.act_window,help:account.action_tax_code_tree
+msgid ""
+"The chart of taxes is used to generate your periodical tax statement. You "
+"will see the taxes with codes related to your legal statement according to "
+"your country."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:437
+#, python-format
+msgid ""
+"Can not find a chart of accounts for this company, you should create one."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -8253,7 +9525,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3158
+=======
+#: code:addons/account/account.py:3128
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Purchase Refund Journal"
msgstr ""
@@ -8351,6 +9627,29 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for the current "
+"partner"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1042
+#, python-format
+msgid ""
+"You can not cancel an invoice which is partially paid! You need to "
+"unreconcile related payment entries first!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.chart.template,property_account_income_categ:0
msgid "Income Category Account"
msgstr ""
@@ -8430,15 +9729,19 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.journal,centralisation:0
msgid "Centralized Counterpart"
msgstr ""
#. module: account
#: help:account.move.line,blocked:0
+=======
+#: help:product.category,property_account_income_categ:0
+>>>>>>> MERGE-SOURCE
msgid ""
-"You can check this box to mark this journal item as a litigation with the "
-"associated partner"
+"This account will be used for invoices to value sales for the current "
+"product category"
msgstr ""
#. module: account
@@ -8458,7 +9761,18 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice.refund:0
+=======
+#: view:account.invoice.report:0
+#: view:analytic.entries.report:0
+msgid "current month"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1057
+#, python-format
+>>>>>>> MERGE-SOURCE
msgid ""
"Use this option if you want to cancel an invoice and create a new\n"
" one. The credit note will be created, "
@@ -8576,10 +9890,12 @@
#. module: account
#: report:account.account.balance:0
#: report:account.central.journal:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
msgid "Filter By"
msgstr ""
@@ -8591,10 +9907,9 @@
msgstr ""
#. module: account
-#: view:account.entries.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:account.action_company_analysis_tree
-msgid "Company Analysis"
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
+#, python-format
+msgid "The entries to reconcile should belong to the same company"
msgstr ""
#. module: account
@@ -8603,7 +9918,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3353
+=======
+#: code:addons/account/account.py:3313
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Tax %.2f%%"
msgstr ""
@@ -8621,7 +9940,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3156
+=======
+#: code:addons/account/account.py:3126
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Purchase Journal"
msgstr ""
@@ -8710,6 +10033,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:504
+#, python-format
+msgid "The payment term of supplier does not have a payment term line!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.move.line.reconcile,debit:0
msgid "Debit amount"
msgstr ""
@@ -8737,6 +10069,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,sale_tax_rate:0
msgid "Sales tax (%)"
msgstr ""
@@ -8767,6 +10100,20 @@
#. module: account
#: view:account.journal:0
+=======
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
+#: model:ir.actions.act_window,name:account.action_account_analytic_chart
+#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
+msgid "Chart of Analytic Accounts"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Draft Customer Invoices"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.ui.menu,name:account.menu_configuration_misc
msgid "Miscellaneous"
msgstr ""
@@ -8813,6 +10160,13 @@
msgstr ""
#. module: account
+#: help:account.move.line,blocked:0
+msgid ""
+"You can check this box to mark this journal item as a litigation with the "
+"associated partner"
+msgstr ""
+
+#. module: account
#: help:account.invoice,internal_number:0
msgid ""
"Unique number of the invoice, computed automatically when the invoice is "
@@ -8831,6 +10185,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1120
+#, python-format
+msgid "The account move (%s) for centralisation has been confirmed!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.move.line,amount_currency:0
msgid ""
"The amount expressed in an optional other currency if it is a multi-currency "
@@ -8838,7 +10201,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1009
+=======
+#: code:addons/account/account.py:1315
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "The account move (%s) for centralisation has been confirmed."
msgstr ""
@@ -8899,7 +10266,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2296
+=======
+#: field:account.invoice,address_contact_id:0
+msgid "Contact Address"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2273
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Wrong model !"
msgstr ""
@@ -8955,7 +10331,11 @@
#. module: account
#: field:account.fiscalyear.close,journal_id:0
+<<<<<<< TREE
#: code:addons/account/account.py:3160
+=======
+#: code:addons/account/account.py:3130
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Opening Entries Journal"
msgstr ""
@@ -8966,9 +10346,28 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.bank.statement,message_is_follower:0
#: field:account.invoice,message_is_follower:0
msgid "Is a Follower"
+=======
+#: help:account.chart.template,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 "
+"Profilt & Loss Report"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:819
+#, python-format
+msgid "Please define sequence on the journal related to this invoice."
+>>>>>>> MERGE-SOURCE
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reference_type:0
+msgid "Reference Type"
msgstr ""
#. module: account
@@ -9045,12 +10444,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.cashbox.line,pieces:0
msgid "Unit of Currency"
msgstr ""
#. module: account
#: code:addons/account/account.py:3157
+=======
+#: code:addons/account/account.py:3127
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Sales Refund Journal"
msgstr ""
@@ -9116,7 +10519,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:869
+=======
+#: code:addons/account/account_invoice.py:821
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Please create some invoice lines."
msgstr ""
@@ -9135,7 +10542,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3165
+=======
+#: code:addons/account/account.py:3135
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "SCNJ"
msgstr ""
@@ -9197,6 +10608,7 @@
#: field:account.common.journal.report,period_from:0
#: field:account.common.partner.report,period_from:0
#: field:account.common.report,period_from:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
#: field:account.general.journal,period_from:0
#: report:account.general.ledger:0
@@ -9222,6 +10634,7 @@
#. module: account
#: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
msgid "Analysis Direction"
msgstr ""
@@ -9237,6 +10650,11 @@
#. module: account
#: view:account.move.line:0
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1061
+#, python-format
+>>>>>>> MERGE-SOURCE
msgid "Total credit"
msgstr ""
@@ -9261,6 +10679,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,purchase_refund_sequence_prefix:0
msgid "Supplier credit note sequence"
msgstr ""
@@ -9298,6 +10717,17 @@
#: code:addons/account/account_move_line.py:827
#, python-format
msgid "To reconcile the entries company should be the same for all entries."
+=======
+#: xsl:account.transfer:0
+msgid "Document"
+msgstr ""
+
+#. module: account
+#: 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"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -9309,6 +10739,7 @@
#: report:account.analytic.account.inverted.balance:0
#: report:account.central.journal:0
#: field:account.entries.report,balance:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
@@ -9357,6 +10788,30 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: view:account.analytic.account:0
+msgid "Contract Data"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_sale
+msgid ""
+"This view is used by accountants in order to record entries massively in "
+"OpenERP. If you want to record a customer invoice, select the journal and "
+"the period in the search toolbar. Then, start by recording the entry line of "
+"the income account. OpenERP will propose to you automatically the Tax "
+"related to this account and the counter-part \"Account receivable\"."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#, python-format
+msgid "You must select accounts to reconcile"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:process.transition,note:account.process_transition_entriesreconcile0
msgid "Accounting entries are the first input of the reconciliation."
msgstr ""
@@ -9367,7 +10822,6 @@
msgstr ""
#. module: account
-#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Filters By"
msgstr ""
@@ -9396,8 +10850,12 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_bank_statement.py:477
#: code:addons/account/wizard/account_period_close.py:51
+=======
+#: code:addons/account/account_move_line.py:1168
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -9479,6 +10937,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,default_sale_tax:0
#: field:account.config.settings,sale_tax:0
msgid "Default sale tax"
@@ -9491,6 +10950,15 @@
#. module: account
#: code:addons/account/account.py:1549
+=======
+#: view:account.account:0
+#: field:account.account,child_consol_ids:0
+msgid "Consolidated Children"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Cannot create moves for different companies."
msgstr ""
@@ -9537,6 +11005,24 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: view:account.entries.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_company_analysis_tree
+msgid "Company Analysis"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:412
+#, python-format
+msgid ""
+"No opening/closing period defined, please create one to set the initial "
+"balance!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: report:account.account.balance:0
#: field:account.aged.trial.balance,period_to:0
#: field:account.balance.report,period_to:0
@@ -9546,6 +11032,7 @@
#: field:account.common.journal.report,period_to:0
#: field:account.common.partner.report,period_to:0
#: field:account.common.report,period_to:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
#: field:account.general.journal,period_to:0
#: report:account.general.ledger:0
@@ -9565,11 +11052,22 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:account.account.type,name:account.account_type_expense_view1
msgid "Expense View"
msgstr ""
#. module: account
+=======
+#: code:addons/account/installer.py:94
+#, python-format
+msgid ""
+"There are currently no company without chart of account. The wizard will "
+"therefore not be executed."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.move.line,date_maturity:0
msgid "Due date"
msgstr ""
@@ -9615,6 +11113,7 @@
#. module: account
#: report:account.account.balance:0
#: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
#: field:account.balance.report,date_from:0
#: report:account.central.journal:0
#: field:account.central.journal,date_from:0
@@ -9622,6 +11121,7 @@
#: field:account.common.journal.report,date_from:0
#: field:account.common.partner.report,date_from:0
#: field:account.common.report,date_from:0
+#: report:account.financial.report:0
#: field:account.fiscalyear,date_start:0
#: report:account.general.journal:0
#: field:account.general.journal,date_from:0
@@ -9670,7 +11170,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:890
+=======
+#: code:addons/account/account_invoice.py:839
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Bad total !"
msgstr ""
@@ -9755,7 +11259,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_move_line.py:1122
+=======
+#: code:addons/account/account_invoice.py:381
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"You cannot do this modification on a confirmed entry. You can just change "
@@ -9810,6 +11318,7 @@
#: report:account.analytic.account.inverted.balance:0
#: report:account.central.journal:0
#: field:account.entries.report,credit:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
@@ -9893,9 +11402,16 @@
#: view:accounting.report:0
#: selection:accounting.report,filter:0
#: selection:accounting.report,filter_cmp:0
+<<<<<<< TREE
#: model:ir.actions.act_window,name:account.action_account_period
#: model:ir.ui.menu,name:account.menu_action_account_period
+=======
+#: code:addons/account/report/common_report_header.py:99
+#: model:ir.actions.act_window,name:account.action_account_period_form
+#: model:ir.ui.menu,name:account.menu_action_account_period_form
+>>>>>>> MERGE-SOURCE
#: model:ir.ui.menu,name:account.next_id_23
+#, python-format
msgid "Periods"
msgstr ""
@@ -10040,6 +11556,7 @@
#: field:account.common.journal.report,date_to:0
#: field:account.common.partner.report,date_to:0
#: field:account.common.report,date_to:0
+#: report:account.financial.report:0
#: field:account.fiscalyear,date_stop:0
#: report:account.general.journal:0
#: field:account.general.journal,date_to:0
@@ -10088,6 +11605,20 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_analytic_line.py:100
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.account,unrealized_gain_loss:0
#: model:ir.actions.act_window,name:account.action_account_gain_loss
#: model:ir.ui.menu,name:account.menu_unrealized_gains_losses
@@ -10112,6 +11643,7 @@
msgstr ""
#. module: account
+#: report:account.aged_trial_balance:0
#: report:account.analytic.account.balance:0
#: report:account.analytic.account.inverted.balance:0
#: report:account.analytic.account.quantity_cost_ledger:0
@@ -10141,6 +11673,7 @@
#. module: account
#: field:account.account,company_id:0
+#: report:account.account.balance:0
#: field:account.aged.trial.balance,company_id:0
#: field:account.analytic.journal,company_id:0
#: field:account.balance.report,company_id:0
@@ -10156,7 +11689,9 @@
#: field:account.entries.report,company_id:0
#: field:account.fiscal.position,company_id:0
#: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
#: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,company_id:0
#: field:account.invoice,company_id:0
#: field:account.invoice.line,company_id:0
@@ -10165,6 +11700,8 @@
#: field:account.invoice.tax,company_id:0
#: field:account.journal,company_id:0
#: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
#: field:account.model,company_id:0
#: field:account.move,company_id:0
#: field:account.move.line,company_id:0
@@ -10282,6 +11819,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: view:wizard.multi.charts.accounts:0
+msgid "Generate Your Chart of Accounts from a Chart Template"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: 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 "
@@ -10338,6 +11883,7 @@
#: report:account.analytic.account.inverted.balance:0
#: report:account.central.journal:0
#: field:account.entries.report,debit:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
@@ -10366,6 +11912,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: help:account.model.line,quantity:0
msgid "The optional quantity on entries."
msgstr ""
@@ -10373,6 +11920,43 @@
#. module: account
#: field:account.automatic.reconcile,reconciled:0
msgid "Reconciled transactions"
+=======
+#: help:product.category,property_account_expense_categ:0
+msgid ""
+"This account will be used for invoices to value expenses for the current "
+"product category"
+msgstr ""
+
+#. module: account
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr ""
+
+#. module: account
+#: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
+msgid "Journal Entry Number"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Recurring"
+msgstr ""
+
+#. module: account
+#: 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!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:843
+#, python-format
+msgid "Entry is already reconciled"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -10412,8 +11996,10 @@
msgstr ""
#. module: account
+#: report:account.account.balance:0
#: selection:account.balance.report,display_account:0
#: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
#: selection:account.report.general.ledger,display_account:0
msgid "With movements"
msgstr ""
@@ -10503,6 +12089,21 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
+msgid "Statistic Reports"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
+#, python-format
+msgid "Bad account!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.print.journal,sort_selection:0
msgid "Entries Sorted by"
msgstr ""
@@ -10522,6 +12123,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_tax_code_list
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -10536,6 +12138,11 @@
" one or several tax code.\n"
" </p>\n"
" "
+=======
+#: code:addons/account/account_invoice.py:373
+#, python-format
+msgid "Invoice '%s' is waiting for validation."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -10575,6 +12182,12 @@
msgstr ""
#. module: account
+#: code:addons/account/account.py:1359
+#, python-format
+msgid "You can not modify a posted entry of closed periods"
+msgstr ""
+
+#. module: account
#: report:account.general.journal:0
#: model:ir.actions.report.xml,name:account.account_general_journal
msgid "General Journal"
@@ -10684,6 +12297,7 @@
#. module: account
#: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
#: field:account.common.partner.report,result_selection:0
#: report:account.partner.balance:0
#: field:account.partner.balance,result_selection:0
@@ -10766,6 +12380,8 @@
#. module: account
#: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
msgid "Future"
msgstr ""
@@ -10797,11 +12413,19 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:res.partner,property_payment_term:0
msgid "Customer Payment Term"
msgstr ""
#. module: account
+=======
+#: field:account.analytic.line,amount_currency:0
+msgid "Amount currency"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:accounting.report,label_filter:0
msgid ""
"This label will be displayed on report to show the balance computed for the "
=== modified file 'account/i18n/bs.po'
--- account/i18n/bs.po 2013-04-05 11:10:48 +0000
+++ account/i18n/bs.po 2013-04-10 14:12:36 +0000
@@ -6,15 +6,32 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-05-10 18:18+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@xxxxxxxxxxx>\n"
+=======
+"POT-Creation-Date: 2012-10-23 11:48+0000\n"
+"PO-Revision-Date: 2012-04-18 19:45+0000\n"
+"Last-Translator: Haris Kovacevic <haris.kovacevic@xxxxxxxxxx>\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: 2013-03-16 05:12+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2012-10-24 05:43+0000\n"
+"X-Generator: Launchpad (build 16179)\n"
+
+#. module: account
+#: view:account.invoice.report:0
+#: view:analytic.entries.report:0
+msgid "last month"
+msgstr "prošlog mjeseca"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -83,6 +100,11 @@
msgstr ""
#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Aged Trial Balance"
+msgstr "Zreli probni saldo"
+
+#. module: account
#: view:account.move:0
#: view:account.move.line:0
msgid "Total Debit"
@@ -113,8 +135,12 @@
#: field:account.move,ref:0
#: field:account.move.line,ref:0
#: field:account.subscription,ref:0
+<<<<<<< TREE
#: xsl:account.transfer:0
#: field:cash.box.in,ref:0
+=======
+#: xsl:account.transfer:0
+>>>>>>> MERGE-SOURCE
msgid "Reference"
msgstr "Referenca"
@@ -126,6 +152,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:641
#: code:addons/account/account.py:686
#: code:addons/account/account.py:781
@@ -144,12 +171,19 @@
#: 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
+=======
+#: code:addons/account/account_invoice.py:1430
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Warning!"
msgstr "Upozorenje!"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3159
+=======
+#: code:addons/account/account.py:3129
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Miscellaneous Journal"
msgstr ""
@@ -224,6 +258,25 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: help:account.tax.code,notprintable:0
+#: help:account.tax.code.template,notprintable:0
+msgid ""
+"Check this box if you don't want any VAT related to this Tax Code to appear "
+"on invoices"
+msgstr ""
+"Označite ovo polje ako ne želite da se PDV vezan uz ovu poreznu šifru "
+"pojavljuje na fakturama."
+
+#. module: account
+#: code:addons/account/account_invoice.py:1254
+#, python-format
+msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
msgid "Accounting entries are an input of the reconciliation."
msgstr ""
@@ -234,6 +287,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:mail.message.subtype,name:account.mt_invoice_validated
msgid "Validated"
msgstr ""
@@ -241,6 +295,11 @@
#. module: account
#: model:account.account.type,name:account.account_type_income_view1
msgid "Income View"
+=======
+#: code:addons/account/account_move_line.py:1215
+#, python-format
+msgid "You can not add/modify entries in a closed journal."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -280,6 +339,7 @@
msgstr "Izaberi period za analizu"
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_invoice_tree3
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -293,6 +353,16 @@
" can generate it directly from the related customer invoice.\n"
" </p>\n"
" "
+=======
+#: view:account.move.line:0
+msgid "St."
+msgstr "St."
+
+#. module: account
+#: code:addons/account/account_invoice.py:560
+#, python-format
+msgid "Invoice line account company does not match with invoice company."
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -587,6 +657,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#. openerp-web
#: code:addons/account/static/src/xml/account_move_reconciliation.xml:31
#, python-format
@@ -600,6 +671,24 @@
#. module: account
#: selection:account.config.settings,period:0
+=======
+#: report:account.account.balance:0
+#: selection:account.balance.report,display_account:0
+#: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
+#: selection:account.report.general.ledger,display_account:0
+#: selection:account.tax,type_tax_use:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "All"
+msgstr "Sve"
+
+#. module: account
+#: field:account.invoice.report,address_invoice_id:0
+msgid "Invoice Address Name"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: selection:account.installer,period:0
msgid "3 Monthly"
msgstr ""
@@ -640,6 +729,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_change_currency.py:64
#: code:addons/account/wizard/account_change_currency.py:70
#, python-format
@@ -653,6 +743,9 @@
#. module: account
#: code:addons/account/account_move_line.py:1159
+=======
+#: code:addons/account/account_move_line.py:1266
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No period found or more than one period found for the given date."
msgstr ""
@@ -663,7 +756,11 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3163
+=======
+#: code:addons/account/account.py:3133
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "SAJ"
msgstr ""
@@ -703,6 +800,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: constraint:account.move:0
msgid ""
"You cannot create more than one move per period on a centralized journal."
@@ -714,6 +812,12 @@
"Set the analytic account that will be used by default on the invoice tax "
"lines for refunds. Leave empty if you don't want to use an analytic account "
"on the invoice tax lines by default."
+=======
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#, python-format
+msgid "To reconcile the entries company should be the same for all entries"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -722,7 +826,13 @@
#: selection:account.common.partner.report,result_selection:0
#: selection:account.partner.balance,result_selection:0
#: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:372
#: code:addons/account/report/account_partner_balance.py:297
+<<<<<<< TREE
+=======
+#: code:addons/account/report/account_partner_ledger.py:395
+#: model:ir.actions.act_window,name:account.action_aged_receivable
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Receivable Accounts"
msgstr "Potražni računi"
@@ -807,6 +917,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/wizard/account_change_currency.py:38
+#, python-format
+msgid "You can only change currency for Draft Invoice !"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
+>>>>>>> MERGE-SOURCE
#: model:ir.ui.menu,name:account.menu_account_report
msgid "Financial Report"
msgstr ""
@@ -829,7 +949,11 @@
msgstr "Tip"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:794
+=======
+#: code:addons/account/account_invoice.py:747
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Taxes are missing!\n"
@@ -961,11 +1085,13 @@
msgstr "Stvori tromjesečno razdoblje"
#. module: account
+#: report:account.aged_trial_balance:0
#: report:account.overdue:0
msgid "Due"
msgstr "Krajnji rok"
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,purchase_journal_id:0
msgid "Purchase journal"
msgstr ""
@@ -976,6 +1102,18 @@
msgstr ""
#. module: account
+=======
+#: code:addons/account/account.py:1353
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"!"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.move:0
+>>>>>>> MERGE-SOURCE
#: view:validate.account.move:0
#: view:validate.account.move.lines:0
msgid "Approve"
@@ -1047,6 +1185,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:2613
+#, python-format
+msgid "I can not locate a parent code for the template account!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.analytic.line:0
msgid "Purchases"
msgstr ""
@@ -1074,6 +1221,7 @@
msgstr "Šifra"
#. module: account
+<<<<<<< TREE
#: view:account.config.settings:0
msgid "Features"
msgstr ""
@@ -1084,6 +1232,13 @@
#: code:addons/account/account_invoice.py:74
#: code:addons/account/account_invoice.py:744
#: code:addons/account/account_move_line.py:195
+=======
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_bank_statement.py:357
+#: code:addons/account/account_invoice.py:73
+#: code:addons/account/account_invoice.py:697
+#: code:addons/account/account_move_line.py:173
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "No Analytic Journal !"
msgstr ""
@@ -1153,12 +1308,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.invoice:0
msgid "Refund "
msgstr ""
#. module: account
#: code:addons/account/account_analytic_line.py:90
+=======
+#: code:addons/account/account_move_line.py:856
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
msgstr ""
@@ -1206,7 +1365,11 @@
#. module: account
#: model:account.account.type,name:account.data_account_type_bank
#: selection:account.bank.accounts.wizard,account_type:0
+<<<<<<< TREE
#: code:addons/account/account.py:3054
+=======
+#: code:addons/account/account.py:3020
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Bank"
msgstr ""
@@ -1308,6 +1471,17 @@
msgstr "Prijenos ovog stavke unosa."
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1317
+#, python-format
+msgid ""
+"You can not use this general account in this journal, check the tab 'Entry "
+"Controls' on the related journal !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.move.line.reconcile,trans_nbr:0
msgid "# of Transaction"
msgstr "Broj transakcija"
@@ -1321,6 +1495,15 @@
msgstr "Oznaka stavke"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:1136
+#, python-format
+msgid "You can not modify/delete a journal with entries for this period !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.invoice,origin:0
#: help:account.invoice.line,origin:0
msgid "Reference of the document that produced this invoice."
@@ -1404,7 +1587,12 @@
msgstr "Porezi"
#. module: account
-#: code:addons/account/wizard/account_financial_report.py:70
+<<<<<<< TREE
+#: code:addons/account/wizard/account_financial_report.py:70
+=======
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Select a starting and an ending period"
msgstr ""
@@ -1471,6 +1659,7 @@
msgstr ""
#. module: account
+#: report:account.aged_trial_balance:0
#: model:ir.ui.menu,name:account.next_id_22
msgid "Partners"
msgstr ""
@@ -1511,8 +1700,10 @@
msgstr ""
#. module: account
+#: report:account.account.balance:0
#: selection:account.balance.report,display_account:0
#: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
#: selection:account.partner.balance,display_partner:0
#: selection:account.report.general.ledger,display_account:0
msgid "With balance is not equal to 0"
@@ -1532,6 +1723,121 @@
msgstr ""
#. module: account
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello${object.address_invoice_id.name and ' ' or "
+"''}${object.address_invoice_id.name or ''},</p>\n"
+" \n"
+" <p>A new invoice is available for ${object.partner_id.name}: </p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" <strong>REFERENCES</strong><br />\n"
+" Invoice number: <strong>${object.number}</strong><br />\n"
+" Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+" Invoice date: ${object.date_invoice}<br />\n"
+" % if object.origin:\n"
+" Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" Your contact: <a "
+"href=\"mailto:${object.user_id.user_email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+" </p> \n"
+" \n"
+" <p>\n"
+" You can view the invoice document, download it and pay online using the "
+"following link:\n"
+" </p>\n"
+" <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\" \n"
+" href=\"${ctx.get('edi_web_url_view') or ''}\">View "
+"Invoice</a>\n"
+" \n"
+" % if object.company_id.paypal_account and object.type in ('out_invoice', "
+"'in_refund'):\n"
+" <% \n"
+" comp_name = quote(object.company_id.name)\n"
+" inv_number = quote(object.number)\n"
+" paypal_account = quote(object.company_id.paypal_account)\n"
+" inv_amount = quote(str(object.amount_total))\n"
+" cur_name = quote(object.currency_id.name)\n"
+" paypal_url = \"https://www.paypal.com/cgi-";
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s&"
+"\" \\\n"
+" "
+"\"invoice=%s&amount=%s&currency_code=%s&button_subtype=services&a"
+"mp;no_note=1&bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
+"\n"
+" %>\n"
+" <br/>\n"
+" <p>It is also possible to directly pay with Paypal:</p>\n"
+" <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+" <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+" </a>\n"
+" % endif\n"
+" \n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+" <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+" Phone: ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web : <a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger
msgid "Account Analytic Cost Ledger"
msgstr ""
@@ -1764,6 +2070,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,group_analytic_accounting:0
msgid "Analytic accounting"
msgstr ""
@@ -1784,6 +2091,16 @@
"this total tax amount will be rounded. If you sell with tax included, you "
"should choose 'Round per line' because you certainly want the sum of your "
"tax-included line subtotals to be equal to the total amount with taxes."
+=======
+#: field:wizard.multi.charts.accounts,seq_journal:0
+msgid "Separated Journal Sequences"
+msgstr "Razdvojeni redoslijedi naloga za knjiženje"
+
+#. module: account
+#: field:account.bank.statement,user_id:0
+#: view:account.invoice:0
+msgid "Responsible"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -1829,6 +2146,16 @@
msgstr "Godišnja suma"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:1431
+#, 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 ""
@@ -1910,6 +2237,7 @@
msgstr "Referenca kupca"
#. module: account
+<<<<<<< TREE
#: help:account.tax,base_code_id:0
#: help:account.tax,ref_base_code_id:0
#: help:account.tax,ref_tax_code_id:0
@@ -1919,6 +2247,11 @@
#: help:account.tax.template,ref_tax_code_id:0
#: help:account.tax.template,tax_code_id:0
msgid "Use this code for the tax declaration."
+=======
+#: code:addons/account/account_cash_statement.py:293
+#, python-format
+msgid "User %s does not have rights to access %s journal !"
+>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account
@@ -2156,8 +2489,23 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:656
#, python-format
+=======
+#: code:addons/account/installer.py:94
+#, python-format
+msgid "No unconfigured company !"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "/"
+msgstr "/"
+
+#. module: account
+#: help:res.company,property_reserve_and_surplus_account:0
+>>>>>>> MERGE-SOURCE
msgid ""
"You cannot change the type of account to '%s' type as it contains journal "
"items!"
@@ -2296,12 +2644,20 @@
msgstr "Fiskalna godina"
#. module: account
+<<<<<<< TREE
#: code:addons/account/wizard/account_move_bank_reconcile.py:53
#, python-format
msgid "Standard Encoding"
msgstr ""
#. module: account
+=======
+#: xsl:account.transfer:0
+msgid "Partner ID"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.journal.select:0
#: view:project.account.analytic.line:0
msgid "Open Entries"
@@ -2372,6 +2728,17 @@
msgstr "Predračun"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:1478
+#, python-format
+msgid ""
+"There is no default default debit account defined \n"
+"on journal \"%s\""
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.account.template,type:0
#: help:account.entries.report,type:0
msgid ""
@@ -2388,6 +2755,26 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1292
+#, python-format
+msgid ""
+"Can not create an automatic sequence for this piece!\n"
+"Put a sequence in the journal definition for automatic numbering or create a "
+"sequence manually for this piece."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:787
+#, python-format
+msgid ""
+"You can not modify the company of this journal as its related record exist "
+"in journal items"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: report:account.invoice:0
msgid "Customer Code"
msgstr ""
@@ -2410,10 +2797,17 @@
msgstr "Opis"
#. module: account
+<<<<<<< TREE
#: field:account.tax,price_include:0
#: field:account.tax.template,price_include:0
msgid "Tax Included in Price"
msgstr "Porez uključen u cijenu"
+=======
+#: code:addons/account/account.py:3136
+#, python-format
+msgid "ECNJ"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.subscription:0
@@ -2429,9 +2823,21 @@
msgstr "Konto prihoda"
#. module: account
+<<<<<<< TREE
#: help:account.config.settings,default_sale_tax:0
msgid "This sale tax will be assigned by default on new products."
msgstr ""
+=======
+#: code:addons/account/account_invoice.py:379
+#, python-format
+msgid "There is no Accounting Journal of type Sale/Purchase defined!"
+msgstr ""
+
+#. module: account
+#: view:product.category:0
+msgid "Accounting Properties"
+msgstr "Svojstva računovodstva"
+>>>>>>> MERGE-SOURCE
#. module: account
#: report:account.general.ledger_landscape:0
@@ -2458,6 +2864,7 @@
#. module: account
#: report:account.account.balance:0
#: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
#: field:account.balance.report,fiscalyear_id:0
#: report:account.central.journal:0
#: field:account.central.journal,fiscalyear_id:0
@@ -2468,7 +2875,11 @@
#: view:account.config.settings:0
#: view:account.entries.report:0
#: field:account.entries.report,fiscalyear_id:0
+<<<<<<< TREE
#: view:account.fiscalyear:0
+=======
+#: report:account.financial.report:0
+>>>>>>> MERGE-SOURCE
#: field:account.fiscalyear,name:0
#: report:account.general.journal:0
#: field:account.general.journal,fiscalyear_id:0
@@ -2528,12 +2939,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: view:account.addtmpl.wizard:0
msgid "Create an Account Based on this Template"
msgstr ""
#. module: account
#: code:addons/account/account_invoice.py:901
+=======
+#: code:addons/account/account.py:1485
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"Cannot create the invoice.\n"
@@ -2554,7 +2969,11 @@
msgstr "Glavna Sekvenca"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_bank_statement.py:477
+=======
+#: code:addons/account/account_bank_statement.py:403
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"In order to delete a bank statement, you must first cancel it to delete "
@@ -2626,6 +3045,19 @@
msgstr "Šifra poreza"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:581
+#, python-format
+msgid ""
+"Can't find any account journal of %s type for this company.\n"
+"\n"
+"You can create one in the menu: \n"
+"Configuration\\Financial Accounting\\Accounts\\Journals."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:account.payment.term,name:account.account_payment_term_advance
#: model:account.payment.term,note:account.account_payment_term_advance
msgid "30% Advance End 30 Days"
@@ -2686,7 +3118,11 @@
msgstr "Stavke računa modela"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3164
+=======
+#: code:addons/account/account.py:3134
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "EXJ"
msgstr ""
@@ -2761,7 +3197,10 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: model:account.account.type,name:account.conf_account_type_tax
+=======
+>>>>>>> MERGE-SOURCE
#: report:account.invoice:0
#: field:account.invoice,amount_tax:0
#: report:account.journal.period.print.sale.purchase:0
@@ -2784,12 +3223,20 @@
msgstr "Analitičko konto"
#. module: account
+<<<<<<< TREE
#: field:account.config.settings,default_purchase_tax:0
#: field:account.config.settings,purchase_tax:0
msgid "Default purchase tax"
msgstr ""
#. module: account
+=======
+#: report:account.aged_trial_balance:0
+msgid "Not due"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.account:0
#: field:account.financial.report,account_ids:0
#: selection:account.financial.report,type:0
@@ -2803,6 +3250,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:3503
#: code:addons/account/account_bank_statement.py:404
#: code:addons/account/account_invoice.py:378
@@ -2812,6 +3260,9 @@
#: code:addons/account/account_invoice.py:605
#: code:addons/account/account_invoice.py:627
#: code:addons/account/account_move_line.py:535
+=======
+#: code:addons/account/account_invoice.py:378
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -2955,6 +3406,7 @@
#. module: account
#: view:account.aged.trial.balance:0
#: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
#: model:ir.ui.menu,name:account.menu_aged_trial_balance
msgid "Aged Partner Balance"
msgstr "Zreli saldo partnera"
@@ -2966,11 +3418,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: constraint:account.move.line:0
msgid "Account and Period must belong to the same company."
msgstr ""
#. module: account
+=======
+>>>>>>> MERGE-SOURCE
#: field:account.invoice.line,discount:0
msgid "Discount (%)"
msgstr "Popust (%)"
@@ -3018,8 +3473,18 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:1411
+=======
+#: view:account.use.model:0
+msgid "This wizard will create recurring accounting entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1329
+>>>>>>> MERGE-SOURCE
#, python-format
+<<<<<<< TREE
msgid "You cannot delete a posted journal entry \"%s\"."
msgstr ""
@@ -3037,6 +3502,15 @@
#: code:addons/account/account.py:2308
#: code:addons/account/account_invoice.py:744
#: code:addons/account/account_move_line.py:195
+=======
+msgid "No sequence defined on the journal !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
+#: code:addons/account/account_move_line.py:173
+>>>>>>> MERGE-SOURCE
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
msgstr ""
@@ -3096,6 +3570,11 @@
msgstr ""
#. module: account
+#: field:accounting.report,debit_credit:0
+msgid "Display Debit/Credit Columns"
+msgstr ""
+
+#. module: account
#: selection:account.entries.report,month:0
#: selection:account.invoice.report,month:0
#: selection:analytic.entries.report,month:0
@@ -3157,11 +3636,31 @@
msgstr "Iznos osnovne šifre"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:401
+#, python-format
+msgid ""
+"You can not delete an invoice which is open or paid. We suggest you to "
+"refund it instead."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:1025
+#, python-format
+msgid "Invoice '%s' is validated."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.model.line,date_maturity:0
msgid ""
"The maturity date of the generated entries for this model. You can choose "
@@ -3194,7 +3693,11 @@
msgstr "Fiskalna pozicija"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_invoice.py:791
+=======
+#: code:addons/account/account_invoice.py:744
+>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"T
Follow ups
