pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]

Browse Source 
bzr revid: stephane@tinyerp.com-20090123145301-8ld0ouoc9vhohe0e
This commit is contained in:
Stephane Wirtel
2009-01-23 15:53:01 +01:00
parent 1798c6ba04 2cb8df7e40
commit a77c853f4c
7 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/report/wizard_account_journal.rml
+7 -7
View File
@@ -24,7 +24,7 @@
<setFont name="Helvetica" size="9"/>
<drawString x="1.0cm" y="1cm"> [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]</drawString>
<drawString x="1.0cm" y="1cm"> [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</drawString>
<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
@@ -145,7 +145,7 @@
</tr>
<tr>
<td>
<para style="P11">[[line[0].period_id.name ]]</para>
<para style="P11">[[ line[0].period_id.name ]]</para>
</td>
<td>
<para style="P11a">[[line[0].journal_id.code ]]</para></td>
@@ -153,16 +153,16 @@
<td></td>
<td></td>
<td>
<para style="P12"><u>[[ '%.2f' % sum_debit(line[0].period_id.id, line[0].journal_id.id) or '0.00' ]]</u></para>
<para style="P12"><u>[[ formatLang(sum_debit(line[0].period_id.id, line[0].journal_id.id)) ]]</u></para>
</td>
<td>
<para style="P12"><u>[[ '%.2f' % sum_credit(line[0].period_id.id, line[0].journal_id.id) or '0.00' ]]</u></para>
<para style="P12"><u>[[ formatLang(sum_credit(line[0].period_id.id, line[0].journal_id.id)) ]]</u></para>
</td>
</tr >
<tr>
<para style="terp_default_8">[[repeatIn(line,'l')]]</para>
<td>
<para style="terp_default_8">[[ l.date ]]</para>
<para style="terp_default_8">[[ formatLang(l.date,date=True) ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ l.ref ]]</para>
@@ -177,10 +177,10 @@
<para style="terp_default_8">[[ l.name ]]</para>
</td>
<td>
<para style="P8">[[ l.debit and '%.2f' % l.debit or '0.00' ]]</para>
<para style="P8">[[ formatLang(l.debit) ]]</para>
</td>
<td>
<para style="P8">[[ l.credit and '%.2f' % l.credit or '0.00' ]]</para>
<para style="P8">[[ formatLang(l.credit) ]]</para>
</td>
<para style="Standard">
<font color="white"> </font>
addons/account/report/wizard_central_journal.rml
+6 -6
View File
@@ -16,7 +16,7 @@
<setFont name="Helvetica" size="9"/>
<drawString x="1.0cm" y="1cm"> [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]</drawString>
<drawString x="1.0cm" y="1cm"> [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</drawString>
<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
@@ -169,7 +169,7 @@
<para style="terp_tblheader_General_Centre">[[ line[0]['journal'].name ]]</para>
</td>
<td>
<para style="terp_tblheader_General_Centre">[[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
<para style="terp_tblheader_General_Centre">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]]</para>
</td>
</tr>
</blockTable>
@@ -208,10 +208,10 @@
</para>
</td>
<td>
<para style="terp_default_Bold_9_Right">[[ '%.2f' % sum_debit(line[0]['period'].id, line[0]['journal'].id) ]]</para>
<para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit(line[0]['period'].id, line[0]['journal'].id)) ]]</para>
</td>
<td>
<para style="terp_default_Bold_9_Right">[[ '%.2f' % sum_credit(line[0]['period'].id, line[0]['journal'].id) ]]</para>
<para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit(line[0]['period'].id, line[0]['journal'].id)) ]]</para>
</td>
</tr>
</blockTable>
@@ -230,10 +230,10 @@
<para style="terp_default_9">[[ l['name'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(l['debit']) and '%.2f' % l['debit'] or '0.00' ]]</para>
<para style="terp_default_Right_9">[[ formatLang(l['debit']) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(l['credit']) and '%.2f' % l['credit'] or '0.00' ]]</para>
<para style="terp_default_Right_9">[[ formatLang(l['credit']) ]]</para>
</td>
</tr>
</blockTable>
addons/account/report/wizard_general_journal.rml
+8 -8
View File
@@ -16,7 +16,7 @@
<setFont name="Helvetica" size="9"/>
<drawString x="1.0cm" y="1cm"> [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]</drawString>
<drawString x="1.0cm" y="1cm"> [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</drawString>
<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
@@ -130,7 +130,7 @@
<para style="terp_default_Bold_9">Printing Date :</para>
</td>
<td>
<para style="terp_default_Bold_9">[[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
<para style="terp_default_Bold_9">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]]</para>
</td>
</tr>
</blockTable>
@@ -178,10 +178,10 @@
</para>
</td>
<td>
<para style="terp_default_Bold_9_Right"><u>[[ '%.2f' % sum_debit(data['form']['period_id'][0][2],data['form']['journal_id'][0][2]) ]]</u></para>
<para style="terp_default_Bold_9_Right"><u>[[ formatLang(sum_debit(data['form']['period_id'][0][2],data['form']['journal_id'][0][2])) ]]</u></para>
</td>
<td>
<para style="terp_default_Bold_9_Right"><u>[[ '%.2f' % sum_credit(data['form']['period_id'][0][2],data['form']['journal_id'][0][2]) ]]</u></para>
<para style="terp_default_Bold_9_Right"><u>[[ formatLang(sum_credit(data['form']['period_id'][0][2],data['form']['journal_id'][0][2])) ]]</u></para>
</td>
</tr>
</blockTable>
@@ -208,10 +208,10 @@
</para>
</td>
<td>
<para style="terp_default_Bold_9_Right"><u>[[ '%.2f' % sum_debit_period( line[0]['pid'],data['form']['journal_id'][0][2]) ]]</u></para>
<para style="terp_default_Bold_9_Right"><u>[[ formatLang(sum_debit_period( line[0]['pid'],data['form']['journal_id'][0][2])) ]]</u></para>
</td>
<td>
<para style="terp_default_Bold_9_Right"><u>[[ '%.2f' % sum_credit_period(line[0]['pid'],data['form']['journal_id'][0][2]) ]]</u></para>
<para style="terp_default_Bold_9_Right"><u>[[ formatLang(sum_credit_period(line[0]['pid'],data['form']['journal_id'][0][2])) ]]</u></para>
</td>
</tr>
<tr>
@@ -229,10 +229,10 @@
<para style="terp_default_9">[[ line[0]['period_name'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ l['debit'] and ('%.2f' % l['debit']) or '' ]]</para>
<para style="terp_default_Right_9">[[ formatLang(l['debit'])]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ l['credit'] and ('%.2f' % l['credit']) or '' ]]</para>
<para style="terp_default_Right_9">[[ formatLang(l['credit']) ]]</para>
</td>
</tr>
</blockTable>
addons/mrp/report/order.rml
+7 -7
View File
@@ -206,7 +206,7 @@
<para style="P22">[[ '['+ o.product_id.code +']' ]] [[ o.product_id.name ]]</para>
</td>
<td>
<para style="P22">[['%.2f' % o.product_qty or '0.00' ]]</para>
<para style="P22">[[ formatLang(o.product_qty) ]]</para>
</td>
<td>
<para style="P22">[[o.priority or '']]</para>
@@ -239,10 +239,10 @@
<blockTable colWidths="128.0,137.0,132.0,131.0" style="Table2">
<tr>
<td>
<para style="P9">[[ time.strftime('%d/%m/%Y') ]]</para>
<para style="P9">[[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</para>
</td>
<td>
<para style="P12">[[ time.strftime('%d/%m/%Y', time.strptime(o.date_planned, '%Y-%m-%d %H:%M:%S')) ]]</para>
<para style="P12">[[ formatLang(o.date_planned, date=True) ]]</para>
</td>
<td>
<para style="P9">[[ o.sale_ref or ' ' ]]</para>
@@ -292,10 +292,10 @@
<para style="P22">[[ line2.workcenter_id.name ]]</para>
</td>
<td>
<para style="P22">[[ line2.cycle or '0.00' ]]</para>
<para style="P22">[[ formatLang(line2.cycle) ]]</para>
</td>
<td>
<para style="P22">[[ line2.hour or '0.00' ]]</para>
<para style="P22">[[ formatLang(line2.hour) ]]</para>
</td>
</tr>
</blockTable>
@@ -327,7 +327,7 @@
<para style="P4">[[ '['+line.product_id.code +']' ]][[ line.product_id.name ]]</para>
</td>
<td>
<para style="P5">[[ '%.2f' % line.product_qty ]] [[line.product_uom.name]]</para>
<para style="P5">[[ formatLang(line.product_qty) ]] [[line.product_uom.name]]</para>
</td>
<td>
<para style="P25">[[ line.location_id.name ]]</para>
@@ -348,4 +348,4 @@
<font color="white"> </font>
</para>
</story>
</document>
</document>
addons/purchase/purchase.py
+2
View File
@@ -452,6 +452,8 @@ class purchase_order_line(osv.osv):
partner_id, date_order=False, fiscal_position=False):
if not pricelist:
raise osv.except_osv(_('No Pricelist !'), _('You have to select a pricelist in the purchase form !\nPlease set one before choosing a product.'))
if not partner_id:
raise osv.except_osv(_('No Partner!'), _('You have to select a partner in the purchase form !\nPlease set one partner before choosing a product.'))
if not product:
return {'value': {'price_unit': 0.0, 'name':'','notes':'', 'product_uom' : False}, 'domain':{'product_uom':[]}}
prod= self.pool.get('product.product').browse(cr, uid,product)
addons/sale/sale.py
+2
View File
@@ -851,6 +851,8 @@ class sale_order_line(osv.osv):
def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,
uom=False, qty_uos=0, uos=False, name='', partner_id=False,
lang=False, update_tax=True, date_order=False, packaging=False, fiscal_position=False):
if not partner_id:
raise osv.except_osv(_('No Partner !'), _('You have to select a partner in the sale form !\nPlease set one partner before choosing a product.'))
warning={}
product_uom_obj = self.pool.get('product.uom')
partner_obj = self.pool.get('res.partner')
addons/stock/report/picking.rml
-1
View File
@@ -119,7 +119,6 @@
<images/>
<story>
<para style="terp_default_8">[[ repeatIn(objects,'picking') ]]</para>
<para style="terp_default_8">[[ setLang((picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.lang)) ]]</para>
<para style="terp_header_Centre"/>
<para style="terp_default_9">
<font color="white"> </font>