Merge branch 'develop' of https://github.com/frappe/erpnext into internal_transfer_precision_fixes
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index 63c6547..52690e1 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -184,7 +184,9 @@
}
)
- 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:
return
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js
index 0f53079..6039bdf 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -1091,7 +1091,7 @@
$.each(tax_fields, function(i, fieldname) { tax[fieldname] = 0.0; });
- frm.doc.paid_amount_after_tax = frm.doc.paid_amount;
+ frm.doc.paid_amount_after_tax = frm.doc.base_paid_amount;
});
},
@@ -1182,7 +1182,7 @@
}
cumulated_tax_fraction += tax.tax_fraction_for_current_item;
- frm.doc.paid_amount_after_tax = flt(frm.doc.paid_amount/(1+cumulated_tax_fraction))
+ frm.doc.paid_amount_after_tax = flt(frm.doc.base_paid_amount/(1+cumulated_tax_fraction))
});
},
@@ -1214,6 +1214,7 @@
frm.doc.total_taxes_and_charges = 0.0;
frm.doc.base_total_taxes_and_charges = 0.0;
+ let company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
let actual_tax_dict = {};
// maintain actual tax rate based on idx
@@ -1234,8 +1235,8 @@
}
}
- tax.tax_amount = current_tax_amount;
- tax.base_tax_amount = tax.tax_amount * frm.doc.source_exchange_rate;
+ // tax accounts are only in company currency
+ tax.base_tax_amount = current_tax_amount;
current_tax_amount *= (tax.add_deduct_tax == "Deduct") ? -1.0 : 1.0;
if(i==0) {
@@ -1244,9 +1245,29 @@
tax.total = flt(frm.doc["taxes"][i-1].total + current_tax_amount, precision("total", tax));
}
- tax.base_total = tax.total * frm.doc.source_exchange_rate;
- frm.doc.total_taxes_and_charges += current_tax_amount;
- frm.doc.base_total_taxes_and_charges += current_tax_amount * frm.doc.source_exchange_rate;
+ // tac accounts are only in company currency
+ tax.base_total = tax.total
+
+ // calculate total taxes and base total taxes
+ if(frm.doc.payment_type == "Pay") {
+ // tax accounts only have company currency
+ if(tax.currency != frm.doc.paid_to_account_currency) {
+ //total_taxes_and_charges has the target currency. so using target conversion rate
+ frm.doc.total_taxes_and_charges += flt(current_tax_amount / frm.doc.target_exchange_rate);
+
+ } else {
+ frm.doc.total_taxes_and_charges += current_tax_amount;
+ }
+ } else if(frm.doc.payment_type == "Receive") {
+ if(tax.currency != frm.doc.paid_from_account_currency) {
+ //total_taxes_and_charges has the target currency. so using source conversion rate
+ frm.doc.total_taxes_and_charges += flt(current_tax_amount / frm.doc.source_exchange_rate);
+ } else {
+ frm.doc.total_taxes_and_charges += current_tax_amount;
+ }
+ }
+
+ frm.doc.base_total_taxes_and_charges += tax.base_tax_amount;
frm.refresh_field('taxes');
frm.refresh_field('total_taxes_and_charges');
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index 4618d08..7f245fd 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -940,6 +940,13 @@
)
if not d.included_in_paid_amount:
+ if get_account_currency(payment_account) != self.company_currency:
+ if self.payment_type == "Receive":
+ exchange_rate = self.target_exchange_rate
+ elif self.payment_type in ["Pay", "Internal Transfer"]:
+ exchange_rate = self.source_exchange_rate
+ base_tax_amount = flt((tax_amount / exchange_rate), self.precision("paid_amount"))
+
gl_entries.append(
self.get_gl_dict(
{
@@ -1033,7 +1040,7 @@
for fieldname in tax_fields:
tax.set(fieldname, 0.0)
- self.paid_amount_after_tax = self.paid_amount
+ self.paid_amount_after_tax = self.base_paid_amount
def determine_exclusive_rate(self):
if not any(cint(tax.included_in_paid_amount) for tax in self.get("taxes")):
@@ -1052,7 +1059,7 @@
cumulated_tax_fraction += tax.tax_fraction_for_current_item
- self.paid_amount_after_tax = flt(self.paid_amount / (1 + cumulated_tax_fraction))
+ self.paid_amount_after_tax = flt(self.base_paid_amount / (1 + cumulated_tax_fraction))
def calculate_taxes(self):
self.total_taxes_and_charges = 0.0
@@ -1075,7 +1082,7 @@
current_tax_amount += actual_tax_dict[tax.idx]
tax.tax_amount = current_tax_amount
- tax.base_tax_amount = tax.tax_amount * self.source_exchange_rate
+ tax.base_tax_amount = current_tax_amount
if tax.add_deduct_tax == "Deduct":
current_tax_amount *= -1.0
@@ -1089,14 +1096,20 @@
self.get("taxes")[i - 1].total + current_tax_amount, self.precision("total", tax)
)
- tax.base_total = tax.total * self.source_exchange_rate
+ tax.base_total = tax.total
if self.payment_type == "Pay":
- self.base_total_taxes_and_charges += flt(current_tax_amount / self.source_exchange_rate)
- self.total_taxes_and_charges += flt(current_tax_amount / self.target_exchange_rate)
- else:
- self.base_total_taxes_and_charges += flt(current_tax_amount / self.target_exchange_rate)
- self.total_taxes_and_charges += flt(current_tax_amount / self.source_exchange_rate)
+ if tax.currency != self.paid_to_account_currency:
+ self.total_taxes_and_charges += flt(current_tax_amount / self.target_exchange_rate)
+ else:
+ self.total_taxes_and_charges += current_tax_amount
+ elif self.payment_type == "Receive":
+ if tax.currency != self.paid_from_account_currency:
+ self.total_taxes_and_charges += flt(current_tax_amount / self.source_exchange_rate)
+ else:
+ self.total_taxes_and_charges += current_tax_amount
+
+ self.base_total_taxes_and_charges += tax.base_tax_amount
if self.get("taxes"):
self.paid_amount_after_tax = self.get("taxes")[-1].base_total
diff --git a/erpnext/accounts/doctype/payment_entry/test_payment_entry.py b/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
index 02627eb..123b5df 100644
--- a/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
@@ -4,6 +4,7 @@
import unittest
import frappe
+from frappe import qb
from frappe.tests.utils import FrappeTestCase
from frappe.utils import flt, nowdate
@@ -722,6 +723,46 @@
flt(payment_entry.total_taxes_and_charges, 2), flt(10 / payment_entry.target_exchange_rate, 2)
)
+ def test_gl_of_multi_currency_payment_with_taxes(self):
+ payment_entry = create_payment_entry(
+ party="_Test Supplier USD", paid_to="_Test Payable USD - _TC", save=True
+ )
+ payment_entry.append(
+ "taxes",
+ {
+ "account_head": "_Test Account Service Tax - _TC",
+ "charge_type": "Actual",
+ "tax_amount": 100,
+ "add_deduct_tax": "Add",
+ "description": "Test",
+ },
+ )
+ payment_entry.target_exchange_rate = 80
+ payment_entry.received_amount = 12.5
+ payment_entry = payment_entry.submit()
+ gle = qb.DocType("GL Entry")
+ gl_entries = (
+ qb.from_(gle)
+ .select(
+ gle.account,
+ gle.debit,
+ gle.credit,
+ gle.debit_in_account_currency,
+ gle.credit_in_account_currency,
+ )
+ .orderby(gle.account)
+ .where(gle.voucher_no == payment_entry.name)
+ .run()
+ )
+
+ expected_gl_entries = (
+ ("_Test Account Service Tax - _TC", 100.0, 0.0, 100.0, 0.0),
+ ("_Test Bank - _TC", 0.0, 1100.0, 0.0, 1100.0),
+ ("_Test Payable USD - _TC", 1000.0, 0.0, 12.5, 0),
+ )
+
+ self.assertEqual(gl_entries, expected_gl_entries)
+
def test_payment_entry_against_onhold_purchase_invoice(self):
pi = make_purchase_invoice()
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
index 601fc87..52efd33 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
@@ -14,6 +14,7 @@
QueryPaymentLedger,
get_outstanding_invoices,
reconcile_against_document,
+ update_reference_in_payment_entry,
)
from erpnext.controllers.accounts_controller import get_advance_payment_entries
@@ -212,6 +213,23 @@
inv.currency = entry.get("currency")
inv.outstanding_amount = flt(entry.get("outstanding_amount"))
+ def get_difference_amount(self, allocated_entry):
+ if allocated_entry.get("reference_type") != "Payment Entry":
+ return
+
+ dr_or_cr = (
+ "credit_in_account_currency"
+ if erpnext.get_party_account_type(self.party_type) == "Receivable"
+ else "debit_in_account_currency"
+ )
+
+ row = self.get_payment_details(allocated_entry, dr_or_cr)
+
+ doc = frappe.get_doc(allocated_entry.reference_type, allocated_entry.reference_name)
+ update_reference_in_payment_entry(row, doc, do_not_save=True)
+
+ return doc.difference_amount
+
@frappe.whitelist()
def allocate_entries(self, args):
self.validate_entries()
@@ -227,12 +245,16 @@
res = self.get_allocated_entry(pay, inv, pay["amount"])
inv["outstanding_amount"] = flt(inv.get("outstanding_amount")) - flt(pay.get("amount"))
pay["amount"] = 0
+
+ res.difference_amount = self.get_difference_amount(res)
+
if pay.get("amount") == 0:
entries.append(res)
break
elif inv.get("outstanding_amount") == 0:
entries.append(res)
continue
+
else:
break
diff --git a/erpnext/accounts/doctype/payment_schedule/payment_schedule.json b/erpnext/accounts/doctype/payment_schedule/payment_schedule.json
index 6ed7a31..dde9980 100644
--- a/erpnext/accounts/doctype/payment_schedule/payment_schedule.json
+++ b/erpnext/accounts/doctype/payment_schedule/payment_schedule.json
@@ -39,6 +39,7 @@
{
"columns": 2,
"fetch_from": "payment_term.description",
+ "fetch_if_empty": 1,
"fieldname": "description",
"fieldtype": "Small Text",
"in_list_view": 1,
@@ -159,7 +160,7 @@
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2021-04-28 05:41:35.084233",
+ "modified": "2022-09-16 13:57:06.382859",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Payment Schedule",
@@ -168,5 +169,6 @@
"quick_entry": 1,
"sort_field": "modified",
"sort_order": "DESC",
+ "states": [],
"track_changes": 1
}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
index 99c5b34..6e7ebd1 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
@@ -176,7 +176,7 @@
},
{
"collapsible": 1,
- "depends_on": "eval:doc.apply_on != 'Transaction'",
+ "depends_on": "eval:doc.apply_on != 'Transaction' && !doc.mixed_conditions",
"fieldname": "section_break_18",
"fieldtype": "Section Break",
"label": "Discount on Other Item"
@@ -297,12 +297,12 @@
{
"fieldname": "min_qty",
"fieldtype": "Float",
- "label": "Min Qty"
+ "label": "Min Qty (As Per Stock UOM)"
},
{
"fieldname": "max_qty",
"fieldtype": "Float",
- "label": "Max Qty"
+ "label": "Max Qty (As Per Stock UOM)"
},
{
"fieldname": "column_break_21",
@@ -481,7 +481,7 @@
"description": "System will notify to increase or decrease quantity or amount ",
"fieldname": "threshold_percentage",
"fieldtype": "Percent",
- "label": "Threshold for Suggestion"
+ "label": "Threshold for Suggestion (In Percentage)"
},
{
"description": "Higher the number, higher the priority",
@@ -583,10 +583,11 @@
"icon": "fa fa-gift",
"idx": 1,
"links": [],
- "modified": "2021-08-06 15:10:04.219321",
+ "modified": "2022-09-16 16:00:38.356266",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Pricing Rule",
+ "naming_rule": "By \"Naming Series\" field",
"owner": "Administrator",
"permissions": [
{
@@ -642,5 +643,6 @@
"show_name_in_global_search": 1,
"sort_field": "modified",
"sort_order": "DESC",
+ "states": [],
"title_field": "title"
-}
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
index 98e0a9b..9af3188 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -324,7 +324,7 @@
if isinstance(pricing_rule, str):
pricing_rule = frappe.get_cached_doc("Pricing Rule", pricing_rule)
- pricing_rule.apply_rule_on_other_items = get_pricing_rule_items(pricing_rule)
+ pricing_rule.apply_rule_on_other_items = get_pricing_rule_items(pricing_rule) or []
if pricing_rule.get("suggestion"):
continue
@@ -337,7 +337,6 @@
if pricing_rule.mixed_conditions or pricing_rule.apply_rule_on_other:
item_details.update(
{
- "apply_rule_on_other_items": json.dumps(pricing_rule.apply_rule_on_other_items),
"price_or_product_discount": pricing_rule.price_or_product_discount,
"apply_rule_on": (
frappe.scrub(pricing_rule.apply_rule_on_other)
@@ -347,6 +346,9 @@
}
)
+ if pricing_rule.apply_rule_on_other_items:
+ item_details["apply_rule_on_other_items"] = json.dumps(pricing_rule.apply_rule_on_other_items)
+
if pricing_rule.coupon_code_based == 1 and args.coupon_code == None:
return item_details
@@ -492,7 +494,7 @@
)
if pricing_rule.get("mixed_conditions") or pricing_rule.get("apply_rule_on_other"):
- items = get_pricing_rule_items(pricing_rule)
+ items = get_pricing_rule_items(pricing_rule, other_items=True)
item_details.apply_on = (
frappe.scrub(pricing_rule.apply_rule_on_other)
if pricing_rule.apply_rule_on_other
diff --git a/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
index 3bd0cd2..0a9db6b 100644
--- a/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
@@ -766,6 +766,68 @@
frappe.delete_doc_if_exists("Pricing Rule", "_Test Pricing Rule with Min Qty - 1")
frappe.delete_doc_if_exists("Pricing Rule", "_Test Pricing Rule with Min Qty - 2")
+ def test_pricing_rule_for_other_items_cond_with_amount(self):
+ item = make_item("Water Flask New")
+ other_item = make_item("Other Water Flask New")
+ make_item_price(item.name, "_Test Price List", 100)
+ make_item_price(other_item.name, "_Test Price List", 100)
+
+ pricing_rule_record = {
+ "doctype": "Pricing Rule",
+ "title": "_Test Water Flask Rule",
+ "apply_on": "Item Code",
+ "apply_rule_on_other": "Item Code",
+ "price_or_product_discount": "Price",
+ "rate_or_discount": "Discount Percentage",
+ "other_item_code": other_item.name,
+ "items": [
+ {
+ "item_code": item.name,
+ }
+ ],
+ "selling": 1,
+ "currency": "INR",
+ "min_amt": 200,
+ "discount_percentage": 10,
+ "company": "_Test Company",
+ }
+ rule = frappe.get_doc(pricing_rule_record)
+ rule.insert()
+
+ si = create_sales_invoice(do_not_save=True, item_code=item.name)
+ si.append(
+ "items",
+ {
+ "item_code": other_item.name,
+ "item_name": other_item.item_name,
+ "description": other_item.description,
+ "stock_uom": other_item.stock_uom,
+ "uom": other_item.stock_uom,
+ "cost_center": si.items[0].cost_center,
+ "expense_account": si.items[0].expense_account,
+ "warehouse": si.items[0].warehouse,
+ "conversion_factor": 1,
+ "qty": 1,
+ },
+ )
+ si.selling_price_list = "_Test Price List"
+ si.save()
+
+ self.assertEqual(si.items[0].discount_percentage, 0)
+ self.assertEqual(si.items[1].discount_percentage, 0)
+
+ si.items[0].qty = 2
+ si.save()
+
+ self.assertEqual(si.items[0].discount_percentage, 0)
+ self.assertEqual(si.items[0].stock_qty, 2)
+ self.assertEqual(si.items[0].amount, 200)
+ self.assertEqual(si.items[0].price_list_rate, 100)
+ self.assertEqual(si.items[1].discount_percentage, 10)
+
+ si.delete()
+ rule.delete()
+
test_dependencies = ["Campaign"]
diff --git a/erpnext/accounts/doctype/pricing_rule/utils.py b/erpnext/accounts/doctype/pricing_rule/utils.py
index 70926cf..1f29d73 100644
--- a/erpnext/accounts/doctype/pricing_rule/utils.py
+++ b/erpnext/accounts/doctype/pricing_rule/utils.py
@@ -252,12 +252,6 @@
stock_qty = flt(args.get("stock_qty"))
amount = flt(args.get("price_list_rate")) * flt(args.get("qty"))
- if pricing_rules[0].apply_rule_on_other:
- field = frappe.scrub(pricing_rules[0].apply_rule_on_other)
-
- if field and pricing_rules[0].get("other_" + field) != args.get(field):
- return
-
pr_doc = frappe.get_cached_doc("Pricing Rule", pricing_rules[0].name)
if pricing_rules[0].mixed_conditions and doc:
@@ -274,7 +268,7 @@
amount += data[1]
if pricing_rules[0].apply_rule_on_other and not pricing_rules[0].mixed_conditions and doc:
- pricing_rules = get_qty_and_rate_for_other_item(doc, pr_doc, pricing_rules) or []
+ pricing_rules = get_qty_and_rate_for_other_item(doc, pr_doc, pricing_rules, args) or []
else:
pricing_rules = filter_pricing_rules_for_qty_amount(stock_qty, amount, pricing_rules, args)
@@ -352,16 +346,14 @@
if fieldname:
msg = _(
"If you {0} {1} quantities of the item {2}, the scheme {3} will be applied on the item."
- ).format(
- type_of_transaction, args.get(fieldname), bold(item_code), bold(args.rule_description)
- )
+ ).format(type_of_transaction, args.get(fieldname), bold(item_code), bold(args.title))
if fieldname in ["min_amt", "max_amt"]:
msg = _("If you {0} {1} worth item {2}, the scheme {3} will be applied on the item.").format(
type_of_transaction,
fmt_money(args.get(fieldname), currency=args.get("currency")),
bold(item_code),
- bold(args.rule_description),
+ bold(args.title),
)
frappe.msgprint(msg)
@@ -454,17 +446,29 @@
return sum_qty, sum_amt, items
-def get_qty_and_rate_for_other_item(doc, pr_doc, pricing_rules):
- items = get_pricing_rule_items(pr_doc)
+def get_qty_and_rate_for_other_item(doc, pr_doc, pricing_rules, row_item):
+ other_items = get_pricing_rule_items(pr_doc, other_items=True)
+ pricing_rule_apply_on = apply_on_table.get(pr_doc.get("apply_on"))
+ apply_on = frappe.scrub(pr_doc.get("apply_on"))
+
+ items = []
+ for d in pr_doc.get(pricing_rule_apply_on):
+ if apply_on == "item_group":
+ items.extend(get_child_item_groups(d.get(apply_on)))
+ else:
+ items.append(d.get(apply_on))
for row in doc.items:
- if row.get(frappe.scrub(pr_doc.apply_rule_on_other)) in items:
- pricing_rules = filter_pricing_rules_for_qty_amount(
- row.get("stock_qty"), row.get("amount"), pricing_rules, row
- )
+ if row.get(apply_on) in items:
+ if not row.get("qty"):
+ continue
+
+ stock_qty = row.get("qty") * (row.get("conversion_factor") or 1.0)
+ amount = stock_qty * (row.get("price_list_rate") or row.get("rate"))
+ pricing_rules = filter_pricing_rules_for_qty_amount(stock_qty, amount, pricing_rules, row)
if pricing_rules and pricing_rules[0]:
- pricing_rules[0].apply_rule_on_other_items = items
+ pricing_rules[0].apply_rule_on_other_items = other_items
return pricing_rules
@@ -658,21 +662,21 @@
doc.append("items", args)
-def get_pricing_rule_items(pr_doc):
+def get_pricing_rule_items(pr_doc, other_items=False) -> list:
apply_on_data = []
apply_on = frappe.scrub(pr_doc.get("apply_on"))
pricing_rule_apply_on = apply_on_table.get(pr_doc.get("apply_on"))
- for d in pr_doc.get(pricing_rule_apply_on):
- if apply_on == "item_group":
- apply_on_data.extend(get_child_item_groups(d.get(apply_on)))
- else:
- apply_on_data.append(d.get(apply_on))
-
- if pr_doc.apply_rule_on_other:
+ if pr_doc.apply_rule_on_other and other_items:
apply_on = frappe.scrub(pr_doc.apply_rule_on_other)
apply_on_data.append(pr_doc.get("other_" + apply_on))
+ else:
+ for d in pr_doc.get(pricing_rule_apply_on):
+ if apply_on == "item_group":
+ apply_on_data.extend(get_child_item_groups(d.get(apply_on)))
+ else:
+ apply_on_data.append(d.get(apply_on))
return list(set(apply_on_data))
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index 534b879..986fc03 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -83,6 +83,8 @@
"section_break_51",
"taxes_and_charges",
"taxes",
+ "tax_withheld_vouchers_section",
+ "tax_withheld_vouchers",
"sec_tax_breakup",
"other_charges_calculation",
"totals",
@@ -512,7 +514,6 @@
"fieldname": "ignore_pricing_rule",
"fieldtype": "Check",
"label": "Ignore Pricing Rule",
- "no_copy": 1,
"permlevel": 1,
"print_hide": 1
},
@@ -1367,7 +1368,7 @@
"width": "50px"
},
{
- "depends_on": "eval:doc.is_subcontracted",
+ "depends_on": "eval:doc.is_subcontracted",
"fieldname": "supplier_warehouse",
"fieldtype": "Link",
"label": "Supplier Warehouse",
@@ -1426,13 +1427,25 @@
"hidden": 1,
"label": "Is Old Subcontracting Flow",
"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",
"idx": 204,
"is_submittable": 1,
"links": [],
- "modified": "2022-06-15 15:40:58.527065",
+ "modified": "2022-09-13 23:39:54.525037",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice",
@@ -1492,6 +1505,7 @@
"show_name_in_global_search": 1,
"sort_field": "modified",
"sort_order": "DESC",
+ "states": [],
"timeline_field": "supplier",
"title_field": "title",
"track_changes": 1
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
index fea81e9..d185300 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -1519,7 +1519,7 @@
if not self.tax_withholding_category:
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
)
@@ -1548,6 +1548,19 @@
for d in to_remove:
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
self.calculate_taxes_and_totals()
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index 1c9d3fb..2da5157 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -649,7 +649,6 @@
"hide_days": 1,
"hide_seconds": 1,
"label": "Ignore Pricing Rule",
- "no_copy": 1,
"print_hide": 1
},
{
@@ -2022,7 +2021,7 @@
"link_fieldname": "consolidated_invoice"
}
],
- "modified": "2022-07-11 17:43:56.435382",
+ "modified": "2022-09-16 17:44:22.227332",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice",
diff --git a/erpnext/accounts/doctype/tax_withheld_vouchers/__init__.py b/erpnext/accounts/doctype/tax_withheld_vouchers/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/accounts/doctype/tax_withheld_vouchers/__init__.py
diff --git a/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json b/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json
new file mode 100644
index 0000000..ce8c0c3
--- /dev/null
+++ b/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json
@@ -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": []
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.py b/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.py
new file mode 100644
index 0000000..ea54c54
--- /dev/null
+++ b/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.py
@@ -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
diff --git a/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
index 6004e2b..0b5df9e 100644
--- a/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
+++ b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
@@ -109,7 +109,7 @@
).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
)
@@ -119,7 +119,7 @@
tax_row = get_tax_row_for_tcs(inv, tax_details, tax_amount, tax_deducted)
if inv.doctype == "Purchase Invoice":
- return tax_row, tax_deducted_on_advances
+ return tax_row, tax_deducted_on_advances, voucher_wise_amount
else:
return tax_row
@@ -217,7 +217,9 @@
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(
parties,
company=inv.company,
@@ -236,6 +238,7 @@
tax_deducted = get_deducted_tax(taxable_vouchers, tax_details)
tax_amount = 0
+
if party_type == "Supplier":
ldc = get_lower_deduction_certificate(tax_details, pan_no)
if tax_deducted:
@@ -261,12 +264,13 @@
if cint(tax_details.round_off_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"):
- dr_or_cr = "credit" if party_type == "Supplier" else "debit"
doctype = "Purchase Invoice" if party_type == "Supplier" else "Sales Invoice"
+ voucher_wise_amount = {}
+ vouchers = []
filters = {
"company": company,
@@ -281,29 +285,40 @@
{"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
WHERE
- j.docstatus = 1
+ j.name = ja.parent
+ AND j.docstatus = 1
AND j.is_opening = 'No'
AND j.posting_date between %s and %s
- AND ja.{dr_or_cr} > 0
AND ja.party in %s
- """.format(
- dr_or_cr=dr_or_cr
+ AND j.apply_tds = 1
+ 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_list=1,
+ as_dict=1,
)
- if journal_entries:
- journal_entries = journal_entries[0]
+ if journal_entries_details:
+ 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(
@@ -329,23 +344,25 @@
def get_taxes_deducted_on_advances_allocated(inv, tax_details):
- advances = [d.reference_name for d in inv.get("advances")]
tax_info = []
- if advances:
- pe = frappe.qb.DocType("Payment Entry").as_("pe")
- at = frappe.qb.DocType("Advance Taxes and Charges").as_("at")
+ if inv.get("advances"):
+ advances = [d.reference_name for d in inv.get("advances")]
- tax_info = (
- frappe.qb.from_(at)
- .inner_join(pe)
- .on(pe.name == at.parent)
- .select(at.parent, at.name, at.tax_amount, at.allocated_amount)
- .where(pe.tax_withholding_category == tax_details.get("tax_withholding_category"))
- .where(at.parent.isin(advances))
- .where(at.account_head == tax_details.account_head)
- .run(as_dict=True)
- )
+ if advances:
+ pe = frappe.qb.DocType("Payment Entry").as_("pe")
+ at = frappe.qb.DocType("Advance Taxes and Charges").as_("at")
+
+ tax_info = (
+ frappe.qb.from_(at)
+ .inner_join(pe)
+ .on(pe.name == at.parent)
+ .select(at.parent, at.name, at.tax_amount, at.allocated_amount)
+ .where(pe.tax_withholding_category == tax_details.get("tax_withholding_category"))
+ .where(at.parent.isin(advances))
+ .where(at.account_head == tax_details.account_head)
+ .run(as_dict=True)
+ )
return tax_info
@@ -394,11 +411,6 @@
supp_credit_amt += supp_jv_credit_amt
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)
cumulative_threshold = tax_details.get("cumulative_threshold", 0)
@@ -515,22 +527,6 @@
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):
if current_amount < (certificate_limit - deducted_amount):
return current_amount * rate / 100
diff --git a/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py b/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py
index 3059f8d..e80fe11 100644
--- a/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py
+++ b/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py
@@ -52,7 +52,7 @@
invoices.append(pi)
# delete invoices to avoid clashing
- for d in invoices:
+ for d in reversed(invoices):
d.cancel()
def test_single_threshold_tds(self):
@@ -88,7 +88,7 @@
self.assertEqual(pi.taxes_and_charges_deducted, 1000)
# delete invoices to avoid clashing
- for d in invoices:
+ for d in reversed(invoices):
d.cancel()
def test_tax_withholding_category_checks(self):
@@ -114,7 +114,7 @@
# TDS should be applied only on 1000
self.assertEqual(pi1.taxes[0].tax_amount, 1000)
- for d in invoices:
+ for d in reversed(invoices):
d.cancel()
def test_cumulative_threshold_tcs(self):
@@ -148,8 +148,8 @@
self.assertEqual(tcs_charged, 500)
invoices.append(si)
- # delete invoices to avoid clashing
- for d in invoices:
+ # cancel invoices to avoid clashing
+ for d in reversed(invoices):
d.cancel()
def test_tds_calculation_on_net_total(self):
@@ -182,8 +182,8 @@
self.assertEqual(pi1.taxes[0].tax_amount, 4000)
- # delete invoices to avoid clashing
- for d in invoices:
+ # cancel invoices to avoid clashing
+ for d in reversed(invoices):
d.cancel()
def test_multi_category_single_supplier(self):
@@ -207,8 +207,50 @@
self.assertEqual(pi1.taxes[0].tax_amount, 250)
- # delete invoices to avoid clashing
- for d in invoices:
+ # cancel invoices to avoid clashing
+ 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()
@@ -308,6 +350,7 @@
"Test TDS Supplier3",
"Test TDS Supplier4",
"Test TDS Supplier5",
+ "Test TDS Supplier6",
]:
if frappe.db.exists("Supplier", name):
continue
@@ -498,3 +541,22 @@
"accounts": [{"company": "_Test Company", "account": "TDS - _TC"}],
}
).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()
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py
index e77e828..82f38da 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py
@@ -237,9 +237,9 @@
or filters.get("party")
or filters.get("group_by") in ["Group by Account", "Group by Party"]
):
- conditions.append("posting_date >=%(from_date)s")
+ conditions.append("(posting_date >=%(from_date)s or is_opening = 'Yes')")
- conditions.append("(posting_date <=%(to_date)s or is_opening = 'Yes')")
+ conditions.append("(posting_date <=%(to_date)s)")
if filters.get("project"):
conditions.append("project in %(project)s")
diff --git a/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py b/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py
index 9d56678..cd5f366 100644
--- a/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py
+++ b/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py
@@ -155,7 +155,6 @@
for d in data:
for period in period_list:
key = period if consolidated else period.key
- d[key] = totals[d["account"]]
d["total"] = totals[d["account"]]
return data
diff --git a/erpnext/accounts/report/trial_balance/trial_balance.py b/erpnext/accounts/report/trial_balance/trial_balance.py
index 6bd08ad..6d2cd8e 100644
--- a/erpnext/accounts/report/trial_balance/trial_balance.py
+++ b/erpnext/accounts/report/trial_balance/trial_balance.py
@@ -172,6 +172,7 @@
query_filters = {
"company": filters.company,
"from_date": filters.from_date,
+ "to_date": filters.to_date,
"report_type": report_type,
"year_start_date": filters.year_start_date,
"project": filters.project,
@@ -200,7 +201,7 @@
where
company=%(company)s
{additional_conditions}
- and (posting_date < %(from_date)s or ifnull(is_opening, 'No') = 'Yes')
+ and (posting_date < %(from_date)s or (ifnull(is_opening, 'No') = 'Yes' and posting_date <= %(to_date)s))
and account in (select name from `tabAccount` where report_type=%(report_type)s)
and is_cancelled = 0
group by account""".format(
diff --git a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py
index 5fcfdff..ee22348 100644
--- a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py
+++ b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py
@@ -104,12 +104,17 @@
where company=%(company)s
and is_cancelled=0
and ifnull(party_type, '') = %(party_type)s and ifnull(party, '') != ''
- and (posting_date < %(from_date)s or ifnull(is_opening, 'No') = 'Yes')
+ and (posting_date < %(from_date)s or (ifnull(is_opening, 'No') = 'Yes' and posting_date <= %(to_date)s))
{account_filter}
group by party""".format(
account_filter=account_filter
),
- {"company": filters.company, "from_date": filters.from_date, "party_type": filters.party_type},
+ {
+ "company": filters.company,
+ "from_date": filters.from_date,
+ "to_date": filters.to_date,
+ "party_type": filters.party_type,
+ },
as_dict=True,
)
diff --git a/erpnext/assets/doctype/asset/asset.js b/erpnext/assets/doctype/asset/asset.js
index f414930..a43a16c 100644
--- a/erpnext/assets/doctype/asset/asset.js
+++ b/erpnext/assets/doctype/asset/asset.js
@@ -239,8 +239,10 @@
item_code: function(frm) {
- if(frm.doc.item_code) {
+ if(frm.doc.item_code && frm.doc.calculate_depreciation) {
frm.trigger('set_finance_book');
+ } else {
+ frm.set_value('finance_books', []);
}
},
@@ -381,6 +383,11 @@
calculate_depreciation: function(frm) {
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) {
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index fbb42fe..fc99d77 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -295,131 +295,12 @@
}
make_stock_entry() {
- var items = $.map(cur_frm.doc.items, function(d) { return d.bom ? d.item_code : false; });
- var me = this;
-
- if(items.length >= 1){
- me.raw_material_data = [];
- me.show_dialog = 1;
- let title = __('Transfer Material to Supplier');
- let fields = [
- {fieldtype:'Section Break', label: __('Raw Materials')},
- {fieldname: 'sub_con_rm_items', fieldtype: 'Table', label: __('Items'),
- fields: [
- {
- fieldtype:'Data',
- fieldname:'item_code',
- label: __('Item'),
- read_only:1,
- in_list_view:1
- },
- {
- fieldtype:'Data',
- fieldname:'rm_item_code',
- label: __('Raw Material'),
- read_only:1,
- in_list_view:1
- },
- {
- fieldtype:'Float',
- read_only:1,
- fieldname:'qty',
- label: __('Quantity'),
- read_only:1,
- in_list_view:1
- },
- {
- fieldtype:'Data',
- read_only:1,
- fieldname:'warehouse',
- label: __('Reserve Warehouse'),
- in_list_view:1
- },
- {
- fieldtype:'Float',
- read_only:1,
- fieldname:'rate',
- label: __('Rate'),
- hidden:1
- },
- {
- fieldtype:'Float',
- read_only:1,
- fieldname:'amount',
- label: __('Amount'),
- hidden:1
- },
- {
- fieldtype:'Link',
- read_only:1,
- fieldname:'uom',
- label: __('UOM'),
- hidden:1
- }
- ],
- data: me.raw_material_data,
- get_data: function() {
- return me.raw_material_data;
- }
- }
- ]
-
- me.dialog = new frappe.ui.Dialog({
- title: title, fields: fields
- });
-
- if (me.frm.doc['supplied_items']) {
- me.frm.doc['supplied_items'].forEach((item, index) => {
- if (item.rm_item_code && item.main_item_code && item.required_qty - item.supplied_qty != 0) {
- me.raw_material_data.push ({
- 'name':item.name,
- 'item_code': item.main_item_code,
- 'rm_item_code': item.rm_item_code,
- 'item_name': item.rm_item_code,
- 'qty': item.required_qty - item.supplied_qty,
- 'warehouse':item.reserve_warehouse,
- 'rate':item.rate,
- 'amount':item.amount,
- 'stock_uom':item.stock_uom
- });
- me.dialog.fields_dict.sub_con_rm_items.grid.refresh();
- }
- })
- }
-
- me.dialog.get_field('sub_con_rm_items').check_all_rows()
-
- me.dialog.show()
- this.dialog.set_primary_action(__('Transfer'), function() {
- me.values = me.dialog.get_values();
- if(me.values) {
- me.values.sub_con_rm_items.map((row,i) => {
- if (!row.item_code || !row.rm_item_code || !row.warehouse || !row.qty || row.qty === 0) {
- let row_id = i+1;
- frappe.throw(__("Item Code, warehouse and quantity are required on row {0}", [row_id]));
- }
- })
- me._make_rm_stock_entry(me.dialog.fields_dict.sub_con_rm_items.grid.get_selected_children())
- me.dialog.hide()
- }
- });
- }
-
- me.dialog.get_close_btn().on('click', () => {
- me.dialog.hide();
- });
-
- }
-
- _make_rm_stock_entry(rm_items) {
frappe.call({
method:"erpnext.controllers.subcontracting_controller.make_rm_stock_entry",
args: {
subcontract_order: cur_frm.doc.name,
- rm_items: rm_items,
order_doctype: cur_frm.doc.doctype
- }
- ,
+ },
callback: function(r) {
var doclist = frappe.model.sync(r.message);
frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index acca380..fb8f25a 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -441,7 +441,6 @@
"fieldname": "ignore_pricing_rule",
"fieldtype": "Check",
"label": "Ignore Pricing Rule",
- "no_copy": 1,
"permlevel": 1,
"print_hide": 1
},
@@ -1180,7 +1179,7 @@
"idx": 105,
"is_submittable": 1,
"links": [],
- "modified": "2022-09-07 11:06:46.035093",
+ "modified": "2022-09-16 17:45:04.954055",
"modified_by": "Administrator",
"module": "Buying",
"name": "Purchase Order",
diff --git a/erpnext/buying/report/purchase_order_trends/purchase_order_trends.py b/erpnext/buying/report/purchase_order_trends/purchase_order_trends.py
index dbdc62e..d089473 100644
--- a/erpnext/buying/report/purchase_order_trends/purchase_order_trends.py
+++ b/erpnext/buying/report/purchase_order_trends/purchase_order_trends.py
@@ -53,4 +53,5 @@
},
"type": "line",
"lineOptions": {"regionFill": 1},
+ "fieldtype": "Currency",
}
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 938de63..8686cb5 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -572,6 +572,11 @@
# if user changed the discount percentage then set user's discount percentage ?
if pricing_rule_args.get("price_or_product_discount") == "Price":
item.set("pricing_rules", pricing_rule_args.get("pricing_rules"))
+ if pricing_rule_args.get("apply_rule_on_other_items"):
+ other_items = json.loads(pricing_rule_args.get("apply_rule_on_other_items"))
+ if other_items and item.item_code not in other_items:
+ return
+
item.set("discount_percentage", pricing_rule_args.get("discount_percentage"))
item.set("discount_amount", pricing_rule_args.get("discount_amount"))
if pricing_rule_args.get("pricing_rule_for") == "Rate":
diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
index 5659ad0..48fe7cb 100644
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -194,16 +194,16 @@
if self.meta.get_field("base_in_words"):
if self.meta.get_field("base_rounded_total") and not self.is_rounded_total_disabled():
- amount = self.base_rounded_total
+ amount = abs(self.base_rounded_total)
else:
- amount = self.base_grand_total
+ amount = abs(self.base_grand_total)
self.base_in_words = money_in_words(amount, self.company_currency)
if self.meta.get_field("in_words"):
if self.meta.get_field("rounded_total") and not self.is_rounded_total_disabled():
- amount = self.rounded_total
+ amount = abs(self.rounded_total)
else:
- amount = self.grand_total
+ amount = abs(self.grand_total)
self.in_words = money_in_words(amount, self.currency)
diff --git a/erpnext/controllers/subcontracting_controller.py b/erpnext/controllers/subcontracting_controller.py
index bbd950e..202a880 100644
--- a/erpnext/controllers/subcontracting_controller.py
+++ b/erpnext/controllers/subcontracting_controller.py
@@ -770,7 +770,7 @@
item = frappe.qb.DocType("Item")
item_list = (
frappe.qb.from_(item)
- .select(item.item_code, item.description, item.allow_alternative_item)
+ .select(item.item_code, item.item_name, item.description, item.allow_alternative_item)
.where(item.name.isin(items))
.run(as_dict=True)
)
@@ -783,68 +783,93 @@
@frappe.whitelist()
-def make_rm_stock_entry(subcontract_order, rm_items, order_doctype="Subcontracting Order"):
- rm_items_list = rm_items
-
- if isinstance(rm_items, str):
- rm_items_list = json.loads(rm_items)
- elif not rm_items:
- frappe.throw(_("No Items available for transfer"))
-
- if rm_items_list:
- fg_items = list(set(item["item_code"] for item in rm_items_list))
- else:
- frappe.throw(_("No Items selected for transfer"))
-
+def make_rm_stock_entry(
+ subcontract_order, rm_items=None, order_doctype="Subcontracting Order", target_doc=None
+):
if subcontract_order:
subcontract_order = frappe.get_doc(order_doctype, subcontract_order)
- if fg_items:
- items = tuple(set(item["rm_item_code"] for item in rm_items_list))
- item_wh = get_item_details(items)
+ if not rm_items:
+ if not subcontract_order.supplied_items:
+ frappe.throw(_("No item available for transfer."))
- stock_entry = frappe.new_doc("Stock Entry")
- stock_entry.purpose = "Send to Subcontractor"
- if order_doctype == "Purchase Order":
- stock_entry.purchase_order = subcontract_order.name
- else:
- stock_entry.subcontracting_order = subcontract_order.name
- stock_entry.supplier = subcontract_order.supplier
- stock_entry.supplier_name = subcontract_order.supplier_name
- stock_entry.supplier_address = subcontract_order.supplier_address
- stock_entry.address_display = subcontract_order.address_display
- stock_entry.company = subcontract_order.company
- stock_entry.to_warehouse = subcontract_order.supplier_warehouse
- stock_entry.set_stock_entry_type()
+ rm_items = subcontract_order.supplied_items
- if order_doctype == "Purchase Order":
- rm_detail_field = "po_detail"
- else:
- rm_detail_field = "sco_rm_detail"
+ fg_item_code_list = list(
+ set(item.get("main_item_code") or item.get("item_code") for item in rm_items)
+ )
- for item_code in fg_items:
- for rm_item_data in rm_items_list:
- if rm_item_data["item_code"] == item_code:
- rm_item_code = rm_item_data["rm_item_code"]
- items_dict = {
- rm_item_code: {
- rm_detail_field: rm_item_data.get("name"),
- "item_name": rm_item_data["item_name"],
- "description": item_wh.get(rm_item_code, {}).get("description", ""),
- "qty": rm_item_data["qty"],
- "from_warehouse": rm_item_data["warehouse"],
- "stock_uom": rm_item_data["stock_uom"],
- "serial_no": rm_item_data.get("serial_no"),
- "batch_no": rm_item_data.get("batch_no"),
- "main_item_code": rm_item_data["item_code"],
- "allow_alternative_item": item_wh.get(rm_item_code, {}).get("allow_alternative_item"),
+ if fg_item_code_list:
+ rm_item_code_list = tuple(set(item.get("rm_item_code") for item in rm_items))
+ item_wh = get_item_details(rm_item_code_list)
+
+ field_no_map, rm_detail_field = "purchase_order", "sco_rm_detail"
+ if order_doctype == "Purchase Order":
+ field_no_map, rm_detail_field = "subcontracting_order", "po_detail"
+
+ if target_doc and target_doc.get("items"):
+ target_doc.items = []
+
+ stock_entry = get_mapped_doc(
+ order_doctype,
+ subcontract_order.name,
+ {
+ order_doctype: {
+ "doctype": "Stock Entry",
+ "field_map": {
+ "to_warehouse": "supplier_warehouse",
+ },
+ "field_no_map": [field_no_map],
+ "validation": {
+ "docstatus": ["=", 1],
+ },
+ },
+ },
+ target_doc,
+ ignore_child_tables=True,
+ )
+
+ stock_entry.purpose = "Send to Subcontractor"
+
+ if order_doctype == "Purchase Order":
+ stock_entry.purchase_order = subcontract_order.name
+ else:
+ stock_entry.subcontracting_order = subcontract_order.name
+
+ stock_entry.set_stock_entry_type()
+
+ for fg_item_code in fg_item_code_list:
+ for rm_item in rm_items:
+
+ if rm_item.get("main_item_code") or rm_item.get("item_code") == fg_item_code:
+ rm_item_code = rm_item.get("rm_item_code")
+
+ items_dict = {
+ rm_item_code: {
+ rm_detail_field: rm_item.get("name"),
+ "item_name": rm_item.get("item_name")
+ or item_wh.get(rm_item_code, {}).get("item_name", ""),
+ "description": item_wh.get(rm_item_code, {}).get("description", ""),
+ "qty": rm_item.get("qty")
+ or max(rm_item.get("required_qty") - rm_item.get("total_supplied_qty"), 0),
+ "from_warehouse": rm_item.get("warehouse") or rm_item.get("reserve_warehouse"),
+ "to_warehouse": subcontract_order.supplier_warehouse,
+ "stock_uom": rm_item.get("stock_uom"),
+ "serial_no": rm_item.get("serial_no"),
+ "batch_no": rm_item.get("batch_no"),
+ "main_item_code": fg_item_code,
+ "allow_alternative_item": item_wh.get(rm_item_code, {}).get("allow_alternative_item"),
+ }
}
- }
- stock_entry.add_to_stock_entry_detail(items_dict)
- return stock_entry.as_dict()
- else:
- frappe.throw(_("No Items selected for transfer"))
- return subcontract_order.name
+
+ stock_entry.add_to_stock_entry_detail(items_dict)
+
+ if target_doc:
+ return stock_entry
+ else:
+ return stock_entry.as_dict()
+ else:
+ frappe.throw(_("No Items selected for transfer."))
def add_items_in_ste(
diff --git a/erpnext/crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js b/erpnext/crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js
index 116db2f..7cd1710 100644
--- a/erpnext/crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js
+++ b/erpnext/crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js
@@ -44,7 +44,7 @@
},
{
fieldname: "opportunity_source",
- label: __("Oppoturnity Source"),
+ label: __("Opportunity Source"),
fieldtype: "Link",
options: "Lead Source",
},
@@ -62,4 +62,4 @@
default: frappe.defaults.get_user_default("Company")
}
]
-};
\ No newline at end of file
+};
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index 70637d3..ff84991 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -1019,7 +1019,6 @@
where
bom_item.docstatus < 2
and bom.name = %(bom)s
- and ifnull(item.has_variants, 0) = 0
and item.is_stock_item in (1, {is_stock_item})
{where_conditions}
group by item_code, stock_uom
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.py b/erpnext/manufacturing/doctype/production_plan/production_plan.py
index aa5c50f..4bb4dcc 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py
@@ -198,7 +198,9 @@
so_item.parent,
so_item.item_code,
so_item.warehouse,
- ((so_item.qty - so_item.work_order_qty) * so_item.conversion_factor).as_("pending_qty"),
+ (
+ (so_item.qty - so_item.work_order_qty - so_item.delivered_qty) * so_item.conversion_factor
+ ).as_("pending_qty"),
so_item.description,
so_item.name,
)
@@ -892,6 +894,7 @@
.select(
(IfNull(Sum(bei.stock_qty / IfNull(bom.quantity, 1)), 0) * planned_qty).as_("qty"),
item.item_name,
+ item.name.as_("item_code"),
bei.description,
bei.stock_uom,
item.min_order_qty,
diff --git a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
index 1d2d1bd..60e6398 100644
--- a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
@@ -12,6 +12,7 @@
)
from erpnext.manufacturing.doctype.work_order.work_order import OverProductionError
from erpnext.manufacturing.doctype.work_order.work_order import make_stock_entry as make_se_from_wo
+from erpnext.selling.doctype.sales_order.sales_order import make_delivery_note
from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
from erpnext.stock.doctype.item.test_item import create_item, make_item
from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
@@ -610,15 +611,21 @@
"""
from erpnext.manufacturing.doctype.work_order.test_work_order import make_wo_order_test_record
+ make_stock_entry(item_code="_Test Item", target="Work In Progress - _TC", qty=2, basic_rate=100)
make_stock_entry(
- item_code="Raw Material Item 1", target="Work In Progress - _TC", qty=2, basic_rate=100
- )
- make_stock_entry(
- item_code="Raw Material Item 2", target="Work In Progress - _TC", qty=2, basic_rate=100
+ item_code="_Test Item Home Desktop 100", target="Work In Progress - _TC", qty=4, basic_rate=100
)
- item = "Test Production Item 1"
- so = make_sales_order(item_code=item, qty=1)
+ item = "_Test FG Item"
+
+ make_stock_entry(item_code=item, target="_Test Warehouse - _TC", qty=1)
+
+ so = make_sales_order(item_code=item, qty=2)
+
+ dn = make_delivery_note(so.name)
+ dn.items[0].qty = 1
+ dn.save()
+ dn.submit()
pln = create_production_plan(
company=so.company, get_items_from="Sales Order", sales_order=so, skip_getting_mr_items=True
diff --git a/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py b/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py
index ec4b25c..550445c 100644
--- a/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py
+++ b/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py
@@ -146,7 +146,7 @@
)
)
else:
- query = query.where(bin.warehouse == frappe.db.escape(filters.get("warehouse")))
+ query = query.where(bin.warehouse == filters.get("warehouse"))
return query.run(as_dict=True)
diff --git a/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py b/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py
index 34e9826..1e1b435 100644
--- a/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py
+++ b/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py
@@ -4,6 +4,8 @@
import frappe
from frappe import _
+from frappe.query_builder.functions import Floor, Sum
+from pypika.terms import ExistsCriterion
def execute(filters=None):
@@ -11,7 +13,6 @@
filters = {}
columns = get_columns()
-
data = get_bom_stock(filters)
return columns, data
@@ -33,59 +34,57 @@
def get_bom_stock(filters):
- conditions = ""
- bom = filters.get("bom")
-
- table = "`tabBOM Item`"
- qty_field = "stock_qty"
-
- qty_to_produce = filters.get("qty_to_produce", 1)
- if int(qty_to_produce) <= 0:
+ qty_to_produce = filters.get("qty_to_produce") or 1
+ if int(qty_to_produce) < 0:
frappe.throw(_("Quantity to Produce can not be less than Zero"))
if filters.get("show_exploded_view"):
- table = "`tabBOM Explosion Item`"
+ bom_item_table = "BOM Explosion Item"
+ else:
+ bom_item_table = "BOM Item"
+
+ bin = frappe.qb.DocType("Bin")
+ bom = frappe.qb.DocType("BOM")
+ bom_item = frappe.qb.DocType(bom_item_table)
+
+ query = (
+ frappe.qb.from_(bom)
+ .inner_join(bom_item)
+ .on(bom.name == bom_item.parent)
+ .left_join(bin)
+ .on(bom_item.item_code == bin.item_code)
+ .select(
+ bom_item.item_code,
+ bom_item.description,
+ bom_item.stock_qty,
+ bom_item.stock_uom,
+ bom_item.stock_qty * qty_to_produce / bom.quantity,
+ Sum(bin.actual_qty).as_("actual_qty"),
+ Sum(Floor(bin.actual_qty / (bom_item.stock_qty * qty_to_produce / bom.quantity))),
+ )
+ .where((bom_item.parent == filters.get("bom")) & (bom_item.parenttype == "BOM"))
+ .groupby(bom_item.item_code)
+ )
if filters.get("warehouse"):
warehouse_details = frappe.db.get_value(
"Warehouse", filters.get("warehouse"), ["lft", "rgt"], as_dict=1
)
+
if warehouse_details:
- conditions += (
- " and exists (select name from `tabWarehouse` wh \
- where wh.lft >= %s and wh.rgt <= %s and ledger.warehouse = wh.name)"
- % (warehouse_details.lft, warehouse_details.rgt)
+ wh = frappe.qb.DocType("Warehouse")
+ query = query.where(
+ ExistsCriterion(
+ frappe.qb.from_(wh)
+ .select(wh.name)
+ .where(
+ (wh.lft >= warehouse_details.lft)
+ & (wh.rgt <= warehouse_details.rgt)
+ & (bin.warehouse == wh.name)
+ )
+ )
)
else:
- conditions += " and ledger.warehouse = %s" % frappe.db.escape(filters.get("warehouse"))
+ query = query.where(bin.warehouse == filters.get("warehouse"))
- else:
- conditions += ""
-
- return frappe.db.sql(
- """
- SELECT
- bom_item.item_code,
- bom_item.description ,
- bom_item.{qty_field},
- bom_item.stock_uom,
- bom_item.{qty_field} * {qty_to_produce} / bom.quantity,
- sum(ledger.actual_qty) as actual_qty,
- sum(FLOOR(ledger.actual_qty / (bom_item.{qty_field} * {qty_to_produce} / bom.quantity)))
- FROM
- `tabBOM` AS bom INNER JOIN {table} AS bom_item
- ON bom.name = bom_item.parent
- LEFT JOIN `tabBin` AS ledger
- ON bom_item.item_code = ledger.item_code
- {conditions}
- WHERE
- bom_item.parent = {bom} and bom_item.parenttype='BOM'
-
- GROUP BY bom_item.item_code""".format(
- qty_field=qty_field,
- table=table,
- conditions=conditions,
- bom=frappe.db.escape(bom),
- qty_to_produce=qty_to_produce or 1,
- )
- )
+ return query.run()
diff --git a/erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py b/erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py
index da28343..70a1850 100644
--- a/erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py
+++ b/erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py
@@ -64,22 +64,21 @@
def get_data(filters):
- cond = "1=1"
+ wo = frappe.qb.DocType("Work Order")
+ query = (
+ frappe.qb.from_(wo)
+ .select(wo.name.as_("work_order"), wo.qty, wo.produced_qty, wo.production_item, wo.bom_no)
+ .where((wo.produced_qty > wo.qty) & (wo.docstatus == 1))
+ )
if filters.get("bom_no") and not filters.get("work_order"):
- cond += " and bom_no = '%s'" % filters.get("bom_no")
+ query = query.where(wo.bom_no == filters.get("bom_no"))
if filters.get("work_order"):
- cond += " and name = '%s'" % filters.get("work_order")
+ query = query.where(wo.name == filters.get("work_order"))
results = []
- for d in frappe.db.sql(
- """ select name as work_order, qty, produced_qty, production_item, bom_no
- from `tabWork Order` where produced_qty > qty and docstatus = 1 and {0}""".format(
- cond
- ),
- as_dict=1,
- ):
+ for d in query.run(as_dict=True):
results.append(d)
for data in frappe.get_all(
@@ -95,16 +94,17 @@
@frappe.whitelist()
@frappe.validate_and_sanitize_search_inputs
def get_work_orders(doctype, txt, searchfield, start, page_len, filters):
- cond = "1=1"
- if filters.get("bom_no"):
- cond += " and bom_no = '%s'" % filters.get("bom_no")
-
- return frappe.db.sql(
- """select name from `tabWork Order`
- where name like %(name)s and {0} and produced_qty > qty and docstatus = 1
- order by name limit {2} offset {1}""".format(
- cond, start, page_len
- ),
- {"name": "%%%s%%" % txt},
- as_list=1,
+ wo = frappe.qb.DocType("Work Order")
+ query = (
+ frappe.qb.from_(wo)
+ .select(wo.name)
+ .where((wo.name.like(f"{txt}%")) & (wo.produced_qty > wo.qty) & (wo.docstatus == 1))
+ .orderby(wo.name)
+ .limit(page_len)
+ .offset(start)
)
+
+ if filters.get("bom_no"):
+ query = query.where(wo.bom_no == filters.get("bom_no"))
+
+ return query.run(as_list=True)
diff --git a/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py b/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py
index 7500744..d3bce83 100644
--- a/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py
+++ b/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py
@@ -96,38 +96,39 @@
value["avg"] = flt(sum(list_of_period_value)) / flt(sum(total_qty))
def get_data_for_forecast(self):
- cond = ""
- if self.filters.item_code:
- cond = " AND soi.item_code = %s" % (frappe.db.escape(self.filters.item_code))
-
- warehouses = []
- if self.filters.warehouse:
- warehouses = get_child_warehouses(self.filters.warehouse)
- cond += " AND soi.warehouse in ({})".format(",".join(["%s"] * len(warehouses)))
-
- input_data = [self.filters.from_date, self.filters.company]
- if warehouses:
- input_data.extend(warehouses)
+ parent = frappe.qb.DocType(self.doctype)
+ child = frappe.qb.DocType(self.child_doctype)
date_field = "posting_date" if self.doctype == "Delivery Note" else "transaction_date"
- return frappe.db.sql(
- """
- SELECT
- so.{date_field} as posting_date, soi.item_code, soi.warehouse,
- soi.item_name, soi.stock_qty as qty, soi.base_amount as amount
- FROM
- `tab{doc}` so, `tab{child_doc}` soi
- WHERE
- so.docstatus = 1 AND so.name = soi.parent AND
- so.{date_field} < %s AND so.company = %s {cond}
- """.format(
- doc=self.doctype, child_doc=self.child_doctype, date_field=date_field, cond=cond
- ),
- tuple(input_data),
- as_dict=1,
+ query = (
+ frappe.qb.from_(parent)
+ .from_(child)
+ .select(
+ parent[date_field].as_("posting_date"),
+ child.item_code,
+ child.warehouse,
+ child.item_name,
+ child.stock_qty.as_("qty"),
+ child.base_amount.as_("amount"),
+ )
+ .where(
+ (parent.docstatus == 1)
+ & (parent.name == child.parent)
+ & (parent[date_field] < self.filters.from_date)
+ & (parent.company == self.filters.company)
+ )
)
+ if self.filters.item_code:
+ query = query.where(child.item_code == self.filters.item_code)
+
+ if self.filters.warehouse:
+ warehouses = get_child_warehouses(self.filters.warehouse) or []
+ query = query.where(child.warehouse.isin(warehouses))
+
+ return query.run(as_dict=True)
+
def prepare_final_data(self):
self.data = []
diff --git a/erpnext/manufacturing/report/job_card_summary/job_card_summary.py b/erpnext/manufacturing/report/job_card_summary/job_card_summary.py
index 5083b73..63c2d97 100644
--- a/erpnext/manufacturing/report/job_card_summary/job_card_summary.py
+++ b/erpnext/manufacturing/report/job_card_summary/job_card_summary.py
@@ -85,8 +85,8 @@
open_job_cards.append(periodic_data.get("Open").get(d))
completed.append(periodic_data.get("Completed").get(d))
- datasets.append({"name": "Open", "values": open_job_cards})
- datasets.append({"name": "Completed", "values": completed})
+ datasets.append({"name": _("Open"), "values": open_job_cards})
+ datasets.append({"name": _("Completed"), "values": completed})
chart = {"data": {"labels": labels, "datasets": datasets}, "type": "bar"}
diff --git a/erpnext/manufacturing/report/production_planning_report/production_planning_report.py b/erpnext/manufacturing/report/production_planning_report/production_planning_report.py
index 1404888..16c25ce 100644
--- a/erpnext/manufacturing/report/production_planning_report/production_planning_report.py
+++ b/erpnext/manufacturing/report/production_planning_report/production_planning_report.py
@@ -4,42 +4,10 @@
import frappe
from frappe import _
+from pypika import Order
from erpnext.stock.doctype.warehouse.warehouse import get_child_warehouses
-# and bom_no is not null and bom_no !=''
-
-mapper = {
- "Sales Order": {
- "fields": """ item_code as production_item, item_name as production_item_name, stock_uom,
- stock_qty as qty_to_manufacture, `tabSales Order Item`.parent as name, bom_no, warehouse,
- `tabSales Order Item`.delivery_date, `tabSales Order`.base_grand_total """,
- "filters": """`tabSales Order Item`.docstatus = 1 and stock_qty > produced_qty
- and `tabSales Order`.per_delivered < 100.0""",
- },
- "Material Request": {
- "fields": """ item_code as production_item, item_name as production_item_name, stock_uom,
- stock_qty as qty_to_manufacture, `tabMaterial Request Item`.parent as name, bom_no, warehouse,
- `tabMaterial Request Item`.schedule_date """,
- "filters": """`tabMaterial Request`.docstatus = 1 and `tabMaterial Request`.per_ordered < 100
- and `tabMaterial Request`.material_request_type = 'Manufacture' """,
- },
- "Work Order": {
- "fields": """ production_item, item_name as production_item_name, planned_start_date,
- stock_uom, qty as qty_to_manufacture, name, bom_no, fg_warehouse as warehouse """,
- "filters": "docstatus = 1 and status not in ('Completed', 'Stopped')",
- },
-}
-
-order_mapper = {
- "Sales Order": {
- "Delivery Date": "`tabSales Order Item`.delivery_date asc",
- "Total Amount": "`tabSales Order`.base_grand_total desc",
- },
- "Material Request": {"Required Date": "`tabMaterial Request Item`.schedule_date asc"},
- "Work Order": {"Planned Start Date": "planned_start_date asc"},
-}
-
def execute(filters=None):
return ProductionPlanReport(filters).execute_report()
@@ -63,40 +31,78 @@
return self.columns, self.data
def get_open_orders(self):
- doctype = (
- "`tabWork Order`"
- if self.filters.based_on == "Work Order"
- else "`tab{doc}`, `tab{doc} Item`".format(doc=self.filters.based_on)
- )
+ doctype, order_by = self.filters.based_on, self.filters.order_by
- filters = mapper.get(self.filters.based_on)["filters"]
- filters = self.prepare_other_conditions(filters, self.filters.based_on)
- order_by = " ORDER BY %s" % (order_mapper[self.filters.based_on][self.filters.order_by])
+ parent = frappe.qb.DocType(doctype)
+ query = None
- self.orders = frappe.db.sql(
- """ SELECT {fields} from {doctype}
- WHERE {filters} {order_by}""".format(
- doctype=doctype,
- filters=filters,
- order_by=order_by,
- fields=mapper.get(self.filters.based_on)["fields"],
- ),
- tuple(self.filters.docnames),
- as_dict=1,
- )
+ if doctype == "Work Order":
+ query = (
+ frappe.qb.from_(parent)
+ .select(
+ parent.production_item,
+ parent.item_name.as_("production_item_name"),
+ parent.planned_start_date,
+ parent.stock_uom,
+ parent.qty.as_("qty_to_manufacture"),
+ parent.name,
+ parent.bom_no,
+ parent.fg_warehouse.as_("warehouse"),
+ )
+ .where(parent.status.notin(["Completed", "Stopped"]))
+ )
- def prepare_other_conditions(self, filters, doctype):
- if self.filters.docnames:
- field = "name" if doctype == "Work Order" else "`tab{} Item`.parent".format(doctype)
- filters += " and %s in (%s)" % (field, ",".join(["%s"] * len(self.filters.docnames)))
+ if order_by == "Planned Start Date":
+ query = query.orderby(parent.planned_start_date, order=Order.asc)
- if doctype != "Work Order":
- filters += " and `tab{doc}`.name = `tab{doc} Item`.parent".format(doc=doctype)
+ if self.filters.docnames:
+ query = query.where(parent.name.isin(self.filters.docnames))
+
+ else:
+ child = frappe.qb.DocType(f"{doctype} Item")
+ query = (
+ frappe.qb.from_(parent)
+ .from_(child)
+ .select(
+ child.bom_no,
+ child.stock_uom,
+ child.warehouse,
+ child.parent.as_("name"),
+ child.item_code.as_("production_item"),
+ child.stock_qty.as_("qty_to_manufacture"),
+ child.item_name.as_("production_item_name"),
+ )
+ .where(parent.name == child.parent)
+ )
+
+ if self.filters.docnames:
+ query = query.where(child.parent.isin(self.filters.docnames))
+
+ if doctype == "Sales Order":
+ query = query.select(
+ child.delivery_date,
+ parent.base_grand_total,
+ ).where((child.stock_qty > child.produced_qty) & (parent.per_delivered < 100.0))
+
+ if order_by == "Delivery Date":
+ query = query.orderby(child.delivery_date, order=Order.asc)
+ elif order_by == "Total Amount":
+ query = query.orderby(parent.base_grand_total, order=Order.desc)
+
+ elif doctype == "Material Request":
+ query = query.select(child.schedule_date,).where(
+ (parent.per_ordered < 100) & (parent.material_request_type == "Manufacture")
+ )
+
+ if order_by == "Required Date":
+ query = query.orderby(child.schedule_date, order=Order.asc)
+
+ query = query.where(parent.docstatus == 1)
if self.filters.company:
- filters += " and `tab%s`.company = %s" % (doctype, frappe.db.escape(self.filters.company))
+ query = query.where(parent.company == self.filters.company)
- return filters
+ self.orders = query.run(as_dict=True)
def get_raw_materials(self):
if not self.orders:
@@ -134,29 +140,29 @@
bom_nos.append(bom_no)
- bom_doctype = (
+ bom_item_doctype = (
"BOM Explosion Item" if self.filters.include_subassembly_raw_materials else "BOM Item"
)
- qty_field = (
- "qty_consumed_per_unit"
- if self.filters.include_subassembly_raw_materials
- else "(bom_item.qty / bom.quantity)"
- )
+ bom = frappe.qb.DocType("BOM")
+ bom_item = frappe.qb.DocType(bom_item_doctype)
- raw_materials = frappe.db.sql(
- """ SELECT bom_item.parent, bom_item.item_code,
- bom_item.item_name as raw_material_name, {0} as required_qty_per_unit
- FROM
- `tabBOM` as bom, `tab{1}` as bom_item
- WHERE
- bom_item.parent in ({2}) and bom_item.parent = bom.name and bom.docstatus = 1
- """.format(
- qty_field, bom_doctype, ",".join(["%s"] * len(bom_nos))
- ),
- tuple(bom_nos),
- as_dict=1,
- )
+ if self.filters.include_subassembly_raw_materials:
+ qty_field = bom_item.qty_consumed_per_unit
+ else:
+ qty_field = bom_item.qty / bom.quantity
+
+ raw_materials = (
+ frappe.qb.from_(bom)
+ .from_(bom_item)
+ .select(
+ bom_item.parent,
+ bom_item.item_code,
+ bom_item.item_name.as_("raw_material_name"),
+ qty_field.as_("required_qty_per_unit"),
+ )
+ .where((bom_item.parent.isin(bom_nos)) & (bom_item.parent == bom.name) & (bom.docstatus == 1))
+ ).run(as_dict=True)
if not raw_materials:
return
diff --git a/erpnext/manufacturing/report/work_order_summary/work_order_summary.py b/erpnext/manufacturing/report/work_order_summary/work_order_summary.py
index 2368bfd..41ffcbb 100644
--- a/erpnext/manufacturing/report/work_order_summary/work_order_summary.py
+++ b/erpnext/manufacturing/report/work_order_summary/work_order_summary.py
@@ -83,6 +83,7 @@
for d in data:
status_wise_data[d.status] += 1
+ labels = [_(label) for label in labels]
values = [status_wise_data[label] for label in labels]
chart = {
@@ -95,7 +96,7 @@
def get_chart_based_on_age(data):
- labels = ["0-30 Days", "30-60 Days", "60-90 Days", "90 Above"]
+ labels = [_("0-30 Days"), _("30-60 Days"), _("60-90 Days"), _("90 Above")]
age_wise_data = {"0-30 Days": 0, "30-60 Days": 0, "60-90 Days": 0, "90 Above": 0}
@@ -135,8 +136,8 @@
pending.append(periodic_data.get("Pending").get(d))
completed.append(periodic_data.get("Completed").get(d))
- datasets.append({"name": "Pending", "values": pending})
- datasets.append({"name": "Completed", "values": completed})
+ datasets.append({"name": _("Pending"), "values": pending})
+ datasets.append({"name": _("Completed"), "values": completed})
chart = {
"data": {"labels": labels, "datasets": datasets},
diff --git a/erpnext/projects/doctype/project/project.js b/erpnext/projects/doctype/project/project.js
index 4f19bbd..c48ed91 100644
--- a/erpnext/projects/doctype/project/project.js
+++ b/erpnext/projects/doctype/project/project.js
@@ -152,6 +152,7 @@
new_child_doc.parentfield = parentfield;
new_child_doc.parenttype = doctype;
new_doc[parentfield] = [new_child_doc];
+ new_doc.project = frm.doc.name;
frappe.ui.form.make_quick_entry(doctype, null, null, new_doc);
});
diff --git a/erpnext/projects/report/project_summary/project_summary.py b/erpnext/projects/report/project_summary/project_summary.py
index 606c0c2..7a35fd2 100644
--- a/erpnext/projects/report/project_summary/project_summary.py
+++ b/erpnext/projects/report/project_summary/project_summary.py
@@ -91,9 +91,9 @@
"data": {
"labels": labels[:30],
"datasets": [
- {"name": "Overdue", "values": overdue[:30]},
- {"name": "Completed", "values": completed[:30]},
- {"name": "Total Tasks", "values": total[:30]},
+ {"name": _("Overdue"), "values": overdue[:30]},
+ {"name": _("Completed"), "values": completed[:30]},
+ {"name": _("Total Tasks"), "values": total[:30]},
],
},
"type": "bar",
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index c0a8c9e..c17610b 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -1492,7 +1492,17 @@
frappe.model.set_value(child.doctype, child.name, "rate", value);
}
+ if (key === "pricing_rules") {
+ frappe.model.set_value(child.doctype, child.name, key, value);
+ }
+
if (key !== "free_item_data") {
+ if (child.apply_rule_on_other_items && JSON.parse(child.apply_rule_on_other_items).length) {
+ if (!in_list(JSON.parse(child.apply_rule_on_other_items), child.item_code)) {
+ continue;
+ }
+ }
+
frappe.model.set_value(child.doctype, child.name, key, value);
}
}
@@ -1510,11 +1520,11 @@
this.remove_pricing_rule(frappe.get_doc(child.doctype, child.name));
}
- if (child.free_item_data.length > 0) {
+ if (child.free_item_data && child.free_item_data.length > 0) {
this.apply_product_discount(child);
}
- if (child.apply_rule_on_other_items) {
+ if (child.apply_rule_on_other_items && JSON.parse(child.apply_rule_on_other_items).length) {
items_rule_dict[child.name] = child;
}
}
@@ -1530,11 +1540,11 @@
for(var k in args) {
let data = args[k];
- if (data && data.apply_rule_on_other_items) {
+ if (data && data.apply_rule_on_other_items && JSON.parse(data.apply_rule_on_other_items)) {
me.frm.doc.items.forEach(d => {
- if (in_list(data.apply_rule_on_other_items, d[data.apply_rule_on])) {
+ if (in_list(JSON.parse(data.apply_rule_on_other_items), d[data.apply_rule_on])) {
for(var k in data) {
- if (in_list(fields, k) && data[k] && (data.price_or_product_discount === 'price' || k === 'pricing_rules')) {
+ if (in_list(fields, k) && data[k] && (data.price_or_product_discount === 'Price' || k === 'pricing_rules')) {
frappe.model.set_value(d.doctype, d.name, k, data[k]);
}
}
diff --git a/erpnext/public/js/help_links.js b/erpnext/public/js/help_links.js
index b643cca..1c3f43e 100644
--- a/erpnext/public/js/help_links.js
+++ b/erpnext/public/js/help_links.js
@@ -671,7 +671,7 @@
label: "Item Valuation",
url:
docsUrl +
- "user/manual/en/stock/articles/item-valuation-fifo-and-moving-average",
+ "user/manual/en/stock/articles/calculation-of-valuation-rate-in-fifo-and-moving-average",
},
];
diff --git a/erpnext/public/js/utils/barcode_scanner.js b/erpnext/public/js/utils/barcode_scanner.js
index a6bff2c..83b108b 100644
--- a/erpnext/public/js/utils/barcode_scanner.js
+++ b/erpnext/public/js/utils/barcode_scanner.js
@@ -21,6 +21,11 @@
this.items_table_name = opts.items_table_name || "items";
this.items_table = this.frm.doc[this.items_table_name];
+ // optional sound name to play when scan either fails or passes.
+ // see https://frappeframework.com/docs/v14/user/en/python-api/hooks#sounds
+ this.success_sound = opts.play_success_sound;
+ this.fail_sound = opts.play_fail_sound;
+
// any API that takes `search_value` as input and returns dictionary as follows
// {
// item_code: "HORSESHOE", // present if any item was found
@@ -54,19 +59,24 @@
if (!data || Object.keys(data).length === 0) {
this.show_alert(__("Cannot find Item with this Barcode"), "red");
this.clean_up();
+ this.play_fail_sound();
reject();
return;
}
me.update_table(data).then(row => {
- row ? resolve(row) : reject();
+ this.play_success_sound();
+ resolve(row);
+ }).catch(() => {
+ this.play_fail_sound();
+ reject();
});
});
});
}
update_table(data) {
- return new Promise(resolve => {
+ return new Promise((resolve, reject) => {
let cur_grid = this.frm.fields_dict[this.items_table_name].grid;
const {item_code, barcode, batch_no, serial_no, uom} = data;
@@ -77,6 +87,7 @@
if (this.dont_allow_new_row) {
this.show_alert(__("Maximum quantity scanned for item {0}.", [item_code]), "red");
this.clean_up();
+ reject();
return;
}
@@ -88,6 +99,7 @@
if (this.is_duplicate_serial_no(row, serial_no)) {
this.clean_up();
+ reject();
return;
}
@@ -219,6 +231,14 @@
return this.items_table.find((d) => !d.item_code);
}
+ play_success_sound() {
+ this.success_sound && frappe.utils.play_sound(this.success_sound);
+ }
+
+ play_fail_sound() {
+ this.fail_sound && frappe.utils.play_sound(this.fail_sound);
+ }
+
clean_up() {
this.scan_barcode_field.set_value("");
refresh_field(this.items_table_name);
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index bb2f95d..c58a46b 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -402,7 +402,6 @@
"fieldname": "ignore_pricing_rule",
"fieldtype": "Check",
"label": "Ignore Pricing Rule",
- "no_copy": 1,
"permlevel": 1,
"print_hide": 1
},
@@ -986,7 +985,7 @@
"idx": 82,
"is_submittable": 1,
"links": [],
- "modified": "2022-06-11 20:35:32.635804",
+ "modified": "2022-09-16 17:44:43.221804",
"modified_by": "Administrator",
"module": "Selling",
"name": "Quotation",
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 74c5c07..ff269d0 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -544,7 +544,6 @@
"hide_days": 1,
"hide_seconds": 1,
"label": "Ignore Pricing Rule",
- "no_copy": 1,
"permlevel": 1,
"print_hide": 1
},
@@ -1549,7 +1548,7 @@
"idx": 105,
"is_submittable": 1,
"links": [],
- "modified": "2022-06-10 03:52:22.212953",
+ "modified": "2022-09-16 17:43:57.007441",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order",
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 09a9652..25806d6 100755
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -880,6 +880,9 @@
@frappe.whitelist()
def make_purchase_order_for_default_supplier(source_name, selected_items=None, target_doc=None):
"""Creates Purchase Order for each Supplier. Returns a list of doc objects."""
+
+ from erpnext.setup.utils import get_exchange_rate
+
if not selected_items:
return
@@ -888,6 +891,15 @@
def set_missing_values(source, target):
target.supplier = supplier
+ target.currency = frappe.db.get_value(
+ "Supplier", filters={"name": supplier}, fieldname=["default_currency"]
+ )
+ company_currency = frappe.db.get_value(
+ "Company", filters={"name": target.company}, fieldname=["default_currency"]
+ )
+
+ target.conversion_rate = get_exchange_rate(target.currency, company_currency, args="for_buying")
+
target.apply_discount_on = ""
target.additional_discount_percentage = 0.0
target.discount_amount = 0.0
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index f9e9349..a8f907e 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -490,7 +490,6 @@
"fieldname": "ignore_pricing_rule",
"fieldtype": "Check",
"label": "Ignore Pricing Rule",
- "no_copy": 1,
"permlevel": 1,
"print_hide": 1
},
@@ -1336,7 +1335,7 @@
"idx": 146,
"is_submittable": 1,
"links": [],
- "modified": "2022-06-10 03:52:04.197415",
+ "modified": "2022-09-16 17:46:17.701904",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note",
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index a70415d..acaac92 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -405,7 +405,6 @@
"fieldname": "ignore_pricing_rule",
"fieldtype": "Check",
"label": "Ignore Pricing Rule",
- "no_copy": 1,
"permlevel": 1,
"print_hide": 1
},
@@ -1158,7 +1157,7 @@
"idx": 261,
"is_submittable": 1,
"links": [],
- "modified": "2022-06-15 15:43:40.664382",
+ "modified": "2022-09-16 17:45:58.430132",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt",
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index a952a93..266ea5f 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -625,6 +625,12 @@
purchase_order: (frm) => {
if (frm.doc.purchase_order) {
frm.set_value("subcontracting_order", "");
+ erpnext.utils.map_current_doc({
+ method: 'erpnext.stock.doctype.stock_entry.stock_entry.get_items_from_subcontract_order',
+ source_name: frm.doc.purchase_order,
+ target_doc: frm,
+ freeze: true,
+ });
}
},
@@ -632,7 +638,7 @@
if (frm.doc.subcontracting_order) {
frm.set_value("purchase_order", "");
erpnext.utils.map_current_doc({
- method: 'erpnext.stock.doctype.stock_entry.stock_entry.get_items_from_subcontracting_order',
+ method: 'erpnext.stock.doctype.stock_entry.stock_entry.get_items_from_subcontract_order',
source_name: frm.doc.subcontracting_order,
target_doc: frm,
freeze: true,
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 76bba8a..738ac33 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -919,6 +919,16 @@
)
if order_rm_detail:
se_item.db_set(self.subcontract_data.rm_detail_field, order_rm_detail)
+ else:
+ if not se_item.allow_alternative_item:
+ frappe.throw(
+ _("Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}").format(
+ se_item.idx,
+ se_item.item_code,
+ self.subcontract_data.order_doctype,
+ self.get(self.subcontract_data.order_field),
+ )
+ )
elif backflush_raw_materials_based_on == "Material Transferred for Subcontract":
for row in self.items:
if not row.subcontracted_item:
@@ -1935,6 +1945,8 @@
se_child.is_finished_item = item_row.get("is_finished_item", 0)
se_child.is_scrap_item = item_row.get("is_scrap_item", 0)
se_child.is_process_loss = item_row.get("is_process_loss", 0)
+ se_child.po_detail = item_row.get("po_detail")
+ se_child.sco_rm_detail = item_row.get("sco_rm_detail")
for field in [
self.subcontract_data.rm_detail_field,
@@ -2581,49 +2593,15 @@
@frappe.whitelist()
-def get_items_from_subcontracting_order(source_name, target_doc=None):
- def post_process(source, target):
- target.stock_entry_type = target.purpose = "Send to Subcontractor"
- target.subcontracting_order = source_name
+def get_items_from_subcontract_order(source_name, target_doc=None):
+ from erpnext.controllers.subcontracting_controller import make_rm_stock_entry
- if target.items:
- target.items = []
+ if isinstance(target_doc, str):
+ target_doc = frappe.get_doc(json.loads(target_doc))
- warehouses = {}
- for item in source.items:
- warehouses[item.name] = item.warehouse
-
- for item in source.supplied_items:
- target.append(
- "items",
- {
- "s_warehouse": warehouses.get(item.reference_name),
- "t_warehouse": source.supplier_warehouse,
- "subcontracted_item": item.main_item_code,
- "item_code": item.rm_item_code,
- "qty": max(item.required_qty - item.total_supplied_qty, 0),
- "transfer_qty": item.required_qty,
- "uom": item.stock_uom,
- "stock_uom": item.stock_uom,
- "conversion_factor": 1,
- },
- )
-
- target_doc = get_mapped_doc(
- "Subcontracting Order",
- source_name,
- {
- "Subcontracting Order": {
- "doctype": "Stock Entry",
- "field_no_map": ["purchase_order"],
- "validation": {
- "docstatus": ["=", 1],
- },
- },
- },
- target_doc,
- post_process,
- ignore_child_tables=True,
+ order_doctype = "Purchase Order" if target_doc.purchase_order else "Subcontracting Order"
+ target_doc = make_rm_stock_entry(
+ subcontract_order=source_name, order_doctype=order_doctype, target_doc=target_doc
)
return target_doc
diff --git a/erpnext/stock/report/delivery_note_trends/delivery_note_trends.py b/erpnext/stock/report/delivery_note_trends/delivery_note_trends.py
index 7a1b8c0..0ec4e1c 100644
--- a/erpnext/stock/report/delivery_note_trends/delivery_note_trends.py
+++ b/erpnext/stock/report/delivery_note_trends/delivery_note_trends.py
@@ -45,4 +45,5 @@
"datasets": [{"name": _("Total Delivered Amount"), "values": datapoints}],
},
"type": "bar",
+ "fieldtype": "Currency",
}
diff --git a/erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py b/erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py
index 23e3c8a..df01b14 100644
--- a/erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py
+++ b/erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py
@@ -4,6 +4,8 @@
import frappe
from frappe import _
+from frappe.query_builder import Field
+from frappe.query_builder.functions import Min, Timestamp
from frappe.utils import add_days, getdate, today
import erpnext
@@ -28,7 +30,7 @@
def get_unsync_date(filters):
date = filters.from_date
if not date:
- date = frappe.db.sql(""" SELECT min(posting_date) from `tabStock Ledger Entry`""")
+ date = (frappe.qb.from_("Stock Ledger Entry").select(Min(Field("posting_date")))).run()
date = date[0][0]
if not date:
@@ -54,22 +56,27 @@
result = []
voucher_wise_dict = {}
- data = frappe.db.sql(
- """
- SELECT
- name, posting_date, posting_time, voucher_type, voucher_no,
- stock_value_difference, stock_value, warehouse, item_code
- FROM
- `tabStock Ledger Entry`
- WHERE
- posting_date
- = %s and company = %s
- and is_cancelled = 0
- ORDER BY timestamp(posting_date, posting_time) asc, creation asc
- """,
- (from_date, report_filters.company),
- as_dict=1,
- )
+ sle = frappe.qb.DocType("Stock Ledger Entry")
+ data = (
+ frappe.qb.from_(sle)
+ .select(
+ sle.name,
+ sle.posting_date,
+ sle.posting_time,
+ sle.voucher_type,
+ sle.voucher_no,
+ sle.stock_value_difference,
+ sle.stock_value,
+ sle.warehouse,
+ sle.item_code,
+ )
+ .where(
+ (sle.posting_date == from_date)
+ & (sle.company == report_filters.company)
+ & (sle.is_cancelled == 0)
+ )
+ .orderby(Timestamp(sle.posting_date, sle.posting_time), sle.creation)
+ ).run(as_dict=True)
for d in data:
voucher_wise_dict.setdefault((d.item_code, d.warehouse), []).append(d)
diff --git a/erpnext/stock/report/item_price_stock/item_price_stock.py b/erpnext/stock/report/item_price_stock/item_price_stock.py
index 15218e6..1b07f59 100644
--- a/erpnext/stock/report/item_price_stock/item_price_stock.py
+++ b/erpnext/stock/report/item_price_stock/item_price_stock.py
@@ -62,22 +62,28 @@
def get_item_price_qty_data(filters):
- conditions = ""
- if filters.get("item_code"):
- conditions += "where a.item_code=%(item_code)s"
+ item_price = frappe.qb.DocType("Item Price")
+ bin = frappe.qb.DocType("Bin")
- item_results = frappe.db.sql(
- """select a.item_code, a.item_name, a.name as price_list_name,
- a.brand as brand, b.warehouse as warehouse, b.actual_qty as actual_qty
- from `tabItem Price` a left join `tabBin` b
- ON a.item_code = b.item_code
- {conditions}""".format(
- conditions=conditions
- ),
- filters,
- as_dict=1,
+ query = (
+ frappe.qb.from_(item_price)
+ .left_join(bin)
+ .on(item_price.item_code == bin.item_code)
+ .select(
+ item_price.item_code,
+ item_price.item_name,
+ item_price.name.as_("price_list_name"),
+ item_price.brand.as_("brand"),
+ bin.warehouse.as_("warehouse"),
+ bin.actual_qty.as_("actual_qty"),
+ )
)
+ if filters.get("item_code"):
+ query = query.where(item_price.item_code == filters.get("item_code"))
+
+ item_results = query.run(as_dict=True)
+
price_list_names = list(set(item.price_list_name for item in item_results))
buying_price_map = get_price_map(price_list_names, buying=1)
diff --git a/erpnext/stock/report/item_shortage_report/item_shortage_report.py b/erpnext/stock/report/item_shortage_report/item_shortage_report.py
index 03a3a6a..9fafe91 100644
--- a/erpnext/stock/report/item_shortage_report/item_shortage_report.py
+++ b/erpnext/stock/report/item_shortage_report/item_shortage_report.py
@@ -8,8 +8,7 @@
def execute(filters=None):
columns = get_columns()
- conditions = get_conditions(filters)
- data = get_data(conditions, filters)
+ data = get_data(filters)
if not data:
return [], [], None, []
@@ -19,49 +18,39 @@
return columns, data, None, chart_data
-def get_conditions(filters):
- conditions = ""
+def get_data(filters):
+ bin = frappe.qb.DocType("Bin")
+ wh = frappe.qb.DocType("Warehouse")
+ item = frappe.qb.DocType("Item")
- if filters.get("warehouse"):
- conditions += "AND warehouse in %(warehouse)s"
- if filters.get("company"):
- conditions += "AND company = %(company)s"
-
- return conditions
-
-
-def get_data(conditions, filters):
- data = frappe.db.sql(
- """
- SELECT
+ query = (
+ frappe.qb.from_(bin)
+ .from_(wh)
+ .from_(item)
+ .select(
bin.warehouse,
bin.item_code,
- bin.actual_qty ,
- bin.ordered_qty ,
- bin.planned_qty ,
- bin.reserved_qty ,
+ bin.actual_qty,
+ bin.ordered_qty,
+ bin.planned_qty,
+ bin.reserved_qty,
bin.reserved_qty_for_production,
- bin.projected_qty ,
- warehouse.company,
- item.item_name ,
- item.description
- FROM
- `tabBin` bin,
- `tabWarehouse` warehouse,
- `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,
+ bin.projected_qty,
+ wh.company,
+ item.item_name,
+ item.description,
+ )
+ .where((bin.projected_qty < 0) & (wh.name == bin.warehouse) & (bin.item_code == item.name))
+ .orderby(bin.projected_qty)
)
- 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):
diff --git a/erpnext/stock/report/item_shortage_report/test_item_shortage_report.py b/erpnext/stock/report/item_shortage_report/test_item_shortage_report.py
new file mode 100644
index 0000000..5884c32
--- /dev/null
+++ b/erpnext/stock/report/item_shortage_report/test_item_shortage_report.py
@@ -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)
diff --git a/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.py b/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.py
index fe2d55a..b62a6ee 100644
--- a/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.py
+++ b/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.py
@@ -46,4 +46,5 @@
},
"type": "bar",
"colors": ["#5e64ff"],
+ "fieldtype": "Currency",
}
diff --git a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js
index 40963f8..15a2ac9 100644
--- a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js
+++ b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js
@@ -205,20 +205,10 @@
}
make_stock_entry() {
- frappe.model.open_mapped_doc({
- method: 'erpnext.stock.doctype.stock_entry.stock_entry.get_items_from_subcontracting_order',
- source_name: cur_frm.doc.name,
- freeze: true,
- freeze_message: __('Creating Stock Entry ...')
- });
- }
-
- make_rm_stock_entry(rm_items) {
frappe.call({
method: 'erpnext.controllers.subcontracting_controller.make_rm_stock_entry',
args: {
subcontract_order: cur_frm.doc.name,
- rm_items: rm_items,
order_doctype: cur_frm.doc.doctype
},
callback: (r) => {
diff --git a/erpnext/www/lms/__init__.py b/erpnext/www/lms/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/www/lms/__init__.py