Merge pull request #25731 from ankush/escaping_company_name
fix: escape company name
diff --git a/erpnext/accounts/doctype/gst_account/gst_account.json b/erpnext/accounts/doctype/gst_account/gst_account.json
index 7067338..b6ec884 100644
--- a/erpnext/accounts/doctype/gst_account/gst_account.json
+++ b/erpnext/accounts/doctype/gst_account/gst_account.json
@@ -1,196 +1,82 @@
{
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "beta": 0,
- "creation": "2018-01-02 15:48:58.768352",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "",
- "editable_grid": 1,
- "engine": "InnoDB",
+ "actions": [],
+ "creation": "2018-01-02 15:48:58.768352",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "company",
+ "cgst_account",
+ "sgst_account",
+ "igst_account",
+ "cess_account",
+ "is_reverse_charge_account"
+ ],
"fields": [
{
- "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": 1,
- "in_standard_filter": 0,
- "label": "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": 1,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "columns": 1,
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Company",
+ "options": "Company",
+ "reqd": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "cgst_account",
- "fieldtype": "Link",
- "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": "CGST 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": 1,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "columns": 2,
+ "fieldname": "cgst_account",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "CGST Account",
+ "options": "Account",
+ "reqd": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "sgst_account",
- "fieldtype": "Link",
- "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": "SGST 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": 1,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "columns": 2,
+ "fieldname": "sgst_account",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "SGST Account",
+ "options": "Account",
+ "reqd": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "igst_account",
- "fieldtype": "Link",
- "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": "IGST 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": 1,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "columns": 2,
+ "fieldname": "igst_account",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "IGST Account",
+ "options": "Account",
+ "reqd": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "cess_account",
- "fieldtype": "Link",
- "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": "CESS 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,
- "unique": 0
+ "columns": 2,
+ "fieldname": "cess_account",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "CESS Account",
+ "options": "Account"
+ },
+ {
+ "columns": 1,
+ "default": "0",
+ "fieldname": "is_reverse_charge_account",
+ "fieldtype": "Check",
+ "in_list_view": 1,
+ "label": "Is Reverse Charge Account"
}
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 1,
- "max_attachments": 0,
- "modified": "2018-01-02 15:52:22.335988",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "GST Account",
- "name_case": "",
- "owner": "Administrator",
- "permissions": [],
- "quick_entry": 1,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1,
- "track_seen": 0
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2021-04-09 12:30:25.889993",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "GST Account",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index 7c73ad6..5538568 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -582,6 +582,16 @@
};
});
+ frm.set_query("adjustment_against", function() {
+ return {
+ filters: {
+ company: frm.doc.company,
+ customer: frm.doc.customer,
+ docstatus: 1
+ }
+ };
+ });
+
frm.custom_make_buttons = {
'Delivery Note': 'Delivery',
'Sales Invoice': 'Return / Credit Note',
@@ -867,6 +877,10 @@
})
}
+ if (frm.doc.is_debit_note) {
+ frm.set_df_property('return_against', 'label', 'Adjustment Against');
+ }
+
if (frappe.boot.active_domains.includes("Healthcare")) {
frm.set_df_property("patient", "hidden", 0);
frm.set_df_property("patient_name", "hidden", 0);
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index c6c67b4..7ae2089 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -16,6 +16,7 @@
"is_pos",
"is_consolidated",
"is_return",
+ "is_debit_note",
"update_billed_amount_in_sales_order",
"column_break1",
"company",
@@ -392,7 +393,7 @@
"read_only": 1
},
{
- "depends_on": "return_against",
+ "depends_on": "eval:doc.return_against || doc.is_debit_note",
"fieldname": "return_against",
"fieldtype": "Link",
"hide_days": 1,
@@ -401,7 +402,7 @@
"no_copy": 1,
"options": "Sales Invoice",
"print_hide": 1,
- "read_only": 1,
+ "read_only_depends_on": "eval:doc.is_return",
"search_index": 1
},
{
@@ -1953,6 +1954,12 @@
},
{
"default": "0",
+ "fieldname": "is_debit_note",
+ "fieldtype": "Check",
+ "label": "Is Debit Note"
+ },
+ {
+ "default": 0,
"depends_on": "grand_total",
"fieldname": "disable_rounded_total",
"fieldtype": "Check",
@@ -1969,7 +1976,7 @@
"link_fieldname": "consolidated_invoice"
}
],
- "modified": "2021-04-15 23:57:58.766651",
+ "modified": "2021-04-23 22:36:32.916354",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice",
diff --git a/erpnext/accounts/report/dimension_wise_accounts_balance_report/__init__.py b/erpnext/accounts/report/dimension_wise_accounts_balance_report/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/accounts/report/dimension_wise_accounts_balance_report/__init__.py
diff --git a/erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js b/erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js
new file mode 100644
index 0000000..6a03948
--- /dev/null
+++ b/erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js
@@ -0,0 +1,81 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+/* eslint-disable */
+
+frappe.require("assets/erpnext/js/financial_statements.js", function() {
+ frappe.query_reports["Dimension-wise Accounts Balance Report"] = {
+ "filters": [
+ {
+ "fieldname": "company",
+ "label": __("Company"),
+ "fieldtype": "Link",
+ "options": "Company",
+ "default": frappe.defaults.get_user_default("Company"),
+ "reqd": 1
+ },
+ {
+ "fieldname": "fiscal_year",
+ "label": __("Fiscal Year"),
+ "fieldtype": "Link",
+ "options": "Fiscal Year",
+ "default": frappe.defaults.get_user_default("fiscal_year"),
+ "reqd": 1,
+ "on_change": function(query_report) {
+ var fiscal_year = query_report.get_values().fiscal_year;
+ if (!fiscal_year) {
+ return;
+ }
+ frappe.model.with_doc("Fiscal Year", fiscal_year, function(r) {
+ var fy = frappe.model.get_doc("Fiscal Year", fiscal_year);
+ frappe.query_report.set_filter_value({
+ from_date: fy.year_start_date,
+ to_date: fy.year_end_date
+ });
+ });
+ }
+ },
+ {
+ "fieldname": "from_date",
+ "label": __("From Date"),
+ "fieldtype": "Date",
+ "default": frappe.defaults.get_user_default("year_start_date"),
+ },
+ {
+ "fieldname": "to_date",
+ "label": __("To Date"),
+ "fieldtype": "Date",
+ "default": frappe.defaults.get_user_default("year_end_date"),
+ },
+ {
+ "fieldname": "finance_book",
+ "label": __("Finance Book"),
+ "fieldtype": "Link",
+ "options": "Finance Book",
+ },
+ {
+ "fieldname": "dimension",
+ "label": __("Select Dimension"),
+ "fieldtype": "Select",
+ "options": get_accounting_dimension_options(),
+ "reqd": 1,
+ },
+ ],
+ "formatter": erpnext.financial_statements.formatter,
+ "tree": true,
+ "name_field": "account",
+ "parent_field": "parent_account",
+ "initial_depth": 3
+ }
+
+});
+
+function get_accounting_dimension_options() {
+ let options =["", "Cost Center", "Project"];
+ frappe.db.get_list('Accounting Dimension',
+ {fields:['document_type']}).then((res) => {
+ res.forEach((dimension) => {
+ options.push(dimension.document_type);
+ });
+ });
+ return options
+}
diff --git a/erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.json b/erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.json
new file mode 100644
index 0000000..6141944
--- /dev/null
+++ b/erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.json
@@ -0,0 +1,22 @@
+{
+ "add_total_row": 0,
+ "columns": [],
+ "creation": "2021-04-09 16:48:59.548018",
+ "disable_prepared_report": 0,
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "filters": [],
+ "idx": 0,
+ "is_standard": "Yes",
+ "modified": "2021-04-09 16:48:59.548018",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Dimension-wise Accounts Balance Report",
+ "owner": "Administrator",
+ "prepared_report": 0,
+ "ref_doctype": "GL Entry",
+ "report_name": "Dimension-wise Accounts Balance Report",
+ "report_type": "Script Report",
+ "roles": []
+}
\ No newline at end of file
diff --git a/erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py b/erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py
new file mode 100644
index 0000000..de7ed49
--- /dev/null
+++ b/erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py
@@ -0,0 +1,213 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe, erpnext
+from frappe import _
+from frappe.utils import (flt, cstr)
+
+from erpnext.accounts.report.financial_statements import filter_accounts, filter_out_zero_value_rows
+from erpnext.accounts.report.trial_balance.trial_balance import validate_filters
+
+from six import itervalues
+
+def execute(filters=None):
+ validate_filters(filters)
+ dimension_items_list = get_dimension_items_list(filters.dimension, filters.company)
+
+ if not dimension_items_list:
+ return [], []
+
+ dimension_items_list = [''.join(d) for d in dimension_items_list]
+ columns = get_columns(dimension_items_list)
+ data = get_data(filters, dimension_items_list)
+
+ return columns, data
+
+def get_data(filters, dimension_items_list):
+ company_currency = erpnext.get_company_currency(filters.company)
+ acc = frappe.db.sql("""
+ select
+ name, account_number, parent_account, lft, rgt, root_type,
+ report_type, account_name, include_in_gross, account_type, is_group
+ from
+ `tabAccount`
+ where
+ company=%s
+ order by lft""", (filters.company), as_dict=True)
+
+ if not acc:
+ return None
+
+ accounts, accounts_by_name, parent_children_map = filter_accounts(acc)
+
+ min_lft, max_rgt = frappe.db.sql("""select min(lft), max(rgt) from `tabAccount`
+ where company=%s""", (filters.company))[0]
+
+ account = frappe.db.sql_list("""select name from `tabAccount`
+ where lft >= %s and rgt <= %s and company = %s""", (min_lft, max_rgt, filters.company))
+
+ gl_entries_by_account = {}
+ set_gl_entries_by_account(dimension_items_list, filters, account, gl_entries_by_account)
+ format_gl_entries(gl_entries_by_account, accounts_by_name, dimension_items_list)
+ accumulate_values_into_parents(accounts, accounts_by_name, dimension_items_list)
+ out = prepare_data(accounts, filters, parent_children_map, company_currency, dimension_items_list)
+ out = filter_out_zero_value_rows(out, parent_children_map)
+
+ return out
+
+def set_gl_entries_by_account(dimension_items_list, filters, account, gl_entries_by_account):
+ for item in dimension_items_list:
+ condition = get_condition(filters.from_date, item, filters.dimension)
+ if account:
+ condition += " and account in ({})"\
+ .format(", ".join([frappe.db.escape(d) for d in account]))
+
+ gl_filters = {
+ "company": filters.get("company"),
+ "from_date": filters.get("from_date"),
+ "to_date": filters.get("to_date"),
+ "finance_book": cstr(filters.get("finance_book"))
+ }
+
+ gl_filters['item'] = ''.join(item)
+
+ if filters.get("include_default_book_entries"):
+ gl_filters["company_fb"] = frappe.db.get_value("Company",
+ filters.company, 'default_finance_book')
+
+ for key, value in filters.items():
+ if value:
+ gl_filters.update({
+ key: value
+ })
+
+ gl_entries = frappe.db.sql("""
+ select
+ posting_date, account, debit, credit, is_opening, fiscal_year,
+ debit_in_account_currency, credit_in_account_currency, account_currency
+ from
+ `tabGL Entry`
+ where
+ company=%(company)s
+ {condition}
+ and posting_date <= %(to_date)s
+ and is_cancelled = 0
+ order by account, posting_date""".format(
+ condition=condition),
+ gl_filters, as_dict=True) #nosec
+
+ for entry in gl_entries:
+ entry['dimension_item'] = ''.join(item)
+ gl_entries_by_account.setdefault(entry.account, []).append(entry)
+
+def format_gl_entries(gl_entries_by_account, accounts_by_name, dimension_items_list):
+
+ for entries in itervalues(gl_entries_by_account):
+ for entry in entries:
+ d = accounts_by_name.get(entry.account)
+ if not d:
+ frappe.msgprint(
+ _("Could not retrieve information for {0}.").format(entry.account), title="Error",
+ raise_exception=1
+ )
+ for item in dimension_items_list:
+ if item == entry.dimension_item:
+ d[frappe.scrub(item)] = d.get(frappe.scrub(item), 0.0) + flt(entry.debit) - flt(entry.credit)
+
+def prepare_data(accounts, filters, parent_children_map, company_currency, dimension_items_list):
+ data = []
+
+ for d in accounts:
+ has_value = False
+ total = 0
+ row = {
+ "account": d.name,
+ "parent_account": d.parent_account,
+ "indent": d.indent,
+ "from_date": filters.from_date,
+ "to_date": filters.to_date,
+ "currency": company_currency,
+ "account_name": ('{} - {}'.format(d.account_number, d.account_name)
+ if d.account_number else d.account_name)
+ }
+
+ for item in dimension_items_list:
+ row[frappe.scrub(item)] = flt(d.get(frappe.scrub(item), 0.0), 3)
+
+ if abs(row[frappe.scrub(item)]) >= 0.005:
+ # ignore zero values
+ has_value = True
+ total += flt(d.get(frappe.scrub(item), 0.0), 3)
+
+ row["has_value"] = has_value
+ row["total"] = total
+ data.append(row)
+
+ return data
+
+def accumulate_values_into_parents(accounts, accounts_by_name, dimension_items_list):
+ """accumulate children's values in parent accounts"""
+ for d in reversed(accounts):
+ if d.parent_account:
+ for item in dimension_items_list:
+ accounts_by_name[d.parent_account][frappe.scrub(item)] = \
+ accounts_by_name[d.parent_account].get(frappe.scrub(item), 0.0) + d.get(frappe.scrub(item), 0.0)
+
+def get_condition(from_date, item, dimension):
+ conditions = []
+
+ if from_date:
+ conditions.append("posting_date >= %(from_date)s")
+ if dimension:
+ if dimension not in ['Cost Center', 'Project']:
+ if dimension in ['Customer', 'Supplier']:
+ dimension = 'Party'
+ else:
+ dimension = 'Voucher No'
+ txt = "{0} = %(item)s".format(frappe.scrub(dimension))
+ conditions.append(txt)
+
+ return " and {}".format(" and ".join(conditions)) if conditions else ""
+
+def get_dimension_items_list(dimension, company):
+ meta = frappe.get_meta(dimension, cached=False)
+ fieldnames = [d.fieldname for d in meta.get("fields")]
+ filters = {}
+ if 'company' in fieldnames:
+ filters['company'] = company
+ return frappe.get_all(dimension, filters, as_list=True)
+
+def get_columns(dimension_items_list, accumulated_values=1, company=None):
+ columns = [{
+ "fieldname": "account",
+ "label": _("Account"),
+ "fieldtype": "Link",
+ "options": "Account",
+ "width": 300
+ }]
+ if company:
+ columns.append({
+ "fieldname": "currency",
+ "label": _("Currency"),
+ "fieldtype": "Link",
+ "options": "Currency",
+ "hidden": 1
+ })
+ for item in dimension_items_list:
+ columns.append({
+ "fieldname": frappe.scrub(item),
+ "label": item,
+ "fieldtype": "Currency",
+ "options": "currency",
+ "width": 150
+ })
+ columns.append({
+ "fieldname": "total",
+ "label": "Total",
+ "fieldtype": "Currency",
+ "options": "currency",
+ "width": 150
+ })
+
+ return columns
diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
index b530d1a..180ba93 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
@@ -62,6 +62,7 @@
for supplier in self.suppliers:
supplier.email_sent = 0
supplier.quote_status = 'Pending'
+ self.send_to_supplier()
def on_cancel(self):
frappe.db.set(self, 'status', 'Cancelled')
@@ -81,7 +82,7 @@
def send_to_supplier(self):
"""Sends RFQ mail to involved suppliers."""
for rfq_supplier in self.suppliers:
- if rfq_supplier.send_email:
+ if rfq_supplier.email_id is not None and rfq_supplier.send_email:
self.validate_email_id(rfq_supplier)
# make new user if required
diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py
index b14c274..41ca404 100644
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -379,8 +379,7 @@
link = frappe.utils.get_link_to_form('Quality Inspection', d.quality_inspection)
frappe.throw(_("Quality Inspection: {0} is not submitted for the item: {1} in row {2}").format(link, d.item_code, d.idx), QualityInspectionNotSubmittedError)
- qa_failed = any([r.status=="Rejected" for r in qa_doc.readings])
- if qa_failed:
+ if qa_doc.status != 'Accepted':
frappe.throw(_("Row {0}: Quality Inspection rejected for item {1}")
.format(d.idx, d.item_code), QualityInspectionRejectedError)
elif qa_required :
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 2a70f2b..55169df 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -268,10 +268,12 @@
},
"Purchase Invoice": {
"validate": [
- "erpnext.regional.india.utils.update_grand_total_for_rcm",
+ "erpnext.regional.india.utils.validate_reverse_charge_transaction",
+ "erpnext.regional.india.utils.update_itc_availed_fields",
"erpnext.regional.united_arab_emirates.utils.update_grand_total_for_rcm",
- "erpnext.regional.united_arab_emirates.utils.validate_returns"
- ]
+ "erpnext.regional.united_arab_emirates.utils.validate_returns",
+ "erpnext.regional.india.utils.update_taxable_values"
+ ]
},
"Payment Entry": {
"on_submit": ["erpnext.regional.create_transaction_log", "erpnext.accounts.doctype.payment_request.payment_request.update_payment_req_status", "erpnext.accounts.doctype.dunning.dunning.resolve_dunning"],
@@ -423,7 +425,6 @@
'erpnext.controllers.taxes_and_totals.get_regional_round_off_accounts': 'erpnext.regional.india.utils.get_regional_round_off_accounts',
'erpnext.hr.utils.calculate_annual_eligible_hra_exemption': 'erpnext.regional.india.utils.calculate_annual_eligible_hra_exemption',
'erpnext.hr.utils.calculate_hra_exemption_for_period': 'erpnext.regional.india.utils.calculate_hra_exemption_for_period',
- 'erpnext.accounts.doctype.purchase_invoice.purchase_invoice.make_regional_gl_entries': 'erpnext.regional.india.utils.make_regional_gl_entries',
'erpnext.controllers.accounts_controller.validate_einvoice_fields': 'erpnext.regional.india.e_invoice.utils.validate_einvoice_fields',
'erpnext.assets.doctype.asset.asset.get_depreciation_amount': 'erpnext.regional.india.utils.get_depreciation_amount'
},
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 82d223c..9b3ddd0 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -769,6 +769,7 @@
erpnext.patches.v12_0.create_taxable_value_field
erpnext.patches.v12_0.add_gst_category_in_delivery_note
erpnext.patches.v12_0.purchase_receipt_status
+erpnext.patches.v12_0.create_itc_reversal_custom_fields
erpnext.patches.v13_0.fix_non_unique_represents_company
erpnext.patches.v12_0.add_document_type_field_for_italy_einvoicing
erpnext.patches.v13_0.make_non_standard_user_type #13-04-2021
diff --git a/erpnext/patches/v12_0/create_itc_reversal_custom_fields.py b/erpnext/patches/v12_0/create_itc_reversal_custom_fields.py
new file mode 100644
index 0000000..0078a53
--- /dev/null
+++ b/erpnext/patches/v12_0/create_itc_reversal_custom_fields.py
@@ -0,0 +1,115 @@
+from __future__ import unicode_literals
+import frappe
+from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
+from frappe.custom.doctype.property_setter.property_setter import make_property_setter
+from erpnext.regional.india.utils import get_gst_accounts
+
+def execute():
+ company = frappe.get_all('Company', filters = {'country': 'India'}, fields=['name'])
+ if not company:
+ return
+
+ frappe.reload_doc("regional", "doctype", "gst_settings")
+ frappe.reload_doc("accounts", "doctype", "gst_account")
+
+ journal_entry_types = frappe.get_meta("Journal Entry").get_options("voucher_type").split("\n") + ['Reversal Of ITC']
+ make_property_setter('Journal Entry', 'voucher_type', 'options', '\n'.join(journal_entry_types), '')
+
+ custom_fields = {
+ 'Journal Entry': [
+ dict(fieldname='reversal_type', label='Reversal Type',
+ fieldtype='Select', insert_after='voucher_type', print_hide=1,
+ options="As per rules 42 & 43 of CGST Rules\nOthers",
+ depends_on="eval:doc.voucher_type=='Reversal Of ITC'",
+ mandatory_depends_on="eval:doc.voucher_type=='Reversal Of ITC'"),
+ dict(fieldname='company_address', label='Company Address',
+ fieldtype='Link', options='Address', insert_after='reversal_type',
+ print_hide=1, depends_on="eval:doc.voucher_type=='Reversal Of ITC'",
+ mandatory_depends_on="eval:doc.voucher_type=='Reversal Of ITC'"),
+ dict(fieldname='company_gstin', label='Company GSTIN',
+ fieldtype='Data', read_only=1, insert_after='company_address', print_hide=1,
+ fetch_from='company_address.gstin',
+ depends_on="eval:doc.voucher_type=='Reversal Of ITC'",
+ mandatory_depends_on="eval:doc.voucher_type=='Reversal Of ITC'")
+ ],
+ 'Purchase Invoice': [
+ dict(fieldname='eligibility_for_itc', label='Eligibility For ITC',
+ fieldtype='Select', insert_after='reason_for_issuing_document', print_hide=1,
+ options='Input Service Distributor\nImport Of Service\nImport Of Capital Goods\nITC on Reverse Charge\nIneligible As Per Section 17(5)\nIneligible Others\nAll Other ITC',
+ default="All Other ITC")
+ ],
+ 'Purchase Invoice Item': [
+ dict(fieldname='taxable_value', label='Taxable Value',
+ fieldtype='Currency', insert_after='base_net_amount', hidden=1, options="Company:company:default_currency",
+ print_hide=1)
+ ]
+ }
+
+ create_custom_fields(custom_fields, update=True)
+
+ # Patch ITC Availed fields from Data to Currency
+ # Patch Availed ITC for current fiscal_year
+
+ gst_accounts = get_gst_accounts(only_non_reverse_charge=1)
+
+ frappe.db.sql("""
+ UPDATE `tabCustom Field` SET fieldtype='Currency', options='Company:company:default_currency'
+ WHERE dt = 'Purchase Invoice' and fieldname in ('itc_integrated_tax', 'itc_state_tax', 'itc_central_tax',
+ 'itc_cess_amount')
+ """)
+
+ frappe.db.sql("""UPDATE `tabPurchase Invoice` set itc_integrated_tax = '0'
+ WHERE trim(coalesce(itc_integrated_tax, '')) = '' """)
+
+ frappe.db.sql("""UPDATE `tabPurchase Invoice` set itc_state_tax = '0'
+ WHERE trim(coalesce(itc_state_tax, '')) = '' """)
+
+ frappe.db.sql("""UPDATE `tabPurchase Invoice` set itc_central_tax = '0'
+ WHERE trim(coalesce(itc_central_tax, '')) = '' """)
+
+ frappe.db.sql("""UPDATE `tabPurchase Invoice` set itc_cess_amount = '0'
+ WHERE trim(coalesce(itc_cess_amount, '')) = '' """)
+
+ # Get purchase invoices
+ invoices = frappe.get_all('Purchase Invoice',
+ {'posting_date': ('>=', '2021-04-01'), 'eligibility_for_itc': ('!=', 'Ineligible')},
+ ['name'])
+
+ amount_map = {}
+
+ if invoices:
+ invoice_list = set([d.name for d in invoices])
+
+ # Get GST applied
+ amounts = frappe.db.sql("""
+ SELECT parent, account_head, sum(base_tax_amount_after_discount_amount) as amount
+ FROM `tabPurchase Taxes and Charges`
+ where parent in %s
+ GROUP BY parent, account_head
+ """, (invoice_list), as_dict=1)
+
+ for d in amounts:
+ amount_map.setdefault(d.parent,
+ {
+ 'itc_integrated_tax': 0,
+ 'itc_state_tax': 0,
+ 'itc_central_tax': 0,
+ 'itc_cess_amount': 0
+ })
+
+ if d.account_head in gst_accounts.get('igst_account'):
+ amount_map[d.parent]['itc_integrated_tax'] += d.amount
+ if d.account_head in gst_accounts.get('cgst_account'):
+ amount_map[d.parent]['itc_central_tax'] += d.amount
+ if d.account_head in gst_accounts.get('sgst_account'):
+ amount_map[d.parent]['itc_state_tax'] += d.amount
+ if d.account_head in gst_accounts.get('cess_account'):
+ amount_map[d.parent]['itc_cess_amount'] += d.amount
+
+ for invoice, values in amount_map.items():
+ frappe.db.set_value('Purchase Invoice', invoice, {
+ 'itc_integrated_tax': values.get('itc_integrated_tax'),
+ 'itc_central_tax': values.get('itc_central_tax'),
+ 'itc_state_tax': values['itc_state_tax'],
+ 'itc_cess_amount': values['itc_cess_amount'],
+ })
\ No newline at end of file
diff --git a/erpnext/public/js/utils/serial_no_batch_selector.js b/erpnext/public/js/utils/serial_no_batch_selector.js
index 3333d56..b5d3981 100644
--- a/erpnext/public/js/utils/serial_no_batch_selector.js
+++ b/erpnext/public/js/utils/serial_no_batch_selector.js
@@ -74,9 +74,18 @@
fieldname: 'qty',
fieldtype:'Float',
read_only: me.has_batch && !me.has_serial_no,
- label: __(me.has_batch && !me.has_serial_no ? 'Total Qty' : 'Qty'),
+ label: __(me.has_batch && !me.has_serial_no ? 'Selected Qty' : 'Qty'),
default: flt(me.item.stock_qty),
},
+ ...get_pending_qty_fields(me),
+ {
+ fieldname: 'uom',
+ read_only: 1,
+ fieldtype: 'Link',
+ options: 'UOM',
+ label: __('UOM'),
+ default: me.item.uom
+ },
{
fieldname: 'auto_fetch_button',
fieldtype:'Button',
@@ -173,6 +182,7 @@
if (this.has_batch && !this.has_serial_no) {
this.update_total_qty();
+ this.update_pending_qtys();
}
this.dialog.show();
@@ -313,7 +323,21 @@
qty_field.set_input(total_qty);
},
+ update_pending_qtys: function() {
+ const pending_qty_field = this.dialog.fields_dict.pending_qty;
+ const total_selected_qty_field = this.dialog.fields_dict.total_selected_qty;
+ if (!pending_qty_field || !total_selected_qty_field) return;
+
+ const me = this;
+ const required_qty = this.dialog.fields_dict.required_qty.value;
+ const selected_qty = this.dialog.fields_dict.qty.value;
+ const total_selected_qty = selected_qty + calc_total_selected_qty(me);
+ const pending_qty = required_qty - total_selected_qty;
+
+ pending_qty_field.set_input(pending_qty);
+ total_selected_qty_field.set_input(total_selected_qty);
+ },
get_batch_fields: function() {
var me = this;
@@ -415,6 +439,7 @@
}
me.update_total_qty();
+ me.update_pending_qtys();
}
},
],
@@ -511,3 +536,60 @@
];
}
});
+
+function get_pending_qty_fields(me) {
+ if (!check_can_calculate_pending_qty(me)) return [];
+ const { frm: { doc: { fg_completed_qty }}, item: { item_code, stock_qty }} = me;
+ const { qty_consumed_per_unit } = erpnext.stock.bom.items[item_code];
+
+ const total_selected_qty = calc_total_selected_qty(me);
+ const required_qty = flt(fg_completed_qty) * flt(qty_consumed_per_unit);
+ const pending_qty = required_qty - (flt(stock_qty) + total_selected_qty);
+
+ const pending_qty_fields = [
+ { fieldtype: 'Section Break', label: __('Pending Quantity') },
+ {
+ fieldname: 'required_qty',
+ read_only: 1,
+ fieldtype: 'Float',
+ label: __('Required Qty'),
+ default: required_qty
+ },
+ { fieldtype: 'Column Break' },
+ {
+ fieldname: 'total_selected_qty',
+ read_only: 1,
+ fieldtype: 'Float',
+ label: __('Total Selected Qty'),
+ default: total_selected_qty
+ },
+ { fieldtype: 'Column Break' },
+ {
+ fieldname: 'pending_qty',
+ read_only: 1,
+ fieldtype: 'Float',
+ label: __('Pending Qty'),
+ default: pending_qty
+ },
+ ];
+ return pending_qty_fields;
+}
+
+function calc_total_selected_qty(me) {
+ const { frm: { doc: { items }}, item: { name, item_code }} = me;
+ const totalSelectedQty = items
+ .filter( item => ( item.name !== name ) && ( item.item_code === item_code ) )
+ .map( item => flt(item.qty) )
+ .reduce( (i, j) => i + j, 0);
+ return totalSelectedQty;
+}
+
+function check_can_calculate_pending_qty(me) {
+ const { frm: { doc }, item } = me;
+ const docChecks = doc.bom_no
+ && doc.fg_completed_qty
+ && erpnext.stock.bom
+ && erpnext.stock.bom.name === doc.bom_no;
+ const itemChecks = !!item;
+ return docChecks && itemChecks;
+}
diff --git a/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html b/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html
index 369a400..3b6a45a 100644
--- a/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html
+++ b/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html
@@ -172,7 +172,7 @@
</thead>
<tbody>
<tr>
- <td><b>(A) {{__("ITC Available (whether in full op part)")}}</b></td>
+ <td><b>(A) {{__("ITC Available (whether in full or part)")}}</b></td>
<td></td>
<td></td>
<td></td>
diff --git a/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py b/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py
index a5dd5a2..3ddcc58 100644
--- a/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py
+++ b/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py
@@ -3,148 +3,21 @@
# For license information, please see license.txt
from __future__ import unicode_literals
+import os
+import json
import frappe
+from six import iteritems
from frappe import _
from frappe.model.document import Document
-import json
-from six import iteritems
-from frappe.utils import flt, getdate
+from frappe.utils import flt, cstr
from erpnext.regional.india import state_numbers
class GSTR3BReport(Document):
- def before_save(self):
-
+ def validate(self):
self.get_data()
def get_data(self):
-
- self.report_dict = {
- "gstin": "",
- "ret_period": "",
- "inward_sup": {
- "isup_details": [
- {
- "ty": "GST",
- "intra": 0,
- "inter": 0
- },
- {
- "ty": "NONGST",
- "inter": 0,
- "intra": 0
- }
- ]
- },
- "sup_details": {
- "osup_zero": {
- "csamt": 0,
- "txval": 0,
- "iamt": 0
- },
- "osup_nil_exmp": {
- "txval": 0
- },
- "osup_det": {
- "samt": 0,
- "csamt": 0,
- "txval": 0,
- "camt": 0,
- "iamt": 0
- },
- "isup_rev": {
- "samt": 0,
- "csamt": 0,
- "txval": 0,
- "camt": 0,
- "iamt": 0
- },
- "osup_nongst": {
- "txval": 0,
- }
- },
- "inter_sup": {
- "unreg_details": [],
- "comp_details": [],
- "uin_details": []
- },
- "itc_elg": {
- "itc_avl": [
- {
- "csamt": 0,
- "samt": 0,
- "ty": "IMPG",
- "camt": 0,
- "iamt": 0
- },
- {
- "csamt": 0,
- "samt": 0,
- "ty": "IMPS",
- "camt": 0,
- "iamt": 0
- },
- {
- "samt": 0,
- "csamt": 0,
- "ty": "ISRC",
- "camt": 0,
- "iamt": 0
- },
- {
- "ty": "ISD",
- "iamt": 0,
- "camt": 0,
- "samt": 0,
- "csamt": 0
- },
- {
- "samt": 0,
- "csamt": 0,
- "ty": "OTH",
- "camt": 0,
- "iamt": 0
- }
- ],
- "itc_rev": [
- {
- "ty": "RUL",
- "iamt": 0,
- "camt": 0,
- "samt": 0,
- "csamt": 0
- },
- {
- "ty": "OTH",
- "iamt": 0,
- "camt": 0,
- "samt": 0,
- "csamt": 0
- }
- ],
- "itc_net": {
- "samt": 0,
- "csamt": 0,
- "camt": 0,
- "iamt": 0
- },
- "itc_inelg": [
- {
- "ty": "RUL",
- "iamt": 0,
- "camt": 0,
- "samt": 0,
- "csamt": 0
- },
- {
- "ty": "OTH",
- "iamt": 0,
- "camt": 0,
- "samt": 0,
- "csamt": 0
- }
- ]
- }
- }
+ self.report_dict = json.loads(get_json('gstr_3b_report_template'))
self.gst_details = self.get_company_gst_details()
self.report_dict["gstin"] = self.gst_details.get("gstin")
@@ -152,23 +25,19 @@
self.month_no = get_period(self.month)
self.account_heads = self.get_account_heads()
- outward_supply_tax_amounts = self.get_tax_amounts("Sales Invoice")
- inward_supply_tax_amounts = self.get_tax_amounts("Purchase Invoice", reverse_charge="Y")
+ self.get_outward_supply_details("Sales Invoice")
+ self.set_outward_taxable_supplies()
+
+ self.get_outward_supply_details("Purchase Invoice", reverse_charge=True)
+ self.set_supplies_liable_to_reverse_charge()
+
itc_details = self.get_itc_details()
-
- self.prepare_data("Sales Invoice", outward_supply_tax_amounts, "sup_details", "osup_det", ["Registered Regular"])
- self.prepare_data("Sales Invoice", outward_supply_tax_amounts, "sup_details", "osup_zero", ["SEZ", "Deemed Export", "Overseas"])
- self.prepare_data("Purchase Invoice", inward_supply_tax_amounts, "sup_details", "isup_rev", ["Unregistered", "Overseas"], reverse_charge="Y")
- self.report_dict["sup_details"]["osup_nil_exmp"]["txval"] = flt(self.get_nil_rated_supply_value(), 2)
self.set_itc_details(itc_details)
-
- inter_state_supplies = self.get_inter_state_supplies(self.gst_details.get("gst_state_number"))
+ self.get_itc_reversal_entries()
inward_nil_exempt = self.get_inward_nil_exempt(self.gst_details.get("gst_state"))
- self.set_inter_state_supply(inter_state_supplies)
self.set_inward_nil_exempt(inward_nil_exempt)
self.missing_field_invoices = self.get_missing_field_invoices()
-
self.json_output = frappe.as_json(self.report_dict)
def set_inward_nil_exempt(self, inward_nil_exempt):
@@ -178,189 +47,95 @@
self.report_dict["inward_sup"]["isup_details"][1]["intra"] = flt(inward_nil_exempt.get("non_gst").get("intra"), 2)
def set_itc_details(self, itc_details):
-
- itc_type_map = {
+ itc_eligible_type_map = {
'IMPG': 'Import Of Capital Goods',
'IMPS': 'Import Of Service',
+ 'ISRC': 'ITC on Reverse Charge',
'ISD': 'Input Service Distributor',
'OTH': 'All Other ITC'
}
+ itc_ineligible_map = {
+ 'RUL': 'Ineligible As Per Section 17(5)',
+ 'OTH': 'Ineligible Others'
+ }
+
net_itc = self.report_dict["itc_elg"]["itc_net"]
for d in self.report_dict["itc_elg"]["itc_avl"]:
-
- itc_type = itc_type_map.get(d["ty"])
-
- if d["ty"] == 'ISRC':
- reverse_charge = ["Y"]
- itc_type = 'All Other ITC'
- gst_category = ['Unregistered', 'Overseas']
- else:
- gst_category = ['Unregistered', 'Overseas', 'Registered Regular']
- reverse_charge = ["N", "Y"]
-
- for account_head in self.account_heads:
- for category in gst_category:
- for charge_type in reverse_charge:
- for key in [['iamt', 'igst_account'], ['camt', 'cgst_account'], ['samt', 'sgst_account'], ['csamt', 'cess_account']]:
- d[key[0]] += flt(itc_details.get((category, itc_type, charge_type, account_head.get(key[1])), {}).get("amount"), 2)
-
+ itc_type = itc_eligible_type_map.get(d["ty"])
for key in ['iamt', 'camt', 'samt', 'csamt']:
+ d[key] = flt(itc_details.get(itc_type, {}).get(key))
net_itc[key] += flt(d[key], 2)
- for account_head in self.account_heads:
- itc_inelg = self.report_dict["itc_elg"]["itc_inelg"][1]
- for key in [['iamt', 'igst_account'], ['camt', 'cgst_account'], ['samt', 'sgst_account'], ['csamt', 'cess_account']]:
- itc_inelg[key[0]] = flt(itc_details.get(("Ineligible", "N", account_head.get(key[1])), {}).get("amount"), 2)
+ for d in self.report_dict["itc_elg"]["itc_inelg"]:
+ itc_type = itc_ineligible_map.get(d["ty"])
+ for key in ['iamt', 'camt', 'samt', 'csamt']:
+ d[key] = flt(itc_details.get(itc_type, {}).get(key))
- def prepare_data(self, doctype, tax_details, supply_type, supply_category, gst_category_list, reverse_charge="N"):
+ def get_itc_reversal_entries(self):
+ reversal_entries = frappe.db.sql("""
+ SELECT ja.account, j.reversal_type, sum(credit_in_account_currency) as amount
+ FROM `tabJournal Entry` j, `tabJournal Entry Account` ja
+ where j.docstatus = 1
+ and j.is_opening = 'No'
+ and ja.parent = j.name
+ and j.voucher_type = 'Reversal Of ITC'
+ and month(j.posting_date) = %s and year(j.posting_date) = %s
+ and j.company = %s and j.company_gstin = %s
+ GROUP BY ja.account, j.reversal_type""", (self.month_no, self.year, self.company,
+ self.gst_details.get("gstin")), as_dict=1)
- account_map = {
- 'sgst_account': 'samt',
- 'cess_account': 'csamt',
- 'cgst_account': 'camt',
- 'igst_account': 'iamt'
- }
+ net_itc = self.report_dict["itc_elg"]["itc_net"]
- txval = 0
- total_taxable_value = self.get_total_taxable_value(doctype, reverse_charge)
+ for entry in reversal_entries:
+ if entry.reversal_type == 'As per rules 42 & 43 of CGST Rules':
+ index = 0
+ else:
+ index = 1
- for gst_category in gst_category_list:
- txval += total_taxable_value.get(gst_category,0)
- for account_head in self.account_heads:
- for account_type, account_name in iteritems(account_head):
- if account_map.get(account_type) in self.report_dict.get(supply_type).get(supply_category):
- self.report_dict[supply_type][supply_category][account_map.get(account_type)] += \
- flt(tax_details.get((account_name, gst_category), {}).get("amount"), 2)
-
- self.report_dict[supply_type][supply_category]["txval"] += flt(txval, 2)
-
- def set_inter_state_supply(self, inter_state_supply):
- osup_det = self.report_dict["sup_details"]["osup_det"]
-
- for key, value in iteritems(inter_state_supply):
- if key[0] == "Unregistered":
- self.report_dict["inter_sup"]["unreg_details"].append(value)
-
- if key[0] == "Registered Composition":
- self.report_dict["inter_sup"]["comp_details"].append(value)
-
- if key[0] == "UIN Holders":
- self.report_dict["inter_sup"]["uin_details"].append(value)
-
- def get_total_taxable_value(self, doctype, reverse_charge):
-
- return frappe._dict(frappe.db.sql("""
- select gst_category, sum(net_total) as total
- from `tab{doctype}`
- where docstatus = 1 and month(posting_date) = %s
- and year(posting_date) = %s and reverse_charge = %s
- and company = %s and company_gstin = %s
- group by gst_category
- """ #nosec
- .format(doctype = doctype), (self.month_no, self.year, reverse_charge, self.company, self.gst_details.get("gstin"))))
+ for key in ['camt', 'samt', 'iamt', 'csamt']:
+ if entry.account in self.account_heads.get(key):
+ self.report_dict["itc_elg"]["itc_rev"][index][key] += flt(entry.amount)
+ net_itc[key] -= flt(entry.amount)
def get_itc_details(self):
- itc_amount = frappe.db.sql("""
- select s.gst_category, sum(t.base_tax_amount_after_discount_amount) as tax_amount,
- t.account_head, s.eligibility_for_itc, s.reverse_charge
- from `tabPurchase Invoice` s , `tabPurchase Taxes and Charges` t
- where s.docstatus = 1 and t.parent = s.name
- and month(s.posting_date) = %s and year(s.posting_date) = %s and s.company = %s
- and s.company_gstin = %s
- group by t.account_head, s.gst_category, s.eligibility_for_itc
- """,
- (self.month_no, self.year, self.company, self.gst_details.get("gstin")), as_dict=1)
+ itc_amounts = frappe.db.sql("""
+ SELECT eligibility_for_itc, sum(itc_integrated_tax) as itc_integrated_tax,
+ sum(itc_central_tax) as itc_central_tax,
+ sum(itc_state_tax) as itc_state_tax,
+ sum(itc_cess_amount) as itc_cess_amount
+ FROM `tabPurchase Invoice`
+ WHERE docstatus = 1
+ and is_opening = 'No'
+ and month(posting_date) = %s and year(posting_date) = %s and company = %s
+ and company_gstin = %s
+ GROUP BY eligibility_for_itc
+ """, (self.month_no, self.year, self.company, self.gst_details.get("gstin")), as_dict=1)
itc_details = {}
-
- for d in itc_amount:
- itc_details.setdefault((d.gst_category, d.eligibility_for_itc, d.reverse_charge, d.account_head),{
- "amount": d.tax_amount
+ for d in itc_amounts:
+ itc_details.setdefault(d.eligibility_for_itc, {
+ 'iamt': d.itc_integrated_tax,
+ 'camt': d.itc_central_tax,
+ 'samt': d.itc_state_tax,
+ 'csamt': d.itc_cess_amount
})
return itc_details
- def get_nil_rated_supply_value(self):
-
- return frappe.db.sql("""
- select sum(i.base_amount) as total from
- `tabSales Invoice Item` i, `tabSales Invoice` s
- where s.docstatus = 1 and i.parent = s.name and i.is_nil_exempt = 1
- and month(s.posting_date) = %s and year(s.posting_date) = %s
- and s.company = %s and s.company_gstin = %s""",
- (self.month_no, self.year, self.company, self.gst_details.get("gstin")), as_dict=1)[0].total
-
- def get_inter_state_supplies(self, state_number):
- inter_state_supply_tax = frappe.db.sql(""" select t.account_head, t.tax_amount_after_discount_amount as tax_amount,
- s.name, s.net_total, s.place_of_supply, s.gst_category from `tabSales Invoice` s, `tabSales Taxes and Charges` t
- where t.parent = s.name and s.docstatus = 1 and month(s.posting_date) = %s and year(s.posting_date) = %s
- and s.company = %s and s.company_gstin = %s and s.gst_category in ('Unregistered', 'Registered Composition', 'UIN Holders')
- """, (self.month_no, self.year, self.company, self.gst_details.get("gstin")), as_dict=1)
-
- inter_state_supply_tax_mapping = {}
- inter_state_supply_details = {}
-
- for d in inter_state_supply_tax:
- inter_state_supply_tax_mapping.setdefault(d.name, {
- 'place_of_supply': d.place_of_supply,
- 'taxable_value': d.net_total,
- 'gst_category': d.gst_category,
- 'camt': 0.0,
- 'samt': 0.0,
- 'iamt': 0.0,
- 'csamt': 0.0
- })
-
- if d.account_head in [a.cgst_account for a in self.account_heads]:
- inter_state_supply_tax_mapping[d.name]['camt'] += d.tax_amount
-
- if d.account_head in [a.sgst_account for a in self.account_heads]:
- inter_state_supply_tax_mapping[d.name]['samt'] += d.tax_amount
-
- if d.account_head in [a.igst_account for a in self.account_heads]:
- inter_state_supply_tax_mapping[d.name]['iamt'] += d.tax_amount
-
- if d.account_head in [a.cess_account for a in self.account_heads]:
- inter_state_supply_tax_mapping[d.name]['csamt'] += d.tax_amount
-
- for key, value in iteritems(inter_state_supply_tax_mapping):
- if value.get('place_of_supply'):
- osup_det = self.report_dict["sup_details"]["osup_det"]
- osup_det["txval"] = flt(osup_det["txval"] + value['taxable_value'], 2)
- osup_det["iamt"] = flt(osup_det["iamt"] + value['iamt'], 2)
- osup_det["camt"] = flt(osup_det["camt"] + value['camt'], 2)
- osup_det["samt"] = flt(osup_det["samt"] + value['samt'], 2)
- osup_det["csamt"] = flt(osup_det["csamt"] + value['csamt'], 2)
-
- if state_number != value.get('place_of_supply').split("-")[0]:
- inter_state_supply_details.setdefault((value.get('gst_category'), value.get('place_of_supply')), {
- "txval": 0.0,
- "pos": value.get('place_of_supply').split("-")[0],
- "iamt": 0.0
- })
-
- inter_state_supply_details[(value.get('gst_category'), value.get('place_of_supply'))]['txval'] += value['taxable_value']
- inter_state_supply_details[(value.get('gst_category'), value.get('place_of_supply'))]['iamt'] += value['iamt']
-
- return inter_state_supply_details
-
def get_inward_nil_exempt(self, state):
- inward_nil_exempt = frappe.db.sql(""" select p.place_of_supply, sum(i.base_amount) as base_amount,
- i.is_nil_exempt, i.is_non_gst from `tabPurchase Invoice` p , `tabPurchase Invoice Item` i
- where p.docstatus = 1 and p.name = i.parent
+ inward_nil_exempt = frappe.db.sql("""
+ SELECT p.place_of_supply, sum(i.base_amount) as base_amount, i.is_nil_exempt, i.is_non_gst
+ FROM `tabPurchase Invoice` p , `tabPurchase Invoice Item` i
+ WHERE p.docstatus = 1 and p.name = i.parent
+ and p.is_opening = 'No'
and p.gst_category != 'Registered Composition'
- and (i.is_nil_exempt = 1 or i.is_non_gst = 1) and
- month(p.posting_date) = %s and year(p.posting_date) = %s and p.company = %s and p.company_gstin = %s
- group by p.place_of_supply, i.is_nil_exempt, i.is_non_gst""", (self.month_no, self.year, self.company, self.gst_details.get("gstin")), as_dict=1)
-
- inward_nil_exempt += frappe.db.sql("""SELECT sum(base_net_total) as base_amount, gst_category, place_of_supply
- FROM `tabPurchase Invoice`
- WHERE docstatus = 1 and gst_category = 'Registered Composition'
- and month(posting_date) = %s and year(posting_date) = %s
- and company = %s and company_gstin = %s
- group by place_of_supply""", (self.month_no, self.year, self.company, self.gst_details.get("gstin")), as_dict=1)
+ and (i.is_nil_exempt = 1 or i.is_non_gst = 1 or p.gst_category = 'Registered Composition') and
+ month(p.posting_date) = %s and year(p.posting_date) = %s
+ and p.company = %s and p.company_gstin = %s
+ GROUP BY p.place_of_supply, i.is_nil_exempt, i.is_non_gst""",
+ (self.month_no, self.year, self.company, self.gst_details.get("gstin")), as_dict=1)
inward_nil_exempt_details = {
"gst": {
@@ -388,37 +163,193 @@
return inward_nil_exempt_details
- def get_tax_amounts(self, doctype, reverse_charge="N"):
+ def get_outward_supply_details(self, doctype, reverse_charge=None):
+ self.get_outward_tax_invoices(doctype, reverse_charge=reverse_charge)
+ self.get_outward_items(doctype)
+ self.get_outward_tax_details(doctype)
+ def get_outward_tax_invoices(self, doctype, reverse_charge=None):
+ self.invoices = []
+ self.invoice_detail_map = {}
+ condition = ''
+
+ if reverse_charge:
+ condition += "AND reverse_charge = 'Y'"
+
+ invoice_details = frappe.db.sql("""
+ SELECT
+ name, gst_category, export_type, place_of_supply
+ FROM
+ `tab{doctype}`
+ WHERE
+ docstatus = 1
+ AND month(posting_date) = %s
+ AND year(posting_date) = %s
+ AND company = %s
+ AND company_gstin = %s
+ AND is_opening = 'No'
+ {reverse_charge}
+ ORDER BY name
+ """.format(doctype=doctype, reverse_charge=condition), (self.month_no, self.year,
+ self.company, self.gst_details.get("gstin")), as_dict=1)
+
+ for d in invoice_details:
+ self.invoice_detail_map.setdefault(d.name, d)
+ self.invoices.append(d.name)
+
+ def get_outward_items(self, doctype):
+ self.invoice_items = frappe._dict()
+ self.is_nil_exempt = []
+ self.is_non_gst = []
+
+ if self.get('invoices'):
+ item_details = frappe.db.sql("""
+ SELECT
+ item_code, parent, taxable_value, base_net_amount, item_tax_rate,
+ is_nil_exempt, is_non_gst
+ FROM
+ `tab%s Item`
+ WHERE parent in (%s)
+ """ % (doctype, ', '.join(['%s']*len(self.invoices))), tuple(self.invoices), as_dict=1)
+
+ for d in item_details:
+ if d.item_code not in self.invoice_items.get(d.parent, {}):
+ self.invoice_items.setdefault(d.parent, {}).setdefault(d.item_code,
+ sum((i.get('taxable_value', 0) or i.get('base_net_amount', 0)) for i in item_details
+ if i.item_code == d.item_code and i.parent == d.parent))
+
+ if d.is_nil_exempt and d.item_code not in self.is_nil_exempt:
+ self.is_nil_exempt.append(d.item_code)
+
+ if d.is_non_gst and d.item_code not in self.is_non_gst:
+ self.is_non_gst.append(d.item_code)
+
+ def get_outward_tax_details(self, doctype):
if doctype == "Sales Invoice":
tax_template = 'Sales Taxes and Charges'
elif doctype == "Purchase Invoice":
tax_template = 'Purchase Taxes and Charges'
- tax_amounts = frappe.db.sql("""
- select s.gst_category, sum(t.base_tax_amount_after_discount_amount) as tax_amount, t.account_head
- from `tab{doctype}` s , `tab{template}` t
- where s.docstatus = 1 and t.parent = s.name and s.reverse_charge = %s
- and month(s.posting_date) = %s and year(s.posting_date) = %s and s.company = %s
- and s.company_gstin = %s
- group by t.account_head, s.gst_category
- """ #nosec
- .format(doctype=doctype, template=tax_template),
- (reverse_charge, self.month_no, self.year, self.company, self.gst_details.get("gstin")), as_dict=1)
+ self.items_based_on_tax_rate = {}
+ self.invoice_cess = frappe._dict()
+ self.cgst_sgst_invoices = []
- tax_details = {}
+ if self.get('invoices'):
+ tax_details = frappe.db.sql("""
+ SELECT
+ parent, account_head, item_wise_tax_detail, base_tax_amount_after_discount_amount
+ FROM `tab%s`
+ WHERE
+ parenttype = %s and docstatus = 1
+ and parent in (%s)
+ ORDER BY account_head
+ """ % (tax_template, '%s', ', '.join(['%s']*len(self.invoices))),
+ tuple([doctype] + list(self.invoices)))
- for d in tax_amounts:
- tax_details.setdefault(
- (d.account_head,d.gst_category),{
- "amount": d.get("tax_amount"),
- }
- )
+ for parent, account, item_wise_tax_detail, tax_amount in tax_details:
+ if account in self.account_heads.get('csamt'):
+ self.invoice_cess.setdefault(parent, tax_amount)
+ else:
+ if item_wise_tax_detail:
+ try:
+ item_wise_tax_detail = json.loads(item_wise_tax_detail)
+ cgst_or_sgst = False
+ if account in self.account_heads.get('camt') \
+ or account in self.account_heads.get('samt'):
+ cgst_or_sgst = True
- return tax_details
+ for item_code, tax_amounts in item_wise_tax_detail.items():
+ if not (cgst_or_sgst or account in self.account_heads.get('iamt') or
+ (item_code in self.is_non_gst + self.is_nil_exempt)):
+ continue
+
+ tax_rate = tax_amounts[0]
+ if tax_rate:
+ if cgst_or_sgst:
+ tax_rate *= 2
+ if parent not in self.cgst_sgst_invoices:
+ self.cgst_sgst_invoices.append(parent)
+
+ rate_based_dict = self.items_based_on_tax_rate\
+ .setdefault(parent, {}).setdefault(tax_rate, [])
+ if item_code not in rate_based_dict:
+ rate_based_dict.append(item_code)
+ except ValueError:
+ continue
+
+
+ if self.get('invoice_items'):
+ # Build itemised tax for export invoices, nil and exempted where tax table is blank
+ for invoice, items in iteritems(self.invoice_items):
+ if invoice not in self.items_based_on_tax_rate and (self.invoice_detail_map.get(invoice, {}).get('export_type')
+ == "Without Payment of Tax"):
+ self.items_based_on_tax_rate.setdefault(invoice, {}).setdefault(0, items.keys())
+
+ def set_outward_taxable_supplies(self):
+ inter_state_supply_details = {}
+
+ for inv, items_based_on_rate in self.items_based_on_tax_rate.items():
+ for rate, items in items_based_on_rate.items():
+ for item_code, taxable_value in self.invoice_items.get(inv).items():
+ if item_code in items:
+ if item_code in self.is_nil_exempt:
+ self.report_dict['sup_details']['osup_nil_exmp']['txval'] += taxable_value
+ elif item_code in self.is_non_gst:
+ self.report_dict['sup_details']['osup_nongst']['txval'] += taxable_value
+ elif rate == 0:
+ self.report_dict['sup_details']['osup_zero']['txval'] += taxable_value
+ #self.report_dict['sup_details']['osup_zero'][key] += tax_amount
+ else:
+ if inv in self.cgst_sgst_invoices:
+ tax_rate = rate/2
+ self.report_dict['sup_details']['osup_det']['camt'] += (taxable_value * tax_rate /100)
+ self.report_dict['sup_details']['osup_det']['samt'] += (taxable_value * tax_rate /100)
+ self.report_dict['sup_details']['osup_det']['txval'] += taxable_value
+ else:
+ self.report_dict['sup_details']['osup_det']['iamt'] += (taxable_value * rate /100)
+ self.report_dict['sup_details']['osup_det']['txval'] += taxable_value
+
+ gst_category = self.invoice_detail_map.get(inv, {}).get('gst_category')
+ place_of_supply = self.invoice_detail_map.get(inv, {}).get('place_of_supply', '00-Other Territory')
+
+ if gst_category in ['Unregistered', 'Registered Composition', 'UIN Holders'] and \
+ self.gst_details.get("gst_state") != place_of_supply.split("-")[1]:
+ inter_state_supply_details.setdefault((gst_category, place_of_supply), {
+ "txval": 0.0,
+ "pos": place_of_supply.split("-")[0],
+ "iamt": 0.0
+ })
+ inter_state_supply_details[(gst_category, place_of_supply)]['txval'] += taxable_value
+ inter_state_supply_details[(gst_category, place_of_supply)]['iamt'] += (taxable_value * rate /100)
+
+ self.set_inter_state_supply(inter_state_supply_details)
+
+ def set_supplies_liable_to_reverse_charge(self):
+ for inv, items_based_on_rate in self.items_based_on_tax_rate.items():
+ for rate, items in items_based_on_rate.items():
+ for item_code, taxable_value in self.invoice_items.get(inv).items():
+ if item_code in items:
+ if inv in self.cgst_sgst_invoices:
+ tax_rate = rate/2
+ self.report_dict['sup_details']['isup_rev']['camt'] += (taxable_value * tax_rate /100)
+ self.report_dict['sup_details']['isup_rev']['samt'] += (taxable_value * tax_rate /100)
+ self.report_dict['sup_details']['isup_rev']['txval'] += taxable_value
+ else:
+ self.report_dict['sup_details']['isup_rev']['iamt'] += (taxable_value * rate /100)
+ self.report_dict['sup_details']['isup_rev']['txval'] += taxable_value
+
+ def set_inter_state_supply(self, inter_state_supply):
+ for key, value in iteritems(inter_state_supply):
+ if key[0] == "Unregistered":
+ self.report_dict["inter_sup"]["unreg_details"].append(value)
+
+ if key[0] == "Registered Composition":
+ self.report_dict["inter_sup"]["comp_details"].append(value)
+
+ if key[0] == "UIN Holders":
+ self.report_dict["inter_sup"]["uin_details"].append(value)
def get_company_gst_details(self):
-
gst_details = frappe.get_all("Address",
fields=["gstin", "gst_state", "gst_state_number"],
filters={
@@ -431,20 +362,28 @@
frappe.throw(_("Please enter GSTIN and state for the Company Address {0}").format(self.company_address))
def get_account_heads(self):
+ account_map = {
+ 'sgst_account': 'samt',
+ 'cess_account': 'csamt',
+ 'cgst_account': 'camt',
+ 'igst_account': 'iamt'
+ }
- account_heads = frappe.get_all("GST Account",
- fields=["cgst_account", "sgst_account", "igst_account", "cess_account"],
- filters={
- "company":self.company
- })
+ account_heads = {}
+ gst_settings_accounts = frappe.get_all("GST Account",
+ filters={'company': self.company, 'is_reverse_charge_account': 0},
+ fields=["cgst_account", "sgst_account", "igst_account", "cess_account"])
- if account_heads:
- return account_heads
- else:
- frappe.throw(_("Please set account heads in GST Settings for Compnay {0}").format(self.company))
+ if not gst_settings_accounts:
+ frappe.throw(_("Please set GST Accounts in GST Settings"))
+
+ for d in gst_settings_accounts:
+ for acc, val in d.items():
+ account_heads.setdefault(account_map.get(acc), []).append(val)
+
+ return account_heads
def get_missing_field_invoices(self):
-
missing_field_invoices = []
for doctype in ["Sales Invoice", "Purchase Invoice"]:
@@ -456,26 +395,32 @@
party_type = 'Supplier'
party = 'supplier'
- docnames = frappe.db.sql("""
- select t1.name from `tab{doctype}` t1, `tab{party_type}` t2
- where t1.docstatus = 1 and month(t1.posting_date) = %s and year(t1.posting_date) = %s
+ docnames = frappe.db.sql(
+ """
+ SELECT t1.name FROM `tab{doctype}` t1, `tab{party_type}` t2
+ WHERE t1.docstatus = 1 and t1.is_opening = 'No'
+ and month(t1.posting_date) = %s and year(t1.posting_date) = %s
and t1.company = %s and t1.place_of_supply IS NULL and t1.{party} = t2.name and
t2.gst_category != 'Overseas'
- """.format(doctype = doctype, party_type = party_type, party=party), (self.month_no, self.year, self.company), as_dict=1) #nosec
+ """.format(doctype = doctype, party_type = party_type,
+ party=party) ,(self.month_no, self.year, self.company), as_dict=1) #nosec
for d in docnames:
missing_field_invoices.append(d.name)
return ",".join(missing_field_invoices)
-def get_state_code(state):
+def get_json(template):
+ file_path = os.path.join(os.path.dirname(__file__), '{template}.json'.format(template=template))
+ with open(file_path, 'r') as f:
+ return cstr(f.read())
+def get_state_code(state):
state_code = state_numbers.get(state)
return state_code
def get_period(month, year=None):
-
month_no = {
"January": 1,
"February": 2,
@@ -499,13 +444,11 @@
@frappe.whitelist()
def view_report(name):
-
json_data = frappe.get_value("GSTR 3B Report", name, 'json_output')
return json.loads(json_data)
@frappe.whitelist()
def make_json(name):
-
json_data = frappe.get_value("GSTR 3B Report", name, 'json_output')
file_name = "GST3B.json"
frappe.local.response.filename = file_name
diff --git a/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report_template.json b/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report_template.json
new file mode 100644
index 0000000..a68bd6a
--- /dev/null
+++ b/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report_template.json
@@ -0,0 +1,127 @@
+{
+ "gstin": "",
+ "ret_period": "",
+ "inward_sup": {
+ "isup_details": [
+ {
+ "ty": "GST",
+ "intra": 0,
+ "inter": 0
+ },
+ {
+ "ty": "NONGST",
+ "inter": 0,
+ "intra": 0
+ }
+ ]
+ },
+ "sup_details": {
+ "osup_zero": {
+ "csamt": 0,
+ "txval": 0,
+ "iamt": 0
+ },
+ "osup_nil_exmp": {
+ "txval": 0
+ },
+ "osup_det": {
+ "samt": 0,
+ "csamt": 0,
+ "txval": 0,
+ "camt": 0,
+ "iamt": 0
+ },
+ "isup_rev": {
+ "samt": 0,
+ "csamt": 0,
+ "txval": 0,
+ "camt": 0,
+ "iamt": 0
+ },
+ "osup_nongst": {
+ "txval": 0
+ }
+ },
+ "inter_sup": {
+ "unreg_details": [],
+ "comp_details": [],
+ "uin_details": []
+ },
+ "itc_elg": {
+ "itc_avl": [
+ {
+ "csamt": 0,
+ "samt": 0,
+ "ty": "IMPG",
+ "camt": 0,
+ "iamt": 0
+ },
+ {
+ "csamt": 0,
+ "samt": 0,
+ "ty": "IMPS",
+ "camt": 0,
+ "iamt": 0
+ },
+ {
+ "samt": 0,
+ "csamt": 0,
+ "ty": "ISRC",
+ "camt": 0,
+ "iamt": 0
+ },
+ {
+ "ty": "ISD",
+ "iamt": 0,
+ "camt": 0,
+ "samt": 0,
+ "csamt": 0
+ },
+ {
+ "samt": 0,
+ "csamt": 0,
+ "ty": "OTH",
+ "camt": 0,
+ "iamt": 0
+ }
+ ],
+ "itc_rev": [
+ {
+ "ty": "RUL",
+ "iamt": 0,
+ "camt": 0,
+ "samt": 0,
+ "csamt": 0
+ },
+ {
+ "ty": "OTH",
+ "iamt": 0,
+ "camt": 0,
+ "samt": 0,
+ "csamt": 0
+ }
+ ],
+ "itc_net": {
+ "samt": 0,
+ "csamt": 0,
+ "camt": 0,
+ "iamt": 0
+ },
+ "itc_inelg": [
+ {
+ "ty": "RUL",
+ "iamt": 0,
+ "camt": 0,
+ "samt": 0,
+ "csamt": 0
+ },
+ {
+ "ty": "OTH",
+ "iamt": 0,
+ "camt": 0,
+ "samt": 0,
+ "csamt": 0
+ }
+ ]
+ }
+}
\ No newline at end of file
diff --git a/erpnext/regional/doctype/gstr_3b_report/test_gstr_3b_report.py b/erpnext/regional/doctype/gstr_3b_report/test_gstr_3b_report.py
index ef8af24..3857ce1 100644
--- a/erpnext/regional/doctype/gstr_3b_report/test_gstr_3b_report.py
+++ b/erpnext/regional/doctype/gstr_3b_report/test_gstr_3b_report.py
@@ -60,8 +60,7 @@
output = json.loads(report.json_output)
- self.assertEqual(output["sup_details"]["osup_det"]["iamt"], 36),
- self.assertEqual(output["sup_details"]["osup_zero"]["iamt"], 18),
+ self.assertEqual(output["sup_details"]["osup_det"]["iamt"], 54)
self.assertEqual(output["inter_sup"]["unreg_details"][0]["iamt"], 18),
self.assertEqual(output["sup_details"]["osup_nil_exmp"]["txval"], 100),
self.assertEqual(output["inward_sup"]["isup_details"][0]["intra"], 250)
diff --git a/erpnext/regional/india/setup.py b/erpnext/regional/india/setup.py
index b12e152..229e0c0 100644
--- a/erpnext/regional/india/setup.py
+++ b/erpnext/regional/india/setup.py
@@ -114,9 +114,12 @@
def make_property_setters(patch=False):
# GST rules do not allow for an invoice no. bigger than 16 characters
+ journal_entry_types = frappe.get_meta("Journal Entry").get_options("voucher_type").split("\n") + ['Reversal Of ITC']
+
if not patch:
make_property_setter('Sales Invoice', 'naming_series', 'options', 'SINV-.YY.-\nSRET-.YY.-', '')
make_property_setter('Purchase Invoice', 'naming_series', 'options', 'PINV-.YY.-\nPRET-.YY.-', '')
+ make_property_setter('Journal Entry', 'voucher_type', 'options', '\n'.join(journal_entry_types), '')
def make_custom_fields(update=True):
hsn_sac_field = dict(fieldname='gst_hsn_code', label='HSN/SAC',
@@ -198,15 +201,20 @@
purchase_invoice_itc_fields = [
dict(fieldname='eligibility_for_itc', label='Eligibility For ITC',
fieldtype='Select', insert_after='reason_for_issuing_document', print_hide=1,
- options='Input Service Distributor\nImport Of Service\nImport Of Capital Goods\nIneligible\nAll Other ITC', default="All Other ITC"),
+ options='Input Service Distributor\nImport Of Service\nImport Of Capital Goods\nITC on Reverse Charge\nIneligible As Per Section 17(5)\nIneligible Others\nAll Other ITC',
+ default="All Other ITC"),
dict(fieldname='itc_integrated_tax', label='Availed ITC Integrated Tax',
- fieldtype='Data', insert_after='eligibility_for_itc', print_hide=1),
+ fieldtype='Currency', insert_after='eligibility_for_itc',
+ options='Company:company:default_currency', print_hide=1),
dict(fieldname='itc_central_tax', label='Availed ITC Central Tax',
- fieldtype='Data', insert_after='itc_integrated_tax', print_hide=1),
+ fieldtype='Currency', insert_after='itc_integrated_tax',
+ options='Company:company:default_currency', print_hide=1),
dict(fieldname='itc_state_tax', label='Availed ITC State/UT Tax',
- fieldtype='Data', insert_after='itc_central_tax', print_hide=1),
+ fieldtype='Currency', insert_after='itc_central_tax',
+ options='Company:company:default_currency', print_hide=1),
dict(fieldname='itc_cess_amount', label='Availed ITC Cess',
- fieldtype='Data', insert_after='itc_state_tax', print_hide=1),
+ fieldtype='Currency', insert_after='itc_state_tax',
+ options='Company:company:default_currency', print_hide=1),
]
sales_invoice_gst_fields = [
@@ -236,6 +244,23 @@
depends_on="eval:doc.gst_category=='Overseas' "),
]
+ journal_entry_fields = [
+ dict(fieldname='reversal_type', label='Reversal Type',
+ fieldtype='Select', insert_after='voucher_type', print_hide=1,
+ options="As per rules 42 & 43 of CGST Rules\nOthers",
+ depends_on="eval:doc.voucher_type=='Reversal Of ITC'",
+ mandatory_depends_on="eval:doc.voucher_type=='Reversal Of ITC'"),
+ dict(fieldname='company_address', label='Company Address',
+ fieldtype='Link', options='Address', insert_after='reversal_type',
+ print_hide=1, depends_on="eval:doc.voucher_type=='Reversal Of ITC'",
+ mandatory_depends_on="eval:doc.voucher_type=='Reversal Of ITC'"),
+ dict(fieldname='company_gstin', label='Company GSTIN',
+ fieldtype='Data', read_only=1, insert_after='company_address', print_hide=1,
+ fetch_from='company_address.gstin',
+ depends_on="eval:doc.voucher_type=='Reversal Of ITC'",
+ mandatory_depends_on="eval:doc.voucher_type=='Reversal Of ITC'")
+ ]
+
inter_state_gst_field = [
dict(fieldname='is_inter_state', label='Is Inter State',
fieldtype='Check', insert_after='disabled', print_hide=1),
@@ -430,13 +455,13 @@
dict(fieldname='einvoice_section', label='E-Invoice Fields', fieldtype='Section Break', insert_after='gst_vehicle_type',
print_hide=1, hidden=1),
-
+
dict(fieldname='ack_no', label='Ack. No.', fieldtype='Data', read_only=1, hidden=1, insert_after='einvoice_section',
no_copy=1, print_hide=1),
-
+
dict(fieldname='ack_date', label='Ack. Date', fieldtype='Data', read_only=1, hidden=1, insert_after='ack_no', no_copy=1, print_hide=1),
- dict(fieldname='irn_cancel_date', label='Cancel Date', fieldtype='Data', read_only=1, hidden=1, insert_after='ack_date',
+ dict(fieldname='irn_cancel_date', label='Cancel Date', fieldtype='Data', read_only=1, hidden=1, insert_after='ack_date',
no_copy=1, print_hide=1),
dict(fieldname='signed_einvoice', label='Signed E-Invoice', fieldtype='Code', options='JSON', hidden=1, insert_after='irn_cancel_date',
@@ -469,6 +494,7 @@
'Purchase Receipt': purchase_invoice_gst_fields,
'Sales Invoice': sales_invoice_gst_category + invoice_gst_fields + sales_invoice_shipping_fields + sales_invoice_gst_fields + si_ewaybill_fields + si_einvoice_fields,
'Delivery Note': sales_invoice_gst_fields + ewaybill_fields + sales_invoice_shipping_fields + delivery_note_gst_category,
+ 'Journal Entry': journal_entry_fields,
'Sales Order': sales_invoice_gst_fields,
'Tax Category': inter_state_gst_field,
'Item': [
@@ -486,7 +512,7 @@
'Sales Invoice Item': [hsn_sac_field, nil_rated_exempt, is_non_gst, taxable_value],
'Purchase Order Item': [hsn_sac_field, nil_rated_exempt, is_non_gst],
'Purchase Receipt Item': [hsn_sac_field, nil_rated_exempt, is_non_gst],
- 'Purchase Invoice Item': [hsn_sac_field, nil_rated_exempt, is_non_gst],
+ 'Purchase Invoice Item': [hsn_sac_field, nil_rated_exempt, is_non_gst, taxable_value],
'Material Request Item': [hsn_sac_field, nil_rated_exempt, is_non_gst],
'Salary Component': [
dict(fieldname= 'component_type',
diff --git a/erpnext/regional/india/utils.py b/erpnext/regional/india/utils.py
index 052d7bd..ca679e4 100644
--- a/erpnext/regional/india/utils.py
+++ b/erpnext/regional/india/utils.py
@@ -204,8 +204,6 @@
if doctype in ("Sales Invoice", "Delivery Note", "Sales Order"):
master_doctype = "Sales Taxes and Charges Template"
-
- get_tax_template_for_sez(party_details, master_doctype, company, 'Customer')
get_tax_template_based_on_category(master_doctype, company, party_details)
if party_details.get('taxes_and_charges'):
@@ -216,7 +214,6 @@
elif doctype in ("Purchase Invoice", "Purchase Order", "Purchase Receipt"):
master_doctype = "Purchase Taxes and Charges Template"
- get_tax_template_for_sez(party_details, master_doctype, company, 'Supplier')
get_tax_template_based_on_category(master_doctype, company, party_details)
if party_details.get('taxes_and_charges'):
@@ -283,20 +280,6 @@
{'company': company, 'disabled': 0, 'tax_category': tax_category.name}, 'name')
return default_tax
-def get_tax_template_for_sez(party_details, master_doctype, company, party_type):
-
- gst_details = frappe.db.get_value(party_type, {'name': party_details.get(frappe.scrub(party_type))},
- ['gst_category', 'export_type'], as_dict=1)
-
- if gst_details:
- if gst_details.gst_category == 'SEZ' and gst_details.export_type == 'With Payment of Tax':
- default_tax = frappe.db.get_value(master_doctype, {"company": company, "is_inter_state":1, "disabled":0,
- "gst_state": number_state_mapping[party_details.company_gstin[:2]]})
-
- party_details["taxes_and_charges"] = default_tax
- party_details.taxes = get_taxes_and_charges(master_doctype, default_tax)
-
-
def calculate_annual_eligible_hra_exemption(doc):
basic_component, hra_component = frappe.db.get_value('Company', doc.company, ["basic_component", "hra_component"])
if not (basic_component and hra_component):
@@ -697,10 +680,19 @@
return int(state_code)
@frappe.whitelist()
-def get_gst_accounts(company, account_wise=False):
+def get_gst_accounts(company=None, account_wise=False, only_reverse_charge=0, only_non_reverse_charge=0):
+ filters={"parent": "GST Settings"}
+
+ if company:
+ filters.update({'company': company})
+ if only_reverse_charge:
+ filters.update({'is_reverse_charge_account': 1})
+ elif only_non_reverse_charge:
+ filters.update({'is_reverse_charge_account': 0})
+
gst_accounts = frappe._dict()
gst_settings_accounts = frappe.get_all("GST Account",
- filters={"parent": "GST Settings", "company": company},
+ filters=filters,
fields=["cgst_account", "sgst_account", "igst_account", "cess_account"])
if not gst_settings_accounts and not frappe.flags.in_test:
@@ -715,101 +707,63 @@
return gst_accounts
-def update_grand_total_for_rcm(doc, method):
+def validate_reverse_charge_transaction(doc, method):
country = frappe.get_cached_value('Company', doc.company, 'country')
if country != 'India':
return
- gst_tax, base_gst_tax = get_gst_tax_amount(doc)
-
- if not base_gst_tax:
- return
+ base_gst_tax = 0
+ base_reverse_charge_booked = 0
if doc.reverse_charge == 'Y':
- doc.taxes_and_charges_added -= gst_tax
- doc.total_taxes_and_charges -= gst_tax
- doc.base_taxes_and_charges_added -= base_gst_tax
- doc.base_total_taxes_and_charges -= base_gst_tax
+ gst_accounts = get_gst_accounts(doc.company, only_reverse_charge=1)
+ reverse_charge_accounts = gst_accounts.get('cgst_account') + gst_accounts.get('sgst_account') \
+ + gst_accounts.get('igst_account')
- update_totals(gst_tax, base_gst_tax, doc)
-
-def update_totals(gst_tax, base_gst_tax, doc):
- doc.base_grand_total -= base_gst_tax
- doc.grand_total -= gst_tax
-
- if doc.meta.get_field("rounded_total"):
- if doc.is_rounded_total_disabled():
- doc.outstanding_amount = doc.grand_total
- else:
- doc.rounded_total = round_based_on_smallest_currency_fraction(doc.grand_total,
- doc.currency, doc.precision("rounded_total"))
-
- doc.rounding_adjustment += flt(doc.rounded_total - doc.grand_total,
- doc.precision("rounding_adjustment"))
-
- doc.outstanding_amount = doc.rounded_total or doc.grand_total
-
- doc.in_words = money_in_words(doc.grand_total, doc.currency)
- doc.base_in_words = money_in_words(doc.base_grand_total, erpnext.get_company_currency(doc.company))
- doc.set_payment_schedule()
-
-def make_regional_gl_entries(gl_entries, doc):
- country = frappe.get_cached_value('Company', doc.company, 'country')
-
- if country != 'India':
- return gl_entries
-
- gst_tax, base_gst_tax = get_gst_tax_amount(doc)
-
- if not base_gst_tax:
- return gl_entries
-
- if doc.reverse_charge == 'Y':
- gst_accounts = get_gst_accounts(doc.company)
- gst_account_list = gst_accounts.get('cgst_account') + gst_accounts.get('sgst_account') \
+ gst_accounts = get_gst_accounts(doc.company, only_non_reverse_charge=1)
+ non_reverse_charge_accounts = gst_accounts.get('cgst_account') + gst_accounts.get('sgst_account') \
+ gst_accounts.get('igst_account')
for tax in doc.get('taxes'):
- if tax.category not in ("Total", "Valuation and Total"):
- continue
+ if tax.account_head in non_reverse_charge_accounts:
+ if tax.add_deduct_tax == 'Add':
+ base_gst_tax += tax.base_tax_amount_after_discount_amount
+ else:
+ base_gst_tax += tax.base_tax_amount_after_discount_amount
+ elif tax.account_head in reverse_charge_accounts:
+ if tax.add_deduct_tax == 'Add':
+ base_reverse_charge_booked += tax.base_tax_amount_after_discount_amount
+ else:
+ base_reverse_charge_booked += tax.base_tax_amount_after_discount_amount
- dr_or_cr = "credit" if tax.add_deduct_tax == "Add" else "debit"
- if flt(tax.base_tax_amount_after_discount_amount) and tax.account_head in gst_account_list:
- account_currency = get_account_currency(tax.account_head)
+ if base_gst_tax != base_reverse_charge_booked:
+ msg = _("Booked reverse charge is not equal to applied tax amount")
+ msg += "<br>"
+ msg += _("Please refer {gst_document_link} to learn more about how to setup and create reverse charge invoice").format(
+ gst_document_link='<a href="https://docs.erpnext.com/docs/user/manual/en/regional/india/gst-setup">GST Documentation</a>')
- gl_entries.append(doc.get_gl_dict(
- {
- "account": tax.account_head,
- "cost_center": tax.cost_center,
- "posting_date": doc.posting_date,
- "against": doc.supplier,
- dr_or_cr: tax.base_tax_amount_after_discount_amount,
- dr_or_cr + "_in_account_currency": tax.base_tax_amount_after_discount_amount \
- if account_currency==doc.company_currency \
- else tax.tax_amount_after_discount_amount
- }, account_currency, item=tax)
- )
+ frappe.throw(msg)
- return gl_entries
+def update_itc_availed_fields(doc, method):
+ country = frappe.get_cached_value('Company', doc.company, 'country')
-def get_gst_tax_amount(doc):
- gst_accounts = get_gst_accounts(doc.company)
- gst_account_list = gst_accounts.get('cgst_account', []) + gst_accounts.get('sgst_account', []) \
- + gst_accounts.get('igst_account', [])
+ if country != 'India':
+ return
- base_gst_tax = 0
- gst_tax = 0
+ # Initialize values
+ doc.itc_integrated_tax = doc.itc_state_tax = doc.itc_central_tax = doc.itc_cess_amount = 0
+ gst_accounts = get_gst_accounts(doc.company, only_non_reverse_charge=1)
for tax in doc.get('taxes'):
- if tax.category not in ("Total", "Valuation and Total"):
- continue
-
- if flt(tax.base_tax_amount_after_discount_amount) and tax.account_head in gst_account_list:
- base_gst_tax += tax.base_tax_amount_after_discount_amount
- gst_tax += tax.tax_amount_after_discount_amount
-
- return gst_tax, base_gst_tax
+ if tax.account_head in gst_accounts.get('igst_account', []):
+ doc.itc_integrated_tax += flt(tax.base_tax_amount_after_discount_amount)
+ if tax.account_head in gst_accounts.get('sgst_account', []):
+ doc.itc_state_tax += flt(tax.base_tax_amount_after_discount_amount)
+ if tax.account_head in gst_accounts.get('cgst_account', []):
+ doc.itc_central_tax += flt(tax.base_tax_amount_after_discount_amount)
+ if tax.account_head in gst_accounts.get('cess_account', []):
+ doc.itc_cess_amount += flt(tax.base_tax_amount_after_discount_amount)
@frappe.whitelist()
def get_regional_round_off_accounts(company, account_list):
diff --git a/erpnext/regional/report/gstr_1/gstr_1.js b/erpnext/regional/report/gstr_1/gstr_1.js
index 1a7ff2b..444f5db 100644
--- a/erpnext/regional/report/gstr_1/gstr_1.js
+++ b/erpnext/regional/report/gstr_1/gstr_1.js
@@ -46,7 +46,13 @@
"label": __("Type of Business"),
"fieldtype": "Select",
"reqd": 1,
- "options": ["B2B", "B2C Large", "B2C Small", "CDNR", "EXPORT"],
+ "options": [
+ { "value": "B2B", "label": __("B2B Invoices - 4A, 4B, 4C, 6B, 6C") },
+ { "value": "B2C Large", "label": __("B2C(Large) Invoices - 5A, 5B") },
+ { "value": "B2C Small", "label": __("B2C(Small) Invoices - 7") },
+ { "value": "CDNR-REG", "label": __("Credit/Debit Notes (Registered) - 9B") },
+ { "value": "EXPORT", "label": __("Export Invoice - 6A") }
+ ],
"default": "B2B"
}
],
diff --git a/erpnext/regional/report/gstr_1/gstr_1.py b/erpnext/regional/report/gstr_1/gstr_1.py
index 808fd3a..1e28a40 100644
--- a/erpnext/regional/report/gstr_1/gstr_1.py
+++ b/erpnext/regional/report/gstr_1/gstr_1.py
@@ -32,6 +32,7 @@
reverse_charge,
return_against,
is_return,
+ is_debit_note,
gst_category,
export_type,
port_code,
@@ -42,7 +43,7 @@
def run(self):
self.get_columns()
- self.gst_accounts = get_gst_accounts(self.filters.company)
+ self.gst_accounts = get_gst_accounts(self.filters.company, only_non_reverse_charge=1)
self.get_invoice_data()
if self.invoices:
@@ -62,9 +63,9 @@
for rate, items in items_based_on_rate.items():
row, taxable_value = self.get_row_data_for_invoice(inv, invoice_details, rate, items)
- if self.filters.get("type_of_business") == "CDNR":
+ if self.filters.get("type_of_business") == "CDNR-REG":
row.append("Y" if invoice_details.posting_date <= date(2017, 7, 1) else "N")
- row.append("C" if invoice_details.return_against else "R")
+ row.append("C" if invoice_details.is_return else "D")
if taxable_value:
self.data.append(row)
@@ -105,7 +106,7 @@
def get_row_data_for_invoice(self, invoice, invoice_details, tax_rate, items):
row = []
for fieldname in self.invoice_fields:
- if self.filters.get("type_of_business") == "CDNR" and fieldname == "invoice_value":
+ if self.filters.get("type_of_business") == "CDNR-REG" and fieldname == "invoice_value":
row.append(abs(invoice_details.base_rounded_total) or abs(invoice_details.base_grand_total))
elif fieldname == "invoice_value":
row.append(invoice_details.base_rounded_total or invoice_details.base_grand_total)
@@ -171,7 +172,7 @@
if self.filters.get("type_of_business") == "B2B":
- conditions += "and ifnull(gst_category, '') in ('Registered Regular', 'Deemed Export', 'SEZ') and is_return != 1"
+ conditions += "AND IFNULL(gst_category, '') in ('Registered Regular', 'Deemed Export', 'SEZ') AND is_return != 1"
if self.filters.get("type_of_business") in ("B2C Large", "B2C Small"):
b2c_limit = frappe.db.get_single_value('GST Settings', 'b2c_limit')
@@ -179,19 +180,19 @@
frappe.throw(_("Please set B2C Limit in GST Settings."))
if self.filters.get("type_of_business") == "B2C Large":
- conditions += """ and ifnull(SUBSTR(place_of_supply, 1, 2),'') != ifnull(SUBSTR(company_gstin, 1, 2),'')
- and grand_total > {0} and is_return != 1 and gst_category ='Unregistered' """.format(flt(b2c_limit))
+ conditions += """ AND ifnull(SUBSTR(place_of_supply, 1, 2),'') != ifnull(SUBSTR(company_gstin, 1, 2),'')
+ AND grand_total > {0} AND is_return != 1 and gst_category ='Unregistered' """.format(flt(b2c_limit))
elif self.filters.get("type_of_business") == "B2C Small":
- conditions += """ and (
+ conditions += """ AND (
SUBSTR(place_of_supply, 1, 2) = SUBSTR(company_gstin, 1, 2)
- or grand_total <= {0}) and is_return != 1 and gst_category ='Unregistered' """.format(flt(b2c_limit))
+ OR grand_total <= {0}) and is_return != 1 AND gst_category ='Unregistered' """.format(flt(b2c_limit))
- elif self.filters.get("type_of_business") == "CDNR":
- conditions += """ and is_return = 1 """
+ elif self.filters.get("type_of_business") == "CDNR-REG":
+ conditions += """ AND (is_return = 1 OR is_debit_note = 1) AND IFNULL(gst_category, '') in ('Registered Regular', 'Deemed Export', 'SEZ')"""
elif self.filters.get("type_of_business") == "EXPORT":
- conditions += """ and is_return !=1 and gst_category = 'Overseas' """
+ conditions += """ AND is_return !=1 and gst_category = 'Overseas' """
return conditions
def get_invoice_items(self):
@@ -403,7 +404,7 @@
"width": 100
}
]
- elif self.filters.get("type_of_business") == "CDNR":
+ elif self.filters.get("type_of_business") == "CDNR-REG":
self.invoice_columns = [
{
"fieldname": "customer_gstin",
@@ -438,6 +439,17 @@
"width":120
},
{
+ "fieldname": "reverse_charge",
+ "label": "Reverse Charge",
+ "fieldtype": "Data"
+ },
+ {
+ "fieldname": "export_type",
+ "label": "Export Type",
+ "fieldtype": "Data",
+ "hidden": 1
+ },
+ {
"fieldname": "reason_for_issuing_document",
"label": "Reason For Issuing document",
"fieldtype": "Data",
@@ -450,6 +462,11 @@
"width": 120
},
{
+ "fieldname": "gst_category",
+ "label": "GST Category",
+ "fieldtype": "Data"
+ },
+ {
"fieldname": "invoice_value",
"label": "Invoice Value",
"fieldtype": "Currency",
@@ -458,10 +475,10 @@
]
self.other_columns = [
{
- "fieldname": "cess_amount",
- "label": "Cess Amount",
- "fieldtype": "Currency",
- "width": 100
+ "fieldname": "cess_amount",
+ "label": "Cess Amount",
+ "fieldtype": "Currency",
+ "width": 100
},
{
"fieldname": "pre_gst",
@@ -589,6 +606,12 @@
out = get_export_json(res)
gst_json["exp"] = out
+ elif filters["type_of_business"] == 'CDNR-REG':
+ for item in report_data[:-1]:
+ res.setdefault(item["customer_gstin"], {}).setdefault(item["invoice_number"],[]).append(item)
+
+ out = get_cdnr_reg_json(res, gstin)
+ gst_json["cdnr"] = out
return {
'report_name': report_name,
@@ -628,7 +651,6 @@
return out
def get_b2cs_json(data, gstin):
-
company_state_number = gstin[0:2]
out = []
@@ -713,6 +735,54 @@
return out
+def get_cdnr_reg_json(res, gstin):
+ out = []
+
+ for gst_in in res:
+ cdnr_item, inv = {"ctin": gst_in, "nt": []}, []
+ if not gst_in: continue
+
+ for number, invoice in iteritems(res[gst_in]):
+ if not invoice[0]["place_of_supply"]:
+ frappe.throw(_("""{0} not entered in Invoice {1}.
+ Please update and try again""").format(frappe.bold("Place Of Supply"),
+ frappe.bold(invoice[0]['invoice_number'])))
+
+ inv_item = {
+ "nt_num": invoice[0]["invoice_number"],
+ "nt_dt": getdate(invoice[0]["posting_date"]).strftime('%d-%m-%Y'),
+ "val": abs(flt(invoice[0]["invoice_value"])),
+ "ntty": invoice[0]["document_type"],
+ "pos": "%02d" % int(invoice[0]["place_of_supply"].split('-')[0]),
+ "rchrg": invoice[0]["reverse_charge"],
+ "inv_type": get_invoice_type_for_cdnr(invoice[0])
+ }
+
+ inv_item["itms"] = []
+ for item in invoice:
+ inv_item["itms"].append(get_rate_and_tax_details(item, gstin))
+
+ inv.append(inv_item)
+
+ if not inv: continue
+ cdnr_item["nt"] = inv
+ out.append(cdnr_item)
+
+ return out
+
+def get_invoice_type_for_cdnr(row):
+ if row.get('gst_category') == 'SEZ':
+ if row.get('export_type') == 'WPAY':
+ invoice_type = 'SEWP'
+ else:
+ invoice_type = 'SEWOP'
+ elif row.get('gst_category') == 'Deemed Export':
+ row.invoice_type = 'DE'
+ elif row.get('gst_category') == 'Registered Regular':
+ invoice_type = 'R'
+
+ return invoice_type
+
def get_basic_invoice_detail(row):
return {
"inum": row["invoice_number"],
diff --git a/erpnext/stock/dashboard/item_dashboard.js b/erpnext/stock/dashboard/item_dashboard.js
index 933ca8a..db05739 100644
--- a/erpnext/stock/dashboard/item_dashboard.js
+++ b/erpnext/stock/dashboard/item_dashboard.js
@@ -230,6 +230,7 @@
},
],
});
+ var submitted = false;
dialog.show();
dialog.get_field('item_code').set_input(item);
@@ -253,6 +254,7 @@
}
dialog.set_primary_action(__('Submit'), function () {
+ if(submitted) return;
var values = dialog.get_values();
if (!values) {
return;
@@ -265,6 +267,7 @@
frappe.msgprint(__('Source and target warehouse must be different'));
}
+ submitted = true;
frappe.call({
method: 'erpnext.stock.doctype.stock_entry.stock_entry_utils.make_stock_entry',
args: values,
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index 61e60f3..f1292d8 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -243,16 +243,23 @@
def get_gl_entries(self, warehouse_account=None):
from erpnext.accounts.general_ledger import process_gl_map
+ gl_entries = []
+ self.make_item_gl_entries(gl_entries, warehouse_account=warehouse_account)
+ self.make_tax_gl_entries(gl_entries)
+ self.get_asset_gl_entry(gl_entries)
+
+ return process_gl_map(gl_entries)
+
+ def make_item_gl_entries(self, gl_entries, warehouse_account=None):
stock_rbnb = self.get_company_default("stock_received_but_not_billed")
landed_cost_entries = get_item_account_wise_additional_cost(self.name)
expenses_included_in_valuation = self.get_company_default("expenses_included_in_valuation")
auto_accounting_for_non_stock_items = cint(frappe.db.get_value('Company', self.company, 'enable_perpetual_inventory_for_non_stock_items'))
- gl_entries = []
warehouse_with_no_account = []
- negative_expense_to_be_booked = 0.0
stock_items = self.get_stock_items()
+
for d in self.get("items"):
if d.item_code in stock_items and flt(d.valuation_rate) and flt(d.qty):
if warehouse_account.get(d.warehouse):
@@ -263,21 +270,22 @@
if not stock_value_diff:
continue
+ warehouse_account_name = warehouse_account[d.warehouse]["account"]
+ warehouse_account_currency = warehouse_account[d.warehouse]["account_currency"]
+ supplier_warehouse_account = warehouse_account.get(self.supplier_warehouse, {}).get("account")
+ supplier_warehouse_account_currency = warehouse_account.get(self.supplier_warehouse, {}).get("account_currency")
+ remarks = self.get("remarks") or _("Accounting Entry for Stock")
+
# If PR is sub-contracted and fg item rate is zero
- # in that case if account for shource and target warehouse are same,
+ # in that case if account for source and target warehouse are same,
# then GL entries should not be posted
if flt(stock_value_diff) == flt(d.rm_supp_cost) \
and warehouse_account.get(self.supplier_warehouse) \
- and warehouse_account[d.warehouse]["account"] == warehouse_account[self.supplier_warehouse]["account"]:
+ and warehouse_account_name == supplier_warehouse_account:
continue
- gl_entries.append(self.get_gl_dict({
- "account": warehouse_account[d.warehouse]["account"],
- "against": stock_rbnb,
- "cost_center": d.cost_center,
- "remarks": self.get("remarks") or _("Accounting Entry for Stock"),
- "debit": stock_value_diff
- }, warehouse_account[d.warehouse]["account_currency"], item=d))
+ self.add_gl_entry(gl_entries, warehouse_account_name, d.cost_center, stock_value_diff, 0.0, remarks,
+ stock_rbnb, account_currency=warehouse_account_currency, item=d)
# GL Entry for from warehouse or Stock Received but not billed
# Intentionally passed negative debit amount to avoid incorrect GL Entry validation
@@ -287,43 +295,28 @@
credit_amount = flt(d.base_net_amount, d.precision("base_net_amount")) \
if credit_currency == self.company_currency else flt(d.net_amount, d.precision("net_amount"))
if credit_amount:
- gl_entries.append(self.get_gl_dict({
- "account": warehouse_account[d.from_warehouse]['account'] \
- if d.from_warehouse else stock_rbnb,
- "against": warehouse_account[d.warehouse]["account"],
- "cost_center": d.cost_center,
- "remarks": self.get("remarks") or _("Accounting Entry for Stock"),
- "debit": -1 * flt(d.base_net_amount, d.precision("base_net_amount")),
- "debit_in_account_currency": -1 * credit_amount
- }, credit_currency, item=d))
+ account = warehouse_account[d.from_warehouse]['account'] \
+ if d.from_warehouse else stock_rbnb
- negative_expense_to_be_booked += flt(d.item_tax_amount)
+ self.add_gl_entry(gl_entries, account, d.cost_center,
+ -1 * flt(d.base_net_amount, d.precision("base_net_amount")), 0.0, remarks, warehouse_account_name,
+ debit_in_account_currency=-1 * credit_amount, account_currency=credit_currency, item=d)
- # Amount added through landed-cost-voucher
+ # Amount added through landed-cos-voucher
if d.landed_cost_voucher_amount and landed_cost_entries:
for account, amount in iteritems(landed_cost_entries[(d.item_code, d.name)]):
account_currency = get_account_currency(account)
- gl_entries.append(self.get_gl_dict({
- "account": account,
- "account_currency": account_currency,
- "against": warehouse_account[d.warehouse]["account"],
- "cost_center": d.cost_center,
- "remarks": self.get("remarks") or _("Accounting Entry for Stock"),
- "credit": (flt(amount["base_amount"]) if (amount["base_amount"] or
- account_currency!=self.company_currency) else flt(amount["amount"])),
- "credit_in_account_currency": flt(amount["amount"]),
- "project": d.project
- }, item=d))
+ credit_amount = (flt(amount["base_amount"]) if (amount["base_amount"] or
+ account_currency!=self.company_currency) else flt(amount["amount"]))
+
+ self.add_gl_entry(gl_entries, account, d.cost_center, 0.0, credit_amount, remarks,
+ warehouse_account_name, credit_in_account_currency=flt(amount["amount"]),
+ account_currency=account_currency, project=d.project, item=d)
# sub-contracting warehouse
if flt(d.rm_supp_cost) and warehouse_account.get(self.supplier_warehouse):
- gl_entries.append(self.get_gl_dict({
- "account": warehouse_account[self.supplier_warehouse]["account"],
- "against": warehouse_account[d.warehouse]["account"],
- "cost_center": d.cost_center,
- "remarks": self.get("remarks") or _("Accounting Entry for Stock"),
- "credit": flt(d.rm_supp_cost)
- }, warehouse_account[self.supplier_warehouse]["account_currency"], item=d))
+ self.add_gl_entry(gl_entries, supplier_warehouse_account, d.cost_center, 0.0, flt(d.rm_supp_cost),
+ remarks, warehouse_account_name, account_currency=supplier_warehouse_account_currency, item=d)
# divisional loss adjustment
valuation_amount_as_per_doc = flt(d.base_net_amount, d.precision("base_net_amount")) + \
@@ -340,46 +333,32 @@
cost_center = d.cost_center or frappe.get_cached_value("Company", self.company, "cost_center")
- gl_entries.append(self.get_gl_dict({
- "account": loss_account,
- "against": warehouse_account[d.warehouse]["account"],
- "cost_center": cost_center,
- "remarks": self.get("remarks") or _("Accounting Entry for Stock"),
- "debit": divisional_loss,
- "project": d.project
- }, credit_currency, item=d))
+ self.add_gl_entry(gl_entries, loss_account, cost_center, divisional_loss, 0.0, remarks,
+ warehouse_account_name, account_currency=credit_currency, project=d.project, item=d)
elif d.warehouse not in warehouse_with_no_account or \
d.rejected_warehouse not in warehouse_with_no_account:
warehouse_with_no_account.append(d.warehouse)
elif d.item_code not in stock_items and not d.is_fixed_asset and flt(d.qty) and auto_accounting_for_non_stock_items:
-
service_received_but_not_billed_account = self.get_company_default("service_received_but_not_billed")
credit_currency = get_account_currency(service_received_but_not_billed_account)
-
- gl_entries.append(self.get_gl_dict({
- "account": service_received_but_not_billed_account,
- "against": d.expense_account,
- "cost_center": d.cost_center,
- "remarks": self.get("remarks") or _("Accounting Entry for Service"),
- "project": d.project,
- "credit": d.amount,
- "voucher_detail_no": d.name
- }, credit_currency, item=d))
-
debit_currency = get_account_currency(d.expense_account)
+ remarks = self.get("remarks") or _("Accounting Entry for Service")
- gl_entries.append(self.get_gl_dict({
- "account": d.expense_account,
- "against": service_received_but_not_billed_account,
- "cost_center": d.cost_center,
- "remarks": self.get("remarks") or _("Accounting Entry for Service"),
- "project": d.project,
- "debit": d.amount,
- "voucher_detail_no": d.name
- }, debit_currency, item=d))
+ self.add_gl_entry(gl_entries, service_received_but_not_billed_account, d.cost_center, 0.0, d.amount,
+ remarks, d.expense_account, account_currency=credit_currency, project=d.project,
+ voucher_detail_no=d.name, item=d)
- self.get_asset_gl_entry(gl_entries)
+ self.add_gl_entry(gl_entries, d.expense_account, d.cost_center, d.amount, 0.0, remarks, service_received_but_not_billed_account,
+ account_currency = debit_currency, project=d.project, voucher_detail_no=d.name, item=d)
+
+ if warehouse_with_no_account:
+ frappe.msgprint(_("No accounting entries for the following warehouses") + ": \n" +
+ "\n".join(warehouse_with_no_account))
+
+ def make_tax_gl_entries(self, gl_entries):
+ expenses_included_in_valuation = self.get_company_default("expenses_included_in_valuation")
+ negative_expense_to_be_booked = sum([flt(d.item_tax_amount) for d in self.get('items')])
# Cost center-wise amount breakup for other charges included for valuation
valuation_tax = {}
for tax in self.get("taxes"):
@@ -420,23 +399,33 @@
applicable_amount = negative_expense_to_be_booked * (valuation_tax[tax.name] / total_valuation_amount)
amount_including_divisional_loss -= applicable_amount
- gl_entries.append(
- self.get_gl_dict({
- "account": account,
- "cost_center": tax.cost_center,
- "credit": applicable_amount,
- "remarks": self.remarks or _("Accounting Entry for Stock"),
- "against": against_account
- }, item=tax)
- )
+ self.add_gl_entry(gl_entries, account, tax.cost_center, 0.0, applicable_amount, self.remarks or _("Accounting Entry for Stock"),
+ against_account, item=tax)
i += 1
- if warehouse_with_no_account:
- frappe.msgprint(_("No accounting entries for the following warehouses") + ": \n" +
- "\n".join(warehouse_with_no_account))
+ def add_gl_entry(self, gl_entries, account, cost_center, debit, credit, remarks, against_account,
+ debit_in_account_currency=None, credit_in_account_currency=None, account_currency=None,
+ project=None, voucher_detail_no=None, item=None):
+ gl_entry = {
+ "account": account,
+ "cost_center": cost_center,
+ "debit": debit,
+ "credit": credit,
+ "against_account": against_account,
+ "remarks": remarks,
+ }
- return process_gl_map(gl_entries)
+ if voucher_detail_no:
+ gl_entry.update({"voucher_detail_no": voucher_detail_no})
+
+ if debit_in_account_currency:
+ gl_entry.update({"debit_in_account_currency": debit_in_account_currency})
+
+ if credit_in_account_currency:
+ gl_entry.update({"credit_in_account_currency": credit_in_account_currency})
+
+ gl_entries.append(self.get_gl_dict(gl_entry, item=item))
def get_asset_gl_entry(self, gl_entries):
for item in self.get("items"):
@@ -458,30 +447,21 @@
asset_amount = flt(item.net_amount) + flt(item.item_tax_amount/self.conversion_rate)
base_asset_amount = flt(item.base_net_amount + item.item_tax_amount)
+ remarks = self.get("remarks") or _("Accounting Entry for Asset")
cwip_account_currency = get_account_currency(cwip_account)
# debit cwip account
- gl_entries.append(self.get_gl_dict({
- "account": cwip_account,
- "against": arbnb_account,
- "cost_center": item.cost_center,
- "remarks": self.get("remarks") or _("Accounting Entry for Asset"),
- "debit": base_asset_amount,
- "debit_in_account_currency": (base_asset_amount
- if cwip_account_currency == self.company_currency else asset_amount)
- }, item=item))
+ debit_in_account_currency = (base_asset_amount
+ if cwip_account_currency == self.company_currency else asset_amount)
+ self.add_gl_entry(gl_entries, cwip_account, item.cost_center, base_asset_amount, 0.0, remarks,
+ arbnb_account, debit_in_account_currency=debit_in_account_currency, item=item)
asset_rbnb_currency = get_account_currency(arbnb_account)
# credit arbnb account
- gl_entries.append(self.get_gl_dict({
- "account": arbnb_account,
- "against": cwip_account,
- "cost_center": item.cost_center,
- "remarks": self.get("remarks") or _("Accounting Entry for Asset"),
- "credit": base_asset_amount,
- "credit_in_account_currency": (base_asset_amount
- if asset_rbnb_currency == self.company_currency else asset_amount)
- }, item=item))
+ credit_in_account_currency = (base_asset_amount
+ if asset_rbnb_currency == self.company_currency else asset_amount)
+ self.add_gl_entry(gl_entries, arbnb_account, item.cost_center, 0.0, base_asset_amount, remarks,
+ cwip_account, credit_in_account_currency=credit_in_account_currency, item=item)
def add_lcv_gl_entries(self, item, gl_entries):
expenses_included_in_asset_valuation = self.get_company_default("expenses_included_in_asset_valuation")
@@ -492,23 +472,13 @@
# This returns company's default cwip account
asset_account = get_asset_account("capital_work_in_progress_account", company=self.company)
- gl_entries.append(self.get_gl_dict({
- "account": expenses_included_in_asset_valuation,
- "against": asset_account,
- "cost_center": item.cost_center,
- "remarks": self.get("remarks") or _("Accounting Entry for Stock"),
- "credit": flt(item.landed_cost_voucher_amount),
- "project": item.project
- }, item=item))
+ remarks = self.get("remarks") or _("Accounting Entry for Stock")
- gl_entries.append(self.get_gl_dict({
- "account": asset_account,
- "against": expenses_included_in_asset_valuation,
- "cost_center": item.cost_center,
- "remarks": self.get("remarks") or _("Accounting Entry for Stock"),
- "debit": flt(item.landed_cost_voucher_amount),
- "project": item.project
- }, item=item))
+ self.add_gl_entry(gl_entries, expenses_included_in_asset_valuation, item.cost_center, 0.0, flt(item.landed_cost_voucher_amount),
+ remarks, asset_account, project=item.project, item=item)
+
+ self.add_gl_entry(gl_entries, asset_account, item.cost_center, 0.0, flt(item.landed_cost_voucher_amount),
+ remarks, expenses_included_in_asset_valuation, project=item.project, item=item)
def update_assets(self, item, valuation_rate):
assets = frappe.db.get_all('Asset',
diff --git a/erpnext/stock/doctype/quality_inspection/test_quality_inspection.py b/erpnext/stock/doctype/quality_inspection/test_quality_inspection.py
index a7dfc9e..56b046a 100644
--- a/erpnext/stock/doctype/quality_inspection/test_quality_inspection.py
+++ b/erpnext/stock/doctype/quality_inspection/test_quality_inspection.py
@@ -27,10 +27,11 @@
dn.reload()
self.assertRaises(QualityInspectionRejectedError, dn.submit)
- frappe.db.set_value("Quality Inspection Reading", {"parent": qa.name}, "status", "Accepted")
+ frappe.db.set_value("Quality Inspection", qa.name, "status", "Accepted")
dn.reload()
dn.submit()
+ qa.reload()
qa.cancel()
dn.reload()
dn.cancel()
diff --git a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
index 3f83780..27b8729 100644
--- a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
+++ b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
@@ -5,7 +5,7 @@
from __future__ import unicode_literals
import frappe, erpnext
from frappe.model.document import Document
-from frappe.utils import cint, get_link_to_form, add_to_date, today
+from frappe.utils import cint, get_link_to_form, add_to_date, now, today
from erpnext.stock.stock_ledger import repost_future_sle
from erpnext.accounts.utils import update_gl_entries_after, check_if_stock_and_account_balance_synced
from frappe.utils.user import get_users_with_role
@@ -127,9 +127,9 @@
check_if_stock_and_account_balance_synced(today(), d.name)
def get_repost_item_valuation_entries():
- date = add_to_date(today(), hours=-3)
+ date = add_to_date(now(), hours=-3)
return frappe.db.sql(""" SELECT name from `tabRepost Item Valuation`
WHERE status != 'Completed' and creation <= %s and docstatus = 1
ORDER BY timestamp(posting_date, posting_time) asc, creation asc
- """, date, as_dict=1)
\ No newline at end of file
+ """, date, as_dict=1)
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index 772c8df..daa1e51 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -107,6 +107,7 @@
frappe.flags.hide_serial_batch_dialog = true;
}
});
+ attach_bom_items(frm.doc.bom_no);
},
setup_quality_inspection: function(frm) {
@@ -311,6 +312,7 @@
}
frm.trigger("setup_quality_inspection");
+ attach_bom_items(frm.doc.bom_no)
},
stock_entry_type: function(frm){
@@ -919,6 +921,7 @@
method: "get_items",
callback: function(r) {
if(!r.exc) refresh_field("items");
+ if(me.frm.doc.bom_no) attach_bom_items(me.frm.doc.bom_no)
}
});
}
@@ -1064,4 +1067,22 @@
}
+function attach_bom_items(bom_no) {
+ if (check_should_not_attach_bom_items(bom_no)) return
+ frappe.db.get_doc("BOM",bom_no).then(bom => {
+ const {name, items} = bom
+ erpnext.stock.bom = {name, items:{}}
+ items.forEach(item => {
+ erpnext.stock.bom.items[item.item_code] = item;
+ });
+ });
+}
+
+function check_should_not_attach_bom_items(bom_no) {
+ return (
+ bom_no === undefined ||
+ (erpnext.stock.bom && erpnext.stock.bom.name === bom_no)
+ );
+}
+
$.extend(cur_frm.cscript, new erpnext.stock.StockEntry({frm: cur_frm}));