Merge pull request #17378 from rohitwaghchaure/trial_balance_error_finance_book_develop
fix: Trial balance finance book issue
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
index 7ab7f14..d224961 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -285,6 +285,7 @@
is_paid: function() {
hide_fields(this.frm.doc);
if(cint(this.frm.doc.is_paid)) {
+ this.frm.set_value("allocate_advances_automatically", 0);
if(!this.frm.doc.company) {
this.frm.set_value("is_paid", 0)
frappe.msgprint(__("Please specify Company to proceed"));
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index 90a0ef4..f21fbd9 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -369,7 +369,7 @@
set_pos_data: function() {
if(this.frm.doc.is_pos) {
- this.frm.set_value("allocate_advances_automatically", this.frm.doc.is_pos ? 0 : 1);
+ this.frm.set_value("allocate_advances_automatically", 0);
if(!this.frm.doc.company) {
this.frm.set_value("is_pos", 0);
frappe.msgprint(__("Please specify Company to proceed"));
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 90dc086..155a996 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -89,7 +89,8 @@
self.validate_paid_amount()
if self.doctype in ['Purchase Invoice', 'Sales Invoice']:
- if cint(self.allocate_advances_automatically) and not cint(self.is_pos):
+ pos_check_field = "is_pos" if self.doctype=="Sales Invoice" else "is_paid"
+ if cint(self.allocate_advances_automatically) and not cint(self.get(pos_check_field)):
self.set_advances()
if self.is_return:
diff --git a/erpnext/patches/v12_0/move_item_tax_to_item_tax_template.py b/erpnext/patches/v12_0/move_item_tax_to_item_tax_template.py
index 575ebeb..02203d2 100644
--- a/erpnext/patches/v12_0/move_item_tax_to_item_tax_template.py
+++ b/erpnext/patches/v12_0/move_item_tax_to_item_tax_template.py
@@ -13,19 +13,19 @@
old_item_taxes.setdefault(d.item_code, [])
old_item_taxes[d.item_code].append(d)
- frappe.reload_doc("accounts", "doctype", "item_tax_template_detail")
- frappe.reload_doc("accounts", "doctype", "item_tax_template")
- frappe.reload_doc("stock", "doctype", "item")
- frappe.reload_doc("stock", "doctype", "item_tax")
- frappe.reload_doc("selling", "doctype", "quotation_item")
- frappe.reload_doc("selling", "doctype", "sales_order_item")
- frappe.reload_doc("stock", "doctype", "delivery_note_item")
- frappe.reload_doc("accounts", "doctype", "sales_invoice_item")
- frappe.reload_doc("buying", "doctype", "supplier_quotation_item")
- frappe.reload_doc("buying", "doctype", "purchase_order_item")
- frappe.reload_doc("stock", "doctype", "purchase_receipt_item")
- frappe.reload_doc("accounts", "doctype", "purchase_invoice_item")
- frappe.reload_doc("accounts", "doctype", "accounts_settings")
+ frappe.reload_doc("accounts", "doctype", "item_tax_template_detail", force=1)
+ frappe.reload_doc("accounts", "doctype", "item_tax_template", force=1)
+ frappe.reload_doc("stock", "doctype", "item", force=1)
+ frappe.reload_doc("stock", "doctype", "item_tax", force=1)
+ frappe.reload_doc("selling", "doctype", "quotation_item", force=1)
+ frappe.reload_doc("selling", "doctype", "sales_order_item", force=1)
+ frappe.reload_doc("stock", "doctype", "delivery_note_item", force=1)
+ frappe.reload_doc("accounts", "doctype", "sales_invoice_item", force=1)
+ frappe.reload_doc("buying", "doctype", "supplier_quotation_item", force=1)
+ frappe.reload_doc("buying", "doctype", "purchase_order_item", force=1)
+ frappe.reload_doc("stock", "doctype", "purchase_receipt_item", force=1)
+ frappe.reload_doc("accounts", "doctype", "purchase_invoice_item", force=1)
+ frappe.reload_doc("accounts", "doctype", "accounts_settings", force=1)
# for each item that have item tax rates
for item_code in old_item_taxes.keys():
@@ -77,6 +77,21 @@
item_tax_template = frappe.new_doc("Item Tax Template")
item_tax_template.title = "{}--{}".format(parent, item_code) if parent else "Item-{}".format(item_code)
for tax_type, tax_rate in iteritems(item_tax_map):
+ if not frappe.db.exists("Account", tax_type):
+ parts = tax_type.strip().split(" - ")
+ account_name = " - ".join(parts[:-1])
+ company = frappe.db.get_value("Company", filters={"abbr": parts[-1]})
+ parent_account = frappe.db.get_value("Account",
+ filters={"account_type": "Tax", "root_type": "Liability", "is_group": 0}, fieldname="parent_account")
+
+ frappe.get_doc({
+ "doctype": "Account",
+ "account_name": account_name,
+ "company": company,
+ "account_type": "Tax",
+ "parent_account": parent_account
+ }).insert()
+
item_tax_template.append("taxes", {"tax_type": tax_type, "tax_rate": tax_rate})
item_tax_templates.setdefault(item_tax_template.title, {})
item_tax_templates[item_tax_template.title][tax_type] = tax_rate
diff --git a/erpnext/portal/product_configurator/utils.py b/erpnext/portal/product_configurator/utils.py
index f02212c..43e6fe5 100644
--- a/erpnext/portal/product_configurator/utils.py
+++ b/erpnext/portal/product_configurator/utils.py
@@ -173,7 +173,6 @@
valid_attribute_values = valid_options.get(attr.attribute, [])
ordered_values = ordered_attribute_value_map.get(attr.attribute, [])
attr['values'] = [v for v in ordered_values if v in valid_attribute_values]
- attr['values'] = valid_attribute_values
return attributes
diff --git a/erpnext/stock/report/inactive_items/__init__.py b/erpnext/stock/report/inactive_items/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/stock/report/inactive_items/__init__.py
diff --git a/erpnext/stock/report/inactive_items/inactive_items.js b/erpnext/stock/report/inactive_items/inactive_items.js
new file mode 100644
index 0000000..39dfd5c
--- /dev/null
+++ b/erpnext/stock/report/inactive_items/inactive_items.js
@@ -0,0 +1,34 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+/* eslint-disable */
+
+frappe.query_reports["Inactive Items"] = {
+ "filters": [
+ {
+ fieldname: "item",
+ label: __("Item"),
+ fieldtype: "Link",
+ options: "Item"
+ },
+ {
+ fieldname: "item_group",
+ label: __("Item Group"),
+ fieldtype: "Link",
+ options: "Item Group"
+ },
+ {
+ fieldname: "based_on",
+ label: __("Based On"),
+ fieldtype: "Select",
+ options: "Sales Order\nSales Invoice",
+ default: "Sales Order"
+ },
+ {
+ fieldname: "days",
+ label: __("Days Since Last order"),
+ fieldtype: "Select",
+ options: [30, 60, 90],
+ default: 30
+ },
+ ]
+}
diff --git a/erpnext/stock/report/inactive_items/inactive_items.json b/erpnext/stock/report/inactive_items/inactive_items.json
new file mode 100644
index 0000000..b9eb05e
--- /dev/null
+++ b/erpnext/stock/report/inactive_items/inactive_items.json
@@ -0,0 +1,31 @@
+{
+ "add_total_row": 0,
+ "creation": "2019-04-16 16:05:00.647308",
+ "disable_prepared_report": 0,
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "idx": 0,
+ "is_standard": "Yes",
+ "letter_head": "Test Letter Head 1",
+ "modified": "2019-04-16 16:06:33.630043",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Inactive Items",
+ "owner": "Administrator",
+ "prepared_report": 0,
+ "ref_doctype": "Sales Invoice",
+ "report_name": "Inactive Items",
+ "report_type": "Script Report",
+ "roles": [
+ {
+ "role": "Accounts User"
+ },
+ {
+ "role": "Accounts Manager"
+ },
+ {
+ "role": "Auditor"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/stock/report/inactive_items/inactive_items.py b/erpnext/stock/report/inactive_items/inactive_items.py
new file mode 100644
index 0000000..8d87912
--- /dev/null
+++ b/erpnext/stock/report/inactive_items/inactive_items.py
@@ -0,0 +1,148 @@
+# 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.utils import getdate, add_days, today, cint
+from frappe import _
+
+def execute(filters=None):
+
+ columns = get_columns()
+ data = get_data(filters)
+ return columns, data
+
+def get_columns():
+
+ columns = [
+ {
+ "fieldname": "territory",
+ "fieldtype": "Link",
+ "label": _("Territory"),
+ "options": "Territory",
+ "width": 100
+ },
+ {
+ "fieldname": "item_group",
+ "fieldtype": "Link",
+ "label": _("Item Group"),
+ "options": "Item Group",
+ "width": 150
+ },
+ {
+ "fieldname": "item_name",
+ "fieldtype": "Link",
+ "options": "Item",
+ "label": "Item",
+ "width": 150
+ },
+ {
+ "fieldname": "item_name",
+ "fieldtype": "Data",
+ "label": _("Item Name"),
+ "width": 150
+ },
+
+ {
+ "fieldname": "customer",
+ "fieldtype": "Link",
+ "label": _("Customer"),
+ "options": "Customer",
+ "width": 100
+ },
+ {
+ "fieldname": "last_order_date",
+ "fieldtype": "Date",
+ "label": _("Last Order Date"),
+ "width": 100
+ },
+ {
+ "fieldname": "qty",
+ "fieldtype": "Float",
+ "label": _("Quantity"),
+ "width": 100
+ },
+ {
+ "fieldname": "days_since_last_order",
+ "fieldtype": "Int",
+ "label": _("Days Since Last Order"),
+ "width": 100
+ },
+ ]
+
+ return columns
+
+
+def get_data(filters):
+
+ data = []
+ items = get_items(filters)
+ sales_invoice_data = get_sales_details(filters)
+
+ for item in items:
+ if sales_invoice_data.get(item.name):
+ item_obj = sales_invoice_data[item.name]
+ if item_obj.days_since_last_order > cint(filters['days']):
+ row = {
+ "territory": item_obj.territory,
+ "item_group": item_obj.item_group,
+ "item": item_obj.name,
+ "item_name": item_obj.item_name,
+ "customer": item_obj.customer,
+ "last_order_date": item_obj.last_order_date,
+ "qty": item_obj.qty,
+ "days_since_last_order": item_obj.days_since_last_order
+ }
+ data.append(row)
+ else:
+ row = {
+ "item_group": item.item_group,
+ "item": item.name,
+ "item_name": item.item_name
+ }
+ data.append(row)
+
+ return data
+
+
+def get_sales_details(filters):
+
+ data = []
+ item_details_map = {}
+
+ date_field = "s.transaction_date" if filters["based_on"] == "Sales Order" else "s.posting_date"
+
+ sales_data = frappe.db.sql("""
+ select s.territory, s.customer, si.item_group, si.item_name, si.qty, {date_field} as last_order_date,
+ DATEDIFF(CURDATE(), {date_field}) as days_since_last_order
+ from `tab{doctype}` s, `tab{doctype} Item` si
+ where s.name = si.parent and s.docstatus = 1
+ group by si.name order by days_since_last_order """ #nosec
+ .format(date_field = date_field, doctype = filters['based_on']), as_dict=1)
+
+ for d in sales_data:
+ item_details_map.setdefault(d.item_name, d)
+
+ return item_details_map
+
+def get_items(filters):
+
+ filters_dict = {
+ "disabled": 0,
+ "is_stock_item": 1
+ }
+
+ if filters.get("item_group"):
+ filters_dict.update({
+ "item_group": filters["item_group"]
+ })
+
+ if filters.get("item"):
+ filters_dict.update({
+ "name": filters["item"]
+ })
+
+ items = frappe.get_all("Item", fields=["name", "item_group", "item_name"], filters=filters_dict, order_by="name")
+
+ return items
+