Merge dba110d0fd into 9802333397

Merge pull request #41527 from frappe/mergify/bp/version-14-hotfix/pr-41523
fix: minor Dr and Cr between Purchase Receipt and Purchase Invoice (backport #41523)
2024-06-02 18:31:06 +00:00 · 2024-05-20 03:03:44 +00:00 · 2024-05-20 08:32:24 +05:30 · 2024-05-17 12:21:28 +00:00 · 2024-05-02 00:10:48 +00:00
2 changed files with 10 additions and 2 deletions
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@ -982,7 +982,7 @@ class PurchaseInvoice(BuyingController):
 		pr_items = frappe.get_all(
 			"Purchase Receipt Item",
 			filters={"parent": ("in", linked_purchase_receipts)},
-			fields=["name", "provisional_expense_account", "qty", "base_rate"],
+			fields=["name", "provisional_expense_account", "qty", "base_rate", "rate"],
 		)
 		default_provisional_account = self.get_company_default("default_provisional_account")
 		provisional_accounts = set(
@ -1010,6 +1010,7 @@ class PurchaseInvoice(BuyingController):
 				"provisional_account": item.provisional_expense_account or default_provisional_account,
 				"qty": item.qty,
 				"base_rate": item.base_rate,
+				"rate": item.rate,
 				"has_provisional_entry": item.name in rows_with_provisional_entries,
 			}

@ -1026,7 +1027,10 @@ class PurchaseInvoice(BuyingController):
 					self.posting_date,
 					pr_item.get("provisional_account"),
 					reverse=1,
-					item_amount=(min(item.qty, pr_item.get("qty")) * pr_item.get("base_rate")),
+					item_amount=(
+						(min(item.qty, pr_item.get("qty")) * pr_item.get("rate"))
+						* purchase_receipt_doc.get("conversion_rate")
+					),
 				)

 	def update_gross_purchase_amount_for_linked_assets(self, item):
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@ -1733,7 +1733,11 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
 		}

 		$.each(["company", "customer"], function(i, fieldname) {
+<<<<<<< HEAD
 			if(frappe.meta.has_field(me.frm.doc.doctype, fieldname) && !["Purchase Order","Purchase Invoice"].includes(me.frm.doc.doctype)) {
+=======
+			if(frappe.meta.has_field(me.frm.doc.doctype, fieldname) &&  !["Purchase Order","Purchase Invoice"].includes(me.frm.doc.doctype)) {
+>>>>>>> 0f0bc9a462 (fix: customer selection not mandatory in  purchase invoice to fetch item details (#33572))
 				if (!me.frm.doc[fieldname]) {
 					frappe.msgprint(__("Please specify") + ": " +
 						frappe.meta.get_label(me.frm.doc.doctype, fieldname, me.frm.doc.name) +
Author	SHA1	Message	Date
mergify[bot]	cfccf2496e	Merge `dba110d0fd` into `9802333397`	2024-05-20 03:03:44 +00:00
ruthra kumar	9802333397	Merge pull request #41527 from frappe/mergify/bp/version-14-hotfix/pr-41523 fix: minor Dr and Cr between Purchase Receipt and Purchase Invoice (backport #41523)	2024-05-20 08:32:24 +05:30
ruthra kumar	82d206b709	fix: minor Dr and Cr between Purchase Receipt and Purchase Invoice This applies for Provisional Accounting for Non-stock items (cherry picked from commit `1c0a24424a`)	2024-05-17 12:21:28 +00:00
vr-greycube	dba110d0fd	fix: customer selection not mandatory in purchase invoice to fetch item details (#33572 ) (cherry picked from commit `0f0bc9a462`) # Conflicts: # erpnext/public/js/controllers/transaction.js	2024-05-02 00:10:48 +00:00