Merge branch 'develop' into refactor/report/bom-stock-report
This commit is contained in:
commit
000c538d65
@ -184,7 +184,9 @@ class JournalEntry(AccountsController):
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
tax_withholding_details = get_party_tax_withholding_details(inv, self.tax_withholding_category)
|
tax_withholding_details, advance_taxes, voucher_wise_amount = get_party_tax_withholding_details(
|
||||||
|
inv, self.tax_withholding_category
|
||||||
|
)
|
||||||
|
|
||||||
if not tax_withholding_details:
|
if not tax_withholding_details:
|
||||||
return
|
return
|
||||||
|
@ -83,6 +83,8 @@
|
|||||||
"section_break_51",
|
"section_break_51",
|
||||||
"taxes_and_charges",
|
"taxes_and_charges",
|
||||||
"taxes",
|
"taxes",
|
||||||
|
"tax_withheld_vouchers_section",
|
||||||
|
"tax_withheld_vouchers",
|
||||||
"sec_tax_breakup",
|
"sec_tax_breakup",
|
||||||
"other_charges_calculation",
|
"other_charges_calculation",
|
||||||
"totals",
|
"totals",
|
||||||
@ -512,7 +514,6 @@
|
|||||||
"fieldname": "ignore_pricing_rule",
|
"fieldname": "ignore_pricing_rule",
|
||||||
"fieldtype": "Check",
|
"fieldtype": "Check",
|
||||||
"label": "Ignore Pricing Rule",
|
"label": "Ignore Pricing Rule",
|
||||||
"no_copy": 1,
|
|
||||||
"permlevel": 1,
|
"permlevel": 1,
|
||||||
"print_hide": 1
|
"print_hide": 1
|
||||||
},
|
},
|
||||||
@ -1426,13 +1427,25 @@
|
|||||||
"hidden": 1,
|
"hidden": 1,
|
||||||
"label": "Is Old Subcontracting Flow",
|
"label": "Is Old Subcontracting Flow",
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "tax_withheld_vouchers_section",
|
||||||
|
"fieldtype": "Section Break",
|
||||||
|
"label": "Tax Withheld Vouchers"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "tax_withheld_vouchers",
|
||||||
|
"fieldtype": "Table",
|
||||||
|
"label": "Tax Withheld Vouchers",
|
||||||
|
"options": "Tax Withheld Vouchers",
|
||||||
|
"read_only": 1
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"icon": "fa fa-file-text",
|
"icon": "fa fa-file-text",
|
||||||
"idx": 204,
|
"idx": 204,
|
||||||
"is_submittable": 1,
|
"is_submittable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2022-06-15 15:40:58.527065",
|
"modified": "2022-09-13 23:39:54.525037",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Accounts",
|
"module": "Accounts",
|
||||||
"name": "Purchase Invoice",
|
"name": "Purchase Invoice",
|
||||||
@ -1492,6 +1505,7 @@
|
|||||||
"show_name_in_global_search": 1,
|
"show_name_in_global_search": 1,
|
||||||
"sort_field": "modified",
|
"sort_field": "modified",
|
||||||
"sort_order": "DESC",
|
"sort_order": "DESC",
|
||||||
|
"states": [],
|
||||||
"timeline_field": "supplier",
|
"timeline_field": "supplier",
|
||||||
"title_field": "title",
|
"title_field": "title",
|
||||||
"track_changes": 1
|
"track_changes": 1
|
||||||
|
@ -1519,7 +1519,7 @@ class PurchaseInvoice(BuyingController):
|
|||||||
if not self.tax_withholding_category:
|
if not self.tax_withholding_category:
|
||||||
return
|
return
|
||||||
|
|
||||||
tax_withholding_details, advance_taxes = get_party_tax_withholding_details(
|
tax_withholding_details, advance_taxes, voucher_wise_amount = get_party_tax_withholding_details(
|
||||||
self, self.tax_withholding_category
|
self, self.tax_withholding_category
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -1548,6 +1548,19 @@ class PurchaseInvoice(BuyingController):
|
|||||||
for d in to_remove:
|
for d in to_remove:
|
||||||
self.remove(d)
|
self.remove(d)
|
||||||
|
|
||||||
|
## Add pending vouchers on which tax was withheld
|
||||||
|
self.set("tax_withheld_vouchers", [])
|
||||||
|
|
||||||
|
for voucher_no, voucher_details in voucher_wise_amount.items():
|
||||||
|
self.append(
|
||||||
|
"tax_withheld_vouchers",
|
||||||
|
{
|
||||||
|
"voucher_name": voucher_no,
|
||||||
|
"voucher_type": voucher_details.get("voucher_type"),
|
||||||
|
"taxable_amount": voucher_details.get("amount"),
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
# calculate totals again after applying TDS
|
# calculate totals again after applying TDS
|
||||||
self.calculate_taxes_and_totals()
|
self.calculate_taxes_and_totals()
|
||||||
|
|
||||||
|
@ -649,7 +649,6 @@
|
|||||||
"hide_days": 1,
|
"hide_days": 1,
|
||||||
"hide_seconds": 1,
|
"hide_seconds": 1,
|
||||||
"label": "Ignore Pricing Rule",
|
"label": "Ignore Pricing Rule",
|
||||||
"no_copy": 1,
|
|
||||||
"print_hide": 1
|
"print_hide": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -2022,7 +2021,7 @@
|
|||||||
"link_fieldname": "consolidated_invoice"
|
"link_fieldname": "consolidated_invoice"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"modified": "2022-07-11 17:43:56.435382",
|
"modified": "2022-09-16 17:44:22.227332",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Accounts",
|
"module": "Accounts",
|
||||||
"name": "Sales Invoice",
|
"name": "Sales Invoice",
|
||||||
|
@ -0,0 +1,49 @@
|
|||||||
|
{
|
||||||
|
"actions": [],
|
||||||
|
"autoname": "autoincrement",
|
||||||
|
"creation": "2022-09-13 16:18:59.404842",
|
||||||
|
"doctype": "DocType",
|
||||||
|
"editable_grid": 1,
|
||||||
|
"engine": "InnoDB",
|
||||||
|
"field_order": [
|
||||||
|
"voucher_type",
|
||||||
|
"voucher_name",
|
||||||
|
"taxable_amount"
|
||||||
|
],
|
||||||
|
"fields": [
|
||||||
|
{
|
||||||
|
"fieldname": "voucher_type",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"in_list_view": 1,
|
||||||
|
"label": "Voucher Type",
|
||||||
|
"options": "DocType"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "voucher_name",
|
||||||
|
"fieldtype": "Dynamic Link",
|
||||||
|
"in_list_view": 1,
|
||||||
|
"label": "Voucher Name",
|
||||||
|
"options": "voucher_type"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "taxable_amount",
|
||||||
|
"fieldtype": "Currency",
|
||||||
|
"in_list_view": 1,
|
||||||
|
"label": "Taxable Amount",
|
||||||
|
"options": "Company:company:default_currency"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"index_web_pages_for_search": 1,
|
||||||
|
"istable": 1,
|
||||||
|
"links": [],
|
||||||
|
"modified": "2022-09-13 23:40:41.479208",
|
||||||
|
"modified_by": "Administrator",
|
||||||
|
"module": "Accounts",
|
||||||
|
"name": "Tax Withheld Vouchers",
|
||||||
|
"naming_rule": "Autoincrement",
|
||||||
|
"owner": "Administrator",
|
||||||
|
"permissions": [],
|
||||||
|
"sort_field": "modified",
|
||||||
|
"sort_order": "DESC",
|
||||||
|
"states": []
|
||||||
|
}
|
@ -0,0 +1,9 @@
|
|||||||
|
# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
|
||||||
|
# For license information, please see license.txt
|
||||||
|
|
||||||
|
# import frappe
|
||||||
|
from frappe.model.document import Document
|
||||||
|
|
||||||
|
|
||||||
|
class TaxWithheldVouchers(Document):
|
||||||
|
pass
|
@ -109,7 +109,7 @@ def get_party_tax_withholding_details(inv, tax_withholding_category=None):
|
|||||||
).format(tax_withholding_category, inv.company, party)
|
).format(tax_withholding_category, inv.company, party)
|
||||||
)
|
)
|
||||||
|
|
||||||
tax_amount, tax_deducted, tax_deducted_on_advances = get_tax_amount(
|
tax_amount, tax_deducted, tax_deducted_on_advances, voucher_wise_amount = get_tax_amount(
|
||||||
party_type, parties, inv, tax_details, posting_date, pan_no
|
party_type, parties, inv, tax_details, posting_date, pan_no
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -119,7 +119,7 @@ def get_party_tax_withholding_details(inv, tax_withholding_category=None):
|
|||||||
tax_row = get_tax_row_for_tcs(inv, tax_details, tax_amount, tax_deducted)
|
tax_row = get_tax_row_for_tcs(inv, tax_details, tax_amount, tax_deducted)
|
||||||
|
|
||||||
if inv.doctype == "Purchase Invoice":
|
if inv.doctype == "Purchase Invoice":
|
||||||
return tax_row, tax_deducted_on_advances
|
return tax_row, tax_deducted_on_advances, voucher_wise_amount
|
||||||
else:
|
else:
|
||||||
return tax_row
|
return tax_row
|
||||||
|
|
||||||
@ -217,7 +217,9 @@ def get_lower_deduction_certificate(tax_details, pan_no):
|
|||||||
|
|
||||||
|
|
||||||
def get_tax_amount(party_type, parties, inv, tax_details, posting_date, pan_no=None):
|
def get_tax_amount(party_type, parties, inv, tax_details, posting_date, pan_no=None):
|
||||||
vouchers = get_invoice_vouchers(parties, tax_details, inv.company, party_type=party_type)
|
vouchers, voucher_wise_amount = get_invoice_vouchers(
|
||||||
|
parties, tax_details, inv.company, party_type=party_type
|
||||||
|
)
|
||||||
advance_vouchers = get_advance_vouchers(
|
advance_vouchers = get_advance_vouchers(
|
||||||
parties,
|
parties,
|
||||||
company=inv.company,
|
company=inv.company,
|
||||||
@ -236,6 +238,7 @@ def get_tax_amount(party_type, parties, inv, tax_details, posting_date, pan_no=N
|
|||||||
tax_deducted = get_deducted_tax(taxable_vouchers, tax_details)
|
tax_deducted = get_deducted_tax(taxable_vouchers, tax_details)
|
||||||
|
|
||||||
tax_amount = 0
|
tax_amount = 0
|
||||||
|
|
||||||
if party_type == "Supplier":
|
if party_type == "Supplier":
|
||||||
ldc = get_lower_deduction_certificate(tax_details, pan_no)
|
ldc = get_lower_deduction_certificate(tax_details, pan_no)
|
||||||
if tax_deducted:
|
if tax_deducted:
|
||||||
@ -261,12 +264,13 @@ def get_tax_amount(party_type, parties, inv, tax_details, posting_date, pan_no=N
|
|||||||
if cint(tax_details.round_off_tax_amount):
|
if cint(tax_details.round_off_tax_amount):
|
||||||
tax_amount = round(tax_amount)
|
tax_amount = round(tax_amount)
|
||||||
|
|
||||||
return tax_amount, tax_deducted, tax_deducted_on_advances
|
return tax_amount, tax_deducted, tax_deducted_on_advances, voucher_wise_amount
|
||||||
|
|
||||||
|
|
||||||
def get_invoice_vouchers(parties, tax_details, company, party_type="Supplier"):
|
def get_invoice_vouchers(parties, tax_details, company, party_type="Supplier"):
|
||||||
dr_or_cr = "credit" if party_type == "Supplier" else "debit"
|
|
||||||
doctype = "Purchase Invoice" if party_type == "Supplier" else "Sales Invoice"
|
doctype = "Purchase Invoice" if party_type == "Supplier" else "Sales Invoice"
|
||||||
|
voucher_wise_amount = {}
|
||||||
|
vouchers = []
|
||||||
|
|
||||||
filters = {
|
filters = {
|
||||||
"company": company,
|
"company": company,
|
||||||
@ -281,29 +285,40 @@ def get_invoice_vouchers(parties, tax_details, company, party_type="Supplier"):
|
|||||||
{"apply_tds": 1, "tax_withholding_category": tax_details.get("tax_withholding_category")}
|
{"apply_tds": 1, "tax_withholding_category": tax_details.get("tax_withholding_category")}
|
||||||
)
|
)
|
||||||
|
|
||||||
invoices = frappe.get_all(doctype, filters=filters, pluck="name") or [""]
|
invoices_details = frappe.get_all(doctype, filters=filters, fields=["name", "base_net_total"])
|
||||||
|
|
||||||
journal_entries = frappe.db.sql(
|
for d in invoices_details:
|
||||||
|
vouchers.append(d.name)
|
||||||
|
voucher_wise_amount.update({d.name: {"amount": d.base_net_total, "voucher_type": doctype}})
|
||||||
|
|
||||||
|
journal_entries_details = frappe.db.sql(
|
||||||
"""
|
"""
|
||||||
SELECT j.name
|
SELECT j.name, ja.credit - ja.debit AS amount
|
||||||
FROM `tabJournal Entry` j, `tabJournal Entry Account` ja
|
FROM `tabJournal Entry` j, `tabJournal Entry Account` ja
|
||||||
WHERE
|
WHERE
|
||||||
j.docstatus = 1
|
j.name = ja.parent
|
||||||
|
AND j.docstatus = 1
|
||||||
AND j.is_opening = 'No'
|
AND j.is_opening = 'No'
|
||||||
AND j.posting_date between %s and %s
|
AND j.posting_date between %s and %s
|
||||||
AND ja.{dr_or_cr} > 0
|
|
||||||
AND ja.party in %s
|
AND ja.party in %s
|
||||||
""".format(
|
AND j.apply_tds = 1
|
||||||
dr_or_cr=dr_or_cr
|
AND j.tax_withholding_category = %s
|
||||||
|
""",
|
||||||
|
(
|
||||||
|
tax_details.from_date,
|
||||||
|
tax_details.to_date,
|
||||||
|
tuple(parties),
|
||||||
|
tax_details.get("tax_withholding_category"),
|
||||||
),
|
),
|
||||||
(tax_details.from_date, tax_details.to_date, tuple(parties)),
|
as_dict=1,
|
||||||
as_list=1,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if journal_entries:
|
if journal_entries_details:
|
||||||
journal_entries = journal_entries[0]
|
for d in journal_entries_details:
|
||||||
|
vouchers.append(d.name)
|
||||||
|
voucher_wise_amount.update({d.name: {"amount": d.amount, "voucher_type": "Journal Entry"}})
|
||||||
|
|
||||||
return invoices + journal_entries
|
return vouchers, voucher_wise_amount
|
||||||
|
|
||||||
|
|
||||||
def get_advance_vouchers(
|
def get_advance_vouchers(
|
||||||
@ -329,9 +344,11 @@ def get_advance_vouchers(
|
|||||||
|
|
||||||
|
|
||||||
def get_taxes_deducted_on_advances_allocated(inv, tax_details):
|
def get_taxes_deducted_on_advances_allocated(inv, tax_details):
|
||||||
advances = [d.reference_name for d in inv.get("advances")]
|
|
||||||
tax_info = []
|
tax_info = []
|
||||||
|
|
||||||
|
if inv.get("advances"):
|
||||||
|
advances = [d.reference_name for d in inv.get("advances")]
|
||||||
|
|
||||||
if advances:
|
if advances:
|
||||||
pe = frappe.qb.DocType("Payment Entry").as_("pe")
|
pe = frappe.qb.DocType("Payment Entry").as_("pe")
|
||||||
at = frappe.qb.DocType("Advance Taxes and Charges").as_("at")
|
at = frappe.qb.DocType("Advance Taxes and Charges").as_("at")
|
||||||
@ -394,11 +411,6 @@ def get_tds_amount(ldc, parties, inv, tax_details, tax_deducted, vouchers):
|
|||||||
supp_credit_amt += supp_jv_credit_amt
|
supp_credit_amt += supp_jv_credit_amt
|
||||||
supp_credit_amt += inv.net_total
|
supp_credit_amt += inv.net_total
|
||||||
|
|
||||||
debit_note_amount = get_debit_note_amount(
|
|
||||||
parties, tax_details.from_date, tax_details.to_date, inv.company
|
|
||||||
)
|
|
||||||
supp_credit_amt -= debit_note_amount
|
|
||||||
|
|
||||||
threshold = tax_details.get("threshold", 0)
|
threshold = tax_details.get("threshold", 0)
|
||||||
cumulative_threshold = tax_details.get("cumulative_threshold", 0)
|
cumulative_threshold = tax_details.get("cumulative_threshold", 0)
|
||||||
|
|
||||||
@ -515,22 +527,6 @@ def get_tds_amount_from_ldc(ldc, parties, pan_no, tax_details, posting_date, net
|
|||||||
return tds_amount
|
return tds_amount
|
||||||
|
|
||||||
|
|
||||||
def get_debit_note_amount(suppliers, from_date, to_date, company=None):
|
|
||||||
|
|
||||||
filters = {
|
|
||||||
"supplier": ["in", suppliers],
|
|
||||||
"is_return": 1,
|
|
||||||
"docstatus": 1,
|
|
||||||
"posting_date": ["between", (from_date, to_date)],
|
|
||||||
}
|
|
||||||
fields = ["abs(sum(net_total)) as net_total"]
|
|
||||||
|
|
||||||
if company:
|
|
||||||
filters["company"] = company
|
|
||||||
|
|
||||||
return frappe.get_all("Purchase Invoice", filters, fields)[0].get("net_total") or 0.0
|
|
||||||
|
|
||||||
|
|
||||||
def get_ltds_amount(current_amount, deducted_amount, certificate_limit, rate, tax_details):
|
def get_ltds_amount(current_amount, deducted_amount, certificate_limit, rate, tax_details):
|
||||||
if current_amount < (certificate_limit - deducted_amount):
|
if current_amount < (certificate_limit - deducted_amount):
|
||||||
return current_amount * rate / 100
|
return current_amount * rate / 100
|
||||||
|
@ -52,7 +52,7 @@ class TestTaxWithholdingCategory(unittest.TestCase):
|
|||||||
invoices.append(pi)
|
invoices.append(pi)
|
||||||
|
|
||||||
# delete invoices to avoid clashing
|
# delete invoices to avoid clashing
|
||||||
for d in invoices:
|
for d in reversed(invoices):
|
||||||
d.cancel()
|
d.cancel()
|
||||||
|
|
||||||
def test_single_threshold_tds(self):
|
def test_single_threshold_tds(self):
|
||||||
@ -88,7 +88,7 @@ class TestTaxWithholdingCategory(unittest.TestCase):
|
|||||||
self.assertEqual(pi.taxes_and_charges_deducted, 1000)
|
self.assertEqual(pi.taxes_and_charges_deducted, 1000)
|
||||||
|
|
||||||
# delete invoices to avoid clashing
|
# delete invoices to avoid clashing
|
||||||
for d in invoices:
|
for d in reversed(invoices):
|
||||||
d.cancel()
|
d.cancel()
|
||||||
|
|
||||||
def test_tax_withholding_category_checks(self):
|
def test_tax_withholding_category_checks(self):
|
||||||
@ -114,7 +114,7 @@ class TestTaxWithholdingCategory(unittest.TestCase):
|
|||||||
# TDS should be applied only on 1000
|
# TDS should be applied only on 1000
|
||||||
self.assertEqual(pi1.taxes[0].tax_amount, 1000)
|
self.assertEqual(pi1.taxes[0].tax_amount, 1000)
|
||||||
|
|
||||||
for d in invoices:
|
for d in reversed(invoices):
|
||||||
d.cancel()
|
d.cancel()
|
||||||
|
|
||||||
def test_cumulative_threshold_tcs(self):
|
def test_cumulative_threshold_tcs(self):
|
||||||
@ -148,8 +148,8 @@ class TestTaxWithholdingCategory(unittest.TestCase):
|
|||||||
self.assertEqual(tcs_charged, 500)
|
self.assertEqual(tcs_charged, 500)
|
||||||
invoices.append(si)
|
invoices.append(si)
|
||||||
|
|
||||||
# delete invoices to avoid clashing
|
# cancel invoices to avoid clashing
|
||||||
for d in invoices:
|
for d in reversed(invoices):
|
||||||
d.cancel()
|
d.cancel()
|
||||||
|
|
||||||
def test_tds_calculation_on_net_total(self):
|
def test_tds_calculation_on_net_total(self):
|
||||||
@ -182,8 +182,8 @@ class TestTaxWithholdingCategory(unittest.TestCase):
|
|||||||
|
|
||||||
self.assertEqual(pi1.taxes[0].tax_amount, 4000)
|
self.assertEqual(pi1.taxes[0].tax_amount, 4000)
|
||||||
|
|
||||||
# delete invoices to avoid clashing
|
# cancel invoices to avoid clashing
|
||||||
for d in invoices:
|
for d in reversed(invoices):
|
||||||
d.cancel()
|
d.cancel()
|
||||||
|
|
||||||
def test_multi_category_single_supplier(self):
|
def test_multi_category_single_supplier(self):
|
||||||
@ -207,8 +207,50 @@ class TestTaxWithholdingCategory(unittest.TestCase):
|
|||||||
|
|
||||||
self.assertEqual(pi1.taxes[0].tax_amount, 250)
|
self.assertEqual(pi1.taxes[0].tax_amount, 250)
|
||||||
|
|
||||||
# delete invoices to avoid clashing
|
# cancel invoices to avoid clashing
|
||||||
for d in invoices:
|
for d in reversed(invoices):
|
||||||
|
d.cancel()
|
||||||
|
|
||||||
|
def test_tax_withholding_category_voucher_display(self):
|
||||||
|
frappe.db.set_value(
|
||||||
|
"Supplier", "Test TDS Supplier6", "tax_withholding_category", "Test Multi Invoice Category"
|
||||||
|
)
|
||||||
|
invoices = []
|
||||||
|
|
||||||
|
pi = create_purchase_invoice(supplier="Test TDS Supplier6", rate=4000, do_not_save=True)
|
||||||
|
pi.apply_tds = 1
|
||||||
|
pi.tax_withholding_category = "Test Multi Invoice Category"
|
||||||
|
pi.save()
|
||||||
|
pi.submit()
|
||||||
|
invoices.append(pi)
|
||||||
|
|
||||||
|
pi1 = create_purchase_invoice(supplier="Test TDS Supplier6", rate=2000, do_not_save=True)
|
||||||
|
pi1.apply_tds = 1
|
||||||
|
pi1.is_return = 1
|
||||||
|
pi1.items[0].qty = -1
|
||||||
|
pi1.tax_withholding_category = "Test Multi Invoice Category"
|
||||||
|
pi1.save()
|
||||||
|
pi1.submit()
|
||||||
|
invoices.append(pi1)
|
||||||
|
|
||||||
|
pi2 = create_purchase_invoice(supplier="Test TDS Supplier6", rate=9000, do_not_save=True)
|
||||||
|
pi2.apply_tds = 1
|
||||||
|
pi2.tax_withholding_category = "Test Multi Invoice Category"
|
||||||
|
pi2.save()
|
||||||
|
pi2.submit()
|
||||||
|
invoices.append(pi2)
|
||||||
|
|
||||||
|
pi2.load_from_db()
|
||||||
|
|
||||||
|
self.assertTrue(pi2.taxes[0].tax_amount, 1100)
|
||||||
|
|
||||||
|
self.assertTrue(pi2.tax_withheld_vouchers[0].voucher_name == pi1.name)
|
||||||
|
self.assertTrue(pi2.tax_withheld_vouchers[0].taxable_amount == pi1.net_total)
|
||||||
|
self.assertTrue(pi2.tax_withheld_vouchers[1].voucher_name == pi.name)
|
||||||
|
self.assertTrue(pi2.tax_withheld_vouchers[1].taxable_amount == pi.net_total)
|
||||||
|
|
||||||
|
# cancel invoices to avoid clashing
|
||||||
|
for d in reversed(invoices):
|
||||||
d.cancel()
|
d.cancel()
|
||||||
|
|
||||||
|
|
||||||
@ -308,6 +350,7 @@ def create_records():
|
|||||||
"Test TDS Supplier3",
|
"Test TDS Supplier3",
|
||||||
"Test TDS Supplier4",
|
"Test TDS Supplier4",
|
||||||
"Test TDS Supplier5",
|
"Test TDS Supplier5",
|
||||||
|
"Test TDS Supplier6",
|
||||||
]:
|
]:
|
||||||
if frappe.db.exists("Supplier", name):
|
if frappe.db.exists("Supplier", name):
|
||||||
continue
|
continue
|
||||||
@ -498,3 +541,22 @@ def create_tax_with_holding_category():
|
|||||||
"accounts": [{"company": "_Test Company", "account": "TDS - _TC"}],
|
"accounts": [{"company": "_Test Company", "account": "TDS - _TC"}],
|
||||||
}
|
}
|
||||||
).insert()
|
).insert()
|
||||||
|
|
||||||
|
if not frappe.db.exists("Tax Withholding Category", "Test Multi Invoice Category"):
|
||||||
|
frappe.get_doc(
|
||||||
|
{
|
||||||
|
"doctype": "Tax Withholding Category",
|
||||||
|
"name": "Test Multi Invoice Category",
|
||||||
|
"category_name": "Test Multi Invoice Category",
|
||||||
|
"rates": [
|
||||||
|
{
|
||||||
|
"from_date": fiscal_year[1],
|
||||||
|
"to_date": fiscal_year[2],
|
||||||
|
"tax_withholding_rate": 10,
|
||||||
|
"single_threshold": 5000,
|
||||||
|
"cumulative_threshold": 10000,
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"accounts": [{"company": "_Test Company", "account": "TDS - _TC"}],
|
||||||
|
}
|
||||||
|
).insert()
|
||||||
|
@ -239,8 +239,10 @@ frappe.ui.form.on('Asset', {
|
|||||||
|
|
||||||
|
|
||||||
item_code: function(frm) {
|
item_code: function(frm) {
|
||||||
if(frm.doc.item_code) {
|
if(frm.doc.item_code && frm.doc.calculate_depreciation) {
|
||||||
frm.trigger('set_finance_book');
|
frm.trigger('set_finance_book');
|
||||||
|
} else {
|
||||||
|
frm.set_value('finance_books', []);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -381,6 +383,11 @@ frappe.ui.form.on('Asset', {
|
|||||||
|
|
||||||
calculate_depreciation: function(frm) {
|
calculate_depreciation: function(frm) {
|
||||||
frm.toggle_reqd("finance_books", frm.doc.calculate_depreciation);
|
frm.toggle_reqd("finance_books", frm.doc.calculate_depreciation);
|
||||||
|
if (frm.doc.item_code && frm.doc.calculate_depreciation ) {
|
||||||
|
frm.trigger("set_finance_book");
|
||||||
|
} else {
|
||||||
|
frm.set_value("finance_books", []);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
gross_purchase_amount: function(frm) {
|
gross_purchase_amount: function(frm) {
|
||||||
|
@ -441,7 +441,6 @@
|
|||||||
"fieldname": "ignore_pricing_rule",
|
"fieldname": "ignore_pricing_rule",
|
||||||
"fieldtype": "Check",
|
"fieldtype": "Check",
|
||||||
"label": "Ignore Pricing Rule",
|
"label": "Ignore Pricing Rule",
|
||||||
"no_copy": 1,
|
|
||||||
"permlevel": 1,
|
"permlevel": 1,
|
||||||
"print_hide": 1
|
"print_hide": 1
|
||||||
},
|
},
|
||||||
@ -1180,7 +1179,7 @@
|
|||||||
"idx": 105,
|
"idx": 105,
|
||||||
"is_submittable": 1,
|
"is_submittable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2022-09-07 11:06:46.035093",
|
"modified": "2022-09-16 17:45:04.954055",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Buying",
|
"module": "Buying",
|
||||||
"name": "Purchase Order",
|
"name": "Purchase Order",
|
||||||
|
@ -402,7 +402,6 @@
|
|||||||
"fieldname": "ignore_pricing_rule",
|
"fieldname": "ignore_pricing_rule",
|
||||||
"fieldtype": "Check",
|
"fieldtype": "Check",
|
||||||
"label": "Ignore Pricing Rule",
|
"label": "Ignore Pricing Rule",
|
||||||
"no_copy": 1,
|
|
||||||
"permlevel": 1,
|
"permlevel": 1,
|
||||||
"print_hide": 1
|
"print_hide": 1
|
||||||
},
|
},
|
||||||
@ -986,7 +985,7 @@
|
|||||||
"idx": 82,
|
"idx": 82,
|
||||||
"is_submittable": 1,
|
"is_submittable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2022-06-11 20:35:32.635804",
|
"modified": "2022-09-16 17:44:43.221804",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Selling",
|
"module": "Selling",
|
||||||
"name": "Quotation",
|
"name": "Quotation",
|
||||||
|
@ -544,7 +544,6 @@
|
|||||||
"hide_days": 1,
|
"hide_days": 1,
|
||||||
"hide_seconds": 1,
|
"hide_seconds": 1,
|
||||||
"label": "Ignore Pricing Rule",
|
"label": "Ignore Pricing Rule",
|
||||||
"no_copy": 1,
|
|
||||||
"permlevel": 1,
|
"permlevel": 1,
|
||||||
"print_hide": 1
|
"print_hide": 1
|
||||||
},
|
},
|
||||||
@ -1549,7 +1548,7 @@
|
|||||||
"idx": 105,
|
"idx": 105,
|
||||||
"is_submittable": 1,
|
"is_submittable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2022-06-10 03:52:22.212953",
|
"modified": "2022-09-16 17:43:57.007441",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Selling",
|
"module": "Selling",
|
||||||
"name": "Sales Order",
|
"name": "Sales Order",
|
||||||
|
@ -490,7 +490,6 @@
|
|||||||
"fieldname": "ignore_pricing_rule",
|
"fieldname": "ignore_pricing_rule",
|
||||||
"fieldtype": "Check",
|
"fieldtype": "Check",
|
||||||
"label": "Ignore Pricing Rule",
|
"label": "Ignore Pricing Rule",
|
||||||
"no_copy": 1,
|
|
||||||
"permlevel": 1,
|
"permlevel": 1,
|
||||||
"print_hide": 1
|
"print_hide": 1
|
||||||
},
|
},
|
||||||
@ -1336,7 +1335,7 @@
|
|||||||
"idx": 146,
|
"idx": 146,
|
||||||
"is_submittable": 1,
|
"is_submittable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2022-06-10 03:52:04.197415",
|
"modified": "2022-09-16 17:46:17.701904",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Stock",
|
"module": "Stock",
|
||||||
"name": "Delivery Note",
|
"name": "Delivery Note",
|
||||||
|
@ -405,7 +405,6 @@
|
|||||||
"fieldname": "ignore_pricing_rule",
|
"fieldname": "ignore_pricing_rule",
|
||||||
"fieldtype": "Check",
|
"fieldtype": "Check",
|
||||||
"label": "Ignore Pricing Rule",
|
"label": "Ignore Pricing Rule",
|
||||||
"no_copy": 1,
|
|
||||||
"permlevel": 1,
|
"permlevel": 1,
|
||||||
"print_hide": 1
|
"print_hide": 1
|
||||||
},
|
},
|
||||||
@ -1158,7 +1157,7 @@
|
|||||||
"idx": 261,
|
"idx": 261,
|
||||||
"is_submittable": 1,
|
"is_submittable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2022-06-15 15:43:40.664382",
|
"modified": "2022-09-16 17:45:58.430132",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Stock",
|
"module": "Stock",
|
||||||
"name": "Purchase Receipt",
|
"name": "Purchase Receipt",
|
||||||
|
@ -8,8 +8,7 @@ from frappe import _
|
|||||||
|
|
||||||
def execute(filters=None):
|
def execute(filters=None):
|
||||||
columns = get_columns()
|
columns = get_columns()
|
||||||
conditions = get_conditions(filters)
|
data = get_data(filters)
|
||||||
data = get_data(conditions, filters)
|
|
||||||
|
|
||||||
if not data:
|
if not data:
|
||||||
return [], [], None, []
|
return [], [], None, []
|
||||||
@ -19,21 +18,16 @@ def execute(filters=None):
|
|||||||
return columns, data, None, chart_data
|
return columns, data, None, chart_data
|
||||||
|
|
||||||
|
|
||||||
def get_conditions(filters):
|
def get_data(filters):
|
||||||
conditions = ""
|
bin = frappe.qb.DocType("Bin")
|
||||||
|
wh = frappe.qb.DocType("Warehouse")
|
||||||
|
item = frappe.qb.DocType("Item")
|
||||||
|
|
||||||
if filters.get("warehouse"):
|
query = (
|
||||||
conditions += "AND warehouse in %(warehouse)s"
|
frappe.qb.from_(bin)
|
||||||
if filters.get("company"):
|
.from_(wh)
|
||||||
conditions += "AND company = %(company)s"
|
.from_(item)
|
||||||
|
.select(
|
||||||
return conditions
|
|
||||||
|
|
||||||
|
|
||||||
def get_data(conditions, filters):
|
|
||||||
data = frappe.db.sql(
|
|
||||||
"""
|
|
||||||
SELECT
|
|
||||||
bin.warehouse,
|
bin.warehouse,
|
||||||
bin.item_code,
|
bin.item_code,
|
||||||
bin.actual_qty,
|
bin.actual_qty,
|
||||||
@ -42,26 +36,21 @@ def get_data(conditions, filters):
|
|||||||
bin.reserved_qty,
|
bin.reserved_qty,
|
||||||
bin.reserved_qty_for_production,
|
bin.reserved_qty_for_production,
|
||||||
bin.projected_qty,
|
bin.projected_qty,
|
||||||
warehouse.company,
|
wh.company,
|
||||||
item.item_name,
|
item.item_name,
|
||||||
item.description
|
item.description,
|
||||||
FROM
|
)
|
||||||
`tabBin` bin,
|
.where((bin.projected_qty < 0) & (wh.name == bin.warehouse) & (bin.item_code == item.name))
|
||||||
`tabWarehouse` warehouse,
|
.orderby(bin.projected_qty)
|
||||||
`tabItem` item
|
|
||||||
WHERE
|
|
||||||
bin.projected_qty<0
|
|
||||||
AND warehouse.name = bin.warehouse
|
|
||||||
AND bin.item_code=item.name
|
|
||||||
{0}
|
|
||||||
ORDER BY bin.projected_qty;""".format(
|
|
||||||
conditions
|
|
||||||
),
|
|
||||||
filters,
|
|
||||||
as_dict=1,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
return data
|
if filters.get("warehouse"):
|
||||||
|
query = query.where(bin.warehouse.isin(filters.get("warehouse")))
|
||||||
|
|
||||||
|
if filters.get("company"):
|
||||||
|
query = query.where(wh.company == filters.get("company"))
|
||||||
|
|
||||||
|
return query.run(as_dict=True)
|
||||||
|
|
||||||
|
|
||||||
def get_chart_data(data):
|
def get_chart_data(data):
|
||||||
|
@ -0,0 +1,51 @@
|
|||||||
|
# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
|
||||||
|
# For license information, please see license.txt
|
||||||
|
|
||||||
|
import frappe
|
||||||
|
from frappe.tests.utils import FrappeTestCase
|
||||||
|
|
||||||
|
from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
|
||||||
|
from erpnext.stock.doctype.item.test_item import make_item
|
||||||
|
from erpnext.stock.report.item_shortage_report.item_shortage_report import (
|
||||||
|
execute as item_shortage_report,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class TestItemShortageReport(FrappeTestCase):
|
||||||
|
def test_item_shortage_report(self):
|
||||||
|
item = make_item().name
|
||||||
|
so = make_sales_order(item_code=item)
|
||||||
|
|
||||||
|
reserved_qty, projected_qty = frappe.db.get_value(
|
||||||
|
"Bin",
|
||||||
|
{
|
||||||
|
"item_code": item,
|
||||||
|
"warehouse": so.items[0].warehouse,
|
||||||
|
},
|
||||||
|
["reserved_qty", "projected_qty"],
|
||||||
|
)
|
||||||
|
self.assertEqual(reserved_qty, so.items[0].qty)
|
||||||
|
self.assertEqual(projected_qty, -(so.items[0].qty))
|
||||||
|
|
||||||
|
filters = {
|
||||||
|
"company": so.company,
|
||||||
|
}
|
||||||
|
report_data = item_shortage_report(filters)[1]
|
||||||
|
item_code_list = [row.get("item_code") for row in report_data]
|
||||||
|
self.assertIn(item, item_code_list)
|
||||||
|
|
||||||
|
filters = {
|
||||||
|
"company": so.company,
|
||||||
|
"warehouse": [so.items[0].warehouse],
|
||||||
|
}
|
||||||
|
report_data = item_shortage_report(filters)[1]
|
||||||
|
item_code_list = [row.get("item_code") for row in report_data]
|
||||||
|
self.assertIn(item, item_code_list)
|
||||||
|
|
||||||
|
filters = {
|
||||||
|
"company": so.company,
|
||||||
|
"warehouse": ["Work In Progress - _TC"],
|
||||||
|
}
|
||||||
|
report_data = item_shortage_report(filters)[1]
|
||||||
|
item_code_list = [row.get("item_code") for row in report_data]
|
||||||
|
self.assertNotIn(item, item_code_list)
|
0
erpnext/www/lms/__init__.py
Normal file
0
erpnext/www/lms/__init__.py
Normal file
Loading…
x
Reference in New Issue
Block a user