[fix] company graph based on base currency

This commit is contained in:
Rushabh Mehta 2017-07-18 18:20:29 +05:30
parent d36c136fc6
commit 1283f6308d
2 changed files with 25 additions and 1 deletions

View File

@ -0,0 +1,24 @@
/* eslint-disable */
// rename this file from _test_[name] to test_[name] to activate
// and remove above this line
QUnit.test("test: Task", function (assert) {
let done = assert.async();
// number of asserts
assert.expect(2);
frappe.run_serially([
// insert a new Task
() => frappe.tests.make('Task', [
// values to be set
{subject: 'new task'}
]),
() => {
assert.equal(cur_frm.doc.status, 'Open');
assert.equal(cur_frm.doc.priority, 'Low');
},
() => done()
]);
});

View File

@ -340,7 +340,7 @@ def update_company_monthly_sales(company):
from frappe.utils.goal import get_monthly_results
import json
filter_str = "company = '{0}' and status != 'Draft'".format(frappe.db.escape(company))
month_to_value_dict = get_monthly_results("Sales Invoice", "grand_total", "posting_date", filter_str, "sum")
month_to_value_dict = get_monthly_results("Sales Invoice", "base_grand_total", "posting_date", filter_str, "sum")
frappe.db.sql(('''
update tabCompany set sales_monthly_history = %s where name=%s