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

[IMP] in contract no order to invoice string shoud be seen until sale order is not confirmed 

bzr revid: fka@tinyerp.com-20130304072341-uo0b9ibjp2sehyrd
This commit is contained in:
Foram Katharotiya (OpenERP) 2013-03-04 12:53:41 +05:30
parent b46c9dae1b
commit 9e037ba34f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account_analytic_analysis/account_analytic_analysis.py
View File

@ -295,7 +295,7 @@ class account_analytic_account(osv.osv):
res = {}
for account in self.browse(cr, uid, ids, context=context):
res[account.id] = 0.0
sale_ids = sale_obj.search(cr, uid, [('project_id','=', account.id), ('partner_id', '=', account.partner_id.id)], context=context)
sale_ids = sale_obj.search(cr, uid, [('project_id','=', account.id), ('partner_id', '=', account.partner_id.id), ('state', '=', 'manual')], context=context)
for sale in sale_obj.browse(cr, uid, sale_ids, context=context):
if not sale.invoiced:
res[account.id] += sale.amount_untaxed

2
addons/account_analytic_analysis/account_analytic_analysis_view.xml
View File

@ -57,7 +57,7 @@
<span attrs="{'invisible': [('fix_price_to_invoice','=',0.0)]}" class="oe_grey">
<button name="open_sale_order_lines"
class="oe_link"
string="⇒ Invoice" type="object"
string="⇒ To invoice" type="object"
context="{'default_partner_id': [partner_id],'default_project_id': active_id,'search_default_uninvoiced': 1,'search_default_project_id': active_id,'search_default_partner_id': [partner_id]}"/>
or view
</span>