Merge branch 'develop' into global_search_modules
diff --git a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
index 350e081..b90a7a9 100644
--- a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
+++ b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
@@ -3,7 +3,7 @@
from __future__ import unicode_literals
import frappe
-from frappe import _
+from frappe import _, scrub
from frappe.utils import flt, cint
from erpnext.accounts.party import get_partywise_advanced_payment_amount
from erpnext.accounts.report.accounts_receivable.accounts_receivable import ReceivablePayableReport
@@ -40,7 +40,7 @@
row.party = party
if self.party_naming_by == "Naming Series":
- row.party_name = frappe.get_cached_value(self.party_type, party, [self.party_type + "_name"])
+ row.party_name = frappe.get_cached_value(self.party_type, party, scrub(self.party_type) + "_name")
row.update(party_dict)
diff --git a/erpnext/utilities/page/__init__.py b/erpnext/assets/report/fixed_asset_register/__init__.py
similarity index 100%
rename from erpnext/utilities/page/__init__.py
rename to erpnext/assets/report/fixed_asset_register/__init__.py
diff --git a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.js b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.js
new file mode 100644
index 0000000..5e994b5
--- /dev/null
+++ b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.js
@@ -0,0 +1,30 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+/* eslint-disable */
+
+frappe.query_reports["Fixed Asset Register"] = {
+ "filters": [
+ {
+ fieldname:"company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
+ reqd: 1
+ },
+ {
+ fieldname:"status",
+ label: __("Status"),
+ fieldtype: "Select",
+ options: "In Store\nDisposed",
+ default: 'In Store',
+ reqd: 1
+ },
+ {
+ fieldname:"finance_book",
+ label: __("Finance Book"),
+ fieldtype: "Link",
+ options: "Finance Book"
+ },
+ ]
+};
diff --git a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.json b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.json
new file mode 100644
index 0000000..ae2aa54
--- /dev/null
+++ b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.json
@@ -0,0 +1,27 @@
+{
+ "add_total_row": 0,
+ "creation": "2019-09-23 16:35:02.836134",
+ "disable_prepared_report": 0,
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "idx": 0,
+ "is_standard": "Yes",
+ "modified": "2019-09-23 16:35:02.836134",
+ "modified_by": "Administrator",
+ "module": "Assets",
+ "name": "Fixed Asset Register",
+ "owner": "Administrator",
+ "prepared_report": 0,
+ "ref_doctype": "Asset",
+ "report_name": "Fixed Asset Register",
+ "report_type": "Script Report",
+ "roles": [
+ {
+ "role": "Accounts User"
+ },
+ {
+ "role": "Quality Manager"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py
new file mode 100644
index 0000000..eac0e2a
--- /dev/null
+++ b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py
@@ -0,0 +1,172 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+
+def execute(filters=None):
+ filters = frappe._dict(filters or {})
+ columns = get_columns(filters)
+ data = get_data(filters)
+ return columns, data
+
+def get_columns(filters):
+ return [
+ {
+ "label": _("Asset Id"),
+ "fieldtype": "Link",
+ "fieldname": "asset_id",
+ "options": "Asset",
+ "width": 100
+ },
+ {
+ "label": _("Asset Name"),
+ "fieldtype": "Data",
+ "fieldname": "asset_name",
+ "width": 140
+ },
+ {
+ "label": _("Asset Category"),
+ "fieldtype": "Link",
+ "fieldname": "asset_category",
+ "options": "Asset Category",
+ "width": 100
+ },
+ {
+ "label": _("Status"),
+ "fieldtype": "Data",
+ "fieldname": "status",
+ "width": 90
+ },
+ {
+ "label": _("Cost Center"),
+ "fieldtype": "Link",
+ "fieldname": "cost_center",
+ "options": "Cost Center",
+ "width": 100
+ },
+ {
+ "label": _("Department"),
+ "fieldtype": "Link",
+ "fieldname": "department",
+ "options": "Department",
+ "width": 100
+ },
+ {
+ "label": _("Location"),
+ "fieldtype": "Link",
+ "fieldname": "location",
+ "options": "Location",
+ "width": 100
+ },
+ {
+ "label": _("Purchase Date"),
+ "fieldtype": "Date",
+ "fieldname": "purchase_date",
+ "width": 90
+ },
+ {
+ "label": _("Gross Purchase Amount"),
+ "fieldname": "gross_purchase_amount",
+ "options": "Currency",
+ "width": 90
+ },
+ {
+ "label": _("Vendor Name"),
+ "fieldtype": "Data",
+ "fieldname": "vendor_name",
+ "width": 100
+ },
+ {
+ "label": _("Available For Use Date"),
+ "fieldtype": "Date",
+ "fieldname": "available_for_use_date",
+ "width": 90
+ },
+ {
+ "label": _("Current Value"),
+ "fieldname": "current_value",
+ "options": "Currency",
+ "width": 90
+ },
+ ]
+
+def get_conditions(filters):
+ conditions = {'docstatus': 1}
+ status = filters.status
+
+ if filters.company:
+ conditions["company"] = filters.company
+
+ # In Store assets are those that are not sold or scrapped
+ operand = 'not in'
+ if status not in 'In Store':
+ operand = 'in'
+
+ conditions['status'] = (operand, ['Sold', 'Scrapped'])
+
+ return conditions
+
+def get_data(filters):
+
+ data = []
+
+ conditions = get_conditions(filters)
+ current_value_map = get_finance_book_value_map(filters.finance_book)
+ pr_supplier_map = get_purchase_receipt_supplier_map()
+ pi_supplier_map = get_purchase_invoice_supplier_map()
+
+ assets_record = frappe.db.get_all("Asset",
+ filters=conditions,
+ fields=["name", "asset_name", "department", "cost_center", "purchase_receipt",
+ "asset_category", "purchase_date", "gross_purchase_amount", "location",
+ "available_for_use_date", "status", "purchase_invoice"])
+
+ for asset in assets_record:
+ if current_value_map.get(asset.name) is not None:
+ row = {
+ "asset_id": asset.name,
+ "asset_name": asset.asset_name,
+ "status": asset.status,
+ "department": asset.department,
+ "cost_center": asset.cost_center,
+ "vendor_name": pr_supplier_map.get(asset.purchase_receipt) or pi_supplier_map.get(asset.purchase_invoice),
+ "gross_purchase_amount": asset.gross_purchase_amount,
+ "available_for_use_date": asset.available_for_use_date,
+ "location": asset.location,
+ "asset_category": asset.asset_category,
+ "purchase_date": asset.purchase_date,
+ "current_value": current_value_map.get(asset.name)
+ }
+ data.append(row)
+
+ return data
+
+def get_finance_book_value_map(finance_book=''):
+ return frappe._dict(frappe.db.sql(''' Select
+ parent, value_after_depreciation
+ FROM `tabAsset Finance Book`
+ WHERE
+ parentfield='finance_books'
+ AND finance_book=%s''', (finance_book)))
+
+def get_purchase_receipt_supplier_map():
+ return frappe._dict(frappe.db.sql(''' Select
+ pr.name, pr.supplier
+ FROM `tabPurchase Receipt` pr, `tabPurchase Receipt Item` pri
+ WHERE
+ pri.parent = pr.name
+ AND pri.is_fixed_asset=1
+ AND pr.docstatus=1
+ AND pr.is_return=0'''))
+
+def get_purchase_invoice_supplier_map():
+ return frappe._dict(frappe.db.sql(''' Select
+ pi.name, pi.supplier
+ FROM `tabPurchase Invoice` pi, `tabPurchase Invoice Item` pii
+ WHERE
+ pii.parent = pi.name
+ AND pii.is_fixed_asset=1
+ AND pi.docstatus=1
+ AND pi.is_return=0'''))
diff --git a/erpnext/crm/doctype/contract/contract.json b/erpnext/crm/doctype/contract/contract.json
index d48cc37..e04ad30 100755
--- a/erpnext/crm/doctype/contract/contract.json
+++ b/erpnext/crm/doctype/contract/contract.json
@@ -1,1034 +1,301 @@
{
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 1,
- "allow_rename": 1,
- "autoname": "",
- "beta": 0,
- "creation": "2018-04-12 06:32:04.582486",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "",
- "editable_grid": 1,
- "engine": "InnoDB",
+ "allow_import": 1,
+ "allow_rename": 1,
+ "creation": "2018-04-12 06:32:04.582486",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "party_type",
+ "is_signed",
+ "cb_party",
+ "party_name",
+ "party_user",
+ "status",
+ "fulfilment_status",
+ "sb_terms",
+ "start_date",
+ "cb_date",
+ "end_date",
+ "sb_signee",
+ "signee",
+ "signed_on",
+ "cb_user",
+ "ip_address",
+ "sb_contract",
+ "contract_template",
+ "contract_terms",
+ "sb_fulfilment",
+ "requires_fulfilment",
+ "fulfilment_deadline",
+ "fulfilment_terms",
+ "sb_references",
+ "document_type",
+ "cb_links",
+ "document_name",
+ "amended_from"
+ ],
"fields": [
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "Customer",
- "fieldname": "party_type",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Party Type",
- "length": 0,
- "no_copy": 0,
- "options": "Customer\nSupplier\nEmployee",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "default": "Customer",
+ "fieldname": "party_type",
+ "fieldtype": "Select",
+ "label": "Party Type",
+ "options": "Customer\nSupplier\nEmployee",
+ "reqd": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 1,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "is_signed",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Signed",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "allow_on_submit": 1,
+ "default": "0",
+ "fieldname": "is_signed",
+ "fieldtype": "Check",
+ "label": "Signed",
+ "no_copy": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "cb_party",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "cb_party",
+ "fieldtype": "Column Break"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "party_name",
- "fieldtype": "Dynamic Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 1,
- "label": "Party Name",
- "length": 0,
- "no_copy": 0,
- "options": "party_type",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "party_name",
+ "fieldtype": "Dynamic Link",
+ "in_standard_filter": 1,
+ "label": "Party Name",
+ "options": "party_type",
+ "reqd": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "party_user",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Party User",
- "length": 0,
- "no_copy": 0,
- "options": "User",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "party_user",
+ "fieldtype": "Link",
+ "label": "Party User",
+ "options": "User"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 1,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "status",
- "fieldtype": "Select",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 1,
- "label": "Status",
- "length": 0,
- "no_copy": 0,
- "options": "Unsigned\nActive\nInactive",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "allow_on_submit": 1,
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "hidden": 1,
+ "in_list_view": 1,
+ "in_standard_filter": 1,
+ "label": "Status",
+ "no_copy": 1,
+ "options": "Unsigned\nActive\nInactive"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 1,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "fulfilment_status",
- "fieldtype": "Select",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 1,
- "label": "Fulfilment Status",
- "length": 0,
- "no_copy": 0,
- "options": "N/A\nUnfulfilled\nPartially Fulfilled\nFulfilled\nLapsed",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "allow_on_submit": 1,
+ "fieldname": "fulfilment_status",
+ "fieldtype": "Select",
+ "hidden": 1,
+ "in_list_view": 1,
+ "in_standard_filter": 1,
+ "label": "Fulfilment Status",
+ "no_copy": 1,
+ "options": "N/A\nUnfulfilled\nPartially Fulfilled\nFulfilled\nLapsed"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "sb_terms",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Contract Period",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "sb_terms",
+ "fieldtype": "Section Break",
+ "label": "Contract Period"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "start_date",
- "fieldtype": "Date",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Start Date",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "start_date",
+ "fieldtype": "Date",
+ "label": "Start Date"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "cb_date",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "cb_date",
+ "fieldtype": "Column Break"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "end_date",
- "fieldtype": "Date",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "End Date",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "end_date",
+ "fieldtype": "Date",
+ "label": "End Date"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "collapsible_depends_on": "",
- "columns": 0,
- "depends_on": "eval:doc.is_signed==1",
- "fieldname": "sb_signee",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Signee Details",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "depends_on": "eval:doc.is_signed==1",
+ "fieldname": "sb_signee",
+ "fieldtype": "Section Break",
+ "label": "Signee Details"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 1,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "signee",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 1,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Signee",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "allow_on_submit": 1,
+ "fieldname": "signee",
+ "fieldtype": "Data",
+ "in_global_search": 1,
+ "label": "Signee",
+ "no_copy": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 1,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "signed_on",
- "fieldtype": "Datetime",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Signed On",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "allow_on_submit": 1,
+ "fieldname": "signed_on",
+ "fieldtype": "Datetime",
+ "in_list_view": 1,
+ "label": "Signed On",
+ "no_copy": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "cb_user",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "cb_user",
+ "fieldtype": "Column Break"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 1,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "ip_address",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "IP Address",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "allow_on_submit": 1,
+ "fieldname": "ip_address",
+ "fieldtype": "Data",
+ "label": "IP Address",
+ "no_copy": 1,
+ "read_only": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "collapsible_depends_on": "eval:doc.docstatus==0",
- "columns": 0,
- "fieldname": "sb_contract",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Contract Details",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "collapsible": 1,
+ "collapsible_depends_on": "eval:doc.docstatus==0",
+ "fieldname": "sb_contract",
+ "fieldtype": "Section Break",
+ "label": "Contract Details"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "contract_template",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Contract Template",
- "length": 0,
- "no_copy": 0,
- "options": "Contract Template",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "contract_template",
+ "fieldtype": "Link",
+ "label": "Contract Template",
+ "options": "Contract Template"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "contract_terms",
- "fieldtype": "Text Editor",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Contract Terms",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "contract_terms",
+ "fieldtype": "Text Editor",
+ "in_list_view": 1,
+ "label": "Contract Terms",
+ "reqd": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "sb_fulfilment",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Fulfilment Details",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "sb_fulfilment",
+ "fieldtype": "Section Break",
+ "label": "Fulfilment Details"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "requires_fulfilment",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Requires Fulfilment",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "default": "0",
+ "fieldname": "requires_fulfilment",
+ "fieldtype": "Check",
+ "label": "Requires Fulfilment"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:doc.requires_fulfilment==1",
- "fieldname": "fulfilment_deadline",
- "fieldtype": "Date",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Fulfilment Deadline",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "depends_on": "eval:doc.requires_fulfilment==1",
+ "fieldname": "fulfilment_deadline",
+ "fieldtype": "Date",
+ "label": "Fulfilment Deadline"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 1,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:doc.requires_fulfilment==1",
- "fieldname": "fulfilment_terms",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Fulfilment Terms",
- "length": 0,
- "no_copy": 0,
- "options": "Contract Fulfilment Checklist",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.requires_fulfilment==1",
+ "fieldname": "fulfilment_terms",
+ "fieldtype": "Table",
+ "label": "Fulfilment Terms",
+ "options": "Contract Fulfilment Checklist"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "fieldname": "sb_references",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "References",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "collapsible": 1,
+ "fieldname": "sb_references",
+ "fieldtype": "Section Break",
+ "label": "References"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "",
- "depends_on": "",
- "fieldname": "document_type",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Document Type",
- "length": 0,
- "no_copy": 0,
- "options": "\nQuotation\nProject\nSales Order\nPurchase Order\nSales Invoice\nPurchase Invoice",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "document_type",
+ "fieldtype": "Select",
+ "label": "Document Type",
+ "options": "\nQuotation\nProject\nSales Order\nPurchase Order\nSales Invoice\nPurchase Invoice"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "cb_links",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "cb_links",
+ "fieldtype": "Column Break"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "document_name",
- "fieldtype": "Dynamic Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 1,
- "in_list_view": 1,
- "in_standard_filter": 1,
- "label": "Document Name",
- "length": 0,
- "no_copy": 0,
- "options": "document_type",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "document_name",
+ "fieldtype": "Dynamic Link",
+ "in_global_search": 1,
+ "in_list_view": 1,
+ "in_standard_filter": 1,
+ "label": "Document Name",
+ "options": "document_type"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Amended From",
- "length": 0,
- "no_copy": 1,
- "options": "Contract",
- "permlevel": 0,
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "fieldname": "amended_from",
+ "fieldtype": "Link",
+ "label": "Amended From",
+ "no_copy": 1,
+ "options": "Contract",
+ "print_hide": 1,
+ "read_only": 1
}
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 1,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2018-06-14 12:47:10.142988",
- "modified_by": "Administrator",
- "module": "CRM",
- "name": "Contract",
- "name_case": "",
- "owner": "Administrator",
+ ],
+ "is_submittable": 1,
+ "modified": "2019-09-30 00:56:41.559681",
+ "modified_by": "Administrator",
+ "module": "CRM",
+ "name": "Contract",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Sales Manager",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 1,
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Sales Manager",
+ "share": 1,
+ "submit": 1,
"write": 1
- },
+ },
{
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Purchase Manager",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 1,
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Purchase Manager",
+ "share": 1,
+ "submit": 1,
"write": 1
- },
+ },
{
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "HR Manager",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 1,
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "HR Manager",
+ "share": 1,
+ "submit": 1,
"write": 1
- },
+ },
{
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "System Manager",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 1,
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "System Manager",
+ "share": 1,
+ "submit": 1,
"write": 1
}
- ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "title_field": "",
- "track_changes": 1,
+ ],
+ "show_name_in_global_search": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1,
"track_seen": 1
}
\ No newline at end of file
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/erpnext_integrations/connectors/shopify_connection.py b/erpnext/erpnext_integrations/connectors/shopify_connection.py
index 1d6e891..bd98037 100644
--- a/erpnext/erpnext_integrations/connectors/shopify_connection.py
+++ b/erpnext/erpnext_integrations/connectors/shopify_connection.py
@@ -19,6 +19,7 @@
dump_request_data(order, event)
def sync_sales_order(order, request_id=None):
+ frappe.set_user('Administrator')
shopify_settings = frappe.get_doc("Shopify Settings")
frappe.flags.request_id = request_id
@@ -33,6 +34,7 @@
make_shopify_log(status="Success")
def prepare_sales_invoice(order, request_id=None):
+ frappe.set_user('Administrator')
shopify_settings = frappe.get_doc("Shopify Settings")
frappe.flags.request_id = request_id
@@ -45,6 +47,7 @@
make_shopify_log(status="Error", exception=True)
def prepare_delivery_note(order, request_id=None):
+ frappe.set_user('Administrator')
shopify_settings = frappe.get_doc("Shopify Settings")
frappe.flags.request_id = request_id
@@ -137,6 +140,7 @@
si.naming_series = shopify_settings.sales_invoice_series or "SI-Shopify-"
si.flags.ignore_mandatory = True
set_cost_center(si.items, shopify_settings.cost_center)
+ si.insert(ignore_mandatory=True)
si.submit()
make_payament_entry_against_sales_invoice(si, shopify_settings)
frappe.db.commit()
@@ -151,6 +155,7 @@
payemnt_entry.flags.ignore_mandatory = True
payemnt_entry.reference_no = doc.name
payemnt_entry.reference_date = nowdate()
+ payemnt_entry.insert(ignore_permissions=True)
payemnt_entry.submit()
def create_delivery_note(shopify_order, shopify_settings, so):
@@ -168,6 +173,7 @@
dn.items = get_fulfillment_items(dn.items, fulfillment.get("line_items"), shopify_settings)
dn.flags.ignore_mandatory = True
dn.save()
+ dn.submit()
frappe.db.commit()
def get_fulfillment_items(dn_items, fulfillment_items, shopify_settings):
@@ -200,7 +206,7 @@
"rate": shopify_item.get("price"),
"delivery_date": nowdate(),
"qty": shopify_item.get("quantity"),
- "stock_uom": shopify_item.get("sku"),
+ "stock_uom": shopify_item.get("uom") or _("Nos"),
"warehouse": shopify_settings.warehouse
})
else:
diff --git a/erpnext/erpnext_integrations/doctype/amazon_mws_settings/amazon_methods.py b/erpnext/erpnext_integrations/doctype/amazon_mws_settings/amazon_methods.py
index b9be9c0..2f39dc5 100644
--- a/erpnext/erpnext_integrations/doctype/amazon_mws_settings/amazon_methods.py
+++ b/erpnext/erpnext_integrations/doctype/amazon_mws_settings/amazon_methods.py
@@ -4,10 +4,7 @@
from __future__ import unicode_literals
import frappe, time, dateutil, math, csv
-try:
- from StringIO import StringIO
-except ImportError:
- from io import StringIO
+from six import StringIO
import erpnext.erpnext_integrations.doctype.amazon_mws_settings.amazon_mws_api as mws
from frappe import _
@@ -26,7 +23,7 @@
listings_response = reports.get_report(report_id=report_id)
#Get ASIN Codes
- string_io = StringIO(listings_response.original)
+ string_io = StringIO(frappe.safe_decode(listings_response.original))
csv_rows = list(csv.reader(string_io, delimiter=str('\t')))
asin_list = list(set([row[1] for row in csv_rows[1:]]))
#break into chunks of 10
@@ -294,7 +291,8 @@
so.submit()
except Exception as e:
- frappe.log_error(message=e, title="Create Sales Order")
+ import traceback
+ frappe.log_error(message=traceback.format_exc(), title="Create Sales Order")
def create_customer(order_json):
order_customer_name = ""
@@ -451,7 +449,7 @@
shipment_item_list = return_as_list(shipment_event.ShipmentEvent.ShipmentItemList.ShipmentItem)
for shipment_item in shipment_item_list:
- charges, fees = []
+ charges, fees = [], []
if 'ItemChargeList' in shipment_item.keys():
charges = return_as_list(shipment_item.ItemChargeList.ChargeComponent)
diff --git a/erpnext/erpnext_integrations/doctype/amazon_mws_settings/amazon_mws_api.py b/erpnext/erpnext_integrations/doctype/amazon_mws_settings/amazon_mws_api.py
index 68c2b9c..9925dc4 100755
--- a/erpnext/erpnext_integrations/doctype/amazon_mws_settings/amazon_mws_api.py
+++ b/erpnext/erpnext_integrations/doctype/amazon_mws_settings/amazon_mws_api.py
@@ -65,7 +65,8 @@
"""
md = hashlib.md5()
md.update(string)
- return base64.encodestring(md.digest()).strip('\n')
+ return base64.encodestring(md.digest()).strip('\n') if six.PY2 \
+ else base64.encodebytes(md.digest()).decode().strip()
def remove_empty(d):
"""
@@ -87,8 +88,7 @@
self.original = xml
self._rootkey = rootkey
self._mydict = xml_utils.xml2dict().fromstring(remove_namespace(xml))
- self._response_dict = self._mydict.get(self._mydict.keys()[0],
- self._mydict)
+ self._response_dict = self._mydict.get(list(self._mydict)[0], self._mydict)
@property
def parsed(self):
diff --git a/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.json b/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.json
index a7040f2..8f1b746 100644
--- a/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.json
+++ b/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.json
@@ -1,1258 +1,280 @@
{
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "beta": 0,
- "creation": "2015-05-18 05:21:07.270859",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "System",
- "editable_grid": 0,
+ "creation": "2015-05-18 05:21:07.270859",
+ "doctype": "DocType",
+ "document_type": "System",
+ "field_order": [
+ "status_html",
+ "enable_shopify",
+ "app_type",
+ "column_break_4",
+ "last_sync_datetime",
+ "section_break_2",
+ "shopify_url",
+ "api_key",
+ "column_break_3",
+ "password",
+ "shared_secret",
+ "access_token",
+ "section_break_38",
+ "webhooks",
+ "section_break_15",
+ "default_customer",
+ "column_break_19",
+ "customer_group",
+ "company_dependent_settings",
+ "company",
+ "cash_bank_account",
+ "column_break_20",
+ "cost_center",
+ "erp_settings",
+ "price_list",
+ "update_price_in_erpnext_price_list",
+ "column_break_26",
+ "warehouse",
+ "section_break_25",
+ "sales_order_series",
+ "column_break_27",
+ "sync_delivery_note",
+ "delivery_note_series",
+ "sync_sales_invoice",
+ "sales_invoice_series",
+ "section_break_22",
+ "html_16",
+ "taxes"
+ ],
"fields": [
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "status_html",
- "fieldtype": "HTML",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "status html",
- "length": 0,
- "no_copy": 0,
- "options": "",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "status_html",
+ "fieldtype": "HTML",
+ "label": "status html",
+ "read_only": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "",
- "fieldname": "enable_shopify",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Enable Shopify",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "default": "0",
+ "fieldname": "enable_shopify",
+ "fieldtype": "Check",
+ "label": "Enable Shopify"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "Public",
- "fieldname": "app_type",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "App Type",
- "length": 0,
- "no_copy": 0,
- "options": "Public\nPrivate",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "default": "Private",
+ "fieldname": "app_type",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "label": "App Type",
+ "read_only": 1,
+ "reqd": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_4",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "column_break_4",
+ "fieldtype": "Column Break"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "last_sync_datetime",
- "fieldtype": "Datetime",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Last Sync Datetime",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "last_sync_datetime",
+ "fieldtype": "Datetime",
+ "label": "Last Sync Datetime",
+ "read_only": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "section_break_2",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "section_break_2",
+ "fieldtype": "Section Break"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "eg: frappe.myshopify.com",
- "fieldname": "shopify_url",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Shop URL",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "description": "eg: frappe.myshopify.com",
+ "fieldname": "shopify_url",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "label": "Shop URL",
+ "reqd": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:doc.app_type==\"Private\"",
- "fieldname": "api_key",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "API Key",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "depends_on": "eval:doc.app_type==\"Private\"",
+ "fieldname": "api_key",
+ "fieldtype": "Data",
+ "label": "API Key"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_3",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "column_break_3",
+ "fieldtype": "Column Break"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:doc.app_type==\"Private\"",
- "fieldname": "password",
- "fieldtype": "Password",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Password",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "depends_on": "eval:doc.app_type==\"Private\"",
+ "fieldname": "password",
+ "fieldtype": "Password",
+ "label": "Password"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "shared_secret",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Shared secret",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "shared_secret",
+ "fieldtype": "Data",
+ "label": "Shared secret"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "access_token",
- "fieldtype": "Data",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Access Token",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "access_token",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "Access Token",
+ "read_only": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "fieldname": "section_break_38",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Webhooks Details",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "collapsible": 1,
+ "fieldname": "section_break_38",
+ "fieldtype": "Section Break",
+ "label": "Webhooks Details"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "webhooks",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Webhooks",
- "length": 0,
- "no_copy": 0,
- "options": "Shopify Webhook Detail",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "webhooks",
+ "fieldtype": "Table",
+ "label": "Webhooks",
+ "options": "Shopify Webhook Detail",
+ "read_only": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "section_break_15",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Customer Settings",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "section_break_15",
+ "fieldtype": "Section Break",
+ "label": "Customer Settings"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "If Shopify not contains a customer in Order, then while syncing Orders, the system will consider default customer for order",
- "fieldname": "default_customer",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Customer",
- "length": 0,
- "no_copy": 0,
- "options": "Customer",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "description": "If Shopify not contains a customer in Order, then while syncing Orders, the system will consider default customer for order",
+ "fieldname": "default_customer",
+ "fieldtype": "Link",
+ "label": "Default Customer",
+ "options": "Customer"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_19",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "column_break_19",
+ "fieldtype": "Column Break"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "",
- "description": "Customer Group will set to selected group while syncing customers from Shopify",
- "fieldname": "customer_group",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Customer Group",
- "length": 0,
- "no_copy": 0,
- "options": "Customer Group",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "description": "Customer Group will set to selected group while syncing customers from Shopify",
+ "fieldname": "customer_group",
+ "fieldtype": "Link",
+ "label": "Customer Group",
+ "options": "Customer Group"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "company_dependent_settings",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "company_dependent_settings",
+ "fieldtype": "Section Break"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "company",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "For Company",
- "length": 0,
- "no_copy": 0,
- "options": "Company",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "label": "For Company",
+ "options": "Company"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "Cash Account will used for Sales Invoice creation",
- "fieldname": "cash_bank_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Cash/Bank Account",
- "length": 0,
- "no_copy": 0,
- "options": "Account",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "description": "Cash Account will used for Sales Invoice creation",
+ "fieldname": "cash_bank_account",
+ "fieldtype": "Link",
+ "label": "Cash/Bank Account",
+ "options": "Account"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_20",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "column_break_20",
+ "fieldtype": "Column Break"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "cost_center",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Cost Center",
- "length": 0,
- "no_copy": 0,
- "options": "Cost Center",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "cost_center",
+ "fieldtype": "Link",
+ "label": "Cost Center",
+ "options": "Cost Center"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "erp_settings",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "erp_settings",
+ "fieldtype": "Section Break"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "",
- "fieldname": "price_list",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Price List",
- "length": 0,
- "no_copy": 0,
- "options": "Price List",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "price_list",
+ "fieldtype": "Link",
+ "label": "Price List",
+ "options": "Price List"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "update_price_in_erpnext_price_list",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Update Price from Shopify To ERPNext Price List",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "default": "0",
+ "fieldname": "update_price_in_erpnext_price_list",
+ "fieldtype": "Check",
+ "label": "Update Price from Shopify To ERPNext Price List"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_26",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "column_break_26",
+ "fieldtype": "Column Break"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "",
- "depends_on": "",
- "description": "Default Warehouse to to create Sales Order and Delivery Note",
- "fieldname": "warehouse",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Warehouse",
- "length": 0,
- "no_copy": 0,
- "options": "Warehouse",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "description": "Default Warehouse to to create Sales Order and Delivery Note",
+ "fieldname": "warehouse",
+ "fieldtype": "Link",
+ "label": "Warehouse",
+ "options": "Warehouse"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "section_break_25",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "section_break_25",
+ "fieldtype": "Section Break"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "sales_order_series",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Sales Order Series",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "sales_order_series",
+ "fieldtype": "Select",
+ "label": "Sales Order Series"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_27",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "column_break_27",
+ "fieldtype": "Column Break"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "",
- "fieldname": "sync_delivery_note",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Import Delivery Notes from Shopify on Shipment",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "default": "0",
+ "fieldname": "sync_delivery_note",
+ "fieldtype": "Check",
+ "label": "Import Delivery Notes from Shopify on Shipment"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:doc.sync_delivery_note==1",
- "fieldname": "delivery_note_series",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Delivery Note Series",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "depends_on": "eval:doc.sync_delivery_note==1",
+ "fieldname": "delivery_note_series",
+ "fieldtype": "Select",
+ "label": "Delivery Note Series"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "",
- "fieldname": "sync_sales_invoice",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Import Sales Invoice from Shopify if Payment is marked",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "default": "0",
+ "fieldname": "sync_sales_invoice",
+ "fieldtype": "Check",
+ "label": "Import Sales Invoice from Shopify if Payment is marked"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:doc.sync_sales_invoice==1",
- "fieldname": "sales_invoice_series",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Sales Invoice Series",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "depends_on": "eval:doc.sync_sales_invoice==1",
+ "fieldname": "sales_invoice_series",
+ "fieldtype": "Select",
+ "label": "Sales Invoice Series"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "section_break_22",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "section_break_22",
+ "fieldtype": "Section Break"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "html_16",
- "fieldtype": "HTML",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "options": "Map Shopify Taxes / Shipping Charges to ERPNext Account",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "html_16",
+ "fieldtype": "HTML",
+ "options": "Map Shopify Taxes / Shipping Charges to ERPNext Account"
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "taxes",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Shopify Tax Account",
- "length": 0,
- "no_copy": 0,
- "options": "Shopify Tax Account",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "fieldname": "taxes",
+ "fieldtype": "Table",
+ "label": "Shopify Tax Account",
+ "options": "Shopify Tax Account"
}
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 1,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2018-09-07 09:11:49.403176",
- "modified_by": "Administrator",
- "module": "ERPNext Integrations",
- "name": "Shopify Settings",
- "name_case": "",
- "owner": "Administrator",
+ ],
+ "issingle": 1,
+ "modified": "2019-09-13 12:32:11.384757",
+ "modified_by": "umair@erpnext.com",
+ "module": "ERPNext Integrations",
+ "name": "Shopify Settings",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 0,
- "cancel": 0,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 0,
- "role": "System Manager",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "print": 1,
+ "read": 1,
+ "role": "System Manager",
+ "share": 1,
"write": 1
}
- ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 0,
- "track_seen": 0,
- "track_views": 0
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC"
}
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py b/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py
index 4943053..e2f6d49 100644
--- a/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py
+++ b/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py
@@ -21,33 +21,22 @@
else:
self.unregister_webhooks()
- self.validate_app_type()
-
def validate_access_credentials(self):
- if self.app_type == "Private":
- if not (self.get_password(raise_exception=False) and self.api_key and self.shopify_url):
- frappe.msgprint(_("Missing value for Password, API Key or Shopify URL"), raise_exception=frappe.ValidationError)
-
- else:
- if not (self.access_token and self.shopify_url):
- frappe.msgprint(_("Access token or Shopify URL missing"), raise_exception=frappe.ValidationError)
-
- def validate_app_type(self):
- if self.app_type == "Public":
- frappe.throw(_("Support for public app is deprecated. Please setup private app, for more details refer user manual"))
+ if not (self.get_password(raise_exception=False) and self.api_key and self.shopify_url):
+ frappe.msgprint(_("Missing value for Password, API Key or Shopify URL"), raise_exception=frappe.ValidationError)
def register_webhooks(self):
webhooks = ["orders/create", "orders/paid", "orders/fulfilled"]
-
- url = get_shopify_url('admin/webhooks.json', self)
+ # url = get_shopify_url('admin/webhooks.json', self)
created_webhooks = [d.method for d in self.webhooks]
-
+ url = get_shopify_url('admin/api/2019-04/webhooks.json', self)
+ print('url', url)
for method in webhooks:
- if method in created_webhooks:
- continue
-
+ print('method', method)
session = get_request_session()
+ print('session', session)
try:
+ print(get_header(self))
d = session.post(url, data=json.dumps({
"webhook": {
"topic": method,
@@ -55,6 +44,7 @@
"format": "json"
}
}), headers=get_header(self))
+ print('d', d.json())
d.raise_for_status()
self.update_webhook_table(method, d.json())
except Exception as e:
@@ -65,7 +55,7 @@
deleted_webhooks = []
for d in self.webhooks:
- url = get_shopify_url('admin/webhooks/{0}.json'.format(d.webhook_id), self)
+ url = get_shopify_url('admin/api/2019-04/webhooks.json'.format(d.webhook_id), self)
try:
res = session.delete(url, headers=get_header(self))
res.raise_for_status()
@@ -77,6 +67,7 @@
self.remove(d)
def update_webhook_table(self, method, res):
+ print('update')
self.append("webhooks", {
"webhook_id": res['webhook']['id'],
"method": method
@@ -84,6 +75,7 @@
def get_shopify_url(path, settings):
if settings.app_type == "Private":
+ print(settings.api_key, settings.get_password('password'), settings.shopify_url, path)
return 'https://{}:{}@{}/{}'.format(settings.api_key, settings.get_password('password'), settings.shopify_url, path)
else:
return 'https://{}/{}'.format(settings.shopify_url, path)
@@ -91,11 +83,7 @@
def get_header(settings):
header = {'Content-Type': 'application/json'}
- if settings.app_type == "Private":
- return header
- else:
- header["X-Shopify-Access-Token"] = settings.access_token
- return header
+ return header;
@frappe.whitelist()
def get_series():
diff --git a/erpnext/erpnext_integrations/doctype/shopify_settings/sync_customer.py b/erpnext/erpnext_integrations/doctype/shopify_settings/sync_customer.py
index 4b284b2..7866fde 100644
--- a/erpnext/erpnext_integrations/doctype/shopify_settings/sync_customer.py
+++ b/erpnext/erpnext_integrations/doctype/shopify_settings/sync_customer.py
@@ -21,7 +21,7 @@
"customer_type": _("Individual")
})
customer.flags.ignore_mandatory = True
- customer.insert()
+ customer.insert(ignore_permissions=True)
if customer:
create_customer_address(customer, shopify_customer)
diff --git a/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py b/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py
index 5570e69..bde1011 100644
--- a/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py
+++ b/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py
@@ -1,13 +1,14 @@
from __future__ import unicode_literals
import frappe
from frappe import _
+from erpnext import get_default_company
from frappe.utils import cstr, cint, get_request_session
from erpnext.erpnext_integrations.doctype.shopify_settings.shopify_settings import get_shopify_url, get_header
shopify_variants_attr_list = ["option1", "option2", "option3"]
def sync_item_from_shopify(shopify_settings, item):
- url = get_shopify_url("/admin/products/{0}.json".format(item.get("product_id")), shopify_settings)
+ url = get_shopify_url("admin/api/2019-04/products/{0}.json".format(item.get("product_id")), shopify_settings)
session = get_request_session()
try:
@@ -107,7 +108,12 @@
"image": get_item_image(shopify_item),
"weight_uom": shopify_item.get("weight_unit"),
"weight_per_unit": shopify_item.get("weight"),
- "default_supplier": get_supplier(shopify_item)
+ "default_supplier": get_supplier(shopify_item),
+ "item_defaults": [
+ {
+ "company": get_default_company()
+ }
+ ]
}
if not is_item_exists(item_dict, attributes, variant_of=variant_of):
@@ -116,7 +122,7 @@
if not item_details:
new_item = frappe.get_doc(item_dict)
- new_item.insert()
+ new_item.insert(ignore_permissions=True, ignore_mandatory=True)
name = new_item.name
if not name:
diff --git a/erpnext/erpnext_integrations/doctype/shopify_settings/test_shopify_settings.py b/erpnext/erpnext_integrations/doctype/shopify_settings/test_shopify_settings.py
index b983407..64ef3dc 100644
--- a/erpnext/erpnext_integrations/doctype/shopify_settings/test_shopify_settings.py
+++ b/erpnext/erpnext_integrations/doctype/shopify_settings/test_shopify_settings.py
@@ -40,6 +40,7 @@
"price_list": "_Test Price List",
"warehouse": "_Test Warehouse - _TC",
"cash_bank_account": "Cash - _TC",
+ "account": "Cash - _TC",
"customer_group": "_Test Customer Group",
"cost_center": "Main - _TC",
"taxes": [
diff --git a/erpnext/erpnext_integrations/utils.py b/erpnext/erpnext_integrations/utils.py
index 9065779..84f7f5a 100644
--- a/erpnext/erpnext_integrations/utils.py
+++ b/erpnext/erpnext_integrations/utils.py
@@ -40,4 +40,4 @@
server_url = '{uri.scheme}://{uri.netloc}/api/method/{endpoint}'.format(uri=urlparse(url), endpoint=endpoint)
- return server_url
\ No newline at end of file
+ return server_url
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 373e105..9742a03 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/hr/report/employee_leave_balance/employee_leave_balance.py b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py
index 7717ba0..e967db8 100644
--- a/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py
+++ b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py
@@ -60,7 +60,10 @@
data = []
for employee in active_employees:
- leave_approvers = department_approver_map.get(employee.department_name, []).append(employee.leave_approver)
+ leave_approvers = department_approver_map.get(employee.department_name, [])
+ if employee.leave_approver:
+ leave_approvers.append(employee.leave_approver)
+
if (len(leave_approvers) and user in leave_approvers) or (user in ["Administrator", employee.user_id]) or ("HR Manager" in frappe.get_roles(user)):
row = [employee.name, employee.employee_name, employee.department]
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.py b/erpnext/manufacturing/doctype/production_plan/production_plan.py
index b51420f..04359e3 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py
@@ -195,6 +195,7 @@
for data in self.po_items:
if data.name == production_plan_item:
data.produced_qty = produced_qty
+ data.pending_qty = data.planned_qty - data.produced_qty
data.db_update()
self.calculate_total_produced_qty()
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.js b/erpnext/manufacturing/doctype/work_order/work_order.js
index ce7b4f9..96e44c8 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.js
+++ b/erpnext/manufacturing/doctype/work_order/work_order.js
@@ -545,11 +545,14 @@
get_max_transferable_qty: (frm, purpose) => {
let max = 0;
- if (frm.doc.skip_transfer) return max;
- if (purpose === 'Manufacture') {
- max = flt(frm.doc.material_transferred_for_manufacturing) - flt(frm.doc.produced_qty);
+ if (frm.doc.skip_transfer) {
+ max = flt(frm.doc.qty) - flt(frm.doc.produced_qty);
} else {
- max = flt(frm.doc.qty) - flt(frm.doc.material_transferred_for_manufacturing);
+ if (purpose === 'Manufacture') {
+ max = flt(frm.doc.material_transferred_for_manufacturing) - flt(frm.doc.produced_qty);
+ } else {
+ max = flt(frm.doc.qty) - flt(frm.doc.material_transferred_for_manufacturing);
+ }
}
return flt(max, precision('qty'));
},
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 722baaf..9f98099 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -638,3 +638,5 @@
erpnext.patches.v12_0.rename_bank_account_field_in_journal_entry_account
erpnext.patches.v12_0.create_default_energy_point_rules
erpnext.patches.v12_0.set_produced_qty_field_in_sales_order_for_work_order
+erpnext.patches.v12_0.generate_leave_ledger_entries
+erpnext.patches.v12_0.set_default_shopify_app_type
diff --git a/erpnext/patches/v12_0/set_default_shopify_app_type.py b/erpnext/patches/v12_0/set_default_shopify_app_type.py
new file mode 100644
index 0000000..d040ea7
--- /dev/null
+++ b/erpnext/patches/v12_0/set_default_shopify_app_type.py
@@ -0,0 +1,6 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+ frappe.reload_doc('erpnext_integrations', 'doctype', 'shopify_settings')
+ frappe.db.set_value('Shopify Settings', None, 'app_type', 'Private')
\ No newline at end of file
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/public/js/templates/contact_list.html b/erpnext/public/js/templates/contact_list.html
index 50fbfd9..7e69691 100644
--- a/erpnext/public/js/templates/contact_list.html
+++ b/erpnext/public/js/templates/contact_list.html
@@ -19,6 +19,9 @@
{% if(contact_list[i].phone) { %}
{%= __("Phone") %}: {%= contact_list[i].phone %}<span class="text-muted"> ({%= __("Primary") %})</span><br>
{% endif %}
+ {% if(contact_list[i].mobile_no) { %}
+ {%= __("Mobile No") %}: {%= contact_list[i].mobile_no %}<span class="text-muted"> ({%= __("Primary") %})</span><br>
+ {% endif %}
{% if(contact_list[i].phone_nos) { %}
{% for(var j=0, k=contact_list[i].phone_nos.length; j<k; j++) { %}
{%= __("Phone") %}: {%= contact_list[i].phone_nos[j].phone %}<br>
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/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
index 2e8bc64..aef53ed 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -115,12 +115,12 @@
cur_frm.add_custom_button(__("Close"), this.close_purchase_receipt, __("Status"))
}
- cur_frm.add_custom_button(__('Return'), this.make_purchase_return, __('Create'));
+ cur_frm.add_custom_button(__('Purchase Return'), this.make_purchase_return, __('Create'));
cur_frm.add_custom_button(__('Make Stock Entry'), cur_frm.cscript['Make Stock Entry'], __('Create'));
if(flt(this.frm.doc.per_billed) < 100) {
- cur_frm.add_custom_button(__('Invoice'), this.make_purchase_invoice, __('Create'));
+ cur_frm.add_custom_button(__('Purchase Invoice'), this.make_purchase_invoice, __('Create'));
}
cur_frm.add_custom_button(__('Retention Stock Entry'), this.make_retention_stock_entry, __('Create'));
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/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