Merge from upstream v13 #62
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
Chore
Bug Fixes
Continuous Integration
Features
Tests
Contributorsdeepeshgarg007, frappe-bot, Alchez, nextchamp-saqib, marination, ankush, ruchamahabal, mergify[bot] Commit-Lint commandsYou can trigger Commit-Lint actions by commenting on this PR:
|
…fix/pr-30754 fix: First preference to parent cost center rather than round off cost center (backport frappe#30754)
chore: version 13 pre release
chore: version 13 release
## [13.27.1](frappe/erpnext@v13.27.0...v13.27.1) (2022-04-26) ### Bug Fixes * Add accounting dimensions for round off GL Entry ([dedb90e](frappe@dedb90e)) * batch_no filtering not working when batch no is also a number in scientific notation ([frappe#30770](frappe#30770)) ([frappe#30771](frappe#30771)) ([c339305](frappe@c339305)) * Check if accounting dimension exists ([1834671](frappe@1834671)) * dependent gle reposting (backport [frappe#30726](frappe#30726)) ([frappe#30772](frappe#30772)) ([a6d0938](frappe@a6d0938)) * Do not validate while creating accounting dimension ([153b41a](frappe@153b41a)) * e_commerce_settings.js ([3a5f5d5](frappe@3a5f5d5)) * e_commerce_settings.py ([86c5f4d](frappe@86c5f4d)) * First preference to parent cost center rather than round off cost center ([a2d95fc](frappe@a2d95fc)) * Handle Multiselect field mapping separately ([dc2f694](frappe@dc2f694)) * **india:** 401 & 403 client error while generating IRN ([198bdcf](frappe@198bdcf)) * **india:** cess value not considered while validating e-invoice totals ([frappe#30800](frappe#30800)) ([f70fca1](frappe@f70fca1)) * **india:** transporter name is null while generating e-way bill ([frappe#30736](frappe#30736)) ([6291b28](frappe@6291b28)) * linter ([6dddbb9](frappe@6dddbb9)) * Loan doctypes in bank reconciliation ([e69c715](frappe@e69c715)) * Mistyped variable name in patch ([e76220e](frappe@e76220e)) * monthly attendance sheet ([frappe#30748](frappe#30748)) ([0b4e3f1](frappe@0b4e3f1)) * Must not be able to start Job Card if it is related to Work Order that is not started yet ([frappe#29072](frappe#29072)) ([frappe#30755](frappe#30755)) ([b656ffa](frappe@b656ffa)) * Query filter fields from Website Item instead of Item master ([bed9e09](frappe@bed9e09)) * select doctype as payment_document ([44f0b69](frappe@44f0b69)) * **Selling,E-Commerce:** Shopping cart quotation without website item. ([frappe#29085](frappe#29085)) ([ea0fe5e](frappe@ea0fe5e)) * SO analysis rpt will fetch SO's without Delivery note as well ([f9d89c7](frappe@f9d89c7)) * translation ([frappe#30781](frappe#30781)) ([frappe#30783](frappe#30783)) ([8335ca6](frappe@8335ca6)) * Update token to allow updates on protected branch ([baab379](frappe@baab379)) * update translation ([frappe#30725](frappe#30725)) ([frappe#30776](frappe#30776)) ([b585262](frappe@b585262)) * Use parent cost center for Sales and Purchase Invoice ([fe9f329](frappe@fe9f329)) * Use right precision for asset value after full schedule ([frappe#30745](frappe#30745)) ([269e192](frappe@269e192)) * Validate field filter wrt to Website Item & re-use validation in Item Group ([34437a8](frappe@34437a8))
(cherry picked from commit 03a6103)
(cherry picked from commit b1ac5ff)
- Get distinct accounts that warehouse value has been booked against - If same account as the one being set, ignore - If not same account or multiple accounts: warn user that it makes it harder to track mismatches (cherry picked from commit 44331f4)
(cherry picked from commit e2a163d)
…fix/pr-30811 chore: Warn users about multiple warehouse accounts (backport frappe#30811)
…fix/pr-30808 fix(pos): search field doesn't reset on checkout (backport frappe#30808)
[skip ci] (cherry picked from commit 3ae9fa9) Co-authored-by: Ankush Menat <ankush@frappe.io>
…appe#30826) * refactor: misc pick list refactors - make tracking fields read only and no-copy 🤦 - collapse print settings section, most users configure it once and forget about it, not need to show this. - call pick list grouping function directly - use get_descendants_of instead of obscure db function (cherry picked from commit 5c3f901) * test: bundles in picklist (cherry picked from commit 7d56820) # Conflicts: # erpnext/stock/doctype/pick_list/test_pick_list.py * feat: Pick list from SO with Product Bundle (cherry picked from commit 36c5e8a) * refactor: sales order status update - rename badly named variables - support updated packed items (cherry picked from commit e64cc66) # Conflicts: # erpnext/stock/doctype/pick_list/pick_list.py * perf: single update per Sales Order. For each SO item the sales order picking status was being updated, this isn't required and wasteful. (cherry picked from commit c3fc0a4) * feat: back-update min picked qty for a bundle (cherry picked from commit 60bc26f) * refactor: simplify needlessly complicated code (cherry picked from commit 3ddad68) * refactor: groupby using keys instead of int index (cherry picked from commit 277b51b) * refactor: simpler check for non-SO items (cherry picked from commit f574121) * feat: create DN from pick list with bundle items (cherry picked from commit 23cb0d6) * refactor: remove unnecssary vars also remove misleading docstring (cherry picked from commit 25485ed) * fix: round off bundle qty This is to accomodate bundles that might allow floating point qty. (cherry picked from commit 41aa4b3) * feat: transfer picklist stock info to packing list (cherry picked from commit 1ac275c) * test: product bundle fixture (cherry picked from commit ee54ece) * test: test bundle - picklist behaviour (cherry picked from commit 9e60acd) # Conflicts: # erpnext/stock/doctype/pick_list/test_pick_list.py * fix: compare against stock qty while validating Other changes: - only allow whole number of bundles to get picked (cherry picked from commit 8207697) * fix: dont map picked qty and consider pick qty for new PL Co-Authored-By: marination <maricadsouza221197@gmail.com> (cherry picked from commit 47e1a01) * fix(UX): only show pick list when picking is pending [skip ci] (cherry picked from commit 9a8e3ef) * chore: make picked qty read only (cherry picked from commit ebd5f0b) * chore: conflicts and py3.7 compatibilty Co-authored-by: Ankush Menat <ankush@frappe.io>
…pe#30827) (frappe#30829) This is an automatic backport of pull request frappe#30827 done by [Mergify](https://mergify.com). --- <details> <summary>Mergify commands and options</summary> <br /> More conditions and actions can be found in the [documentation](https://docs.mergify.com/). You can also trigger Mergify actions by commenting on this pull request: - `@Mergifyio refresh` will re-evaluate the rules - `@Mergifyio rebase` will rebase this PR on its base branch - `@Mergifyio update` will merge the base branch into this PR - `@Mergifyio backport <destination>` will backport this PR on `<destination>` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com </details>
(cherry picked from commit a8452c2)
…fix/pr-30843 fix: Multi currency opening invoices (backport frappe#30843)
(cherry picked from commit 67bb290)
…fix/pr-30815 fix: Ignore custom field validation while setup (backport frappe#30815)
(cherry picked from commit 82a0635) # Conflicts: # erpnext/patches.txt # erpnext/selling/doctype/sales_order/sales_order.json
…rappe#30859) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> Co-authored-by: sersaber <93864988+sersaber@users.noreply.github.com>
(cherry picked from commit 60915e8) # Conflicts: # erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py # erpnext/healthcare/doctype/patient_appointment/patient_appointment.py # erpnext/healthcare/doctype/therapy_plan/therapy_plan.py # erpnext/non_profit/doctype/membership/membership.py
(cherry picked from commit c10a225) # Conflicts: # erpnext/healthcare/doctype/patient_appointment/patient_appointment.py
(cherry picked from commit 30876a1) # Conflicts: # erpnext/healthcare/doctype/patient_appointment/test_patient_appointment.py
(cherry picked from commit 417d6ab) # Conflicts: # erpnext/accounts/doctype/journal_entry/journal_entry.py
(cherry picked from commit 5b87264) # Conflicts: # erpnext/accounts/doctype/journal_entry/journal_entry.py
(cherry picked from commit 65232ed) # Conflicts: # erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py # erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
(cherry picked from commit bc34737) # Conflicts: # erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
…fix/pr-31004 fix: duplicate entries in payment terms report output (backport frappe#31004)
(cherry picked from commit 147fc8f)
(cherry picked from commit a1f53f8)
(cherry picked from commit 9e4a360)
…fix/pr-31129 fix: Loan Doc query in Bank Reconciliation Statement (backport frappe#31129)
…fix/pr-31039 fix: Chart data for monthly periodicity in Cash Flow report (backport frappe#31039)
fix: timesheet fetching in sales invoice
…fix/pr-26916 fix: Account currency validation for first transaction (backport frappe#26916)
…backport frappe#31085) (frappe#31135) Co-authored-by: sersaber <93864988+sersaber@users.noreply.github.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
chore: Weekly release for version-13
# [13.31.0](frappe/erpnext@v13.30.0...v13.31.0) (2022-05-26) ### Bug Fixes * Account currency validation for first transaction ([228f10b](frappe@228f10b)) * Add party account validation for journal entry ([7f853b1](frappe@7f853b1)) * always update item_name for stock entry (backport [frappe#31068](frappe#31068)) ([frappe#31071](frappe#31071)) ([f519dc6](frappe@f519dc6)) * change project's actual_start_date fieldtype from Data to Date (backport [frappe#31085](frappe#31085)) ([frappe#31135](frappe#31135)) ([8c2f203](frappe@8c2f203)) * Chart data for monthly periodicity in Cash Flow report ([frappe#31039](frappe#31039)) ([f14e9b7](frappe@f14e9b7)) * corrective job card creation (backport [frappe#31083](frappe#31083)) ([frappe#31084](frappe#31084)) ([c17c260](frappe@c17c260)) * don't capture payments with invoice_id as donations ([168a9d4](frappe@168a9d4)) * employee advance status update on return via additional salary ([d59c3d2](frappe@d59c3d2)) * Handle missing HSN Codes ([ce3a21e](frappe@ce3a21e)) * Healthcare module accounting test cases ([09a42a1](frappe@09a42a1)) * **India:** Async issue in company address trigger ([2ea3318](frappe@2ea3318)) * **india:** error while parsing e-invoice ([frappe#31061](frappe#31061)) ([1461d66](frappe@1461d66)) * **india:** eway bill cancel api is disabled ([frappe#31060](frappe#31060)) ([95491e1](frappe@95491e1)) * Job Card excess transfer behaviour (backport [frappe#31054](frappe#31054)) ([frappe#31096](frappe#31096)) ([3984f04](frappe@3984f04)) * Leave Encashment calculations (backport [frappe#31062](frappe#31062)) ([frappe#31091](frappe#31091)) ([ba76b64](frappe@ba76b64)) * Loan Doc query in Bank Reconciliation Statement ([611d1af](frappe@611d1af)) * Loan repayment entries for payroll payable account ([ea6d754](frappe@ea6d754)) * multiple entries for same payment term ([90b1147](frappe@90b1147)) * Party account validation in JV ([d10c2e5](frappe@d10c2e5)) * payments duplicate on pos closing entry (backport [frappe#30976](frappe#30976)) ([frappe#31005](frappe#31005)) ([0efbabe](frappe@0efbabe)) * **pos:** paid amount calculation for multicurrency invoice ([frappe#31122](frappe#31122)) ([98eb7da](frappe@98eb7da)) * remove bad default for Membership From Date ([34928d2](frappe@34928d2)) * Remove validation from Journal Entry ([4ca6cdc](frappe@4ca6cdc)) * replace document states with list settings ([78e9e66](frappe@78e9e66)) * timesheet fetching in sales invoice ([216c32f](frappe@216c32f)) * Use directly <a> and style it as button instead of using button ([0ab9fc0](frappe@0ab9fc0)) ### Features * **Employee Advance:** add 'Returned' and 'Partly Claimed and Returned' status ([42e7a86](frappe@42e7a86)) ### Reverts * Revert "fix: Add party account validation for journal entry" ([9d43a90](frappe@9d43a90))
|
Tests are failing because of WooCommerce and some cypress import resolving issues. Merging anyway. |
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: