Merge pull request #38838 from pps190/fix-use-party-account-currency
fix: use party account currency when party account is specified
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
index 376c9ba..9feda11 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -244,8 +244,12 @@
row.invoiced_in_account_currency += amount_in_account_currency
else:
if self.is_invoice(ple):
- row.credit_note -= amount
- row.credit_note_in_account_currency -= amount_in_account_currency
+ if row.voucher_no == ple.voucher_no == ple.against_voucher_no:
+ row.paid -= amount
+ row.paid_in_account_currency -= amount_in_account_currency
+ else:
+ row.credit_note -= amount
+ row.credit_note_in_account_currency -= amount_in_account_currency
else:
row.paid -= amount
row.paid_in_account_currency -= amount_in_account_currency
diff --git a/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py
index 6da0077..976935b 100644
--- a/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py
@@ -76,6 +76,41 @@
return credit_note
+ def test_pos_receivable(self):
+ filters = {
+ "company": self.company,
+ "party_type": "Customer",
+ "party": [self.customer],
+ "report_date": add_days(today(), 2),
+ "based_on_payment_terms": 0,
+ "range1": 30,
+ "range2": 60,
+ "range3": 90,
+ "range4": 120,
+ "show_remarks": False,
+ }
+
+ pos_inv = self.create_sales_invoice(no_payment_schedule=True, do_not_submit=True)
+ pos_inv.posting_date = add_days(today(), 2)
+ pos_inv.is_pos = 1
+ pos_inv.append(
+ "payments",
+ frappe._dict(
+ mode_of_payment="Cash",
+ amount=flt(pos_inv.grand_total / 2),
+ ),
+ )
+ pos_inv.disable_rounded_total = 1
+ pos_inv.save()
+ pos_inv.submit()
+
+ report = execute(filters)
+ expected_data = [[pos_inv.grand_total, pos_inv.paid_amount, 0]]
+
+ row = report[1][-1]
+ self.assertEqual(expected_data[0], [row.invoiced, row.paid, row.credit_note])
+ pos_inv.cancel()
+
def test_accounts_receivable(self):
filters = {
"company": self.company,
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index 88faeee..3b671bb 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -214,7 +214,7 @@
}
},
- fg_item_qty: async function(frm, cdt, cdn) {
+ qty: async function (frm, cdt, cdn) {
if (frm.doc.is_subcontracted && !frm.doc.is_old_subcontracting_flow) {
var row = locals[cdt][cdn];
@@ -222,7 +222,7 @@
var result = await frm.events.get_subcontracting_boms_for_finished_goods(row.fg_item)
if (result.message && row.item_code == result.message.service_item && row.uom == result.message.service_item_uom) {
- frappe.model.set_value(cdt, cdn, "qty", flt(row.fg_item_qty) * flt(result.message.conversion_factor));
+ frappe.model.set_value(cdt, cdn, "fg_item_qty", flt(row.qty) / flt(result.message.conversion_factor));
}
}
}
diff --git a/erpnext/controllers/item_variant.py b/erpnext/controllers/item_variant.py
index c8785a5..ea7fb23 100644
--- a/erpnext/controllers/item_variant.py
+++ b/erpnext/controllers/item_variant.py
@@ -56,10 +56,24 @@
copy_attributes_to_variant(template, variant)
- variant.manufacturer = manufacturer
- variant.manufacturer_part_no = manufacturer_part_no
-
variant.item_code = append_number_if_name_exists("Item", template.name)
+ variant.flags.ignore_mandatory = True
+ variant.save()
+
+ if not frappe.db.exists(
+ "Item Manufacturer", {"item_code": variant.name, "manufacturer": manufacturer}
+ ):
+ manufacturer_doc = frappe.new_doc("Item Manufacturer")
+ manufacturer_doc.update(
+ {
+ "item_code": variant.name,
+ "manufacturer": manufacturer,
+ "manufacturer_part_no": manufacturer_part_no,
+ }
+ )
+
+ manufacturer_doc.flags.ignore_mandatory = True
+ manufacturer_doc.save(ignore_permissions=True)
return variant
diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py
index e8bae8c..4489d60 100644
--- a/erpnext/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@ -12,7 +12,7 @@
from erpnext.controllers.stock_controller import StockController
from erpnext.stock.doctype.item.item import set_item_default
from erpnext.stock.get_item_details import get_bin_details, get_conversion_factor
-from erpnext.stock.utils import get_incoming_rate
+from erpnext.stock.utils import get_incoming_rate, get_valuation_method
class SellingController(StockController):
@@ -432,11 +432,13 @@
items = self.get("items") + (self.get("packed_items") or [])
for d in items:
- if not self.get("return_against"):
+ if not self.get("return_against") or (
+ get_valuation_method(d.item_code) == "Moving Average" and self.get("is_return")
+ ):
# Get incoming rate based on original item cost based on valuation method
qty = flt(d.get("stock_qty") or d.get("actual_qty"))
- if not (self.get("is_return") and d.incoming_rate):
+ if not d.incoming_rate:
d.incoming_rate = get_incoming_rate(
{
"item_code": d.item_code,
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.py b/erpnext/manufacturing/doctype/production_plan/production_plan.py
index c201c4f..4b72a83 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py
@@ -583,6 +583,7 @@
if close:
self.db_set("status", "Closed")
+ self.update_bin_qty()
return
if self.total_produced_qty > 0:
@@ -597,6 +598,9 @@
if close is not None:
self.db_set("status", self.status)
+ if self.docstatus == 1 and self.status != "Completed":
+ self.update_bin_qty()
+
def update_ordered_status(self):
update_status = False
for d in self.po_items:
diff --git a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
index cc9d9a0..f86725d 100644
--- a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
@@ -1458,6 +1458,47 @@
self.assertEqual(row.get("uom"), "Nos")
self.assertEqual(row.get("conversion_factor"), 10.0)
+ def test_unreserve_qty_on_closing_of_pp(self):
+ from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
+ from erpnext.stock.utils import get_or_make_bin
+
+ fg_item = make_item(properties={"is_stock_item": 1, "stock_uom": "_Test UOM 1"}).name
+ rm_item = make_item(properties={"is_stock_item": 1, "stock_uom": "_Test UOM 1"}).name
+
+ store_warehouse = create_warehouse("Store Warehouse", company="_Test Company")
+ rm_warehouse = create_warehouse("RM Warehouse", company="_Test Company")
+
+ make_bom(item=fg_item, raw_materials=[rm_item], source_warehouse="_Test Warehouse - _TC")
+
+ pln = create_production_plan(
+ item_code=fg_item, planned_qty=10, stock_uom="_Test UOM 1", do_not_submit=1
+ )
+
+ pln.for_warehouse = rm_warehouse
+ mr_items = get_items_for_material_requests(pln.as_dict())
+ for d in mr_items:
+ pln.append("mr_items", d)
+
+ pln.save()
+ pln.submit()
+
+ bin_name = get_or_make_bin(rm_item, rm_warehouse)
+ before_qty = flt(frappe.db.get_value("Bin", bin_name, "reserved_qty_for_production_plan"))
+
+ pln.reload()
+ pln.set_status(close=True)
+
+ bin_name = get_or_make_bin(rm_item, rm_warehouse)
+ after_qty = flt(frappe.db.get_value("Bin", bin_name, "reserved_qty_for_production_plan"))
+ self.assertAlmostEqual(after_qty, before_qty - 10)
+
+ pln.reload()
+ pln.set_status(close=False)
+
+ bin_name = get_or_make_bin(rm_item, rm_warehouse)
+ after_qty = flt(frappe.db.get_value("Bin", bin_name, "reserved_qty_for_production_plan"))
+ self.assertAlmostEqual(after_qty, before_qty)
+
def create_production_plan(**args):
"""
diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note.py b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
index 3a58122..da8ee02 100644
--- a/erpnext/stock/doctype/delivery_note/test_delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
@@ -1375,6 +1375,56 @@
dn.reload()
self.assertEqual(frappe.db.get_value("Serial No", serial_no, "status"), "Delivered")
+ def test_sales_return_valuation_for_moving_average(self):
+ item_code = make_item(
+ "_Test Item Sales Return with MA", {"is_stock_item": 1, "valuation_method": "Moving Average"}
+ ).name
+
+ make_stock_entry(
+ item_code=item_code,
+ target="_Test Warehouse - _TC",
+ qty=5,
+ basic_rate=100.0,
+ posting_date=add_days(nowdate(), -5),
+ )
+ dn = create_delivery_note(
+ item_code=item_code, qty=5, rate=500, posting_date=add_days(nowdate(), -4)
+ )
+ self.assertEqual(dn.items[0].incoming_rate, 100.0)
+
+ make_stock_entry(
+ item_code=item_code,
+ target="_Test Warehouse - _TC",
+ qty=5,
+ basic_rate=200.0,
+ posting_date=add_days(nowdate(), -3),
+ )
+ make_stock_entry(
+ item_code=item_code,
+ target="_Test Warehouse - _TC",
+ qty=5,
+ basic_rate=300.0,
+ posting_date=add_days(nowdate(), -2),
+ )
+
+ dn1 = create_delivery_note(
+ is_return=1,
+ item_code=item_code,
+ return_against=dn.name,
+ qty=-5,
+ rate=500,
+ company=dn.company,
+ expense_account="Cost of Goods Sold - _TC",
+ cost_center="Main - _TC",
+ do_not_submit=1,
+ posting_date=add_days(nowdate(), -1),
+ )
+
+ # (300 * 5) + (200 * 5) = 2500
+ # 2500 / 10 = 250
+
+ self.assertAlmostEqual(dn1.items[0].incoming_rate, 250.0)
+
def create_delivery_note(**args):
dn = frappe.new_doc("Delivery Note")
diff --git a/erpnext/stock/doctype/item/test_item.py b/erpnext/stock/doctype/item/test_item.py
index a942f58..b237f73 100644
--- a/erpnext/stock/doctype/item/test_item.py
+++ b/erpnext/stock/doctype/item/test_item.py
@@ -522,39 +522,25 @@
self.assertEqual(factor, 1.0)
def test_item_variant_by_manufacturer(self):
- fields = [{"field_name": "description"}, {"field_name": "variant_based_on"}]
- set_item_variant_settings(fields)
+ template = make_item(
+ "_Test Item Variant By Manufacturer", {"has_variants": 1, "variant_based_on": "Manufacturer"}
+ ).name
- if frappe.db.exists("Item", "_Test Variant Mfg"):
- frappe.delete_doc("Item", "_Test Variant Mfg")
- if frappe.db.exists("Item", "_Test Variant Mfg-1"):
- frappe.delete_doc("Item", "_Test Variant Mfg-1")
- if frappe.db.exists("Manufacturer", "MSG1"):
- frappe.delete_doc("Manufacturer", "MSG1")
+ for manufacturer in ["DFSS", "DASA", "ASAAS"]:
+ if not frappe.db.exists("Manufacturer", manufacturer):
+ m_doc = frappe.new_doc("Manufacturer")
+ m_doc.short_name = manufacturer
+ m_doc.insert()
- template = frappe.get_doc(
- dict(
- doctype="Item",
- item_code="_Test Variant Mfg",
- has_variant=1,
- item_group="Products",
- variant_based_on="Manufacturer",
- )
- ).insert()
+ self.assertFalse(frappe.db.exists("Item Manufacturer", {"manufacturer": "DFSS"}))
+ variant = get_variant(template, manufacturer="DFSS", manufacturer_part_no="DFSS-123")
- manufacturer = frappe.get_doc(dict(doctype="Manufacturer", short_name="MSG1")).insert()
+ item_manufacturer = frappe.db.exists(
+ "Item Manufacturer", {"manufacturer": "DFSS", "item_code": variant.name}
+ )
+ self.assertTrue(item_manufacturer)
- variant = get_variant(template.name, manufacturer=manufacturer.name)
- self.assertEqual(variant.item_code, "_Test Variant Mfg-1")
- self.assertEqual(variant.description, "_Test Variant Mfg")
- self.assertEqual(variant.manufacturer, "MSG1")
- variant.insert()
-
- variant = get_variant(template.name, manufacturer=manufacturer.name, manufacturer_part_no="007")
- self.assertEqual(variant.item_code, "_Test Variant Mfg-2")
- self.assertEqual(variant.description, "_Test Variant Mfg")
- self.assertEqual(variant.manufacturer, "MSG1")
- self.assertEqual(variant.manufacturer_part_no, "007")
+ frappe.delete_doc("Item Manufacturer", item_manufacturer)
def test_stock_exists_against_template_item(self):
stock_item = frappe.get_all("Stock Ledger Entry", fields=["item_code"], limit=1)
diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py
index 3e90ed5..ad9b34c 100644
--- a/erpnext/stock/doctype/material_request/material_request.py
+++ b/erpnext/stock/doctype/material_request/material_request.py
@@ -169,7 +169,9 @@
def on_submit(self):
self.update_requested_qty_in_production_plan()
self.update_requested_qty()
- if self.material_request_type == "Purchase":
+ if self.material_request_type == "Purchase" and frappe.db.exists(
+ "Budget", {"applicable_on_material_request": 1, "docstatus": 1}
+ ):
self.validate_budget()
def before_save(self):