Merge lp:~julie-w/unifield-server/US-6572 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account/__init__.py'
--- bin/addons/account/__init__.py	2011-01-14 00:11:01 +0000
+++ bin/addons/account/__init__.py	2019-10-25 14:10:32 +0000
@@ -33,6 +33,5 @@
 import product
 import sequence
 import company
-import res_currency
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'bin/addons/account/__openerp__.py'
--- bin/addons/account/__openerp__.py	2019-07-24 14:20:02 +0000
+++ bin/addons/account/__openerp__.py	2019-10-25 14:10:32 +0000
@@ -54,7 +54,6 @@
         'report/account_analytic_entries_report_view.xml',
         'wizard/account_move_bank_reconcile_view.xml',
         'wizard/account_use_model_view.xml',
-        'account_installer.xml',
         'wizard/account_period_close_view.xml',
         'account_view.xml',
         'account_report.xml',

=== modified file 'bin/addons/account/account.py'
--- bin/addons/account/account.py	2019-07-30 09:13:43 +0000
+++ bin/addons/account/account.py	2019-10-25 14:10:32 +0000
@@ -2276,75 +2276,6 @@
     _defaults = {
         'legend': lambda self, cr, uid, context:_('You can specify year, month and date in the name of the model using the following labels:\n\n%(year)s: To Specify Year \n%(month)s: To Specify Month \n%(date)s: Current Date\n\ne.g. My model on %(date)s'),
     }
-    def generate(self, cr, uid, ids, datas={}, context=None):
-        move_ids = []
-        entry = {}
-        account_move_obj = self.pool.get('account.move')
-        account_move_line_obj = self.pool.get('account.move.line')
-        pt_obj = self.pool.get('account.payment.term')
-
-        if context is None:
-            context = {}
-
-        if datas.get('date', False):
-            context.update({'date': datas['date']})
-
-        period_id = self.pool.get('account.period').find(cr, uid, dt=context.get('date', False))
-        if not period_id:
-            raise osv.except_osv(_('No period found !'), _('Unable to find a valid period !'))
-        period_id = period_id[0]
-
-        for model in self.browse(cr, uid, ids, context=context):
-            entry['name'] = model.name%{'year':time.strftime('%Y'), 'month':time.strftime('%m'), 'date':time.strftime('%Y-%m')}
-            move_id = account_move_obj.create(cr, uid, {
-                'ref': entry['name'],
-                'period_id': period_id,
-                'journal_id': model.journal_id.id,
-                'date': context.get('date',time.strftime('%Y-%m-%d'))
-            })
-            move_ids.append(move_id)
-            for line in model.lines_id:
-                analytic_account_id = False
-                if line.analytic_account_id:
-                    if not model.journal_id.analytic_journal_id:
-                        raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (model.journal_id.name,))
-                    analytic_account_id = line.analytic_account_id.id
-                val = {
-                    'move_id': move_id,
-                    'journal_id': model.journal_id.id,
-                    'period_id': period_id,
-                    'analytic_account_id': analytic_account_id
-                }
-
-                date_maturity = time.strftime('%Y-%m-%d')
-                if line.date_maturity == 'partner':
-                    if not line.partner_id:
-                        raise osv.except_osv(_('Error !'), _("Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!" \
-                                                             "\nPlease define partner on it!")%(line.name, model.name))
-                    if line.partner_id.property_payment_term:
-                        payment_term_id = line.partner_id.property_payment_term.id
-                        pterm_list = pt_obj.compute(cr, uid, payment_term_id, value=1, date_ref=date_maturity)
-                        if pterm_list:
-                            pterm_list = [l[0] for l in pterm_list]
-                            pterm_list.sort()
-                            date_maturity = pterm_list[-1]
-
-                val.update({
-                    'name': line.name,
-                    'quantity': line.quantity,
-                    'debit': line.debit,
-                    'credit': line.credit,
-                    'account_id': line.account_id.id,
-                    'move_id': move_id,
-                    'partner_id': line.partner_id.id,
-                    'date': context.get('date',time.strftime('%Y-%m-%d')),
-                    'date_maturity': date_maturity
-                })
-                c = context.copy()
-                c.update({'journal_id': model.journal_id.id,'period_id': period_id})
-                account_move_line_obj.create(cr, uid, val, context=c)
-
-        return move_ids
 
 account_model()
 

=== modified file 'bin/addons/account/account_analytic_line.py'
--- bin/addons/account/account_analytic_line.py	2018-08-31 13:43:37 +0000
+++ bin/addons/account/account_analytic_line.py	2019-10-25 14:10:32 +0000
@@ -63,73 +63,6 @@
                 return False
         return True
 
-    # Compute the cost based on the price type define into company
-    # property_valuation_price_type property
-    def on_change_unit_amount(self, cr, uid, id, prod_id, quantity, company_id,
-                              unit=False, journal_id=False, context=None):
-        if context==None:
-            context={}
-        if not journal_id:
-            j_ids = self.pool.get('account.analytic.journal').search(cr, uid, [('type','=','purchase')])
-            journal_id = j_ids and j_ids[0] or False
-        if not journal_id or not prod_id:
-            return {}
-        product_obj = self.pool.get('product.product')
-        analytic_journal_obj =self.pool.get('account.analytic.journal')
-        product_price_type_obj = self.pool.get('product.price.type')
-        j_id = analytic_journal_obj.browse(cr, uid, journal_id, context=context)
-        prod = product_obj.browse(cr, uid, prod_id, context=context)
-        result = 0.0
-
-        if j_id.type <> 'sale':
-            a = prod.product_tmpl_id.property_account_expense.id
-            if not a:
-                a = prod.categ_id.property_account_expense_categ.id
-            if not a:
-                raise osv.except_osv(_('Error !'),
-                                     _('There is no expense account defined ' \
-                                       'for this product: "%s" (id:%d)') % \
-                                     (prod.name, prod.id,))
-        else:
-            a = prod.product_tmpl_id.property_account_income.id
-            if not a:
-                a = prod.categ_id.property_account_income_categ.id
-            if not a:
-                raise osv.except_osv(_('Error !'),
-                                     _('There is no income account defined ' \
-                                       'for this product: "%s" (id:%d)') % \
-                                     (prod.name, prod_id,))
-
-        flag = False
-        # Compute based on pricetype
-        product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','standard_price')], context=context)
-        pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context=context)[0]
-        if journal_id:
-            journal = analytic_journal_obj.browse(cr, uid, journal_id, context=context)
-            if journal.type == 'sale':
-                product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','list_price')], context)
-                if product_price_type_ids:
-                    pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context=context)[0]
-        # Take the company currency as the reference one
-        if pricetype.field == 'list_price':
-            flag = True
-        ctx = context.copy()
-        if unit:
-            # price_get() will respect a 'uom' in its context, in order
-            # to return a default price for those units
-            ctx['uom'] = unit
-        amount_unit = prod.price_get(pricetype.field, context=ctx)[prod.id]
-        prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
-        amount = amount_unit * quantity or 1.0
-        result = round(amount, prec)
-        if not flag:
-            result *= -1
-        return {'value': {
-            'amount': result,
-            'general_account_id': a,
-        }
-        }
-
     def view_header_get(self, cr, user, view_id, view_type, context=None):
         if context is None:
             context = {}

=== modified file 'bin/addons/account/account_bank_statement.py'
--- bin/addons/account/account_bank_statement.py	2016-11-17 08:46:41 +0000
+++ bin/addons/account/account_bank_statement.py	2019-10-25 14:10:32 +0000
@@ -25,28 +25,43 @@
 from tools.translate import _
 import decimal_precision as dp
 
+
 class account_bank_statement(osv.osv):
 
-    def create(self, cr, uid, vals, context=None):
-        seq = 0
-        if 'line_ids' in vals:
-            for line in vals['line_ids']:
-                seq += 1
-                line[2]['sequence'] = seq
-                vals[seq - 1] = line
-        return super(account_bank_statement, self).create(cr, uid, vals, context=context)
-
     def write(self, cr, uid, ids, vals, context=None):
         if not ids:
             return True
-        res = super(account_bank_statement, self).write(cr, uid, ids, vals, context=context)
-        account_bank_statement_line_obj = self.pool.get('account.bank.statement.line')
-        for statement in self.browse(cr, uid, ids, context):
-            seq = 0
-            for line in statement.line_ids:
-                seq += 1
-                account_bank_statement_line_obj.write(cr, uid, [line.id], {'sequence': seq}, context=context)
-        return res
+        if context is None:
+            context = {}
+
+        if not context.get('sync_update_execution'):
+            if 'balance_end_real' in vals:
+                new_vals = {'balance_start': vals['balance_end_real']}
+                # US-948/2: carry over end of month balance to next registers if
+                # the source register is not 'end of month balance' frozen
+                # note: the last carry over is processed via
+                # 'button_confirm_closing_bank_balance' button
+                to_write_id_list = []
+                for r in self.read(cr, uid, ids,
+                                   [ 'closing_balance_frozen', 'journal_id', ],
+                                   context=context):
+                    if not r['closing_balance_frozen']:
+                        if r['journal_id']:
+                            jtype = self.pool.get('account.journal').read(cr,
+                                                                          uid, [r['journal_id'][0]], ['type'],
+                                                                          context=context)[0]['type']
+                            if jtype != 'cash':
+                                args = [('prev_reg_id', '=', r['id'])]
+                                search_ids = self.search(cr, uid, args,
+                                                         context=context)
+                                if search_ids:
+                                    to_write_id_list.extend(search_ids)
+                self.write(cr, uid, to_write_id_list, new_vals, context=context)
+
+        if not vals:
+            return True
+
+        return super(account_bank_statement, self).write(cr, uid, ids, vals, context=context)
 
     def _default_journal_id(self, cr, uid, context=None):
         if context is None:
@@ -60,43 +75,25 @@
                 journal_id = ids[0]
         return journal_id
 
-    def _default_balance_start(self, cr, uid, context=None):
-        cr.execute('select id from account_bank_statement where journal_id=%s order by date desc limit 1', (1,))
-        res = cr.fetchone()
-        if res:
-            return self.browse(cr, uid, res[0], context=context).balance_end
-        return 0.0
-
-    def _end_balance(self, cursor, user, ids, name, attr, context=None):
-        res_currency_obj = self.pool.get('res.currency')
-        res_users_obj = self.pool.get('res.users')
+    def _end_balance(self, cr, uid, ids, field_name=None, arg=None, context=None):
+        """
+        Calculate register's balance
+        """
+        if context is None:
+            context = {}
         res = {}
 
-        company_currency_id = res_users_obj.browse(cursor, user, user,
-                                                   context=context).company_id.currency_id.id
-
-        statements = self.browse(cursor, user, ids, context=context)
-        for statement in statements:
+        # Add this context in order to escape cheque register filter
+        ctx = context.copy()
+        ctx.update({'from_end_balance': True})
+        for statement in self.browse(cr, uid, ids, context=ctx):
             res[statement.id] = statement.balance_start
-            currency_id = statement.currency.id
-            for line in statement.move_line_ids:
-                if line.debit > 0:
-                    if line.account_id.id == \
-                            statement.journal_id.default_debit_account_id.id:
-                        res[statement.id] += res_currency_obj.compute(cursor,
-                                                                      user, company_currency_id, currency_id,
-                                                                      line.debit, context=context)
-                else:
-                    if line.account_id.id == \
-                            statement.journal_id.default_credit_account_id.id:
-                        res[statement.id] -= res_currency_obj.compute(cursor,
-                                                                      user, company_currency_id, currency_id,
-                                                                      line.credit, context=context)
-            if statement.state == 'draft':
-                for line in statement.line_ids:
-                    res[statement.id] += line.amount
-        for r in res:
-            res[r] = round(res[r], 2)
+            for st_line in statement.line_ids:
+                res[statement.id] += st_line.amount or 0.0
+            # UF-425: Add the Open Advances Amount when calculating the "Calculated Balance" value
+            res[statement.id] -= statement.open_advance_amount or 0.0
+            # UF-810: Add a "Unrecorded Expenses" when calculating "Calculated Balance"
+            res[statement.id] -= statement.unrecorded_expenses_amount or 0.0
         return res
 
     def _get_period(self, cr, uid, context=None):
@@ -125,21 +122,18 @@
             res[statement_id] = (currency_id, currency_names[currency_id])
         return res
 
