mirror of
https://github.com/frappe/erpnext.git
synced 2026-03-05 11:33:56 +00:00
Merge pull request #43769 from Ninad1306/auto_create_pr_from_sr
This commit is contained in:
Smit Vora
@@ -707,86 +707,103 @@ def make_purchase_receipt(source_name, target_doc=None, save=False, submit=False
|
||||
else:
|
||||
source_doc = source_name
|
||||
|
||||
if not source_doc.is_return:
|
||||
if not target_doc:
|
||||
target_doc = frappe.new_doc("Purchase Receipt")
|
||||
target_doc.is_subcontracted = 1
|
||||
target_doc.is_old_subcontracting_flow = 0
|
||||
if source_doc.is_return:
|
||||
return
|
||||
|
||||
target_doc = get_mapped_doc(
|
||||
"Subcontracting Receipt",
|
||||
source_doc.name,
|
||||
{
|
||||
"Subcontracting Receipt": {
|
||||
"doctype": "Purchase Receipt",
|
||||
"field_map": {
|
||||
"posting_date": "posting_date",
|
||||
"posting_time": "posting_time",
|
||||
"name": "subcontracting_receipt",
|
||||
"supplier_warehouse": "supplier_warehouse",
|
||||
},
|
||||
"field_no_map": ["total_qty", "total"],
|
||||
},
|
||||
},
|
||||
target_doc,
|
||||
ignore_child_tables=True,
|
||||
po_sr_item_dict = {}
|
||||
po_name = None
|
||||
for item in source_doc.items:
|
||||
if not item.purchase_order:
|
||||
continue
|
||||
|
||||
if not po_name:
|
||||
po_name = item.purchase_order
|
||||
|
||||
po_sr_item_dict[item.purchase_order_item] = {
|
||||
"qty": flt(item.qty),
|
||||
"rejected_qty": flt(item.rejected_qty),
|
||||
"warehouse": item.warehouse,
|
||||
"rejected_warehouse": item.rejected_warehouse,
|
||||
"subcontracting_receipt_item": item.name,
|
||||
}
|
||||
|
||||
if not po_name:
|
||||
frappe.throw(
|
||||
_("Purchase Order Item reference is missing in Subcontracting Receipt {0}").format(
|
||||
source_doc.name
|
||||
)
|
||||
)
|
||||
|
||||
target_doc.currency = frappe.get_cached_value("Company", target_doc.company, "default_currency")
|
||||
def update_item(obj, target, source_parent):
|
||||
sr_item_details = po_sr_item_dict.get(obj.name)
|
||||
ratio = flt(obj.qty) / flt(obj.fg_item_qty)
|
||||
|
||||
po_items_details = {}
|
||||
for item in source_doc.items:
|
||||
if item.purchase_order and item.purchase_order_item:
|
||||
if item.purchase_order not in po_items_details:
|
||||
po_doc = frappe.get_doc("Purchase Order", item.purchase_order)
|
||||
po_items_details[item.purchase_order] = {
|
||||
po_item.name: po_item for po_item in po_doc.items
|
||||
}
|
||||
target.update(
|
||||
{
|
||||
"qty": ratio * sr_item_details["qty"],
|
||||
"rejected_qty": ratio * sr_item_details["rejected_qty"],
|
||||
"warehouse": sr_item_details["warehouse"],
|
||||
"rejected_warehouse": sr_item_details["rejected_warehouse"],
|
||||
"subcontracting_receipt_item": sr_item_details["subcontracting_receipt_item"],
|
||||
}
|
||||
)
|
||||
|
||||
if po_item := po_items_details[item.purchase_order].get(item.purchase_order_item):
|
||||
conversion_factor = flt(po_item.qty) / flt(po_item.fg_item_qty)
|
||||
item_row = {
|
||||
"item_code": po_item.item_code,
|
||||
"item_name": po_item.item_name,
|
||||
"conversion_factor": conversion_factor,
|
||||
"qty": flt(item.qty) * conversion_factor,
|
||||
"rejected_qty": flt(item.rejected_qty) * conversion_factor,
|
||||
"uom": po_item.uom,
|
||||
"rate": po_item.rate,
|
||||
"warehouse": item.warehouse,
|
||||
"rejected_warehouse": item.rejected_warehouse,
|
||||
"purchase_order": item.purchase_order,
|
||||
"purchase_order_item": item.purchase_order_item,
|
||||
"subcontracting_receipt_item": item.name,
|
||||
"project": po_item.project,
|
||||
}
|
||||
target_doc.append("items", item_row)
|
||||
def post_process(source, target):
|
||||
target.set_missing_values()
|
||||
target.update(
|
||||
{
|
||||
"posting_date": source_doc.posting_date,
|
||||
"posting_time": source_doc.posting_time,
|
||||
"subcontracting_receipt": source_doc.name,
|
||||
"supplier_warehouse": source_doc.supplier_warehouse,
|
||||
"is_subcontracted": 1,
|
||||
"is_old_subcontracting_flow": 0,
|
||||
"currency": frappe.get_cached_value("Company", target.company, "default_currency"),
|
||||
}
|
||||
)
|
||||
|
||||
if not target_doc.items:
|
||||
frappe.throw(
|
||||
_("Purchase Order Item reference is missing in Subcontracting Receipt {0}").format(
|
||||
source_doc.name
|
||||
)
|
||||
target_doc = get_mapped_doc(
|
||||
"Purchase Order",
|
||||
po_name,
|
||||
{
|
||||
"Purchase Order": {
|
||||
"doctype": "Purchase Receipt",
|
||||
"field_map": {"supplier_warehouse": "supplier_warehouse"},
|
||||
"validation": {
|
||||
"docstatus": ["=", 1],
|
||||
},
|
||||
},
|
||||
"Purchase Order Item": {
|
||||
"doctype": "Purchase Receipt Item",
|
||||
"field_map": {
|
||||
"name": "purchase_order_item",
|
||||
"parent": "purchase_order",
|
||||
"bom": "bom",
|
||||
},
|
||||
"postprocess": update_item,
|
||||
"condition": lambda doc: doc.name in po_sr_item_dict,
|
||||
},
|
||||
"Purchase Taxes and Charges": {"doctype": "Purchase Taxes and Charges", "reset_value": True},
|
||||
},
|
||||
postprocess=post_process,
|
||||
)
|
||||
|
||||
if (save or submit) and frappe.has_permission(target_doc.doctype, "create"):
|
||||
target_doc.save()
|
||||
|
||||
if submit and frappe.has_permission(target_doc.doctype, "submit", target_doc):
|
||||
try:
|
||||
target_doc.submit()
|
||||
except Exception as e:
|
||||
target_doc.add_comment("Comment", _("Submit Action Failed") + "<br><br>" + str(e))
|
||||
|
||||
if notify:
|
||||
frappe.msgprint(
|
||||
_("Purchase Receipt {0} created.").format(
|
||||
get_link_to_form(target_doc.doctype, target_doc.name)
|
||||
),
|
||||
indicator="green",
|
||||
alert=True,
|
||||
)
|
||||
|
||||
target_doc.set_missing_values()
|
||||
|
||||
if (save or submit) and frappe.has_permission(target_doc.doctype, "create"):
|
||||
target_doc.save()
|
||||
|
||||
if submit and frappe.has_permission(target_doc.doctype, "submit", target_doc):
|
||||
try:
|
||||
target_doc.submit()
|
||||
except Exception as e:
|
||||
target_doc.add_comment("Comment", _("Submit Action Failed") + "<br><br>" + str(e))
|
||||
|
||||
if notify:
|
||||
frappe.msgprint(
|
||||
_("Purchase Receipt {0} created.").format(
|
||||
get_link_to_form(target_doc.doctype, target_doc.name)
|
||||
),
|
||||
indicator="green",
|
||||
alert=True,
|
||||
)
|
||||
|
||||
return target_doc
|
||||
return target_doc
|
||||
|
||||
@@ -1084,18 +1084,42 @@ class TestSubcontractingReceipt(IntegrationTestCase):
|
||||
|
||||
@IntegrationTestCase.change_settings("Buying Settings", {"auto_create_purchase_receipt": 1})
|
||||
def test_auto_create_purchase_receipt(self):
|
||||
from erpnext.buying.doctype.purchase_order.test_purchase_order import create_purchase_order
|
||||
|
||||
fg_item = "Subcontracted Item SA1"
|
||||
service_items = [
|
||||
{
|
||||
"warehouse": "_Test Warehouse - _TC",
|
||||
"item_code": "Subcontracted Service Item 1",
|
||||
"qty": 5,
|
||||
"qty": 10,
|
||||
"rate": 100,
|
||||
"fg_item": fg_item,
|
||||
"fg_item_qty": 5,
|
||||
},
|
||||
]
|
||||
sco = get_subcontracting_order(service_items=service_items)
|
||||
|
||||
po = create_purchase_order(
|
||||
rm_items=service_items,
|
||||
is_subcontracted=1,
|
||||
supplier_warehouse="_Test Warehouse 1 - _TC",
|
||||
do_not_submit=True,
|
||||
)
|
||||
po.append(
|
||||
"taxes",
|
||||
{
|
||||
"account_head": "_Test Account Excise Duty - _TC",
|
||||
"charge_type": "On Net Total",
|
||||
"cost_center": "_Test Cost Center - _TC",
|
||||
"description": "Excise Duty",
|
||||
"doctype": "Purchase Taxes and Charges",
|
||||
"rate": 10,
|
||||
},
|
||||
)
|
||||
po.save()
|
||||
po.submit()
|
||||
|
||||
sco = get_subcontracting_order(po_name=po.name)
|
||||
|
||||
rm_items = get_rm_items(sco.supplied_items)
|
||||
itemwise_details = make_stock_in_entry(rm_items=rm_items)
|
||||
make_stock_transfer_entry(
|
||||
@@ -1103,11 +1127,24 @@ class TestSubcontractingReceipt(IntegrationTestCase):
|
||||
rm_items=rm_items,
|
||||
itemwise_details=copy.deepcopy(itemwise_details),
|
||||
)
|
||||
|
||||
scr = make_subcontracting_receipt(sco.name)
|
||||
scr.items[0].qty = 3
|
||||
scr.save()
|
||||
scr.submit()
|
||||
|
||||
self.assertTrue(frappe.db.get_value("Purchase Receipt", {"subcontracting_receipt": scr.name}))
|
||||
pr_details = frappe.get_all(
|
||||
"Purchase Receipt",
|
||||
filters={"subcontracting_receipt": scr.name},
|
||||
fields=["name", "total_taxes_and_charges"],
|
||||
)
|
||||
|
||||
self.assertTrue(pr_details)
|
||||
|
||||
pr_qty = frappe.db.get_value("Purchase Receipt Item", {"parent": pr_details[0]["name"]}, "qty")
|
||||
self.assertEqual(pr_qty, 6)
|
||||
|
||||
self.assertEqual(pr_details[0]["total_taxes_and_charges"], 60)
|
||||
|
||||
def test_use_serial_batch_fields_for_subcontracting_receipt(self):
|
||||
fg_item = make_item(
|
||||
|
||||
Reference in New Issue
Block a user