Merge lp:~camptocamp/carriers-deliveries/7.0-delivery_carrier_label_dispatch-output-file-yvr into lp:~stock-logistic-core-editors/carriers-deliveries/7.0
Proposed by
Yannick Vaucher @ Camptocamp
Status: | Needs review |
---|---|
Proposed branch: | lp:~camptocamp/carriers-deliveries/7.0-delivery_carrier_label_dispatch-output-file-yvr |
Merge into: | lp:~stock-logistic-core-editors/carriers-deliveries/7.0 |
Prerequisite: | lp:~camptocamp/carriers-deliveries/7.0-add-delivery_carrier_label_dispatch-yvr |
Diff against target: |
503 lines (+180/-199) 7 files modified
delivery_carrier_label_dispatch/__init__.py (+0/-1) delivery_carrier_label_dispatch/__openerp__.py (+7/-2) delivery_carrier_label_dispatch/i18n/delivery_carrier_label_dispatch.pot (+76/-95) delivery_carrier_label_dispatch/pdf_utils.py (+2/-0) delivery_carrier_label_dispatch/stock.py (+0/-62) delivery_carrier_label_dispatch/wizard/generate_labels.py (+91/-34) delivery_carrier_label_dispatch/wizard/generate_labels_view.xml (+4/-5) |
To merge this branch: | bzr merge lp:~camptocamp/carriers-deliveries/7.0-delivery_carrier_label_dispatch-output-file-yvr |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Leonardo Pistone | code review | Approve | |
Stock and Logistic Core Editors | Pending | ||
Review via email: mp+202444@code.launchpad.net |
To post a comment you must log in.
Unmerged revisions
- 22. By Yannick Vaucher @ Camptocamp
-
update pot file
- 21. By Yannick Vaucher @ Camptocamp
-
Add better exception message from dispatch to identify the pack with an error
- 20. By Yannick Vaucher @ Camptocamp
-
merge main branch to resolve conflicts
- 19. By Yannick Vaucher @ Camptocamp
-
add file extension in file name for poor OS
- 18. By Yannick Vaucher @ Camptocamp
-
fix generation of picking shipping labels from picking dispatch when there are no pack defined in the pickings
- 17. By Guewen Baconnier @ Camptocamp
-
use the general method and not the one for the button
avoid utils.PdfReadEr
ror('Cannot read an empty file') error - 16. By Yannick Vaucher @ Camptocamp
-
[FIX] delivery_
carrier_ label_dispatch - save picking dispatch label pdf file as attachement of the picking
Hi Yannick,
#file_type='pdf'
is meant to be commented out?
I approve in any case because you are not really changing that line, justing indenting it a little :)