Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into pur-inv-status-fix

Browse Source
This commit is contained in:
Saqib 2020-05-13 14:02:19 +05:30 committed by GitHub
commit 7adfc34a26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 185 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

176
erpnext/accounts/dashboard_fixtures.py
View File

@ -1,15 +1,22 @@
# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt # License: GNU General Public License v3. See license.txt
from erpnext import get_default_company
import frappe import frappe
import json import json
def get_data(): def get_data():
return frappe._dict({ data = frappe._dict({
"dashboards": get_dashboards(), "dashboards": [],
"charts": get_charts(), "charts": []
}) })
company = get_company_for_dashboards()
if company:
company_doc = frappe.get_doc("Company", company)
data.dashboards = get_dashboards()
data.charts = get_charts(company_doc)
return data
def get_dashboards(): def get_dashboards():
return [{ return [{
@ -24,88 +31,87 @@ def get_dashboards():
] ]
}] }]
def get_charts(): def get_charts(company):
company = frappe.get_doc("Company", get_company_for_dashboards())
income_account = company.default_income_account or get_account("Income Account", company.name) income_account = company.default_income_account or get_account("Income Account", company.name)
expense_account = company.default_expense_account or get_account("Expense Account", company.name) expense_account = company.default_expense_account or get_account("Expense Account", company.name)
bank_account = company.default_bank_account or get_account("Bank", company.name) bank_account = company.default_bank_account or get_account("Bank", company.name)
return [ return [
{ {
"doctype": "Dashboard Chart", "doctype": "Dashboard Chart",
"time_interval": "Quarterly", "time_interval": "Quarterly",
"name": "Income", "name": "Income",
"chart_name": "Income", "chart_name": "Income",
"timespan": "Last Year", "timespan": "Last Year",
"color": None, "color": None,
"filters_json": json.dumps({"company": company.name, "account": income_account}), "filters_json": json.dumps({"company": company.name, "account": income_account}),
"source": "Account Balance Timeline", "source": "Account Balance Timeline",
"chart_type": "Custom", "chart_type": "Custom",
"timeseries": 1, "timeseries": 1,
"owner": "Administrator", "owner": "Administrator",
"type": "Line" "type": "Line"
}, },
{ {
"doctype": "Dashboard Chart", "doctype": "Dashboard Chart",
"time_interval": "Quarterly", "time_interval": "Quarterly",
"name": "Expenses", "name": "Expenses",
"chart_name": "Expenses", "chart_name": "Expenses",
"timespan": "Last Year", "timespan": "Last Year",
"color": None, "color": None,
"filters_json": json.dumps({"company": company.name, "account": expense_account}), "filters_json": json.dumps({"company": company.name, "account": expense_account}),
"source": "Account Balance Timeline", "source": "Account Balance Timeline",
"chart_type": "Custom", "chart_type": "Custom",
"timeseries": 1, "timeseries": 1,
"owner": "Administrator", "owner": "Administrator",
"type": "Line" "type": "Line"
}, },
{ {
"doctype": "Dashboard Chart", "doctype": "Dashboard Chart",
"time_interval": "Quarterly", "time_interval": "Quarterly",
"name": "Bank Balance", "name": "Bank Balance",
"chart_name": "Bank Balance", "chart_name": "Bank Balance",
"timespan": "Last Year", "timespan": "Last Year",
"color": "#ffb868", "color": "#ffb868",
"filters_json": json.dumps({"company": company.name, "account": bank_account}), "filters_json": json.dumps({"company": company.name, "account": bank_account}),
"source": "Account Balance Timeline", "source": "Account Balance Timeline",
"chart_type": "Custom", "chart_type": "Custom",
"timeseries": 1, "timeseries": 1,
"owner": "Administrator", "owner": "Administrator",
"type": "Line" "type": "Line"
}, },
{ {
"doctype": "Dashboard Chart", "doctype": "Dashboard Chart",
"time_interval": "Monthly", "time_interval": "Monthly",
"name": "Incoming Bills (Purchase Invoice)", "name": "Incoming Bills (Purchase Invoice)",
"chart_name": "Incoming Bills (Purchase Invoice)", "chart_name": "Incoming Bills (Purchase Invoice)",
"timespan": "Last Year", "timespan": "Last Year",
"color": "#a83333", "color": "#a83333",
"value_based_on": "base_grand_total", "value_based_on": "base_grand_total",
"filters_json": json.dumps({}), "filters_json": json.dumps({}),
"chart_type": "Sum", "chart_type": "Sum",
"timeseries": 1, "timeseries": 1,
"based_on": "posting_date", "based_on": "posting_date",
"owner": "Administrator", "owner": "Administrator",
"document_type": "Purchase Invoice", "document_type": "Purchase Invoice",
"type": "Bar" "type": "Bar"
}, },
{ {
"doctype": "Dashboard Chart", "doctype": "Dashboard Chart",
"time_interval": "Monthly", "time_interval": "Monthly",
"name": "Outgoing Bills (Sales Invoice)", "name": "Outgoing Bills (Sales Invoice)",
"chart_name": "Outgoing Bills (Sales Invoice)", "chart_name": "Outgoing Bills (Sales Invoice)",
"timespan": "Last Year", "timespan": "Last Year",
"color": "#7b933d", "color": "#7b933d",
"value_based_on": "base_grand_total", "value_based_on": "base_grand_total",
"filters_json": json.dumps({}), "filters_json": json.dumps({}),
"chart_type": "Sum", "chart_type": "Sum",
"timeseries": 1, "timeseries": 1,
"based_on": "posting_date", "based_on": "posting_date",
"owner": "Administrator", "owner": "Administrator",
"document_type": "Sales Invoice", "document_type": "Sales Invoice",
"type": "Bar" "type": "Bar"
} }
] ]
def get_account(account_type, company): def get_account(account_type, company):
accounts = frappe.get_list("Account", filters={"account_type": account_type, "company": company}) accounts = frappe.get_list("Account", filters={"account_type": account_type, "company": company})
@ -113,11 +119,9 @@ def get_account(account_type, company):
return accounts[0].name return accounts[0].name
def get_company_for_dashboards(): def get_company_for_dashboards():
company = frappe.defaults.get_defaults().company company = get_default_company()
if company: if not company:
return company
else:
company_list = frappe.get_list("Company") company_list = frappe.get_list("Company")
if company_list: if company_list:
return company_list[0].name company = company_list[0].name
return None return company

