Unifield Server

Merge lp:~dorian-kemps/unifield-server/US-12088 into lp:unifield-server

  1. US-12088
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 6588
Proposed branch: lp:~dorian-kemps/unifield-server/US-12088
Merge into: lp:unifield-server
Diff against target: 16 lines (+4/-0)
1 file modified
bin/addons/msf_outgoing/report/shipment_donation_certificate.py (+4/-0)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-12088
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+454238@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/msf_outgoing/report/shipment_donation_certificate.py'
2--- bin/addons/msf_outgoing/report/shipment_donation_certificate.py 2023-05-04 12:17:53 +0000
3+++ bin/addons/msf_outgoing/report/shipment_donation_certificate.py 2023-10-23 07:51:02 +0000
4@@ -24,8 +24,12 @@
5 curr_obj = self.pool.get('res.currency')
6
7 lines = []
8+ if ship.state == 'cancel':
9+ return lines
10 keys = []
11 for pack in ship.pack_family_memory_ids:
12+ if pack.state == 'returned':
13+ continue
14 for move in pack.move_lines:
15 key = (move.product_id.id, move.prodlot_id and move.prodlot_id.id or False)
16 move_price = move.price_unit

Subscribers

People subscribed via source and target branches