Ashvin Rathod (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-bug-802410-ara into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
Bug #802410 in OpenERP Addons: "Report Order with layout aborted if lines
type Note or Page break"
https://bugs.launchpad.net/openobject-addons/+bug/802410
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-802410-ara/+merge/67177
Hello,
Fix: lp:802410 Report Order with layout aborted if lines type Note or Page break
Thanks,
ara
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-802410-ara/+merge/67177
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-bug-802410-ara.
=== modified file 'sale_layout/report/report_sale_layout.rml'
--- sale_layout/report/report_sale_layout.rml 2011-05-10 05:59:46 +0000
+++ sale_layout/report/report_sale_layout.rml 2011-07-07 12:22:35 +0000
@@ -133,31 +133,6 @@
<images/>
</stylesheet>
<story>
- <pto>
- <pto_header>
- <blockTable colWidths="198.0,85.0,71.0,57.0,57.0,71.0" style="Table7">
- <tr>
- <td>
- <para style="terp_tblheader_Details">Description</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Centre">VAT</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Quantity</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Unit Price</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Disc.(%)</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Price</para>
- </td>
- </tr>
- </blockTable>
- </pto_header>
<para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
<para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
<blockTable colWidths="260.0,64.0,215.0" style="Tableau2">
@@ -275,9 +250,7 @@
<blockTable colWidths="6.0,193.0,85.0,71.0,57.0,57.0,71.0" style="Table1">
<tr>
<td>
- <para style="terp_default_8">
- <font face="Helvetica" size="9.0">[[ a['layout_type']=='text' and removeParentNode('blockTable')]]</font>
- </para>
+ <para style="terp_default_9">[[ a['type']=='text' and removeParentNode('blockTable')]]</para>
</td>
<td>
<para style="terp_default_9"><font face="Helvetica" size="8.0">[[ (a['layout_type']=='title' or a['layout_type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) or removeParentNode('font') ]] </font>[[ a['name'] ]]</para>
@@ -396,6 +369,5 @@
<para style="Standard">
<font color="white"> </font>
</para>
- </pto>
</story>
</document>
\ No newline at end of file
=== modified file 'sale_layout/sale_layout_view.xml'
--- sale_layout/sale_layout_view.xml 2011-06-15 13:48:31 +0000
+++ sale_layout/sale_layout_view.xml 2011-07-07 12:22:35 +0000
@@ -44,7 +44,7 @@
<separator colspan="4" string="Manual Description" />
<field name="layout_type" on_change="onchange_sale_order_line_view(layout_type)"/>
<field name="sequence" string="Seq."/>
- <field colspan="4" name="name" select="2" attrs="{'readonly':[('layout_type','in',('line','break'))] }"/>
+ <field colspan="4" name="name" required="0" select="2" attrs="{'readonly':[('layout_type','in',('line','break'))], 'required':[('layout_type','not in',['line','break'])]}"/>
<field name="price_unit" select="2" attrs="{'readonly':[('layout_type','!=','article')],'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"/>
<field name="discount" attrs="{'readonly':[('layout_type','!=','article')]}"/>
<field name="type" attrs="{'readonly':[('layout_type','!=','article')]}"/>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
