nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 08:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
chore: release v14
This commit is contained in:
rohitwaghchaure
2024-06-11 18:36:07 +05:30
committed by GitHub
parent 0c4a2af9ab 7234625d65
commit a6ed10b712
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/doctype/repost_accounting_ledger_settings/repost_accounting_ledger_settings.json
View File

@@ -17,7 +17,7 @@
"in_create": 1, "in_create": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2023-11-07 14:24:13.321522", "modified": "2024-06-06 13:56:37.908879",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Repost Accounting Ledger Settings", "name": "Repost Accounting Ledger Settings",
@@ -30,13 +30,17 @@
"print": 1, "print": 1,
"read": 1, "read": 1,
"role": "Administrator", "role": "Administrator",
"select": 1,
"share": 1, "share": 1,
"write": 1 "write": 1
}, },
{ {
"create": 1,
"delete": 1,
"read": 1, "read": 1,
"role": "System Manager", "role": "System Manager",
"select": 1 "select": 1,
"write": 1
} }
], ],
"sort_field": "modified", "sort_field": "modified",

6
erpnext/selling/doctype/sales_order/sales_order.py
View File

@@ -576,6 +576,11 @@ def get_requested_item_qty(sales_order):
def make_material_request(source_name, target_doc=None): def make_material_request(source_name, target_doc=None):
requested_item_qty = get_requested_item_qty(source_name) requested_item_qty = get_requested_item_qty(source_name)
def postprocess(source, target):
if source.tc_name and frappe.db.get_value("Terms and Conditions", source.tc_name, "buying") != 1:
target.tc_name = None
target.terms = None
def get_remaining_qty(so_item): def get_remaining_qty(so_item):
return flt( return flt(
flt(so_item.qty) flt(so_item.qty)
@@ -631,6 +636,7 @@ def make_material_request(source_name, target_doc=None):
}, },
}, },
target_doc, target_doc,
postprocess,
) )
return doc return doc