Unifield Server

Merge lp:~mallorymarcot/unifield-server/us-4278 into lp:unifield-server

  1. us-4278
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4988
Proposed branch: lp:~mallorymarcot/unifield-server/us-4278
Merge into: lp:unifield-server
Diff against target: 24 lines (+11/-3)
1 file modified
bin/addons/msf_outgoing/report/packing_list.py (+11/-3)
To merge this branch: bzr merge lp:~mallorymarcot/unifield-server/us-4278
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+347611@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/packing_list.py'
2--- bin/addons/msf_outgoing/report/packing_list.py 2015-07-24 10:07:46 +0000
3+++ bin/addons/msf_outgoing/report/packing_list.py 2018-06-07 15:32:18 +0000
4@@ -79,9 +79,17 @@
5 for key in sort_keys:
6 result.append(res.get(key))
7
8- result[-1]['last'] = True
9-
10- return result
11+ filtered_result = [] # remove empty PPL
12+ for data in result:
13+ if data.get('pf'):
14+ filtered_result.append(data)
15+
16+ if filtered_result:
17+ filtered_result[-1]['last'] = True
18+ else:
19+ raise osv.except_osv(_('Error'), _('No PPL to export !'))
20+
21+ return filtered_result
22
23 def _get_parcel(self, list_of_parcels):
24 '''

Subscribers

People subscribed via source and target branches