Merge lp:openobject-addons/6.0 into lp:openobject-addons

[Ainara]

[lp:openobject-addons/6.0]

5421. By Launchpad Translations on behalf of openerp on 2013-02-02

Launchpad automatic translations update.

5422. By Launchpad Translations on behalf of openerp on 2013-02-04

Launchpad automatic translations update.

5423. By Xavier ALT on 2013-02-04

[MERGE] OPW 575875: stock: fix wrong quantity when computating explicitly products without prodlots

5424. By Launchpad Translations on behalf of openerp on 2013-02-07

Launchpad automatic translations update.

5425. By Launchpad Translations on behalf of openerp on 2013-02-08

Launchpad automatic translations update.

5426. By Launchpad Translations on behalf of openerp on 2013-02-09

Launchpad automatic translations update.

5427. By Launchpad Translations on behalf of openerp on 2013-02-10

Launchpad automatic translations update.

5428. By Launchpad Translations on behalf of openerp on 2013-02-11

Launchpad automatic translations update.

5429. By Launchpad Translations on behalf of openerp on 2013-02-12

Launchpad automatic translations update.

5430. By Launchpad Translations on behalf of openerp on 2013-02-13

Launchpad automatic translations update.

5431. By Launchpad Translations on behalf of openerp on 2013-02-16

Launchpad automatic translations update.

5432. By Launchpad Translations on behalf of openerp on 2013-02-19

Launchpad automatic translations update.

5433. By Launchpad Translations on behalf of openerp on 2013-02-20

Launchpad automatic translations update.

5434. By Launchpad Translations on behalf of openerp on 2013-02-21

Launchpad automatic translations update.

5435. By Launchpad Translations on behalf of openerp on 2013-02-22

Launchpad automatic translations update.

5436. By Launchpad Translations on behalf of openerp on 2013-02-24

Launchpad automatic translations update.

5437. By Launchpad Translations on behalf of openerp on 2013-02-26

Launchpad automatic translations update.

5438. By Xavier ALT on 2013-02-27

[MERGE] OPW 583829: procurement: do not duplicate procurement related to stock.move on stock.picking duplication

5439. By Launchpad Translations on behalf of openerp on 2013-02-28

Launchpad automatic translations update.

5440. By Xavier ALT on 2013-02-28

[MERGE] OPW 584876: account_voucher: when user specify a write-off analytic account, propagate it to created move line

5441. By Launchpad Translations on behalf of openerp on 2013-03-01

Launchpad automatic translations update.

5442. By Launchpad Translations on behalf of openerp on 2013-03-02

Launchpad automatic translations update.

5443. By Launchpad Translations on behalf of openerp on 2013-03-03

Launchpad automatic translations update.

5444. By Launchpad Translations on behalf of openerp on 2013-03-05

Launchpad automatic translations update.

5445. By Launchpad Translations on behalf of openerp on 2013-03-06

Launchpad automatic translations update.

5446. By Launchpad Translations on behalf of openerp on 2013-03-07

Launchpad automatic translations update.

5447. By Launchpad Translations on behalf of openerp on 2013-03-08

Launchpad automatic translations update.

5448. By Launchpad Translations on behalf of openerp on 2013-03-09

Launchpad automatic translations update.

5449. By Launchpad Translations on behalf of openerp on 2013-03-10

Launchpad automatic translations update.

5450. By Launchpad Translations on behalf of openerp on 2013-03-12

Launchpad automatic translations update.

5451. By Launchpad Translations on behalf of openerp on 2013-03-14

Launchpad automatic translations update.

5452. By Launchpad Translations on behalf of openerp on 2013-03-15

Launchpad automatic translations update.

5453. By Launchpad Translations on behalf of openerp on 2013-03-16

Launchpad automatic translations update.

5454. By Launchpad Translations on behalf of openerp on 2013-03-18

Launchpad automatic translations update.

5455. By Launchpad Translations on behalf of openerp on 2013-03-19

Launchpad automatic translations update.

5456. By Launchpad Translations on behalf of openerp on 2013-03-20

Launchpad automatic translations update.

5457. By Launchpad Translations on behalf of openerp on 2013-03-21

Launchpad automatic translations update.

5458. By Launchpad Translations on behalf of openerp on 2013-03-24

Launchpad automatic translations update.

5459. By Launchpad Translations on behalf of openerp on 2013-03-25

Launchpad automatic translations update.

5460. By Chris Biersbach (OpenERP) on 2013-03-26

[FIX] MRP: Back-port of rounding fix (from 6.1 and onwards). Ceil is used instead of round to always round the qty of products up, rounding down is just wrong in this case.

5461. By Chris Biersbach (OpenERP) on 2013-03-26

[MERGE] OPW: 584197: account: Re-Opening periods from closed fiscal years is no longer allowed.

5462. By Launchpad Translations on behalf of openerp on 2013-03-28

Launchpad automatic translations update.

5463. By Launchpad Translations on behalf of openerp on 2013-03-29

Launchpad automatic translations update.

5464. By Launchpad Translations on behalf of openerp on 2013-03-30

Launchpad automatic translations update.

5465. By Launchpad Translations on behalf of openerp on 2013-03-31

Launchpad automatic translations update.

5466. By Launchpad Translations on behalf of openerp on 2013-04-01

Launchpad automatic translations update.

5467. By Launchpad Translations on behalf of openerp on 2013-04-25

Launchpad automatic translations update.

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

Launchpad automatic translations update.

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

Launchpad automatic translations update.

5470. By Launchpad Translations on behalf of openerp on 2013-05-01

Launchpad automatic translations update.

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

Launchpad automatic translations update.

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

Launchpad automatic translations update.

5473. By Launchpad Translations on behalf of openerp on 2013-05-17

Launchpad automatic translations update.

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

Launchpad automatic translations update.

5475. By Launchpad Translations on behalf of openerp on 2013-06-03

Launchpad automatic translations update.

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

Hello,

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

Thanks!

review: Needs Resubmitting

Unmerged revisions

5621. By Launchpad Translations on behalf of openerp on 2015-05-26

Launchpad automatic translations update.

5620. By Launchpad Translations on behalf of openerp on 2015-05-19

Launchpad automatic translations update.

5619. By Launchpad Translations on behalf of openerp on 2015-05-16

Launchpad automatic translations update.

5618. By Launchpad Translations on behalf of openerp on 2015-05-08

Launchpad automatic translations update.

5617. By Launchpad Translations on behalf of openerp on 2015-05-06

Launchpad automatic translations update.

5616. By Launchpad Translations on behalf of openerp on 2015-04-17

Launchpad automatic translations update.

5615. By Launchpad Translations on behalf of openerp on 2015-04-01

Launchpad automatic translations update.

5614. By Launchpad Translations on behalf of openerp on 2015-03-31

Launchpad automatic translations update.

5613. By Launchpad Translations on behalf of openerp on 2015-03-30

Launchpad automatic translations update.

5612. By Launchpad Translations on behalf of openerp on 2015-03-27

Launchpad automatic translations update.

=== modified file 'account/account.py'
--- account/account.py	2013-04-29 15:14:10 +0000
+++ account/account.py	2013-06-03 06:13:34 +0000
@@ -288,8 +288,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 = {
@@ -779,11 +798,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'],
@@ -792,15 +828,25 @@
             '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']:
+<<<<<<< TREE
             # if we have the right to create a journal, we should be able to
             # create it's sequence.
             vals.update({'sequence_id': self.create_sequence(cr, SUPERUSER_ID, vals, context)})
+=======
+            vals.update({'sequence_id': self.create_sequence(cr, 1, vals, context)})
+>>>>>>> MERGE-SOURCE
         return super(account_journal, self).create(cr, uid, vals, context)
 
     def name_get(self, cr, user, ids, context=None):
@@ -841,7 +887,7 @@
         if name:
             ids = self.search(cr, user, [('code', 'ilike', name)]+ args, limit=limit, context=context)
         if not ids:
-            ids = self.search(cr, user, [('name', 'ilike', name)]+ args, limit=limit, context=context)#fix it ilike should be replace with operator
+            ids = self.search(cr, user, [('name', operator, name)]+ args, limit=limit, context=context)
 
         return self.name_get(cr, user, ids, context=context)
 
@@ -1001,6 +1047,7 @@
     def find(self, cr, uid, dt=None, context=None):
         if context is None: context = {}
         if not dt:
+<<<<<<< TREE
             dt = fields.date.context_today(self, cr, uid, context=context)
         args = [('date_start', '<=' ,dt), ('date_stop', '>=', dt)]
         if context.get('company_id', False):
@@ -1017,14 +1064,36 @@
         if not result:
             raise osv.except_osv(_('Error !'), _('There is no period defined for this date: %s.\nPlease create one.')%dt)
         return result
+=======
+            dt = time.strftime('%Y-%m-%d')
+#CHECKME: shouldn't we check the state of the period?
+        args = [('date_start', '<=' ,dt), ('date_stop', '>=', dt)]
+        if context.get('company_id', False):
+            args.append(('company_id', '=', context['company_id']))
+        else:
+            company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
+            args.append(('company_id', '=', company_id))
+        ids = self.search(cr, uid, args, context=context)
+        if not ids:
+            raise osv.except_osv(_('Error !'), _('No period defined for this date: %s !\nPlease create a fiscal year.')%dt)
+        return ids
+>>>>>>> MERGE-SOURCE
 
     def action_draft(self, cr, uid, ids, *args):
         mode = 'draft'
+<<<<<<< TREE
         for period in self.browse(cr, uid, ids):
             if period.fiscalyear_id.state == 'done':
                 raise osv.except_osv(_('Warning !'), _('You can not re-open a period which belongs to closed fiscal year'))
         cr.execute('update account_journal_period set state=%s where period_id in %s', (mode, tuple(ids),))
         cr.execute('update account_period set state=%s where id in %s', (mode, tuple(ids),))
+=======
+        for period in self.browse(cr, uid, ids):
+            if period.fiscalyear_id.state == 'done':
+                raise osv.except_osv(_('Warning !'), _('You can not re-open a period which belongs to closed fiscal year'))
+        cr.execute('update account_journal_period set state=%s where period_id in %s', (mode, tuple(ids)))
+        cr.execute('update account_period set state=%s where id in %s', (mode, tuple(ids)))
+>>>>>>> MERGE-SOURCE
         return True
 
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
@@ -1284,10 +1353,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 cannot create more than one move per period on a 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):
@@ -1340,8 +1437,15 @@
 
     def button_cancel(self, cr, uid, ids, context=None):
         for line in self.browse(cr, uid, ids, context=context):
+<<<<<<< TREE
             if not line.journal_id.update_posted:
                 raise osv.except_osv(_('Error!'), _('You cannot modify a posted entry of this journal.\nFirst you should set the journal to allow cancelling entries.'))
+=======
+            if line.period_id.state == 'done':
+                raise osv.except_osv(_('Error !'), _('You can not modify a posted entry of closed periods'))
+            elif not line.journal_id.update_posted:
+                raise osv.except_osv(_('Error !'), _('You can not modify a posted entry of this journal !\nYou should set the journal to allow cancelling entries if you want to do that.'))
+>>>>>>> MERGE-SOURCE
         if ids:
             cr.execute('UPDATE account_move '\
                        'SET state=%s '\
@@ -1393,8 +1497,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
             c['period_id'] = vals['period_id'] if 'period_id' in vals else self._get_period(cr, uid, context)
@@ -1452,7 +1555,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 = {}
 
@@ -1479,7 +1587,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,
                 'partner_id': False,
@@ -1490,7 +1598,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
@@ -1504,6 +1613,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,))
@@ -1533,20 +1643,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)
@@ -1742,7 +1887,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):
@@ -2180,6 +2326,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))
@@ -3094,12 +3241,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):
@@ -3518,7 +3674,28 @@
             default_account_id  = obj_acc.create(cr, uid, vals, context=context)
 
             #create the bank journal
+<<<<<<< TREE
             vals_journal = self._prepare_bank_journal(cr, uid, line, current_num, default_account_id, company_id, context=context)
