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] [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')]}"/>