Merge lp:~gbaconnier-c2c/openobject-addons/extra-6.0-c2c-magento-improvements into lp:openobject-addons/extra-6.0

[Guewen Baconnier @ Camptocamp]

Unmerged revisions

5353. By Guewen Baconnier @ CampToCamp <email address hidden> on 2011-03-29

[FIX] base_sale_payment_type: returns the good payment's settings when multiple codes match

5351. By Lorenzo Battistini on 2011-03-29

[FIX] AgileBG authors

5350. By Jordi Esteve (www.zikzakmedia.com) on 2011-03-29

[IMP+FIX] Internet Domain:
- Domain Report (rml)
- Example webservice or send email expiration
- [FIX] Duplicity emails when run_mail_scheduler
- Redesing wizard osv_memory

5349. By Launchpad Translations on behalf of openerp-commiter on 2011-03-29

Launchpad automatic translations update.

5348. By Raphaël Valyi - http://www.akretion.com on 2011-03-29

[FIX] kettle_connector: fixed issue with param replacement

5347. By Lorenzo Battistini on 2011-03-28

[FIX] product_pricelist_fixed_price translation

5346. By Launchpad Translations on behalf of openerp-commiter on 2011-03-28

Launchpad automatic translations update.

=== modified file 'base_sale_multichannels/sale.py'
--- base_sale_multichannels/sale.py	2011-04-20 11:34:11 +0000
+++ base_sale_multichannels/sale.py	2011-04-28 09:28:28 +0000
@@ -289,6 +289,7 @@
     }
 
     def payment_code_to_payment_settings(self, cr, uid, payment_code, context=None):
+<<<<<<< TREE
         pay_type_obj = self.pool.get('base.sale.payment.type')
         payment_setting_ids = pay_type_obj.search(cr, uid, [['name', 'like', payment_code]])
         payment_setting_id = False
@@ -296,6 +297,18 @@
             if payment_code in [x.strip() for x in type['name'].split(';')]:
                 payment_setting_id = type['id']
         return payment_setting_id and pay_type_obj.browse(cr, uid, payment_setting_id, context) or False
+=======
+        payment_setting_ids = self.pool.get('base.sale.payment.type').search(cr, uid, [['name', 'ilike', payment_code]])
+        # it can happens that a payment_code match 2 payment types like: bank and bankcr.
+        # in such case, we have to search which one is the good one by splitting the payment types and search for the exact match
+        if len(payment_setting_ids) > 1:
+            for payment_setting_id in payment_setting_ids[:]:
+                name = self.pool.get('base.sale.payment.type').read(cr, uid, payment_setting_id, ['name'])['name']
+                if payment_code.lower() in [exact_payment_name.strip().lower() for exact_payment_name in name.split(';')]:
+                    payment_setting_ids = [payment_setting_id]
+                    break        
+        return payment_setting_ids and self.pool.get('base.sale.payment.type').browse(cr, uid, payment_setting_ids[0], context) or False
+>>>>>>> MERGE-SOURCE
 
     def generate_payment_with_pay_code(self, cr, uid, payment_code, partner_id, amount, payment_ref, entry_name, date, paid, context):
         payment_settings = self.payment_code_to_payment_settings(cr, uid, payment_code, context)
@@ -341,7 +354,10 @@
         order = self.browse(cr, uid, order_id, context)
         payment_settings = self.payment_code_to_payment_settings(cr, uid, order.ext_payment_method, context)
                 
-        if payment_settings: 
+        if payment_settings:
+            if payment_settings.payment_term_id:
+                self.write(cr, uid, order.id, {'payment_term': payment_settings.payment_term_id.id})
+
             if payment_settings.check_if_paid and not paid:
                 if order.state == 'draft' and datetime.strptime(order.date_order, '%Y-%m-%d') < datetime.now() - relativedelta(days=payment_settings.days_before_order_cancel or 30):
                     wf_service.trg_validate(uid, 'sale.order', order.id, 'cancel', cr)
@@ -444,6 +460,7 @@
         'check_if_paid': fields.boolean('Check if Paid?'),
         'days_before_order_cancel': fields.integer('Days Delay before Cancel', help='number of days before an unpaid order will be cancelled at next status update from Magento'),
         'invoice_date_is_order_date' : fields.boolean('Force Invoice Date?', help="If it's check the invoice date will be the same as the order date"),
+        'payment_term_id': fields.many2one('account.payment.term', 'Payment Term'),
     }
     
     _defaults = {
 
=== modified file 'base_sale_multichannels/sale_view.xml'
--- base_sale_multichannels/sale_view.xml	2011-04-15 20:07:38 +0000
+++ base_sale_multichannels/sale_view.xml	2011-04-28 09:28:28 +0000
@@ -97,6 +97,7 @@
                     <field name="picking_policy"/>
                     <field name="order_policy"/>
                     <field name="invoice_quantity"/>
+                    <field name="payment_term_id"/>
                     <separator string="Worflow Option" colspan="4" />
                     <field name="validate_order"/>
                     <field name="validate_picking"/>
@@ -124,6 +125,7 @@
                     <field name="picking_policy"/>
                     <field name="order_policy"/>
                     <field name="invoice_quantity"/>
+                    <field name="payment_term_id"/>
                     <field name="is_auto_reconcile"/>
                     <field name="validate_order"/>
                     <field name="validate_payment"/>