Merge lp:~openbig/bigconsulting/account_payment_discount_ext into lp:bigconsulting

[gpa(OpenERP)]

=== modified file 'account_payment_discount_extension/account_payment_discount.py'
--- account_payment_discount_extension/account_payment_discount.py	2010-08-23 08:21:01 +0000
+++ account_payment_discount_extension/account_payment_discount.py	2010-08-26 12:51:47 +0000
@@ -48,7 +48,14 @@
                     delay = payment_data[0].delay
                     self.write(cr, uid, [inv.id], {'next_payment_date':(datetime.now() + relativedelta(days=delay)).strftime('%Y-%m-%d')})
         return data
-        
+    
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        default = default.copy()
+        default.update({'next_payment_date':False})
+        return super(account_invoice, self).copy(cr, uid, id, default, context)
+
 account_invoice()
 
 class payment_line(osv.osv):
 
=== modified file 'account_payment_discount_extension/account_payment_discount_view.xml'
--- account_payment_discount_extension/account_payment_discount_view.xml	2010-08-23 07:25:41 +0000
+++ account_payment_discount_extension/account_payment_discount_view.xml	2010-08-26 12:51:47 +0000
@@ -34,7 +34,7 @@
             <field name="inherit_id" ref="account_payment_extension.view_payment_order_form_ext1"/>
             <field name="arch" type="xml">
                 <xpath expr="//button[@string='Select invoices to pay/receive payment']" position="replace">
-                        <button name="%(wizard_populate_payment_ext111)d"  string="Select invoices to pay/receive payment" type="action" attrs="{'invisible':[('state','=','done')]}"/>
+                        <button name="%(wizard_populate_payment_discount_ext)d"  string="Select invoices to pay/receive payment" type="action" attrs="{'invisible':[('state','=','done')]}"/>
                 </xpath>
             </field>
         </record>
@@ -49,7 +49,6 @@
                     <field name="cash_discount" />
                     <field name="discount_date" />
                     <field name="pay_amount" />
-                    <label stirng=""/>
                 </xpath>
             </field>
         </record>
@@ -58,7 +57,7 @@
             <field name="name">payment.order.form1</field>
             <field name="model">payment.order</field>
             <field name="inherit_id" ref="account_payment.view_payment_order_form"/>
-            <field name="type">form</field>
+            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <xpath expr="//tree/field[@name='amount']" position="after">
                     <field name="cash_discount" />
@@ -81,5 +80,17 @@
             </field>
         </record>
         
+        <record id="view_payment_order_wizard_form" model="ir.ui.view">
+            <field name="name">payment.order.form1</field>
+            <field name="model">payment.order</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account_payment.view_payment_order_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//button[@string='Make Payments']" position="replace">
+                        <button name="%(wizard_pay_discount_payment)d"  states="open" string="Make Payments" type="action" />
+                </xpath>
+            </field>
+        </record>
+        
     </data>
 </openerp>
 
=== modified file 'account_payment_discount_extension/account_payment_disocunt_wizard.xml'
--- account_payment_discount_extension/account_payment_disocunt_wizard.xml	2010-08-23 08:19:07 +0000
+++ account_payment_discount_extension/account_payment_disocunt_wizard.xml	2010-08-26 12:51:47 +0000
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <wizard id="wizard_populate_payment_ext111" menu="True" model="payment.order" name="populate_payment_ext_filter" string="Populate payment to pay"/>
+        <wizard id="wizard_populate_payment_discount_ext" menu="False" model="payment.order" name="populate_payment_discount_ext" string="Populate payment to pay"/>
+        <wizard id="wizard_pay_discount_payment" menu="False" model="payment.order" name="pay_discount_payment" string="Pay"/>
     </data>
 </openerp>
 
=== modified file 'account_payment_discount_extension/wizard/__init__.py'
--- account_payment_discount_extension/wizard/__init__.py	2010-08-20 12:17:29 +0000
+++ account_payment_discount_extension/wizard/__init__.py	2010-08-26 12:51:47 +0000
@@ -20,7 +20,8 @@
 #
 ##############################################################################
 
