Merge lp:~unifield-team/unifield-server/us-1641 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 3963
Proposed branch: lp:~unifield-team/unifield-server/us-1641
Merge into: lp:unifield-server
Diff against target: 26 lines (+9/-0)
1 file modified
bin/addons/purchase_override/purchase.py (+9/-0)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1641
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+305006@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/addons/purchase_override/purchase.py'
--- bin/addons/purchase_override/purchase.py 2016-08-24 09:34:26 +0000
+++ bin/addons/purchase_override/purchase.py 2016-09-06 14:14:20 +0000
@@ -1201,6 +1201,7 @@
1201 sol_obj = self.pool.get('sale.order.line')1201 sol_obj = self.pool.get('sale.order.line')
1202 so_obj = self.pool.get('sale.order')1202 so_obj = self.pool.get('sale.order')
1203 ad_obj = self.pool.get('analytic.distribution')1203 ad_obj = self.pool.get('analytic.distribution')
1204 ccl_obj = self.pool.get('cost.center.distribution.line')
1204 proc_obj = self.pool.get('procurement.order')1205 proc_obj = self.pool.get('procurement.order')
1205 pick_obj = self.pool.get('stock.picking')1206 pick_obj = self.pool.get('stock.picking')
1206 move_obj = self.pool.get('stock.move')1207 move_obj = self.pool.get('stock.move')
@@ -1226,6 +1227,14 @@
1226 new_distrib = ad_obj.copy(cr, uid, l.analytic_distribution_id.id, {}, context=context)1227 new_distrib = ad_obj.copy(cr, uid, l.analytic_distribution_id.id, {}, context=context)
1227 elif not l.analytic_distribution_id and l.order_id and l.order_id.analytic_distribution_id:1228 elif not l.analytic_distribution_id and l.order_id and l.order_id.analytic_distribution_id:
1228 new_distrib = ad_obj.copy(cr, uid, l.order_id.analytic_distribution_id.id, {}, context=context)1229 new_distrib = ad_obj.copy(cr, uid, l.order_id.analytic_distribution_id.id, {}, context=context)
1230
1231 # Make check on partner_type of the AD cost center lines
1232 ccl_ids = ccl_obj.search(cr, uid, [
1233 ('distribution_id', '=', new_distrib),
1234 ('partner_type', '!=', l.link_so_id.partner_type)
1235 ], context=context)
1236 ccl_obj.write(cr, uid, ccl_ids, {'partner_type': l.link_so_id.partner_type}, context=context)
1237
1229 # Creates the FO lines1238 # Creates the FO lines
1230 tmp_sale_context = context.get('sale_id')1239 tmp_sale_context = context.get('sale_id')
1231 # create new line in FOXXXX-Y1240 # create new line in FOXXXX-Y

Subscribers

People subscribed via source and target branches

to all changes: