From feaae64ba2f183fa680215b0ce22a4e3580b6031 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Thu, 7 Jul 2011 17:46:46 +0530
Subject: [PATCH 1/2] [FIX] sale_layout: Report Order with layout aborted if
 lines type Note or Page break

lp bug: https://launchpad.net/bugs/802410 fixed

bzr revid: ara@tinyerp.com-20110707121646-qxscon9vg5whdn2h
---
 .../sale_layout/report/report_sale_layout.rml | 30 +------------------
 addons/sale_layout/sale_layout_view.xml       |  2 +-
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/addons/sale_layout/report/report_sale_layout.rml b/addons/sale_layout/report/report_sale_layout.rml
index 941df09aeb5..dfd0223f2a7 100644
--- a/addons/sale_layout/report/report_sale_layout.rml
+++ b/addons/sale_layout/report/report_sale_layout.rml
@@ -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
diff --git a/addons/sale_layout/sale_layout_view.xml b/addons/sale_layout/sale_layout_view.xml
index 6dee4ddd62f..81d9af4ce73 100644
--- a/addons/sale_layout/sale_layout_view.xml
+++ b/addons/sale_layout/sale_layout_view.xml
@@ -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')]}"/>

From d6c416787b6dd229ae3875aed6f9d9beeb2bff93 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 18 Jul 2011 12:14:21 +0530
Subject: [PATCH 2/2] [IMP] Report Order with layout aborted if lines type Note
 or Page break

bzr revid: ara@tinyerp.com-20110718064421-j3n73azrncj9buey
---
 addons/sale_layout/report/report_sale_layout.py  | 2 +-
 addons/sale_layout/report/report_sale_layout.rml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/sale_layout/report/report_sale_layout.py b/addons/sale_layout/report/report_sale_layout.py
index 57839ecffeb..62513d6d98f 100644
--- a/addons/sale_layout/report/report_sale_layout.py
+++ b/addons/sale_layout/report/report_sale_layout.py
@@ -67,7 +67,7 @@ class sale_order_1(report_sxw.rml_parse):
                 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'] = ''
diff --git a/addons/sale_layout/report/report_sale_layout.rml b/addons/sale_layout/report/report_sale_layout.rml
index dfd0223f2a7..a0ccec0ab7b 100644
--- a/addons/sale_layout/report/report_sale_layout.rml
+++ b/addons/sale_layout/report/report_sale_layout.rml
@@ -250,7 +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_9">[[ a['type']=='text' and removeParentNode('blockTable')]]</para>
+            <para style="terp_default_9">[[ a['layout_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>
@@ -268,7 +268,7 @@
             <para style="terp_default_Centre_9"><font face="Helvetica" size="8.0">[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font> [[ formatLang(a['discount']) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ a['layout_type']=='break' and removeParentNode('blockTable')]]<font face="Helvetica" size="8.0">[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font> [[ formatLang(a['price_subtotal'], digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font> [[ formatLang(a['price_subtotal'], digits=get_digits(dp='Sale Price')) ]] [[ a['currency'] ]]</para>
           </td>
         </tr>
         <tr>