diff options
| author | Foram Katharotiya (OpenERP) <fka@tinyerp.com> | 2013-03-04 16:29:18 +0530 |
|---|---|---|
| committer | Foram Katharotiya (OpenERP) <fka@tinyerp.com> | 2013-03-04 16:29:18 +0530 |
| commit | af5969508acb2bc8d135354e6e346dfd7cc98e54 (patch) | |
| tree | 3bc57252f0627e6fa265f805b09b57e5e62beaf7 | |
| parent | 4f00199aaa761b5ce4e1be9a78fde765896c1153 (diff) | |
[IMP] if directly create a so and invoice, from the SO it not display in contract
bzr revid: fka@tinyerp.com-20130304105918-vblu28tisjnbdt0h
| -rw-r--r-- | addons/account_analytic_analysis/account_analytic_analysis.py | 2 | ||||
| -rw-r--r-- | addons/account_analytic_analysis/account_analytic_analysis_view.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 27407423aad..723752db384 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -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), ('state', '=', 'manual')], 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 diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml index 38836b7fcbd..a8626eff92e 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml @@ -68,7 +68,7 @@ <button name="%(action_sales_order)d" string="Sale Orders" type="action" class="oe_link" - context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id],'search_default_project_id': [active_id],'default_project_id': [active_id]}" + context="{'default_partner_id': [partner_id], 'search_default_project_id': [active_id],'default_project_id': [active_id]}" /> </td> </tr><tr> |