Sales - Reports

Merge lp:~agilebg/sale-reports/7_fix_1331541 into lp:~sale-core-editors/sale-reports/7.0

  1. 7_fix_1331541
  2. Merge into 7.0
Proposed by Nicola Malcontenti - Agile BG
Status: Merged
Approved by: Yannick Vaucher @ Camptocamp
Approved revision: 27
Merged at revision: 27
Proposed branch: lp:~agilebg/sale-reports/7_fix_1331541
Merge into: lp:~sale-core-editors/sale-reports/7.0
Diff against target: 17 lines (+6/-2)
1 file modified
sale_order_webkit/sale_report.xml (+6/-2)
To merge this branch: bzr merge lp:~agilebg/sale-reports/7_fix_1331541
Reviewer Review Type Date Requested Status
Lorenzo Battistini (community) Needs Fixing
Yannick Vaucher @ Camptocamp code review Approve
Alex Comba - Agile BG (community) code review Approve
Pedro Manuel Baeza code review Approve
Review via email: mp+223871@code.launchpad.net

Description of the change

In order to solve https://bugs.launchpad.net/sale-reports/+bug/1331541
i have made this change

To post a comment you must log in.
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

LGTM.

Regards.

review: Approve (code review)
Revision history for this message
Alex Comba - Agile BG (tafaru) :
review: Approve (code review)
Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) :
review: Approve (code review)
Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote :

Thanks for the patch

Revision history for this message
Lorenzo Battistini (elbati) wrote :

</data/> should be </data>

review: Needs Fixing
Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote :

Fixed in merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'sale_order_webkit/sale_report.xml'
2--- sale_order_webkit/sale_report.xml 2013-01-24 10:40:06 +0000
3+++ sale_order_webkit/sale_report.xml 2014-06-20 08:24:55 +0000
4@@ -7,7 +7,11 @@
5 model="sale.order"
6 file="sale_order_webkit/report/sale_order.mako"
7 string="Quotation - Order"
8- webkit_header="base_headers_webkit.base_reports_portrait_header"
9 report_type="webkit"/>
10- </data>
11+ </data/>
12+ <data noupdate="1">
13+ <record id="sale.report_sale_order" model="ir.actions.report.xml">
14+ <field name="webkit_header" ref="base_headers_webkit.base_reports_portrait_header"></field>
15+ </record>
16+ </data>
17 </openerp>

Subscribers

People subscribed via source and target branches