+=======
+            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
+>>>>>>> MERGE-SOURCE
             obj_journal.create(cr, uid, vals_journal)
             current_num += 1
         return True

=== modified file 'account/account_analytic_line.py'
--- account/account_analytic_line.py	2013-04-15 10:23:49 +0000
+++ account/account_analytic_line.py	2013-06-03 06:13:34 +0000
@@ -64,13 +64,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	2013-06-03 06:13:34 +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	2013-04-18 10:39:07 +0000
+++ account/account_bank_statement.py	2013-06-03 06:13:34 +0000
@@ -367,8 +367,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):
@@ -571,7 +571,11 @@
     }
     _defaults = {
         'name': lambda self,cr,uid,context={}: self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement.line'),
+<<<<<<< TREE
         'date': lambda self,cr,uid,context={}: context.get('date', fields.date.context_today(self,cr,uid,context=context)),
+=======
+        'date': lambda self, cr, uid, context, *a: context.get('date') or time.strftime('%Y-%m-%d'),
+>>>>>>> MERGE-SOURCE
         'type': 'general',
     }
 

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2013-05-22 10:33:05 +0000
+++ account/account_invoice.py	2013-06-03 06:13:34 +0000
@@ -79,10 +79,18 @@
 
     def _reconciled(self, cr, uid, ids, name, args, context=None):
         res = {}
+<<<<<<< TREE
         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':
                 self.signal_open_test(cr, uid, [inv.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)
+>>>>>>> MERGE-SOURCE
         return res
 
     def _get_reference_type(self, cr, uid, context=None):
@@ -91,13 +99,25 @@
     def _amount_residual(self, cr, uid, ids, name, args, context=None):
         result = {}
         for invoice in self.browse(cr, uid, ids, context=context):
+            checked_partial_rec_ids = []
             result[invoice.id] = 0.0
             if invoice.move_id:
+<<<<<<< TREE
                 for m in invoice.move_id.line_id:
                     if m.account_id.type in ('receivable','payable'):
                         result[invoice.id] += m.amount_residual_currency
             #prevent the residual amount on the invoice to be less than 0
             result[invoice.id] = max(result[invoice.id], 0.0)            
+=======
+                for move_line in invoice.move_id.line_id:
+                    if move_line.account_id.type in ('receivable','payable'):
+                        if move_line.reconcile_partial_id:
+                            partial_reconcile_id = move_line.reconcile_partial_id.id
+                            if partial_reconcile_id in checked_partial_rec_ids:
+                                continue
+                            checked_partial_rec_ids.append(partial_reconcile_id)
+                        result[invoice.id] += move_line.amount_residual_currency
+>>>>>>> MERGE-SOURCE
         return result
 
     # Give Journal Items related to the payment reconciled to this invoice
@@ -264,8 +284,13 @@
         'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}, track_visibility='always'),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True, change_default=True, readonly=True, states={'draft':[('readonly',False)]}),
+<<<<<<< TREE
         'check_total': fields.float('Verification Total', digits_compute=dp.get_precision('Account'), readonly=True, states={'draft':[('readonly',False)]}),
         'reconciled': fields.function(_reconciled, string='Paid/Reconciled', type='boolean',
+=======
+        'check_total': fields.float('Total', digits_compute=dp.get_precision('Account'), states={'open':[('readonly',True)],'close':[('readonly',True)],'paid':[('readonly',True)]}),
+        'reconciled': fields.function(_reconciled, method=True, string='Paid/Reconciled', type='boolean',
+>>>>>>> MERGE-SOURCE
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, None, 50), # Check if we can remove ?
                 'account.move.line': (_get_invoice_from_line, None, 50),
@@ -687,8 +712,12 @@
             'move_id':False,
             'move_name':False,
             'internal_number': False,
+<<<<<<< TREE
             'period_id': False,
             'sent': False,
+=======
+            'period_id': False
+>>>>>>> MERGE-SOURCE
         })
         if 'date_invoice' not in default:
             default.update({
@@ -861,6 +890,8 @@
                     line2[tmp]['credit'] = (am < 0) and -am or 0.0
                     line2[tmp]['tax_amount'] += l['tax_amount']
                     line2[tmp]['analytic_lines'] += l['analytic_lines']
+                    line2[tmp]['amount_currency'] += l['amount_currency']
+                    line2[tmp]['quantity'] += l['quantity']
                 else:
                     line2[tmp] = l
             line = []
@@ -1164,6 +1195,7 @@
         """
         clean_lines = []
         for line in lines:
+<<<<<<< TREE
             clean_line = {}
             for field in line._all_columns.keys():
                 if line._all_columns[field].column._type == 'many2one':
@@ -1192,6 +1224,21 @@
             :param integer journal_id: account.journal from the wizard
             :return: dict of value to create() the refund
         """
+=======
+            del line['id']
+            del line['invoice_id']
+            for field in ('company_id', 'partner_id', 'account_id', 'product_id',
+                          'uos_id', 'account_analytic_id', 'tax_code_id', 'base_code_id'):
+                line[field] = line.get(field, False) and line[field][0]
+            if 'invoice_line_tax_id' in line:
+                line['invoice_line_tax_id'] = [(6,0, line.get('invoice_line_tax_id', [])) ]
+        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', 'user_id', 'fiscal_position'])
+        obj_invoice_line = self.pool.get('account.invoice.line')
+        obj_invoice_tax = self.pool.get('account.invoice.tax')
+>>>>>>> MERGE-SOURCE
         obj_journal = self.pool.get('account.journal')
 
         type_dict = {
@@ -1238,6 +1285,7 @@
 
     def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None, context=None):
         new_ids = []
+<<<<<<< TREE
         for invoice in self.browse(cr, uid, ids, context=context):
             invoice = self._prepare_refund(cr, uid, invoice,
                                                 date=date,
@@ -1245,6 +1293,55 @@
                                                 description=description,
                                                 journal_id=journal_id,
                                                 context=context)
+=======
+        for invoice in invoices:
+            del invoice['id']
+
+            type_dict = {
+                'out_invoice': 'out_refund', # Customer Invoice
+                'in_invoice': 'in_refund',   # Supplier Invoice
+                'out_refund': 'out_invoice', # Customer Refund
+                'in_refund': 'in_invoice',   # Supplier Refund
+            }
+
+            invoice_lines = obj_invoice_line.read(cr, uid, invoice['invoice_line'])
+            invoice_lines = self._refund_cleanup_lines(cr, uid, invoice_lines)
+
+            tax_lines = obj_invoice_tax.read(cr, uid, invoice['tax_line'])
+            tax_lines = filter(lambda l: l['manual'], tax_lines)
+            tax_lines = self._refund_cleanup_lines(cr, uid, tax_lines)
+            if journal_id:
+                refund_journal_ids = [journal_id]
+            elif invoice['type'] == 'in_invoice':
+                refund_journal_ids = obj_journal.search(cr, uid, [('type','=','purchase_refund')])
+            else:
+                refund_journal_ids = obj_journal.search(cr, uid, [('type','=','sale_refund')])
+
+            if not date:
+                date = time.strftime('%Y-%m-%d')
+            invoice.update({
+                'type': type_dict[invoice['type']],
+                'date_invoice': date,
+                'state': 'draft',
+                'number': False,
+                'invoice_line': invoice_lines,
+                'tax_line': tax_lines,
+                'journal_id': refund_journal_ids
+            })
+            if period_id:
+                invoice.update({
+                    'period_id': period_id,
+                })
+            if description:
+                invoice.update({
+                    'name': description,
+                })
+            # 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',
+                    'user_id', 'fiscal_position'):
+                invoice[field] = invoice[field] and invoice[field][0]
+>>>>>>> MERGE-SOURCE
             # create the new invoice
             new_ids.append(self.create(cr, uid, invoice, context=context))
 
@@ -1447,10 +1544,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
@@ -1754,6 +1855,7 @@
         'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True),
     }
 