-    _order = "date desc, id desc"
     _name = "account.bank.statement"
     _description = "Bank Statement"
     _columns = {
-        'name': fields.char('Name', size=64, required=True, help='if you give the Name other then /, its created Accounting Entries Move will be with same name as statement name. This allows the statement entries to have the same references than the statement itself', states={'confirm': [('readonly', True)]}),
+        'name': fields.char('Register Name', size=64, required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'date': fields.date('Date', required=True, states={'confirm': [('readonly', True)]}),
-        'journal_id': fields.many2one('account.journal', 'Journal', required=True,
-                                      readonly=True, states={'draft':[('readonly',False)]}),
-        'period_id': fields.many2one('account.period', 'Period', required=True,
-                                     states={'confirm':[('readonly', True)]}),
+        'journal_id': fields.many2one('account.journal', 'Journal', required=True, readonly=True),
+        'period_id': fields.many2one('account.period', 'Period', required=True),
         'balance_start': fields.float('Starting Balance', digits_compute=dp.get_precision('Account'),
                                       states={'confirm':[('readonly',True)]}),
-        'balance_end_real': fields.float('Ending Balance', digits_compute=dp.get_precision('Account'),
-                                         states={'confirm':[('readonly', True)]}),
-        'balance_end': fields.function(_end_balance, method=True, string='Balance'),
+        'balance_end_real': fields.float('Closing Balance', digits_compute=dp.get_precision('Account'), states={'confirm':[('readonly', True)]},
+                                         help="Please enter manually the end-of-month balance, as per the printed bank statement received. Before confirming closing balance & closing the register, you must make sure that the calculated balance of the bank statement is equal to that amount."),
+        'balance_end': fields.function(_end_balance, method=True, store=False, string='Calculated Balance'),
         'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
         'line_ids': fields.one2many('account.bank.statement.line',
                                     'statement_id', 'Statement lines',
@@ -147,21 +141,18 @@
         'deleted_line_ids': fields.one2many('account.bank.statement.line.deleted', 'statement_id', 'Statement lines'),
         'move_line_ids': fields.one2many('account.move.line', 'statement_id',
                                          'Entry lines', states={'confirm':[('readonly',True)]}),
-        'state': fields.selection([('draft', 'Draft'),('confirm', 'Confirmed')],
-                                  'State', required=True,
-                                  states={'confirm': [('readonly', True)]}, readonly="1",
-                                  help='When new statement is created the state will be \'Draft\'. \
-            \n* And after getting confirmation from the bank it will be in \'Confirmed\' state.'),
+        'state': fields.selection((('draft', 'Draft'), ('open', 'Open'), ('partial_close', 'Partial Close'), ('confirm', 'Closed')),
+                                  readonly="True", string='State'),
         'currency': fields.function(_currency, method=True, string='Currency',
                                     type='many2one', relation='res.currency'),
         'account_id': fields.related('journal_id', 'default_debit_account_id', type='many2one', relation='account.account', string='Account used in this journal', readonly=True, help='used in statement reconciliation domain, but shouldn\'t be used elswhere.'),
     }
 
     _defaults = {
-        'name': "/",
+        'name': False,
         'date': lambda *a: time.strftime('%Y-%m-%d'),
         'state': 'draft',
-        'balance_start': _default_balance_start,
+        'balance_start': lambda *a: 0.0,
         'journal_id': _default_journal_id,
         'period_id': _get_period,
     }
@@ -199,168 +190,9 @@
     def button_dummy(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {}, context=context)
 
-    def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, st_line_number, context=None):
-        if context is None:
-            context = {}
-        res_currency_obj = self.pool.get('res.currency')
-        account_move_obj = self.pool.get('account.move')
-        account_move_line_obj = self.pool.get('account.move.line')
-        account_bank_statement_line_obj = self.pool.get('account.bank.statement.line')
-        st_line = account_bank_statement_line_obj.browse(cr, uid, st_line_id, context=context)
-        st = st_line.statement_id
-
-        context.update({'date': st_line.date})
-
-        move_id = account_move_obj.create(cr, uid, {
-            'journal_id': st.journal_id.id,
-            'period_id': st.period_id.id,
-            'date': st_line.date,
-            'name': st_line_number,
-        }, context=context)
-        account_bank_statement_line_obj.write(cr, uid, [st_line.id], {
-            'move_ids': [(4, move_id, False)]
-        })
-
-        torec = []
-        if st_line.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 = ((st_line.amount<=0) and st.journal_id.default_debit_account_id) or st_line.account_id
-        context.update({
-            'res.currency.compute.account': acc_cur,
-        })
-        amount = res_currency_obj.compute(cr, uid, st.currency.id,
-                                          company_currency_id, st_line.amount, context=context)
-
-        val = {
-            'name': st_line.name,
-            'date': st_line.date,
-            'ref': st_line.ref,
-            'move_id': move_id,
-            'partner_id': ((st_line.partner_id) and st_line.partner_id.id) or False,
-            'account_id': (st_line.account_id) and st_line.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,
-            'analytic_account_id': st_line.analytic_account_id and st_line.analytic_account_id.id or False
-        }
-
-        if st.currency.id <> company_currency_id:
-            amount_cur = res_currency_obj.compute(cr, uid, company_currency_id,
-                                                  st.currency.id, amount, context=context)
-            val['amount_currency'] = -amount_cur
-
-        if st_line.account_id and st_line.account_id.currency_id and st_line.account_id.currency_id.id <> company_currency_id:
-            val['currency_id'] = st_line.account_id.currency_id.id
-            amount_cur = res_currency_obj.compute(cr, uid, company_currency_id,
-                                                  st_line.account_id.currency_id.id, amount, context=context)
-            val['amount_currency'] = -amount_cur
-
-        move_line_id = account_move_line_obj.create(cr, uid, val, context=context)
-        torec.append(move_line_id)
-
-        # 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 = st_line.amount
-            currency_id = st.currency.id
-        account_move_line_obj.create(cr, uid, {
-            'name': st_line.name,
-            'date': st_line.date,
-            'ref': st_line.ref,
-            'move_id': move_id,
-            'partner_id': ((st_line.partner_id) and st_line.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 !'),
-                                     _('Journal Item "%s" is not valid') % line.name)
-
-        # Bank statements will not consider boolean on journal entry_posted
-        account_move_obj.post(cr, uid, [move_id], context=context)
-        return move_id
-
-    def get_next_st_line_number(self, cr, uid, st_number, st_line, context=None):
-        return st_number + '/' + str(st_line.sequence)
-
-    def balance_check(self, cr, uid, st_id, journal_type='bank', context=None):
-        st = self.browse(cr, uid, st_id, context=context)
-        if not (abs((st.balance_end or 0.0) - st.balance_end_real) < 0.0001):
-            raise osv.except_osv(_('Error !'),
-                                 _('The statement balance is incorrect !\n') +
-                                 _('The expected balance (%.2f) is different than the computed one. (%.2f)') % (st.balance_end_real, st.balance_end))
-        return True
-
     def statement_close(self, cr, uid, ids, journal_type='bank', context=None):
         return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
 
-    def check_status_condition(self, cr, uid, state, journal_type='bank'):
-        return state=='draft'
-
-    def button_confirm_bank(self, cr, uid, ids, context=None):
-        done = []
-        obj_seq = self.pool.get('ir.sequence')
-        if context is None:
-            context = {}
-
-        for st in self.browse(cr, uid, ids, context=context):
-            j_type = st.journal_id.type
-            company_currency_id = st.journal_id.company_id.currency_id.id
-            if not self.check_status_condition(cr, uid, st.state, journal_type=j_type):
-                continue
-
-            self.balance_check(cr, uid, st.id, journal_type=j_type, context=context)
-            if (not st.journal_id.default_credit_account_id) \
-                    or (not st.journal_id.default_debit_account_id):
-                raise osv.except_osv(_('Configuration Error !'),
-                                     _('Please verify that an account is defined in the journal.'))
-
-            if not st.name == '/':
-                st_number = st.name
-            else:
-                if st.journal_id.sequence_id:
-                    c = {'fiscalyear_id': st.period_id.fiscalyear_id.id}
-                    st_number = obj_seq.get_id(cr, uid, st.journal_id.sequence_id.id, context=c)
-                else:
-                    st_number = obj_seq.get(cr, uid, 'account.bank.statement')
-
-            for line in st.move_line_ids:
-                if line.state <> 'valid':
-                    raise osv.except_osv(_('Error !'),
-                                         _('The account entries lines are not in valid state.'))
-            for st_line in st.line_ids:
-                if st_line.analytic_account_id:
-                    if not st.journal_id.analytic_journal_id:
-                        raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (st.journal_id.name,))
-                if not st_line.amount:
-                    continue
-                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)
-
-            self.write(cr, uid, [st.id], {'name': st_number}, context=context)
-            self.log(cr, uid, st.id, _('Statement %s is confirmed, journal items are created.') % (st_number,))
-            done.append(st.id)
-        return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
-
     def button_cancel(self, cr, uid, ids, context=None):
         done = []
         account_move_obj = self.pool.get('account.move')

=== modified file 'bin/addons/account/account_cash_statement.py'
--- bin/addons/account/account_cash_statement.py	2019-07-30 09:13:43 +0000
+++ bin/addons/account/account_cash_statement.py	2019-10-25 14:10:32 +0000
@@ -70,7 +70,6 @@
     _inherit = 'account.bank.statement'
 
     def _get_starting_balance(self, cr, uid, ids, context=None):
-
         """ Find starting balance
         @param name: Names of fields.
         @param arg: User defined arguments
@@ -83,13 +82,18 @@
             if statement.journal_id.type not in('cash'):
                 continue
 
-            for line in statement.starting_details_ids:
-                amount_total+= line.pieces * line.number
+            if not statement.prev_reg_id:
+                for line in statement.starting_details_ids:
+                    amount_total+= line.pieces * line.number
+            else:
+                amount_total = statement.prev_reg_id.msf_calculated_balance
+
             res[statement.id] = {
                 'balance_start': amount_total
             }
         return res
 
+
     def _balance_end_cash(self, cr, uid, ids, name, arg, context=None):
         """ Find ending balance  "
         @param name: Names of fields.
@@ -119,39 +123,6 @@
             res2[statement.id] = encoding_total
         return res2
 
-    def _end_balance(self, cursor, user, ids, name, attr, context=None):
-        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
-
-        statements = self.browse(cursor, user, ids, context=context)
-        for statement in statements:
-            res[statement.id] = statement.balance_start
-            currency_id = statement.currency.id
-            for line in statement.move_line_ids:
-                if line.debit > 0:
-                    if line.account_id.id == \
-                            statement.journal_id.default_debit_account_id.id:
-                        res[statement.id] += res_currency_obj.compute(cursor,
-                                                                      user, company_currency_id, currency_id,
-                                                                      line.debit, context=context)
-                else:
-                    if line.account_id.id == \
-                            statement.journal_id.default_credit_account_id.id:
-                        res[statement.id] -= res_currency_obj.compute(cursor,
-                                                                      user, company_currency_id, currency_id,
-                                                                      line.credit, context=context)
-
-            if statement.state in ('draft', 'open'):
-                for line in statement.line_ids:
-                    res[statement.id] += line.amount
-        for r in res:
-            res[r] = round(res[r], 2)
-        return res
-
     def _get_company(self, cr, uid, context=None):
         user_pool = self.pool.get('res.users')
         company_pool = self.pool.get('res.company')
@@ -218,79 +189,19 @@
         return res
 
     _columns = {
-        'balance_end_real': fields.float('Closing Balance', digits_compute=dp.get_precision('Account'), states={'confirm': [('readonly', True)]}, help="closing balance entered by the cashbox verifier"),
-        'state': fields.selection(
-            [('draft', 'Draft'),
-             ('confirm', 'Closed'),
-             ('open','Open')], 'State', required=True, states={'confirm': [('readonly', True)]}, readonly="1"),
         'total_entry_encoding': fields.function(_get_sum_entry_encoding, method=True, store=False, string="Cash Transaction", help="Total cash transactions"),
-        'balance_end': fields.function(_end_balance, method=True, store=False, string='Balance', help="Closing balance based on Starting Balance and Cash Transactions"),
         'balance_end_cash': fields.function(_balance_end_cash, method=True, store=False, string='Balance', help="Closing balance based on cashBox"),
         'starting_details_ids': fields.one2many('account.cashbox.line', 'starting_id', string='Opening Cashbox'),
         'ending_details_ids': fields.one2many('account.cashbox.line', 'ending_id', string='Closing Cashbox'),
-        'name': fields.char('Name', size=64, required=True, states={'draft': [('readonly', False)]}, readonly=True, help='if you give the Name other then /, its created Accounting Entries Move will be with same name as statement name. This allows the statement entries to have the same references than the statement itself'),
         'user_id': fields.many2one('res.users', 'Responsible', required=False),
     }
     _defaults = {
-        'state': 'draft',
         'date': lambda *a: time.strftime("%Y-%m-%d %H:%M:%S"),
         'user_id': lambda self, cr, uid, context=None: uid,
         'starting_details_ids': _get_cash_open_box_lines,
         'ending_details_ids': _get_default_cash_close_box_lines
     }
 
-    def create(self, cr, uid, vals, context=None):
-        sql = [
-            ('journal_id', '=', vals.get('journal_id', False)),
-            ('state', '=', 'open')
-        ]
-        open_jrnl = self.search(cr, uid, sql)
-        if open_jrnl:
-            raise osv.except_osv(_('Error'), _('You can not have two open register for the same journal'))
-
-        if self.pool.get('account.journal').browse(cr, uid, vals['journal_id'], context=context).type == 'cash':
-            open_close = self._get_cash_open_close_box_lines(cr, uid, context)
-            if vals.get('starting_details_ids', False):
-                for start in vals.get('starting_details_ids'):
-                    dict_val = start[2]
-                    for end in open_close['end']:
-                        if end[2]['pieces'] == dict_val['pieces']:
-                            end[2]['number'] += dict_val['number']
-            vals.update({
-                #                'ending_details_ids': open_close['start'],
-                'starting_details_ids': open_close['end']
-            })
-        else:
-            vals.update({
-                'ending_details_ids': False,
-                'starting_details_ids': False
-            })
-        res_id = super(account_cash_statement, self).create(cr, uid, vals, context=context)
-        self.write(cr, uid, [res_id], {})
-        return res_id
-
-    def write(self, cr, uid, ids, vals, context=None):
-        """
-        Update redord(s) comes in {ids}, with new value comes as {vals}
-        return True on success, False otherwise
-
-        @param cr: cursor to database
-        @param user: id of current user
-        @param ids: list of record ids to be update
-        @param vals: dict of new values to be set
-        @param context: context arguments, like lang, time zone
-
-        @return: True on success, False otherwise
-        """
-        if not ids:
-            return True
-
-        super(account_cash_statement, self).write(cr, uid, ids, vals, context=context)
-        res = self._get_starting_balance(cr, uid, ids)
-        for rs in res:
-            super(account_cash_statement, self).write(cr, uid, [rs], res.get(rs))
-        return True
-
     def onchange_journal_id(self, cr, uid, statement_id, journal_id, context=None):
         """ Changes balance start and starting details if journal_id changes"
         @param statement_id: Changed statement_id
@@ -346,13 +257,6 @@
             self.write(cr, uid, [statement.id], vals, context=context)
         return True
 
-    def balance_check(self, cr, uid, cash_id, journal_type='bank', context=None):
-        if journal_type == 'bank':
-            return super(account_cash_statement, self).balance_check(cr, uid, cash_id, journal_type, context)
-        if not self._equal_balance(cr, uid, cash_id, context):
-            raise osv.except_osv(_('Error !'), _('CashBox Balance is not matching with Calculated Balance !'))
-        return True
-
     def statement_close(self, cr, uid, ids, journal_type='bank', context=None):
         if journal_type == 'bank':
             return super(account_cash_statement, self).statement_close(cr, uid, ids, journal_type, context)
@@ -362,15 +266,6 @@
         }
         return self.write(cr, uid, ids, vals, context=context)
 
-    def check_status_condition(self, cr, uid, state, journal_type='bank'):
-        if journal_type == 'bank':
-            return super(account_cash_statement, self).check_status_condition(cr, uid, state, journal_type)
-        return state=='open'
-
-    def button_confirm_cash(self, cr, uid, ids, context=None):
-        super(account_cash_statement, self).button_confirm_bank(cr, uid, ids, context=context)
-        return self.write(cr, uid, ids, {'closing_date': time.strftime("%Y-%m-%d %H:%M:%S")}, context=context)
-
     def button_cancel(self, cr, uid, ids, context=None):
         cash_box_line_pool = self.pool.get('account.cashbox.line')
         super(account_cash_statement, self).button_cancel(cr, uid, ids, context=context)

=== removed file 'bin/addons/account/account_installer.xml'
--- bin/addons/account/account_installer.xml	2011-01-14 00:11:01 +0000
+++ bin/addons/account/account_installer.xml	1970-01-01 00:00:00 +0000
@@ -1,130 +0,0 @@
-<openerp>
-    <data>
-        <record id="view_account_configuration_installer" model="ir.ui.view">
-            <field name="name">account.installer.form</field>
-            <field name="model">account.installer</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.res_config_installer"/>
-            <field name="arch" type="xml">
-            <data>
-                <form position="attributes">
-                    <attribute name="string">Accounting Application Configuration</attribute>
-                </form>
-                <separator string="title" position="attributes">
-                    <attribute name="string">Configure Your Accounting Chart</attribute>
-                </separator>
-                <xpath expr="//label[@string='description']" position="attributes">
-                    <attribute name="string">The default Chart of Accounts is matching your country selection. If no certified Chart of Accounts exists for your specified country, a generic one can be installed and will be selected by default.</attribute>
-                </xpath>
-                <xpath expr="//button[@string='Install Modules']" position="attributes">
-                    <attribute name="string">Configure</attribute>
-                </xpath>
-                <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                    <attribute name='rowspan'>23</attribute>
-                    <attribute name='string'></attribute>
-                </xpath>
-                <group colspan="8">
-                    <group colspan="4" width="600">
-                        <field name="charts"/>
-                            <group colspan="4" groups="base.group_extended">
-                                <separator col="4" colspan="4" string="Configure Fiscal Year"/>
-                                <field name="company_id" colspan="4" widget="selection"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
-                                <field name="date_start" on_change="on_change_start_date(date_start)"/>
-                                <field name="date_stop"/>
-                                <field name="period" colspan="4"/>
-                            </group>
-                            <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
-                                <field name="sale_tax" on_change="on_change_tax(sale_tax)" attrs="{'required':[('charts','=','configurable')]}"/>
-                                <field name="purchase_tax" groups="base.group_extended"/>
-                            </group>
-                            <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
-                                <separator col="4" colspan="4" string="Bank and Cash Accounts"/>
-                                <field colspan="4" mode="tree" height="200" name="bank_accounts_id" nolabel="1" widget="one2many_list">
-                                    <form string="">
-                                        <field name="acc_name"/>
-                                        <field name="account_type"/>
-                                        <field name="currency_id" widget="selection" groups="base.group_extended"/>
-                                    </form>
-                                    <tree editable="bottom" string="Your bank and cash accounts">
-                                        <field name="acc_name"/>
-                                        <field name="account_type"/>
-                                        <field name="currency_id" widget="selection" groups="base.group_extended"/>
-                                    </tree>
-                                </field>
-                            </group>
-                        </group>
-                    </group>
-                </data>
-            </field>
-        </record>
-
-        <record id="view_account_modules_installer" model="ir.ui.view">
-            <field name="name">account.installer.modules.form</field>
-            <field name="model">account.installer.modules</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.res_config_installer"/>
-            <field name="arch" type="xml">
-                <data>
-                    <form position="attributes">
-                        <attribute name="string">Accounting Application Configuration</attribute>
-                    </form>
-                    <separator string="title" position="attributes">
-                         <attribute name="string">Configure Your Accounting Application</attribute>
-
-                    </separator>
-                    <xpath expr="//label[@string='description']" position="attributes">
-                        <attribute name="string">Add extra Accounting functionalities to the ones already installed.</attribute>
-                    </xpath>
-                    <xpath expr="//button[@string='Install Modules']" position="attributes">
-                        <attribute name="string">Configure</attribute>
-                    </xpath>
-                    <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                        <attribute name='string'></attribute>
-                    </xpath>
-                    <group colspan="8">
-                        <field name="account_voucher"/>
-                        <field name="account_followup"/>
-                        <field name="account_payment"/>
-                        <field name="account_analytic_plans"/>
-                        <field name="account_anglo_saxon"/>
-<!--                    <field name="account_voucher_payment"/>-->
-                    </group>
-                </data>
-            </field>
-        </record>
-
-        <record id="action_account_configuration_installer" model="ir.actions.act_window">
-            <field name="name">Accounting Chart Configuration</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.installer</field>
-            <field name="view_id" ref="view_account_configuration_installer"/>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-        <record id="action_account_installer" model="ir.actions.act_window">
-            <field name="name">Accounting Application Configuration</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.installer.modules</field>
-            <field name="view_id" ref="view_account_modules_installer"/>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-        <record id="account_configuration_installer_todo" model="ir.actions.todo">
-            <field name="action_id" ref="action_account_configuration_installer"/>
-            <field name="sequence">3</field>
-            <field name="restart">onskip</field>
-        </record>
-
-        <record id="account_installer_todo" model="ir.actions.todo">
-            <field name="action_id" ref="action_account_installer"/>
-            <field name="sequence">5</field>
-            <field name="restart">always</field>
-            <field eval="[(6,0,[ref('base.group_extended')])]" name="groups_id"/>
-        </record>
-
-    </data>
-</openerp>

=== modified file 'bin/addons/account/account_invoice_view.xml'
--- bin/addons/account/account_invoice_view.xml	2019-07-29 15:00:38 +0000
+++ bin/addons/account/account_invoice_view.xml	2019-10-25 14:10:32 +0000
@@ -223,8 +223,11 @@
                                                domain="[('type', 'not in', ['view', 'consolidation']),
                                                         ('user_type_code', '=', 'tax')]"/>
 
-                                        <field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
-                                        <field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,parent.date_invoice)"/>
+                                        <field name="base"
+                                               on_change="base_change(base, parent.currency_id, parent.company_id, parent.document_date, parent.date_invoice)"
+                                               readonly="1"/>
+                                        <field name="amount"
+                                               on_change="amount_change(amount, parent.currency_id, parent.company_id, parent.document_date, parent.date_invoice)"/>
 
                                         <field invisible="True" name="base_amount"/>
                                         <field invisible="True" name="tax_amount"/>
@@ -339,8 +342,11 @@
                                     <tree editable="bottom" string="Taxes">
                                         <field name="name"/>
                                         <field name="account_id" groups="account.group_account_invoice"/>
-                                        <field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
-                                        <field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,parent.date_invoice)"/>
+                                        <field name="base"
+                                               on_change="base_change(base, parent.currency_id, parent.company_id, parent.document_date, parent.date_invoice)"
+                                               readonly="1"/>
+                                        <field name="amount"
+                                               on_change="amount_change(amount, parent.currency_id, parent.company_id, parent.document_date, parent.date_invoice)"/>
                                         <field invisible="True" name="base_amount"/>
                                         <field invisible="True" name="tax_amount"/>
                                         <field name="factor_base" invisible="True"/>

=== modified file 'bin/addons/account/account_move_line.py'
--- bin/addons/account/account_move_line.py	2019-09-17 16:00:23 +0000
+++ bin/addons/account/account_move_line.py	2019-10-25 14:10:32 +0000
@@ -21,7 +21,6 @@
 
 import time
 from datetime import datetime
-from operator import itemgetter
 
 from osv import fields, osv
 from tools.translate import _
@@ -29,6 +28,7 @@
 import tools
 import netsvc
 
+
 class account_move_line(osv.osv):
     _name = "account.move.line"
     _description = "Journal Items"
@@ -149,57 +149,6 @@
         query += company_clause
         return query
 
-    def _amount_residual(self, cr, uid, ids, field_names, args, context=None):
-        """
-           This function returns the residual amount on a receivable or payable account.move.line.
-           By default, it returns an amount in the currency of this journal entry (maybe different
-           of the company currency), but if you pass 'residual_in_company_currency' = True in the
-           context then the returned amount will be in company currency.
-        """
-        res = {}
-        if context is None:
-            context = {}
-        cur_obj = self.pool.get('res.currency')
-        for move_line in self.browse(cr, uid, ids, context=context):
-            res[move_line.id] = {
-                'amount_residual': 0.0,
-                'amount_residual_currency': 0.0,
-            }
-
-            if move_line.reconcile_id:
-                continue
-            if not move_line.account_id.type in ('payable', 'receivable'):
-                #this function does not suport to be used on move lines not related to payable or receivable accounts
-                continue
-
-            if move_line.currency_id:
-                move_line_total = move_line.amount_currency
-                sign = move_line.amount_currency < 0 and -1 or 1
-            else:
-                move_line_total = move_line.debit - move_line.credit
-                sign = (move_line.debit - move_line.credit) < 0 and -1 or 1
-            line_total_in_company_currency =  move_line.debit - move_line.credit
-            context_unreconciled = context.copy()
-            if move_line.reconcile_partial_id:
-                for payment_line in move_line.reconcile_partial_id.line_partial_ids:
-                    if payment_line.id == move_line.id:
-                        continue
-                    if payment_line.currency_id and move_line.currency_id and payment_line.currency_id.id == move_line.currency_id.id:
-                        move_line_total += payment_line.amount_currency
-                    else:
-                        if move_line.currency_id:
-                            context_unreconciled.update({'date': payment_line.date})
-                            amount_in_foreign_currency = cur_obj.compute(cr, uid, move_line.company_id.currency_id.id, move_line.currency_id.id, (payment_line.debit - payment_line.credit), round=False, context=context_unreconciled)
-                            move_line_total += amount_in_foreign_currency
-                        else:
-                            move_line_total += (payment_line.debit - payment_line.credit)
-                    line_total_in_company_currency += (payment_line.debit - payment_line.credit)
-
-            result = move_line_total
-            res[move_line.id]['amount_residual_currency'] =  sign * (move_line.currency_id and self.pool.get('res.currency').round(cr, uid, move_line.currency_id.rounding, result) or result)
-            res[move_line.id]['amount_residual'] = sign * line_total_in_company_currency
-        return res
-
     def default_get(self, cr, uid, fields, context=None):
         data = self._default_get(cr, uid, fields, context=context)
         for f in data.keys():
@@ -387,18 +336,6 @@
         data['debit'] = s > 0  and s or 0.0
         data['credit'] = s < 0  and -s or 0.0
 
-        if account and account.currency_id:
-            data['currency_id'] = account.currency_id.id
-            acc = account
-            if s>0:
-                acc = acc1
-            compute_ctx = context.copy()
-            compute_ctx.update({
-                'res.currency.compute.account': acc,
-                'res.currency.compute.account_invert': True,
-            })
-            v = currency_obj.compute(cr, uid, account.company_id.currency_id.id, data['currency_id'], s, context=compute_ctx)
-            data['amount_currency'] = v
         return data
 
     def on_create_write(self, cr, uid, id, context=None):
@@ -601,8 +538,6 @@
         'reconcile_id': fields.many2one('account.move.reconcile', 'Reconcile', readonly=True, ondelete='set null', select=2),
         'reconcile_partial_id': fields.many2one('account.move.reconcile', 'Partial Reconcile', readonly=True, ondelete='set null', select=2),
         'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency if it is a multi-currency entry.", digits_compute=dp.get_precision('Account')),
-        'amount_residual_currency': fields.function(_amount_residual, method=True, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."),
-        'amount_residual': fields.function(_amount_residual, method=True, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in the company currency."),
         'currency_id': fields.many2one('res.currency', 'Currency', help="The optional other currency if it is a multi-currency entry."),
         'period_id': fields.many2one('account.period', 'Period', required=True, select=2),
         'fiscalyear_id': fields.related('period_id', 'fiscalyear_id', type='many2one', relation='account.fiscalyear', string='Fiscal Year', store=False),
@@ -737,31 +672,6 @@
         (_check_company_id, 'Company must be same for its related account and period.',['company_id'] ),
     ]
 
-    #TODO: ONCHANGE_ACCOUNT_ID: set account_tax_id
-    def onchange_currency(self, cr, uid, ids, account_id, amount, currency_id, date=False, journal=False, context=None):
-        if context is None:
-            context = {}
-        account_obj = self.pool.get('account.account')
-        journal_obj = self.pool.get('account.journal')
-        currency_obj = self.pool.get('res.currency')
-        if (not currency_id) or (not account_id):
-            return {}
-        result = {}
-        acc = account_obj.browse(cr, uid, account_id, context=context)
-        if (amount>0) and journal:
-            x = journal_obj.browse(cr, uid, journal).default_credit_account_id
-            if x: acc = x
-        context.update({
-            'date': date,
-            'res.currency.compute.account': acc,
-        })
-        v = currency_obj.compute(cr, uid, currency_id, acc.company_id.currency_id.id, amount, context=context)
-        result['value'] = {
-            'debit': v > 0 and v or 0.0,
-            'credit': v < 0 and -v or 0.0
-        }
-        return result
-
     def onchange_partner_id(self, cr, uid, ids, move_id, partner_id, account_id=None, debit=0, credit=0, date=False, journal=False):
         partner_obj = self.pool.get('res.partner')
         payment_term_obj = self.pool.get('account.payment.term')
@@ -901,123 +811,6 @@
             'context':context,
         }
 
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        journal_pool = self.pool.get('account.journal')
-        if context is None:
-            context = {}
-        result = super(account_move_line, self).fields_view_get(cr, uid, view_id, view_type, context=context, toolbar=toolbar, submenu=submenu)
-        if view_type != 'tree':
-            #Remove the toolbar from the form view
-            if view_type == 'form':
-                if result.get('toolbar', False):
-                    result['toolbar']['action'] = []
-            #Restrict the list of journal view in search view
-            if view_type == 'search' and result['fields'].get('journal_id', False):
-                result['fields']['journal_id']['selection'] = journal_pool.name_search(cr, uid, '', [], context=context)
-                ctx = context.copy()
-                #we add the refunds journal in the selection field of journal
-                if context.get('journal_type', False) == 'sale':
-                    ctx.update({'journal_type': 'sale_refund'})
-                    result['fields']['journal_id']['selection'] += journal_pool.name_search(cr, uid, '', [], context=ctx)
-                elif context.get('journal_type', False) == 'purchase':
-                    ctx.update({'journal_type': 'purchase_refund'})
-                    result['fields']['journal_id']['selection'] += journal_pool.name_search(cr, uid, '', [], context=ctx)
-            return result
-        if context.get('view_mode', False):
-            return result
-        fld = []
-        fields = {}
-        flds = []
-        title = _("Accounting Entries") #self.view_header_get(cr, uid, view_id, view_type, context)
-        xml = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5" on_write="on_create_write" colors="red:state==\'draft\';black:state==\'valid\'">\n\t''' % (title)
-
-        ids = journal_pool.search(cr, uid, [])
-        journals = journal_pool.browse(cr, uid, ids, context=context)
-        all_journal = [None]
-        common_fields = {}
-        total = len(journals)
-        for journal in journals:
-            all_journal.append(journal.id)
-            for field in journal.view_id.columns_id:
-                if not field.field in fields:
-                    fields[field.field] = [journal.id]
-                    fld.append((field.field, field.sequence, field.name))
-                    flds.append(field.field)
-                    common_fields[field.field] = 1
-                else:
-                    fields.get(field.field).append(journal.id)
-                    common_fields[field.field] = common_fields[field.field] + 1
-        fld.append(('period_id', 3, _('Period')))
-        fld.append(('journal_id', 10, _('Journal')))
-        flds.append('period_id')
-        flds.append('journal_id')
-        fields['period_id'] = all_journal
-        fields['journal_id'] = all_journal
-        fld = sorted(fld, key=itemgetter(1))
-        widths = {
-            'statement_id': 50,
-            'state': 60,
-            'tax_code_id': 50,
-            'move_id': 40,
-        }
-        for field_it in fld:
-            field = field_it[0]
-            if common_fields.get(field) == total:
-                fields.get(field).append(None)
-#            if field=='state':
-#                state = 'colors="red:state==\'draft\'"'
-            attrs = []
-            if field == 'debit':
-                attrs.append('sum = "%s"' % _("Total debit"))
-
-            elif field == 'credit':
-                attrs.append('sum = "%s"' % _("Total credit"))
-
-            elif field == 'move_id':
-                attrs.append('required = "False"')
-
-            elif field == 'account_tax_id':
-                attrs.append('domain="[(\'parent_id\', \'=\' ,False)]"')
-                attrs.append("context=\"{'journal_id': journal_id}\"")
-
-            elif field == 'account_id' and journal.id:
-                attrs.append('domain="[(\'journal_id\', \'=\', '+str(journal.id)+'),(\'type\',\'&lt;&gt;\',\'view\'), (\'type\',\'&lt;&gt;\',\'closed\')]" on_change="onchange_account_id(account_id, partner_id)"')
-
-            elif field == 'partner_id':
-                attrs.append('on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"')
-
-            elif field == 'journal_id':
-                attrs.append("context=\"{'journal_id': journal_id}\"")
-
-            elif field == 'statement_id':
-                attrs.append("domain=\"[('state', '!=', 'confirm'),('journal_id.type', '=', 'bank')]\"")
-
-            elif field == 'date':
-                attrs.append('on_change="onchange_date(date)"')
-
-            elif field == 'analytic_account_id':
-                attrs.append('''groups="analytic.group_analytic_accounting"''') # Currently it is not working due to framework problem may be ..
-
-            if field in ('amount_currency', 'currency_id'):
-                attrs.append('on_change="onchange_currency(account_id, amount_currency, currency_id, date, journal_id)"')
-                attrs.append('''attrs="{'readonly': [('state', '=', 'valid')]}"''')
-
-            if field in widths:
-                attrs.append('width="'+str(widths[field])+'"')
-
-            if field in ('journal_id',):
-                attrs.append("invisible=\"context.get('journal_id', False)\"")
-            elif field in ('period_id',):
-                attrs.append("invisible=\"context.get('period_id', False)\"")
-            else:
-                attrs.append("invisible=\"context.get('visible_id') not in %s\"" % (fields.get(field)))
-            xml += '''<field name="%s" %s/>\n''' % (field,' '.join(attrs))
-
-        xml += '''</tree>'''
-        result['arch'] = xml
-        result['fields'] = self.fields_get(cr, uid, flds, context)
-        return result
-
     def _check_moves(self, cr, uid, context=None):
         # use the first move ever created for this journal and period
         if context is None:
@@ -1330,15 +1123,6 @@
                     if a.id == vals['account_id']:
                         ok = True
                         break
-            # Automatically convert in the account's secondary currency if there is one and
-            # the provided values were not already multi-currency
-            if account.currency_id and 'amount_currency' not in vals and account.currency_id.id != account.company_id.currency_id.id:
-                vals['currency_id'] = account.currency_id.id
-                ctx = {}
-                if 'date' in vals:
-                    ctx['date'] = vals['date']
-                vals['amount_currency'] = cur_obj.compute(cr, uid, account.company_id.currency_id.id,
-                                                          account.currency_id.id, vals.get('debit', 0.0)-vals.get('credit', 0.0), context=ctx)
         if not ok:
             raise osv.except_osv(_('Bad account !'), _('You can not use this general account in this journal !'))
 

=== modified file 'bin/addons/account/invoice.py'
--- bin/addons/account/invoice.py	2019-07-25 14:58:06 +0000
+++ bin/addons/account/invoice.py	2019-10-25 14:10:32 +0000
@@ -27,6 +27,7 @@
 from osv import fields, osv, orm
 from tools.translate import _
 from msf_partner import PARTNER_TYPE
+from base import currency_date
 
 
 class account_invoice(osv.osv):
@@ -1724,6 +1725,7 @@
             return res_final
 
         company = self.pool.get('res.company').browse(cr, uid, company_id, context=context)
+        # DONE: TEST JN => no date in context
         currency = self.pool.get('res.currency').browse(cr, uid, currency_id, context=context)
 
         if company.currency_id.id != currency.id:
@@ -1918,7 +1920,7 @@
             tax_amount = round(atx.amount * amount_untaxed, 2)
         return tax_amount
 
-    def base_change(self, cr, uid, ids, base, currency_id=False, company_id=False, date_invoice=False):
+    def base_change(self, cr, uid, ids, base, currency_id=False, company_id=False, document_date=False, date_invoice=False):
         cur_obj = self.pool.get('res.currency')
         company_obj = self.pool.get('res.company')
         company_currency = False
@@ -1928,10 +1930,13 @@
         if company_id:
             company_currency = company_obj.read(cr, uid, [company_id], ['currency_id'])[0]['currency_id'][0]
         if currency_id and company_currency:
-            base = cur_obj.compute(cr, uid, currency_id, company_currency, base*factor, context={'date': date_invoice or time.strftime('%Y-%m-%d')}, round=False)
+            # DONE: TEST JN
+            curr_date = currency_date.get_date(self, cr, document_date, date_invoice)
+            base = cur_obj.compute(cr, uid, currency_id, company_currency, base*factor,
+                                   context={'currency_date': curr_date or time.strftime('%Y-%m-%d')}, round=False)
         return {'value': {'base_amount':base}}
 
-    def amount_change(self, cr, uid, ids, amount, currency_id=False, company_id=False, date_invoice=False):
+    def amount_change(self, cr, uid, ids, amount, currency_id=False, company_id=False, document_date=False, date_invoice=False):
         cur_obj = self.pool.get('res.currency')
         company_obj = self.pool.get('res.company')
         company_currency = False
@@ -1941,7 +1946,10 @@
         if company_id:
             company_currency = company_obj.read(cr, uid, [company_id], ['currency_id'])[0]['currency_id'][0]
         if currency_id and company_currency:
-            amount = cur_obj.compute(cr, uid, currency_id, company_currency, amount*factor, context={'date': date_invoice or time.strftime('%Y-%m-%d')}, round=False)
+            # DONE: TEST JN
+            curr_date = currency_date.get_date(self, cr, document_date, date_invoice)
+            amount = cur_obj.compute(cr, uid, currency_id, company_currency, amount*factor,
+                                     context={'currency_date': curr_date or time.strftime('%Y-%m-%d')}, round=False)
         return {'value': {'tax_amount': amount}}
 
     _order = 'sequence'
@@ -1952,6 +1960,8 @@
         'sequence': 0,
     }
     def compute(self, cr, uid, invoice_id, context=None):
+        if context is None:
+            context = {}
         tax_grouped = {}
         tax_obj = self.pool.get('account.tax')
         cur_obj = self.pool.get('res.currency')
@@ -1973,14 +1983,22 @@
                 if inv.type in ('out_invoice','in_invoice'):
                     val['base_code_id'] = tax['base_code_id']
                     val['tax_code_id'] = tax['tax_code_id']
-                    val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
-                    val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
+                    # DONE: TEST JN
+                    curr_date = currency_date.get_date(self, cr, inv.document_date, inv.date_invoice)
+                    val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['base_sign'],
+                                                         context={'currency_date': curr_date or time.strftime('%Y-%m-%d')}, round=False)
+                    val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['tax_sign'],
+                                                        context={'currency_date': curr_date or time.strftime('%Y-%m-%d')}, round=False)
                     val['account_id'] = tax['account_collected_id'] or line.account_id.id
                 else:
                     val['base_code_id'] = tax['ref_base_code_id']
                     val['tax_code_id'] = tax['ref_tax_code_id']
-                    val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['ref_base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
-                    val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['ref_tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
+                    # DONE: TEST JN
+                    curr_date = currency_date.get_date(self, cr, inv.document_date, inv.date_invoice)
+                    val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['ref_base_sign'],
+                                                         context={'currency_date': curr_date or time.strftime('%Y-%m-%d')}, round=False)
+                    val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['ref_tax_sign'],
+                                                        context={'currency_date': curr_date or time.strftime('%Y-%m-%d')}, round=False)
                     val['account_id'] = tax['account_paid_id'] or line.account_id.id
 
                 key = tax['id']  # taxes are grouped by id

=== modified file 'bin/addons/account/project/project_view.xml'
--- bin/addons/account/project/project_view.xml	2018-06-25 13:34:58 +0000
+++ bin/addons/account/project/project_view.xml	2019-10-25 14:10:32 +0000
@@ -176,24 +176,14 @@
                 </form>
             </field>
         </record>
+
+        <!-- see ./bin/addons/finance/account_analytic_line_view.xml -->
         <record id="view_account_analytic_line_tree" model="ir.ui.view">
             <field name="name">account.analytic.line.tree</field>
             <field name="model">account.analytic.line</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree editable="top" string="Analytic Entries">
-                    <field name="date"/>
-                    <field name="ref" invisible="context.get('to_invoice', False)"/>
-                    <field name="name"/>
-                    <field name="journal_id" invisible="context.get('to_invoice', False)"/>
-                    <field name="amount" sum="Total" invisible="context.get('to_invoice', False)"/>
-                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)" invisible="not context.get('to_invoice', False)"/>
-                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" sum="Total Quantity" invisible="not context.get('to_invoice', False)"/>
-                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" invisible="not context.get('to_invoice', False)"/>
-                    <field domain="[('type','=','normal')]" name="account_id"/>
-                    <field name="general_account_id" invisible="context.get('to_invoice', False)"/>
-                    <field name="user_id" invisible="1" />
-                </tree>
+                <tree />
             </field>
         </record>
 
@@ -294,36 +284,6 @@
             <field eval="True" name="object"/>
         </record>
 
-        <record id="account_analytic_line_extended_form" model="ir.ui.view">
-            <field name="name">account.analytic.line.extended_form</field>
-            <field name="model">account.analytic.line</field>
-            <field name="type">form</field>
-            <field name="priority" eval="18"/>
-            <field name="arch" type="xml">
-                <form string="Project line">
-                    <field name="name"/>
-                    <field name="account_id" groups="base.group_extended"/>
-                    <field name="date" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
-                    <field name="journal_id"/>
-                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
-                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/>
-                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
-                    <field invisible="True" name="general_account_id"/>
-                    <field name="amount"/>
-                    <field name="currency_id" />
-                    <field name="amount_currency" />
-                    <field name="company_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
-                </form>
-            </field>
-        </record>
-        <record id="action_account_analytic_account_line_extended_form" model="ir.actions.act_window">
-            <field name="name">account.analytic.line.extended</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.analytic.line</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="account_analytic_line_extended_form"/>
-        </record>
-
         #
         # Analytic Journal
         #

=== removed file 'bin/addons/account/res_currency.py'
--- bin/addons/account/res_currency.py	2017-09-29 15:41:58 +0000
+++ bin/addons/account/res_currency.py	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Copyright (C) 2010 OpenERP s.a. (<http://www.openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import osv
-
-"""Inherit res.currency to handle accounting date values when converting currencies"""
-
-class res_currency_account(osv.osv):
-    _inherit = "res.currency"
-
-    def _get_conversion_rate(self, cr, uid, from_currency, to_currency, context=None):
-        if context is None:
-            context = {}
-        rate = super(res_currency_account, self)._get_conversion_rate(cr, uid, from_currency, to_currency, context=context)
-        account = context.get('res.currency.compute.account')
-        account_invert = context.get('res.currency.compute.account_invert')
-        if account and account.currency_mode == 'average' and account.currency_id:
-            query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
-            cr.execute('''select sum(debit-credit),sum(amount_currency) from account_move_line l
-                where l.currency_id=%%s and l.account_id=%%s and %s''' % query, (account.currency_id.id,account.id,))  # not_a_user_entry
-            tot1,tot2 = cr.fetchone()
-            if tot2 and not account_invert:
-                rate = float(tot1)/float(tot2)
-            elif tot1 and account_invert:
-                rate = float(tot2)/float(tot1)
-        return rate
-
-res_currency_account()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'bin/addons/account/wizard/account_change_currency.py'
--- bin/addons/account/wizard/account_change_currency.py	2011-04-08 11:23:24 +0000
+++ bin/addons/account/wizard/account_change_currency.py	2019-10-25 14:10:32 +0000
@@ -50,6 +50,7 @@
         invoice = obj_inv.browse(cr, uid, context['active_id'], context=context)
         if invoice.currency_id.id == new_currency:
             return {}
+        # DONE: TEST JN => cf. comm. Loic on US-5848 we keep using the date of the day here
         rate = obj_currency.browse(cr, uid, new_currency, context=context).rate
         for line in invoice.invoice_line:
             new_price = 0

=== modified file 'bin/addons/account_corrections/account_move_line.py'
--- bin/addons/account_corrections/account_move_line.py	2019-01-28 13:35:47 +0000
+++ bin/addons/account_corrections/account_move_line.py	2019-10-25 14:10:32 +0000
@@ -26,6 +26,8 @@
 from tools.translate import _
 from time import strftime
 from tools.misc import flatten
+from base import currency_date
+
 
 class account_move_line(osv.osv):
     _name = 'account.move.line'
@@ -543,13 +545,15 @@
                     # update amount on new distribution
                     ana_obj.update_distribution_line_amount(cr, uid, new_distrib_id, (-1 * (ml.debit - ml.credit)), context=context)
                 new_line_id = self.copy(cr, uid, ml.id, {'move_id': new_move_id, 'date': date, 'document_date': ml.document_date, 'period_id': period_ids[0]}, context=context)
+                # DONE: TEST JN
+                curr_date = currency_date.get_date(self, cr, ml.document_date, ml.date, source_date=ml.source_date)
                 vals.update({
                     'name': name,
                     'debit': ml.credit,
                     'credit': ml.debit,
                     'amount_currency': amt,
                     'reversal_line_id': ml.id,
-                    'source_date': ml.source_date or ml.date,
+                    'source_date': curr_date,
                     'reversal': True,
                     'reference': ml.move_id and ml.move_id.name or '',
                     'ref': ml.move_id and ml.move_id.name or '',
@@ -746,6 +750,8 @@
             # Do the reverse
             name = self.join_without_redundancy(ml.name, 'REV')
             amt = -1 * ml.amount_currency
+            # DONE: TEST JN
+            curr_date = currency_date.get_date(self, cr, ml.document_date, ml.date, source_date=ml.source_date)
             vals.update({
                 'debit': ml.credit,
                 'credit': ml.debit,
@@ -754,7 +760,7 @@
                 'name': name,
                 'reversal_line_id': ml.id,
                 'account_id': ml.account_id.id,
-                'source_date': ml.source_date or ml.date,
+                'source_date': curr_date,
                 'reversal': True,
                 'document_date': ml.document_date,
                 'reference': ml.move_id and ml.move_id.name or '',
@@ -768,7 +774,7 @@
                 'journal_id': journal_id,
                 'corrected_line_id': ml.id,
                 'account_id': new_account_id,
-                'source_date': ml.source_date or ml.date,
+                'source_date': curr_date,
                 'have_an_historic': True,
                 'document_date': ml.document_date,
                 'reference': ml.move_id and ml.move_id.name or '',

=== modified file 'bin/addons/account_corrections/wizard/analytic_distribution_wizard.py'
--- bin/addons/account_corrections/wizard/analytic_distribution_wizard.py	2019-10-15 16:08:57 +0000
+++ bin/addons/account_corrections/wizard/analytic_distribution_wizard.py	2019-10-25 14:10:32 +0000
@@ -26,6 +26,8 @@
 from tools.translate import _
 import time
 from collections import defaultdict
+from base import currency_date
+
 
 class analytic_distribution_wizard(osv.osv_memory):
     _inherit = 'analytic.distribution.wizard'
@@ -150,9 +152,13 @@
         ana_line_obj = self.pool.get('account.analytic.line')
         company_currency_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id
         ml = wizard.move_line_id
-        orig_date = ml.source_date or ml.date
+        # US-5848: orig_date left unchanged not to break historical behavior,
+        # but the value set here seems overwritten later in the process if there is a source_date
+        orig_date = ml.source_date or ml.date  # DONE: TEST JN
         orig_document_date = ml.document_date
         posting_date = wizard.date
+        # DONE: TEST JN
+        curr_date = currency_date.get_date(self, cr, ml.document_date, ml.date, source_date=ml.source_date)
         working_period_id = []
         new_line_ids = []
         entry_seq_data = {}
@@ -363,7 +369,10 @@
                     if keep_seq_and_corrected[4]:
                         name = ana_line_obj.join_without_redundancy(keep_seq_and_corrected[4], 'COR')
 
-            created_analytic_line_ids = self.pool.get('funding.pool.distribution.line').create_analytic_lines(cr, uid, [new_distrib_line], ml.id, date=create_date, document_date=orig_document_date, source_date=orig_date, name=name, context=context)
+            # DONE: TEST JN
+            created_analytic_line_ids = self.pool.get('funding.pool.distribution.line').\
+                create_analytic_lines(cr, uid, [new_distrib_line], ml.id, date=create_date, document_date=orig_document_date,
+                                      source_date=curr_date, name=name, context=context)
             new_line_ids.extend(created_analytic_line_ids.values())
             working_period_id = working_period_id or \
                 self.pool.get('account.period').get_period_from_date(cr, uid, date=create_date, context=context)
@@ -425,8 +434,9 @@
                 if cp.state != 'draft':
                     raise osv.except_osv(_('Error'), _('Period (%s) is not open.') % (cp.name,))
             # Create the new ana line
+            # DONE: TEST JN
             ret = fp_distrib_obj.create_analytic_lines(cr, uid, line.distribution_line_id.id, ml.id, date=posting_date,
-                                                       document_date=orig_document_date, source_date=orig_date, name=name, context=context)
+                                                       document_date=orig_document_date, source_date=curr_date, name=name, context=context)
             new_line_ids.extend(ret.values())
             working_period_id = working_period_id or period_ids
             # Add link to first analytic lines
@@ -443,7 +453,8 @@
         for line in to_override:
             # update the ana line
             to_override_ids = ana_line_obj.search(cr, uid, [('distrib_line_id', '=', 'funding.pool.distribution.line,%d'%line.distribution_line_id.id), ('is_reversal', '=', False), ('is_reallocated', '=', False)])
-            ctx = {'date': orig_date}
+            # DONE: TEST JN
+            ctx = {'currency_date': curr_date}
             amount_cur = (ml.credit_currency - ml.debit_currency) * line.percentage / 100
             amount = self.pool.get('res.currency').compute(cr, uid, ml.currency_id.id, company_currency_id, amount_cur, round=False, context=ctx)
 
@@ -479,12 +490,13 @@
             has_generated_cor = True
         # compute the adjustment amount
         all_aji_ids = ana_line_obj.search(cr, uid, [
-            ('move_id', '=', ml.id),
-            ('is_reversal', '=', False),
-            ('is_reallocated', '=', False),
-        ], order='NO_ORDER', context=context)
+                        ('move_id', '=', ml.id),
+                        ('is_reversal', '=', False),
+                        ('is_reallocated', '=', False),
+                        ('account_id.category', '=', 'FUNDING'),  # exclude free lines
+                      ], order='NO_ORDER', context=context)
         max_line = {'amount': 0, 'aji_bro': False}
-        aji_fields = ['amount_currency', 'period_id', 'currency_id', 'source_date', 'date']
+        aji_fields = ['amount_currency', 'period_id', 'currency_id', 'source_date', 'document_date', 'date']
         for aji in ana_line_obj.browse(cr, uid, all_aji_ids, fields_to_fetch=aji_fields, context=context):
             total_rounded_amount += round(abs(aji.amount_currency or 0.0), 2)
             if has_generated_cor and aji.id in new_line_ids and abs(aji.amount_currency or 0.0) > max_line['amount']:
@@ -511,10 +523,10 @@
             # then recompute functional amount
             if fix_aji_currency_id:
                 new_context = context.copy()
-                if max_line['aji_bro'].source_date:
-                    new_context['date'] = max_line['aji_bro'].source_date
-                else:
-                    new_context['date'] = max_line['aji_bro'].date
+                # DONE: TEST JN
+                max_line_curr_date = currency_date.get_date(self, cr, max_line['aji_bro'].document_date, max_line['aji_bro'].date,
+                                                            source_date=max_line['aji_bro'].source_date)
+                new_context['currency_date'] = max_line_curr_date
                 aji_fix_vals['amount'] = \
                     self.pool.get('res.currency').compute(cr, uid,
                                                           fix_aji_currency_id, company_currency_id,
@@ -570,15 +582,17 @@
             for line in to_override:
                 # update the ana line
                 to_override_ids = ana_line_obj.search(cr, uid, [('distrib_line_id', '=', '%s,%d' % (obj_name, line.distribution_line_id.id)), ('is_reversal', '=', False), ('is_reallocated', '=', False)])
-                ctx = {'date': orig_date}
+                # DONE: TEST JN
+                ctx = {'currency_date': curr_date}
                 amount_cur = (ml.credit_currency - ml.debit_currency) * line.percentage / 100
                 amount = self.pool.get('res.currency').compute(cr, uid, ml.currency_id.id, company_currency_id, amount_cur, round=False, context=ctx)
+                # the posting date is the one of the entry corrected
                 ana_line_obj.write(cr, uid, to_override_ids, {
                     'account_id': line.analytic_id.id,
                     'amount_currency': amount_cur,
                     'amount': amount,
-                    'date': orig_date,
-                    'source_date': orig_date,
+                    'date': ml.date,  # DONE: TEST JN
+                    'source_date': curr_date,  # DONE: TEST JN
                     'document_date': orig_document_date,
                 })
                 # update the distib line
@@ -596,7 +610,10 @@
                     'currency_id': ml and  ml.currency_id and ml.currency_id.id or company_currency_id,
                 })
                 # create the ana line
-                self.pool.get(obj_name).create_analytic_lines(cr, uid, [new_distrib_line], ml.id, date=orig_date, document_date=orig_document_date, source_date=orig_date, ref=ml.ref)
+                # DONE: TEST JN
+                # the posting date is the one of the entry corrected
+                self.pool.get(obj_name).create_analytic_lines(cr, uid, [new_distrib_line], ml.id, date=ml.date,
+                                                              document_date=orig_document_date, source_date=curr_date, ref=ml.ref)
         # Set move line as corrected upstream if needed
         if to_reverse or to_override or to_create:
             self.pool.get('account.move.line').corrected_upstream_marker(cr, uid, [ml.id], context=context)

=== modified file 'bin/addons/account_hq_entries/wizard/hq_entries_validation.py'
--- bin/addons/account_hq_entries/wizard/hq_entries_validation.py	2019-01-09 12:52:42 +0000
+++ bin/addons/account_hq_entries/wizard/hq_entries_validation.py	2019-10-25 14:10:32 +0000
@@ -25,6 +25,8 @@
 from osv import fields
 from tools.translate import _
 from time import strftime
+from base import currency_date
+
 
 class hq_entries_validation(osv.osv_memory):
     _name = 'hq.entries.validation'
@@ -105,11 +107,13 @@
                          (account.default_destination_id and account.default_destination_id.id) or False
         distrib_id = self.pool.get('analytic.distribution').create(cr, uid, {})
         if distrib_id:
+            # DONE: TEST JN
+            curr_date = currency_date.get_date(self, cr, line.document_date or line.date, line.date)
             common_vals = {'distribution_id':distrib_id,
                            'currency_id':currency_id,
                            'percentage':100.0,
                            'date':line.date or current_date,
-                           'source_date':line.date or current_date,
+                           'source_date': curr_date or current_date,
                            'destination_id':destination_id}
             common_vals.update({'analytic_id':cc_id})
             self.pool.get('cost.center.distribution.line').create(cr, uid, common_vals)
@@ -126,7 +130,7 @@
         return distrib_id
 
     def create_move(self, cr, uid, ids, period_id=False, currency_id=False,
-                    date=None, journal=None, orig_acct=None, doc_date=None, split=False, context=None):
+                    date=None, journal=None, orig_acct=None, doc_date=None, source_date=None, split=False, context=None):
         """
         Create a move with given hq entries lines
         Return created lines (except counterpart lines)
@@ -188,7 +192,7 @@
                     'journal_id': journal_id,
                     'date': line.date,
                     'date_maturity': line.date,
-                    'document_date': line.document_date,
+                    'document_date': line.document_date or line.date,
                     'move_id': move_id,
                     'analytic_distribution_id': distrib_id,
                     'name': line.name or '',
@@ -196,6 +200,9 @@
                     'partner_txt': line.partner_txt or '',
                     'reference': line.ref or ''
                 }
+                # DONE: TEST JN
+                if source_date is not None:
+                    vals.update({'source_date': source_date, })
                 # Fetch debit/credit
                 debit = 0.0
                 credit = 0.0
@@ -294,8 +301,10 @@
             aml_obj.write(cr, uid, original_move.id, {'corrected': True, 'have_an_historic': True} , context=context)
             original_account_id = original_move.account_id.id
 
+            # DONE: TEST JN
+            curr_date = currency_date.get_date(self, cr, line.document_date or line.date, line.date)
             new_res_move = self.create_move(cr, uid, [x.id for x in line.split_ids], line.period_id.id,
-                                            line.currency_id.id, date=line.date, doc_date=line.document_date,
+                                            line.currency_id.id, date=line.date, doc_date=line.document_date, source_date=curr_date,
                                             journal=od_journal_id, orig_acct=original_account_id, split=True, context=context)
             # original move line
             original_ml_result = res_move[line.id]
@@ -329,7 +338,8 @@
                 'reversal_line_id': original_move.id,
                 'partner_txt': original_move.partner_txt or '',
                 'reference': ji_entry_seq or ' ', # UFTP-342: if HQ entry reference is empty, do not display anything. As a field function exists for account_move_line object, so we add a blank char to avoid this problem
-                'document_date': line.document_date,  # US-1361
+                'document_date': line.document_date or line.date,
+                'source_date': curr_date,  # DONE: TEST JN
             }, context=context, check=False, update_check=False)
 
             # create the analytic lines as a reversed copy of the original
@@ -453,7 +463,9 @@
                     split_change.append(line)
                     continue
                 if not line.user_validated:
-                    to_write.setdefault(line.currency_id.id, {}).setdefault(line.period_id.id, {}).setdefault(line.date, []).append(line.id)
+                    document_date = line.document_date or line.date  # posting date is used by default if there is no doc date on the line
+                    to_write.setdefault(line.currency_id.id, {}).setdefault(line.period_id.id, {}).\
+                        setdefault(line.date, {}).setdefault(document_date, []).append(line.id)
 
                     if line.account_id.id != line.account_id_first_value.id:
                         if line.cost_center_id.id != line.cost_center_id_first_value.id or line.destination_id.id != line.destination_id_first_value.id:
@@ -483,20 +495,23 @@
             for currency in to_write:
                 for period in to_write[currency]:
                     for date in to_write[currency][period]:
-                        lines = to_write[currency][period][date]
-                        write = self.create_move(cr, uid, lines, period, currency, date)
-                        all_lines.update(write)
-                        if write:
-                            self.pool.get('hq.entries').write(cr, uid, write.keys(), {'user_validated': True}, context=context)
+                        for doc_date in to_write[currency][period][date]:
+                            lines = to_write[currency][period][date][doc_date]
+                            write = self.create_move(cr, uid, lines, period_id=period, currency_id=currency, date=date, doc_date=doc_date)
+                            all_lines.update(write)
+                            if write:
+                                self.pool.get('hq.entries').write(cr, uid, write.keys(), {'user_validated': True}, context=context)
 
             for line in account_change:
