Merge lp:~openbias/openobject-addons/fix-949231 into lp:openobject-addons

[OpenBias]

[qdp (OpenERP) (qdp)]

i don't know what's this merge proposal, except a huge collapsing conflict. Btw, i can see that the bug is set as 'fix released', and a branch has already been pushed into stable version so i guess this MP can simply be rejected.

Anyway, thanks for the contribution
Quentin

Unmerged revisions

5116. By Jose Patricio Villarreal on 2012-03-08

[FIX] adds name field if object is not uising it

5115. By Jose Patricio Villarreal on 2012-03-08

[FIX] adds name field if its not used on the object

5114. By Launchpad Translations on behalf of openerp on 2012-03-07

Launchpad automatic translations update.

5113. By Xavier ALT on 2012-03-06

[MERGE] OPW 381524 - on picking invoicing, do not invoice scrapped products

5112. By Xavier ALT on 2012-03-06

[MERGE] OPW 18001: l10n_ch: create_date wizard was not saving file inside wizard

5111. By Xavier ALT on 2012-03-06

[MERGE] OPW 18001: do not lock-out user when payment.order is 'done', allow it to cancel it

  - When 'Payment Order' is in 'done' state, the workflow is frozen and the
    user is unable to cancel it (required in case bank refuse the payment).
    This allow to cancel the payment order except when some lines are already
    imported in a bank statement (i.e payment done bank-side: modification
    forbidden).

5110. By Xavier ALT on 2012-03-06

[MERGE] OPW 51189 - on invoice 'refund', keep original salesman and fiscal position

5109. By Xavier ALT on 2012-03-06

[MERGE] OPW 51075 - account.move.line: reconcile_partial() error msg when lines are already reconciled

5108. By Xavier ALT on 2012-03-06

[MERGE] OPW 279130 - translate errors raised inside product_id_change (sale/purchase) dep. on user lang., not partner lang.

5107. By Xavier ALT on 2012-03-06

[MERGE] OPW 382063 - account fiscal year closing: fix default date in opening entries

=== modified file 'account/account.py'
--- account/account.py	2012-02-28 14:08:16 +0000
+++ account/account.py	2012-03-08 01:34:25 +0000
@@ -284,8 +284,12 @@
         children_and_consolidated = self._get_children_and_consol(cr, uid, ids, context=context)
         #compute for each account the balance/debit/credit from the move lines
         accounts = {}
+<<<<<<< TREE
         res = {}
         null_result = dict((fn, 0.0) for fn in field_names)
+=======
+        sums = {}
+>>>>>>> MERGE-SOURCE
         if children_and_consolidated:
             aml_query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
 
@@ -321,7 +325,6 @@
             # consolidate accounts with direct children
             children_and_consolidated.reverse()
             brs = list(self.browse(cr, uid, children_and_consolidated, context=context))
-            sums = {}
             currency_obj = self.pool.get('res.currency')
             while brs:
                 current = brs.pop(0)
@@ -341,6 +344,7 @@
                             sums[current.id][fn] += sums[child.id][fn]
                         else:
                             sums[current.id][fn] += currency_obj.compute(cr, uid, child.company_id.currency_id.id, current.company_id.currency_id.id, sums[child.id][fn], context=context)
+<<<<<<< TREE
 
                 # as we have to relay on values computed before this is calculated separately than previous fields
                 if current.currency_id and current.exchange_rate and \
@@ -357,6 +361,13 @@
             for id in ids:
                 res[id] = null_result
         return res
+=======
+        res = {}
+        null_result = dict((fn, 0.0) for fn in field_names)
+        for id in ids:
+            res[id] = sums.get(id, null_result)
+        return res
+>>>>>>> MERGE-SOURCE
 
     def _get_company_currency(self, cr, uid, ids, field_name, arg, context=None):
         result = {}
@@ -490,10 +501,18 @@
             'manage this. So if you import from another software system you may have to use the rate at date. ' \
             'Incoming transactions always use the rate at date.', \
             required=True),
+<<<<<<< TREE
         'level': fields.function(_get_level, string='Level', method=True, type='integer',
              store={
                     'account.account': (_get_children_and_consol, ['level', 'parent_id'], 10),
                    }),
+=======
+        'level': fields.function(_get_level, string='Level', method=True, type='integer',
+            store={
+                'account.account': (_get_children_and_consol, ['level', 'parent_id'], 10),
+            }),
+
+>>>>>>> MERGE-SOURCE
     }
 
     _defaults = {
@@ -788,11 +807,28 @@
         return super(account_journal, self).write(cr, uid, ids, vals, context=context)
 
     def create_sequence(self, cr, uid, vals, context=None):
+<<<<<<< TREE
         """ Create new no_gap entry sequence for every new Joural
         """
         # in account.journal code is actually the prefix of the sequence
         # whereas ir.sequence code is a key to lookup global sequences.
         prefix = vals['code'].upper()
+=======
+        """
+        Create new entry sequence for every new Joural
+        """
+        seq_pool = self.pool.get('ir.sequence')
+        seq_typ_pool = self.pool.get('ir.sequence.type')
+
+        name = vals['name']
+        code = vals['code'].lower()
+
+        types = {
+            'name': name,
+            'code': code
+        }
+        seq_typ_pool.create(cr, uid, types)
+>>>>>>> MERGE-SOURCE
 
         seq = {
             'name': vals['name'],
@@ -801,9 +837,15 @@
             'padding': 4,
             'number_increment': 1
         }
+<<<<<<< TREE
         if 'company_id' in vals:
             seq['company_id'] = vals['company_id']
         return self.pool.get('ir.sequence').create(cr, uid, seq)
+=======
+        if 'company_id' in vals:
+            seq['company_id'] = vals['company_id']
+        return seq_pool.create(cr, uid, seq)
+>>>>>>> MERGE-SOURCE
 
     def create(self, cr, uid, vals, context=None):
         if not 'sequence_id' in vals or not vals['sequence_id']:
@@ -1295,10 +1337,38 @@
                     return False
         return True
 
+<<<<<<< TREE
+=======
+    def _check_period_journal(self, cursor, user, ids, context=None):
+        for move in self.browse(cursor, user, ids, context=context):
+            for line in move.line_id:
+                if line.period_id.id != move.period_id.id:
+                    return False
+                if line.journal_id.id != move.journal_id.id:
+                    return False
+        return True
+
+    def _check_date(self, cursor, user, ids, context=None):
+        for move in self.browse(cursor, user, ids, context=context):
+            if move.journal_id.allow_date:
+                if not time.strptime(move.date[:10],'%Y-%m-%d') >= time.strptime(move.period_id.date_start, '%Y-%m-%d') or not time.strptime(move.date[:10], '%Y-%m-%d') <= time.strptime(move.period_id.date_stop, '%Y-%m-%d'):
+                        return False
+        return True
+
+>>>>>>> MERGE-SOURCE
     _constraints = [
         (_check_centralisation,
             'You can not create more than one move per period on centralized journal',
             ['journal_id']),
+<<<<<<< TREE
+=======
+        (_check_period_journal,
+            'You cannot create entries on different periods/journals in the same move',
+            ['line_id']),
+        (_check_date,
+            'The date of your Journal Entry is not in the defined period!',
+            ['journal_id'])
+>>>>>>> MERGE-SOURCE
     ]
 
     def post(self, cr, uid, ids, context=None):
@@ -1410,8 +1480,7 @@
                     if not l[0]:
                         l[2]['period_id'] = default_period
                 context['period_id'] = default_period
-
-        if 'line_id' in vals:
+        if vals.get('line_id'):
             c = context.copy()
             c['novalidate'] = True
             result = super(account_move, self).create(cr, uid, vals, c)
@@ -1460,7 +1529,12 @@
 
     def _centralise(self, cr, uid, move, mode, context=None):
         assert mode in ('debit', 'credit'), 'Invalid Mode' #to prevent sql injection
-        currency_obj = self.pool.get('res.currency')
+<<<<<<< TREE
+        currency_obj = self.pool.get('res.currency')
+=======
+        currency_obj = self.pool.get('res.currency')
+        move_line_obj = self.pool.get('account.move.line')
+>>>>>>> MERGE-SOURCE
         if context is None:
             context = {}
 
@@ -1487,7 +1561,7 @@
             line_id = res[0]
         else:
             context.update({'journal_id': move.journal_id.id, 'period_id': move.period_id.id})
-            line_id = self.pool.get('account.move.line').create(cr, uid, {
+            line_id = move_line_obj.create(cr, uid, {
                 'name': _(mode.capitalize()+' Centralisation'),
                 'centralisation': mode,
                 'account_id': account_id,
@@ -1497,7 +1571,8 @@
                 'date': move.period_id.date_stop,
                 'debit': 0.0,
                 'credit': 0.0,
-            }, context)
+                'state': 'valid',
+            }, context, check=False)
 
         # find the first line of this move with the other mode
         # so that we can exclude it from our calculation
@@ -1511,6 +1586,7 @@
         cr.execute('SELECT SUM(%s) FROM account_move_line WHERE move_id=%%s AND id!=%%s' % (mode,), (move.id, line_id2))
         result = cr.fetchone()[0] or 0.0
         cr.execute('update account_move_line set '+mode2+'=%s where id=%s', (result, line_id))
+<<<<<<< TREE
 
         #adjust also the amount in currency if needed
         cr.execute("select currency_id, sum(amount_currency) as amount_currency from account_move_line where move_id = %s and currency_id is not null group by currency_id", (move.id,))
@@ -1539,20 +1615,55 @@
                         'amount_currency': amount_currency,
                     }, context)
 
+=======
+
+        #adjust also the amount in currency if needed
+        cr.execute("select currency_id, COALESCE(sum(amount_currency),0.0) as amount_currency from account_move_line where move_id = %s and currency_id is not null group by currency_id", (move.id,))
+        for row in cr.dictfetchall():
+            currency_id = currency_obj.browse(cr, uid, row['currency_id'], context=context)
+            if not currency_obj.is_zero(cr, uid, currency_id, row['amount_currency']):
+                amount_currency = row['amount_currency'] * -1
+                account_id = amount_currency > 0 and move.journal_id.default_debit_account_id.id or move.journal_id.default_credit_account_id.id
+                cr.execute('select id from account_move_line where move_id=%s and centralisation=\'currency\' and currency_id = %s limit 1', (move.id, row['currency_id']))
+                res = cr.fetchone()
+                if res:
+                    cr.execute('update account_move_line set amount_currency=%s , account_id=%s where id=%s', (amount_currency, account_id, res[0]))
+                else:
+                    context.update({'journal_id': move.journal_id.id, 'period_id': move.period_id.id})
+                    line_id = move_line_obj.create(cr, uid, {
+                        'name': _('Currency Adjustment'),
+                        'centralisation': 'currency',
+                        'account_id': account_id,
+                        'move_id': move.id,
+                        'journal_id': move.journal_id.id,
+                        'period_id': move.period_id.id,
+                        'date': move.period_id.date_stop,
+                        'debit': 0.0,
+                        'credit': 0.0,
+                        'currency_id': row['currency_id'],
+                        'amount_currency': amount_currency,
+                    }, context)
+
+>>>>>>> MERGE-SOURCE
         return True
 
     #
     # Validate a balanced move. If it is a centralised journal, create a move.
     #
     def validate(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         if context and ('__last_update' in context):
             del context['__last_update']
 
         valid_moves = [] #Maintains a list of moves which can be responsible to create analytic entries
         obj_analytic_line = self.pool.get('account.analytic.line')
         obj_move_line = self.pool.get('account.move.line')
+
         for move in self.browse(cr, uid, ids, context):
             # Unlink old analytic lines on move_lines
+            if not move.line_id and not context.get('lines_cancel'):
+                raise osv.except_osv(_('No Move Lines !'), _('Please create some move lines.'))
             for obj_line in move.line_id:
                 for obj in obj_line.analytic_lines:
                     obj_analytic_line.unlink(cr,uid,obj.id)
@@ -1720,7 +1831,8 @@
                     AND move.id = line.move_id \
                     GROUP BY line.tax_code_id',
                        (parent_ids,) + where_params)
-        res=dict(cr.fetchall())
+        res = dict(cr.fetchall())
+        res2 = {}
         obj_precision = self.pool.get('decimal.precision')
         res2 = {}
         for record in self.browse(cr, uid, ids, context=context):
@@ -2140,6 +2252,7 @@
                 cur_price_unit -= tax.amount
 
         for tax in taxes:
+            amount = 0.0
             if tax.type=='percent':
                 if tax.include_base_amount:
                     amount = cur_price_unit - (cur_price_unit / (1 + tax.amount))
@@ -3047,12 +3160,21 @@
         configured_cmp = [r[0] for r in cr.fetchall()]
         unconfigured_cmp = list(set(company_ids)-set(configured_cmp))
         for field in res['fields']:
+<<<<<<< TREE
             if field == 'company_id':
                 res['fields'][field]['domain'] = [('id','in',unconfigured_cmp)]
                 res['fields'][field]['selection'] = [('', '')]
                 if unconfigured_cmp:
                     cmp_select = [(line.id, line.name) for line in company_obj.browse(cr, uid, unconfigured_cmp)]
                     res['fields'][field]['selection'] = cmp_select
+=======
+           if field == 'company_id':
+               res['fields'][field]['domain'] = [('id','in',unconfigured_cmp)]
+               res['fields'][field]['selection'] = [('', '')]
+               if unconfigured_cmp:
+                   cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
+                   res['fields'][field]['selection'] = cmp_select
+>>>>>>> MERGE-SOURCE
         return res
 
     def check_created_journals(self, cr, uid, vals_journal, company_id, context=None):
@@ -3149,6 +3271,7 @@
                 'default_credit_account_id': _get_default_account(journal_type, 'credit'),
                 'default_debit_account_id': _get_default_account(journal_type, 'debit'),
             }
+<<<<<<< TREE
             journal_data.append(vals)
         return journal_data
 
@@ -3161,6 +3284,40 @@
         :param company_id: company_id selected from wizard.multi.charts.accounts.
         :returns: True
         """
+=======
+            acc_cash_id  = obj_acc.create(cr,uid,vals)
+
+            if obj_multi.seq_journal:
+                vals_seq={
+                    'name': _('Bank Journal ') + vals['name'],
+                    'code': 'account.journal',
+                }
+                seq_id = obj_sequence.create(cr,uid,vals_seq)
+
+            #create the bank journal
+            analitical_bank_ids = analytic_journal_obj.search(cr,uid,[('type','=','situation')])
+            analitical_journal_bank = analitical_bank_ids and analitical_bank_ids[0] or False
+
+            vals_journal = {}
+            vals_journal['name']= vals['name']
+            vals_journal['code']= _('BNK') + str(current_num)
+            vals_journal['sequence_id'] = seq_id
+            vals_journal['type'] = line.account_type == 'cash' and 'cash' or 'bank'
+            vals_journal['company_id'] =  company_id
+            vals_journal['analytic_journal_id'] = analitical_journal_bank
+
+            if line.currency_id:
+                vals_journal['view_id'] = view_id_cur
+                vals_journal['currency'] = line.currency_id.id
+            else:
+                vals_journal['view_id'] = view_id_cash
+            vals_journal['default_credit_account_id'] = acc_cash_id
+            vals_journal['default_debit_account_id'] = acc_cash_id
+            obj_journal.create(cr, uid, vals_journal)
+            current_num += 1
+
+        #create the properties
+>>>>>>> MERGE-SOURCE
         property_obj = self.pool.get('ir.property')
         field_obj = self.pool.get('ir.model.fields')
         todo_list = [
 
=== modified file 'account/account_analytic_line.py'
--- account/account_analytic_line.py	2012-02-13 18:07:41 +0000
+++ account/account_analytic_line.py	2012-03-08 01:34:25 +0000
@@ -65,13 +65,13 @@
     # property_valuation_price_type property
     def on_change_unit_amount(self, cr, uid, id, prod_id, quantity, company_id,
             unit=False, journal_id=False, context=None):
-        if context==None:
-            context={}
+        if context is None:
+            context = {}
         if not journal_id:
             j_ids = self.pool.get('account.analytic.journal').search(cr, uid, [('type','=','purchase')])
             journal_id = j_ids and j_ids[0] or False
         if not journal_id or not prod_id:
-            return {}
+            return {'value': {}}
         product_obj = self.pool.get('product.product')
         analytic_journal_obj =self.pool.get('account.analytic.journal')
         product_price_type_obj = self.pool.get('product.price.type')
 
=== modified file 'account/account_assert_test.xml'
--- account/account_assert_test.xml	2011-01-14 00:11:01 +0000
+++ account/account_assert_test.xml	2012-03-08 01:34:25 +0000
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <assert model="account.move" search="[]" string="For all Journal Items, the state is valid implies that the sum of credits equals the sum of debits">
-            <test expr="not len(line_id) or line_id[0].state != 'valid' or (sum([l.debit - l.credit for l in line_id]) &lt;= 0.00001)"/>
+            <test expr="not len(line_id) or line_id[0].state != 'valid' or abs(sum([l.debit - l.credit for l in line_id]) &lt;= 0.00001)"/>
         </assert>
     </data>
 </openerp>
 
=== modified file 'account/account_bank_statement.py'
--- account/account_bank_statement.py	2012-02-23 09:48:04 +0000
+++ account/account_bank_statement.py	2012-03-08 01:34:25 +0000
@@ -301,8 +301,8 @@
                 raise osv.except_osv(_('Error !'),
                         _('Journal item "%s" is not valid.') % line.name)
 
-        # Bank statements will not consider boolean on journal entry_posted
-        account_move_obj.post(cr, uid, [move_id], context=context)
+        if st.journal_id.entry_posted:
+            account_move_obj.post(cr, uid, [move_id], context=context)
         return move_id
 
     def get_next_st_line_number(self, cr, uid, st_number, st_line, context=None):
 
=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2012-02-28 14:08:16 +0000
+++ account/account_invoice.py	2012-03-08 01:34:25 +0000
@@ -80,8 +80,11 @@
 
     def _reconciled(self, cr, uid, ids, name, args, context=None):
         res = {}
-        for id in ids:
-            res[id] = self.test_paid(cr, uid, [id])
+        wf_service = netsvc.LocalService("workflow")
+        for inv in self.browse(cr, uid, ids, context=context):
+            res[inv.id] = self.test_paid(cr, uid, [inv.id])
+            if not res[inv.id] and inv.state == 'paid':
+                wf_service.trg_validate(uid, 'account.invoice', inv.id, 'open_test', cr)
         return res
 
     def _get_reference_type(self, cr, uid, context=None):
@@ -617,7 +620,11 @@
             'move_id':False,
             'move_name':False,
             'internal_number': False,
+<<<<<<< TREE
             'period_id': False,
+=======
+            'period_id': False
+>>>>>>> MERGE-SOURCE
         })
         if 'date_invoice' not in default:
             default.update({
@@ -1092,7 +1099,7 @@
         return map(lambda x: (0,0,x), lines)
 
     def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None):
-        invoices = self.read(cr, uid, ids, ['name', 'type', 'number', 'reference', 'comment', 'date_due', 'partner_id', 'address_contact_id', 'address_invoice_id', 'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line', 'journal_id'])
+        invoices = self.read(cr, uid, ids, ['name', 'type', 'number', 'reference', 'comment', 'date_due', 'partner_id', 'address_contact_id', 'address_invoice_id', 'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line', 'journal_id', 'user_id', 'fiscal_position'])
         obj_invoice_line = self.pool.get('account.invoice.line')
         obj_invoice_tax = self.pool.get('account.invoice.tax')
         obj_journal = self.pool.get('account.journal')
@@ -1141,7 +1148,8 @@
                 })
             # take the id part of the tuple returned for many2one fields
             for field in ('address_contact_id', 'address_invoice_id', 'partner_id',
-                    'account_id', 'currency_id', 'payment_term', 'journal_id'):
+                    'account_id', 'currency_id', 'payment_term', 'journal_id',
+                    'user_id', 'fiscal_position'):
                 invoice[field] = invoice[field] and invoice[field][0]
             # create the new invoice
             new_ids.append(self.create(cr, uid, invoice))
@@ -1331,10 +1339,14 @@
         if not partner_id:
             raise osv.except_osv(_('No Partner Defined !'),_("You must first select a partner !") )
         if not product:
+<<<<<<< TREE
             if type in ('in_invoice', 'in_refund'):
                 return {'value': {}, 'domain':{'product_uom':[]}}
             else:
                 return {'value': {'price_unit': 0.0}, 'domain':{'product_uom':[]}}
+=======
+            return {'value': {'price_unit': 0.0, 'categ_id': False}, 'domain':{'product_uom':[]}}
+>>>>>>> MERGE-SOURCE
         part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
         fpos_obj = self.pool.get('account.fiscal.position')
         fpos = fposition_id and fpos_obj.browse(cr, uid, fposition_id, context=context) or False
 
=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml	2012-02-28 14:08:16 +0000
+++ account/account_invoice_view.xml	2012-03-08 01:34:25 +0000
@@ -508,7 +508,11 @@
         <act_window
            id="act_account_journal_2_account_invoice_opened"
            name="Unpaid Invoices"
+<<<<<<< TREE
            context="{'search_default_journal_id': [active_id], 'search_default_unpaid':1, 'default_journal_id': active_id}"
+=======
+           context="{'search_default_journal_id': active_id, 'search_default_unpaid':1, 'default_journal_id': active_id}"
+>>>>>>> MERGE-SOURCE
            res_model="account.invoice"
            src_model="account.journal"/>
 
 
=== modified file 'account/account_move_line.py'
--- account/account_move_line.py	2012-02-13 18:07:41 +0000
+++ account/account_move_line.py	2012-03-08 01:34:25 +0000
@@ -228,8 +228,21 @@
         # Compute simple values
         data = super(account_move_line, self).default_get(cr, uid, fields, context=context)
         # Starts: Manual entry from account.move form
+<<<<<<< TREE
         if context.get('lines'):
             total_new = context.get('balance', 0.00)
+=======
+        if context.get('lines',[]):
+            total_new = 0.00
+            for line_record in context['lines']:
+                if not isinstance(line_record, (tuple, list)):
+                    line_record_detail = self.read(cr, uid, line_record, ['analytic_account_id','debit','credit','name','reconcile_id','tax_code_id','tax_amount','account_id','ref','currency_id','date_maturity','amount_currency','partner_id', 'reconcile_partial_id'])
+                else:
+                    line_record_detail = line_record[2]
+                total_new += (line_record_detail['debit'] or 0.00)- (line_record_detail['credit'] or 0.00)
+                for item in line_record_detail.keys():
+                    data[item] = line_record_detail[item]
+>>>>>>> MERGE-SOURCE
             if context['journal']:
                 journal_data = journal_obj.browse(cr, uid, context['journal'], context=context)
                 if journal_data.type == 'purchase':
@@ -506,8 +519,13 @@
                                 }),
         'date_created': fields.date('Creation date', select=True),
         'analytic_lines': fields.one2many('account.analytic.line', 'move_id', 'Analytic lines'),
+<<<<<<< TREE
         'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation'),('currency','Currency Adjustment')], 'Centralisation', size=8),
         'balance': fields.function(_balance, fnct_search=_balance_search, string='Balance'),
+=======
+        'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation'),('currency','Currency Adjustment')], 'Centralisation', size=8),
+        'balance': fields.function(_balance, fnct_search=_balance_search, method=True, string='Balance'),
+>>>>>>> MERGE-SOURCE
         'state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'State', readonly=True,
                                   help='When new move line is created the state will be \'Draft\'.\n* When all the payments are done it will be in \'Valid\' state.'),
         'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or a tax code account."),
@@ -553,9 +571,13 @@
         'date_created': fields.date.context_today,
         'state': 'draft',
         'currency_id': _get_currency,
+<<<<<<< TREE
         'journal_id': lambda self, cr, uid, c: c.get('journal_id', False),
         'credit': 0.0,
         'debit': 0.0,
+=======
+        'journal_id': lambda self, cr, uid, c: c.get('journal_id', c.get('journal',False)),
+>>>>>>> MERGE-SOURCE
         'account_id': lambda self, cr, uid, c: c.get('account_id', False),
         'period_id': lambda self, cr, uid, c: c.get('period_id', False),
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.move.line', context=c)
@@ -592,6 +614,13 @@
             if l.company_id != l.account_id.company_id or l.company_id != l.period_id.company_id:
                 return False
         return True
+    
+    def _check_date(self, cr, uid, ids, context=None):
+        for line in self.browse(cr, uid, ids, context=context):
+            if line.journal_id.allow_date:
+                if not time.strptime(line.date[:10],'%Y-%m-%d') >= time.strptime(line.period_id.date_start, '%Y-%m-%d') or not time.strptime(line.date[:10], '%Y-%m-%d') <= time.strptime(line.period_id.date_stop, '%Y-%m-%d'):
+                    return False
+        return True
 
     def _check_date(self, cr, uid, ids, context=None):
         for l in self.browse(cr, uid, ids, context=context):
@@ -608,11 +637,18 @@
         return True
 
     _constraints = [
+<<<<<<< TREE
         (_check_no_view, 'You can not create journal items on an account of type view.', ['account_id']),
         (_check_no_closed, 'You can not create journal items on closed account.', ['account_id']),
         (_check_company_id, 'Company must be the same for its related account and period.', ['company_id']),
         (_check_date, 'The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal.', ['date']),
         (_check_currency, 'The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal.', ['currency_id']),
+=======
+        (_check_no_view, 'You can not create move line on view account.', ['account_id']),
+        (_check_no_closed, 'You can not create move line on closed account.', ['account_id']),
+        (_check_company_id, 'Company must be same for its related account and period.',['company_id'] ),
+        (_check_date, 'The date of your Journal Entry is not in the defined period!', ['date']),
+>>>>>>> MERGE-SOURCE
     ]
 
     #TODO: ONCHANGE_ACCOUNT_ID: set account_tax_id
@@ -700,6 +736,12 @@
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
         if context is None:
             context = {}
+        if context and context.get('fiscalyear', False):
+            periods = self.pool.get('account.fiscalyear').browse(cr, uid, context.get('fiscalyear'), context=context).period_ids
+            period_ids = [period.id for period in periods]
+            args.append(('period_id', 'in', period_ids))
+        if context and context.get('periods', False):
+            args.append(('period_id', 'in', context.get('periods')))
         if context and context.get('next_partner_only', False):
             if not context.get('partner_id', False):
                 partner = self.get_next_partner_only(cr, uid, offset, context)
@@ -751,7 +793,7 @@
             else:
                 currency_id = line.company_id.currency_id
             if line.reconcile_id:
-                raise osv.except_osv(_('Warning'), _('Already Reconciled!'))
+                raise osv.except_osv(_('Warning'), _("Journal Item '%s' (id: %s), Move '%s' is already reconciled!") % (line.name, line.id, line.move_id.name))
             if line.reconcile_partial_id:
                 for line2 in line.reconcile_partial_id.line_partial_ids:
                     if not line2.reconcile_id:
@@ -828,7 +870,7 @@
             raise osv.except_osv(_('Error'), _('Some entries are already reconciled !'))
 
         if (not currency_obj.is_zero(cr, uid, account.company_id.currency_id, writeoff)) or \
-           (account.currency_id and (not currency_obj.is_zero(cr, uid, account.currency_id, currency))):
+           (not context.get('fy_closing', False) and account.currency_id and (not currency_obj.is_zero(cr, uid, account.currency_id, currency))):
             if not writeoff_acc_id:
                 raise osv.except_osv(_('Warning'), _('You have to provide an account for the write off/exchange difference entry !'))
             if writeoff > 0:
@@ -1044,8 +1086,12 @@
                 f.set('context', "{'journal_id': journal_id}")
 
             elif field == 'account_id' and journal.id:
+<<<<<<< TREE
                 f.set('domain', "[('journal_id', '=', journal_id),('type','!=','view'), ('type','!=','closed')]")
                 f.set('on_change', 'onchange_account_id(account_id, partner_id)')
+=======
+                attrs.append('domain="[(\'journal_id\', \'=\', journal_id),(\'type\',\'&lt;&gt;\',\'view\'), (\'type\',\'&lt;&gt;\',\'closed\')]" on_change="onchange_account_id(account_id, partner_id)"')
+>>>>>>> MERGE-SOURCE
 
             elif field == 'partner_id':
                 f.set('on_change', 'onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)')
@@ -1127,9 +1173,15 @@
             context['journal_id'] = line.journal_id.id
             context['period_id'] = line.period_id.id
             result = super(account_move_line, self).unlink(cr, uid, [line.id], context=context)
+<<<<<<< TREE
         move_ids = list(move_ids)
         if check and move_ids:
             move_obj.validate(cr, uid, move_ids, context=context)
+=======
+            if check:
+                context.update({'lines_cancel': 'cancel'})
+                move_obj.validate(cr, uid, [line.move_id.id], context=context)
+>>>>>>> MERGE-SOURCE
         return result
 
     def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
 
=== modified file 'account/account_report.xml'
--- account/account_report.xml	2012-02-03 14:53:20 +0000
+++ account/account_report.xml	2012-03-08 01:34:25 +0000
@@ -48,5 +48,21 @@
             auto="False"
             menu="False"/>
 
+        <report id="account_balance_sheet"
+            string="Balance Sheet"
+            model="account.account"
+            name="account.balancesheet"
+            rml="account/report/account_balance_sheet.rml"
+            auto="False"
+            menu="False"/>
+
+        <report id="account_balance_sheet_horizontal"
+            string="Balance Sheet Horizontal"
+            model="account.account"
+            name="account.balancesheet.horizontal"
+            rml="account/report/account_balance_sheet_horizontal.rml"
+            auto="False"
+            menu="False"/>
+
     </data>
 </openerp>
 
=== modified file 'account/account_view.xml'
--- account/account_view.xml	2012-02-22 11:53:32 +0000
+++ account/account_view.xml	2012-03-08 01:34:25 +0000
@@ -229,7 +229,7 @@
             <field name="name">account.account.list</field>
             <field name="model">account.account</field>
             <field name="type">tree</field>
-            <field name="field_parent">child_id</field>
+            <field name="priority" eval="1"/>
             <field name="arch" type="xml">
                 <tree colors="blue:type == 'view';black:type in ('other','receivable','payable','consolidation');gray:type == 'closed'" string="Chart of accounts" toolbar="1" >
                     <field name="code"/>
@@ -464,7 +464,7 @@
                             <group col="2" colspan="2">
                                 <group colspan="2" col="2">
                                     <separator string="Accounts" colspan="4"/>
-                                    <field name="default_debit_account_id" attrs="{'required':[('type','in', ('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                                    <field name="default_debit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                                     <field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                                 </group>
                                 <group colspan="2" col="2">
@@ -634,7 +634,23 @@
                             </field>
                         </page>
                         <page string="Journal Entries" name="move_live_ids">
-                            <field colspan="4" name="move_line_ids" nolabel="1"/>
+                            <field colspan="4" name="move_line_ids" nolabel="1" mode="tree,form">
+                            	<tree string="Journal Items" editable="top" on_write="on_create_write">
+									<field name="move_id"/>
+									<field name="ref"/>
+									<field name="date"/>
+									<field name="period_id"/>
+									<field name="partner_id" on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"/>
+									<field name="account_id"/>
+									<field name="name"/>
+									<field name="journal_id" invisible="1"/>
+									<field name="debit" sum="Total debit"/>
+									<field name="credit" sum="Total credit"/>
+									<field name="reconcile_partial_id" groups="base.group_extended"/>
+									<field name="reconcile_id"/>
+									<field name="state"/>
+								</tree>
+                            </field>
                         </page>
                     </notebook>
                     <group col="8" colspan="4">
@@ -1356,10 +1372,14 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Journal Items">
+<<<<<<< TREE
                             <field name="balance" invisible="1"/>
                             <field colspan="4" name="line_id" nolabel="1" height="250" widget="one2many_list" 
                             on_change="onchange_line_id(line_id)"
                             context="{'balance': balance , 'journal': journal_id }">
+=======
+                            <field colspan="4" name="line_id" nolabel="1" height="250" widget="one2many_list" default_get="{'lines':line_id , 'journal':journal_id, 'period_id':period_id}">
+>>>>>>> MERGE-SOURCE
                                 <form string="Journal Item">
                                     <group col="6" colspan="4">
                                         <field name="name"/>
@@ -2041,6 +2061,7 @@
            res_model="account.move.line"
            src_model="account.journal"/>
 
+<<<<<<< TREE
         <act_window
             context="{'search_default_reconcile_id':False, 'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
             domain="[('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]"
@@ -2049,6 +2070,9 @@
             res_model="account.move.line"
             src_model="res.partner"
             groups="base.group_extended"/>
+=======
+        <act_window context="{'search_default_reconcile_id':False, 'search_default_partner_id':[active_id], 'default_partner_id': active_id}" domain="[('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]" id="act_account_partner_account_move_all" name="Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner" groups="base.group_extended"/>
+>>>>>>> MERGE-SOURCE
 
         <act_window context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}" id="act_account_partner_account_move" name="Journal Items" res_model="account.move.line" src_model="res.partner" groups="account.group_account_user"/>
 
 
=== modified file 'account/board_account_view.xml'
--- account/board_account_view.xml	2011-12-19 16:54:40 +0000
+++ account/board_account_view.xml	2012-03-08 01:34:25 +0000
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+<<<<<<< TREE
+=======
+
+    	<record id="note_account_type" model="board.note.type">
+            <field name="name">Accountants</field>
+        </record>
+
+>>>>>>> MERGE-SOURCE
         <record id="action_aged_receivable" model="ir.actions.act_window">
             <field name="name">Receivable Accounts</field>
             <field name="res_model">report.account.receivable</field>
@@ -15,6 +23,7 @@
             <field name="view_mode">graph,tree</field>
             <field name="domain">[('type','=','income')]</field>
         </record>
+<<<<<<< TREE
       <record id="action_company_analysis_tree" model="ir.actions.act_window">
           <field name="name">Company Analysis</field>
           <field name="res_model">account.entries.report</field>
@@ -33,12 +42,46 @@
           <field name="context">{'default_type': 'liquidity'}</field>
           <field name="view_id" ref="account.view_treasory_graph"/>
       </record>
+=======
+      	
+      	<record id="action_company_analysis_tree" model="ir.actions.act_window">
+        	<field name="name">Company Analysis</field>
+			<field name="res_model">account.entries.report</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,graph</field>
+			<field name="context">{'group_by':['user_type'], 'group_by_no_leaf':1}</field>
+			<field name="view_id" ref="account.view_account_entries_report_tree"/>
+			<field name="domain">[('year','=',time.strftime('%Y'))]</field>
+		</record>
+		
+		<record id="action_treasory_graph" model="ir.actions.act_window">
+			<field name="name">Treasury</field>
+			<field name="res_model">account.account</field>
+  			<field name="view_type">form</field>
+			<field name="view_mode">graph,tree</field>
+			<field name="domain">[('type','=','liquidity')]</field>
+			<field name="view_id" ref="account.view_treasory_graph"/>
+		</record>
+
+		<record id="action_draft_customer_invoices_dashboard" model="ir.actions.act_window">
+			<field name="name">Customer Invoices to Approve</field>
+			<field name="res_model">account.invoice</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,form,calendar,graph</field>
+			<field eval="False" name="view_id"/>
+			<field name="domain">[('state','=','draft'),('type','=','out_invoice')]</field>
+			<field name="context">{'type':'out_invoice', 'journal_type': 'sale'}</field>
+			<field name="search_view_id" ref="account.view_account_invoice_filter"/>
+		</record>
+        
+>>>>>>> MERGE-SOURCE
         <record id="board_account_form" model="ir.ui.view">
             <field name="name">board.account.form</field>
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Board">
+<<<<<<< TREE
                     <board style="2-1">
                         <column>
                             <action name="%(account.action_invoice_tree1)d" creatable="true" string="Draft Customer Invoices" domain="[('state','in',('draft','proforma2')), ('type','=','out_invoice')]"/>
@@ -48,6 +91,19 @@
                             <action name="%(action_treasory_graph)d" string="Treasury"/> <!--groups="account.group_account_manager,account.group_account_user"-->
                         </column>
                     </board>
+=======
+                    <hpaned>
+                        <child1>
+                            <action colspan="4" height="160" width="400" name="%(action_draft_customer_invoices_dashboard)d" string="Customer Invoices to Approve" />
+                            <action colspan="4" height="160" width="400" name="%(action_company_analysis_tree)d" string="Company Analysis" groups="account.group_account_manager"/>
+                        </child1>
+                        <child2>
+                            <action colspan="4" height="220" name="%(action_treasory_graph)d" string="Treasury" groups="account.group_account_manager,account.group_account_user"/>
+                            <action colspan="4" height="220" name="%(action_aged_receivable)d" string="Aged Receivables" groups="account.group_account_manager,account.group_account_user"/>
+                            <!--  <action colspan="4" height="220" name="%(action_aged_income)d" string="Aged income"/> -->
+                        </child2>
+                    </hpaned>
+>>>>>>> MERGE-SOURCE
                 </form>
             </field>
         </record>
 
=== modified file 'account/configurable_account_chart.xml'
--- account/configurable_account_chart.xml	2011-12-30 11:06:04 +0000
+++ account/configurable_account_chart.xml	2012-03-08 01:34:25 +0000
@@ -30,10 +30,24 @@
         <record model="account.account.type" id="conf_account_type_equity">
           <field name="name">Equity</field>
           <field name="code">equity</field>
+<<<<<<< TREE
           <field name="close_method">balance</field>
           <field name="report_type">liability</field>
         </record>
         <record model="account.account.type" id="conf_account_type_chk">
+=======
+          <field name="report_type">liability</field>
+          <field name="close_method">balance</field>
+        </record>
+
+         <record model="account.account.type" id="conf_account_type_bnk">
+          <field name="name">Bank</field>
+          <field name="code">bank</field>
+          <field name="report_type">asset</field>
+          <field name="close_method">balance</field>
+        </record>
+         <record model="account.account.type" id="conf_account_type_chk">
+>>>>>>> MERGE-SOURCE
           <field name="name">Check</field>
           <field name="code">check</field>
           <field name="close_method">balance</field>
 
=== modified file 'account/demo/account_minimal.xml'
--- account/demo/account_minimal.xml	2011-12-19 16:54:40 +0000
+++ account/demo/account_minimal.xml	2012-03-08 01:34:25 +0000
@@ -8,8 +8,19 @@
         <record id="account_type_cash_equity" model="account.account.type">
             <field name="name">Equity</field>
             <field name="code">equity</field>
-            <field name="close_method">balance</field>
-            <field name="report_type">liability</field>
+<<<<<<< TREE
+            <field name="close_method">balance</field>
+            <field name="report_type">liability</field>
+=======
+            <field name="report_type">liability</field>
+            <field name="close_method">balance</field>
+        </record>
+        <record id="account_type_cash_moves" model="account.account.type">
+            <field name="name">Cash</field>
+            <field name="code">cash</field>
+            <field name="report_type">asset</field>
+            <field name="close_method">balance</field>
+>>>>>>> MERGE-SOURCE
         </record>
 
         <!--
 
=== modified file 'account/i18n/account.pot'
--- account/i18n/account.pot	2012-02-08 01:08:30 +0000
+++ account/i18n/account.pot	2012-03-08 01:34:25 +0000
@@ -4,10 +4,17 @@
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 6.1rc1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2012-02-08 00:35+0000\n"
+=======
+"Project-Id-Version: OpenERP Server 6.0.2\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2011-05-09 10:18+0000\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -32,8 +39,14 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: help:account.tax.code,sequence:0
 msgid "Determine the display order in the report 'Accounting \\ Reporting \\ Generic Reporting \\ Taxes \\ Taxes Report'"
+=======
+#: code:addons/account/account.py:516
+#, python-format
+msgid "You cannot remove/deactivate an account which is set as a property to any Partner."
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -60,6 +73,15 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:793
+#, python-format
+msgid "Please define sequence on invoice journal"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: constraint:account.period:0
 msgid "Error ! The duration of the Period(s) is/are invalid. "
 msgstr ""
@@ -106,8 +128,19 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: constraint:account.journal:0
 msgid "Configuration error! The currency chosen should be shared by the default accounts too."
+=======
+#: report:account.tax.code.entries:0
+msgid "Accounting Entries-"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1305
+#, python-format
+msgid "You can not delete posted movement: \"%s\"!"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -146,7 +179,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_invoice.py:1428
+=======
+#: code:addons/account/invoice.py:1436
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -201,6 +238,16 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:915
+#, python-format
+msgid "No period defined for this date: %s !\n"
+"Please create a fiscal year."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
 msgstr ""
@@ -212,7 +259,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_invoice.py:1241
+=======
+#: code:addons/account/invoice.py:1224
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -228,7 +279,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_move_line.py:1200
+=======
+#: code:addons/account/account_move_line.py:1182
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -271,7 +326,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_invoice.py:551
+=======
+#: code:addons/account/invoice.py:532
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -503,9 +562,15 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 msgid "Counterpart"
+=======
+#: code:addons/account/account_cash_statement.py:349
+#, python-format
+msgid "CashBox Balance is not matching with Calculated Balance !"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -593,7 +658,12 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:3116
+=======
+#: code:addons/account/account.py:2823
+#: code:addons/account/installer.py:434
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -620,8 +690,13 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_move_line.py:750
 #: code:addons/account/account_move_line.py:803
+=======
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -697,12 +772,16 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: field:account.invoice.refund,filter_refund:0
 msgid "Refund Method"
 msgstr ""
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:38
+=======
+#: code:addons/account/wizard/account_change_currency.py:38
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
 msgstr ""
@@ -823,8 +902,14 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: field:account.cashbox.line,pieces:0
 msgid "Values"
+=======
+#: code:addons/account/account_move_line.py:1197
+#, python-format
+msgid "You can not do this modification on a confirmed entry ! Please note that you can just change some non important fields !"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -847,6 +932,7 @@
 
 #. module: account
 #: report:account.overdue:0
+#: report:account.aged_trial_balance:0
 msgid "Due"
 msgstr ""
 
@@ -951,15 +1037,28 @@
 #: field:account.journal,code:0
 #: report:account.partner.balance:0
 #: field:account.period,code:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
 msgid "Code"
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:2268
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
 #: code:addons/account/account_invoice.py:688
 #: code:addons/account/account_move_line.py:173
+=======
+#: code:addons/account/account.py:2097
+#: code:addons/account/account_bank_statement.py:350
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:73
+#: code:addons/account/invoice.py:678
+#: code:addons/account/wizard/account_use_model.py:81
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "No Analytic Journal !"
 msgstr ""
@@ -1161,14 +1260,23 @@
 
 #. module: account
 #: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.tax.code.entries:0
+>>>>>>> MERGE-SOURCE
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Entry Label"
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:1129
+=======
+#: code:addons/account/account.py:990
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1316,6 +1424,7 @@
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_22
+#: report:account.aged_trial_balance:0
 msgid "Partners"
 msgstr ""
 
@@ -1339,6 +1448,15 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1277
+#, python-format
+msgid "You can not use this general account in this journal !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
 #: selection:account.partner.balance,display_partner:0
@@ -1420,6 +1538,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 #: selection:account.bank.statement,state:0
@@ -1428,6 +1547,28 @@
 #: selection:account.fiscalyear,state:0
 #: selection:account.period,state:0
 msgid "Closed"
+=======
+#: view:account.payment.term.line:0
+msgid "Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:823
+#, python-format
+msgid "Cannot create the invoice !\n"
+"The payment term defined gives a computed amount greater than the total invoiced amount."
+msgstr ""
+
+#. module: account
+#: field:account.installer.modules,account_anglo_saxon:0
+msgid "Anglo-Saxon Accounting"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -1584,12 +1725,15 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_invoice.py:1429
 #, python-format
 msgid "You selected an Unit of Measure which is not compatible with the product."
 msgstr ""
 
 #. module: account
+=======
+>>>>>>> MERGE-SOURCE
 #: view:account.change.currency:0
 msgid "This wizard will change the currency of the invoice"
 msgstr ""
@@ -1600,6 +1744,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.analytic.account:0
 msgid "Pending Accounts"
 msgstr ""
@@ -1607,6 +1752,21 @@
 #. module: account
 #: view:account.tax.template:0
 msgid "Tax Declaration"
+=======
+#: constraint:account.fiscalyear:0
+msgid "Error! You cannot define overlapping fiscal years"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:799
+#, python-format
+msgid "The account is not defined to be reconciled !"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,pieces:0
+msgid "Values"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -1625,6 +1785,15 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:806
+#, python-format
+msgid "You have to provide an account for the write off entry !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: model:ir.model,name:account.model_account_common_journal_report
 msgid "Account Common Journal Report"
 msgstr ""
@@ -1651,7 +1820,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_cash_statement.py:292
+=======
+#: code:addons/account/account_cash_statement.py:329
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -1672,14 +1845,32 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:509
+#, python-format
+msgid "You cannot deactivate an account that contains account moves."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.move.line.reconcile,credit:0
 msgid "Credit amount"
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:407
 #: code:addons/account/account.py:412
 #: code:addons/account/account.py:429
+=======
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:529
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1830,6 +2021,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: constraint:account.move.line:0
 msgid "The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal."
 msgstr ""
@@ -1840,6 +2032,8 @@
 msgstr ""
 
 #. module: account
+=======
+>>>>>>> MERGE-SOURCE
 #: view:account.invoice:0
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
@@ -1954,7 +2148,17 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:1461
+=======
+#: code:addons/account/installer.py:348
+#, python-format
+msgid " Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1333
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "There is no default default debit account defined \n"
 "on journal \"%s\""
@@ -2014,7 +2218,12 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:3119
+=======
+#: code:addons/account/account.py:2888
+#: code:addons/account/installer.py:498
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2033,7 +2242,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_invoice.py:370
+=======
+#: code:addons/account/invoice.py:351
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2104,6 +2317,11 @@
 #: field:accounting.report,fiscalyear_id:0
 #: field:accounting.report,fiscalyear_id_cmp:0
 #: model:ir.model,name:account.model_account_fiscalyear
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
 msgid "Fiscal Year"
 msgstr ""
 
@@ -2231,7 +2449,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_invoice.py:572
+=======
+#: code:addons/account/invoice.py:552
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Can't find any account journal of %s type for this company.\n"
 "\n"
@@ -2305,7 +2527,12 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:3117
+=======
+#: code:addons/account/account.py:2840
+#: code:addons/account/installer.py:454
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2389,7 +2616,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_invoice.py:369
+=======
+#: code:addons/account/invoice.py:350
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2405,6 +2636,15 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:654
+#, python-format
+msgid "You cannot modify company of this journal as its related record exist in Entry Lines"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: report:account.journal.period.print:0
 #: report:account.journal.period.print.sale.purchase:0
 msgid "Label"
@@ -2435,7 +2675,12 @@
 
 #. module: account
 #: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
 #: report:account.overdue:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -2557,15 +2802,27 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:1321
+=======
+#: code:addons/account/account.py:1195
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:2268
 #: code:addons/account/account_invoice.py:688
 #: code:addons/account/account_move_line.py:173
+=======
+#: code:addons/account/account.py:2097
+#: code:addons/account/account_bank_statement.py:350
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
+#: code:addons/account/wizard/account_use_model.py:81
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
@@ -2616,6 +2873,14 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: selection:account.print.journal,sort_selection:0
+msgid "Reference Number"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
 #: selection:analytic.entries.report,month:0
@@ -2708,7 +2973,23 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_invoice.py:735
+=======
+#: help:account.partner.ledger,initial_balance:0
+#: help:account.report.general.ledger,initial_balance:0
+msgid "It adds initial balance row on report which display previous sum amount of debit/credit/balance"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+msgid "Analytic Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:836
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Tax base different!\n"
 "Click on compute to update the tax base."
@@ -2847,8 +3128,13 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:3363
 #: code:addons/account/account_bank.py:90
+=======
+#: code:addons/account/account.py:2950
+#: code:addons/account/installer.py:296
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "BNK"
 msgstr ""
@@ -2942,12 +3228,21 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
 #, python-format
 msgid "No End of year journal defined for the fiscal year"
 msgstr ""
 
 #. module: account
+=======
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+#, python-format
+msgid "No End of year journal defined for the fiscal year"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Keep empty to use the expense account"
@@ -2965,8 +3260,12 @@
 #: field:account.common.report,journal_ids:0
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids:0
+<<<<<<< TREE
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+>>>>>>> MERGE-SOURCE
 #: view:account.journal.period:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,journal_ids:0
@@ -3033,7 +3332,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_invoice.py:1332
+=======
+#: code:addons/account/invoice.py:1298
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3066,10 +3369,29 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: model:ir.actions.act_window,name:account.action_account_unreconcile
 #: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
 #: model:ir.actions.act_window,name:account.action_account_unreconcile_select
 msgid "Unreconcile Entries"
+=======
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.invoice:0
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_configuration_installer
+msgid "Accounting Chart Configuration"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -3108,21 +3430,48 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:product.product:0
 msgid "Purchase Taxes"
 msgstr ""
 
 #. module: account
+=======
+>>>>>>> MERGE-SOURCE
 #: view:validate.account.move.lines:0
 msgid "All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore."
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:373
+#, python-format
+msgid "Cannot delete invoice(s) that are already opened or paid !"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance.landscape:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: model:ir.actions.report.xml,name:account.account_transfers
 msgid "Transfers"
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.chart:0
 msgid "Account charts"
 msgstr ""
@@ -3156,6 +3505,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.invoice.line:0
 msgid "Quantity :"
 msgstr ""
@@ -3168,6 +3518,22 @@
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
 msgid "Print Sale/Purchase Journal"
+=======
+#: code:addons/account/account.py:532
+#, python-format
+msgid "You cannot change the type of account from '%s' to '%s' type as it contains account entries!"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+msgid "Counterpart"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Invoicing Data"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -3329,19 +3695,36 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:2280
+=======
+#: code:addons/account/account.py:2109
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!\n"
 "Please define partner on it!"
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_move_line.py:837
+=======
+#: code:addons/account/account_move_line.py:801
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:1218
+#, python-format
+msgid "You cannot validate a Journal Entry unless all journal items are in same chart of accounts !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.tax:0
 msgid "Account Tax"
 msgstr ""
@@ -3445,7 +3828,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_move_line.py:1153
+=======
+#: code:addons/account/account_move_line.py:1134
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3456,8 +3843,20 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Create a draft Refund"
+=======
+#: code:addons/account/invoice.py:1437
+#, python-format
+msgid "You selected an Unit of Measure which is not compatible with the product."
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:476
+#, python-format
+msgid "The Payment Term of Supplier does not have Payment Term Lines(Computation) defined !"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -3791,6 +4190,15 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:722
+#, python-format
+msgid "Global taxes defined, but are not in invoice lines !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.entries.report,month:0
 #: view:account.invoice.report:0
 #: field:account.invoice.report,month:0
@@ -3857,7 +4265,16 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_analytic_line.py:93
+=======
+#: help:account.move,state:0
+msgid "All manually created new journal entry are usually in the state 'Unposted', but you can set the option to skip that state on the related journal. In that case, they will be behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in 'Posted' state."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:90
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4028,8 +4445,20 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
+=======
+#: code:addons/account/account.py:2081
+#: code:addons/account/wizard/account_use_model.py:69
+#, python-format
+msgid "Unable to find a valid period !"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Voucher No"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -4081,6 +4510,13 @@
 msgstr ""
 
 #. module: account
+#: constraint:account.account:0
+#: constraint:account.account.template:0
+msgid "Configuration Error! \n"
+"You cannot define children to an account with internal type different of \"View\"! "
+msgstr ""
+
+#. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
 msgid "Account Analytic Cost Ledger For Journal Report"
 msgstr ""
@@ -4108,8 +4544,24 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: selection:account.journal,type:0
 msgid "Bank and Cheques"
+=======
+#: code:addons/account/account.py:1304
+#: code:addons/account/account.py:1332
+#: code:addons/account/account.py:1339
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/invoice.py:904
+#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_fiscalyear_close.py:78
+#: code:addons/account/wizard/account_fiscalyear_close.py:81
+#: code:addons/account/wizard/account_move_journal.py:165
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:55
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:57
+#, python-format
+msgid "UserError"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -4143,6 +4595,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.payment.term.line:0
 msgid "Example"
 msgstr ""
@@ -4167,6 +4620,14 @@
 msgstr ""
 
 #. module: account
+=======
+#: constraint:account.account:0
+#: constraint:account.tax.code:0
+msgid "Error ! You can not create recursive accounts."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.subscription.generate:0
 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
 #: model:ir.ui.menu,name:account.menu_generate_subscription
@@ -4205,7 +4666,17 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:1567
+=======
+#: code:addons/account/invoice.py:73
+#, python-format
+msgid "You must define an analytic journal of type '%s' !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1411
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
@@ -4237,8 +4708,19 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: model:ir.ui.menu,name:account.menu_finance_configuration
 msgid "Configuration"
+=======
+#: report:account.account.balance.landscape:0
+msgid "Account Balance -"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -4285,6 +4767,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.invoice:0
 msgid "My invoices"
 msgstr ""
@@ -4292,6 +4775,12 @@
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
 msgid "Check"
+=======
+#: code:addons/account/invoice.py:812
+#, python-format
+msgid "Please verify the price of the invoice !\n"
+"The real total does not match the computed total."
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -4412,6 +4901,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:1088
 #: code:addons/account/account.py:1090
 #: code:addons/account/account.py:1321
@@ -4434,6 +4924,20 @@
 #: code:addons/account/wizard/account_report_common.py:150
 #, python-format
 msgid "Error"
+=======
+#: selection:account.account.type,report_type:0
+msgid "Balance Sheet (Assets Accounts)"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Third Party (Country)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid "With Supplier Refunds you can manage the credit notes you receive from your suppliers. A refund is a document that credits an invoice completely or partially. You can easily generate refunds and reconcile them directly from the invoice form."
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -4451,8 +4955,14 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: model:ir.actions.act_window,help:account.action_account_partner_balance
 msgid "This report is analysis by partner. It is a PDF report containing one line per partner representing the cumulative credit balance."
+=======
+#: code:addons/account/invoice.py:728
+#, python-format
+msgid "Taxes missing !"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -4528,7 +5038,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:1351
+=======
+#: code:addons/account/account.py:1224
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "You can not modify a posted entry of this journal !\n"
 "You should set the journal to allow cancelling entries if you want to do that."
@@ -4550,7 +5064,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:1090
+=======
+#: code:addons/account/account.py:954
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4593,7 +5111,15 @@
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 #: field:account.vat.declaration,target_move:0
+<<<<<<< TREE
 #: field:accounting.report,target_move:0
+=======
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
+>>>>>>> MERGE-SOURCE
 msgid "Target Moves"
 msgstr ""
 
@@ -4681,7 +5207,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:1307
+=======
+#: code:addons/account/account.py:1181
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4713,8 +5243,16 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
 #: model:ir.ui.menu,name:account.menu_account_report_bs
+=======
+#: view:account.bs.report:0
+#: model:ir.actions.act_window,name:account.action_account_bs_report
+#: model:ir.ui.menu,name:account.menu_account_bs_report
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+>>>>>>> MERGE-SOURCE
 msgid "Balance Sheet"
 msgstr ""
 
@@ -4812,8 +5350,15 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
 msgid "Template Tax Fiscal Position"
+=======
+#: code:addons/account/account.py:2081
+#: code:addons/account/wizard/account_use_model.py:69
+#, python-format
+msgid "No period found !"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -4884,8 +5429,16 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.payment.term.line:0
 msgid "Amount Computation"
+=======
+#: code:addons/account/account.py:2940
+#: code:addons/account/installer.py:283
+#: code:addons/account/installer.py:295
+#, python-format
+msgid "Bank Journal "
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -4909,6 +5462,15 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1199
+#, python-format
+msgid "You can not do this modification on a reconciled entry ! Please note that you can just change some non important fields !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: model:ir.model,name:account.model_account_common_account_report
 msgid "Account Common Account Report"
 msgstr ""
@@ -4966,6 +5528,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:3446
 #: code:addons/account/account_bank_statement.py:338
 #: code:addons/account/account_invoice.py:427
@@ -4973,6 +5536,15 @@
 #: code:addons/account/account_invoice.py:542
 #: code:addons/account/account_invoice.py:550
 #: code:addons/account/account_invoice.py:572
+=======
+#: code:addons/account/account_bank_statement.py:331
+#: code:addons/account/invoice.py:408
+#: code:addons/account/invoice.py:508
+#: code:addons/account/invoice.py:523
+#: code:addons/account/invoice.py:531
+#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:1361
+>>>>>>> MERGE-SOURCE
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5038,12 +5610,32 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.invoice.report:0
 msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
 #: field:account.analytic.line,amount_currency:0
+=======
+#: help:account.account.type,report_type:0
+msgid "According value related accounts will be display on respective reports (Balance Sheet Profit & Loss Account)"
+msgstr ""
+
+#. module: account
+#: field:account.report.general.ledger,sortby:0
+msgid "Sort By"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1340
+#, python-format
+msgid "There is no default default credit account defined \n"
+"on journal \"%s\""
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5195,7 +5787,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_move_line.py:759
+=======
+#: code:addons/account/account_move_line.py:729
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5235,7 +5831,11 @@
 
 #. module: account
 #: view:account.move.line.reconcile:0
+<<<<<<< TREE
 #: code:addons/account/account_move_line.py:857
+=======
+#: code:addons/account/account_move_line.py:821
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5367,6 +5967,15 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/wizard/account_change_currency.py:59
+#, python-format
+msgid "New currency is not confirured properly !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.aged.trial.balance,filter:0
 #: field:account.balance.report,filter:0
 #: field:account.central.journal,filter:0
@@ -5386,6 +5995,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:2256
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
@@ -5399,12 +6009,20 @@
 #. module: account
 #: code:addons/account/account_move_line.py:1155
 #: code:addons/account/account_move_line.py:1238
+=======
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_move_line.py:830
+=======
+#: code:addons/account/account_move_line.py:794
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Entries are not of the same account or already reconciled ! "
 msgstr ""
@@ -5439,9 +6057,19 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_bank_statement.py:402
 #: code:addons/account/account_invoice.py:392
 #: code:addons/account/wizard/account_period_close.py:51
+=======
+#: selection:account.automatic.reconcile,power:0
+msgid "7"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:391
+#: code:addons/account/invoice.py:373
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -5588,6 +6216,15 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "is validated."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.chart.template:0
 #: field:account.chart.template,account_root_id:0
 msgid "Root Account"
@@ -5657,6 +6294,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.invoice.report:0
 msgid "Open and Paid Invoices"
 msgstr ""
@@ -5668,6 +6306,9 @@
 
 #. module: account
 #: code:addons/account/account.py:629
+=======
+#: code:addons/account/account.py:546
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "You can not remove/desactivate an account which is set on a customer or supplier."
 msgstr ""
@@ -5889,7 +6530,13 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:664
+=======
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "You cannot change the owner company of an account that already contains journal items."
 msgstr ""
@@ -6044,6 +6691,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:624
 #, python-format
 msgid "You can not remove an account containing journal items."
@@ -6052,6 +6700,10 @@
 #. module: account
 #: code:addons/account/account_analytic_line.py:145
 #: code:addons/account/account_move_line.py:933
+=======
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6062,12 +6714,16 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: help:res.partner.bank,currency_id:0
 msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
 #: code:addons/account/account.py:1563
+=======
+#: code:addons/account/account.py:1407
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6102,7 +6758,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_move_line.py:808
+=======
+#: code:addons/account/account_move_line.py:772
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6161,6 +6821,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
@@ -6186,6 +6847,33 @@
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
+=======
+#: code:addons/account/account.py:509
+#: code:addons/account/account.py:511
+#: code:addons/account/account.py:836
+#: code:addons/account/account.py:915
+#: code:addons/account/account.py:990
+#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2357
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
+#: code:addons/account/account_bank_statement.py:292
+#: code:addons/account/account_bank_statement.py:305
+#: code:addons/account/account_bank_statement.py:345
+#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1197
+#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:1014
+#: code:addons/account/wizard/account_invoice_refund.py:100
+#: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+>>>>>>> MERGE-SOURCE
 #: code:addons/account/wizard/account_use_model.py:44
 #, python-format
 msgid "Error !"
@@ -6262,6 +6950,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_move_line.py:1218
 #, python-format
 msgid "You can not do this modification on a reconciled entry! You can just change some non legal fields or you must unreconcile first!\n"
@@ -6277,6 +6966,13 @@
 msgstr ""
 
 #. module: account
+=======
+#: report:account.general.ledger_landscape:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.partner.balance:0
 #: view:account.partner.ledger:0
 msgid "This report is an analysis done by a partner. It is a PDF report containing one line per partner representing the cumulative credit balance"
@@ -6322,9 +7018,13 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.bank.statement:0
 #: code:addons/account/account.py:420
 #: code:addons/account/account.py:432
+=======
+#: code:addons/account/wizard/account_change_currency.py:64
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -6396,11 +7096,17 @@
 #: report:account.journal.period.print:0
 #: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
 msgid "Total:"
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:2229
+=======
+#: code:addons/account/account.py:2064
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "You can specify year, month and date in the name of the model using the following labels:\n"
 "\n"
@@ -6428,6 +7134,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.tax.template:0
 msgid "Taxes used in Sales"
 msgstr ""
@@ -6435,6 +7142,10 @@
 #. module: account
 #: code:addons/account/account_invoice.py:495
 #: code:addons/account/wizard/account_invoice_refund.py:145
+=======
+#: code:addons/account/invoice.py:476
+#: code:addons/account/wizard/account_invoice_refund.py:137
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Data Insufficient !"
 msgstr ""
@@ -6569,6 +7280,15 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:524
+#, python-format
+msgid "Can not find account chart for this company in invoice line account, Please Create account."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.tax.template:0
 msgid "Account Tax Template"
 msgstr ""
@@ -6720,7 +7440,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:1088
+=======
+#: code:addons/account/account.py:952
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -6834,6 +7558,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/wizard/account_fiscalyear_close.py:73
 #, python-format
 msgid "The periods to generate opening entries were not found"
@@ -6848,6 +7573,26 @@
 #: code:addons/account/account.py:3121
 #, python-format
 msgid "OPEJ"
+=======
+#: code:addons/account/account_cash_statement.py:250
+#, python-format
+msgid "You can not have two open register for the same journal"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  day of the month= -1"
+msgstr ""
+
+#. module: account
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: account
+#: help:account.journal,type:0
+msgid "Select 'Sale' for Sale journal to be used at the time of making invoice. Select 'Purchase' for Purchase Journal to be used at the time of approving purchase order. Select 'Cash' to be used at the time of making payment. Select 'General' for miscellaneous operations. Select 'Opening/Closing Situation' to be used at the time of new fiscal year creation or end of year entries generation."
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -6857,10 +7602,20 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: selection:account.entries.report,move_line_state:0
 #: view:account.move.line:0
 #: selection:account.move.line,state:0
 msgid "Unbalanced"
+=======
+#: help:account.installer.modules,account_followup:0
+msgid "Helps you generate reminder letters for unpaid invoices, including multiple levels of reminding and customized per-partner policies."
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  value amount: n.a"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -6880,9 +7635,19 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/wizard/account_fiscalyear_close.py:84
 #, python-format
 msgid "The journal must have default credit and debit account"
+=======
+#: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
+#: view:account.journal:0
+#: field:account.journal,user_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,user_id:0
+msgid "User"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -6901,6 +7666,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: model:ir.ui.menu,name:account.menu_multi_currency
 msgid "Multi-Currencies"
 msgstr ""
@@ -6912,12 +7678,20 @@
 
 #. module: account
 #: code:addons/account/account_move_line.py:1302
+=======
+#: code:addons/account/account_move_line.py:1277
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:3108
+=======
+#: code:addons/account/account.py:2821
+#: code:addons/account/installer.py:432
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -6934,7 +7708,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_move_line.py:1277
+=======
+#: code:addons/account/account_move_line.py:1252
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7220,6 +7998,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:629
 #: code:addons/account/account.py:642
 #: code:addons/account/account.py:645
@@ -7232,6 +8011,19 @@
 #: code:addons/account/account_move_line.py:97
 #: code:addons/account/account_move_line.py:750
 #: code:addons/account/account_move_line.py:803
+=======
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
+#: code:addons/account/account.py:532
+#: code:addons/account/account.py:546
+#: code:addons/account/account.py:654
+#: code:addons/account/account.py:941
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:728
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7295,7 +8087,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_invoice.py:810
+=======
+#: code:addons/account/invoice.py:795
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7360,7 +8156,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_invoice.py:379
+=======
+#: code:addons/account/invoice.py:360
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7417,7 +8217,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_invoice.py:1332
+=======
+#: code:addons/account/invoice.py:1298
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7476,7 +8280,12 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:3111
+=======
+#: code:addons/account/account.py:2885
+#: code:addons/account/installer.py:495
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7614,6 +8423,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: field:account.aged.trial.balance,chart_account_id:0
 #: field:account.balance.report,chart_account_id:0
 #: field:account.central.journal,chart_account_id:0
@@ -7628,6 +8438,17 @@
 #: field:account.report.general.ledger,chart_account_id:0
 #: field:account.vat.declaration,chart_account_id:0
 #: field:accounting.report,chart_account_id:0
+=======
+#: report:account.general.ledger:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
+>>>>>>> MERGE-SOURCE
 msgid "Chart of Account"
 msgstr ""
 
@@ -7701,8 +8522,19 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.payment.term.line:0
 msgid "  Value amount: n.a"
+=======
+#: code:addons/account/invoice.py:905
+#, python-format
+msgid "Cannot create invoice move on centralised journal"
+msgstr ""
+
+#. module: account
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -7744,9 +8576,17 @@
 #: report:account.account.balance:0
 #: report:account.central.journal:0
 #: report:account.general.journal:0
+<<<<<<< TREE
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+>>>>>>> MERGE-SOURCE
 #: report:account.partner.balance:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
 msgid "Filter By"
 msgstr ""
 
@@ -7797,7 +8637,12 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:3109
+=======
+#: code:addons/account/account.py:2838
+#: code:addons/account/installer.py:452
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -7971,9 +8816,16 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: model:account.account.type,name:account.data_account_type_expense
 #: model:account.financial.report,name:account.account_financial_report_expense0
 msgid "Expense"
+=======
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
+#, python-format
+msgid "Bad account!"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -7982,7 +8834,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_move_line.py:1105
+=======
+#: code:addons/account/account_move_line.py:1062
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8189,12 +9045,26 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:3110
+=======
+#: code:addons/account/account.py:2861
+#: code:addons/account/installer.py:476
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:941
+#, python-format
+msgid "You cannot modify company of this period as its related record exist in Entry Lines"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.move:0
 #: view:account.move.line:0
 #: view:account.payment.term:0
@@ -8236,7 +9106,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_invoice.py:810
+=======
+#: code:addons/account/invoice.py:795
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8252,7 +9126,12 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:3118
+=======
+#: code:addons/account/account.py:2864
+#: code:addons/account/installer.py:479
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8297,7 +9176,12 @@
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
 #: report:account.partner.balance:0
 #: field:account.partner.balance,period_from:0
 #: field:account.partner.ledger,period_from:0
@@ -8313,7 +9197,17 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:2357
+#, python-format
+msgid "Cannot locate parent code for template account!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8344,6 +9238,15 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:1014
+#, python-format
+msgid "You cannot cancel the Invoice which is Partially Paid! You need to unreconcile concerned payment entries!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: report:account.overdue:0
 msgid "Best regards."
 msgstr ""
@@ -8364,13 +9267,44 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: field:account.account.type,report_type:0
 msgid "P&L / BS Category"
-msgstr ""
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree4
-msgid "With Supplier Refunds you can manage the credit notes you receive from your suppliers. A refund is a document that credits an invoice completely or partially. You can easily generate refunds and reconcile them directly from the invoice form."
+=======
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:70
+#, python-format
+msgid "Current currency is not confirured properly !"
+>>>>>>> MERGE-SOURCE
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:952
+#: code:addons/account/account.py:954
+#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1411
+#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:120
+#: code:addons/account/wizard/account_report_common.py:126
+#, python-format
+msgid "Error"
 msgstr ""
 
 #. module: account
@@ -8379,10 +9313,21 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree
 msgid "Bank Statements"
+=======
+#: selection:account.account.type,report_type:0
+msgid "Profit & Loss (Income Accounts)"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -8396,8 +9341,12 @@
 #: field:account.entries.report,balance:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
+<<<<<<< TREE
 #: report:account.general.ledger_landscape:0
 #: field:account.invoice,residual:0
+=======
+#: report:account.general.ledger_landscape:0
+>>>>>>> MERGE-SOURCE
 #: field:account.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
@@ -8408,6 +9357,10 @@
 #: field:account.treasury.report,balance:0
 #: field:report.account.receivable,balance:0
 #: field:report.aged.receivable,balance:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
 msgid "Balance"
 msgstr ""
 
@@ -8418,7 +9371,15 @@
 
 #. module: account
 #: report:account.account.balance:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+>>>>>>> MERGE-SOURCE
 msgid "Display Account"
 msgstr ""
 
@@ -8480,6 +9441,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: report:account.general.ledger:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
@@ -8502,7 +9468,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_move_line.py:1153
+=======
+#: code:addons/account/account_move_line.py:1134
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -8616,7 +9586,12 @@
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
 #: report:account.partner.balance:0
 #: field:account.partner.balance,period_to:0
 #: field:account.partner.ledger,period_to:0
@@ -8652,8 +9627,15 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: report:account.overdue:0
 msgid "Maturity date"
+=======
+#: code:addons/account/invoice.py:725
+#, python-format
+msgid "Tax base different !\n"
+"Click on compute to update tax base"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -8686,8 +9668,12 @@
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 #: field:account.vat.declaration,date_from:0
+<<<<<<< TREE
 #: field:accounting.report,date_from:0
 #: field:accounting.report,date_from_cmp:0
+=======
+#: report:account.aged_trial_balance:0
+>>>>>>> MERGE-SOURCE
 msgid "Start Date"
 msgstr ""
 
@@ -8711,7 +9697,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_invoice.py:828
+=======
+#: code:addons/account/invoice.py:812
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -8758,17 +9748,32 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:accounting.report:0
 msgid "Comparison"
 msgstr ""
 
 #. module: account
 #: code:addons/account/account_invoice.py:372
+=======
+#: code:addons/account/invoice.py:353
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Unknown Error"
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:1181
+#, python-format
+msgid "You cannot validate a non-balanced entry !\n"
+"Make sure you have configured Payment Term properly !\n"
+"It should contain atleast one Payment Term Line with type \"Balance\" !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: help:res.partner,property_account_payable:0
 msgid "This account will be used instead of the default one as the payable account for the current partner"
 msgstr ""
@@ -8820,6 +9825,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: selection:account.account.type,report_type:0
 #: code:addons/account/account.py:181
 #, python-format
@@ -8830,6 +9836,11 @@
 #: constraint:account.account:0
 msgid "Configuration Error! \n"
 "You can not select an account type with a deferral method different of \"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
+=======
+#: view:account.general.journal:0
+#: model:ir.ui.menu,name:account.menu_account_general_journal
+msgid "General Journals"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -9092,7 +10103,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_analytic_line.py:102
+=======
+#: code:addons/account/account_analytic_line.py:99
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9137,6 +10152,7 @@
 #: field:report.account.sales,amount_total:0
 #: field:report.account_type.sales,amount_total:0
 #: field:report.invoice.created,amount_total:0
+#: report:account.aged_trial_balance:0
 msgid "Total"
 msgstr ""
 
@@ -9257,8 +10273,21 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
+=======
+#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:806
+#: code:addons/account/wizard/account_invoice_state.py:44
+#: code:addons/account/wizard/account_invoice_state.py:68
+#: code:addons/account/wizard/account_report_balance_sheet.py:70
+#: code:addons/account/wizard/account_state_open.py:37
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#: code:addons/account/wizard/account_validate_account_move.py:61
+#, python-format
+msgid "Warning"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -9268,6 +10297,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Your Chart of Accounts from a Chart Template"
 msgstr ""
@@ -9281,6 +10311,16 @@
 #: view:account.automatic.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Write-Off Move"
+=======
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -9348,16 +10388,20 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: selection:account.print.journal,sort_selection:0
 msgid "Journal Entry Number"
 msgstr ""
 
 #. module: account
+=======
+>>>>>>> MERGE-SOURCE
 #: view:account.subscription:0
 msgid "Recurring"
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:642
 #, python-format
 msgid "You cannot change the type of account from 'Closed' to any other type which contains journal items!"
@@ -9365,6 +10409,9 @@
 
 #. module: account
 #: code:addons/account/account_move_line.py:832
+=======
+#: code:addons/account/account_move_line.py:796
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9385,6 +10432,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a purchase journal."
 msgstr ""
@@ -9392,6 +10440,13 @@
 #. module: account
 #: help:account.account,type:0
 msgid "The 'Internal Type' is used for features available on different types of accounts: view can not have journal items, consolidation are accounts that can have children accounts for multi-company consolidations, payable/receivable are for partners accounts (for debit/credit computations), closed for depreciated accounts."
+=======
+#: code:addons/account/account_move_line.py:1252
+#, python-format
+msgid "Can not create an automatic sequence for this piece !\n"
+"\n"
+"Put a sequence in the journal definition for automatic numbering or create a sequence manually for this piece."
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -9527,7 +10582,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_invoice.py:364
+=======
+#: code:addons/account/invoice.py:345
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -9552,6 +10611,15 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1123
+#, python-format
+msgid "The date of your Journal Entry is not in the defined period!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.subscription,period_total:0
 msgid "Number of Periods"
 msgstr ""
@@ -9711,6 +10779,7 @@
 #: field:account.partner.ledger,result_selection:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: report:account.aged_trial_balance:0
 msgid "Partner's"
 msgstr ""
 
@@ -9817,6 +10886,15 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:511
+#, python-format
+msgid "You cannot remove an account which has account entries!. "
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: model:ir.actions.act_window,help:account.action_account_form
 msgid "Create and manage the accounts you need to record journal entries. An account is part of a ledger allowing your company to register all kinds of debit and credit transactions. Companies present their annual accounts in two main parts: the balance sheet and the income statement (profit and loss account). The annual accounts of a company are required by law to disclose a certain amount of information. They have to be certified by an external auditor annually."
 msgstr ""
@@ -9826,3 +10904,48 @@
 msgid "The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."
 msgstr ""
 
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+msgid "Liabilities"
+msgstr ""
+
+#. module: account
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+msgid "Balance:"
+msgstr ""
+
+#. module: account
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+msgid "Particular"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Aged Trial Balance"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Period Length(days)"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Account Total"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
+msgid "Not due"
+msgstr ""
 
=== modified file 'account/i18n/ar.po'
--- account/i18n/ar.po	2012-02-29 11:07:30 +0000
+++ account/i18n/ar.po	2012-03-08 01:34:25 +0000
@@ -6,13 +6,20 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2012-02-13 13:33+0000\n"
 "Last-Translator: kifcaliph <Unknown>\n"
+=======
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2012-02-27 19:08+0000\n"
+"Last-Translator: amani ali <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-02-14 05:43+0000\n"
 "X-Generator: Launchpad (build 14781)\n"
 
@@ -21,6 +28,10 @@
 #: view:analytic.entries.report:0
 msgid "last month"
 msgstr "الشهر الماضي"
+=======
+"X-Launchpad-Export-Date: 2012-02-28 06:07+0000\n"
+"X-Generator: Launchpad (build 14874)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -30,6 +41,7 @@
 #. module: account
 #: view:account.journal:0
 msgid "Other Configuration"
+<<<<<<< TREE
 msgstr "إعدادات أخرى"
 
 #. module: account
@@ -40,9 +52,31 @@
 msgstr ""
 
 #. module: account
+=======
+msgstr "إعدادات أخرى"
+
+#. module: account
+#: code:addons/account/account.py:506
+#, python-format
+msgid ""
+"You cannot remove/deactivate an account which is set as a property to any "
+"Partner."
+msgstr "لايمكن الغاء/تعطيل حساب معد كخاص بأي طرف."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
-msgstr "تسوية اليومية"
+<<<<<<< TREE
+msgstr "تسوية اليومية"
+=======
+msgstr "تسوية اليومية"
+
+#. module: account
+#: field:account.installer.modules,account_voucher:0
+msgid "Voucher Management"
+msgstr "إدارة القسائم"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.account:0
@@ -53,16 +87,28 @@
 msgstr "إحصائيات الحساب"
 
 #. module: account
+<<<<<<< TREE
 #: view:account.invoice:0
 msgid "Proforma/Open/Paid Invoices"
 msgstr ""
 
 #. module: account
+=======
+>>>>>>> MERGE-SOURCE
 #: field:report.invoice.created,residual:0
 msgid "Residual"
 msgstr "متبقي"
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:805
+#, python-format
+msgid "Please define sequence on invoice journal"
+msgstr "يرجى تحديد تسلسل على الفاتورة"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: constraint:account.period:0
 msgid "Error ! The duration of the Period(s) is/are invalid. "
 msgstr "خظأ! إن مدة الفترة أو الفترات غير صالحة "
@@ -75,6 +121,7 @@
 #. module: account
 #: view:account.tax:0
 msgid "Children Definition"
+<<<<<<< TREE
 msgstr "تعريف فروع"
 
 #. module: account
@@ -82,11 +129,31 @@
 #, python-format
 msgid "Journal item \"%s\" is not valid."
 msgstr "عنصر يومية غير صحيح \"%s\"."
+=======
+msgstr "تعريف فروع"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr "فترة المقبوضات حتى اليوم"
+<<<<<<< TREE
+msgstr "فترة المقبوضات حتى اليوم"
+=======
+msgstr "فترة المقبوضات حتى اليوم"
+
+#. module: account
+#: field:account.partner.ledger,reconcil:0
+msgid "Include Reconciled Entries"
+msgstr "إضافة السجلات المسواه"
+
+#. module: account
+#: view:account.pl.report:0
+msgid ""
+"The Profit and Loss report gives you an overview of your company profit and "
+"loss in a single document"
+msgstr ""
+"تقرير المكسب و الخسارة يعطيك فكرة عامة عن مكسب و خسارة شركتك في ملف واحد"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
@@ -109,6 +176,7 @@
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disabled"
 msgstr ""
+<<<<<<< TREE
 "إذا كنت توافق على المعاملات ، يجب عليك أيضا التحقق من كافة الإجراءات التي "
 "ترتبط بتلك المعاملات لأنه لن يكونوا غير مفعّلين"
 
@@ -118,6 +186,21 @@
 "Configuration error! The currency chosen should be shared by the default "
 "accounts too."
 msgstr ""
+=======
+"إذا كنت توافق على المعاملات ، يجب عليك أيضا التحقق من كافة الإجراءات التي "
+"ترتبط بتلك المعاملات لأنه لن يكونوا غير مفعّلين"
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Accounting Entries-"
+msgstr "المدخلات المحاسبية -"
+
+#. module: account
+#: code:addons/account/account.py:1291
+#, python-format
+msgid "You can not delete posted movement: \"%s\"!"
+msgstr "لا يمكنك حذف حركة تم ترحيلها: \"%s\"!"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: report:account.invoice:0
@@ -216,12 +299,38 @@
 #. module: account
 #: model:ir.model,name:account.model_account_tax
 msgid "account.tax"
-msgstr "account.tax"
+<<<<<<< TREE
+msgstr "account.tax"
+=======
+msgstr "account.tax"
+
+#. module: account
+#: code:addons/account/account.py:901
+#, python-format
+msgid ""
+"No period defined for this date: %s !\n"
+"Please create a fiscal year."
+msgstr ""
+"لا توجد مدة معرّفة لهذا التاريخ: %s\n"
+"يرجى إنشاء سنة مالية."
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
-msgstr "انقل السطر و اختر الموازنة"
+<<<<<<< TREE
+msgstr "انقل السطر و اختر الموازنة"
+=======
+msgstr "انقل السطر و اختر الموازنة"
+
+#. module: account
+#: help:account.model.line,sequence:0
+msgid ""
+"The sequence field is used to order the resources from lower sequences to "
+"higher ones"
+msgstr ""
+"يستخدم حقل التسلسل بترتيب الموارد من التسلسل الأقل الى التسلسل الأعلى."
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: help:account.tax.code,notprintable:0
@@ -253,6 +362,7 @@
 #: code:addons/account/account_move_line.py:1200
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
+<<<<<<< TREE
 msgstr "لايمكن اضافة/تعديل البيانات في سجل مقفل"
 
 #. module: account
@@ -267,6 +377,14 @@
 #: report:account.overdue:0
 msgid "Sub-Total :"
 msgstr "جزئي:"
+=======
+msgstr "لايمكن اضافة/تعديل البيانات في سجل مقفل"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Calculated Balance"
+msgstr "الرصيد الحسابي"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
@@ -338,6 +456,7 @@
 #: view:product.product:0
 #: view:product.template:0
 msgid "Purchase Properties"
+<<<<<<< TREE
 msgstr "خصائص الشراء"
 
 #. module: account
@@ -347,6 +466,9 @@
 "leave the automatic formatting, it will be computed based on the financial "
 "reports hierarchy (auto-computed field 'level')."
 msgstr ""
+=======
+msgstr "خصائص الشراء"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.installer:0
@@ -369,6 +491,7 @@
 "OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
 "Cash Registers, or Customer/Supplier payments."
 msgstr ""
+<<<<<<< TREE
 "طريقة العرض هذه يتم استخدامها بواسطة المحاسبين لإدخال مجموعة بيانات دفعة "
 "واحدة. أما بنود الدفتر يتم إنشاءها في حالة استخدام كشف حساف، تسجيل نقدية أو "
 "مدفوعات مورد/عميل."
@@ -377,6 +500,11 @@
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
 msgstr ""
+=======
+"طريقة العرض هذه يتم استخدامها بواسطة المحاسبين لإدخال مجموعة بيانات دفعة "
+"واحدة. أما بنود الدفتر يتم إنشاءها في حالة استخدام كشف حساف، تسجيل نقدية أو "
+"مدفوعات مورد/عميل."
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
@@ -447,12 +575,16 @@
 #. module: account
 #: help:account.model.line,amount_currency:0
 msgid "The amount expressed in an optional other currency."
+<<<<<<< TREE
 msgstr "أعرب الكمية بعملات اخرى اختيارية."
 
 #. module: account
 #: field:accounting.report,enable_filter:0
 msgid "Enable Comparison"
 msgstr "إتاحة المقارنة"
+=======
+msgstr "أعرب الكمية بعملات اخرى اختيارية."
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: help:account.journal.period,state:0
@@ -541,9 +673,15 @@
 msgstr "اختر مخططات الحسابات"
 
 #. module: account
+<<<<<<< TREE
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
 msgstr ""
+=======
+#: view:product.product:0
+msgid "Purchase Taxes"
+msgstr "ضرائب الشراء"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
@@ -561,10 +699,17 @@
 msgstr "حركات لم تسوى"
 
 #. module: account
+<<<<<<< TREE
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 msgid "Counterpart"
 msgstr "نظير"
+=======
+#: code:addons/account/account_cash_statement.py:348
+#, python-format
+msgid "CashBox Balance is not matching with Calculated Balance !"
+msgstr "رصيد النقدية لايساوي الرصيد الحسابي"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -620,6 +765,7 @@
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
+<<<<<<< TREE
 msgstr "المتواليات"
 
 #. module: account
@@ -627,6 +773,9 @@
 #: selection:account.financial.report,type:0
 msgid "Report Value"
 msgstr "قيمة التقرير"
+=======
+msgstr "المتواليات"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -641,6 +790,7 @@
 #. module: account
 #: sql_constraint:account.sequence.fiscalyear:0
 msgid "Main Sequence must be different from current !"
+<<<<<<< TREE
 msgstr "المسلسل الرئيسي لابد أن يختلف من الحالي !"
 
 #. module: account
@@ -648,6 +798,9 @@
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
+=======
+msgstr "المسلسل الرئيسي لابد أن يختلف من الحالي !"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
@@ -658,7 +811,16 @@
 #: code:addons/account/account.py:3116
 #, python-format
 msgid "SAJ"
-msgstr "شباب العمال الاشتراكي."
+<<<<<<< TREE
+msgstr "شباب العمال الاشتراكي."
+=======
+msgstr "شباب العمال الاشتراكي."
+
+#. module: account
+#: help:account.bank.statement,balance_end_real:0
+msgid "closing balance entered by the cashbox verifier"
+msgstr "رصيد الإغلاق من محقق النقدية"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.period:0
@@ -698,6 +860,7 @@
 #: model:ir.actions.act_window,name:account.action_aged_receivable
 #, python-format
 msgid "Receivable Accounts"
+<<<<<<< TREE
 msgstr "حسابات مدينة"
 
 #. module: account
@@ -706,6 +869,9 @@
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
 msgstr ""
+=======
+msgstr "حسابات مدينة"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:ir.model,name:account.model_account_report_general_ledger
@@ -723,24 +889,41 @@
 msgstr "هل أنت متأكد من إنشاء القيد؟"
 
 #. module: account
+<<<<<<< TREE
 #: view:account.invoice:0
 msgid "Print Invoice"
 msgstr "طباعة الفاتورة"
+=======
+#: selection:account.bank.accounts.wizard,account_type:0
+msgid "Check"
+msgstr "تأكيد"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: field:account.partner.reconcile.process,today_reconciled:0
 msgid "Partners Reconciled Today"
+<<<<<<< TREE
 msgstr "شركاء تم تسويتهم اليوم"
 
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Sale journal in this year"
 msgstr ""
+=======
+msgstr "شركاء تم تسويتهم اليوم"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
+<<<<<<< TREE
 #: selection:account.financial.report,display_detail:0
 msgid "Display children with hierarchy"
 msgstr ""
+=======
+#: code:addons/account/account_bank_statement.py:306
+#, python-format
+msgid "The statement balance is incorrect !\n"
+msgstr "رصيد الكشف خاطئ !\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -758,23 +941,31 @@
 #: model:ir.model,name:account.model_project_account_analytic_line
 #, python-format
 msgid "Analytic Entries by line"
+<<<<<<< TREE
 msgstr "قيود تحليلية في سطور"
 
 #. module: account
 #: field:account.invoice.refund,filter_refund:0
 msgid "Refund Method"
 msgstr ""
+=======
+msgstr "قيود تحليلية في سطور"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:38
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
+<<<<<<< TREE
 msgstr "يمكن تغيير العملة في مسودة الفتورة"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
+=======
+msgstr "يمكن تغيير العملة في مسودة الفتورة"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.analytic.journal:0
@@ -789,6 +980,7 @@
 #: field:account.move.reconcile,type:0
 #: field:report.invoice.created,type:0
 msgid "Type"
+<<<<<<< TREE
 msgstr "نوع"
 
 #. module: account
@@ -798,6 +990,9 @@
 "Taxes are missing!\n"
 "Click on compute button."
 msgstr ""
+=======
+msgstr "نوع"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
@@ -807,12 +1002,16 @@
 #. module: account
 #: help:account.invoice,reference:0
 msgid "The partner reference of this invoice."
+<<<<<<< TREE
 msgstr "مرجع الشريك لهذه الفاتورة"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Supplier Invoices And Refunds"
 msgstr ""
+=======
+msgstr "مرجع الشريك لهذه الفاتورة"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
@@ -820,12 +1019,16 @@
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
+<<<<<<< TREE
 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 ""
+=======
+msgstr "عكس التسوية"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
@@ -835,11 +1038,21 @@
 #. module: account
 #: model:ir.model,name:account.model_account_automatic_reconcile
 msgid "Automatic Reconcile"
-msgstr "تسوية آلية"
+<<<<<<< TREE
+msgstr "تسوية آلية"
+=======
+msgstr "تسوية آلية"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Due date Computation"
+msgstr "تاريخ استحقاق الحساب"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "J.C./Move name"
+<<<<<<< TREE
 msgstr "نقل اسم/ j.c."
 
 #. module: account
@@ -850,6 +1063,9 @@
 "or Loss you'd realized if those transactions were ended today. Only for "
 "accounts having a secondary currency set."
 msgstr ""
+=======
+msgstr "نقل اسم/ j.c."
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -889,6 +1105,7 @@
 #. module: account
 #: view:account.payment.term:0
 msgid "Computation"
+<<<<<<< TREE
 msgstr "أحسب/حساب"
 
 #. module: account
@@ -900,6 +1117,22 @@
 #: field:account.cashbox.line,pieces:0
 msgid "Values"
 msgstr "قيم"
+=======
+msgstr "أحسب/حساب"
+
+#. module: account
+#: view:account.move.line:0
+msgid "Next Partner to reconcile"
+msgstr "الشريك التالي للموازنة"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1191
+#, python-format
+msgid ""
+"You can not do this modification on a confirmed entry ! Please note that you "
+"can just change some non important fields !"
+msgstr "لا يمكنك التعديلات لقيد مؤكد ! يمكنك تحرير بعض الحقول غير المهمة فقط"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.invoice.report:0
@@ -922,6 +1155,7 @@
 #. module: account
 #: report:account.overdue:0
 msgid "Due"
+<<<<<<< TREE
 msgstr "مستحق"
 
 #. module: account
@@ -931,14 +1165,24 @@
 "You cannot validate this journal entry because account \"%s\" does not "
 "belong to chart of accounts \"%s\"!"
 msgstr ""
+=======
+msgstr "مستحق"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_move_line.py:835
 #, python-format
 msgid ""
 "This account does not allow reconciliation! You should update the account "
 "definition to change this."
 msgstr ""
+=======
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_total_tax:0
+msgid "Total With Tax"
+msgstr "إجمالي مع الضرائب"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.invoice:0
@@ -960,6 +1204,7 @@
 #: selection:account.account.template,type:0
 #: selection:account.entries.report,type:0
 msgid "Consolidation"
+<<<<<<< TREE
 msgstr "تجميع"
 
 #. module: account
@@ -970,6 +1215,11 @@
 msgstr "الخصوم"
 
 #. module: account
+=======
+msgstr "تجميع"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.entries.report:0
 msgid "Extended Filters..."
 msgstr "مرشحات مفصلة..."
@@ -1001,6 +1251,7 @@
 "amount.If the tax account is base tax code, this field will contain the "
 "basic amount(without tax)."
 msgstr ""
+<<<<<<< TREE
 "إذا كان حساب الضريبة هو حساب رمز الضريبة، فهذا الحقل سيحتوي علي قيمة "
 "الضريبة. إذا كان حساب الضريبة رمز الضريبة الرئيسي، فهذا الحقل سيحتوي علي "
 "المبلغ الرئيسي (دون الضريبة)."
@@ -1010,6 +1261,11 @@
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
+=======
+"إذا كان حساب الضريبة هو حساب رمز الضريبة، فهذا الحقل سيحتوي علي قيمة "
+"الضريبة. إذا كان حساب الضريبة رمز الضريبة الرئيسي، فهذا الحقل سيحتوي علي "
+"المبلغ الرئيسي (دون الضريبة)."
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.analytic.line:0
@@ -1076,6 +1332,7 @@
 #. module: account
 #: field:account.report.general.ledger,landscape:0
 msgid "Landscape Mode"
+<<<<<<< TREE
 msgstr "وضع أفقي"
 
 #. module: account
@@ -1090,6 +1347,14 @@
 #: field:account.report.general.ledger,sortby:0
 msgid "Sort by"
 msgstr "ترتيب حسب"
+=======
+msgstr "وضع أفقي"
+
+#. module: account
+#: view:board.board:0
+msgid "Customer Invoices to Approve"
+msgstr "فاتورة الزبون للموافقة"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: help:account.fiscalyear.close,fy_id:0
@@ -1102,6 +1367,7 @@
 "These types are defined according to your country. The type contains more "
 "information about the account and its specificities."
 msgstr ""
+<<<<<<< TREE
 "وتعرف هذه الأنواع طبقًا لبلدك. النوع يحتوي على مزيد من المعلومات عن الحساب "
 "وخصوصياتها."
 
@@ -1111,6 +1377,10 @@
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
 msgstr ""
+=======
+"وتعرف هذه الأنواع طبقًا لبلدك. النوع يحتوي على مزيد من المعلومات عن الحساب "
+"وخصوصياتها."
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.tax:0
@@ -1126,7 +1396,16 @@
 #: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
 #: model:ir.ui.menu,name:account.journal_cash_move_lines
 msgid "Cash Registers"
-msgstr "سجلات النقدية"
+<<<<<<< TREE
+msgstr "سجلات النقدية"
+=======
+msgstr "سجلات النقدية"
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "Profit & Loss (Expense Accounts)"
+msgstr "الربح و الخسارة (حسابات النفقة)"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -1144,12 +1423,16 @@
 #. module: account
 #: view:account.subscription.generate:0
 msgid "Generate Entries before:"
+<<<<<<< TREE
 msgstr "تكوين المدخلات قبل:"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Unbalanced Journal Items"
 msgstr ""
+=======
+msgstr "تكوين المدخلات قبل:"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
@@ -1167,6 +1450,7 @@
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement"
+<<<<<<< TREE
 msgstr "تأكيد الكشف"
 
 #. module: account
@@ -1175,6 +1459,9 @@
 "Total amount (in Secondary currency) for transactions held in secondary "
 "currency for this account."
 msgstr ""
+=======
+msgstr "تأكيد الكشف"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
@@ -1185,12 +1472,16 @@
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Credit Centralisation"
+<<<<<<< TREE
 msgstr "مركزية الدين"
 
 #. module: account
 #: view:report.account_type.sales:0
 msgid "All Months Sales by type"
 msgstr ""
+=======
+msgstr "مركزية الدين"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree2
@@ -1200,6 +1491,7 @@
 "purchase orders or receipts. This way, you can control the invoice from your "
 "supplier according to what you purchased or received."
 msgstr ""
+<<<<<<< TREE
 "يمكنك مع المزود ان اتدخل وتدير الفواتير المصدرة من مزوداتك. يمكن انتاج "
 "فواتير مسودة بفتح erp تلقائيًا من اوامر المشترى او الاستلامات. بتلك الطريقة, "
 "يمكنك التحكم في الفاتورة من مزودك طبقًا لما اشتريته او استقبلته."
@@ -1209,21 +1501,36 @@
 #: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
 msgid "Tax Code Templates"
 msgstr "قوالب رمز الضريبة"
+=======
+"يمكنك مع المزود ان اتدخل وتدير الفواتير المصدرة من مزوداتك. يمكن انتاج "
+"فواتير مسودة بفتح erp تلقائيًا من اوامر المشترى او الاستلامات. بتلك الطريقة, "
+"يمكنك التحكم في الفاتورة من مزودك طبقًا لما اشتريته او استقبلته."
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.invoice.cancel:0
 msgid "Cancel Invoices"
+<<<<<<< TREE
 msgstr "الغاء الفواتير"
 
 #. module: account
 #: help:account.journal,code:0
 msgid "The code will be displayed on reports."
 msgstr ""
+=======
+msgstr "الغاء الفواتير"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
+<<<<<<< TREE
 #: view:account.tax.template:0
 msgid "Taxes used in Purchases"
 msgstr ""
+=======
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconciliation transactions"
+msgstr "إلغاء تسوية المعاملات"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: field:account.invoice.tax,tax_code_id:0
@@ -1236,16 +1543,21 @@
 #. module: account
 #: field:account.account,currency_mode:0
 msgid "Outgoing Currencies Rate"
+<<<<<<< TREE
 msgstr "معدل العملات الصادرة"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
 msgid "Situation"
 msgstr "الحالة"
+=======
+msgstr "معدل العملات الصادرة"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: help:account.move.line,move_id:0
 msgid "The move of this entry line."
+<<<<<<< TREE
 msgstr "الحركة لخط هذا القيد"
 
 #. module: account
@@ -1255,6 +1567,9 @@
 "You can not use this general account in this journal, check the tab 'Entry "
 "Controls' on the related journal !"
 msgstr ""
+=======
+msgstr "الحركة لخط هذا القيد"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: field:account.move.line.reconcile,trans_nbr:0
@@ -1285,12 +1600,16 @@
 #: view:account.analytic.line:0
 #: view:account.journal:0
 msgid "Others"
+<<<<<<< TREE
 msgstr "أخرى"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Draft Subscription"
 msgstr ""
+=======
+msgstr "أخرى"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.account:0
@@ -1359,12 +1678,16 @@
 #: code:addons/account/wizard/account_report_common.py:144
 #, python-format
 msgid "Select a starting and an ending period"
+<<<<<<< TREE
 msgstr "اختر بداية و نهاية للفترة"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
 msgid "Profit and Loss"
 msgstr ""
+=======
+msgstr "اختر بداية و نهاية للفترة"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
@@ -1374,7 +1697,16 @@
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Search tax template"
-msgstr "بحث قوالب الضريبة"
+<<<<<<< TREE
+msgstr "بحث قوالب الضريبة"
+=======
+msgstr "بحث قوالب الضريبة"
+
+#. module: account
+#: report:account.invoice:0
+msgid "Your Reference"
+msgstr "مرجعك"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -1428,7 +1760,16 @@
 #: model:process.node,name:account.process_node_bankstatement0
 #: model:process.node,name:account.process_node_supplierbankstatement0
 msgid "Bank Statement"
-msgstr "كشف حساب بنك"
+<<<<<<< TREE
+msgstr "كشف حساب بنك"
+=======
+msgstr "كشف حساب بنك"
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank account owner"
+msgstr "كشف حساب البنك"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: field:res.partner,property_account_receivable:0
@@ -1438,7 +1779,17 @@
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_central_journal
 msgid "Central Journal"
-msgstr "اليومية العامة"
+<<<<<<< TREE
+msgstr "اليومية العامة"
+=======
+msgstr "اليومية العامة"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1271
+#, python-format
+msgid "You can not use this general account in this journal !"
+msgstr "لا يمكنك إستخدام هذا الحساب العام في هذه اليومية !"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -1510,6 +1861,7 @@
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Entries "
+<<<<<<< TREE
 msgstr "عدد القيود "
 
 #. module: account
@@ -1518,6 +1870,9 @@
 "By unchecking the active field, you may hide a fiscal position without "
 "deleting it."
 msgstr ""
+=======
+msgstr "عدد القيود "
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:ir.model,name:account.model_temp_range
@@ -1528,9 +1883,37 @@
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree4
 msgid "Supplier Refunds"
-msgstr "رد مال للمورد"
-
-#. module: account
+<<<<<<< TREE
+msgstr "رد مال للمورد"
+=======
+msgstr "رد مال للمورد"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid ""
+"Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
+msgstr ""
+"مثال: عند صافي 14 يوم 2 في المائة, مبلغ متبقي عند نهاية 30 يومًا من الشهر."
+
+#. module: account
+#: code:addons/account/invoice.py:815
+#, python-format
+msgid ""
+"Cannot create the invoice !\n"
+"The payment term defined gives a computed amount greater than the total "
+"invoiced amount."
+msgstr ""
+"لا يمكنك من إنشاء الفاتورة !\n"
+"طريقة السداد المحددة تعطي قيمة حسابية أكبر من إجمالي قيمة الفاتورة."
+
+#. module: account
+#: field:account.installer.modules,account_anglo_saxon:0
+msgid "Anglo-Saxon Accounting"
+msgstr "المحاسبة الإنجليزية"
+>>>>>>> MERGE-SOURCE
+
+#. module: account
+<<<<<<< TREE
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 #: selection:account.bank.statement,state:0
@@ -1540,6 +1923,12 @@
 #: selection:account.period,state:0
 msgid "Closed"
 msgstr "مغلق"
+=======
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr "حركة الإعدام"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
@@ -1549,7 +1938,16 @@
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
 msgid "Template for Fiscal Position"
-msgstr "قوالب للمركز المالي"
+<<<<<<< TREE
+msgstr "قوالب للمركز المالي"
+=======
+msgstr "قوالب للمركز المالي"
+
+#. module: account
+#: model:account.tax.code,name:account.account_tax_code_0
+msgid "Tax Code Test"
+msgstr "اختبار رمز الضريبة"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: field:account.automatic.reconcile,reconciled:0
@@ -1596,6 +1994,7 @@
 #: view:account.move.line:0
 msgid "Unposted Journal Items"
 msgstr ""
+"قيمة دائنة أو مدينة خاطئة في النموذج (دائن + مدين يجب أن يكون أكبر من صفر)!"
 
 #. module: account
 #: view:account.chart.template:0
@@ -1676,7 +2075,16 @@
 #. module: account
 #: view:account.invoice:0
 msgid "Responsible"
-msgstr "مسئول"
+<<<<<<< TREE
+msgstr "مسئول"
+=======
+msgstr "مسئول"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Sub-Total :"
+msgstr "جزئي:"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
@@ -1694,6 +2102,7 @@
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
+<<<<<<< TREE
 msgstr "الفواتير"
 
 #. module: account
@@ -1701,10 +2110,25 @@
 #, python-format
 msgid "Unknown Partner"
 msgstr "شريك مجهول"
+=======
+msgstr "الفواتير"
+
+#. module: account
+#: field:account.chart.template,tax_code_root_id:0
+msgid "Root Tax Code"
+msgstr "رمز الضريبة الرئيسي"
+
+#. module: account
+#: field:account.partner.ledger,initial_balance:0
+#: field:account.report.general.ledger,initial_balance:0
+msgid "Include initial balances"
+msgstr "ضم الأرصدة المبدئية"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
+<<<<<<< TREE
 msgstr "جمع السنة"
 
 #. module: account
@@ -1713,6 +2137,9 @@
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
 msgstr "لقد اخترت وحدة مقياس غير ملائمة للمنتج."
+=======
+msgstr "جمع السنة"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.change.currency:0
@@ -1726,6 +2153,7 @@
 "Have a complete tree view of all journal items per account code by clicking "
 "on an account."
 msgstr ""
+<<<<<<< TREE
 "اعرض لائحة بأسماء حسابات السنة المالية لشركتك وصنف بالمدة.   لديك لائحة "
 "كاملة لكل قيود دفتر الأستاذ على حسب رقم الحساب عن طريق الضغط على  الحساب"
 
@@ -1738,6 +2166,26 @@
 #: view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr "الإعلان الضريبي"
+=======
+"اعرض لائحة بأسماء حسابات السنة المالية لشركتك وصنف بالمدة.   لديك لائحة "
+"كاملة لكل قيود دفتر الأستاذ على حسب رقم الحساب عن طريق الضغط على  الحساب"
+
+#. module: account
+#: constraint:account.fiscalyear:0
+msgid "Error! You cannot define overlapping fiscal years"
+msgstr "خطأ! لا يمكنك تعريف سنوات مالية متداخلة"
+
+#. module: account
+#: code:addons/account/account_move_line.py:835
+#, python-format
+msgid "The account is not defined to be reconciled !"
+msgstr "لم يعرف الحساب لتسويته !"
+
+#. module: account
+#: field:account.cashbox.line,pieces:0
+msgid "Values"
+msgstr "قيم"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: help:account.journal.period,active:0
@@ -1749,12 +2197,31 @@
 #. module: account
 #: view:res.partner:0
 msgid "Supplier Debit"
-msgstr "مورد مدين"
+<<<<<<< TREE
+msgstr "مورد مدين"
+=======
+msgstr "مورد مدين"
+
+#. module: account
+#: help:account.model.line,quantity:0
+msgid "The optional quantity on entries"
+msgstr "الكمية الإختيارية علي القيود"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
 msgid "Receivables & Payables"
-msgstr "المدينون و الدائنون"
+<<<<<<< TREE
+msgstr "المدينون و الدائنون"
+=======
+msgstr "المدينون و الدائنون"
+
+#. module: account
+#: code:addons/account/account_move_line.py:815
+#, python-format
+msgid "You have to provide an account for the write off entry !"
+msgstr "يجب إعطاء حساب لقيود الإعدام !"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_journal_report
@@ -1801,20 +2268,55 @@
 #. module: account
 #: view:account.tax:0
 msgid "Tax Declaration: Credit Notes"
-msgstr "الإعلان الضريبي: الأوراق الدائنة"
+<<<<<<< TREE
+msgstr "الإعلان الضريبي: الأوراق الدائنة"
+=======
+msgstr "الإعلان الضريبي: الأوراق الدائنة"
+
+#. module: account
+#: code:addons/account/account.py:499
+#, python-format
+msgid "You cannot deactivate an account that contains account moves."
+msgstr "لا يمكنك إلغاء نشاط حساب إذا كان يحتوي علي حركات حساب."
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: field:account.move.line.reconcile,credit:0
 msgid "Credit amount"
+<<<<<<< TREE
 msgstr "مبلغ الدائنون"
 
 #. module: account
 #: code:addons/account/account.py:407
 #: code:addons/account/account.py:412
 #: code:addons/account/account.py:429
+=======
+msgstr "مبلغ الدائنون"
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr "لا يمكنك إنشاء حركة سطر علي حساب مغلق."
+
+#. module: account
+#: code:addons/account/account.py:519
+>>>>>>> MERGE-SOURCE
 #, python-format
+<<<<<<< TREE
 msgid "Error!"
 msgstr "خطأ!"
+=======
+msgid ""
+"You cannot change the type of account from 'Closed' to any other type which "
+"contains account entries!"
+msgstr ""
+"لا يمكنك تغيير نوع الحساب من \"مغلق\" إلي أي نوع آخر يحتوي علي قيود يومية!"
+
+#. module: account
+#: view:res.company:0
+msgid "Reserve And Profit/Loss Account"
+msgstr "حساب الإحتياطي و الأرباح و الخسائر"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: sql_constraint:account.move.line:0
@@ -1844,9 +2346,15 @@
 msgstr "القيود في سطر"
 
 #. module: account
+<<<<<<< TREE
 #: field:account.vat.declaration,based_on:0
 msgid "Based on"
 msgstr "بالاستناد الى"
+=======
+#: report:account.tax.code.entries:0
+msgid "A/c Code"
+msgstr "كود c/a"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: field:account.invoice,move_id:0
@@ -1876,12 +2384,16 @@
 #. module: account
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
+<<<<<<< TREE
 msgstr "خطأ! لا يمكنك إنشاء شركات متداخلة (شركات تستخدم نفسها)."
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
 msgid "Sale/Purchase Journal"
 msgstr ""
+=======
+msgstr "خطأ! لا يمكنك إنشاء شركات متداخلة (شركات تستخدم نفسها)."
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.analytic.account:0
@@ -1914,6 +2426,7 @@
 #. module: account
 #: selection:account.account.type,report_type:0
 msgid "/"
+<<<<<<< TREE
 msgstr "/"
 
 #. module: account
@@ -1923,6 +2436,19 @@
 "will be added, Loss : Amount will be deducted.), as calculated in Profit & "
 "Loss Report"
 msgstr ""
+=======
+msgstr "/"
+
+#. module: account
+#: field:account.bs.report,reserve_account_id:0
+msgid "Reserve & Profit/Loss Account"
+msgstr "حساب الإحتياطي و الأرباح و الخسائر"
+
+#. module: account
+#: help:account.bank.statement,balance_end:0
+msgid "Closing balance based on Starting Balance and Cash Transactions"
+msgstr "رصيد الإغلاق بناءاً علي رصيد أول المدة و معاملات النقدية"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.node,note:account.process_node_reconciliation0
@@ -1962,15 +2488,22 @@
 msgstr "إذا تم إختيار \"صحيح\" فلن تقبل قيد بتاريخ خارج الفترة المعرفة"
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_invoice.py:73
 #, python-format
 msgid "You must define an analytic journal of type '%s'!"
 msgstr ""
+=======
+#: model:ir.actions.act_window,name:account.action_account_pl_report
+msgid "Account Profit And Loss"
+msgstr "حساب الإربح و الخسائر"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: field:account.installer,config_logo:0
 #: field:wizard.multi.charts.accounts,config_logo:0
 msgid "Image"
+<<<<<<< TREE
 msgstr "صورة"
 
 #. module: account
@@ -1985,6 +2518,9 @@
 #: model:ir.actions.act_window,help:account.action_account_financial_report_tree
 msgid "Makes a generic system to draw financial reports easily."
 msgstr ""
+=======
+msgstr "صورة"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.invoice:0
@@ -1998,6 +2534,7 @@
 "If the active field is set to False, it will allow you to hide the tax "
 "without removing it."
 msgstr ""
+<<<<<<< TREE
 "إذا كان الحقل النشط به لا أو (False) سيسمح لك بإخفاء الضريبة دون إزالتها"
 
 #. module: account
@@ -2027,6 +2564,26 @@
 #: report:account.journal.period.print.sale.purchase:0
 msgid "VAT Declaration"
 msgstr ""
+=======
+"إذا كان الحقل النشط به لا أو (False) سيسمح لك بإخفاء الضريبة دون إزالتها"
+
+#. module: account
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
+"اذا اعطيت اسم لاخر بعد / , فهي تنشأ تحرك مدخلات محاسبية  ستكون مع نفس الاسم "
+"كإسم البيان. وهي تسمح لمدخلات البيان ان يكون لها نفس المراجع عن البيان نفسه."
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_unreconcile
+#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
+#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
+msgid "Unreconcile Entries"
+msgstr "إلغاء تسوية القيود"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: field:account.move.reconcile,line_partial_ids:0
@@ -2090,6 +2647,7 @@
 "Invalid period ! Some periods overlap or the date period is not in the scope "
 "of the fiscal year. "
 msgstr ""
+<<<<<<< TREE
 "فترة خاطئة ! بعض الفترات تتداخل أو أن التاريخ ليس موجود داخل الفترة المالية. "
 
 #. module: account
@@ -2097,6 +2655,9 @@
 #, python-format
 msgid "You have to assign an analytic journal on the '%s' journal!"
 msgstr ""
+=======
+"فترة خاطئة ! بعض الفترات تتداخل أو أن التاريخ ليس موجود داخل الفترة المالية. "
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -2104,10 +2665,23 @@
 #: selection:account.invoice.report,state:0
 #: selection:report.invoice.created,state:0
 msgid "Pro-forma"
-msgstr "كمسألة شكلية"
-
-#. module: account
-#: code:addons/account/account.py:1461
+<<<<<<< TREE
+msgstr "كمسألة شكلية"
+
+#. module: account
+#: code:addons/account/account.py:1461
+=======
+msgstr "كمسألة شكلية"
+
+#. module: account
+#: code:addons/account/installer.py:348
+#, python-format
+msgid " Journal"
+msgstr " يومية"
+
+#. module: account
+#: code:addons/account/account.py:1461
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2126,10 +2700,15 @@
 "partners accounts (for debit/credit computations), closed for depreciated "
 "accounts."
 msgstr ""
+"استخدم هذا النموذج ليميز العلامات بتأثيرات خاصة في OpenERP: لا يمكن للعرض ان "
+"يحتوي على مدخلات, التدعيم هو حسابات يمكن ان تشمل على حسابات فرعية لتدعيمات "
+"الشركة المتعددة, الدفع/الاستقبال لكل حسابات الشركاء (دين/حسابية الائتمان), "
+"مغلق للحاسبات المنخفضة القيمة."
 
 #. module: account
 #: view:account.chart.template:0
 msgid "Search Chart of Account Templates"
+<<<<<<< TREE
 msgstr "بحث قوالب دليل الحسابات"
 
 #. module: account
@@ -2153,6 +2732,9 @@
 #: report:account.invoice:0
 msgid "Customer Code"
 msgstr ""
+=======
+msgstr "بحث قوالب دليل الحسابات"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.installer:0
@@ -2187,7 +2769,7 @@
 #: code:addons/account/account.py:3119
 #, python-format
 msgid "ECNJ"
-msgstr ""
+msgstr "ECNJ"
 
 #. module: account
 #: view:account.subscription:0
@@ -2206,12 +2788,16 @@
 #: code:addons/account/account_invoice.py:370
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
+<<<<<<< TREE
 msgstr "لا يوجد دفتر يومية للمبيعات أو المشتريات معرف!"
 
 #. module: account
 #: constraint:res.partner.bank:0
 msgid "The RIB and/or IBAN is not valid"
 msgstr ""
+=======
+msgstr "لا يوجد دفتر يومية للمبيعات أو المشتريات معرف!"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:product.category:0
@@ -2294,6 +2880,7 @@
 #: help:accounting.report,fiscalyear_id:0
 #: help:accounting.report,fiscalyear_id_cmp:0
 msgid "Keep empty for all open fiscal year"
+<<<<<<< TREE
 msgstr "اتركه فارغ لجميع السنوات المالية المفتوحة"
 
 #. module: account
@@ -2316,20 +2903,28 @@
 "'Setup Your Bank Accounts' tool that will automatically create the accounts "
 "and journals for you."
 msgstr ""
+=======
+msgstr "اتركه فارغ لجميع السنوات المالية المفتوحة"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
+<<<<<<< TREE
 msgstr "قيد الحساب"
 
 #. module: account
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
 msgstr ""
+=======
+msgstr "قيد الحساب"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: field:account.sequence.fiscalyear,sequence_main_id:0
 msgid "Main Sequence"
+<<<<<<< TREE
 msgstr "المسلسل الرئيسي"
 
 #. module: account
@@ -2339,6 +2934,9 @@
 "In order to delete a bank statement, you must first cancel it to delete "
 "related journal items."
 msgstr ""
+=======
+msgstr "المسلسل الرئيسي"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: field:account.invoice,payment_term:0
@@ -2356,6 +2954,7 @@
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
 msgid "Fiscal Positions"
+<<<<<<< TREE
 msgstr "الأوضاع المالية"
 
 #. module: account
@@ -2363,6 +2962,9 @@
 #: constraint:account.tax.code:0
 msgid "Error ! You can not create recursive accounts."
 msgstr "خطأ ! لا يمكن إنشاء حسابات تكرارية."
+=======
+msgstr "الأوضاع المالية"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: field:account.period.close,sure:0
@@ -2393,7 +2995,17 @@
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
 msgid "Draft state of an invoice"
-msgstr "حالة مسودة من الفاتورة"
+<<<<<<< TREE
+msgstr "حالة مسودة من الفاتورة"
+=======
+msgstr "حالة مسودة من الفاتورة"
+
+#. module: account
+#: help:account.account,reconcile:0
+msgid ""
+"Check this if the user is allowed to reconcile entries in this account."
+msgstr "علم علي هذه لو أن هذا المستخدم لتسوية قيود هذا الحساب."
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.partner.reconcile.process:0
@@ -2415,6 +3027,7 @@
 "You can create one in the menu: \n"
 "Configuration\\Financial Accounting\\Accounts\\Journals."
 msgstr ""
+<<<<<<< TREE
 "لم يتمكن من إيجاد حساب يومية لنوع  %s لهذه الشركة.\n"
 "\n"
 "يمكنك إنشاء واحد من القائمة: \n"
@@ -2430,6 +3043,12 @@
 #: view:account.entries.report:0
 msgid "Unreconciled entries"
 msgstr "إدخالات لم يتم تسويتها"
+=======
+"لم يتمكن من إيجاد حساب يومية لنوع  %s لهذه الشركة.\n"
+"\n"
+"يمكنك إنشاء واحد من القائمة: \n"
+"Configuration\\Financial Accounting\\Accounts\\Journals."
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
@@ -2460,6 +3079,12 @@
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
+"تطبع هذه القائمة إعلان ضريبة القيمة المضافة على أساس الفواتير أو المدفوعات. "
+"حدد واحد أو عدة فترات من السنة المالية. يتم إنشاء المعلومات المطلوبة "
+"تلقائيًا للحصول على الإقرار الضريبي من قبل OpenERP من الفواتير (أو دفعات، في "
+"بعض البلدان). ويتم تحديث هذه البيانات في الوقت الحقيقي. وهذا مفيد جدا لأنه "
+"يتيح لك المعاينة في أي وقت للضرائب التي مدينون لكم في بداية ونهاية الشهر "
+"الجاري أو الربع."
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -2495,7 +3120,7 @@
 #: code:addons/account/account.py:3117
 #, python-format
 msgid "EXJ"
-msgstr ""
+msgstr "EXJ"
 
 #. module: account
 #: field:product.template,supplier_taxes_id:0
@@ -2547,6 +3172,7 @@
 #: view:account.print.journal:0
 msgid ""
 "This report gives you an overview of the situation of a specific journal"
+<<<<<<< TREE
 msgstr "هذا التقرير يعطي لمحة عامة عن وضع  يومية محددة"
 
 #. module: account
@@ -2556,6 +3182,17 @@
 
 #. module: account
 #: model:account.account.type,name:account.account_type_tax
+=======
+msgstr "هذا التقرير يعطي لمحة عامة عن وضع  يومية محددة"
+
+#. module: account
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr "خطأ! لا يمكنك إنشاء فئات متداخلة."
+
+#. module: account
+#: model:account.account.type,name:account.account_type_tax
+>>>>>>> MERGE-SOURCE
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2600,7 +3237,20 @@
 #. module: account
 #: report:account.overdue:0
 msgid "Date:"
-msgstr "تاريخ:"
+<<<<<<< TREE
+msgstr "تاريخ:"
+=======
+msgstr "تاريخ:"
+
+#. module: account
+#: code:addons/account/account.py:640
+#, python-format
+msgid ""
+"You cannot modify company of this journal as its related record exist in "
+"Entry Lines"
+msgstr ""
+"ﻻ يمكنك تعديل الشركة لهذه اليومية حيث أن له إرتباطات أخري في سطور القيد"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: report:account.journal.period.print:0
@@ -2643,12 +3293,16 @@
 #. module: account
 #: help:account.move.line,tax_code_id:0
 msgid "The Account can either be a base tax code or a tax code account."
+<<<<<<< TREE
 msgstr "يمكن للحساب أن يكون رمز رئيسي للضريبة أو حساب رمز الضريبة."
 
 #. module: account
 #: sql_constraint:account.model.line:0
 msgid "Wrong credit or debit value in model, they must be positive!"
 msgstr ""
+=======
+msgstr "يمكن للحساب أن يكون رمز رئيسي للضريبة أو حساب رمز الضريبة."
+>>>>>>> MERGE-SOURCE