Merge lp:~openerp-dev/openobject-addons/6.0-opw-578572-dhs into lp:openobject-addons/6.0

[Dhruti Shastri(OpenERP)]

Sale_layout doesn't work with Pagebreak.

[Naresh(OpenERP) (nch-openerp)]

I see a problem here. When you print the report without a page break tag you don't have the headers repeated any more if your order lines spans over more then 1 page.

secondly if you change the rml please change the sxw too.

Thanks,
Naresh

review: Needs Fixing

Unmerged revisions

5334. By Dhruti Shastri(OpenERP) on 2012-09-05

[FIX] sale_layout : PageBreak doesn't work (case: 578572)

=== modified file 'sale_layout/report/report_sale_layout.py'
--- sale_layout/report/report_sale_layout.py	2011-07-19 06:24:46 +0000
+++ sale_layout/report/report_sale_layout.py	2012-09-05 07:37:29 +0000
@@ -67,7 +67,7 @@
                 sub_total[i] = entry.price_subtotal and entry.price_subtotal
                 i = i + 1
                 res['note'] = entry.notes or ''
-                res['currency'] = sale_order.pricelist_id.currency_id.name
+                res['currency'] = sale_order.pricelist_id.currency_id.symbol
                 res['layout_type'] = entry.layout_type
             else:
                 res['product_uom_qty'] = ''

=== modified file 'sale_layout/report/report_sale_layout.rml'
--- sale_layout/report/report_sale_layout.rml	2012-01-16 14:49:03 +0000
+++ sale_layout/report/report_sale_layout.rml	2012-09-05 07:37:29 +0000
@@ -133,33 +133,6 @@
     <images/>
   </stylesheet>
   <story>
-  <pto>
-  <pto_header>
-	<para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
-	<para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
-    <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">
@@ -392,6 +365,5 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-   </pto>
   </story>
 </document>

=== modified file 'sale_layout/sale_layout_view.xml'
--- sale_layout/sale_layout_view.xml	2011-01-14 00:11:01 +0000
+++ sale_layout/sale_layout_view.xml	2012-09-05 07:37:29 +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" 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')]}"/>