From a0011c5b529662d28a1e0fc623c96644fbb68c96 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Wed, 8 May 2024 16:23:46 +0200 Subject: [PATCH 01/73] fix(Sales Order): only show permitted actions (cherry picked from commit c29d95537185d909612103b65573242a91ef0d70) --- .../doctype/sales_order/sales_order.js | 128 +++++++++++------- 1 file changed, 82 insertions(+), 46 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index d95bf9811a2..8c37e2f088e 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -58,7 +58,8 @@ frappe.ui.form.on("Sales Order", { if ( frm.doc.status !== "Closed" && flt(frm.doc.per_delivered, 2) < 100 && - flt(frm.doc.per_billed, 2) < 100 + flt(frm.doc.per_billed, 2) < 100 && + frm.has_perm("write") ) { frm.add_custom_button(__("Update Items"), () => { erpnext.utils.update_child_items({ @@ -74,7 +75,8 @@ frappe.ui.form.on("Sales Order", { if ( frm.doc.__onload && frm.doc.__onload.has_unreserved_stock && - flt(frm.doc.per_picked) === 0 + flt(frm.doc.per_picked) === 0 && + frappe.model.can_create("Stock Reservation Entry") ) { frm.add_custom_button( __("Reserve"), @@ -85,7 +87,11 @@ frappe.ui.form.on("Sales Order", { } // Stock Reservation > Unreserve button will be only visible if the SO has un-delivered reserved stock. - if (frm.doc.__onload && frm.doc.__onload.has_reserved_stock) { + if ( + frm.doc.__onload && + frm.doc.__onload.has_reserved_stock && + frappe.model.can_cancel("Stock Reservation Entry") + ) { frm.add_custom_button( __("Unreserve"), () => frm.events.cancel_stock_reservation_entries(frm), @@ -94,7 +100,7 @@ frappe.ui.form.on("Sales Order", { } frm.doc.items.forEach((item) => { - if (flt(item.stock_reserved_qty) > 0) { + if (flt(item.stock_reserved_qty) > 0 && frappe.model.can_read("Stock Reservation Entry")) { frm.add_custom_button( __("Reserved Stock"), () => frm.events.show_reserved_stock(frm), @@ -142,6 +148,10 @@ frappe.ui.form.on("Sales Order", { }, get_items_from_internal_purchase_order(frm) { + if (!frappe.model.can_read("Purchase Order")) { + return; + } + frm.add_custom_button( __("Purchase Order"), () => { @@ -630,15 +640,17 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex } } - if (!doc.__onload || !doc.__onload.has_reserved_stock) { - // Don't show the `Reserve` button if the Sales Order has Picked Items. - if (flt(doc.per_picked, 2) < 100 && flt(doc.per_delivered, 2) < 100) { - this.frm.add_custom_button( - __("Pick List"), - () => this.create_pick_list(), - __("Create") - ); - } + if ( + (!doc.__onload || !doc.__onload.has_reserved_stock) && + flt(doc.per_picked, 2) < 100 && + flt(doc.per_delivered, 2) < 100 && + frappe.model.can_create("Pick List") + ) { + this.frm.add_custom_button( + __("Pick List"), + () => this.create_pick_list(), + __("Create") + ); } const order_is_a_sale = ["Sales", "Shopping Cart"].indexOf(doc.order_type) !== -1; @@ -653,20 +665,25 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex (order_is_a_sale || order_is_a_custom_sale) && allow_delivery ) { - this.frm.add_custom_button( - __("Delivery Note"), - () => this.make_delivery_note_based_on_delivery_date(true), - __("Create") - ); - this.frm.add_custom_button( - __("Work Order"), - () => this.make_work_order(), - __("Create") - ); + if (frappe.model.can_create("Delivery Note")) { + this.frm.add_custom_button( + __("Delivery Note"), + () => this.make_delivery_note_based_on_delivery_date(true), + __("Create") + ); + } + + if (frappe.model.can_create("Work Order")) { + this.frm.add_custom_button( + __("Work Order"), + () => this.make_work_order(), + __("Create") + ); + } } // sales invoice - if (flt(doc.per_billed, 2) < 100) { + if (flt(doc.per_billed, 2) < 100 && frappe.model.can_create("Sales Invoice")) { this.frm.add_custom_button( __("Sales Invoice"), () => me.make_sales_invoice(), @@ -676,8 +693,10 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex // material request if ( - !doc.order_type || - ((order_is_a_sale || order_is_a_custom_sale) && flt(doc.per_delivered, 2) < 100) + (!doc.order_type || + ((order_is_a_sale || order_is_a_custom_sale) && + flt(doc.per_delivered, 2) < 100)) && + frappe.model.can_create("Material Request") ) { this.frm.add_custom_button( __("Material Request"), @@ -692,7 +711,7 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex } // Make Purchase Order - if (!this.frm.doc.is_internal_customer) { + if (!this.frm.doc.is_internal_customer && frappe.model.can_create("Purchase Order")) { this.frm.add_custom_button( __("Purchase Order"), () => this.make_purchase_order(), @@ -702,24 +721,32 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex // maintenance if (flt(doc.per_delivered, 2) < 100 && (order_is_maintenance || order_is_a_custom_sale)) { - this.frm.add_custom_button( - __("Maintenance Visit"), - () => this.make_maintenance_visit(), - __("Create") - ); - this.frm.add_custom_button( - __("Maintenance Schedule"), - () => this.make_maintenance_schedule(), - __("Create") - ); + if (frappe.model.can_create("Maintenance Visit")) { + this.frm.add_custom_button( + __("Maintenance Visit"), + () => this.make_maintenance_visit(), + __("Create") + ); + } + if (frappe.model.can_create("Maintenance Schedule")) { + this.frm.add_custom_button( + __("Maintenance Schedule"), + () => this.make_maintenance_schedule(), + __("Create") + ); + } } // project - if (flt(doc.per_delivered, 2) < 100) { + if (flt(doc.per_delivered, 2) < 100 && frappe.model.can_create("Project")) { this.frm.add_custom_button(__("Project"), () => this.make_project(), __("Create")); } - if (doc.docstatus === 1 && !doc.inter_company_order_reference) { + if ( + doc.docstatus === 1 && + !doc.inter_company_order_reference && + frappe.model.can_create("Purchase Order") + ) { let me = this; let internal = me.frm.doc.is_internal_customer; if (internal) { @@ -743,18 +770,27 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex flt(doc.per_billed, precision("per_billed", doc)) < 100 + frappe.boot.sysdefaults.over_billing_allowance ) { - this.frm.add_custom_button( - __("Payment Request"), - () => this.make_payment_request(), - __("Create") - ); - this.frm.add_custom_button(__("Payment"), () => this.make_payment_entry(), __("Create")); + if (frappe.model.can_create("Payment Request")) { + this.frm.add_custom_button( + __("Payment Request"), + () => this.make_payment_request(), + __("Create") + ); + } + + if (frappe.model.can_create("Payment Entry")) { + this.frm.add_custom_button( + __("Payment"), + () => this.make_payment_entry(), + __("Create") + ); + } } this.frm.page.set_inner_btn_group_as_primary(__("Create")); } } - if (this.frm.doc.docstatus === 0) { + if (this.frm.doc.docstatus === 0 && frappe.model.can_read("Quotation")) { this.frm.add_custom_button( __("Quotation"), function () { From cef6d0d74d11067e29e58d080fa09a328a5f016a Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Wed, 8 May 2024 17:55:16 +0200 Subject: [PATCH 02/73] fix(Delivery Note): only show permitted actions (cherry picked from commit 418bdc1dcc0c8c8eaaa6555b3689436515270c7c) --- erpnext/public/js/controllers/transaction.js | 2 +- .../doctype/delivery_note/delivery_note.js | 132 +++++++++++------- 2 files changed, 81 insertions(+), 53 deletions(-) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index b421aeebfb3..a0685d80985 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -325,7 +325,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe } const me = this; - if (!this.frm.is_new() && this.frm.doc.docstatus === 0) { + if (!this.frm.is_new() && this.frm.doc.docstatus === 0 && frappe.model.can_create("Quality Inspection")) { this.frm.add_custom_button(__("Quality Inspection(s)"), () => { me.make_quality_inspection(); }, __("Create")); diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js index 23d0adc5708..06881c99c12 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.js +++ b/erpnext/stock/doctype/delivery_note/delivery_note.js @@ -79,7 +79,12 @@ frappe.ui.form.on("Delivery Note", { }, refresh: function (frm) { - if (frm.doc.docstatus === 1 && frm.doc.is_return === 1 && frm.doc.per_billed !== 100) { + if ( + frm.doc.docstatus === 1 && + frm.doc.is_return === 1 && + frm.doc.per_billed !== 100 && + frappe.model.can_create("Sales Invoice") + ) { frm.add_custom_button( __("Credit Note"), function () { @@ -93,7 +98,11 @@ frappe.ui.form.on("Delivery Note", { frm.page.set_inner_btn_group_as_primary(__("Create")); } - if (frm.doc.docstatus == 1 && !frm.doc.inter_company_reference) { + if ( + frm.doc.docstatus == 1 && + !frm.doc.inter_company_reference && + frappe.model.can_create("Purchase Receipt") + ) { let internal = frm.doc.is_internal_customer; if (internal) { let button_label = @@ -140,42 +149,46 @@ erpnext.stock.DeliveryNoteController = class DeliveryNoteController extends ( refresh(doc, dt, dn) { var me = this; super.refresh(); - if (!doc.is_return && (doc.status != "Closed" || this.frm.is_new())) { - if (this.frm.doc.docstatus === 0) { - this.frm.add_custom_button( - __("Sales Order"), - function () { - if (!me.frm.doc.customer) { - frappe.throw({ - title: __("Mandatory"), - message: __("Please Select a Customer"), - }); - } - erpnext.utils.map_current_doc({ - method: "erpnext.selling.doctype.sales_order.sales_order.make_delivery_note", - args: { - for_reserved_stock: 1, - }, - source_doctype: "Sales Order", - target: me.frm, - setters: { - customer: me.frm.doc.customer, - }, - get_query_filters: { - docstatus: 1, - status: ["not in", ["Closed", "On Hold"]], - per_delivered: ["<", 99.99], - company: me.frm.doc.company, - project: me.frm.doc.project || undefined, - }, + if ( + !doc.is_return && + (doc.status != "Closed" || this.frm.is_new()) && + this.frm.has_perm("write") && + frappe.model.can_read("Sales Order") && + this.frm.doc.docstatus === 0 + ) { + this.frm.add_custom_button( + __("Sales Order"), + function () { + if (!me.frm.doc.customer) { + frappe.throw({ + title: __("Mandatory"), + message: __("Please Select a Customer"), }); - }, - __("Get Items From") - ); - } + } + erpnext.utils.map_current_doc({ + method: "erpnext.selling.doctype.sales_order.sales_order.make_delivery_note", + args: { + for_reserved_stock: 1, + }, + source_doctype: "Sales Order", + target: me.frm, + setters: { + customer: me.frm.doc.customer, + }, + get_query_filters: { + docstatus: 1, + status: ["not in", ["Closed", "On Hold"]], + per_delivered: ["<", 99.99], + company: me.frm.doc.company, + project: me.frm.doc.project || undefined, + }, + }); + }, + __("Get Items From") + ); } - if (!doc.is_return && doc.status != "Closed") { + if (!doc.is_return && doc.status != "Closed" && frappe.model.can_create("Shipment")) { if (doc.docstatus == 1) { this.frm.add_custom_button( __("Shipment"), @@ -186,7 +199,11 @@ erpnext.stock.DeliveryNoteController = class DeliveryNoteController extends ( ); } - if (flt(doc.per_installed, 2) < 100 && doc.docstatus == 1) + if ( + flt(doc.per_installed, 2) < 100 && + doc.docstatus == 1 && + frappe.model.can_create("Installation Note") + ) { this.frm.add_custom_button( __("Installation Note"), function () { @@ -194,8 +211,9 @@ erpnext.stock.DeliveryNoteController = class DeliveryNoteController extends ( }, __("Create") ); + } - if (doc.docstatus == 1) { + if (doc.docstatus == 1 && this.frm.has_perm("create")) { this.frm.add_custom_button( __("Sales Return"), function () { @@ -205,7 +223,7 @@ erpnext.stock.DeliveryNoteController = class DeliveryNoteController extends ( ); } - if (doc.docstatus == 1) { + if (doc.docstatus == 1 && frappe.model.can_create("Delivery Trip")) { this.frm.add_custom_button( __("Delivery Trip"), function () { @@ -215,19 +233,23 @@ erpnext.stock.DeliveryNoteController = class DeliveryNoteController extends ( ); } - if (doc.docstatus == 0 && !doc.__islocal) { - if (doc.__onload && doc.__onload.has_unpacked_items) { - this.frm.add_custom_button( - __("Packing Slip"), - function () { - frappe.model.open_mapped_doc({ - method: "erpnext.stock.doctype.delivery_note.delivery_note.make_packing_slip", - frm: me.frm, - }); - }, - __("Create") - ); - } + if ( + doc.docstatus == 0 && + !doc.__islocal && + doc.__onload && + doc.__onload.has_unpacked_items && + frappe.model.can_create("Packing Slip") + ) { + this.frm.add_custom_button( + __("Packing Slip"), + function () { + frappe.model.open_mapped_doc({ + method: "erpnext.stock.doctype.delivery_note.delivery_note.make_packing_slip", + frm: me.frm, + }); + }, + __("Create") + ); } if (!doc.__islocal && doc.docstatus == 1) { @@ -254,7 +276,13 @@ erpnext.stock.DeliveryNoteController = class DeliveryNoteController extends ( } } - if (doc.docstatus == 1 && !doc.is_return && doc.status != "Closed" && flt(doc.per_billed) < 100) { + if ( + doc.docstatus == 1 && + !doc.is_return && + doc.status != "Closed" && + flt(doc.per_billed) < 100 && + frappe.model.can_create("Sales Invoice") + ) { // show Make Invoice button only if Delivery Note is not created from Sales Invoice var from_sales_invoice = false; from_sales_invoice = me.frm.doc.items.some(function (item) { From c10b123a817ba0e1285a607c8514b57747d0ebf5 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 20 Jun 2024 17:04:58 +0530 Subject: [PATCH 03/73] fix: do not show zero balance stock items in stock balance report (backport #41958) (#41961) fix: do not show zero balance stock in stock balance (cherry picked from commit 7f7b363d487983ee396c4921b4047074551ec47a) Co-authored-by: Rohit Waghchaure --- erpnext/stock/report/stock_balance/stock_balance.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/stock/report/stock_balance/stock_balance.py b/erpnext/stock/report/stock_balance/stock_balance.py index 64ad36ff5b1..27d9f1164bc 100644 --- a/erpnext/stock/report/stock_balance/stock_balance.py +++ b/erpnext/stock/report/stock_balance/stock_balance.py @@ -137,6 +137,10 @@ class StockBalanceReport: report_data.update( {"reserved_stock": sre_details.get((report_data.item_code, report_data.warehouse), 0.0)} ) + + if report_data and report_data.bal_qty == 0 and report_data.bal_val == 0: + continue + self.data.append(report_data) def get_item_warehouse_map(self): From 48dc24b9bf65e788bffc700f4002f66cef9bcfed Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 20 Jun 2024 17:05:39 +0530 Subject: [PATCH 04/73] fix: add string for translation (backport #41903) (#41963) fix: add string for translation (#41903) fix: add string for translation (cherry picked from commit f28c692dca5db94460de8828a3f5d6faee9aed05) Co-authored-by: mahsem <137205921+mahsem@users.noreply.github.com> --- erpnext/stock/doctype/stock_settings/stock_settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.js b/erpnext/stock/doctype/stock_settings/stock_settings.js index 0443f3f1ece..79638590f9b 100644 --- a/erpnext/stock/doctype/stock_settings/stock_settings.js +++ b/erpnext/stock/doctype/stock_settings/stock_settings.js @@ -41,7 +41,7 @@ frappe.ui.form.on("Stock Settings", { msg += " "; msg += __("This is considered dangerous from accounting point of view."); msg += "
"; - msg += "Do you still want to enable negative inventory?"; + msg += __("Do you still want to enable negative inventory?"); frappe.confirm( msg, From 9bad219f0a755898a798569f90e6b162317f7912 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Thu, 20 Jun 2024 14:28:24 +0200 Subject: [PATCH 05/73] refactor: remove use of can_create for Payment Request (#41647) (cherry picked from commit 47bc5691a1579b88e0a430f6fbe5ff6309486ccf) --- erpnext/selling/doctype/sales_order/sales_order.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index 361c8550597..e732dfd42d5 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -774,13 +774,11 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex flt(doc.per_billed, precision("per_billed", doc)) < 100 + frappe.boot.sysdefaults.over_billing_allowance ) { - if (frappe.model.can_create("Payment Request")) { - this.frm.add_custom_button( - __("Payment Request"), - () => this.make_payment_request(), - __("Create") - ); - } + this.frm.add_custom_button( + __("Payment Request"), + () => this.make_payment_request(), + __("Create") + ); if (frappe.model.can_create("Payment Entry")) { this.frm.add_custom_button( From 21802396ce0659de9097074916b3144ce576171e Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Thu, 20 Jun 2024 14:32:01 +0200 Subject: [PATCH 06/73] fix: move condition for shipment --- erpnext/stock/doctype/delivery_note/delivery_note.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js index 06881c99c12..3352b53343a 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.js +++ b/erpnext/stock/doctype/delivery_note/delivery_note.js @@ -188,8 +188,8 @@ erpnext.stock.DeliveryNoteController = class DeliveryNoteController extends ( ); } - if (!doc.is_return && doc.status != "Closed" && frappe.model.can_create("Shipment")) { - if (doc.docstatus == 1) { + if (!doc.is_return && doc.status != "Closed") { + if (doc.docstatus == 1 && frappe.model.can_create("Shipment")) { this.frm.add_custom_button( __("Shipment"), function () { From 77f4199e2ad4b1b7b2b4122a67affcc2d845a80b Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Thu, 20 Jun 2024 12:00:25 +0530 Subject: [PATCH 07/73] fix: incorrect discount on other item When discount is applied on other item, don't update `discount_amount` as the amount is calculated for current item (cherry picked from commit 654764e398a8315a7eeb056f616b939ac98b6646) --- erpnext/public/js/controllers/transaction.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index 524d3033579..950914953aa 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -1733,6 +1733,10 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe me.frm.doc.items.forEach(d => { if (in_list(JSON.parse(data.apply_rule_on_other_items), d[data.apply_rule_on])) { for(var k in data) { + if (data.pricing_rule_for == "Discount Percentage" && data.apply_rule_on_other_items && k == "discount_amount") { + continue; + } + 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]); } From a41577a1cd901f7c66256f9bb877af1ddc610913 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Fri, 21 Jun 2024 17:21:32 +0530 Subject: [PATCH 08/73] fix: incorrect against_account upon reposting (cherry picked from commit 20c4098399d5cb276d373074036a738e6cee67b0) --- .../accounts/doctype/purchase_invoice/purchase_invoice.py | 6 +++++- .../repost_accounting_ledger/repost_accounting_ledger.py | 4 ++++ erpnext/accounts/doctype/sales_invoice/sales_invoice.py | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py index fba60cef632..dce742d1021 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -593,7 +593,7 @@ class PurchaseInvoice(BuyingController): for item in self.get("items"): validate_account_head(item.idx, item.expense_account, self.company, "Expense") - def set_against_expense_account(self): + def set_against_expense_account(self, force=False): against_accounts = [] for item in self.get("items"): if item.expense_account and (item.expense_account not in against_accounts): @@ -601,6 +601,10 @@ class PurchaseInvoice(BuyingController): self.against_expense_account = ",".join(against_accounts) + def force_set_against_expense_account(self): + self.set_against_expense_account() + frappe.db.set_value(self.doctype, self.name, "against_expense_account", self.against_expense_account) + def po_required(self): if frappe.db.get_value("Buying Settings", None, "po_required") == "Yes": if frappe.get_value( diff --git a/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py b/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py index 6bc19222c98..8c8ba633df0 100644 --- a/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py +++ b/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py @@ -167,6 +167,10 @@ def start_repost(account_repost_doc=str) -> None: doc.make_gl_entries_on_cancel() doc.docstatus = 1 + if doc.doctype == "Sales Invoice": + doc.force_set_against_income_account() + else: + doc.force_set_against_expense_account() doc.make_gl_entries() elif doc.doctype in ["Payment Entry", "Journal Entry", "Expense Claim"]: diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index cb0803db932..babcb417f23 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -943,6 +943,10 @@ class SalesInvoice(SellingController): against_acc.append(d.income_account) self.against_income_account = ",".join(against_acc) + def force_set_against_income_account(self): + self.set_against_income_account() + frappe.db.set_value(self.doctype, self.name, "against_income_account", self.against_income_account) + def add_remarks(self): if not self.remarks: if self.po_no and self.po_date: From 9945a90b3fdfdbe95c7205c7228372d3b47e0ce6 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2024 18:26:05 +0530 Subject: [PATCH 09/73] fix: decimal issue in pick list (backport #41972) (#41982) fix: decimal issue in pick list (#41972) (cherry picked from commit 21adc7b63e742389a107d4df6a939ebbf23b196b) Co-authored-by: rohitwaghchaure --- erpnext/stock/doctype/pick_list/pick_list.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/doctype/pick_list/pick_list.py b/erpnext/stock/doctype/pick_list/pick_list.py index 4b5ab3836c5..69a1bdf17d8 100644 --- a/erpnext/stock/doctype/pick_list/pick_list.py +++ b/erpnext/stock/doctype/pick_list/pick_list.py @@ -693,7 +693,8 @@ def get_items_with_location_and_quantity(item_doc, item_location_map, docstatus) # if stock qty is zero on submitted entry, show positive remaining qty to recalculate in case of restock. remaining_stock_qty = item_doc.qty if (docstatus == 1 and item_doc.stock_qty == 0) else item_doc.stock_qty - while flt(remaining_stock_qty) > 0 and available_locations: + precision = frappe.get_precision("Pick List Item", "qty") + while flt(remaining_stock_qty, precision) > 0 and available_locations: item_location = available_locations.pop(0) item_location = frappe._dict(item_location) @@ -838,6 +839,7 @@ def validate_picked_materials(item_code, required_qty, locations, picked_item_de def filter_locations_by_picked_materials(locations, picked_item_details) -> list[dict]: filterd_locations = [] + precision = frappe.get_precision("Pick List Item", "qty") for row in locations: key = row.warehouse if row.batch_no: @@ -856,7 +858,7 @@ def filter_locations_by_picked_materials(locations, picked_item_details) -> list if row.serial_nos: row.serial_nos = list(set(row.serial_nos) - set(picked_item_details[key].get("serial_no"))) - if row.qty > 0: + if flt(row.qty, precision) > 0: filterd_locations.append(row) return filterd_locations From ca343f12d8abcb7441868490249cb29df5f3f6a5 Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Tue, 28 May 2024 20:37:52 +0530 Subject: [PATCH 10/73] =?UTF-8?q?refactor:=20renamed=20number=20of=20depre?= =?UTF-8?q?ciations=20booked=20to=20opening=20booked=20de=E2=80=A6=20(#415?= =?UTF-8?q?15)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: renamed number of depreciations booked to opening booked depreciations * feat: introduced new field for showing total number of booked depreciations --- .../doctype/journal_entry/journal_entry.py | 24 ++++++++++++ erpnext/assets/doctype/asset/asset.json | 16 ++++---- erpnext/assets/doctype/asset/asset.py | 27 ++++++++++---- erpnext/assets/doctype/asset/depreciation.py | 1 + erpnext/assets/doctype/asset/test_asset.py | 26 ++++++------- .../asset_depreciation_schedule.json | 6 +-- .../asset_depreciation_schedule.py | 30 ++++++++------- .../test_asset_depreciation_schedule.py | 37 ++++++++++++++++++- .../asset_finance_book.json | 10 ++++- .../asset_finance_book/asset_finance_book.py | 1 + .../doctype/asset_repair/asset_repair.py | 4 +- erpnext/patches.txt | 1 + ...sset_depreciation_schedules_from_assets.py | 2 +- ..._booked_to_opening_booked_depreciations.py | 7 ++++ .../update_gpa_and_ndb_for_assdeprsch.py | 4 +- 15 files changed, 144 insertions(+), 52 deletions(-) create mode 100644 erpnext/patches/v15_0/rename_number_of_depreciations_booked_to_opening_booked_depreciations.py diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index 3ec47ff022a..554217ab6b9 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -194,6 +194,7 @@ class JournalEntry(AccountsController): self.update_asset_value() self.update_inter_company_jv() self.update_invoice_discounting() + self.update_booked_depreciation() def on_update_after_submit(self): if hasattr(self, "repost_required"): @@ -225,6 +226,7 @@ class JournalEntry(AccountsController): self.unlink_inter_company_jv() self.unlink_asset_adjustment_entry() self.update_invoice_discounting() + self.update_booked_depreciation() def get_title(self): return self.pay_to_recd_from or self.accounts[0].account @@ -439,6 +441,28 @@ class JournalEntry(AccountsController): if status: inv_disc_doc.set_status(status=status) + def update_booked_depreciation(self): + for d in self.get("accounts"): + if ( + self.voucher_type == "Depreciation Entry" + and d.reference_type == "Asset" + and d.reference_name + and frappe.get_cached_value("Account", d.account, "root_type") == "Expense" + and d.debit + ): + asset = frappe.get_doc("Asset", d.reference_name) + for fb_row in asset.get("finance_books"): + if fb_row.finance_book == self.finance_book: + depr_schedule = get_depr_schedule(asset.name, "Active", fb_row.finance_book) + total_number_of_booked_depreciations = asset.opening_number_of_booked_depreciations + for je in depr_schedule: + if je.journal_entry: + total_number_of_booked_depreciations += 1 + fb_row.db_set( + "total_number_of_booked_depreciations", total_number_of_booked_depreciations + ) + break + def unlink_advance_entry_reference(self): for d in self.get("accounts"): if d.is_advance == "Yes" and d.reference_type in ("Sales Invoice", "Purchase Invoice"): diff --git a/erpnext/assets/doctype/asset/asset.json b/erpnext/assets/doctype/asset/asset.json index 3a2a942bdf2..99a430cbb40 100644 --- a/erpnext/assets/doctype/asset/asset.json +++ b/erpnext/assets/doctype/asset/asset.json @@ -45,7 +45,7 @@ "calculate_depreciation", "column_break_33", "opening_accumulated_depreciation", - "number_of_depreciations_booked", + "opening_number_of_booked_depreciations", "is_fully_depreciated", "section_break_36", "finance_books", @@ -257,12 +257,6 @@ "label": "Opening Accumulated Depreciation", "options": "Company:company:default_currency" }, - { - "depends_on": "eval:(doc.is_existing_asset)", - "fieldname": "number_of_depreciations_booked", - "fieldtype": "Int", - "label": "Number of Depreciations Booked" - }, { "collapsible": 1, "collapsible_depends_on": "eval:doc.calculate_depreciation || doc.is_existing_asset", @@ -546,6 +540,12 @@ "no_copy": 1, "print_hide": 1, "read_only": 1 + }, + { + "depends_on": "eval:(doc.is_existing_asset)", + "fieldname": "opening_number_of_booked_depreciations", + "fieldtype": "Int", + "label": "Opening Number of Booked Depreciations" } ], "idx": 72, @@ -589,7 +589,7 @@ "link_fieldname": "target_asset" } ], - "modified": "2024-04-18 16:45:47.306032", + "modified": "2024-05-21 13:46:21.066483", "modified_by": "Administrator", "module": "Assets", "name": "Asset", diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py index 063a5447ab5..8641bb33fad 100644 --- a/erpnext/assets/doctype/asset/asset.py +++ b/erpnext/assets/doctype/asset/asset.py @@ -89,8 +89,8 @@ class Asset(AccountsController): maintenance_required: DF.Check naming_series: DF.Literal["ACC-ASS-.YYYY.-"] next_depreciation_date: DF.Date | None - number_of_depreciations_booked: DF.Int opening_accumulated_depreciation: DF.Currency + opening_number_of_booked_depreciations: DF.Int policy_number: DF.Data | None purchase_amount: DF.Currency purchase_date: DF.Date | None @@ -145,7 +145,7 @@ class Asset(AccountsController): "Asset Depreciation Schedules created:
{0}

Please check, edit if needed, and submit the Asset." ).format(asset_depr_schedules_links) ) - + self.set_total_booked_depreciations() self.total_asset_cost = self.gross_purchase_amount self.status = self.get_status() @@ -417,7 +417,7 @@ class Asset(AccountsController): if not self.is_existing_asset: self.opening_accumulated_depreciation = 0 - self.number_of_depreciations_booked = 0 + self.opening_number_of_booked_depreciations = 0 else: depreciable_amount = flt(self.gross_purchase_amount) - flt(row.expected_value_after_useful_life) if flt(self.opening_accumulated_depreciation) > depreciable_amount: @@ -428,15 +428,15 @@ class Asset(AccountsController): ) if self.opening_accumulated_depreciation: - if not self.number_of_depreciations_booked: - frappe.throw(_("Please set Number of Depreciations Booked")) + if not self.opening_number_of_booked_depreciations: + frappe.throw(_("Please set Opening Number of Booked Depreciations")) else: - self.number_of_depreciations_booked = 0 + self.opening_number_of_booked_depreciations = 0 - if flt(row.total_number_of_depreciations) <= cint(self.number_of_depreciations_booked): + if flt(row.total_number_of_depreciations) <= cint(self.opening_number_of_booked_depreciations): frappe.throw( _( - "Row {0}: Total Number of Depreciations cannot be less than or equal to Number of Depreciations Booked" + "Row {0}: Total Number of Depreciations cannot be less than or equal to Opening Number of Booked Depreciations" ).format(row.idx), title=_("Invalid Schedule"), ) @@ -457,6 +457,17 @@ class Asset(AccountsController): ).format(row.idx) ) + def set_total_booked_depreciations(self): + # set value of total number of booked depreciations field + for fb_row in self.get("finance_books"): + total_number_of_booked_depreciations = self.opening_number_of_booked_depreciations + depr_schedule = get_depr_schedule(self.name, "Active", fb_row.finance_book) + if depr_schedule: + for je in depr_schedule: + if je.journal_entry: + total_number_of_booked_depreciations += 1 + fb_row.db_set("total_number_of_booked_depreciations", total_number_of_booked_depreciations) + def validate_expected_value_after_useful_life(self): for row in self.get("finance_books"): depr_schedule = get_depr_schedule(self.name, "Draft", row.finance_book) diff --git a/erpnext/assets/doctype/asset/depreciation.py b/erpnext/assets/doctype/asset/depreciation.py index 2c54f55f25c..cc8defc5fe6 100644 --- a/erpnext/assets/doctype/asset/depreciation.py +++ b/erpnext/assets/doctype/asset/depreciation.py @@ -323,6 +323,7 @@ def _make_journal_entry_for_depreciation( if not je.meta.get_workflow(): je.submit() + asset.reload() idx = cint(asset_depr_schedule_doc.finance_book_id) row = asset.get("finance_books")[idx - 1] row.value_after_depreciation -= depr_schedule.depreciation_amount diff --git a/erpnext/assets/doctype/asset/test_asset.py b/erpnext/assets/doctype/asset/test_asset.py index 7e0c3ad6888..07608e7144e 100644 --- a/erpnext/assets/doctype/asset/test_asset.py +++ b/erpnext/assets/doctype/asset/test_asset.py @@ -355,7 +355,7 @@ class TestAsset(AssetSetup): purchase_date="2020-04-01", expected_value_after_useful_life=0, total_number_of_depreciations=5, - number_of_depreciations_booked=2, + opening_number_of_booked_depreciations=2, frequency_of_depreciation=12, depreciation_start_date="2023-03-31", opening_accumulated_depreciation=24000, @@ -453,7 +453,7 @@ class TestAsset(AssetSetup): purchase_date="2020-01-01", expected_value_after_useful_life=0, total_number_of_depreciations=6, - number_of_depreciations_booked=1, + opening_number_of_booked_depreciations=1, frequency_of_depreciation=10, depreciation_start_date="2021-01-01", opening_accumulated_depreciation=20000, @@ -739,7 +739,7 @@ class TestDepreciationMethods(AssetSetup): calculate_depreciation=1, available_for_use_date="2030-06-06", is_existing_asset=1, - number_of_depreciations_booked=2, + opening_number_of_booked_depreciations=2, opening_accumulated_depreciation=47095.89, expected_value_after_useful_life=10000, depreciation_start_date="2032-12-31", @@ -789,7 +789,7 @@ class TestDepreciationMethods(AssetSetup): available_for_use_date="2030-01-01", is_existing_asset=1, depreciation_method="Double Declining Balance", - number_of_depreciations_booked=1, + opening_number_of_booked_depreciations=1, opening_accumulated_depreciation=50000, expected_value_after_useful_life=10000, depreciation_start_date="2031-12-31", @@ -1123,8 +1123,8 @@ class TestDepreciationBasics(AssetSetup): self.assertRaises(frappe.ValidationError, asset.save) - def test_number_of_depreciations_booked(self): - """Tests if an error is raised when number_of_depreciations_booked is not specified when opening_accumulated_depreciation is.""" + def test_opening_booked_depreciations(self): + """Tests if an error is raised when opening_number_of_booked_depreciations is not specified when opening_accumulated_depreciation is.""" asset = create_asset( item_code="Macbook Pro", @@ -1140,9 +1140,9 @@ class TestDepreciationBasics(AssetSetup): self.assertRaises(frappe.ValidationError, asset.save) def test_number_of_depreciations(self): - """Tests if an error is raised when number_of_depreciations_booked >= total_number_of_depreciations.""" + """Tests if an error is raised when opening_number_of_booked_depreciations >= total_number_of_depreciations.""" - # number_of_depreciations_booked > total_number_of_depreciations + # opening_number_of_booked_depreciations > total_number_of_depreciations asset = create_asset( item_code="Macbook Pro", calculate_depreciation=1, @@ -1151,13 +1151,13 @@ class TestDepreciationBasics(AssetSetup): expected_value_after_useful_life=10000, depreciation_start_date="2020-07-01", opening_accumulated_depreciation=10000, - number_of_depreciations_booked=5, + opening_number_of_booked_depreciations=5, do_not_save=1, ) self.assertRaises(frappe.ValidationError, asset.save) - # number_of_depreciations_booked = total_number_of_depreciations + # opening_number_of_booked_depreciations = total_number_of_depreciations asset_2 = create_asset( item_code="Macbook Pro", calculate_depreciation=1, @@ -1166,7 +1166,7 @@ class TestDepreciationBasics(AssetSetup): expected_value_after_useful_life=10000, depreciation_start_date="2020-07-01", opening_accumulated_depreciation=10000, - number_of_depreciations_booked=5, + opening_number_of_booked_depreciations=5, do_not_save=1, ) @@ -1502,7 +1502,7 @@ class TestDepreciationBasics(AssetSetup): asset = create_asset(calculate_depreciation=1) asset.opening_accumulated_depreciation = 2000 - asset.number_of_depreciations_booked = 1 + asset.opening_number_of_booked_depreciations = 1 asset.finance_books[0].expected_value_after_useful_life = 100 asset.save() @@ -1696,7 +1696,7 @@ def create_asset(**args): "purchase_date": args.purchase_date or "2015-01-01", "calculate_depreciation": args.calculate_depreciation or 0, "opening_accumulated_depreciation": args.opening_accumulated_depreciation or 0, - "number_of_depreciations_booked": args.number_of_depreciations_booked or 0, + "opening_number_of_booked_depreciations": args.opening_number_of_booked_depreciations or 0, "gross_purchase_amount": args.gross_purchase_amount or 100000, "purchase_amount": args.purchase_amount or 100000, "maintenance_required": args.maintenance_required or 0, diff --git a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json index 73838163d3a..36ee7402576 100644 --- a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json +++ b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -13,7 +13,7 @@ "column_break_2", "gross_purchase_amount", "opening_accumulated_depreciation", - "number_of_depreciations_booked", + "opening_number_of_booked_depreciations", "finance_book", "finance_book_id", "depreciation_details_section", @@ -171,10 +171,10 @@ "read_only": 1 }, { - "fieldname": "number_of_depreciations_booked", + "fieldname": "opening_number_of_booked_depreciations", "fieldtype": "Int", "hidden": 1, - "label": "Number of Depreciations Booked", + "label": "Opening Number of Booked Depreciations", "print_hide": 1, "read_only": 1 }, diff --git a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py index f64e9123dc0..d9fc5b3dd47 100644 --- a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py +++ b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py @@ -50,7 +50,7 @@ class AssetDepreciationSchedule(Document): gross_purchase_amount: DF.Currency naming_series: DF.Literal["ACC-ADS-.YYYY.-"] notes: DF.SmallText | None - number_of_depreciations_booked: DF.Int + opening_number_of_booked_depreciations: DF.Int opening_accumulated_depreciation: DF.Currency rate_of_depreciation: DF.Percent shift_based: DF.Check @@ -161,7 +161,7 @@ class AssetDepreciationSchedule(Document): return ( asset_doc.gross_purchase_amount != self.gross_purchase_amount or asset_doc.opening_accumulated_depreciation != self.opening_accumulated_depreciation - or asset_doc.number_of_depreciations_booked != self.number_of_depreciations_booked + or asset_doc.opening_number_of_booked_depreciations != self.opening_number_of_booked_depreciations ) def not_manual_depr_or_have_manual_depr_details_been_modified(self, row): @@ -194,7 +194,7 @@ class AssetDepreciationSchedule(Document): self.finance_book = row.finance_book self.finance_book_id = row.idx self.opening_accumulated_depreciation = asset_doc.opening_accumulated_depreciation or 0 - self.number_of_depreciations_booked = asset_doc.number_of_depreciations_booked or 0 + self.opening_number_of_booked_depreciations = asset_doc.opening_number_of_booked_depreciations or 0 self.gross_purchase_amount = asset_doc.gross_purchase_amount self.depreciation_method = row.depreciation_method self.total_number_of_depreciations = row.total_number_of_depreciations @@ -263,7 +263,7 @@ class AssetDepreciationSchedule(Document): row.db_update() final_number_of_depreciations = cint(row.total_number_of_depreciations) - cint( - self.number_of_depreciations_booked + self.opening_number_of_booked_depreciations ) has_pro_rata = _check_is_pro_rata(asset_doc, row) @@ -328,7 +328,7 @@ class AssetDepreciationSchedule(Document): if date_of_disposal and getdate(schedule_date) >= getdate(date_of_disposal): from_date = add_months( getdate(asset_doc.available_for_use_date), - (asset_doc.number_of_depreciations_booked * row.frequency_of_depreciation), + (asset_doc.opening_number_of_booked_depreciations * row.frequency_of_depreciation), ) if self.depreciation_schedule: from_date = self.depreciation_schedule[-1].schedule_date @@ -378,13 +378,16 @@ class AssetDepreciationSchedule(Document): from_date = get_last_day( add_months( getdate(asset_doc.available_for_use_date), - ((self.number_of_depreciations_booked - 1) * row.frequency_of_depreciation), + ( + (self.opening_number_of_booked_depreciations - 1) + * row.frequency_of_depreciation + ), ) ) else: from_date = add_months( getdate(add_days(asset_doc.available_for_use_date, -1)), - (self.number_of_depreciations_booked * row.frequency_of_depreciation), + (self.opening_number_of_booked_depreciations * row.frequency_of_depreciation), ) depreciation_amount, days, months = _get_pro_rata_amt( row, @@ -400,7 +403,8 @@ class AssetDepreciationSchedule(Document): # In case of increase_in_asset_life, the asset.to_date is already set on asset_repair submission asset_doc.to_date = add_months( asset_doc.available_for_use_date, - (n + self.number_of_depreciations_booked) * cint(row.frequency_of_depreciation), + (n + self.opening_number_of_booked_depreciations) + * cint(row.frequency_of_depreciation), ) depreciation_amount_without_pro_rata = depreciation_amount @@ -546,7 +550,7 @@ def _check_is_pro_rata(asset_doc, row, wdv_or_dd_non_yearly=False): has_pro_rata = False # if not existing asset, from_date = available_for_use_date - # otherwise, if number_of_depreciations_booked = 2, available_for_use_date = 01/01/2020 and frequency_of_depreciation = 12 + # otherwise, if opening_number_of_booked_depreciations = 2, available_for_use_date = 01/01/2020 and frequency_of_depreciation = 12 # from_date = 01/01/2022 from_date = _get_modified_available_for_use_date(asset_doc, row, wdv_or_dd_non_yearly) days = date_diff(row.depreciation_start_date, from_date) + 1 @@ -567,12 +571,12 @@ def _get_modified_available_for_use_date(asset_doc, row, wdv_or_dd_non_yearly=Fa if wdv_or_dd_non_yearly: return add_months( asset_doc.available_for_use_date, - (asset_doc.number_of_depreciations_booked * 12), + (asset_doc.opening_number_of_booked_depreciations * 12), ) else: return add_months( asset_doc.available_for_use_date, - (asset_doc.number_of_depreciations_booked * row.frequency_of_depreciation), + (asset_doc.opening_number_of_booked_depreciations * row.frequency_of_depreciation), ) @@ -678,7 +682,7 @@ def get_straight_line_or_manual_depr_amount( flt(asset.gross_purchase_amount) - flt(asset.opening_accumulated_depreciation) - flt(row.expected_value_after_useful_life) - ) / flt(row.total_number_of_depreciations - asset.number_of_depreciations_booked) + ) / flt(row.total_number_of_depreciations - asset.opening_number_of_booked_depreciations) def get_daily_prorata_based_straight_line_depr( @@ -704,7 +708,7 @@ def get_shift_depr_amount(asset_depr_schedule, asset, row, schedule_idx): flt(asset.gross_purchase_amount) - flt(asset.opening_accumulated_depreciation) - flt(row.expected_value_after_useful_life) - ) / flt(row.total_number_of_depreciations - asset.number_of_depreciations_booked) + ) / flt(row.total_number_of_depreciations - asset.opening_number_of_booked_depreciations) asset_shift_factors_map = get_asset_shift_factors_map() shift = ( diff --git a/erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py b/erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py index 6e4966ac6cf..6009ac1496c 100644 --- a/erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py +++ b/erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py @@ -5,6 +5,9 @@ import frappe from frappe.tests.utils import FrappeTestCase from frappe.utils import cstr +from erpnext.assets.doctype.asset.depreciation import ( + post_depreciation_entries, +) from erpnext.assets.doctype.asset.test_asset import create_asset, create_asset_data from erpnext.assets.doctype.asset_depreciation_schedule.asset_depreciation_schedule import ( get_asset_depr_schedule_doc, @@ -28,7 +31,7 @@ class TestAssetDepreciationSchedule(FrappeTestCase): self.assertRaises(frappe.ValidationError, second_asset_depr_schedule.insert) - def test_daily_prorata_based_depr_on_sl_methond(self): + def test_daily_prorata_based_depr_on_sl_method(self): asset = create_asset( calculate_depreciation=1, depreciation_method="Straight Line", @@ -160,3 +163,35 @@ class TestAssetDepreciationSchedule(FrappeTestCase): for d in get_depr_schedule(asset.name, "Draft") ] self.assertEqual(schedules, expected_schedules) + + def test_update_total_number_of_booked_depreciations(self): + # check if updates total number of booked depreciations when depreciation gets booked + asset = create_asset( + item_code="Macbook Pro", + calculate_depreciation=1, + opening_accumulated_depreciation=2000, + opening_number_of_booked_depreciations=2, + depreciation_method="Straight Line", + available_for_use_date="2020-03-01", + depreciation_start_date="2020-03-31", + frequency_of_depreciation=1, + total_number_of_depreciations=24, + submit=1, + ) + + post_depreciation_entries(date="2021-03-31") + asset.reload() + """ + opening_number_of_booked_depreciations = 2 + number_of_booked_depreciations till 2021-03-31 = 13 + total_number_of_booked_depreciations = 15 + """ + self.assertEqual(asset.finance_books[0].total_number_of_booked_depreciations, 15) + + # cancel depreciation entry + depr_entry = get_depr_schedule(asset.name, "Active")[0].journal_entry + + frappe.get_doc("Journal Entry", depr_entry).cancel() + asset.reload() + + self.assertEqual(asset.finance_books[0].total_number_of_booked_depreciations, 14) diff --git a/erpnext/assets/doctype/asset_finance_book/asset_finance_book.json b/erpnext/assets/doctype/asset_finance_book/asset_finance_book.json index ba5b5f87826..c269948b742 100644 --- a/erpnext/assets/doctype/asset_finance_book/asset_finance_book.json +++ b/erpnext/assets/doctype/asset_finance_book/asset_finance_book.json @@ -8,6 +8,7 @@ "finance_book", "depreciation_method", "total_number_of_depreciations", + "total_number_of_booked_depreciations", "daily_prorata_based", "shift_based", "column_break_5", @@ -104,12 +105,19 @@ "fieldname": "shift_based", "fieldtype": "Check", "label": "Depreciate based on shifts" + }, + { + "default": "0", + "fieldname": "total_number_of_booked_depreciations", + "fieldtype": "Int", + "label": "Total Number of Booked Depreciations ", + "read_only": 1 } ], "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2023-12-29 08:49:39.876439", + "modified": "2024-05-21 15:48:20.907250", "modified_by": "Administrator", "module": "Assets", "name": "Asset Finance Book", diff --git a/erpnext/assets/doctype/asset_finance_book/asset_finance_book.py b/erpnext/assets/doctype/asset_finance_book/asset_finance_book.py index f812a0816dd..d06d6355ec3 100644 --- a/erpnext/assets/doctype/asset_finance_book/asset_finance_book.py +++ b/erpnext/assets/doctype/asset_finance_book/asset_finance_book.py @@ -28,6 +28,7 @@ class AssetFinanceBook(Document): rate_of_depreciation: DF.Percent salvage_value_percentage: DF.Percent shift_based: DF.Check + total_number_of_booked_depreciations: DF.Int total_number_of_depreciations: DF.Int value_after_depreciation: DF.Currency # end: auto-generated types diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.py b/erpnext/assets/doctype/asset_repair/asset_repair.py index 27542bc6de8..ccde836fe0d 100644 --- a/erpnext/assets/doctype/asset_repair/asset_repair.py +++ b/erpnext/assets/doctype/asset_repair/asset_repair.py @@ -377,7 +377,7 @@ class AssetRepair(AccountsController): def calculate_last_schedule_date(self, asset, row, extra_months): asset.flags.increase_in_asset_life = True number_of_pending_depreciations = cint(row.total_number_of_depreciations) - cint( - asset.number_of_depreciations_booked + asset.opening_number_of_booked_depreciations ) depr_schedule = get_depr_schedule(asset.name, "Active", row.finance_book) @@ -410,7 +410,7 @@ class AssetRepair(AccountsController): def calculate_last_schedule_date_before_modification(self, asset, row, extra_months): asset.flags.increase_in_asset_life = True number_of_pending_depreciations = cint(row.total_number_of_depreciations) - cint( - asset.number_of_depreciations_booked + asset.opening_number_of_booked_depreciations ) depr_schedule = get_depr_schedule(asset.name, "Active", row.finance_book) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 2522077e9c3..383989643b7 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -365,3 +365,4 @@ erpnext.patches.v15_0.fix_debit_credit_in_transaction_currency erpnext.patches.v15_0.remove_cancelled_asset_capitalization_from_asset erpnext.patches.v15_0.rename_purchase_receipt_amount_to_purchase_amount erpnext.patches.v14_0.enable_set_priority_for_pricing_rules #1 +erpnext.patches.v15_0.rename_number_of_depreciations_booked_to_opening_booked_depreciations diff --git a/erpnext/patches/v15_0/create_asset_depreciation_schedules_from_assets.py b/erpnext/patches/v15_0/create_asset_depreciation_schedules_from_assets.py index c31d754d2cd..a39b3e3cb24 100644 --- a/erpnext/patches/v15_0/create_asset_depreciation_schedules_from_assets.py +++ b/erpnext/patches/v15_0/create_asset_depreciation_schedules_from_assets.py @@ -43,7 +43,7 @@ def get_details_of_draft_or_submitted_depreciable_assets(): asset.name, asset.opening_accumulated_depreciation, asset.gross_purchase_amount, - asset.number_of_depreciations_booked, + asset.opening_number_of_booked_depreciations, asset.docstatus, ) .where(asset.calculate_depreciation == 1) diff --git a/erpnext/patches/v15_0/rename_number_of_depreciations_booked_to_opening_booked_depreciations.py b/erpnext/patches/v15_0/rename_number_of_depreciations_booked_to_opening_booked_depreciations.py new file mode 100644 index 00000000000..18183374554 --- /dev/null +++ b/erpnext/patches/v15_0/rename_number_of_depreciations_booked_to_opening_booked_depreciations.py @@ -0,0 +1,7 @@ +import frappe +from frappe.model.utils.rename_field import rename_field + + +def execute(): + if frappe.db.has_column("Asset", "number_of_depreciations_booked"): + rename_field("Asset", "number_of_depreciations_booked", "opening_number_of_booked_depreciations") diff --git a/erpnext/patches/v15_0/update_gpa_and_ndb_for_assdeprsch.py b/erpnext/patches/v15_0/update_gpa_and_ndb_for_assdeprsch.py index afb59e0f6f5..4399a95fda2 100644 --- a/erpnext/patches/v15_0/update_gpa_and_ndb_for_assdeprsch.py +++ b/erpnext/patches/v15_0/update_gpa_and_ndb_for_assdeprsch.py @@ -9,12 +9,12 @@ def execute(): ON `tabAsset Depreciation Schedule`.`asset`=`tabAsset`.`name` SET `tabAsset Depreciation Schedule`.`gross_purchase_amount`=`tabAsset`.`gross_purchase_amount`, - `tabAsset Depreciation Schedule`.`number_of_depreciations_booked`=`tabAsset`.`number_of_depreciations_booked` + `tabAsset Depreciation Schedule`.`opening_number_of_booked_depreciations`=`tabAsset`.`opening_number_of_booked_depreciations` WHERE ( `tabAsset Depreciation Schedule`.`gross_purchase_amount`<>`tabAsset`.`gross_purchase_amount` OR - `tabAsset Depreciation Schedule`.`number_of_depreciations_booked`<>`tabAsset`.`number_of_depreciations_booked` + `tabAsset Depreciation Schedule`.`opening_number_of_booked_depreciations`<>`tabAsset`.`opening_number_of_booked_depreciations` ) AND `tabAsset Depreciation Schedule`.`docstatus`<2""" ) From 7b5d5043c5220189240c04f90abb7ffbe75d7cd3 Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Sat, 22 Jun 2024 00:57:00 +0530 Subject: [PATCH 11/73] fix: reload asset when creating asset depreciation --- .../v15_0/create_asset_depreciation_schedules_from_assets.py | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/patches/v15_0/create_asset_depreciation_schedules_from_assets.py b/erpnext/patches/v15_0/create_asset_depreciation_schedules_from_assets.py index a39b3e3cb24..523b559d734 100644 --- a/erpnext/patches/v15_0/create_asset_depreciation_schedules_from_assets.py +++ b/erpnext/patches/v15_0/create_asset_depreciation_schedules_from_assets.py @@ -4,6 +4,7 @@ import frappe def execute(): frappe.reload_doc("assets", "doctype", "Asset Depreciation Schedule") frappe.reload_doc("assets", "doctype", "Asset Finance Book") + frappe.reload_doc("assets", "doctype", "Asset") assets = get_details_of_draft_or_submitted_depreciable_assets() From f9574366b5ad3e78bb44f01c26e71dc30fd3142b Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Sat, 22 Jun 2024 01:01:03 +0530 Subject: [PATCH 12/73] chore: added nosemgrep for security checks --- erpnext/patches/v15_0/update_gpa_and_ndb_for_assdeprsch.py | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/patches/v15_0/update_gpa_and_ndb_for_assdeprsch.py b/erpnext/patches/v15_0/update_gpa_and_ndb_for_assdeprsch.py index 4399a95fda2..f8cb3e48e7a 100644 --- a/erpnext/patches/v15_0/update_gpa_and_ndb_for_assdeprsch.py +++ b/erpnext/patches/v15_0/update_gpa_and_ndb_for_assdeprsch.py @@ -3,6 +3,7 @@ import frappe def execute(): # not using frappe.qb because https://github.com/frappe/frappe/issues/20292 + # nosemgrep frappe.db.sql( """UPDATE `tabAsset Depreciation Schedule` JOIN `tabAsset` From 44c16713ba9fdda293d612b10720d63f6a83b0c8 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Sat, 22 Jun 2024 10:39:53 +0530 Subject: [PATCH 13/73] feat: default account head for operating cost (backport #41985) (#41987) * feat: default account head for operating cost (#41985) (cherry picked from commit fd7666a029a430c0b3cf4d1c9d0b728f4d0e4476) # Conflicts: # erpnext/manufacturing/doctype/bom/bom.py # erpnext/setup/doctype/company/company.json * chore: fix conflicts * chore: fix conflicts * chore: fix conflicts * chore: fix conflicts --------- Co-authored-by: rohitwaghchaure --- erpnext/manufacturing/doctype/bom/bom.py | 14 +++- .../doctype/work_order/test_work_order.py | 75 +++++++++++++++++++ erpnext/setup/doctype/company/company.js | 6 ++ erpnext/setup/doctype/company/company.json | 19 ++++- erpnext/setup/doctype/company/company.py | 1 + 5 files changed, 108 insertions(+), 7 deletions(-) diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py index 20b9845ef6a..009320c7a18 100644 --- a/erpnext/manufacturing/doctype/bom/bom.py +++ b/erpnext/manufacturing/doctype/bom/bom.py @@ -1259,12 +1259,18 @@ def get_children(parent=None, is_root=False, **filters): def add_additional_cost(stock_entry, work_order): # Add non stock items cost in the additional cost stock_entry.additional_costs = [] - expenses_included_in_valuation = frappe.get_cached_value( - "Company", work_order.company, "expenses_included_in_valuation" + company_account = frappe.db.get_value( + "Company", + work_order.company, + ["expenses_included_in_valuation", "default_operating_cost_account"], + as_dict=1, ) - add_non_stock_items_cost(stock_entry, work_order, expenses_included_in_valuation) - add_operations_cost(stock_entry, work_order, expenses_included_in_valuation) + expense_account = ( + company_account.default_operating_cost_account or company_account.expenses_included_in_valuation + ) + add_non_stock_items_cost(stock_entry, work_order, expense_account) + add_operations_cost(stock_entry, work_order, expense_account) def add_non_stock_items_cost(stock_entry, work_order, expense_account): diff --git a/erpnext/manufacturing/doctype/work_order/test_work_order.py b/erpnext/manufacturing/doctype/work_order/test_work_order.py index 14a56f21afb..d1f2cdbd1aa 100644 --- a/erpnext/manufacturing/doctype/work_order/test_work_order.py +++ b/erpnext/manufacturing/doctype/work_order/test_work_order.py @@ -1748,6 +1748,81 @@ class TestWorkOrder(FrappeTestCase): job_card2.time_logs = [] job_card2.save() + def test_operating_cost_account(self): + operating_cost_account = "Test Operating Cost Account - _TC" + company = "_Test Company" + if not frappe.db.exists("Account", operating_cost_account): + frappe.get_doc( + { + "doctype": "Account", + "account_name": "Test Operating Cost Account", + "account_type": "Expense Account", + "company": company, + "parent_account": "Expenses - _TC", + "root_type": "Expense", + } + ).insert() + + frappe.db.set_value("Company", company, "default_operating_cost_account", operating_cost_account) + + for item in ["TEST RM OP COST Item 1", "TEST FG OP COST Item"]: + if not frappe.db.exists("Item", item): + make_item(item_code=item, properties={"is_stock_item": 1}) + + fg_item = "TEST FG OP COST Item" + bom_doc = make_bom( + item=fg_item, + raw_materials=["TEST RM OP COST Item 1"], + rate=150, + with_operations=1, + do_not_save=True, + ) + + workstation = "Test Workstation For Capacity Planning 1" + if not frappe.db.exists("Workstation", workstation): + make_workstation(workstation=workstation, production_capacity=1) + + operation = "Test Operation For Capacity Planning 1" + if not frappe.db.exists("Operation", operation): + make_operation(operation=operation, workstation=workstation) + + bom_doc.append( + "operations", + {"operation": operation, "time_in_mins": 60, "hour_rate": 100, "workstation": workstation}, + ) + + bom_doc.save() + bom_doc.submit() + + wo = make_wo_order_test_record( + production_item=fg_item, + bom_no=bom_doc.name, + qty=1, + skip_transfer=1, + ) + + job_cards = frappe.get_all("Job Card", filters={"work_order": wo.name}) + for job_card in job_cards: + job_card_doc = frappe.get_doc("Job Card", job_card.name) + job_card_doc.time_logs = [] + job_card_doc.append( + "time_logs", + { + "from_time": now(), + "to_time": add_to_date(now(), minutes=60), + "time_in_mins": 60, + "completed_qty": 1, + }, + ) + + job_card_doc.submit() + + se_doc = frappe.get_doc(make_stock_entry(wo.name, "Manufacture", 1)) + se_doc.save() + + for row in se_doc.additional_costs: + self.assertEqual(row.expense_account, operating_cost_account) + def test_op_cost_and_scrap_based_on_sub_assemblies(self): # Make Sub Assembly BOM 1 diff --git a/erpnext/setup/doctype/company/company.js b/erpnext/setup/doctype/company/company.js index 4712a10cc0a..939eaf25712 100644 --- a/erpnext/setup/doctype/company/company.js +++ b/erpnext/setup/doctype/company/company.js @@ -28,6 +28,12 @@ frappe.ui.form.on("Company", { }; }); + frm.set_query("default_operating_cost_account", function (doc) { + return { + filters: { company: doc.name, root_type: "Expense" }, + }; + }); + frm.set_query("default_selling_terms", function () { return { filters: { selling: 1 } }; }); diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json index b2d6af03a10..787b0826f01 100644 --- a/erpnext/setup/doctype/company/company.json +++ b/erpnext/setup/doctype/company/company.json @@ -109,6 +109,8 @@ "stock_received_but_not_billed", "default_provisional_account", "expenses_included_in_valuation", + "manufacturing_section", + "default_operating_cost_account", "dashboard_tab" ], "fields": [ @@ -773,7 +775,7 @@ { "fieldname": "stock_tab", "fieldtype": "Tab Break", - "label": "Stock" + "label": "Stock and Manufacturing" }, { "fieldname": "dashboard_tab", @@ -788,6 +790,17 @@ "fieldname": "reconcile_on_advance_payment_date", "fieldtype": "Check", "label": "Reconcile on Advance Payment Date" + }, + { + "fieldname": "manufacturing_section", + "fieldtype": "Section Break", + "label": "Manufacturing" + }, + { + "fieldname": "default_operating_cost_account", + "fieldtype": "Link", + "label": "Default Operating Cost Account", + "options": "Account" } ], "icon": "fa fa-building", @@ -795,7 +808,7 @@ "image_field": "company_logo", "is_tree": 1, "links": [], - "modified": "2024-05-27 17:32:49.057386", + "modified": "2024-06-21 17:46:25.567565", "modified_by": "Administrator", "module": "Setup", "name": "Company", @@ -862,4 +875,4 @@ "sort_order": "ASC", "states": [], "track_changes": 1 -} \ No newline at end of file +} diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py index 2a0b32ed568..87d14e3c6b4 100644 --- a/erpnext/setup/doctype/company/company.py +++ b/erpnext/setup/doctype/company/company.py @@ -62,6 +62,7 @@ class Company(NestedSet): default_income_account: DF.Link | None default_inventory_account: DF.Link | None default_letter_head: DF.Link | None + default_operating_cost_account: DF.Link | None default_payable_account: DF.Link | None default_provisional_account: DF.Link | None default_receivable_account: DF.Link | None From b59c91a341d3f4265ae966a12e3a002c0a4dbc0b Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Sat, 22 Jun 2024 21:27:00 +0530 Subject: [PATCH 14/73] perf: dont run queries unnecessarily, improved filters (#41993) * perf: dont run queries unnecessarily, improved filters * perf: dont run query if `in` filter is empty (cherry picked from commit ac6d85aed628734820cc055d00e062b4fd90bb8c) --- .../controllers/subcontracting_controller.py | 33 ++++++++++++------- .../serial_and_batch_bundle.py | 7 ++-- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/erpnext/controllers/subcontracting_controller.py b/erpnext/controllers/subcontracting_controller.py index e0f1ed77140..d31ee258b27 100644 --- a/erpnext/controllers/subcontracting_controller.py +++ b/erpnext/controllers/subcontracting_controller.py @@ -294,16 +294,23 @@ class SubcontractingController(StockController): receipt_items = {item.name: item.get(self.subcontract_data.order_field) for item in receipt_items} consumed_materials = self.__get_consumed_items(doctype, receipt_items.keys()) - voucher_nos = [d.voucher_no for d in consumed_materials if d.voucher_no] - voucher_bundle_data = get_voucher_wise_serial_batch_from_bundle( - voucher_no=voucher_nos, - is_outward=1, - get_subcontracted_item=("Subcontracting Receipt Supplied Item", "main_item_code"), - ) - if return_consumed_items: return (consumed_materials, receipt_items) + if not consumed_materials: + return + + voucher_nos = [d.voucher_no for d in consumed_materials if d.voucher_no] + voucher_bundle_data = ( + get_voucher_wise_serial_batch_from_bundle( + voucher_no=voucher_nos, + is_outward=1, + get_subcontracted_item=("Subcontracting Receipt Supplied Item", "main_item_code"), + ) + if voucher_nos + else {} + ) + for row in consumed_materials: key = (row.rm_item_code, row.main_item_code, receipt_items.get(row.reference_name)) if not self.available_materials.get(key): @@ -350,10 +357,14 @@ class SubcontractingController(StockController): transferred_items = self.__get_transferred_items() voucher_nos = [row.voucher_no for row in transferred_items] - voucher_bundle_data = get_voucher_wise_serial_batch_from_bundle( - voucher_no=voucher_nos, - is_outward=0, - get_subcontracted_item=("Stock Entry Detail", "subcontracted_item"), + voucher_bundle_data = ( + get_voucher_wise_serial_batch_from_bundle( + voucher_no=voucher_nos, + is_outward=0, + get_subcontracted_item=("Stock Entry Detail", "subcontracted_item"), + ) + if voucher_nos + else {} ) for row in transferred_items: diff --git a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py index 87bf2df5f61..e7637aca63e 100644 --- a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py +++ b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py @@ -2104,10 +2104,13 @@ def get_ledgers_from_serial_batch_bundle(**kwargs) -> list[frappe._dict]: ) for key, val in kwargs.items(): - if not val: + if val is None: continue - if key in ["get_subcontracted_item"]: + if not val and isinstance(val, list): + return [] + + if key == "get_subcontracted_item": continue if key in ["name", "item_code", "warehouse", "voucher_no", "company", "voucher_detail_no"]: From 199a64937b4d504b1ff3b151d913e47ad7ff5361 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Wed, 8 May 2024 09:55:55 +0530 Subject: [PATCH 15/73] chore: remove validation on payment entry (cherry picked from commit e7740033cad4bfbe0ca35ca05795635b2db4257e) --- .../doctype/payment_entry/payment_entry.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py index 69075e5cf6c..e4f6a735183 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py @@ -163,22 +163,6 @@ class PaymentEntry(AccountsController): alert=True, ) - def validate_advance_account_currency(self): - if self.book_advance_payments_in_separate_party_account is True: - company_currency = frappe.get_cached_value("Company", self.company, "default_currency") - if self.payment_type == "Receive" and self.paid_from_account_currency != company_currency: - frappe.throw( - _("Booking advances in foreign currency account: {0} ({1}) is not yet supported.").format( - frappe.bold(self.paid_from), frappe.bold(self.paid_from_account_currency) - ) - ) - if self.payment_type == "Pay" and self.paid_to_account_currency != company_currency: - frappe.throw( - _("Booking advances in foreign currency account: {0} ({1}) is not yet supported.").format( - frappe.bold(self.paid_to), frappe.bold(self.paid_to_account_currency) - ) - ) - def on_cancel(self): self.ignore_linked_doctypes = ( "GL Entry", From 5d2f296ca8c350f28d6b650dad13a6f9b581f6f2 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Thu, 9 May 2024 11:06:06 +0530 Subject: [PATCH 16/73] refactor: convert amount to base currency for advances (cherry picked from commit c9ede1ffbe25d6250b52910372c1d7cfa82096c5) --- erpnext/accounts/doctype/payment_entry/payment_entry.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py index e4f6a735183..79ed5639cf2 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py @@ -1250,7 +1250,7 @@ class PaymentEntry(AccountsController): dr_or_cr, account = self.get_dr_and_account_for_advances(invoice) args_dict["account"] = account - args_dict[dr_or_cr] = invoice.allocated_amount + args_dict[dr_or_cr] = self.calculate_base_allocated_amount_for_reference(invoice) args_dict[dr_or_cr + "_in_account_currency"] = invoice.allocated_amount args_dict.update( { @@ -1269,7 +1269,7 @@ class PaymentEntry(AccountsController): args_dict[dr_or_cr + "_in_account_currency"] = 0 dr_or_cr = "debit" if dr_or_cr == "credit" else "credit" args_dict["account"] = self.party_account - args_dict[dr_or_cr] = invoice.allocated_amount + args_dict[dr_or_cr] = self.calculate_base_allocated_amount_for_reference(invoice) args_dict[dr_or_cr + "_in_account_currency"] = invoice.allocated_amount args_dict.update( { From 47071cec5df815534e72ef4730349d8cd8d0d749 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 20 May 2024 16:00:39 +0530 Subject: [PATCH 17/73] refactor: for advances uses the party account in references table (cherry picked from commit 7dce6e03c7f8452fa9ca942b38a0cf1bd2264d3e) --- erpnext/controllers/accounts_controller.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index 40ce8b6bc57..f576ecc1b11 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -1430,10 +1430,13 @@ class AccountsController(TransactionBase): if d.exchange_gain_loss and ( (d.reference_doctype, d.reference_name, str(d.idx)) not in booked ): - if self.payment_type == "Receive": - party_account = self.paid_from - elif self.payment_type == "Pay": - party_account = self.paid_to + if self.book_advance_payments_in_separate_party_account: + party_account = d.account + else: + if self.payment_type == "Receive": + party_account = self.paid_from + elif self.payment_type == "Pay": + party_account = self.paid_to dr_or_cr = "debit" if d.exchange_gain_loss > 0 else "credit" From 6ebd4ba2ccf8de2045f6d9d7691c97b9a11e61e1 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 28 May 2024 08:44:19 +0530 Subject: [PATCH 18/73] refactor(test): simpler create_account helper method (cherry picked from commit 475e0ddeeef3700e2c75910886fad3e44f58eb6d) --- .../tests/test_accounts_controller.py | 98 +++++++++++-------- 1 file changed, 58 insertions(+), 40 deletions(-) diff --git a/erpnext/controllers/tests/test_accounts_controller.py b/erpnext/controllers/tests/test_accounts_controller.py index f91acb2e4ea..37d98549a4d 100644 --- a/erpnext/controllers/tests/test_accounts_controller.py +++ b/erpnext/controllers/tests/test_accounts_controller.py @@ -55,6 +55,7 @@ class TestAccountsController(FrappeTestCase): 40 series - Company default Cost center is unset 50 series - Journals against Journals 60 series - Journals against Payment Entries + 70 series - Advances in Separate party account. Both Party and Advance account are in Foreign currency. 90 series - Dimension inheritence """ @@ -114,47 +115,64 @@ class TestAccountsController(FrappeTestCase): self.supplier = make_supplier("_Test MC Supplier USD", "USD") def create_account(self): - account_name = "Debtors USD" - if not frappe.db.get_value( - "Account", filters={"account_name": account_name, "company": self.company} - ): - acc = frappe.new_doc("Account") - acc.account_name = account_name - acc.parent_account = "Accounts Receivable - " + self.company_abbr - acc.company = self.company - acc.account_currency = "USD" - acc.account_type = "Receivable" - acc.insert() - else: - name = frappe.db.get_value( - "Account", - filters={"account_name": account_name, "company": self.company}, - fieldname="name", - pluck=True, - ) - acc = frappe.get_doc("Account", name) - self.debtors_usd = acc.name + accounts = [ + frappe._dict( + { + "attribute_name": "debtors_usd", + "name": "Debtors USD", + "account_type": "Receivable", + "account_currency": "USD", + "parent_account": "Accounts Receivable - " + self.company_abbr, + } + ), + frappe._dict( + { + "attribute_name": "creditors_usd", + "name": "Creditors USD", + "account_type": "Payable", + "account_currency": "USD", + "parent_account": "Accounts Payable - " + self.company_abbr, + } + ), + # Advance accounts under Asset and Liability header + frappe._dict( + { + "attribute_name": "debtors_advance_usd", + "name": "Advance Received USD", + "account_type": "Receivable", + "account_currency": "USD", + "parent_account": "Current Liabilities - " + self.company_abbr, + } + ), + frappe._dict( + { + "attribute_name": "creditors_advance_usd", + "name": "Advance Paid USD", + "account_type": "Payable", + "account_currency": "USD", + "parent_account": "Current Assets - " + self.company_abbr, + } + ), + ] - account_name = "Creditors USD" - if not frappe.db.get_value( - "Account", filters={"account_name": account_name, "company": self.company} - ): - acc = frappe.new_doc("Account") - acc.account_name = account_name - acc.parent_account = "Accounts Payable - " + self.company_abbr - acc.company = self.company - acc.account_currency = "USD" - acc.account_type = "Payable" - acc.insert() - else: - name = frappe.db.get_value( - "Account", - filters={"account_name": account_name, "company": self.company}, - fieldname="name", - pluck=True, - ) - acc = frappe.get_doc("Account", name) - self.creditors_usd = acc.name + for x in accounts: + if not frappe.db.get_value("Account", filters={"account_name": x.name, "company": self.company}): + acc = frappe.new_doc("Account") + acc.account_name = x.name + acc.parent_account = x.parent_account + acc.company = self.company + acc.account_currency = x.account_currency + acc.account_type = x.account_type + acc.insert() + else: + name = frappe.db.get_value( + "Account", + filters={"account_name": x.name, "company": self.company}, + fieldname="name", + pluck=True, + ) + acc = frappe.get_doc("Account", name) + setattr(self, x.attribute_name, acc.name) def create_sales_invoice( self, From 259d7cde39daf7249f19a2d083842c8c0e9e71e9 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 28 May 2024 11:20:07 +0530 Subject: [PATCH 19/73] test: exc gain/loss booking on advances under asset/liability (cherry picked from commit 827d67d02f745346bd32bed5428cc33a7baba745) --- .../tests/test_accounts_controller.py | 67 ++++++++++++++++++- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/erpnext/controllers/tests/test_accounts_controller.py b/erpnext/controllers/tests/test_accounts_controller.py index 37d98549a4d..8a59f0b070c 100644 --- a/erpnext/controllers/tests/test_accounts_controller.py +++ b/erpnext/controllers/tests/test_accounts_controller.py @@ -137,7 +137,7 @@ class TestAccountsController(FrappeTestCase): # Advance accounts under Asset and Liability header frappe._dict( { - "attribute_name": "debtors_advance_usd", + "attribute_name": "advance_received_usd", "name": "Advance Received USD", "account_type": "Receivable", "account_currency": "USD", @@ -146,7 +146,7 @@ class TestAccountsController(FrappeTestCase): ), frappe._dict( { - "attribute_name": "creditors_advance_usd", + "attribute_name": "advance_paid_usd", "name": "Advance Paid USD", "account_type": "Payable", "account_currency": "USD", @@ -174,6 +174,18 @@ class TestAccountsController(FrappeTestCase): acc = frappe.get_doc("Account", name) setattr(self, x.attribute_name, acc.name) + def enable_advances_under_asset_and_liability(self): + company = frappe.get_doc("Company", self.company) + company.book_advance_payments_in_separate_party_account = 1 + company.default_advance_received_account = self.advance_received_usd + company.default_advance_paid_account = self.advance_paid_usd + company.save() + + def disable_advances_under_asset_and_liability(self): + company = frappe.get_doc("Company", self.company) + company.book_advance_payments_in_separate_party_account = 0 + company.save() + def create_sales_invoice( self, qty=1, @@ -1716,3 +1728,54 @@ class TestAccountsController(FrappeTestCase): # Exchange Gain/Loss Journal should've been cancelled exc_je_for_je1 = self.get_journals_for(je1.doctype, je1.name) self.assertEqual(exc_je_for_je1, []) + + def test_70_advance_payment_against_sales_invoice_in_foreign_currency(self): + """ + Customer advance booked under Liability + """ + self.enable_advances_under_asset_and_liability() + + adv = self.create_payment_entry(amount=1, source_exc_rate=83) + adv.save() # explicit 'save' is needed to trigger set_liability_account() + self.assertEqual(adv.paid_from, self.advance_received_usd) + adv.submit() + + si = self.create_sales_invoice(qty=1, conversion_rate=80, rate=1, do_not_submit=True) + si.debit_to = self.debtors_usd + si.save().submit() + self.assert_ledger_outstanding(si.doctype, si.name, 80.0, 1.0) + + pr = self.create_payment_reconciliation() + pr.receivable_payable_account = self.debtors_usd + pr.default_advance_account = self.advance_received_usd + pr.get_unreconciled_entries() + self.assertEqual(pr.invoices[0].invoice_number, si.name) + self.assertEqual(pr.payments[0].reference_name, adv.name) + + # Allocate and Reconcile + invoices = [x.as_dict() for x in pr.invoices] + payments = [x.as_dict() for x in pr.payments] + pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments})) + pr.reconcile() + self.assertEqual(len(pr.invoices), 0) + self.assertEqual(len(pr.payments), 0) + self.assert_ledger_outstanding(si.doctype, si.name, 0.0, 0.0) + + # Exc Gain/Loss journal should've been creatad + exc_je_for_si = self.get_journals_for(si.doctype, si.name) + exc_je_for_adv = self.get_journals_for(adv.doctype, adv.name) + self.assertEqual(len(exc_je_for_si), 1) + self.assertEqual(len(exc_je_for_adv), 1) + self.assertEqual(exc_je_for_si, exc_je_for_adv) + + adv.reload() + adv.cancel() + si.reload() + self.assert_ledger_outstanding(si.doctype, si.name, 80.0, 1.0) + # Exc Gain/Loss journal should've been cancelled + exc_je_for_si = self.get_journals_for(si.doctype, si.name) + exc_je_for_adv = self.get_journals_for(adv.doctype, adv.name) + self.assertEqual(len(exc_je_for_si), 0) + self.assertEqual(len(exc_je_for_adv), 0) + + self.disable_advances_under_asset_and_liability() From 88e1c28e7d070fe028c0e034a2ef483f55c0c664 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Wed, 29 May 2024 08:17:02 +0530 Subject: [PATCH 20/73] test: advance against purchase invoice (cherry picked from commit 90c84822d01a9b8ab2aba303846702f08b33c63a) --- .../tests/test_accounts_controller.py | 112 ++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/erpnext/controllers/tests/test_accounts_controller.py b/erpnext/controllers/tests/test_accounts_controller.py index 8a59f0b070c..d2144adde0f 100644 --- a/erpnext/controllers/tests/test_accounts_controller.py +++ b/erpnext/controllers/tests/test_accounts_controller.py @@ -10,6 +10,7 @@ from frappe.utils import add_days, getdate, nowdate from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry from erpnext.accounts.doctype.payment_entry.test_payment_entry import create_payment_entry +from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice from erpnext.accounts.party import get_party_account from erpnext.stock.doctype.item.test_item import create_item @@ -248,6 +249,48 @@ class TestAccountsController(FrappeTestCase): payment.posting_date = posting_date return payment + def create_purchase_invoice( + self, + qty=1, + rate=1, + conversion_rate=80, + posting_date=None, + do_not_save=False, + do_not_submit=False, + ): + """ + Helper function to populate default values in purchase invoice + """ + if posting_date is None: + posting_date = nowdate() + + pinv = make_purchase_invoice( + posting_date=posting_date, + qty=qty, + rate=rate, + company=self.company, + supplier=self.supplier, + item_code=self.item, + item_name=self.item, + cost_center=self.cost_center, + warehouse=self.warehouse, + parent_cost_center=self.cost_center, + update_stock=0, + currency="USD", + conversion_rate=conversion_rate, + is_pos=0, + is_return=0, + income_account=self.income_account, + expense_account=self.expense_account, + do_not_save=True, + ) + pinv.credit_to = self.creditors_usd + if not do_not_save: + pinv.save() + if not do_not_submit: + pinv.submit() + return pinv + def clear_old_entries(self): doctype_list = [ "GL Entry", @@ -1779,3 +1822,72 @@ class TestAccountsController(FrappeTestCase): self.assertEqual(len(exc_je_for_adv), 0) self.disable_advances_under_asset_and_liability() + + def test_71_advance_payment_against_purchase_invoice_in_foreign_currency(self): + """ + Supplier advance booked under Asset + """ + self.enable_advances_under_asset_and_liability() + + usd_amount = 1 + inr_amount = 85 + exc_rate = 85 + adv = create_payment_entry( + company=self.company, + payment_type="Pay", + party_type="Supplier", + party=self.supplier, + paid_from=self.cash, + paid_to=self.advance_paid_usd, + paid_amount=inr_amount, + ) + adv.source_exchange_rate = 1 + adv.target_exchange_rate = exc_rate + adv.received_amount = usd_amount + adv.paid_amount = exc_rate * usd_amount + adv.posting_date = nowdate() + adv.save() + # Make sure that advance account is still set + self.assertEqual(adv.paid_to, self.advance_paid_usd) + adv.submit() + + pi = self.create_purchase_invoice(qty=1, conversion_rate=83, rate=1) + self.assertEqual(pi.credit_to, self.creditors_usd) + self.assert_ledger_outstanding(pi.doctype, pi.name, 83.0, 1.0) + + pr = self.create_payment_reconciliation() + pr.party_type = "Supplier" + pr.party = self.supplier + pr.receivable_payable_account = self.creditors_usd + pr.default_advance_account = self.advance_paid_usd + pr.get_unreconciled_entries() + self.assertEqual(pr.invoices[0].invoice_number, pi.name) + self.assertEqual(pr.payments[0].reference_name, adv.name) + + # Allocate and Reconcile + invoices = [x.as_dict() for x in pr.invoices] + payments = [x.as_dict() for x in pr.payments] + pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments})) + pr.reconcile() + self.assertEqual(len(pr.invoices), 0) + self.assertEqual(len(pr.payments), 0) + self.assert_ledger_outstanding(pi.doctype, pi.name, 0.0, 0.0) + + # Exc Gain/Loss journal should've been creatad + exc_je_for_pi = self.get_journals_for(pi.doctype, pi.name) + exc_je_for_adv = self.get_journals_for(adv.doctype, adv.name) + self.assertEqual(len(exc_je_for_pi), 1) + self.assertEqual(len(exc_je_for_adv), 1) + self.assertEqual(exc_je_for_pi, exc_je_for_adv) + + adv.reload() + adv.cancel() + pi.reload() + self.assert_ledger_outstanding(pi.doctype, pi.name, 83.0, 1.0) + # Exc Gain/Loss journal should've been cancelled + exc_je_for_pi = self.get_journals_for(pi.doctype, pi.name) + exc_je_for_adv = self.get_journals_for(adv.doctype, adv.name) + self.assertEqual(len(exc_je_for_pi), 0) + self.assertEqual(len(exc_je_for_adv), 0) + + self.disable_advances_under_asset_and_liability() From 78ad3f6cdc8689cc6c297eb8ca4d1adcedc17b6a Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Wed, 29 May 2024 11:26:10 +0530 Subject: [PATCH 21/73] refactor: validation to force accounts to be on same currency (cherry picked from commit 0f0b4d88bcd5e298154748a58c20589c5aa9f531) --- erpnext/buying/doctype/supplier/supplier.py | 1 + erpnext/selling/doctype/customer/customer.py | 1 + erpnext/utilities/transaction_base.py | 57 ++++++++++++++++++++ 3 files changed, 59 insertions(+) diff --git a/erpnext/buying/doctype/supplier/supplier.py b/erpnext/buying/doctype/supplier/supplier.py index 0df17fdd4b9..ff5385dd961 100644 --- a/erpnext/buying/doctype/supplier/supplier.py +++ b/erpnext/buying/doctype/supplier/supplier.py @@ -138,6 +138,7 @@ class Supplier(TransactionBase): validate_party_accounts(self) self.validate_internal_supplier() self.add_role_for_user() + self.validate_currency_for_receivable_payable_and_advance_account() @frappe.whitelist() def get_supplier_group_details(self): diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py index f5185c2ff5b..8ce67cc659a 100644 --- a/erpnext/selling/doctype/customer/customer.py +++ b/erpnext/selling/doctype/customer/customer.py @@ -144,6 +144,7 @@ class Customer(TransactionBase): self.validate_default_bank_account() self.validate_internal_customer() self.add_role_for_user() + self.validate_currency_for_receivable_payable_and_advance_account() # set loyalty program tier if frappe.db.exists("Customer", self.name): diff --git a/erpnext/utilities/transaction_base.py b/erpnext/utilities/transaction_base.py index 3b7812f96c2..9559c9170cf 100644 --- a/erpnext/utilities/transaction_base.py +++ b/erpnext/utilities/transaction_base.py @@ -168,6 +168,63 @@ class TransactionBase(StatusUpdater): if len(child_table_values) > 1: self.set(default_field, None) + def validate_currency_for_receivable_payable_and_advance_account(self): + if self.doctype in ["Customer", "Supplier"]: + account_type = "Receivable" if self.doctype == "Customer" else "Payable" + for x in self.accounts: + company_default_currency = frappe.get_cached_value("Company", x.company, "default_currency") + receivable_payable_account_currency = None + advance_account_currency = None + + if x.account: + receivable_payable_account_currency = frappe.get_cached_value( + "Account", x.account, "account_currency" + ) + + if x.advance_account: + advance_account_currency = frappe.get_cached_value( + "Account", x.advance_account, "account_currency" + ) + if receivable_payable_account_currency and ( + receivable_payable_account_currency != self.default_currency + and receivable_payable_account_currency != company_default_currency + ): + frappe.throw( + _( + "{0} Account must be in either customer billing currency: {1} or Company default currency: {2}" + ).format( + account_type, + frappe.bold(self.default_currency), + frappe.bold(company_default_currency), + ) + ) + + if advance_account_currency and ( + advance_account_currency != self.default_currency + and advance_account_currency != company_default_currency + ): + frappe.throw( + _( + "Advance Account must be in either customer billing currency: {0} or Company default currency: {1}" + ).format(frappe.bold(self.default_currency), frappe.bold(company_default_currency)) + ) + + if ( + receivable_payable_account_currency + and advance_account_currency + and receivable_payable_account_currency != advance_account_currency + ): + frappe.throw( + _( + "Both {0} Account: {1} and Advance Account: {2} must be of same currency for company: {3}" + ).format( + account_type, + frappe.bold(x.account), + frappe.bold(x.advance_account), + frappe.bold(x.company), + ) + ) + def delete_events(ref_type, ref_name): events = ( From 4bde34539996757f04f1c4f23184b32d22d5ddb7 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 10 Jun 2024 20:06:21 +0530 Subject: [PATCH 22/73] refactor: validation in customer group (cherry picked from commit 4f9a2281754ad64c845739a29c5225059f1cc11d) --- .../doctype/customer_group/customer_group.py | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/erpnext/setup/doctype/customer_group/customer_group.py b/erpnext/setup/doctype/customer_group/customer_group.py index 0b783c0c56e..6d95d3bcb24 100644 --- a/erpnext/setup/doctype/customer_group/customer_group.py +++ b/erpnext/setup/doctype/customer_group/customer_group.py @@ -38,6 +38,53 @@ class CustomerGroup(NestedSet): def validate(self): if not self.parent_customer_group: self.parent_customer_group = get_root_of("Customer Group") + self.validate_currency_for_receivable_and_advance_account() + + def validate_currency_for_receivable_and_advance_account(self): + for x in self.accounts: + company_default_currency = frappe.get_cached_value("Company", x.company, "default_currency") + receivable_account_currency = None + advance_account_currency = None + + if x.account: + receivable_account_currency = frappe.get_cached_value( + "Account", x.account, "account_currency" + ) + + if x.advance_account: + advance_account_currency = frappe.get_cached_value( + "Account", x.advance_account, "account_currency" + ) + + if receivable_account_currency and receivable_account_currency != company_default_currency: + frappe.throw( + _("Receivable Account: {0} must be in Company default currency: {1}").format( + frappe.bold(x.account), + frappe.bold(company_default_currency), + ) + ) + + if advance_account_currency and advance_account_currency != company_default_currency: + frappe.throw( + _("Advance Account: {0} must be in Company default currency: {1}").format( + frappe.bold(x.advance_account), frappe.bold(company_default_currency) + ) + ) + + if ( + receivable_account_currency + and advance_account_currency + and receivable_account_currency != advance_account_currency + ): + frappe.throw( + _( + "Both Receivable Account: {0} and Advance Account: {1} must be of same currency for company: {2}" + ).format( + frappe.bold(x.account), + frappe.bold(x.advance_account), + frappe.bold(x.company), + ) + ) def on_update(self): self.validate_name_with_customer() From 545d0b9730295407a29990b5b9adc0ce9240b51d Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 10 Jun 2024 20:08:28 +0530 Subject: [PATCH 23/73] refactor: validation in Supplier Group (cherry picked from commit 107b614518444339a9674287fa6cb2c788716fa8) --- .../doctype/supplier_group/supplier_group.py | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/erpnext/setup/doctype/supplier_group/supplier_group.py b/erpnext/setup/doctype/supplier_group/supplier_group.py index b639b962509..fa0c6beac49 100644 --- a/erpnext/setup/doctype/supplier_group/supplier_group.py +++ b/erpnext/setup/doctype/supplier_group/supplier_group.py @@ -3,6 +3,7 @@ import frappe +from frappe import _ from frappe.utils.nestedset import NestedSet, get_root_of @@ -32,6 +33,51 @@ class SupplierGroup(NestedSet): def validate(self): if not self.parent_supplier_group: self.parent_supplier_group = get_root_of("Supplier Group") + self.validate_currency_for_payable_and_advance_account() + + def validate_currency_for_payable_and_advance_account(self): + for x in self.accounts: + company_default_currency = frappe.get_cached_value("Company", x.company, "default_currency") + payable_account_currency = None + advance_account_currency = None + + if x.account: + payable_account_currency = frappe.get_cached_value("Account", x.account, "account_currency") + + if x.advance_account: + advance_account_currency = frappe.get_cached_value( + "Account", x.advance_account, "account_currency" + ) + + if payable_account_currency and payable_account_currency != company_default_currency: + frappe.throw( + _("Payable Account: {0} must be in Company default currency: {1}").format( + frappe.bold(x.account), + frappe.bold(company_default_currency), + ) + ) + + if advance_account_currency and advance_account_currency != company_default_currency: + frappe.throw( + _("Advance Account: {0} must be in Company default currency: {1}").format( + frappe.bold(x.advance_account), frappe.bold(company_default_currency) + ) + ) + + if ( + payable_account_currency + and advance_account_currency + and payable_account_currency != advance_account_currency + ): + frappe.throw( + _( + "Both Payable Account: {0} and Advance Account: {1} must be of same currency for company: {2}" + ).format( + frappe.bold(x.account), + frappe.bold(x.advance_account), + frappe.bold(x.company), + ) + ) def on_update(self): NestedSet.on_update(self) From 2bd10d388ffe7cddb5614e37f644fc0369d8b060 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 11 Jun 2024 10:18:59 +0530 Subject: [PATCH 24/73] refactor: better error messages (cherry picked from commit 83ff94b9b87772251f663f3be59c44cadb2c3a67) --- erpnext/utilities/transaction_base.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/erpnext/utilities/transaction_base.py b/erpnext/utilities/transaction_base.py index 9559c9170cf..6fab5380c38 100644 --- a/erpnext/utilities/transaction_base.py +++ b/erpnext/utilities/transaction_base.py @@ -191,9 +191,11 @@ class TransactionBase(StatusUpdater): ): frappe.throw( _( - "{0} Account must be in either customer billing currency: {1} or Company default currency: {2}" + "{0} Account: {1} ({2}) must be in either customer billing currency: {3} or Company default currency: {4}" ).format( account_type, + frappe.bold(x.account), + frappe.bold(receivable_payable_account_currency), frappe.bold(self.default_currency), frappe.bold(company_default_currency), ) @@ -205,8 +207,12 @@ class TransactionBase(StatusUpdater): ): frappe.throw( _( - "Advance Account must be in either customer billing currency: {0} or Company default currency: {1}" - ).format(frappe.bold(self.default_currency), frappe.bold(company_default_currency)) + "Advance Account: {0} must be in either customer billing currency: {1} or Company default currency: {2}" + ).format( + frappe.bold(x.advance_account), + frappe.bold(self.default_currency), + frappe.bold(company_default_currency), + ) ) if ( From d1679d4663748694c79070587c66e1f951366705 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 17 Jun 2024 07:30:13 +0530 Subject: [PATCH 25/73] chore: fix test data (cherry picked from commit 07d59443b7e679e3dd3498f5837a800983540616) --- erpnext/buying/doctype/supplier/test_records.json | 1 + erpnext/selling/doctype/customer/test_records.json | 1 + 2 files changed, 2 insertions(+) diff --git a/erpnext/buying/doctype/supplier/test_records.json b/erpnext/buying/doctype/supplier/test_records.json index 1aa63fb5ba0..1bb9899cc85 100644 --- a/erpnext/buying/doctype/supplier/test_records.json +++ b/erpnext/buying/doctype/supplier/test_records.json @@ -35,6 +35,7 @@ "doctype": "Supplier", "supplier_name": "_Test Supplier USD", "supplier_group": "_Test Supplier Group", + "default_currency": "USD", "accounts": [{ "company": "_Test Company", "account": "_Test Payable USD - _TC" diff --git a/erpnext/selling/doctype/customer/test_records.json b/erpnext/selling/doctype/customer/test_records.json index 61cb36b0fae..6040f4dd75b 100644 --- a/erpnext/selling/doctype/customer/test_records.json +++ b/erpnext/selling/doctype/customer/test_records.json @@ -47,6 +47,7 @@ "customer_type": "Individual", "doctype": "Customer", "territory": "_Test Territory", + "default_currency": "USD", "accounts": [{ "company": "_Test Company", "account": "_Test Receivable USD - _TC" From a1ebd162841339ae19c0dc620156749716b4bc52 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 17 Jun 2024 08:45:54 +0530 Subject: [PATCH 26/73] chore: remove dead code (cherry picked from commit 7e318c013257ccb673e5065fac32e25e463be96d) --- erpnext/accounts/doctype/payment_entry/payment_entry.py | 1 - 1 file changed, 1 deletion(-) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py index 79ed5639cf2..a2882206b4a 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py @@ -76,7 +76,6 @@ class PaymentEntry(AccountsController): self.setup_party_account_field() self.set_missing_values() self.set_liability_account() - self.validate_advance_account_currency() self.set_missing_ref_details(force=True) self.validate_payment_type() self.validate_party_details() From 3b15708f18e695a93f740f03ddb8b1153abc6208 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 18 Jun 2024 14:35:35 +0530 Subject: [PATCH 27/73] fix(test): incorrect field for customer default billing currency (cherry picked from commit c696d13a5edbd62606efd266db9cd95bf18ed7d6) --- erpnext/accounts/doctype/subscription/test_subscription.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/subscription/test_subscription.py b/erpnext/accounts/doctype/subscription/test_subscription.py index cb4f0200478..ba4963f78ed 100644 --- a/erpnext/accounts/doctype/subscription/test_subscription.py +++ b/erpnext/accounts/doctype/subscription/test_subscription.py @@ -565,7 +565,7 @@ def create_parties(): if not frappe.db.exists("Customer", "_Test Subscription Customer"): customer = frappe.new_doc("Customer") customer.customer_name = "_Test Subscription Customer" - customer.billing_currency = "USD" + customer.default_currency = "USD" customer.append("accounts", {"company": "_Test Company", "account": "_Test Receivable USD - _TC"}) customer.insert() From 6dbe820416fdc91b91ed947f691acf12633b935f Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 18 Jun 2024 15:10:25 +0530 Subject: [PATCH 28/73] refactor(test): enfore use of customer/supplier master While using advance accounts in foreign currency, always use Customer/Supplier master to maintain them (cherry picked from commit 64e63887bed71db1cb6e880ee2ae7f2e88d34a6c) --- .../tests/test_accounts_controller.py | 42 +++++++++++++++---- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/erpnext/controllers/tests/test_accounts_controller.py b/erpnext/controllers/tests/test_accounts_controller.py index d2144adde0f..3f6830c2021 100644 --- a/erpnext/controllers/tests/test_accounts_controller.py +++ b/erpnext/controllers/tests/test_accounts_controller.py @@ -175,17 +175,43 @@ class TestAccountsController(FrappeTestCase): acc = frappe.get_doc("Account", name) setattr(self, x.attribute_name, acc.name) - def enable_advances_under_asset_and_liability(self): + def setup_advance_accounts_in_party_master(self): company = frappe.get_doc("Company", self.company) company.book_advance_payments_in_separate_party_account = 1 - company.default_advance_received_account = self.advance_received_usd - company.default_advance_paid_account = self.advance_paid_usd company.save() - def disable_advances_under_asset_and_liability(self): + customer = frappe.get_doc("Customer", self.customer) + customer.append( + "accounts", + { + "company": self.company, + "account": self.debtors_usd, + "advance_account": self.advance_received_usd, + }, + ) + customer.save() + + supplier = frappe.get_doc("Supplier", self.supplier) + supplier.append( + "accounts", + { + "company": self.company, + "account": self.creditors_usd, + "advance_account": self.advance_paid_usd, + }, + ) + supplier.save() + + def remove_advance_accounts_from_party_master(self): company = frappe.get_doc("Company", self.company) company.book_advance_payments_in_separate_party_account = 0 company.save() + customer = frappe.get_doc("Customer", self.customer) + customer.accounts = [] + customer.save() + supplier = frappe.get_doc("Supplier", self.supplier) + supplier.accounts = [] + supplier.save() def create_sales_invoice( self, @@ -1776,7 +1802,7 @@ class TestAccountsController(FrappeTestCase): """ Customer advance booked under Liability """ - self.enable_advances_under_asset_and_liability() + self.setup_advance_accounts_in_party_master() adv = self.create_payment_entry(amount=1, source_exc_rate=83) adv.save() # explicit 'save' is needed to trigger set_liability_account() @@ -1821,13 +1847,13 @@ class TestAccountsController(FrappeTestCase): self.assertEqual(len(exc_je_for_si), 0) self.assertEqual(len(exc_je_for_adv), 0) - self.disable_advances_under_asset_and_liability() + self.remove_advance_accounts_from_party_master() def test_71_advance_payment_against_purchase_invoice_in_foreign_currency(self): """ Supplier advance booked under Asset """ - self.enable_advances_under_asset_and_liability() + self.setup_advance_accounts_in_party_master() usd_amount = 1 inr_amount = 85 @@ -1890,4 +1916,4 @@ class TestAccountsController(FrappeTestCase): self.assertEqual(len(exc_je_for_pi), 0) self.assertEqual(len(exc_je_for_adv), 0) - self.disable_advances_under_asset_and_liability() + self.remove_advance_accounts_from_party_master() From c45ce75f57bf475152f7ac0af020717919c8758a Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Sat, 22 Jun 2024 19:32:07 +0530 Subject: [PATCH 29/73] refactor(test): make and use a different party for subscription (cherry picked from commit 3fabf4aaa48943f29429931cf0d3e9a3c08a65e5) --- .../accounts/doctype/subscription/test_subscription.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/subscription/test_subscription.py b/erpnext/accounts/doctype/subscription/test_subscription.py index ba4963f78ed..af3916ae469 100644 --- a/erpnext/accounts/doctype/subscription/test_subscription.py +++ b/erpnext/accounts/doctype/subscription/test_subscription.py @@ -476,7 +476,7 @@ class TestSubscription(FrappeTestCase): start_date="2021-01-01", submit_invoice=0, generate_new_invoices_past_due_date=1, - party="_Test Subscription Customer", + party="_Test Subscription Customer John Doe", ) # create invoices for the first two moths @@ -569,6 +569,12 @@ def create_parties(): customer.append("accounts", {"company": "_Test Company", "account": "_Test Receivable USD - _TC"}) customer.insert() + if not frappe.db.exists("Customer", "_Test Subscription Customer John Doe"): + customer = frappe.new_doc("Customer") + customer.customer_name = "_Test Subscription Customer John Doe" + customer.append("accounts", {"company": "_Test Company", "account": "_Test Receivable - _TC"}) + customer.insert() + def reset_settings(): settings = frappe.get_single("Subscription Settings") From f3aa8854880173dd89a911ca4198c9fc605e35f1 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Fri, 21 Jun 2024 15:46:16 +0530 Subject: [PATCH 30/73] fix: pricing rule with and without 'apply multiple' and priority Either all of the pricing rules identified for an item should have 'apply multiple' enabled. If not, Priority is applied and only the highest priority is applied (cherry picked from commit 5e875b238c9d1a1c376f2fa98c0d2451da7e80b7) --- erpnext/accounts/doctype/pricing_rule/utils.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/erpnext/accounts/doctype/pricing_rule/utils.py b/erpnext/accounts/doctype/pricing_rule/utils.py index 60c9e26aabe..9c7911d7cae 100644 --- a/erpnext/accounts/doctype/pricing_rule/utils.py +++ b/erpnext/accounts/doctype/pricing_rule/utils.py @@ -174,12 +174,9 @@ def _get_pricing_rules(apply_on, args, values): def apply_multiple_pricing_rules(pricing_rules): - apply_multiple_rule = [ - d.apply_multiple_pricing_rules for d in pricing_rules if d.apply_multiple_pricing_rules - ] - - if not apply_multiple_rule: - return False + for d in pricing_rules: + if not d.apply_multiple_pricing_rules: + return False return True From f52f726e0601dfdf3e2fd329e82ad3b933035df4 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Sat, 22 Jun 2024 20:26:23 +0530 Subject: [PATCH 31/73] test: priority takes effect on with and without apply multiple (cherry picked from commit efebc3662e8b76ea82866f940ed0bc9032c819e2) --- .../doctype/pricing_rule/test_pricing_rule.py | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py index 7f9c55ff24f..72961a6b6ec 100644 --- a/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py +++ b/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py @@ -1237,6 +1237,68 @@ class TestPricingRule(unittest.TestCase): frappe.delete_doc_if_exists("Pricing Rule", "_Test Pricing Rule 1") frappe.delete_doc_if_exists("Pricing Rule", "_Test Pricing Rule 2") + def test_pricing_rules_with_and_without_apply_multiple(self): + item = make_item("PR Item 99") + + test_records = [ + { + "doctype": "Pricing Rule", + "title": "_Test discount on item group", + "name": "_Test discount on item group", + "apply_on": "Item Group", + "item_groups": [ + { + "item_group": "Products", + } + ], + "selling": 1, + "price_or_product_discount": "Price", + "rate_or_discount": "Discount Percentage", + "discount_percentage": 60, + "has_priority": 1, + "company": "_Test Company", + "apply_multiple_pricing_rules": True, + }, + { + "doctype": "Pricing Rule", + "title": "_Test fixed rate on item code", + "name": "_Test fixed rate on item code", + "apply_on": "Item Code", + "items": [ + { + "item_code": item.name, + } + ], + "selling": 1, + "price_or_product_discount": "Price", + "rate_or_discount": "Rate", + "rate": 25, + "has_priority": 1, + "company": "_Test Company", + "apply_multiple_pricing_rules": False, + }, + ] + + for item_group_priority, item_code_priority in [(2, 4), (4, 2)]: + item_group_rule = frappe.get_doc(test_records[0].copy()) + item_group_rule.priority = item_group_priority + item_group_rule.insert() + + item_code_rule = frappe.get_doc(test_records[1].copy()) + item_code_rule.priority = item_code_priority + item_code_rule.insert() + + si = create_sales_invoice(qty=5, customer="_Test Customer 1", item=item.name, do_not_submit=True) + si.save() + self.assertEqual(len(si.pricing_rules), 1) + # Item Code rule should've applied as it has higher priority + expected_rule = item_group_rule if item_group_priority > item_code_priority else item_code_rule + self.assertEqual(si.pricing_rules[0].pricing_rule, expected_rule.name) + + si.delete() + item_group_rule.delete() + item_code_rule.delete() + test_dependencies = ["Campaign"] From fe9dffb271021e554331f048931fe793b05bbaf1 Mon Sep 17 00:00:00 2001 From: Dany Robert Date: Mon, 3 Jun 2024 13:45:55 +0000 Subject: [PATCH 32/73] feat: accounting dimension filters in gp report (cherry picked from commit d165638bbbd49ef260760528ccca1eb04b71628b) --- .../report/gross_profit/gross_profit.js | 22 ++++++++++++++ .../report/gross_profit/gross_profit.py | 30 +++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/erpnext/accounts/report/gross_profit/gross_profit.js b/erpnext/accounts/report/gross_profit/gross_profit.js index fad6586466e..4f65aa615ee 100644 --- a/erpnext/accounts/report/gross_profit/gross_profit.js +++ b/erpnext/accounts/report/gross_profit/gross_profit.js @@ -63,6 +63,26 @@ frappe.query_reports["Gross Profit"] = { }; }, }, + { + fieldname: "cost_center", + label: __("Cost Center"), + fieldtype: "MultiSelectList", + get_data: function (txt) { + return frappe.db.get_link_options("Cost Center", txt, { + company: frappe.query_report.get_filter_value("company"), + }); + }, + }, + { + fieldname: "project", + label: __("Project"), + fieldtype: "MultiSelectList", + get_data: function (txt) { + return frappe.db.get_link_options("Project", txt, { + company: frappe.query_report.get_filter_value("company"), + }); + }, + }, ], tree: true, name_field: "parent", @@ -85,3 +105,5 @@ frappe.query_reports["Gross Profit"] = { return value; }, }; + +erpnext.utils.add_dimensions("Gross Profit", 15); diff --git a/erpnext/accounts/report/gross_profit/gross_profit.py b/erpnext/accounts/report/gross_profit/gross_profit.py index c8c8dd9b494..6ddb95eb140 100644 --- a/erpnext/accounts/report/gross_profit/gross_profit.py +++ b/erpnext/accounts/report/gross_profit/gross_profit.py @@ -8,6 +8,11 @@ from frappe import _, qb, scrub from frappe.query_builder import Order from frappe.utils import cint, flt, formatdate +from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import ( + get_accounting_dimensions, + get_dimension_with_children, +) +from erpnext.accounts.report.financial_statements import get_cost_centers_with_children from erpnext.controllers.queries import get_match_cond from erpnext.stock.report.stock_ledger.stock_ledger import get_item_group_condition from erpnext.stock.utils import get_incoming_rate @@ -787,6 +792,31 @@ class GrossProfitGenerator: if self.filters.get("item_code"): conditions += " and `tabSales Invoice Item`.item_code = %(item_code)s" + if self.filters.get("cost_center"): + self.filters.cost_center = frappe.parse_json(self.filters.get("cost_center")) + self.filters.cost_center = get_cost_centers_with_children(self.filters.cost_center) + conditions += " and `tabSales Invoice Item`.cost_center in %(cost_center)s" + + if self.filters.get("project"): + self.filters.project = frappe.parse_json(self.filters.get("project")) + conditions += " and `tabSales Invoice Item`.project in %(project)s" + + accounting_dimensions = get_accounting_dimensions(as_list=False) + if accounting_dimensions: + for dimension in accounting_dimensions: + if self.filters.get(dimension.fieldname): + if frappe.get_cached_value("DocType", dimension.document_type, "is_tree"): + self.filters[dimension.fieldname] = get_dimension_with_children( + dimension.document_type, self.filters.get(dimension.fieldname) + ) + conditions += ( + f" and `tabSales Invoice Item`.{dimension.fieldname} in %({dimension.fieldname})s" + ) + else: + conditions += ( + f" and `tabSales Invoice Item`.{dimension.fieldname} in %({dimension.fieldname})s" + ) + if self.filters.get("warehouse"): warehouse_details = frappe.db.get_value( "Warehouse", self.filters.get("warehouse"), ["lft", "rgt"], as_dict=1 From 068ae87b8d56cb1161a9fd42136b72da33f6313f Mon Sep 17 00:00:00 2001 From: Dany Robert Date: Mon, 3 Jun 2024 13:55:12 +0000 Subject: [PATCH 33/73] feat(gp): group by cost center (cherry picked from commit e26bc17c75f1dfea1659172216e3449f2271da14) --- .../accounts/report/gross_profit/gross_profit.js | 2 +- .../accounts/report/gross_profit/gross_profit.py | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/report/gross_profit/gross_profit.js b/erpnext/accounts/report/gross_profit/gross_profit.js index 4f65aa615ee..ad194ee90a2 100644 --- a/erpnext/accounts/report/gross_profit/gross_profit.js +++ b/erpnext/accounts/report/gross_profit/gross_profit.js @@ -36,7 +36,7 @@ frappe.query_reports["Gross Profit"] = { label: __("Group By"), fieldtype: "Select", options: - "Invoice\nItem Code\nItem Group\nBrand\nWarehouse\nCustomer\nCustomer Group\nTerritory\nSales Person\nProject\nMonthly\nPayment Term", + "Invoice\nItem Code\nItem Group\nBrand\nWarehouse\nCustomer\nCustomer Group\nTerritory\nSales Person\nProject\nCost Center\nMonthly\nPayment Term", default: "Invoice", }, { diff --git a/erpnext/accounts/report/gross_profit/gross_profit.py b/erpnext/accounts/report/gross_profit/gross_profit.py index 6ddb95eb140..fe2746660eb 100644 --- a/erpnext/accounts/report/gross_profit/gross_profit.py +++ b/erpnext/accounts/report/gross_profit/gross_profit.py @@ -125,6 +125,13 @@ def execute(filters=None): "gross_profit_percent", ], "project": ["project", "base_amount", "buying_amount", "gross_profit", "gross_profit_percent"], + "cost_center": [ + "cost_center", + "base_amount", + "buying_amount", + "gross_profit", + "gross_profit_percent", + ], "territory": [ "territory", "base_amount", @@ -304,7 +311,14 @@ def get_columns(group_wise_columns, filters): "fieldname": "project", "fieldtype": "Link", "options": "Project", - "width": 100, + "width": 140, + }, + "cost_center": { + "label": _("Cost Center"), + "fieldname": "cost_center", + "fieldtype": "Link", + "options": "Cost Center", + "width": 140, }, "sales_person": { "label": _("Sales Person"), From 68b318a94b679fef505090fa1ebb4adecb3862a8 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 17:04:13 +0530 Subject: [PATCH 34/73] fix: Wrong Delete Batch on Purchase Receipt (backport #42007) (#42012) fix: Wrong Delete Batch on Purchase Receipt (#42007) (cherry picked from commit d50487ce530605bd311da372a09b9e2fb339f00d) Co-authored-by: rohitwaghchaure --- erpnext/public/js/utils/serial_no_batch_selector.js | 1 + .../doctype/serial_and_batch_bundle/serial_and_batch_bundle.py | 1 + 2 files changed, 2 insertions(+) diff --git a/erpnext/public/js/utils/serial_no_batch_selector.js b/erpnext/public/js/utils/serial_no_batch_selector.js index 4928f2dc1a5..78efb46f4c3 100644 --- a/erpnext/public/js/utils/serial_no_batch_selector.js +++ b/erpnext/public/js/utils/serial_no_batch_selector.js @@ -635,6 +635,7 @@ erpnext.SerialBatchPackageSelector = class SerialNoBatchBundleUpdate { set_data(data) { data.forEach((d) => { d.qty = Math.abs(d.qty); + d.name = d.child_row || d.name; this.dialog.fields_dict.entries.df.data.push(d); }); diff --git a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py index e7637aca63e..63e1e5084d6 100644 --- a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py +++ b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py @@ -1220,6 +1220,7 @@ def get_serial_batch_ledgers(item_code=None, docstatus=None, voucher_no=None, na "`tabSerial and Batch Entry`.`warehouse`", "`tabSerial and Batch Entry`.`batch_no`", "`tabSerial and Batch Entry`.`serial_no`", + "`tabSerial and Batch Entry`.`name` as `child_row`", ] if not child_row: From 838cc5b72aff39d53093c71a52fe2645c69fe1a8 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 17:04:24 +0530 Subject: [PATCH 35/73] fix: incorrect Difference Amount (backport #42008) (#42013) fix: incorrect Difference Amount (#42008) (cherry picked from commit 7d91c6cbd5faf3f0d9d507b76964acf98282786a) Co-authored-by: rohitwaghchaure --- .../stock_reconciliation.py | 17 ++++++++++++----- .../test_stock_reconciliation.py | 1 + 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py index 8301a706183..674624e184b 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py @@ -404,7 +404,9 @@ class StockReconciliation(StockController): fields=["total_qty as qty", "avg_rate as rate"], )[0] + bundle_data.qty = abs(bundle_data.qty) self.calculate_difference_amount(item, bundle_data) + return True inventory_dimensions_dict = {} @@ -464,11 +466,16 @@ class StockReconciliation(StockController): frappe.msgprint(_("Removed items with no change in quantity or value.")) def calculate_difference_amount(self, item, item_dict): - self.difference_amount += flt(item.qty, item.precision("qty")) * flt( - item.valuation_rate or item_dict.get("rate"), item.precision("valuation_rate") - ) - flt(item_dict.get("qty"), item.precision("qty")) * flt( - item_dict.get("rate"), item.precision("valuation_rate") - ) + qty_precision = item.precision("qty") + val_precision = item.precision("valuation_rate") + + new_qty = flt(item.qty, qty_precision) + new_valuation_rate = flt(item.valuation_rate or item_dict.get("rate"), val_precision) + + current_qty = flt(item_dict.get("qty"), qty_precision) + current_valuation_rate = flt(item_dict.get("rate"), val_precision) + + self.difference_amount += (new_qty * new_valuation_rate) - (current_qty * current_valuation_rate) def validate_data(self): def _get_msg(row_num, msg): diff --git a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py index 8845bdbb753..a41db6cf611 100644 --- a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py @@ -1109,6 +1109,7 @@ class TestStockReconciliation(FrappeTestCase, StockTestMixin): ) sr.reload() + self.assertEqual(sr.difference_amount, 98900.0) self.assertTrue(sr.items[0].current_valuation_rate) current_sabb = sr.items[0].current_serial_and_batch_bundle From f6be19cb7c46e67dde6c8dc43afe08d57d87acc5 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2024 13:07:03 +0530 Subject: [PATCH 36/73] fix: valuation rate for the legacy batches (backport #42011) (#42020) fix: valuation rate for the legacy batches (#42011) (cherry picked from commit 9ab333d10584745e67ff3bcfe3385d890fc1075a) Co-authored-by: rohitwaghchaure --- erpnext/stock/deprecated_serial_batch.py | 86 ++++++++++++------- .../test_stock_reconciliation.py | 4 +- erpnext/stock/utils.py | 6 +- .../test_subcontracting_receipt.py | 8 +- 4 files changed, 63 insertions(+), 41 deletions(-) diff --git a/erpnext/stock/deprecated_serial_batch.py b/erpnext/stock/deprecated_serial_batch.py index e43e6f21c92..d10833b6d46 100644 --- a/erpnext/stock/deprecated_serial_batch.py +++ b/erpnext/stock/deprecated_serial_batch.py @@ -1,3 +1,6 @@ +import datetime +from collections import defaultdict + import frappe from frappe.query_builder.functions import CombineDatetime, Sum from frappe.utils import flt @@ -8,12 +11,7 @@ from pypika import Order class DeprecatedSerialNoValuation: @deprecated def calculate_stock_value_from_deprecarated_ledgers(self): - if not frappe.db.get_all( - "Stock Ledger Entry", - fields=["name"], - filters={"serial_no": ("is", "set"), "is_cancelled": 0, "item_code": self.sle.item_code}, - limit=1, - ): + if not has_sle_for_serial_nos(self.sle.item_code): return serial_nos = self.get_filterd_serial_nos() @@ -82,6 +80,20 @@ class DeprecatedSerialNoValuation: return incoming_values +@frappe.request_cache +def has_sle_for_serial_nos(item_code): + serial_nos = frappe.db.get_all( + "Stock Ledger Entry", + fields=["name"], + filters={"serial_no": ("is", "set"), "is_cancelled": 0, "item_code": item_code}, + limit=1, + ) + if serial_nos: + return True + + return False + + class DeprecatedBatchNoValuation: @deprecated def calculate_avg_rate_from_deprecarated_ledgers(self): @@ -92,19 +104,25 @@ class DeprecatedBatchNoValuation: @deprecated def get_sle_for_batches(self): + from erpnext.stock.utils import get_combine_datetime + if not self.batchwise_valuation_batches: return [] sle = frappe.qb.DocType("Stock Ledger Entry") - timestamp_condition = CombineDatetime(sle.posting_date, sle.posting_time) < CombineDatetime( - self.sle.posting_date, self.sle.posting_time - ) - if self.sle.creation: - timestamp_condition |= ( - CombineDatetime(sle.posting_date, sle.posting_time) - == CombineDatetime(self.sle.posting_date, self.sle.posting_time) - ) & (sle.creation < self.sle.creation) + timestamp_condition = None + if self.sle.posting_date and self.sle.posting_time: + posting_datetime = get_combine_datetime(self.sle.posting_date, self.sle.posting_time) + if not self.sle.creation: + posting_datetime = posting_datetime + datetime.timedelta(milliseconds=1) + + timestamp_condition = sle.posting_datetime < posting_datetime + + if self.sle.creation: + timestamp_condition |= (sle.posting_datetime == posting_datetime) & ( + sle.creation < self.sle.creation + ) query = ( frappe.qb.from_(sle) @@ -120,10 +138,12 @@ class DeprecatedBatchNoValuation: & (sle.batch_no.isnotnull()) & (sle.is_cancelled == 0) ) - .where(timestamp_condition) .groupby(sle.batch_no) ) + if timestamp_condition: + query = query.where(timestamp_condition) + if self.sle.name: query = query.where(sle.name != self.sle.name) @@ -134,8 +154,8 @@ class DeprecatedBatchNoValuation: if not self.non_batchwise_valuation_batches: return - self.non_batchwise_balance_value = 0.0 - self.non_batchwise_balance_qty = 0.0 + self.non_batchwise_balance_value = defaultdict(float) + self.non_batchwise_balance_qty = defaultdict(float) self.set_balance_value_for_non_batchwise_valuation_batches() @@ -146,12 +166,12 @@ class DeprecatedBatchNoValuation: if not self.non_batchwise_balance_qty: continue - if self.non_batchwise_balance_value == 0: + if self.non_batchwise_balance_qty.get(batch_no) == 0: self.batch_avg_rate[batch_no] = 0.0 self.stock_value_differece[batch_no] = 0.0 else: self.batch_avg_rate[batch_no] = ( - self.non_batchwise_balance_value / self.non_batchwise_balance_qty + self.non_batchwise_balance_value[batch_no] / self.non_batchwise_balance_qty[batch_no] ) self.stock_value_differece[batch_no] = self.non_batchwise_balance_value @@ -174,17 +194,21 @@ class DeprecatedBatchNoValuation: @deprecated def set_balance_value_from_sl_entries(self) -> None: + from erpnext.stock.utils import get_combine_datetime + sle = frappe.qb.DocType("Stock Ledger Entry") batch = frappe.qb.DocType("Batch") - timestamp_condition = CombineDatetime(sle.posting_date, sle.posting_time) < CombineDatetime( - self.sle.posting_date, self.sle.posting_time - ) + posting_datetime = get_combine_datetime(self.sle.posting_date, self.sle.posting_time) + if not self.sle.creation: + posting_datetime = posting_datetime + datetime.timedelta(milliseconds=1) + + timestamp_condition = sle.posting_datetime < posting_datetime + if self.sle.creation: - timestamp_condition |= ( - CombineDatetime(sle.posting_date, sle.posting_time) - == CombineDatetime(self.sle.posting_date, self.sle.posting_time) - ) & (sle.creation < self.sle.creation) + timestamp_condition |= (sle.posting_datetime == posting_datetime) & ( + sle.creation < self.sle.creation + ) query = ( frappe.qb.from_(sle) @@ -201,6 +225,7 @@ class DeprecatedBatchNoValuation: & (sle.batch_no.isnotnull()) & (batch.use_batchwise_valuation == 0) & (sle.is_cancelled == 0) + & (sle.batch_no.isin(self.non_batchwise_valuation_batches)) ) .where(timestamp_condition) .groupby(sle.batch_no) @@ -210,8 +235,8 @@ class DeprecatedBatchNoValuation: query = query.where(sle.name != self.sle.name) for d in query.run(as_dict=True): - self.non_batchwise_balance_value += flt(d.batch_value) - self.non_batchwise_balance_qty += flt(d.batch_qty) + self.non_batchwise_balance_value[d.batch_no] += flt(d.batch_value) + self.non_batchwise_balance_qty[d.batch_no] += flt(d.batch_qty) self.available_qty[d.batch_no] += flt(d.batch_qty) @deprecated @@ -249,6 +274,7 @@ class DeprecatedBatchNoValuation: & (bundle.is_cancelled == 0) & (bundle.docstatus == 1) & (bundle.type_of_transaction.isin(["Inward", "Outward"])) + & (bundle_child.batch_no.isin(self.non_batchwise_valuation_batches)) ) .where(timestamp_condition) .groupby(bundle_child.batch_no) @@ -260,6 +286,6 @@ class DeprecatedBatchNoValuation: query = query.where(bundle.voucher_type != "Pick List") for d in query.run(as_dict=True): - self.non_batchwise_balance_value += flt(d.batch_value) - self.non_batchwise_balance_qty += flt(d.batch_qty) + self.non_batchwise_balance_value[d.batch_no] += flt(d.batch_value) + self.non_batchwise_balance_qty[d.batch_no] += flt(d.batch_qty) self.available_qty[d.batch_no] += flt(d.batch_qty) diff --git a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py index a41db6cf611..48d67c2cf46 100644 --- a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py @@ -647,7 +647,7 @@ class TestStockReconciliation(FrappeTestCase, StockTestMixin): "has_serial_no": 1, "has_batch_no": 1, "serial_no_series": "SRS9.####", - "batch_number_series": "BNS9.####", + "batch_number_series": "BNS90.####", "create_new_batch": 1, }, ) @@ -680,7 +680,7 @@ class TestStockReconciliation(FrappeTestCase, StockTestMixin): { "is_stock_item": 1, "has_batch_no": 1, - "batch_number_series": "BNS9.####", + "batch_number_series": "BNS91.####", "create_new_batch": 1, }, ).name diff --git a/erpnext/stock/utils.py b/erpnext/stock/utils.py index eca01a57640..f2388e5737a 100644 --- a/erpnext/stock/utils.py +++ b/erpnext/stock/utils.py @@ -276,11 +276,7 @@ def get_incoming_rate(args, raise_error_if_no_rate=True): sn_obj = SerialNoValuation(sle=args, warehouse=args.get("warehouse"), item_code=args.get("item_code")) return sn_obj.get_incoming_rate() - elif ( - args.get("batch_no") - and frappe.db.get_value("Batch", args.get("batch_no"), "use_batchwise_valuation", cache=True) - and not args.get("serial_and_batch_bundle") - ): + elif args.get("batch_no") and not args.get("serial_and_batch_bundle"): args.actual_qty = args.qty args.batch_nos = frappe._dict({args.batch_no: args}) diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py b/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py index 81662a6257b..0f5fe7ab958 100644 --- a/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py +++ b/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py @@ -623,8 +623,8 @@ class TestSubcontractingReceipt(FrappeTestCase): "has_batch_no": 1, "has_serial_no": 1, "create_new_batch": 1, - "batch_number_series": "BNGS-.####", - "serial_no_series": "BNSS-.####", + "batch_number_series": "BNGS0-.####", + "serial_no_series": "BNSS90-.####", } ).name @@ -715,8 +715,8 @@ class TestSubcontractingReceipt(FrappeTestCase): "has_batch_no": 1, "has_serial_no": 1, "create_new_batch": 1, - "batch_number_series": "BNGS-.####", - "serial_no_series": "BNSS-.####", + "batch_number_series": "BNGS91-.####", + "serial_no_series": "BNSS91-.####", } ).name From 068de08bbbcbe885523b484ed964e73ef38c4fdc Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2024 18:42:43 +0530 Subject: [PATCH 37/73] fix: timeout while cancelling LCV (backport #42030) (backport #42031) (#42032) fix: timeout while cancelling LCV (backport #42030) (#42031) fix: timeout while cancelling LCV (#42030) fix: timeout while canelling LCV (cherry picked from commit 21bf7fd1f8c9d4c1cd9f3b419089782e82658165) Co-authored-by: rohitwaghchaure (cherry picked from commit 2e76b9f9db51b70341bbbdeeeb43bfbd6675abd4) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- erpnext/stock/stock_ledger.py | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py index e804ae18016..d0195843c5f 100644 --- a/erpnext/stock/stock_ledger.py +++ b/erpnext/stock/stock_ledger.py @@ -1794,6 +1794,7 @@ def get_next_stock_reco(kwargs): sle.actual_qty, sle.has_batch_no, ) + .force_index("item_warehouse") .where( (sle.item_code == kwargs.get("item_code")) & (sle.warehouse == kwargs.get("warehouse")) From e278fc683f9cad5d709c1719d2bae502193387a5 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 09:11:01 +0530 Subject: [PATCH 38/73] fix: Stock Reservation Entry was not getting created (backport #42033) (#42035) fix: Stock Reservation Entry was not getting created (#42033) (cherry picked from commit 1a9899b32bc574873ef27e5e56dc07eea9385178) Co-authored-by: Poorvi-R-Bhat --- erpnext/selling/doctype/sales_order/sales_order.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index e732dfd42d5..cdcd1047bd8 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -75,8 +75,7 @@ frappe.ui.form.on("Sales Order", { if ( frm.doc.__onload && frm.doc.__onload.has_unreserved_stock && - flt(frm.doc.per_picked) === 0 && - frappe.model.can_create("Stock Reservation Entry") + flt(frm.doc.per_picked) === 0 ) { frm.add_custom_button( __("Reserve"), From a981633d949fb43054bb22b78c77c5bde3296742 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 13:00:36 +0530 Subject: [PATCH 39/73] fix: manufacturing date issue in the batch (backport #42034) (#42037) * fix: manufacturing date issue in the batch (#42034) (cherry picked from commit eca3e02f8da4b5d7d1b15a3c42de225168f3bf5e) # Conflicts: # erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py * chore: fix conflicts --------- Co-authored-by: rohitwaghchaure --- erpnext/stock/doctype/batch/batch.py | 16 +++++++++- .../purchase_receipt/test_purchase_receipt.py | 31 ++++++++++++++++++- 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/doctype/batch/batch.py b/erpnext/stock/doctype/batch/batch.py index 0be85e46015..e490badfc40 100644 --- a/erpnext/stock/doctype/batch/batch.py +++ b/erpnext/stock/doctype/batch/batch.py @@ -161,11 +161,25 @@ class Batch(Document): self.use_batchwise_valuation = 1 def before_save(self): + self.set_expiry_date() + + def set_expiry_date(self): has_expiry_date, shelf_life_in_days = frappe.db.get_value( "Item", self.item, ["has_expiry_date", "shelf_life_in_days"] ) + if not self.expiry_date and has_expiry_date and shelf_life_in_days: - self.expiry_date = add_days(self.manufacturing_date, shelf_life_in_days) + if ( + not self.manufacturing_date + and self.reference_doctype in ["Stock Entry", "Purchase Receipt", "Purchase Invoice"] + and self.reference_name + ): + self.manufacturing_date = frappe.db.get_value( + self.reference_doctype, self.reference_name, "posting_date" + ) + + if self.manufacturing_date: + self.expiry_date = add_days(self.manufacturing_date, shelf_life_in_days) if has_expiry_date and not self.expiry_date: frappe.throw( diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py index 42747818d2b..cae58de9303 100644 --- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py +++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py @@ -3,7 +3,7 @@ import frappe from frappe.tests.utils import FrappeTestCase, change_settings -from frappe.utils import add_days, cint, cstr, flt, nowtime, today +from frappe.utils import add_days, cint, cstr, flt, getdate, nowtime, today from pypika import functions as fn import erpnext @@ -2961,6 +2961,35 @@ class TestPurchaseReceipt(FrappeTestCase): self.assertSequenceEqual(expected_gle, gl_entries) frappe.local.enable_perpetual_inventory["_Test Company"] = old_perpetual_inventory + def test_manufacturing_and_expiry_date_for_batch(self): + item = make_item( + "_Test Manufacturing and Expiry Date For Batch", + { + "is_purchase_item": 1, + "is_stock_item": 1, + "has_batch_no": 1, + "create_new_batch": 1, + "batch_number_series": "B-MEBATCH.#####", + "has_expiry_date": 1, + "shelf_life_in_days": 5, + }, + ) + + pr = make_purchase_receipt( + qty=10, + rate=100, + item_code=item.name, + posting_date=today(), + ) + + pr.reload() + self.assertTrue(pr.items[0].serial_and_batch_bundle) + + batch_no = get_batch_from_bundle(pr.items[0].serial_and_batch_bundle) + batch = frappe.get_doc("Batch", batch_no) + self.assertEqual(batch.manufacturing_date, getdate(today())) + self.assertEqual(batch.expiry_date, getdate(add_days(today(), 5))) + def prepare_data_for_internal_transfer(): from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_internal_supplier From f2feeaf264febdbb3b9489b9d363c1e2798dd5f9 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 16:49:55 +0530 Subject: [PATCH 40/73] fix: fixed asset value in Fixed Asset Register (backport #41930) (#42027) fix: fixed asset value in Fixed Asset Register (#41930) (cherry picked from commit 1c643a0ead6ab7f894e9fcf286a53fe566633a8b) Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> --- .../fixed_asset_register.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py index 5d4ef4e3845..8ebf9d6d389 100644 --- a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py +++ b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py @@ -125,9 +125,10 @@ def get_data(filters): if assets_linked_to_fb and asset.calculate_depreciation and asset.asset_id not in assets_linked_to_fb: continue - asset_value = get_asset_value_after_depreciation( - asset.asset_id, finance_book - ) or get_asset_value_after_depreciation(asset.asset_id) + depreciation_amount = depreciation_amount_map.get(asset.asset_id) or 0.0 + asset_value = ( + asset.gross_purchase_amount - asset.opening_accumulated_depreciation - depreciation_amount + ) row = { "asset_id": asset.asset_id, @@ -139,7 +140,7 @@ def get_data(filters): or pi_supplier_map.get(asset.purchase_invoice), "gross_purchase_amount": asset.gross_purchase_amount, "opening_accumulated_depreciation": asset.opening_accumulated_depreciation, - "depreciated_amount": depreciation_amount_map.get(asset.asset_id) or 0.0, + "depreciated_amount": depreciation_amount, "available_for_use_date": asset.available_for_use_date, "location": asset.location, "asset_category": asset.asset_category, @@ -185,11 +186,12 @@ def prepare_chart_data(data, filters): ) for d in data: - date = d.get(date_field) - belongs_to_month = formatdate(date, "MMM YYYY") + if d.get(date_field): + date = d.get(date_field) + belongs_to_month = formatdate(date, "MMM YYYY") - labels_values_map[belongs_to_month].asset_value += d.get("asset_value") - labels_values_map[belongs_to_month].depreciated_amount += d.get("depreciated_amount") + labels_values_map[belongs_to_month].asset_value += d.get("asset_value") + labels_values_map[belongs_to_month].depreciated_amount += d.get("depreciated_amount") return { "data": { From 63b26e679b05d8f2c334257ba4f8921ad72a48db Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 16:50:41 +0530 Subject: [PATCH 41/73] feat: Turkish Chart Of Accounts (backport #41756) (#42028) * feat: Create Turkish Chart Of Accounts (cherry picked from commit 5c8ea86a3f039077c50b0b9e6ecbae6e29bf574a) * feat: Create Turkish Chart Of Accounts (cherry picked from commit b401ba2c268fc22b99514d599e477c999293a773) --------- Co-authored-by: fzozyurt --- .../unverified/tr_l10ntr_tek_duzen_hesap.json | 531 ------ .../verified/tr_chart_of_accounts.json | 1473 +++++++++++++++++ 2 files changed, 1473 insertions(+), 531 deletions(-) delete mode 100644 erpnext/accounts/doctype/account/chart_of_accounts/unverified/tr_l10ntr_tek_duzen_hesap.json create mode 100644 erpnext/accounts/doctype/account/chart_of_accounts/verified/tr_chart_of_accounts.json diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/tr_l10ntr_tek_duzen_hesap.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/tr_l10ntr_tek_duzen_hesap.json deleted file mode 100644 index dfc821eb53e..00000000000 --- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/tr_l10ntr_tek_duzen_hesap.json +++ /dev/null @@ -1,531 +0,0 @@ -{ - "country_code": "tr", - "name": "Turkey - Tek D\u00fczen Hesap Plan\u0131", - "tree": { - "Duran Varl\u0131klar": { - "Di\u011fer Alacaklar": { - "Ba\u011fl\u0131 Ortakl\u0131klardan Alacaklar": {}, - "Di\u011fer Alacak Senetleri Reeskontu(-)": {}, - "Di\u011fer \u00c7e\u015fitli Alacaklar": {}, - "Ortaklardan Alacaklar": {}, - "Personelden Alacaklar": {}, - "\u0130\u015ftiraklerden Alacaklar": {}, - "\u015e\u00fcpheli Di\u011fer Alacaklar Kar\u015f\u0131l\u0131\u011f\u0131(-)": {} - }, - "Di\u011fer Duran Varl\u0131klar": { - "Birikmi\u015f Amortismanlar(-)": {}, - "Di\u011fer KDV": {}, - "Di\u011fer \u00c7e\u015fitli Duran Varl\u0131klar": {}, - "Elden \u00c7\u0131kar\u0131lacak Stoklar Ve Maddi Duran Varl\u0131klar": {}, - "Gelecek Y\u0131llar \u0130htiyac\u0131 Stoklar": {}, - "Gelecek Y\u0131llarda \u0130ndirilecek KDV": {}, - "Pe\u015fin \u00d6denen Vergi Ve Fonlar": {}, - "Stok De\u011fer D\u00fc\u015f\u00fckl\u00fc\u011f\u00fc Kar\u015f\u0131l\u0131\u011f\u0131(-)": {} - }, - "Gelecek Y\u0131llara Ait Giderler ve Gelir Tahakkuklar\u0131": { - "Gelecek Y\u0131llara Ait Giderler": {}, - "Gelir Tahakkuklar\u0131": {} - }, - "Maddi Duran Varl\u0131klar": { - "Arazi Ve Arsalar": {}, - "Binalar": {}, - "Birikmi\u015f Amortismanlar(-)": {}, - "Demirba\u015flar": {}, - "Di\u011fer Maddi Duran Varl\u0131klar": {}, - "Ta\u015f\u0131tlar": {}, - "Tesis, Makine Ve Cihazlar": {}, - "Verilen Avanslar": {}, - "Yap\u0131lmakta Olan Yat\u0131r\u0131mlar": {}, - "Yer Alt\u0131 Ve Yer \u00dcst\u00fc D\u00fczenleri": {} - }, - "Maddi Olmayan Duran Varl\u0131klar": { - "Ara\u015ft\u0131rma Ve Geli\u015ftirme Giderleri": {}, - "Birikmi\u015f Amortismanlar(-)": {}, - "Di\u011fer Maddi Olmayan Duran Varl\u0131klar": {}, - "Haklar": {}, - "Kurulu\u015f Ve \u00d6rg\u00fctlenme Giderleri": {}, - "Verilen Avanslar": {}, - "\u00d6zel Maliyetler": {}, - "\u015eerefiye": {} - }, - "Mali Duran Varl\u0131klar": { - "Ba\u011fl\u0131 Menkul K\u0131ymetler": {}, - "Ba\u011fl\u0131 Menkul K\u0131ymetler De\u011fer D\u00fc\u015f\u00fckl\u00fc\u011f\u00fc Kar\u015f\u0131l\u0131\u011f\u0131(-)": {}, - "Ba\u011fl\u0131 Ortakl\u0131klar": {}, - "Ba\u011fl\u0131 Ortakl\u0131klar Sermaye Paylar\u0131 De\u011fer D\u00fc\u015f\u00fckl\u00fc\u011f\u00fc Kar\u015f\u0131l\u0131\u011f\u0131(-)": {}, - "Ba\u011fl\u0131 Ortakl\u0131klara Sermaye Taahh\u00fctleri(-)": {}, - "Di\u011fer Mali Duran Varl\u0131klar": {}, - "Di\u011fer Mali Duran Varl\u0131klar Kar\u015f\u0131l\u0131\u011f\u0131(-)": {}, - "\u0130\u015ftirakler": {}, - "\u0130\u015ftirakler Sermaye Paylar\u0131 De\u011fer D\u00fc\u015f\u00fckl\u00fc\u011f\u00fc Kar\u015f\u0131l\u0131\u011f\u0131(-)": {}, - "\u0130\u015ftiraklere Sermaye Taahh\u00fctleri(-)": {} - }, - "Ticari Alacaklar": { - "Alacak Senetleri": {}, - "Alacak Senetleri Reeskontu(-)": {}, - "Al\u0131c\u0131lar": {}, - "Kazaqn\u0131lmam\u0131\u015f Finansal Kiralama Faiz Gelirleri(-)": {}, - "Verilen Depozito Ve Teminatlar": {}, - "\u015e\u00fcpheli Ticari Alacaklar Kar\u015f\u0131l\u0131\u011f\u0131(-)": {} - }, - "root_type": "", - "\u00d6zel T\u00fckenmeye Tabi Varl\u0131klar": { - "Arama Giderleri": {}, - "Birikmi\u015f T\u00fckenme Paylar\u0131(-)": {}, - "Di\u011fer \u00d6zel T\u00fckenmeye Tabi Varl\u0131klar": {}, - "Haz\u0131rl\u0131k Ve Geli\u015ftirme Giderleri": {}, - "Verilen Avanslar": {} - } - }, - "D\u00f6nen Varl\u0131klar": { - "Di\u011fer Alacaklar": { - "Ba\u011fl\u0131 Ortakl\u0131klardan Alacaklar": {}, - "Di\u011fer Alacak Senetleri Reeskontu(-)": {}, - "Di\u011fer \u00c7e\u015fitli Alacaklar": {}, - "Ortaklardan Alacaklar": {}, - "Personelden Alacaklar": {}, - "\u0130\u015ftiraklerden Alacaklar": {}, - "\u015e\u00fcpheli Di\u011fer Alacaklar": {}, - "\u015e\u00fcpheli Di\u011fer Alacaklar Kar\u015f\u0131l\u0131\u011f\u0131(-)": {} - }, - "Di\u011fer D\u00f6nen Varl\u0131klar": { - "Devreden KDV": {}, - "Di\u011fer D\u00f6nen Varl\u0131klar Kar\u015f\u0131l\u0131\u011f\u0131(-)": {}, - "Di\u011fer KDV": {}, - "Di\u011fer \u00c7e\u015fitli D\u00f6nen Varl\u0131klar": {}, - "Personel Avanslar\u0131": {}, - "Pe\u015fin \u00d6denen Vergiler Ve Fonlar": {}, - "Say\u0131m Ve Tesell\u00fcm Noksanlar\u0131": {}, - "\u0130ndirilecek KDV": {}, - "\u0130\u015f Avanslar\u0131": {} - }, - "Gelecek Aylara Ait Giderler ve Gelir Tahakkuklar\u0131": { - "Gelecek Aylara Ait Giderler": {}, - "Gelir Tahakkuklar\u0131": {} - }, - "Haz\u0131r De\u011ferler": { - "Al\u0131nan \u00c7ekler": {}, - "Bankalar": { - "account_type": "Bank" - }, - "Di\u011fer Haz\u0131r De\u011ferler": {}, - "Kasa": { - "account_type": "Cash" - }, - "Verilen \u00c7ekler ve \u00d6deme Emirleri(-)": {} - }, - "Menkul K\u0131ymetler": { - "Di\u011fer Menkul K\u0131ymetler": {}, - "Hisse Senetleri": {}, - "Kamu Kesimi Tahvil, Senet ve Bonolar\u0131": {}, - "Menkul K\u0131ymetler De\u011fer D\u00fc\u015f\u00fckl\u00fc\u011f\u00fc Kar\u015f\u0131l\u0131\u011f\u0131(-)": {}, - "\u00d6zel Kesim Tahvil Senet Ve Bonolar\u0131": {} - }, - "Stoklar": { - "Mamuller": {}, - "Stok De\u011fer D\u00fc\u015f\u00fckl\u00fc\u011f\u00fc Kar\u015f\u0131l\u0131\u011f\u0131(-)": {}, - "Ticari Mallar": {}, - "Verilen Sipari\u015f Avanslar\u0131": {}, - "Yar\u0131 Mamuller": {}, - "\u0130lk Madde Malzeme": {} - }, - "Ticari Alacaklar": { - "Alacak Senetleri": {}, - "Alacak Senetleri Reeskontu(-)": {}, - "Al\u0131c\u0131lar": {}, - "Di\u011fer Ticari Alacaklar": {}, - "Kazan\u0131lmam\u0131\u015f Finansal Kiralama Faiz Gelirleri(-)": {}, - "Verilen Depozito ve Teminatlar": {}, - "\u015e\u00fcpheli Ticari Alacaklar": {}, - "\u015e\u00fcpheli Ticari Alacaklar Kar\u015f\u0131l\u0131\u011f\u0131": {} - }, - "Y\u0131llara Yayg\u0131n \u0130n\u015faat ve Onar\u0131m Maliyetleri": { - "Ta\u015feronlara Verilen Avanslar": {}, - "Y\u0131llara Yayg\u0131n \u0130n\u015faat Ve Onar\u0131m Maliyetleri": {} - }, - "root_type": "" - }, - "Gelir Tablosu Hesaplar\u0131": { - "Br\u00fct Sat\u0131\u015flar": { - "Di\u011fer Gelirler": {}, - "Yurt D\u0131\u015f\u0131 Sat\u0131\u015flar": {}, - "Yurt \u0130\u00e7i Sat\u0131\u015flar": {} - }, - "Di\u011fer Faaliyetlerden Olu\u015fan Gelir ve K\u00e2rlar": { - "Ba\u011fl\u0131 Ortakl\u0131klardan Temett\u00fc Gelirleri": {}, - "Di\u011fer Ola\u011fan Gelir Ve K\u00e2rlar": {}, - "Enflasyon D\u00fczeltme K\u00e2rlar\u0131": {}, - "Faiz Gelirleri": {}, - "Kambiyo K\u00e2rlar\u0131": {}, - "Komisyon Gelirleri": {}, - "Konusu Kalmayan Kar\u015f\u0131l\u0131klar": {}, - "Menkul K\u0131ymet Sat\u0131\u015f K\u00e2rlar\u0131": {}, - "Reeskont Faiz Gelirleri": {}, - "\u0130\u015ftiraklerden Temett\u00fc Gelirleri": {} - }, - "Di\u011fer Faaliyetlerden Olu\u015fan Gider ve Zararlar (-)": { - "Di\u011fer Ola\u011fan Gider Ve Zararlar(-)": {}, - "Enflasyon D\u00fczeltmesi Zararlar\u0131(-)": {}, - "Kambiyo Zararlar\u0131(-)": {}, - "Kar\u015f\u0131l\u0131k Giderleri(-)": {}, - "Komisyon Giderleri(-)": {}, - "Menkul K\u0131ymet Sat\u0131\u015f Zararlar\u0131(-)": {}, - "Reeskont Faiz Giderleri(-)": {} - }, - "D\u00f6nem Net K\u00e2r\u0131 Ve Zarar\u0131": { - "D\u00f6nem K\u00e2r\u0131 Vergi Ve Di\u011fer Yasal Y\u00fck\u00fcml\u00fcl\u00fck Kar\u015f\u0131l\u0131klar\u0131(-)": {}, - "D\u00f6nem K\u00e2r\u0131 Veya Zarar\u0131": {}, - "D\u00f6nem Net K\u00e2r\u0131 Veya Zarar\u0131": {}, - "Enflasyon D\u00fczeltme Hesab\u0131": {}, - "Y\u0131llara Yayg\u0131n \u0130n\u015faat Ve Enflasyon D\u00fczeltme Hesab\u0131": {} - }, - "Faaliyet Giderleri(-)": { - "Ara\u015ft\u0131rma Ve Geli\u015ftirme Giderleri(-)": {}, - "Genel Y\u00f6netim Giderleri(-)": {}, - "Pazarlama Sat\u0131\u015f Ve Da\u011f\u0131t\u0131m Giderleri(-)": {} - }, - "Finansman Giderleri": { - "K\u0131sa Vadeli Bor\u00e7lanma Giderleri(-)": {}, - "Uzun Vadeli Bor\u00e7lanma Giderleri(-)": {} - }, - "Ola\u011fan D\u0131\u015f\u0131 Gelir Ve K\u00e2rlar": { - "Di\u011fer Ola\u011fan D\u0131\u015f\u0131 Gelir Ve K\u00e2rlar": {}, - "\u00d6nceki D\u00f6nem Gelir Ve K\u00e2rlar\u0131": {} - }, - "Ola\u011fan D\u0131\u015f\u0131 Gider Ve Zaralar(-)": { - "Di\u011fer Ola\u011fan D\u0131\u015f\u0131 Gider Ve Zararlar(-)": {}, - "\u00c7al\u0131\u015fmayan K\u0131s\u0131m Gider Ve Zararlar\u0131(-)": {}, - "\u00d6nceki D\u00f6nem Gider Ve Zararlar\u0131(-)": {} - }, - "Sat\u0131\u015f \u0130ndirimleri (-)": { - "Di\u011fer \u0130ndirimler": {}, - "Sat\u0131\u015f \u0130ndirimleri(-)": {}, - "Sat\u0131\u015ftan \u0130adeler(-)": {} - }, - "Sat\u0131\u015flar\u0131n Maliyeti(-)": { - "Di\u011fer Sat\u0131\u015flar\u0131n Maliyeti(-)": {}, - "Sat\u0131lan Hizmet Maliyeti(-)": {}, - "Sat\u0131lan Mamuller Maliyeti(-)": {}, - "Sat\u0131lan Ticari Mallar Maliyeti(-)": {} - }, - "root_type": "" - }, - "K\u0131sa Vadeli Yabanc\u0131 Kaynaklar": { - "Al\u0131nan Avanslar": { - "Al\u0131nan Di\u011fer Avanslar": { - "account_type": "Payable" - }, - "Al\u0131nan Sipari\u015f Avanslar\u0131": { - "account_type": "Payable" - }, - "account_type": "Payable" - }, - "Bor\u00e7 ve Gider Kar\u015f\u0131l\u0131klar\u0131": { - "Di\u011fer Bor\u00e7 Ve Gider Kar\u015f\u0131l\u0131klar\u0131": { - "account_type": "Payable" - }, - "D\u00f6nem K\u00e2r\u0131 Vergi Ve Di\u011fer Yasal Y\u00fck\u00fcml\u00fcl\u00fck Kar\u015f\u0131l\u0131klar\u0131": { - "account_type": "Tax" - }, - "D\u00f6nem K\u00e2r\u0131n\u0131n Pe\u015fin \u00d6denen Vergi Ve Di\u011fer Y\u00fck\u00fcml\u00fcl\u00fckler(-)": { - "account_type": "Tax" - }, - "K\u0131dem Tazminat\u0131 Kar\u015f\u0131l\u0131\u011f\u0131": {}, - "Maliyet Giderleri Kar\u015f\u0131l\u0131\u011f\u0131": {}, - "account_type": "Payable" - }, - "Di\u011fer Bor\u00e7lar": { - "Ba\u011fl\u0131 Ortakl\u0131klara Bor\u00e7lar": { - "account_type": "Payable" - }, - "Di\u011fer Bor\u00e7 Senetleri Reeskontu(-)": { - "account_type": "Payable" - }, - "Di\u011fer \u00c7e\u015fitli Bor\u00e7lar": { - "account_type": "Payable" - }, - "Ortaklara Bor\u00e7lar": { - "account_type": "Payable" - }, - "Personele Bor\u00e7lar": { - "account_type": "Payable" - }, - "account_type": "Payable", - "\u0130\u015ftiraklere Bor\u00e7lar": { - "account_type": "Payable" - } - }, - "Di\u011fer K\u0131sa Vadeli Yabanc\u0131 Kaynaklar": { - "Di\u011fer KDV": { - "account_type": "Tax" - }, - "Di\u011fer \u00c7e\u015fitli Yabanc\u0131 Kaynaklar": {}, - "Hesaplanan KDV": { - "account_type": "Tax" - }, - "Merkez Ve \u015eubeler Cari Hesab\u0131": {}, - "Say\u0131m Ve Tesell\u00fcm Fazlalar\u0131": {}, - "account_type": "Payable" - }, - "Gelecek Aylara Ait Gelirler Ve Gider Tahakkuklar\u0131": { - "Gelecek Aylara Ait Gelirler": {}, - "Gider Tahakkuklar\u0131": {} - }, - "Mali Bor\u00e7lar": { - "Banka Kredileri": { - "account_type": "Payable" - }, - "Di\u011fer Mali Bor\u00e7lar": { - "account_type": "Payable" - }, - "Ertelenmi\u015f Finansal Kiralama Bor\u00e7lanma Maliyetleri(-)": { - "account_type": "Payable" - }, - "Finansal Kiralama \u0130\u015flemlerinden Bor\u00e7lar": { - "account_type": "Payable" - }, - "Menkul K\u0131ymetler \u0130hra\u00e7 Fark\u0131(-)": { - "account_type": "Payable" - }, - "Tahvil Anapara Bor\u00e7, Taksit Ve Faizleri": { - "account_type": "Payable" - }, - "Uzun Vadeli Kredilerin Anapara Taksitleri Ve Faizleri": { - "account_type": "Payable" - }, - "account_type": "Payable", - "\u00c7\u0131kar\u0131lan Bonolar Ve Senetler": { - "account_type": "Payable" - }, - "\u00c7\u0131kar\u0131lm\u0131\u015f Di\u011fer Menkul K\u0131ymetler": { - "account_type": "Payable" - } - }, - "Ticari Bor\u00e7lar": { - "Al\u0131nan Depozito Ve Teminatlar": { - "account_type": "Payable" - }, - "Bor\u00e7 Senetleri": { - "account_type": "Payable" - }, - "Bor\u00e7 Senetleri Reeskontu(-)": { - "account_type": "Payable" - }, - "Di\u011fer Ticari Bor\u00e7lar": { - "account_type": "Payable" - }, - "Sat\u0131c\u0131lar": { - "account_type": "Payable" - }, - "account_type": "Payable" - }, - "Y\u0131llara Yayg\u0131n \u0130n\u015faat Ve Onar\u0131m Hakedi\u015fleri": { - "350 Y\u0131llara Yayg\u0131n \u0130n\u015faat Ve Onar\u0131m Hakedi\u015fleri Bedelleri": { - "account_type": "Payable" - }, - "account_type": "Payable" - }, - "root_type": "", - "\u00d6denecek Vergi ve Di\u011fer Y\u00fck\u00fcml\u00fcl\u00fckler": { - "Vadesi Ge\u00e7mi\u015f, Ertelenmi\u015f Veya Taksitlendirilmi\u015f Vergi Ve Di\u011fer Y\u00fck\u00fcml\u00fcl\u00fckler": { - "account_type": "Tax" - }, - "account_type": "Tax", - "\u00d6denecek Di\u011fer Y\u00fck\u00fcml\u00fcl\u00fckler": { - "account_type": "Tax" - }, - "\u00d6denecek Sosyal G\u00fcvenl\u00fck Kesintileri": { - "account_type": "Tax" - }, - "\u00d6denecek Vergi Ve Fonlar": { - "account_type": "Tax" - } - } - }, - "Maliyet Hesaplar\u0131": { - "Ara\u015ft\u0131rma Ve Geli\u015ftirme Giderleri": {}, - "Direkt \u0130lk Madde Ve Malzeme Giderleri": { - "Direk \u0130lk Madde Ve Malzeme Giderleri Hesab\u0131": {}, - "Direkt \u0130lk Madde Ve Malzeme Fiyat Fark\u0131": {}, - "Direkt \u0130lk Madde Ve Malzeme Miktar Fark\u0131": {}, - "Direkt \u0130lk Madde Ve Malzeme Yans\u0131tma Hesab\u0131": {} - }, - "Direkt \u0130\u015f\u00e7ilik Giderleri": { - "Direkt \u0130\u015f\u00e7ilik Giderleri": {}, - "Direkt \u0130\u015f\u00e7ilik Giderleri Yans\u0131tma Hesab\u0131": {}, - "Direkt \u0130\u015f\u00e7ilik S\u00fcre Farklar\u0131": {}, - "Direkt \u0130\u015f\u00e7ilik \u00dccret Farklar\u0131": {} - }, - "Finansman Giderleri": { - "Finansman Giderleri": {}, - "Finansman Giderleri Fark Hesab\u0131": {}, - "Finansman Giderleri Yans\u0131tma Hesab\u0131": {} - }, - "Genel Y\u00f6netim Giderleri": { - "Genel Y\u00f6netim Gider Farklar\u0131 Hesab\u0131": {}, - "Genel Y\u00f6netim Giderleri": {}, - "Genel Y\u00f6netim Giderleri Yans\u0131tma Hesab\u0131": {} - }, - "Genel \u00dcretim Giderleri": { - "Genel \u00dcretim Giderleri": {}, - "Genel \u00dcretim Giderleri B\u00fct\u00e7e Farklar\u0131": {}, - "Genel \u00dcretim Giderleri Kapasite Farklar\u0131": {}, - "Genel \u00dcretim Giderleri Verimlilik Giderleri": {}, - "Genel \u00dcretim Giderleri Yans\u0131tma Hesab\u0131": {} - }, - "Hizmet \u00dcretim Maliyeti": { - "Hizmet \u00dcretim Maliyeti": {}, - "Hizmet \u00dcretim Maliyeti Fark Hesaplar\u0131": {}, - "Hizmet \u00dcretim Maliyeti Yans\u0131tma Hesab\u0131": {} - }, - "Maliyet Muhasebesi Ba\u011flant\u0131 Hesaplar\u0131": { - "Maliyet Muhasebesi Ba\u011flant\u0131 Hesab\u0131": {}, - "Maliyet Muhasebesi Yans\u0131tma Hesab\u0131": {} - }, - "Pazarlama, Sat\u0131\u015f Ve Da\u011f\u0131t\u0131m Giderleri": { - "Atra\u015ft\u0131rma Ve Geli\u015ftirme Giderleri": {}, - "Pazarlama Sat\u0131\u015f Ve Dag\u0131t\u0131m Giderleri Yans\u0131tma Hesab\u0131": {}, - "Pazarlama Sat\u0131\u015f Ve Da\u011f\u0131t\u0131m Giderleri Fark Hesab\u0131": {} - }, - "root_type": "" - }, - "Naz\u0131m Hesaplar": { - "root_type": "" - }, - "Serbest Hesaplar": { - "root_type": "" - }, - "Uzun Vadeli Yabanc\u0131 Kaynaklar": { - "Al\u0131nan Avanslar": { - "Al\u0131nan Di\u011fer Avanslar": { - "account_type": "Payable" - }, - "Al\u0131nan Sipari\u015f Avanslar\u0131": { - "account_type": "Payable" - }, - "account_type": "Payable" - }, - "Bor\u00e7 Ve Gider Kar\u015f\u0131l\u0131klar\u0131": { - "Di\u011fer Bor\u00e7 Ve Gider Kar\u015f\u0131l\u0131klar\u0131": { - "account_type": "Payable" - }, - "K\u0131dem Tazminat\u0131 Kar\u015f\u0131l\u0131\u011f\u0131": {}, - "account_type": "Payable" - }, - "Di\u011fer Bor\u00e7lar": { - "Ba\u011fl\u0131 Ortakl\u0131klara Bor\u00e7lar": { - "account_type": "Payable" - }, - "Di\u011fer Bor\u00e7 Senetleri Reeskontu(-)": { - "account_type": "Payable" - }, - "Di\u011fer \u00c7e\u015fitli Bor\u00e7lar": { - "account_type": "Payable" - }, - "Kamuya Olan Ertelenmi\u015f Veya Taksitlendirilmi\u015f Bor\u00e7lar": { - "account_type": "Payable" - }, - "Ortaklara Bor\u00e7lar": { - "account_type": "Payable" - }, - "account_type": "Payable", - "\u0130\u015ftiraklere Bor\u00e7lar": { - "account_type": "Payable" - } - }, - "Di\u011fer Uzun Vadeli Yabanc\u0131 Kaynaklar": { - "Di\u011fer \u00c7e\u015fitli Uzun Vadeli Yabanc\u0131 Kaynaklar": { - "account_type": "Payable" - }, - "Gelecek Y\u0131llara Ertelenmi\u015f Veya Terkin Edilecek KDV": { - "account_type": "Payable" - }, - "Tesise Kat\u0131lma Paylar\u0131": { - "account_type": "Payable" - }, - "account_type": "Payable" - }, - "Gelecek Y\u0131llara Ait Gelirler Ve Gider Tahakkuklar\u0131": { - "Gelecek Y\u0131llara Ait Gelirler": {}, - "Gider Tahakkuklar\u0131": {} - }, - "Mali Bor\u00e7lar": { - "Banka Kredileri": { - "account_type": "Payable" - }, - "Di\u011fer Mali Bor\u00e7lar": { - "account_type": "Payable" - }, - "Ertelenmi\u015f Finansal Kiralama Bor\u00e7lanma Maliyetleri(-)": { - "account_type": "Payable" - }, - "Finansal Kiralama \u0130\u015flemlerinden Bor\u00e7lar": { - "account_type": "Payable" - }, - "Menkul K\u0131ymetler \u0130hra\u00e7 Fark\u0131(-)": { - "account_type": "Payable" - }, - "account_type": "Payable", - "\u00c7\u0131kar\u0131lm\u0131\u015f Di\u011fer Menkul K\u0131ymetler": { - "account_type": "Payable" - }, - "\u00c7\u0131kar\u0131lm\u0131\u015f Tahviller": { - "account_type": "Payable" - } - }, - "Ticari Bor\u00e7lar": { - "Al\u0131nan Depozito Ve Teminatlar": { - "account_type": "Payable" - }, - "Bor\u00e7 Senetleri": { - "account_type": "Payable" - }, - "Bor\u00e7 Senetleri Reeskontu(-)": { - "account_type": "Payable" - }, - "Di\u011fer Ticari Bor\u00e7lar": { - "account_type": "Payable" - }, - "Sat\u0131c\u0131lar": { - "account_type": "Payable" - }, - "account_type": "Payable" - }, - "root_type": "" - }, - "\u00d6z Kaynaklar": { - "D\u00f6nem Net K\u00e2r\u0131 (Zarar\u0131)": { - "D\u00f6nem Net K\u00e2r\u0131": {}, - "D\u00f6nem Net Zarar\u0131(-)": {} - }, - "Ge\u00e7mi\u015f Y\u0131llar K\u00e2rlar\u0131": { - "Ge\u00e7mi\u015f Y\u0131llar K\u00e2rlar\u0131": {} - }, - "Ge\u00e7mi\u015f Y\u0131llar Zararlar\u0131(-)": { - "Ge\u00e7mi\u015f Y\u0131llar Zararlar\u0131(-)": {} - }, - "K\u00e2r Yedekleri": { - "Di\u011fer K\u00e2r Yedekleri": {}, - "Ola\u011fan\u00fcst\u00fc Yedekler": {}, - "Stat\u00fc Yedekleri": {}, - "Yasal Yedekler": {}, - "\u00d6zel Fonlar": {} - }, - "Sermaye Yedekleri": { - "Di\u011fer Sermaye Yedekleri": {}, - "Hisse Senedi \u0130ptal K\u00e2rlar\u0131": {}, - "Hisse Senetleri \u0130hra\u00e7 Primleri": {}, - "Maddi Duran Varl\u0131k Yeniden De\u011ferlenme Art\u0131\u015flar\u0131": {}, - "Maliyet Art\u0131\u015flar\u0131 Fonu": {}, - "\u0130\u015ftirakler Yeniden De\u011ferleme Art\u0131\u015flar\u0131": {} - }, - "root_type": "", - "\u00d6denmi\u015f Sermaye": { - "Sermaye": {}, - "\u00d6denmi\u015f Sermaye(-)": { - "account_type": "Payable" - } - } - } - } -} \ No newline at end of file diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/tr_chart_of_accounts.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/tr_chart_of_accounts.json new file mode 100644 index 00000000000..fa8860883d2 --- /dev/null +++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/tr_chart_of_accounts.json @@ -0,0 +1,1473 @@ +{ + "country_code": "tr", + "name": "Turkey - Chart of Accounts", + "tree": { + "D\u00d6NEN VARLIKLAR": { + "account_number": "1", + "root_type": "Asset", + "HAZIR DE\u011eERLER": { + "account_number": "10", + "KASA": { + "account_number": "100", + "is_group": 1, + "account_type": "Cash", + "TL KASA": { + "account_number": "100.01", + "account_type": "Cash" + }, + "EUR KASA": { + "account_number": "100.02", + "account_type": "Cash" + }, + "USD KASA": { + "account_number": "100.03", + "account_type": "Cash" + } + }, + "ALINAN \u00c7EKLER": { + "account_number": "101", + "is_group": 1 + }, + "BANKALAR": { + "account_number": "102", + "is_group": 1, + "account_type": "Bank" + }, + "VER\u0130LEN \u00c7EKLER VE \u00d6DEME EM\u0130RLER\u0130(-)": { + "account_number": "103", + "is_group": 1 + }, + "D\u0130\u011eER HAZIR DE\u011eERLER": { + "account_number": "108", + "is_group": 1 + } + }, + "MENKUL KIYMETLER": { + "account_number": "11", + "H\u0130SSE SENETLER\u0130": { + "account_number": "110", + "is_group": 1 + }, + "\u00d6ZEL KES\u0130M TAHV\u0130L SENET VE BONOLARI": { + "account_number": "111", + "is_group": 1 + }, + "KAMU KES\u0130M\u0130 TAHV\u0130L, SENET VE BONOLARI": { + "account_number": "112", + "is_group": 1 + }, + "D\u0130\u011eER MENKUL KIYMETLER": { + "account_number": "118", + "is_group": 1 + }, + "MENKUL KIYMETLER DE\u011eER D\u00dc\u015e\u00dcKL\u00dc\u011e\u00dc KAR\u015eILI\u011eI(-)": { + "account_number": "119", + "is_group": 1 + } + }, + "T\u0130CAR\u0130 ALACAKLAR": { + "account_number": "12", + "ALICILAR": { + "account_number": "120", + "ALICILAR": { + "account_number": "120.01", + "account_type": "Receivable" + } + }, + "ALACAK SENETLER\u0130": { + "account_number": "121", + "is_group": 1 + }, + "ALACAK SENETLER\u0130 REESKONTU(-)": { + "account_number": "122", + "is_group": 1 + }, + "KAZANILMAMI\u015e F\u0130NANSAL K\u0130RALAMA FA\u0130Z GEL\u0130RLER\u0130 (-)": { + "account_number": "124", + "is_group": 1 + }, + "VER\u0130LEN DEPOZ\u0130TO VE TEM\u0130NATLAR": { + "account_number": "126", + "is_group": 1 + }, + "D\u0130\u011eER T\u0130CAR\u0130 ALACAKLAR": { + "account_number": "127", + "is_group": 1 + }, + "\u015e\u00dcPHEL\u0130 T\u0130CAR\u0130 ALACAKLAR": { + "account_number": "128", + "is_group": 1 + }, + "\u015e\u00dcPHEL\u0130 T\u0130CAR\u0130 ALACAKLAR KAR\u015eILI\u011eI(-)": { + "account_number": "129", + "is_group": 1 + } + }, + "D\u0130\u011eER ALACAKLAR": { + "account_number": "13", + "ORTAKLARDAN ALACAKLAR": { + "account_number": "131", + "is_group": 1 + }, + "\u0130\u015eT\u0130RAKLERDEN ALACAKLAR": { + "account_number": "132", + "is_group": 1 + }, + "BA\u011eLI ORTAKLIKLARDAN ALACAKLAR": { + "account_number": "133", + "is_group": 1 + }, + "PERSONELDEN ALACAKLAR": { + "account_number": "135", + "is_group": 1 + }, + "D\u0130\u011eER \u00c7E\u015e\u0130TL\u0130 ALACAKLAR": { + "account_number": "136", + "is_group": 1 + }, + "D\u0130\u011eER ALACAK SENETLER\u0130 REESKONTU(-)": { + "account_number": "137", + "is_group": 1 + }, + "\u015e\u00dcPHEL\u0130 D\u0130\u011eER ALACAKLAR": { + "account_number": "138", + "is_group": 1 + }, + "\u015e\u00dcPHEL\u0130 D\u0130\u011eER ALACAKLAR KAR\u015eILI\u011eI(-)": { + "account_number": "139", + "is_group": 1 + } + }, + "STOKLAR": { + "account_number": "15", + "\u0130LK MADDE MALZEME": { + "account_number": "150", + "is_group": 1 + }, + "YARI MAMULLER": { + "account_number": "151", + "is_group": 1 + }, + "MAMULLER": { + "account_number": "152", + "is_group": 1 + }, + "T\u0130CAR\u0130 MALLAR": { + "account_number": "153", + "is_group": 1 + }, + "D\u0130\u011eER STOKLAR": { + "account_number": "157", + "D\u0130\u011eR. STOK.": { + "account_number": "157.01", + "account_type": "Stock" + } + }, + "STOK DE\u011eER D\u00dc\u015e\u00dcKL\u00dc\u011e\u00dc KAR\u015eILI\u011eI(-)": { + "account_number": "158", + "is_group": 1 + }, + "VER\u0130LEN S\u0130PAR\u0130\u015e AVANSLARI": { + "account_number": "159", + "is_group": 1 + } + }, + "YILLARA YAYGIN \u0130N\u015eAAT VE ONARIM MAL\u0130YETLER\u0130": { + "account_number": "17", + "YILLARA YAYGIN \u0130N\u015eAAT VE ONARIM MAL\u0130YETLER\u0130": { + "account_number": "170", + "is_group": 1 + }, + "(YILLARA YAYGIN \u0130N\u015eAAT VE ONARIM MAL\u0130YETLER\u0130)": { + "account_number": "177", + "is_group": 1 + }, + "(YILLARA YAYGIN \u0130N\u015eAAT ENFLASYON D\u00dcZELTME)": { + "account_number": "178", + "is_group": 1 + }, + "TA\u015eERONLARA VER\u0130LEN AVANSLAR": { + "account_number": "179", + "is_group": 1 + } + }, + "GELECEK AYLARA A\u0130T G\u0130DERLER VE GEL\u0130R TAHAKKUKLARI": { + "account_number": "18", + "GELECEK AYLARA A\u0130T G\u0130DERLER": { + "account_number": "180", + "is_group": 1 + }, + "GEL\u0130R TAHAKKUKLARI": { + "account_number": "181", + "is_group": 1 + } + }, + "D\u0130\u011eER D\u00d6NEN VARLIKLAR": { + "account_number": "19", + "DEVREDEN KDV": { + "account_number": "190", + "is_group": 1 + }, + "\u0130ND\u0130R\u0130LECEK KDV": { + "account_number": "191", + "\u0130ND\u0130R\u0130LECEK KDV": { + "account_number": "191.01", + "% 18'L\u0130K \u0130ND\u0130R\u0130LECEK KDV": { + "account_number": "191.01.01", + "account_type": "Tax" + }, + "% 8'L\u0130K \u0130ND\u0130R\u0130LECEK KDV": { + "account_number": "191.01.02", + "account_type": "Tax" + }, + "% 1'L\u0130K \u0130ND\u0130R\u0130LECEK KDV": { + "account_number": "191.01.03", + "account_type": "Tax" + }, + "% 20'L\u0130K \u0130ND\u0130R\u0130LECEK KDV": { + "account_number": "191.01.04", + "account_type": "Tax" + }, + "% 10'L\u0130K \u0130ND\u0130R\u0130LECEK KDV": { + "account_number": "191.01.05", + "account_type": "Tax" + } + } + }, + "D\u0130\u011eER KDV": { + "account_number": "192", + "is_group": 1 + }, + "PE\u015e\u0130N \u00d6DENEN VERG\u0130LER VE FONLAR": { + "account_number": "193", + "is_group": 1 + }, + "\u0130\u015e AVANSLARI": { + "account_number": "195", + "is_group": 1 + }, + "PERSONEL AVANSLARI": { + "account_number": "196", + "is_group": 1 + }, + "SAYIM VE TESELL\u00dcM NOKSANLARI": { + "account_number": "197", + "is_group": 1 + }, + "D\u0130\u011eER \u00c7E\u015e\u0130TL\u0130 D\u00d6NEN VARLIKLAR": { + "account_number": "198", + "is_group": 1 + }, + "D\u0130\u011eER D\u00d6NEN VARLIKLAR KAR\u015eILI\u011eI(-)": { + "account_number": "199", + "is_group": 1 + } + } + }, + "DURAN VARLIKLAR": { + "account_number": "2", + "root_type": "Asset", + "T\u0130CAR\u0130 ALACAKLAR": { + "account_number": "22", + "ALICILAR": { + "account_number": "220", + "is_group": 1 + }, + "ALACAK SENETLER\u0130": { + "account_number": "221", + "is_group": 1 + }, + "ALACAK SENETLER\u0130 REESKONTU(-)": { + "account_number": "222", + "is_group": 1 + }, + "KAZANILMAMI\u015e F\u0130NANSAL K\u0130RALAMA FA\u0130Z GEL\u0130RLER\u0130 (-)-": { + "account_number": "224", + "is_group": 1 + }, + "VER\u0130LEN DEPOZ\u0130TO VE TEM\u0130NATLAR": { + "account_number": "226", + "is_group": 1 + }, + "\u015e\u00dcPHEL\u0130 T\u0130CAR\u0130 ALACAKLAR KAR\u015eILI\u011eI(-)": { + "account_number": "229", + "is_group": 1 + } + }, + "D\u0130\u011eER ALACAKLAR": { + "account_number": "23", + "ORTAKLARDAN ALACAKLAR": { + "account_number": "231", + "is_group": 1 + }, + "\u0130\u015eT\u0130RAKLERDEN ALACAKLAR": { + "account_number": "232", + "is_group": 1 + }, + "BA\u011eLI ORTAKLIKLARDAN ALACAKLAR": { + "account_number": "233", + "is_group": 1 + }, + "PERSONELDEN ALACAKLAR": { + "account_number": "235", + "is_group": 1 + }, + "D\u0130\u011eER \u00c7E\u015e\u0130TL\u0130 ALACAKLAR": { + "account_number": "236", + "is_group": 1 + }, + "D\u0130\u011eER ALACAK SENETLER\u0130 REESKONTU(-)": { + "account_number": "237", + "is_group": 1 + }, + "\u015e\u00dcPHEL\u0130 D\u0130\u011eER ALACAKLAR KAR\u015eILI\u011eI(-)": { + "account_number": "239", + "is_group": 1 + } + }, + "MAL\u0130 DURAN VARLIKLAR": { + "account_number": "24", + "BA\u011eLI MENKUL KIYMETLER": { + "account_number": "240", + "BA\u011eL. MEKL. KIYM.": { + "account_number": "240.01", + "account_type": "Fixed Asset" + } + }, + "BA\u011eLI MENKUL KIYMETLER DE\u011eER D\u00dc\u015e\u00dcKL\u00dc\u011e\u00dc KAR\u015eILI\u011eI(-)": { + "account_number": "241", + "is_group": 1 + }, + "\u0130\u015eT\u0130RAKLER": { + "account_number": "242", + "is_group": 1 + }, + "\u0130\u015eT\u0130RAKLERE SERMAYE TAAHH\u00dcTLER\u0130(-)": { + "account_number": "243", + "is_group": 1 + }, + "\u0130\u015eT\u0130RAKLER SERMAYE PAYLARI DE\u011eER D\u00dc\u015e\u00dcKL\u00dc\u011e\u00dc KAR\u015eILI\u011eI(-)": { + "account_number": "244", + "is_group": 1 + }, + "BA\u011eLI ORTAKLIKLAR": { + "account_number": "245", + "is_group": 1 + }, + "BA\u011eLI ORTAKLIKLARA SERMAYE TAAHH\u00dcTLER\u0130(-)": { + "account_number": "246", + "is_group": 1 + }, + "BA\u011eLI ORTAKLIKLAR SERMAYE PAYLARI DE\u011eER D\u00dc\u015e\u00dcKL\u00dc\u011e\u00dc KAR\u015eILI\u011eI(-)": { + "account_number": "247", + "is_group": 1 + }, + "D\u0130\u011eER MAL\u0130 DURAN VARLIKLAR": { + "account_number": "248", + "is_group": 1 + }, + "D\u0130\u011eER MAL\u0130 DURAN VARLIKLAR KAR\u015eILI\u011eI(-)": { + "account_number": "249", + "is_group": 1 + } + }, + "MADD\u0130 DURAN VARLIKLAR": { + "account_number": "25", + "ARAZ\u0130 VE ARSALAR": { + "account_number": "250", + "is_group": 1 + }, + "YER ALTI VE YER \u00dcST\u00dc D\u00dcZENLER\u0130": { + "account_number": "251", + "is_group": 1 + }, + "B\u0130NALAR": { + "account_number": "252", + "is_group": 1 + }, + "TES\u0130S, MAK\u0130NE VE C\u0130HAZLAR": { + "account_number": "253", + "is_group": 1 + }, + "TA\u015eITLAR": { + "account_number": "254", + "is_group": 1 + }, + "DEM\u0130RBA\u015eLAR": { + "account_number": "255", + "is_group": 1 + }, + "D\u0130\u011eER MADD\u0130 DURAN VARLIKLAR": { + "account_number": "256", + "is_group": 1 + }, + "B\u0130R\u0130KM\u0130\u015e AMORT\u0130SMANLAR(-)": { + "account_number": "257", + "is_group": 1 + }, + "YAPILMAKTA OLAN YATIRIMLAR": { + "account_number": "258", + "is_group": 1 + }, + "VER\u0130LEN AVANSLAR": { + "account_number": "259", + "is_group": 1 + } + }, + "MADD\u0130 OLMAYAN DURAN VARLIKLAR": { + "account_number": "26", + "HAKLAR": { + "account_number": "260", + "is_group": 1 + }, + "\u015eEREF\u0130YE": { + "account_number": "261", + "is_group": 1 + }, + "KURULU\u015e VE \u00d6RG\u00dcTLENME G\u0130DERLER\u0130": { + "account_number": "262", + "is_group": 1 + }, + "ARA\u015eTIRMA VE GEL\u0130\u015eT\u0130RME G\u0130DERLER\u0130": { + "account_number": "263", + "is_group": 1 + }, + "\u00d6ZEL MAL\u0130YETLER": { + "account_number": "264", + "\u00d6ZL. MAL\u0130YT.": { + "account_number": "264.01", + "account_type": "Depreciation" + } + }, + "D\u0130\u011eER MADD\u0130 OLMAYAN DURAN VARLIKLAR": { + "account_number": "267", + "is_group": 1 + }, + "B\u0130R\u0130KM\u0130\u015e AMORT\u0130SMANLAR(-)": { + "account_number": "268", + "is_group": 1 + }, + "VER\u0130LEN AVANSLAR": { + "account_number": "269", + "is_group": 1 + } + }, + "\u00d6ZEL T\u00dcKENMEYE TAB\u0130 VARLIKLAR": { + "account_number": "27", + "ARAMA G\u0130DERLER\u0130": { + "account_number": "271", + "is_group": 1 + }, + "HAZIRLIK VE GEL\u0130\u015eT\u0130RME G\u0130DERLER\u0130": { + "account_number": "272", + "is_group": 1 + }, + "D\u0130\u011eER \u00d6ZEL T\u00dcKENMEYE TAB\u0130 VARLIKLAR": { + "account_number": "277", + "is_group": 1 + }, + "B\u0130R\u0130KM\u0130\u015e T\u00dcKENME PAYLARI(-)": { + "account_number": "278", + "is_group": 1 + }, + "VER\u0130LEN AVANSLAR": { + "account_number": "279", + "is_group": 1 + } + }, + "GELECEK YILLARA A\u0130T G\u0130DERLER VE GEL\u0130R TAHAKKUKLARI": { + "account_number": "28", + "GELECEK YILLARA A\u0130T G\u0130DERLER": { + "account_number": "280", + "is_group": 1 + }, + "GEL\u0130R TAHAKKUKLARI": { + "account_number": "281", + "is_group": 1 + } + }, + "D\u0130\u011eER DURAN VARLIKLAR": { + "account_number": "29", + "GELECEK YILLARDA \u0130ND\u0130R\u0130LECEK KDV": { + "account_number": "291", + "is_group": 1 + }, + "D\u0130\u011eER KDV": { + "account_number": "292", + "is_group": 1 + }, + "GELECEK YILLAR \u0130HT\u0130YACI STOKLAR": { + "account_number": "293", + "is_group": 1 + }, + "ELDEN \u00c7IKARILACAK STOKLAR VE MADD\u0130 DURAN VARLIKLAR": { + "account_number": "294", + "is_group": 1 + }, + "PE\u015e\u0130N \u00d6DENEN VERG\u0130 VE FONLAR": { + "account_number": "295", + "is_group": 1 + }, + "D\u0130\u011eER \u00c7E\u015e\u0130TL\u0130 DURAN VARLIKLAR": { + "account_number": "297", + "is_group": 1 + }, + "STOK DE\u011eER D\u00dc\u015e\u00dcKL\u00dc\u011e\u00dc KAR\u015eILI\u011eI(-)": { + "account_number": "298", + "is_group": 1 + }, + "B\u0130R\u0130KM\u0130\u015e AMORT\u0130SMANLAR(-)": { + "account_number": "299", + "is_group": 1 + } + } + }, + "KISA VADEL\u0130 YABANCI KAYNAKLAR": { + "account_number": "3", + "root_type": "Liability", + "MAL\u0130 BOR\u00c7LAR": { + "account_number": "30", + "BANKA KRED\u0130LER\u0130": { + "account_number": "300", + "is_group": 1 + }, + "F\u0130NANSAL K\u0130RALAMA \u0130\u015eLEMLER\u0130NDEN BOR\u00c7LAR": { + "account_number": "301", + "is_group": 1 + }, + "ERTELENM\u0130\u015e F\u0130NANSAL K\u0130RALAMA BOR\u00c7LANMA MAL\u0130YETLER\u0130(-)": { + "account_number": "302", + "is_group": 1 + }, + "UZUN VADEL\u0130 KRED\u0130LER\u0130N ANAPARA TAKS\u0130TLER\u0130 VE FA\u0130ZLER\u0130": { + "account_number": "303", + "is_group": 1 + }, + "TAHV\u0130L ANAPARA BOR\u00c7, TAKS\u0130T VE FA\u0130ZLER\u0130": { + "account_number": "304", + "is_group": 1 + }, + "\u00c7IKARILAN BONOLAR VE SENETLER": { + "account_number": "305", + "is_group": 1 + }, + "\u00c7IKARILMI\u015e D\u0130\u011eER MENKUL KIYMETLER": { + "account_number": "306", + "is_group": 1 + }, + "MENKUL KIYMETLER \u0130HRA\u00c7 FARKI(-)": { + "account_number": "308", + "is_group": 1 + }, + "D\u0130\u011eER MAL\u0130 BOR\u00c7LAR": { + "account_number": "309", + "is_group": 1 + } + }, + "T\u0130CAR\u0130 BOR\u00c7LAR": { + "account_number": "32", + "SATICILAR": { + "account_number": "320", + "SATICILAR TRY": { + "account_number": "320.01" + } + }, + "BOR\u00c7 SENETLER\u0130": { + "account_number": "321", + "is_group": 1 + }, + "BOR\u00c7 SENETLER\u0130 REESKONTU(-)": { + "account_number": "322", + "is_group": 1 + }, + "ALINAN DEPOZ\u0130TO VE TEM\u0130NATLAR": { + "account_number": "326", + "is_group": 1 + }, + "D\u0130\u011eER T\u0130CAR\u0130 BOR\u00c7LAR": { + "account_number": "329", + "is_group": 1 + } + }, + "D\u0130\u011eER BOR\u00c7LAR": { + "account_number": "33", + "ORTAKLARA BOR\u00c7LAR": { + "account_number": "331", + "is_group": 1 + }, + "\u0130\u015eT\u0130RAKLERE BOR\u00c7LAR": { + "account_number": "332", + "is_group": 1 + }, + "BA\u011eLI ORTAKLIKLARA BOR\u00c7LAR": { + "account_number": "333", + "is_group": 1 + }, + "PERSONELE BOR\u00c7LAR": { + "account_number": "335", + "is_group": 1 + }, + "D\u0130\u011eER \u00c7E\u015e\u0130TL\u0130 BOR\u00c7LAR": { + "account_number": "336", + "is_group": 1 + }, + "D\u0130\u011eER BOR\u00c7 SENETLER\u0130 REESKONTU(-)": { + "account_number": "337", + "is_group": 1 + } + }, + "ALINAN AVANSLAR": { + "account_number": "34", + "ALINAN S\u0130PAR\u0130\u015e AVANSLARI": { + "account_number": "340", + "is_group": 1 + }, + "ALINAN D\u0130\u011eER AVANSLAR": { + "account_number": "349", + "is_group": 1 + } + }, + "YILLARA YAYGIN \u0130N\u015eAAT VE ONARIM HAKED\u0130\u015eLER\u0130": { + "account_number": "35", + "YILLARA YAYGIN \u0130N\u015eAAT VE ONARIM HAKED\u0130\u015e BEDELLER\u0130": { + "account_number": "358", + "is_group": 1 + } + }, + "\u00d6DENECEK VERG\u0130 VE D\u0130\u011eER Y\u00dcK\u00dcML\u00dcL\u00dcKLER": { + "account_number": "36", + "\u00d6DENECEK VERG\u0130 VE FONLAR": { + "account_number": "360", + "is_group": 1 + }, + "\u00d6DENECEK SOSYAL G\u00dcVENL\u0130K KES\u0130NT\u0130LER\u0130": { + "account_number": "361", + "is_group": 1 + }, + "VADES\u0130 GE\u00c7M\u0130\u015e, ERTELENM\u0130\u015e VEYA TAKS\u0130TLEND\u0130R\u0130LM\u0130\u015e VERG\u0130 VE D\u0130\u011eER Y\u00dcK\u00dcML\u00dcL\u00dcKLER": { + "account_number": "368", + "is_group": 1 + }, + "\u00d6DENECEK D\u0130\u011eER Y\u00dcK\u00dcML\u00dcL\u00dcKLER": { + "account_number": "369", + "is_group": 1 + } + }, + "BOR\u00c7 VE G\u0130DER KAR\u015eILIKLARI": { + "account_number": "37", + "D\u00d6NEM K\u00c2RI VERG\u0130 VE D\u0130\u011eER YASAL Y\u00dcK\u00dcML\u00dcL\u00dcK KAR\u015eILIKLARI": { + "account_number": "370", + "is_group": 1 + }, + "D\u00d6NEM K\u00c2RININ PE\u015e\u0130N \u00d6DENEN VERG\u0130 VE D\u0130\u011eER Y\u00dcK\u00dcML\u00dcL\u00dcKLER\u0130(-)": { + "account_number": "371", + "is_group": 1 + }, + "KIDEM TAZM\u0130NATI KAR\u015eILI\u011eI": { + "account_number": "372", + "is_group": 1 + }, + "MAL\u0130YET G\u0130DERLER\u0130 KAR\u015eILI\u011eI": { + "account_number": "373", + "is_group": 1 + }, + "D\u0130\u011eER BOR\u00c7 VE G\u0130DER KAR\u015eILIKLARI": { + "account_number": "379", + "is_group": 1 + } + }, + "GELECEK AYLARA A\u0130T GEL\u0130RLER VE G\u0130DER TAHAKKUKLARI": { + "account_number": "38", + "GELECEK AYLARA A\u0130T GEL\u0130RLER": { + "account_number": "380", + "is_group": 1 + }, + "G\u0130DER TAHAKKUKLARI": { + "account_number": "381", + "is_group": 1 + } + }, + "D\u0130\u011eER KISA VADEL\u0130 YABANCI KAYNAKLAR": { + "account_number": "39", + "HESAPLANAN KDV": { + "account_number": "391", + "HESAPL. KDV": { + "account_number": "391.01", + "% 18 HESAPLAN KDV": { + "account_number": "391.01.01", + "account_type": "Tax" + }, + "% 8 HESAPLANAN KDV": { + "account_number": "391.01.02", + "account_type": "Tax" + }, + "% 1 HESAPLANAN KDV": { + "account_number": "391.01.03", + "account_type": "Tax" + }, + "% 20 HESAPLANAN KDV": { + "account_number": "391.01.04", + "account_type": "Tax" + }, + "% 10 HESAPLANAN KDV": { + "account_number": "391.01.05", + "account_type": "Tax" + } + } + }, + "D\u0130\u011eER KDV": { + "account_number": "392", + "is_group": 1 + }, + "MERKEZ VE \u015eUBELER CAR\u0130 HESABI": { + "account_number": "393", + "is_group": 1 + }, + "SAYIM VE TESELL\u00dcM FAZLALARI": { + "account_number": "397", + "is_group": 1 + }, + "D\u0130\u011eER \u00c7E\u015e\u0130TL\u0130 YABANCI KAYNAKLAR": { + "account_number": "399", + "is_group": 1 + } + } + }, + "UZUN VADEL\u0130 YABANCI KAYNAKLAR": { + "account_number": "4", + "root_type": "Liability", + "MAL\u0130 BOR\u00c7LAR": { + "account_number": "40", + "BANKA KRED\u0130LER\u0130": { + "account_number": "400", + "is_group": 1 + }, + "F\u0130NANSAL K\u0130RALAMA \u0130\u015eLEMLER\u0130NDEN BOR\u00c7LAR-": { + "account_number": "401", + "is_group": 1 + }, + "ERTELENM\u0130\u015e F\u0130NANSAL K\u0130RALAMA BOR\u00c7LANMA MAL\u0130YETLER\u0130 (-)": { + "account_number": "402", + "is_group": 1 + }, + "\u00c7IKARILMI\u015e TAHV\u0130LLER": { + "account_number": "405", + "is_group": 1 + }, + "\u00c7IKARILMI\u015e D\u0130\u011eER MENKUL KIYMETLER": { + "account_number": "407", + "is_group": 1 + }, + "MENKUL KIYMETLER \u0130HRA\u00c7 FARKI(-)": { + "account_number": "408", + "is_group": 1 + }, + "D\u0130\u011eER MAL\u0130 BOR\u00c7LAR": { + "account_number": "409", + "is_group": 1 + } + }, + "T\u0130CAR\u0130 BOR\u00c7LAR": { + "account_number": "42", + "SATICILAR": { + "account_number": "420", + "is_group": 1 + }, + "BOR\u00c7 SENETLER\u0130": { + "account_number": "421", + "is_group": 1 + }, + "BOR\u00c7 SENETLER\u0130 REESKONTU(-)": { + "account_number": "422", + "is_group": 1 + }, + "ALINAN DEPOZ\u0130TO VE TEM\u0130NATLAR": { + "account_number": "426", + "is_group": 1 + }, + "D\u0130\u011eER T\u0130CAR\u0130 BOR\u00c7LAR": { + "account_number": "429", + "is_group": 1 + } + }, + "D\u0130\u011eER BOR\u00c7LAR": { + "account_number": "43", + "ORTAKLARA BOR\u00c7LAR": { + "account_number": "431", + "is_group": 1 + }, + "\u0130\u015eT\u0130RAKLERE BOR\u00c7LAR": { + "account_number": "432", + "is_group": 1 + }, + "BA\u011eLI ORTAKLIKLARA BOR\u00c7LAR": { + "account_number": "433", + "is_group": 1 + }, + "D\u0130\u011eER \u00c7E\u015e\u0130TL\u0130 BOR\u00c7LAR": { + "account_number": "436", + "is_group": 1 + }, + "D\u0130\u011eER BOR\u00c7 SENETLER\u0130 REESKONTU(-)": { + "account_number": "437", + "is_group": 1 + }, + "KAMUYA OLAN ERTELENM\u0130\u015e VEYA TAKS\u0130TLEND\u0130R\u0130LM\u0130\u015e BOR\u00c7LAR": { + "account_number": "438", + "is_group": 1 + } + }, + "ALINAN AVANSLAR": { + "account_number": "44", + "ALINAN S\u0130PAR\u0130\u015e AVANSLARI": { + "account_number": "440", + "is_group": 1 + }, + "ALINAN D\u0130\u011eER AVANSLAR": { + "account_number": "449", + "is_group": 1 + } + }, + "BOR\u00c7 VE G\u0130DER KAR\u015eILIKLARI": { + "account_number": "47", + "KIDEM TAZM\u0130NATI KAR\u015eILI\u011eI": { + "account_number": "472", + "is_group": 1 + }, + "D\u0130\u011eER BOR\u00c7 VE G\u0130DER KAR\u015eILIKLARI": { + "account_number": "479", + "is_group": 1 + } + }, + "GELECEK YILLARA A\u0130T GEL\u0130RLER VE G\u0130DER TAHAKKUKLARI": { + "account_number": "48", + "GELECEK YILLARA A\u0130T GEL\u0130RLER": { + "account_number": "480", + "is_group": 1 + }, + "G\u0130DER TAHAKKUKLARI": { + "account_number": "481", + "is_group": 1 + } + }, + "D\u0130\u011eER UZUN VADEL\u0130 YABANCI KAYNAKLAR": { + "account_number": "49", + "GELECEK YILLARA ERTELENM\u0130\u015e VEYA TERK\u0130N ED\u0130LECEK KDV": { + "account_number": "492", + "is_group": 1 + }, + "TES\u0130SE KATILMA PAYLARI": { + "account_number": "493", + "is_group": 1 + }, + "D\u0130\u011eER \u00c7E\u015e\u0130TL\u0130 UZUN VADEL\u0130 YABANCI KAYNAKLAR": { + "account_number": "499", + "is_group": 1 + } + } + }, + "\u00d6Z KAYNAKLAR": { + "account_number": "5", + "root_type": "Equity", + "\u00d6DENM\u0130\u015e SERMAYE": { + "account_number": "50", + "SERMAYE": { + "account_number": "500", + "is_group": 1 + }, + "\u00d6DENMEM\u0130\u015e SERMAYE(-)": { + "account_number": "501", + "is_group": 1 + }, + "SERMAYE D\u00dcZELTMES\u0130 OLUMLU FARKLARI": { + "account_number": "502", + "is_group": 1 + }, + "SERMAYE D\u00dcZELTMES\u0130 OLUMSUZ FARKLARI (-)": { + "account_number": "503", + "is_group": 1 + } + }, + "SERMAYE YEDEKLER\u0130": { + "account_number": "52", + "H\u0130SSE SENETLER\u0130 \u0130HRA\u00c7 PR\u0130MLER\u0130": { + "account_number": "520", + "is_group": 1 + }, + "H\u0130SSE SENED\u0130 \u0130PTAL K\u00c2RLARI": { + "account_number": "521", + "is_group": 1 + }, + "MADD\u0130 DURAN VARLIK YEN\u0130DEN DE\u011eERLEME ARTI\u015eLARI": { + "account_number": "522", + "is_group": 1 + }, + "\u0130\u015eT\u0130RAKLER YEN\u0130DEN DE\u011eERLEME ARTI\u015eLARI": { + "account_number": "523", + "is_group": 1 + }, + "D\u0130\u011eER SERMAYE YEDEKLER\u0130": { + "account_number": "529", + "is_group": 1 + } + }, + "K\u00c2R YEDEKLER\u0130": { + "account_number": "54", + "YASAL YEDEKLER": { + "account_number": "540", + "is_group": 1 + }, + "STAT\u00dc YEDEKLER\u0130": { + "account_number": "541", + "is_group": 1 + }, + "OLA\u011eAN\u00dcST\u00dc YEDEKLER": { + "account_number": "542", + "is_group": 1 + }, + "D\u0130\u011eER K\u00c2R YEDEKLER\u0130": { + "account_number": "548", + "is_group": 1 + }, + "\u00d6ZEL FONLAR": { + "account_number": "549", + "is_group": 1 + } + }, + "GE\u00c7M\u0130\u015e YILLAR K\u00c2RLARI": { + "account_number": "57", + "GE\u00c7M\u0130\u015e YILLAR K\u00c2RLARI": { + "account_number": "570", + "is_group": 1 + } + }, + "GE\u00c7M\u0130\u015e YILLAR ZARARLARI(-)": { + "account_number": "58", + "GE\u00c7M\u0130\u015e YILLAR ZARARLARI(-)": { + "account_number": "580", + "is_group": 1 + } + }, + "D\u00d6NEM NET K\u00c2RI (ZARARI)": { + "account_number": "59", + "D\u00d6NEM NET K\u00c2RI": { + "account_number": "590", + "is_group": 1 + }, + "D\u00d6NEM NET ZARARI(-)": { + "account_number": "591", + "is_group": 1 + } + } + }, + "GEL\u0130R TABLOSU HESAPLARI": { + "account_number": "6", + "root_type": "Income", + "BR\u00dcT SATI\u015eLAR": { + "account_number": "60", + "YURT \u0130\u00c7\u0130 SATI\u015eLAR": { + "account_number": "600", + "is_group": 1 + }, + "YURT DI\u015eI SATI\u015eLAR": { + "account_number": "601", + "is_group": 1 + }, + "D\u0130\u011eER GEL\u0130RLER": { + "account_number": "602", + "is_group": 1 + } + }, + "SATI\u015e \u0130ND\u0130R\u0130MLER\u0130(-)": { + "account_number": "61", + "SATI\u015eTAN \u0130ADELER(-)": { + "account_number": "610", + "is_group": 1 + }, + "SATI\u015e \u0130ND\u0130R\u0130MLER\u0130(-)": { + "account_number": "611", + "is_group": 1 + }, + "D\u0130\u011eER \u0130ND\u0130R\u0130MLER(-)": { + "account_number": "612", + "is_group": 1 + } + }, + "SATI\u015eLARIN MAL\u0130YET\u0130(-)": { + "account_number": "62", + "SATILAN MAMULLER MAL\u0130YET\u0130(-)": { + "account_number": "620", + "is_group": 1 + }, + "SATILAN T\u0130CAR\u0130 MALLAR MAL\u0130YET\u0130(-)": { + "account_number": "621", + "is_group": 1 + }, + "SATILAN H\u0130ZMET MAL\u0130YET\u0130(-)": { + "account_number": "622", + "is_group": 1 + }, + "D\u0130\u011eER SATI\u015eLARIN MAL\u0130YET\u0130(-)": { + "account_number": "623", + "D\u0130\u011eR. SAT\u015e. MALYT.": { + "account_number": "623.01" + } + } + }, + "FAAL\u0130YET G\u0130DERLER\u0130(-)": { + "account_number": "63", + "ARA\u015eTIRMA VE GEL\u0130\u015eT\u0130RME G\u0130DERLER\u0130(-)": { + "account_number": "630", + "is_group": 1 + }, + "PAZARLAMA SATI\u015e VE DA\u011eITIM G\u0130DERLER\u0130(-)": { + "account_number": "631", + "is_group": 1 + }, + "GENEL Y\u00d6NET\u0130M G\u0130DERLER\u0130(-)": { + "account_number": "632", + "is_group": 1 + } + }, + "D\u0130\u011eER FAAL\u0130YETLERDEN OLA\u011eAN GEL\u0130R VE K\u00c2RLAR": { + "account_number": "64", + "\u0130\u015eT\u0130RAKLERDEN TEMETT\u00dc GEL\u0130RLER\u0130": { + "account_number": "640", + "is_group": 1 + }, + "BA\u011eLI ORTAKLIKLARDAN TEMETT\u00dc GEL\u0130RLER\u0130": { + "account_number": "641", + "is_group": 1 + }, + "FA\u0130Z GEL\u0130RLER\u0130": { + "account_number": "642", + "is_group": 1 + }, + "KOM\u0130SYON GEL\u0130RLER\u0130": { + "account_number": "643", + "is_group": 1 + }, + "KONUSU KALMAYAN KAR\u015eILIKLAR": { + "account_number": "644", + "is_group": 1 + }, + "MENKUL KIYMET SATI\u015e K\u00c2RLARI": { + "account_number": "645", + "is_group": 1 + }, + "KAMB\u0130YO K\u00c2RLARI": { + "account_number": "646", + "is_group": 1 + }, + "REESKONT FA\u0130Z GEL\u0130RLER\u0130": { + "account_number": "647", + "is_group": 1 + }, + "ENFLASYON D\u00dcZELTME K\u00c2RLARI": { + "account_number": "648", + "is_group": 1 + }, + "D\u0130\u011eER OLA\u011eAN GEL\u0130R VE K\u00c2RLAR": { + "account_number": "649", + "is_group": 1 + } + }, + "D\u0130\u011eER FAAL\u0130YETLERDEN OLA\u011eAN G\u0130DER VE ZARARLAR(-)": { + "account_number": "65", + "KOM\u0130SYON G\u0130DERLER\u0130(-)": { + "account_number": "653", + "is_group": 1 + }, + "KAR\u015eILIK G\u0130DERLER\u0130(-)": { + "account_number": "654", + "is_group": 1 + }, + "MENKUL KIYMET SATI\u015e ZARARLARI(-)": { + "account_number": "655", + "is_group": 1 + }, + "KAMB\u0130YO ZARARLARI(-)": { + "account_number": "656", + "is_group": 1 + }, + "REESKONT FA\u0130Z G\u0130DERLER\u0130(-)": { + "account_number": "657", + "is_group": 1 + }, + "ENFLASYON D\u00dcZELTMES\u0130 ZARARLARI(-)": { + "account_number": "658", + "is_group": 1 + }, + "D\u0130\u011eER OLA\u011eAN G\u0130DER VE ZARARLAR(-)": { + "account_number": "659", + "is_group": 1 + } + }, + "F\u0130NANSMAN G\u0130DERLER\u0130(-)": { + "account_number": "66", + "KISA VADEL\u0130 BOR\u00c7LANMA G\u0130DERLER\u0130(-)": { + "account_number": "660", + "is_group": 1 + }, + "UZUN VADEL\u0130 BOR\u00c7LANMA G\u0130DERLER\u0130(-)": { + "account_number": "661", + "is_group": 1 + } + }, + "OLA\u011eAN DI\u015eI GEL\u0130R VE K\u00c2RLAR": { + "account_number": "67", + "\u00d6NCEK\u0130 D\u00d6NEM GEL\u0130R VE K\u00c2RLARI": { + "account_number": "671", + "is_group": 1 + }, + "D\u0130\u011eER OLA\u011eAN DI\u015eI GEL\u0130R VE K\u00c2RLAR": { + "account_number": "679", + "is_group": 1 + } + }, + "OLA\u011eAN DI\u015eI G\u0130DER VE ZARARLAR(-)": { + "account_number": "68", + "\u00c7ALI\u015eMAYAN KISIM G\u0130DER VE ZARARLARI(-)": { + "account_number": "680", + "is_group": 1 + }, + "\u00d6NCEK\u0130 D\u00d6NEM G\u0130DER VE ZARARLARI(-)": { + "account_number": "681", + "is_group": 1 + }, + "D\u0130\u011eER OLA\u011eAN DI\u015eI G\u0130DER VE ZARARLAR(-)": { + "account_number": "689", + "is_group": 1 + } + }, + "D\u00d6NEM NET K\u00c2RI VEYA ZARARI": { + "account_number": "69", + "D\u00d6NEM K\u00c2RI VEYA ZARARI": { + "account_number": "690", + "is_group": 1 + }, + "D\u00d6NEM K\u00c2RI VERG\u0130 VE D\u0130\u011eER YASAL Y\u00dcK\u00dcML\u00dcL\u00dcK KAR\u015eILIKLARI(-)": { + "account_number": "691", + "is_group": 1 + }, + "D\u00d6NEM NET K\u00c2RI VEYA ZARARI": { + "account_number": "692", + "is_group": 1 + }, + "YILLARA YAYGIN \u0130N\u015eAAT VE ENFLASYON D\u00dcZELTME HESABI": { + "account_number": "697", + "is_group": 1 + }, + "ENFLASYON D\u00dcZELTME HESABI": { + "account_number": "698", + "is_group": 1 + } + } + }, + "MAL\u0130YET HESAPLARI (7/A SE\u00c7ENE\u011e\u0130)": { + "account_number": "7", + "root_type": "Expense", + "MAL\u0130YET MUHASEBES\u0130 BA\u011eLANTI HESAPLARI": { + "account_number": "70", + "MAL\u0130YET MUHASEBES\u0130 BA\u011eLANTI HESABI": { + "account_number": "700", + "is_group": 1 + }, + "MAL\u0130YET MUHASEBES\u0130 YANSITMA HESABI": { + "account_number": "701", + "is_group": 1 + } + }, + "D\u0130REKT \u0130LK MADDE VE MALZEME G\u0130DERLER\u0130": { + "account_number": "71", + "D\u0130REKT \u0130LK MADDE VE MALZEME G\u0130DERLER\u0130 HESABI": { + "account_number": "710", + "is_group": 1 + }, + "D\u0130REKT \u0130LK MADDE VE MALZEME YANSITMA HESABI": { + "account_number": "711", + "is_group": 1 + }, + "D\u0130REKT \u0130LK MADDE VE MALZEME F\u0130YAT FARKI": { + "account_number": "712", + "is_group": 1 + }, + "D\u0130REKT \u0130LK MADDE VE MALZEME M\u0130KTAR FARKI": { + "account_number": "713", + "is_group": 1 + } + }, + "D\u0130REKT \u0130\u015e\u00c7\u0130L\u0130K G\u0130DERLER\u0130": { + "account_number": "72", + "D\u0130REKT \u0130\u015e\u00c7\u0130L\u0130K G\u0130DERLER\u0130": { + "account_number": "720", + "is_group": 1 + }, + "D\u0130REKT \u0130\u015e\u00c7\u0130L\u0130K G\u0130DERLER\u0130 YANSITMA HESABI": { + "account_number": "721", + "is_group": 1 + }, + "D\u0130REKT \u0130\u015e\u00c7\u0130L\u0130K \u00dcCRET FARKLARI": { + "account_number": "722", + "is_group": 1 + }, + "D\u0130REKT \u0130\u015e\u00c7\u0130L\u0130K S\u00dcRE FARKLARI": { + "account_number": "723", + "is_group": 1 + } + }, + "GENEL \u00dcRET\u0130M G\u0130DERLER\u0130": { + "account_number": "73", + "GENEL \u00dcRET\u0130M G\u0130DERLER\u0130": { + "account_number": "730", + "is_group": 1 + }, + "GENEL \u00dcRET\u0130M G\u0130DERLER\u0130 YANSITMA HESABI": { + "account_number": "731", + "is_group": 1 + }, + "GENEL \u00dcRET\u0130M G\u0130DERLER\u0130 B\u00dcT\u00c7E FARKLARI": { + "account_number": "732", + "is_group": 1 + }, + "GENEL \u00dcRET\u0130M G\u0130DERLER\u0130 VER\u0130ML\u0130L\u0130K G\u0130DERLER\u0130": { + "account_number": "733", + "is_group": 1 + }, + "GENEL \u00dcRET\u0130M G\u0130DERLER\u0130 KAPAS\u0130TE FARKLARI": { + "account_number": "734", + "is_group": 1 + } + }, + "H\u0130ZMET \u00dcRET\u0130M MAL\u0130YET\u0130": { + "account_number": "74", + "H\u0130ZMET \u00dcRET\u0130M MAL\u0130YET\u0130": { + "account_number": "740", + "is_group": 1 + }, + "H\u0130ZMET \u00dcRET\u0130M MAL\u0130YET\u0130 YANSITMA HESABI": { + "account_number": "741", + "is_group": 1 + }, + "H\u0130ZMET \u00dcRET\u0130M MAL\u0130YET\u0130 FARK HESAPLARI": { + "account_number": "742", + "is_group": 1 + } + }, + "ARA\u015eTIRMA VE GEL\u0130\u015eT\u0130RME G\u0130DERLER\u0130": { + "account_number": "75", + "ARA\u015eTIRMA VE GEL\u0130\u015eT\u0130RME G\u0130DERLER\u0130": { + "account_number": "750", + "is_group": 1 + }, + "ARA\u015eTIRMA VE GEL\u0130\u015eT\u0130RME G\u0130DERLER\u0130 YANSITMA HESABI": { + "account_number": "751", + "is_group": 1 + }, + "ARA\u015eTIRMA VE GEL\u0130\u015eT\u0130RME G\u0130DER FARKLARI": { + "account_number": "752", + "is_group": 1 + } + }, + "PAZARLAMA SATI\u015e VE DA\u011eITIM G\u0130DERLER\u0130": { + "account_number": "76", + "PAZARLAMA SATI\u015e VE DA\u011eITIM G\u0130DERLER\u0130": { + "account_number": "760", + "is_group": 1 + }, + "PAZARLAMA SATI\u015e VE DA\u011eITIM G\u0130DERLER\u0130 YANSITMA HESABI": { + "account_number": "761", + "is_group": 1 + }, + "PAZARLAMA SATI\u015e VE DA\u011eITIM G\u0130DERLER\u0130 FARK HESABI": { + "account_number": "762", + "is_group": 1 + } + }, + "GENEL Y\u00d6NET\u0130M G\u0130DERLER\u0130": { + "account_number": "77", + "GENEL Y\u00d6NET\u0130M G\u0130DERLER\u0130": { + "account_number": "770", + "is_group": 1 + }, + "GENEL Y\u00d6NET\u0130M G\u0130DERLER\u0130 YANSITMA HESABI": { + "account_number": "771", + "is_group": 1 + }, + "GENEL Y\u00d6NET\u0130M G\u0130DER FARKLARI HESABI": { + "account_number": "772", + "is_group": 1 + } + }, + "F\u0130NANSMAN G\u0130DERLER\u0130": { + "account_number": "78", + "F\u0130NANSMAN G\u0130DERLER\u0130": { + "account_number": "780", + "is_group": 1 + }, + "F\u0130NANSMAN G\u0130DERLER\u0130 YANSITMA HESABI": { + "account_number": "781", + "is_group": 1 + }, + "F\u0130NANSMAN G\u0130DERLER\u0130 FARK HESABI": { + "account_number": "782", + "is_group": 1 + } + }, + "G\u0130DER \u00c7E\u015e\u0130TLER\u0130": { + "account_number": "79", + "\u0130LK MADDE VE MALZEME G\u0130DERLER\u0130": { + "account_number": "790", + "is_group": 1 + }, + "\u0130\u015e\u00c7\u0130 \u00dcCRET VE G\u0130DERLER\u0130": { + "account_number": "791", + "is_group": 1 + }, + "MEMUR \u00dcCRET VE G\u0130DERLER\u0130": { + "account_number": "792", + "is_group": 1 + }, + "DI\u015eARIDAN SA\u011eLANAN FAYDA VE H\u0130ZMETLER": { + "account_number": "793", + "is_group": 1 + }, + "\u00c7E\u015e\u0130TL\u0130 G\u0130DERLER": { + "account_number": "794", + "is_group": 1 + }, + "VERG\u0130, RES\u0130M VE HAR\u00c7LAR": { + "account_number": "795", + "is_group": 1 + }, + "AMORT\u0130SMAN VE T\u00dcKENME PAYLARI": { + "account_number": "796", + "is_group": 1 + }, + "F\u0130NANSMAN G\u0130DERLER\u0130": { + "account_number": "797", + "is_group": 1 + }, + "G\u0130DER \u00c7E\u015e\u0130TLER\u0130 YANSITMA HESABI": { + "account_number": "798", + "is_group": 1 + }, + "\u00dcRET\u0130M MAL\u0130YET HESABI": { + "account_number": "799", + "is_group": 1 + } + } + }, + "SERBEST HESAPLAR": { + "account_number": "8", + "root_type": "Asset", + "B\u00dcT\u00c7E GEL\u0130RLER\u0130 HESABI": { + "account_number": "800", + "is_group": 1 + }, + "GEL\u0130R YANSITMA HESABI": { + "account_number": "805", + "is_group": 1 + }, + "B\u00dcT\u00c7E GEL\u0130RLER\u0130NDEN RET VE \u0130ADELER HESABI": { + "account_number": "810", + "is_group": 1 + }, + "B\u00dcT\u00c7E G\u0130DERLER\u0130 HESABI": { + "account_number": "830", + "is_group": 1 + }, + "B\u00dcT\u00c7EDEN MAHSUP ED\u0130LECEK \u00d6DEMELER HESABI": { + "account_number": "833", + "is_group": 1 + }, + "GE\u00c7EN YIL B\u00dcT\u00c7E MAHSUPLARI HESABI": { + "account_number": "834", + "is_group": 1 + }, + "G\u0130DER YANSITMA HESABI": { + "account_number": "835", + "is_group": 1 + }, + "B\u00dcT\u00c7E UYGULAMA SONU\u00c7LARI HESABI": { + "account_number": "895", + "is_group": 1 + } + }, + "NAZIM HESAPLAR": { + "account_number": "9", + "root_type": "Expense", + "G\u00d6NDER\u0130LECEK B\u00dcT\u00c7E \u00d6DENEKLER\u0130 HESABI": { + "account_number": "900", + "is_group": 1 + }, + "B\u00dcT\u00c7E \u00d6DENEKLER\u0130 HESABI": { + "account_number": "901", + "is_group": 1 + }, + "B\u00dcT\u00c7E \u00d6DENEK HAREKETLER\u0130 HESABI": { + "account_number": "902", + "is_group": 1 + }, + "KULLANILACAK \u00d6DENEKLER HESABI": { + "account_number": "903", + "is_group": 1 + }, + "\u00d6DENEKLER HESABI": { + "account_number": "904", + "is_group": 1 + }, + "\u00d6DENEKL\u0130 G\u0130DERLER HESABI": { + "account_number": "905", + "is_group": 1 + }, + "MAHSUP D\u00d6NEM\u0130NE AKTARILAN KULLANILACAK \u00d6DENEKLER HESABI": { + "account_number": "906", + "is_group": 1 + }, + "MAHSUP D\u00d6NEM\u0130NE AKTARILAN \u00d6DENEKLER HESABI": { + "account_number": "907", + "is_group": 1 + }, + "TEM\u0130NAT MEKTUPLARI HESABI": { + "account_number": "910", + "is_group": 1 + }, + "TEM\u0130NAT MEKTUPLARI EMANETLER\u0130 HESABI": { + "account_number": "911", + "is_group": 1 + }, + "K\u0130\u015e\u0130LERE A\u0130T MENKUL KIYMETLER HESABI": { + "account_number": "912", + "is_group": 1 + }, + "K\u0130\u015e\u0130LERE A\u0130T MENKUL KIYMET EMANETLER\u0130 HESABI": { + "account_number": "913", + "is_group": 1 + }, + "G\u0130DER TAAHH\u00dcTLER\u0130 HESABI": { + "account_number": "920", + "is_group": 1 + }, + "G\u0130DER TAAHH\u00dcTLER\u0130 KAR\u015eILI\u011eI HESABI": { + "account_number": "921", + "is_group": 1 + }, + "VER\u0130LEN GARANT\u0130LER HESABI": { + "account_number": "930", + "is_group": 1 + }, + "VER\u0130LEN GARANT\u0130LER KAR\u015eILI\u011eI HESABI": { + "account_number": "931", + "is_group": 1 + }, + "STOK AYARLAMA": { + "account_number": "940", + "STOK SAYIM AYARLAMA": { + "account_number": "940.01", + "account_type": "Stock Adjustment" + } + } + } + } +} \ No newline at end of file From c27f272f061732e9fc58d35a95f5c34c52c0a4ab Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 16:51:07 +0530 Subject: [PATCH 42/73] perf: code optimization to handle large asset creation (backport #42018) (#42025) perf: code optimization to handle large asset creation (#42018) (cherry picked from commit 5738d93f95f7c891a01e43349abcba72d23f9e69) Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> --- erpnext/controllers/buying_controller.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py index bf6e3cd663a..30a5f38400e 100644 --- a/erpnext/controllers/buying_controller.py +++ b/erpnext/controllers/buying_controller.py @@ -659,10 +659,7 @@ class BuyingController(SubcontractingController): return if self.doctype in ["Purchase Receipt", "Purchase Invoice"]: - field = "purchase_invoice" if self.doctype == "Purchase Invoice" else "purchase_receipt" - self.process_fixed_asset() - self.update_fixed_asset(field) if self.doctype in ["Purchase Order", "Purchase Receipt"] and not frappe.db.get_single_value( "Buying Settings", "disable_last_purchase_rate" @@ -772,7 +769,7 @@ class BuyingController(SubcontractingController): if not row.asset_location: frappe.throw(_("Row {0}: Enter location for the asset item {1}").format(row.idx, row.item_code)) - item_data = frappe.db.get_value( + item_data = frappe.get_cached_value( "Item", row.item_code, ["asset_naming_series", "asset_category"], as_dict=1 ) asset_quantity = row.qty if is_grouped_asset else 1 @@ -801,7 +798,7 @@ class BuyingController(SubcontractingController): asset.flags.ignore_validate = True asset.flags.ignore_mandatory = True asset.set_missing_values() - asset.insert() + asset.db_insert() return asset.name @@ -827,11 +824,7 @@ class BuyingController(SubcontractingController): frappe.delete_doc("Asset", asset.name, force=1) continue - if self.docstatus in [0, 1] and not asset.get(field): - asset.set(field, self.name) - asset.purchase_date = self.posting_date - asset.supplier = self.supplier - elif self.docstatus == 2: + if self.docstatus == 2: if asset.docstatus == 2: continue if asset.docstatus == 0: From cf4d4ba3e97094bbe5d61b2f119ab157d4ffac08 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 16:51:16 +0530 Subject: [PATCH 43/73] fix: incorrect time period in asset depreciation schedule (backport #41805) (#42043) fix: incorrect time period in asset depreciation schedule (#41805) * fix(wip): depreciation calculation for existing asset * fix(wip): added validation for incorrect depreciation period * fix: depreciation schedule time period issue for existing asset * chore: run pre-commit checks and apply fixes * style: apply formatting changes * style: made some necessary changes * chore: modified test (cherry picked from commit 625f16dee0e77e40d0162b46ac4361879ef605a5) Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> --- erpnext/assets/doctype/asset/test_asset.py | 6 +-- .../asset_depreciation_schedule.py | 45 ++++++++++++------- .../test_asset_depreciation_schedule.py | 38 +++++++++++++++- 3 files changed, 67 insertions(+), 22 deletions(-) diff --git a/erpnext/assets/doctype/asset/test_asset.py b/erpnext/assets/doctype/asset/test_asset.py index 07608e7144e..742cc3eaa49 100644 --- a/erpnext/assets/doctype/asset/test_asset.py +++ b/erpnext/assets/doctype/asset/test_asset.py @@ -1501,19 +1501,17 @@ class TestDepreciationBasics(AssetSetup): """ asset = create_asset(calculate_depreciation=1) - asset.opening_accumulated_depreciation = 2000 - asset.opening_number_of_booked_depreciations = 1 asset.finance_books[0].expected_value_after_useful_life = 100 asset.save() asset.reload() - self.assertEqual(asset.finance_books[0].value_after_depreciation, 98000.0) + self.assertEqual(asset.finance_books[0].value_after_depreciation, 100000.0) # changing expected_value_after_useful_life shouldn't affect value_after_depreciation asset.finance_books[0].expected_value_after_useful_life = 200 asset.save() asset.reload() - self.assertEqual(asset.finance_books[0].value_after_depreciation, 98000.0) + self.assertEqual(asset.finance_books[0].value_after_depreciation, 100000.0) def test_asset_cost_center(self): asset = create_asset(is_existing_asset=1, do_not_save=1) diff --git a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py index d9fc5b3dd47..bd67a173343 100644 --- a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py +++ b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py @@ -552,32 +552,45 @@ def _check_is_pro_rata(asset_doc, row, wdv_or_dd_non_yearly=False): # if not existing asset, from_date = available_for_use_date # otherwise, if opening_number_of_booked_depreciations = 2, available_for_use_date = 01/01/2020 and frequency_of_depreciation = 12 # from_date = 01/01/2022 - from_date = _get_modified_available_for_use_date(asset_doc, row, wdv_or_dd_non_yearly) + from_date = _get_modified_available_for_use_date(asset_doc, row, wdv_or_dd_non_yearly=False) days = date_diff(row.depreciation_start_date, from_date) + 1 - - if wdv_or_dd_non_yearly: - total_days = get_total_days(row.depreciation_start_date, 12) - else: - # if frequency_of_depreciation is 12 months, total_days = 365 - total_days = get_total_days(row.depreciation_start_date, row.frequency_of_depreciation) - + total_days = get_total_days(row.depreciation_start_date, row.frequency_of_depreciation) + if days <= 0: + frappe.throw( + _( + """Error: This asset already has {0} depreciation periods booked. + The `depreciation start` date must be at least {1} periods after the `available for use` date. + Please correct the dates accordingly.""" + ).format( + asset_doc.opening_number_of_booked_depreciations, + asset_doc.opening_number_of_booked_depreciations, + ) + ) if days < total_days: has_pro_rata = True - return has_pro_rata def _get_modified_available_for_use_date(asset_doc, row, wdv_or_dd_non_yearly=False): - if wdv_or_dd_non_yearly: - return add_months( + """ + if Asset has opening booked depreciations = 9, + available for use date = 17-07-2023, + depreciation start date = 30-04-2024 + then from date should be 01-04-2024 + """ + if asset_doc.opening_number_of_booked_depreciations > 0: + from_date = add_months( asset_doc.available_for_use_date, - (asset_doc.opening_number_of_booked_depreciations * 12), + (asset_doc.opening_number_of_booked_depreciations * row.frequency_of_depreciation) - 1, ) + if is_last_day_of_the_month(row.depreciation_start_date): + return add_days(get_last_day(from_date), 1) + + # get from date when depreciation start date is not last day of the month + months_difference = month_diff(row.depreciation_start_date, from_date) - 1 + return add_days(add_months(row.depreciation_start_date, -1 * months_difference), 1) else: - return add_months( - asset_doc.available_for_use_date, - (asset_doc.opening_number_of_booked_depreciations * row.frequency_of_depreciation), - ) + return asset_doc.available_for_use_date def _get_pro_rata_amt( diff --git a/erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py b/erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py index 6009ac1496c..c359715571e 100644 --- a/erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py +++ b/erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py @@ -3,7 +3,7 @@ import frappe from frappe.tests.utils import FrappeTestCase -from frappe.utils import cstr +from frappe.utils import cstr, flt from erpnext.assets.doctype.asset.depreciation import ( post_depreciation_entries, @@ -172,7 +172,7 @@ class TestAssetDepreciationSchedule(FrappeTestCase): opening_accumulated_depreciation=2000, opening_number_of_booked_depreciations=2, depreciation_method="Straight Line", - available_for_use_date="2020-03-01", + available_for_use_date="2020-01-01", depreciation_start_date="2020-03-31", frequency_of_depreciation=1, total_number_of_depreciations=24, @@ -195,3 +195,37 @@ class TestAssetDepreciationSchedule(FrappeTestCase): asset.reload() self.assertEqual(asset.finance_books[0].total_number_of_booked_depreciations, 14) + + def test_schedule_for_wdv_method_for_existing_asset(self): + asset = create_asset( + calculate_depreciation=1, + depreciation_method="Written Down Value", + available_for_use_date="2020-07-17", + is_existing_asset=1, + opening_number_of_booked_depreciations=2, + opening_accumulated_depreciation=11666.67, + depreciation_start_date="2021-04-30", + total_number_of_depreciations=12, + frequency_of_depreciation=3, + gross_purchase_amount=50000, + rate_of_depreciation=40, + ) + + self.assertEqual(asset.status, "Draft") + expected_schedules = [ + ["2021-04-30", 3833.33, 15500.0], + ["2021-07-31", 3833.33, 19333.33], + ["2021-10-31", 3833.33, 23166.66], + ["2022-01-31", 3833.33, 26999.99], + ["2022-04-30", 2300.0, 29299.99], + ["2022-07-31", 2300.0, 31599.99], + ["2022-10-31", 2300.0, 33899.99], + ["2023-01-31", 2300.0, 36199.99], + ["2023-04-30", 1380.0, 37579.99], + ["2023-07-31", 12420.01, 50000.0], + ] + schedules = [ + [cstr(d.schedule_date), flt(d.depreciation_amount, 2), d.accumulated_depreciation_amount] + for d in get_depr_schedule(asset.name, "Draft") + ] + self.assertEqual(schedules, expected_schedules) From b29435744fee8c824f70d05a8a2748df93e51573 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 17:43:57 +0530 Subject: [PATCH 44/73] chore: patch to enable total number of booked depreciations field (backport #41940) (#42042) * chore: patch to enable total number of booked depreciations field (#41940) * chore: patch to enable total number of booked depreciations field * fix: conflict resolved * refactor: replaced fb_row.db_set with set_value (cherry picked from commit 5fdd1d3278d1c1765129551d975cf51064d79439) # Conflicts: # erpnext/patches.txt * fix: resolved conflicts * fix: removed unmerged patches --------- Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> --- .../doctype/journal_entry/journal_entry.py | 17 +++++------ erpnext/patches.txt | 1 + ...te_total_number_of_booked_depreciations.py | 29 +++++++++++++++++++ 3 files changed, 37 insertions(+), 10 deletions(-) create mode 100644 erpnext/patches/v15_0/update_total_number_of_booked_depreciations.py diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index 554217ab6b9..39f9aaf7a6c 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -226,7 +226,7 @@ class JournalEntry(AccountsController): self.unlink_inter_company_jv() self.unlink_asset_adjustment_entry() self.update_invoice_discounting() - self.update_booked_depreciation() + self.update_booked_depreciation(1) def get_title(self): return self.pay_to_recd_from or self.accounts[0].account @@ -441,7 +441,7 @@ class JournalEntry(AccountsController): if status: inv_disc_doc.set_status(status=status) - def update_booked_depreciation(self): + def update_booked_depreciation(self, cancel=0): for d in self.get("accounts"): if ( self.voucher_type == "Depreciation Entry" @@ -453,14 +453,11 @@ class JournalEntry(AccountsController): asset = frappe.get_doc("Asset", d.reference_name) for fb_row in asset.get("finance_books"): if fb_row.finance_book == self.finance_book: - depr_schedule = get_depr_schedule(asset.name, "Active", fb_row.finance_book) - total_number_of_booked_depreciations = asset.opening_number_of_booked_depreciations - for je in depr_schedule: - if je.journal_entry: - total_number_of_booked_depreciations += 1 - fb_row.db_set( - "total_number_of_booked_depreciations", total_number_of_booked_depreciations - ) + if cancel: + fb_row.total_number_of_booked_depreciations -= 1 + else: + fb_row.total_number_of_booked_depreciations += 1 + fb_row.db_update() break def unlink_advance_entry_reference(self): diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 383989643b7..dba491a728d 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -366,3 +366,4 @@ erpnext.patches.v15_0.remove_cancelled_asset_capitalization_from_asset erpnext.patches.v15_0.rename_purchase_receipt_amount_to_purchase_amount erpnext.patches.v14_0.enable_set_priority_for_pricing_rules #1 erpnext.patches.v15_0.rename_number_of_depreciations_booked_to_opening_booked_depreciations +erpnext.patches.v15_0.update_total_number_of_booked_depreciations diff --git a/erpnext/patches/v15_0/update_total_number_of_booked_depreciations.py b/erpnext/patches/v15_0/update_total_number_of_booked_depreciations.py new file mode 100644 index 00000000000..4b556c2b512 --- /dev/null +++ b/erpnext/patches/v15_0/update_total_number_of_booked_depreciations.py @@ -0,0 +1,29 @@ +import frappe + +from erpnext.assets.doctype.asset_depreciation_schedule.asset_depreciation_schedule import ( + get_depr_schedule, +) + + +def execute(): + if frappe.db.has_column("Asset Finance Book", "total_number_of_booked_depreciations"): + assets = frappe.get_all( + "Asset", filters={"docstatus": 1}, fields=["name", "opening_number_of_booked_depreciations"] + ) + + for asset in assets: + asset_doc = frappe.get_doc("Asset", asset.name) + + for fb_row in asset_doc.get("finance_books"): + depr_schedule = get_depr_schedule(asset.name, "Active", fb_row.finance_book) + total_number_of_booked_depreciations = asset.opening_number_of_booked_depreciations or 0 + + for je in depr_schedule: + if je.journal_entry: + total_number_of_booked_depreciations += 1 + frappe.db.set_value( + "Asset Finance Book", + fb_row.name, + "total_number_of_booked_depreciations", + total_number_of_booked_depreciations, + ) From 3536a754ff8dd778e72679dd906e7703f1ef7c0f Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 17:47:30 +0530 Subject: [PATCH 45/73] fix: lead status filter (backport #41816) (#42046) fix: lead status filter (#41816) (cherry picked from commit 8ae2b8ff8cb9070304e4961d290fc14c97ac900a) Co-authored-by: Nihantra C. Patel <141945075+Nihantra-Patel@users.noreply.github.com> --- erpnext/crm/doctype/lead/lead_list.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/crm/doctype/lead/lead_list.js b/erpnext/crm/doctype/lead/lead_list.js index 97415251a93..beef2c934dc 100644 --- a/erpnext/crm/doctype/lead/lead_list.js +++ b/erpnext/crm/doctype/lead/lead_list.js @@ -1,4 +1,8 @@ frappe.listview_settings["Lead"] = { + get_indicator: function (doc) { + var indicator = [__(doc.status), frappe.utils.guess_colour(doc.status), "status,=," + doc.status]; + return indicator; + }, onload: function (listview) { if (frappe.boot.user.can_create.includes("Prospect")) { listview.page.add_action_item(__("Create Prospect"), function () { From 482832f3c2be1b7cd63e5ffea595a88abdd3869b Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 18:01:33 +0530 Subject: [PATCH 46/73] fix: unhide serial no field (backport #42045) (#42047) * fix: unhide serial no field (#42045) (cherry picked from commit 80c6981cfaff082ae05d64fd183e29fea04e0b81) # Conflicts: # erpnext/assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json * fix: resolved conflicts --------- Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> --- .../asset_capitalization_stock_item.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/erpnext/assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json b/erpnext/assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json index c838f8b0f26..da05e930eab 100644 --- a/erpnext/assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json +++ b/erpnext/assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json @@ -108,7 +108,6 @@ "depends_on": "eval:doc.use_serial_batch_fields === 1", "fieldname": "serial_no", "fieldtype": "Text", - "hidden": 1, "label": "Serial No", "print_hide": 1 }, @@ -178,7 +177,7 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2024-03-05 11:22:57.346889", + "modified": "2024-06-26 17:06:22.564438", "modified_by": "Administrator", "module": "Assets", "name": "Asset Capitalization Stock Item", @@ -188,4 +187,4 @@ "sort_order": "DESC", "states": [], "track_changes": 1 -} \ No newline at end of file +} From 8a91bf315491e6b3b54c1b0f681397bb5acd4a66 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2024 16:31:06 +0530 Subject: [PATCH 47/73] fix: not able to make purchase return (backport #42053) (#42055) fix: not able to make purchase return (#42053) (cherry picked from commit 9738c04ef0e795dbf9b11531fb9a2b42ada935a7) Co-authored-by: rohitwaghchaure --- .../controllers/sales_and_purchase_return.py | 10 +++++-- .../purchase_receipt/test_purchase_receipt.py | 30 +++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/erpnext/controllers/sales_and_purchase_return.py b/erpnext/controllers/sales_and_purchase_return.py index b61d1773a67..76d04c04d6a 100644 --- a/erpnext/controllers/sales_and_purchase_return.py +++ b/erpnext/controllers/sales_and_purchase_return.py @@ -146,7 +146,10 @@ def validate_returned_items(doc): def validate_quantity(doc, args, ref, valid_items, already_returned_items): fields = ["stock_qty"] if doc.doctype in ["Purchase Receipt", "Purchase Invoice", "Subcontracting Receipt"]: - fields.extend(["received_qty", "rejected_qty"]) + if not args.get("return_qty_from_rejected_warehouse"): + fields.extend(["received_qty", "rejected_qty"]) + else: + fields.extend(["received_qty"]) already_returned_data = already_returned_items.get(args.item_code) or {} @@ -158,9 +161,12 @@ def validate_quantity(doc, args, ref, valid_items, already_returned_items): for column in fields: returned_qty = flt(already_returned_data.get(column, 0)) if len(already_returned_data) > 0 else 0 - if column == "stock_qty": + if column == "stock_qty" and not args.get("return_qty_from_rejected_warehouse"): reference_qty = ref.get(column) current_stock_qty = args.get(column) + elif args.get("return_qty_from_rejected_warehouse"): + reference_qty = ref.get("rejected_qty") * ref.get("conversion_factor", 1.0) + current_stock_qty = args.get(column) * args.get("conversion_factor", 1.0) else: reference_qty = ref.get(column) * ref.get("conversion_factor", 1.0) current_stock_qty = args.get(column) * args.get("conversion_factor", 1.0) diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py index cae58de9303..16553749d0a 100644 --- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py +++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py @@ -2990,6 +2990,36 @@ class TestPurchaseReceipt(FrappeTestCase): self.assertEqual(batch.manufacturing_date, getdate(today())) self.assertEqual(batch.expiry_date, getdate(add_days(today(), 5))) + def test_purchase_return_from_rejected_warehouse(self): + from erpnext.stock.doctype.purchase_receipt.purchase_receipt import ( + make_purchase_return_against_rejected_warehouse, + ) + + item_code = "_Test Item Return from Rejected Warehouse 11" + create_item(item_code) + + warehouse = create_warehouse("_Test Warehouse Return Qty Warehouse 11") + rejected_warehouse = create_warehouse("_Test Rejected Warehouse Return Qty Warehouse 11") + + # Step 1: Create Purchase Receipt with valuation rate 100 + pr = make_purchase_receipt( + item_code=item_code, + warehouse=warehouse, + qty=24, + rate=100, + rejected_qty=31, + rejected_warehouse=rejected_warehouse, + ) + + pr_return = make_purchase_return_against_rejected_warehouse(pr.name) + pr_return.save() + pr_return.submit() + + self.assertEqual(pr_return.items[0].warehouse, rejected_warehouse) + self.assertEqual(pr_return.items[0].qty, 31 * -1) + self.assertEqual(pr_return.items[0].rejected_qty, 0.0) + self.assertEqual(pr_return.items[0].rejected_warehouse, "") + def prepare_data_for_internal_transfer(): from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_internal_supplier From d396c18689e530d3f11a791ef1064c2d9775466e Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2024 17:32:43 +0530 Subject: [PATCH 48/73] perf: Performance optmization for Purchase Invoice submission (backport #40263) (#41946) * perf: Optimization for providional gl entries (cherry picked from commit d7b738ff61e0ebab62ff2c15247f90b79401e9a4) # Conflicts: # erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py * perf: Performance optimization for validating budget (cherry picked from commit f204d810bba5a6fdb3137b780489907c30b650fc) # Conflicts: # erpnext/accounts/doctype/budget/budget.py * perf: Cached accounting dimensions details (cherry picked from commit 8cd8b8f885419fac8297b171e90be7657357a0e3) * perf: Optimzed code for merging similar gl entries (cherry picked from commit aa75a6014264853668acd15e996e8fd0af8e7ebe) * fix: linter issues (cherry picked from commit acc0b2faf82c2b352cc2caf14ef26e6e55f34230) * perf: Cache accounting dimension filter map (cherry picked from commit e4bd1738752896e9a50231561c8ca5f3a2ee15c5) # Conflicts: # erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.py * fix: minor fixes (cherry picked from commit 5cd9bf3bda1c63fc04b6b4db8ddfdb2f9c7b456e) * perf: skip unnecessary validation while transaction cancellation (cherry picked from commit 05385e4acb0f3af7e9cd19c752df8d7287f73401) * perf: refactored handling provisional gl entries for non-stock items (cherry picked from commit 49c74369a58c313f114a8a9d99bb3b316febe4cf) # Conflicts: # erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py * perf: validate expense against budget only if budget exists (cherry picked from commit c15b2d5490975a2eb69ee0819611bc46fcd0dd3e) * perf: Get bin details only for stock items (cherry picked from commit 6ff9e6ee848e68c1d84bc17ad682b376214c5d59) # Conflicts: # erpnext/stock/get_item_details.py * fix: added index for price_list column in Item Price (cherry picked from commit d279e23623f13f93c6f7c870fef0c2335e6d2b15) # Conflicts: # erpnext/stock/doctype/item_price/item_price.json * perf: Caching in checking allowance for qty and amount (cherry picked from commit 8d682fa8840ef69a1d8a78e4bb418668f251585b) * perf: Caching in gl entry (cherry picked from commit b07769d8d7890580a9c47598bd166347ca8c1aec) # Conflicts: # erpnext/accounts/doctype/gl_entry/gl_entry.py * chore: resolve conflicts * chore: resolve conflict in purchase_invoice.py --------- Co-authored-by: Nabin Hait Co-authored-by: ruthra kumar --- .../accounting_dimension.py | 16 +- .../test_accounting_dimension.py | 2 + .../accounting_dimension_filter.py | 62 ++++--- .../test_accounting_dimension_filter.py | 2 + erpnext/accounts/doctype/budget/budget.py | 20 +- .../budget_account/budget_account.json | 124 ++++--------- erpnext/accounts/doctype/gl_entry/gl_entry.py | 10 +- .../payment_ledger_entry.py | 9 +- .../purchase_invoice/purchase_invoice.py | 173 ++++++++++-------- erpnext/accounts/general_ledger.py | 45 ++--- erpnext/controllers/accounts_controller.py | 4 +- erpnext/controllers/status_updater.py | 7 +- .../stock/doctype/item_price/item_price.json | 3 +- erpnext/stock/get_item_details.py | 28 +-- 14 files changed, 254 insertions(+), 251 deletions(-) diff --git a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py index 7a2f4e4b71b..db99bcd223b 100644 --- a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py +++ b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py @@ -255,14 +255,16 @@ def get_accounting_dimensions(as_list=True, filters=None): def get_checks_for_pl_and_bs_accounts(): - dimensions = frappe.db.sql( - """SELECT p.label, p.disabled, p.fieldname, c.default_dimension, c.company, c.mandatory_for_pl, c.mandatory_for_bs - FROM `tabAccounting Dimension`p ,`tabAccounting Dimension Detail` c - WHERE p.name = c.parent""", - as_dict=1, - ) + if frappe.flags.accounting_dimensions_details is None: + # nosemgrep + frappe.flags.accounting_dimensions_details = frappe.db.sql( + """SELECT p.label, p.disabled, p.fieldname, c.default_dimension, c.company, c.mandatory_for_pl, c.mandatory_for_bs + FROM `tabAccounting Dimension`p ,`tabAccounting Dimension Detail` c + WHERE p.name = c.parent""", + as_dict=1, + ) - return dimensions + return frappe.flags.accounting_dimensions_details def get_dimension_with_children(doctype, dimensions): diff --git a/erpnext/accounts/doctype/accounting_dimension/test_accounting_dimension.py b/erpnext/accounts/doctype/accounting_dimension/test_accounting_dimension.py index cb7f5f5da78..10dbe3bab0f 100644 --- a/erpnext/accounts/doctype/accounting_dimension/test_accounting_dimension.py +++ b/erpnext/accounts/doctype/accounting_dimension/test_accounting_dimension.py @@ -78,6 +78,8 @@ class TestAccountingDimension(unittest.TestCase): def tearDown(self): disable_dimension() + frappe.flags.accounting_dimensions_details = None + frappe.flags.dimension_filter_map = None def create_dimension(): diff --git a/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.py b/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.py index 01f6e60bf3b..1954b4b0efe 100644 --- a/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.py +++ b/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.py @@ -66,37 +66,41 @@ class AccountingDimensionFilter(Document): def get_dimension_filter_map(): - filters = frappe.db.sql( - """ - SELECT - a.applicable_on_account, d.dimension_value, p.accounting_dimension, - p.allow_or_restrict, a.is_mandatory - FROM - `tabApplicable On Account` a, - `tabAccounting Dimension Filter` p - LEFT JOIN `tabAllowed Dimension` d ON d.parent = p.name - WHERE - p.name = a.parent - AND p.disabled = 0 - """, - as_dict=1, - ) - - dimension_filter_map = {} - - for f in filters: - f.fieldname = scrub(f.accounting_dimension) - - build_map( - dimension_filter_map, - f.fieldname, - f.applicable_on_account, - f.dimension_value, - f.allow_or_restrict, - f.is_mandatory, + if not frappe.flags.get("dimension_filter_map"): + # nosemgrep + filters = frappe.db.sql( + """ + SELECT + a.applicable_on_account, d.dimension_value, p.accounting_dimension, + p.allow_or_restrict, a.is_mandatory + FROM + `tabApplicable On Account` a, `tabAllowed Dimension` d, + `tabAccounting Dimension Filter` p + WHERE + p.name = a.parent + AND p.disabled = 0 + AND p.name = d.parent + """, + as_dict=1, ) - return dimension_filter_map + dimension_filter_map = {} + + for f in filters: + f.fieldname = scrub(f.accounting_dimension) + + build_map( + dimension_filter_map, + f.fieldname, + f.applicable_on_account, + f.dimension_value, + f.allow_or_restrict, + f.is_mandatory, + ) + + frappe.flags.dimension_filter_map = dimension_filter_map + + return frappe.flags.dimension_filter_map def build_map(map_object, dimension, account, filter_value, allow_or_restrict, is_mandatory): diff --git a/erpnext/accounts/doctype/accounting_dimension_filter/test_accounting_dimension_filter.py b/erpnext/accounts/doctype/accounting_dimension_filter/test_accounting_dimension_filter.py index 3dec7c87020..77057c1e20e 100644 --- a/erpnext/accounts/doctype/accounting_dimension_filter/test_accounting_dimension_filter.py +++ b/erpnext/accounts/doctype/accounting_dimension_filter/test_accounting_dimension_filter.py @@ -47,6 +47,8 @@ class TestAccountingDimensionFilter(unittest.TestCase): def tearDown(self): disable_dimension_filter() disable_dimension() + frappe.flags.accounting_dimensions_details = None + frappe.flags.dimension_filter_map = None for si in self.invoice_list: si.load_from_db() diff --git a/erpnext/accounts/doctype/budget/budget.py b/erpnext/accounts/doctype/budget/budget.py index 11f78ae1763..2c4ed7781aa 100644 --- a/erpnext/accounts/doctype/budget/budget.py +++ b/erpnext/accounts/doctype/budget/budget.py @@ -142,6 +142,8 @@ class Budget(Document): def validate_expense_against_budget(args, expense_amount=0): args = frappe._dict(args) + if not frappe.get_all("Budget", limit=1): + return if args.get("company") and not args.fiscal_year: args.fiscal_year = get_fiscal_year(args.get("posting_date"), company=args.get("company"))[0] @@ -149,6 +151,11 @@ def validate_expense_against_budget(args, expense_amount=0): "Company", args.get("company"), "exception_budget_approver_role" ) + if not frappe.get_cached_value( + "Budget", {"fiscal_year": args.fiscal_year, "company": args.company} + ): # nosec + return + if not args.account: args.account = args.get("expense_account") @@ -175,14 +182,19 @@ def validate_expense_against_budget(args, expense_amount=0): if ( args.get(budget_against) and args.account - and frappe.db.get_value("Account", {"name": args.account, "root_type": "Expense"}) + and (frappe.get_cached_value("Account", args.account, "root_type") == "Expense") ): doctype = dimension.get("document_type") if frappe.get_cached_value("DocType", doctype, "is_tree"): - lft, rgt = frappe.db.get_value(doctype, args.get(budget_against), ["lft", "rgt"]) - condition = f"""and exists(select name from `tab{doctype}` - where lft<={lft} and rgt>={rgt} and name=b.{budget_against})""" # nosec + lft, rgt = frappe.get_cached_value(doctype, args.get(budget_against), ["lft", "rgt"]) + condition = """and exists(select name from `tab%s` + where lft<=%s and rgt>=%s and name=b.%s)""" % ( + doctype, + lft, + rgt, + budget_against, + ) # nosec args.is_tree = True else: condition = f"and b.{budget_against}={frappe.db.escape(args.get(budget_against))}" diff --git a/erpnext/accounts/doctype/budget_account/budget_account.json b/erpnext/accounts/doctype/budget_account/budget_account.json index ead07614a7f..c7d872647f1 100644 --- a/erpnext/accounts/doctype/budget_account/budget_account.json +++ b/erpnext/accounts/doctype/budget_account/budget_account.json @@ -1,94 +1,42 @@ { - "allow_copy": 0, - "allow_import": 0, - "allow_rename": 0, - "beta": 0, - "creation": "2016-05-16 11:54:09.286135", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "", - "editable_grid": 1, - "engine": "InnoDB", + "actions": [], + "creation": "2016-05-16 11:54:09.286135", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "account", + "budget_amount" + ], "fields": [ { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "account", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 1, - "label": "Account", - "length": 0, - "no_copy": 0, - "options": "Account", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "fieldname": "account", + "fieldtype": "Link", + "in_list_view": 1, + "label": "Account", + "options": "Account", + "reqd": 1, + "search_index": 1 + }, { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "budget_amount", - "fieldtype": "Currency", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 1, - "label": "Budget Amount", - "length": 0, - "no_copy": 0, - "options": "Company:company:default_currency", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "unique": 0 + "fieldname": "budget_amount", + "fieldtype": "Currency", + "in_list_view": 1, + "label": "Budget Amount", + "options": "Company:company:default_currency", + "reqd": 1 } - ], - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 0, - - "is_submittable": 0, - "issingle": 0, - "istable": 1, - "max_attachments": 0, - "modified": "2017-01-02 17:02:53.339420", - "modified_by": "Administrator", - "module": "Accounts", - "name": "Budget Account", - "name_case": "", - "owner": "Administrator", - "permissions": [], - "quick_entry": 1, - "read_only": 0, - "read_only_onload": 0, - "sort_field": "modified", - "sort_order": "DESC", - "track_seen": 0 + ], + "istable": 1, + "links": [], + "modified": "2024-03-04 15:43:27.016947", + "modified_by": "Administrator", + "module": "Accounts", + "name": "Budget Account", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "sort_field": "modified", + "sort_order": "DESC", + "states": [] } \ No newline at end of file diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.py b/erpnext/accounts/doctype/gl_entry/gl_entry.py index 594c3054cfd..facfbf51e00 100644 --- a/erpnext/accounts/doctype/gl_entry/gl_entry.py +++ b/erpnext/accounts/doctype/gl_entry/gl_entry.py @@ -328,8 +328,10 @@ def update_outstanding_amt( party_condition = "" if against_voucher_type == "Sales Invoice": - party_account = frappe.db.get_value(against_voucher_type, against_voucher, "debit_to") - account_condition = f"and account in ({frappe.db.escape(account)}, {frappe.db.escape(party_account)})" + party_account = frappe.get_cached_value(against_voucher_type, against_voucher, "debit_to") + account_condition = "and account in ({0}, {1})".format( + frappe.db.escape(account), frappe.db.escape(party_account) + ) else: account_condition = f" and account = {frappe.db.escape(account)}" @@ -392,7 +394,9 @@ def update_outstanding_amt( def validate_frozen_account(account, adv_adj=None): frozen_account = frappe.get_cached_value("Account", account, "freeze_account") if frozen_account == "Yes" and not adv_adj: - frozen_accounts_modifier = frappe.db.get_value("Accounts Settings", None, "frozen_accounts_modifier") + frozen_accounts_modifier = frappe.get_cached_value( + "Accounts Settings", None, "frozen_accounts_modifier" + ) if not frozen_accounts_modifier: frappe.throw(_("Account {0} is frozen").format(account)) diff --git a/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py b/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py index ca591d42073..2bc44893c20 100644 --- a/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py +++ b/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py @@ -161,11 +161,12 @@ class PaymentLedgerEntry(Document): def on_update(self): adv_adj = self.flags.adv_adj if not self.flags.from_repost: - self.validate_account_details() - self.validate_dimensions_for_pl_and_bs() - self.validate_allowed_dimensions() - validate_balance_type(self.account, adv_adj) validate_frozen_account(self.account, adv_adj) + if not self.delinked: + self.validate_account_details() + self.validate_dimensions_for_pl_and_bs() + self.validate_allowed_dimensions() + validate_balance_type(self.account, adv_adj) # update outstanding amount if ( diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py index dce742d1021..e519f069aa4 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -795,13 +795,12 @@ class PurchaseInvoice(BuyingController): self.db_set("repost_required", self.needs_repost) def make_gl_entries(self, gl_entries=None, from_repost=False): - if not gl_entries: - gl_entries = self.get_gl_entries() + update_outstanding = "No" if (cint(self.is_paid) or self.write_off_account) else "Yes" + if self.docstatus == 1: + if not gl_entries: + gl_entries = self.get_gl_entries() - if gl_entries: - update_outstanding = "No" if (cint(self.is_paid) or self.write_off_account) else "Yes" - - if self.docstatus == 1: + if gl_entries: make_gl_entries( gl_entries, update_outstanding=update_outstanding, @@ -809,32 +808,43 @@ class PurchaseInvoice(BuyingController): from_repost=from_repost, ) self.make_exchange_gain_loss_journal() - elif self.docstatus == 2: - provisional_entries = [a for a in gl_entries if a.voucher_type == "Purchase Receipt"] - make_reverse_gl_entries(voucher_type=self.doctype, voucher_no=self.name) - if provisional_entries: - for entry in provisional_entries: - frappe.db.set_value( - "GL Entry", - { - "voucher_type": "Purchase Receipt", - "voucher_detail_no": entry.voucher_detail_no, - }, - "is_cancelled", - 1, - ) - - if update_outstanding == "No": - update_outstanding_amt( - self.credit_to, - "Supplier", - self.supplier, - self.doctype, - self.return_against if cint(self.is_return) and self.return_against else self.name, - ) - - elif self.docstatus == 2 and cint(self.update_stock) and self.auto_accounting_for_stock: + elif self.docstatus == 2: make_reverse_gl_entries(voucher_type=self.doctype, voucher_no=self.name) + self.cancel_provisional_entries() + + self.update_supplier_outstanding(update_outstanding) + + def cancel_provisional_entries(self): + rows = set() + purchase_receipts = set() + for d in self.items: + if d.purchase_receipt: + purchase_receipts.add(d.purchase_receipt) + rows.add(d.name) + + if rows: + # cancel gl entries + gle = qb.DocType("GL Entry") + gle_update_query = ( + qb.update(gle) + .set(gle.is_cancelled, 1) + .where( + (gle.voucher_type == "Purchase Receipt") + & (gle.voucher_no.isin(purchase_receipts)) + & (gle.voucher_detail_no.isin(rows)) + ) + ) + gle_update_query.run() + + def update_supplier_outstanding(self, update_outstanding): + if update_outstanding == "No": + update_outstanding_amt( + self.credit_to, + "Supplier", + self.supplier, + self.doctype, + self.return_against if cint(self.is_return) and self.return_against else self.name, + ) def get_gl_entries(self, warehouse_account=None): self.auto_accounting_for_stock = erpnext.is_perpetual_inventory_enabled(self.company) @@ -947,8 +957,9 @@ class PurchaseInvoice(BuyingController): "Company", self.company, "enable_provisional_accounting_for_non_stock_items" ) ) - - purchase_receipt_doc_map = {} + self.provisional_enpenses_booked_in_pr = False + if provisional_accounting_for_non_stock_items: + self.get_provisional_accounts() for item in self.get("items"): if flt(item.base_net_amount): @@ -1087,49 +1098,7 @@ class PurchaseInvoice(BuyingController): dummy, amount = self.get_amount_and_base_amount(item, None) if provisional_accounting_for_non_stock_items: - if item.purchase_receipt: - provisional_account, pr_qty, pr_base_rate, pr_rate = frappe.get_cached_value( - "Purchase Receipt Item", - item.pr_detail, - ["provisional_expense_account", "qty", "base_rate", "rate"], - ) - provisional_account = provisional_account or self.get_company_default( - "default_provisional_account" - ) - purchase_receipt_doc = purchase_receipt_doc_map.get(item.purchase_receipt) - - if not purchase_receipt_doc: - purchase_receipt_doc = frappe.get_doc( - "Purchase Receipt", item.purchase_receipt - ) - purchase_receipt_doc_map[item.purchase_receipt] = purchase_receipt_doc - - # Post reverse entry for Stock-Received-But-Not-Billed if it is booked in Purchase Receipt - expense_booked_in_pr = frappe.db.get_value( - "GL Entry", - { - "is_cancelled": 0, - "voucher_type": "Purchase Receipt", - "voucher_no": item.purchase_receipt, - "voucher_detail_no": item.pr_detail, - "account": provisional_account, - }, - "name", - ) - - if expense_booked_in_pr: - # Intentionally passing purchase invoice item to handle partial billing - purchase_receipt_doc.add_provisional_gl_entry( - item, - gl_entries, - self.posting_date, - provisional_account, - reverse=1, - item_amount=( - (min(item.qty, pr_qty) * pr_rate) - * purchase_receipt_doc.get("conversion_rate") - ), - ) + self.make_provisional_gl_entry(gl_entries, item) if not self.is_internal_transfer(): gl_entries.append( @@ -1225,6 +1194,58 @@ class PurchaseInvoice(BuyingController): if item.is_fixed_asset and item.landed_cost_voucher_amount: self.update_gross_purchase_amount_for_linked_assets(item) + def get_provisional_accounts(self): + self.provisional_accounts = frappe._dict() + linked_purchase_receipts = set([d.purchase_receipt for d in self.items if d.purchase_receipt]) + pr_items = frappe.get_all( + "Purchase Receipt Item", + filters={"parent": ("in", linked_purchase_receipts)}, + fields=["name", "provisional_expense_account", "qty", "base_rate"], + ) + default_provisional_account = self.get_company_default("default_provisional_account") + for item in pr_items: + self.provisional_accounts[item.name] = { + "provisional_account": item.provisional_expense_account or default_provisional_account, + "qty": item.qty, + "base_rate": item.base_rate, + } + + def make_provisional_gl_entry(self, gl_entries, item): + if item.purchase_receipt: + if not self.provisional_enpenses_booked_in_pr: + pr_item = self.provisional_accounts.get(item.pr_detail, {}) + provisional_account = pr_item.get("provisional_account") + pr_qty = pr_item.get("qty") + pr_base_rate = pr_item.get("base_rate") + + # Post reverse entry for Stock-Received-But-Not-Billed if it is booked in Purchase Receipt + provision_gle_against_pr = frappe.db.get_value( + "GL Entry", + { + "is_cancelled": 0, + "voucher_type": "Purchase Receipt", + "voucher_no": item.purchase_receipt, + "voucher_detail_no": item.pr_detail, + "account": provisional_account, + }, + ["name"], + ) + if provision_gle_against_pr: + self.provisional_enpenses_booked_in_pr = True + + if self.provisional_enpenses_booked_in_pr: + purchase_receipt_doc = frappe.get_cached_doc("Purchase Receipt", item.purchase_receipt) + + # Intentionally passing purchase invoice item to handle partial billing + purchase_receipt_doc.add_provisional_gl_entry( + item, + gl_entries, + self.posting_date, + provisional_account, + reverse=1, + item_amount=(min(item.qty, pr_qty) * pr_base_rate), + ) + def update_gross_purchase_amount_for_linked_assets(self, item): assets = frappe.db.get_all( "Asset", diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py index 3f01dee888d..2fd7b5d3c81 100644 --- a/erpnext/accounts/general_ledger.py +++ b/erpnext/accounts/general_ledger.py @@ -7,7 +7,7 @@ import copy import frappe from frappe import _ from frappe.model.meta import get_field_precision -from frappe.utils import cint, cstr, flt, formatdate, getdate, now +from frappe.utils import cint, flt, formatdate, getdate, now import erpnext from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import ( @@ -228,11 +228,13 @@ def get_cost_center_allocation_data(company, posting_date): def merge_similar_entries(gl_map, precision=None): merged_gl_map = [] accounting_dimensions = get_accounting_dimensions() + merge_properties = get_merge_properties(accounting_dimensions) for entry in gl_map: + entry.merge_key = get_merge_key(entry, merge_properties) # if there is already an entry in this account then just add it # to that entry - same_head = check_if_in_list(entry, merged_gl_map, accounting_dimensions) + same_head = check_if_in_list(entry, merged_gl_map) if same_head: same_head.debit = flt(same_head.debit) + flt(entry.debit) same_head.debit_in_account_currency = flt(same_head.debit_in_account_currency) + flt( @@ -273,34 +275,35 @@ def merge_similar_entries(gl_map, precision=None): return merged_gl_map -def check_if_in_list(gle, gl_map, dimensions=None): - account_head_fieldnames = [ - "voucher_detail_no", - "party", - "against_voucher", +def get_merge_properties(dimensions=None): + merge_properties = [ + "account", "cost_center", - "against_voucher_type", + "party", "party_type", + "voucher_detail_no", + "against_voucher", + "against_voucher_type", "project", "finance_book", "voucher_no", ] - if dimensions: - account_head_fieldnames = account_head_fieldnames + dimensions + merge_properties.extend(dimensions) + return merge_properties + +def get_merge_key(entry, merge_properties): + merge_key = [] + for fieldname in merge_properties: + merge_key.append(entry.get(fieldname, "")) + + return tuple(merge_key) + + +def check_if_in_list(gle, gl_map): for e in gl_map: - same_head = True - if e.account != gle.account: - same_head = False - continue - - for fieldname in account_head_fieldnames: - if cstr(e.get(fieldname)) != cstr(gle.get(fieldname)): - same_head = False - break - - if same_head: + if e.merge_key == gle.merge_key: return e diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index f576ecc1b11..0cbf1b320ca 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -1764,8 +1764,8 @@ class AccountsController(TransactionBase): item_allowance = {} global_qty_allowance, global_amount_allowance = None, None - role_allowed_to_over_bill = frappe.db.get_single_value( - "Accounts Settings", "role_allowed_to_over_bill" + role_allowed_to_over_bill = frappe.get_cached_value( + "Accounts Settings", None, "role_allowed_to_over_bill" ) user_roles = frappe.get_roles() diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py index 896413aaed8..492000d71d4 100644 --- a/erpnext/controllers/status_updater.py +++ b/erpnext/controllers/status_updater.py @@ -554,6 +554,7 @@ class StatusUpdater(Document): ref_doc.set_status(update=True) +@frappe.request_cache def get_allowance_for( item_code, item_allowance=None, @@ -583,20 +584,20 @@ def get_allowance_for( global_amount_allowance, ) - qty_allowance, over_billing_allowance = frappe.db.get_value( + qty_allowance, over_billing_allowance = frappe.get_cached_value( "Item", item_code, ["over_delivery_receipt_allowance", "over_billing_allowance"] ) if qty_or_amount == "qty" and not qty_allowance: if global_qty_allowance is None: global_qty_allowance = flt( - frappe.db.get_single_value("Stock Settings", "over_delivery_receipt_allowance") + frappe.get_cached_value("Stock Settings", None, "over_delivery_receipt_allowance") ) qty_allowance = global_qty_allowance elif qty_or_amount == "amount" and not over_billing_allowance: if global_amount_allowance is None: global_amount_allowance = flt( - frappe.db.get_single_value("Accounts Settings", "over_billing_allowance") + frappe.get_cached_value("Accounts Settings", None, "over_billing_allowance") ) over_billing_allowance = global_amount_allowance diff --git a/erpnext/stock/doctype/item_price/item_price.json b/erpnext/stock/doctype/item_price/item_price.json index 3daf4dc2bd8..c6950b9a10f 100644 --- a/erpnext/stock/doctype/item_price/item_price.json +++ b/erpnext/stock/doctype/item_price/item_price.json @@ -107,7 +107,8 @@ "in_standard_filter": 1, "label": "Price List", "options": "Price List", - "reqd": 1 + "reqd": 1, + "search_index": 1 }, { "bold": 1, diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index 5da3c066869..a7aa7dce452 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -103,19 +103,8 @@ def get_item_details(args, doc=None, for_validate=False, overwrite_warehouse=Tru if args.customer and cint(args.is_pos): out.update(get_pos_profile_item_details(args.company, args, update_data=True)) - if args.get("doctype") == "Material Request" and args.get("material_request_type") == "Material Transfer": - out.update(get_bin_details(args.item_code, args.get("from_warehouse"))) - - elif out.get("warehouse"): - if doc and doc.get("doctype") == "Purchase Order": - # calculate company_total_stock only for po - bin_details = get_bin_details( - args.item_code, out.warehouse, args.company, include_child_warehouses=True - ) - else: - bin_details = get_bin_details(args.item_code, out.warehouse, include_child_warehouses=True) - - out.update(bin_details) + if item.is_stock_item: + update_bin_details(args, out, doc) # update args with out, if key or value not exists for key, value in out.items(): @@ -166,6 +155,19 @@ def set_valuation_rate(out, args): out.update(get_valuation_rate(args.item_code, args.company, out.get("warehouse"))) +def update_bin_details(args, out, doc): + if args.get("doctype") == "Material Request" and args.get("material_request_type") == "Material Transfer": + out.update(get_bin_details(args.item_code, args.get("from_warehouse"))) + + elif out.get("warehouse"): + company = args.company if (doc and doc.get("doctype") == "Purchase Order") else None + + # calculate company_total_stock only for po + bin_details = get_bin_details(args.item_code, out.warehouse, company, include_child_warehouses=True) + + out.update(bin_details) + + def process_args(args): if isinstance(args, str): args = json.loads(args) From 1f3374fcdf3e29a9fa6ad7d317db1b9c087bdbfb Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Sat, 29 Jun 2024 07:32:45 +0530 Subject: [PATCH 49/73] fix: reposting file attachment permission issue (backport #42068) (#42075) * fix: reposting file attachment permission issue (#42068) (cherry picked from commit 03e674e21d7ede46c43496d51db26ad523ae3fb1) # Conflicts: # erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json * chore: fix conflicts --------- Co-authored-by: rohitwaghchaure --- .../doctype/repost_item_valuation/repost_item_valuation.js | 4 +--- .../repost_item_valuation/repost_item_valuation.json | 5 +++-- .../doctype/repost_item_valuation/repost_item_valuation.py | 6 ++++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js index f0506ab6930..6f2548ac8ea 100644 --- a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js +++ b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js @@ -128,9 +128,7 @@ frappe.ui.form.on("Repost Item Valuation", { method: "restart_reposting", doc: frm.doc, callback: function (r) { - if (!r.exc) { - frm.refresh(); - } + frm.reload_doc(); }, }); }, diff --git a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json index 1c5b521c296..67e97964e18 100644 --- a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json +++ b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -218,13 +218,14 @@ "fieldname": "reposting_data_file", "fieldtype": "Attach", "label": "Reposting Data File", + "no_copy": 1, "read_only": 1 } ], "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2023-05-31 12:48:57.138693", + "modified": "2024-06-27 16:55:23.150146", "modified_by": "Administrator", "module": "Stock", "name": "Repost Item Valuation", @@ -276,4 +277,4 @@ "sort_field": "modified", "sort_order": "DESC", "states": [] -} \ No newline at end of file +} diff --git a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py index 40767704f4e..717b1c31026 100644 --- a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py +++ b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py @@ -179,7 +179,7 @@ class RepostItemValuation(Document): def clear_attachment(self): if attachments := get_attachments(self.doctype, self.name): attachment = attachments[0] - frappe.delete_doc("File", attachment.name) + frappe.delete_doc("File", attachment.name, ignore_permissions=True) if self.reposting_data_file: self.db_set("reposting_data_file", None) @@ -219,6 +219,7 @@ class RepostItemValuation(Document): self.distinct_item_and_warehouse = None self.items_to_be_repost = None self.gl_reposting_index = 0 + self.clear_attachment() self.db_update() def deduplicate_similar_repost(self): @@ -271,6 +272,7 @@ def repost(doc): repost_gl_entries(doc) doc.set_status("Completed") + doc.db_set("reposting_data_file", None) remove_attached_file(doc.name) except Exception as e: @@ -315,7 +317,7 @@ def remove_attached_file(docname): if file_name := frappe.db.get_value( "File", {"attached_to_name": docname, "attached_to_doctype": "Repost Item Valuation"}, "name" ): - frappe.delete_doc("File", file_name, delete_permanently=True) + frappe.delete_doc("File", file_name, ignore_permissions=True, delete_permanently=True) def repost_sl_entries(doc): From 760b2e24f27c1dfdc70eb685562e83afc9f35ae3 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Sat, 29 Jun 2024 10:59:57 +0530 Subject: [PATCH 50/73] fix: expense account from item group not fetched (backport #41957) (#41962) fix: expense account from item group not fetched (cherry picked from commit 86ebe58231bf1a0271c9274a2b312bc533e1e5f3) Co-authored-by: Rohit Waghchaure --- erpnext/stock/doctype/stock_entry/stock_entry.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 266d74afbed..005ad287d78 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -1627,7 +1627,7 @@ class StockEntry(StockController): "has_serial_no": item.has_serial_no, "has_batch_no": item.has_batch_no, "sample_quantity": item.sample_quantity, - "expense_account": item.expense_account, + "expense_account": item.expense_account or item_group_defaults.get("expense_account"), } ) From 4e74257ba9bf520d0a92622adf979e77cd4d8222 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 25 Jun 2024 13:52:38 +0530 Subject: [PATCH 51/73] fix: incorrect dr/cr on Adv Payment against Journals (cherry picked from commit f6c1dffb3531c5ba9b9011b72ddb852b2403ac26) --- erpnext/accounts/doctype/payment_entry/payment_entry.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py index a2882206b4a..f5fb49f0bba 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py @@ -1218,12 +1218,17 @@ class PaymentEntry(AccountsController): return "credit", reference.account if reference.reference_doctype == "Payment Entry": + # reference.account_type and reference.payment_type is only available for Reverse payments if reference.account_type == "Receivable" and reference.payment_type == "Pay": return "credit", self.party_account else: return "debit", self.party_account - return "debit", reference.account + if reference.reference_doctype == "Journal Entry": + if self.party_type == "Customer" and self.payment_type == "Receive": + return "credit", reference.account + else: + return "debit", reference.account def add_advance_gl_for_reference(self, gl_entries, invoice): args_dict = { From e00348fd5271c5e375290e762a99b8c55d0de275 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 25 Jun 2024 16:14:05 +0530 Subject: [PATCH 52/73] test: advance payment against journal entry - customer type (cherry picked from commit 5e84272cf920492a2cdfb2163e8ee3e7f899e6e9) --- .../test_payment_reconciliation.py | 116 ++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py index 53f69a47e75..f272fede589 100644 --- a/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py +++ b/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py @@ -109,6 +109,14 @@ class TestPaymentReconciliation(FrappeTestCase): "account_currency": "INR", "account_type": "Payable", }, + # 'Receivable' account for capturing advance received, under 'Liabilities' group + { + "attribute": "advance_receivable_account", + "account_name": "Advance Received", + "parent_account": "Current Liabilities - _PR", + "account_currency": "INR", + "account_type": "Receivable", + }, ] for x in accounts: @@ -1574,6 +1582,114 @@ class TestPaymentReconciliation(FrappeTestCase): ) self.assertEqual(len(pl_entries), 3) + def test_advance_payment_reconciliation_against_journal_for_customer(self): + frappe.db.set_value( + "Company", + self.company, + { + "book_advance_payments_in_separate_party_account": 1, + "default_advance_received_account": self.advance_receivable_account, + "reconcile_on_advance_payment_date": 0, + }, + ) + amount = 200.0 + je = self.create_journal_entry(self.debit_to, self.bank, amount) + je.accounts[0].cost_center = self.main_cc.name + je.accounts[0].party_type = "Customer" + je.accounts[0].party = self.customer + je.accounts[1].cost_center = self.main_cc.name + je = je.save().submit() + + pe = self.create_payment_entry(amount=amount).save().submit() + + pr = self.create_payment_reconciliation() + pr.default_advance_account = self.advance_receivable_account + pr.get_unreconciled_entries() + self.assertEqual(len(pr.invoices), 1) + self.assertEqual(len(pr.payments), 1) + invoices = [invoice.as_dict() for invoice in pr.invoices] + payments = [payment.as_dict() for payment in pr.payments] + pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments})) + pr.reconcile() + + # Assert Ledger Entries + gl_entries = frappe.db.get_all( + "GL Entry", + filters={"voucher_no": pe.name, "is_cancelled": 0}, + ) + self.assertEqual(len(gl_entries), 4) + pl_entries = frappe.db.get_all( + "Payment Ledger Entry", + filters={"voucher_no": pe.name, "delinked": 0}, + ) + self.assertEqual(len(pl_entries), 3) + + gl_entries = frappe.db.get_all( + "GL Entry", + filters={"voucher_no": pe.name, "is_cancelled": 0}, + fields=["account", "voucher_no", "against_voucher", "debit", "credit"], + order_by="account, against_voucher, debit", + ) + expected_gle = [ + { + "account": self.advance_receivable_account, + "voucher_no": pe.name, + "against_voucher": pe.name, + "debit": 0.0, + "credit": amount, + }, + { + "account": self.advance_receivable_account, + "voucher_no": pe.name, + "against_voucher": pe.name, + "debit": amount, + "credit": 0.0, + }, + { + "account": self.debit_to, + "voucher_no": pe.name, + "against_voucher": je.name, + "debit": 0.0, + "credit": amount, + }, + { + "account": self.bank, + "voucher_no": pe.name, + "against_voucher": None, + "debit": amount, + "credit": 0.0, + }, + ] + self.assertEqual(gl_entries, expected_gle) + + pl_entries = frappe.db.get_all( + "Payment Ledger Entry", + filters={"voucher_no": pe.name}, + fields=["account", "voucher_no", "against_voucher_no", "amount"], + order_by="account, against_voucher_no, amount", + ) + expected_ple = [ + { + "account": self.advance_receivable_account, + "voucher_no": pe.name, + "against_voucher_no": pe.name, + "amount": -amount, + }, + { + "account": self.advance_receivable_account, + "voucher_no": pe.name, + "against_voucher_no": pe.name, + "amount": amount, + }, + { + "account": self.debit_to, + "voucher_no": pe.name, + "against_voucher_no": je.name, + "amount": -amount, + }, + ] + self.assertEqual(pl_entries, expected_ple) + def make_customer(customer_name, currency=None): if not frappe.db.exists("Customer", customer_name): From 6a0111c7db2dbc4b778e3dd5cf425ccf9eb65374 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 25 Jun 2024 16:25:20 +0530 Subject: [PATCH 53/73] test: advance payment entry against journal - supplier type (cherry picked from commit 1b384b99429f8953b99a7d6a6c1206ba4a319638) --- .../test_payment_reconciliation.py | 115 ++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py index f272fede589..a5295585221 100644 --- a/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py +++ b/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py @@ -1690,6 +1690,121 @@ class TestPaymentReconciliation(FrappeTestCase): ] self.assertEqual(pl_entries, expected_ple) + def test_advance_payment_reconciliation_against_journal_for_supplier(self): + self.supplier = make_supplier("_Test Supplier") + frappe.db.set_value( + "Company", + self.company, + { + "book_advance_payments_in_separate_party_account": 1, + "default_advance_paid_account": self.advance_payable_account, + "reconcile_on_advance_payment_date": 0, + }, + ) + amount = 200.0 + je = self.create_journal_entry(self.creditors, self.bank, -amount) + je.accounts[0].cost_center = self.main_cc.name + je.accounts[0].party_type = "Supplier" + je.accounts[0].party = self.supplier + je.accounts[1].cost_center = self.main_cc.name + je = je.save().submit() + + pe = self.create_payment_entry(amount=amount) + pe.payment_type = "Pay" + pe.party_type = "Supplier" + pe.paid_from = self.bank + pe.paid_to = self.creditors + pe.party = self.supplier + pe.save().submit() + + pr = self.create_payment_reconciliation(party_is_customer=False) + pr.default_advance_account = self.advance_payable_account + pr.get_unreconciled_entries() + self.assertEqual(len(pr.invoices), 1) + self.assertEqual(len(pr.payments), 1) + invoices = [invoice.as_dict() for invoice in pr.invoices] + payments = [payment.as_dict() for payment in pr.payments] + pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments})) + pr.reconcile() + + # Assert Ledger Entries + gl_entries = frappe.db.get_all( + "GL Entry", + filters={"voucher_no": pe.name, "is_cancelled": 0}, + ) + self.assertEqual(len(gl_entries), 4) + pl_entries = frappe.db.get_all( + "Payment Ledger Entry", + filters={"voucher_no": pe.name, "delinked": 0}, + ) + self.assertEqual(len(pl_entries), 3) + + gl_entries = frappe.db.get_all( + "GL Entry", + filters={"voucher_no": pe.name, "is_cancelled": 0}, + fields=["account", "voucher_no", "against_voucher", "debit", "credit"], + order_by="account, against_voucher, debit", + ) + expected_gle = [ + { + "account": self.advance_payable_account, + "voucher_no": pe.name, + "against_voucher": pe.name, + "debit": 0.0, + "credit": amount, + }, + { + "account": self.advance_payable_account, + "voucher_no": pe.name, + "against_voucher": pe.name, + "debit": amount, + "credit": 0.0, + }, + { + "account": self.creditors, + "voucher_no": pe.name, + "against_voucher": je.name, + "debit": amount, + "credit": 0.0, + }, + { + "account": self.bank, + "voucher_no": pe.name, + "against_voucher": None, + "debit": 0.0, + "credit": amount, + }, + ] + self.assertEqual(gl_entries, expected_gle) + + pl_entries = frappe.db.get_all( + "Payment Ledger Entry", + filters={"voucher_no": pe.name}, + fields=["account", "voucher_no", "against_voucher_no", "amount"], + order_by="account, against_voucher_no, amount", + ) + expected_ple = [ + { + "account": self.advance_payable_account, + "voucher_no": pe.name, + "against_voucher_no": pe.name, + "amount": -amount, + }, + { + "account": self.advance_payable_account, + "voucher_no": pe.name, + "against_voucher_no": pe.name, + "amount": amount, + }, + { + "account": self.creditors, + "voucher_no": pe.name, + "against_voucher_no": je.name, + "amount": -amount, + }, + ] + self.assertEqual(pl_entries, expected_ple) + def make_customer(customer_name, currency=None): if not frappe.db.exists("Customer", customer_name): From cb703ff17c2add26412291b7aa4f84020eb2b92d Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Fri, 28 Jun 2024 20:38:32 +0530 Subject: [PATCH 54/73] chore: better test name (cherry picked from commit ad7efd59394aa645f72ff2aa5618a39c4b2277b2) --- .../doctype/unreconcile_payment/test_unreconcile_payment.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/unreconcile_payment/test_unreconcile_payment.py b/erpnext/accounts/doctype/unreconcile_payment/test_unreconcile_payment.py index 882dd1d6dab..43dfbfaef60 100644 --- a/erpnext/accounts/doctype/unreconcile_payment/test_unreconcile_payment.py +++ b/erpnext/accounts/doctype/unreconcile_payment/test_unreconcile_payment.py @@ -107,7 +107,7 @@ class TestUnreconcilePayment(AccountsTestMixin, FrappeTestCase): self.assertEqual(len(pe.references), 1) self.assertEqual(pe.unallocated_amount, 100) - def test_02_unreconcile_one_payment_from_multi_payments(self): + def test_02_unreconcile_one_payment_among_multi_payments(self): """ Scenario: 2 payments, both split against 2 different invoices Unreconcile only one payment from one invoice From 3c58e0af50515ee78a2de10e56cdaba41ab47ebb Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Fri, 28 Jun 2024 20:48:22 +0530 Subject: [PATCH 55/73] refactor: handle purchase invoice as reference (cherry picked from commit 9ec6aef95d99c148731404f2f6b9e323fd2b8b16) --- erpnext/accounts/doctype/payment_entry/payment_entry.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py index f5fb49f0bba..fb3500e2c58 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py @@ -1217,6 +1217,9 @@ class PaymentEntry(AccountsController): if reference.reference_doctype == "Sales Invoice": return "credit", reference.account + if reference.reference_doctype == "Purchase Invoice": + return "debit", reference.account + if reference.reference_doctype == "Payment Entry": # reference.account_type and reference.payment_type is only available for Reverse payments if reference.account_type == "Receivable" and reference.payment_type == "Pay": From a0e06a4ba5c5efc2cd69a8b561c5832dcd210761 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 14:15:13 +0530 Subject: [PATCH 56/73] fix: timeout error while submitting JV (backport #42040) (#42099) * fix: timeout error while submitting JV (#42040) (cherry picked from commit 32bdcdb08f93e580abbacf57abea4242f456cbaa) # Conflicts: # erpnext/accounts/doctype/account/account.json # erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py # erpnext/accounts/utils.py # erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json * chore: fix conflicts * chore: fix conflicts * chore: fix conflicts * chore: fix conflicts --------- Co-authored-by: rohitwaghchaure --- erpnext/accounts/doctype/account/account.json | 7 ++-- .../payment_entry/test_payment_entry.py | 2 +- .../test_payment_ledger_entry.py | 6 +++- .../sales_invoice/test_sales_invoice.py | 31 +++++++++-------- erpnext/accounts/utils.py | 33 ++++++++++++++----- .../stock_ledger_entry.json | 5 +-- erpnext/stock/utils.py | 2 -- 7 files changed, 54 insertions(+), 32 deletions(-) diff --git a/erpnext/accounts/doctype/account/account.json b/erpnext/accounts/doctype/account/account.json index 0c9232015d9..e87b59ea9cb 100644 --- a/erpnext/accounts/doctype/account/account.json +++ b/erpnext/accounts/doctype/account/account.json @@ -121,7 +121,8 @@ "label": "Account Type", "oldfieldname": "account_type", "oldfieldtype": "Select", - "options": "\nAccumulated Depreciation\nAsset Received But Not Billed\nBank\nCash\nChargeable\nCapital Work in Progress\nCost of Goods Sold\nCurrent Asset\nCurrent Liability\nDepreciation\nDirect Expense\nDirect Income\nEquity\nExpense Account\nExpenses Included In Asset Valuation\nExpenses Included In Valuation\nFixed Asset\nIncome Account\nIndirect Expense\nIndirect Income\nLiability\nPayable\nReceivable\nRound Off\nStock\nStock Adjustment\nStock Received But Not Billed\nService Received But Not Billed\nTax\nTemporary" + "options": "\nAccumulated Depreciation\nAsset Received But Not Billed\nBank\nCash\nChargeable\nCapital Work in Progress\nCost of Goods Sold\nCurrent Asset\nCurrent Liability\nDepreciation\nDirect Expense\nDirect Income\nEquity\nExpense Account\nExpenses Included In Asset Valuation\nExpenses Included In Valuation\nFixed Asset\nIncome Account\nIndirect Expense\nIndirect Income\nLiability\nPayable\nReceivable\nRound Off\nStock\nStock Adjustment\nStock Received But Not Billed\nService Received But Not Billed\nTax\nTemporary", + "search_index": 1 }, { "description": "Rate at which this tax is applied", @@ -190,7 +191,7 @@ "idx": 1, "is_tree": 1, "links": [], - "modified": "2023-07-20 18:18:44.405723", + "modified": "2024-06-27 16:23:04.444354", "modified_by": "Administrator", "module": "Accounts", "name": "Account", @@ -251,4 +252,4 @@ "sort_order": "ASC", "states": [], "track_changes": 1 -} \ No newline at end of file +} diff --git a/erpnext/accounts/doctype/payment_entry/test_payment_entry.py b/erpnext/accounts/doctype/payment_entry/test_payment_entry.py index 4631f8905e6..cc03dc260bb 100644 --- a/erpnext/accounts/doctype/payment_entry/test_payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/test_payment_entry.py @@ -82,7 +82,7 @@ class TestPaymentEntry(FrappeTestCase): expected_gle = dict( (d[0], d) - for d in [["_Test Receivable USD - _TC", 0, 5500, so.name], ["Cash - _TC", 5500.0, 0, None]] + for d in [["_Test Receivable USD - _TC", 0, 5500, so.name], [pe.paid_to, 5500.0, 0, None]] ) self.validate_gl_entries(pe.name, expected_gle) diff --git a/erpnext/accounts/doctype/payment_ledger_entry/test_payment_ledger_entry.py b/erpnext/accounts/doctype/payment_ledger_entry/test_payment_ledger_entry.py index 3eac98d7910..9a33a7ccf6d 100644 --- a/erpnext/accounts/doctype/payment_ledger_entry/test_payment_ledger_entry.py +++ b/erpnext/accounts/doctype/payment_ledger_entry/test_payment_ledger_entry.py @@ -509,7 +509,11 @@ class TestPaymentLedgerEntry(FrappeTestCase): @change_settings( "Accounts Settings", - {"unlink_payment_on_cancellation_of_invoice": 1, "delete_linked_ledger_entries": 1}, + { + "unlink_payment_on_cancellation_of_invoice": 1, + "delete_linked_ledger_entries": 1, + "unlink_advance_payment_on_cancelation_of_order": 1, + }, ) def test_advance_payment_unlink_on_order_cancellation(self): transaction_date = nowdate() diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py index 5cffe11e995..b0d62339be0 100644 --- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py @@ -2202,13 +2202,14 @@ class TestSalesInvoice(FrappeTestCase): self.assertEqual(si.total_taxes_and_charges, 228.82) self.assertEqual(si.rounding_adjustment, -0.01) - expected_values = [ - ["_Test Account Service Tax - _TC", 0.0, 114.41], - ["_Test Account VAT - _TC", 0.0, 114.41], - [si.debit_to, 1500, 0.0], - ["Round Off - _TC", 0.01, 0.01], - ["Sales - _TC", 0.0, 1271.18], - ] + round_off_account = frappe.get_cached_value("Company", "_Test Company", "round_off_account") + expected_values = { + "_Test Account Service Tax - _TC": [0.0, 114.41], + "_Test Account VAT - _TC": [0.0, 114.41], + si.debit_to: [1500, 0.0], + round_off_account: [0.01, 0.01], + "Sales - _TC": [0.0, 1271.18], + } gl_entries = frappe.db.sql( """select account, sum(debit) as debit, sum(credit) as credit @@ -2219,10 +2220,10 @@ class TestSalesInvoice(FrappeTestCase): as_dict=1, ) - for i, gle in enumerate(gl_entries): - self.assertEqual(expected_values[i][0], gle.account) - self.assertEqual(expected_values[i][1], gle.debit) - self.assertEqual(expected_values[i][2], gle.credit) + for gle in gl_entries: + expected_account_values = expected_values[gle.account] + self.assertEqual(expected_account_values[0], gle.debit) + self.assertEqual(expected_account_values[1], gle.credit) def test_rounding_adjustment_3(self): from erpnext.accounts.doctype.accounting_dimension.test_accounting_dimension import ( @@ -2270,6 +2271,7 @@ class TestSalesInvoice(FrappeTestCase): self.assertEqual(si.total_taxes_and_charges, 480.86) self.assertEqual(si.rounding_adjustment, -0.02) + round_off_account = frappe.get_cached_value("Company", "_Test Company", "round_off_account") expected_values = dict( (d[0], d) for d in [ @@ -2277,7 +2279,7 @@ class TestSalesInvoice(FrappeTestCase): ["_Test Account Service Tax - _TC", 0.0, 240.43], ["_Test Account VAT - _TC", 0.0, 240.43], ["Sales - _TC", 0.0, 4007.15], - ["Round Off - _TC", 0.02, 0.01], + [round_off_account, 0.02, 0.01], ] ) @@ -2306,8 +2308,9 @@ class TestSalesInvoice(FrappeTestCase): as_dict=1, ) - self.assertEqual(round_off_gle.cost_center, "_Test Cost Center 2 - _TC") - self.assertEqual(round_off_gle.location, "Block 1") + if round_off_gle: + self.assertEqual(round_off_gle.cost_center, "_Test Cost Center 2 - _TC") + self.assertEqual(round_off_gle.location, "Block 1") disable_dimension() diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py index 1ad24c46603..2558e976bea 100644 --- a/erpnext/accounts/utils.py +++ b/erpnext/accounts/utils.py @@ -10,7 +10,7 @@ import frappe.defaults from frappe import _, qb, throw from frappe.model.meta import get_field_precision from frappe.query_builder import AliasedQuery, Criterion, Table -from frappe.query_builder.functions import Sum +from frappe.query_builder.functions import Count, Sum from frappe.query_builder.utils import DocType from frappe.utils import ( add_days, @@ -1492,24 +1492,39 @@ def get_stock_accounts(company, voucher_type=None, voucher_no=None): ) ] - return stock_accounts + return list(set(stock_accounts)) def get_stock_and_account_balance(account=None, posting_date=None, company=None): if not posting_date: posting_date = nowdate() - warehouse_account = get_warehouse_account_map(company) - account_balance = get_balance_on( account, posting_date, in_account_currency=False, ignore_account_permission=True ) - related_warehouses = [ - wh - for wh, wh_details in warehouse_account.items() - if wh_details.account == account and not wh_details.is_group - ] + account_table = frappe.qb.DocType("Account") + query = ( + frappe.qb.from_(account_table) + .select(Count(account_table.name)) + .where( + (account_table.account_type == "Stock") + & (account_table.company == company) + & (account_table.is_group == 0) + ) + ) + + no_of_stock_accounts = cint(query.run()[0][0]) + + related_warehouses = [] + if no_of_stock_accounts > 1: + warehouse_account = get_warehouse_account_map(company) + + related_warehouses = [ + wh + for wh, wh_details in warehouse_account.items() + if wh_details.account == account and not wh_details.is_group + ] total_stock_value = get_stock_value_on(related_warehouses, posting_date) diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json index e8e82af25ac..58b6e4a74b6 100644 --- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json +++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json @@ -101,6 +101,7 @@ "oldfieldtype": "Date", "print_width": "100px", "read_only": 1, + "search_index": 1, "width": "100px" }, { @@ -360,7 +361,7 @@ "in_create": 1, "index_web_pages_for_search": 1, "links": [], - "modified": "2024-03-13 09:56:13.021696", + "modified": "2024-06-27 16:23:18.820049", "modified_by": "Administrator", "module": "Stock", "name": "Stock Ledger Entry", @@ -384,4 +385,4 @@ "sort_field": "modified", "sort_order": "DESC", "states": [] -} \ No newline at end of file +} diff --git a/erpnext/stock/utils.py b/erpnext/stock/utils.py index f2388e5737a..4c502e106ec 100644 --- a/erpnext/stock/utils.py +++ b/erpnext/stock/utils.py @@ -68,8 +68,6 @@ def get_stock_value_on( frappe.qb.from_(sle) .select(IfNull(Sum(sle.stock_value_difference), 0)) .where((sle.posting_date <= posting_date) & (sle.is_cancelled == 0)) - .orderby(CombineDatetime(sle.posting_date, sle.posting_time), order=frappe.qb.desc) - .orderby(sle.creation, order=frappe.qb.desc) ) if warehouses: From c3f5a494f32a4fff787dbd04c5d36f006bac0865 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 15:12:36 +0530 Subject: [PATCH 57/73] fix: batch reset while making SABB (backport #42076) (#42123) fix: batch reset while making SABB (#42076) (cherry picked from commit 8f424528ddf4e8ab198a1fa6b909a825c4a233d7) Co-authored-by: rohitwaghchaure --- .../test_serial_and_batch_bundle.py | 55 +++++++++++++++++++ erpnext/stock/serial_batch_bundle.py | 12 +++- 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py b/erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py index c313917bd4c..2913af4a724 100644 --- a/erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py +++ b/erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py @@ -646,6 +646,61 @@ class TestSerialandBatchBundle(FrappeTestCase): self.assertEqual(flt(stock_value_difference, 2), 353.0 * -1) + def test_pick_serial_nos_for_batch_item(self): + item_code = make_item( + "Test Pick Serial Nos for Batch Item 1", + properties={ + "is_stock_item": 1, + "has_batch_no": 1, + "create_new_batch": 1, + "batch_no_series": "PSNBI-TSNVL-.#####", + "has_serial_no": 1, + "serial_no_series": "SN-PSNBI-TSNVL-.#####", + }, + ).name + + se = make_stock_entry( + item_code=item_code, + qty=10, + target="_Test Warehouse - _TC", + rate=500, + ) + + batch1 = get_batch_from_bundle(se.items[0].serial_and_batch_bundle) + serial_nos1 = get_serial_nos_from_bundle(se.items[0].serial_and_batch_bundle) + + se = make_stock_entry( + item_code=item_code, + qty=10, + target="_Test Warehouse - _TC", + rate=500, + ) + + batch2 = get_batch_from_bundle(se.items[0].serial_and_batch_bundle) + serial_nos2 = get_serial_nos_from_bundle(se.items[0].serial_and_batch_bundle) + + se = make_stock_entry( + item_code=item_code, + qty=10, + source="_Test Warehouse - _TC", + use_serial_batch_fields=True, + batch_no=batch2, + ) + + serial_nos = get_serial_nos_from_bundle(se.items[0].serial_and_batch_bundle) + self.assertEqual(serial_nos, serial_nos2) + + se = make_stock_entry( + item_code=item_code, + qty=10, + source="_Test Warehouse - _TC", + use_serial_batch_fields=True, + batch_no=batch1, + ) + + serial_nos = get_serial_nos_from_bundle(se.items[0].serial_and_batch_bundle) + self.assertEqual(serial_nos, serial_nos1) + def get_batch_from_bundle(bundle): from erpnext.stock.serial_batch_bundle import get_batch_nos diff --git a/erpnext/stock/serial_batch_bundle.py b/erpnext/stock/serial_batch_bundle.py index 1fa5665c141..c5346d2b0a3 100644 --- a/erpnext/stock/serial_batch_bundle.py +++ b/erpnext/stock/serial_batch_bundle.py @@ -950,7 +950,17 @@ class SerialBatchCreation: if self.get("ignore_serial_nos"): kwargs["ignore_serial_nos"] = self.ignore_serial_nos - if self.has_serial_no and not self.get("serial_nos"): + if ( + self.has_serial_no + and self.has_batch_no + and not self.get("serial_nos") + and self.get("batches") + and len(self.get("batches")) == 1 + ): + # If only one batch is available and no serial no is available + kwargs["batches"] = next(iter(self.get("batches").keys())) + self.serial_nos = get_serial_nos_for_outward(kwargs) + elif self.has_serial_no and not self.get("serial_nos"): self.serial_nos = get_serial_nos_for_outward(kwargs) elif not self.has_serial_no and self.has_batch_no and not self.get("batches"): self.batches = get_available_batches(kwargs) From 97c49b93b673f5a9472d505cc981a12e5e4aa00b Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 16:53:29 +0530 Subject: [PATCH 58/73] =?UTF-8?q?fix:=20refactor=20Asset=20Repair=20and=20?= =?UTF-8?q?Stock=20Entry=20linkage=20to=20resolve=20amendme=E2=80=A6=20(ba?= =?UTF-8?q?ckport=20#41919)=20(#42058)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: refactor Asset Repair and Stock Entry linkage to resolve amendme… (#41919) * fix: refactor Asset Repair and Stock Entry linkage to resolve amendment issues * chore: added missing patch to patches.txt * chore: fixing previous changes * chore: fixing minor issues * fix: code changes to enhance efficiency * chore: replaced frappe.qb with db.sql because of conflict * fix: minor changes (cherry picked from commit ba79e68190b1d2c5b5e618c1beeffeec4061fc8f) # Conflicts: # erpnext/assets/doctype/asset_repair/asset_repair.json # erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.json # erpnext/patches.txt # erpnext/stock/doctype/stock_entry/stock_entry.json * chore: fixed conflicts * fix: removed unmerged patches * fix: use f-string instead of format call --------- Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> --- erpnext/accounts/doctype/budget/budget.py | 13 +-- erpnext/accounts/doctype/gl_entry/gl_entry.py | 4 +- .../doctype/asset_repair/asset_repair.js | 45 ++++++++-- .../doctype/asset_repair/asset_repair.json | 26 ++---- .../doctype/asset_repair/asset_repair.py | 90 +++++++++---------- .../doctype/asset_repair/test_asset_repair.py | 29 +++--- .../asset_repair_consumed_item.json | 14 ++- .../asset_repair_consumed_item.py | 3 +- erpnext/patches.txt | 2 + ...pdate_asset_repair_field_in_stock_entry.py | 15 ++++ ...d_in_asset_repair_consumed_item_doctype.py | 14 +++ .../doctype/stock_entry/stock_entry.json | 11 ++- .../stock/doctype/stock_entry/stock_entry.py | 1 + 13 files changed, 163 insertions(+), 104 deletions(-) create mode 100644 erpnext/patches/v15_0/update_asset_repair_field_in_stock_entry.py create mode 100644 erpnext/patches/v15_0/update_warehouse_field_in_asset_repair_consumed_item_doctype.py diff --git a/erpnext/accounts/doctype/budget/budget.py b/erpnext/accounts/doctype/budget/budget.py index 2c4ed7781aa..145480138d6 100644 --- a/erpnext/accounts/doctype/budget/budget.py +++ b/erpnext/accounts/doctype/budget/budget.py @@ -151,9 +151,7 @@ def validate_expense_against_budget(args, expense_amount=0): "Company", args.get("company"), "exception_budget_approver_role" ) - if not frappe.get_cached_value( - "Budget", {"fiscal_year": args.fiscal_year, "company": args.company} - ): # nosec + if not frappe.get_cached_value("Budget", {"fiscal_year": args.fiscal_year, "company": args.company}): # nosec return if not args.account: @@ -188,13 +186,8 @@ def validate_expense_against_budget(args, expense_amount=0): if frappe.get_cached_value("DocType", doctype, "is_tree"): lft, rgt = frappe.get_cached_value(doctype, args.get(budget_against), ["lft", "rgt"]) - condition = """and exists(select name from `tab%s` - where lft<=%s and rgt>=%s and name=b.%s)""" % ( - doctype, - lft, - rgt, - budget_against, - ) # nosec + condition = f"""and exists(select name from `tab{doctype}` + where lft<={lft} and rgt>={rgt} and name=b.{budget_against})""" # nosec args.is_tree = True else: condition = f"and b.{budget_against}={frappe.db.escape(args.get(budget_against))}" diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.py b/erpnext/accounts/doctype/gl_entry/gl_entry.py index facfbf51e00..75e1b993141 100644 --- a/erpnext/accounts/doctype/gl_entry/gl_entry.py +++ b/erpnext/accounts/doctype/gl_entry/gl_entry.py @@ -329,9 +329,7 @@ def update_outstanding_amt( if against_voucher_type == "Sales Invoice": party_account = frappe.get_cached_value(against_voucher_type, against_voucher, "debit_to") - account_condition = "and account in ({0}, {1})".format( - frappe.db.escape(account), frappe.db.escape(party_account) - ) + account_condition = f"and account in ({frappe.db.escape(account)}, {frappe.db.escape(party_account)})" else: account_condition = f" and account = {frappe.db.escape(account)}" diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.js b/erpnext/assets/doctype/asset_repair/asset_repair.js index 27a4eb6e995..489fbaca6b2 100644 --- a/erpnext/assets/doctype/asset_repair/asset_repair.js +++ b/erpnext/assets/doctype/asset_repair/asset_repair.js @@ -20,14 +20,14 @@ frappe.ui.form.on("Asset Repair", { }; }; - frm.fields_dict.warehouse.get_query = function (doc) { + frm.set_query("warehouse", "stock_items", function () { return { filters: { is_group: 0, - company: doc.company, + company: frm.doc.company, }, }; - }; + }); frm.set_query("serial_and_batch_bundle", "stock_items", (doc, cdt, cdn) => { let row = locals[cdt][cdn]; @@ -79,7 +79,7 @@ frappe.ui.form.on("Asset Repair", { }); } - if (frm.doc.repair_status == "Completed") { + if (frm.doc.repair_status == "Completed" && !frm.doc.completion_date) { frm.set_value("completion_date", frappe.datetime.now_datetime()); } }, @@ -87,15 +87,48 @@ frappe.ui.form.on("Asset Repair", { stock_items_on_form_rendered() { erpnext.setup_serial_or_batch_no(); }, + + stock_consumption: function (frm) { + if (!frm.doc.stock_consumption) { + frm.clear_table("stock_items"); + frm.refresh_field("stock_items"); + } + }, + + purchase_invoice: function (frm) { + if (frm.doc.purchase_invoice) { + frappe.call({ + method: "frappe.client.get_value", + args: { + doctype: "Purchase Invoice", + fieldname: "base_net_total", + filters: { name: frm.doc.purchase_invoice }, + }, + callback: function (r) { + if (r.message) { + frm.set_value("repair_cost", r.message.base_net_total); + } + }, + }); + } else { + frm.set_value("repair_cost", 0); + } + }, }); frappe.ui.form.on("Asset Repair Consumed Item", { - item_code: function (frm, cdt, cdn) { + warehouse: function (frm, cdt, cdn) { var item = locals[cdt][cdn]; + if (!item.item_code) { + frappe.msgprint(__("Please select an item code before setting the warehouse.")); + frappe.model.set_value(cdt, cdn, "warehouse", ""); + return; + } + let item_args = { item_code: item.item_code, - warehouse: frm.doc.warehouse, + warehouse: item.warehouse, qty: item.consumed_quantity, serial_no: item.serial_no, company: frm.doc.company, diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.json b/erpnext/assets/doctype/asset_repair/asset_repair.json index accb5bf54b5..c98f5a8d7f4 100644 --- a/erpnext/assets/doctype/asset_repair/asset_repair.json +++ b/erpnext/assets/doctype/asset_repair/asset_repair.json @@ -22,16 +22,14 @@ "column_break_14", "project", "accounting_details", - "repair_cost", + "purchase_invoice", "capitalize_repair_cost", "stock_consumption", "column_break_8", - "purchase_invoice", + "repair_cost", "stock_consumption_details_section", - "warehouse", "stock_items", "total_repair_cost", - "stock_entry", "asset_depreciation_details_section", "increase_in_asset_life", "section_break_9", @@ -122,7 +120,8 @@ "default": "0", "fieldname": "repair_cost", "fieldtype": "Currency", - "label": "Repair Cost" + "label": "Repair Cost", + "read_only": 1 }, { "fieldname": "amended_from", @@ -218,13 +217,6 @@ "label": "Total Repair Cost", "read_only": 1 }, - { - "depends_on": "stock_consumption", - "fieldname": "warehouse", - "fieldtype": "Link", - "label": "Warehouse", - "options": "Warehouse" - }, { "depends_on": "capitalize_repair_cost", "fieldname": "asset_depreciation_details_section", @@ -251,20 +243,12 @@ "fieldtype": "Link", "label": "Company", "options": "Company" - }, - { - "fieldname": "stock_entry", - "fieldtype": "Link", - "label": "Stock Entry", - "no_copy": 1, - "options": "Stock Entry", - "read_only": 1 } ], "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2022-08-16 15:55:25.023471", + "modified": "2024-06-13 16:14:14.398356", "modified_by": "Administrator", "module": "Assets", "name": "Asset Repair", diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.py b/erpnext/assets/doctype/asset_repair/asset_repair.py index ccde836fe0d..903e68e32e0 100644 --- a/erpnext/assets/doctype/asset_repair/asset_repair.py +++ b/erpnext/assets/doctype/asset_repair/asset_repair.py @@ -47,20 +47,25 @@ class AssetRepair(AccountsController): repair_cost: DF.Currency repair_status: DF.Literal["Pending", "Completed", "Cancelled"] stock_consumption: DF.Check - stock_entry: DF.Link | None stock_items: DF.Table[AssetRepairConsumedItem] total_repair_cost: DF.Currency - warehouse: DF.Link | None # end: auto-generated types def validate(self): self.asset_doc = frappe.get_doc("Asset", self.asset) + self.validate_dates() self.update_status() if self.get("stock_items"): self.set_stock_items_cost() self.calculate_total_repair_cost() + def validate_dates(self): + if self.completion_date and (self.failure_date > self.completion_date): + frappe.throw( + _("Completion Date can not be before Failure Date. Please adjust the dates accordingly.") + ) + def update_status(self): if self.repair_status == "Pending" and self.asset_doc.status != "Out of Order": frappe.db.set_value("Asset", self.asset, "status", "Out of Order") @@ -105,22 +110,22 @@ class AssetRepair(AccountsController): if self.asset_doc.calculate_depreciation and self.increase_in_asset_life: self.modify_depreciation_schedule() - notes = _( - "This schedule was created when Asset {0} was repaired through Asset Repair {1}." - ).format( - get_link_to_form(self.asset_doc.doctype, self.asset_doc.name), - get_link_to_form(self.doctype, self.name), - ) - self.asset_doc.flags.ignore_validate_update_after_submit = True - make_new_active_asset_depr_schedules_and_cancel_current_ones(self.asset_doc, notes) - self.asset_doc.save() + notes = _( + "This schedule was created when Asset {0} was repaired through Asset Repair {1}." + ).format( + get_link_to_form(self.asset_doc.doctype, self.asset_doc.name), + get_link_to_form(self.doctype, self.name), + ) + self.asset_doc.flags.ignore_validate_update_after_submit = True + make_new_active_asset_depr_schedules_and_cancel_current_ones(self.asset_doc, notes) + self.asset_doc.save() - add_asset_activity( - self.asset, - _("Asset updated after completion of Asset Repair {0}").format( - get_link_to_form("Asset Repair", self.name) - ), - ) + add_asset_activity( + self.asset, + _("Asset updated after completion of Asset Repair {0}").format( + get_link_to_form("Asset Repair", self.name) + ), + ) def before_cancel(self): self.asset_doc = frappe.get_doc("Asset", self.asset) @@ -136,29 +141,28 @@ class AssetRepair(AccountsController): self.asset_doc.total_asset_cost -= self.repair_cost self.asset_doc.additional_asset_cost -= self.repair_cost - if self.get("stock_consumption"): - self.increase_stock_quantity() if self.get("capitalize_repair_cost"): self.ignore_linked_doctypes = ("GL Entry", "Stock Ledger Entry") self.make_gl_entries(cancel=True) - self.db_set("stock_entry", None) if self.asset_doc.calculate_depreciation and self.increase_in_asset_life: self.revert_depreciation_schedule_on_cancellation() - notes = _("This schedule was created when Asset {0}'s Asset Repair {1} was cancelled.").format( - get_link_to_form(self.asset_doc.doctype, self.asset_doc.name), - get_link_to_form(self.doctype, self.name), - ) - self.asset_doc.flags.ignore_validate_update_after_submit = True - make_new_active_asset_depr_schedules_and_cancel_current_ones(self.asset_doc, notes) - self.asset_doc.save() + notes = _( + "This schedule was created when Asset {0}'s Asset Repair {1} was cancelled." + ).format( + get_link_to_form(self.asset_doc.doctype, self.asset_doc.name), + get_link_to_form(self.doctype, self.name), + ) + self.asset_doc.flags.ignore_validate_update_after_submit = True + make_new_active_asset_depr_schedules_and_cancel_current_ones(self.asset_doc, notes) + self.asset_doc.save() - add_asset_activity( - self.asset, - _("Asset updated after cancellation of Asset Repair {0}").format( - get_link_to_form("Asset Repair", self.name) - ), - ) + add_asset_activity( + self.asset, + _("Asset updated after cancellation of Asset Repair {0}").format( + get_link_to_form("Asset Repair", self.name) + ), + ) def after_delete(self): frappe.get_doc("Asset", self.asset).set_status() @@ -170,11 +174,6 @@ class AssetRepair(AccountsController): def check_for_stock_items_and_warehouse(self): if not self.get("stock_items"): frappe.throw(_("Please enter Stock Items consumed during the Repair."), title=_("Missing Items")) - if not self.warehouse: - frappe.throw( - _("Please enter Warehouse from which Stock Items consumed during the Repair were taken."), - title=_("Missing Warehouse"), - ) def increase_asset_value(self): total_value_of_stock_consumed = self.get_total_value_of_stock_consumed() @@ -208,6 +207,7 @@ class AssetRepair(AccountsController): stock_entry = frappe.get_doc( {"doctype": "Stock Entry", "stock_entry_type": "Material Issue", "company": self.company} ) + stock_entry.asset_repair = self.name for stock_item in self.get("stock_items"): self.validate_serial_no(stock_item) @@ -215,7 +215,7 @@ class AssetRepair(AccountsController): stock_entry.append( "items", { - "s_warehouse": self.warehouse, + "s_warehouse": stock_item.warehouse, "item_code": stock_item.item_code, "qty": stock_item.consumed_quantity, "basic_rate": stock_item.valuation_rate, @@ -228,8 +228,6 @@ class AssetRepair(AccountsController): stock_entry.insert() stock_entry.submit() - self.db_set("stock_entry", stock_entry.name) - def validate_serial_no(self, stock_item): if not stock_item.serial_and_batch_bundle and frappe.get_cached_value( "Item", stock_item.item_code, "has_serial_no" @@ -247,12 +245,6 @@ class AssetRepair(AccountsController): "Serial and Batch Bundle", stock_item.serial_and_batch_bundle, values_to_update ) - def increase_stock_quantity(self): - if self.stock_entry: - stock_entry = frappe.get_doc("Stock Entry", self.stock_entry) - stock_entry.flags.ignore_links = True - stock_entry.cancel() - def make_gl_entries(self, cancel=False): if flt(self.total_repair_cost) > 0: gl_entries = self.get_gl_entries() @@ -316,7 +308,7 @@ class AssetRepair(AccountsController): return # creating GL Entries for each row in Stock Items based on the Stock Entry created for it - stock_entry = frappe.get_doc("Stock Entry", self.stock_entry) + stock_entry = frappe.get_doc("Stock Entry", {"asset_repair": self.name}) default_expense_account = None if not erpnext.is_perpetual_inventory_enabled(self.company): @@ -357,7 +349,7 @@ class AssetRepair(AccountsController): "cost_center": self.cost_center, "posting_date": getdate(), "against_voucher_type": "Stock Entry", - "against_voucher": self.stock_entry, + "against_voucher": stock_entry.name, "company": self.company, }, item=self, diff --git a/erpnext/assets/doctype/asset_repair/test_asset_repair.py b/erpnext/assets/doctype/asset_repair/test_asset_repair.py index 278da1b08bf..44d08869a63 100644 --- a/erpnext/assets/doctype/asset_repair/test_asset_repair.py +++ b/erpnext/assets/doctype/asset_repair/test_asset_repair.py @@ -76,14 +76,14 @@ class TestAssetRepair(unittest.TestCase): def test_warehouse(self): asset_repair = create_asset_repair(stock_consumption=1) self.assertTrue(asset_repair.stock_consumption) - self.assertTrue(asset_repair.warehouse) + self.assertTrue(asset_repair.stock_items[0].warehouse) def test_decrease_stock_quantity(self): asset_repair = create_asset_repair(stock_consumption=1, submit=1) stock_entry = frappe.get_last_doc("Stock Entry") self.assertEqual(stock_entry.stock_entry_type, "Material Issue") - self.assertEqual(stock_entry.items[0].s_warehouse, asset_repair.warehouse) + self.assertEqual(stock_entry.items[0].s_warehouse, asset_repair.stock_items[0].warehouse) self.assertEqual(stock_entry.items[0].item_code, asset_repair.stock_items[0].item_code) self.assertEqual(stock_entry.items[0].qty, asset_repair.stock_items[0].consumed_quantity) @@ -114,14 +114,14 @@ class TestAssetRepair(unittest.TestCase): asset_repair.repair_status = "Completed" self.assertRaises(frappe.ValidationError, asset_repair.submit) - def test_increase_in_asset_value_due_to_stock_consumption(self): + def test_no_increase_in_asset_value_when_not_capitalized(self): asset = create_asset(calculate_depreciation=1, submit=1) initial_asset_value = get_asset_value_after_depreciation(asset.name) - asset_repair = create_asset_repair(asset=asset, stock_consumption=1, submit=1) + create_asset_repair(asset=asset, stock_consumption=1, submit=1) asset.reload() increase_in_asset_value = get_asset_value_after_depreciation(asset.name) - initial_asset_value - self.assertEqual(asset_repair.stock_items[0].total_value, increase_in_asset_value) + self.assertEqual(increase_in_asset_value, 0) def test_increase_in_asset_value_due_to_repair_cost_capitalisation(self): asset = create_asset(calculate_depreciation=1, submit=1) @@ -185,7 +185,7 @@ class TestAssetRepair(unittest.TestCase): frappe.get_doc("Purchase Invoice", asset_repair.purchase_invoice).items[0].expense_account ) stock_entry_expense_account = ( - frappe.get_doc("Stock Entry", asset_repair.stock_entry).get("items")[0].expense_account + frappe.get_doc("Stock Entry", {"asset_repair": asset_repair.name}).get("items")[0].expense_account ) expected_values = { @@ -260,6 +260,12 @@ class TestAssetRepair(unittest.TestCase): asset.finance_books[0].value_after_depreciation, ) + def test_asset_repiar_link_in_stock_entry(self): + asset = create_asset(calculate_depreciation=1, submit=1) + asset_repair = create_asset_repair(asset=asset, stock_consumption=1, submit=1) + stock_entry = frappe.get_last_doc("Stock Entry") + self.assertEqual(stock_entry.asset_repair, asset_repair.name) + def num_of_depreciations(asset): return asset.finance_books[0].total_number_of_depreciations @@ -289,7 +295,7 @@ def create_asset_repair(**args): if args.stock_consumption: asset_repair.stock_consumption = 1 - asset_repair.warehouse = args.warehouse or create_warehouse("Test Warehouse", company=asset.company) + warehouse = args.warehouse or create_warehouse("Test Warehouse", company=asset.company) bundle = None if args.serial_no: @@ -297,8 +303,8 @@ def create_asset_repair(**args): frappe._dict( { "item_code": args.item_code, - "warehouse": asset_repair.warehouse, - "company": frappe.get_cached_value("Warehouse", asset_repair.warehouse, "company"), + "warehouse": warehouse, + "company": frappe.get_cached_value("Warehouse", warehouse, "company"), "qty": (flt(args.stock_qty) or 1) * -1, "voucher_type": "Asset Repair", "type_of_transaction": "Asset Repair", @@ -314,6 +320,7 @@ def create_asset_repair(**args): "stock_items", { "item_code": args.item_code or "_Test Stock Item", + "warehouse": warehouse, "valuation_rate": args.rate if args.get("rate") is not None else 100, "consumed_quantity": args.qty or 1, "serial_and_batch_bundle": bundle, @@ -333,7 +340,7 @@ def create_asset_repair(**args): stock_entry.append( "items", { - "t_warehouse": asset_repair.warehouse, + "t_warehouse": asset_repair.stock_items[0].warehouse, "item_code": asset_repair.stock_items[0].item_code, "qty": asset_repair.stock_items[0].consumed_quantity, "basic_rate": args.rate if args.get("rate") is not None else 100, @@ -351,7 +358,7 @@ def create_asset_repair(**args): company=asset.company, expense_account=frappe.db.get_value("Company", asset.company, "default_expense_account"), cost_center=asset_repair.cost_center, - warehouse=asset_repair.warehouse, + warehouse=args.warehouse or create_warehouse("Test Warehouse", company=asset.company), ) asset_repair.purchase_invoice = pi.name diff --git a/erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.json b/erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.json index 6910c2eebf6..c4c13ce413b 100644 --- a/erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.json +++ b/erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.json @@ -6,6 +6,7 @@ "engine": "InnoDB", "field_order": [ "item_code", + "warehouse", "valuation_rate", "consumed_quantity", "total_value", @@ -44,19 +45,28 @@ "fieldtype": "Link", "in_list_view": 1, "label": "Item", - "options": "Item" + "options": "Item", + "reqd": 1 }, { "fieldname": "serial_and_batch_bundle", "fieldtype": "Link", "label": "Serial and Batch Bundle", "options": "Serial and Batch Bundle" + }, + { + "fieldname": "warehouse", + "fieldtype": "Link", + "in_list_view": 1, + "label": "Warehouse", + "options": "Warehouse", + "reqd": 1 } ], "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2023-04-06 02:24:20.375870", + "modified": "2024-06-13 12:01:47.147333", "modified_by": "Administrator", "module": "Assets", "name": "Asset Repair Consumed Item", diff --git a/erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.py b/erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.py index ab43cfe62aa..4d41397a0b1 100644 --- a/erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.py +++ b/erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.py @@ -15,7 +15,7 @@ class AssetRepairConsumedItem(Document): from frappe.types import DF consumed_quantity: DF.Data | None - item_code: DF.Link | None + item_code: DF.Link parent: DF.Data parentfield: DF.Data parenttype: DF.Data @@ -23,6 +23,7 @@ class AssetRepairConsumedItem(Document): serial_no: DF.SmallText | None total_value: DF.Currency valuation_rate: DF.Currency + warehouse: DF.Link # end: auto-generated types pass diff --git a/erpnext/patches.txt b/erpnext/patches.txt index dba491a728d..66e98dde5b4 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -366,4 +366,6 @@ erpnext.patches.v15_0.remove_cancelled_asset_capitalization_from_asset erpnext.patches.v15_0.rename_purchase_receipt_amount_to_purchase_amount erpnext.patches.v14_0.enable_set_priority_for_pricing_rules #1 erpnext.patches.v15_0.rename_number_of_depreciations_booked_to_opening_booked_depreciations +erpnext.patches.v15_0.update_warehouse_field_in_asset_repair_consumed_item_doctype +erpnext.patches.v15_0.update_asset_repair_field_in_stock_entry erpnext.patches.v15_0.update_total_number_of_booked_depreciations diff --git a/erpnext/patches/v15_0/update_asset_repair_field_in_stock_entry.py b/erpnext/patches/v15_0/update_asset_repair_field_in_stock_entry.py new file mode 100644 index 00000000000..cc0668d9caa --- /dev/null +++ b/erpnext/patches/v15_0/update_asset_repair_field_in_stock_entry.py @@ -0,0 +1,15 @@ +import frappe +from frappe.query_builder import DocType + + +def execute(): + if frappe.db.has_column("Asset Repair", "stock_entry"): + AssetRepair = DocType("Asset Repair") + StockEntry = DocType("Stock Entry") + + ( + frappe.qb.update(StockEntry) + .join(AssetRepair) + .on(StockEntry.name == AssetRepair.stock_entry) + .set(StockEntry.asset_repair, AssetRepair.name) + ).run() diff --git a/erpnext/patches/v15_0/update_warehouse_field_in_asset_repair_consumed_item_doctype.py b/erpnext/patches/v15_0/update_warehouse_field_in_asset_repair_consumed_item_doctype.py new file mode 100644 index 00000000000..e0291826930 --- /dev/null +++ b/erpnext/patches/v15_0/update_warehouse_field_in_asset_repair_consumed_item_doctype.py @@ -0,0 +1,14 @@ +import frappe + + +# not able to use frappe.qb because of this bug https://github.com/frappe/frappe/issues/20292 +def execute(): + if frappe.db.has_column("Asset Repair", "warehouse"): + # nosemgrep + frappe.db.sql( + """UPDATE `tabAsset Repair Consumed Item` ar_item + JOIN `tabAsset Repair` ar + ON ar.name = ar_item.parent + SET ar_item.warehouse = ar.warehouse + WHERE ifnull(ar.warehouse, '') != ''""" + ) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json index d45296f1310..a090b37033b 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.json +++ b/erpnext/stock/doctype/stock_entry/stock_entry.json @@ -20,6 +20,7 @@ "sales_invoice_no", "pick_list", "purchase_receipt_no", + "asset_repair", "col2", "company", "posting_date", @@ -674,6 +675,14 @@ { "fieldname": "column_break_eaoa", "fieldtype": "Column Break" + }, + { + "depends_on": "eval:doc.asset_repair", + "fieldname": "asset_repair", + "fieldtype": "Link", + "label": "Asset Repair", + "options": "Asset Repair", + "read_only": 1 } ], "icon": "fa fa-file-text", @@ -681,7 +690,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2024-01-12 11:56:58.644882", + "modified": "2024-06-26 19:12:17.937088", "modified_by": "Administrator", "module": "Stock", "name": "Stock Entry", diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 005ad287d78..f08ae6c286c 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -98,6 +98,7 @@ class StockEntry(StockController): address_display: DF.SmallText | None amended_from: DF.Link | None apply_putaway_rule: DF.Check + asset_repair: DF.Link | None bom_no: DF.Link | None company: DF.Link credit_note: DF.Link | None From 58e18e2b1fa7d8e9e6fb43282be777af711ac865 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 16:54:14 +0530 Subject: [PATCH 59/73] fix: resolve gl entries duplication in asset purchase workflow (backport #41845) (#42120) * fix: resolve gl entries duplication in asset purchase workflow (#41845) * fix: resolve gl entries duplication in asset purchase workflow * fix: prevent duplicate entry when creating purchase receipt from purchase invoice * chore: test case added * fix: fixed missing asset category issue (cherry picked from commit 55a4bd469b17f8c8abe5e77d7c7f5413cc09c5bc) * fix: use f-string instead of format call --------- Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> --- .../purchase_invoice/purchase_invoice.py | 15 +++++ .../purchase_invoice/test_purchase_invoice.py | 56 ++++++++++++++++++- .../purchase_receipt/purchase_receipt.py | 2 +- 3 files changed, 71 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py index e519f069aa4..2938b2a5309 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -549,6 +549,21 @@ class PurchaseInvoice(BuyingController): item.expense_account = stock_not_billed_account elif item.is_fixed_asset: account = None + if not item.pr_detail and item.po_detail: + receipt_item = frappe.get_cached_value( + "Purchase Receipt Item", + { + "purchase_order": item.purchase_order, + "purchase_order_item": item.po_detail, + "docstatus": 1, + }, + ["name", "parent"], + as_dict=1, + ) + if receipt_item: + item.pr_detail = receipt_item.name + item.purchase_receipt = receipt_item.parent + if item.pr_detail: if not self.asset_received_but_not_billed: self.asset_received_but_not_billed = self.get_company_default( diff --git a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py index 3c3b081fa2f..4980c22fac1 100644 --- a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py @@ -10,7 +10,11 @@ import erpnext from erpnext.accounts.doctype.account.test_account import create_account, get_inventory_account from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry from erpnext.buying.doctype.purchase_order.purchase_order import get_mapped_purchase_invoice -from erpnext.buying.doctype.purchase_order.test_purchase_order import create_purchase_order +from erpnext.buying.doctype.purchase_order.purchase_order import make_purchase_invoice as make_pi_from_po +from erpnext.buying.doctype.purchase_order.test_purchase_order import ( + create_pr_against_po, + create_purchase_order, +) from erpnext.buying.doctype.supplier.test_supplier import create_supplier from erpnext.controllers.accounts_controller import get_payment_terms from erpnext.controllers.buying_controller import QtyMismatchError @@ -2185,6 +2189,56 @@ class TestPurchaseInvoice(FrappeTestCase, StockTestMixin): self.assertEqual(row.serial_no, "\n".join(serial_nos[:2])) self.assertEqual(row.rejected_serial_no, serial_nos[2]) + def test_make_pr_and_pi_from_po(self): + from erpnext.assets.doctype.asset.test_asset import create_asset_category + + if not frappe.db.exists("Asset Category", "Computers"): + create_asset_category() + + item = create_item( + item_code="_Test_Item", is_stock_item=0, is_fixed_asset=1, asset_category="Computers" + ) + po = create_purchase_order(item_code=item.item_code) + pr = create_pr_against_po(po.name, 10) + pi = make_pi_from_po(po.name) + pi.insert() + pi.submit() + + pr_gl_entries = frappe.db.sql( + """select account, debit, credit + from `tabGL Entry` where voucher_type='Purchase Receipt' and voucher_no=%s + order by account asc""", + pr.name, + as_dict=1, + ) + + pr_expected_values = [ + ["Asset Received But Not Billed - _TC", 0, 5000], + ["CWIP Account - _TC", 5000, 0], + ] + + for i, gle in enumerate(pr_gl_entries): + self.assertEqual(pr_expected_values[i][0], gle.account) + self.assertEqual(pr_expected_values[i][1], gle.debit) + self.assertEqual(pr_expected_values[i][2], gle.credit) + + pi_gl_entries = frappe.db.sql( + """select account, debit, credit + from `tabGL Entry` where voucher_type='Purchase Invoice' and voucher_no=%s + order by account asc""", + pi.name, + as_dict=1, + ) + pi_expected_values = [ + ["Asset Received But Not Billed - _TC", 5000, 0], + ["Creditors - _TC", 0, 5000], + ] + + for i, gle in enumerate(pi_gl_entries): + self.assertEqual(pi_expected_values[i][0], gle.account) + self.assertEqual(pi_expected_values[i][1], gle.debit) + self.assertEqual(pi_expected_values[i][2], gle.credit) + def set_advance_flag(company, flag, default_account): frappe.db.set_value( diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py index 6a00fed5588..3136cdffeff 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py @@ -661,7 +661,7 @@ class PurchaseReceipt(BuyingController): if not ( (erpnext.is_perpetual_inventory_enabled(self.company) and d.item_code in stock_items) - or d.is_fixed_asset + or (d.is_fixed_asset and not d.purchase_invoice) ): continue From 317cc0358c0e3cb07da0d72657dddeb9ef7ee546 Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Mon, 1 Jul 2024 16:55:49 +0530 Subject: [PATCH 60/73] fix: add auto-update for overdue status (#42105) * fix: auto-update for overdue status * chore: use qb.update (cherry picked from commit c5e474f4f52019d431da6b3ed6b3ad4368a0f3f1) --- .../doctype/asset_maintenance/asset_maintenance.py | 9 ++++++--- .../asset_maintenance_log/asset_maintenance_log.py | 14 +++++++++++++- erpnext/hooks.py | 1 + 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py b/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py index 570c9751a57..b44164f2dae 100644 --- a/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +++ b/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py @@ -18,9 +18,7 @@ class AssetMaintenance(Document): if TYPE_CHECKING: from frappe.types import DF - from erpnext.assets.doctype.asset_maintenance_task.asset_maintenance_task import ( - AssetMaintenanceTask, - ) + from erpnext.assets.doctype.asset_maintenance_task.asset_maintenance_task import AssetMaintenanceTask asset_category: DF.ReadOnly | None asset_maintenance_tasks: DF.Table[AssetMaintenanceTask] @@ -47,6 +45,11 @@ class AssetMaintenance(Document): assign_tasks(self.name, task.assign_to, task.maintenance_task, task.next_due_date) self.sync_maintenance_tasks() + def after_delete(self): + asset = frappe.get_doc("Asset", self.asset_name) + if asset.status == "In Maintenance": + asset.set_status() + def sync_maintenance_tasks(self): tasks_names = [] for task in self.get("asset_maintenance_tasks"): diff --git a/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py b/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py index 009bcc3e69a..95d02714c5b 100644 --- a/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +++ b/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py @@ -5,7 +5,8 @@ import frappe from frappe import _ from frappe.model.document import Document -from frappe.utils import getdate, nowdate +from frappe.query_builder import DocType +from frappe.utils import getdate, nowdate, today from erpnext.assets.doctype.asset_maintenance.asset_maintenance import calculate_next_due_date @@ -75,6 +76,17 @@ class AssetMaintenanceLog(Document): asset_maintenance_doc.save() +def update_asset_maintenance_log_status(): + AssetMaintenanceLog = DocType("Asset Maintenance Log") + ( + frappe.qb.update(AssetMaintenanceLog) + .set(AssetMaintenanceLog.maintenance_status, "Overdue") + .where( + (AssetMaintenanceLog.maintenance_status == "Planned") & (AssetMaintenanceLog.due_date < today()) + ) + ).run() + + @frappe.whitelist() @frappe.validate_and_sanitize_search_inputs def get_maintenance_tasks(doctype, txt, searchfield, start, page_len, filters): diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 64cbc297d20..a080af9a827 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -442,6 +442,7 @@ scheduler_events = { "erpnext.accounts.doctype.process_statement_of_accounts.process_statement_of_accounts.send_auto_email", "erpnext.accounts.utils.auto_create_exchange_rate_revaluation_daily", "erpnext.accounts.utils.run_ledger_health_checks", + "erpnext.assets.doctype.asset.asset_maintenance_log.update_asset_maintenance_log_status", ], "weekly": [ "erpnext.accounts.utils.auto_create_exchange_rate_revaluation_weekly", From 7fcb0f578ae7456c71313f1240d3a6e855d8f86e Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 1 Jul 2024 15:49:48 +0530 Subject: [PATCH 61/73] fix: Re-open allows SO's to be over credit limit (cherry picked from commit 5eed78126374843d90328198cf5919dad8358018) --- erpnext/selling/doctype/sales_order/sales_order.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index af67f07a360..a00b08ab097 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -496,6 +496,10 @@ class SalesOrder(SellingController): def update_status(self, status): self.check_modified_date() self.set_status(update=True, status=status) + # Upon Sales Order Re-open, check for credit limit. + # Limit should be checked after the 'Hold/Closed' status is reset. + if status == "Draft" and self.docstatus == 1: + self.check_credit_limit() self.update_reserved_qty() self.notify_update() clear_doctype_notifications(self) From b63eab8cbb41a3261080af844e9aa289fc067209 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 1 Jul 2024 16:43:16 +0530 Subject: [PATCH 62/73] test: credit check on Sales Order re-open (cherry picked from commit 60694e09c4feefefb98f52e542a9193c9ec2f0d0) # Conflicts: # erpnext/selling/doctype/sales_order/test_sales_order.py --- .../doctype/sales_order/test_sales_order.py | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index bd51543b36e..c57af93b953 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -9,7 +9,12 @@ from frappe.core.doctype.user_permission.test_user_permission import create_user from frappe.tests.utils import FrappeTestCase, change_settings from frappe.utils import add_days, flt, getdate, nowdate, today +<<<<<<< HEAD from erpnext.controllers.accounts_controller import update_child_qty_rate +======= +from erpnext.accounts.test.accounts_mixin import AccountsTestMixin +from erpnext.controllers.accounts_controller import InvalidQtyError, update_child_qty_rate +>>>>>>> 60694e09c4 (test: credit check on Sales Order re-open) from erpnext.maintenance.doctype.maintenance_schedule.test_maintenance_schedule import ( make_maintenance_schedule, ) @@ -31,7 +36,7 @@ from erpnext.stock.doctype.item.test_item import make_item from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry -class TestSalesOrder(FrappeTestCase): +class TestSalesOrder(AccountsTestMixin, FrappeTestCase): @classmethod def setUpClass(cls): super().setUpClass() @@ -49,6 +54,9 @@ class TestSalesOrder(FrappeTestCase): ) super().tearDownClass() + def setUp(self): + self.create_customer("_Test Customer Credit") + def tearDown(self): frappe.set_user("Administrator") @@ -2086,6 +2094,28 @@ class TestSalesOrder(FrappeTestCase): frappe.db.set_single_value("Stock Settings", "update_existing_price_list_rate", 0) frappe.db.set_single_value("Stock Settings", "auto_insert_price_list_rate_if_missing", 0) + def test_credit_limit_on_so_reopning(self): + # set credit limit + company = "_Test Company" + customer = frappe.get_doc("Customer", self.customer) + customer.credit_limits = [] + customer.append( + "credit_limits", {"company": company, "credit_limit": 1000, "bypass_credit_limit_check": False} + ) + customer.save() + + so1 = make_sales_order(qty=9, rate=100, do_not_submit=True) + so1.customer = self.customer + so1.save().submit() + + so1.update_status("Closed") + + so2 = make_sales_order(qty=9, rate=100, do_not_submit=True) + so2.customer = self.customer + so2.save().submit() + + self.assertRaises(frappe.ValidationError, so1.update_status, "Draft") + def automatically_fetch_payment_terms(enable=1): accounts_settings = frappe.get_doc("Accounts Settings") From bff99d89b9922ce2676bb369cb00db286c6897ce Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 1 Jul 2024 17:05:22 +0530 Subject: [PATCH 63/73] chore: resolve conflict --- erpnext/selling/doctype/sales_order/test_sales_order.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index c57af93b953..53c629a90b4 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -9,12 +9,8 @@ from frappe.core.doctype.user_permission.test_user_permission import create_user from frappe.tests.utils import FrappeTestCase, change_settings from frappe.utils import add_days, flt, getdate, nowdate, today -<<<<<<< HEAD -from erpnext.controllers.accounts_controller import update_child_qty_rate -======= from erpnext.accounts.test.accounts_mixin import AccountsTestMixin -from erpnext.controllers.accounts_controller import InvalidQtyError, update_child_qty_rate ->>>>>>> 60694e09c4 (test: credit check on Sales Order re-open) +from erpnext.controllers.accounts_controller import update_child_qty_rate from erpnext.maintenance.doctype.maintenance_schedule.test_maintenance_schedule import ( make_maintenance_schedule, ) From 3b4d39766f78492bd2ba92dc6c6c5b91263d3e6d Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 18:18:58 +0530 Subject: [PATCH 64/73] fix: this.frm.events.update_cost is not a function (backport #41960) (#41965) * fix: this.frm.events.update_cost is not a function (#41960) (cherry picked from commit d5ed4582c360784863caa223ac74b1bed769032a) # Conflicts: # erpnext/manufacturing/doctype/workstation/workstation.json # erpnext/manufacturing/doctype/workstation/workstation.py * chore: fix conflicts * chore: fix conflicts --------- Co-authored-by: rohitwaghchaure --- .../doctype/bom_creator/bom_creator.js | 1 - .../doctype/workstation/workstation.json | 16 ++-------------- .../doctype/workstation/workstation.py | 3 +++ 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/erpnext/manufacturing/doctype/bom_creator/bom_creator.js b/erpnext/manufacturing/doctype/bom_creator/bom_creator.js index 32231aa4949..34d0fc7131b 100644 --- a/erpnext/manufacturing/doctype/bom_creator/bom_creator.js +++ b/erpnext/manufacturing/doctype/bom_creator/bom_creator.js @@ -212,7 +212,6 @@ erpnext.bom.BomConfigurator = class BomConfigurator extends erpnext.TransactionC item.stock_qty = flt(item.qty * item.conversion_factor, precision("stock_qty", item)); refresh_field("stock_qty", item.name, item.parentfield); this.toggle_conversion_factor(item); - this.frm.events.update_cost(this.frm); } } }; diff --git a/erpnext/manufacturing/doctype/workstation/workstation.json b/erpnext/manufacturing/doctype/workstation/workstation.json index 5912714052b..4758e5d3588 100644 --- a/erpnext/manufacturing/doctype/workstation/workstation.json +++ b/erpnext/manufacturing/doctype/workstation/workstation.json @@ -17,8 +17,6 @@ "column_break_3", "production_capacity", "warehouse", - "production_capacity_section", - "parts_per_hour", "workstation_status_tab", "status", "column_break_glcv", @@ -210,16 +208,6 @@ "label": "Warehouse", "options": "Warehouse" }, - { - "fieldname": "production_capacity_section", - "fieldtype": "Section Break", - "label": "Production Capacity" - }, - { - "fieldname": "parts_per_hour", - "fieldtype": "Float", - "label": "Parts Per Hour" - }, { "fieldname": "total_working_hours", "fieldtype": "Float", @@ -252,7 +240,7 @@ "idx": 1, "image_field": "on_status_image", "links": [], - "modified": "2023-11-30 12:43:35.808845", + "modified": "2024-06-20 14:17:13.806609", "modified_by": "Administrator", "module": "Manufacturing", "name": "Workstation", @@ -277,4 +265,4 @@ "sort_order": "ASC", "states": [], "track_changes": 1 -} \ No newline at end of file +} diff --git a/erpnext/manufacturing/doctype/workstation/workstation.py b/erpnext/manufacturing/doctype/workstation/workstation.py index 0966d26b781..326a8b37efc 100644 --- a/erpnext/manufacturing/doctype/workstation/workstation.py +++ b/erpnext/manufacturing/doctype/workstation/workstation.py @@ -55,6 +55,9 @@ class Workstation(Document): hour_rate_electricity: DF.Currency hour_rate_labour: DF.Currency hour_rate_rent: DF.Currency + off_status_image: DF.AttachImage | None + on_status_image: DF.AttachImage | None + plant_floor: DF.Link | None production_capacity: DF.Int working_hours: DF.Table[WorkstationWorkingHour] workstation_name: DF.Data From d9e62fef2121efb39f9a2ef220e92bae98bf848d Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 19:12:58 +0530 Subject: [PATCH 65/73] fix: stock qty validation in SCR (backport #42124) (#42133) fix: stock qty validation in SCR (#42124) (cherry picked from commit 99f2735ad3440aa3690bb514b32d7d9610753041) Co-authored-by: rohitwaghchaure --- .../subcontracting_receipt.py | 6 ++++++ .../test_subcontracting_receipt.py | 18 +++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py index 5e717e1f22a..48203167187 100644 --- a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py +++ b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py @@ -426,6 +426,12 @@ class SubcontractingReceipt(SubcontractingController): ) def validate_available_qty_for_consumption(self): + if ( + frappe.db.get_single_value("Buying Settings", "backflush_raw_materials_of_subcontract_based_on") + == "BOM" + ): + return + for item in self.get("supplied_items"): precision = item.precision("consumed_qty") if ( diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py b/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py index 0f5fe7ab958..8ff5c8f27b0 100644 --- a/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py +++ b/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py @@ -81,6 +81,7 @@ class TestSubcontractingReceipt(FrappeTestCase): self.assertEqual(scr.get("items")[0].rm_supp_cost, flt(rm_supp_cost)) def test_available_qty_for_consumption(self): + set_backflush_based_on("BOM") make_stock_entry(item_code="_Test Item", qty=100, target="_Test Warehouse 1 - _TC", basic_rate=100) make_stock_entry( item_code="_Test Item Home Desktop 100", @@ -125,7 +126,7 @@ class TestSubcontractingReceipt(FrappeTestCase): ) scr = make_subcontracting_receipt(sco.name) scr.save() - self.assertRaises(frappe.ValidationError, scr.submit) + scr.submit() def test_subcontracting_gle_fg_item_rate_zero(self): from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import get_gl_entries @@ -476,6 +477,21 @@ class TestSubcontractingReceipt(FrappeTestCase): # consumed_qty should be (accepted_qty * qty_consumed_per_unit) = (6 * 1) = 6 self.assertEqual(scr.supplied_items[0].consumed_qty, 6) + # Do not transfer materials to the supplier warehouse and check whether system allows to consumed directly from the supplier's warehouse + sco = get_subcontracting_order(service_items=service_items) + + # Transfer RM's + rm_items = get_rm_items(sco.supplied_items) + itemwise_details = make_stock_in_entry(rm_items=rm_items, warehouse="_Test Warehouse 1 - _TC") + + # Create Subcontracting Receipt + scr = make_subcontracting_receipt(sco.name) + scr.submit() + self.assertEqual(scr.docstatus, 1) + + for item in scr.supplied_items: + self.assertFalse(item.available_qty_for_consumption) + def test_supplied_items_cost_after_reposting(self): # Set Backflush Based On as "BOM" set_backflush_based_on("BOM") From a45f8ca5fd7403e61f4c836dc28ea7742c24441e Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 10:51:06 +0530 Subject: [PATCH 66/73] fix: batch picking in pick list based on Stock Settings (backport #42021) (#42134) fix: batch picking in pick list based on Stock Settings (#42021) (cherry picked from commit 97c9941143ebf29a06240516b103b5b171d642ab) Co-authored-by: rohitwaghchaure --- erpnext/stock/doctype/pick_list/pick_list.py | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/stock/doctype/pick_list/pick_list.py b/erpnext/stock/doctype/pick_list/pick_list.py index 69a1bdf17d8..6dd53f290c9 100644 --- a/erpnext/stock/doctype/pick_list/pick_list.py +++ b/erpnext/stock/doctype/pick_list/pick_list.py @@ -963,6 +963,7 @@ def get_available_item_locations_for_batched_item( { "item_code": item_code, "warehouse": from_warehouses, + "based_on": frappe.db.get_single_value("Stock Settings", "pick_serial_and_batch_based_on"), } ) ) From d61dab856942ff94092c90963dedef71fdf6dfed Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 2 Jul 2024 14:37:44 +0530 Subject: [PATCH 67/73] fix: provisional entry for non stock items --- .../accounts/doctype/gl_entry/gl_entry.json | 9 ++-- erpnext/accounts/doctype/gl_entry/gl_entry.py | 2 - .../purchase_invoice/purchase_invoice.py | 50 +++++++++---------- 3 files changed, 30 insertions(+), 31 deletions(-) diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.json b/erpnext/accounts/doctype/gl_entry/gl_entry.json index 0800971269b..2d106ad8cee 100644 --- a/erpnext/accounts/doctype/gl_entry/gl_entry.json +++ b/erpnext/accounts/doctype/gl_entry/gl_entry.json @@ -179,7 +179,8 @@ "fieldname": "voucher_detail_no", "fieldtype": "Data", "label": "Voucher Detail No", - "read_only": 1 + "read_only": 1, + "search_index": 1 }, { "fieldname": "project", @@ -290,7 +291,7 @@ "idx": 1, "in_create": 1, "links": [], - "modified": "2023-12-18 15:38:14.006208", + "modified": "2024-07-02 14:31:51.496466", "modified_by": "Administrator", "module": "Accounts", "name": "GL Entry", @@ -322,7 +323,7 @@ ], "quick_entry": 1, "search_fields": "voucher_no,account,posting_date,against_voucher", - "sort_field": "modified", + "sort_field": "creation", "sort_order": "DESC", "states": [] -} +} \ No newline at end of file diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.py b/erpnext/accounts/doctype/gl_entry/gl_entry.py index 75e1b993141..d74224c4aa2 100644 --- a/erpnext/accounts/doctype/gl_entry/gl_entry.py +++ b/erpnext/accounts/doctype/gl_entry/gl_entry.py @@ -32,8 +32,6 @@ class GLEntry(Document): account: DF.Link | None account_currency: DF.Link | None against: DF.Text | None - against_link: DF.DynamicLink | None - against_type: DF.Link | None against_voucher: DF.DynamicLink | None against_voucher_type: DF.Link | None company: DF.Link | None diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py index 2938b2a5309..0f64c9d697f 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -972,7 +972,6 @@ class PurchaseInvoice(BuyingController): "Company", self.company, "enable_provisional_accounting_for_non_stock_items" ) ) - self.provisional_enpenses_booked_in_pr = False if provisional_accounting_for_non_stock_items: self.get_provisional_accounts() @@ -1218,37 +1217,38 @@ class PurchaseInvoice(BuyingController): fields=["name", "provisional_expense_account", "qty", "base_rate"], ) default_provisional_account = self.get_company_default("default_provisional_account") + provisional_accounts = set( + [ + d.provisional_expense_account + if d.provisional_expense_account + else default_provisional_account + for d in pr_items + ] + ) + + provisional_gl_entries = frappe.get_all( + "GL Entry", + filters={ + "voucher_type": "Purchase Receipt", + "voucher_no": ("in", linked_purchase_receipts), + "account": ("in", provisional_accounts), + "is_cancelled": 0, + }, + fields=["voucher_detail_no"], + ) + rows_with_provisional_entries = [d.voucher_detail_no for d in provisional_gl_entries] for item in pr_items: self.provisional_accounts[item.name] = { "provisional_account": item.provisional_expense_account or default_provisional_account, "qty": item.qty, "base_rate": item.base_rate, + "has_provisional_entry": item.name in rows_with_provisional_entries, } def make_provisional_gl_entry(self, gl_entries, item): if item.purchase_receipt: - if not self.provisional_enpenses_booked_in_pr: - pr_item = self.provisional_accounts.get(item.pr_detail, {}) - provisional_account = pr_item.get("provisional_account") - pr_qty = pr_item.get("qty") - pr_base_rate = pr_item.get("base_rate") - - # Post reverse entry for Stock-Received-But-Not-Billed if it is booked in Purchase Receipt - provision_gle_against_pr = frappe.db.get_value( - "GL Entry", - { - "is_cancelled": 0, - "voucher_type": "Purchase Receipt", - "voucher_no": item.purchase_receipt, - "voucher_detail_no": item.pr_detail, - "account": provisional_account, - }, - ["name"], - ) - if provision_gle_against_pr: - self.provisional_enpenses_booked_in_pr = True - - if self.provisional_enpenses_booked_in_pr: + pr_item = self.provisional_accounts.get(item.pr_detail, {}) + if pr_item.get("has_provisional_entry"): purchase_receipt_doc = frappe.get_cached_doc("Purchase Receipt", item.purchase_receipt) # Intentionally passing purchase invoice item to handle partial billing @@ -1256,9 +1256,9 @@ class PurchaseInvoice(BuyingController): item, gl_entries, self.posting_date, - provisional_account, + pr_item.get("provisional_account"), reverse=1, - item_amount=(min(item.qty, pr_qty) * pr_base_rate), + item_amount=(min(item.qty, pr_item.get("qty")) * pr_item.get("base_rate")), ) def update_gross_purchase_amount_for_linked_assets(self, item): From b0aef9e42b34dfe6b8b0002647b8ba966a735a9a Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Tue, 2 Jul 2024 16:10:47 +0530 Subject: [PATCH 68/73] fix: handle none type object error (cherry picked from commit 6760c9c4e2aff70f3494aeb9e5b52d66128ab04e) --- .../v15_0/update_total_number_of_booked_depreciations.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/erpnext/patches/v15_0/update_total_number_of_booked_depreciations.py b/erpnext/patches/v15_0/update_total_number_of_booked_depreciations.py index 4b556c2b512..82f1c88903d 100644 --- a/erpnext/patches/v15_0/update_total_number_of_booked_depreciations.py +++ b/erpnext/patches/v15_0/update_total_number_of_booked_depreciations.py @@ -18,9 +18,10 @@ def execute(): depr_schedule = get_depr_schedule(asset.name, "Active", fb_row.finance_book) total_number_of_booked_depreciations = asset.opening_number_of_booked_depreciations or 0 - for je in depr_schedule: - if je.journal_entry: - total_number_of_booked_depreciations += 1 + if depr_schedule: + for je in depr_schedule: + if je.journal_entry: + total_number_of_booked_depreciations += 1 frappe.db.set_value( "Asset Finance Book", fb_row.name, From 706a6c1ad7c7850974d7dc7b6a0ff162ef4c1a28 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Fri, 28 Jun 2024 20:28:01 +0530 Subject: [PATCH 69/73] fix: always post to tax account heads if LCV is booked (cherry picked from commit 0fcd5d51309ed3fd2dfcc16d44d31489990848d1) --- .../stock/doctype/purchase_receipt/purchase_receipt.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py index 3136cdffeff..a8cb7fd83b4 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py @@ -776,6 +776,13 @@ class PurchaseReceipt(BuyingController): posting_date=posting_date, ) + def is_landed_cost_booked_for_any_item(self) -> bool: + for x in self.items: + if x.landed_cost_voucher_amount != 0: + return True + + return False + def make_tax_gl_entries(self, gl_entries, via_landed_cost_voucher=False): negative_expense_to_be_booked = sum([flt(d.item_tax_amount) for d in self.get("items")]) is_asset_pr = any(d.is_fixed_asset for d in self.get("items")) @@ -811,7 +818,7 @@ class PurchaseReceipt(BuyingController): i = 1 for tax in self.get("taxes"): if valuation_tax.get(tax.name): - if via_landed_cost_voucher: + if via_landed_cost_voucher or self.is_landed_cost_booked_for_any_item(): account = tax.account_head else: negative_expense_booked_in_pi = frappe.db.sql( From b7cbafae140918087ca43ac9d9427669fb52a849 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 1 Jul 2024 17:50:36 +0530 Subject: [PATCH 70/73] test: Repost should not merge expense accounts from LCV (cherry picked from commit fa56555150a36d2880f0d409c4924ca7bbab121d) --- .../purchase_receipt/test_purchase_receipt.py | 136 ++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py index 16553749d0a..6ddf756a7a2 100644 --- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py +++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py @@ -3020,6 +3020,142 @@ class TestPurchaseReceipt(FrappeTestCase): self.assertEqual(pr_return.items[0].rejected_qty, 0.0) self.assertEqual(pr_return.items[0].rejected_warehouse, "") + def test_tax_account_heads_on_lcv_and_item_repost(self): + """ + PO -> PR -> PI + PR -> LCV + Backdated `Repost Item valuation` should not merge tax account heads into stock_rbnb + """ + from erpnext.accounts.doctype.account.test_account import create_account + from erpnext.buying.doctype.purchase_order.test_purchase_order import ( + create_purchase_order, + make_pr_against_po, + ) + from erpnext.stock.doctype.purchase_receipt.purchase_receipt import make_purchase_invoice + + stock_rbnb = "Stock Received But Not Billed - _TC" + stock_in_hand = "Stock In Hand - _TC" + test_cc = "_Test Cost Center - _TC" + test_company = "_Test Company" + creditors = "Creditors - _TC" + lcv_expense_account = "Expenses Included In Valuation - _TC" + + company_doc = frappe.get_doc("Company", test_company) + company_doc.enable_perpetual_inventory = True + company_doc.stock_received_but_not_billed = stock_rbnb + company_doc.save() + + packaging_charges_account = create_account( + account_name="Packaging Charges", + parent_account="Indirect Expenses - _TC", + company=test_company, + account_type="Tax", + ) + + po = create_purchase_order(qty=10, rate=100, do_not_save=1) + po.taxes = [] + po.append( + "taxes", + { + "category": "Valuation and Total", + "account_head": packaging_charges_account, + "cost_center": test_cc, + "description": "Test", + "add_deduct_tax": "Add", + "charge_type": "Actual", + "tax_amount": 250, + }, + ) + po.save().submit() + + pr = make_pr_against_po(po.name, received_qty=10) + pr_gl_entries = get_gl_entries(pr.doctype, pr.name, skip_cancelled=True) + expected_pr_gles = [ + {"account": stock_rbnb, "debit": 0.0, "credit": 1000.0, "cost_center": test_cc}, + {"account": stock_in_hand, "debit": 1250.0, "credit": 0.0, "cost_center": test_cc}, + {"account": packaging_charges_account, "debit": 0.0, "credit": 250.0, "cost_center": test_cc}, + ] + self.assertEqual(expected_pr_gles, pr_gl_entries) + + # Make PI against Purchase Receipt + pi = make_purchase_invoice(pr.name).save().submit() + pi_gl_entries = get_gl_entries(pi.doctype, pi.name, skip_cancelled=True) + expected_pi_gles = [ + {"account": stock_rbnb, "debit": 1000.0, "credit": 0.0, "cost_center": test_cc}, + {"account": packaging_charges_account, "debit": 250.0, "credit": 0.0, "cost_center": test_cc}, + {"account": creditors, "debit": 0.0, "credit": 1250.0, "cost_center": None}, + ] + self.assertEqual(expected_pi_gles, pi_gl_entries) + + self.create_lcv(pr.doctype, pr.name, test_company, lcv_expense_account) + pr_gles_after_lcv = get_gl_entries(pr.doctype, pr.name, skip_cancelled=True) + expected_pr_gles_after_lcv = [ + {"account": stock_rbnb, "debit": 0.0, "credit": 1000.0, "cost_center": test_cc}, + {"account": stock_in_hand, "debit": 1300.0, "credit": 0.0, "cost_center": test_cc}, + {"account": packaging_charges_account, "debit": 0.0, "credit": 250.0, "cost_center": test_cc}, + {"account": lcv_expense_account, "debit": 0.0, "credit": 50.0, "cost_center": test_cc}, + ] + self.assertEqual(expected_pr_gles_after_lcv, pr_gles_after_lcv) + + # Trigger Repost Item Valudation on a older date + repost_doc = frappe.get_doc( + { + "doctype": "Repost Item Valuation", + "based_on": "Item and Warehouse", + "item_code": pr.items[0].item_code, + "warehouse": pr.items[0].warehouse, + "posting_date": add_days(pr.posting_date, -1), + "posting_time": "00:00:00", + "company": pr.company, + "allow_negative_stock": 1, + "via_landed_cost_voucher": 0, + "allow_zero_rate": 0, + } + ) + repost_doc.save().submit() + + pr_gles_after_repost = get_gl_entries(pr.doctype, pr.name, skip_cancelled=True) + expected_pr_gles_after_repost = [ + {"account": stock_rbnb, "debit": 0.0, "credit": 1000.0, "cost_center": test_cc}, + {"account": stock_in_hand, "debit": 1300.0, "credit": 0.0, "cost_center": test_cc}, + {"account": packaging_charges_account, "debit": 0.0, "credit": 250.0, "cost_center": test_cc}, + {"account": lcv_expense_account, "debit": 0.0, "credit": 50.0, "cost_center": test_cc}, + ] + self.assertEqual(len(pr_gles_after_repost), len(expected_pr_gles_after_repost)) + self.assertEqual(expected_pr_gles_after_repost, pr_gles_after_repost) + + def create_lcv(self, receipt_document_type, receipt_document, company, expense_account, charges=50): + ref_doc = frappe.get_doc(receipt_document_type, receipt_document) + + lcv = frappe.new_doc("Landed Cost Voucher") + lcv.company = company + lcv.distribute_charges_based_on = "Qty" + lcv.set( + "purchase_receipts", + [ + { + "receipt_document_type": receipt_document_type, + "receipt_document": receipt_document, + "supplier": ref_doc.supplier, + "posting_date": ref_doc.posting_date, + "grand_total": ref_doc.base_grand_total, + } + ], + ) + + lcv.set( + "taxes", + [ + { + "description": "Testing", + "expense_account": expense_account, + "amount": charges, + } + ], + ) + lcv.save().submit() + return lcv + def prepare_data_for_internal_transfer(): from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_internal_supplier From e55fd7204a3ead3793c18099f9ad8c33fc632cf4 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 2 Jul 2024 12:45:04 +0530 Subject: [PATCH 71/73] refactor(test): cleanup test data (cherry picked from commit 6ba6b5aa33a6a5d9f3ad042dd9cf2c423960dd55) --- .../purchase_receipt/test_purchase_receipt.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py index 6ddf756a7a2..d92de03b341 100644 --- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py +++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py @@ -3087,7 +3087,7 @@ class TestPurchaseReceipt(FrappeTestCase): ] self.assertEqual(expected_pi_gles, pi_gl_entries) - self.create_lcv(pr.doctype, pr.name, test_company, lcv_expense_account) + lcv = self.create_lcv(pr.doctype, pr.name, test_company, lcv_expense_account) pr_gles_after_lcv = get_gl_entries(pr.doctype, pr.name, skip_cancelled=True) expected_pr_gles_after_lcv = [ {"account": stock_rbnb, "debit": 0.0, "credit": 1000.0, "cost_center": test_cc}, @@ -3124,6 +3124,18 @@ class TestPurchaseReceipt(FrappeTestCase): self.assertEqual(len(pr_gles_after_repost), len(expected_pr_gles_after_repost)) self.assertEqual(expected_pr_gles_after_repost, pr_gles_after_repost) + # teardown + lcv.reload() + lcv.cancel() + pi.reload() + pi.cancel() + pr.reload() + pr.cancel() + + company_doc.enable_perpetual_inventory = False + company_doc.stock_received_but_not_billed = None + company_doc.save() + def create_lcv(self, receipt_document_type, receipt_document, company, expense_account, charges=50): ref_doc = frappe.get_doc(receipt_document_type, receipt_document) From c3cc36364896bcc759a05ad535017bad76d987bf Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 2 Jul 2024 17:00:16 +0530 Subject: [PATCH 72/73] refactor(test): fix flaky test (cherry picked from commit 0e256b8b29d2779bf84c3adb311cc3b122dd4b42) --- erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py index d92de03b341..968cb68dac0 100644 --- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py +++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py @@ -3043,6 +3043,7 @@ class TestPurchaseReceipt(FrappeTestCase): company_doc = frappe.get_doc("Company", test_company) company_doc.enable_perpetual_inventory = True company_doc.stock_received_but_not_billed = stock_rbnb + company_doc.default_inventory_account = stock_in_hand company_doc.save() packaging_charges_account = create_account( @@ -3134,6 +3135,7 @@ class TestPurchaseReceipt(FrappeTestCase): company_doc.enable_perpetual_inventory = False company_doc.stock_received_but_not_billed = None + company_doc.default_inventory_account = None company_doc.save() def create_lcv(self, receipt_document_type, receipt_document, company, expense_account, charges=50): From 11ebbf2a9cfad99c1e2a6406f537f75a4526185b Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2024 10:09:09 +0530 Subject: [PATCH 73/73] fix: show zero stock items filter in the stock balance report (backport #42147) (#42152) fix: show zero stock items filter in the stock balance report (#42147) (cherry picked from commit 1dae2156e3d2de35c0406253ecd48c07be0db483) Co-authored-by: rohitwaghchaure --- erpnext/stock/report/stock_balance/stock_balance.js | 6 ++++++ erpnext/stock/report/stock_balance/stock_balance.py | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/report/stock_balance/stock_balance.js b/erpnext/stock/report/stock_balance/stock_balance.js index ca2c053fdb1..d80261895aa 100644 --- a/erpnext/stock/report/stock_balance/stock_balance.js +++ b/erpnext/stock/report/stock_balance/stock_balance.js @@ -101,6 +101,12 @@ frappe.query_reports["Stock Balance"] = { fieldtype: "Check", default: 0, }, + { + fieldname: "include_zero_stock_items", + label: __("Include Zero Stock Items"), + fieldtype: "Check", + default: 0, + }, ], formatter: function (value, row, column, data, default_formatter) { diff --git a/erpnext/stock/report/stock_balance/stock_balance.py b/erpnext/stock/report/stock_balance/stock_balance.py index 27d9f1164bc..2694ba03c8b 100644 --- a/erpnext/stock/report/stock_balance/stock_balance.py +++ b/erpnext/stock/report/stock_balance/stock_balance.py @@ -138,7 +138,12 @@ class StockBalanceReport: {"reserved_stock": sre_details.get((report_data.item_code, report_data.warehouse), 0.0)} ) - if report_data and report_data.bal_qty == 0 and report_data.bal_val == 0: + if ( + not self.filters.get("include_zero_stock_items") + and report_data + and report_data.bal_qty == 0 + and report_data.bal_val == 0 + ): continue self.data.append(report_data)