+                # DONE: TEST JN
+                curr_date = currency_date.get_date(self, cr, line.document_date or line.date, line.date)
                 corrected_distrib_id = self.pool.get('analytic.distribution').create(cr, uid, {
                     'funding_pool_lines': [(0, 0, {
                         'percentage': 100,
                         'analytic_id': line.analytic_id.id,
                         'cost_center_id': line.cost_center_id.id,
                         'currency_id': line.currency_id.id,
-                        'source_date': line.date,
+                        'source_date': curr_date,
                         'destination_id': line.destination_id.id,
                     })]
                 })
@@ -506,10 +521,14 @@
                 # actual distrib_id
                 distrib_id = self.pool.get('account.move.line').read(cr, uid, all_lines[line.id], ['analytic_distribution_id'])['analytic_distribution_id'][0]
                 # update the distribution
+                # DONE: TEST JN
+                curr_date = currency_date.get_date(self, cr, line.document_date or line.date, line.date)
                 distrib_fp_lines = distrib_fp_line_obj.search(cr, uid, [('cost_center_id', '=', line.cost_center_id_first_value.id), ('distribution_id', '=', distrib_id)])
-                distrib_fp_line_obj.write(cr, uid, distrib_fp_lines, {'cost_center_id': line.cost_center_id.id, 'source_date': line.date, 'destination_id': line.destination_id.id})
+                distrib_fp_line_obj.write(cr, uid, distrib_fp_lines, {'cost_center_id': line.cost_center_id.id,
+                                                                      'source_date': curr_date, 'destination_id': line.destination_id.id})
                 distrib_cc_lines = distrib_cc_line_obj.search(cr, uid, [('analytic_id', '=', line.cost_center_id_first_value.id), ('distribution_id', '=', distrib_id)])
-                distrib_cc_line_obj.write(cr, uid, distrib_cc_lines, {'analytic_id': line.cost_center_id.id, 'source_date': line.date, 'destination_id': line.destination_id.id})
+                distrib_cc_line_obj.write(cr, uid, distrib_cc_lines, {'analytic_id': line.cost_center_id.id,
+                                                                      'source_date': curr_date, 'destination_id': line.destination_id.id})
 
                 # reverse ana lines
                 fp_old_lines = ana_line_obj.search(cr, uid, [
@@ -529,8 +548,10 @@
                     continue
 
                 # UTP-1118: posting date should be those from initial HQ entry line
-                vals_cor = {'date':line.date, 'source_date':line.date, 'cost_center_id':line.cost_center_id.id,
-                            'account_id':line.analytic_id.id, 'destination_id':line.destination_id.id, 'journal_id':acor_journal_id, 'last_correction_id':fp_old_lines[0]}
+                # DONE: TEST JN
+                vals_cor = {'date': line.date, 'source_date': curr_date, 'cost_center_id': line.cost_center_id.id,
+                            'account_id': line.analytic_id.id, 'destination_id': line.destination_id.id,
+                            'journal_id': acor_journal_id, 'last_correction_id':fp_old_lines[0]}
 
                 # US-1347: Use the entry sequence of HQ for reference, not the description
                 entry_seq = ana_line_obj.read(cr, uid, res_reverse, ['ref'], context=context)
@@ -578,13 +599,15 @@
                 pure_ad_cor_ji_ids.append(all_lines[line.id])
 
             for line in cc_account_change:
+                # DONE: TEST JN
+                curr_date = currency_date.get_date(self, cr, line.document_date or line.date, line.date)
                 # call correct_account with a new arg: new_distrib
                 corrected_distrib_id = self.pool.get('analytic.distribution').create(cr, uid, {
                     'cost_center_lines': [(0, 0, {
                         'percentage': 100,
                         'analytic_id': line.cost_center_id.id,
                         'currency_id': line.currency_id.id,
-                        'source_date': line.date,
+                        'source_date': curr_date,
                         'destination_id': line.destination_id.id,
                     })],
                     'funding_pool_lines': [(0, 0, {
@@ -592,7 +615,7 @@
                         'analytic_id': line.analytic_id.id,
                         'cost_center_id': line.cost_center_id.id,
                         'currency_id': line.currency_id.id,
-                        'source_date': line.date,
+                        'source_date': curr_date,
                         'destination_id': line.destination_id.id,
                     })]
                 })

=== modified file 'bin/addons/account_mcdb/account_analytic_line.py'
--- bin/addons/account_mcdb/account_analytic_line.py	2017-04-19 09:37:05 +0000
+++ bin/addons/account_mcdb/account_analytic_line.py	2019-10-25 14:10:32 +0000
@@ -26,6 +26,8 @@
 from time import strftime
 from lxml import etree
 from tools.translate import _
+from base import currency_date
+
 
 class account_analytic_line(osv.osv):
     _name = 'account.analytic.line'
@@ -35,6 +37,8 @@
         """
         Get an amount regarding currency in context (from 'output' and 'output_currency_id' values)
         """
+        if context is None:
+            context = {}
         # Prepare some value
         res = {}
         # Some verifications
@@ -48,27 +52,32 @@
         # Retrieve currency
         currency_id = context.get('output_currency_id')
         currency_obj = self.pool.get('res.currency')
+        # DONE: TEST JN => the context is not important here
         rate = currency_obj.read(cr, uid, currency_id, ['rate'], context=context).get('rate', False)
         # Do calculation
         if not rate:
             for out_id in ids:
                 res[out_id] = {'output_currency': currency_id, 'output_amount': 0.0, 'output_amount_debit': 0.0, 'output_amount_credit': 0.0}
             return res
-        for ml in self.browse(cr, uid, ids, context=context):
-            res[ml.id] = {'output_currency': False, 'output_amount': 0.0, 'output_amount_debit': 0.0, 'output_amount_credit': 0.0}
+        aal_fields = ['document_date', 'date', 'source_date', 'currency_id', 'amount_currency']
+        for aal in self.browse(cr, uid, ids, fields_to_fetch=aal_fields, context=context):
+            res[aal.id] = {'output_currency': False, 'output_amount': 0.0, 'output_amount_debit': 0.0, 'output_amount_credit': 0.0}
             # output_amount field
             # Update with date
-            context.update({'date': ml.source_date or ml.date or strftime('%Y-%m-%d')})
-            mnt = self.pool.get('res.currency').compute(cr, uid, ml.currency_id.id, currency_id, ml.amount_currency, round=True, context=context)
-            res[ml.id]['output_amount'] = mnt or 0.0
+            # DONE: TEST JN
+            curr_date = currency_date.get_date(self, cr, aal.document_date, aal.date, source_date=aal.source_date)
+            context.update({'currency_date': curr_date or strftime('%Y-%m-%d')})
+            mnt = self.pool.get('res.currency').compute(cr, uid, aal.currency_id.id, currency_id, aal.amount_currency,
+                                                        round=True, context=context)
+            res[aal.id]['output_amount'] = mnt or 0.0
             if mnt < 0.0:
-                res[ml.id]['output_amount_debit'] = 0.0
-                res[ml.id]['output_amount_credit'] = abs(mnt) or 0.0
+                res[aal.id]['output_amount_debit'] = 0.0
+                res[aal.id]['output_amount_credit'] = abs(mnt) or 0.0
             else:
-                res[ml.id]['output_amount_debit'] = abs(mnt) or 0.0
-                res[ml.id]['output_amount_credit'] = 0.0
+                res[aal.id]['output_amount_debit'] = abs(mnt) or 0.0
+                res[aal.id]['output_amount_credit'] = 0.0
             # or output_currency field
-            res[ml.id]['output_currency'] = currency_id
+            res[aal.id]['output_currency'] = currency_id
         return res
 
     def _get_cheque_number(self, cr, uid, ids, name, args, context=None):

=== modified file 'bin/addons/account_mcdb/account_bank_statement.py'
--- bin/addons/account_mcdb/account_bank_statement.py	2014-04-15 08:35:03 +0000
+++ bin/addons/account_mcdb/account_bank_statement.py	2019-10-25 14:10:32 +0000
@@ -25,6 +25,8 @@
 from osv import fields
 from time import strftime
 from lxml import etree
+from base import currency_date
+
 
 class account_bank_statement_line(osv.osv):
     _name = 'account.bank.statement.line'
@@ -34,6 +36,8 @@
         """
         Get an amount regarding currency in context (from 'output' and 'output_currency_id' values)
         """
+        if context is None:
+            context = {}
         # Prepare some value
         res = {}
         # Some verifications
@@ -47,6 +51,7 @@
         # Retrieve currency
         currency_id = context.get('output_currency_id')
         currency_obj = self.pool.get('res.currency')
+        # DONE: TEST JN => the context is not important here
         rate = currency_obj.read(cr, uid, currency_id, ['rate'], context=context).get('rate', False)
         # Do calculation
         if not rate:
@@ -57,7 +62,9 @@
             res[absl.id] = {'output_currency': False, 'output_amount': 0.0, 'output_amount_debit': 0.0, 'output_amount_credit': 0.0}
             # output_amount field
             # Update with date
-            context.update({'date': absl.date or strftime('%Y-%m-%d')})
+            # DONE: TEST JN
+            curr_date = currency_date.get_date(self, cr, absl.document_date, absl.date)
+            context.update({'currency_date': curr_date or strftime('%Y-%m-%d')})
             mnt = self.pool.get('res.currency').compute(cr, uid, absl.currency_id.id, currency_id, absl.amount, round=True, context=context)
             res[absl.id]['output_amount'] = mnt or 0.0
             if mnt < 0.0:

=== modified file 'bin/addons/account_mcdb/account_move_line.py'
--- bin/addons/account_mcdb/account_move_line.py	2019-02-06 10:04:42 +0000
+++ bin/addons/account_mcdb/account_move_line.py	2019-10-25 14:10:32 +0000
@@ -25,6 +25,8 @@
 from osv import fields
 from time import strftime
 from lxml import etree
+from base import currency_date
+
 
 class account_move_line(osv.osv):
     _name = 'account.move.line'
@@ -53,6 +55,7 @@
                 return func_amount
             original_currency = ml.functional_currency_id.id
         # Perform the conversion from original currency to selected currency
+        # DONE: TEST JN => there is only a "currency_date" in context (no "date")
         return currency_obj.compute(cr, uid, original_currency, currency_id, func_amount, round=round, context=context)
 
     def _get_output(self, cr, uid, ids, field_name, arg, context=None):
@@ -76,6 +79,7 @@
         company_currency_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
         currency_id = context.get('output_currency_id')
         currency_obj = self.pool.get('res.currency')
+        # DONE: TEST JN => the context is not important here
         rate = currency_obj.read(cr, uid, currency_id, ['rate'], context=context).get('rate', False)
         # Do calculation
         if not rate:
@@ -86,7 +90,9 @@
             res[ml.id] = {'output_currency': currency_id, 'output_amount': 0.0, 'output_amount_debit': 0.0, 'output_amount_credit': 0.0}
             # output_amount field
             # Update with date
-            context.update({'date': ml.source_date or ml.date or strftime('%Y-%m-%d')})
+            # DONE: TEST JN
+            curr_date = currency_date.get_date(self, cr, ml.document_date, ml.date, source_date=ml.source_date)
+            context.update({'currency_date': curr_date or strftime('%Y-%m-%d')})
             # Now call the common method to calculate the output values
             if currency_id == company_currency_id:
                 res[ml.id].update({'output_amount': ml.debit - ml.credit, 'output_amount_debit': ml.debit, 'output_amount_credit': ml.credit})

=== modified file 'bin/addons/account_mcdb/report/account_mcdb_export.py'
--- bin/addons/account_mcdb/report/account_mcdb_export.py	2017-07-06 14:23:27 +0000
+++ bin/addons/account_mcdb/report/account_mcdb_export.py	2019-10-25 14:10:32 +0000
@@ -24,6 +24,9 @@
 from osv import osv
 from osv import fields
 from tools.translate import _
+from time import strftime
+from base import currency_date
+
 
 def get_back_browse(self, cr, uid, context):
     background_id = context.get('background_id')
@@ -240,11 +243,9 @@
                     csv_line.append(company_currency.encode('utf-8') or '')
                 else:
                     #output debit/credit
-                    context['date'] = al.source_date or al.date  # uftp-361 [FIX] reversal line: source_date or posting_date
-                    if al.is_reversal == True:
-                        context.update({'date': al.document_date})
-                    if al.last_corrected_id:
-                        context.update({'date': al.document_date})
+                    # DONE: TEST JN
+                    curr_date = currency_date.get_date(self, cr, al.document_date, al.date, source_date=al.source_date)
+                    context['currency_date'] = curr_date
                     amount = currency_obj.compute(cr, uid, al.currency_id.id, currency_id, al.amount_currency, round=True, context=context)
                     csv_line.append(amount or 0.0)
                     #output currency
@@ -313,6 +314,9 @@
                 csv_line.append(absl.functional_currency_id and absl.functional_currency_id.name and absl.functional_currency_id.name.encode('utf-8') or '')
             else:
                 #output amount (debit/credit) regarding booking currency
+                # DONE: TEST JN
+                curr_date = currency_date.get_date(self, cr, absl.document_date, absl.date)
+                context.update({'currency_date': curr_date or strftime('%Y-%m-%d')})
                 amount = currency_obj.compute(cr, uid, absl.currency_id.id, currency_id, absl.amount, round=True, context=context)
                 if amount < 0.0:
                     csv_line.append(0.0)

=== modified file 'bin/addons/account_override/account.py'
--- bin/addons/account_override/account.py	2019-09-27 08:59:21 +0000
+++ bin/addons/account_override/account.py	2019-10-25 14:10:32 +0000
@@ -90,6 +90,7 @@
                         (__compute will handle their escaping) as a
                         tuple
         """
+        # DONE: TEST JN => there is no "date" in context
         mapping = {
             'balance': "COALESCE(SUM(l.debit),0) " \
                        "- COALESCE(SUM(l.credit), 0) as balance",
@@ -997,6 +998,7 @@
             if 'document_date' in vals:
                 context['document_date'] = vals.get('document_date')
             if 'date' in vals:
+                # DONE: TEST JN => this date isn't used for amount computation
                 context['date'] = vals.get('date')
             # UTFTP-262: Make manual_name mandatory
             if 'manual_name' not in vals or not vals.get('manual_name', False) or vals.get('manual_name') == '':

=== modified file 'bin/addons/account_override/account_move_line.py'
--- bin/addons/account_override/account_move_line.py	2018-11-12 17:20:58 +0000
+++ bin/addons/account_override/account_move_line.py	2019-10-25 14:10:32 +0000
@@ -546,6 +546,7 @@
                 context.update({'document_date': m.document_date})
             if m and m.date:
                 vals.update({'date': m.date})
+                # DONE: TEST JN => this date isn't used for amount computation
                 context.update({'date': m.date})
             # UFTP-262: Add description from the move_id (US-2027) if there is not descr. on the line
             if m and m.manual_name and not vals.get('name'):
@@ -600,6 +601,7 @@
                     context.update({'document_date': m.document_date})
                 if m and m.date:
                     vals.update({'date': m.date})
+                    # DONE: TEST JN => not sure whether it's still possible to have a move_id in vals at this step but in any cases the date in context here has no effect on amount computation
                     context.update({'date': m.date})
         # Note that _check_document_date HAVE TO be BEFORE the super write. If not, some problems appears in ournal entries document/posting date changes at the same time!
         self._check_document_date(cr, uid, ids, vals, context=context)

=== modified file 'bin/addons/account_override/invoice.py'
--- bin/addons/account_override/invoice.py	2019-07-25 15:47:28 +0000
+++ bin/addons/account_override/invoice.py	2019-10-25 14:10:32 +0000
@@ -973,6 +973,8 @@
         Reverse move if this object is a In-kind Donation. Otherwise do normal job: cancellation.
         Don't delete an invoice that is linked to a PO. This is only for supplier invoices.
         """
+        # Oct. 2019: log if this method is used at least once (cf it may be dead code?)
+        self.pool.get('ir.config_parameter').set_param(cr, 1, 'action_cancel.in_use', True)
         to_cancel = []
         for i in self.browse(cr, uid, ids):
             if i.is_inkind_donation:
@@ -1934,6 +1936,7 @@
                 std_price = p_info['standard_price']
                 company_curr_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id
                 if company_curr_id and company_curr_id != currency_id:
+                    # DONE: TEST JN => no date in context
                     std_price = self.pool.get('res.currency').compute(cr, uid, company_curr_id, currency_id, std_price, context=context)
                 res['value']['price_unit'] = std_price
                 res['value']['price_subtotal'] = (qty or 0) * std_price

=== modified file 'bin/addons/account_override/res_company.py'
--- bin/addons/account_override/res_company.py	2019-01-30 10:58:14 +0000
+++ bin/addons/account_override/res_company.py	2019-10-25 14:10:32 +0000
@@ -23,11 +23,32 @@
 
 from osv import osv
 from osv import fields
+from base import currency_date
+from tools.translate import _
+
 
 class res_company(osv.osv):
     _name = 'res.company'
     _inherit = 'res.company'
 
+    def _get_currency_date_type(self, cr, uid, ids, name, args, context=None):
+        """
+        Returns the type of date used for functional amount computation in this instance
+        """
+        res = {}
+        for c_id in ids:
+            res[c_id] = currency_date.get_date_type(self, cr) == 'document' and _('Document Date') or _('Posting Date')
+        return res
+
+    def _get_currency_date_beginning(self, cr, uid, ids, name, args, context=None):
+        """
+        Returns the date from when the functional amount computation is based on the document date, if applicable
+        """
+        res = {}
+        for c_id in ids:
+            res[c_id] = currency_date.get_date_type(self, cr) == 'document' and currency_date.BEGINNING or False
+        return res
+
     _columns = {
         'import_invoice_default_account': fields.many2one('account.account', string="Re-billing Inter-section account",
                                                           help="Default account for an import invoice on a Debit note"),
@@ -36,6 +57,10 @@
         'additional_allocation': fields.boolean('Additional allocation condition?', help="If you check this attribute, analytic allocation will be required for income accounts with an account code starting with \"7\"; if unchecked, the analytic allocation will be required for all income accounts."),
         'revaluation_default_account': fields.many2one('account.account', string="Revaluation account",
                                                        help="Default account used for revaluation"),
+        'currency_date_type': fields.function(_get_currency_date_type, method=True, type='char',
+                                              string='Date Type Used', store=False, readonly=1),
+        'currency_date_beginning': fields.function(_get_currency_date_beginning, method=True, type='date',
+                                                   string='Since', store=False, readonly=1),
     }
 
 

=== modified file 'bin/addons/account_override/res_currency.py'
--- bin/addons/account_override/res_currency.py	2014-03-06 16:53:18 +0000
+++ bin/addons/account_override/res_currency.py	2019-10-25 14:10:32 +0000
@@ -33,62 +33,3 @@
 
 res_currency_rate()
 
-class res_currency(osv.osv):
-    _name = 'res.currency'
-    _inherit = 'res.currency'
-
-    def _check_unicity_currency_name(self, cr, uid, ids, context=None):
-        """
-        Check that no currency have the same name and the same currency_table_id.
-        Check is non case-sensitive.
-        """
-        if not context:
-            context = {}
-        for c in self.browse(cr, uid, ids):
-            if not c.currency_name:
-                continue
-            sql = """SELECT id, name
-            FROM res_currency
-            WHERE currency_name ilike %s"""
-            if c.currency_table_id:
-                sql += """\nAND currency_table_id in %s"""
-                cr.execute(sql, (c.currency_name, tuple([c.currency_table_id.id])))
-            else:
-                sql += """\nAND currency_table_id is Null"""
-                cr.execute(sql, (c.currency_name,))
-            bad_ids = cr.fetchall()
-            if bad_ids and len(bad_ids) > 1:
-                return False
-        return True
-
-    def _check_unicity_name(self, cr, uid, ids, context=None):
-        """
-        Check that no currency is the same and have the same currency_table_id.
-        Check is non case-sensitive.
-        """
-        if not context:
-            context = {}
-        for c in self.browse(cr, uid, ids):
-            if not c.name:
-                continue
-            sql = """SELECT id, name
-            FROM res_currency
-            WHERE name ilike %s"""
-            if c.currency_table_id:
-                sql += """\nAND currency_table_id in %s"""
-                cr.execute(sql, (c.name, tuple([c.currency_table_id.id])))
-            else:
-                sql += """\nAND currency_table_id is Null"""
-                cr.execute(sql, (c.name,))
-            bad_ids = cr.fetchall()
-            if bad_ids and len(bad_ids) > 1:
-                return False
-        return True
-
-    _constraints = [
-        (_check_unicity_currency_name, "Another currency have the same name.", ['currency_name']),
-        (_check_unicity_name, "Same currency exists", ['name']),
-    ]
-
-res_currency()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'bin/addons/account_payment/__init__.py'
--- bin/addons/account_payment/__init__.py	2011-01-14 00:11:01 +0000
+++ bin/addons/account_payment/__init__.py	2019-10-25 14:10:32 +0000
@@ -23,10 +23,6 @@
 # Init Sales
 #----------------------------------------------------------
 
-import account_payment
-import wizard
+import account_invoice
 import account_move_line
-import account_invoice
-import report
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'bin/addons/account_payment/__openerp__.py'
--- bin/addons/account_payment/__openerp__.py	2017-09-28 14:05:02 +0000
+++ bin/addons/account_payment/__openerp__.py	2019-10-25 14:10:32 +0000
@@ -31,20 +31,11 @@
 * a basic mechanism to easily plug various automated payment.
     """,
     'author': 'OpenERP SA',
-    'depends': ['account_voucher'],
+    'depends': ['account'],
     'update_xml': [
-        'security/account_payment_security.xml',
-        'security/ir.model.access.csv',
-        'wizard/account_payment_pay_view.xml',
-        'wizard/account_payment_populate_statement_view.xml',
-        'wizard/account_payment_create_order_view.xml',
-        'account_payment_view.xml',
-        'account_payment_workflow.xml',
-        'account_payment_sequence.xml',
         'account_invoice_view.xml',
-        'account_payment_report.xml',
     ],
-    'demo_xml': ['account_payment_demo.xml'],
+    'demo_xml': [],
     'test': [
     ],
     'installable': True,

=== modified file 'bin/addons/account_payment/account_move_line.py'
--- bin/addons/account_payment/account_move_line.py	2018-04-03 10:18:51 +0000
+++ bin/addons/account_payment/account_move_line.py	2019-10-25 14:10:32 +0000
@@ -19,9 +19,7 @@
 #
 ##############################################################################
 
-from operator import itemgetter
 from osv import fields, osv
-from tools.translate import _
 
 class account_move_line(osv.osv):
     _inherit = "account.move.line"
@@ -35,84 +33,16 @@
                     CASE WHEN ml.amount_currency < 0
                         THEN - ml.amount_currency
                         ELSE ml.credit
-                    END -
-                    (SELECT coalesce(sum(amount_currency),0)
-                        FROM payment_line pl
-                            INNER JOIN payment_order po
-                                ON (pl.order_id = po.id)
-                        WHERE move_line_id = ml.id
-                        AND po.state != 'cancel') AS amount
+                    END
                     FROM account_move_line ml
                     WHERE id IN %s""", (tuple(ids),))
         r = dict(cr.fetchall())
         return r
 
-    def _to_pay_search(self, cr, uid, obj, name, args, context=None):
-        if not args:
-            return []
-        line_obj = self.pool.get('account.move.line')
-        query = line_obj._query_get(cr, uid, context={})
-        where = ' and '.join(map(lambda x: '''(SELECT
-        CASE WHEN l.amount_currency < 0
-            THEN - l.amount_currency
-            ELSE l.credit
-        END - coalesce(sum(pl.amount_currency), 0)
-        FROM payment_line pl
-        INNER JOIN payment_order po ON (pl.order_id = po.id)
-        WHERE move_line_id = l.id
-        AND po.state != 'cancel'
-        ) %(operator)s %%s ''' % {'operator': x[1]}, args))
-        sql_args = tuple(map(itemgetter(2), args))
-
-        cr.execute(('''SELECT id
-            FROM account_move_line l
-            WHERE account_id IN (select id
-                FROM account_account
-                WHERE type=%s AND active)
-            AND reconcile_id IS null
-            AND credit > 0
-            AND ''' + where + ' and ' + query), ('payable',)+sql_args )  # not_a_user_entry
-
-        res = cr.fetchall()
-        if not res:
-            return [('id', '=', '0')]
-        return [('id', 'in', map(lambda x:x[0], res))]
-
-    def line2bank(self, cr, uid, ids, payment_type=None, context=None):
-        """
-        Try to return for each Ledger Posting line a corresponding bank
-        account according to the payment type.  This work using one of
-        the bank of the partner defined on the invoice eventually
-        associated to the line.
-        Return the first suitable bank for the corresponding partner.
-        """
-        payment_mode_obj = self.pool.get('payment.mode')
-        line2bank = {}
-        if not ids:
-            return {}
-        bank_type = payment_mode_obj.suitable_bank_types(cr, uid, payment_type,
-                                                         context=context)
-        for line in self.browse(cr, uid, ids, context=context):
-            line2bank[line.id] = False
-            if line.invoice and line.invoice.partner_bank_id:
-                line2bank[line.id] = line.invoice.partner_bank_id.id
-            elif line.partner_id:
-                if not line.partner_id.bank_ids:
-                    line2bank[line.id] = False
-                else:
-                    for bank in line.partner_id.bank_ids:
-                        if bank.state in bank_type:
-                            line2bank[line.id] = bank.id
-                            break
-                if not line2bank[line.id] and line.partner_id.bank_ids:
-                    line2bank[line.id] = line.partner_id.bank_ids[0].id
-            else:
-                raise osv.except_osv(_('Error !'), _('No partner defined on entry line'))
-        return line2bank
 
     _columns = {
         'amount_to_pay': fields.function(amount_to_pay, method=True,
-                                         type='float', string='Amount to pay', fnct_search=_to_pay_search),
+                                         type='float', string='Amount to pay'),
     }
 
 account_move_line()

