Merge pull request #19206 from hrwX/disp_mobile_no
fix: Show primary mobile no
diff --git a/erpnext/crm/doctype/opportunity/opportunity.json b/erpnext/crm/doctype/opportunity/opportunity.json
index 37f492e..66e3ca4 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.json
+++ b/erpnext/crm/doctype/opportunity/opportunity.json
@@ -1,5 +1,6 @@
{
"allow_import": 1,
+ "allow_rename": 1,
"autoname": "naming_series:",
"creation": "2013-03-07 18:50:30",
"description": "Potential Sales Deal",
@@ -411,7 +412,7 @@
],
"icon": "fa fa-info-sign",
"idx": 195,
- "modified": "2019-09-12 09:37:30.127901",
+ "modified": "2019-09-30 12:58:37.385400",
"modified_by": "Administrator",
"module": "CRM",
"name": "Opportunity",
diff --git a/erpnext/healthcare/doctype/patient/patient.json b/erpnext/healthcare/doctype/patient/patient.json
index 1de4205..0136f72 100644
--- a/erpnext/healthcare/doctype/patient/patient.json
+++ b/erpnext/healthcare/doctype/patient/patient.json
@@ -347,7 +347,7 @@
"icon": "fa fa-user",
"image_field": "image",
"max_attachments": 50,
- "modified": "2019-09-23 16:01:39.811633",
+ "modified": "2019-09-25 23:30:49.905893",
"modified_by": "Administrator",
"module": "Healthcare",
"name": "Patient",
@@ -362,6 +362,18 @@
"print": 1,
"read": 1,
"report": 1,
+ "role": "System Manager",
+ "share": 1,
+ "write": 1
+ },
+ {
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
"role": "Physician",
"share": 1,
"write": 1
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index b165b13..5e27e02 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -42,6 +42,8 @@
get_help_messages = "erpnext.utilities.activation.get_help_messages"
get_user_progress_slides = "erpnext.utilities.user_progress.get_user_progress_slides"
update_and_get_user_progress = "erpnext.utilities.user_progress_utils.update_default_domain_actions_and_get_state"
+leaderboards = "erpnext.startup.leaderboard.get_leaderboards"
+
on_session_creation = "erpnext.shopping_cart.utils.set_cart_count"
on_logout = "erpnext.shopping_cart.utils.clear_cart_count"
diff --git a/erpnext/projects/doctype/project/project.json b/erpnext/projects/doctype/project/project.json
index 205f895..7d47db3 100644
--- a/erpnext/projects/doctype/project/project.json
+++ b/erpnext/projects/doctype/project/project.json
@@ -108,7 +108,7 @@
"fieldname": "percent_complete_method",
"fieldtype": "Select",
"label": "% Complete Method",
- "options": "Task Completion\nTask Progress\nTask Weight"
+ "options": "Manual\nTask Completion\nTask Progress\nTask Weight"
},
{
"bold": 1,
diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py
index 6176cf8..783bcf3 100644
--- a/erpnext/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py
@@ -87,6 +87,11 @@
frappe.db.set_value("Sales Order", self.sales_order, "project", self.name)
def update_percent_complete(self):
+ if self.percent_complete_method == "Manual":
+ if self.status == "Completed":
+ self.percent_complete = 100
+ return
+
total = frappe.db.count('Task', dict(project=self.name))
if not total:
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index 584391e..9eb3748 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -64,16 +64,19 @@
})
def validate_default_accounts(self):
- for field in ["default_bank_account", "default_cash_account",
+ accounts = [
+ "default_bank_account", "default_cash_account",
"default_receivable_account", "default_payable_account",
"default_expense_account", "default_income_account",
"stock_received_but_not_billed", "stock_adjustment_account",
- "expenses_included_in_valuation", "default_payroll_payable_account"]:
- if self.get(field):
- for_company = frappe.db.get_value("Account", self.get(field), "company")
- if for_company != self.name:
- frappe.throw(_("Account {0} does not belong to company: {1}")
- .format(self.get(field), self.name))
+ "expenses_included_in_valuation", "default_payroll_payable_account"
+ ]
+
+ for field in accounts:
+ if self.get(field):
+ for_company = frappe.db.get_value("Account", self.get(field), "company")
+ if for_company != self.name:
+ frappe.throw(_("Account {0} does not belong to company: {1}").format(self.get(field), self.name))
def validate_currency(self):
if self.is_new():
@@ -180,21 +183,29 @@
self.existing_company = self.parent_company
def set_default_accounts(self):
- self._set_default_account("default_cash_account", "Cash")
- self._set_default_account("default_bank_account", "Bank")
- self._set_default_account("round_off_account", "Round Off")
- self._set_default_account("accumulated_depreciation_account", "Accumulated Depreciation")
- self._set_default_account("depreciation_expense_account", "Depreciation")
- self._set_default_account("capital_work_in_progress_account", "Capital Work in Progress")
- self._set_default_account("asset_received_but_not_billed", "Asset Received But Not Billed")
- self._set_default_account("expenses_included_in_asset_valuation", "Expenses Included In Asset Valuation")
+ default_accounts = {
+ "default_cash_account": "Cash",
+ "default_bank_account": "Bank",
+ "round_off_account": "Round Off",
+ "accumulated_depreciation_account": "Accumulated Depreciation",
+ "depreciation_expense_account": "Depreciation",
+ "capital_work_in_progress_account": "Capital Work in Progress",
+ "asset_received_but_not_billed": "Asset Received But Not Billed",
+ "expenses_included_in_asset_valuation": "Expenses Included In Asset Valuation"
+ }
if self.enable_perpetual_inventory:
- self._set_default_account("stock_received_but_not_billed", "Stock Received But Not Billed")
- self._set_default_account("default_inventory_account", "Stock")
- self._set_default_account("stock_adjustment_account", "Stock Adjustment")
- self._set_default_account("expenses_included_in_valuation", "Expenses Included In Valuation")
- self._set_default_account("default_expense_account", "Cost of Goods Sold")
+ default_accounts.update({
+ "stock_received_but_not_billed": "Stock Received But Not Billed",
+ "default_inventory_account": "Stock",
+ "stock_adjustment_account": "Stock Adjustment",
+ "expenses_included_in_valuation": "Expenses Included In Valuation",
+ "default_expense_account": "Cost of Goods Sold"
+ })
+
+ for default_account in default_accounts:
+ if self.is_new() or frappe.flags.in_test:
+ self._set_default_account(default_account, default_accounts.get(default_account))
if not self.default_income_account:
income_account = frappe.db.get_value("Account",
@@ -243,8 +254,7 @@
if self.get(fieldname):
return
- account = frappe.db.get_value("Account", {"account_type": account_type,
- "is_group": 0, "company": self.name})
+ account = frappe.db.get_value("Account", {"account_type": account_type, "is_group": 0, "company": self.name})
if account:
self.db_set(fieldname, account)
diff --git a/erpnext/startup/leaderboard.py b/erpnext/startup/leaderboard.py
new file mode 100644
index 0000000..90ecd46
--- /dev/null
+++ b/erpnext/startup/leaderboard.py
@@ -0,0 +1,177 @@
+
+from __future__ import unicode_literals, print_function
+import frappe
+from frappe.utils import cint
+
+def get_leaderboards():
+ leaderboards = {
+ "Customer": {
+ "fields": [
+ {'fieldname': 'total_sales_amount', 'fieldtype': 'Currency'},
+ 'total_qty_sold',
+ {'fieldname': 'outstanding_amount', 'fieldtype': 'Currency'}
+ ],
+ "method": "erpnext.startup.leaderboard.get_all_customers",
+ },
+ "Item": {
+ "fields": [
+ {'fieldname': 'total_sales_amount', 'fieldtype': 'Currency'},
+ 'total_qty_sold',
+ {'fieldname': 'total_purchase_amount', 'fieldtype': 'Currency'},
+ 'total_qty_purchased',
+ 'available_stock_qty',
+ {'fieldname': 'available_stock_value', 'fieldtype': 'Currency'}
+ ],
+ "method": "erpnext.startup.leaderboard.get_all_items",
+ },
+ "Supplier": {
+ "fields": [
+ {'fieldname': 'total_purchase_amount', 'fieldtype': 'Currency'},
+ 'total_qty_purchased',
+ {'fieldname': 'outstanding_amount', 'fieldtype': 'Currency'}
+ ],
+ "method": "erpnext.startup.leaderboard.get_all_suppliers",
+ },
+ "Sales Partner": {
+ "fields": [
+ {'fieldname': 'total_sales_amount', 'fieldtype': 'Currency'},
+ {'fieldname': 'total_commission', 'fieldtype': 'Currency'}
+ ],
+ "method": "erpnext.startup.leaderboard.get_all_sales_partner",
+ },
+ "Sales Person": {
+ "fields": [
+ {'fieldname': 'total_sales_amount', 'fieldtype': 'Currency'}
+ ],
+ "method": "erpnext.startup.leaderboard.get_all_sales_person",
+ }
+ }
+
+ return leaderboards
+
+@frappe.whitelist()
+def get_all_customers(from_date, company, field, limit = None):
+ if field == "outstanding_amount":
+ filters = [['docstatus', '=', '1'], ['company', '=', company]]
+ if from_date:
+ filters.append(['posting_date', '>=', from_date])
+ return frappe.db.get_all('Sales Invoice',
+ fields = ['customer as name', 'sum(outstanding_amount) as value'],
+ filters = filters,
+ group_by = 'customer',
+ order_by = 'value desc',
+ limit = limit
+ )
+ else:
+ if field == "total_sales_amount":
+ select_field = "sum(so_item.base_net_amount)"
+ elif field == "total_qty_sold":
+ select_field = "sum(so_item.stock_qty)"
+
+ return frappe.db.sql("""
+ select so.customer as name, {0} as value
+ FROM `tabSales Order` as so JOIN `tabSales Order Item` as so_item
+ ON so.name = so_item.parent
+ where so.docstatus = 1 and so.transaction_date >= %s and so.company = %s
+ group by so.customer
+ order by value DESC
+ limit %s
+ """.format(select_field), (from_date, company, cint(limit)), as_dict=1) #nosec
+
+@frappe.whitelist()
+def get_all_items(from_date, company, field, limit = None):
+ if field in ("available_stock_qty", "available_stock_value"):
+ select_field = "sum(actual_qty)" if field=="available_stock_qty" else "sum(stock_value)"
+ return frappe.db.get_all('Bin',
+ fields = ['item_code as name', '{0} as value'.format(select_field)],
+ group_by = 'item_code',
+ order_by = 'value desc',
+ limit = limit
+ )
+ else:
+ if field == "total_sales_amount":
+ select_field = "sum(order_item.base_net_amount)"
+ select_doctype = "Sales Order"
+ elif field == "total_purchase_amount":
+ select_field = "sum(order_item.base_net_amount)"
+ select_doctype = "Purchase Order"
+ elif field == "total_qty_sold":
+ select_field = "sum(order_item.stock_qty)"
+ select_doctype = "Sales Order"
+ elif field == "total_qty_purchased":
+ select_field = "sum(order_item.stock_qty)"
+ select_doctype = "Purchase Order"
+
+ return frappe.db.sql("""
+ select order_item.item_code as name, {0} as value
+ from `tab{1}` sales_order join `tab{1} Item` as order_item
+ on sales_order.name = order_item.parent
+ where sales_order.docstatus = 1
+ and sales_order.company = %s and sales_order.transaction_date >= %s
+ group by order_item.item_code
+ order by value desc
+ limit %s
+ """.format(select_field, select_doctype), (company, from_date, cint(limit)), as_dict=1) #nosec
+
+@frappe.whitelist()
+def get_all_suppliers(from_date, company, field, limit = None):
+ if field == "outstanding_amount":
+ filters = [['docstatus', '=', '1'], ['company', '=', company]]
+ if from_date:
+ filters.append(['posting_date', '>=', from_date])
+ return frappe.db.get_all('Purchase Invoice',
+ fields = ['supplier as name', 'sum(outstanding_amount) as value'],
+ filters = filters,
+ group_by = 'supplier',
+ order_by = 'value desc',
+ limit = limit
+ )
+ else:
+ if field == "total_purchase_amount":
+ select_field = "sum(purchase_order_item.base_net_amount)"
+ elif field == "total_qty_purchased":
+ select_field = "sum(purchase_order_item.stock_qty)"
+
+ return frappe.db.sql("""
+ select purchase_order.supplier as name, {0} as value
+ FROM `tabPurchase Order` as purchase_order LEFT JOIN `tabPurchase Order Item`
+ as purchase_order_item ON purchase_order.name = purchase_order_item.parent
+ where purchase_order.docstatus = 1 and purchase_order.modified >= %s
+ and purchase_order.company = %s
+ group by purchase_order.supplier
+ order by value DESC
+ limit %s""".format(select_field), (from_date, company, cint(limit)), as_dict=1) #nosec
+
+@frappe.whitelist()
+def get_all_sales_partner(from_date, company, field, limit = None):
+ if field == "total_sales_amount":
+ select_field = "sum(`base_net_total`)"
+ elif field == "total_commission":
+ select_field = "sum(`total_commission`)"
+
+ filters = {
+ 'sales_partner': ['!=', ''],
+ 'docstatus': 1,
+ 'company': company
+ }
+ if from_date:
+ filters['transaction_date'] = ['>=', from_date]
+
+ return frappe.get_list('Sales Order', fields=[
+ '`sales_partner` as name',
+ '{} as value'.format(select_field),
+ ], filters=filters, group_by='sales_partner', order_by='value DESC', limit=limit)
+
+@frappe.whitelist()
+def get_all_sales_person(from_date, company, field = None, limit = 0):
+ return frappe.db.sql("""
+ select sales_team.sales_person as name, sum(sales_order.base_net_total) as value
+ from `tabSales Order` as sales_order join `tabSales Team` as sales_team
+ on sales_order.name = sales_team.parent and sales_team.parenttype = 'Sales Order'
+ where sales_order.docstatus = 1
+ and sales_order.transaction_date >= %s
+ and sales_order.company = %s
+ group by sales_team.sales_person
+ order by value DESC
+ limit %s
+ """, (from_date, company, cint(limit)), as_dict=1)
diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py
index d386230..5bdbca2 100644
--- a/erpnext/stock/report/stock_ledger/stock_ledger.py
+++ b/erpnext/stock/report/stock_ledger/stock_ledger.py
@@ -107,7 +107,7 @@
if include_uom:
cf_field = ", ucd.conversion_factor"
cf_join = "left join `tabUOM Conversion Detail` ucd on ucd.parent=item.name and ucd.uom='%s'" \
- % frappe.db.escape(include_uom)
+ % (include_uom)
res = frappe.db.sql("""
select
diff --git a/erpnext/stock/utils.py b/erpnext/stock/utils.py
index 4c663e3..2ac0bae 100644
--- a/erpnext/stock/utils.py
+++ b/erpnext/stock/utils.py
@@ -253,31 +253,40 @@
return
convertible_cols = {}
- for col_idx in reversed(range(0, len(columns))):
- col = columns[col_idx]
- if isinstance(col, dict) and col.get("convertible") in ['rate', 'qty']:
- convertible_cols[col_idx] = col['convertible']
- columns.insert(col_idx+1, col.copy())
- columns[col_idx+1]['fieldname'] += "_alt"
- if convertible_cols[col_idx] == 'rate':
- columns[col_idx+1]['label'] += " (per {})".format(include_uom)
- else:
- columns[col_idx+1]['label'] += " ({})".format(include_uom)
+
+ is_dict_obj = False
+ if isinstance(result[0], dict):
+ is_dict_obj = True
+
+ convertible_columns = {}
+ for idx, d in enumerate(columns):
+ key = d.get("fieldname") if is_dict_obj else idx
+ if d.get("convertible"):
+ convertible_columns.setdefault(key, d.get("convertible"))
+
+ # Add new column to show qty/rate as per the selected UOM
+ columns.insert(idx+1, {
+ 'label': "{0} (per {1})".format(d.get("label"), include_uom),
+ 'fieldname': "{0}_{1}".format(d.get("fieldname"), frappe.scrub(include_uom)),
+ 'fieldtype': 'Currency' if d.get("convertible") == 'rate' else 'Float'
+ })
for row_idx, row in enumerate(result):
- new_row = []
- for col_idx, d in enumerate(row):
- new_row.append(d)
- if col_idx in convertible_cols:
- if conversion_factors[row_idx]:
- if convertible_cols[col_idx] == 'rate':
- new_row.append(flt(d) * conversion_factors[row_idx])
- else:
- new_row.append(flt(d) / conversion_factors[row_idx])
- else:
- new_row.append(None)
+ data = row.items() if is_dict_obj else enumerate(row)
+ for key, value in data:
+ if not key in convertible_columns or not conversion_factors[row_idx]:
+ continue
- result[row_idx] = new_row
+ if convertible_columns.get(key) == 'rate':
+ new_value = flt(value) * conversion_factors[row_idx]
+ else:
+ new_value = flt(value) / conversion_factors[row_idx]
+
+ if not is_dict_obj:
+ row.insert(key+1, new_value)
+ else:
+ new_key = "{0}_{1}".format(key, frappe.scrub(include_uom))
+ row[new_key] = new_value
def get_available_serial_nos(item_code, warehouse):
return frappe.get_all("Serial No", filters = {'item_code': item_code,
diff --git a/erpnext/utilities/page/__init__.py b/erpnext/utilities/page/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/utilities/page/__init__.py
+++ /dev/null
diff --git a/erpnext/utilities/page/leaderboard/__init__.py b/erpnext/utilities/page/leaderboard/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/utilities/page/leaderboard/__init__.py
+++ /dev/null
diff --git a/erpnext/utilities/page/leaderboard/leaderboard.css b/erpnext/utilities/page/leaderboard/leaderboard.css
deleted file mode 100644
index 1f4fc51..0000000
--- a/erpnext/utilities/page/leaderboard/leaderboard.css
+++ /dev/null
@@ -1,54 +0,0 @@
-.list-filters {
- overflow-y: hidden;
- padding: 5px
-}
-
-.list-filter-item {
- min-width: 150px;
- float: left;
- margin:5px;
-}
-
-.list-item_content{
- flex: 1;
- padding-right: 15px;
- align-items: center;
-}
-
-.select-time, .select-doctype, .select-filter, .select-sort {
- background: #f0f4f7;
-}
-
-.select-time:focus, .select-doctype:focus, .select-filter:focus, .select-sort:focus {
- background: #f0f4f7;
-}
-
-.header-btn-base{
- border:none;
- outline:0;
- vertical-align:middle;
- overflow:hidden;
- text-decoration:none;
- color:inherit;
- background-color:inherit;
- cursor:pointer;
- white-space:nowrap;
-}
-
-.header-btn-grey,.header-btn-grey:hover{
- color:#000!important;
- background-color:#bbb!important
-}
-
-.header-btn-round{
- border-radius:4px
-}
-
-.item-title-bold{
- font-weight: bold;
-}
-
-/*
-.header-btn-base:hover {
- box-shadow:0 8px 16px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19)
-}*/
diff --git a/erpnext/utilities/page/leaderboard/leaderboard.js b/erpnext/utilities/page/leaderboard/leaderboard.js
deleted file mode 100644
index 43d0e6e..0000000
--- a/erpnext/utilities/page/leaderboard/leaderboard.js
+++ /dev/null
@@ -1,307 +0,0 @@
-frappe.pages["leaderboard"].on_page_load = function (wrapper) {
- frappe.leaderboard = new frappe.Leaderboard(wrapper);
-}
-
-frappe.Leaderboard = Class.extend({
-
- init: function (parent) {
- frappe.ui.make_app_page({
- parent: parent,
- title: "Leaderboard",
- single_column: false
- });
-
- this.parent = parent;
- this.page = this.parent.page;
- this.page.sidebar.html(`<ul class="module-sidebar-nav overlay-sidebar nav nav-pills nav-stacked"></ul>`);
- this.$sidebar_list = this.page.sidebar.find('ul');
-
- // const list of doctypes
- this.doctypes = ["Customer", "Item", "Supplier", "Sales Partner","Sales Person"];
- this.timespans = ["Week", "Month", "Quarter", "Year"];
- this.filters = {
- "Customer": ["total_sales_amount", "total_qty_sold", "outstanding_amount", ],
- "Item": ["total_sales_amount", "total_qty_sold", "total_purchase_amount",
- "total_qty_purchased", "available_stock_qty", "available_stock_value"],
- "Supplier": ["total_purchase_amount", "total_qty_purchased", "outstanding_amount"],
- "Sales Partner": ["total_sales_amount", "total_commission"],
- "Sales Person": ["total_sales_amount"],
- };
-
- // for saving current selected filters
- // TODO: revert to 0 index for doctype and timespan, and remove preset down
- const _initial_doctype = this.doctypes[0];
- const _initial_timespan = this.timespans[0];
- const _initial_filter = this.filters[_initial_doctype];
-
- this.options = {
- selected_doctype: _initial_doctype,
- selected_filter: _initial_filter,
- selected_filter_item: _initial_filter[0],
- selected_timespan: _initial_timespan,
- };
-
- this.message = null;
- this.make();
- },
-
- make: function () {
- var me = this;
-
- var $container = $(`<div class="leaderboard page-main-content">
- <div class="leaderboard-graph"></div>
- <div class="leaderboard-list"></div>
- </div>`).appendTo(this.page.main);
-
- this.$graph_area = $container.find('.leaderboard-graph');
-
- this.doctypes.map(doctype => {
- this.get_sidebar_item(doctype).appendTo(this.$sidebar_list);
- });
-
- this.company_select = this.page.add_field({
- fieldname: 'company',
- label: __('Company'),
- fieldtype:'Link',
- options:'Company',
- default:frappe.defaults.get_default('company'),
- reqd: 1,
- change: function() {
- me.options.selected_company = this.value;
- me.make_request($container);
- }
- });
- this.timespan_select = this.page.add_select(__("Timespan"),
- this.timespans.map(d => {
- return {"label": __(d), value: d }
- })
- );
-
- this.type_select = this.page.add_select(__("Type"),
- me.options.selected_filter.map(d => {
- return {"label": __(frappe.model.unscrub(d)), value: d }
- })
- );
-
- this.$sidebar_list.on('click', 'li', function(e) {
- let $li = $(this);
- let doctype = $li.find('span').attr("doctype-value");
-
- me.options.selected_company = frappe.defaults.get_default('company');
- me.options.selected_doctype = doctype;
- me.options.selected_filter = me.filters[doctype];
- me.options.selected_filter_item = me.filters[doctype][0];
-
- me.type_select.empty().add_options(
- me.options.selected_filter.map(d => {
- return {"label": __(frappe.model.unscrub(d)), value: d }
- })
- );
-
- me.$sidebar_list.find('li').removeClass('active');
- $li.addClass('active');
-
- me.make_request($container);
- });
-
- this.timespan_select.on("change", function() {
- me.options.selected_timespan = this.value;
- me.make_request($container);
- });
-
- this.type_select.on("change", function() {
- me.options.selected_filter_item = this.value
- me.make_request($container);
- });
-
- // now get leaderboard
- this.$sidebar_list.find('li:first').trigger('click');
- },
-
- make_request: function ($container) {
- var me = this;
-
- frappe.model.with_doctype(me.options.selected_doctype, function () {
- me.get_leaderboard(me.get_leaderboard_data, $container);
- });
- },
-
- get_leaderboard: function (notify, $container) {
- var me = this;
- if(!me.options.selected_company) {
- frappe.throw(__("Please select Company"));
- }
- frappe.call({
- method: "erpnext.utilities.page.leaderboard.leaderboard.get_leaderboard",
- args: {
- doctype: me.options.selected_doctype,
- timespan: me.options.selected_timespan,
- company: me.options.selected_company,
- field: me.options.selected_filter_item,
- },
- callback: function (r) {
- let results = r.message || [];
-
- let graph_items = results.slice(0, 10);
-
- me.$graph_area.show().empty();
- let args = {
- data: {
- datasets: [
- {
- values: graph_items.map(d=>d.value)
- }
- ],
- labels: graph_items.map(d=>d.name)
- },
- colors: ['light-green'],
- format_tooltip_x: d=>d[me.options.selected_filter_item],
- type: 'bar',
- height: 140
- };
- new frappe.Chart('.leaderboard-graph', args);
-
- notify(me, r, $container);
- }
- });
- },
-
- get_leaderboard_data: function (me, res, $container) {
- if (res && res.message) {
- me.message = null;
- $container.find(".leaderboard-list").html(me.render_list_view(res.message));
- } else {
- me.$graph_area.hide();
- me.message = __("No items found.");
- $container.find(".leaderboard-list").html(me.render_list_view());
- }
- },
-
- render_list_view: function (items = []) {
- var me = this;
-
- var html =
- `${me.render_message()}
- <div class="result" style="${me.message ? "display:none;" : ""}">
- ${me.render_result(items)}
- </div>`;
-
- return $(html);
- },
-
- render_result: function (items) {
- var me = this;
-
- var html =
- `${me.render_list_header()}
- ${me.render_list_result(items)}`;
-
- return html;
- },
-
- render_list_header: function () {
- var me = this;
- const _selected_filter = me.options.selected_filter
- .map(i => frappe.model.unscrub(i));
- const fields = ['name', me.options.selected_filter_item];
-
- const html =
- `<div class="list-headers">
- <div class="list-item list-item--head" data-list-renderer="${"List"}">
- ${
- fields.map(filter => {
- const col = frappe.model.unscrub(filter);
- return (
- `<div class="leaderboard-item list-item_content ellipsis text-muted list-item__content--flex-2
- header-btn-base
- ${(col && _selected_filter.indexOf(col) !== -1) ? "text-right" : ""}">
- <span class="list-col-title ellipsis">
- ${col}
- </span>
- </div>`);
- }).join("")
- }
- </div>
- </div>`;
- return html;
- },
-
- render_list_result: function (items) {
- var me = this;
-
- let _html = items.map((item, index) => {
- const $value = $(me.get_item_html(item));
-
- let item_class = "";
- if(index == 0) {
- item_class = "first";
- } else if (index == 1) {
- item_class = "second";
- } else if(index == 2) {
- item_class = "third";
- }
- const $item_container = $(`<div class="list-item-container ${item_class}">`).append($value);
- return $item_container[0].outerHTML;
- }).join("");
-
- let html =
- `<div class="result-list">
- <div class="list-items">
- ${_html}
- </div>
- </div>`;
-
- return html;
- },
-
- render_message: function () {
- var me = this;
-
- let html =
- `<div class="no-result text-center" style="${me.message ? "" : "display:none;"}">
- <div class="msg-box no-border">
- <p>No Item found</p>
- </div>
- </div>`;
-
- return html;
- },
-
- get_item_html: function (item) {
- var me = this;
- const company = me.options.selected_company;
- const currency = frappe.get_doc(":Company", company).default_currency;
- const fields = ['name','value'];
-
- const html =
- `<div class="list-item">
- ${
- fields.map(col => {
- let val = item[col];
- if(col=="name") {
- var formatted_value = `<a class="grey list-id ellipsis"
- href="#Form/${me.options.selected_doctype}/${item["name"]}"> ${val} </a>`
- } else {
- var formatted_value = `<span class="text-muted ellipsis">
- ${(me.options.selected_filter_item.indexOf('qty') == -1) ? format_currency(val, currency) : val}</span>`
- }
-
- return (
- `<div class="list-item_content ellipsis list-item__content--flex-2
- ${(col == "value") ? "text-right" : ""}">
- ${formatted_value}
- </div>`);
- }).join("")
- }
- </div>`;
-
- return html;
- },
-
- get_sidebar_item: function(item) {
- return $(`<li class="strong module-sidebar-item">
- <a class="module-link">
- <span doctype-value="${item}">${ __(item) }</span></a>
- </li>`);
- }
-});
diff --git a/erpnext/utilities/page/leaderboard/leaderboard.json b/erpnext/utilities/page/leaderboard/leaderboard.json
deleted file mode 100644
index 8ccef7d..0000000
--- a/erpnext/utilities/page/leaderboard/leaderboard.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "content": null,
- "creation": "2017-06-06 02:54:24.785360",
- "docstatus": 0,
- "doctype": "Page",
- "idx": 0,
- "modified": "2017-09-12 14:05:26.422064",
- "modified_by": "Administrator",
- "module": "Utilities",
- "name": "leaderboard",
- "owner": "Administrator",
- "page_name": "leaderboard",
- "roles": [],
- "script": null,
- "standard": "Yes",
- "style": null,
- "system_page": 0,
- "title": "Leaderboard"
-}
\ No newline at end of file
diff --git a/erpnext/utilities/page/leaderboard/leaderboard.py b/erpnext/utilities/page/leaderboard/leaderboard.py
deleted file mode 100644
index 87cf2a4..0000000
--- a/erpnext/utilities/page/leaderboard/leaderboard.py
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
-# MIT License. See license.txt
-
-from __future__ import unicode_literals, print_function
-import frappe
-from frappe.utils import add_to_date
-
-@frappe.whitelist()
-def get_leaderboard(doctype, timespan, company, field):
- """return top 10 items for that doctype based on conditions"""
- from_date = get_from_date(timespan)
- records = []
- if doctype == "Customer":
- records = get_all_customers(from_date, company, field)
- elif doctype == "Item":
- records = get_all_items(from_date, company, field)
- elif doctype == "Supplier":
- records = get_all_suppliers(from_date, company, field)
- elif doctype == "Sales Partner":
- records = get_all_sales_partner(from_date, company, field)
- elif doctype == "Sales Person":
- records = get_all_sales_person(from_date, company)
-
- return records
-
-def get_all_customers(from_date, company, field):
- if field == "outstanding_amount":
- return frappe.db.sql("""
- select customer as name, sum(outstanding_amount) as value
- FROM `tabSales Invoice`
- where docstatus = 1 and posting_date >= %s and company = %s
- group by customer
- order by value DESC
- limit 20
- """, (from_date, company), as_dict=1)
- else:
- if field == "total_sales_amount":
- select_field = "sum(so_item.base_net_amount)"
- elif field == "total_qty_sold":
- select_field = "sum(so_item.stock_qty)"
-
- return frappe.db.sql("""
- select so.customer as name, {0} as value
- FROM `tabSales Order` as so JOIN `tabSales Order Item` as so_item
- ON so.name = so_item.parent
- where so.docstatus = 1 and so.transaction_date >= %s and so.company = %s
- group by so.customer
- order by value DESC
- limit 20
- """.format(select_field), (from_date, company), as_dict=1)
-
-def get_all_items(from_date, company, field):
- if field in ("available_stock_qty", "available_stock_value"):
- return frappe.db.sql("""
- select item_code as name, {0} as value
- from tabBin
- group by item_code
- order by value desc
- limit 20
- """.format("sum(actual_qty)" if field=="available_stock_qty" else "sum(stock_value)"), as_dict=1)
- else:
- if field == "total_sales_amount":
- select_field = "sum(order_item.base_net_amount)"
- select_doctype = "Sales Order"
- elif field == "total_purchase_amount":
- select_field = "sum(order_item.base_net_amount)"
- select_doctype = "Purchase Order"
- elif field == "total_qty_sold":
- select_field = "sum(order_item.stock_qty)"
- select_doctype = "Sales Order"
- elif field == "total_qty_purchased":
- select_field = "sum(order_item.stock_qty)"
- select_doctype = "Purchase Order"
-
- return frappe.db.sql("""
- select order_item.item_code as name, {0} as value
- from `tab{1}` sales_order join `tab{1} Item` as order_item
- on sales_order.name = order_item.parent
- where sales_order.docstatus = 1
- and sales_order.company = %s and sales_order.transaction_date >= %s
- group by order_item.item_code
- order by value desc
- limit 20
- """.format(select_field, select_doctype), (company, from_date), as_dict=1)
-
-def get_all_suppliers(from_date, company, field):
- if field == "outstanding_amount":
- return frappe.db.sql("""
- select supplier as name, sum(outstanding_amount) as value
- FROM `tabPurchase Invoice`
- where docstatus = 1 and posting_date >= %s and company = %s
- group by supplier
- order by value DESC
- limit 20""", (from_date, company), as_dict=1)
- else:
- if field == "total_purchase_amount":
- select_field = "sum(purchase_order_item.base_net_amount)"
- elif field == "total_qty_purchased":
- select_field = "sum(purchase_order_item.stock_qty)"
-
- return frappe.db.sql("""
- select purchase_order.supplier as name, {0} as value
- FROM `tabPurchase Order` as purchase_order LEFT JOIN `tabPurchase Order Item`
- as purchase_order_item ON purchase_order.name = purchase_order_item.parent
- where purchase_order.docstatus = 1 and purchase_order.modified >= %s
- and purchase_order.company = %s
- group by purchase_order.supplier
- order by value DESC
- limit 20""".format(select_field), (from_date, company), as_dict=1)
-
-def get_all_sales_partner(from_date, company, field):
- if field == "total_sales_amount":
- select_field = "sum(base_net_total)"
- elif field == "total_commission":
- select_field = "sum(total_commission)"
-
- return frappe.db.sql("""
- select sales_partner as name, {0} as value
- from `tabSales Order`
- where ifnull(sales_partner, '') != '' and docstatus = 1
- and transaction_date >= %s and company = %s
- group by sales_partner
- order by value DESC
- limit 20
- """.format(select_field), (from_date, company), as_dict=1)
-
-def get_all_sales_person(from_date, company):
- return frappe.db.sql("""
- select sales_team.sales_person as name, sum(sales_order.base_net_total) as value
- from `tabSales Order` as sales_order join `tabSales Team` as sales_team
- on sales_order.name = sales_team.parent and sales_team.parenttype = 'Sales Order'
- where sales_order.docstatus = 1
- and sales_order.transaction_date >= %s
- and sales_order.company = %s
- group by sales_team.sales_person
- order by value DESC
- limit 20
- """, (from_date, company), as_dict=1)
-
-def get_from_date(seleted_timespan):
- """return string for ex:this week as date:string"""
- days = months = years = 0
- if "month" == seleted_timespan.lower():
- months = -1
- elif "quarter" == seleted_timespan.lower():
- months = -3
- elif "year" == seleted_timespan.lower():
- years = -1
- else:
- days = -7
-
- return add_to_date(None, years=years, months=months, days=days,
- as_string=True, as_datetime=True)
\ No newline at end of file