Merge branch 'staging-fixes' into Gross-Profit-Exclude-Opening-Invoice
diff --git a/erpnext/accounts/report/gross_profit/gross_profit.py b/erpnext/accounts/report/gross_profit/gross_profit.py
index 2ed664c..7ecc695 100644
--- a/erpnext/accounts/report/gross_profit/gross_profit.py
+++ b/erpnext/accounts/report/gross_profit/gross_profit.py
@@ -200,7 +200,7 @@
def skip_row(self, row, product_bundles):
if self.filters.get("group_by") != "Invoice":
- if not row.get(scrub(self.filters.get("group_by"))):
+ if not row.get(scrub(self.filters.get("group_by", ""))):
return True
elif row.get("is_return") == 1:
return True
@@ -316,7 +316,7 @@
on `tabSales Invoice Item`.parent = `tabSales Invoice`.name
{sales_team_table}
where
- `tabSales Invoice`.docstatus=1 {conditions} {match_cond}
+ `tabSales Invoice`.docstatus=1 and `tabSales Invoice`.is_opening!='Yes' {conditions} {match_cond}
order by
`tabSales Invoice`.posting_date desc, `tabSales Invoice`.posting_time desc"""
.format(conditions=conditions, sales_person_cols=sales_person_cols,
diff --git a/erpnext/setup/doctype/company/company_dashboard.py b/erpnext/setup/doctype/company/company_dashboard.py
index 6133226..5efcf38 100644
--- a/erpnext/setup/doctype/company/company_dashboard.py
+++ b/erpnext/setup/doctype/company/company_dashboard.py
@@ -13,7 +13,7 @@
'goal_doctype_link': 'company',
'goal_field': 'base_grand_total',
'date_field': 'posting_date',
- 'filter_str': 'docstatus = 1',
+ 'filter_str': "docstatus = 1 and is_opening != 'Yes'",
'aggregation': 'sum'
},