=== removed file 'bin/addons/account_payment/account_payment.py'
--- bin/addons/account_payment/account_payment.py	2018-09-18 12:25:20 +0000
+++ bin/addons/account_payment/account_payment.py	1970-01-01 00:00:00 +0000
@@ -1,429 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-
-from osv import osv, fields
-import netsvc
-
-class payment_mode(osv.osv):
-    _name= 'payment.mode'
-    _description= 'Payment Mode'
-    _columns = {
-        'name': fields.char('Name', size=64, required=True, help='Mode of Payment'),
-        'bank_id': fields.many2one('res.partner.bank', "Bank account",
-                                   required=True,help='Bank Account for the Payment Mode'),
-        'journal': fields.many2one('account.journal', 'Journal', required=True,
-                                   domain=[('type', 'in', ('bank','cash'))], help='Bank or Cash Journal for the Payment Mode'),
-        'company_id': fields.many2one('res.company', 'Company', required=True),
-    }
-    _defaults = {
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id
-    }
-
-    def suitable_bank_types(self, cr, uid, payment_code=None, context=None):
-        """Return the codes of the bank type that are suitable
-        for the given payment type code"""
-        if not payment_code:
-            return []
-        cr.execute(""" SELECT pb.state
-            FROM res_partner_bank pb
-            JOIN payment_mode pm ON (pm.bank_id = pb.id)
-            WHERE pm.id = %s """, [payment_code])
-        return [x[0] for x in cr.fetchall()]
-
-payment_mode()
-
-class payment_order(osv.osv):
-    _name = 'payment.order'
-    _description = 'Payment Order'
-    _rec_name = 'reference'
-
-    def get_wizard(self, type):
-        logger = netsvc.Logger()
-        logger.notifyChannel("warning", netsvc.LOG_WARNING,
-                             "No wizard found for the payment type '%s'." % type)
-        return None
-
-    def _total(self, cursor, user, ids, name, args, context=None):
-        if not ids:
-            return {}
-        res = {}
-        for order in self.browse(cursor, user, ids, context=context):
-            if order.line_ids:
-                res[order.id] = reduce(lambda x, y: x + y.amount, order.line_ids, 0.0)
-            else:
-                res[order.id] = 0.0
-        return res
-
-    _columns = {
-        'date_scheduled': fields.date('Scheduled date if fixed', states={'done':[('readonly', True)]}, help='Select a date if you have chosen Preferred Date to be fixed.'),
-        'reference': fields.char('Reference', size=128, required=1, states={'done': [('readonly', True)]}),
-        'mode': fields.many2one('payment.mode', 'Payment mode', select=True, required=1, states={'done': [('readonly', True)]}, help='Select the Payment Mode to be applied.'),
-        'state': fields.selection([
-            ('draft', 'Draft'),
-            ('open', 'Confirmed'),
-            ('cancel', 'Cancelled'),
-            ('done', 'Done')], 'State', select=True,
-            help='When an order is placed the state is \'Draft\'.\n Once the bank is confirmed the state is set to \'Confirmed\'.\n Then the order is paid the state is \'Done\'.'),
-        'line_ids': fields.one2many('payment.line', 'order_id', 'Payment lines', states={'done': [('readonly', True)]}),
-        'total': fields.function(_total, string="Total", method=True, type='float'),
-        'user_id': fields.many2one('res.users', 'User', required=True, states={'done': [('readonly', True)]}),
-        'date_prefered': fields.selection([
-            ('now', 'Directly'),
-            ('due', 'Due date'),
-            ('fixed', 'Fixed date')
-        ], "Preferred date", change_default=True, required=True, states={'done': [('readonly', True)]}, help="Choose an option for the Payment Order:'Fixed' stands for a date specified by you.'Directly' stands for the direct execution.'Due date' stands for the scheduled date of execution."),
-        'date_created': fields.date('Creation date', readonly=True),
-        'date_done': fields.date('Execution date', readonly=True),
-    }
-
-    _defaults = {
-        'user_id': lambda self,cr,uid,context: uid,
-        'state': 'draft',
-        'date_prefered': 'due',
-        'date_created': lambda *a: time.strftime('%Y-%m-%d'),
-        'reference': lambda self,cr,uid,context: self.pool.get('ir.sequence').get(cr, uid, 'payment.order'),
-    }
-
-    def set_to_draft(self, cr, uid, ids, *args):
-        self.write(cr, uid, ids, {'state': 'draft'})
-        wf_service = netsvc.LocalService("workflow")
-        for id in ids:
-            wf_service.trg_create(uid, 'payment.order', id, cr)
-        return True
-
-    def action_open(self, cr, uid, ids, *args):
-        ir_seq_obj = self.pool.get('ir.sequence')
-
-        for order in self.read(cr, uid, ids, ['reference']):
-            if not order['reference']:
-                reference = ir_seq_obj.get(cr, uid, 'payment.order')
-                self.write(cr, uid, order['id'], {'reference':reference})
-        return True
-
-    def set_done(self, cr, uid, ids, *args):
-        wf_service = netsvc.LocalService("workflow")
-        self.write(cr, uid, ids, {'date_done': time.strftime('%Y-%m-%d')})
-        wf_service.trg_validate(uid, 'payment.order', ids[0], 'done', cr)
-        return True
-
-    def copy(self, cr, uid, id, default={}, context=None):
-        default.update({
-            'state': 'draft',
-            'line_ids': [],
-            'reference': self.pool.get('ir.sequence').get(cr, uid, 'payment.order')
-        })
-        return super(payment_order, self).copy(cr, uid, id, default, context=context)
-
-    def write(self, cr, uid, ids, vals, context=None):
-        if not ids:
-            return True
-        if context is None:
-            context = {}
-        payment_line_obj = self.pool.get('payment.line')
-        payment_line_ids = []
-
-        if (vals.get('date_prefered', False) == 'fixed' and not vals.get('date_scheduled', False)) or vals.get('date_scheduled', False):
-            for order in self.browse(cr, uid, ids, context=context):
-                for line in order.line_ids:
-                    payment_line_ids.append(line.id)
-            payment_line_obj.write(cr, uid, payment_line_ids, {'date': vals.get('date_scheduled', False)}, context=context)
-        elif vals.get('date_prefered', False) == 'due':
-            vals.update({'date_scheduled': False})
-            for order in self.browse(cr, uid, ids, context=context):
-                for line in order.line_ids:
-                    payment_line_obj.write(cr, uid, [line.id], {'date': line.ml_maturity_date}, context=context)
-        elif vals.get('date_prefered', False) == 'now':
-            vals.update({'date_scheduled': False})
-            for order in self.browse(cr, uid, ids, context=context):
-                for line in order.line_ids:
-                    payment_line_ids.append(line.id)
-            payment_line_obj.write(cr, uid, payment_line_ids, {'date': False}, context=context)
-        return super(payment_order, self).write(cr, uid, ids, vals, context=context)
-
-payment_order()
-
-class payment_line(osv.osv):
-    _name = 'payment.line'
-    _description = 'Payment Line'
-
-    def translate(self, orig):
-        return {
-            "due_date": "date_maturity",
-            "reference": "ref"}.get(orig, orig)
-
-    def info_owner(self, cr, uid, ids, name=None, args=None, context=None):
-        if not ids: return {}
-        partner_zip_obj = self.pool.get('res.partner.zip')
-
-        result = {}
-        info=''
-        for line in self.browse(cr, uid, ids, context=context):
-            owner = line.order_id.mode.bank_id.partner_id
-            result[line.id] = False
-            if owner.address:
-                for ads in owner.address:
-                    if ads.type == 'default':
-                        st = ads.street and ads.street or ''
-                        st1 = ads.street2 and ads.street2 or ''
-                        if 'zip_id' in ads:
-                            zip_city = ads.zip_id and partner_zip_obj.name_get(cr, uid, [ads.zip_id.id])[0][1] or ''
-                        else:
-                            zip = ads.zip and ads.zip or ''
-                            city = ads.city and ads.city or  ''
-                            zip_city = zip + ' ' + city
-                        cntry = ads.country_id and ads.country_id.name or ''
-                        info = owner.name + "\n" + st + " " + st1 + "\n" + zip_city + "\n" +cntry
-                        result[line.id] = info
-                        break
-        return result
-
-    def info_partner(self, cr, uid, ids, name=None, args=None, context=None):
-        if not ids: return {}
-        partner_zip_obj = self.pool.get('res.partner.zip')
-        result = {}
-        info = ''
-
-        for line in self.browse(cr, uid, ids, context=context):
-            result[line.id] = False
-            if not line.partner_id:
-                break
-            partner = line.partner_id.name or ''
-            if line.partner_id.address:
-                for ads in line.partner_id.address:
-                    if ads.type == 'default':
-                        st = ads.street and ads.street or ''
-                        st1 = ads.street2 and ads.street2 or ''
-                        if 'zip_id' in ads:
-                            zip_city = ads.zip_id and partner_zip_obj.name_get(cr, uid, [ads.zip_id.id])[0][1] or ''
-                        else:
-                            zip = ads.zip and ads.zip or ''
-                            city = ads.city and ads.city or  ''
-                            zip_city = zip + ' ' + city
-                        cntry = ads.country_id and ads.country_id.name or ''
-                        info = partner + "\n" + st + " " + st1 + "\n" + zip_city + "\n" +cntry
-                        result[line.id] = info
-                        break
-        return result
-
-    def _amount(self, cursor, user, ids, name, args, context=None):
-        if not ids:
-            return {}
-        currency_obj = self.pool.get('res.currency')
-        if context is None:
-            context = {}
-        res = {}
-
-        for line in self.browse(cursor, user, ids, context=context):
-            ctx = context.copy()
-            ctx['date'] = line.order_id.date_done or time.strftime('%Y-%m-%d')
-            res[line.id] = currency_obj.compute(cursor, user, line.currency.id,
-                                                line.company_currency.id,
-                                                line.amount_currency, context=ctx)
-        return res
-
-    def _get_currency(self, cr, uid, context=None):
-        user_obj = self.pool.get('res.users')
-        currency_obj = self.pool.get('res.currency')
-        user = user_obj.browse(cr, uid, uid, context=context)
-
-        if user.company_id:
-            return user.company_id.currency_id.id
-        else:
-            return currency_obj.search(cr, uid, [('rate', '=', 1.0)])[0]
-
-    def _get_date(self, cr, uid, context=None):
-        if context is None:
-            context = {}
-        payment_order_obj = self.pool.get('payment.order')
-        date = False
-
-        if context.get('order_id') and context['order_id']:
-            order = payment_order_obj.browse(cr, uid, context['order_id'], context=context)
-            if order.date_prefered == 'fixed':
-                date = order.date_scheduled
-            else:
-                date = time.strftime('%Y-%m-%d')
-        return date
-
-    def _get_ml_inv_ref(self, cr, uid, ids, *a):
-        res = {}
-        for id in self.browse(cr, uid, ids):
-            res[id.id] = False
-            if id.move_line_id:
-                if id.move_line_id.invoice:
-                    res[id.id] = id.move_line_id.invoice.id
-        return res
-
-    def _get_ml_maturity_date(self, cr, uid, ids, *a):
-        res = {}
-        for id in self.browse(cr, uid, ids):
-            if id.move_line_id:
-                res[id.id] = id.move_line_id.date_maturity
-            else:
-                res[id.id] = False
-        return res
-
-    def _get_ml_created_date(self, cr, uid, ids, *a):
-        res = {}
-        for id in self.browse(cr, uid, ids):
-            if id.move_line_id:
-                res[id.id] = id.move_line_id.date_created
-            else:
-                res[id.id] = False
-        return res
-
-    _columns = {
-        'name': fields.char('Your Reference', size=64, required=True),
-        'communication': fields.char('Communication', size=64, required=True, help="Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order ?'"),
-        'communication2': fields.char('Communication 2', size=64, help='The successor message of Communication.'),
-        'move_line_id': fields.many2one('account.move.line', 'Entry line', domain=[('reconcile_id', '=', False), ('account_id.type', '=', 'payable')], help='This Entry Line will be referred for the information of the ordering customer.'),
-        'amount_currency': fields.float('Amount in Partner Currency', digits=(16, 2),
-                                        required=True, help='Payment amount in the partner currency'),
-        'currency': fields.many2one('res.currency','Partner Currency', required=True),
-        'company_currency': fields.many2one('res.currency', 'Company Currency', readonly=True),
-        'bank_id': fields.many2one('res.partner.bank', 'Destination Bank account'),
-        'order_id': fields.many2one('payment.order', 'Order', required=True,
-                                    ondelete='cascade', select=True),
-        'partner_id': fields.many2one('res.partner', string="Partner", required=True, help='The Ordering Customer'),
-        'amount': fields.function(_amount, string='Amount in Company Currency',
-                                  method=True, type='float',
-                                  help='Payment amount in the company currency'),
-        'ml_date_created': fields.function(_get_ml_created_date, string="Effective Date",
-                                           method=True, type='date', help="Invoice Effective Date"),
-        'ml_maturity_date': fields.function(_get_ml_maturity_date, method=True, type='date', string='Due Date'),
-        'ml_inv_ref': fields.function(_get_ml_inv_ref, method=True, type='many2one', relation='account.invoice', string='Invoice Ref.'),
-        'info_owner': fields.function(info_owner, string="Owner Account", method=True, type="text", help='Address of the Main Partner'),
-        'info_partner': fields.function(info_partner, string="Destination Account", method=True, type="text", help='Address of the Ordering Customer.'),
-        'date': fields.date('Payment Date', help="If no payment date is specified, the bank will treat this payment line directly"),
-        'create_date': fields.datetime('Created', readonly=True),
-        'state': fields.selection([('normal','Free'), ('structured','Structured')], 'Communication Type', required=True),
-        'bank_statement_line_id': fields.many2one('account.bank.statement.line', 'Bank statement line')
-    }
-    _defaults = {
-        'name': lambda obj, cursor, user, context: obj.pool.get('ir.sequence'
-                                                                ).get(cursor, user, 'payment.line'),
-        'state': 'normal',
-        'currency': _get_currency,
-        'company_currency': _get_currency,
-        'date': _get_date,
-    }
-    _sql_constraints = [
-        ('name_uniq', 'UNIQUE(name)', 'The payment line name must be unique!'),
-    ]
-
-    def onchange_move_line(self, cr, uid, ids, move_line_id, payment_type, date_prefered, date_scheduled, currency=False, company_currency=False, context=None):
-        data = {}
-        move_line_obj = self.pool.get('account.move.line')
-
-        data['amount_currency'] = data['communication'] = data['partner_id'] = data['reference'] = data['date_created'] = data['bank_id'] = data['amount'] = False
-
-        if move_line_id:
-            line = move_line_obj.browse(cr, uid, move_line_id, context=context)
-            data['amount_currency'] = line.amount_to_pay
-
-            res = self.onchange_amount(cr, uid, ids, data['amount_currency'], currency,
-                                       company_currency, context)
-            if res:
-                data['amount'] = res['value']['amount']
-            data['partner_id'] = line.partner_id.id
-            temp = line.currency_id and line.currency_id.id or False
-            if not temp:
-                if line.invoice:
-                    data['currency'] = line.invoice.currency_id.id
-            else:
-                data['currency'] = temp
-
-            # calling onchange of partner and updating data dictionary
-            temp_dict = self.onchange_partner(cr, uid, ids, line.partner_id.id, payment_type)
-            data.update(temp_dict['value'])
-
-            data['reference'] = line.ref
-            data['date_created'] = line.date_created
-            data['communication'] = line.ref
-
-            if date_prefered == 'now':
-                #no payment date => immediate payment
-                data['date'] = False
-            elif date_prefered == 'due':
-                data['date'] = line.date_maturity
-            elif date_prefered == 'fixed':
-                data['date'] = date_scheduled
-        return {'value': data}
-
-    def onchange_amount(self, cr, uid, ids, amount, currency, cmpny_currency, context=None):
-        if (not amount) or (not cmpny_currency):
-            return {'value': {'amount': False}}
-        res = {}
-        currency_obj = self.pool.get('res.currency')
-        company_amount = currency_obj.compute(cr, uid, currency, cmpny_currency, amount)
-        res['amount'] = company_amount
-        return {'value': res}
-
-    def onchange_partner(self, cr, uid, ids, partner_id, payment_type, context=None):
-        data = {}
-        partner_zip_obj = self.pool.get('res.partner.zip')
-        partner_obj = self.pool.get('res.partner')
-        payment_mode_obj = self.pool.get('payment.mode')
-        data['info_partner'] = data['bank_id'] = False
-
-        if partner_id:
-            part_obj = partner_obj.browse(cr, uid, partner_id, context=context)
-            partner = part_obj.name or ''
-
-            if part_obj.address:
-                for ads in part_obj.address:
-                    if ads.type == 'default':
-                        st = ads.street and ads.street or ''
-                        st1 = ads.street2 and ads.street2 or ''
-
-                        if 'zip_id' in ads:
-                            zip_city = ads.zip_id and partner_zip_obj.name_get(cr, uid, [ads.zip_id.id])[0][1] or ''
-                        else:
-                            zip = ads.zip and ads.zip or ''
-                            city = ads.city and ads.city or  ''
-                            zip_city = zip + ' ' + city
-
-                        cntry = ads.country_id and ads.country_id.name or ''
-                        info = partner + "\n" + st + " " + st1 + "\n" + zip_city + "\n" +cntry
-
-                        data['info_partner'] = info
-
-            if part_obj.bank_ids and payment_type:
-                bank_type = payment_mode_obj.suitable_bank_types(cr, uid, payment_type, context=context)
-                for bank in part_obj.bank_ids:
-                    if bank.state in bank_type:
-                        data['bank_id'] = bank.id
-                        break
-        return {'value': data}
-
-    def fields_get(self, cr, uid, fields=None, context=None, with_uom_rounding=False):
-        res = super(payment_line, self).fields_get(cr, uid, fields, context)
-        if 'communication2' in res:
-            res['communication2'].setdefault('states', {})
-            res['communication2']['states']['structured'] = [('readonly', True)]
-            res['communication2']['states']['normal'] = [('readonly', False)]
-        return res
-
-payment_line()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== removed file 'bin/addons/account_payment/account_payment_demo.xml'
--- bin/addons/account_payment/account_payment_demo.xml	2011-01-14 00:11:01 +0000
+++ bin/addons/account_payment/account_payment_demo.xml	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-    	<record id="partner_bank_1" model="res.partner.bank">
-            <field name="name">Reserve Bank</field>
-            <field name="acc_number">00987654321</field>
-            <field name="partner_id" ref="base.res_partner_agrolait"></field>
-            <field name="state">bank</field>
-            <field name="bank" ref="base.res_bank_1"/>
-        </record>
-    	<record id="payment_mode_1" model="payment.mode">
-            <field name="name">Direct Payment</field>
-            <field name="journal" ref="account.sales_journal"/>
-            <field name="bank_id" ref="account_payment.partner_bank_1"/>
-            <field name="company_id" ref="base.main_company"/>
-        </record>
-        <record id="payment_order_1" model="payment.order">
-            <field name="reference">ORDER1</field>
-            <field name="mode" ref="account_payment.payment_mode_1"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="date_prefered">now</field>
-            <field name="state">draft</field>
-        </record>
-    </data>
-</openerp>

=== removed file 'bin/addons/account_payment/account_payment_report.xml'
--- bin/addons/account_payment/account_payment_report.xml	2011-01-14 00:11:01 +0000
+++ bin/addons/account_payment/account_payment_report.xml	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <report auto="True" id="payment_order1" model="payment.order" name="payment.order" rml="account_payment/report/order.rml" string="Payment Order"/>
-    </data>
-</openerp>

=== removed file 'bin/addons/account_payment/account_payment_sequence.xml'
--- bin/addons/account_payment/account_payment_sequence.xml	2011-01-14 00:11:01 +0000
+++ bin/addons/account_payment/account_payment_sequence.xml	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-        <record forcecreate="1" id="seq_type_payment_order" model="ir.sequence.type">
-            <field name="name">Payment order</field>
-            <field name="code">payment.order</field>
-        </record>
-        
-        <record forcecreate="1" id="seq_payment_order" model="ir.sequence">
-            <field name="name">Payment order</field>
-            <field name="code">payment.order</field>
-            <field eval="3" name="padding"/>
-            <field name="prefix">%(year)s/</field>
-        </record>
-        
-        <record forcecreate="1" id="seq_type_payment_line" model="ir.sequence.type">
-            <field name="name">Payment Line</field>
-            <field name="code">payment.line</field>
-        </record>
-        
-        <record forcecreate="1" id="seq_payment_line" model="ir.sequence">
-            <field name="name">Payment Line</field>
-            <field name="code">payment.line</field>
-            <field name="prefix"/>
-            <field name="padding">3</field>
-        </record>
-        
-    </data>
-</openerp>

=== modified file 'bin/addons/account_payment/account_payment_view.xml'
--- bin/addons/account_payment/account_payment_view.xml	2017-10-04 05:23:42 +0000
+++ bin/addons/account_payment/account_payment_view.xml	2019-10-25 14:10:32 +0000
@@ -15,308 +15,5 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_move_line_tree_wiz">
-            <field name="name">account.move.line.tree</field>
-            <field name="model">account.move.line</field>
-            <field name="type">tree</field>
-            <field name="priority" eval="10"/>
-            <field name="arch" type="xml">
-                <tree string="Account Entry Line">
-                    <field name="partner_id"/>
-                    <field name="ref"/>
-                    <field name="name"/>
-                    <field name="journal_id"/>
-                    <field name="account_id"/>
-                    <field name="date_maturity"/>
-                    <field name="date"/>
-                    <field name="debit" sum="Total debit"/>
-                    <field name="credit" sum="Total credit"/>
-                    <field name="amount_to_pay"/>
-                    <field name="amount_currency"/>
-                    <field name="currency_id"/>
-                    <field name="period_id" invisible="1"/>
-                </tree>
-            </field>
-        </record>
-
-        <menuitem id="menu_main_payment" name="Payment" parent="account.menu_finance" sequence="7"/>
-
-        <record id="view_payment_mode_search" model="ir.ui.view">
-            <field name="name">payment.mode.search</field>
-            <field name="model">payment.mode</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <form string="Payment Mode">
-                    <field name="name"/>
-                    <field name="journal" widget='selection'/>
-                    <field name="company_id" widget='selection' groups="base.group_multi_company"/>
-                    <newline/>
-                    <group expand="0" string="Group By...">
-                      <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal'}"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <record id="view_payment_mode_tree" model="ir.ui.view">
-            <field name="name">payment.mode.tree</field>
-            <field name="model">payment.mode</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Payment Mode">
-                    <field name="name"/>
-                    <field name="journal"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_payment_mode_form" model="ir.ui.view">
-            <field name="name">payment.mode.form</field>
-            <field name="model">payment.mode</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Payment Mode">
-                    <field name="name" select="1"/>
-                    <field name="journal" select="1"/>
-                    <field name="bank_id"/>
-                    <field name="company_id" select="1" widget='selection' groups="base.group_multi_company"/>
-                </form>
-            </field>
-        </record>
-        <record id="action_payment_mode_form" model="ir.actions.act_window">
-            <field name="name">Payment Mode</field>
-            <field name="res_model">payment.mode</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="view_payment_mode_search"/>
-        </record>
-
-        <menuitem action="action_payment_mode_form" id="menu_action_payment_mode_form" parent="account.menu_configuration_misc"/>
-
-        <record id="view_payment_order_form" model="ir.ui.view">
-            <field name="name">payment.order.form</field>
-            <field name="model">payment.order</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Payment order">
-                    <group col="6" colspan="4">
-                      <field name="reference"/>
-                      <field name="mode" widget='selection'/>
-                      <field name="user_id"/>
-                      <field name="date_prefered"/>
-                      <field name="date_scheduled" select="1" attrs="{'readonly':[('date_prefered','!=','fixed')]}" />
-                      <button colspan="2" name="%(action_create_payment_order)d" string="Select Invoices to Pay" type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
-                    </group>
-                    <field name="line_ids" colspan="4" widget="one2many_list" nolabel="1" default_get="{'order_id': active_id or False}" >
-                        <form string="Payment Line">
-                            <notebook>
-                                <page string="Payment">
-                                    <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode,parent.date_prefered,parent.date_scheduled,currency,company_currency)" select="1" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)] "/>
-                                    <separator colspan="4" string="Transaction Information"/>
-                                    <field name="date"/>
-                                    <group colspan="2">
-                                        <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)"/>
-                                        <field name="currency" nolabel="1"/>
-                                    </group>
-                                    <field name="partner_id" on_change="onchange_partner(partner_id,parent.mode)" select="1"/>
-                                    <field domain="[('partner_id','=',partner_id)]" name="bank_id"/>
-                                    <separator colspan="2" string="Owner Account"/>
-                                    <separator colspan="2" string="Destination Account"/>
-                                    <field colspan="2" name="info_owner" nolabel="1"/>
-                                    <field colspan="2" name="info_partner" nolabel="1"/>
-                                    <field colspan="4" name="communication"/>
-                                    <field colspan="4" name="communication2"/>
-                                    <field name="name"/>
-                                     <field name="state"/>
-                                </page>
-                                <page string="Information">
-
-                                    <separator colspan="4" string="General Information"/>
-                                    <group colspan="2">
-                                        <field name="amount"/>
-                                        <field name="company_currency" nolabel="1"/>
-                                    </group>
-                                    <separator colspan="4" string="Entry Information"/>
-                                    <field name="create_date" readonly="1"/>
-                                    <field name="ml_maturity_date"/>
-                                    <field name="ml_inv_ref"/>
-                                </page>
-                            </notebook>
-                        </form>
-                        <tree string="Payment Line">
-                            <field name="ml_inv_ref" />
-                            <field name="partner_id" select="1"/>
-                            <field name="bank_id" domain="[('partner_id', '=', partner_id)]"/>
-                            <field name="ml_maturity_date"/>
-                            <field name="date"/>
-                            <field name="amount_currency" string="Amount"/>
-                            <field name="currency"/>
-                            <field name="name"/>
-                            <field name="amount" sum="Total in Company Currency" invisible="1"/>
-                        </tree>
-                    </field>
-                    <field name="date_created"/>
-                    <field name="date_done"/>
-                    <field name="state" readonly="1" select="1"/>
-                    <group col="4" colspan="2">
-                         <button name="cancel" states="draft,open" string="Cancel" icon="gtk-cancel"/>
-                         <button name="open" states="draft" string="Confirm Payments"  icon="gtk-apply"/>
-                         <button name="set_done" states="open" string="Make Payments" type="object" icon="gtk-execute"/>
-                         <button name="set_to_draft" states="cancel" string="Set to draft" type="object" icon="gtk-convert"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <record id="view_payment_order_tree" model="ir.ui.view">
-            <field name="name">payment.order.tree</field>
-            <field name="model">payment.order</field>
-            <field name="type">tree</field>
-            <field eval="4" name="priority"/>
-            <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');gray:state in ('cancel','done');black:state in ('open')" string="Payment order">
-                    <field name="reference"/>
-                    <field name="mode"/>
-                    <field name="user_id"/>
-                    <field name="date_created"/>
-                    <field name="date_done"/>
-                    <field name="total"/>
-                    <field name="state"/>
-                    <button name="cancel" states="draft,open" string="Cancel" icon="gtk-cancel"/>
-                    <button name="open" states="draft" string="Confirm Payments"  icon="gtk-apply"/>
-                    <button name="set_done" states="open" string="Make Payments"  type ="object" icon="gtk-execute"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_payment_order_search" model="ir.ui.view">
-            <field name="name">payment.order.tree.search</field>
-            <field name="model">payment.order</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Search Payment Orders">
-                    <group col="8" colspan="4">
-                        <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
-                        <filter string="Confirmed" domain="[('state','=','open')]" icon="terp-camera_test"/>
-                        <filter string="Done" domain="[('state','=','done')]" icon="terp-dialog-close"/>
-                        <separator orientation="vertical"/>
-                        <field name="reference"/>
-                        <field name="mode" widget='selection'/>
-                        <field name="date_done"/>
-                        <field name="state"/>
-                    </group>
-                    <newline/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Payment Mode" context="{'group_by': 'mode'}" icon="terp-dolar"/>
-                        <filter string="State" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-        <record id="action_payment_order_tree" model="ir.actions.act_window">
-            <field name="name">Payment Orders</field>
-            <field name="res_model">payment.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="view_payment_order_search"/>
-            <field name="help">A payment order is a payment request from your company to pay a supplier invoice or a customer credit note. Here you can register all payment orders that should be done, keep track of all payment orders and mention the invoice reference and the partner the payment should be done for.</field>
-        </record>
-
-        <menuitem action="action_payment_order_tree" id="menu_action_payment_order_form" parent="menu_main_payment" sequence="3"/>
-
-        <record id="action_payment_order_tree_new" model="ir.actions.act_window">
-            <field name="name">New Payment Order</field>
-            <field name="res_model">payment.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
-        </record>
-
-        <record id="view_payment_line_form" model="ir.ui.view">
-            <field name="name">Payment Line</field>
-            <field name="model">payment.line</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Payment Line">
-                    <notebook>
-                        <page string="Payment">
-                            <field name="order_id" select="1"/>
-                            <field name="move_line_id" on_change="onchange_move_line(move_line_id, False, currency, company_currency)" select="1" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)] "/>
-                            <separator colspan="4" string="Transaction Information"/>
-                            <field name="date"/>
-                            <group colspan="2">
-                                <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,comapny_currency)"/>
-                                <field name="currency" nolabel="1"/>
-                            </group>
-                            <field name="partner_id" on_change="onchange_partner(partner_id, False)" select="1"/>
-                            <field domain="[('partner_id','=',partner_id)]" name="bank_id"/>
-                            <separator colspan="2" string="Owner Account"/>
-                            <separator colspan="2" string="Desitination Account"/>
-                            <field colspan="2" name="info_owner" nolabel="1"/>
-                            <field colspan="2" name="info_partner" nolabel="1"/>
-
-                            <field colspan="4" name="communication"/>
-                            <field colspan="4" name="communication2"/>
-                            <field name="name"/>
-                             <field name="state"/>
-                        </page>
-                        <page string="Information">
-                            <separator colspan="4" string="General Information"/>
-                            <group colspan="2">
-                                <field name="amount" select="1"/>
-                                <field name="company_currency" nolabel="1"/>
-                            </group>
-                            <separator colspan="4" string="Entry Information"/>
-                            <field name="create_date"/>
-                            <field name="ml_maturity_date"/>
-                            <field name="ml_inv_ref"/>
-                        </page>
-                    </notebook>
-                </form>
-            </field>
-        </record>
-        <record id="view_payment_line_tree" model="ir.ui.view">
-            <field name="name">Payment Lines</field>
-            <field name="model">payment.line</field>
-            <field name="type">tree</field>
-            <field eval="4" name="priority"/>
-            <field name="arch" type="xml">
-                <tree string="Payment Line">
-                    <field name="order_id"/>
-                    <field name="ml_inv_ref" />
-                    <field name="ml_maturity_date"/>
-                    <field name="partner_id" select="1"/>
-                    <field name="amount" sum="Amount Total"/>
-                    <field name="amount_currency" sum="Currency Amount Total"/>
-                    <field name="currency"/>
-                    <field name="bank_id" domain="[('partner_id', '=', partner_id)]"/>
-                    <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode)"/>
-                    <field name="create_date"/>
-                    <field name="name"/>
-                </tree>
-            </field>
-        </record>
-        <record id="action_payment_line_form" model="ir.actions.act_window">
-            <field name="name">Payment Line</field>
-            <field name="res_model">payment.line</field>
-            <field name="view_type">tree</field>
-            <field name="view_mode">form,tree</field>
-        </record>
-
-        <record id="view_bank_statement_form" model="ir.ui.view">
-            <field name="name">account.bank.statement.form.inherit</field>
-            <field name="model">account.bank.statement</field>
-            <field name="type">form</field>
-            <field name="priority">21</field>
-            <field name="inherit_id" ref="account.view_bank_statement_form"/>
-            <field name="arch" type="xml">
-                <field name="journal_id" position="after">
-                    <button name="%(action_account_populate_statement_confirm)d" attrs="{'invisible':[('state','=','confirm')]}" string="Import payment lines" type="action" icon="gtk-execute"/>
-                </field>
-            </field>
-        </record>
-
-
     </data>
 </openerp>

=== removed file 'bin/addons/account_payment/account_payment_workflow.xml'
--- bin/addons/account_payment/account_payment_workflow.xml	2018-09-28 16:12:03 +0000
+++ bin/addons/account_payment/account_payment_workflow.xml	1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="wkf_payment_order" model="workflow">
-            <field name="name">Payment Order Workflow</field>
-            <field name="osv">payment.order</field>
-            <field name="on_create">True</field>
-        </record>
-        <!--Activity -->
-        <record id="act_draft" model="workflow.activity">
-            <field name="name">draft</field>
-            <field name="wkf_id" ref="wkf_payment_order"/>
-            <field name="flow_start">True</field>
-            <field name="action">write({'state':'draft'})</field>
-            <field name="kind">function</field>
-        </record>
-        <record id="act_open" model="workflow.activity">
-            <field name="name">open</field>
-            <field name="wkf_id" ref="wkf_payment_order"/>
-            <field name="action">action_open()
-write({'state':'open'})</field>
-            <field name="kind">function</field>
-        </record>
-        <record id="act_done" model="workflow.activity">
-            <field name="name">done</field>
-            <field name="wkf_id" ref="wkf_payment_order"/>
-            <field name="action">write({'state':'done'})</field>
-            <field name="kind">function</field>
-            <field name="flow_stop">True</field>
-        </record>
-        <record id="act_cancel" model="workflow.activity">
-            <field name="name">cancel</field>
-            <field name="wkf_id" ref="wkf_payment_order"/>
-            <field name="action">write({'state':'cancel'})</field>
-            <field name="kind">function</field>
-            <field name="flow_stop">True</field>
-        </record>
-
-        <!-- Transition -->
-        <record id="trans_draft_open" model="workflow.transition">
-            <field name="act_from" ref="act_draft"/>
-            <field name="act_to" ref="act_open"/>
-            <field name="sequence" eval="10" />
-            <field name="signal">open</field>
-        </record>
-
-        <record id="trans_open_done" model="workflow.transition">
-            <field name="act_from" ref="act_open"/>
-            <field name="act_to" ref="act_done"/>
-            <field name="sequence" eval="10" />
-            <field name="signal">done</field>
-        </record>
-        <record id="trans_draft_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_draft"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="sequence" eval="20" />
-            <field name="signal">cancel</field>
-        </record>
-        <record id="trans_open_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_open"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="sequence" eval="20" />
-            <field name="signal">cancel</field>
-        </record>
-
-    </data>
-</openerp>

=== removed directory 'bin/addons/account_payment/report'
=== removed file 'bin/addons/account_payment/report/__init__.py'
--- bin/addons/account_payment/report/__init__.py	2011-01-14 00:11:01 +0000
+++ bin/addons/account_payment/report/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import payment_order
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== removed file 'bin/addons/account_payment/report/order.rml'
--- bin/addons/account_payment/report/order.rml	2011-01-14 00:11:01 +0000
+++ bin/addons/account_payment/report/order.rml	1970-01-01 00:00:00 +0000
@@ -1,290 +0,0 @@
-<?xml version="1.0"?>
-<document filename="Payment Order.pdf">
-  <template pageSize="(595.0,842.0)" title="Payment Order" author="OpenERP S.A. ([e-mail])" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="34.0" y1="34.0" width="527" height="774"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table6">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table7">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="Standard" fontName="Helvetica"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica"/>
-    <paraStyle name="Table Contents" fontName="Helvetica"/>
-    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
-    <paraStyle name="Footer" fontName="Helvetica"/>
-    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_space_0.2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <images/>
-  </stylesheet>
-  <story>
-  <pto>
-  <pto_header>
-    <blockTable colWidths="112.0,86.0,106.0,63.0,85.0,75.0" style="Table3">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Partner</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Bank Account</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Invoice Ref</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Value Date</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Amount</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Currency</para>
-        </td>
-      </tr>
-    </blockTable>
-  </pto_header>
-    <para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="318.0,210.0" style="Table1">
-      <tr>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_address">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.name or '']]</para>
-          <para style="terp_default_address">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.street or '']]</para>
-          <para style="terp_default_address">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.street2 or removeParentNode('para')]]</para>
-          <para style="terp_default_address">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.zip or '']] [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.city or '']]</para>
-          <para style="terp_default_address">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.state and o.mode.bank_id.bank.state.name or removeParentNode('para') ]]</para>
-          <para style="terp_default_address">[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.country and o.mode.bank_id.bank.country.name or '']]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_header">Payment Order / Payment</para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="106.0,106.0,106.0,106.0,106.0" style="Table6">
-      <tr>
-        <td>
-          <para style="terp_tblheader_General_Centre">Payment Type</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Reference</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Used Account</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Execution Type</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Company Currency</para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="106.0,106.0,106.0,106.0,106.0" style="Table7">
-      <tr>
-        <td>
-          <para style="terp_default_Centre_8">[[ o.mode and o.mode.name or '-' ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_8">[[ o.reference or '-' ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_8">[[get_account_name(o.mode.bank_id.id)]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_8">[[ o.date_prefered == 'now' and 'Now' or removeParentNode('para') ]]</para>
-          <para style="terp_default_Centre_8">[[ o.date_prefered == 'due' and 'Due date' or removeParentNode('para') ]]</para>
-          <para style="terp_default_Centre_8">[[ o.date_prefered == 'fixed' and 'Fixed date' or removeParentNode('para') ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_8">[[ o.user_id and o.user_id.company_id and o.user_id.company_id.currency_id and o.user_id.company_id.currency_id.name or '' ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="112.0,86.0,106.0,63.0,85.0,75.0" style="Table3">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Partner</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Bank Account</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Invoice Ref</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Value Date</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Amount</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Currency</para>
-        </td>
-      </tr>
-    </blockTable>
-    <section>
-      <para style="terp_default_2">[[repeatIn(o.line_ids, 'line') ]]</para>
-      <blockTable colWidths="112.0,86.0,106.0,64.0,85.0,75.0" style="Table4">
-        <tr>
-          <td>
-            <para style="terp_default_9">[[line.partner_id and line.partner_id.name or '-' ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Centre_9">[[get_account_name(line.bank_id.id) or '-']]</para>
-          </td>
-          <td>
-            <para style="terp_default_Centre_9">[[ get_invoice_name(line.ml_inv_ref.id) or '-' ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Centre_9">[[line.date=='False' and '-' or formatLang(line.date,date=True) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[formatLang(line.amount) or '-' ]] [[get_company_currency_symbol()]] </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.amount_currency) ]] [[ line.currency.symbol]] </para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <blockTable colWidths="335.0,32.0,85.0,75.0" style="Table5">
-      <tr>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">Total:</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_amount_total(o)) or '' ]] [[get_company_currency_symbol()]] </para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_amount_total_in_currency(o)) or '' ]] [[get_company_currency_symbol()]] </para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-  </pto>
-  </story>
-</document>

=== removed file 'bin/addons/account_payment/report/order.sxw'
Binary files bin/addons/account_payment/report/order.sxw	2011-01-14 00:11:01 +0000 and bin/addons/account_payment/report/order.sxw	1970-01-01 00:00:00 +0000 differ
=== removed file 'bin/addons/account_payment/report/payment_order.py'
--- bin/addons/account_payment/report/payment_order.py	2011-01-14 00:11:01 +0000
+++ bin/addons/account_payment/report/payment_order.py	1970-01-01 00:00:00 +0000
@@ -1,90 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-
-import pooler
-from report import report_sxw
-
-class payment_order(report_sxw.rml_parse):
-
-    def __init__(self, cr, uid, name, context=None):
-        super(payment_order, self).__init__(cr, uid, name, context=context)
-        self.localcontext.update( {
-            'time': time,
-            'get_invoice_name': self._get_invoice_name,
-            'get_company_currency': self._get_company_currency,
-            'get_company_currency_symbol': self._get_company_currency_symbol,
-            'get_amount_total_in_currency': self._get_amount_total_in_currency,
-            'get_amount_total': self._get_amount_total,
-            'get_account_name': self._get_account_name,
-        })
-
-    def _get_invoice_name(self, invoice_id):
-        if invoice_id:
-            pool = pooler.get_pool(self.cr.dbname)
-            value_name = pool.get('account.invoice').name_get(self.cr, self.uid, [invoice_id])
-            if value_name:
-                return value_name[0][1]
-        return False
-
-    def _get_amount_total_in_currency(self, payment):
-        total = 0.0
-        if payment.line_ids:
-            currency_cmp = payment.line_ids[0].currency.id
-        else:
-            return False
-        for line in payment.line_ids:
-            if currency_cmp == line.currency.id:
-                total += line.amount_currency
-            else:
-                return False
-        return total
-
-    def _get_amount_total(self, payment):
-        total = 0.0
-        if not payment.line_ids:
-            return False
-        for line in payment.line_ids:
-            total += line.amount
-        return total
-
-    def _get_company_currency(self):
-        pool = pooler.get_pool(self.cr.dbname)
-        user = pool.get('res.users').browse(self.cr, self.uid, self.uid)
-        return user.company_id and user.company_id.currency_id and user.company_id.currency_id.symbol or False
-
-    def _get_company_currency_symbol(self):
-        pool = pooler.get_pool(self.cr.dbname)
-        user = pool.get('res.users').browse(self.cr, self.uid, self.uid)
-        return user.company_id and user.company_id.currency_id and user.company_id.currency_id.symbol or False
-
-    def _get_account_name(self,bank_id):
-        if bank_id:
-            pool = pooler.get_pool(self.cr.dbname)
-            value_name = pool.get('res.partner.bank').name_get(self.cr, self.uid, [bank_id])
-            if value_name:
-                return value_name[0][1]
-        return False
-
-report_sxw.report_sxw('report.payment.order', 'payment.order', 'addons/account_payment/report/payment_order.rml', parser=payment_order, header="external")
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== removed directory 'bin/addons/account_payment/security'
=== removed file 'bin/addons/account_payment/security/account_payment_security.xml'
--- bin/addons/account_payment/security/account_payment_security.xml	2011-02-28 13:57:54 +0000
+++ bin/addons/account_payment/security/account_payment_security.xml	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data noupdate="1">
-
-    <record id="group_account_payment" model="res.groups">
-        <field name="name">Accounting / Payments</field>
-    </record>
-
-    <record id="payment_mode_comp_rule" model="ir.rule">
-        <field name="name">Payment Mode company rule</field>
-        <field model="ir.model" name="model_id" ref="model_payment_mode"/>
-        <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-    </record>
-
-</data>
-</openerp>

=== removed file 'bin/addons/account_payment/security/ir.model.access.csv'
--- bin/addons/account_payment/security/ir.model.access.csv	2018-10-04 14:32:37 +0000
+++ bin/addons/account_payment/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"

=== removed directory 'bin/addons/account_payment/wizard'
=== removed file 'bin/addons/account_payment/wizard/__init__.py'
--- bin/addons/account_payment/wizard/__init__.py	2011-01-14 00:11:01 +0000
+++ bin/addons/account_payment/wizard/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import account_payment_order
-import account_payment_populate_statement
-import account_payment_pay
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== removed file 'bin/addons/account_payment/wizard/account_payment_create_order_view.xml'
--- bin/addons/account_payment/wizard/account_payment_create_order_view.xml	2017-05-10 12:47:14 +0000
+++ bin/addons/account_payment/wizard/account_payment_create_order_view.xml	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-		<record id="view_create_payment_order" model="ir.ui.view">
-            <field name="name">payment.order.create.form</field>
-            <field name="model">payment.order.create</field>
-            <field name="type">form</field>
-            <field name="priority">18</field>
-            <field name="arch" type="xml">
-			<form string="Search Payment lines">
-			    <group col="4" colspan="6">
-					<field name="duedate" />
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="search_entries" string="Search" colspan="1" type="object" icon="gtk-execute"/>
-				</group>
-			</form>
-            </field>
-        </record>
-
-		<record id="view_create_payment_order_lines" model="ir.ui.view">
-            <field name="name">payment.order.create.form</field>
-            <field name="model">payment.order.create</field>
-            <field name="type">form</field>
-            <field name="priority">17</field>
-            <field name="arch" type="xml">
-			<form string="Search Payment lines">
-			    <group col="4" colspan="6">
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="create_payment" string="_Add to payment order" colspan="1" type="object" icon="gtk-execute"/>
-				</group>
-			</form>
-            </field>
-        </record>
-
-        <record id="action_create_payment_order" model="ir.actions.act_window">
-            <field name="name">Populate Payment</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">payment.order.create</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-	</data>
-</openerp>

=== removed file 'bin/addons/account_payment/wizard/account_payment_order.py'
--- bin/addons/account_payment/wizard/account_payment_order.py	2011-01-14 00:11:01 +0000
+++ bin/addons/account_payment/wizard/account_payment_order.py	1970-01-01 00:00:00 +0000
@@ -1,123 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-from lxml import etree
-
-from osv import osv, fields
-
-class payment_order_create(osv.osv_memory):
-    """
-    Create a payment object with lines corresponding to the account move line
-    to pay according to the date and the mode provided by the user.
-    Hypothesis:
-    - Small number of non-reconcilied move line, payment mode and bank account type,
-    - Big number of partner and bank account.
-
-    If a type is given, unsuitable account Entry lines are ignored.
-    """
-
-    _name = 'payment.order.create'
-    _description = 'payment.order.create'
-    _columns = {
-        'duedate': fields.date('Due Date', required=True),
-        'entries': fields.many2many('account.move.line', 'line_pay_rel', 'pay_id', 'line_id', 'Entries')
-    }
-    _defaults = {
-         'duedate': lambda *a: time.strftime('%Y-%m-%d'),
-    }
-
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        res = super(payment_order_create, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
-        if context and 'line_ids' in context:
-            view_obj = etree.XML(res['arch'])
-            child = view_obj.getchildren()[0]
-            domain = '[("id", "in", '+ str(context['line_ids'])+')]'
-            field = etree.Element('field', attrib={'domain': domain, 'name':'entries', 'colspan':'4', 'height':'300', 'width':'800', 'nolabel':"1"})
-            child.addprevious(field)
-            res['arch'] = etree.tostring(view_obj)
-        return res
-
-    def create_payment(self, cr, uid, ids, context=None):
-        order_obj = self.pool.get('payment.order')
-        line_obj = self.pool.get('account.move.line')
-        payment_obj = self.pool.get('payment.line')
-        if context is None:
-            context = {}
-        data = self.read(cr, uid, ids, [], context=context)[0]
-        line_ids = data['entries']
-        if not line_ids:
-            return {'type': 'ir.actions.act_window_close'}
-
-        payment = order_obj.browse(cr, uid, context['active_id'], context=context)
-        t = None
-        line2bank = line_obj.line2bank(cr, uid, line_ids, t, context)
-
-        ## Finally populate the current payment with new lines:
-        for line in line_obj.browse(cr, uid, line_ids, context=context):
-            if payment.date_prefered == "now":
-                #no payment date => immediate payment
-                date_to_pay = False
-            elif payment.date_prefered == 'due':
-                date_to_pay = line.date_maturity
-            elif payment.date_prefered == 'fixed':
-                date_to_pay = payment.date_scheduled
-            payment_obj.create(cr, uid,{
-                'move_line_id': line.id,
-                'amount_currency': line.amount_to_pay,
-                'bank_id': line2bank.get(line.id),
-                'order_id': payment.id,
-                'partner_id': line.partner_id and line.partner_id.id or False,
-                'communication': line.ref or '/',
-                'date': date_to_pay,
-                'currency': line.invoice and line.invoice.currency_id.id or False,
-                }, context=context)
-        return {'type': 'ir.actions.act_window_close'}
-
-    def search_entries(self, cr, uid, ids, context=None):
-        line_obj = self.pool.get('account.move.line')
-        mod_obj = self.pool.get('ir.model.data')
-        if context is None:
-            context = {}
-        data = self.read(cr, uid, ids, [], context=context)[0]
-        search_due_date = data['duedate']
-#        payment = self.pool.get('payment.order').browse(cr, uid, context['active_id'], context=context)
-
-        # Search for move line to pay:
-        domain = [('reconcile_id', '=', False), ('account_id.type', '=', 'payable'), ('amount_to_pay', '>', 0)]
-        domain = domain + ['|', ('date_maturity', '<=', search_due_date), ('date_maturity', '=', False)]
-        line_ids = line_obj.search(cr, uid, domain, context=context)
-        context.update({'line_ids': line_ids})
-        model_data_ids = mod_obj.search(cr, uid,[('model', '=', 'ir.ui.view'), ('name', '=', 'view_create_payment_order_lines')], context=context)
-        resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-        return {'name': ('Entrie Lines'),
-                'context': context,
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'payment.order.create',
-                'views': [(resource_id,'form')],
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-        }
-
-payment_order_create()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== removed file 'bin/addons/account_payment/wizard/account_payment_pay.py'
--- bin/addons/account_payment/wizard/account_payment_pay.py	2011-01-14 00:11:01 +0000
+++ bin/addons/account_payment/wizard/account_payment_pay.py	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import osv
-
-class account_payment_make_payment(osv.osv_memory):
-    _name = "account.payment.make.payment"
-    _description = "Account make payment"
-
-    def launch_wizard(self, cr, uid, ids, context=None):
-        """
-        Search for a wizard to launch according to the type.
-        If type is manual. just confirm the order.
-        """
-        obj_payment_order = self.pool.get('payment.order')
-        if context is None:
-            context = {}
-#        obj_model = self.pool.get('ir.model.data')
-#        obj_act = self.pool.get('ir.actions.act_window')
-#        order = obj_payment_order.browse(cr, uid, context['active_id'], context)
-        obj_payment_order.set_done(cr, uid, [context['active_id']], context)
-        return {'type': 'ir.actions.act_window_close'}
-#        t = order.mode and order.mode.type.code or 'manual'
-#        if t == 'manual':
-#            obj_payment_order.set_done(cr,uid,context['active_id'],context)
-#            return {}
-#
-#        gw = obj_payment_order.get_wizard(t)
-#        if not gw:
-#            obj_payment_order.set_done(cr,uid,context['active_id'],context)
-#            return {}
-#
-#        module, wizard= gw
-#        result = obj_model._get_id(cr, uid, module, wizard)
-#        id = obj_model.read(cr, uid, [result], ['res_id'])[0]['res_id']
-#        return obj_act.read(cr, uid, [id])[0]
-
-account_payment_make_payment()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== removed file 'bin/addons/account_payment/wizard/account_payment_pay_view.xml'
--- bin/addons/account_payment/wizard/account_payment_pay_view.xml	2011-01-14 00:11:01 +0000
+++ bin/addons/account_payment/wizard/account_payment_pay_view.xml	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-     <data>
-
-        <record id="account_payment_make_payment_view" model="ir.ui.view">
-             <field name="name">account.payment.make.payment.form</field>
-             <field name="model">account.payment.make.payment</field>
-             <field name="type">form</field>
-             <field name="arch" type="xml">
-				<form string="Make Payment">
-					<separator string="Are you sure you want to make payment?"/>
-					<newline/>
-					<group  colspan="2" col="4">
-						<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-						<button name="launch_wizard" string="Yes" type="object" icon="gtk-ok" default_focus="1"/>
-	 				</group>
-				</form>
-			</field>
-		</record>
-
-		<record id="action_account_payment_make_payment" model="ir.actions.act_window">
-			<field name="name">Make Payment</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">account.payment.make.payment</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="view_id" ref="account_payment_make_payment_view"/>
-			<field name="target">new</field>
-		</record>
-
-
-	</data>
-</openerp>

=== removed file 'bin/addons/account_payment/wizard/account_payment_populate_statement.py'
--- bin/addons/account_payment/wizard/account_payment_populate_statement.py	2011-05-16 14:06:09 +0000
+++ bin/addons/account_payment/wizard/account_payment_populate_statement.py	1970-01-01 00:00:00 +0000
@@ -1,122 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-from lxml import etree
-
-from osv import osv, fields
-
-class account_payment_populate_statement(osv.osv_memory):
-    _name = "account.payment.populate.statement"
-    _description = "Account Payment Populate Statement"
-    _columns = {
-        'lines': fields.many2many('payment.line', 'payment_line_rel_', 'payment_id', 'line_id', 'Payment Lines')
-    }
-
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        line_obj = self.pool.get('payment.line')
-
-        res = super(account_payment_populate_statement, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
-        line_ids = line_obj.search(cr, uid, [
-            ('move_line_id.reconcile_id', '=', False),
-            ('bank_statement_line_id', '=', False),
-            ('move_line_id.state','=','valid')])
-        line_ids.extend(line_obj.search(cr, uid, [
-            ('move_line_id.reconcile_id', '=', False),
-            ('order_id.mode', '=', False),
-            ('move_line_id.state','=','valid')]))
-        domain = '[("id", "in", '+ str(line_ids)+')]'
-        doc = etree.XML(res['arch'])
-        nodes = doc.xpath("//field[@name='lines']")
-        for node in nodes:
-            node.set('domain', domain)
-        res['arch'] = etree.tostring(doc)
-        return res
-
-    def populate_statement(self, cr, uid, ids, context=None):
-        line_obj = self.pool.get('payment.line')
-        statement_obj = self.pool.get('account.bank.statement')
-        statement_line_obj = self.pool.get('account.bank.statement.line')
-        currency_obj = self.pool.get('res.currency')
-        voucher_obj = self.pool.get('account.voucher')
-        voucher_line_obj = self.pool.get('account.voucher.line')
-        move_line_obj = self.pool.get('account.move.line')
-
-        if context is None:
-            context = {}
-        data = self.read(cr, uid, ids, [], context=context)[0]
-        line_ids = data['lines']
-        if not line_ids:
-            return {'type': 'ir.actions.act_window_close'}
-
-        statement = statement_obj.browse(cr, uid, context['active_id'], context=context)
-
-        for line in line_obj.browse(cr, uid, line_ids, context=context):
-            ctx = context.copy()
-            ctx['date'] = line.ml_maturity_date # was value_date earlier,but this field exists no more now
-            amount = currency_obj.compute(cr, uid, line.currency.id,
-                    statement.currency.id, line.amount_currency, context=ctx)
-
-            if not line.move_line_id.id:
-                continue
-            context.update({'move_line_ids': [line.move_line_id.id]})
-            result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, price=abs(amount), currency_id=statement.currency.id, ttype='payment', date=line.date, context=context)
-
-            voucher_res = {
-                    'type': 'payment',
-                    'name': line.name,
-                    'partner_id': line.partner_id.id,
-                    'journal_id': statement.journal_id.id,
-                    'account_id': result.get('account_id', statement.journal_id.default_credit_account_id.id),
-                    'company_id': statement.company_id.id,
-                    'currency_id': statement.currency.id,
-                    'date': line.date or time.strftime('%Y-%m-%d'),
-                    'amount': abs(amount),
-                    'period_id': statement.period_id.id
-            }
-            voucher_id = voucher_obj.create(cr, uid, voucher_res, context=context)
-            voucher_line_dict =  {}
-            if result['value']['line_ids']:
-                for line_dict in result['value']['line_ids']:
-                    move_line = move_line_obj.browse(cr, uid, line_dict['move_line_id'], context)
-                    if line.move_line_id.move_id.id == move_line.move_id.id:
-                        voucher_line_dict = line_dict
-            if voucher_line_dict:
-                voucher_line_dict.update({'voucher_id': voucher_id})
-                voucher_line_obj.create(cr, uid, voucher_line_dict, context=context)
-
-            st_line_id = statement_line_obj.create(cr, uid, {
-                'name': line.order_id.reference or '?',
-                'amount': - amount,
-                'type': 'supplier',
-                'partner_id': line.partner_id.id,
-                'account_id': line.move_line_id.account_id.id,
-                'statement_id': statement.id,
-                'ref': line.communication,
-                'voucher_id': voucher_id,
-                }, context=context)
-
-            line_obj.write(cr, uid, [line.id], {'bank_statement_line_id': st_line_id})
-        return {'type': 'ir.actions.act_window_close'}
-
-account_payment_populate_statement()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== removed file 'bin/addons/account_payment/wizard/account_payment_populate_statement_view.xml'
--- bin/addons/account_payment/wizard/account_payment_populate_statement_view.xml	2011-01-14 00:11:01 +0000
+++ bin/addons/account_payment/wizard/account_payment_populate_statement_view.xml	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-	<data>
-
-        <record id="account_payment_populate_statement_view" model="ir.ui.view">
-             <field name="name">Payment Populate statement</field>
-             <field name="model">account.payment.populate.statement</field>
-             <field name="type">form</field>
-             <field name="arch" type="xml">
-                <form string="Populate Statement:">
-                    <group colspan="4" col="6">
-                        <field name="lines" colspan="4" height="300" width="800" nolabel="1" />
-                        <separator colspan="6"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                        <button name="populate_statement" string="ADD" type="object" icon="gtk-ok"/>
-                    </group>
-                </form>
-             </field>
-        </record>
-
-        <record id="action_account_populate_statement_confirm" model="ir.actions.act_window">
-             <field name="name">Payment Populate statement</field>
-             <field name="res_model">account.payment.populate.statement</field>
-             <field name="type">ir.actions.act_window</field>
-             <field name="view_type">form</field>
-             <field name="view_mode">tree,form</field>
-             <field name="view_id" ref="account_payment_populate_statement_view"/>
-             <field name="context">{'record_id':active_id}</field>
-             <field name="target">new</field>
-       </record>
-
-        <record id="action_account_payment_populate_statement" model="ir.actions.act_window">
-             <field name="name">Payment Populate statement</field>
-             <field name="res_model">account.payment.populate.statement</field>
-             <field name="type">ir.actions.act_window</field>
-             <field name="view_type">form</field>
-             <field name="view_mode">tree,form</field>
-             <field name="view_id" ref="account_payment_populate_statement_view"/>
-             <field name="context">{'record_id':active_id}</field>
-             <field name="target">new</field>
-       </record>
-
-	</data>
-</openerp>
\ No newline at end of file

=== modified file 'bin/addons/account_period_closing_level/account_year_end_closing.py'
--- bin/addons/account_period_closing_level/account_year_end_closing.py	2018-11-23 14:44:11 +0000
+++ bin/addons/account_period_closing_level/account_year_end_closing.py	2019-10-25 14:10:32 +0000
@@ -318,8 +318,8 @@
                 'block_manual_currency_id': True,
                 'company_id': cpy_rec.id,
                 'currency_id': ccy_id,
-                'date': posting_date,
-                'document_date': posting_date,
+                'date': last_day_fy,
+                'document_date': last_day_fy,
                 'instance_id': instance_rec.id,
                 'journal_id': journal_id,
                 'name': name,
@@ -335,17 +335,18 @@
             """
             name = 'Balance move to 0'
 
+            # DONE: TEST JN => behavior unchanged (use of clearer date name for the source date)
             vals = {
                 'account_id': account_id,
                 'company_id': cpy_rec.id,
                 'currency_id': ccy_id,
-                'date': posting_date,
-                'document_date': posting_date,
+                'date': last_day_fy,
+                'document_date': last_day_fy,
                 'instance_id': instance_rec.id,
                 'journal_id': journal_id,
                 'name': name,
                 'period_id': period_id,
-                'source_date': posting_date,
+                'source_date': last_day_fy,
 
                 'debit_currency': \
                 balance_currency if balance_currency > 0. else 0.,
@@ -378,7 +379,7 @@
                                                          instance_rec.id, context=context)
 
         fy_year = self._get_fy_year(cr, uid, fy_rec, context=context)
-        posting_date = "%d-12-31" % (fy_year, )
+        last_day_fy = "%d-12-31" % (fy_year, )
 
         journal_code = 'EOY'
         journal_id = self._get_journal(cr, uid, journal_code, context=context)
@@ -593,8 +594,8 @@
                 'block_manual_currency_id': True,
                 'company_id': cpy_rec.id,
                 'currency_id': ccy_id,
-                'date': posting_date,
-                'document_date': posting_date,
+                'date': first_day_next_fy,
+                'document_date': first_day_next_fy,
                 'instance_id': instance_rec.id,
                 'journal_id': journal_id,
                 'name': name,
@@ -611,17 +612,18 @@
             """
             default_name = 'Balance report / Previous Fiscal Year'
 
+            # DONE: TEST JN => behavior unchanged (use of clearer date name for the source date)
             vals = {
                 'account_id': account_id,
                 'company_id': cpy_rec.id,
                 'currency_id': ccy_id,
-                'date': posting_date,
-                'document_date': posting_date,
+                'date': first_day_next_fy,
+                'document_date': first_day_next_fy,
                 'instance_id': instance_rec.id,
                 'journal_id': journal_id,
                 'name': name or default_name,
                 'period_id': period_id,
-                'source_date': posting_date,
+                'source_date': first_day_next_fy,
 
                 'debit_currency': \
                 balance_currency if balance_currency > 0. else 0.,
@@ -664,7 +666,7 @@
 
         fy_year = self._get_fy_year(cr, uid, fy_rec, context=context)
         next_fy_id = self._get_next_fy_id(cr, uid, fy_rec, context=context)
-        posting_date = "%d-01-01" % (fy_year + 1, )
+        first_day_next_fy = "%d-01-01" % (fy_year + 1, )
 
         journal_code = 'IB'
         journal_id = self._get_journal(cr, uid, journal_code, context=context)

=== removed directory 'bin/addons/account_voucher'
=== removed file 'bin/addons/account_voucher/__init__.py'
--- bin/addons/account_voucher/__init__.py	2011-01-14 00:11:01 +0000
+++ bin/addons/account_voucher/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import account_voucher
-import invoice
-import report
-import wizard
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== removed file 'bin/addons/account_voucher/__openerp__.py'
--- bin/addons/account_voucher/__openerp__.py	2017-10-04 05:23:42 +0000
+++ bin/addons/account_voucher/__openerp__.py	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-{
-    "name" : "Accounting Voucher Entries",
-    "version" : "1.0",
-    "author" : 'OpenERP SA',
-    "description": """Account Voucher module includes all the basic requirements of
-    Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, etc...
-    * Voucher Entry
-    * Voucher Receipt
-    * Cheque Register
-    """,
-    "category" : "Generic Modules/Accounting",
-    "website" : "http://tinyerp.com",
-    "depends" : ["account"],
-    "init_xml" : [],
-
-    "demo_xml" : [],
-
-    "update_xml" : [
-        "security/ir.model.access.csv",
-        "account_voucher_sequence.xml",
-        "account_voucher_workflow.xml",
-        "account_voucher_report.xml",
-        "wizard/account_voucher_unreconcile_view.xml",
-        "wizard/account_statement_from_invoice_view.xml",
-        "account_voucher_view.xml",
-        "voucher_payment_receipt_view.xml",
-        "voucher_sales_purchase_view.xml",
-        "account_voucher_wizard.xml",
-        "report/account_voucher_sales_receipt_view.xml",
-        "security/account_voucher_security.xml"
-    ],
-    "test" : [
-    ],
-    'certificate': '0037580727101',
-    "active": False,
-    "installable": True,
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== removed file 'bin/addons/account_voucher/account_voucher.py'
--- bin/addons/account_voucher/account_voucher.py	2012-06-20 14:19:49 +0000
+++ bin/addons/account_voucher/account_voucher.py	1970-01-01 00:00:00 +0000
@@ -1,1022 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-from lxml import etree
-
-import netsvc
-from osv import osv, fields
-import decimal_precision as dp
-from tools.translate import _
-
-
-class account_voucher(osv.osv):
-
-    def _get_type(self, cr, uid, context=None):
-        if context is None:
-            context = {}
-        return context.get('type', False)
-
-    def _get_period(self, cr, uid, context=None):
-        if context is None: context = {}
-        if context.get('period_id', False):
-            return context.get('period_id')
-        periods = self.pool.get('account.period').find(cr, uid)
-        return periods and periods[0] or False
-
-    def _get_journal(self, cr, uid, context=None):
-        if context is None: context = {}
-        journal_pool = self.pool.get('account.journal')
-        invoice_pool = self.pool.get('account.invoice')
-        if context.get('invoice_id', False):
-            currency_id = invoice_pool.browse(cr, uid, context['invoice_id'], context=context).currency_id.id
-            journal_id = journal_pool.search(cr, uid, [('currency', '=', currency_id)], limit=1)
-            return journal_id and journal_id[0] or False
-        if context.get('journal_id', False):
-            return context.get('journal_id')
-        if not context.get('journal_id', False) and context.get('search_default_journal_id', False):
-            return context.get('search_default_journal_id')
-
-        ttype = context.get('type', 'bank')
-        if ttype in ('payment', 'receipt'):
-            ttype = 'bank'
-        res = journal_pool.search(cr, uid, [('type', '=', ttype)], limit=1)
-        return res and res[0] or False
-
-    def _get_tax(self, cr, uid, context=None):
-        if context is None: context = {}
-        journal_pool = self.pool.get('account.journal')
-        journal_id = context.get('journal_id', False)
-        if not journal_id:
-            ttype = context.get('type', 'bank')
-            res = journal_pool.search(cr, uid, [('type', '=', ttype)], limit=1)
-            if not res:
-                return False
-            journal_id = res[0]
-
-        if not journal_id:
-            return False
-        journal = journal_pool.browse(cr, uid, journal_id, context=context)
-        account_id = journal.default_credit_account_id or journal.default_debit_account_id
-        if account_id and account_id.tax_ids:
-            tax_id = account_id.tax_ids[0].id
-            return tax_id
-        return False
-
-    def _get_currency(self, cr, uid, context=None):
-        if context is None: context = {}
-        journal_pool = self.pool.get('account.journal')
-        journal_id = context.get('journal_id', False)
-        if journal_id:
-            journal = journal_pool.browse(cr, uid, journal_id, context=context)
-#            currency_id = journal.company_id.currency_id.id
-            if journal.currency:
-                return journal.currency.id
-        return False
-
-    def _get_partner(self, cr, uid, context=None):
-        if context is None: context = {}
-        return context.get('partner_id', False)
-
-    def _get_reference(self, cr, uid, context=None):
-        if context is None: context = {}
-        return context.get('reference', False)
-
-    def _get_narration(self, cr, uid, context=None):
-        if context is None: context = {}
-        return context.get('narration', False)
-
-    def _get_amount(self, cr, uid, context=None):
-        if context is None:
-            context= {}
-        return context.get('amount', 0.0)
-
-    def name_get(self, cr, uid, ids, context=None):
-        if not ids:
-            return []
-        if context is None: context = {}
-        return [(r['id'], (str("%.2f" % r['amount']) or '')) for r in self.read(cr, uid, ids, ['amount'], context, load='_classic_write')]
-
-    def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
-        mod_obj = self.pool.get('ir.model.data')
-        if context is None: context = {}
-        
-        def get_res_id(view_type, condition):
-            result = False
-            if view_type == 'tree':
-                result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_voucher_tree')
-            elif view_type == 'form':
-                if condition:
-                    result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_vendor_receipt_form')
-                else:
-                    result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_vendor_payment_form')
-            return result and result[1] or False
-
-        if not view_id and context.get('invoice_type', False):
-            view_id = get_res_id(view_type,context.get('invoice_type', False) in ('out_invoice', 'out_refund'))
-
-        if not view_id and context.get('line_type', False):
-            view_id = get_res_id(view_type,context.get('line_type', False) == 'customer')
-
-        res = super(account_voucher, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
-        doc = etree.XML(res['arch'])
-        nodes = doc.xpath("//field[@name='partner_id']")
-        if context.get('type', 'sale') in ('purchase', 'payment'):
-            for node in nodes:
-                node.set('domain', "[('supplier', '=', True)]")
-            res['arch'] = etree.tostring(doc)
-        return res
-
-    def _compute_writeoff_amount(self, cr, uid, line_dr_ids, line_cr_ids, amount):
-        debit = credit = 0.0
-        for l in line_dr_ids:
-            debit += l['amount']
-        for l in line_cr_ids:
-            credit += l['amount']
-        return abs(amount - abs(credit - debit))
-
-    def onchange_line_ids(self, cr, uid, ids, line_dr_ids, line_cr_ids, amount):
-        if not line_dr_ids and not line_cr_ids:
-            return {'value':{}}
-        line_dr_ids = [x[2] for x in line_dr_ids]
-        line_cr_ids = [x[2] for x in line_cr_ids]
-        return {'value': {'writeoff_amount': self._compute_writeoff_amount(cr, uid, line_dr_ids, line_cr_ids, amount)}}
-
-    def _get_writeoff_amount(self, cr, uid, ids, name, args, context=None):
-        if not ids: return {}
-        res = {}
-        debit = credit = 0.0
-        for voucher in self.browse(cr, uid, ids, context=context):
-            for l in voucher.line_dr_ids:
-                debit += l.amount
-            for l in voucher.line_cr_ids:
-                credit += l.amount
-            res[voucher.id] =  abs(voucher.amount - abs(credit - debit))
-        return res
-
-    _name = 'account.voucher'
-    _description = 'Accounting Voucher'
-    _order = "date desc, id desc"
-#    _rec_name = 'number'
-    _columns = {
-        'type':fields.selection([
-            ('sale','Sale'),
-            ('purchase','Purchase'),
-            ('payment','Payment'),
-            ('receipt','Receipt'),
-        ],'Default Type', readonly=True, states={'draft':[('readonly',False)]}),
-        'name':fields.char('Memo', size=256, readonly=True, states={'draft':[('readonly',False)]}),
-        'date':fields.date('Date', readonly=True, select=True, states={'draft':[('readonly',False)]}, help="Effective date for accounting entries"),
-        'journal_id':fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'account_id':fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'line_ids':fields.one2many('account.voucher.line','voucher_id','Voucher Lines', readonly=True, states={'draft':[('readonly',False)]}),
-        'line_cr_ids':fields.one2many('account.voucher.line','voucher_id','Credits',
-            domain=[('type','=','cr')], context={'default_type':'cr'}, readonly=True, states={'draft':[('readonly',False)]}),
-        'line_dr_ids':fields.one2many('account.voucher.line','voucher_id','Debits',
-            domain=[('type','=','dr')], context={'default_type':'dr'}, readonly=True, states={'draft':[('readonly',False)]}),
-        'period_id': fields.many2one('account.period', 'Period', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'narration':fields.text('Notes', readonly=True, states={'draft':[('readonly',False)]}),
-        'currency_id':fields.many2one('res.currency', 'Currency', readonly=True, states={'draft':[('readonly',False)]}),
-#        'currency_id': fields.related('journal_id','currency', type='many2one', relation='res.currency', string='Currency', store=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'state':fields.selection(
-            [('draft','Draft'),
-             ('proforma','Pro-forma'),
-             ('posted','Posted'),
-             ('cancel','Cancelled')
-            ], 'State', readonly=True, size=32,
-            help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Voucher. \
-                        \n* The \'Pro-forma\' when voucher is in Pro-forma state,voucher does not have an voucher number. \
-                        \n* The \'Posted\' state is used when user create voucher,a voucher number is generated and voucher entries are created in account \
-                        \n* The \'Cancelled\' state is used when user cancel voucher.'),
-        'amount': fields.float('Total', digits_compute=dp.get_precision('Account'), required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'tax_amount':fields.float('Tax Amount', digits_compute=dp.get_precision('Account'), readonly=True, states={'draft':[('readonly',False)]}),
-        'reference': fields.char('Ref #', size=64, readonly=True, states={'draft':[('readonly',False)]}, help="Transaction reference number."),
-        'number': fields.char('Number', size=32, readonly=True,),
-        'move_id':fields.many2one('account.move', 'Account Entry'),
-        'move_ids': fields.related('move_id','line_id', type='one2many', relation='account.move.line', string='Journal Items', readonly=True),
-        'partner_id':fields.many2one('res.partner', 'Partner', change_default=1, readonly=True, states={'draft':[('readonly',False)]}),
-        'audit': fields.related('move_id','to_check', type='boolean', relation='account.move', string='Audit Complete ?'),
-        'pay_now':fields.selection([
-            ('pay_now','Pay Directly'),
-            ('pay_later','Pay Later or Group Funds'),
-        ],'Payment', select=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'tax_id':fields.many2one('account.tax', 'Tax', readonly=True, states={'draft':[('readonly',False)]}),
-        'pre_line':fields.boolean('Previous Payments ?', required=False),
-        'date_due': fields.date('Due Date', readonly=True, select=True, states={'draft':[('readonly',False)]}),
-        'payment_option':fields.selection([
-                                           ('without_writeoff', 'Keep Open'),
-                                           ('with_writeoff', 'Reconcile with Write-Off'),
-                                           ], 'Payment Difference', required=True, readonly=True, states={'draft': [('readonly', False)]}),
-        'writeoff_acc_id': fields.many2one('account.account', 'Write-Off account', readonly=True, states={'draft': [('readonly', False)]}),
-        'comment': fields.char('Write-Off Comment', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}),
-        'analytic_id': fields.many2one('account.analytic.account','Write-Off Analytic Account', readonly=True, states={'draft': [('readonly', False)]}),
-        'writeoff_amount': fields.function(_get_writeoff_amount, method=True, string='Write-Off Amount', type='float', readonly=True),
-    }
-    _defaults = {
-        'period_id': _get_period,
-        'partner_id': _get_partner,
-        'journal_id':_get_journal,
-        'currency_id': _get_currency,
-        'reference': _get_reference,
-        'narration':_get_narration,
-        'amount': _get_amount,
-        'type':_get_type,
-        'state': 'draft',
-        'pay_now': 'pay_later',
-        'name': '',
-        'date': lambda *a: time.strftime('%Y-%m-%d'),
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher',context=c),
-        'tax_id': _get_tax,
-        'payment_option': 'without_writeoff',
-        'comment': _('Write-Off'),
-    }
-
-    def compute_tax(self, cr, uid, ids, context=None):
-        tax_pool = self.pool.get('account.tax')
-        partner_pool = self.pool.get('res.partner')
-        position_pool = self.pool.get('account.fiscal.position')
-        voucher_line_pool = self.pool.get('account.voucher.line')
-        voucher_pool = self.pool.get('account.voucher')
-        if context is None: context = {}
-
-        for voucher in voucher_pool.browse(cr, uid, ids, context=context):
-            voucher_amount = 0.0
-            for line in voucher.line_ids:
-                voucher_amount += line.untax_amount or line.amount
-                line.amount = line.untax_amount or line.amount
-                voucher_line_pool.write(cr, uid, [line.id], {'amount':line.amount, 'untax_amount':line.untax_amount})
-
-            if not voucher.tax_id:
-                self.write(cr, uid, [voucher.id], {'amount':voucher_amount, 'tax_amount':0.0})
-                continue
-
-            tax = [tax_pool.browse(cr, uid, voucher.tax_id.id, context=context)]
-            partner = partner_pool.browse(cr, uid, voucher.partner_id.id, context=context) or False
-            taxes = position_pool.map_tax(cr, uid, partner and partner.property_account_position or False, tax)
-            tax = tax_pool.browse(cr, uid, taxes, context=context)
-
-            total = voucher_amount
-            total_tax = 0.0
-
-            if not tax[0].price_include:
-                for tax_line in tax_pool.compute_all(cr, uid, tax, voucher_amount, 1).get('taxes', []):
-                    total_tax += tax_line.get('amount', 0.0)
-                total += total_tax
-            else:
-                for line in voucher.line_ids:
-                    line_total = 0.0
-                    line_tax = 0.0
-
-                    for tax_line in tax_pool.compute_all(cr, uid, tax, line.untax_amount or line.amount, 1).get('taxes', []):
-                        line_tax += tax_line.get('amount', 0.0)
-                        line_total += tax_line.get('price_unit')
-                    total_tax += line_tax
-                    untax_amount = line.untax_amount or line.amount
-                    voucher_line_pool.write(cr, uid, [line.id], {'amount':line_total, 'untax_amount':untax_amount})
-
-            self.write(cr, uid, [voucher.id], {'amount':total, 'tax_amount':total_tax})
-        return True
-
-    def onchange_price(self, cr, uid, ids, line_ids, tax_id, partner_id=False, context=None):
-        tax_pool = self.pool.get('account.tax')
-        partner_pool = self.pool.get('res.partner')
-        position_pool = self.pool.get('account.fiscal.position')
-        res = {
-            'tax_amount': False,
-            'amount': False,
-        }
-        voucher_total = 0.0
-        voucher_line_ids = []
-
-        total = 0.0
-        total_tax = 0.0
-        for line in line_ids:
-            line_amount = 0.0
-            line_amount = line[2] and line[2].get('amount',0.0) or 0.0
-            voucher_line_ids += [line[1]]
-            voucher_total += line_amount
-
-        total = voucher_total
-        total_tax = 0.0
-        if tax_id:
-            tax = [tax_pool.browse(cr, uid, tax_id, context=context)]
-            if partner_id:
-                partner = partner_pool.browse(cr, uid, partner_id, context=context) or False
-                taxes = position_pool.map_tax(cr, uid, partner and partner.property_account_position or False, tax)
-                tax = tax_pool.browse(cr, uid, taxes, context=context)
-
-            if not tax[0].price_include:
-                for tax_line in tax_pool.compute_all(cr, uid, tax, voucher_total, 1).get('taxes', []):
-                    total_tax += tax_line.get('amount')
-                total += total_tax
-
-        res.update({
-            'amount':total or voucher_total,
-            'tax_amount':total_tax
-        })
-        return {
-            'value':res
-        }
-
-    def onchange_term_id(self, cr, uid, ids, term_id, amount):
-        term_pool = self.pool.get('account.payment.term')
-        terms = False
-        due_date = False
-        default = {'date_due':False}
-        if term_id and amount:
-            terms = term_pool.compute(cr, uid, term_id, amount)
-        if terms:
-            due_date = terms[-1][0]
-            default.update({
-                'date_due':due_date
-            })
-        return {'value':default}
-
-    def onchange_journal_voucher(self, cr, uid, ids, line_ids=False, tax_id=False, price=0.0, partner_id=False, journal_id=False, ttype=False, context=None):
-        """price
-        Returns a dict that contains new values and context
-
-        @param partner_id: latest value from user input for field partner_id
-        @param args: other arguments
-        @param context: context arguments, like lang, time zone
-
-        @return: Returns a dict which contains new values, and context
-        """
-        default = {
-            'value':{},
-        }
-
-        if not partner_id or not journal_id:
-            return default
-
-        partner_pool = self.pool.get('res.partner')
-        journal_pool = self.pool.get('account.journal')
-
-        journal = journal_pool.browse(cr, uid, journal_id, context=context)
-        partner = partner_pool.browse(cr, uid, partner_id, context=context)
-        account_id = False
-        tr_type = False
-        if journal.type in ('sale','sale_refund'):
-            account_id = partner.property_account_receivable.id
-            tr_type = 'sale'
-        elif journal.type in ('purchase', 'purchase_refund','expense'):
-            account_id = partner.property_account_payable.id
-            tr_type = 'purchase'
-        else:
-            account_id = journal.default_credit_account_id.id or journal.default_debit_account_id.id
-            tr_type = 'receipt'
-
-        default['value']['account_id'] = account_id
-        default['value']['type'] = ttype or tr_type
-
-        vals = self.onchange_journal(cr, uid, ids, journal_id, line_ids, tax_id, partner_id, context)
-        default['value'].update(vals.get('value'))
-
-        return default
-
-    def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id, price, currency_id, ttype, date, context=None):
-        """price
-        Returns a dict that contains new values and context
-
-        @param partner_id: latest value from user input for field partner_id
-        @param args: other arguments
-        @param context: context arguments, like lang, time zone
-
-        @return: Returns a dict which contains new values, and context
-        """
-        if context is None:
-            context = {}
-        if not journal_id:
-            return {}
-        context_multi_currency = context.copy()
-        if date:
-            context_multi_currency.update({'date': date})
-
-        line_pool = self.pool.get('account.voucher.line')
-        line_ids = ids and line_pool.search(cr, uid, [('voucher_id', '=', ids[0])]) or False
-        if line_ids:
-            line_pool.unlink(cr, uid, line_ids)
-
-        currency_pool = self.pool.get('res.currency')
-        move_line_pool = self.pool.get('account.move.line')
-        partner_pool = self.pool.get('res.partner')
-        journal_pool = self.pool.get('account.journal')
-
-        vals = self.onchange_journal(cr, uid, ids, journal_id, [], False, partner_id, context)
-        vals = vals.get('value')
-        currency_id = vals.get('currency_id', currency_id)
-        default = {
-            'value':{'line_ids':[], 'line_dr_ids':[], 'line_cr_ids':[], 'pre_line': False, 'currency_id':currency_id},
-        }
-
-        if not partner_id:
-            return default
-
-        if not partner_id and ids:
-            line_ids = line_pool.search(cr, uid, [('voucher_id', '=', ids[0])])
-            if line_ids:
-                line_pool.unlink(cr, uid, line_ids)
-            return default
-
-        journal = journal_pool.browse(cr, uid, journal_id, context=context)
-        partner = partner_pool.browse(cr, uid, partner_id, context=context)
-        account_id = False
-        if journal.type in ('sale','sale_refund'):
-            account_id = partner.property_account_receivable.id
-        elif journal.type in ('purchase', 'purchase_refund','expense'):
-            account_id = partner.property_account_payable.id
-        else:
-            account_id = journal.default_credit_account_id.id or journal.default_debit_account_id.id
-
-        default['value']['account_id'] = account_id
-
-        if journal.type not in ('cash', 'bank'):
-            return default
-
-        total_credit = 0.0
-        total_debit = 0.0
-        account_type = 'receivable'
-        if ttype == 'payment':
-            account_type = 'payable'
-            total_debit = price or 0.0
-        else:
-            total_credit = price or 0.0
-            account_type = 'receivable'
-
-        if not context.get('move_line_ids', False):
-            domain = [('state','=','valid'), ('account_id.type', '=', account_type), ('reconcile_id', '=', False), ('partner_id', '=', partner_id)]
-            if context.get('invoice_id', False):
-	            domain.append(('invoice', '=', context['invoice_id']))
-            ids = move_line_pool.search(cr, uid, domain, context=context)    
-        else:
-            ids = context['move_line_ids']
-        ids.reverse()
-        moves = move_line_pool.browse(cr, uid, ids, context=context)
-
-        company_currency = journal.company_id.currency_id.id
-        if company_currency != currency_id and ttype == 'payment':
-            total_debit = currency_pool.compute(cr, uid, currency_id, company_currency, total_debit, context=context_multi_currency)
-        elif company_currency != currency_id and ttype == 'receipt':
-            total_credit = currency_pool.compute(cr, uid, currency_id, company_currency, total_credit, context=context_multi_currency)
-
-        for line in moves:
-            if line.credit and line.reconcile_partial_id and ttype == 'receipt':
-                continue
-            if line.debit and line.reconcile_partial_id and ttype == 'payment':
-                continue
-            total_credit += line.credit or 0.0
-            total_debit += line.debit or 0.0
-        for line in moves:
-            if line.credit and line.reconcile_partial_id and ttype == 'receipt':
-                continue
-            if line.debit and line.reconcile_partial_id and ttype == 'payment':
-                continue
-            original_amount = line.credit or line.debit or 0.0
-            amount_unreconciled = currency_pool.compute(cr, uid, line.currency_id and line.currency_id.id or company_currency, currency_id, abs(line.amount_residual_currency), context=context_multi_currency)
-            rs = {
-                'name':line.move_id.name,
-                'type': line.credit and 'dr' or 'cr',
-                'move_line_id':line.id,
-                'account_id':line.account_id.id,
-                'amount_original': currency_pool.compute(cr, uid, line.currency_id and line.currency_id.id or company_currency, currency_id, line.currency_id and abs(line.amount_currency) or original_amount, context=context_multi_currency),
-                'date_original':line.date,
-                'date_due':line.date_maturity,
-                'amount_unreconciled': amount_unreconciled,
-            }
-
-            if line.credit:
-                amount = min(amount_unreconciled, currency_pool.compute(cr, uid, company_currency, currency_id, abs(total_debit), context=context_multi_currency))
-                rs['amount'] = amount
-                total_debit -= amount
-            else:
-                amount = min(amount_unreconciled, currency_pool.compute(cr, uid, company_currency, currency_id, abs(total_credit), context=context_multi_currency))
-                rs['amount'] = amount
-                total_credit -= amount
-
-            default['value']['line_ids'].append(rs)
-            if rs['type'] == 'cr':
-                default['value']['line_cr_ids'].append(rs)
-            else:
-                default['value']['line_dr_ids'].append(rs)
-
-            if ttype == 'payment' and len(default['value']['line_cr_ids']) > 0:
-                default['value']['pre_line'] = 1
-            elif ttype == 'receipt' and len(default['value']['line_dr_ids']) > 0:
-                default['value']['pre_line'] = 1
-            default['value']['writeoff_amount'] = self._compute_writeoff_amount(cr, uid, default['value']['line_dr_ids'], default['value']['line_cr_ids'], price)
-
-        return default
-
-    def onchange_date(self, cr, uid, ids, partner_id, journal_id, price, currency_id, ttype, date, context=None):
-        """
-        @param date: latest value from user input for field date
-        @param args: other arguments
-        @param context: context arguments, like lang, time zone
-        @return: Returns a dict which contains new values, and context
-        """
-        period_pool = self.pool.get('account.period')
-        res = self.onchange_partner_id(cr, uid, ids, partner_id, journal_id, price, currency_id, ttype, date, context=context)
-        pids = period_pool.search(cr, uid, [('date_start', '<=', date), ('date_stop', '>=', date)])
-        if pids:
-            if not 'value' in res:
-                res['value'] = {}
-            res['value'].update({'period_id':pids[0]})
-        return res
-
-    def onchange_journal(self, cr, uid, ids, journal_id, line_ids, tax_id, partner_id, context=None):
-        if not journal_id:
-            return False
-        journal_pool = self.pool.get('account.journal')
-        journal = journal_pool.browse(cr, uid, journal_id, context=context)
-        account_id = journal.default_credit_account_id or journal.default_debit_account_id
-        tax_id = False
-        if account_id and account_id.tax_ids:
-            tax_id = account_id.tax_ids[0].id
-
-        vals = self.onchange_price(cr, uid, ids, line_ids, tax_id, partner_id, context)
-        vals['value'].update({'tax_id':tax_id})
-        currency_id = journal.company_id.currency_id.id
-        if journal.currency:
-            currency_id = journal.currency.id
-        vals['value'].update({'currency_id':currency_id})
-        return vals
-
-    def proforma_voucher(self, cr, uid, ids, context=None):
-        self.action_move_line_create(cr, uid, ids, context=context)
-        return True
-
-    def action_cancel_draft(self, cr, uid, ids, context=None):
-        wf_service = netsvc.LocalService("workflow")
-        for voucher_id in ids:
-            wf_service.trg_create(uid, 'account.voucher', voucher_id, cr)
-        self.write(cr, uid, ids, {'state':'draft'})
-        return True
-
-    def cancel_voucher(self, cr, uid, ids, context=None):
-        reconcile_pool = self.pool.get('account.move.reconcile')
-        move_pool = self.pool.get('account.move')
-
-        for voucher in self.browse(cr, uid, ids, context=context):
-            recs = []
-            for line in voucher.move_ids:
-                if line.reconcile_id:
-                    recs += [line.reconcile_id.id]
-                if line.reconcile_partial_id:
-                    recs += [line.reconcile_partial_id.id]
-
-            reconcile_pool.unlink(cr, uid, recs)
-
-            if voucher.move_id:
-                move_pool.button_cancel(cr, uid, [voucher.move_id.id])
-                move_pool.unlink(cr, uid, [voucher.move_id.id])
-        res = {
-            'state':'cancel',
-            'move_id':False,
-        }
-        self.write(cr, uid, ids, res)
-        return True
-
-    def unlink(self, cr, uid, ids, context=None):
-        for t in self.read(cr, uid, ids, ['state'], context=context):
-            if t['state'] not in ('draft', 'cancel'):
-                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Voucher(s) which are already opened or paid !'))
-        return super(account_voucher, self).unlink(cr, uid, ids, context=context)
-
-    # TODO: may be we can remove this method if not used anyware
-    def onchange_payment(self, cr, uid, ids, pay_now, journal_id, partner_id, ttype='sale'):
-        res = {}
-        if not partner_id:
-            return res
-        res = {'account_id':False}
-        partner_pool = self.pool.get('res.partner')
-        journal_pool = self.pool.get('account.journal')
-        if pay_now == 'pay_later':
-            partner = partner_pool.browse(cr, uid, partner_id)
-            journal = journal_pool.browse(cr, uid, journal_id)
-            if journal.type in ('sale','sale_refund'):
-                account_id = partner.property_account_receivable.id
-            elif journal.type in ('purchase', 'purchase_refund','expense'):
-                account_id = partner.property_account_payable.id
-            else:
-                account_id = journal.default_credit_account_id.id or journal.default_debit_account_id.id
-            res['account_id'] = account_id
-        return {'value':res}
-
-    def __hook_move_line_values_before_creation(self, cr, uid, move_line):
-        """
-        Change move line vals before its creation
-        """
-        return move_line
-
-    def action_move_line_create(self, cr, uid, ids, context=None):
-
-        def _get_payment_term_lines(term_id, amount):
-            term_pool = self.pool.get('account.payment.term')
-            if term_id and amount:
-                terms = term_pool.compute(cr, uid, term_id, amount)
-                return terms
-            return False
-        if context is None:
-            context = {}
-        move_pool = self.pool.get('account.move')
-        move_line_pool = self.pool.get('account.move.line')
-        currency_pool = self.pool.get('res.currency')
-        tax_obj = self.pool.get('account.tax')
-        seq_obj = self.pool.get('ir.sequence')
-        for inv in self.browse(cr, uid, ids, context=context):
-            if inv.move_id:
-                continue
-            context_multi_currency = context.copy()
-            context_multi_currency.update({'date': inv.date})
-
-            if inv.number:
-                name = inv.number
-            elif inv.journal_id.sequence_id:
-                name = seq_obj.get_id(cr, uid, inv.journal_id.sequence_id.id)
-            else:
-                raise osv.except_osv(_('Error !'), _('Please define a sequence on the journal !'))
-            if not inv.reference:
-                ref = name.replace('/','')
-            else:
-                ref = inv.reference
-
-            move = {
-                'name': name,
-                'journal_id': inv.journal_id.id,
-                'narration': inv.narration,
-                'date': inv.date,
-                'ref': ref,
-                'period_id': inv.period_id and inv.period_id.id or False
-            }
-            move_id = move_pool.create(cr, uid, move)
-
-            #create the first line manually
-            company_currency = inv.journal_id.company_id.currency_id.id
-            current_currency = inv.currency_id.id
-            debit = 0.0
-            credit = 0.0
-            # TODO: is there any other alternative then the voucher type ??
-            # -for sale, purchase we have but for the payment and receipt we do not have as based on the bank/cash journal we can not know its payment or receipt
-            if inv.type in ('purchase', 'payment'):
-                credit = currency_pool.compute(cr, uid, current_currency, company_currency, inv.amount, context=context_multi_currency)
-            elif inv.type in ('sale', 'receipt'):
-                debit = currency_pool.compute(cr, uid, current_currency, company_currency, inv.amount, context=context_multi_currency)
-            if debit < 0:
-                credit = -debit
-                debit = 0.0
-            if credit < 0:
-                debit = -credit
-                credit = 0.0
-            sign = debit - credit < 0 and -1 or 1
-            #create the first line of the voucher
-            move_line = {
-                'name': inv.name or '/',
-                'debit': debit,
-                'credit': credit,
-                'account_id': inv.account_id.id,
-                'move_id': move_id,
-                'journal_id': inv.journal_id.id,
-                'period_id': inv.period_id.id,
-                'partner_id': inv.partner_id.id,
-                'currency_id': company_currency <> current_currency and  current_currency or False,
-                'amount_currency': company_currency <> current_currency and sign * inv.amount or 0.0,
-                'date': inv.date,
-                'date_maturity': inv.date_due
-            }
-            move_line = self.__hook_move_line_values_before_creation(cr, uid, move_line)
-            move_line_pool.create(cr, uid, move_line)
-            rec_list_ids = []
-            line_total = debit - credit
-            if inv.type == 'sale':
-                line_total = line_total - currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.tax_amount, context=context_multi_currency)
-            elif inv.type == 'purchase':
-                line_total = line_total + currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.tax_amount, context=context_multi_currency)
-
-            for line in inv.line_ids: