Dhruti Shastri has proposed merging
lp:~openerp-dev/openobject-addons/6.1-opw-577744-dhs into
lp:openobject-addons/6.1.
Requested reviews:
Olivier Dony (OpenERP) (odo-openerp)
Naresh(OpenERP) (nch-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-577744-dhs/+merge/120499
Branch fixes following things,
1] The note description is printed, but not the note itself
2] The word “sub total” stays English
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-577744-dhs/+merge/120499
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.1-opw-577744-dhs.
=== 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-21 05:29:32 +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-21 05:29:32 +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/sale_layout.py'
--- sale_layout/sale_layout.py 2012-02-14 23:24:48 +0000
+++ sale_layout/sale_layout.py 2012-08-21 05:29:32 +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 {}
_______________________________________________
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
