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

merging from the trunk

Browse Source 
bzr revid: mga@tinyerp.com-20081215121149-hnhmyhcnuq4qzarr
bzr revid: mga@tinyerp.com-20081215121325-ebk4gbppnri5oit3
This commit is contained in:
Mantavya Gajjar
2008-12-15 17:43:25 +05:30
parent 90f334cfcf 7015ae6cc6
commit 876aa21856
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account.py
-1
View File
@@ -832,7 +832,6 @@ class account_move(osv.osv):
if 'line_id' in vals:
c = context.copy()
c['novalidate'] = True
print 'XXXXXXXXXXXXXXXXXXX : ',vals
result = super(account_move, self).create(cr, uid, vals, c)
self.validate(cr, uid, [result], context)
else:
addons/account/account_move_line.py
-1
View File
@@ -728,7 +728,6 @@ class account_move_line(osv.osv):
if vals.get('date', False):
todo_date = vals['date']
del vals['date']
print 'Writing', vals, 'to move_line', ids
result = super(account_move_line, self).write(cr, uid, ids, vals, context)
if check:
addons/account/invoice.py
+1 -1
View File
@@ -618,7 +618,7 @@ class account_invoice(osv.osv):
i[2]['period_id'] = period_id
if not 'name' in move:
move['name'] = inv.name
move['name'] = inv.name or '/'
move_id = self.pool.get('account.move').create(cr, uid, move)
new_move_name = self.pool.get('account.move').browse(cr, uid, move_id).name
addons/account/report/invoice.rml
+5 -5
View File
@@ -327,7 +327,7 @@
<para style="terp_default_9">[[ l.name ]]</para>
</td>
<td>
<para style="terp_default_9">[[ ', '.join([lt.name for lt in l.invoice_line_tax_id]) or '0.00' ]]</para>
<para style="terp_default_9">[[ ', '.join([lt.name for lt in l.invoice_line_tax_id]) or '' ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(l.quantity) or '0.00' ]]</para>
@@ -463,7 +463,7 @@
<blockTable colWidths="530.0" style="Table_Main_Table">
<tr>
<td>
<para style="terp_default_8">[[ format(o.amount_tax or removeParentNode('blockTable')) ]]</para>
<!-- <para style="terp_default_8">[[ format(o.amount_tax or removeParentNode('blockTable')) ]]</para> -->
<blockTable colWidths="54.0,58.0,67.0" style="Table_Tax_Header">
<tr>
<td>
@@ -491,10 +491,10 @@
<para style="terp_default_Centre_8">[[ t.name ]]</para>
</td>
<td>
<para style="terp_default_Right_8">[[ formatLang(t.base) ]]</para>
<para style="terp_default_Right_8">[[ formatLang(t.base) or '0.00' ]]</para>
</td>
<td>
<para style="terp_default_Right_8">[[ formatLang(t.amount) or 0.00 ]]</para>
<para style="terp_default_Right_8">[[ formatLang(t.amount) or '0.00' ]]</para>
</td>
</tr>
</blockTable>
@@ -559,4 +559,4 @@
<font color="white"> </font>
</para>
</story>
</document>
</document>