odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Bugfix on account move line and minor edit on account budget 

bzr revid: jvo@tinyerp.com-20080925141714-o0dfv75tel6wzxdd
This commit is contained in:
Jay Vora 2008-09-25 19:47:14 +05:30
parent 703a2410d9
commit 0d0e87c941
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account/account_view.xml
View File

@ -654,6 +654,7 @@
<field name="state"/>
<field name="reconcile_id"/>
<field name="reconcile_partial_id"/>
<field colspan="4" name="reconcile_implicit"/>
</tree>
</field>
</record>
@ -748,7 +749,7 @@
<newline/>
<field name="account_tax_id" domain="[('parent_id','=',False)]"/>
<field name="analytic_account_id"/>
<field colspan="4" name="reconcile_implicit"/>
<separator colspan="4" string="State"/>
<newline/>
<field name="reconcile_id"/>
@ -1289,6 +1290,7 @@
<field name="credit" sum="Total credit"/>
<field name="account_tax_id"/>
<field name="analytic_account_id"/>
<field colspan="4" name="reconcile_implicit"/>
<field name="state"/>
</tree>
</field>

6
addons/account_budget/crossovered_budget.py
View File

@ -215,9 +215,9 @@ class crossovered_budget_lines(osv.osv):
'date_from': fields.date('Start Date',required=True),
'date_to': fields.date('End Date',required=True),
'paid_date': fields.date('Paid Date'),
'planned_amount':fields.float('Planned Amount',required=True),
'practical_amount':fields.function(_prac,method=True, string='Practical Amount',type='float'),
'theoritical_amount':fields.function(_theo,method=True, string='Theoritical Amount',type='float'),
'planned_amount':fields.float('Planned Amount',required=True,digits=(16,2)),
'practical_amount':fields.function(_prac,method=True, string='Practical Amount',type='float',digits=(16,2)),
'theoritical_amount':fields.function(_theo,method=True, string='Theoritical Amount',type='float',digits=(16,2)),
'percentage':fields.function(_perc,method=True, string='Percentage',type='float'),
}
crossovered_budget_lines()