+<<<<<<< TREE
     def _find_accounting_partner(self, partner):
         '''
         Find the partner for which the accounting entries will be created
@@ -1776,5 +1878,13 @@
             self.pool.get('account.invoice').write(cr, uid, [context['default_res_id']], {'sent': True}, context=context)
             self.pool.get('account.invoice').message_post(cr, uid, [context['default_res_id']], body=_("Invoice sent"), context=context)
         return super(mail_compose_message, self).send_mail(cr, uid, ids, context=context)
+=======
+    def copy(self, cr, uid, id, default=None, context=None):
+        default = default or {}
+        default.update({'invoice_ids' : []})
+        return super(res_partner, self).copy(cr, uid, id, default, context)
+
+res_partner()
+>>>>>>> MERGE-SOURCE
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml	2013-04-22 15:34:49 +0000
+++ account/account_invoice_view.xml	2013-06-03 06:13:34 +0000
@@ -240,11 +240,32 @@
                                         <field name="factor_tax" invisible="True"/>
                                     </tree>
                                 </field>
+<<<<<<< TREE
                             </div>
                             <div class="oe_clear">
                                 <label for="comment"/>
                             </div>
                             <field name="comment"/>
+=======
+                            </group>
+                            <group col="4" colspan="2">
+                                <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific"/>
+                                <field name="amount_untaxed"/>
+                                <label string="" colspan="2"/>
+                                <field name="amount_tax"/>
+                                <field name="reconciled"/>
+                                <field name="amount_total"/>
+                                <field name="state"/>
+                                <field name="residual"/>
+                                <group col="6" colspan="4">
+                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
+                                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
+                                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
+                                    <button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
+                                    <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
+                                </group>
+                            </group>
+>>>>>>> MERGE-SOURCE
                         </page>
                         <page string="Other Info">
                             <group>
@@ -345,6 +366,7 @@
                     </group>
                     <field name="sent" invisible="1"/>
                     <notebook colspan="4">
+<<<<<<< TREE
                         <page string="Invoice Lines">
                             <field name="invoice_line" nolabel="1" widget="one2many_list" context="{'type': type}">
                                 <tree string="Invoice Lines" editable="bottom">
@@ -387,6 +409,47 @@
                                 <label for="comment"/>
                             </div>
                             <field name="comment" class="oe_inline" placeholder="Additional notes..."/>
+=======
+                        <page string="Invoice">
+                            <field domain="[('company_id', '=', company_id),('type','=', 'receivable')]" name="account_id" groups="account.group_account_user"/>
+                            <field name="name"/>
+                            <field name="payment_term" widget="selection"/>
+                            <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list"/>
+                            <group col="1" colspan="2">
+                                <field name="tax_line" nolabel="1">
+                                    <tree editable="bottom" string="Taxes">
+                                        <field name="name"/>
+                                        <field name="account_id" groups="account.group_account_invoice"/>
+                                        <field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
+                                        <field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,parent.date_invoice)"/>
+                                        <field invisible="True" name="base_amount"/>
+                                        <field invisible="True" name="tax_amount"/>
+                                        <field name="factor_base" invisible="True"/>
+                                        <field name="factor_tax" invisible="True"/>
+                                    </tree>
+                                </field>
+                            </group>
+                            <group col="4" colspan="2">
+                                <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" groups="base.group_user" icon="terp-stock_format-scientific"/>
+                                <field name="amount_untaxed"/>
+                                <label string="" colspan="2"/>
+                                <field name="amount_tax"/>
+                                <field name="reconciled"/>
+                                <field name="amount_total"/>
+                                <field name="state"/>
+                                <field name="residual"/>
+                                <group col="8" colspan="4" groups="base.group_user">
+                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
+                                    <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
+
+                                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
+                                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
+                                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_account_user"/>
+                                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
+                                    <button name="%(account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,paid,proforma,sale,proforma2"/>
+                                </group>
+                            </group>
+>>>>>>> MERGE-SOURCE
                         </page>
                         <page string="Other Info">
                             <group col="4">
@@ -625,11 +688,20 @@
         </record>
         <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/>
 
+<<<<<<< TREE
+=======
+        <act_window context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>
+
+>>>>>>> MERGE-SOURCE
         <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}"
            domain="[('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	2013-04-29 15:14:10 +0000
+++ account/account_move_line.py	2013-06-03 06:13:34 +0000
@@ -242,6 +242,7 @@
 
         # Compute simple values
         data = super(account_move_line, self).default_get(cr, uid, fields, context=context)
+<<<<<<< TREE
         if context.get('journal_id'):
             total = 0.0
             #in account.move form view, it is not possible to compute total debit and credit using
@@ -298,6 +299,138 @@
                     compute_ctx.update({'date': data['date']})
                 data['amount_currency'] = currency_obj.compute(cr, uid, account.company_id.currency_id.id, data['currency_id'], -total, context=compute_ctx)
         data = self._default_get_move_form_hook(cr, uid, data)
+=======
+        # Starts: Manual entry from account.move form
+        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]
+            if context['journal']:
+                journal_data = journal_obj.browse(cr, uid, context['journal'], context=context)
+                if journal_data.type == 'purchase':
+                    if total_new > 0:
+                        account = journal_data.default_credit_account_id
+                    else:
+                        account = journal_data.default_debit_account_id
+                else:
+                    if total_new > 0:
+                        account = journal_data.default_credit_account_id
+                    else:
+                        account = journal_data.default_debit_account_id
+                if account and ((not fields) or ('debit' in fields) or ('credit' in fields)) and 'partner_id' in data and (data['partner_id']):
+                    part = partner_obj.browse(cr, uid, data['partner_id'], context=context)
+                    account = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, account.id)
+                    account = account_obj.browse(cr, uid, account, context=context)
+                    data['account_id'] =  account.id
+
+            s = -total_new
+            data['debit'] = s > 0 and s or 0.0
+            data['credit'] = s < 0 and -s or 0.0
+            data = self._default_get_move_form_hook(cr, uid, data)
+            return data
+        # Ends: Manual entry from account.move form
+        if not 'move_id' in fields: #we are not in manual entry
+            return data
+        # Compute the current move
+        move_id = False
+        partner_id = False
+        if context.get('journal_id', False) and context.get('period_id', False):
+            if 'move_id' in fields:
+                cr.execute('SELECT move_id \
+                    FROM \
+                        account_move_line \
+                    WHERE \
+                        journal_id = %s and period_id = %s AND create_uid = %s AND state = %s \
+                    ORDER BY id DESC limit 1',
+                    (context['journal_id'], context['period_id'], uid, 'draft'))
+                res = cr.fetchone()
+                move_id = (res and res[0]) or False
+                if not move_id:
+                    return data
+                else:
+                    data['move_id'] = move_id
+            if 'date' in fields:
+                cr.execute('SELECT date \
+                    FROM \
+                        account_move_line \
+                    WHERE \
+                        journal_id = %s AND period_id = %s AND create_uid = %s \
+                    ORDER BY id DESC',
+                    (context['journal_id'], context['period_id'], uid))
+                res = cr.fetchone()
+                if res:
+                    data['date'] = res[0]
+                else:
+                    period = period_obj.browse(cr, uid, context['period_id'],
+                            context=context)
+                    data['date'] = period.date_start
+        if not move_id:
+            return data
+        total = 0
+        ref_id = False
+        move = move_obj.browse(cr, uid, move_id, context=context)
+        if 'name' in fields:
+            data.setdefault('name', move.line_id[-1].name)
+        acc1 = False
+        for l in move.line_id:
+            acc1 = l.account_id
+            partner_id = partner_id or l.partner_id.id
+            ref_id = ref_id or l.ref
+            total += (l.debit or 0.0) - (l.credit or 0.0)
+
+        if 'ref' in fields:
+            data['ref'] = ref_id
+        if 'partner_id' in fields:
+            data['partner_id'] = partner_id
+
+        if move.journal_id.type == 'purchase':
+            if total > 0:
+                account = move.journal_id.default_credit_account_id
+            else:
+                account = move.journal_id.default_debit_account_id
+        else:
+            if total > 0:
+                account = move.journal_id.default_credit_account_id
+            else:
+                account = move.journal_id.default_debit_account_id
+        part = partner_id and partner_obj.browse(cr, uid, partner_id) or False
+        # part = False is acceptable for fiscal position.
+        account = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, account.id)
+        if account:
+            account = account_obj.browse(cr, uid, account, context=context)
+
+        if account and ((not fields) or ('debit' in fields) or ('credit' in fields)):
+            data['account_id'] = account.id
+            # Propose the price VAT excluded, the VAT will be added when confirming line
+            if account.tax_ids:
+                taxes = fiscal_pos_obj.map_tax(cr, uid, part and part.property_account_position or False, account.tax_ids)
+                tax = tax_obj.browse(cr, uid, taxes)
+                for t in tax_obj.compute_inv(cr, uid, tax, total, 1):
+                    total -= t['amount']
+
+        s = -total
+        data['debit'] = s > 0  and s or 0.0
+        data['credit'] = s < 0  and -s or 0.0
+
+        if account and account.currency_id:
+            data['currency_id'] = account.currency_id.id
+            acc = account
+            if s>0:
+                acc = acc1
+            compute_ctx = context.copy()
+            compute_ctx.update({
+                    'res.currency.compute.account': acc,
+                    'res.currency.compute.account_invert': True,
+                })
+            v = currency_obj.compute(cr, uid, account.company_id.currency_id.id, data['currency_id'], s, context=compute_ctx)
+            data['amount_currency'] = v
+>>>>>>> MERGE-SOURCE
         return data
 
     def on_create_write(self, cr, uid, id, context=None):
@@ -465,9 +598,16 @@
                                 }),
         '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'),
         'state': fields.selection([('draft','Unbalanced'), ('valid','Balanced')], 'Status', readonly=True),
+=======
+        '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'),
+        '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.'),
+>>>>>>> MERGE-SOURCE
         '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."),
         'tax_amount': fields.float('Tax/Base Amount', digits_compute=dp.get_precision('Account'), select=True, help="If the Tax account is a tax code account, this field will contain the taxed amount.If the tax account is base tax code, "\
                     "this field will contain the basic amount(without tax)."),
@@ -544,10 +684,14 @@
         'date_created': fields.date.context_today,
         'state': 'draft',
         'currency_id': _get_currency,
+<<<<<<< TREE
         'journal_id': _get_journal,
         'credit': 0.0,
         'debit': 0.0,
         'amount_currency': 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': _get_period,
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.move.line', context=c)
@@ -585,6 +729,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):
@@ -620,6 +771,7 @@
         return True
 
     _constraints = [
+<<<<<<< TREE
         (_check_no_view, 'You cannot create journal items on an account of type view.', ['account_id']),
         (_check_no_closed, 'You cannot create journal items on closed account.', ['account_id']),
         (_check_company_id, 'Account and Period must belong to the same company.', ['company_id']),
@@ -628,6 +780,12 @@
         (_check_currency_and_amount, "You cannot create journal items with a secondary currency without recording both 'currency' and 'amount currency' field.", ['currency_id','amount_currency']),
         (_check_currency_amount, 'The amount expressed in the secondary currency must be positive when the journal item is a debit and negative when if it is a credit.', ['amount_currency']),
         (_check_currency_company, "You cannot provide a secondary currency if it is the same than the company one." , ['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
@@ -722,6 +880,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.list_partners_to_reconcile(cr, uid, context=context)
@@ -777,7 +941,11 @@
             else:
                 currency_id = line.company_id.currency_id
             if line.reconcile_id:
+<<<<<<< TREE
                 raise osv.except_osv(_('Warning'), _("Journal Item '%s' (id: %s), Move '%s' is already reconciled!") % (line.name, line.id, line.move_id.name)) 
+=======
+                raise osv.except_osv(_('Warning'), _("Journal Item '%s' (id: %s), Move '%s' is already reconciled!") % (line.name, line.id, line.move_id.name))
+>>>>>>> MERGE-SOURCE
             if line.reconcile_partial_id:
                 for line2 in line.reconcile_partial_id.line_partial_ids:
                     if not line2.reconcile_id:
@@ -853,6 +1021,7 @@
         if r[0][1] != None:
             raise osv.except_osv(_('Error!'), _('Some entries are already reconciled.'))
 
+<<<<<<< TREE
         if context.get('fy_closing'):
             # We don't want to generate any write-off when being called from the
             # wizard used to close a fiscal year (and it doesn't give us any
@@ -860,6 +1029,10 @@
             pass
         elif (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))):
+=======
+        if (not currency_obj.is_zero(cr, uid, account.company_id.currency_id, writeoff)) or \
+           (not context.get('fy_closing', False) and account.currency_id and (not currency_obj.is_zero(cr, uid, account.currency_id, currency))):
+>>>>>>> MERGE-SOURCE
             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:
@@ -993,6 +1166,126 @@
             'context':context,
         }
 
+<<<<<<< TREE
+=======
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        journal_pool = self.pool.get('account.journal')
+        if context is None:
+            context = {}
+        result = super(account_move_line, self).fields_view_get(cr, uid, view_id, view_type, context=context, toolbar=toolbar, submenu=submenu)
+        if view_type != 'tree':
+            #Remove the toolbar from the form view
+            if view_type == 'form':
+                if result.get('toolbar', False):
+                    result['toolbar']['action'] = []
+            #Restrict the list of journal view in search view
+            if view_type == 'search' and result['fields'].get('journal_id', False):
+                result['fields']['journal_id']['selection'] = journal_pool.name_search(cr, uid, '', [], context=context)
+                ctx = context.copy()
+                #we add the refunds journal in the selection field of journal
+                if context.get('journal_type', False) == 'sale':
+                    ctx.update({'journal_type': 'sale_refund'})
+                    result['fields']['journal_id']['selection'] += journal_pool.name_search(cr, uid, '', [], context=ctx)
+                elif context.get('journal_type', False) == 'purchase':
+                    ctx.update({'journal_type': 'purchase_refund'})
+                    result['fields']['journal_id']['selection'] += journal_pool.name_search(cr, uid, '', [], context=ctx)
+            return result
+        if context.get('view_mode', False):
+            return result
+        fld = []
+        fields = {}
+        flds = []
+        title = _("Accounting Entries") #self.view_header_get(cr, uid, view_id, view_type, context)
+        xml = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5" on_write="on_create_write" colors="red:state==\'draft\';black:state==\'valid\'">\n\t''' % (title)
+
+        ids = journal_pool.search(cr, uid, [])
+        journals = journal_pool.browse(cr, uid, ids, context=context)
+        all_journal = [None]
+        common_fields = {}
+        total = len(journals)
+        for journal in journals:
+            all_journal.append(journal.id)
+            for field in journal.view_id.columns_id:
+                if not field.field in fields:
+                    fields[field.field] = [journal.id]
+                    fld.append((field.field, field.sequence, field.name))
+                    flds.append(field.field)
+                    common_fields[field.field] = 1
+                else:
+                    fields.get(field.field).append(journal.id)
+                    common_fields[field.field] = common_fields[field.field] + 1
+        fld.append(('period_id', 3, _('Period')))
+        fld.append(('journal_id', 10, _('Journal')))
+        flds.append('period_id')
+        flds.append('journal_id')
+        fields['period_id'] = all_journal
+        fields['journal_id'] = all_journal
+        fld = sorted(fld, key=itemgetter(1))
+        widths = {
+            'statement_id': 50,
+            'state': 60,
+            'tax_code_id': 50,
+            'move_id': 40,
+        }
+        for field_it in fld:
+            field = field_it[0]
+            if common_fields.get(field) == total:
+                fields.get(field).append(None)
+#            if field=='state':
+#                state = 'colors="red:state==\'draft\'"'
+            attrs = []
+            if field == 'debit':
+                attrs.append('sum = "%s"' % _("Total debit"))
+
+            elif field == 'credit':
+                attrs.append('sum = "%s"' % _("Total credit"))
+
+            elif field == 'move_id':
+                attrs.append('required = "False"')
+
+            elif field == 'account_tax_id':
+                attrs.append('domain="[(\'parent_id\', \'=\' ,False)]"')
+                attrs.append("context=\"{'journal_id': journal_id}\"")
+
+            elif field == 'account_id' and journal.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)"')
+
+            elif field == 'partner_id':
+                attrs.append('on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"')
+
+            elif field == 'journal_id':
+                attrs.append("context=\"{'journal_id': journal_id}\"")
+
+            elif field == 'statement_id':
+                attrs.append("domain=\"[('state', '!=', 'confirm'),('journal_id.type', '=', 'bank')]\"")
+
+            elif field == 'date':
+                attrs.append('on_change="onchange_date(date)"')
+
+            elif field == 'analytic_account_id':
+                attrs.append('''groups="analytic.group_analytic_accounting"''') # Currently it is not working due to framework problem may be ..
+
+            if field in ('amount_currency', 'currency_id'):
+                attrs.append('on_change="onchange_currency(account_id, amount_currency, currency_id, date, journal_id)"')
+                attrs.append('''attrs="{'readonly': [('state', '=', 'valid')]}"''')
+
+            if field in widths:
+                attrs.append('width="'+str(widths[field])+'"')
+
+            if field in ('journal_id',):
+                attrs.append("invisible=\"context.get('journal_id', False)\"")
+            elif field in ('period_id',):
+                attrs.append("invisible=\"context.get('period_id', False)\"")
+            else:
+                attrs.append("invisible=\"context.get('visible_id') not in %s\"" % (fields.get(field)))
+            xml += '''<field name="%s" %s/>\n''' % (field,' '.join(attrs))
+
+        xml += '''</tree>'''
+        result['arch'] = xml
+        result['fields'] = self.fields_get(cr, uid, flds, context)
+        return result
+
+>>>>>>> MERGE-SOURCE
     def _check_moves(self, cr, uid, context=None):
         # use the first move ever created for this journal and period
         if context is None:
