chore: merge branch 'version-13-hotfix' into 'version-13-pre-release' (#27173)
* feat: add provision for process loss in manufac * feat: add is process loss autoset and validation * fix: add warehouse and unset is scrap for process loss items * refactor: shift auto entry of is process loss check, update validations * test: add bom tests for process loss val, add se test for qty calc * fix: add more validations, remove source wh req for pl item * fix: sider * refactor: polyfill ?? * fix: sider * refactor: validation error message formatting * test: check manufacture completion qty in se and wo * fix: wo tests, sider, account for pl in se validation * fix: reword error messages, fix test values * feat: add procss_loss_qty field in work order * feat: process loss report, fix set pl query condition * fix: correct value in test * fix: get filters to work - reorder and rename columns - add work order filter * fix: Shopping cart Exchange rate validation (#27050) * fix: Shopping cart Exchange rate validation - Use `get_exchange_rate` to check for price list exchange rate in cart settings - Move cart exchange rate validation for Price List from hooks to doc event - Call cart exchange rate validation on PL update only if PL is in cart and currency is changed * chore: Comment out obsolete test - Modifying this test means considering extreme edge cases, which seems pointless now * fix: Remove snippet that got in due to cherry-pick from `develop` - This snippet is not present in v13-hotfix. Via https://github.com/frappe/erpnext/pull/26520 Co-authored-by: Nabin Hait <nabinhait@gmail.com> * feat: initialize party link for customer & suppliers * feat: toggle to enable common party accounting * feat: auto create advance entry on invoice submission * test: creation of advance entry on invoice submission * fix: remove unwanted filter query * feat: validate multiple links * fix: party link permissions * perf: reduce number of queries to get party link * fix: cost center & naming series * fix: cost center in test_sales_invoice_against_supplier * fix: Don't create inward SLE against SI unless is internal customer enabled (#27086) * fix: Dont create inward SLE against SI unless is internal customer enabled - Check if is internal customer enabled apart from target warehouse - Test to check if inward SLE is made if target warehouse is accidentally set but customer is not internal * test: Use internal customer for delivery of bundle items to target warehouse - created `create_internal_customer` util - reused it in delivery note and sales invoice tests - use internal customer for target warehouse test in delivery note (cherry picked from commitf4dc9ee2aa) # Conflicts: # erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py * fix: prevent over riding scrap table values, name kwargs, set currency * fix(regional): minor fixes and test for South Africa VAT report (#26933) (#27162) * fix: allow to change incoming rate manually in case of stand-alone credit note (#27164) * fix: allow to change rate manually in case of stand-alone credit note (#27036) Co-authored-by: Marica <maricadsouza221197@gmail.com> (cherry picked from commitfe4540d74d) # Conflicts: # erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json * fix: resolve conflicts Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com> Co-authored-by: Ankush Menat <ankush@iwebnotes.com> * fix: Fee Validity fixes (#27161) * fix: Fee Validity fixes (#27156) * chore: update Fee Validity form labels * fix: first appointment should not be considered for Fee Validity * fix: Fee Validity test cases * fix: appointment test case (cherry picked from commit642b4c805c) * fix: overlapping appointments Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> * fix: Merge conflicts and place internal customer creation util in test_customer.py * fix: internal customer util returns 'str' not doc object * fix: negative qty validation on stock reco cancellation (#27170) (#27171) * test: negative stock validation on SR cancel * fix: negative stock setting ignored in stock reco In stock reconcilation cancellation negative stock setting is ignored as `db.get_value` is returning string `'0'` which is not casted to int/bool for further logic. This causes negative qty, which evantually gets caught by reposting but by design this should stop cancellation. * test: typo and minor refactor (cherry picked from commite7109c18db) Co-authored-by: Ankush Menat <ankush@iwebnotes.com> Co-authored-by: 18alantom <2.alan.tom@gmail.com> Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com> Co-authored-by: Frappe PR Bot <frappe.pr.bot@gmail.com> Co-authored-by: Ankush Menat <ankush@iwebnotes.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
This commit is contained in:
@@ -362,7 +362,7 @@ class SellingController(StockController):
|
||||
sales_order.update_reserved_qty(so_item_rows)
|
||||
|
||||
def set_incoming_rate(self):
|
||||
if self.doctype not in ("Delivery Note", "Sales Invoice", "Sales Order"):
|
||||
if self.doctype not in ("Delivery Note", "Sales Invoice"):
|
||||
return
|
||||
|
||||
items = self.get("items") + (self.get("packed_items") or [])
|
||||
@@ -371,18 +371,19 @@ class SellingController(StockController):
|
||||
# Get incoming rate based on original item cost based on valuation method
|
||||
qty = flt(d.get('stock_qty') or d.get('actual_qty'))
|
||||
|
||||
d.incoming_rate = get_incoming_rate({
|
||||
"item_code": d.item_code,
|
||||
"warehouse": d.warehouse,
|
||||
"posting_date": self.get('posting_date') or self.get('transaction_date'),
|
||||
"posting_time": self.get('posting_time') or nowtime(),
|
||||
"qty": qty if cint(self.get("is_return")) else (-1 * qty),
|
||||
"serial_no": d.get('serial_no'),
|
||||
"company": self.company,
|
||||
"voucher_type": self.doctype,
|
||||
"voucher_no": self.name,
|
||||
"allow_zero_valuation": d.get("allow_zero_valuation")
|
||||
}, raise_error_if_no_rate=False)
|
||||
if not d.incoming_rate:
|
||||
d.incoming_rate = get_incoming_rate({
|
||||
"item_code": d.item_code,
|
||||
"warehouse": d.warehouse,
|
||||
"posting_date": self.get('posting_date') or self.get('transaction_date'),
|
||||
"posting_time": self.get('posting_time') or nowtime(),
|
||||
"qty": qty if cint(self.get("is_return")) else (-1 * qty),
|
||||
"serial_no": d.get('serial_no'),
|
||||
"company": self.company,
|
||||
"voucher_type": self.doctype,
|
||||
"voucher_no": self.name,
|
||||
"allow_zero_valuation": d.get("allow_zero_valuation")
|
||||
}, raise_error_if_no_rate=False)
|
||||
|
||||
# For internal transfers use incoming rate as the valuation rate
|
||||
if self.is_internal_transfer():
|
||||
@@ -422,7 +423,7 @@ class SellingController(StockController):
|
||||
or (cint(self.is_return) and self.docstatus==2)):
|
||||
sl_entries.append(self.get_sle_for_source_warehouse(d))
|
||||
|
||||
if d.target_warehouse:
|
||||
if d.target_warehouse and self.get("is_internal_customer"):
|
||||
sl_entries.append(self.get_sle_for_target_warehouse(d))
|
||||
|
||||
if d.warehouse and ((not cint(self.is_return) and self.docstatus==2)
|
||||
|
||||
Reference in New Issue
Block a user