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

[gpa(OpenERP)]

added new module account_payment_discount_extension

[lp:~openbig/bigconsulting/account_payment_discount_extension]

80. By gpa(OpenERP) on 2010-08-23

solve the error when using min profile

Unmerged revisions

=== added directory 'account_payment_discount_extension'
=== added file 'account_payment_discount_extension/__init__.py'
--- account_payment_discount_extension/__init__.py	1970-01-01 00:00:00 +0000
+++ account_payment_discount_extension/__init__.py	2010-08-23 07:27:42 +0000
@@ -0,0 +1,24 @@
+# -*- 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 account_payment_discount
+import wizard
\ No newline at end of file

=== added file 'account_payment_discount_extension/__terp__.py'
--- account_payment_discount_extension/__terp__.py	1970-01-01 00:00:00 +0000
+++ account_payment_discount_extension/__terp__.py	2010-08-23 07:27:42 +0000
@@ -0,0 +1,42 @@
+# -*- 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/>.
+#
+##############################################################################
+
+{
+    "name" : "Account Payment Discount Extension",
+    "version" : "1.1",
+    "author" : "Big Consulting",
+    "website" : "http://www.openbig.org",
+    "category" : "Generic Modules/Accounting",
+    "license" : "GPL-3",
+    "depends" : ["base","account","account_invoice_cash_discount","account_payment_extension",],
+    "init_xml" : [
+    ],
+    "demo_xml" : [
+    ],
+    "update_xml" : [
+            "account_payment_disocunt_wizard.xml",
+            "account_payment_discount_view.xml",
+            ],
+    "active": False,
+    "installable": True,
+}
+

=== added file 'account_payment_discount_extension/account_payment_discount.py'
--- account_payment_discount_extension/account_payment_discount.py	1970-01-01 00:00:00 +0000
+++ account_payment_discount_extension/account_payment_discount.py	2010-08-23 07:27:42 +0000
@@ -0,0 +1,62 @@
+# -*- 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 netsvc
+from osv import fields, osv
+import time
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+
+
+class payment_order(osv.osv):
+    _inherit='payment.order'
+    _columns={
+        'inter_bank_journal': fields.many2one('account.journal', 'Intermediate Band Journal', required=False),
+    }
+payment_order()
+
+class account_invoice(osv.osv):
+    _inherit='account.invoice'
+    _columns={
+        'next_payment_date': fields.date('Next Payment Date', states={'open':[('readonly',True)],'close':[('readonly',True)]},),
+    }
+    def action_date_assign(self, cr, uid, ids, *args):
+        data = super(account_invoice,self).action_date_assign(cr, uid, ids, *args)
+        for inv in self.browse(cr, uid, ids):
+            if inv.payment_term.id:
+                payment_data = self.pool.get('account.payment.term').browse(cr, uid, inv.payment_term.id).cash_discount_ids
+                if payment_data:
+                    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
+        
+account_invoice()
+
+class payment_line(osv.osv):
+    _name = 'payment.line'
+    _inherit = 'payment.line'
+    _columns = {
+        'cash_discount': fields.float('Cash Discount'),
+        'discount_date': fields.date('Discount Date'),
+        'pay_amount': fields.float('Pay Amount'),
+    }
+payment_line()
\ No newline at end of file

=== added file 'account_payment_discount_extension/account_payment_discount_view.xml'
--- account_payment_discount_extension/account_payment_discount_view.xml	1970-01-01 00:00:00 +0000
+++ account_payment_discount_extension/account_payment_discount_view.xml	2010-08-23 07:27:42 +0000
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+        <record model="ir.ui.view" id="invoice_customer_form_inherit11">
+            <field name="name">account.invoice.customer.form.inherit</field>
+            <field name="model">account.invoice</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="arch" type="xml">
+                <field name="date_due" position="after">
+                    <field name="next_payment_date" />
+                </field>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="invoice_supplier_form_inherit11">
+		        <field name="name">account.invoice.supplier.form.inherit</field>
+		        <field name="model">account.invoice</field>
+		        <field name="type">form</field>
+		        <field name="inherit_id" ref="account.invoice_supplier_form"/>
+		        <field name="priority">2</field>
+		        <field name="arch" type="xml">
+		            <field name="number" position="before">
+		                <field name="next_payment_date" />
+		            </field>
+		        </field>
+        </record>
+
+        <record id="view_payment_order_form_wizard_ext" model="ir.ui.view">
+            <field name="name">payment.order.form.ext11</field>
+            <field name="model">payment.order</field>
+            <field name="type">form</field>
+            <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')]}"/>
+                </xpath>
+            </field>
+        </record>
+        
+         <record model="ir.ui.view" id="view_payment_order_form1">
+            <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="arch" type="xml">
+                <xpath expr="//field[@name='partner_id']" position="before">
+                    <field name="cash_discount" />
+                    <field name="discount_date" />
+                    <field name="pay_amount" />
+                    <label stirng=""/>
+                </xpath>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_payment_order_tree1">
+            <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="arch" type="xml">
+                <xpath expr="//tree/field[@name='amount']" position="after">
+                    <field name="cash_discount" />
+                    <field name="discount_date" />
+                    <field name="pay_amount" />
+                    <label stirng=""/>
+                </xpath>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_payment_order_bank_form1">
+            <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="arch" type="xml">
+                <field name="user_id" position="after">
+                    <field name="inter_bank_journal" required="True"/>
+                </field>
+            </field>
+        </record>
+        
+    </data>
+</openerp>

=== added file 'account_payment_discount_extension/account_payment_disocunt_wizard.xml'
--- account_payment_discount_extension/account_payment_disocunt_wizard.xml	1970-01-01 00:00:00 +0000
+++ account_payment_discount_extension/account_payment_disocunt_wizard.xml	2010-08-23 07:27:42 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <wizard id="wizard_populate_payment_ext111" menu="True" model="payment.order" name="populate_payment_ext111" string="Populate payment to pay2222"/>
+    </data>
+</openerp>

=== added directory 'account_payment_discount_extension/wizard'
=== added file 'account_payment_discount_extension/wizard/__init__.py'
--- account_payment_discount_extension/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ account_payment_discount_extension/wizard/__init__.py	2010-08-23 07:27:42 +0000
@@ -0,0 +1,26 @@
+# -*- 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_payment_order1
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== added file 'account_payment_discount_extension/wizard/wizard_payment_order1.py'
--- account_payment_discount_extension/wizard/wizard_payment_order1.py	1970-01-01 00:00:00 +0000
+++ account_payment_discount_extension/wizard/wizard_payment_order1.py	2010-08-23 07:27:42 +0000
@@ -0,0 +1,204 @@
+# -*- 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 pool.get('account.move.line').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 = pool.get('account.move.line').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 pool.get('account.move.line').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 = 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
+        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
+        
+        pool.get('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_ext111')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: