Fetch from Upstream #76
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vjFaLk
commented
Jun 30, 2023
vjFaLk
commented
* chore: update CODEOWNERS [skip ci] (cherry picked from commit aa8b241) # Conflicts: # CODEOWNERS * fix: conflicts * chore: remove duplicates * chore: remove duplicates --------- Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
(cherry picked from commit fb3271c) # Conflicts: # erpnext/stock/doctype/serial_no/serial_no.json
…-34858 fix: unable to change `company` for manual `Serial No` entry (backport #34858)
chore: release v13
(cherry picked from commit 6fca9ad)
(cherry picked from commit c86c543) # Conflicts: # erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
…ock` (cherry picked from commit 11c8503)
(cherry picked from commit 8108b2d)
…-34953 fix: `PermissionError` in Work Order (backport #34953)
…-34912 fix: internal Purchase Receipt GL Entries (backport #34912)
(cherry picked from commit 19911b4) # Conflicts: # erpnext/accounts/doctype/sales_invoice/sales_invoice.js
…-34980 fix: validation for internal transfer entry (backport #34980)
(cherry picked from commit ac87179) # Conflicts: # erpnext/support/doctype/service_level_agreement/service_level_agreement.json
…-34981 fix: SLA permissions (backport #34981)
… [v14] (backport #35010) (#35029) * fix: value of depreciable assets not updating after manual depr entry [v14] (#35010) * fix: update value of asset with calc_depr on after manual depr entry * fix: value of asset with calc_depr on after manual depr entry not reflecting in asset_depr_and_bal report * chore: add validation for depr journal entry * test: manual_depr_for_depreciable_asset and manual_depr_w_incorrect_jv_voucher_type * chore: unlink depreciable asset from manual depr entry (cherry picked from commit 3c75e55) # Conflicts: # erpnext/accounts/doctype/journal_entry/journal_entry.js * chore: fixed conflicts --------- Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
… fixed asset register (backport #35031) (#35036) fix: use filter_by_finance_book instead of only_depreciable_assets in fixed asset register (#35031) fix: use filter_by_finance_book instead of only_depreciable_assets (cherry picked from commit e08d636) Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
…ate" > "Work Order" (#34726) * fix: convert asynchronous field update to synchronous * fix: wrong qty of remaining work orders to be created when using "Create" > "Work Order"
* fix: Payment Request flow fixes from Order to Payment Entry (cherry picked from commit dc17898) # Conflicts: # erpnext/buying/doctype/purchase_order/purchase_order.js # erpnext/public/js/controllers/transaction.js * chore: Update test case (cherry picked from commit e25b98b) * chore: More fixes (cherry picked from commit 31c95de) * chore: resolve conflicts --------- Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
…ies (#35989) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit c16a581)
…-36088 fix: circular dependency during reposting causing timeout error (backport #36088)
chore: release v13
## [13.52.4](v13.52.3...v13.52.4) (2023-07-11) ### Bug Fixes * also check on_hold ([#35910](#35910)) ([5aa02b8](5aa02b8)) * circular dependency during reposting causing timeout error ([ba69be1](ba69be1)) * **Employee Advance:** check if return amount is set before validating ([#36080](#36080)) ([beaf13e](beaf13e)) * error messages while evaluating formulas and handle line boundaries ([#35989](#35989)) ([4af57a7](4af57a7)) * gst_hsn_code is ambiguous on gst reports ([3a00052](3a00052)) * incorrect status in MR created from PP (backport [#36085](#36085)) ([#36087](#36087)) ([e05bb10](e05bb10)) * payment entry `voucher_type` error ([#35779](#35779)) ([9c3ec41](9c3ec41)) * **Payment Entry:** compare rounded amount ([#36011](#36011)) ([b04c190](b04c190)) * precision causing outstanding issue on partly paid invoices ([#36030](#36030)) ([cf3ec93](cf3ec93)) * single column indexes ([#32425](#32425)) ([53f7764](53f7764)) ### Reverts * Revert "perf: improve item wise register reports (backport #35908) (#35912)" ([b992366](b992366)), closes [#35908](#35908) [#35912](#35912)
[skip ci] (cherry picked from commit b5f6a1c)
fix: improve "Update Items" modal (#36105) * fix: make "Update Items" modal larger * fix: remove conversion factor from overview Conversion factor doesn't make much sense without two different UOMs next to it, hence moving it to row detail view (cherry picked from commit d5fe143) Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix: hsn code not showing up in gst itemised registers
…36145) * perf: index `variant_of` and `attribute` in `Item Variant Attribute` (cherry picked from commit e4128a5) * perf: index `disabled` in `Item` (cherry picked from commit 04400eb) # Conflicts: # erpnext/stock/doctype/item/item.json * chore: `conflicts` --------- Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
(cherry picked from commit bccb718)
chore: release v13
## [13.52.6](v13.52.5...v13.52.6) (2023-07-18) ### Bug Fixes * allow manual asset receipt mov from nowhere (backport [#36093](#36093)) ([#36095](#36095)) ([2993eb5](2993eb5)) * HSN code not showing up in GST itemised register reports ([#36142](#36142)) ([1d3917b](1d3917b)) * improve "Update Items" modal ([#36105](#36105)) ([3bc899f](3bc899f)) ### Performance Improvements * index in `Item` and `Item Variant Attribute` (backport [#36133](#36133)) ([#36145](#36145)) ([120de24](120de24))
chore: release v13
## [13.52.7](v13.52.6...v13.52.7) (2023-07-26) ### Bug Fixes * allow both custodian and location while creating asset (backport [#36263](#36263)) ([#36270](#36270)) ([e4f28e8](e4f28e8)) * apply discount on item after applying price list ([#36125](#36125)) ([bde9e89](bde9e89)) * group by in fixed asset register (copy [#36310](#36310)) ([#36312](#36312)) ([a5e1c47](a5e1c47))
…#36403) * fix: only publish repost progress to doc subscriber (#36400) Huge size of string gets blasted to everyone on site. Due to some memory leak (cause unknown) till sockets are open the strings are also in process' memory. related frappe/frappe#21863 (cherry picked from commit c0642cf) # Conflicts: # erpnext/stock/stock_ledger.py * chore: conflicts --------- Co-authored-by: Ankush Menat <ankush@frappe.io>
* perf: use `LEFT JOIN` instead of `NOT EXISTS` (cherry picked from commit 58d8675) # Conflicts: # erpnext/manufacturing/doctype/bom_update_log/bom_updation_utils.py * fix: long queue `process_boms_cost_level_wise` (cherry picked from commit 148d466) * chore: `conflicts` * fix: failing test case --------- Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
* fix: added validation for unique serial numbers in pos invoice * fix: updated title of validation * fix: removed extra whitespace * fix: added validation for duplicate batch numbers --------- Co-authored-by: Ritvik Sardana <ritviksardana@Ritviks-MacBook-Air.local>
chore: release v13
## [13.52.8](v13.52.7...v13.52.8) (2023-08-01) ### Bug Fixes * added validation for unique serial numbers in pos invoice ([#36302](#36302)) ([a165b37](a165b37)) * only publish repost progress to doc subscriber (backport [#36400](#36400)) ([#36403](#36403)) ([e9df064](e9df064)) * removed "fetch_from" (backport [#36365](#36365)) ([#36387](#36387)) ([c574494](c574494)) ### Performance Improvements * use `LEFT JOIN` instead of `NOT EXISTS` (backport [#36221](#36221)) ([#36384](#36384)) ([cdc86bd](cdc86bd))
vjFaLk
merged commit c7eb392
into
ParsimonyGit:parsimony-production-v13
4 of 6 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.