Merge lp:~unifield-team/unifield-wm/us-202 into lp:unifield-wm

[jftempo]

=== modified file 'analytic_distribution_supply/purchase.py'
--- analytic_distribution_supply/purchase.py	2014-04-04 10:05:06 +0000
+++ analytic_distribution_supply/purchase.py	2015-04-13 15:54:37 +0000
@@ -443,6 +443,13 @@
             context = {}
         if isinstance(ids, (int, long)):
             ids = [ids]
+
+        if not context.get('partner_type'):
+            raise osv.except_osv(
+                _('Error'),
+                _('You need to select a partner before add the analytic distribution'),
+            )
+
         # Prepare some values
         purchase_line = self.browse(cr, uid, ids[0], context=context)
         amount = purchase_line.price_subtotal or 0.0

=== modified file 'purchase_override/purchase.py'
--- purchase_override/purchase.py	2015-04-02 12:05:19 +0000
+++ purchase_override/purchase.py	2015-04-13 15:54:37 +0000
@@ -854,9 +854,21 @@
                         else:
                             bro_dest_ok = pol.account_4_distribution.default_destination_id
                         # Copy cost center line to the new distribution
-                        ccdl_obj.copy(cr, uid, line.id, {'distribution_id': id_ad, 'destination_id': bro_dest_ok.id})
+                        ccdl_obj.copy(cr, uid, line.id, {
+                            'distribution_id': id_ad,
+                            'destination_id': bro_dest_ok.id,
+                            'partner_type': pol.order_id.partner_id.partner_type,
+                        })
                         # Write result
                         pol_obj.write(cr, uid, [pol.id], {'analytic_distribution_id': id_ad})
+                else:
+                    ad_lines = pol.analytic_distribution_id and pol.analytic_distribution_id.cost_center_lines or po.analytic_distribution_id.cost_center_lines
+                    for line in ad_lines:
+                        if not line.partner_type:
+                            ccdl_obj.write(cr, uid, [line.id], {
+                                'partner_type': pol.order_id.partner_id.partner_type,
+                            })
+
         return True
 
     def wkf_picking_done(self, cr, uid, ids, context=None):