3
erpnext/assets/doctype/location/location.json
View File

@ -141,7 +141,7 @@
], ],
"is_tree": 1, "is_tree": 1,
"links": [], "links": [],
"modified": "2020-03-18 18:00:08.885805", "modified": "2020-05-08 16:11:11.375701",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Assets", "module": "Assets",
"name": "Location", "name": "Location",
@ -221,7 +221,6 @@
} }
], ],
"quick_entry": 1, "quick_entry": 1,
"restrict_to_domain": "Agriculture",
"show_name_in_global_search": 1, "show_name_in_global_search": 1,
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",

10
erpnext/hr/doctype/hr_settings/hr_settings.json
View File

@ -13,12 +13,12 @@
"stop_birthday_reminders", "stop_birthday_reminders",
"expense_approver_mandatory_in_expense_claim", "expense_approver_mandatory_in_expense_claim",
"payroll_settings", "payroll_settings",
"payroll_based_on", "payroll_based_on",
"max_working_hours_against_timesheet", "max_working_hours_against_timesheet",
"include_holidays_in_total_working_days", "include_holidays_in_total_working_days",
"disable_rounded_total", "disable_rounded_total",
"column_break_11", "column_break_11",
"daily_wages_fraction_for_half_day", "daily_wages_fraction_for_half_day",
"email_salary_slip_to_employee", "email_salary_slip_to_employee",
"encrypt_salary_slips_in_emails", "encrypt_salary_slips_in_emails",
"password_policy", "password_policy",
@ -191,7 +191,7 @@
"default": "Leave", "default": "Leave",
"fieldname": "payroll_based_on", "fieldname": "payroll_based_on",
"fieldtype": "Select", "fieldtype": "Select",
"label": "Calculate Working Days in Payroll based on", "label": "Calculate Payroll Working Days Based On",
"options": "Leave\nAttendance" "options": "Leave\nAttendance"
}, },
{ {
@ -206,7 +206,7 @@
"idx": 1, "idx": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2020-04-13 21:20:59.382394", "modified": "2020-05-11 13:02:51.274347",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "HR Settings", "name": "HR Settings",

2
erpnext/loan_management/doctype/loan_security_pledge/loan_security_pledge.py
View File

@ -38,7 +38,7 @@ class LoanSecurityPledge(Document):
for pledge in self.securities: for pledge in self.securities:
if not pledge.qty and not pledge.amount: if not pledge.qty and not pledge.amount:
frappe.throw(_("Qty or Amount is mandatroy for loan security")) frappe.throw(_("Qty or Amount is mandatory for loan security!"))
if not (self.loan_application and pledge.loan_security_price): if not (self.loan_application and pledge.loan_security_price):
pledge.loan_security_price = get_loan_security_price(pledge.loan_security) pledge.loan_security_price = get_loan_security_price(pledge.loan_security)

1
erpnext/patches.txt
View File

@ -680,3 +680,4 @@ erpnext.patches.v12_0.update_appointment_reminder_scheduler_entry
erpnext.patches.v12_0.retain_permission_rules_for_video_doctype erpnext.patches.v12_0.retain_permission_rules_for_video_doctype
erpnext.patches.v13_0.patch_to_fix_reverse_linking_in_additional_salary_encashment_and_incentive erpnext.patches.v13_0.patch_to_fix_reverse_linking_in_additional_salary_encashment_and_incentive
execute:frappe.delete_doc_if_exists("Page", "appointment-analytic") execute:frappe.delete_doc_if_exists("Page", "appointment-analytic")
execute:frappe.rename_doc("Desk Page", "Getting Started", "Home", force=True)

7
erpnext/patches/v11_0/set_default_email_template_in_hr.py
View File

@ -1,8 +1,9 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from frappe import _
import frappe import frappe
def execute(): def execute():
hr_settings = frappe.get_single("HR Settings") hr_settings = frappe.get_single("HR Settings")
hr_settings.leave_approval_notification_template = "Leave Approval Notification" hr_settings.leave_approval_notification_template = _("Leave Approval Notification")
hr_settings.leave_status_notification_template = "Leave Status Notification" hr_settings.leave_status_notification_template = _("Leave Status Notification")
hr_settings.save() hr_settings.save()

8
erpnext/patches/v13_0/move_tax_slabs_from_payroll_period_to_income_tax_slab.py
View File

@ -7,7 +7,7 @@ import frappe
from frappe.model.utils.rename_field import rename_field from frappe.model.utils.rename_field import rename_field
def execute(): def execute():
if not frappe.db.table_exists("Payroll Period"): if not (frappe.db.table_exists("Payroll Period") and frappe.db.table_exists("Taxable Salary Slab")):
return return
for doctype in ("income_tax_slab", "salary_structure_assignment", "employee_other_income", "income_tax_slab_other_charges"): for doctype in ("income_tax_slab", "salary_structure_assignment", "employee_other_income", "income_tax_slab_other_charges"):
@ -60,6 +60,9 @@ def execute():
""", (income_tax_slab.name, company.name, period.start_date)) """, (income_tax_slab.name, company.name, period.start_date))
# move other incomes to separate document # move other incomes to separate document
if not frappe.db.table_exists("Employee Tax Exemption Proof Submission"):
return
migrated = [] migrated = []
proofs = frappe.get_all("Employee Tax Exemption Proof Submission", proofs = frappe.get_all("Employee Tax Exemption Proof Submission",
filters = {'docstatus': 1}, filters = {'docstatus': 1},
@ -79,6 +82,9 @@ def execute():
except: except:
pass pass
if not frappe.db.table_exists("Employee Tax Exemption Declaration"):
return
declerations = frappe.get_all("Employee Tax Exemption Declaration", declerations = frappe.get_all("Employee Tax Exemption Declaration",
filters = {'docstatus': 1}, filters = {'docstatus': 1},
fields =['payroll_period', 'employee', 'company', 'income_from_other_sources'] fields =['payroll_period', 'employee', 'company', 'income_from_other_sources']

40
erpnext/selling/report/sales_analytics/sales_analytics.json
View File

@ -1,31 +1,31 @@
{ {
"add_total_row": 0, "add_total_row": 0,
"creation": "2018-09-21 12:46:29.451048", "creation": "2018-09-21 12:46:29.451048",
"disable_prepared_report": 0, "disable_prepared_report": 0,
"disabled": 0, "disabled": 0,
"docstatus": 0, "docstatus": 0,
"doctype": "Report", "doctype": "Report",
"idx": 0, "idx": 0,
"is_standard": "Yes", "is_standard": "Yes",
"modified": "2019-05-24 05:37:02.866139", "modified": "2020-04-30 19:49:02.303320",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Sales Analytics", "name": "Sales Analytics",
"owner": "Administrator", "owner": "Administrator",
"prepared_report": 0, "prepared_report": 0,
"ref_doctype": "Sales Order", "ref_doctype": "Sales Order",
"report_name": "Sales Analytics", "report_name": "Sales Analytics",
"report_type": "Script Report", "report_type": "Script Report",
"roles": [ "roles": [
{ {
"role": "Stock User" "role": "Stock User"
}, },
{ {
"role": "Maintenance User" "role": "Maintenance User"
}, },
{ {
"role": "Accounts User" "role": "Accounts User"
}, },
{ {
"role": "Sales Manager" "role": "Sales Manager"
} }

10
erpnext/selling/report/sales_analytics/sales_analytics.py
View File

@ -194,6 +194,9 @@ class Analytics(object):
def get_rows(self): def get_rows(self):
self.data = [] self.data = []
self.get_periodic_data() self.get_periodic_data()
total_row = {
"entity": "Total",
}
for entity, period_data in iteritems(self.entity_periodic_data): for entity, period_data in iteritems(self.entity_periodic_data):
row = { row = {
@ -207,6 +210,9 @@ class Analytics(object):
row[scrub(period)] = amount row[scrub(period)] = amount
total += amount total += amount
if not total_row.get(scrub(period)): total_row[scrub(period)] = 0
total_row[scrub(period)] += amount
row["total"] = total row["total"] = total
if self.filters.tree_type == "Item": if self.filters.tree_type == "Item":
@ -214,6 +220,8 @@ class Analytics(object):
self.data.append(row) self.data.append(row)
self.data.append(total_row)
def get_rows_by_group(self): def get_rows_by_group(self):
self.get_periodic_data() self.get_periodic_data()
out = [] out = []
@ -232,8 +240,10 @@ class Analytics(object):
self.entity_periodic_data.setdefault(d.parent, frappe._dict()).setdefault(period, 0.0) self.entity_periodic_data.setdefault(d.parent, frappe._dict()).setdefault(period, 0.0)
self.entity_periodic_data[d.parent][period] += amount self.entity_periodic_data[d.parent][period] += amount
total += amount total += amount
row["total"] = total row["total"] = total
out = [row] + out out = [row] + out
self.data = out self.data = out
def get_periodic_data(self): def get_periodic_data(self):

30
erpnext/selling/report/sales_analytics/test_analytics.py
View File

@ -33,6 +33,21 @@ class TestAnalytics(unittest.TestCase):
report = execute(filters) report = execute(filters)
expected_data = [ expected_data = [
{
'entity': 'Total',
'apr_2017': 0.0,
'may_2017': 0.0,
'jun_2017': 2000.0,
'jul_2017': 1000.0,
'aug_2017': 0.0,
'sep_2017': 1500.0,
'oct_2017': 1000.0,
'nov_2017': 0.0,
'dec_2017': 0.0,
'jan_2018': 0.0,
'feb_2018': 2000.0,
'mar_2018': 0.0
},
{ {
"entity": "_Test Customer 1", "entity": "_Test Customer 1",
"entity_name": "_Test Customer 1", "entity_name": "_Test Customer 1",
@ -134,6 +149,21 @@ class TestAnalytics(unittest.TestCase):
report = execute(filters) report = execute(filters)
expected_data = [ expected_data = [
{
'entity': 'Total',
'apr_2017': 0.0,
'may_2017': 0.0,
'jun_2017': 20.0,
'jul_2017': 10.0,
'aug_2017': 0.0,
'sep_2017': 15.0,
'oct_2017': 10.0,
'nov_2017': 0.0,
'dec_2017': 0.0,
'jan_2018': 0.0,
'feb_2018': 20.0,
'mar_2018': 0.0
},
{ {
"entity": "_Test Customer 1", "entity": "_Test Customer 1",
"entity_name": "_Test Customer 1", "entity_name": "_Test Customer 1",

14
erpnext/setup/desk_page/getting_started/getting_started.json → erpnext/setup/desk_page/home/home.json
View File

@ -47,26 +47,20 @@
} }
], ],
"category": "Modules", "category": "Modules",
"charts": [ "charts": [],
{
"chart_name": "Bank Balance",
"label": "Bank Balance"
}
],
"creation": "2020-01-23 13:46:38.833076", "creation": "2020-01-23 13:46:38.833076",
"developer_mode_only": 0, "developer_mode_only": 0,
"disable_user_customization": 0, "disable_user_customization": 0,
"docstatus": 0, "docstatus": 0,
"doctype": "Desk Page", "doctype": "Desk Page",
"extends_another_page": 0, "extends_another_page": 0,
"icon": "",
"idx": 0, "idx": 0,
"is_standard": 1, "is_standard": 1,
"label": "Getting Started", "label": "Home",
"modified": "2020-04-01 11:30:19.763099", "modified": "2020-05-11 10:20:37.358701",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Getting Started", "name": "Home",
"owner": "Administrator", "owner": "Administrator",
"pin_to_bottom": 0, "pin_to_bottom": 0,
"pin_to_top": 1, "pin_to_top": 1,

2
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@ -470,7 +470,7 @@ class StockEntry(StockController):
"qty": item.s_warehouse and -1*flt(item.transfer_qty) or flt(item.transfer_qty), "qty": item.s_warehouse and -1*flt(item.transfer_qty) or flt(item.transfer_qty),
"serial_no": item.serial_no, "serial_no": item.serial_no,
"voucher_type": self.doctype, "voucher_type": self.doctype,
"voucher_no": item.name, "voucher_no": self.name,
"company": self.company, "company": self.company,
"allow_zero_valuation": item.allow_zero_valuation_rate, "allow_zero_valuation": item.allow_zero_valuation_rate,
}) })

13
erpnext/stock/stock_ledger.py
View File

@ -548,7 +548,16 @@ def get_valuation_rate(item_code, warehouse, voucher_type, voucher_no,
if not allow_zero_rate and not valuation_rate and raise_error_if_no_rate \ if not allow_zero_rate and not valuation_rate and raise_error_if_no_rate \
and cint(erpnext.is_perpetual_inventory_enabled(company)): and cint(erpnext.is_perpetual_inventory_enabled(company)):
frappe.local.message_log = [] frappe.local.message_log = []
frappe.throw(_("Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting / cancelling this entry.") form_link = frappe.utils.get_link_to_form("Item", item_code)
.format(item_code, voucher_type, voucher_no))
message = _("Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}.").format(form_link, voucher_type, voucher_no)
message += "<br><br>" + _(" Here are the options to proceed:")
solutions = "<li>" + _("If the item is transacting as a Zero Valuation Rate item in this entry, please enable 'Allow Zero Valuation Rate' in the {0} Item table.").format(voucher_type) + "</li>"
solutions += "<li>" + _("If not, you can Cancel / Submit this entry ") + _("{0}").format(frappe.bold("after")) + _(" performing either one below:") + "</li>"
sub_solutions = "<ul><li>" + _("Create an incoming stock transaction for the Item.") + "</li>"
sub_solutions += "<li>" + _("Mention Valuation Rate in the Item master.") + "</li></ul>"
msg = message + solutions + sub_solutions + "</li>"
frappe.throw(msg=msg, title=_("Valuation Rate Missing"))
return valuation_rate return valuation_rate