Merge lp:~therp-nl/openerp-stock-delivery-times/7.0_lp1298520_crash_product_nocompany into lp:openerp-stock-delivery-times

[Ronald Portier (Therp)]

Fixes 1298520. PO lead is normally taken from the company defined in the product.

However, the code crashed when product did not refer to a company (products shared in multicompany install).

This change will take the company from the product, the context, the user, or the main company. If everything else fails, it will just return a PO lead time of zero days.

[Benoit Guillot - http://www.akretion.com (benoit-guillot-z)]

Thank you for the fixes and the contributions !
Sorry for the delay ...

review: Approve

[Ronald Portier (Therp) (rportier1962)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hello Benoit,

I was very glad with the Akretion modules, just needed these fixes to
get everything working!

Kind regards,

Ronald

Op 29-08-14 om 11:01 schreef Benoit Guillot - http://www.akretion.com:
> Review: Approve
>
> Thank you for the fixes and the contributions !
> Sorry for the delay ...
>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.15 (GNU/Linux)

iQIcBAEBAgAGBQJUAEZ/AAoJEKGB+BJNcQHTqDUQAMQCCSdQJlTE06HY3rzfSdLK
YvgbyK9xpLp3bq2EC2PTf6SLhwEK9LrByr7fO4CMAZWXZfxWMkhj4rVriQEDefxV
PLkj6oKV7F3bMqBnlZZhulIFdBFWktMMP8v9yN1Umw/AJoUSVFSoYG7UwrjfZ2gx
d7NrNYwrB0mGEVV1aSayAqqp5N8kahA+XoxvQJXD204r9kNtWMzI+LBOAKrgG+vb
irLYk5tq6h+cTwKFSkvWLfC03k/ZhwQ7x0f3Seq3YKG7dGFRWVmxuQIAvr9Tx8d9
mRFUxdDHZQ1InL5MH55dD9RK50ky1GekvREi1FU/xVjOCyvZfR3OmfvkiH6frCxt
2A0oOlNk8qgGPofYxZofkDruqU8hVsYnubxEhlSozWNdHKAODsXPVy29yq8ESPq7
zKJgyguGrqQyl3ZGbGfH/1mc41TaHkE2MrJZmCbNfcsvnZljVai4vJgpY0yoW4RG
bb0n/ppj2Q3I7rA6vv5G0YC2H77stR4WRmIJcNjHqPGvhBO55wGS4I8EU8wunzfc
AWmnd6TG/7/ojPhnFLNNP1CA1QYZk+E89pVdw8cqiy1DGEMmLqfLZaezWAvE8TS5
dcrUlsxKXKoI9ssXt/cy7SeVUioyZt+WIe3bP51rdXPxIqsCKPk4i3aPC3nzbiwt
TEvFUdzATa5fS69y2KUc
=z2Xd
-----END PGP SIGNATURE-----

=== modified file 'stock_delivery_times_advanced/__openerp__.py'
--- stock_delivery_times_advanced/__openerp__.py	2014-01-16 15:01:13 +0000
+++ stock_delivery_times_advanced/__openerp__.py	2014-03-28 14:32:43 +0000
@@ -34,11 +34,11 @@
         'stock_available_immediately',
         ],
     'data': [
+        'wizard/stock_change_date_view.xml',
         'stock_view.xml',
         'sale_view.xml',
         'product_view.xml',
         'product_data.xml',
-        'wizard/stock_change_date_view.xml',
         ],
     'demo': [],
     'installable': True,

=== modified file 'stock_delivery_times_advanced/product.py'
--- stock_delivery_times_advanced/product.py	2014-01-16 15:01:13 +0000
+++ stock_delivery_times_advanced/product.py	2014-03-28 14:32:43 +0000
@@ -46,6 +46,38 @@
 class product_product(orm.Model):
     _inherit = 'product.product'
 
+    def _get_company_po_lead(self, cr, uid, product_obj, context=None):
+        '''Get po_lead from company. Company is taken, in order of preference,
+        from 1. product, 2. context, 3 user, 4. main company. if no company
+        is found, we will simply return a zero po leadtime.'''
+        context = context or {}
+        # check wether product refers to company
+        if product_obj.company_id:
+            return product_obj.company_id.po_lead
+        # Company in context?
+        if 'force_company' in context:
+            company_id = context['force_company']
+        else:
+            # Take company from user
+            user_model = self.pool['res.users']
+            user_record = user_model.read(
+                cr, uid, uid, ['company_id'], context=context)
+            company_id = (
+                user_record and user_record['company_id']
+                and user_record['company_id'][0] or False)
+            # if still no company, last resort is to use main company
+            if not company_id:
+                base_model = self.pool['ir.model.data']
+                company_id = base_model.get_object_reference(
+                    cr, uid, 'base', 'main_company')[1]
+        # If we still did not find a company, just return 0
+        if not company_id:
+            return 0.0
+        company_model = self.pool['res.company']
+        company_record = company_model.read(
+            cr, uid, company_id, ['po_lead'], context=context)
+        return company_record['po_lead']
+
     def _get_delays(self, cr, uid, product, qty=1, context=None):
         """Compute the delay information for a product
         """
@@ -58,5 +90,5 @@
                 #TODO use a different calendar for the supplier delay than the company calendar
                 supplier_shortage = product.seller_info_id['supplier_shortage']
         #add purchase lead time
-        delay += product.company_id.po_lead
+        delay += self._get_company_po_lead(cr, uid, product, context=context)
         return delay, supplier_shortage