-import wizard_payment_order1
+import wizard_payment_discount_order
+import wizard_discount_pay
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
 
=== added file 'account_payment_discount_extension/wizard/wizard_discount_pay.py'
--- account_payment_discount_extension/wizard/wizard_discount_pay.py	1970-01-01 00:00:00 +0000
+++ account_payment_discount_extension/wizard/wizard_discount_pay.py	2010-08-26 12:51:47 +0000
@@ -0,0 +1,80 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution  
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import wizard
+from osv import osv
+import pooler
+from osv import fields
+import time
+
+
+def _launch_wizard(self, cr, uid, data, context):
+    """
+    Search for a wizard to launch according to the type.
+    If type is manual. just confirm the order.
+    """
+    pool = pooler.get_pool(cr.dbname)
+    order_ref = pool.get('payment.order')
+    order_line = pool.get('payment.line')
+    order = order_ref.browse(cr,uid,data['id'],context)
+    invoice_obj = pool.get('account.invoice')
+    
+    t= order.mode and order.mode.type.code or 'manual'
+    if t == 'manual' :
+        order_ref.set_done(cr,uid,data['id'],context)
+        return {}
+   
+    journal_id = order.mode.journal.id
+    period_ids = pool.get('account.period').find(cr, uid, context=context)
+
+    for pay_line in order.line_ids:
+        invoice_data = invoice_obj.browse(cr, uid, pay_line.move_line_id.invoice.id, context=context)
+        account_id = order.mode.journal.default_credit_account_id and order.mode.journal.default_credit_account_id.id  #invoice_data.partner_id.property_account_payable.id
+        invoice_obj.pay_and_reconcile(cr, uid, [invoice_data.id],
+                   pay_line.amount_currency, account_id, period_ids[0], journal_id, False,
+                    period_ids[0], journal_id, context, pay_line.name)
+
+    gw = order_ref.get_wizard(t)
+    if not gw:
+        order_ref.set_done(cr,uid,data['id'],context)
+        return {}       
+
+    mod_obj = pool.get('ir.model.data')
+    act_obj = pool.get('ir.actions.wizard')
+    module, wizard= gw
+    result = mod_obj._get_id(cr, uid, module, wizard)
+    id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
+    result = act_obj.read(cr, uid, [id])[0]
+    #result['context'] = str({'fiscalyear': data['form']['fiscalyear']})
+    return result
+
+class wizard_pay(wizard.interface):
+
+    states= {'init' : {'actions': [],       
+                       'result':{'type':'action',
+                                 'action':_launch_wizard,
+                                 'state':'end'}
+                       }
+             }
+wizard_pay('pay_discount_payment')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'account_payment_discount_extension/wizard/wizard_payment_discount_order.py'
--- account_payment_discount_extension/wizard/wizard_payment_discount_order.py	1970-01-01 00:00:00 +0000
+++ account_payment_discount_extension/wizard/wizard_payment_discount_order.py	2010-08-26 12:51:47 +0000
@@ -0,0 +1,217 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import wizard
+import pooler
+from tools.misc import UpdateableStr
+import time
+
+
+FORM = UpdateableStr()
+
+FIELDS = {
+    'entries': {'string':'Entries', 'type':'many2many', 'relation':'account.move.line',},
+    'communication2': {'string':'Communication 2', 'type':'char', 'size': 64, 'help':'The successor message of payment communication.'},
+}
+
+field_duedate={
+    'duedate': {'string':'Due Date', 'type':'date','required':True, 'default': lambda *a: time.strftime('%Y-%m-%d'),},
+    'amount': {'string':'Amount', 'type':'float', 'help': 'Next step will automatically select payments up to this amount.'}
+    }
+arch_duedate='''<?xml version="1.0" encoding="utf-8"?>
+<form string="Search Payment lines" col="2">
+    <field name="duedate" />
+    <field name="amount" />
+</form>'''
+
+
+def search_entries(self, cr, uid, data, context):
+
+    search_due_date = data['form']['duedate']
+    pool = pooler.get_pool(cr.dbname)
+    order_obj = pool.get('payment.order')
+    line_obj = pool.get('account.move.line')
+    invoice_obj = pool.get('account.invoice')
+    payment = order_obj.browse(cr, uid, data['id'],
+            context=context)
+    ctx = ''
+    if payment.mode:
+        ctx = '''context="{'journal_id': %d}"''' % payment.mode.journal.id
+
+    # Search for move line to pay:
+    domain = [('reconcile_id', '=', False),('account_id.type', '=', payment.type)]#,('account_id.type', '=', payment.type),('amount_to_pay', '<>', 0)]
+#    domain = domain + ['|',('date_maturity','<',search_due_date),('date_maturity','=',False)]
+    #if payment.mode:
+     #   domain = [('payment_type','=',payment.mode.type.id)] + domain
+    sel_line_ids = line_obj.search(cr, uid, domain, order='date_maturity', context=context)
+    line_ids = []    
+
+    for line in line_obj.browse(cr, uid, sel_line_ids, context):
+        if line.invoice.id:
+            invoice_data = invoice_obj.browse(cr, uid, line.invoice.id, context=context)
+            if invoice_data.next_payment_date:
+                if invoice_data.next_payment_date >=search_due_date:
+                    line_ids.append(line.id)
+    
+    FORM.string = '''<?xml version="1.0" encoding="utf-8"?>
+<form string="Populate Payment:">
+    <field name="entries" colspan="4" height="300" width="800" nolabel="1"
+        domain="[('id', 'in', [%s])]" %s/>
+    <separator string="Extra message of payment communication" colspan="4"/>
+    <field name="communication2" colspan="4"/>
+</form>''' % (','.join([str(x) for x in line_ids]), ctx)
+
+    selected_ids = []
+    amount = data['form']['amount']
+    if amount:
+        if payment.mode and payment.mode.require_bank_account:
+            line2bank = line_obj.line2bank(cr, uid, line_ids, payment.mode.id, context)
+        else:
+            line2bank = None
+        # If user specified an amount, search what moves match the criteria taking into account
+        # if payment mode allows bank account to be null.
+        for line in line_obj.browse(cr, uid, line_ids, context):
+            if abs(line.amount_to_pay) <= amount:
+                if line2bank and not line2bank.get(line.id):
+                    continue
+                amount -= abs(line.amount_to_pay)
+                selected_ids.append(line.id)
+    return {
+        'entries': selected_ids,
+    }
+
+def create_payment(self, cr, uid, data, context):
+    line_ids= data['form']['entries'][0][2]
+    if not line_ids: return {}
+
+    pool= pooler.get_pool(cr.dbname)
+    order_obj = pool.get('payment.order')
+    order_line_obj = pool.get('payment.line')
+    line_obj = pool.get('account.move.line')
+    invoice_obj = pool.get('account.invoice')
+    payment_term_obj = pool.get('account.payment.term')
+    
+    tax_obj = pool.get('account.tax')
+    invoice_tax_obj = pool.get("account.invoice.tax")
+   
+    payment = order_obj.browse(cr, uid, data['id'],
+            context=context)
+    t = payment.mode and payment.mode.type.id or None
+    line2bank = pool.get('account.move.line').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):
+        invoice_data = invoice_obj.browse(cr, uid, line.invoice.id, context=context)
+        discount = 0.0
+        account = False
+        payment_data = payment_term_obj.browse(cr, uid, invoice_data.payment_term.id).cash_discount_ids
+        
+        if payment_data:
+            cash_discount = payment_data[0].discount
+            discount = invoice_data.amount_total * cash_discount /100
+            account =payment_data[0].sup_discount_account_id.id
+        dis_next_date = invoice_data.next_payment_date
+
+        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_planned
+            
+        order_line_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 and line.name!='/' and line.ref+'. '+line.name) or line.ref or line.name or '/',
+            'communication2': data['form']['communication2'],
+            'date': date_to_pay,
+            'currency': line.invoice and line.invoice.currency_id.id or False,
+            'account_id': line.account_id.id,
+            'cash_discount':discount,
+            'discount_date':dis_next_date,
+            'pay_amount':(line.amount_to_pay-discount),
+            }, context=context)
+        
+    return {}
+
+def _get_defaults(self, cr, uid, data, context):
+    pool= pooler.get_pool(cr.dbname)
+    order_obj = pool.get('payment.order')
+    plan_date = order_obj.browse(cr, uid, data['id'], context=context).date_planned
+    data['form']['duedate'] = plan_date
+    return data['form']
+
+class wizard_payment_order(wizard.interface):
+    """
+    Create a payment object with lines corresponding to the account move line
+    to pay according to the date provided by the user and the mode-type payment of the order.
+    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 move lines are ignored.
+    """
+    states = {
+
+        'init': {
+            'actions': [_get_defaults],
+            'result': {
+                'type': 'form',
+                'arch': arch_duedate,
+                'fields':field_duedate,
+                'state': [
+                    ('end','_Cancel'),
+                    ('search','_Search', '', True)
+                ]
+            },
+         },
+
+        'search': {
+            'actions': [search_entries],
+            'result': {
+                'type': 'form',
+                'arch': FORM,
+                'fields': FIELDS,
+                'state': [
+                    ('end','_Cancel'),
+                    ('create','_Add to payment order', '', True)
+                ]
+            },
+         },
+        'create': {
+            'actions': [],
+            'result': {
+                'type': 'action',
+                'action': create_payment,
+                'state': 'end'}
+            },
+        }
+
+wizard_payment_order('populate_payment_discount_ext')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 \ No newline at end of file
 
=== removed file 'account_payment_discount_extension/wizard/wizard_payment_order1.py'
--- account_payment_discount_extension/wizard/wizard_payment_order1.py	2010-08-23 08:19:07 +0000
+++ account_payment_discount_extension/wizard/wizard_payment_order1.py	1970-01-01 00:00:00 +0000
@@ -1,205 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import pooler
-from tools.misc import UpdateableStr
-import time
-
-
-FORM = UpdateableStr()
-
-FIELDS = {
-    'entries': {'string':'Entries', 'type':'many2many', 'relation':'account.move.line',},
-    'communication2': {'string':'Communication 2', 'type':'char', 'size': 64, 'help':'The successor message of payment communication.'},
-}
-
-field_duedate={
-    'duedate': {'string':'Due Date', 'type':'date','required':True, 'default': lambda *a: time.strftime('%Y-%m-%d'),},
-    'amount': {'string':'Amount', 'type':'float', 'help': 'Next step will automatically select payments up to this amount.'}
-    }
-arch_duedate='''<?xml version="1.0" encoding="utf-8"?>
-<form string="Search Payment lines" col="2">
-    <field name="duedate" />
-    <field name="amount" />
-</form>'''
-
-
-def search_entries(self, cr, uid, data, context):
-
-    search_due_date = data['form']['duedate']
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('payment.order')
-    line_obj = pool.get('account.move.line')
-    invoice_obj = pool.get('account.invoice')
-    payment = order_obj.browse(cr, uid, data['id'],
-            context=context)
-    ctx = ''
-    if payment.mode:
-        ctx = '''context="{'journal_id': %d}"''' % payment.mode.journal.id
-
-    # Search for move line to pay:
-    domain = [('reconcile_id', '=', False)]#,('account_id.type', '=', payment.type),('amount_to_pay', '<>', 0)]
-#    domain = domain + ['|',('date_maturity','<',search_due_date),('date_maturity','=',False)]
-    #if payment.mode:
-     #   domain = [('payment_type','=',payment.mode.type.id)] + domain
-    sel_line_ids = line_obj.search(cr, uid, domain, order='date_maturity', context=context)
-    line_ids = []    
-
-    for line in line_obj.browse(cr, uid, sel_line_ids, context):
-        if line.invoice.id:
-            invoice_data = invoice_obj.browse(cr, uid, line.invoice.id, context=context)
-            if invoice_data.next_payment_date:
-                if invoice_data.next_payment_date >=search_due_date:
-                    line_ids.append(line.id)
-    
-    FORM.string = '''<?xml version="1.0" encoding="utf-8"?>
-                        <form string="Populate Payment:">
-                            <field name="entries" colspan="4" height="300" width="800" nolabel="1"
-                                domain="[('id', 'in', [%s])]" %s/>
-                            <separator string="Extra message of payment communication" colspan="4"/>
-                            <field name="communication2" colspan="4"/>
-                        </form>''' % (','.join([str(x) for x in line_ids]), ctx)
-
-    selected_ids = []
-    amount = data['form']['amount']
-    if amount:
-        if payment.mode and payment.mode.require_bank_account:
-            line2bank = line_obj.line2bank(cr, uid, line_ids, payment.mode.id, context)
-        else:
-            line2bank = None
-        # If user specified an amount, search what moves match the criteria taking into account
-        # if payment mode allows bank account to be null.
-        for line in line_obj.browse(cr, uid, line_ids, context):
-            if abs(line.amount_to_pay) <= amount:
-                if line2bank and not line2bank.get(line.id):
-                    continue
-                amount -= abs(line.amount_to_pay)
-                selected_ids.append(line.id)
-    return {
-        'entries': selected_ids,
-    }
-
-def create_payment(self, cr, uid, data, context):
-    line_ids= data['form']['entries'][0][2]
-    if not line_ids: return {}
-
-    pool= pooler.get_pool(cr.dbname)
-    order_obj = pool.get('payment.order')
-    line_obj = pool.get('account.move.line')
-    invoice_obj = pool.get('account.invoice')
-    payment_term_obj = pool.get('account.payment.term')
-    payment_line = pool.get('payment.line')
-    payment = order_obj.browse(cr, uid, data['id'],
-            context=context)
-    t = payment.mode and payment.mode.type.id or 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):
-
-        invoice_data = invoice_obj.browse(cr, uid, line.invoice.id, context=context)
-        discount = 0.0
-        payment_data = payment_term_obj.browse(cr, uid, invoice_data.payment_term.id).cash_discount_ids
-        if payment_data:
-            cash_discount = payment_data[0].discount
-            discount = invoice_data.amount_total * cash_discount /100
-        dis_next_date = invoice_data.next_payment_date
-
-        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_planned
-        
-        payment_line.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 and line.name!='/' and line.ref+'. '+line.name) or line.ref or line.name or '/',
-            'communication2': data['form']['communication2'],
-            'date': date_to_pay,
-            'currency': line.invoice and line.invoice.currency_id.id or False,
-            'account_id': line.account_id.id,
-            'cash_discount':discount,
-            'discount_date':dis_next_date,
-            'pay_amount':(line.amount_to_pay+discount),
-            }, context=context)
-        
-    return {}
-
-
-class wizard_payment_order(wizard.interface):
-    """
-    Create a payment object with lines corresponding to the account move line
-    to pay according to the date provided by the user and the mode-type payment of the order.
-    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 move lines are ignored.
-    """
-    states = {
-
-        'init': {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': arch_duedate,
-                'fields':field_duedate,
-                'state': [
-                    ('end','_Cancel'),
-                    ('search','_Search', '', True)
-                ]
-            },
-         },
-
-        'search': {
-            'actions': [search_entries],
-            'result': {
-                'type': 'form',
-                'arch': FORM,
-                'fields': FIELDS,
-                'state': [
-                    ('end','_Cancel'),
-                    ('create','_Add to payment order', '', True)
-                ]
-            },
-         },
-        'create': {
-            'actions': [],
-            'result': {
-                'type': 'action',
-                'action': create_payment,
-                'state': 'end'}
-            },
-        }
-
-wizard_payment_order('populate_payment_ext_filter')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: