Merge lp:~zaber/openobject-addons/order-point-filter into lp:openobject-addons

[Don Kirkby]

Fix bug 939790 by removing order point filter on purchase_ok flag.

Sorry about the previous two attempts at this merge. I selected the wrong source and the wrong target.

Unmerged revisions

2906. By Don Kirkby on 2012-02-23

[FIX] Orderpoint should not filter based on purchase_ok flag.

2905. By Jay Vora (Serpent Consulting Services) on 2011-03-04

[FIX] report_analytic_planning : copy() overridden in order to avoid creation of o2m fields which are related to objects with _auto=False property

2904. By Dhruti(OpenERP) on 2011-02-28

[FIX] Account : Invoice line should contain the product description in notes (Ref : Case 4298)

2903. By Dukai Gábor on 2011-02-21

[FIX] MRP : Raw Procurement creates a purchase order with wrong supplier and price(when there are more than 1 suppliers)

2902. By Jay Vora (Serpent Consulting Services) on 2011-02-10

[FIX] Purchase : Destination address should not be restricted to be an address of any partner

2901. By Jay Vora (Serpent Consulting Services) on 2011-02-10

[FIX] Sale : Corrected the code which Cancelling an out picking sets the sale order as shipped

2900. By Anup(OpenERP) <email address hidden> on 2011-02-04

[FIX] mrp : Product Quantity Corrected with Different UoM in Production Order

2899. By Jay Vora (Serpent Consulting Services) on 2011-01-19

[FIX] Document : Correction on wrong M2M relational table on ir_attachment(courtesy : Ludora,Nima)

2898. By JMA(OpenERP),RHA(OpenERP) on 2011-01-07

[FIX] Stock : Correction on average price calculation via partial pickings

2897. By Quentin,Delphine,Dhruti on 2011-01-07

[FIX] Stock : Constraint for Lot checking corrected(Courtesy: Maintenance case ID 3596)

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2012-02-24 01:08:27 +0000
@@ -0,0 +1,1 @@
+./.ropeproject

=== renamed file '.bzrignore' => '.bzrignore.moved'
=== modified file 'account/__openerp__.py'
--- account/__openerp__.py	2012-01-31 13:36:57 +0000
+++ account/__openerp__.py	2012-02-24 01:08:27 +0000
@@ -51,7 +51,10 @@
 module named account_voucher.
     """,
     'website': 'http://www.openerp.com',
+<<<<<<< TREE
     'images' : ['images/accounts.jpeg','images/bank_statement.jpeg','images/cash_register.jpeg','images/chart_of_accounts.jpeg','images/customer_invoice.jpeg','images/journal_entries.jpeg'],
+=======
+>>>>>>> MERGE-SOURCE
     'init_xml': [],
     "depends" : ["base_setup", "product", "analytic", "process", "board", "edi"],
     'update_xml': [
@@ -132,6 +135,7 @@
         'project/project_demo.xml',
         'project/analytic_account_demo.xml',
         'demo/account_minimal.xml',
+<<<<<<< TREE
         'demo/account_invoice_demo.xml',
 #        'account_unit_test.xml',
     ],
@@ -149,6 +153,10 @@
         'test/test_edi_invoice.yml',
         'test/account_report.yml',
         'test/account_fiscalyear_close_state.yml', #last test, as it will definitively close the demo fiscalyear
+=======
+        'test/invoice_basic_test.xml',
+        'test/invoice_bug452854_test.xml',
+>>>>>>> MERGE-SOURCE
     ],
     'installable': True,
     'auto_install': False,

=== modified file 'account/account.py'
--- account/account.py	2012-02-15 09:38:17 +0000
+++ account/account.py	2012-02-24 01:08:27 +0000
@@ -20,12 +20,21 @@
 ##############################################################################
 
 import time
+<<<<<<< TREE
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
 from operator import itemgetter
 
+=======
+
+from operator import itemgetter
+
+>>>>>>> MERGE-SOURCE
 import netsvc
+<<<<<<< TREE
 import pooler
+=======
+>>>>>>> MERGE-SOURCE
 from osv import fields, osv
 import decimal_precision as dp
 from tools.translate import _
@@ -49,6 +58,26 @@
         level -= 1
     return True
 
+def check_cycle(self, cr, uid, ids):
+    """ climbs the ``self._table.parent_id`` chains for 100 levels or
+    until it can't find any more parent(s)
+
+    Returns true if it runs out of parents (no cycle), false if
+    it can recurse 100 times without ending all chains
+    """
+    level = 100
+    while len(ids):
+        cr.execute('SELECT DISTINCT parent_id '\
+                   'FROM '+self._table+' '\
+                   'WHERE id IN %s '\
+                   'AND parent_id IS NOT NULL',
+                   (tuple(ids),))
+        ids = map(itemgetter(0), cr.fetchall())
+        if not level:
+            return False
+        level -= 1
+    return True
+
 class account_payment_term(osv.osv):
     _name = "account.payment.term"
     _description = "Payment Term"
@@ -259,34 +288,68 @@
             ids3 = self._get_children_and_consol(cr, uid, ids3, context)
         return ids2 + ids3
 
-    def __compute(self, cr, uid, ids, field_names, arg=None, context=None,
-                  query='', query_params=()):
-        """ compute the balance, debit and/or credit for the provided
-        account ids
-        Arguments:
-        `ids`: account ids
-        `field_names`: the fields to compute (a list of any of
-                       'balance', 'debit' and 'credit')
-        `arg`: unused fields.function stuff
-        `query`: additional query filter (as a string)
-        `query_params`: parameters for the provided query string
-                        (__compute will handle their escaping) as a
-                        tuple
-        """
+<<<<<<< TREE
+    def __compute(self, cr, uid, ids, field_names, arg=None, context=None,
+                  query='', query_params=()):
+        """ compute the balance, debit and/or credit for the provided
+        account ids
+        Arguments:
+        `ids`: account ids
+        `field_names`: the fields to compute (a list of any of
+                       'balance', 'debit' and 'credit')
+        `arg`: unused fields.function stuff
+        `query`: additional query filter (as a string)
+        `query_params`: parameters for the provided query string
+                        (__compute will handle their escaping) as a
+                        tuple
+        """
+=======
+    def __compute(self, cr, uid, ids, field_names, arg=None, context=None,
+                  query='', query_params=()):
+        """ compute the balance, debit and/or credit for the provided
+        account ids
+
+        Arguments:
+        `ids`: account ids
+        `field_names`: the fields to compute (a list of any of
+                       'balance', 'debit' and 'credit')
+        `arg`: unused fields.function stuff
+        `query`: additional query filter (as a string)
+        `query_params`: parameters for the provided query string
+                        (__compute will handle their escaping) as a
+                        tuple
+        """
+>>>>>>> MERGE-SOURCE
         mapping = {
+<<<<<<< TREE
             'balance': "COALESCE(SUM(l.debit),0) - COALESCE(SUM(l.credit), 0) as balance",
             'debit': "COALESCE(SUM(l.debit), 0) as debit",
             'credit': "COALESCE(SUM(l.credit), 0) as credit",
             # by convention, foreign_balance is 0 when the account has no secondary currency, because the amounts may be in different currencies
             'foreign_balance': "(SELECT CASE WHEN currency_id IS NULL THEN 0 ELSE COALESCE(SUM(l.amount_currency), 0) END FROM account_account WHERE id IN (l.account_id)) as foreign_balance",
+=======
+            'balance': "COALESCE(SUM(l.debit),0) " \
+                       "- COALESCE(SUM(l.credit), 0) as balance",
+            'debit': "COALESCE(SUM(l.debit), 0) as debit",
+            'credit': "COALESCE(SUM(l.credit), 0) as credit"
+>>>>>>> MERGE-SOURCE
         }
         #get all the necessary accounts
+<<<<<<< TREE
         children_and_consolidated = self._get_children_and_consol(cr, uid, ids, context=context)
+=======
+        children_and_consolidated = self._get_children_and_consol(
+            cr, uid, ids, context=context)
+>>>>>>> MERGE-SOURCE
         #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)
         if children_and_consolidated:
+=======
+        if children_and_consolidated:
+>>>>>>> MERGE-SOURCE
             aml_query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
 
             wheres = [""]
@@ -294,6 +357,7 @@
                 wheres.append(query.strip())
             if aml_query.strip():
                 wheres.append(aml_query.strip())
+<<<<<<< TREE
             filters = " AND ".join(wheres)
             self.logger.notifyChannel('addons.'+self._name, netsvc.LOG_DEBUG,
                                       'Filters: %s'%filters)
@@ -314,10 +378,33 @@
             cr.execute(request, params)
             self.logger.notifyChannel('addons.'+self._name, netsvc.LOG_DEBUG,
                                       'Status: %s'%cr.statusmessage)
+=======
+            filters = " AND ".join(wheres)
+            self.logger.notifyChannel('addons.'+self._name, netsvc.LOG_DEBUG,
+                                      'Filters: %s'%filters)
+            # IN might not work ideally in case there are too many
+            # children_and_consolidated, in that case join on a
+            # values() e.g.:
+            # SELECT l.account_id as id FROM account_move_line l
+            # INNER JOIN (VALUES (id1), (id2), (id3), ...) AS tmp (id)
+            # ON l.account_id = tmp.id
+            # or make _get_children_and_consol return a query and join on that
+            request = ("SELECT l.account_id as id, " +\
+                       ' , '.join(map(mapping.__getitem__, field_names)) +
+                       " FROM account_move_line l" \
+                       " WHERE l.account_id IN %s " \
+                            + filters +
+                       " GROUP BY l.account_id")
+            params = (tuple(children_and_consolidated),) + query_params
+            cr.execute(request, params)
+            self.logger.notifyChannel('addons.'+self._name, netsvc.LOG_DEBUG,
+                                      'Status: %s'%cr.statusmessage)
+>>>>>>> MERGE-SOURCE
 
             for res in cr.dictfetchall():
                 accounts[res['id']] = res
 
+<<<<<<< TREE
             # consolidate accounts with direct children
             children_and_consolidated.reverse()
             brs = list(self.browse(cr, uid, children_and_consolidated, context=context))
@@ -334,8 +421,27 @@
 #                        except ValueError:
 #                            brs.insert(0, child)
 #                if can_compute:
+=======
+        # consolidate accounts with direct children
+        children_and_consolidated.reverse()
+        brs = list(self.browse(cr, uid, children_and_consolidated, context=context))
+        sums = {}
+        while brs:
+            current = brs[0]
+            can_compute = True
+            for child in current.child_id:
+                if child.id not in sums:
+                    can_compute = False
+                    try:
+                        brs.insert(0, brs.pop(brs.index(child)))
+                    except ValueError:
+                        brs.insert(0, child)
+            if can_compute:
+                brs.pop(0)
+>>>>>>> MERGE-SOURCE
                 for fn in field_names:
                     sums.setdefault(current.id, {})[fn] = accounts.get(current.id, {}).get(fn, 0.0)
+<<<<<<< TREE
                     for child in current.child_id:
                         if child.company_id.currency_id.id == current.company_id.currency_id.id:
                             sums[current.id][fn] += sums[child.id][fn]
@@ -356,6 +462,14 @@
         else:
             for id in ids:
                 res[id] = null_result
+=======
+                    if current.child_id:
+                        sums[current.id][fn] += sum(sums[child.id][fn] for child in current.child_id)
+        res = {}
+        null_result = dict((fn, 0.0) for fn in field_names)
+        for id in ids:
+            res[id] = sums.get(id, null_result)
+>>>>>>> MERGE-SOURCE
         return res
 
     def _get_company_currency(self, cr, uid, ids, field_name, arg, context=None):
@@ -450,6 +564,7 @@
             ('liquidity','Liquidity'),
             ('consolidation', 'Consolidation'),
             ('closed', 'Closed'),
+<<<<<<< TREE
         ], 'Internal Type', required=True, help="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 "\
@@ -459,6 +574,12 @@
               "country-specific legal reports, and set the rules to close a fiscal year and generate opening entries."),
         'financial_report_ids': fields.many2many('account.financial.report', 'account_account_financial_report', 'account_id', 'report_line_id', 'Financial Reports'),
         'parent_id': fields.many2one('account.account', 'Parent', ondelete='cascade', domain=[('type','=','view')]),
+=======
+        ], 'Internal Type', required=True,),
+
+        'user_type': fields.many2one('account.account.type', 'Account Type', required=True),
+        'parent_id': fields.many2one('account.account', 'Parent', ondelete='cascade', domain=[('type','=','view')]),
+>>>>>>> MERGE-SOURCE
         'child_parent_ids': fields.one2many('account.account','parent_id','Children'),
         'child_consol_ids': fields.many2many('account.account', 'account_account_consol_rel', 'child_id', 'parent_id', 'Consolidated Children'),
         'child_id': fields.function(_get_child_ids, type='many2many', relation="account.account", string="Child Accounts"),
@@ -621,6 +742,7 @@
             if method == 'write':
                 raise osv.except_osv(_('Error !'), _('You can not desactivate an account that contains some journal items.'))
             elif method == 'unlink':
+<<<<<<< TREE
                 raise osv.except_osv(_('Error !'), _('You can not remove an account containing journal items.'))
         #Checking whether the account is set as a property to any Partner or not
         value = 'account.account,' + str(ids[0])
@@ -645,9 +767,46 @@
                     raise osv.except_osv(_('Warning !'), _("You cannot change the type of account from '%s' to '%s' type as it contains journal items!") % (old_type,new_type,))
         return True
 
+=======
+                raise osv.except_osv(_('Error !'), _('You cannot remove an account which has account entries!. '))
+        
+        
+        #Checking whether the account is set as a property to any Partner or not
+        value = 'account.account,' + str(ids[0])
+        partner_prop_acc = self.pool.get('ir.property').search(cr, uid, [('value','=',value)], context=context)
+        if partner_prop_acc:
+            raise osv.except_osv(_('Warning !'), _('You cannot remove/deactivate an account which is set as a property to any Partner!'))
+        
+        return True
+    
+    def _check_allow_type_change(self, cr, uid, ids, new_type, context):
+        group1 = ['payable', 'receivable', 'other']
+        group2 = ['consolidation','view']
+        
+        line_obj = self.pool.get('account.move.line')
+        for account in self.browse(cr, uid, ids, context=context):
+            old_type = account.type
+            account_ids = self.search(cr, uid, [('id', 'child_of', [account.id])])
+            
+            if line_obj.search(cr, uid, [('account_id', 'in', account_ids)]):
+                #Check for 'Closed' type
+                if old_type == 'closed' and new_type !='closed':
+                    raise osv.except_osv(_('Warning !'), _("You cannot change the type of account from 'Closed' to any other type which contains account entries!"))
+            
+                #Check for change From group1 to group2 and vice versa
+                if (old_type in group1 and new_type in group2) or (old_type in group2 and new_type in group1):
+                    raise osv.except_osv(_('Warning !'), _("You cannot change the type of account from '%s' to '%s' type as it contains account entries!") % (old_type,new_type,))
+           
+        return True
+        
+>>>>>>> MERGE-SOURCE
     def write(self, cr, uid, ids, vals, context=None):
+<<<<<<< TREE
 
         if context is None:
+=======
+        if context is None:
+>>>>>>> MERGE-SOURCE
             context = {}
         if not ids:
             return True
@@ -663,9 +822,15 @@
                     if vals['company_id']!=i:
                         raise osv.except_osv(_('Warning !'), _('You cannot change the owner company of an account that already contains journal items.'))
         if 'active' in vals and not vals['active']:
+<<<<<<< TREE
             self._check_moves(cr, uid, ids, "write", context=context)
         if 'type' in vals.keys():
             self._check_allow_type_change(cr, uid, ids, vals['type'], context=context)
+=======
+            self._check_moves(cr, uid, ids, "write", context)
+        if 'type' in vals.keys(): 
+            self._check_allow_type_change(cr, uid, ids, vals['type'], context=context)
+>>>>>>> MERGE-SOURCE
         return super(account_account, self).write(cr, uid, ids, vals, context=context)
 
     def unlink(self, cr, uid, ids, context=None):
@@ -844,10 +1009,18 @@
         if context.get('journal_type', False):
             args += [('type','=',context.get('journal_type'))]
         if name:
+<<<<<<< TREE
             ids = self.search(cr, user, [('code', 'ilike', name)]+ args, limit=limit, context=context)
+=======
+            ids = self.search(cr, user, [('code','ilike',name)]+ args, limit=limit, context=context)
+>>>>>>> MERGE-SOURCE
         if not ids:
+<<<<<<< TREE
             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)
+>>>>>>> MERGE-SOURCE
         return self.name_get(cr, user, ids, context=context)
 
     def onchange_type(self, cr, uid, ids, type, currency, context=None):
@@ -962,6 +1135,7 @@
             if exception:
                 raise osv.except_osv(_('Error !'), _('No fiscal year defined for this date !\nPlease create one from the configuration of the accounting menu.'))
             else:
+<<<<<<< TREE
                 return []
         return ids
 
@@ -977,6 +1151,23 @@
             ids = self.search(cr, user, [('name', operator, name)]+ args, limit=limit)
         return self.name_get(cr, user, ids, context=context)
 
+=======
+                return False
+        return ids[0]
+    
+    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
+        if args is None:
+            args = []
+        if context is None:
+            context = {}
+        ids = []
+        if name:
+            ids = self.search(cr, user, [('code','ilike',name)]+ args, limit=limit)
+        if not ids:
+            ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit)
+        return self.name_get(cr, user, ids, context=context)
+    
+>>>>>>> MERGE-SOURCE
 account_fiscalyear()
 
 class account_period(osv.osv):
@@ -1057,6 +1248,18 @@
         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),))
         return True
+    
+    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
+        if args is None:
+            args = []
+        if context is None:
+            context = {}
+        ids = []
+        if name:
+            ids = self.search(cr, user, [('code','ilike',name)]+ args, limit=limit)
+        if not ids:
+            ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit)
+        return self.name_get(cr, user, ids, context=context)
 
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
         if args is None:
@@ -1230,10 +1433,17 @@
 
     def _amount_compute(self, cr, uid, ids, name, args, context, where =''):
         if not ids: return {}
+<<<<<<< TREE
         cr.execute( 'SELECT move_id, SUM(debit) '\
                     'FROM account_move_line '\
                     'WHERE move_id IN %s '\
                     'GROUP BY move_id', (tuple(ids),))
+=======
+        cr.execute('SELECT move_id, SUM(debit) '\
+                   'FROM account_move_line '\
+                   'WHERE move_id IN %s '\
+                   'GROUP BY move_id', (tuple(ids),))
+>>>>>>> MERGE-SOURCE
         result = dict(cr.fetchall())
         for id in ids:
             result.setdefault(id, 0.0)
@@ -1249,6 +1459,7 @@
                 else:
                     continue
             else:
+<<<<<<< TREE
                 if cond[1] in ['=like', 'like', 'not like', 'ilike', 'not ilike', 'in', 'not in', 'child_of']:
                     continue
 
@@ -1258,6 +1469,18 @@
         if ids:
             return [('id', 'in', tuple(ids))]
         return [('id', '=', '0')]
+=======
+                if cond[1] in ['=like', 'like', 'not like', 'ilike', 'not ilike', 'in', 'not in', 'child_of']:
+                    continue
+            
+            cr.execute("select move_id from account_move_line group by move_id having sum(debit) %s %%s" % (cond[1]) ,(amount,))
+            res_ids = set(id[0] for id in cr.fetchall())
+            ids = ids and (ids & res_ids) or res_ids
+        if ids:
+            return [('id','in',tuple(ids))]
+        else:    
+            return [('id', '=', '0')]
+>>>>>>> MERGE-SOURCE
 
     _columns = {
         'name': fields.char('Number', size=64, required=True),
@@ -1322,6 +1545,7 @@
                         c = {'fiscalyear_id': move.period_id.fiscalyear_id.id}
                         new_name = obj_sequence.next_by_id(cr, uid, journal.sequence_id.id, c)
                     else:
+<<<<<<< TREE
                         raise osv.except_osv(_('Error'), _('No sequence defined on the journal !'))
 
                 if new_name:
@@ -1331,6 +1555,18 @@
                    'SET state=%s '\
                    'WHERE id IN %s',
                    ('posted', tuple(valid_moves),))
+=======
+                        raise osv.except_osv(_('Error'), _('No sequence defined in the journal !'))
+                    if new_name:
+                        self.write(cr, uid, [move.id], {'name':new_name})
+
+            cr.execute('UPDATE account_move '\
+                       'SET state=%s '\
+                       'WHERE id IN %s',
+                       ('posted', tuple(ids)))
+        else:
+            raise osv.except_osv(_('Integrity Error !'), _('You can not validate a non-balanced entry !\nMake sure you have configured Payment Term properly !\nIt should contain atleast one Payment Term Line with type "Balance" !'))
+>>>>>>> MERGE-SOURCE
         return True
 
     def button_validate(self, cursor, user, ids, context=None):
@@ -1353,10 +1589,17 @@
         for line in self.browse(cr, uid, ids, context=context):
             if 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.'))
+<<<<<<< TREE
         if ids:
             cr.execute('UPDATE account_move '\
                        'SET state=%s '\
                        'WHERE id IN %s', ('draft', tuple(ids),))
+=======
+        if len(ids):
+            cr.execute('UPDATE account_move '\
+                       'SET state=%s '\
+                       'WHERE id IN %s', ('draft', tuple(ids)))
+>>>>>>> MERGE-SOURCE
         return True
 
     def onchange_line_id(self, cr, uid, ids, line_ids, context=None):
@@ -1459,8 +1702,12 @@
         return amount
 
     def _centralise(self, cr, uid, move, mode, context=None):
+<<<<<<< TREE
         assert mode in ('debit', 'credit'), 'Invalid Mode' #to prevent sql injection
         currency_obj = self.pool.get('res.currency')
+=======
+        assert (mode in ('debit', 'credit')), 'Invalid Mode' #to prevent sql injection
+>>>>>>> MERGE-SOURCE
         if context is None:
             context = {}
 
@@ -1507,8 +1754,13 @@
             line_id2 = res[0]
         else:
             line_id2 = 0
+<<<<<<< TREE
 
         cr.execute('SELECT SUM(%s) FROM account_move_line WHERE move_id=%%s AND id!=%%s' % (mode,), (move.id, line_id2))
+=======
+        
+        cr.execute('SELECT SUM(%s) FROM account_move_line WHERE move_id=%%s AND id!=%%s' % (mode,), (move.id, line_id2))
+>>>>>>> MERGE-SOURCE
         result = cr.fetchone()[0] or 0.0
         cr.execute('update account_move_line set '+mode2+'=%s where id=%s', (result, line_id))
 
@@ -1547,10 +1799,16 @@
     def validate(self, cr, uid, ids, context=None):
         if context and ('__last_update' in context):
             del context['__last_update']
+<<<<<<< TREE
 
         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')
+=======
+
+        valid_moves = [] #Maintains a list of moves which can be responsible to create analytic entries
+
+>>>>>>> MERGE-SOURCE
         for move in self.browse(cr, uid, ids, context):
             # Unlink old analytic lines on move_lines
             for obj_line in move.line_id:
@@ -1565,7 +1823,7 @@
             for line in move.line_id:
                 amount += line.debit - line.credit
                 line_ids.append(line.id)
-                if line.state=='draft':
+                if line.state == 'draft':
                     line_draft_ids.append(line.id)
 
                 if not company_id:
@@ -1573,6 +1831,7 @@
                 if not company_id == line.account_id.company_id.id:
                     raise osv.except_osv(_('Error'), _("Couldn't create move between different companies"))
 
+<<<<<<< TREE
                 if line.account_id.currency_id and line.currency_id:
                     if line.account_id.currency_id.id != line.currency_id.id and (line.account_id.currency_id.id != line.account_id.company_id.currency_id.id):
                         raise osv.except_osv(_('Error'), _("""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.""") % (line.account_id.code, line.account_id.name))
@@ -1586,15 +1845,45 @@
                 # Check whether the move lines are confirmed
 
                 if not line_draft_ids:
+=======
+                if line.account_id.currency_id:
+                    if line.account_id.currency_id.id != line.currency_id.id and (line.account_id.currency_id.id != line.account_id.company_id.currency_id.id or line.currency_id):
+                        raise osv.except_osv(_('Error'), _("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.") % (line.account_id.code, line.account_id.name))
+
+            # Check that the move balances, the tolerance for debit/credit must
+            # be smaller than the smallest value according to price accuracy
+            # (hence the +1 below)
+            # Example:
+            #    difference == 0.01 is OK iff price_accuracy <= 1!
+            #    difference == 0.0001 is OK iff price_accuracy <= 3!
+            if abs(amount) < 10 ** -(int(config['price_accuracy'])+1):
+                # If the move is balanced
+                # Add to the list of valid moves
+                # (analytic lines will be created later for valid moves)
+                valid_moves.append(move)
+
+                # Check whether the move lines are confirmed
+                
+                if not len(line_draft_ids):
+>>>>>>> MERGE-SOURCE
                     continue
+<<<<<<< TREE
                 # Update the move lines (set them as valid)
 
                 obj_move_line.write(cr, uid, line_draft_ids, {
+=======
+                # Update the move lines (set them as valid)
+
+                self.pool.get('account.move.line').write(cr, uid, line_draft_ids, {
+                    'journal_id': move.journal_id.id,
+                    'period_id': move.period_id.id,
+>>>>>>> MERGE-SOURCE
                     'state': 'valid'
                 }, context, check=False)
 
                 account = {}
                 account2 = {}
+<<<<<<< TREE
 
                 if journal.type in ('purchase','sale'):
                     for line in move.line_id:
@@ -1621,17 +1910,59 @@
                 #
                 # Update the move lines (set them as valid)
                 #
+=======
+                
+                if journal.type in ('purchase','sale'):
+
+                    for line in move.line_id:
+                        code = amount = 0
+                        key = (line.account_id.id, line.tax_code_id.id)
+                        if key in account2:
+                            code = account2[key][0]
+                            amount = account2[key][1] * (line.debit + line.credit)
+                        elif line.account_id.id in account:
+                            code = account[line.account_id.id][0]
+                            amount = account[line.account_id.id][1] * (line.debit + line.credit)
+                        if (code or amount) and not (line.tax_code_id or line.tax_amount):
+                            self.pool.get('account.move.line').write(cr, uid, [line.id], {
+                                'tax_code_id': code,
+                                'tax_amount': amount
+                            }, context, check=False)
+                            
+            elif journal.centralisation:
+                # If the move is not balanced, it must be centralised...
+
+                # Add to the list of valid moves
+                # (analytic lines will be created later for valid moves)
+                valid_moves.append(move)
+
+                #
+                # Update the move lines (set them as valid)
+                #
+                
+>>>>>>> MERGE-SOURCE
                 self._centralise(cr, uid, move, 'debit', context=context)
                 self._centralise(cr, uid, move, 'credit', context=context)
                 obj_move_line.write(cr, uid, line_draft_ids, {
                     'state': 'valid'
                 }, context, check=False)
             else:
+<<<<<<< TREE
                 # We can't validate it (it's unbalanced)
                 # Setting the lines as draft
                 obj_move_line.write(cr, uid, line_ids, {
+=======
+                # We can't validate it (it's unbalanced)
+                # Setting the lines as draft
+                self.pool.get('account.move.line').write(cr, uid, line_ids, {
+                    'journal_id': move.journal_id.id,
+                    'period_id': move.period_id.id,
+                    #'tax_code_id': False,
+                    #'tax_amount': False,
+>>>>>>> MERGE-SOURCE
                     'state': 'draft'
                 }, context, check=False)
+<<<<<<< TREE
         # Create analytic lines for the valid moves
         for record in valid_moves:
             obj_move_line.create_analytic_lines(cr, uid, [line.id for line in record.line_id], context)
@@ -1639,6 +1970,16 @@
         valid_moves = [move.id for move in valid_moves]
         return len(valid_moves) > 0 and valid_moves or False
 
+=======
+
+        # Create analytic lines for the valid moves
+        
+        for record in valid_moves:
+            self.pool.get('account.move.line').create_analytic_lines(cr, uid, [line.id for line in record.line_id], context)
+
+        return len(valid_moves) > 0
+
+>>>>>>> MERGE-SOURCE
 account_move()
 
 class account_move_reconcile(osv.osv):
@@ -1698,28 +2039,51 @@
 
     This code is used for some tax declarations.
     """
+<<<<<<< TREE
     def _sum(self, cr, uid, ids, name, args, context, where ='', where_params=()):
         parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
+=======
+    def _sum(self, cr, uid, ids, name, args, context,
+             where ='', where_params=()):
+        parent_ids = tuple(self.search(
+            cr, uid, [('parent_id', 'child_of', ids)]))
+>>>>>>> MERGE-SOURCE
         if context.get('based_on', 'invoices') == 'payments':
             cr.execute('SELECT line.tax_code_id, sum(line.tax_amount) \
                     FROM account_move_line AS line, \
                         account_move AS move \
                         LEFT JOIN account_invoice invoice ON \
                             (invoice.move_id = move.id) \
+<<<<<<< TREE
                     WHERE line.tax_code_id IN %s '+where+' \
+=======
+                    WHERE line.tax_code_id in %s '+where+' \
+>>>>>>> MERGE-SOURCE
                         AND move.id = line.move_id \
                         AND ((invoice.state = \'paid\') \
                             OR (invoice.id IS NULL)) \
+<<<<<<< TREE
                             GROUP BY line.tax_code_id',
                                 (parent_ids,) + where_params)
+=======
+                    GROUP BY line.tax_code_id',
+                       (parent_ids,)+where_params)
+>>>>>>> MERGE-SOURCE
         else:
             cr.execute('SELECT line.tax_code_id, sum(line.tax_amount) \
+<<<<<<< TREE
                     FROM account_move_line AS line, \
                     account_move AS move \
                     WHERE line.tax_code_id IN %s '+where+' \
                     AND move.id = line.move_id \
                     GROUP BY line.tax_code_id',
                        (parent_ids,) + where_params)
+=======
+                    FROM account_move_line AS line \
+                    WHERE line.tax_code_id in %s '+where+' \
+                    GROUP BY line.tax_code_id',
+                       (parent_ids,)+where_params)
+>>>>>>> MERGE-SOURCE
         res=dict(cr.fetchall())
         obj_precision = self.pool.get('decimal.precision')
         res2 = {}
@@ -1749,8 +2113,13 @@
             for fy in fiscalyear_id:
                 pids += map(lambda x: str(x.id), self.pool.get('account.fiscalyear').browse(cr, uid, fy).period_ids)
             if pids:
+<<<<<<< TREE
                 where = ' AND line.period_id IN %s AND move.state IN %s '
                 where_params = (tuple(pids), move_state)
+=======
+                where = ' and period_id in %s'
+                where_params = (tuple(pids),)
+>>>>>>> MERGE-SOURCE
         return self._sum(cr, uid, ids, name, args, context,
                 where=where, where_params=where_params)
 
@@ -1768,7 +2137,12 @@
                 return dict.fromkeys(ids, 0.0)
             period_id = period_id[0]
         return self._sum(cr, uid, ids, name, args, context,
+<<<<<<< TREE
                 where=' AND line.period_id=%s AND move.state IN %s', where_params=(period_id, move_state))
+=======
+                         where=' and line.period_id=%s',
+                         where_params=(period_id,))
+>>>>>>> MERGE-SOURCE
 
     _name = 'account.tax.code'
     _description = 'Tax Code'
@@ -1788,6 +2162,7 @@
         'sequence': fields.integer('Sequence', help="Determine the display order in the report 'Accounting \ Reporting \ Generic Reporting \ Taxes \ Taxes Report'"),
     }
 
+<<<<<<< TREE
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
         if not args:
             args = []
@@ -1796,6 +2171,16 @@
         ids = self.search(cr, user, ['|',('name',operator,name),('code',operator,name)] + args, limit=limit, context=context)
         return self.name_get(cr, user, ids, context)
 
+=======
+    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
+        if not args:
+            args = []
+        if context is None:
+            context = {}
+        ids = self.search(cr, user, ['|',('name',operator,name),('code',operator,name)] + args, limit=limit, context=context)
+        return self.name_get(cr, user, ids, context)
+        
+>>>>>>> MERGE-SOURCE
     def name_get(self, cr, uid, ids, context=None):
         if isinstance(ids, (int, long)):
             ids = [ids]
@@ -1817,15 +2202,28 @@
         'sign': 1.0,
         'notprintable': False,
     }
-
-    def copy(self, cr, uid, id, default=None, context=None):
-        if default is None:
-            default = {}
-        default = default.copy()
-        default.update({'line_ids': []})
-        return super(account_tax_code, self).copy(cr, uid, id, default, context)
-
-    _check_recursion = check_cycle
+<<<<<<< TREE
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        default = default.copy()
+        default.update({'line_ids': []})
+        return super(account_tax_code, self).copy(cr, uid, id, default, context)
+
+    _check_recursion = check_cycle
+=======
+    
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        default = default.copy()
+        default.update({'line_ids': []})
+        return super(account_tax_code, self).copy(cr, uid, id, default, context)
+
+    _check_recursion = check_cycle
+
+>>>>>>> MERGE-SOURCE
     _constraints = [
         (_check_recursion, 'Error ! You can not create recursive accounts.', ['parent_id'])
     ]
@@ -2491,6 +2889,7 @@
         'nocreate': False,
     }
 
+<<<<<<< TREE
     def _check_type(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
@@ -2501,6 +2900,9 @@
         return True
 
     _check_recursion = check_cycle
+=======
+    _check_recursion = check_cycle
+>>>>>>> MERGE-SOURCE
     _constraints = [
         (_check_recursion, 'Error ! You can not create recursive account templates.', ['parent_id']),
         (_check_type, 'Configuration Error!\nYou can not define children to an account with internal type different of "View"! ', ['type']),

=== modified file 'account/account_bank_statement.py'
--- account/account_bank_statement.py	2012-02-23 09:48:04 +0000
+++ account/account_bank_statement.py	2012-02-24 01:08:27 +0000
@@ -357,6 +357,7 @@
                         raise osv.except_osv(_('No Analytic Journal !'),_("You have to assign an analytic journal on the '%s' journal!") % (st.journal_id.name,))
                 if not st_line.amount:
                     continue
+<<<<<<< TREE
                 st_line_number = self.get_next_st_line_number(cr, uid, st_number, st_line, context)
                 self.create_move_from_st_line(cr, uid, st_line.id, company_currency_id, st_line_number, context)
 
@@ -368,6 +369,141 @@
         return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
 
     def button_cancel(self, cr, uid, ids, context=None):
+=======
+
+                torec = []
+                if move.amount >= 0:
+                    account_id = st.journal_id.default_credit_account_id.id
+                else:
+                    account_id = st.journal_id.default_debit_account_id.id
+                acc_cur = ((move.amount<=0) and st.journal_id.default_debit_account_id) or move.account_id
+                amount = res_currency_obj.compute(cr, uid, st.currency.id,
+                        company_currency_id, move.amount, context=context,
+                        account=acc_cur)
+                if move.reconcile_id and move.reconcile_id.line_new_ids:
+                    for newline in move.reconcile_id.line_new_ids:
+                        amount += newline.amount
+
+                val = {
+                    'name': move.name,
+                    'date': move.date,
+                    'ref': move.ref,
+                    'move_id': move_id,
+                    'partner_id': ((move.partner_id) and move.partner_id.id) or False,
+                    'account_id': (move.account_id) and move.account_id.id,
+                    'credit': ((amount>0) and amount) or 0.0,
+                    'debit': ((amount<0) and -amount) or 0.0,
+                    'statement_id': st.id,
+                    'journal_id': st.journal_id.id,
+                    'period_id': st.period_id.id,
+                    'currency_id': st.currency.id,
+                }
+                
+                amount = res_currency_obj.compute(cr, uid, st.currency.id,
+                        company_currency_id, move.amount, context=context,
+                        account=acc_cur)
+                if st.currency.id <> company_currency_id:
+                    amount_cur = res_currency_obj.compute(cr, uid, company_currency_id,
+                                st.currency.id, amount, context=context,
+                                account=acc_cur)
+                    val['amount_currency'] = -amount_cur
+
+                if move.account_id and move.account_id.currency_id and move.account_id.currency_id.id <> company_currency_id:
+                    val['currency_id'] = move.account_id.currency_id.id
+                    amount_cur = res_currency_obj.compute(cr, uid, company_currency_id,
+                            move.account_id.currency_id.id, amount, context=context,
+                            account=acc_cur)
+                    val['amount_currency'] = -amount_cur
+
+                torec.append(account_move_line_obj.create(cr, uid, val , context=context))
+
+                if move.reconcile_id and move.reconcile_id.line_new_ids:
+                    for newline in move.reconcile_id.line_new_ids:
+                        account_move_line_obj.create(cr, uid, {
+                            'name': newline.name or move.name,
+                            'date': move.date,
+                            'ref': move.ref,
+                            'move_id': move_id,
+                            'partner_id': ((move.partner_id) and move.partner_id.id) or False,
+                            'account_id': (newline.account_id) and newline.account_id.id,
+                            'debit': newline.amount>0 and newline.amount or 0.0,
+                            'credit': newline.amount<0 and -newline.amount or 0.0,
+                            'statement_id': st.id,
+                            'journal_id': st.journal_id.id,
+                            'period_id': st.period_id.id,
+
+                        }, context=context)
+
+                # Fill the secondary amount/currency
+                # if currency is not the same than the company
+                amount_currency = False
+                currency_id = False
+                if st.currency.id <> company_currency_id:
+                    amount_currency = move.amount
+                    currency_id = st.currency.id
+                account_move_line_obj.create(cr, uid, {
+                    'name': move.name,
+                    'date': move.date,
+                    'ref': move.ref,
+                    'move_id': move_id,
+                    'partner_id': ((move.partner_id) and move.partner_id.id) or False,
+                    'account_id': account_id,
+                    'credit': ((amount < 0) and -amount) or 0.0,
+                    'debit': ((amount > 0) and amount) or 0.0,
+                    'statement_id': st.id,
+                    'journal_id': st.journal_id.id,
+                    'period_id': st.period_id.id,
+                    'amount_currency': amount_currency,
+                    'currency_id': currency_id,
+                    }, context=context)
+
+                for line in account_move_line_obj.browse(cr, uid, [x.id for x in
+                        account_move_obj.browse(cr, uid, move_id,
+                            context=context).line_id],
+                        context=context):
+                    if line.state <> 'valid':
+                        raise osv.except_osv(_('Error !'),
+                                _('Account move line "%s" is not valid') % line.name)
+
+                if move.reconcile_id and move.reconcile_id.line_ids:
+                    ## Search if move has already a partial reconciliation
+                    previous_partial = False
+                    for line_reconcile_move in move.reconcile_id.line_ids:
+                        if line_reconcile_move.reconcile_partial_id:
+                            previous_partial = True
+                            break
+                    ##
+                    torec += map(lambda x: x.id, move.reconcile_id.line_ids)
+                    #try:
+                    if abs(move.reconcile_amount-move.amount)<0.0001:
+
+                        writeoff_acc_id = False
+                        #There should only be one write-off account!
+                        for entry in move.reconcile_id.line_new_ids:
+                            writeoff_acc_id = entry.account_id.id
+                            break
+                        ## If we have already a partial reconciliation
+                        ## We need to make a partial reconciliation
+                        ## To add this amount to previous paid amount
+                        if previous_partial:
+                            account_move_line_obj.reconcile_partial(cr, uid, torec, 'statement', context)
+                        ## If it's the first reconciliation, we do a full reconciliation as regular
+                        else:
+                            account_move_line_obj.reconcile(cr, uid, torec, 'statement', writeoff_acc_id=writeoff_acc_id, writeoff_period_id=st.period_id.id, writeoff_journal_id=st.journal_id.id, context=context)
+
+                    else:
+                        account_move_line_obj.reconcile_partial(cr, uid, torec, 'statement', context)
+                    #except:
+                    #    raise osv.except_osv(_('Error !'), _('Unable to reconcile entry "%s": %.2f') % (move.name, move.amount))
+
+                if st.journal_id.entry_posted:
+                    account_move_obj.write(cr, uid, [move_id], {'state':'posted'})
+            done.append(st.id)
+        self.write(cr, uid, done, {'state':'confirm'}, context=context)
+        return True
+
+    def button_cancel(self, cr, uid, ids, context={}):
+>>>>>>> MERGE-SOURCE
         done = []
         account_move_obj = self.pool.get('account.move')
         for st in self.browse(cr, uid, ids, context=context):
@@ -402,6 +538,7 @@
                 raise osv.except_osv(_('Invalid action !'), _('In order to delete a bank statement, you must first cancel it to delete related journal items.'))
         osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
         return True
+<<<<<<< TREE
 
     def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
@@ -412,15 +549,34 @@
         default['move_line_ids'] = []
         return super(account_bank_statement, self).copy(cr, uid, id, default, context=context)
 
+=======
+    
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        if context is None:
+            context = {}    
+        default = default.copy()
+        default['move_line_ids'] = []
+        return super(account_bank_statement, self).copy(cr, uid, id, default, context)
+    
+>>>>>>> MERGE-SOURCE
 account_bank_statement()
 
 class account_bank_statement_line(osv.osv):
 
+<<<<<<< TREE
     def onchange_partner_id(self, cr, uid, ids, partner_id, context=None):
         obj_partner = self.pool.get('res.partner')
         if context is None:
             context = {}
+=======
+    def onchange_partner_id(self, cursor, user, line_id, partner_id, type, currency_id,
+            context={}):
+        res = {'value': {}}
+>>>>>>> MERGE-SOURCE
         if not partner_id:
+<<<<<<< TREE
             return {}
         part = obj_partner.browse(cr, uid, partner_id, context=context)
         if not part.supplier and not part.customer:
@@ -450,6 +606,56 @@
             part = obj_partner.browse(cr, uid, partner_id, context=context)
             if type == 'supplier':
                 account_id = part.property_account_payable.id
+=======
+            return res
+        line = self.browse(cursor, user, line_id)
+  
+        if not line or (line and not line[0].account_id):
+            part = self.pool.get('res.partner').browse(cursor, user, partner_id,
+                context=context)
+            if type == 'supplier':
+                account_id = part.property_account_payable.id
+            else:
+                account_id =  part.property_account_receivable.id
+            res['value']['account_id'] = account_id
+
+        if not line or (line and not line[0].amount):
+            res_users_obj = self.pool.get('res.users')
+            res_currency_obj = self.pool.get('res.currency')
+            company_currency_id = res_users_obj.browse(cursor, user, user,
+                    context=context).company_id.currency_id.id
+            if not currency_id:
+                currency_id = company_currency_id
+
+            cursor.execute('SELECT sum(debit-credit) \
+                FROM account_move_line \
+                WHERE (reconcile_id is null) \
+                    AND partner_id = %s \
+                    AND account_id=%s', (partner_id, account_id))
+            pgres = cursor.fetchone()
+            balance = pgres and pgres[0] or 0.0
+
+            balance = res_currency_obj.compute(cursor, user, company_currency_id,
+                currency_id, balance, context=context)
+            res['value']['amount'] = balance
+        return res
+
+    def _reconcile_amount(self, cursor, user, ids, name, args, context=None):
+        if not ids:
+            return {}
+        res_currency_obj = self.pool.get('res.currency')
+        res_users_obj = self.pool.get('res.users')
+
+        res = {}
+        company_currency_id = res_users_obj.browse(cursor, user, user,
+                context=context).company_id.currency_id.id
+
+        for line in self.browse(cursor, user, ids, context=context):
+            if line.reconcile_id:
+                res[line.id] = res_currency_obj.compute(cursor, user,
+                        company_currency_id, line.statement_id.currency.id,
+                        line.reconcile_id.total_entry, context=context)
+>>>>>>> MERGE-SOURCE
             else:
                 account_id = part.property_account_receivable.id
             res['value']['account_id'] = account_id

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2012-02-16 19:11:07 +0000
+++ account/account_invoice.py	2012-02-24 01:08:27 +0000
@@ -20,12 +20,26 @@
 ##############################################################################
 
 import time
+<<<<<<< TREE
 from lxml import etree
 import decimal_precision as dp
 
+=======
+from operator import itemgetter
+
+>>>>>>> MERGE-SOURCE
 import netsvc
+<<<<<<< TREE
+=======
+from osv import fields, osv
+from osv.orm import except_orm
+>>>>>>> MERGE-SOURCE
 import pooler
+<<<<<<< TREE
 from osv import fields, osv, orm
+=======
+from tools import config
+>>>>>>> MERGE-SOURCE
 from tools.translate import _
 
 class account_invoice(osv.osv):
@@ -88,6 +102,7 @@
         return [('none', _('Free Reference'))]
 
     def _amount_residual(self, cr, uid, ids, name, args, context=None):
+<<<<<<< TREE
         result = {}
         for invoice in self.browse(cr, uid, ids, context=context):
             result[invoice.id] = 0.0
@@ -96,6 +111,33 @@
                     if m.account_id.type in ('receivable','payable'):
                         result[invoice.id] += m.amount_residual_currency
         return result
+=======
+        if context is None:
+            context = {}
+        res = {}
+        data_inv = self.browse(cr, uid, ids)
+        cur_obj = self.pool.get('res.currency')
+        for inv in data_inv:
+            if inv.reconciled: 
+                res[inv.id] = 0.0
+                continue
+            inv_total = inv.amount_total
+            context_unreconciled = context.copy()
+            for lines in inv.move_lines:
+                if lines.currency_id and lines.currency_id.id == inv.currency_id.id:
+                   if inv.type in ('out_invoice','in_refund'):
+                        inv_total += lines.amount_currency
+                   else:
+                        inv_total -= lines.amount_currency
+                else:
+                   context_unreconciled.update({'date': lines.date})
+                   amount_in_invoice_currency = cur_obj.compute(cr, uid, inv.company_id.currency_id.id, inv.currency_id.id,abs(lines.debit-lines.credit),round=False,context=context_unreconciled)
+                   inv_total -= amount_in_invoice_currency
+
+            result = inv_total 
+            res[inv.id] =  self.pool.get('res.currency').round(cr, uid, inv.currency_id, result)
+        return res
+>>>>>>> MERGE-SOURCE
 
     # Give Journal Items related to the payment reconciled to this invoice
     # Return ids of partial and total payments related to the selected invoices
@@ -136,6 +178,7 @@
         for invoice in self.browse(cr, uid, ids, context=context):
             src = []
             lines = []
+<<<<<<< TREE
             if invoice.move_id:
                 for m in invoice.move_id.line_id:
                     temp_lines = []
@@ -146,6 +189,16 @@
                     lines += [x for x in temp_lines if x not in lines]
                     src.append(m.id)
 
+=======
+            for m in self.pool.get('account.move.line').browse(cr, uid, moves, context):
+                temp_lines = []#Added temp list to avoid duplicate records
+                if m.reconcile_id:
+                    temp_lines = map(lambda x: x.id, m.reconcile_id.line_id)
+                elif m.reconcile_partial_id:
+                    temp_lines = map(lambda x: x.id, m.reconcile_partial_id.line_partial_ids)
+                lines += [x for x in temp_lines if x not in lines]
+                src.append(m.id)
+>>>>>>> MERGE-SOURCE
             lines = filter(lambda x: x not in src, lines)
             result[invoice.id] = lines
         return result
@@ -288,6 +341,7 @@
         'internal_number': False,
         'user_id': lambda s, cr, u, c: u,
     }
+<<<<<<< TREE
     _sql_constraints = [
         ('number_uniq', 'unique(number, company_id, journal_id, type)', 'Invoice Number must be unique per Company!'),
     ]
@@ -380,6 +434,20 @@
             self.log(cr, uid, inv_id, message)
         return True
 
+=======
+    
+    def create(self, cr, uid, vals, context={}):
+        try:
+            res = super(account_invoice, self).create(cr, uid, vals, context)
+            return res
+        except Exception,e:
+            if '"journal_id" viol' in e.args[0]:
+                raise except_orm(_('Configuration Error!'),
+                     _('There is no Accounting Journal of type Sale/Purchase defined!'))
+            else:
+                raise except_orm(_('UnknownError'), str(e))
+            
+>>>>>>> MERGE-SOURCE
     def unlink(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
@@ -393,8 +461,17 @@
         osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
         return True
 
+<<<<<<< TREE
     def onchange_partner_id(self, cr, uid, ids, type, partner_id,\
             date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):
+=======
+#   def get_invoice_address(self, cr, uid, ids):
+#       res = self.pool.get('res.partner').address_get(cr, uid, [part], ['invoice'])
+#       return [{}]
+
+    def onchange_partner_id(self, cr, uid, ids, type, partner_id,
+            date_invoice=False, payment_term=False, partner_bank=False):
+>>>>>>> MERGE-SOURCE
         invoice_addr_id = False
         contact_addr_id = False
         partner_payment_term = False
@@ -461,7 +538,7 @@
             else:
                 result['value']['date_due'] = False
 
-        if partner_bank_id != bank_id:
+        if partner_bank != bank_id:
             to_update = self.onchange_partner_bank(cr, uid, ids, bank_id)
             result['value'].update(to_update['value'])
         return result
@@ -498,7 +575,11 @@
     def onchange_invoice_line(self, cr, uid, ids, lines):
         return {}
 
+<<<<<<< TREE
     def onchange_partner_bank(self, cursor, user, ids, partner_bank_id=False):
+=======
+    def onchange_partner_bank(self, cursor, user, ids, partner_bank):
+>>>>>>> MERGE-SOURCE
         return {'value': {}}
 
     def onchange_company_id(self, cr, uid, ids, company_id, part_id, type, invoice_line, currency_id):
@@ -598,6 +679,7 @@
     def move_line_id_payment_gets(self, cr, uid, ids, *args):
         res = {}
         if not ids: return res
+<<<<<<< TREE
         cr.execute('SELECT i.id, l.id '\
                    'FROM account_move_line l '\
                    'LEFT JOIN account_invoice i ON (i.move_id=l.move_id) '\
@@ -607,6 +689,15 @@
         for r in cr.fetchall():
             res.setdefault(r[0], [])
             res[r[0]].append( r[1] )
+=======
+        cr.execute('SELECT l.id '\
+                   'FROM account_move_line l '\
+                   'LEFT JOIN account_invoice i ON (i.move_id=l.move_id) '\
+                   'WHERE i.id IN %s '\
+                   'AND l.account_id=i.account_id',
+                   (tuple(ids),))
+        res = map(itemgetter(0), cr.fetchall())
+>>>>>>> MERGE-SOURCE
         return res
 
     def copy(self, cr, uid, id, default=None, context=None):
@@ -645,14 +736,25 @@
         ctx = context.copy()
         ait_obj = self.pool.get('account.invoice.tax')
         for id in ids:
+<<<<<<< TREE
             cr.execute("DELETE FROM account_invoice_tax WHERE invoice_id=%s AND manual is False", (id,))
             partner = self.browse(cr, uid, id, context=ctx).partner_id
+=======
+            cr.execute("DELETE FROM account_invoice_tax WHERE invoice_id=%s", (id,))
+            partner = self.browse(cr, uid, id,context=ctx).partner_id
+>>>>>>> MERGE-SOURCE
             if partner.lang:
                 ctx.update({'lang': partner.lang})
             for taxe in ait_obj.compute(cr, uid, id, context=ctx).values():
                 ait_obj.create(cr, uid, taxe)
+<<<<<<< TREE
         # Update the stored value (fields.function), so we write to trigger recompute
         self.pool.get('account.invoice').write(cr, uid, ids, {'invoice_line':[]}, context=ctx)
+=======
+         # Update the stored value (fields.function), so we write to trigger recompute
+        self.pool.get('account.invoice').write(cr, uid, ids, {'invoice_line':[]}, context=ctx)    
+#        self.pool.get('account.invoice').write(cr, uid, ids, {}, context=context)
+>>>>>>> MERGE-SOURCE
         return True
 
     def button_compute(self, cr, uid, ids, context=None, set_total=False):
@@ -706,6 +808,16 @@
             if res and res['value']:
                 self.write(cr, uid, [inv.id], res['value'])
         return True
+    
+    def finalize_invoice_move_lines(self, cr, uid, invoice_browse, move_lines):
+        """finalize_invoice_move_lines(cr, uid, invoice, move_lines) -> move_lines
+        Hook method to be overridden in additional modules to verify and possibly alter the 
+        move lines to be created by an invoice, for special cases.
+        :param invoice_browse: browsable record of the invoice that is generating the move lines
+        :param move_lines: list of dictionaries with the account.move.lines (as for create())
+        :return: the (possibly updated) final move_lines to create for this invoice 
+        """
+        return move_lines
 
     def finalize_invoice_move_lines(self, cr, uid, invoice_browse, move_lines):
         """finalize_invoice_move_lines(cr, uid, invoice, move_lines) -> move_lines
@@ -820,6 +932,7 @@
             # one move line per invoice line
             iml = self._get_analytic_lines(cr, uid, inv.id, context=ctx)
             # check if taxes are all computed
+<<<<<<< TREE
             compute_taxes = ait_obj.compute(cr, uid, inv.id, context=ctx)
             self.check_tax_lines(cr, uid, inv, compute_taxes, ait_obj)
 
@@ -837,6 +950,32 @@
                 total_fixed = (total_fixed * 100) / (inv.amount_total or 1.0)
                 if (total_fixed + total_percent) > 100:
                     raise osv.except_osv(_('Error !'), _("Can not create the invoice !\nThe related payment term is probably misconfigured as it gives a computed amount greater than the total invoiced amount. The latest line of your payment term must be of type 'balance' to avoid rounding issues."))
+=======
+            ctx = context.copy()
+            ctx.update({'lang': inv.partner_id.lang})
+            compute_taxes = ait_obj.compute(cr, uid, inv.id, context=ctx)
+            if not inv.tax_line:
+                for tax in compute_taxes.values():
+                    ait_obj.create(cr, uid, tax)
+            else:
+                tax_key = []
+                for tax in inv.tax_line:
+                    if tax.manual:
+                        continue
+                    key = (tax.tax_code_id.id, tax.base_code_id.id, tax.account_id.id)
+                    tax_key.append(key)
+                    if not key in compute_taxes:
+                        raise osv.except_osv(_('Warning !'), _('Global taxes defined, but are not in invoice lines !'))
+                    base = compute_taxes[key]['base']
+                    if abs(base - tax.base) > inv.company_id.currency_id.rounding:
+                        raise osv.except_osv(_('Warning !'), _('Tax base different !\nClick on compute to update tax base'))
+                for key in compute_taxes:
+                    if not key in tax_key:
+                        raise osv.except_osv(_('Warning !'), _('Taxes missing !'))
+
+            if inv.type in ('in_invoice', 'in_refund') and abs(inv.check_total - inv.amount_total) >= (inv.currency_id.rounding/2.0):
+                raise osv.except_osv(_('Bad total !'), _('Please verify the price of the invoice !\nThe real total does not match the computed total.'))
+>>>>>>> MERGE-SOURCE
 
             # one move line per tax line
             iml += ait_obj.move_line_get(cr, uid, inv.id)
@@ -918,6 +1057,7 @@
             journal = journal_obj.browse(cr, uid, journal_id, context=ctx)
             if journal.centralisation:
                 raise osv.except_osv(_('UserError'),
+<<<<<<< TREE
                         _('You cannot create an invoice on a centralised journal. Uncheck the centralised counterpart box in the related journal from the configuration menu.'))
 
             line = self.finalize_invoice_move_lines(cr, uid, inv, line)
@@ -931,6 +1071,14 @@
             }
             period_id = inv.period_id and inv.period_id.id or False
             ctx.update({'company_id': inv.company_id.id})
+=======
+                        _('Cannot create invoice move on centralised journal'))
+
+            line = self.finalize_invoice_move_lines(cr, uid, inv, line)
+
+            move = {'ref': inv.number, 'line_id': line, 'journal_id': journal_id, 'date': date}
+            period_id=inv.period_id and inv.period_id.id or False
+>>>>>>> MERGE-SOURCE
             if not period_id:
                 period_ids = period_obj.find(cr, uid, inv.date_invoice, context=ctx)
                 period_id = period_ids and period_ids[0] or False
@@ -942,11 +1090,18 @@
             move_id = move_obj.create(cr, uid, move, context=ctx)
             new_move_name = move_obj.browse(cr, uid, move_id, context=ctx).name
             # make the invoice point to that move
+<<<<<<< TREE
             self.write(cr, uid, [inv.id], {'move_id': move_id,'period_id':period_id, 'move_name':new_move_name}, context=ctx)
             # Pass invoice in context in method post: used if you want to get the same
             # account move reference when creating the same invoice after a cancelled one:
             ctx.update({'invoice':inv})
             move_obj.post(cr, uid, [move_id], context=ctx)
+=======
+            self.write(cr, uid, [inv.id], {'move_id': move_id,'period_id':period_id, 'move_name':new_move_name})
+            # Pass invoice in context in method post: used if you want to get the same
+            # account move reference when creating the same invoice after a cancelled one:
+            self.pool.get('account.move').post(cr, uid, [move_id], context={'invoice':inv})
+>>>>>>> MERGE-SOURCE
         self._log_event(cr, uid, ids)
         return True
 
@@ -971,6 +1126,7 @@
             'analytic_account_id': x.get('account_analytic_id', False),
         }
 
+<<<<<<< TREE
     def action_number(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
@@ -989,7 +1145,34 @@
             if invtype in ('in_invoice', 'in_refund'):
                 if not reference:
                     ref = self._convert_ref(cr, uid, number)
+=======
+    def action_number(self, cr, uid, ids, *args):
+        cr.execute('SELECT id, type, number, move_id, reference ' \
+                   'FROM account_invoice ' \
+                   'WHERE id IN %s',
+                   (tuple(ids),))
+        obj_inv = self.browse(cr, uid, ids)[0]
+        for (id, invtype, number, move_id, reference) in cr.fetchall():
+            if not number:
+                tmp_context = {
+                    'fiscalyear_id' : obj_inv.period_id.fiscalyear_id.id,
+                }
+                if obj_inv.journal_id.invoice_sequence_id:
+                    sid = obj_inv.journal_id.invoice_sequence_id.id
+                    number = self.pool.get('ir.sequence').get_id(cr, uid, sid, 'id=%s', context=tmp_context)
+>>>>>>> MERGE-SOURCE
                 else:
+<<<<<<< TREE
+=======
+                    number = self.pool.get('ir.sequence').get_id(cr, uid,
+                                                                 'account.invoice.' + invtype,
+                                                                 'code=%s',
+                                                                 context=tmp_context)
+                if not number:
+                    raise osv.except_osv(_('Warning !'), _('There is no active invoice sequence defined for the journal !'))
+
+                if invtype in ('in_invoice', 'in_refund'):
+>>>>>>> MERGE-SOURCE
                     ref = reference
             else:
                 ref = self._convert_ref(cr, uid, number)
@@ -1023,6 +1206,7 @@
             if i['move_id']:
                 move_ids.append(i['move_id'][0])
             if i['payment_ids']:
+<<<<<<< TREE
                 account_move_line_obj = self.pool.get('account.move.line')
                 pay_ids = account_move_line_obj.browse(cr, uid, i['payment_ids'])
                 for move_line in pay_ids:
@@ -1030,6 +1214,14 @@
                         raise osv.except_osv(_('Error !'), _('You can not cancel an invoice which is partially paid! You need to unreconcile related payment entries first!'))
 
         # First, set the invoices as cancelled and detach the move ids
+=======
+                account_move_line_obj = self.pool.get('account.move.line')
+                pay_ids = account_move_line_obj.browse(cr, uid , i['payment_ids'])
+                for move_line in pay_ids:
+                    if move_line.reconcile_partial_id and move_line.reconcile_partial_id.line_partial_ids:
+                        raise osv.except_osv(_('Error !'), _('You cannot cancel the Invoice which is Partially Paid! You need to unreconcile concerned payment entries!'))
+
+>>>>>>> MERGE-SOURCE
         self.write(cr, uid, ids, {'state':'cancel', 'move_id':False})
         if move_ids:
             # second, invalidate the move(s)
@@ -1220,20 +1412,32 @@
         line_ids = []
         total = 0.0
         line = self.pool.get('account.move.line')
+<<<<<<< TREE
         move_ids = [move_id,]
         if invoice.move_id:
             move_ids.append(invoice.move_id.id)
         cr.execute('SELECT id FROM account_move_line '\
                    'WHERE move_id IN %s',
                    ((move_id, invoice.move_id.id),))
+=======
+        cr.execute('SELECT id FROM account_move_line '\
+                   'WHERE move_id in %s',
+                   ((move_id, invoice.move_id.id),))
+>>>>>>> MERGE-SOURCE
         lines = line.browse(cr, uid, map(lambda x: x[0], cr.fetchall()) )
+
         for l in lines+invoice.payment_ids:
             if l.account_id.id == src_account_id:
                 line_ids.append(l.id)
                 total += (l.debit or 0.0) - (l.credit or 0.0)
+<<<<<<< TREE
 
         inv_id, name = self.name_get(cr, uid, [invoice.id], context=context)[0]
         if (not round(total,self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))) or writeoff_acc_id:
+=======
+
+        if (not round(total,int(config['price_accuracy']))) or writeoff_acc_id:
+>>>>>>> MERGE-SOURCE
             self.pool.get('account.move.line').reconcile(cr, uid, line_ids, 'manual', writeoff_acc_id, writeoff_period_id, writeoff_journal_id, context)
         else:
             code = invoice.currency_id.symbol
@@ -1332,7 +1536,11 @@
             raise osv.except_osv(_('No Partner Defined !'),_("You must first select a partner !") )
         if not product:
             if type in ('in_invoice', 'in_refund'):
+<<<<<<< TREE
                 return {'value': {}, 'domain':{'product_uom':[]}}
+=======
+                return {'value':{}, 'domain':{'product_uom':[]}}
+>>>>>>> MERGE-SOURCE
             else:
                 return {'value': {'price_unit': 0.0}, 'domain':{'product_uom':[]}}
         part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
@@ -1369,8 +1577,13 @@
         result['name'] = res.partner_ref
 
         domain = {}
+<<<<<<< TREE
         result['uos_id'] = res.uom_id.id or uom or False
         result['note'] = res.description
+=======
+        result['uos_id'] = uom or res.uom_id.id or False
+        result['note'] = res.description
+>>>>>>> MERGE-SOURCE
         if result['uos_id']:
             res2 = res.uom_id.category_id.id
             if res2:

=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml	2012-02-16 18:50:48 +0000
+++ account/account_invoice_view.xml	2012-02-24 01:08:27 +0000
@@ -497,6 +497,7 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field eval="False" name="view_id"/>
             <field name="domain">[('type','=','in_refund')]</field>
+<<<<<<< TREE
             <field name="context">{'default_type': 'in_refund', 'type': 'in_refund', 'journal_type': 'purchase_refund'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
             <field name="help">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.</field>
@@ -511,6 +512,241 @@
            context="{'search_default_journal_id': [active_id], 'search_default_unpaid':1, 'default_journal_id': active_id}"
            res_model="account.invoice"
            src_model="account.journal"/>
+=======
+            <field name="context">{'type':'in_refund'}</field>
+        </record>
+        <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="account.menu_finance_invoice"/>
+
+        <record id="action_invoice_tree4_new" model="ir.actions.act_window">
+            <field name="name">New Supplier Refund</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree,calendar,graph</field>
+            <field eval="invoice_supplier_form" name="view_id"/>
+            <field name="domain">[('type','=','in_refund')]</field>
+            <field name="context">{'type':'in_refund'}</field>
+        </record>
+        <menuitem action="action_invoice_tree4_new" id="menu_action_invoice_tree4_new" parent="menu_action_invoice_tree4"/>
+
+
+        <record id="action_invoice_tree5" model="ir.actions.act_window">
+            <field name="name">Draft Customer Invoices</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="domain">[('state','=','draft'),('type','=','out_invoice')]</field>
+            <field name="context">{'type':'out_invoice'}</field>
+        </record>
+        <record id="action_invoice_tree5_view1" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="act_window_id" ref="action_invoice_tree5"/>
+        </record>
+        <record id="action_invoice_tree5_view2" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="invoice_form"/>
+            <field name="act_window_id" ref="action_invoice_tree5"/>
+        </record>
+
+        <menuitem action="action_invoice_tree5" id="menu_invoice_draft" parent="menu_action_invoice_tree1"/>
+
+        <record id="action_invoice_tree6" model="ir.actions.act_window">
+            <field name="name">PRO-FORMA Customer Invoices</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="domain">[('state','=','proforma2'),('type','=','out_invoice')]</field>
+            <field name="context">{'type':'out_invoice'}</field>
+        </record>
+        <record id="action_invoice_tree6_view1" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="act_window_id" ref="action_invoice_tree6"/>
+        </record>
+        <record id="action_invoice_tree6_view2" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="invoice_form"/>
+            <field name="act_window_id" ref="action_invoice_tree6"/>
+        </record>
+
+        <menuitem action="action_invoice_tree6" id="menu_action_invoice_tree6" parent="menu_action_invoice_tree1"/>
+
+        <record id="action_invoice_tree7" model="ir.actions.act_window">
+            <field name="name">Unpaid Customer Invoices</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="domain">[('state','not in',['draft','cancel','proforma','proforma2']),('reconciled','=',False),('type','=','out_invoice')]</field>
+            <field name="context">{'type':'out_invoice'}</field>
+        </record>
+        <record id="action_invoice_tree7_view1" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="act_window_id" ref="action_invoice_tree7"/>
+        </record>
+        <record id="action_invoice_tree7_view2" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="invoice_form"/>
+            <field name="act_window_id" ref="action_invoice_tree7"/>
+        </record>
+
+        <menuitem action="action_invoice_tree7" id="menu_action_invoice_tree7" parent="menu_action_invoice_tree1"/>
+
+        <record id="action_invoice_tree8" model="ir.actions.act_window">
+            <field name="name">Draft Supplier Invoices</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="domain">[('state','=','draft'),('type','=','in_invoice')]</field>
+            <field name="context">{'type':'in_invoice'}</field>
+        </record>
+        <record id="action_invoice_tree8_view1" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="act_window_id" ref="action_invoice_tree8"/>
+        </record>
+        <record id="action_invoice_tree8_view2" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="invoice_supplier_form"/>
+            <field name="act_window_id" ref="action_invoice_tree8"/>
+        </record>
+
+        <menuitem action="action_invoice_tree8" id="menu_action_invoice_tree8" parent="menu_action_invoice_tree2"/>
+
+        <record id="action_invoice_tree9" model="ir.actions.act_window">
+            <field name="name">Unpaid Supplier Invoices</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="domain">[('state','not in',['draft','cancel','proforma','proforma2']),('reconciled','=',False),('type','=','in_invoice')]</field>
+            <field name="context">{'type':'in_invoice'}</field>
+        </record>
+        <record id="action_invoice_tree9_view1" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="act_window_id" ref="action_invoice_tree9"/>
+        </record>
+        <record id="action_invoice_tree9_view2" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="invoice_supplier_form"/>
+            <field name="act_window_id" ref="action_invoice_tree9"/>
+        </record>
+
+        <menuitem action="action_invoice_tree9" id="menu_action_invoice_tree9" parent="menu_action_invoice_tree2"/>
+
+        <record id="action_invoice_tree10" model="ir.actions.act_window">
+            <field name="name">Draft Customer Refunds</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="domain">[('state','=','draft'),('type','=','out_refund')]</field>
+            <field name="context">{'type':'out_refund'}</field>
+        </record>
+        <record id="action_invoice_tree10_view1" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="act_window_id" ref="action_invoice_tree10"/>
+        </record>
+        <record id="action_invoice_tree10_view2" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="invoice_form"/>
+            <field name="act_window_id" ref="action_invoice_tree10"/>
+        </record>
+
+        <menuitem action="action_invoice_tree10" id="menu_action_invoice_tree10" parent="menu_action_invoice_tree3"/>
+
+        <record id="action_invoice_tree11" model="ir.actions.act_window">
+            <field name="name">Unpaid Customer Refunds</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="domain">[('state','not in',['draft','cancel','proforma','proforma2']),('reconciled','=',False),('type','=','out_refund')]</field>
+            <field name="context">{'type':'out_refund'}</field>
+        </record>
+        <record id="action_invoice_tree11_view1" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="act_window_id" ref="action_invoice_tree11"/>
+        </record>
+        <record id="action_invoice_tree11_view2" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="invoice_form"/>
+            <field name="act_window_id" ref="action_invoice_tree11"/>
+        </record>
+
+        <menuitem action="action_invoice_tree11" id="menu_action_invoice_tree11" parent="menu_action_invoice_tree3"/>
+
+        <record id="action_invoice_tree12" model="ir.actions.act_window">
+            <field name="name">Draft Supplier Refunds</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="domain">[('state','=','draft'),('type','=','in_refund')]</field>
+            <field name="context">{'type':'in_refund'}</field>
+        </record>
+        <record id="action_invoice_tree12_view1" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="act_window_id" ref="action_invoice_tree12"/>
+        </record>
+        <record id="action_invoice_tree12_view2" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="invoice_supplier_form"/>
+            <field name="act_window_id" ref="action_invoice_tree12"/>
+        </record>
+
+        <menuitem action="action_invoice_tree12" id="menu_action_invoice_tree12" parent="menu_action_invoice_tree4"/>
+
+        <record id="action_invoice_tree13" model="ir.actions.act_window">
+            <field name="name">Unpaid Supplier Refunds</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="domain">[('state','not in',['draft','cancel','proforma','proforma2']),('reconciled','=',False),('type','=','in_refund')]</field>
+            <field name="context">{'type':'in_refund'}</field>
+        </record>
+        <record id="action_invoice_tree13_view1" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="act_window_id" ref="action_invoice_tree13"/>
+        </record>
+        <record id="action_invoice_tree13_view2" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="invoice_supplier_form"/>
+            <field name="act_window_id" ref="action_invoice_tree13"/>
+        </record>
+
+        <menuitem action="action_invoice_tree13" id="menu_action_invoice_tree13" parent="menu_action_invoice_tree4"/>
+
+        <act_window domain="[('partner_id','=',active_id)]" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>
+
+        <record id="act_res_partner_2_account_invoice_opened_view1" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="act_window_id" ref="act_res_partner_2_account_invoice_opened"/>
+        </record>
+        <record id="act_res_partner_2_account_invoice_opened_view2" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="invoice_form"/>
+            <field name="act_window_id" ref="act_res_partner_2_account_invoice_opened"/>
+        </record>
+
+        <act_window domain="[('journal_id','=',active_id),('state','not in',['draft','cancel','proforma','proforma2']),('reconciled','=',False)]" id="act_account_journal_2_account_invoice_opened" name="Unpaid invoices" res_model="account.invoice" src_model="account.journal"/>
+
+        <act_window domain="[('account_analytic_id', '=', active_id)]" id="act_account_analytic_account_2_account_invoice_line" name="Invoice lines" res_model="account.invoice.line" src_model="account.analytic.account"/>
+		
+		<act_window domain="[('partner_id', '=', partner_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_invoice_account_move_unreconciled" name="Unreconciled Receivables &amp; Payables" res_model="account.move.line" src_model="account.invoice"/>
+>>>>>>> MERGE-SOURCE
 
     </data>
 </openerp>

=== modified file 'account/account_invoice_workflow.xml'
--- account/account_invoice_workflow.xml	2011-01-14 00:11:01 +0000
+++ account/account_invoice_workflow.xml	2012-02-24 01:08:27 +0000
@@ -85,6 +85,14 @@
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">invoice_cancel</field>
         </record>
+        
+        <record id="open_test_to_paid" model="workflow.transition">
+            <field name="act_from" ref="act_open_test"/>
+            <field name="act_to" ref="act_paid"/>
+            <field name="trigger_model">account.move.line</field>
+            <field name="trigger_expr_id">move_line_id_payment_get()</field>
+            <field name="condition">test_paid()</field>
+        </record>
 
         <record id="open_test_to_paid" model="workflow.transition">
             <field name="act_from" ref="act_open_test"/>

=== modified file 'account/account_move_line.py'
--- account/account_move_line.py	2012-02-13 18:07:41 +0000
+++ account/account_move_line.py	2012-02-24 01:08:27 +0000
@@ -379,10 +379,17 @@
         for line_id in ids:
             res[line_id] = False
         cursor.execute('SELECT l.id, i.id ' \
+<<<<<<< TREE
                         'FROM account_move_line l, account_invoice i ' \
                         'WHERE l.move_id = i.move_id ' \
                         'AND l.id IN %s',
                         (tuple(ids),))
+=======
+                       'FROM account_move_line l, account_invoice i ' \
+                       'WHERE l.move_id = i.move_id ' \
+                       'AND l.id in %s',
+                       (tuple(ids),))
+>>>>>>> MERGE-SOURCE
         invoice_ids = []
         for line_id, invoice_id in cursor.fetchall():
             res[line_id] = invoice_id
@@ -654,14 +661,20 @@
             date = datetime.now().strftime('%Y-%m-%d')
         part = partner_obj.browse(cr, uid, partner_id)
 
+<<<<<<< TREE
         if part.property_payment_term:
             res = payment_term_obj.compute(cr, uid, part.property_payment_term.id, 100, date)
+=======
+        if part.property_payment_term:
+            res = self.pool.get('account.payment.term').compute(cr, uid, part.property_payment_term.id, 100, date)
+>>>>>>> MERGE-SOURCE
             if res:
                 val['date_maturity'] = res[0][0]
         if not account_id:
             id1 = part.property_account_payable.id
             id2 =  part.property_account_receivable.id
             if journal:
+<<<<<<< TREE
                 jt = journal_obj.browse(cr, uid, journal).type
                 if jt in ('sale', 'purchase_refund'):
                     val['account_id'] = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, id2)
@@ -672,6 +685,14 @@
                         val['account_id'] = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, id2)
                     elif part.supplier:
                         val['account_id'] = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, id1)
+=======
+                jt = self.pool.get('account.journal').browse(cr, uid, journal).type
+                if jt == 'sale':
+                    val['account_id'] = self.pool.get('account.fiscal.position').map_account(cr, uid, part and part.property_account_position or False, id2)
+
+                elif jt == 'purchase':
+                    val['account_id'] = self.pool.get('account.fiscal.position').map_account(cr, uid, part and part.property_account_position or False, id1)
+>>>>>>> MERGE-SOURCE
                 if val.get('account_id', False):
                     d = self.onchange_account_id(cr, uid, ids, val['account_id'])
                     val.update(d['value'])
@@ -755,21 +776,34 @@
             if line.reconcile_partial_id:
                 for line2 in line.reconcile_partial_id.line_partial_ids:
                     if not line2.reconcile_id:
+<<<<<<< TREE
                         if line2.id not in merges:
                             merges.append(line2.id)
                         if line2.account_id.currency_id:
                             total += line2.amount_currency
                         else:
                             total += (line2.debit or 0.0) - (line2.credit or 0.0)
+=======
+                        if line2.id not in merges:
+                            merges.append(line2.id)
+                        total += (line2.debit or 0.0) - (line2.credit or 0.0)
+>>>>>>> MERGE-SOURCE
                 merges_rec.append(line.reconcile_partial_id.id)
             else:
                 unmerge.append(line.id)
+<<<<<<< TREE
                 if line.account_id.currency_id:
                     total += line.amount_currency
                 else:
                     total += (line.debit or 0.0) - (line.credit or 0.0)
         if self.pool.get('res.currency').is_zero(cr, uid, currency_id, total):
             res = self.reconcile(cr, uid, merges+unmerge, context=context, writeoff_acc_id=writeoff_acc_id, writeoff_period_id=writeoff_period_id, writeoff_journal_id=writeoff_journal_id)
+=======
+                total += (line.debit or 0.0) - (line.credit or 0.0)
+
+        if not total:
+            res = self.reconcile(cr, uid, merges+unmerge, context=context)
+>>>>>>> MERGE-SOURCE
             return res
         r_id = move_rec_obj.create(cr, uid, {
             'type': type,
@@ -790,6 +824,7 @@
         currency = 0.0
         account_id = False
         partner_id = False
+<<<<<<< TREE
         if context is None:
             context = {}
         company_list = []
@@ -797,7 +832,12 @@
             if company_list and not line.company_id.id in company_list:
                 raise osv.except_osv(_('Warning !'), _('To reconcile the entries company should be the same for all entries'))
             company_list.append(line.company_id.id)
+=======
+        invoice = False
+>>>>>>> MERGE-SOURCE
         for line in unrec_lines:
+            if line.invoice:
+                invoice = line.invoice
             if line.state <> 'valid':
                 raise osv.except_osv(_('Error'),
                         _('Entry "%s" is not valid !') % line.name)
@@ -805,6 +845,7 @@
             debit += line['debit']
             currency += line['amount_currency'] or 0.0
             account_id = line['account_id']['id']
+            account_type = line['account_id']['type']
             partner_id = (line['partner_id'] and line['partner_id']['id']) or False
         writeoff = debit - credit
 
@@ -814,11 +855,19 @@
         else:
             date = time.strftime('%Y-%m-%d')
 
+<<<<<<< TREE
         cr.execute('SELECT account_id, reconcile_id '\
                    'FROM account_move_line '\
                    'WHERE id IN %s '\
                    'GROUP BY account_id,reconcile_id',
                    (tuple(ids), ))
+=======
+        cr.execute('SELECT account_id, reconcile_id '\
+                   'FROM account_move_line '\
+                   'WHERE id IN %s '\
+                   'GROUP BY account_id,reconcile_id',
+                   (tuple(ids),))
+>>>>>>> MERGE-SOURCE
         r = cr.fetchall()
         #TODO: move this check to a constraint in the account_move_reconcile object
         if not unrec_lines:
@@ -845,6 +894,7 @@
             if 'comment' in context and context['comment']:
                 libelle = context['comment']
             else:
+<<<<<<< TREE
                 libelle = _('Write-Off')
 
             cur_obj = self.pool.get('res.currency')
@@ -858,9 +908,26 @@
                     else:
                         tmp_amount = cur_obj.compute(cr, uid, line.account_id.company_id.currency_id.id, context.get('currency_id',False), abs(line.debit-line.credit), context={'date': line.date})
                         amount_currency_writeoff += (line.debit > 0) and tmp_amount or -tmp_amount
+=======
+                libelle= _('Write-Off')
+
+            cur_obj = self.pool.get('res.currency')
+            cur_id = False
+            amount_currency_writeoff = 0.0
+            if context.get('company_currency_id',False) != context.get('currency_id',False):
+                cur_id = context.get('currency_id',False)
+                for line in unrec_lines:
+                    #tmp_amount = cur_obj.compute(cr, uid, invoice.company_id.currency_id.id, invoice.currency_id.id, abs(line.debit-line.credit), context={'date': line.date})
+                    if line.currency_id and line.currency_id.id == context.get('currency_id',False):
+                        amount_currency_writeoff += line.amount_currency
+                    else:
+                        tmp_amount = cur_obj.compute(cr, uid, line.account_id.company_id.currency_id.id, context.get('currency_id',False), abs(line.debit-line.credit), context={'date': line.date})
+                        amount_currency_writeoff += (line.debit > 0) and tmp_amount or -tmp_amount
+>>>>>>> MERGE-SOURCE
 
             writeoff_lines = [
                 (0, 0, {
+<<<<<<< TREE
                     'name': libelle,
                     'debit': self_debit,
                     'credit': self_credit,
@@ -869,6 +936,16 @@
                     'partner_id': partner_id,
                     'currency_id': cur_id or (account.currency_id.id or False),
                     'amount_currency': amount_currency_writeoff and -1 * amount_currency_writeoff or (account.currency_id.id and -1 * currency or 0.0)
+=======
+                    'name':libelle,
+                    'debit':self_debit,
+                    'credit':self_credit,
+                    'account_id':account_id,
+                    'date':date,
+                    'partner_id':partner_id,
+                    'currency_id': cur_id or (account.currency_id.id or False),
+                    'amount_currency': amount_currency_writeoff and -1 * amount_currency_writeoff or (account.currency_id.id and -1 * currency or 0.0)
+>>>>>>> MERGE-SOURCE
                 }),
                 (0, 0, {
                     'name': libelle,
@@ -876,21 +953,31 @@
                     'credit': credit,
                     'account_id': writeoff_acc_id,
                     'analytic_account_id': context.get('analytic_id', False),
+<<<<<<< TREE
                     'date': date,
                     'partner_id': partner_id,
                     'currency_id': cur_id or (account.currency_id.id or False),
                     'amount_currency': amount_currency_writeoff and amount_currency_writeoff or (account.currency_id.id and currency or 0.0)
+=======
+                    'date':date,
+                    'partner_id':partner_id,
+                    'currency_id': cur_id or (account.currency_id.id or False),
+                    'amount_currency': amount_currency_writeoff and amount_currency_writeoff or (account.currency_id.id and currency or 0.0)
+>>>>>>> MERGE-SOURCE
                 })
             ]
+<<<<<<< TREE
 
             writeoff_move_id = move_obj.create(cr, uid, {
+=======
+            writeoff_move_id = self.pool.get('account.move').create(cr, uid, {
+>>>>>>> MERGE-SOURCE
                 'period_id': writeoff_period_id,
                 'journal_id': writeoff_journal_id,
                 'date':date,
                 'state': 'draft',
                 'line_id': writeoff_lines
             })
-
             writeoff_line_ids = self.search(cr, uid, [('move_id', '=', writeoff_move_id), ('account_id', '=', account_id)])
             if account_id == writeoff_acc_id:
                 writeoff_line_ids = [writeoff_line_ids[1]]
@@ -933,6 +1020,7 @@
             return j + (p and (':' + p) or '')
         return False
 
+<<<<<<< TREE
     def onchange_date(self, cr, user, ids, date, context=None):
         """
         Returns a dict that contains new values and context
@@ -1002,6 +1090,49 @@
                     fld.append((field.field, field.sequence))
                     flds.append(field.field)
                     common_fields[field.field] = 1
+=======
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False):
+        result = super(osv.osv, self).fields_view_get(cr, uid, view_id,view_type,context,toolbar=toolbar)
+        if view_type=='tree' and context.get('journal_id',False):
+            title = self.view_header_get(cr, uid, view_id, view_type, context)
+            journal = self.pool.get('account.journal').browse(cr, uid, context['journal_id'])
+
+            # if the journal view has a state field, color lines depending on
+            # its value
+            state = ''
+            for field in journal.view_id.columns_id:
+                if field.field=='state':
+                    state = ' colors="red:state==\'draft\'"'
+
+            #xml = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5"%s>\n\t''' % (title, state)
+            xml = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5" on_write="_on_create_write"%s>\n\t''' % (title, state)
+            fields = []
+
+            widths = {
+                'ref': 50,
+                'statement_id': 50,
+                'state': 60,
+                'tax_code_id': 50,
+                'move_id': 40,
+            }
+            for field in journal.view_id.columns_id:
+                fields.append(field.field)
+                attrs = []
+                if field.field=='debit':
+                    attrs.append('sum="Total debit"')
+                elif field.field=='credit':
+                    attrs.append('sum="Total credit"')
+                elif field.field=='account_tax_id':
+                    attrs.append('domain="[(\'parent_id\',\'=\',False)]"')
+                elif field.field=='account_id' and journal.id:
+                    attrs.append('domain="[(\'journal_id\', \'=\', '+str(journal.id)+'),(\'type\',\'&lt;&gt;\',\'view\'), (\'type\',\'&lt;&gt;\',\'closed\')]" on_change="onchange_account_id(account_id, partner_id)"')
+                elif field.field == 'partner_id':
+                    attrs.append('on_change="onchange_partner_id(move_id,partner_id,account_id,debit,credit,date,((\'journal_id\' in context) and context[\'journal_id\']) or {})"')
+                if field.readonly:
+                    attrs.append('readonly="1"')
+                if field.required:
+                    attrs.append('required="1"')
+>>>>>>> MERGE-SOURCE
                 else:
                     fields.get(field.field).append(journal.id)
                     common_fields[field.field] = common_fields[field.field] + 1
@@ -1083,6 +1214,16 @@
         result['arch'] = etree.tostring(document, pretty_print=True)
         result['fields'] = fields_get
         return result
+    
+    def _check_moves(self, cr, uid, context):
+        # use the first move ever created for this journal and period
+        cr.execute('select id, state, name from account_move where journal_id=%s and period_id=%s order by id limit 1', (context['journal_id'],context['period_id']))
+        res = cr.fetchone()
+        if res:
+            if res[1] != 'draft':
+                raise osv.except_osv(_('UserError'),
+                        _('The account move (%s) for centralisation has been confirmed!') % res[2])
+        return res
 
     def _check_moves(self, cr, uid, context=None):
         # use the first move ever created for this journal and period
@@ -1133,6 +1274,7 @@
         return result
 
     def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
+<<<<<<< TREE
         if context is None:
             context={}
         move_obj = self.pool.get('account.move')
@@ -1140,6 +1282,10 @@
         journal_obj = self.pool.get('account.journal')
         if isinstance(ids, (int, long)):
             ids = [ids]
+=======
+        if context is None:
+            context = {}
+>>>>>>> MERGE-SOURCE
         if vals.get('account_tax_id', False):
             raise osv.except_osv(_('Unable to change tax !'), _('You can not change the tax, you should remove and recreate lines !'))
         if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
@@ -1152,6 +1298,7 @@
         if vals.get('date', False):
             todo_date = vals['date']
             del vals['date']
+<<<<<<< TREE
 
         for line in self.browse(cr, uid, ids, context=context):
             ctx = context.copy()
@@ -1169,6 +1316,27 @@
             journal = journal_obj.browse(cr, uid, ctx['journal_id'], context=ctx)
             if journal.centralisation:
                 self._check_moves(cr, uid, context=ctx)
+=======
+
+        for line in self.browse(cr, uid, ids,context=context):
+            ctx = context.copy()
+            if ('journal_id' not in ctx):
+                if line.move_id:
+                    ctx['journal_id'] = line.move_id.journal_id.id
+                else:
+                    ctx['journal_id'] = line.journal_id.id
+            if ('period_id' not in ctx):
+                if line.move_id:
+                    ctx['period_id'] = line.move_id.period_id.id
+                else:
+                    ctx['period_id'] = line.period_id.id  
+            #Check for centralisation  
+            journal = self.pool.get('account.journal').browse(cr, uid, ctx['journal_id'], context=ctx)
+            if journal.centralisation:
+                self._check_moves(cr, uid, context=ctx)
+
+        
+>>>>>>> MERGE-SOURCE
         result = super(account_move_line, self).write(cr, uid, ids, vals, context)
         if check:
             done = []
@@ -1201,10 +1369,16 @@
 
     def _update_check(self, cr, uid, ids, context=None):
         done = {}
+<<<<<<< TREE
         for line in self.browse(cr, uid, ids, context=context):
             err_msg = _('Move name (id): %s (%s)') % (line.move_id.name, str(line.move_id.id))
             if line.move_id.state <> 'draft' and (not line.journal_id.entry_posted):
                 raise osv.except_osv(_('Error !'), _('You can not do this modification on a confirmed entry! You can just change some non legal fields or you must unconfirm the journal entry first! \n%s') % err_msg)
+=======
+        for line in self.browse(cr, uid, ids, context):
+            if line.move_id.state<>'draft' and (not line.journal_id.entry_posted):
+                raise osv.except_osv(_('Error !'), _('You can not do this modification on a confirmed entry ! Please note that you can just change some non important fields !'))
+>>>>>>> MERGE-SOURCE
             if line.reconcile_id:
                 raise osv.except_osv(_('Error !'), _('You can not do this modification on a reconciled entry! You can just change some non legal fields or you must unreconcile first!\n%s') % err_msg)
             t = (line.journal_id.id, line.period_id.id)
@@ -1297,10 +1471,17 @@
                 vals['analytic_lines'] = [(0,0, {
                         'name': vals['name'],
                         'date': vals.get('date', time.strftime('%Y-%m-%d')),
+<<<<<<< TREE
                         'account_id': vals.get('analytic_account_id', False),
                         'unit_amount': vals.get('quantity', 1.0),
                         'amount': vals.get('debit', 0.0) or vals.get('credit', 0.0),
                         'general_account_id': vals.get('account_id', False),
+=======
+                        'account_id': vals['analytic_account_id'],
+                        'unit_amount': vals.get('quantity',1.0),
+                        'amount': vals.get('debit',0.0) or vals.get('credit',0.0),
+                        'general_account_id': vals['account_id'],
+>>>>>>> MERGE-SOURCE
                         'journal_id': journal.analytic_journal_id.id,
                         'ref': vals.get('ref', False),
                         'user_id': uid
@@ -1367,8 +1548,18 @@
                     self.create(cr, uid, data, context)
             del vals['account_tax_id']
 
+<<<<<<< TREE
         if check and ((not context.get('no_store_function')) or journal.entry_posted):
             tmp = move_obj.validate(cr, uid, [vals['move_id']], context)
+=======
+        # No needed, related to the job
+        #if not is_new_move and 'date' in vals:
+        #    if context and ('__last_update' in context):
+        #        del context['__last_update']
+        #    self.pool.get('account.move').write(cr, uid, [move_id], {'date':vals['date']}, context=context)
+        if check and ((not context.get('no_store_function')) or journal.entry_posted):
+            tmp = self.pool.get('account.move').validate(cr, uid, [vals['move_id']], context)
+>>>>>>> MERGE-SOURCE
             if journal.entry_posted and tmp:
                 move_obj.button_validate(cr,uid, [vals['move_id']], context)
         return result

=== modified file 'account/account_view.xml'
--- account/account_view.xml	2012-02-14 11:07:04 +0000
+++ account/account_view.xml	2012-02-24 01:08:27 +0000
@@ -883,7 +883,12 @@
                     <field name="code"/>
                     <field name="sum_period"/>
                     <field name="sum"/>
+<<<<<<< TREE
                     <field name="company_id" groups="base.group_multi_company"/>
+=======
+                    <field name="sum_period"/>
+                    <field name="company_id"/>
+>>>>>>> MERGE-SOURCE
                 </tree>
             </field>
         </record>
@@ -893,6 +898,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Tax Code">
+<<<<<<< TREE
                     <group col="6" colspan="4">
                         <field name="name"/>
                         <field name="code"/>
@@ -911,6 +917,19 @@
                     </group>
                     <separator string="Description" colspan="4"/>
                     <field colspan="4" name="info" nolabel="1"/>
+=======
+                    <field name="name" select="1"/>
+                    <field name="code" select="1"/>
+                    <field name="company_id" select="1"/>
+                    <field name="notprintable"/>
+                    <field name="parent_id" select="1"/>
+                    <field name="sign"/>
+                    <newline/>
+                    <field name="sum"/>
+                    <field name="sum_period"/>
+                    <newline/>
+                    <field colspan="4" name="info"/>
+>>>>>>> MERGE-SOURCE
                 </form>
             </field>
         </record>
@@ -1017,6 +1036,20 @@
                             <field colspan="2" name="python_compute" nolabel="1" attrs="{'readonly':[('type','!=','code')],'required':[('type','=','code')]}"/>
                             <field colspan="2" name="python_compute_inv" nolabel="1" attrs="{'readonly':[('type','!=','code')],'required':[('type','=','code')]}"/>
 
+<<<<<<< TREE
+=======
+                            <separator colspan="4" string="Credit Notes"/>
+                            <field name="ref_base_code_id"/>
+                            <field name="ref_base_sign"/>
+                            <field name="ref_tax_code_id"/>
+                            <field name="ref_tax_sign"/>
+                        </page>
+                        <page groups="base.group_extended" string="Special Computation">
+                            <separator colspan="4" string="Compute Code (if type=code)"/>
+                            <field colspan="4" name="python_compute" nolabel="1" attrs="{'readonly':[('type','!=','code')], 'required':[('type','=','code')]}"/>
+                            <separator colspan="4" string="Applicable Code (if type=code)"/>
+                            <field colspan="4" name="python_applicable" nolabel="1" attrs="{'readonly':[('applicable_type','=','true')], 'required':[('applicable_type','=','code')]}"/>
+>>>>>>> MERGE-SOURCE
                         </page>
                     </notebook>
                 </form>
@@ -2013,7 +2046,11 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_move_line_tax_tree"/>
+<<<<<<< TREE
             <field name="domain">[('tax_code_id','child_of',active_id),('state','&lt;&gt;','draft')]</field>
+=======
+            <field name="domain">[('tax_code_id','child_of',[active_id]),('state','&lt;&gt;','draft')]</field>
+>>>>>>> MERGE-SOURCE
         </record>
         <record id="ir_open_tax_move_line" model="ir.values">
             <field name="key2">tree_but_open</field>
@@ -2027,6 +2064,7 @@
     # Admin config
     -->
 
+<<<<<<< TREE
         <act_window
            id="act_account_journal_2_account_bank_statement"
            name="Bank statements"
@@ -2055,6 +2093,25 @@
         <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
             <field name="name">Create Account</field>
             <field name="model">account.addtmpl.wizard</field>
+=======
+        <act_window domain="[('journal_id', '=', active_id)]" id="act_account_journal_2_account_bank_statement" name="Bank statements" res_model="account.bank.statement" src_model="account.journal"/>
+
+        <act_window domain="[('journal_id', '=', active_id)]" id="act_account_journal_2_account_move_line" name="Entry lines" res_model="account.move.line" src_model="account.journal"/>
+
+        <act_window domain="[('partner_id', '=', active_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_partner_account_move_unreconciled" name="Unreconciled Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner"/>
+
+        <act_window domain="[('partner_id', '=', active_id), ('account_id.type', 'in', ['receivable', 'payable'])]" id="act_account_partner_account_move_all" name="All Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner"/>
+        
+        <act_window domain="[('partner_id', '=', active_id)]" id="act_account_partner_account_move" name="All Account Entries" res_model="account.move.line" src_model="res.partner"/>
+
+
+
+        <!-- configuration wizard view -->
+
+        <record id="view_account_config_wizard_form" model="ir.ui.view">
+            <field name="name">Account Configure wizard</field>
+            <field name="model">account.config.wizard</field>
+>>>>>>> MERGE-SOURCE
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Account">

=== modified file 'account/company.py'
--- account/company.py	2011-11-16 13:43:36 +0000
+++ account/company.py	2012-02-24 01:08:27 +0000
@@ -46,4 +46,69 @@
 
 res_company()
 
+<<<<<<< TREE
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+=======
+class company_setup(osv.osv_memory):
+    """
+    Insert Information for a company.
+    Wizard asks for:
+        * A Company with its partner
+        * Insert a suitable message for Overdue Payment Report.
+    """
+    _name='wizard.company.setup'
+
+    _columns = {
+        'company_id':fields.many2one('res.company','Company',required=True),
+        'partner_id':fields.many2one('res.partner','Partner'),
+        'overdue_msg': fields.text('Overdue Payment Message'),
+    }
+    def get_message(self,cr,uid,context={}):
+        company =self.pool.get('res.users').browse(cr,uid,[uid],context)[0].company_id
+        msg = company.overdue_msg or ''
+        phone = company.partner_id.address and (company.partner_id.address[0].phone and ' at ' + str(company.partner_id.address[0].phone) + '.' or '.') or '.'
+        msg += str(phone)
+        return msg
+
+    _defaults = {
+        'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr,uid,[uid],c)[0].company_id.id,
+        'partner_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr,uid,[uid],c)[0].company_id.partner_id.id,
+        'overdue_msg': get_message,
+    }
+
+    def onchange_company_id(self, cr, uid, ids, company, context=None):
+        res = {}
+        if not company:
+            return {}
+        comp_obj = self.pool.get('res.company').browse(cr,uid,company)
+        res['partner_id'] = comp_obj.partner_id.id
+        phone = comp_obj.partner_id.address and (comp_obj.partner_id.address[0].phone and ' at ' + str(comp_obj.partner_id.address[0].phone) + '.' or '.') or '.'
+        res['overdue_msg'] = comp_obj.overdue_msg or '' + str(phone)
+        
+        return {'value': res }
+
+    def action_create(self, cr, uid, ids, context=None):
+        content_wiz = self.pool.get('wizard.company.setup').read(cr,uid,ids,['company_id','overdue_msg'])
+        if content_wiz:
+            wiz_data = content_wiz[0]
+            self.pool.get('res.company').write(cr, uid, [wiz_data['company_id']], {'overdue_msg':wiz_data['overdue_msg']})
+
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'ir.actions.configuration.wizard',
+                'type': 'ir.actions.act_window',
+                'target':'new',
+        }
+
+    def action_cancel(self,cr,uid,ids,conect=None):
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'ir.actions.configuration.wizard',
+                'type': 'ir.actions.act_window',
+                'target':'new',
+        }
+
+company_setup()
+>>>>>>> MERGE-SOURCE

=== modified file 'account/demo/account_minimal.xml'
--- account/demo/account_minimal.xml	2011-12-19 16:54:40 +0000
+++ account/demo/account_minimal.xml	2012-02-24 01:08:27 +0000
@@ -11,6 +11,11 @@
             <field name="close_method">balance</field>
             <field name="report_type">liability</field>
         </record>
+        <record id="account_type_tax" model="account.account.type">
+            <field name="name">Tax</field> 
+            <field name="code">Tax</field>
+            <field name="close_method">unreconciled</field>
+        </record>
 
         <!--
         Chart of Accounts
@@ -276,6 +281,31 @@
             <field name="type">other</field>
             <field name="user_type" ref="data_account_type_expense"/>
         </record>
+        <record id="a_taxes" model="account.account">
+            <field name="name">Taxes</field>
+            <field name="code">x 445000</field>
+            <field name="type">other</field>
+            <field eval="ref('minimal_0')" name="parent_id"/>
+            <field name="user_type" ref="account_type_tax"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="note">
+This chart of account is used for automated testing purpose. It is installed
+only if you selected demo data during your database creation. Modules can
+do black box testing on entries on this chart of account, without modifying
+your own chart of account.
+</field>
+        </record>
+        <!--
+        Tax
+        -->
+        <record model="account.tax" id="t_vat">
+            <field name="name">x VAT</field>
+            <field name="amount" eval="0.196"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="a_taxes"/>
+            <field name="account_collected_id" ref="a_taxes"/>
+            <field name="ref_tax_sign" eval="-1"/>
+        </record>
 
         <!-- Properties -->
         <record forcecreate="True" id="property_account_receivable" model="ir.property">

=== modified file 'account/i18n/account.pot'
--- account/i18n/account.pot	2012-02-08 01:08:30 +0000
+++ account/i18n/account.pot	2012-02-24 01:08:27 +0000
@@ -4,14 +4,22 @@
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 6.1rc1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2012-02-08 00:35+0000\n"
+=======
+"Project-Id-Version: OpenERP Server 5.0.12\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2010-09-02 14:06:04+0000\n"
+"PO-Revision-Date: 2010-09-02 14:06:04+0000\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
+<<<<<<< TREE
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
@@ -2226,11 +2234,29 @@
 
 #. module: account
 #: field:account.tax,tax_code_id:0
+=======
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "Integrity Error !"
+msgstr ""
+
+#. module: account
+#: help:account.tax,amount:0
+msgid "For Tax Type percent enter % ratio between 0-1."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.tax.code:0
 msgid "Account Tax Code"
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_invoice.py:572
 #, python-format
 msgid "Can't find any account journal of %s type for this company.\n"
@@ -2247,6 +2273,78 @@
 
 #. module: account
 #: view:account.entries.report:0
+=======
+#: model:ir.actions.act_window,name:account.action_invoice_tree9
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree9
+msgid "Unpaid Supplier Invoices"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/wizard_open_closed_fiscalyear.py:0
+#, python-format
+msgid "No journal for ending writing has been defined for the fiscal year"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_entries
+msgid "Entries Encoding"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
+msgid "Specify The Message for the Overdue Payment Report."
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
+msgid "Confirm statement from draft"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_asset
+msgid "Asset"
+msgstr ""
+
+#. module: account
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/wizard_validate_account_move.py:0
+#, python-format
+msgid "Specified Journal does not have any account move entries in draft state for this period"
+msgstr ""
+
+#. module: account
+#: wizard_view:account_use_models,init_form:0
+msgid "Select Message"
+msgstr ""
+
+#. module: account
+#: help:product.category,property_account_income_categ:0
+msgid "This account will be used to value incoming stock for the current product category"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "You cannot remove/deactivate an account which is set as a property to any Partner!"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,period_id:0
+msgid "Keep empty to use the period of the validation(invoice) date."
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,description:0
+msgid "Internal Name"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
+>>>>>>> MERGE-SOURCE
 msgid "Unreconciled entries"
 msgstr ""
 
@@ -2257,8 +2355,51 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: help:account.invoice.tax,sequence:0
 msgid "Gives the sequence order when displaying a list of invoice tax."
+=======
+#: view:account.account:0
+msgid "Account Statistics"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_vat_declaration
+#: model:ir.ui.menu,name:account.menu_wizard_vat_declaration
+msgid "Print Taxes Report"
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "There is no active invoice sequence defined for the journal !"
+msgstr ""
+
+#. module: account
+#: help:account.tax,sequence:0
+msgid "The sequence field is used to order the tax lines from the lowest sequences to the higher ones. The order is important if you have a tax with several tax children. In this case, the evaluation order is important."
+msgstr ""
+
+#. module: account
+#: field:account.move.line,amount_taxed:0
+msgid "Taxed Amount"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:0
+#, python-format
+msgid "Account move line \"%s\" is not valid"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,residual:0
+msgid "Residual"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -2280,6 +2421,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.invoice.confirm:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_confirm
 msgid "Confirm Draft Invoices"
@@ -2297,6 +2439,54 @@
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_renew_view
 msgid "Accounts to Renew"
+=======
+#: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm
+msgid "Confirm draft invoices"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,days2:0
+msgid "Day of the month, set -1 for the last day of the current month. If it's positive, it gives the day of the next month. Set 0 for net days (otherwise it's based on the beginning of the month)."
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Total Credit"
+msgstr ""
+
+#. module: account
+#: field:account.config.wizard,charts:0
+msgid "Charts of Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_move_line_select
+msgid "Move line select"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/wizard_refund.py:0
+#, python-format
+msgid "No Period found on Invoice!"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the expense account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "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."
+msgstr ""
+
+#. module: account
+#: rml:account.journal.period.print:0
+#: rml:account.tax.code.entries:0
+msgid "Entry label"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -2307,7 +2497,51 @@
 #. module: account
 #: code:addons/account/account.py:3117
 #, python-format
+<<<<<<< TREE
 msgid "EXJ"
+=======
+msgid "You have to provide an account for the write off entry !"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Account Entry Line"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.aged.trial.balance,init:0
+msgid "Aged Trial Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
+msgid "Recurrent Entries"
+msgstr ""
+
+#. module: account
+#: model:account.tax,name:account.t_vat
+msgid "x VAT"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,amount:0
+#: field:account.bank.statement.line,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0
+#: rml:account.invoice:0
+#: field:account.invoice.tax,amount:0
+#: field:account.move,amount:0
+#: field:account.tax,amount:0
+#: field:account.tax.template,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger
+#: model:ir.actions.wizard,name:account.wizard_third_party_ledger
+#: model:ir.ui.menu,name:account.menu_third_party_ledger
+msgid "Partner Ledger"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -2316,22 +2550,70 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.entries.report:0
 msgid "entries"
+=======
+#: view:account.move:0
+msgid "Total Debit"
+msgstr ""
+
+#. module: account
+#: rml:account.tax.code.entries:0
+msgid "Accounting Entries-"
+msgstr ""
+
+#. module: account
+#: help:account.journal,view_id:0
+msgid "Gives the view used when writing or browsing entries in this journal. The view tell Open ERP which fields should be visible, required or readonly and in which order. You can create your own view for a faster encoding in each journal."
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
 #: help:account.invoice,date_due:0
 #: help:account.invoice,payment_term:0
+<<<<<<< TREE
 msgid "If you use payment terms, the due date will be computed automatically at the generation of accounting entries. If you keep the payment term and the due date empty, it means direct payment. The payment term may compute several due dates, for example 50% now, 50% in one month."
 msgstr ""
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
+=======
+msgid "If you use payment terms, the due date will be computed automatically at the generation of accounting entries. If you keep the payment term and the due date empty, it means direct payment. The payment term may compute several due dates, for example 50% now, 50% in one month."
+msgstr ""
+
+#. module: account
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "You can not delete posted movement: \"%s\"!"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.account.balance.report,checktype:0
+#: wizard_view:account.analytic.account.analytic.check.report,init:0
+#: wizard_view:account.analytic.account.cost_ledger.report,init:0
+#: wizard_view:account.analytic.account.inverted.balance.report,init:0
+#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
+#: wizard_view:account.vat.declaration,init:0
+>>>>>>> MERGE-SOURCE
 msgid "Select period"
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: model:ir.ui.menu,name:account.menu_account_pp_statements
 msgid "Statements"
 msgstr ""
@@ -2368,14 +2650,78 @@
 #: view:account.analytic.account:0
 #: field:account.bank.statement.line,analytic_account_id:0
 #: field:account.entries.report,analytic_account_id:0
+=======
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Please verify the price of the invoice !\nThe real total does not match the computed total."
+msgstr ""
+
+#. module: account
+#: field:account.invoice,origin:0
+#: field:account.invoice.line,origin:0
+msgid "Origin"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.journal:0
+msgid "Move Name"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.subscription.generate,init:0
+msgid "Subscription Compute"
+msgstr ""
+
+#. module: account
+#: rml:account.central.journal:0
+msgid "Account Num."
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.analytic.check:0
+msgid "Delta Debit"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_tax
+#: rml:account.invoice:0
+#: field:account.invoice,amount_tax:0
+#: field:account.move.line,account_tax_id:0
+msgid "Tax"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "No analytic journal !"
+msgstr ""
+
+#. module: account
+#: rml:account.general.journal:0
+msgid "Debit Trans."
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,account_id:0
+>>>>>>> MERGE-SOURCE
 #: field:account.invoice.line,account_analytic_id:0
+<<<<<<< TREE
 #: field:account.model.line,analytic_account_id:0
+=======
+#: wizard_field:account.invoice.pay,addendum,analytic_id:0
+>>>>>>> MERGE-SOURCE
 #: field:account.move.line,analytic_account_id:0
+<<<<<<< TREE
 #: field:account.move.line.reconcile.writeoff,analytic_id:0
+=======
+#: wizard_field:account.move.line.reconcile,addendum,analytic_id:0
+#: field:report.hr.timesheet.invoice.journal,account_id:0
+>>>>>>> MERGE-SOURCE
 msgid "Analytic Account"
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.account:0
 #: field:account.financial.report,account_ids:0
 #: selection:account.financial.report,type:0
@@ -2401,10 +2747,86 @@
 
 #. module: account
 #: report:account.overdue:0
+=======
+#: wizard_button:account.automatic.reconcile,reconcile,end:0
+msgid "OK"
+msgstr ""
+
+#. module: account
+#: field:account.tax,child_depend:0
+#: field:account.tax.template,child_depend:0
+msgid "Tax on Children"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/wizard/wizard_use_model.py:0
+#, python-format
+msgid "No period found !"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term:0
+msgid "Description on invoices"
+msgstr ""
+
+#. module: account
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.reconcile,total_entry:0
+msgid "Total entries"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.account,account_src_id:0
+#: field:account.fiscal.position.account.template,account_src_id:0
+msgid "Account Source"
+msgstr ""
+
+#. module: account
+#: field:account.journal,update_posted:0
+msgid "Allow Cancelling Entries"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_paymentorderbank0
+#: model:process.transition,name:account.process_transition_paymentorderreconcilation0
+msgid "Payment Reconcilation"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/wizard_refund.py:0
+#, python-format
+msgid "Can not %s draft/proforma/cancel invoice."
+msgstr ""
+
+#. module: account
+#: model:account.journal,name:account.expenses_journal
+msgid "Journal de frais"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
+msgid "All Analytic Entries"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+>>>>>>> MERGE-SOURCE
 msgid "Date:"
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: report:account.journal.period.print:0
 #: report:account.journal.period.print.sale.purchase:0
 msgid "Label"
@@ -2414,6 +2836,36 @@
 #: view:account.tax:0
 #: view:res.partner.bank:0
 msgid "Accounting Information"
+=======
+#: selection:account.account.type,sign:0
+msgid "Negative"
+msgstr ""
+
+#. module: account
+#: rml:account.partner.balance:0
+msgid "(Account/Partner) Name"
+msgstr ""
+
+#. module: account
+#: selection:account.move,type:0
+msgid "Contra"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,state:0
+#: field:account.bank.statement,state:0
+#: field:account.invoice,state:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.subscription:0
+msgid "State"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree13
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree13
+msgid "Unpaid Supplier Refunds"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -2429,6 +2881,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: report:account.invoice:0
 msgid "Disc.(%)"
 msgstr ""
@@ -2439,10 +2892,23 @@
 #: report:account.overdue:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+=======
+#: rml:account.invoice:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: account
+#: rml:account.general.ledger:0
+#: field:account.model,ref:0
+#: field:account.move,ref:0
+#: rml:account.overdue:0
+#: field:account.subscription,ref:0
+>>>>>>> MERGE-SOURCE
 msgid "Ref"
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: help:account.move.line,tax_code_id:0
 msgid "The Account can either be a base tax code or a tax code account."
 msgstr ""
@@ -2455,6 +2921,53 @@
 #. module: account
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
 msgid "Automatic Reconciliation"
+=======
+#: field:account.tax.template,type_tax_use:0
+msgid "Tax Use In"
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,include_base_amount:0
+msgid "Set if the amount of tax must be included in the base amount before computing the next taxes."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodical Processing"
+msgstr ""
+
+#. module: account
+#: view:report.hr.timesheet.invoice.journal:0
+msgid "Analytic Entries Stats"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
+msgid "Tax Code Templates"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+msgid "Net Total:"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_reconcilepaid0
+#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+msgid "Reconcile Paid"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.chart,init,target_move:0
+msgid "Target Moves"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tax_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_tax_template_form
+msgid "Tax Templates"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -2474,6 +2987,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.bank.statement:0
 #: view:account.common.report:0
 #: view:account.move:0
@@ -2507,11 +3021,49 @@
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+=======
+#: help:account.payment.term.line,days:0
+msgid "Number of days to add before computation of the day of month.If Date=15/01, Number of Days=22, Day of Month=-1, then the due date is 28/02."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax
+msgid "account.tax"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "Bank Journal "
+msgstr ""
+
+#. module: account
+#: constraint:account.payment.term.line:0
+#: code:addons/account/account.py:0
+#, python-format
+msgid "Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for 2% "
+msgstr ""
+
+#. module: account
+#: rml:account.general.ledger:0
+msgid "Mvt"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "You can not use this general account in this journal !"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_aged_trial_balance
+>>>>>>> MERGE-SOURCE
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: model:process.transition,name:account.process_transition_entriesreconcile0
 #: model:process.transition,name:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries"
@@ -2520,6 +3072,58 @@
 #. module: account
 #: field:account.invoice,reference_type:0
 msgid "Communication Type"
+=======
+#: view:account.journal:0
+msgid "Entry Controls"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,sequence:0
+msgid "The sequence field is used to order the resources from lower sequences to higher ones"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.analytic.account.chart,init:0
+#: wizard_view:account.analytic.line,init:0
+msgid "(Keep empty to open the current situation)"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_account
+msgid "Fiscal Position Accounts Mapping"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,contact_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: account
+#: selection:account.model.line,date:0
+#: selection:account.model.line,date_maturity:0
+msgid "Partner Payment Term"
+msgstr ""
+
+#. module: account
+#: view:account.move.reconcile:0
+msgid "Account Entry Reconcile"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.move.bank.reconcile,init,open:0
+msgid "Open for bank reconciliation"
+>>>>>>> MERGE-SOURCE
+msgstr ""
+
+#. module: account
+#: help:res.partner,credit:0
+msgid "Total amount this customer owes you."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "Currency Profit/Loss"
 msgstr ""
 
 #. module: account
@@ -2528,6 +3132,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: help:account.journal,entry_posted:0
 msgid "Check this box if you don't want new journal entries to pass through the 'draft' state and instead goes directly to the 'posted state' without any manual validation. \n"
 "Note that journal entries that are automatically created by the system are always skipping that state."
@@ -2632,6 +3237,283 @@
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Line 2:"
+=======
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "You can not add/modify entries in a closed journal."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "You can not do this modification on a reconciled entry ! Please note that you can just change some non important fields !"
+msgstr ""
+
+#. module: account
+#: rml:account.central.journal:0
+msgid "Printing Date"
+msgstr ""
+
+#. module: account
+#: field:account.tax,tax_group:0
+#: field:account.tax.template,tax_group:0
+msgid "Tax Group"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear,company_id:0
+msgid "Keep empty if the fiscal year belongs to several companies."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_analytic_accounting
+msgid "Analytic Accounting"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid "Sub-Total :"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,line_ids:0
+#: view:account.analytic.line:0
+#: code:addons/account/project/wizard/wizard_account_analytic_line.py:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+#: model:ir.actions.act_window,name:account.action_account_tree1
+#: model:ir.ui.menu,name:account.next_id_41
+#, python-format
+msgid "Analytic Entries"
+msgstr ""
+
+#. module: account
+#: rml:account.tax.code.entries:0
+msgid "Voucher Nb"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,user_id:0
+#: field:account.journal,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
+msgid "account.analytic.line.extended"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,partner_id:0
+msgid "Associated Partner"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "You must first select a partner !"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,comment:0
+msgid "Additional Information"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,type:0
+msgid "Customer Refund"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,value_amount:0
+msgid "For Value percent enter % ratio between 0-1."
+msgstr ""
+
+#. module: account
+#: field:account.tax,ref_tax_sign:0
+#: field:account.tax,tax_sign:0
+#: field:account.tax.template,ref_tax_sign:0
+#: field:account.tax.template,tax_sign:0
+msgid "Tax Code Sign"
+msgstr ""
+
+#. module: account
+#: selection:account.move,type:0
+msgid "Journal Voucher"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "St."
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_supplieranalyticcost0
+msgid "Analytic Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,field:0
+msgid "Field Name"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sign:0
+#: field:account.tax.code.template,sign:0
+msgid "Sign for parent"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear,end_journal_period_id:0
+msgid "End of Year Entries Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:0
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+#: view:product.template:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_paymententries0
+msgid "Can be draft or validated"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.invoice.pay,init,reconcile:0
+msgid "Partial Payment"
+msgstr ""
+
+#. module: account
+#: wizard_view:account_use_models,create:0
+msgid "Move Lines Created."
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear,state:0
+#: field:account.journal.period,state:0
+#: field:account.move,state:0
+#: field:account.move.line,state:0
+#: field:account.period,state:0
+#: field:account.subscription,state:0
+msgid "Status"
+msgstr ""
+
+#. module: account
+#: field:account.account.type,partner_account:0
+msgid "Partner account"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.subscription.generate,init:0
+msgid "Generate entries before:"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.cost_ledger:0
+#: rml:account.analytic.account.quantity_cost_ledger:0
+#: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
+#: model:ir.actions.wizard,name:account.account_analytic_account_cost_ledger_report
+msgid "Cost Ledger"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.account.balance.report,checktype:0
+#: wizard_view:account.general.ledger.report,checktype:0
+#: wizard_view:account.partner.balance.report,init:0
+#: wizard_view:account.third_party_ledger.report,init:0
+msgid "(Keep empty for all open fiscal years)"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,move_lines:0
+msgid "Move Lines"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/wizard_fiscalyear_close.py:0
+#, python-format
+msgid "The opening journal must not have any entry in the new fiscal year !"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_config_wizard
+msgid "account.config.wizard"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
+#: model:ir.ui.menu,name:account.report_account_analytic_journal_print
+msgid "Account cost and revenue by journal"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,user_type:0
+msgid "These types are defined according to your country. The type contain more information about the account and it's specificities."
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,init,power:0
+msgid "6"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.next_id_30
+msgid "Bank Reconciliation"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_account_template
+msgid "Templates for Accounts"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_type_form
+#: model:ir.ui.menu,name:account.menu_action_account_type_form
+msgid "Account Types"
+msgstr ""
+
+#. module: account
+#: selection:account.account.balance.report,checktype,display_account:0
+#: selection:account.general.ledger.report,checktype,display_account:0
+msgid "With movements"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_form
+#: model:ir.model,name:account.model_account_analytic_account
+#: model:ir.ui.menu,name:account.account_analytic_def_account
+msgid "Analytic Accounts"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.print.journal.report,init:0
+#: model:ir.actions.wizard,name:account.wizard_print_journal
+#: model:ir.ui.menu,name:account.menu_print_journal
+msgid "Print Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_accounts_wizard
+msgid "account.bank.accounts.wizard"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,date_created:0
+#: field:account.move.reconcile,create_date:0
+msgid "Creation date"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.invoice.refund,init,cancel_invoice:0
+msgid "Cancel Invoice"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -2647,6 +3529,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: help:account.invoice,period_id:0
 msgid "Keep empty to use the period of the validation(invoice) date."
 msgstr ""
@@ -2654,6 +3537,82 @@
 #. module: account
 #: help:account.bank.statement,account_id:0
 msgid "used in statement reconciliation domain, but shouldn't be used elswhere."
+=======
+#: wizard_field:account.move.line.reconcile,addendum,journal_id:0
+msgid "Write-Off Journal"
+msgstr ""
+
+#. module: account
+#: field:account.model.line,amount_currency:0
+#: field:account.move.line,amount_currency:0
+msgid "Amount Currency"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/wizard_central_journal.py:0
+#: code:addons/account/wizard/wizard_general_journal.py:0
+#: code:addons/account/wizard/wizard_print_journal.py:0
+#: code:addons/account/wizard/wizard_third_party_ledger.py:0
+#, python-format
+msgid "No Data Available"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:0
+#, python-format
+msgid "Cannot delete bank statement which are already confirmed !"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_expense_categ:0
+msgid "Expense Category Account"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.fiscalyear.close,init,fy2_id:0
+msgid "New Fiscal Year"
+msgstr ""
+
+#. module: account
+#: help:account.tax,tax_group:0
+msgid "If a default tax is given in the partner it only overrides taxes from accounts (or products) in the same group."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0
+msgid "Fiscal Year to Open"
+msgstr ""
+
+#. module: account
+#: view:account.config.wizard:0
+msgid "Select Chart of Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,quantity:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.analytic.account.inverted.balance:0
+#: rml:account.analytic.account.quantity_cost_ledger:0
+#: field:account.analytic.line,unit_amount:0
+#: rml:account.invoice:0
+#: field:account.invoice.line,quantity:0
+#: field:account.model.line,quantity:0
+#: field:account.move.line,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: account
+#: rml:account.general.journal:0
+msgid "Printing Date :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.account.balance.report,checktype,date_to:0
+#: wizard_field:account.general.ledger.report,checktype,date_to:0
+#: wizard_field:account.partner.balance.report,init,date2:0
+#: wizard_field:account.third_party_ledger.report,init,date2:0
+msgid "End date"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -2689,11 +3648,14 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: model:ir.ui.menu,name:account.menu_account_report_pl
 msgid "Profit And Loss"
 msgstr ""
 
 #. module: account
+=======
+>>>>>>> MERGE-SOURCE
 #: view:account.fiscal.position:0
 #: field:account.fiscal.position,name:0
 #: field:account.fiscal.position.account,position_id:0
@@ -2734,6 +3696,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: help:account.tax.template,include_base_amount:0
 msgid "Set if the amount of tax must be included in the base amount before computing the next taxes."
 msgstr ""
@@ -2757,6 +3720,99 @@
 #: field:accounting.report,account_report_id:0
 #: model:ir.ui.menu,name:account.menu_account_financial_reports_tree
 msgid "Account Reports"
+=======
+#: wizard_view:account.open_closed_fiscalyear,init:0
+msgid "Choose Fiscal Year"
+msgstr ""
+
+#. module: account
+#: field:account.sequence.fiscalyear,sequence_main_id:0
+msgid "Main Sequence"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
+#: model:ir.ui.menu,name:account.account_analytic_journal_print
+msgid "Print Analytic Journals"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,sequence:0
+msgid "The sequence field is used to order the payment term lines from the lowest sequences to the higher ones"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.reconcile,total_new:0
+msgid "Total write-off"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.tax:0
+#: model:ir.actions.act_window,name:account.action_tax_code_list
+#: model:ir.ui.menu,name:account.menu_action_tax_code_list
+msgid "Tax codes"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.template,chart_template_id:0
+#: field:account.tax.template,chart_template_id:0
+#: field:wizard.multi.charts.accounts,chart_template_id:0
+msgid "Chart Template"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_income_categ:0
+msgid "Income Category Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.analytic_account_form
+#: model:ir.ui.menu,name:account.account_analytic_form
+msgid "New Analytic Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
+msgid "Fiscal Position Templates"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+#: field:account.invoice.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.journal:0
+msgid "Period from :"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_wizard_multi_charts_accounts
+msgid "wizard.multi.charts.accounts"
+msgstr ""
+
+#. module: account
+#: model:account.journal,name:account.sales_journal
+msgid "Journal de vente"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,amount_currency:0
+msgid "The amount expressed in an optional other currency."
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position.template:0
+#: field:account.fiscal.position.template,name:0
+msgid "Fiscal Position Template"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -2780,17 +3836,72 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: model:ir.ui.menu,name:account.menu_account_print_sale_purchase_journal
 msgid "Sale/Purchase Journals"
+=======
+#: model:process.transition,name:account.process_transition_invoiceimport0
+msgid "Invoice import"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.action_move_journal_line_form_select
+msgid "Standard entry"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
 #: help:account.account,currency_mode:0
+<<<<<<< TREE
 msgid "This will select how the current currency rate for outgoing transactions is computed. In most countries the legal method is \"average\" but only a few software systems are able to 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."
 msgstr ""
 
 #. module: account
 #: help:account.chart.template,code_digits:0
+=======
+msgid "This will select how the current currency rate for outgoing transactions is computed. In most countries the legal method is \"average\" but only a few software systems are able to 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."
+msgstr ""
+
+#. module: account
+#: field:account.account,company_currency_id:0
+msgid "Company Currency"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "There is no default default credit account defined \n' \\n"
+"                                'on journal \"%s\""
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_account_template
+msgid "Fiscal Position Template Account Mapping"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.move.line.reconcile,init_partial,addendum:0
+msgid "Reconcile With Write-Off"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:0
+#, python-format
+msgid "The expected balance (%.2f) is different than the computed one. (%.2f)"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,tax_amount:0
+msgid "Tax/Base Amount"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: help:wizard.multi.charts.accounts,code_digits:0
 msgid "No. of Digits to use for account code"
 msgstr ""
@@ -2801,6 +3912,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.fiscalyear:0
 msgid "Search Fiscalyear"
 msgstr ""
@@ -2823,6 +3935,53 @@
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
+=======
+#: selection:account.payment.term.line,value:0
+msgid "Fixed Amount"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.analytic.check:0
+msgid "Analytic Credit"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,reconcile_partial_id:0
+#: wizard_button:account.move.line.reconcile,init_partial,partial:0
+msgid "Partial Reconcile"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.automatic.reconcile,reconcile,unreconciled:0
+msgid "Not reconciled transactions"
+msgstr ""
+
+#. module: account
+#: rml:account.tax.code.entries:0
+msgid "Third party (Country)"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,tax_ids:0
+#: field:account.fiscal.position.template,tax_ids:0
+msgid "Tax Mapping"
+msgstr ""
+
+#. module: account
+#: view:account.config.wizard:0
+msgid "Continue"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,value:0
+msgid "Value"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.invoice.pay,addendum,writeoff_acc_id:0
+#: wizard_field:account.move.line.reconcile,addendum,writeoff_acc_id:0
+>>>>>>> MERGE-SOURCE
 msgid "Write-Off account"
 msgstr ""
 
@@ -2834,8 +3993,30 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: help:account.invoice.tax,base_code_id:0
 msgid "The account basis of the tax declaration."
+=======
+#: model:ir.actions.wizard,name:account.wizard_fiscalyear_close_state
+#: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
+msgid "Close a Fiscal Year"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_generate_subscription
+#: model:ir.ui.menu,name:account.menu_generate_subscription
+msgid "Create subscription entries"
+msgstr ""
+
+#. module: account
+#: view:wizard.company.setup:0
+msgid "Message"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Select invoices you want to pay and manages advances"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -2859,8 +4040,25 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.invoice:0
 msgid "Proforma Invoices"
+=======
+#: help:account.tax,type:0
+msgid "The computation method for the tax amount."
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_accountingentries0
+#: model:process.node,note:account.process_node_supplieraccountingentries0
+msgid "Validated accounting entries."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.move.line.unreconcile,init:0
+#: wizard_view:account.reconcile.unreconcile,init:0
+msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -2874,6 +4072,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.payment.term.line:0
 msgid "  Day of the Month: 0"
 msgstr ""
@@ -2903,6 +4102,154 @@
 #. module: account
 #: model:ir.actions.act_window,help:account.action_validate_account_move_line
 msgid "This wizard will validate all journal entries of a particular journal and period. Once journal entries are validated, you can not update them anymore."
+=======
+#: field:account.invoice,tax_line:0
+msgid "Tax Lines"
+msgstr ""
+
+#. module: account
+#: field:ir.sequence,fiscal_ids:0
+msgid "Sequences"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.subscription.generate,init,generate:0
+msgid "Compute Entry Dates"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Cannot create invoice move on centralised journal"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.automatic.reconcile,init,journal_id:0
+#: field:account.bank.statement,journal_id:0
+#: wizard_field:account.central.journal.report,init,journal_id:0
+#: wizard_field:account.general.journal.report,init,journal_id:0
+#: field:account.invoice,journal_id:0
+#: field:account.journal.period,journal_id:0
+#: field:account.model,journal_id:0
+#: field:account.move,journal_id:0
+#: wizard_field:account.move.bank.reconcile,init,journal_id:0
+#: wizard_field:account.move.journal,init,journal_id:0
+#: field:account.move.line,journal_id:0
+#: wizard_field:account.move.validate,init,journal_id:0
+#: wizard_field:account.print.journal.report,init,journal_id:0
+#: field:fiscalyear.seq,journal_id:0
+#: model:ir.actions.report.xml,name:account.account_journal
+#: model:ir.model,name:account.model_account_journal
+#: wizard_field:populate_statement_from_inv,init,journal_id:0
+#: field:report.hr.timesheet.invoice.journal,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: account
+#: field:account.account,child_id:0
+#: field:account.analytic.account,child_ids:0
+msgid "Child Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.account,check_history:0
+msgid "Display History"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.third_party_ledger.report,init,date1:0
+msgid "        Start date"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.account.balance.report,checktype,display_account:0
+#: wizard_field:account.general.ledger.report,checktype,display_account:0
+msgid "Display accounts "
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_statement_reconcile_line
+msgid "Statement reconcile line"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement.reconcile:0
+#: field:account.bank.statement.reconcile,line_new_ids:0
+#: wizard_view:account.move.line.reconcile,init_full:0
+#: wizard_view:account.move.line.reconcile,init_partial:0
+#: code:addons/account/wizard/wizard_pay_invoice.py:0
+#: code:addons/account/wizard/wizard_reconcile.py:0
+#, python-format
+msgid "Write-Off"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.general.ledger.report,checktype,amount_currency:0
+msgid "With Currency"
+msgstr ""
+
+#. module: account
+#: field:res.partner,debit:0
+msgid "Total Payable"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.fiscalyear.close.state,init,close:0
+msgid "Close states"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_wizard_company_setup
+msgid "wizard.company.setup"
+msgstr ""
+
+#. module: account
+#: wizard_view:account_use_models,create:0
+msgid "Use Model"
+msgstr ""
+
+#. module: account
+#: field:account.journal,refund_journal:0
+msgid "Refund Journal"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_income
+msgid "Income"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.statement.line,type:0
+msgid "Supplier"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,tax_amount:0
+msgid "Tax Code Amount"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,sign:0
+msgid "Positive"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.general.journal.report,init:0
+#: model:ir.actions.wizard,name:account.wizard_general_journal
+#: model:ir.ui.menu,name:account.menu_general_journal
+msgid "Print General Journal"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -2912,6 +4259,16 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: help:account.payment.term.line,value:0
+msgid "Example: 14 days 2%, 30 days net\n"
+"1. Line 1: percent 0.02 14 days\n"
+"2. Line 2: balance 30 days"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 msgid "Generate Chart of Accounts from a Chart Template"
 msgstr ""
@@ -3046,6 +4403,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: field:account.financial.report,display_detail:0
 msgid "Display details"
 msgstr ""
@@ -3069,10 +4427,76 @@
 #: model:ir.actions.act_window,name:account.action_account_unreconcile
 #: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
 #: model:ir.actions.act_window,name:account.action_account_unreconcile_select
+=======
+#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_2_report_hr_timesheet_invoice_journal
+msgid "Costs & Revenues"
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+msgid "Error ! You can not create recursive accounts."
+msgstr ""
+
+#. module: account
+#: rml:account.tax.code.entries:0
+msgid "Account Number"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.analytic.account.balance.report,init,empty_acc:0
+msgid "Empty Accounts ? "
+msgstr ""
+
+#. module: account
+#: view:account.config.wizard:0
+msgid "Skip"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "Couldn't create move between different companies"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,period_id:0
+msgid "Force Period"
+msgstr ""
+
+#. module: account
+#: help:account.account.type,sequence:0
+msgid "Gives the sequence order when displaying a list of account types."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Re-Open"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.fiscalyear.close,init:0
+msgid "Are you sure you want to create entries?"
+msgstr ""
+
+#. module: account
+#: field:account.tax,include_base_amount:0
+msgid "Include in base amount"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.analytic.check:0
+msgid "Delta Credit"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile
+#: model:ir.actions.wizard,name:account.wizard_unreconcile
+>>>>>>> MERGE-SOURCE
 msgid "Unreconcile Entries"
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: field:account.tax.code,notprintable:0
 #: field:account.tax.code.template,notprintable:0
 msgid "Not Printable in Invoice"
@@ -3086,7 +4510,109 @@
 
 #. module: account
 #: code:addons/account/account_cash_statement.py:314
-#, python-format
+=======
+#: model:process.node,note:account.process_node_supplierdraftinvoices0
+msgid "Pre-generated invoice from control"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_suppliervalidentries0
+#: model:process.transition,name:account.process_transition_validentries0
+msgid "Valid Entries"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
+msgid "Cost Legder for period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree2
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree2
+msgid "New Statement"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,move_id:0
+msgid "Move"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.analytic.account.chart,init,from_date:0
+#: wizard_field:account.analytic.line,init,from_date:0
+msgid "From"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_reconciliation0
+#: model:process.node,note:account.process_node_supplierreconciliation0
+msgid "Reconciliation of entries from invoice(s) and payment(s)"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.central.journal.report,init:0
+#: model:ir.actions.wizard,name:account.wizard_central_journal
+#: model:ir.ui.menu,name:account.menu_central_journal
+msgid "Print Central Journal"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.aged.trial.balance,init,period_length:0
+msgid "Period length (days)"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "You can not use an inactive account!"
+msgstr ""
+
+#. module: account
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
+msgid "Percent"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_charts
+msgid "Charts"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
+#: selection:account.tax,type_tax_use:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "Sale"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.account.balance.report,account_selection,checktype:0
+#: wizard_button:account.general.ledger.report,account_selection,checktype:0
+msgid "Next"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_account_position:0
+msgid "The fiscal position will determine taxes and the accounts used for the the partner."
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.cost_ledger:0
+msgid "Date or Code"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,user_id:0
+msgid "Account Manager"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+>>>>>>> MERGE-SOURCE
+#, python-format
+<<<<<<< TREE
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
 
@@ -3105,9 +4631,29 @@
 #: selection:account.subscription,period_type:0
 #: view:analytic.entries.report:0
 msgid "year"
-msgstr ""
-
-#. module: account
+=======
+msgid "Entries are not of the same account or already reconciled ! "
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.journal:0
+msgid "to :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.move.line.reconcile,init_full,debit:0
+#: wizard_field:account.move.line.reconcile,init_partial,debit:0
+msgid "Debit amount"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,residual:0
+msgid "Remaining amount due."
+>>>>>>> MERGE-SOURCE
+msgstr ""
+
+#. module: account
+<<<<<<< TREE
 #: view:product.product:0
 msgid "Purchase Taxes"
 msgstr ""
@@ -3115,6 +4661,136 @@
 #. module: account
 #: 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."
+=======
+#: wizard_button:account.account.balance.report,checktype,report:0
+#: wizard_button:account.analytic.account.analytic.check.report,init,report:0
+#: wizard_button:account.analytic.account.balance.report,init,report:0
+#: wizard_button:account.analytic.account.cost_ledger.report,init,report:0
+#: wizard_button:account.analytic.account.inverted.balance.report,init,report:0
+#: wizard_button:account.analytic.account.journal.report,init,report:0
+#: wizard_button:account.analytic.account.quantity_cost_ledger.report,init,report:0
+#: wizard_button:account.central.journal.report,init,print:0
+#: wizard_button:account.general.journal.report,init,print:0
+#: wizard_button:account.general.ledger.report,checktype,checkreport:0
+#: wizard_button:account.partner.balance.report,init,report:0
+#: wizard_button:account.print.journal.report,init,print:0
+#: wizard_button:account.third_party_ledger.report,init,checkreport:0
+msgid "Print"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.account.balance.report,checktype,date_from:0
+msgid "Start date"
+msgstr ""
+
+#. module: account
+#: model:account.journal,name:account.refund_expenses_journal
+msgid "x Expenses Credit Notes Journal"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,type:0
+#: field:account.bank.statement.line,type:0
+#: field:account.invoice,type:0
+#: field:account.journal,type:0
+#: field:account.move,type:0
+#: field:account.move.reconcile,type:0
+msgid "Type"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Accounts Allowed (empty for no control)"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Untaxed amount"
+msgstr ""
+
+#. module: account
+#: field:account.tax,account_collected_id:0
+#: field:account.tax.template,account_collected_id:0
+msgid "Invoice Tax Account"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Analytic Lines"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.invoice.pay,init:0
+#: model:ir.actions.wizard,name:account.wizard_invoice_pay
+msgid "Pay invoice"
+msgstr ""
+
+#. module: account
+#: constraint:account.invoice:0
+msgid "Error: Invalid Bvr Number (wrong checksum)."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree5
+#: model:ir.ui.menu,name:account.menu_invoice_draft
+msgid "Draft Customer Invoices"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_subscription_line
+msgid "Account Subscription Line"
+msgstr ""
+
+#. module: account
+#: selection:account.account.balance.report,checktype,state:0
+#: selection:account.general.ledger.report,checktype,state:0
+#: selection:account.partner.balance.report,init,state:0
+#: selection:account.third_party_ledger.report,init,state:0
+msgid "No Filter"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,days:0
+msgid "Number of Days"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,reference:0
+msgid "The partner reference of this invoice."
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Cannot delete invoice(s) that are already opened or paid !"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.general.ledger.report,checktype,sortbydate:0
+msgid "Sort by:"
+msgstr ""
+
+#. module: account
+#: field:account.move,to_check:0
+msgid "To Be Verified"
+msgstr ""
+
+#. module: account
+#: help:res.partner,debit:0
+msgid "Total amount you have to pay to this supplier."
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,init,power:0
+msgid "7"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:0
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Invalid action !"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
@@ -3144,13 +4820,185 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: report:account.invoice:0
 #: model:process.node,name:account.process_node_draftinvoices0
+=======
+#: help:account.journal,entry_posted:0
+msgid "Check this box if you don't want new account moves to pass through the 'draft' state and instead goes directly to the 'posted state' without any manual validation."
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,partner_id:0
+#: field:account.bank.statement.reconcile,partner_id:0
+#: rml:account.general.ledger:0
+#: field:account.invoice,partner_id:0
+#: field:account.move,partner_id:0
+#: wizard_field:account.partner.balance.report,init,result_selection:0
+#: wizard_field:account.third_party_ledger.report,init,result_selection:0
+#: field:wizard.company.setup,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,number:0
+msgid "Unique number of the invoice, computed automatically when the invoice is created."
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+>>>>>>> MERGE-SOURCE
 msgid "Draft Invoice"
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/wizard/account_invoice_state.py:68
+=======
+#: model:account.account.type,name:account.account_type_expense
+msgid "Expense"
+msgstr ""
+
+#. module: account
+#: field:account.journal,invoice_sequence_id:0
+msgid "Invoice Sequence"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.automatic.reconcile,init:0
+msgid "Options"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.analytic.account.chart,init:0
+msgid "Select the Period for Analysis"
+msgstr ""
+
+#. module: account
+#: model:process.process,name:account.process_process_invoiceprocess0
+msgid "Customer Invoice Process"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+msgid "Fiscal Position Remark :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.fiscalyear.close,init,period_id:0
+msgid "Opening Entries Period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_validate_account_moves
+#: model:ir.actions.wizard,name:account.wizard_validate_account_moves_line
+#: model:ir.ui.menu,name:account.menu_validate_account_moves
+msgid "Validate Account Moves"
+msgstr ""
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "days"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,init,direction_selection:0
+msgid "Past"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,company_currency_id:0
+#: field:account.bank.accounts.wizard,currency_id:0
+#: field:account.bank.statement,currency:0
+#: field:account.bank.statement.reconcile,total_currency:0
+#: field:account.bank.statement.reconcile,total_second_currency:0
+#: rml:account.general.ledger:0
+#: field:account.invoice,currency_id:0
+#: field:account.journal,currency:0
+#: field:account.model.line,currency_id:0
+#: field:account.move.line,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
+msgid "Unpaid invoices"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_paymentreconcile0
+msgid "Payment Reconcile"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form
+#: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_tree
+msgid "Statements reconciliation"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form_new
+#: model:ir.ui.menu,name:account.menu_action_subscription_form_new
+msgid "New Subscription"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term:0
+msgid "Computation"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Analytic Entry"
+msgstr ""
+
+#. module: account
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
+msgid "Overdue Payments Message"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_tax_code_tree
+#: model:ir.ui.menu,name:account.menu_action_tax_code_tree
+msgid "Chart of Taxes"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,value_amount:0
+msgid "Value Amount"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
+msgid "Reconciled entries"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,address_contact_id:0
+msgid "Contact Address"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Create 3 Months Periods"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "(keep empty to use the current period)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree8
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree8
+msgid "Draft Supplier Invoices"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/wizard/wizard_use_model.py:0
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' or 'Done' state!"
 msgstr ""
@@ -3208,6 +5056,7 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Can not create the invoice !\n"
@@ -3216,10 +5065,36 @@
 
 #. module: account
 #: report:account.invoice:0
+=======
+#: field:account.account,shortcut:0
+#: field:account.account.template,shortcut:0
+msgid "Shortcut"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+msgid "Consolidation"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,account_root_id:0
+msgid "Root Account"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid "Exception made of a mistake of our side, it seems that the following bills stay unpaid. Please, take appropriate measures in order to carry out this payment in the next 8 days."
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+>>>>>>> MERGE-SOURCE
 msgid "VAT :"
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: report:account.central.journal:0
 #: report:account.general.ledger:0
 #: field:account.installer,charts:0
@@ -3227,12 +5102,16 @@
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 #: model:ir.actions.act_window,name:account.action_account_chart
+=======
+#: wizard_field:account.general.ledger.report,account_selection,Account_list:0
+>>>>>>> MERGE-SOURCE
 #: model:ir.actions.act_window,name:account.action_account_tree
 #: model:ir.ui.menu,name:account.menu_action_account_tree2
 msgid "Chart of Accounts"
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.tax.chart:0
 msgid "(If you do not select period it will take all open periods)"
 msgstr ""
@@ -3255,6 +5134,59 @@
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
+=======
+#: model:account.journal,name:account.check_journal
+msgid "x Checks Journal"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,partner_bank:0
+msgid "The partner bank account to pay\n"
+"             Keep empty to use the default"
+msgstr ""
+
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralised counterpart"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.fiscalyear.close,init,journal_id:0
+msgid "Opening Entries Journal"
+msgstr ""
+
+#. module: account
+#: view:account.config.wizard:0
+msgid "Create a Fiscal Year"
+msgstr ""
+
+#. module: account
+#: field:product.template,taxes_id:0
+msgid "Customer Taxes"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,date_invoice:0
+msgid "Date Invoiced"
+msgstr ""
+
+#. module: account
+#: help:account.account.balance.report,checktype,periods:0
+#: help:account.general.ledger.report,checktype,periods:0
+#: help:account.partner.balance.report,init,periods:0
+#: help:account.third_party_ledger.report,init,periods:0
+#: help:account.vat.declaration,init,periods:0
+msgid "All periods if empty"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Liability"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,init,power:0
+>>>>>>> MERGE-SOURCE
 msgid "2"
 msgstr ""
 
@@ -3268,6 +5200,7 @@
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+<<<<<<< TREE
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3282,7 +5215,15 @@
 #: report:account.journal.period.print:0
 #: report:account.journal.period.print.sale.purchase:0
 #: view:account.move:0
+=======
+#: field:account.bank.statement.line,date:0
+#: field:account.bank.statement.reconcile,name:0
+#: rml:account.general.ledger:0
+#: selection:account.general.ledger.report,checktype,sortbydate:0
+#: rml:account.journal.period.print:0
+>>>>>>> MERGE-SOURCE
 #: field:account.move,date:0
+<<<<<<< TREE
 #: field:account.move.line.reconcile.writeoff,date_p:0
 #: report:account.overdue:0
 #: selection:account.partner.balance,filter:0
@@ -3292,17 +5233,29 @@
 #: selection:account.report.general.ledger,filter:0
 #: selection:account.report.general.ledger,sortby:0
 #: field:account.subscription.generate,date:0
+=======
+#: wizard_field:account.move.line.reconcile,addendum,date_p:0
+#: rml:account.overdue:0
+#: wizard_field:account.subscription.generate,init,date:0
+>>>>>>> MERGE-SOURCE
 #: field:account.subscription.line,date:0
+<<<<<<< TREE
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
 #: field:analytic.entries.report,date:0
+=======
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+>>>>>>> MERGE-SOURCE
 msgid "Date"
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: view:account.move:0
 msgid "Post"
 msgstr ""
@@ -3310,6 +5263,21 @@
 #. module: account
 #: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
+=======
+#: code:addons/account/account.py:0
+#, python-format
+msgid "No period defined for this date !\nPlease create a fiscal year."
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reference_type:0
+msgid "Reference Type"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.move.line.unreconcile,init,unrec:0
+#: wizard_button:account.reconcile.unreconcile,init,unrec:0
+>>>>>>> MERGE-SOURCE
 msgid "Unreconcile"
 msgstr ""
 
@@ -3342,11 +5310,20 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
+msgid "and Journals"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.tax:0
 msgid "Account Tax"
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
 msgid "Budgets"
 msgstr ""
@@ -3710,9 +5687,14 @@
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
 msgid "Shortcut"
+=======
+#: field:account.analytic.line,move_id:0
+msgid "Move Line"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
 #: constraint:account.fiscalyear:0
 msgid "Error! The start date of the fiscal year must be before his end date."
 msgstr ""
@@ -4398,9 +6380,39 @@
 #: 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
+=======
+#: field:account.bank.accounts.wizard,acc_no:0
+msgid "Account No."
+msgstr ""
+
+#. module: account
+#: rml:account.central.journal:0
+msgid "Journal Code"
+msgstr ""
+
+#. module: account
+#: help:account.tax,applicable_type:0
+msgid "If not applicable (computed through a Python code), the tax won't appear on the invoice."
+msgstr ""
+
+#. module: account
+#: field:account.model,lines_id:0
+msgid "Model Entries"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,date:0
+msgid "Date End"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.move.reconcile,line_id:0
+>>>>>>> MERGE-SOURCE
 #: 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
+<<<<<<< TREE
 #: 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
@@ -4613,10 +6625,28 @@
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
 msgid "Payments"
+=======
+#: model:ir.ui.menu,name:account.menu_action_move_line_search
+msgid "Entry Lines"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "The account move (%s) for centralisation has been confirmed!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "No Analytic Journal !"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: account
 #: view:account.tax:0
+<<<<<<< TREE
 msgid "Reverse Compute Code"
 msgstr ""
 
@@ -4837,6 +6867,89 @@
 msgstr ""
 
 #. module: account
+=======
+#: view:account.tax.template:0
+msgid "Applicable Code (if type=code)"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.move.journal,init,open:0
+msgid "Open Journal"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.journal:0
+msgid "KI"