Somesh Khare(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/6.0-opw-6432-skh into
lp:openobject-addons/6.0.
Requested reviews:
Priyesh (OpenERP) (pso-openerp)
Jay Vora (OpenERP) (jvo-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-6432-skh/+merge/67694
Hello Sir,
[Fix] : Sale_layout module with multiple issue.
1. Currency symbol appears while give test and note.
2. No Action when the layout_type selection have Line, Break.
Thanks,
SKH
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-6432-skh/+merge/67694
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.0-opw-6432-skh.
=== modified file 'sale_layout/report/report_sale_layout.rml'
--- sale_layout/report/report_sale_layout.rml 2011-01-14 00:11:01 +0000
+++ sale_layout/report/report_sale_layout.rml 2011-07-12 13:07:38 +0000
@@ -276,7 +276,7 @@
<tr>
<td>
<para style="terp_default_8">
- <font face="Helvetica" size="9.0">[[ a['layout_type']=='text' and removeParentNode('blockTable')]]</font>
+ <font face="Helvetica" size="9.0">[[ a['layout_type'] in ['text','break'] and removeParentNode('blockTable')]]</font>
</para>
</td>
<td>
@@ -295,7 +295,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'], digits=get_digits(dp='Sale Price')) ]]</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['layout_type']=='article' and o.pricelist_id.currency_id.symbol ]]</para>
</td>
</tr>
<tr>
=== modified file 'sale_layout/sale_layout.py'
--- sale_layout/sale_layout.py 2011-01-14 00:11:01 +0000
+++ sale_layout/sale_layout.py 2011-07-12 13:07:38 +0000
@@ -68,9 +68,9 @@
},
}
if type == 'line':
- temp['value']['name'] = ' '
+ temp['value']['name'] = '____'
if type == 'break':
- temp['value']['name'] = ' '
+ temp['value']['name'] = '·····Page Break·····'
if type == 'subtotal':
temp['value']['name'] = 'Sub Total'
return temp
@@ -79,9 +79,9 @@
def create(self, cr, user, vals, context=None):
if vals.has_key('layout_type'):
if vals['layout_type'] == 'line':
- vals['name'] = ' '
+ vals['name'] = '____'
if vals['layout_type'] == 'break':
- vals['name'] = ' '
+ vals['name'] = '·····Page Break·····'
if vals['layout_type'] != 'article':
vals['product_uom_qty']= 0
return super(sale_order_line, self).create(cr, user, vals, context)
@@ -89,9 +89,9 @@
def write(self, cr, user, ids, vals, context=None):
if vals.has_key('layout_type'):
if vals['layout_type'] == 'line':
- vals['name'] = ' '
+ vals['name'] = '____'
if vals['layout_type'] == 'break':
- vals['name'] = ' '
+ vals['name'] = '·····Page Break·····'
return super(sale_order_line, self).write(cr, user, ids, vals, context)
def copy(self, cr, uid, id, default=None, context=None):
_______________________________________________
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
