Merge from upstream v13 #63
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
- Create child-parent map once and fetch value from child key to get parents - Get parents recursively for a leaf node (get all ancestors) - Approx. 44 secs for 4lakh 70k boms
- Move `get_boms_in_bottom_up_order` in bom update tool’s file - Remove repeated rm cost update from `update_cost`. `calculate_cost` handles RM cost update - db_update children in `calculate_cost` optionally - Don’t call `update_exploded_items` and regenerate exploded items in `update_cost`. They will stay the same (except cost)
- Doc is only used to iterate over items(which wont change) and change rate/amount of rows - These changes are inserted in db via `db_update`, so no harm - Tested locally: refetching cached doc after db update, reflects fresh data.
- Use the right price list and currency to avoid rate conversion (1000/62.9), since rates are reset correctly now - Use RM rate based on Price List in BOM. Non stock item has no valuation
- Process BOMs level wise and Pause after level is complete - Cron job will resume Paused jobs, which will again process the new level and pause at the end - This will go on until all BOMs are updated - Added Progress section with fields to track updated BOMs in Log - Cleanup: Add BOM Updation utils file to contain helper functions/sub-functions - Cleanup: BOM Update Log file will only contain functions that are in direct context of the Log Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
(cherry picked from commit 2388d86) # Conflicts: # erpnext/translations/de.csv
… there are existing employees (cherry picked from commit 2922857)
(cherry picked from commit ab0ef60)
(cherry picked from commit 2bc6d46)
…rappe#31141) (frappe#31146) * chore: resave naming series doctype schema separate commit to avoid mixing actual changes (cherry picked from commit 82cd54b) * feat: preview next numbers on naming series tool (cherry picked from commit 24d1bf5) * docs: update help information on naming series (cherry picked from commit 4d0e2aa) * test: add basic tests for naming series tool (cherry picked from commit 964b418) Co-authored-by: Ankush Menat <ankush@frappe.io>
frappe#31144) * fix: skip existing batch number during autogen (frappe#31140) * test: correctly check for existing item * test: batch no for test PR generation Co-authored-by: Ankush Menat <me@ankush.dev> Co-authored-by: Ankush Menat <ankush@frappe.io>
…pe#31150) * style: format warehouse js (cherry picked from commit c704ad8) * fix: improve labels, simplify logic (cherry picked from commit a6ddd86) * fix: german translations (cherry picked from commit 9356eb1) * fix: remove unsupported arguments Co-authored-by: Ankush Menat <ankushmenat@gmail.com> (cherry picked from commit e77c379) * refactor: set queries during setup (cherry picked from commit 1b16eb7) * style: format (cherry picked from commit 1e9f9c4) Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit 4b04694)
(cherry picked from commit 2a10f09)
(cherry picked from commit 2a10f09)
…fix/pr-31155 fix: Exchange rate reste to 1 on making mapped doc (backport frappe#31155)
…31155 fix: Exchange rate reste to 1 on making mapped doc (backport frappe#31155)
## [13.31.1](frappe/erpnext@v13.31.0...v13.31.1) (2022-05-27) ### Bug Fixes * Exchange rate reste to 1 on making mapped doc ([e5b586f](frappe@e5b586f))
(cherry picked from commit 385e22a)
(cherry picked from commit b81d751) # Conflicts: # erpnext/payroll/doctype/gratuity/test_gratuity.py
(cherry picked from commit 6c66bbb) # Conflicts: # erpnext/payroll/doctype/gratuity/test_gratuity.py
(cherry picked from commit 79b0aed) # Conflicts: # erpnext/payroll/doctype/gratuity/gratuity.json
(cherry picked from commit c9e0703)
- Generate RM-Rate map from Items table (will include subassembly items with rate) - Function to reset exploded item rate from above map - `db_update` exploded item rate only if rate is changed - Via Update Cost, only update exploded items rate, do not regenerate table again - Exploded Items are regenerated on Save and Replace BOM job - `calculate_exploded_cost` is run only via non doc events (Update Cost button, Update BOMs Cost Job)
…fix/pr-31350 fix: Conversion rate validation for multi-currency invoices (backport frappe#31350)
…fix/pr-31396 fix: Quotation lost update (backport frappe#31396)
(cherry picked from commit 65b21ee)
…fix/pr-31264 fix: internal transfer GLE validation (backport frappe#31264)
chore: weekly version-13 release
## [13.34.1](frappe/erpnext@v13.34.0...v13.34.1) (2022-06-21) ### Bug Fixes * Conversion rate validation for multi-currency invoices ([4186aaf](frappe@4186aaf)) * **india:** e-invoice eligibility if company gstin is not configured ([frappe#31247](frappe#31247)) ([7696ae4](frappe@7696ae4)) * internal transfer GLE validation ([8a4cd2a](frappe@8a4cd2a)) * Merge Conflicts ([0f3a02d](frappe@0f3a02d)) * Pick Template BOM if variant BOM absent in WO popup from SO ([7c35887](frappe@7c35887)) * Quotation lost update ([3b9f943](frappe@3b9f943)) * Spelling mistake in quotation depend on (backport [frappe#31362](frappe#31362)) ([frappe#31363](frappe#31363)) ([ebcdaf7](frappe@ebcdaf7)) * transaction date gets unset in material request ([frappe#31387](frappe#31387)) ([4e2ed6f](frappe@4e2ed6f)), closes [frappe#31327](frappe#31327) * UOM handling for transaction without item (backport [frappe#31389](frappe#31389)) ([frappe#31391](frappe#31391)) ([051e5cd](frappe@051e5cd)) ### Performance Improvements * GLE reposting with progress and chunking (backport [frappe#31343](frappe#31343)) ([frappe#31373](frappe#31373)) ([f19ed0b](frappe@f19ed0b))
…fix/pr-30837 fix: Respect system precision for user facing balance qty values (backport frappe#30837)
* fix: update ru translate (frappe#31404) * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv fix logic * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv (cherry picked from commit ce1b4e4) # Conflicts: # erpnext/translations/ru.csv * chore: Fix merge conflicts Co-authored-by: Vladislav <integration.into.society@gmail.com> Co-authored-by: Marica <maricadsouza221197@gmail.com>
(cherry picked from commit 8b1ff96)
- Delete `BOM Update Batch` table on 'Completed' log, to save space - Hide Progress section on 'Completed' log - Enqueue `on_submit` for 'Update Cost' job, getting leaf boms could take time for huge DBs. Users have to wait for screen to unfreeze. - Add error handling to `process_boms_cost_level_wise` (Called via cron job and on submit, both in background)
…p-perf-hotfix chore: Clear Progress section for completed logs & `on_submit` UX
…fix/pr-31420 fix: translation for filter status on report (backport frappe#31420)
(cherry picked from commit 0097a2b)
…ue to payment days (frappe#31425) * fix(Salary Slip): Components not updated when amount evaluates to 0 due to payment days * fix: remove 0 valued components that have been updated later
…fix/pr-31395 fix: filter set in Bank Clearance Summary (backport frappe#31395)
(cherry picked from commit 00807ab)
…fix/pr-31421 fix: add UOM validation for planned-qty (backport frappe#31421)
(cherry picked from commit 6acd032)
…fix/pr-31439 fix: General Ledger and TB opening entries mismatch issues (backport frappe#31439)
(cherry picked from commit 58fe220)
…1455) (frappe#31456) refactor: clean up product bundle client side code (frappe#31455) refactor: clean up product bundle cient side code - Remove deprecated CUR_FRM scripts - Remove client side fetches and move it to doctype schema (cherry picked from commit 20dac08) Co-authored-by: Ankush Menat <ankush@frappe.io>
…fix/pr-31446 fix: Quotation and Sales Order item sync (backport frappe#31446)
… (frappe#31457) fix: dont update RM items table if not required (frappe#31408) Currently on PO update RM item table is auto computed again and again, if there was any transfer/consumption against that then it will be lost. This change: 1. Disables updating RM table if no change in qty of FG was made. Since RM table can't possibly be different with same FG qty. 2. Blocks update completely if qty is changed and RM items are already transferred. (cherry picked from commit dd11f26) Co-authored-by: Ankush Menat <ankush@frappe.io>
chore: weekly version-13 release
## [13.34.2](frappe/erpnext@v13.34.1...v13.34.2) (2022-06-28) ### Bug Fixes * add UOM validation for planned-qty ([559bde3](frappe@559bde3)) * dont update RM items table if not required (backport [frappe#31408](frappe#31408)) ([frappe#31457](frappe#31457)) ([8155306](frappe@8155306)) * General Ledger and TB opening entries mismatch issues ([a0c5c73](frappe@a0c5c73)) * Monthly depreciation using WDV method ([e7659a1](frappe@e7659a1)) * Quotation and Sales Order item sync ([2219132](frappe@2219132)) * Respect system precision for user facing balance qty values ([frappe#30837](frappe#30837)) ([642b9c5](frappe@642b9c5)) * **Salary Slip:** Components not updated when amount evaluates to 0 due to payment days ([frappe#31425](frappe#31425)) ([abfe926](frappe@abfe926)) * translation for filter status on report ([736f206](frappe@736f206)) * update ru translate (backport [frappe#31404](frappe#31404)) ([frappe#31417](frappe#31417)) ([8b78a12](frappe@8b78a12))
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.
Changelogs: