Merge lp:~magentoerpconnect-community/magentoerpconnect/legacy61-fix-1011491 into lp:magentoerpconnect/oerp6.1-oldstable

[Guewen Baconnier @ Camptocamp]

Generate automatic payments according to the sale order's payment terms.

More info at :
https://bugs.launchpad.net/magentoerpconnect/+bug/1011491

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

I would be glad to have a review on this branch.

Thanks

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

LGTM

review: Approve (code review, no test)

=== modified file 'magentoerpconnect/sale.py'
--- magentoerpconnect/sale.py	2012-05-25 09:01:25 +0000
+++ magentoerpconnect/sale.py	2012-06-11 13:33:19 +0000
@@ -621,6 +621,26 @@
                 amount = payment_info.get('amount_ordered', False)
         return paid, amount
 
+    def _get_payment_amounts(self, cr, uid, order, total_amount, context=None):
+        """
+        Compute the payments to create for an order based on an amount
+        which represents the total paid.
+
+        Uses the account.payment.term if there is one on the order so it will
+        correctly divide the payment between the billing deadlines.
+
+        :param browse_record order: browsable order
+        :param float total_amount: total amount of the payment
+        :return: list of tuple of payment [(payment date, payment amount), ...]
+        """
+        if order.payment_term:
+            return self.pool.get('account.payment.term').compute(
+                cr, uid, order.payment_term.id, total_amount,
+                date_ref=order.date_order, context=context)
+        else:
+            # full payment should be generated
+            return [(order.date_order, total_amount)]
+
     def create_payments(self, cr, uid, order_id, data_record, context=None):
         if context is None:
             context = {}
@@ -630,18 +650,21 @@
             paid, amount = self._parse_external_payment(
                 cr, uid, data_record, context=context)
             if paid:
-                order = self.pool.get('sale.order').browse(
-                    cr, uid, order_id, context)
-                self.generate_payment_with_pay_code(
-                    cr, uid,
-                    payment_info['method'],
-                    order.partner_id.id,
-                    float(amount),
-                    "mag_" + payment_info['payment_id'],
-                    "mag_" + data_record['increment_id'],
-                    order.date_order,
-                    paid,
-                    context=context)
+                # external amount is a str
+                amount = float(amount)
+                order = self.pool.get('sale.order').browse( cr, uid, order_id, context)
+                payments = self._get_payment_amounts(cr, uid, order, amount, context=context)
+                for pay_date, pay_amount in payments:
+                    self.generate_payment_with_pay_code(
+                        cr, uid,
+                        payment_info['method'],
+                        order.partner_id.id,
+                        pay_amount,
+                        "mag_" + payment_info['payment_id'],
+                        "mag_" + data_record['increment_id'],
+                        pay_date,
+                        paid,
+                        context=context)
         else:
             paid = super(sale_order, self).create_payments(
                 cr, uid, order_id, data_record, context=context)