nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-18 10:57:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Saurabh
2017-07-25 16:42:28 +05:30
parent fb4f320df4 08c3b3c925
commit dc6e369172
71 changed files with 17449 additions and 16879 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -317,7 +317,7 @@ def update_company_current_month_sales(company):
results = frappe.db.sql(('''
select
sum(grand_total) as total, date_format(posting_date, '%m-%Y') as month_year
sum(base_grand_total) as total, date_format(posting_date, '%m-%Y') as month_year
from
`tabSales Invoice`
where

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

@@ -14,7 +14,7 @@ def get_data():
'goal_history_field': 'sales_monthly_history',
'goal_doctype': 'Sales Invoice',
'goal_doctype_link': 'company',
'goal_field': 'grand_total',
'goal_field': 'base_grand_total',
'date_field': 'posting_date',
'filter_str': 'status != "Draft"',
'aggregation': 'sum'