@@ -1038,9 +1331,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):
@@ -1052,7 +1351,11 @@
         if isinstance(ids, (int, long)):
             ids = [ids]
         if vals.get('account_tax_id', False):
+<<<<<<< TREE
             raise osv.except_osv(_('Unable to change tax!'), _('You cannot change the tax, you should remove and recreate lines.'))
+=======
+            raise osv.except_osv(_('Unable to change tax !'), _('You can not change the tax, you should remove and recreate lines !'))
+>>>>>>> MERGE-SOURCE
         if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
             raise osv.except_osv(_('Bad Account!'), _('You cannot use an inactive account.'))
         if update_check:
@@ -1133,11 +1436,17 @@
         if context is None:
             context = {}
         if vals.get('move_id', False):
+<<<<<<< TREE
             move = self.pool.get('account.move').browse(cr, uid, vals['move_id'], context=context)
             if move.company_id:
                 vals['company_id'] = move.company_id.id
             if move.date and not vals.get('date'):
                 vals['date'] = move.date
+=======
+            company_id = self.pool.get('account.move').read(cr, uid, vals['move_id'], ['company_id']).get('company_id', False)
+            if company_id:
+                vals['company_id'] = company_id[0]
+>>>>>>> MERGE-SOURCE
         if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
             raise osv.except_osv(_('Bad Account!'), _('You cannot use an inactive account.'))
         if 'journal_id' in vals and vals['journal_id']:

=== modified file 'account/account_report.xml'
--- account/account_report.xml	2013-02-22 15:59:32 +0000
+++ account/account_report.xml	2013-06-03 06:13:34 +0000
@@ -41,5 +41,32 @@
             groups="group_account_user,group_account_manager"
             parent="account.menu_finance_generic_reporting" sequence="3"/>
 
+<<<<<<< TREE
+=======
+        <report id="account_account_balance_landscape"
+            string="Account balance"
+            model="account.account"
+            name="account.account.balance.landscape"
+            rml="account/report/account_balance_landscape.rml"
+            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"/>
+
+>>>>>>> MERGE-SOURCE
     </data>
 </openerp>

=== modified file 'account/account_view.xml'
--- account/account_view.xml	2013-05-14 12:03:41 +0000
+++ account/account_view.xml	2013-06-03 06:13:34 +0000
@@ -240,6 +240,41 @@
                 </search>
             </field>
         </record>
+<<<<<<< TREE
+=======
+
+        <record id="view_account_list" model="ir.ui.view">
+            <field name="name">account.account.list</field>
+            <field name="model">account.account</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="1"/>
+            <field name="arch" type="xml">
+                <tree colors="blue:type in ('view');black:type in ('other','receivable','payable','consolidation');gray:type in ('closed')" string="Chart of accounts" toolbar="1" >
+                    <field name="code"/>
+                    <field name="name"/>
+                    <field name="parent_id" invisible="1"/>
+                    <field name="user_type" invisible="1"/>
+                    <field name="debit"/>
+                    <field name="credit"/>
+                    <field name="balance"/>
+                    <field name="type"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="company_currency_id"/>
+                </tree>
+            </field>
+        </record>
+        <record id="view_treasory_graph" model="ir.ui.view">
+           <field name="name">account.treasury.graph</field>
+           <field name="model">account.account</field>
+           <field name="type">graph</field>
+           <field name="arch" type="xml">
+               <graph string="Treasury Analysis" type="bar">
+                  <field name="name"/>
+                  <field name="balance" operator="+"/>
+               </graph>
+         </field>
+      </record>
+>>>>>>> MERGE-SOURCE
         <record id="action_account_form" model="ir.actions.act_window">
             <field name="name">Accounts</field>
             <field name="res_model">account.account</field>
@@ -409,6 +444,7 @@
                             <field name="company_id" groups="base.group_multi_company"/>
                         </group>
                     </group>
+<<<<<<< TREE
                     <notebook>
                         <page string="Advanced Settings">
                             <group>
@@ -422,6 +458,45 @@
                                     <field name="allow_date"/>
                                     <field name="group_invoice_lines"/>
                                 </group>
+=======
+                    <notebook colspan="4">
+                        <page string="General Information">
+                            <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_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                                </group>
+                                <group colspan="2" col="2">
+                                    <separator string="Journal View" colspan="4"/>
+                                    <field name="view_id" widget="selection"/>
+                                </group>
+                            </group>
+
+                            <group colspan="2" col="2">
+                                <separator string="Company" colspan="4"/>
+                                <field name="company_id" groups="base.group_multi_company"/>
+                                <field name="user_id" groups="base.group_extended"/>
+                                <field name="currency"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator string="Validations" colspan="4"/>
+                                <field name="allow_date" groups="base.group_extended"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator string="Other Configuration" colspan="4"/>
+                                <field name="centralisation" groups="base.group_extended"/>
+                                <field name="entry_posted"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator string="Invoicing Data" colspan="4"/>
+<!--                                <field name="invoice_sequence_id"/>-->
+                                <field name="group_invoice_lines"/>
+                            </group>
+                            <group colspan="2" col="2" groups="base.group_extended">
+                                <separator string="Sequence" colspan="4"/>
+                                <field name="sequence_id" required="0"/>
+>>>>>>> MERGE-SOURCE
                             </group>
                         </page>
                         <page string="Entry Controls">
@@ -576,10 +651,16 @@
                             <field name="balance_end_real" widget="monetary" options='{"currency_field" : "currency"}'/>
                         </group>
                     </group>
+<<<<<<< TREE
 
                     <notebook>
                         <page string="Transactions" name="statement_line_ids">
                             <field name="line_ids" context="{'date':date}">
+=======
+                    <notebook colspan="4">
+                        <page string="Transaction" name="statement_line_ids">
+                            <field colspan="4" name="line_ids" nolabel="1" context="{'date':date}">
+>>>>>>> MERGE-SOURCE
                                 <tree editable="bottom" string="Statement lines">
                                     <field name="sequence" readonly="1" invisible="1"/>
                                     <field name="date"/>
@@ -608,6 +689,28 @@
                                 </form>
                             </field>
                         </page>
+<<<<<<< TREE
+=======
+                        <page string="Journal Entries" name="move_live_ids">
+                            <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>
+>>>>>>> MERGE-SOURCE
                     </notebook>
                 </sheet>
                 </form>
@@ -1287,9 +1390,14 @@
                     </group>
                     <notebook>
                         <page string="Journal Items">
+<<<<<<< TREE
                             <field name="line_id" widget="one2many_list"
                               context="{'line_id': line_id , 'journal_id': journal_id }">
                                 <form string="Journal Item" version="7.0">
+=======
+                            <field colspan="4" name="line_id" nolabel="1" height="250" widget="one2many_list" default_get="{'lines':line_id , 'journal':journal_id, 'period_id':period_id}">
+                                <form string="Journal Item">
+>>>>>>> MERGE-SOURCE
                                     <group col="6" colspan="4">
                                         <field name="name"/>
                                         <field name="ref"/>
@@ -1444,10 +1552,15 @@
         <act_window
             id="act_account_move_to_account_move_line_open"
             name="Journal Items"
+<<<<<<< TREE
             context="{'search_default_journal_id': active_id, 'default_journal_id': active_id}"
+=======
+            context="{'search_default_move_id':[active_id], 'default_move_id': active_id}"
+>>>>>>> MERGE-SOURCE
             res_model="account.move.line"
             src_model="account.move"/>
 
+<<<<<<< TREE
         <act_window
             domain="[('reconcile_id', '=', active_id)]"
             id="act_account_acount_move_line_reconcile_open"
@@ -1456,6 +1569,66 @@
             src_model="account.move.reconcile"/>
 
         <!-- TODO: Print Journal (and change state), Close Journal (and verify that there is no draft Entry Lines) -->
+=======
+        <record id="action_move_line_search" model="ir.actions.act_window">
+            <field name="name">Journal Items</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.move.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_move_line_tree"/>
+            <field name="search_view_id" ref="view_account_move_line_filter"/>
+        </record>
+        <record id="action_move_line_search_view1" model="ir.actions.act_window.view">
+            <field eval="10" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_move_line_tree"/>
+            <field name="act_window_id" ref="action_move_line_search"/>
+        </record>
+        <record id="action_move_line_search_view2" model="ir.actions.act_window.view">
+            <field eval="11" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="act_window_id" ref="action_move_line_search"/>
+        </record>
+
+        <act_window
+            context="{'search_default_next_partner':1,'view_mode':True}"
+            id="action_account_manual_reconcile" name="Journal Items"
+            res_model="account.move.line"
+            view_id="view_move_line_tree"/>
+
+
+        <menuitem
+             name="Manual Reconciliation" icon="STOCK_EXECUTE"
+             action="action_account_manual_reconcile"
+             id="menu_manual_reconcile"
+             parent="account.periodical_processing_reconciliation"/>
+
+
+        <act_window
+            id="act_account_acount_move_line_open"
+            name="Entries"
+            context="{'search_default_account_id':[active_id], 'search_default_unreconciled':0, 'default_account_id': active_id}"
+            res_model="account.move.line"
+            src_model="account.account"/>
+
+        <act_window
+            id="act_account_acount_move_line_open_unreconciled"
+            name="Unreconciled Entries"
+            res_model="account.move.line"
+            context="{'search_default_account_id':[active_id], 'search_default_unreconciled':1, 'default_account_id': active_id}"
+            src_model="account.account"/>
+
+        <act_window domain="[('reconcile_id', '=', active_id)]" id="act_account_acount_move_line_reconcile_open" name="Reconciled entries" res_model="account.move.line" src_model="account.move.reconcile"/>
+
+
+        <!--
+    TODO:
+        Print Journal (and change state)
+        Close Journal (and verify that there is no draft Entry Lines)
+-->
+
+>>>>>>> MERGE-SOURCE
         <record id="view_journal_period_tree" model="ir.ui.view">
             <field name="name">account.journal.period.tree</field>
             <field name="model">account.journal.period</field>
@@ -1766,11 +1939,106 @@
             <field name="model">account.subscription.line</field>
             <field eval="20" name="priority"/>
             <field name="arch" type="xml">
+<<<<<<< TREE
                 <form string="Subscription lines" version="7.0">
                     <group col="4">
                         <field name="subscription_id"/>
                         <field name="date"/>
                         <field name="move_id"/>
+=======
+                <form string="Subscription lines">
+                    <field name="subscription_id"/>
+                    <field name="date"/>
+                    <field name="move_id"/>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_move_line_tree1" model="ir.actions.act_window">
+            <field name="name">Journal Items</field>
+            <field name="res_model">account.move.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('account_id','child_of', [active_id]),('state','&lt;&gt;','draft')]</field>
+            <field name="context">{'account_id':active_id}</field>
+        </record>
+
+        <record id="view_move_line_tax_tree" model="ir.ui.view">
+            <field name="name">account.move.line.tax.tree</field>
+            <field name="model">account.move.line</field>
+            <field name="type">tree</field>
+            <field eval="4" name="priority"/>
+            <field name="arch" type="xml">
+                <tree colors="red:state in ('draft');black:state in ('valid')" string="Journal Items">
+                    <field name="date"/>
+                    <field name="move_id"/>
+                    <field name="statement_id" string="St."/>
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="account_id"/>
+                    <field name="tax_code_id"/>
+                    <field name="tax_amount"/>
+                    <field name="debit" sum="Total debit"/>
+                    <field name="credit" sum="Total credit"/>
+                    <field name="account_tax_id"/>
+                    <field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="action_tax_code_line_open" model="ir.actions.act_window">
+            <field name="name">Journal Items</field>
+            <field name="res_model">account.move.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_move_line_tax_tree"/>
+            <field name="domain">[('tax_code_id','child_of',active_id),('state','&lt;&gt;','draft')]</field>
+        </record>
+        <record id="ir_open_tax_move_line" model="ir.values">
+            <field name="key2">tree_but_open</field>
+            <field name="model">account.tax.code</field>
+            <field name="name">Tax Details</field>
+            <field eval="'ir.actions.act_window,%d'%action_tax_code_line_open" name="value"/>
+            <field eval="True" name="object"/>
+        </record>
+
+
+        <!--
+    # Admin config
+    -->
+
+        <act_window
+           id="act_account_journal_2_account_bank_statement"
+           name="Bank statements"
+           context="{'search_default_journal_id': active_id, 'default_journal_id': active_id}"
+           res_model="account.bank.statement"
+           src_model="account.journal"/>
+
+        <act_window
+           id="act_account_journal_2_account_move_line"
+           name="Journal Items"
+           context="{'search_default_journal_id':active_id, 'default_journal_id': active_id}"
+           res_model="account.move.line"
+           src_model="account.journal"/>
+
+        <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"/>
+
+        <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"/>
+
+        <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
+            <field name="name">Create Account</field>
+            <field name="model">account.addtmpl.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Create Account">
+                    <separator col="4" colspan="4" string="Create an Account based on this template"/>
+                    <field name="cparent_id"/>
+                    <newline/>
+                    <group col="2" colspan="2">
+                        <button icon="gtk-cancel" special="cancel" string="Cancel" name="action_cancel" type="object"/>
+                        <button icon="gtk-ok" name="action_create" string="Add" type="object"/>
+>>>>>>> MERGE-SOURCE
                     </group>
                 </form>
             </field>
@@ -2268,7 +2536,11 @@
                     </group>
                     <notebook>
                         <page string="Cash Transactions" attrs="{'invisible': [('state','=','draft')]}">
+<<<<<<< TREE
                             <field name="line_ids" context="{'date':date}">
+=======
+                            <field colspan="4" name="line_ids" nolabel="1" context="{'date':date}">
+>>>>>>> MERGE-SOURCE
                                 <tree editable="bottom" string="Statement lines">
                                     <field name="sequence" invisible="1"/>
                                     <field name="date"/>

=== modified file 'account/board_account_view.xml'
--- account/board_account_view.xml	2012-11-29 22:26:45 +0000
+++ account/board_account_view.xml	2013-06-03 06:13:34 +0000
@@ -2,6 +2,7 @@
 <openerp>
     <data>
 
+<<<<<<< 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>
@@ -10,18 +11,85 @@
             <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="note_account_type" model="board.note.type">
+            <field name="name">Accountants</field>
+>>>>>>> MERGE-SOURCE
+        </record>
+
+<<<<<<< TREE
+=======
+        <record id="action_aged_receivable" model="ir.actions.act_window">
+            <field name="name">Receivable Accounts</field>
+            <field name="res_model">report.account.receivable</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="domain">[('type','=','receivable')]</field>
+        </record>
+        <record id="action_aged_income" model="ir.actions.act_window">
+            <field name="name">Income Accounts</field>
+            <field name="res_model">report.account.receivable</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="domain">[('type','=','income')]</field>
+        </record>
+      	
+      	<record id="action_company_analysis_tree" model="ir.actions.act_window">
+        	<field name="name">Company Analysis</field>
+			<field name="res_model">account.entries.report</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,graph</field>
+			<field name="context">{'group_by':['user_type'], 'group_by_no_leaf':1}</field>
+			<field name="view_id" ref="account.view_account_entries_report_tree"/>
+			<field name="domain">[('year','=',time.strftime('%Y'))]</field>
+		</record>
+		
+		<record id="action_treasory_graph" model="ir.actions.act_window">
+			<field name="name">Treasury</field>
+			<field name="res_model">account.account</field>
+  			<field name="view_type">form</field>
+			<field name="view_mode">graph,tree</field>
+			<field name="domain">[('type','=','liquidity')]</field>
+			<field name="view_id" ref="account.view_treasory_graph"/>
+		</record>
+
+		<record id="action_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="arch" type="xml">
+<<<<<<< TREE
                 <form string="Account Board" version="7.0">
                     <board style="2-1">
                         <column>
                             <action name="%(action_company_analysis_tree)d" string="Company Analysis"/>
                         </column>
                     </board>
+=======
+                <form string="Account 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/data/configurable_account_chart.xml'
--- account/data/configurable_account_chart.xml	2012-11-29 22:26:45 +0000
+++ account/data/configurable_account_chart.xml	2013-06-03 06:13:34 +0000
@@ -31,10 +31,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	2012-12-15 18:15:44 +0000
+++ account/demo/account_minimal.xml	2013-06-03 06:13:34 +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	2013-03-14 11:27:40 +0000
+++ account/i18n/account.pot	2013-06-03 06:13:34 +0000
@@ -4,10 +4,17 @@
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 7.0alpha\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-21 17:04+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"
@@ -21,6 +28,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: sql_constraint:account.fiscal.position.account:0
 msgid "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
@@ -28,6 +36,16 @@
 #. module: account
 #: help:account.tax.code,sequence:0
 msgid "Determine the display order in the report 'Accounting \\ Reporting \\ Generic Reporting \\ Taxes \\ Taxes Report'"
+=======
+#: view:account.journal:0
+msgid "Other Configuration"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:516
+#, python-format
+msgid "You cannot remove/deactivate an account which is set as a property to any Partner."
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -53,7 +71,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_bank_statement.py:368
+=======
+#: code:addons/account/invoice.py:793
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Journal item \"%s\" is not valid."
 msgstr ""
@@ -83,6 +105,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: constraint:account.account.template:0
 msgid "Error!\n"
 "You cannot create recursive account templates."
@@ -90,6 +113,32 @@
 
 #. module: account
 #. openerp-web
+=======
+#: view:account.unreconcile:0
+msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Accounting Entries-"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1305
+#, python-format
+msgid "You can not delete posted movement: \"%s\"!"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.line,origin:0
+msgid "Origin"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,reconcile:0
+>>>>>>> MERGE-SOURCE
 #: view:account.automatic.reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
@@ -117,6 +166,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:641
 #: code:addons/account/account.py:686
 #: code:addons/account/account.py:781
@@ -136,6 +186,9 @@
 #: code:addons/account/wizard/account_state_open.py:37
 #: code:addons/account/wizard/account_validate_account_move.py:39
 #: code:addons/account/wizard/account_validate_account_move.py:61
+=======
+#: code:addons/account/invoice.py:1436
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -201,11 +254,46 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: model:ir.model,name:account.model_account_tax
+msgid "account.tax"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:915
+#, python-format
+msgid "No period defined for this date: %s !\n"
+"Please create a fiscal year."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: help:account.model.line,sequence:0
+msgid "The sequence field is used to order the resources from lower sequences to higher ones"
+msgstr ""
+
+#. module: account
+#: help:account.tax.code,notprintable:0
+#: help:account.tax.code.template,notprintable:0
+msgid "Check this box if you don't want any VAT related to this Tax Code to appear on invoices"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:1224
+#, python-format
+msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries are an input of the reconciliation."
 msgstr ""
@@ -216,6 +304,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: model:mail.message.subtype,name:account.mt_invoice_validated
 msgid "Validated"
 msgstr ""
@@ -239,6 +328,16 @@
 #: help:account.config.settings,module_account_voucher:0
 msgid "This includes all the basic requirements of voucher entries for bank, cash, sales, purchase, expense, contra, etc.\n"
 "                This installs the module account_voucher."
+=======
+#: code:addons/account/account_move_line.py:1182
+#, python-format
+msgid "You can not add/modify entries in a closed journal."
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Calculated Balance"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -257,6 +356,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: model:ir.actions.act_window,help:account.action_invoice_tree3
 msgid "<p class=\"oe_view_nocontent_create\">\n"
 "                Click to create a customer refund. \n"
@@ -268,6 +368,21 @@
 "                can generate it directly from the related customer invoice.\n"
 "              </p>\n"
 "            "
+=======
+#: view:account.move.line:0
+msgid "St."
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:532
+#, python-format
+msgid "Invoice line account company does not match with invoice company."
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,field:0
+msgid "Field Name"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -522,9 +637,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
@@ -597,6 +718,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
 #, python-format
@@ -621,6 +743,15 @@
 
 #. module: account
 #: code:addons/account/account.py:3153
+=======
+#: field:account.invoice.tax,tax_amount:0
+msgid "Tax Code Amount"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2823
+#: code:addons/account/installer.py:434
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -658,6 +789,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: constraint:account.move:0
 msgid "You cannot create more than one move per period on a centralized journal."
 msgstr ""
@@ -665,6 +797,12 @@
 #. module: account
 #: help:account.tax,account_analytic_paid_id:0
 msgid "Set the analytic account that will be used by default on the invoice tax lines for refunds. Leave empty if you don't want to use an analytic account on the invoice tax lines by default."
+=======
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+#, python-format
+msgid "To reconcile the entries company should be the same for all entries"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -749,6 +887,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: field:account.invoice.refund,filter_refund:0
 msgid "Refund Method"
 msgstr ""
@@ -756,6 +895,11 @@
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
+=======
+#: code:addons/account/wizard/account_change_currency.py:38
+#, python-format
+msgid "You can only change currency for Draft Invoice !"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -882,8 +1026,25 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: field:account.journal.cashbox.line,pieces:0
 msgid "Values"
+=======
+#: view:account.move.line:0
+msgid "Next Partner to reconcile"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1197
+#, python-format
+msgid "You can not do this modification on a confirmed entry ! Please note that you can just change some non important fields !"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,delay_to_pay:0
+msgid "Avg. Delay To Pay"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -900,6 +1061,7 @@
 
 #. module: account
 #: report:account.overdue:0
+#: report:account.aged_trial_balance:0
 msgid "Due"
 msgstr ""
 
@@ -1005,10 +1167,15 @@
 #: 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
 #: view:account.config.settings:0
 msgid "Features"
 msgstr ""
@@ -1019,6 +1186,14 @@
 #: code:addons/account/account_invoice.py:73
 #: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
+=======
+#: 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 ""
@@ -1109,6 +1284,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: field:account.config.settings,sale_refund_journal_id:0
 msgid "Sale refund journal"
 msgstr ""
@@ -1129,6 +1305,30 @@
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
+=======
+#: selection:account.account.type,report_type:0
+msgid "Profit & Loss (Expense Accounts)"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "-"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Manager"
+msgstr ""
+
+#. module: account
+#: view:account.subscription.generate:0
+msgid "Generate Entries before:"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: selection:account.bank.accounts.wizard,account_type:0
 #: code:addons/account/account.py:3044
 #, python-format
@@ -1233,13 +1433,27 @@
 
 #. 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:990
+#, python-format
+msgid "You can not modify/delete a journal with entries for this period !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: help:account.invoice,origin:0
 #: help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
@@ -1391,6 +1605,7 @@
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_22
+#: report:account.aged_trial_balance:0
 msgid "Partners"
 msgstr ""
 
@@ -1420,9 +1635,18 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:612
 #: code:addons/account/account.py:767
 #: code:addons/account/account.py:768
+=======
+#: model:ir.actions.report.xml,name:account.account_central_journal
+msgid "Central Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1277
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -1531,6 +1755,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: field:account.tax.code,code:0
 #: field:account.tax.code.template,code:0
 msgid "Case Code"
@@ -1539,17 +1764,28 @@
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
-msgstr ""
-
-#. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-#: selection:account.bank.statement,state:0
-#: selection:account.entries.report,type:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.period,state:0
-msgid "Closed"
+=======
+#: view:account.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"
+>>>>>>> MERGE-SOURCE
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
 msgstr ""
 
 #. module: account
@@ -1673,8 +1909,18 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: field:account.config.settings,group_analytic_accounting:0
 msgid "Analytic accounting"
+=======
+#: field:wizard.multi.charts.accounts,seq_journal:0
+msgid "Separated Journal Sequences"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Responsible"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -1733,6 +1979,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.installer:0
 msgid "Select a configuration package to setup automatically your\n"
 "                        taxes and chart of accounts."
@@ -1752,6 +1999,26 @@
 #: report:account.journal.period.print.sale.purchase:0
 #: view:account.tax.template:0
 msgid "Tax Declaration"
+=======
+#: model:ir.actions.act_window,help:account.action_account_chart
+msgid "Display your company chart of accounts per fiscal year and filter by period. Have a complete tree view of all journal items per account code by clicking on an account."
+msgstr ""
+
+#. module: account
+#: constraint:account.fiscalyear:0
+msgid "Error! You cannot define overlapping fiscal years"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:799
+#, python-format
+msgid "The account is not defined to be reconciled !"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,pieces:0
+msgid "Values"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -1770,6 +2037,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: field:account.config.settings,module_account_payment:0
 msgid "Manage payment orders"
 msgstr ""
@@ -1783,6 +2051,11 @@
 #: view:account.bank.statement:0
 #: field:account.bank.statement,last_closing_balance:0
 msgid "Last Closing Balance"
+=======
+#: code:addons/account/account_move_line.py:806
+#, python-format
+msgid "You have to provide an account for the write off entry !"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -1806,6 +2079,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: help:account.tax,base_code_id:0
 #: help:account.tax,ref_base_code_id:0
 #: help:account.tax,ref_tax_code_id:0
@@ -1815,6 +2089,11 @@
 #: help:account.tax.template,ref_tax_code_id:0
 #: help:account.tax.template,tax_code_id:0
 msgid "Use this code for the tax declaration."
+=======
+#: code:addons/account/account_cash_statement.py:329
+#, python-format
+msgid "User %s does not have rights to access %s journal !"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -1833,8 +2112,14 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
+=======
+#: code:addons/account/account.py:509
+#, python-format
+msgid "You cannot deactivate an account that contains account moves."
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -1843,6 +2128,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: field:account.bank.statement,message_ids:0
 #: field:account.invoice,message_ids:0
 msgid "Messages"
@@ -1905,6 +2191,14 @@
 #: code:addons/account/wizard/account_use_model.py:44
 #: code:addons/account/wizard/pos_box.py:32
 #: code:addons/account/wizard/pos_box.py:36
+=======
+#: 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 ""
@@ -2089,6 +2383,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:8
 #, python-format
@@ -2118,6 +2413,20 @@
 msgstr ""
 
 #. module: account
+=======
+#: model:ir.actions.act_window,name:account.action_account_pl_report
+msgid "Account Profit And Loss"
+msgstr ""
+
+#. module: account
+#: field:account.installer,config_logo:0
+#: field:account.installer.modules,config_logo:0
+#: field:wizard.multi.charts.accounts,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.invoice:0
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
@@ -2244,6 +2553,23 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/installer.py:348
+#, python-format
+msgid " Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1333
+#, python-format
+msgid "There is no default default debit account defined \n"
+"on journal \"%s\""
+msgstr ""
+
+#. module: account
+#: help:account.account,type:0
+>>>>>>> MERGE-SOURCE
 #: help:account.account.template,type:0
 #: help:account.entries.report,type:0
 msgid "This type is used to differentiate types with special effects in OpenERP: view can not have entries, consolidation are accounts that can have children accounts for multi-company consolidations, payable/receivable are for partners accounts (for debit/credit computations), closed for depreciated accounts."
@@ -2277,9 +2603,16 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: field:account.tax,price_include:0
 #: field:account.tax.template,price_include:0
 msgid "Tax Included in Price"
+=======
+#: code:addons/account/account.py:2888
+#: code:addons/account/installer.py:498
+#, python-format
+msgid "ECNJ"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -2296,12 +2629,27 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: help:account.config.settings,default_sale_tax:0
 msgid "This sale tax will be assigned by default on new products."
 msgstr ""
 
 #. module: account
 #: report:account.general.ledger_landscape:0
+=======
+#: code:addons/account/invoice.py:351
+#, python-format
+msgid "There is no Accounting Journal of type Sale/Purchase defined!"
+msgstr ""
+
+#. module: account
+#: view:product.category:0
+msgid "Accounting Properties"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger_landscape:0
+>>>>>>> MERGE-SOURCE
 #: report:account.journal.period.print:0
 #: report:account.journal.period.print.sale.purchase:0
 msgid "Entries Sorted By"
@@ -2359,6 +2707,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 ""
 
@@ -2486,6 +2839,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: model:account.payment.term,name:account.account_payment_term_advance
 #: model:account.payment.term,note:account.account_payment_term_advance
 msgid "30% Advance End 30 Days"
@@ -2494,6 +2848,14 @@
 #. module: account
 #: view:account.entries.report:0
 msgid "Unreconciled entries"
+=======
+#: code:addons/account/invoice.py:552
+#, python-format
+msgid "Can't find any account journal of %s type for this company.\n"
+"\n"
+"You can create one in the menu: \n"
+"Configuration\\Financial Accounting\\Accounts\\Journals."
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -2546,7 +2908,12 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:3154
+=======
+#: code:addons/account/account.py:2840
+#: code:addons/account/installer.py:454
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2650,6 +3017,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:3493
 #: code:addons/account/account_bank_statement.py:404
 #: code:addons/account/account_invoice.py:386
@@ -2659,6 +3027,9 @@
 #: code:addons/account/account_invoice.py:609
 #: code:addons/account/account_invoice.py:631
 #: code:addons/account/account_move_line.py:535
+=======
+#: code:addons/account/invoice.py:350
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2681,6 +3052,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"
@@ -2710,7 +3090,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
@@ -2855,8 +3240,18 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:1411
+=======
+#: view:account.use.model:0
+msgid "This wizard will create recurring accounting entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1195
+>>>>>>> MERGE-SOURCE
 #, python-format
+<<<<<<< TREE
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
 
@@ -2874,6 +3269,17 @@
 #: code:addons/account/account.py:2298
 #: code:addons/account/account_invoice.py:748
 #: code:addons/account/account_move_line.py:195
+=======
+msgid "No sequence defined on the journal !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py: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 ""
@@ -2924,8 +3330,24 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: field:accounting.report,debit_credit:0
 msgid "Display Debit/Credit Columns"
+=======
+#: code:addons/account/account_bank_statement.py:307
+#, python-format
+msgid "The expected balance (%.2f) is different than the computed one. (%.2f)"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentreconcile0
+msgid "Payment entries are the second input of the reconciliation."
+msgstr ""
+
+#. module: account
+#: selection:account.print.journal,sort_selection:0
+msgid "Reference Number"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -3021,6 +3443,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_invoice.py:795
 #, python-format
 msgid "Tax base different!\n"
@@ -3050,6 +3473,24 @@
 #: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
+=======
+#: 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
+#, python-format
+msgid "No fiscal year defined for this date !\n"
+"Please create one."
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -3170,8 +3611,13 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:3412
 #: code:addons/account/account_bank.py:95
+=======
+#: code:addons/account/account.py:2950
+#: code:addons/account/installer.py:296
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "BNK"
 msgstr ""
@@ -3325,6 +3771,16 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+#, python-format
+msgid "No End of year journal defined for the fiscal year"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+>>>>>>> MERGE-SOURCE
 #: view:account.tax.template:0
 msgid "Keep empty to use the expense account"
 msgstr ""
@@ -3341,8 +3797,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
@@ -3415,7 +3875,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_invoice.py:1428
+=======
+#: code:addons/account/invoice.py:1298
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3454,6 +3918,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: help:account.config.settings,paypal_account:0
 msgid "Paypal account (email) for receiving online payments (credit card, etc.) If you set a paypal account, the customer  will be able to pay your invoices or quotations with a button \"Pay with  Paypal\" in automated emails or through the OpenERP portal."
 msgstr ""
@@ -3472,6 +3937,24 @@
 #: 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
@@ -3503,6 +3986,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: field:account.config.settings,date_start:0
 msgid "Start date"
 msgstr ""
@@ -3516,12 +4000,18 @@
 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/account_move_line.py:98
+=======
+#: code:addons/account/invoice.py:373
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "You have not supplied enough arguments to compute the initial balance, please select a period and a journal in the context."
 msgstr ""
@@ -3532,8 +4022,15 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: field:account.config.settings,expects_chart_of_accounts:0
 msgid "This company has its own chart of accounts"
+=======
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -3587,6 +4084,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.config.settings:0
 msgid "Options"
 msgstr ""
@@ -3611,6 +4109,33 @@
 #. module: account
 #: view:account.installer:0
 msgid "Continue"
+=======
+#: code:addons/account/wizard/account_invoice_state.py:68
+#, python-format
+msgid "Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' or 'Done' state!"
+msgstr ""
+
+#. module: account
+#: 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"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,state:0
+msgid "Invoice State"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -3712,8 +4237,12 @@
 #: field:account.entries.report,date:0
 #: selection:account.general.journal,filter:0
 #: report:account.general.ledger:0
+<<<<<<< TREE
 #: report:account.general.ledger_landscape:0
 #: field:account.invoice.refund,date:0
+=======
+#: report:account.general.ledger_landscape:0
+>>>>>>> MERGE-SOURCE
 #: field:account.invoice.report,date:0
 #: report:account.journal.period.print:0
 #: report:account.journal.period.print.sale.purchase:0
@@ -3755,19 +4284,40 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:2310
+=======
+#: 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
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "All"
+=======
+#: code:addons/account/account_move_line.py:801
+#, python-format
+msgid "Some entries are already reconciled !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1218
+#, python-format
+msgid "You cannot validate a Journal Entry unless all journal items are in same chart of accounts !"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Account Tax"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -3876,11 +4426,35 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1134
+#, python-format
+msgid "Unable to change tax !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:analytic.entries.report,nbr:0
 msgid "#Entries"
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:1437
+#, python-format
+msgid "You selected an Unit of Measure which is not compatible with the product."
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:476
+#, python-format
+msgid "The Payment Term of Supplier does not have Payment Term Lines(Computation) defined !"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.state.open:0
 msgid "Open Invoice"
 msgstr ""
@@ -4205,6 +4779,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: model:ir.actions.act_window,help:account.action_bank_tree
 msgid "<p class=\"oe_view_nocontent_create\">\n"
 "            Click to setup a new bank account. \n"
@@ -4228,6 +4803,27 @@
 #: constraint:account.period:0
 msgid "Error!\n"
 "The duration of the Period(s) is/are invalid."
+=======
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,due_delay:0
+msgid "Avg. Due Delay"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Acc.Type"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:722
+#, python-format
+msgid "Global taxes defined, but are not in invoice lines !"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -4315,7 +4911,16 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_move_line.py:867
+=======
+#: 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 "You have to provide an account for the write off/exchange difference entry."
 msgstr ""
@@ -4464,6 +5069,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
 msgid "Journal Items to Reconcile"
@@ -4487,6 +5093,17 @@
 #. module: account
 #: view:account.tax:0
 msgid "Tax Computation"
