nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-20 13:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: is_opening != 'Yes'

Browse Source
This commit is contained in:
Saif Ur Rehman
2019-01-02 16:09:34 +05:00
parent fac6b59627
commit e194a655df
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/report/gross_profit/gross_profit.py
View File

@@ -316,7 +316,7 @@ class GrossProfitGenerator(object):
on `tabSales Invoice Item`.parent = `tabSales Invoice`.name on `tabSales Invoice Item`.parent = `tabSales Invoice`.name
{sales_team_table} {sales_team_table}
where where
`tabSales Invoice`.docstatus=1 and `tabSales Invoice`.is_opening='No' {conditions} {match_cond} `tabSales Invoice`.docstatus=1 and `tabSales Invoice`.is_opening!='Yes' {conditions} {match_cond}
order by order by
`tabSales Invoice`.posting_date desc, `tabSales Invoice`.posting_time desc""" `tabSales Invoice`.posting_date desc, `tabSales Invoice`.posting_time desc"""
.format(conditions=conditions, sales_person_cols=sales_person_cols, .format(conditions=conditions, sales_person_cols=sales_person_cols,

2
erpnext/setup/doctype/company/company_dashboard.py
View File

@@ -13,7 +13,7 @@ def get_data():
'goal_doctype_link': 'company', 'goal_doctype_link': 'company',
'goal_field': 'base_grand_total', 'goal_field': 'base_grand_total',
'date_field': 'posting_date', 'date_field': 'posting_date',
'filter_str': 'docstatus = 1', 'filter_str': "docstatus = 1 and is_opening != 'Yes'",
'aggregation': 'sum' 'aggregation': 'sum'
}, },