Merge lp:~openerp-dev/openobject-addons/6.1-opw-577744-dhs into lp:openobject-addons/6.1

[Dhruti Shastri(OpenERP)]

Branch fixes following things,

1] The note description is printed, but not the note itself

2] The word “sub total” stays English

[Olivier Dony (Odoo) (odo-openerp)]

This seems ok on first look, but if you modify a .rml file you should also modify the .sxw file in the same manner.

Thanks!

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/6.1-opw-577744-dhs]

6957. By Quentin (OpenERP) <email address hidden> on 2012-08-21

[MERGE] fixes in account_voucher

6958. By Xavier ALT on 2012-08-21

[FIX] OPW 577963: ir_attachment: speed up ir.attachment search for large databases

6959. By Olivier Dony (Odoo) on 2012-08-22

[FIX] document: complete previous fix, restore sort order after filtering

6960. By Xavier ALT on 2012-08-22

[MERGE] BUG 1039664: edi: fix wrong cursor when generating edi_web_url_view

  regression from revid: <email address hidden>

6961. By Dhruti Shastri(OpenERP) on 2012-08-24

[FIX] : Sale_layout : SubTotal not translated, Note doesn't display not itself (case Ref: 577744)

[Dhruti Shastri(OpenERP) (dhs-openerp)]

I ahve made the changes in sxw according to rml

review: Needs Resubmitting

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Not Relevant on Trunk (means that the sale_layout module is no more in trunk and so this bug has no meaning anymore). If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6961. By Dhruti Shastri(OpenERP) on 2012-08-24

[FIX] : Sale_layout : SubTotal not translated, Note doesn't display not itself (case Ref: 577744)

=== modified file 'sale_layout/i18n/nl.po'
--- sale_layout/i18n/nl.po	2012-08-10 05:19:04 +0000
+++ sale_layout/i18n/nl.po	2012-08-24 08:11:19 +0000
@@ -23,7 +23,9 @@
 msgstr "Orderreferentie moet uniek zijn per bedrijf!"
 
 #. module: sale_layout
+#: code:addons/sale_layout/sale_layout.py:82
 #: selection:sale.order.line,layout_type:0
+#, python-format
 msgid "Sub Total"
 msgstr "Subtotaal"
 

=== modified file 'sale_layout/report/report_sale_layout.rml'
--- sale_layout/report/report_sale_layout.rml	2012-03-15 18:11:12 +0000
+++ sale_layout/report/report_sale_layout.rml	2012-08-24 08:11:19 +0000
@@ -274,9 +274,14 @@
       <blockTable colWidths="539.0" style="Table11">
         <tr>
           <td>
-            <para style="terp_default_9">[[ a['layout_type']=='text' and a['name'] or removeParentNode('blockTable') ]]</para>
+            <para style="terp_default_9">[[ a['layout_type']=='text' and a['name'] or removeParentNode('blockTable') ]] </para>
           </td>
         </tr>
+        <tr>
+          <td>
+          	<para stype="terp_default_9">[[ a['note'] or removeParentNode('tr') ]] </para>
+          </td>
+        </tr>	
       </blockTable>
       <pageBreak>[[ a['layout_type']!='break' and removeParentNode('pageBreak')]]</pageBreak>
       <blockTable colWidths="198.0,85.0,71.0,57.0,57.0,71.0" style="Table13">

=== modified file 'sale_layout/report/report_sale_layout.sxw'
Binary files sale_layout/report/report_sale_layout.sxw	2011-05-10 09:14:36 +0000 and sale_layout/report/report_sale_layout.sxw	2012-08-24 08:11:19 +0000 differ
=== modified file 'sale_layout/sale_layout.py'
--- sale_layout/sale_layout.py	2012-02-14 23:24:48 +0000
+++ sale_layout/sale_layout.py	2012-08-24 08:11:19 +0000
@@ -22,6 +22,7 @@
 
 from osv import fields, osv
 import decimal_precision as dp
+from tools.translate import _
 
 class sale_order_line(osv.osv):
 
@@ -78,7 +79,7 @@
             if type == 'break':
                 temp['value']['name'] = ' '
             if type == 'subtotal':
-                temp['value']['name'] = 'Sub Total'
+                temp['value']['name'] = _('Sub Total')
             return temp
         return {}