+=======
+#: 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
@@ -4537,6 +5154,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 ""
@@ -4557,6 +5181,25 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:1304
+#: code:addons/account/account.py:1332
+#: code:addons/account/account.py:1339
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/invoice.py:904
+#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_fiscalyear_close.py:78
+#: code:addons/account/wizard/account_fiscalyear_close.py:81
+#: code:addons/account/wizard/account_move_journal.py:165
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:55
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:57
+#, python-format
+msgid "UserError"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
 msgstr ""
@@ -4579,6 +5222,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
 msgstr ""
@@ -4601,6 +5245,19 @@
 msgstr ""
 
 #. module: account
+=======
+#: help:account.bank.statement,balance_end_cash:0
+msgid "Closing balance based on cashBox"
+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
@@ -4630,6 +5287,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.invoice:0
 msgid "My Invoices"
 msgstr ""
@@ -4642,6 +5300,22 @@
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Sale Tax"
+=======
+#: 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
+#, 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 ""
+
+#. module: account
+#: field:account.invoice.refund,date:0
+msgid "Operation date"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -4651,7 +5325,22 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.invoice:0
+=======
+#: view:validate.account.move:0
+msgid "All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore."
+msgstr ""
+
+#. module: account
+#: report:account.account.balance.landscape:0
+msgid "Account Balance -"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:997
+#, python-format
+>>>>>>> MERGE-SOURCE
 msgid "Invoice "
 msgstr ""
 
@@ -4690,6 +5379,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: help:account.config.settings,expects_chart_of_accounts:0
 msgid "Check this box if this company is a legal entity."
 msgstr ""
@@ -4738,6 +5428,20 @@
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "or"
+=======
+#: code:addons/account/invoice.py:812
+#, python-format
+msgid "Please verify the price of the invoice !\n"
+"The real total does not match the computed total."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,user_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,user_id:0
+msgid "Salesman"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -4830,6 +5534,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_invoice.py:894
 #, python-format
 msgid "Please verify the price of the invoice !\n"
@@ -4853,6 +5558,49 @@
 msgstr ""
 
 #. module: account
+=======
+#: view:account.move:0
+#: view:account.move.line:0
+#: code:addons/account/wizard/account_move_journal.py:153
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
+#: model:ir.actions.act_window,name:account.act_account_move_to_account_move_line_open
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move
+#: model:ir.actions.act_window,name:account.action_account_manual_reconcile
+#: model:ir.actions.act_window,name:account.action_account_moves_all_a
+#: model:ir.actions.act_window,name:account.action_account_moves_bank
+#: model:ir.actions.act_window,name:account.action_account_moves_purchase
+#: model:ir.actions.act_window,name:account.action_account_moves_sale
+#: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
+#: model:ir.actions.act_window,name:account.action_move_line_tree1
+#: model:ir.actions.act_window,name:account.action_tax_code_line_open
+#: model:ir.model,name:account.model_account_move_line
+#: model:ir.ui.menu,name:account.menu_action_account_moves_all
+#: model:ir.ui.menu,name:account.menu_action_account_moves_bank
+#: model:ir.ui.menu,name:account.menu_eaction_account_moves_purchase
+#: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
+#, python-format
+msgid "Journal Items"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "Balance Sheet (Assets Accounts)"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Third Party (Country)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid "With Supplier Refunds you can manage the credit notes you receive from your suppliers. A refund is a document that credits an invoice completely or partially. You can easily generate refunds and reconcile them directly from the invoice form."
+msgstr ""
+
+#. module: account
+#: field:account.analytic.Journal.report,date2:0
+>>>>>>> MERGE-SOURCE
 #: field:account.analytic.balance,date2:0
 #: field:account.analytic.cost.ledger,date2:0
 #: field:account.analytic.cost.ledger.journal.report,date2:0
@@ -4862,6 +5610,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: model:process.node,note:account.process_node_supplierpaymentorder0
 msgid "Payment of invoices"
 msgstr ""
@@ -4878,6 +5627,14 @@
 
 #. module: account
 #: code:addons/account/account_cash_statement.py:301
+=======
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:728
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "There is no %s Account on the journal %s."
 msgstr ""
@@ -4934,8 +5691,20 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: field:account.treasury.report,date:0
 msgid "Beginning of Period Date"
+=======
+#: field:account.journal,allow_date:0
+msgid "Check Date not in the Period"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1224
+#, python-format
+msgid "You can not modify a posted entry of this journal !\n"
+"You should set the journal to allow cancelling entries if you want to do that."
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -4954,9 +5723,20 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: help:account.tax,price_include:0
 #: help:account.tax.template,price_include:0
 msgid "Check this if the price you use on the product and invoices includes this tax."
+=======
+#: code:addons/account/account.py:954
+#, python-format
+msgid "Start period should be smaller then End period"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "5"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -4990,7 +5770,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 ""
 
@@ -5062,8 +5850,24 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: help:account.invoice,sent:0
 msgid "It indicates that the invoice has been sent."
+=======
+#: field:account.bank.statement,starting_details_ids:0
+msgid "Opening Cashbox"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Line 1:"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1181
+#, python-format
+msgid "Integrity Error !"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -5101,9 +5905,22 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
 #: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
+=======
+#: view:account.automatic.reconcile:0
+msgid "Reconciliation result"
+msgstr ""
+
+#. module: account
+#: 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 ""
 
@@ -5212,8 +6029,15 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: help:res.partner,last_reconciliation_date:0
 msgid "Date on which the partner accounting entries were fully reconciled last time. It differs from the date of the last reconciliation made for this partner, as here we depict the fact that nothing more was to be reconciled at this date. This can be achieved in 2 ways: either the last debit/credit entry was reconciled, either the user pressed the button \"Fully Reconciled\" in the manual reconciliation process"
+=======
+#: 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
@@ -5280,12 +6104,18 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.payment.term.line:0
 msgid "Amount Computation"
 msgstr ""
 
 #. module: account
 #: code:addons/account/account_move_line.py:1108
+=======
+#: code:addons/account/account.py:2940
+#: code:addons/account/installer.py:283
+#: code:addons/account/installer.py:295
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5311,8 +6141,14 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: model:account.account.type,name:account.account_type_asset_view1
 msgid "Asset View"
+=======
+#: 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 !"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -5380,6 +6216,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.invoice:0
 msgid "Draft Refund "
 msgstr ""
@@ -5393,6 +6230,18 @@
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
+=======
+#: 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
+#: code:addons/account/wizard/account_move_journal.py:63
+#, python-format
+msgid "Configuration Error !"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -5451,12 +6300,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
@@ -5592,6 +6461,15 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:729
+#, python-format
+msgid "Already Reconciled!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: help:account.tax,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
@@ -5627,7 +6505,11 @@
 
 #. module: account
 #: view:account.move.line.reconcile:0
+<<<<<<< TREE
 #: code:addons/account/account_move_line.py:882
+=======
+#: code:addons/account/account_move_line.py:821
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5756,8 +6638,14 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.invoice:0
 msgid "(update)"
+=======
+#: code:addons/account/wizard/account_change_currency.py:59
+#, python-format
+msgid "New currency is not confirured properly !"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -5780,6 +6668,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:2286
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
@@ -5798,6 +6687,18 @@
 #. module: account
 #: field:account.journal,loss_account_id:0
 msgid "Loss Account"
+=======
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
+#, python-format
+msgid "You can not use an inactive account!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:794
+#, python-format
+msgid "Entries are not of the same account or already reconciled ! "
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -5823,6 +6724,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:1321
 #, python-format
 msgid "You cannot validate this journal entry because account \"%s\" does not belong to chart of accounts \"%s\"."
@@ -5831,6 +6733,23 @@
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
+=======
+#: 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
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:102
+#, python-format
+msgid "Period: %s"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -5941,6 +6860,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"
@@ -6028,6 +6956,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.invoice.report:0
 msgid "Open and Paid Invoices"
 msgstr ""
@@ -6040,6 +6969,11 @@
 #. module: account
 #: view:account.config.settings:0
 msgid "Bank & Cash"
+=======
+#: code:addons/account/account.py:546
+#, python-format
+msgid "You cannot modify Company of account as its related record exist in Entry Lines"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -6327,9 +7261,23 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:686
 #, python-format
 msgid "You cannot change the owner company of an account that already contains journal items."
+=======
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
+#, python-format
+msgid "Can not find account chart for this company, Please Create account."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:57
+#, python-format
+msgid "Enter a Start date !"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -6471,13 +7419,19 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_analytic_line.py:142
 #: code:addons/account/account_move_line.py:958
+=======
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Entries: "
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: help:res.partner.bank,currency_id:0
 msgid "Currency of the related account journal."
 msgstr ""
@@ -6495,6 +7449,14 @@
 #. module: account
 #: selection:account.account.type,report_type:0
 #: code:addons/account/account.py:190
+=======
+#: view:account.use.model:0
+msgid "Create manual recurring entries in a chosen journal."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1407
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Balance Sheet (Asset account)"
 msgstr ""
@@ -6510,8 +7472,14 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.move.line:0
 msgid "Next Partner Entries to reconcile"
+=======
+#: code:addons/account/account_move_line.py:772
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -6556,6 +7524,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: selection:account.account.type,report_type:0
 #: code:addons/account/account.py:189
 #, python-format
@@ -6576,6 +7545,39 @@
 #. module: account
 #: code:addons/account/account.py:1024
 #: code:addons/account/account_move_line.py:1108
+=======
+#: view:account.payment.term.line:0
+msgid "  valuation: percent"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:509
+#: code:addons/account/account.py:511
+#: code:addons/account/account.py:836
+#: code:addons/account/account.py:915
+#: code:addons/account/account.py:990
+#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2357
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
+#: code:addons/account/account_bank_statement.py:292
+#: code:addons/account/account_bank_statement.py:305
+#: code:addons/account/account_bank_statement.py:345
+#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1197
+#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:1014
+#: code:addons/account/wizard/account_invoice_refund.py:100
+#: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+#: code:addons/account/wizard/account_use_model.py:44
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -6661,11 +7663,22 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "JRNL"
+=======
+#: report:account.general.ledger_landscape:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
+msgid "This report is an analysis done by a partner. It is a PDF report containing one line per partner representing the cumulative credit balance"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -6706,9 +7719,13 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.bank.statement:0
 #: code:addons/account/account.py:422
 #: code:addons/account/account.py:434
+=======
+#: code:addons/account/wizard/account_change_currency.py:64
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Opening Balance"
 msgstr ""
@@ -6725,7 +7742,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
+#: view:account.report.general.ledger:0
+>>>>>>> MERGE-SOURCE
 #: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
 #: model:ir.actions.report.xml,name:account.account_general_ledger
 #: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
@@ -6774,10 +7796,13 @@
 #: 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
 #: constraint:account.journal:0
 msgid "Configuration error!\n"
 "The currency chosen should be shared by the default accounts too."
@@ -6785,6 +7810,9 @@
 
 #. module: account
 #: code:addons/account/account.py:2256
+=======
+#: 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"
@@ -6817,6 +7845,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: constraint:account.fiscalyear:0
 msgid "Error!\n"
 "The start date of a fiscal year must precede its end date."
@@ -6825,6 +7854,12 @@
 #. module: account
 #: view:account.tax.template:0
 msgid "Taxes used in Sales"
+=======
+#: code:addons/account/invoice.py:476
+#: code:addons/account/wizard/account_invoice_refund.py:137
+#, python-format
+msgid "Data Insufficient !"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -6936,6 +7971,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 ""
@@ -7089,9 +8133,15 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
+=======
+#: code:addons/account/account.py:952
+#, python-format
+msgid "You should have chosen periods that belongs to the same company"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -7201,6 +8251,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: model:ir.actions.act_window,help:account.action_account_analytic_account_tree2
 msgid "<p>\n"
 "                Click to add a new analytic account.\n"
@@ -7225,6 +8276,9 @@
 
 #. module: account
 #: code:addons/account/account.py:3158
+=======
+#: code:addons/account/account_cash_statement.py:250
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7236,10 +8290,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
@@ -7279,6 +8343,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: model:ir.ui.menu,name:account.menu_multi_currency
 msgid "Multi-Currencies"
 msgstr ""
@@ -7290,6 +8355,16 @@
 
 #. module: account
 #: code:addons/account/account.py:3145
+=======
+#: code:addons/account/account_move_line.py:1277
+#, python-format
+msgid "Bad account !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2821
+#: code:addons/account/installer.py:432
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7300,7 +8375,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_move_line.py:1186
+=======
+#: code:addons/account/account_move_line.py:1252
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7592,9 +8671,23 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:653
 #: code:addons/account/account.py:656
 #: code:addons/account/account.py:668
+=======
+#: code:addons/account/account.py: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 ""
@@ -7627,11 +8720,14 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.move.line.unreconcile.select:0
 msgid "Open for Unreconciliation"
 msgstr ""
 
 #. module: account
+=======
+>>>>>>> MERGE-SOURCE
 #: field:account.bank.statement.line,partner_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,partner_id:0
@@ -7662,7 +8758,17 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_invoice.py:873
+=======
+#: code:addons/account/wizard/account_invoice_refund.py:100
+#, python-format
+msgid "Can not %s draft/proforma/cancel invoice."
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:795
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7701,6 +8807,15 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:360
+#, python-format
+msgid "Invoice '%s' is paid."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: model:process.node,note:account.process_node_electronicfile0
 msgid "Automatic entry"
 msgstr ""
@@ -7732,7 +8847,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_invoice.py:1428
+=======
+#: code:addons/account/invoice.py:1298
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7810,7 +8929,12 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:3148
+=======
+#: code:addons/account/account.py:2885
+#: code:addons/account/installer.py:495
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7945,6 +9069,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
@@ -7960,6 +9085,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 ""
 
@@ -8043,12 +9179,16 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: model:email.template,subject:account.email_template_edi_invoice
 msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
 msgstr ""
 
 #. module: account
 #: code:addons/account/account_move_line.py:1211
+=======
+#: code:addons/account/invoice.py:905
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "You cannot use this general account in this journal, check the tab 'Entry Controls' on the related journal."
 msgstr ""
@@ -8111,9 +9251,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 ""
 
@@ -8154,7 +9302,12 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account.py:3146
+=======
+#: code:addons/account/account.py:2838
+#: code:addons/account/installer.py:452
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8341,9 +9494,21 @@
 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"
+=======
+#: constraint:account.bank.statement.line:0
+msgid "The amount of the voucher must be the same amount as the one on the statement line"
+msgstr ""
+
+#. module: account
+#: 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
@@ -8352,6 +9517,15 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:1062
+#, python-format
+msgid "The account move (%s) for centralisation has been confirmed!"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: help:account.move.line,amount_currency:0
 msgid "The amount expressed in an optional other currency if it is a multi-currency entry."
 msgstr ""
@@ -8549,17 +9723,31 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: field:account.cashbox.line,pieces:0
 msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
 #: code:addons/account/account.py:3147
+=======
+#: code:addons/account/account.py: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
 msgid "Information"
@@ -8618,12 +9806,17 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_invoice.py:873
+=======
+#: code:addons/account/invoice.py:795
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/wizard/pos_box.py:37
 #, python-format
 msgid "Please check that the field 'Internal Transfers Account' is set on the payment method '%s'."
@@ -8636,6 +9829,20 @@
 
 #. module: account
 #: code:addons/account/account.py:3155
+=======
+#: report:account.overdue:0
+msgid "Dear Sir/Madam,"
+msgstr ""
+
+#. module: account
+#: view:account.installer.modules:0
+msgid "Configure Your Accounting Application"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2864
+#: code:addons/account/installer.py:479
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8693,7 +9900,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
@@ -8709,12 +9921,19 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: model:ir.actions.report.xml,name:account.account_central_journal
 msgid "Central Journal"
+=======
+#: code:addons/account/account.py:2357
+#, python-format
+msgid "Cannot locate parent code for template account!"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8739,8 +9958,24 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: field:account.subscription,period_total:0
 msgid "Number of Periods"
+=======
+#: 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
+#: report:account.overdue:0
+msgid "Best regards."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Unpaid"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -8749,11 +9984,51 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:70
+#, python-format
+msgid "Current currency is not confirured properly !"
+msgstr ""
+
+#. 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
+>>>>>>> MERGE-SOURCE
 #: view:account.account.template:0
 msgid "Receivale Accounts"
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: field:account.config.settings,purchase_refund_sequence_prefix:0
 msgid "Supplier credit note sequence"
 msgstr ""
@@ -8788,6 +10063,16 @@
 #: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
+=======
+#: 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
@@ -8801,8 +10086,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
@@ -8813,6 +10102,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 ""
 
@@ -8823,7 +10116,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 ""
 
@@ -8852,11 +10153,21 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.fiscalyear.close:0
 msgid "Generate Fiscal Year Opening Entries"
 msgstr ""
 
 #. module: account
+=======
+#: model:ir.actions.act_window,help:account.action_account_period_form
+msgid "Here you can define a financial period, an interval of time in your company's financial year. An accounting period typically is a month or a quarter. It usually corresponds to the periods of the tax declaration. Create and manage periods from here and decide whether a period should be closed or left open depending on your company's activities over a specific period."
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
@@ -8886,9 +10197,13 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_bank_statement.py:477
 #: code:addons/account/account_invoice.py:458
 #: code:addons/account/wizard/account_period_close.py:51
+=======
+#: code:addons/account/account_move_line.py:1134
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Invalid Action!"
 msgstr ""
@@ -9032,7 +10347,12 @@
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
+<<<<<<< TREE
+#: report:account.general.ledger_landscape:0
+=======
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
 #: report:account.partner.balance:0
 #: field:account.partner.balance,period_to:0
 #: field:account.partner.ledger,period_to:0
@@ -9081,8 +10401,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
@@ -9115,8 +10442,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 ""
 
@@ -9146,7 +10477,11 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_invoice.py:894
+=======
+#: code:addons/account/invoice.py:812
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9200,6 +10535,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.bank.statement:0
 #: view:account.move:0
 #: view:account.move.line:0
@@ -9237,6 +10573,28 @@
 #. module: account
 #: field:account.bank.statement.line,name:0
 msgid "OBI"
+=======
+#: field:account.account,active:0
+#: field:account.analytic.journal,active:0
+#: field:account.journal.period,active:0
+#: field:account.payment.term,active:0
+#: field:account.tax,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:353
+#, python-format
+msgid "Unknown Error"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1181
+#, python-format
+msgid "You cannot validate a non-balanced entry !\n"
+"Make sure you have configured Payment Term properly !\n"
+"It should contain atleast one Payment Term Line with type \"Balance\" !"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -9286,11 +10644,20 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.invoice:0
 msgid "Draft Invoice "
 msgstr ""
 
 #. module: account
+=======
+#: help:account.invoice.refund,journal_id:0
+msgid "You can select here the journal to use for the refund invoice that will be created. If you leave that field empty, it will use the same journal as the current invoice."
+msgstr ""
+
+#. module: account
+#: view:account.general.journal:0
+>>>>>>> MERGE-SOURCE
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
 msgstr ""
@@ -9460,11 +10827,14 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: field:account.subscription.generate,date:0
 msgid "Generate Entries Before"
 msgstr ""
 
 #. module: account
+=======
+>>>>>>> MERGE-SOURCE
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
 msgid "Running Subscriptions"
 msgstr ""
@@ -9540,6 +10910,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: selection:account.financial.report,display_detail:0
 msgid "No detail"
 msgstr ""
@@ -9552,6 +10923,32 @@
 msgstr ""
 
 #. module: account
+=======
+#: help:account.model,name:0
+msgid "This is a model for recurring accounting entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:99
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "JNRL"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  value amount: 0.02"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+>>>>>>> MERGE-SOURCE
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "States"
@@ -9577,6 +10974,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 ""
 
@@ -9728,6 +11126,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
 msgstr ""
@@ -9746,6 +11145,35 @@
 #: view:account.automatic.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Write-Off Move"
+=======
+#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:806
+#: code:addons/account/wizard/account_invoice_state.py:44
+#: code:addons/account/wizard/account_invoice_state.py:68
+#: code:addons/account/wizard/account_report_balance_sheet.py:70
+#: code:addons/account/wizard/account_state_open.py:37
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#: code:addons/account/wizard/account_validate_account_move.py:61
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: account
+#: help:product.category,property_account_expense_categ:0
+#: help:product.template,property_account_expense:0
+msgid "This account will be used to value outgoing stock for the current product category using cost price"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -9814,6 +11242,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: help:account.model.line,quantity:0
 msgid "The optional quantity on entries."
 msgstr ""
@@ -9821,6 +11250,21 @@
 #. module: account
 #: field:account.automatic.reconcile,reconciled:0
 msgid "Reconciled transactions"
+=======
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Recurring"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:796
+#, python-format
+msgid "Entry is already reconciled"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -9845,6 +11289,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a purchase journal."
 msgstr ""
@@ -9852,6 +11297,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
@@ -9961,6 +11413,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: model:ir.actions.act_window,help:account.action_tax_code_list
 msgid "<p class=\"oe_view_nocontent_create\">\n"
 "                Click to define a new tax code.\n"
@@ -9971,6 +11424,11 @@
 "                one or several tax code.\n"
 "              </p>\n"
 "            "
+=======
+#: code:addons/account/invoice.py:345
+#, python-format
+msgid "Invoice '%s' is waiting for validation."
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -10002,8 +11460,19 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.config.settings:0
 msgid "Install more chart templates"
+=======
+#: 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
+#: field:account.subscription,period_total:0
+msgid "Number of Periods"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -10119,6 +11588,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 ""
 
@@ -10224,6 +11694,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: field:res.partner,property_payment_term:0
 msgid "Customer Payment Term"
 msgstr ""
@@ -10236,6 +11707,27 @@
 #. module: account
 #: selection:account.config.settings,tax_calculation_rounding_method:0
 msgid "Round per line"
+=======
+#: field:account.analytic.line,amount_currency:0
+msgid "Amount currency"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:55
+#, python-format
+msgid "You must enter a period length that cannot be 0 or below !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:511
+#, python-format
+msgid "You cannot remove an account which has account entries!. "
+msgstr ""
+
+#. module: account
+#: 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."
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -10243,3 +11735,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	2013-04-05 11:10:48 +0000
+++ account/i18n/ar.po	2013-06-03 06:13:34 +0000
@@ -6,19 +6,31 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-15 22:53+0000\n"
 "Last-Translator: gehad shaat <[e-mail]>\n"
+=======
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2012-02-27 19:08+0000\n"
+"Last-Translator: Pioneer Solutions <[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: 2013-03-16 05:12+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2012-08-28 07:37+0000\n"
+"X-Generator: Launchpad (build 15864)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "System payment"
+<<<<<<< TREE
 msgstr "مدفوعات النظام"
 
 #. module: account
@@ -35,11 +47,36 @@
 msgstr ""
 "تحديد ترتيب العرض التقرير ’الحسابات/التقارير/ التقارير العمومية/الضرائب/ "
 "تقرير الضرائب’"
+=======
+msgstr "نظام الدفع"
+
+#. module: account
+#: view:account.journal:0
+msgid "Other Configuration"
+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 "لايمكن الغاء/تعطيل حساب معد كخاص بأي طرف."
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: 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
@@ -49,25 +86,69 @@
 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_bank_statement.py:368
+=======
+#: code:addons/account/account_invoice.py:805
+>>>>>>> MERGE-SOURCE
 #, python-format
+<<<<<<< TREE
 msgid "Journal item \"%s\" is not valid."
 msgstr "بند اليومية \"%s\" غير صحيح."
+=======
+msgid "Please define sequence on invoice journal"
+msgstr "يرجى تحديد تسلسل على الفاتورة"
+
+#. module: account
+#: constraint:account.period:0
+msgid "Error ! The duration of the Period(s) is/are invalid. "
+msgstr "خظأ! إن مدة الفترة أو الفترات غير صالحة "
+
+#. module: account
+#: field:account.analytic.line,currency_id:0
+msgid "Account currency"
+msgstr "عملة الحساب"
+
+#. module: account
+#: view:account.tax:0
+msgid "Children Definition"
+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 ""