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/68338
Hello Sir,
[Fix] : According to the OPW case 6432 there are few issues in the Sale_layout
module.
1. When the Title or Note are in the selection for layout_type in the
sale order line, Currency symbol appears in the report.
2. There is no action when select line and page-break for layout_type.
I have fixed the issue in the branch.
Thanks,
SKH
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-6432-skh/+merge/68338
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.py'
--- sale_layout/report/report_sale_layout.py 2011-01-14 00:11:01 +0000
+++ sale_layout/report/report_sale_layout.py 2011-07-19 06:37:11 +0000
@@ -108,14 +108,14 @@
res['price_subtotal'] = ''
res['currency'] = ''
elif entry.layout_type == 'line':
- res['product_uom_qty'] = '__________'
- res['price_unit'] = '______________'
- res['discount'] = '___________'
- res['tax_id'] = '_________________'
- res['product_uom'] = '_____'
- res['name'] = '_______________________________________'
- res['price_subtotal'] = '_________'
- res['currency'] = '_______'
+ res['product_uom_qty'] = ''
+ res['price_unit'] = ' '
+ res['discount'] = ''
+ res['tax_id'] = ''
+ res['product_uom'] = ''
+ res['name'] = '__________________________________________________________________________________________________________________'
+ res['price_subtotal'] = ''
+ res['currency'] = ''
elif entry.layout_type == 'break':
res['layout_type'] = entry.layout_type
res['name'] = entry.name
=== 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-19 06:37:11 +0000
@@ -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['layout_type'] in ['text','break'] 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>
@@ -295,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'], 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>
@@ -396,6 +369,5 @@
<para style="Standard">
<font color="white"> </font>
</para>
- </pto>
</story>
</document>
\ No newline at end of file
=== 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-19 06:37:11 +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
