Change bom structure report to sxw report

- Better layout
- Use multi-ids

bzr revid: ced-a14a5bf5c6ea787ff7ab53dd99681a3032ac47a5

diff --git a/addons/mrp/mrp_report.xml b/addons/mrp/mrp_report.xml
index ccdd54e..a213e31 100644 (file)
--- a/addons/mrp/mrp_report.xml
+++ b/addons/mrp/mrp_report.xml
@@ -1,65 +1,15 @@
 <?xml version="1.0"?>
 <terp>
        <data>
-               <!--
-               Resource: ir.report.custom
-               -->
 
-               <record id="ir_report_custom_1" model="ir.report.custom">
-                       <field name="model_id" model="ir.model" search="[('model','=','mrp.bom')]"/>
-                       <field name="title">BOM Structure</field>
-                       <field name="name">BOM Structure</field>
-                       <field name="field_parent" model="ir.model.fields" search="[('name','=','bom_lines')]"/>
-               </record>
-               
-               <!--
-               Resource: ir.report.custom.fields
-               -->
-               
-               <record id="ir_report_custom_fields_bom2" model="ir.report.custom.fields">
-                       <field name="sequence">1</field>
-                       <field name="field_child0" model="ir.model.fields" search="[('name','=','name'),('model','=','mrp.bom')]"/>
-                       <field name="operation" eval="None"/>
-                       <field name="report_id" ref="ir_report_custom_1"/>
-                       <field name="groupby">1</field>
-                       <field name="name">BOM</field>
-               </record>
-               <record id="ir_report_custom_fields_bom3" model="ir.report.custom.fields">
-                       <field name="sequence">2</field>
-                       <field name="field_child0" model="ir.model.fields" search="[('name','=','product_id'),('model','=','mrp.bom')]"/>
-                       <field name="field_child1" model="ir.model.fields" search="[('name','=','product_tmpl_id'),('model','=','product.product')]"/>
-                       <field name="field_child2" model="ir.model.fields" search="[('name','=','name'),('model','=','product.template')]"/>
-                       <field name="operation" eval="None"/>
-                       <field name="report_id" ref="ir_report_custom_1"/>
-                       <field name="name">Product Name</field>
-               </record>
-               <record id="ir_report_custom_fields_bom4" model="ir.report.custom.fields">
-                       <field name="sequence">3</field>
-                       <field name="field_child0" model="ir.model.fields" search="[('name','=','product_qty')]"/>
-                       <field name="operation" eval="None"/>
-                       <field name="width" eval="20"/>
-                       <field name="report_id" ref="ir_report_custom_1"/>
-                       <field name="name">Quantity</field>
-               </record>
-               <record id="ir_report_custom_fields_bom5" model="ir.report.custom.fields">
-                       <field name="sequence">4</field>
-                       <field name="field_child0" model="ir.model.fields" search="[('name','=','product_uom'),('model','=','mrp.bom')]"/>
-                       <field name="field_child1" model="ir.model.fields" search="[('name','=','name'),('model','=','product.uom')]"/>
-                       <field name="operation" eval="None"/>
-                       <field name="width" eval="20"/>
-                       <field name="report_id" ref="ir_report_custom_1"/>
-                       <field name="name">UoM</field>
-               </record>
-               <record id="ir_report_custom_fields_bom6" model="ir.report.custom.fields">
-                       <field name="sequence">5</field>
-                       <field name="field_child0" model="ir.model.fields" search="[('name','=','code')]"/>
-                       <field name="operation" eval="None"/>
-                       <field name="width" eval="20"/>
-                       <field name="report_id" ref="ir_report_custom_1"/>
-                       <field name="name">Code</field>
-               </record>
-
-               <function model="ir.report.custom" name="subscribe" eval="[[ir_report_custom_1]]"/>
+               <report
+                       id="report_bom_structure"
+                       string="BOM Structure"
+                       model="mrp.bom"
+                       name="bom.structure"
+                       rml="mrp/report/bom_structure.rml"
+                       auto="True"
+                       header="False"/>
 
        </data>
 </terp>

diff --git a/addons/mrp/report/bom_structure.rml b/addons/mrp/report/bom_structure.rml
new file mode 100644 (file)
index 0000000..349e937
--- /dev/null
+++ b/addons/mrp/report/bom_structure.rml
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<document filename="test.pdf"><template pageSize="(612.0,792.0)" title="Test" author="Martin Simon" allowSplitting="20"><pageTemplate id="first"><frame id="first" x1="57.0" y1="57.0" width="498" height="678"/></pageTemplate></template><stylesheet><blockTableStyle id="Standard_Outline"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Table1"><blockAlignment value="LEFT"/><blockValign value="TOP"/><lineStyle kind="GRID" colorName="black"/><blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/><blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/><blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/><blockBackground colorName="#e6e6e6" start="3,0" stop="3,0"/><blockBackground colorName="#e6e6e6" start="4,0" stop="4,0"/></blockTableStyle><initialize><paraStyle name="all" alignment="justify"/></initialize><paraStyle name="P1" fontName="Times-Roman" alignment="LEFT"/><paraStyle name="P2" fontName="Times-Roman" fontSize="16.0" leading="20" alignment="CENTER"/><paraStyle name="P3" fontName="Times-Roman" alignment="LEFT"/><paraStyle name="P4" fontName="Times-Roman" fontSize="13.0" leading="16" alignment="LEFT"/><paraStyle name="P5" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT"/><paraStyle name="P6" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT"/><paraStyle name="Standard" fontName="Times-Roman"/><paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/><paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/><paraStyle name="Index" fontName="Times-Roman"/><paraStyle name="Table Contents" fontName="Times-Roman"/><paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/></stylesheet><images/><story><para style="P2">BOM Structure</para><para style="P1"><font color="white"> </font></para><section><para style="P5"><font face="Times-Roman">[[ repeatIn(objects, 'o') ]]</font></para><blockTable colWidths="157.0,151.0,85.0,50.0,56.0" style="Table1"><tr><td><para style="P3">BOM</para></td><td><para style="P3">Product Name</para></td><td><para style="P3">Quantity</para></td><td><para style="P3">UoM</para></td><td><para style="P3">Code</para></td></tr><tr><td><para style="P6"><font face="Times-Roman">[[ o.name ]]</font></para></td><td><para style="P3">[[ o.product_id.name ]]</para></td><td><para style="P3">[[ o.product_qty ]]</para></td><td><para style="P3">[[ o.product_uom.name ]]</para></td><td><para style="P3">[[ o.code ]]</para></td></tr><tr><td><para style="P3">[[ repeatIn(o.bom_lines, 'l') ]]</para><para style="P3">- [[ l.name ]]</para></td><td><para style="P3">[[ l.product_id.name ]]</para></td><td><para style="P3">[[ l.product_qty ]]</para></td><td><para style="P3">[[ l.product_uom.name ]]</para></td><td><para style="P3">[[ l.code ]]</para></td></tr></blockTable><para style="P1"><font color="white"> </font></para></section></story></document>
+