Merge pull request #43974 from frappe/version-14-hotfix

chore: release v14
This commit is contained in:
ruthra kumar
2024-11-06 10:40:10 +05:30
committed by GitHub
4 changed files with 23 additions and 14 deletions

View File

@@ -224,11 +224,6 @@
"link_doctype": "Bank Guarantee", "link_doctype": "Bank Guarantee",
"link_fieldname": "bank_account" "link_fieldname": "bank_account"
}, },
{
"group": "Transactions",
"link_doctype": "Payroll Entry",
"link_fieldname": "bank_account"
},
{ {
"group": "Transactions", "group": "Transactions",
"link_doctype": "Bank Transaction", "link_doctype": "Bank Transaction",
@@ -255,7 +250,7 @@
"link_fieldname": "default_bank_account" "link_fieldname": "default_bank_account"
} }
], ],
"modified": "2024-09-24 06:57:41.292970", "modified": "2024-10-30 09:41:14.113414",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Bank Account", "name": "Bank Account",

View File

@@ -14,15 +14,26 @@ def get_data():
"Material Request": ["items", "material_request"], "Material Request": ["items", "material_request"],
"Supplier Quotation": ["items", "supplier_quotation"], "Supplier Quotation": ["items", "supplier_quotation"],
"Project": ["items", "project"], "Project": ["items", "project"],
"Sales Order": ["items", "sales_order"],
"BOM": ["items", "bom"],
"Production Plan": ["items", "production_plan"],
"Blanket Order": ["items", "blanket_order"],
}, },
"transactions": [ "transactions": [
{"label": _("Related"), "items": ["Purchase Receipt", "Purchase Invoice"]}, {"label": _("Related"), "items": ["Purchase Receipt", "Purchase Invoice", "Sales Order"]},
{"label": _("Payment"), "items": ["Payment Entry", "Journal Entry", "Payment Request"]}, {"label": _("Payment"), "items": ["Payment Entry", "Journal Entry", "Payment Request"]},
{ {
"label": _("Reference"), "label": _("Reference"),
"items": ["Material Request", "Supplier Quotation", "Project", "Auto Repeat"], "items": ["Supplier Quotation", "Project", "Auto Repeat"],
},
{
"label": _("Manufacturing"),
"items": ["Material Request", "BOM", "Production Plan", "Blanket Order"],
},
{
"label": _("Sub-contracting"),
"items": ["Subcontracting Order", "Subcontracting Receipt", "Stock Entry"],
}, },
{"label": _("Sub-contracting"), "items": ["Subcontracting Order", "Stock Entry"]},
{"label": _("Internal"), "items": ["Sales Order"]}, {"label": _("Internal"), "items": ["Sales Order"]},
], ],
} }

View File

@@ -14,6 +14,8 @@ def get_data():
}, },
"internal_links": { "internal_links": {
"Quotation": ["items", "prevdoc_docname"], "Quotation": ["items", "prevdoc_docname"],
"BOM": ["items", "bom_no"],
"Blanket Order": ["items", "blanket_order"],
}, },
"transactions": [ "transactions": [
{ {
@@ -22,8 +24,8 @@ def get_data():
}, },
{"label": _("Purchasing"), "items": ["Material Request", "Purchase Order"]}, {"label": _("Purchasing"), "items": ["Material Request", "Purchase Order"]},
{"label": _("Projects"), "items": ["Project"]}, {"label": _("Projects"), "items": ["Project"]},
{"label": _("Manufacturing"), "items": ["Work Order"]},
{"label": _("Reference"), "items": ["Quotation", "Auto Repeat"]}, {"label": _("Reference"), "items": ["Quotation", "Auto Repeat"]},
{"label": _("Manufacturing"), "items": ["Work Order", "BOM", "Blanket Order"]},
{"label": _("Payment"), "items": ["Payment Entry", "Payment Request", "Journal Entry"]}, {"label": _("Payment"), "items": ["Payment Entry", "Payment Request", "Journal Entry"]},
], ],
} }

View File

@@ -742,7 +742,7 @@ class update_entries_after:
rate = 0 rate = 0
# Material Transfer, Repack, Manufacturing # Material Transfer, Repack, Manufacturing
if sle.voucher_type == "Stock Entry": if sle.voucher_type == "Stock Entry":
self.recalculate_amounts_in_stock_entry(sle.voucher_no) self.recalculate_amounts_in_stock_entry(sle.voucher_no, sle.voucher_detail_no)
rate = frappe.db.get_value("Stock Entry Detail", sle.voucher_detail_no, "valuation_rate") rate = frappe.db.get_value("Stock Entry Detail", sle.voucher_detail_no, "valuation_rate")
# Sales and Purchase Return # Sales and Purchase Return
elif sle.voucher_type in ( elif sle.voucher_type in (
@@ -853,14 +853,15 @@ class update_entries_after:
# Update outgoing item's rate, recalculate FG Item's rate and total incoming/outgoing amount # Update outgoing item's rate, recalculate FG Item's rate and total incoming/outgoing amount
if not sle.dependant_sle_voucher_detail_no: if not sle.dependant_sle_voucher_detail_no:
self.recalculate_amounts_in_stock_entry(sle.voucher_no) self.recalculate_amounts_in_stock_entry(sle.voucher_no, sle.voucher_detail_no)
def recalculate_amounts_in_stock_entry(self, voucher_no): def recalculate_amounts_in_stock_entry(self, voucher_no, voucher_detail_no):
stock_entry = frappe.get_doc("Stock Entry", voucher_no, for_update=True) stock_entry = frappe.get_doc("Stock Entry", voucher_no, for_update=True)
stock_entry.calculate_rate_and_amount(reset_outgoing_rate=False, raise_error_if_no_rate=False) stock_entry.calculate_rate_and_amount(reset_outgoing_rate=False, raise_error_if_no_rate=False)
stock_entry.db_update() stock_entry.db_update()
for d in stock_entry.items: for d in stock_entry.items:
d.db_update() if d.name == voucher_detail_no or (not d.s_warehouse and d.t_warehouse):
d.db_update()
def update_rate_on_delivery_and_sales_return(self, sle, outgoing_rate): def update_rate_on_delivery_and_sales_return(self, sle, outgoing_rate):
# Update item's incoming rate on transaction # Update item's incoming rate on transaction