Merge from upstream v15 #85
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
(cherry picked from commit 7075c50)
(cherry picked from commit 0ffc5cf)
…fix/pr-40388 feat: add recursion qty field in promotional scheme (backport frappe#40388)
…pe#40391) fix: negative stock error for the batch (frappe#40389) (cherry picked from commit a419812) Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
… (frappe#40397) fix: decimal issue while making the stock entry (frappe#40394) (cherry picked from commit 4a02d14) Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
…) (frappe#40402) * fix: recursion issue while submitting work order (frappe#40400) (cherry picked from commit 72614bb) * chore: fix linter issue --------- Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 79a0473)
…rappe#40408) (frappe#40413) fix: qc created for raw materials during manufacture entry (frappe#40408) (cherry picked from commit f8a1a7f) Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix: incorrect work order status (frappe#40407) (cherry picked from commit 9482976) Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
…fix/pr-40403 fix: error message wording (backport frappe#40403)
…ery (backport frappe#40414) (frappe#40416) fix: conditionally apply `is_group` filter in accounting dimension query (frappe#40414) (cherry picked from commit daf4ae2) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
…ml (backport frappe#40099) (frappe#40419) chore: Add translation to buttons in Update stock_summary_template.html (frappe#40099) chore: Add translation to buttons in Update stock_summary_template.html (cherry picked from commit f3b4237) Co-authored-by: Ernesto Ruiz <eruiz@wbapps.com>
…m is not set so validate WO give error (backport frappe#40180) (frappe#40421) fix: if input manualy material request on WO the material_request_item is not set so validate WO give error (frappe#40180) (cherry picked from commit f24f51b) Co-authored-by: HENRY Florian <florian.henry@open-concept.pro>
chore: release v15
# [15.17.0](frappe/erpnext@v15.16.2...v15.17.0) (2024-03-13) ### Bug Fixes * **accounts:** Allow setting Number of new Cost Center (backport [frappe#40212](frappe#40212)) ([frappe#40314](frappe#40314)) ([7001e0a](frappe@7001e0a)) * advance paid amount and ledger entries against SO/PO ([6a5a941](frappe@6a5a941)) * barcode field on line item not working (backport [frappe#40381](frappe#40381)) ([frappe#40384](frappe#40384)) ([9ce68de](frappe@9ce68de)) * batch no not copied while making Material Consumption entry (backport [frappe#40290](frappe#40290)) ([frappe#40300](frappe#40300)) ([6d1c144](frappe@6d1c144)) * Blanket order rate getting changed on converting to order ([d8c6eb0](frappe@d8c6eb0)) * conditionally apply `is_group` filter in accounting dimension query (backport [frappe#40414](frappe#40414)) ([frappe#40416](frappe#40416)) ([40752c1](frappe@40752c1)) * decimal issue while making the stock entry (backport [frappe#40394](frappe#40394)) ([frappe#40397](frappe#40397)) ([91af7c0](frappe@91af7c0)) * error message wording ([frappe#40403](frappe#40403)) ([2a40808](frappe@2a40808)) * Filter for projects in Sales Cycle ([173b3b8](frappe@173b3b8)) * get_user_default_as_list args order ([44ff607](frappe@44ff607)) * if input manualy material request on WO the material_request_item is not set so validate WO give error (backport [frappe#40180](frappe#40180)) ([frappe#40421](frappe#40421)) ([a5e6763](frappe@a5e6763)) * incorrect advance paid in Sales/Purchase Order ([6832908](frappe@6832908)) * incorrect work order status (backport [frappe#40407](frappe#40407)) ([frappe#40411](frappe#40411)) ([605132a](frappe@605132a)) * load ignored doctype and include Mode of Payment Account ([frappe#40334](frappe#40334)) ([5fac500](frappe@5fac500)) * MR Default Supplier search query (backport [frappe#40273](frappe#40273)) ([frappe#40351](frappe#40351)) ([a195dd3](frappe@a195dd3)) * negative stock error for the batch (backport [frappe#40389](frappe#40389)) ([frappe#40391](frappe#40391)) ([478b988](frappe@478b988)) * not able to cancel purchase receipt for old subcontracting flow (backport [frappe#40298](frappe#40298)) ([frappe#40302](frappe#40302)) ([e0e80f7](frappe@e0e80f7)) * qc created for raw materials during manufacture entry (backport [frappe#40408](frappe#40408)) ([frappe#40413](frappe#40413)) ([f932265](frappe@f932265)) * recursion issue while submitting work order (backport [frappe#40400](frappe#40400)) ([frappe#40402](frappe#40402)) ([d6e87f3](frappe@d6e87f3)) * Sender email in process statements of accounts ([953f640](frappe@953f640)) * **Shipment Parcel:** make length, width and height non-mandatory ([1476196](frappe@1476196)) * stock ledger balance qty for the batch (backport [frappe#40274](frappe#40274)) ([frappe#40301](frappe#40301)) ([62aefce](frappe@62aefce)) * use serial batch fields for subcontracting receipt (backport [frappe#40311](frappe#40311)) ([frappe#40315](frappe#40315)) ([4b15c00](frappe@4b15c00)) * use serial/batch field for rejected items (backport [frappe#40327](frappe#40327)) ([frappe#40329](frappe#40329)) ([7ca7242](frappe@7ca7242)) * Use serial/batch fields for delivery note return (backport [frappe#40374](frappe#40374)) ([frappe#40376](frappe#40376)) ([32660ab](frappe@32660ab)) ### Features * add recursion qty field in promotional scheme ([5f4b23d](frappe@5f4b23d))
(cherry picked from commit 2cefe2a) # Conflicts: # erpnext/accounts/doctype/sales_invoice/sales_invoice.json
(cherry picked from commit adf13a1) # Conflicts: # erpnext/controllers/accounts_controller.py
(cherry picked from commit 767f215)
(cherry picked from commit 77aac6f)
(cherry picked from commit 849f478) # Conflicts: # erpnext/patches.txt
(cherry picked from commit 4d0c2d8)
(cherry picked from commit ce3b1f0)
(cherry picked from commit 445d2ac) # Conflicts: # erpnext/controllers/accounts_controller.py
…nted commits (cherry picked from commit dedae4f)
…fix/pr-40372 refactor: checkbox to toggle standalone Credit/Debit note behaviour (backport frappe#40372)
(cherry picked from commit 2cefe2a) # Conflicts: # erpnext/accounts/doctype/sales_invoice/sales_invoice.json
(cherry picked from commit adf13a1) # Conflicts: # erpnext/controllers/accounts_controller.py
…fix/pr-40684 fix: incorrect total qty in job card (backport frappe#40684)
(cherry picked from commit 016585c)
…fix/pr-40685 fix: validation error for the subcontracting receipt (backport frappe#40685)
chore: release v15
# [15.18.0](frappe/erpnext@v15.17.6...v15.18.0) (2024-03-27) ### Bug Fixes * Add default finance book check in P&L statement ([f087159](frappe@f087159)) * Batch No is mandatory while making manufacture entry ([a638c9c](frappe@a638c9c)) * Book depreciation until the asset disposal date and removed unwanted commits ([2d7ff5d](frappe@2d7ff5d)) * Cannot read properties of undefined (reading 'rate') ([d287ed5](frappe@d287ed5)) * existing batch from different warehouse not showing in the dropdown ([79d0478](frappe@79d0478)) * incorrect total qty in job card ([68d57c3](frappe@68d57c3)) * item not coming in quick entry ([008894d](frappe@008894d)) * permissions during bulk transaction logs ([6e6ca42](frappe@6e6ca42)) * pick list not picked qty less than 1 ([5310ec3](frappe@5310ec3)) * rate not fetching from the item price ([fd02060](frappe@fd02060)) * rate reset to zero ([4636ef0](frappe@4636ef0)) * remove faulty translation ([frappe#40667](frappe#40667)) ([afa930f](frappe@afa930f)) * style for tax breakup ([501b09a](frappe@501b09a)) * translatability of bom configurator labels ([cf49cec](frappe@cf49cec)) * Turkish translations ([frappe#40650](frappe#40650)) ([17a0876](frappe@17a0876)) * use serial/batch fields for subcontracting receipt and in transit stock entry ([9ec24bc](frappe@9ec24bc)) * use Text Editor for rendering tax breakup table ([a95bb27](frappe@a95bb27)) * validate gl for previous fiscal year ([4b973b2](frappe@4b973b2)) * validation error for the subcontracting receipt ([23ae82d](frappe@23ae82d)) * wrong buying amount if delivered and billed qty varies ([c224240](frappe@c224240)) ### Features * bisect doctype ([884a18f](frappe@884a18f)) * nodes doctype ([bfccfa4](frappe@bfccfa4)) ### Performance Improvements * add in some indexes (backport [frappe#40590](frappe#40590)) ([frappe#40605](frappe#40605)) ([f66cf7d](frappe@f66cf7d))
…40703 fix: rate changed on changing of the qty (backport frappe#40700) (backport frappe#40703)
## [15.18.1](frappe/erpnext@v15.18.0...v15.18.1) (2024-03-27) ### Bug Fixes * rate changed on changing of the qty ([471f1c8](frappe@471f1c8))
(cherry picked from commit 565bfa1)
…40742 refactor: configurable exchange gain or loss posting date (frappe#37630)
(cherry picked from commit 1f46c15)
…40739 refactor: use sql to clear comments (backport frappe#40739)
## [15.18.2](frappe/erpnext@v15.18.1...v15.18.2) (2024-03-29) ### Bug Fixes * use sql to clear comments ([e2196ef](frappe@e2196ef))
…40746 fix: sales / purchase return validation issue (backport frappe#40741) (backport frappe#40746)
…40761 chore: show item name in the validation message (backport frappe#40757) (backport frappe#40761)
## [15.18.3](frappe/erpnext@v15.18.2...v15.18.3) (2024-03-29) ### Bug Fixes * sales / prchase return validation issue ([2eac2ef](frappe@2eac2ef))
Alchez
merged commit 4044c82
into
ParsimonyGit:parsimony-production-v15
9 of 11 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.
Changes: