Unifield Server

Merge lp:~julie-w/unifield-server/US-3079 into lp:unifield-server

  1. US-3079
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4414
Proposed branch: lp:~julie-w/unifield-server/US-3079
Merge into: lp:unifield-server
Diff against target: 29 lines (+4/-2)
1 file modified
bin/addons/return_claim/return_claim.py (+4/-2)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-3079
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+327970@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
1=== modified file 'bin/addons/return_claim/return_claim.py'
2--- bin/addons/return_claim/return_claim.py 2016-09-28 16:03:46 +0000
3+++ bin/addons/return_claim/return_claim.py 2017-08-09 12:24:02 +0000
4@@ -842,6 +842,8 @@
5 claim = obj.return_claim_id_claim_event
6 # claim type
7 claim_type = claim.type_return_claim
8+ # don't generate financial documents if the claim is linked to an internal or intermission partner
9+ inv_status = claim.partner_id_return_claim.partner_type in ['internal', 'intermission'] and 'none' or '2binvoiced'
10 # new name, previous name + -return
11 new_name = origin_picking.name + '-return'
12 # get the picking values and move values according to claim type
13@@ -851,7 +853,7 @@
14 'purchase_id': origin_picking.purchase_id.id,
15 'sale_id': origin_picking.sale_id.id,
16 'reason_type_id': context['common']['rt_goods_return'],
17- 'invoice_state': '2binvoiced',
18+ 'invoice_state': inv_status,
19 'claim': True,
20 }
21 move_values = {'reason_type_id': context['common']['rt_goods_return']}
22@@ -887,7 +889,7 @@
23 'reason_type_id': context['common']['rt_goods_replacement'],
24 'purchase_id': origin_picking.purchase_id.id,
25 'sale_id': origin_picking.sale_id.id,
26- 'invoice_state': '2binvoiced',
27+ 'invoice_state': inv_status,
28 }
29 replacement_move_values = {'reason_type_id': context['common']['rt_goods_replacement']}
30

Subscribers

People subscribed via source and target branches