Merge lp:~openerp-dev/openobject-addons/trunk-paypal-sub-ins-sgo into lp:openobject-addons

[Thibault Delavallée (OpenERP)]

[WIP]

Unmerged revisions

8919. By Sanjay Gohel (Open ERP) on 2013-10-24

[MERGE]merge with parent

8918. By Sanjay Gohel (Open ERP) on 2013-10-08

[MERGE]sync with trunk

8917. By Sanjay Gohel (Open ERP) on 2013-10-08

[IMP]improve paypal installment

8916. By Sanjay Gohel (Open ERP) on 2013-09-27

[ADD]add paypal icon for installment

8915. By Sanjay Gohel (Open ERP) on 2013-09-26

[MERGE]sync with trunk

8914. By Sanjay Gohel (Open ERP) on 2013-09-26

[IMP]change string for field and help for fields as per new specificatin and give proper variable name. add compute method selection field for payment term line. add on change for it

8913. By Sanjay Gohel (Open ERP) on 2013-09-20

[MERGE]merge old paypal installment branch from which i can use it for new development

=== modified file 'account/account.py'
--- account/account.py	2013-10-09 18:03:37 +0000
+++ account/account.py	2013-10-24 15:18:27 +0000
@@ -55,6 +55,7 @@
         level -= 1
     return True
 
+COMPUTE_METHOD = [('other','Other')]
 class account_payment_term(osv.osv):
     _name = "account.payment.term"
     _description = "Payment Term"
@@ -63,12 +64,23 @@
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the payment term without removing it."),
         'note': fields.text('Description', translate=True),
         'line_ids': fields.one2many('account.payment.term.line', 'payment_id', 'Terms'),
+        'compute_method': fields.selection (COMPUTE_METHOD, "Compute Method")
     }
     _defaults = {
         'active': 1,
+        'compute_method': 'other',
     }
     _order = "name"
 
+    def _get_next_date(self, date_ref, term_line):
+        next_date = (datetime.strptime(date_ref, '%Y-%m-%d') + relativedelta(days=term_line.days))
+        if term_line.days2 < 0:
+            next_first_date = next_date + relativedelta(day=1,months=1) #Getting 1st of next month
+            next_date = next_first_date + relativedelta(days=term_line.days2)
+        if term_line.days2 > 0:
+            next_date += relativedelta(day=term_line.days2, months=1)
+        return next_date
+
     def compute(self, cr, uid, id, value, date_ref=False, context=None):
         if not date_ref:
             date_ref = datetime.now().strftime('%Y-%m-%d')
@@ -80,18 +92,12 @@
         for line in pt.line_ids:
             if line.value == 'fixed':
                 amt = round(line.value_amount, prec)
-            elif line.value == 'procent':
+            elif line.value == 'percent':
                 amt = round(value * line.value_amount, prec)
             elif line.value == 'balance':
                 amt = round(amount, prec)
             if amt:
-                next_date = (datetime.strptime(date_ref, '%Y-%m-%d') + relativedelta(days=line.days))
-                if line.days2 < 0:
-                    next_first_date = next_date + relativedelta(day=1,months=1) #Getting 1st of next month
-                    next_date = next_first_date + relativedelta(days=line.days2)
-                if line.days2 > 0:
-                    next_date += relativedelta(day=line.days2, months=1)
-                result.append( (next_date.strftime('%Y-%m-%d'), amt) )
+                result.append( (self._get_next_date(date_ref, line).strftime('%Y-%m-%d'), amt) )
                 amount -= amt
 
         amount = reduce(lambda x,y: x+y[1], result, 0.0)
@@ -104,27 +110,38 @@
     _name = "account.payment.term.line"
     _description = "Payment Term Line"
     _columns = {
-        'value': fields.selection([('procent', 'Percent'),
-                                   ('balance', 'Balance'),
-                                   ('fixed', 'Fixed Amount')], 'Computation',
-                                   required=True, help="""Select here the kind of valuation related to this payment term line. Note that you should have your last line with the type 'Balance' to ensure that the whole amount will be treated."""),
+        'value': fields.selection([('fixed', 'Fixed Amount'),
+                                   ('percent', 'Percentage'),
+                                   ('balance', 'Balance')], 'Pay',
+                                   required=True, help="Specify how to compute the amount to be paid with this payment term line. Make sure to always have ‘Balance’ in the last line of a payment term to insure full payment of the invoice."),
 
-        'value_amount': fields.float('Amount To Pay', digits_compute=dp.get_precision('Payment Term'), help="For percent enter a ratio between 0-1."),
-        'days': fields.integer('Number of Days', required=True, help="Number of days to add before computation of the day of month." \
-            "If Date=15/01, Number of Days=22, Day of Month=-1, then the due date is 28/02."),
-        'days2': fields.integer('Day of the Month', required=True, help="Day of the month, set -1 for the last day of the current month. If it's positive, it gives the day of the next month. Set 0 for net days (otherwise it's based on the beginning of the month)."),
+        'value_amount': fields.float('Fixed Amount', digits_compute=dp.get_precision('Payment Term'), help="For percent enter a ratio between 0-1."),
+        'days': fields.integer('Number of days to add after invoice date', required=True, help="Number of net days to add the invoice date to compute the due date."),
+        'days2': fields.integer('Day of the month', required=True, help="Day of the month, set -1 for the last day of the current month. If it's positive, it gives the day of the next month. Set 0 for net days (otherwise it's based on the beginning of the month)."),
         'payment_id': fields.many2one('account.payment.term', 'Payment Term', required=True, select=True, ondelete='cascade'),
+        'compute_due_date': fields.selection([('fixed',"in a fixed amount of days after invoice date (Net on receipt, Net 30…)"),('end_of_month',"end of month based on invoice date (Net E.O.M.)"), ('other',"Other")], string="Due date is")
     }
     _defaults = {
         'value': 'balance',
         'days': 30,
         'days2': 0,
+        'compute_due_date': 'other'
     }
     _order = "value desc,days"
 
+    def onchange_compute_due_date(self, cr, uid, ids, compute_due_date, context=None):
+        res = {}
+        if not compute_due_date:
+            return res
+        if compute_due_date == 'fixed':
+            res['value'] = {'days': 30, 'days2' : 0}
+        if compute_due_date == 'end_of_month':
+            res['value'] = {'days': 0, 'days2' : -1}
+        return res
+
     def _check_percent(self, cr, uid, ids, context=None):
         obj = self.browse(cr, uid, ids[0], context=context)
-        if obj.value == 'procent' and ( obj.value_amount < 0.0 or obj.value_amount > 1.0):
+        if obj.value == 'percent' and ( obj.value_amount < 0.0 or obj.value_amount > 1.0):
             return False
         return True
 

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2013-09-23 17:13:10 +0000
+++ account/account_invoice.py	2013-10-24 15:18:27 +0000
@@ -955,7 +955,7 @@
                 for line in inv.payment_term.line_ids:
                     if line.value == 'fixed':
                         total_fixed += line.value_amount
-                    if line.value == 'procent':
+                    if line.value == 'percent':
                         total_percent += line.value_amount
                 total_fixed = (total_fixed * 100) / (inv.amount_total or 1.0)
                 if (total_fixed + total_percent) > 100:

=== modified file 'account/account_view.xml'
--- account/account_view.xml	2013-09-12 13:20:32 +0000
+++ account/account_view.xml	2013-10-24 15:18:27 +0000
@@ -1594,20 +1594,42 @@
             <field name="model">account.payment.term.line</field>
             <field name="arch" type="xml">
                 <form string="Payment Term" version="7.0">
-                    <group>
-                        <group string="Amount Computation">
-	                        <field name="value"/>
+                        <group string="Amount Computation" col="4">
+	                        <field name="value" class="oe_inline"/>
 	                        <label for="value_amount" string="Amount To Pay"  attrs="{'invisible':[('value','=','balance')]}"/>
 	                        <div attrs="{'invisible':[('value','=','balance')]}">
 	                            <field name="value_amount" class="oe_inline"/>
-	                            <label string="%%" class="oe_inline" attrs="{'invisible':['!',('value','=','procent')]}" />
+	                            <label string="%%" class="oe_inline" attrs="{'invisible':['!',('value','=','percent')]}" />
 	                        </div>
                         </group>
-                        <group string="Due Date Computation">
-                            <field name="days"/>
-                            <field name="days2"/>
+                        <group name="Due Date Computation" string="Due Date Computation">
+                            <field name="compute_due_date" on_change="onchange_compute_due_date(compute_due_date)" class="oe_inline"/>
+                            <field name="days" attrs="{'invisible':[('compute_due_date','=','end_of_month')]}"/>
+                            <field name="days2" attrs="{'invisible':['|','|',('value','=','percent'),('compute_due_date','=','fixed'),('compute_due_date','=','end_of_month')]}"/>
                         </group>
-                    </group>
+                        <div style="color: grey;" attrs="{'invisible':['|',('compute_due_date','=','fixed'),('compute_due_date','=','end_of_month')]}">
+                            <ul>
+                                <li>Set 0 for net days (you can also use the ‘in a fixed amount of days after invoice date…’ option).</li> 
+                                <li>Set -1 for last day of the month, where month is the month of [invoice date + ‘Number of days to add after invoice date’].</li>  
+                                <li>Set 1 for first day of the next month, where next month is the month after [invoice date + ‘Number of days to add after invoice date’].</li>
+                                <li> Example 1:
+                                    <ul>
+                                        <li>Invoice date = August 21st</li> 
+                                        <li>Number of days to add after invoice date = 12</li>
+                                        <li>Day of the month = -1</li> 
+                                        <li>Then due date = September 30th</li> 
+                                    </ul>
+                                </li>
+                                <li>Example 2:
+                                    <ul>
+                                        <li>Invoice date = August 21st </li>
+                                        <li>Number of days to add after invoice date = 12</li> 
+                                        <li>Day of the month = 2</li> 
+                                        <li>Then due date = October 2d</li>
+                                    </ul>
+                                 </li>
+                           </ul>
+                        </div>
                 </form>
             </field>
         </record>
@@ -1629,6 +1651,7 @@
                     <group col="4">
                         <field name="name"/>
                         <field name="active"/>
+                        <field name="compute_method"/>
                     </group>
                     <field name="note" placeholder="Payment term explanation for the customer..."/>
                     <separator string="Computation"/>

=== modified file 'account/demo/account_demo.xml'
--- account/demo/account_demo.xml	2013-03-14 14:53:37 +0000
+++ account/demo/account_demo.xml	2013-10-24 15:18:27 +0000
@@ -146,7 +146,7 @@
             <field name="note">30% Advance End 30 Days</field>
         </record>
         <record id="account_payment_term_line_advance1" model="account.payment.term.line">
-            <field name="value">procent</field>
+            <field name="value">percent</field>
             <field eval="0.300000" name="value_amount"/>
             <field eval="0" name="days"/>
             <field eval="0" name="days2"/>

=== modified file 'account/edi/invoice.py'
--- account/edi/invoice.py	2013-07-30 09:16:43 +0000
+++ account/edi/invoice.py	2013-10-24 15:18:27 +0000
@@ -259,21 +259,25 @@
             pass
         return action
 
+    def _prepare_paypal_params(self, inv):
+        params = {
+            "cmd": "_xclick",
+            "business": inv.company_id.paypal_account,
+            "item_name": inv.company_id.name + " Invoice " + inv.number,
+            "invoice": inv.number,
+            "amount": inv.residual,
+            "currency_code": inv.currency_id.name,
+            "button_subtype": "services",
+            "no_note": "1",
+            "bn": "OpenERP_Invoice_PayNow_" + inv.currency_id.name,
+        }
+        return params
+        
     def _edi_paypal_url(self, cr, uid, ids, field, arg, context=None):
         res = dict.fromkeys(ids, False)
         for inv in self.browse(cr, uid, ids, context=context):
             if inv.type == 'out_invoice' and inv.company_id.paypal_account:
-                params = {
-                    "cmd": "_xclick",
-                    "business": inv.company_id.paypal_account,
-                    "item_name": "%s Invoice %s" % (inv.company_id.name, inv.number or ''),
-                    "invoice": inv.number,
-                    "amount": inv.residual,
-                    "currency_code": inv.currency_id.name,
-                    "button_subtype": "services",
-                    "no_note": "1",
-                    "bn": "OpenERP_Invoice_PayNow_" + inv.currency_id.name,
-                }
+                params = self._prepare_paypal_params(inv)
                 res[inv.id] = "https://www.paypal.com/cgi-bin/webscr?" + urlencode(params)
         return res
 

=== added directory 'paypal_installment_plan'
=== added file 'paypal_installment_plan/__init__.py'
--- paypal_installment_plan/__init__.py	1970-01-01 00:00:00 +0000
+++ paypal_installment_plan/__init__.py	2013-10-24 15:18:27 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-today OpenERP SA (<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/>.
+#
+##############################################################################
+
+import paypal_installment_plan
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'paypal_installment_plan/__openerp__.py'
--- paypal_installment_plan/__openerp__.py	1970-01-01 00:00:00 +0000
+++ paypal_installment_plan/__openerp__.py	2013-10-24 15:18:27 +0000
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-today OpenERP SA (<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/>.
+#
+##############################################################################
+
+{
+    'name': 'Paypal Installment Plan',
+    'version': '1.1',
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'description': """
+ This module allows to use the Installment Plan feature of Paypal for customer invoices.
+ You will also need to enable this feature on your Paypal account. With this module, 
+ your customers will be able to automatically pay an invoice in several installments 
+ with Paypal. They will be able to sign up for a payment plan in Paypal (with up to four       
+ installments) by clicking on the ‘Pay Now’ button included in the email sent from OpenERP
+ for the invoice or by clicking on the banner on their invoice in OpenERP. This module 
+ changes the way payment terms are defined. Check the ‘Supports Paypal Installment Plan’
+ box on the payment term form view to activate the feature for this payment term.
+    """,
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'depends': ['account','sale'],
+    'data': [
+        'paypal_installment_plan_view.xml'
+    ],
+    'installable': True,
+    'auto_install': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'paypal_installment_plan/paypal_installment_plan.py'
--- paypal_installment_plan/paypal_installment_plan.py	1970-01-01 00:00:00 +0000
+++ paypal_installment_plan/paypal_installment_plan.py	2013-10-24 15:18:27 +0000
@@ -0,0 +1,151 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-today OpenERP SA (<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 datetime import datetime
+from dateutil.relativedelta import relativedelta
+
+from openerp.osv import fields, osv
+
+from urllib import urlencode
+from openerp.addons.account import account as apt
+apt.COMPUTE_METHOD.append(('variable_amount', 'Variable Amounts'))
+
+class account_payment_term(osv.Model):
+    _inherit = "account.payment.term"
+    _columns = {
+        'allow_installments': fields.boolean("Supports Paypal Recurring Payments"),
+        'unit_of_time': fields.selection([('weeks', 'Week(s)'), ('months', 'Month(s)')], 'Installment Plan', help="Paypal Installment Plans only support weeks or months as unit of time and a single unit of time for all lines of a payment term."),
+        'compute_method': fields.selection (apt.COMPUTE_METHOD, "Compute Method")
+    }
+
+    def _get_next_date(self, date_ref, term_line):
+        if not term_line.payment_id.allow_installments:
+            return super(account_payment_term, self)._get_next_date(date_ref, term_line)
+        if term_line.payment_id.unit_of_time == "weeks":
+            next_date = (datetime.strptime(date_ref, '%Y-%m-%d') + relativedelta(weeks=term_line.installment_interval))
+        else:
+            next_date = (datetime.strptime(date_rhef, '%Y-%m-%d') + relativedelta(months=term_line.installment_interval))
+        return next_date
+
+    def compute_lines(self, cr, uid, ids, value, date_ref=False, context=None):
+        res = {}
+        for term_id in ids:
+            res[term_id] = self.compute(cr, uid, term_id, value, date_ref=date_ref, context=context)
+        return res
+
+    def _check_line_ids(self, cr, uid, ids, context=None):
+        for payment_term in self.browse(cr, uid, ids, context=context):
+            if len(payment_term.line_ids) > 4 and payment_term.allow_installments:
+                return False
+        return True
+
+    def _check_installment_interval(self, cr, uid, ids, context=None):
+        for payment_term in self.browse(cr, uid, ids, context=context):
+            for lines in payment_term.line_ids:
+                if payment_term.unit_of_time == 'weeks' and (lines.installment_interval < 0 or lines.installment_interval > 52):
+                    return False
+                elif payment_term.unit_of_time == 'months' and (lines.installment_interval < 0 or lines.installment_interval > 12):
+                    return False
+        return True
+
+    _constraints = [
+        (_check_line_ids, 'You Can not pay more than 4 installments !', ['line_ids']),
+        (_check_installment_interval, "‘Number of periods’ must be an integer between 0 and 52 if ‘Unit of time’ is ‘Week(s)’ and an integer between 0 and 12 if ‘Unit of time’ is ‘Month(s)’", ['installment_interval']),
+    ]
+
+
+class account_payment_term_line(osv.Model):
+    _inherit = "account.payment.term.line"
+    _columns = {
+            'installment_interval': fields.selection([(x,x) for x in range(1,53)], string="Installment Internal"),
+            'unit_of_time': fields.selection([('weeks', 'Week(s)'), ('months', 'Month(s)')], 'After', readonly=True),
+    }
+
+class sale_order(osv.Model):
+    _inherit = 'sale.order'
+
+    def _prepare_paypal_params(self, sale):
+        if not sale.payment_term.allow_installments:
+            return super(sale_order, self)._prepare_paypal_params(sale)
+        params = {
+            "cmd": "_xclick-payment-plan",
+            "business": sale.company_id.paypal_account,
+            "item_name": sale.company_id.name + " Sale Order " + sale.name,
+            "lc": sale.partner_id.country_id.code,
+            "no_note": 1,
+            "no_shipping": 1,
+            "disp_tot": "Y",
+            "currency_code": sale.currency_id.name,
+            "on0": "plan",
+            "os0": "option_0",
+            "option_select0": "option_0", 
+            "option_select0_name": sale.payment_term.name.replace(" ","+"),
+            "option_select0_type": "V",
+        }
+        count = 0
+        totlines = sale.payment_term.compute_lines(sale.amount_total, sale.date_order or {}).get(sale.payment_term.id)
+        for line in sale.payment_term.line_ids:
+            params.update({"option_select0_a"+str(count): totlines[count][1],
+                                 "option_select0_p"+str(count): line.installment_interval,
+                                 "option_select0_n"+str(count): 1})
+            if sale.payment_term.unit_of_time == "weeks":
+                params.update({"option_select0_t"+str(count): "W"})
+            else:
+                params.update({"option_select0_t"+str(count): "M"})
+            count += 1
+        return params
+
+
+class account_invoice(osv.Model):
+    _inherit = 'account.invoice'
+
+    def _prepare_paypal_params(self, inv):
+        if not inv.payment_term.allow_installments:
+            return super(account_invoice, self)._prepare_paypal_params(inv)
+        params = {
+            "cmd": "_xclick-payment-plan",
+            "business": inv.company_id.paypal_account,
+            "item_name": inv.company_id.name + " Invoice " + inv.number,
+            "lc": inv.partner_id.country_id.code,
+            "no_note": 1,
+            "no_shipping": 1,
+            "disp_tot": "Y",
+            "currency_code": inv.currency_id.name,
+            "on0": "plan",
+            "os0": "option_0",
+            "option_select0": "option_0", 
+            "option_select0_name": inv.payment_term.name.replace(" ","+"),
+            "option_select0_type": "V",
+        }
+        count = 0
+        totlines = inv.payment_term.compute_lines(inv.amount_total, inv.date_invoice or {}).get(inv.payment_term.id)
+        for line in inv.payment_term.line_ids:
+            params.update({"option_select0_a"+str(count): totlines[count][1],
+                                 "option_select0_p"+str(count): line.installment_interval,
+                                 "option_select0_n"+str(count): 1})
+            if inv.payment_term.unit_of_time == "weeks":
+                params.update({"option_select0_t"+str(count): "W"})
+            else:
+                params.update({"option_select0_t"+str(count): "M"})
+            count += 1
+        return params
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'paypal_installment_plan/paypal_installment_plan_view.xml'
--- paypal_installment_plan/paypal_installment_plan_view.xml	1970-01-01 00:00:00 +0000
+++ paypal_installment_plan/paypal_installment_plan_view.xml	2013-10-24 15:18:27 +0000
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_payment_term_form_inherit" model="ir.ui.view">
+            <field name="name">account.payment.term.form</field>
+            <field name="model">account.payment.term</field>
+            <field name="inherit_id" ref="account.view_payment_term_form"/>
+            <field name="arch" type="xml">
+                <group col="4" position="attributes">
+                    <attribute name="col">6</attribute>
+                </group>
+                <field name="active" position="after"> 
+                    <field name="allow_installments" class="oe_inline"/>
+                </field>
+                <field name="note" position="replace">
+                    <group>
+                        <field name="note" nolabel="1" placeholder="Payment term explanation for the customer..."/>
+                        <p class="oe_grey" attrs="{'invisible':[('allow_installments','=',False)]}">
+                            Paypal supports a maximum of four payments for a given payment term.
+                            This means that this payment term should not include more than four
+                            lines.Any line after the fourth one will be ignored by Paypal.
+                            The customer will be able to sign up for an Installment Plan in
+                            Paypal by clicking on the ‘Pay Now’ button in the email they receive
+                            from OpenERP for the invoice or by clicking on the banner on
+                            their invoice.To correctly trigger the Installment Plan in Paypal,
+                            the customer needs to click on ‘Pay Now’ and sign up for the plan
+                            in Paypal on the same day they receive the email
+                            (even if the first payment is due in the future).                        
+                        </p>
+                    </group>
+                </field>
+                <field name="line_ids" position="before">
+                    <group attrs="{'invisible':[('allow_installments','=',False)]}">
+            	       <field name="unit_of_time" class="oe_inline" attrs="{'required':[('allow_installments','=',True)]}"/>
+                    </group>
+                </field>
+                <field name="line_ids" position="attributes">
+                    <attribute name="context">{'allow_installments': allow_installments, 'unit_of_time': unit_of_time}</attribute>
+                </field>
+            </field>
+        </record>
+     
+        <record id="view_payment_term_line_form_inherit" model="ir.ui.view">
+            <field name="name">account.payment.term.line.form</field>
+            <field name="model">account.payment.term.line</field>
+            <field name="inherit_id" ref="account.view_payment_term_line_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//group[@name='Due Date Computation']" position="inside">
+                   <field name="installment_interval" invisible="not context.get('allow_installments', False)"/>
+                   <field name="unit_of_time" invisible="not context.get('allow_installments', False)"/>
+                </xpath>
+                <field name="days" position="attributes">
+                    <attribute name="invisible">context.get('allow_installments', False)</attribute>
+                </field>
+                <field name="days2" position="attributes">
+                    <attribute name="invisible">context.get('allow_installments', False)</attribute>
+                </field>
+            </field>
+        </record>
+        
+        <record id="view_payment_term_line_tree_inherit" model="ir.ui.view">
+            <field name="name">account.payment.term.line.tree</field>
+            <field name="model">account.payment.term.line</field>
+            <field name="inherit_id" ref="account.view_payment_term_line_tree"/>
+            <field name="arch" type="xml">
+                <field name="days" position="after">
+                    <field name="installment_interval" invisible="not context.get('allow_installments', False)"/>
+                </field>
+                <field name="days" position="attributes">
+                    <attribute name="invisible">context.get('allow_installments', False)</attribute>
+                </field>
+                <field name="days2" position="attributes">
+                    <attribute name="invisible">context.get('allow_installments', False)</attribute>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added directory 'paypal_installment_plan/static'
=== added directory 'paypal_installment_plan/static/description'
=== added file 'paypal_installment_plan/static/description/icon.png'
Binary files paypal_installment_plan/static/description/icon.png	1970-01-01 00:00:00 +0000 and paypal_installment_plan/static/description/icon.png	2013-10-24 15:18:27 +0000 differ
=== modified file 'portal/portal_data.xml'
--- portal/portal_data.xml	2013-10-01 15:59:01 +0000
+++ portal/portal_data.xml	2013-10-24 15:18:27 +0000
@@ -90,12 +90,7 @@
             <field name="name">Paypal</field>
             <field name="form_template"><![CDATA[
 % if object.company_id.paypal_account:
-<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_blank">
-  <input type="hidden" name="cmd" value="_xclick"/>
-  <input type="hidden" name="business" value="${object.company_id.paypal_account}"/>
-  <input type="hidden" name="item_name" value="${object.company_id.name} ${kind.title()} ${reference}"/>
-  <input type="hidden" name="amount" value="${amount}"/>
-  <input type="hidden" name="currency_code" value="${currency.name}"/>
+<form action="${object.paypal_url}" method="post" target="_blank">
   <input type="image" name="submit" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
 </form>
 % endif

=== modified file 'sale/edi/sale_order.py'
--- sale/edi/sale_order.py	2012-12-17 14:43:06 +0000
+++ sale/edi/sale_order.py	2013-10-24 15:18:27 +0000
@@ -181,22 +181,28 @@
             order_line.pop('price_subtotal', None)
         return super(sale_order,self).edi_import(cr, uid, edi_document, context=context)
 
+
+    def _prepare_paypal_params(self, sale):
+        params = {
+            "cmd": "_xclick",
+            "business": sale.company_id.paypal_account,
+            "item_name": sale.company_id.name + " Sale Order " + sale.name,
+            "invoice": sale.name,
+            "amount": sale.amount_total,
+            "currency_code": sale.currency_id.name,
+            "button_subtype": "services",
+            "no_note": "1",
+            "bn": "OpenERP_Invoice_PayNow_" + sale.currency_id.name,
+        }
+        return params
+
+
     def _edi_paypal_url(self, cr, uid, ids, field, arg, context=None):
         res = dict.fromkeys(ids, False)
         for order in self.browse(cr, uid, ids, context=context):
             if order.order_policy in ('prepaid', 'manual') and \
                     order.company_id.paypal_account and order.state != 'draft':
-                params = {
-                    "cmd": "_xclick",
-                    "business": order.company_id.paypal_account,
-                    "item_name": order.company_id.name + " Order " + order.name,
-                    "invoice": order.name,
-                    "amount": order.amount_total,
-                    "currency_code": order.pricelist_id.currency_id.name,
-                    "button_subtype": "services",
-                    "no_note": "1",
-                    "bn": "OpenERP_Order_PayNow_" + order.pricelist_id.currency_id.name,
-                }
+                params = self._prepare_paypal_params(order)
                 res[order.id] = "https://www.paypal.com/cgi-bin/webscr?" + urlencode(params)
         return res