Merge lp:~invitu/openobject-addons/6.1-fix-1190444 into lp:openobject-addons/6.1

Proposed by invitu
Status: Rejected
Rejected by: Martin Trigaux (OpenERP)
Proposed branch: lp:~invitu/openobject-addons/6.1-fix-1190444
Merge into: lp:openobject-addons/6.1
Diff against target: 23 lines (+2/-2)
2 files modified
account/account_report.xml (+1/-1)
sale/sale_report.xml (+1/-1)
To merge this branch: bzr merge lp:~invitu/openobject-addons/6.1-fix-1190444
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+170473@code.launchpad.net

Description of the change

[IMP] account/sale : some data should not be updated because they are part of customisation for the company

To post a comment you must log in.
Revision history for this message
Martin Trigaux (OpenERP) (mat-openerp) wrote :

Hello,

As explained on the bug report, we don't want to set noupdate on these reports, instead create new one (but I understood it's already what you are doing now)

Regards

Unmerged revisions

7224. By invitu

[IMP] account/sale : some data should not be updated because they are part of customisation for the company

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/account_report.xml'
2--- account/account_report.xml 2013-01-08 05:29:36 +0000
3+++ account/account_report.xml 2013-06-20 01:44:25 +0000
4@@ -1,6 +1,6 @@
5 <?xml version="1.0" encoding="utf-8"?>
6 <openerp>
7- <data>
8+ <data noupdate="1">
9 <report auto="False" id="account_general_ledger" menu="False" model="account.account" name="account.general.ledger" rml="account/report/account_general_ledger.rml" string="General Ledger"/>
10 <report auto="False" id="account_financial_report" menu="False" model="account.financial.report" name="account.financial.report" rml="account/report/account_financial_report.rml" string="Financial Report"/>
11 <report auto="False" id="account_aged_partner_balance" menu="False" model="res.partner" name="account.aged_trial_balance" rml="account/report/account_aged_partner_balance.rml" string="Aged Partner Balance"/>
12
13=== modified file 'sale/sale_report.xml'
14--- sale/sale_report.xml 2011-10-10 14:38:06 +0000
15+++ sale/sale_report.xml 2013-06-20 01:44:25 +0000
16@@ -1,6 +1,6 @@
17 <?xml version="1.0" encoding="utf-8"?>
18 <openerp>
19- <data>
20+ <data noupdate="1">
21
22 <report auto="False" id="report_sale_order" model="sale.order" name="sale.order"
23 rml="sale/report/sale_order.rml" string="Quotation / Order"