Merge lp:~alnslang/account-financial-report/6.1 into lp:~account-report-core-editor/account-financial-report/6.1

[Sebastien LANGE - http://www.Syleam.fr]

[Stefan Rijnhart (Opener) (stefan-opener)]

Hi,

looks like you reformatted the xml file to fix the spacing as well as changed the content. Not sure if there are any best practices that we could set as a standard for OpenERP community reviews, but personally I would appreciated it if you could remove the reformatting for clarity's sake and upload a separate branch to fix the spacing (as I *do* appreciate a neatly spaced XML file). It would make it a bit easier to do adhoc reviews on all these projects.

Cheers,
Stefan.

[Nhomar - Vauxoo (nhomar)]

I think the same as Stefan.

You should propose 2 MP.

1 for reformatting - if you think it is needed -

2 for the bug itself.

Regards.

In my case i well mark thi MP as Needs Fixing

Thanks

review: Needs Fixing

[lp:~alnslang/account-financial-report/6.1]

24. By Sebastien LANGE - http://www.Syleam.fr on 2012-12-09

[FIX] Convert ir.header_webkit in ir.property in xml files

[Sebastien LANGE - http://www.Syleam.fr (alnslang)]

I modified my commit for just having the bug fix.

review: Needs Resubmitting

[Stefan Rijnhart (Opener) (stefan-opener)]

Thank you. Looks fine now.

review: Approve (code reading, no test)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Looks good to me. Thanks

review: Approve

=== modified file 'account_financial_report_webkit/report/report.xml'
--- account_financial_report_webkit/report/report.xml	2012-03-06 09:13:59 +0000
+++ account_financial_report_webkit/report/report.xml	2012-12-09 13:54:22 +0000
@@ -14,8 +14,13 @@
             <field name="name">General Ledger Webkit</field>
             <field name="report_rml">account_financial_report_webkit/report/templates/account_report_general_ledger.mako</field>
             <field name="report_file">account_financial_report_webkit/report/templates/account_report_general_ledger.mako</field>
-            <field name="webkit_header" ref="financial_landscape_header"/>
         </record> 
+        <record id="property_account_report_general_ledger_webkit" model="ir.property">
+            <field name="name">account_report_general_ledger_webkit</field>
+            <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
+            <field eval="'ir.header_webkit,'+str(ref('account_financial_report_webkit.financial_landscape_header'))" model="ir.header_webkit" name="value"/>
+            <field eval="'ir.actions.report.xml,'+str(ref('account_financial_report_webkit.account_report_general_ledger_webkit'))" model="ir.actions.report.xml" name="res_id"/>
+        </record>
         <!-- waiting the fix 
         <report auto="False" 
             id="account_report_partner_ledger_webkit" 
@@ -38,7 +43,12 @@
             <field name="name">Partner Ledger Webkit</field>
             <field name="report_rml">account_financial_report_webkit/report/templates/account_report_partners_ledger.mako</field>
             <field name="report_file">account_financial_report_webkit/report/templates/account_report_partners_ledger.mako</field>
-            <field name="webkit_header" ref="financial_landscape_header"/>
+        </record>
+        <record id="property_account_report_partners_ledger_webkit" model="ir.property">
+            <field name="name">account_report_partners_ledger_webkit</field>
+            <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
+            <field eval="'ir.header_webkit,'+str(ref('account_financial_report_webkit.financial_landscape_header'))" model="ir.header_webkit" name="value"/>
+            <field eval="'ir.actions.report.xml,'+str(ref('account_financial_report_webkit.account_report_partners_ledger_webkit'))" model="ir.actions.report.xml" name="res_id"/>
         </record>
 
         <record id="account_report_trial_balance_webkit" model="ir.actions.report.xml">
@@ -53,8 +63,13 @@
              <field name="name">Trial Balance Webkit</field>
              <field name="report_rml">account_financial_report_webkit/report/templates/account_report_trial_balance.mako</field>
              <field name="report_file">account_financial_report_webkit/report/templates/account_report_trial_balance.mako</field>
-             <field name="webkit_header" ref="financial_portrait_header"/>
          </record>
+        <record id="property_account_report_trial_balance_webkit" model="ir.property">
+            <field name="name">account_report_trial_balance_webkit</field>
+            <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
+            <field eval="'ir.header_webkit,'+str(ref('account_financial_report_webkit.financial_portrait_header'))" model="ir.header_webkit" name="value"/>
+            <field eval="'ir.actions.report.xml,'+str(ref('account_financial_report_webkit.account_report_trial_balance_webkit'))" model="ir.actions.report.xml" name="res_id"/>
+        </record>
 
         <record id="account_report_partner_balance_webkit" model="ir.actions.report.xml">
              <field name="report_type">webkit</field>
@@ -68,8 +83,13 @@
              <field name="name">Partner Balance Webkit</field>
              <field name="report_rml">account_financial_report_webkit/report/templates/account_report_partner_balance.mako</field>
              <field name="report_file">account_financial_report_webkit/report/templates/account_report_partner_balance.mako</field>
-             <field name="webkit_header" ref="financial_portrait_header"/>
          </record>
+        <record id="property_account_report_partner_balance_webkit" model="ir.property">
+            <field name="name">account_report_partner_balance_webkit</field>
+            <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
+            <field eval="'ir.header_webkit,'+str(ref('account_financial_report_webkit.financial_portrait_header'))" model="ir.header_webkit" name="value"/>
+            <field eval="'ir.actions.report.xml,'+str(ref('account_financial_report_webkit.account_report_partner_balance_webkit'))" model="ir.actions.report.xml" name="res_id"/>
+        </record>
 
         <record id="account_report_open_invoices_webkit" model="ir.actions.report.xml">
              <field name="report_type">webkit</field>
@@ -83,8 +103,13 @@
              <field name="name">Open Invoices Report</field>
              <field name="report_rml">account_financial_report_webkit/report/templates/account_report_open_invoices.mako</field>
              <field name="report_file">account_financial_report_webkit/report/templates/account_report_open_invoices.mako</field>
-             <field name="webkit_header" ref="financial_landscape_header"/>
          </record>
+        <record id="property_account_report_open_invoices_webkit" model="ir.property">
+            <field name="name">account_report_open_invoices_webkit</field>
+            <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
+            <field eval="'ir.header_webkit,'+str(ref('account_financial_report_webkit.financial_landscape_header'))" model="ir.header_webkit" name="value"/>
+            <field eval="'ir.actions.report.xml,'+str(ref('account_financial_report_webkit.account_report_open_invoices_webkit'))" model="ir.actions.report.xml" name="res_id"/>
+        </record>
 
         <!--<record id="account_report_profit_loss_webkit" model="ir.actions.report.xml">-->
              <!--<field name="report_type">webkit</field>-->