Merge lp:~rr.clearcorp/openobject-addons/6.1-account_asset into lp:openobject-addons

[Ronald Rubi]

[FIX] Error correction in 'compute assets' wizard. The wizard closes all assets.

The can_close variable remains on true all times, we need set in false for all cases.

[Olivier Dony (Odoo) (odo-openerp)]

Hello,

This 6.1-based branch cannot be submitted against trunk, please re-submit it against 6.1 if it is still relevant. (The diff is unreadable with more than 1.7 million lines!)

Thanks!

review: Needs Resubmitting

[Ronald Rubi (rr.clearcorp)]

Hello Olivier,

I'ver re-submit this branch.

https://code.launchpad.net/~rr.clearcorp/openobject-addons/6.1-account_asset/+merge/167082

Regards,

2013/6/3 Olivier Dony (OpenERP) <email address hidden>

> Review: Resubmit
>
> Hello,
>
> This 6.1-based branch cannot be submitted against trunk, please re-submit
> it against 6.1 if it is still relevant. (The diff is unreadable with more
> than 1.7 million lines!)
>
> Thanks!
> --
>
> https://code.launchpad.net/~rr.clearcorp/openobject-addons/6.1-account_asset/+merge/164813
> You are the owner of lp:~rr.clearcorp/openobject-addons/6.1-account_asset.
>

--
*Ronald Rubí Chacón*
*Desarrollador OpenERP*
*
*
<http://clearcorp.co.cr/>

<email address hidden> <email address hidden>
CR: +(506) 4000 CORP (4000 2677)
US: [phone]

300 m. Este de la Escuela
Calle de Platanares
11402 San Jerónimo, Moravia
San José, Costa Rica
*Ver en GoogleMaps™*<http://clearcorp.co.cr/sites/all/themes/clearcorp/maps/map-platanares.html>

http://www.clearcorp.co.cr

Unmerged revisions

7214. By Ronald Rubi on 2013-05-20

[FIX] Error correction in 'compute assets' wizard. The wizard closes all assets.

7213. By Launchpad Translations on behalf of openerp on 2013-05-18

Launchpad automatic translations update.

7212. By Launchpad Translations on behalf of openerp on 2013-05-16

Launchpad automatic translations update.

7211. By Launchpad Translations on behalf of openerp on 2013-05-15

Launchpad automatic translations update.

7210. By Launchpad Translations on behalf of openerp on 2013-05-14

Launchpad automatic translations update.

7209. By Launchpad Translations on behalf of openerp on 2013-05-13

Launchpad automatic translations update.

7208. By Launchpad Translations on behalf of openerp on 2013-05-12

Launchpad automatic translations update.

7207. By Launchpad Translations on behalf of openerp on 2013-05-06

Launchpad automatic translations update.

7206. By Launchpad Translations on behalf of openerp on 2013-04-30

Launchpad automatic translations update.

7205. By Launchpad Translations on behalf of openerp on 2013-04-27

Launchpad automatic translations update.

=== modified file 'account/account.py'
--- account/account.py	2013-04-18 10:39:07 +0000
+++ account/account.py	2013-05-20 22:05:38 +0000
@@ -1340,14 +1340,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 = {}
@@ -3390,9 +3408,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-04-22 15:34:49 +0000
+++ account/account_invoice.py	2013-05-20 22:05:38 +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
@@ -840,6 +852,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 = []
@@ -1446,6 +1460,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
@@ -1572,6 +1592,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
@@ -1584,6 +1605,24 @@
                 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}}
+
+account_invoice_line()
+>>>>>>> MERGE-SOURCE
 
 class account_invoice_tax(osv.osv):
     _name = "account.invoice.tax"

=== modified file 'account/account_move_line.py'
--- account/account_move_line.py	2013-04-22 15:34:49 +0000
+++ account/account_move_line.py	2013-05-20 22:05:38 +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):
@@ -720,6 +726,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):
@@ -729,10 +736,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(
@@ -764,8 +806,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.'))
@@ -835,10 +876,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-05-20 22:05:38 +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-04-22 15:34:49 +0000
+++ account/account_view.xml	2013-05-20 22:05:38 +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-05-20 22:05:38 +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"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} ${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;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&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;\" \\\n"
+"                 \"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&amp;no_note=1&amp;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:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<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-05-20 22:05:38 +0000
@@ -6,15 +6,32 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\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 <[e-mail]>\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"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;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&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
+"\" \\\n"
+"                 "
+"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
+"mp;no_note=1&amp;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:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<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