Merge pull request #16576 from nabinhait/pay_reco_fix
fix: Optimising payment reconciliation queries
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
index f2d5006..0dd716d 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -231,7 +231,7 @@
item.expense_account = warehouse_account[item.warehouse]["account"]
else:
item.expense_account = stock_not_billed_account
- elif item.is_fixed_asset and d.pr_detail:
+ elif item.is_fixed_asset and item.pr_detail:
item.expense_account = asset_received_but_not_billed
elif not item.expense_account and for_validate:
throw(_("Expense account is mandatory for item {0}").format(item.item_code or item.item_name))
diff --git a/erpnext/manufacturing/doctype/job_card/job_card.py b/erpnext/manufacturing/doctype/job_card/job_card.py
index 5343a28..5ed03be 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.py
+++ b/erpnext/manufacturing/doctype/job_card/job_card.py
@@ -57,7 +57,7 @@
.format(d.idx, d.item_code))
if self.get('operation') == d.operation:
- child = self.append('items', {
+ self.append('items', {
'item_code': d.item_code,
'source_warehouse': d.source_warehouse,
'uom': frappe.db.get_value("Item", d.item_code, 'stock_uom'),
@@ -108,6 +108,10 @@
if not self.items:
self.transferred_qty = self.for_quantity if self.docstatus == 1 else 0
+ doc = frappe.get_doc('Work Order', self.get('work_order'))
+ if doc.transfer_material_against == 'Work Order' or doc.skip_transfer:
+ return
+
if self.items:
self.transferred_qty = frappe.db.get_value('Stock Entry', {
'job_card': self.name,