Merge lp:~camptocamp/stock-logistic-report/7.0-button-print-delivery-order into lp:stock-logistic-report

Proposed by Guewen Baconnier @ Camptocamp
Status: Merged
Approved by: Yannick Vaucher @ Camptocamp
Approved revision: 7
Merged at revision: 7
Proposed branch: lp:~camptocamp/stock-logistic-report/7.0-button-print-delivery-order
Merge into: lp:stock-logistic-report
Diff against target: 34 lines (+18/-1)
2 files modified
stock_picking_webkit/__openerp__.py (+3/-1)
stock_picking_webkit/stock_view.xml (+15/-0)
To merge this branch: bzr merge lp:~camptocamp/stock-logistic-report/7.0-button-print-delivery-order
Reviewer Review Type Date Requested Status
Yannick Vaucher @ Camptocamp code review, no tests Approve
Pedro Manuel Baeza Approve
Leonardo Pistone code review Approve
Review via email: mp+199952@code.launchpad.net

Description of the change

The stock_picking_webkit aims to replace the RML report, but the button to print the delivery orders still print the RML report.

Change the action of the button to print the new one.

To post a comment you must log in.
Revision history for this message
Leonardo Pistone (lepistone) wrote :

LGTM, thanks

review: Approve (code review)
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

Seems OK to me, but I wonder if it's not better to simply replace the report definition instead, because if there are other custom modules that use that report, they will still use the old report.

Regards.

review: Needs Information
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

> Seems OK to me, but I wonder if it's not better to simply replace the report
> definition instead, because if there are other custom modules that use that
> report, they will still use the old report.
>
> Regards.

This was done already in the module, but on the stock picking's report (stock.report_picking_list_out), and the button points to the delivery picking's report.
I fear the side effects on existing databases if we change that now.

Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

OK then, Guewen.

Thank you.

Regards.

review: Approve
Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) :
review: Approve (code review, no tests)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stock_picking_webkit/__openerp__.py'
2--- stock_picking_webkit/__openerp__.py 2013-12-13 04:40:56 +0000
3+++ stock_picking_webkit/__openerp__.py 2013-12-23 14:07:03 +0000
4@@ -35,7 +35,9 @@
5 'author': 'Camptocamp',
6 'website': 'http://www.openerp.com',
7 'depends': ['base', 'report_webkit', 'base_headers_webkit', 'stock', 'delivery'],
8- 'data': ['report.xml'],
9+ 'data': ['report.xml',
10+ 'stock_view.xml',
11+ ],
12 'installable': True,
13 'auto_install': False,
14 }
15
16=== added file 'stock_picking_webkit/stock_view.xml'
17--- stock_picking_webkit/stock_view.xml 1970-01-01 00:00:00 +0000
18+++ stock_picking_webkit/stock_view.xml 2013-12-23 14:07:03 +0000
19@@ -0,0 +1,15 @@
20+<?xml version="1.0" encoding="utf-8"?>
21+<openerp>
22+ <data noupdate="0">
23+ <record id="view_picking_out_form" model="ir.ui.view">
24+ <field name="name">stock.picking.out.form</field>
25+ <field name="model">stock.picking.out</field>
26+ <field name="inherit_id" ref="delivery.view_delivery_order_inherit_stock"/>
27+ <field name="arch" type="xml">
28+ <xpath expr="/form/header//button[@string='Print Delivery Order']" position="attributes">
29+ <attribute name="name">%(stock.report_picking_list_out)d</attribute>
30+ </xpath>
31+ </field>
32+ </record>
33+ </data>
34+</openerp>

Subscribers

People subscribed via source and target branches