Update from Upstream v13 #37
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
Oct 6, 2021
… Same Rate Throughout Sales Cycle' is checked
…e Rate is Not Maintained Throughout Sales Cycle'
(cherry picked from commit 62fc544) Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
…_in_pr_dn (frappe#27430) * fix: fail migration due to None type * fix: incorrect key: value pair in filter. Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
(cherry picked from commit dae0a1c)
…3-hotfix/27433 fix: Template Error due to use of single quote
…pe#27443) * fix(ux): apply proper filtering in stock reports Stock Balance: apply company filter to warehouse field Stock Ageing: apply company filter to warehouse field * fix: unnecessary parens Co-authored-by: Alan <2.alan.tom@gmail.com> (cherry picked from commit d743c41) Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
* fix(ux): clean invalid fields from variant setting (frappe#27412) (cherry picked from commit 6ef879f) # Conflicts: # erpnext/stock/doctype/item_variant_settings/item_variant_settings.js * fix: resolve conflicts Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
…another payment days based component (frappe#27453) * fix(Payroll): incorrect component amount calculation if dependent on another payment days based component (frappe#27349) * fix(Payroll): incorrect component amount calculation if dependent on another payment days based component * fix: set component amount precision at the end * fix: consider default amount during taxt calculations * test: component amount dependent on another payment days based component * fix: test (cherry picked from commit bab644a) # Conflicts: # erpnext/payroll/doctype/salary_slip/test_salary_slip.py * fix: conflicts in test file Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
…) (frappe#27461) (cherry picked from commit a5baf90) Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
…appe#27470) * fix: employee advance return through multiple additional salaries (frappe#27438) * fix: employee advance return through multiple additional salaries * test: test repay unclaimed amount from salary * fix: sorting in imports (cherry picked from commit b98740b) * fix: remove naming rule Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
…#27456) (frappe#27474) (cherry picked from commit 95460d9) Co-authored-by: Chillar Anand <chillar@avilpage.com>
…rappe#27227) * fix: Maintain same rate in Stock Ledger until stock become positive * fix: Maintain same rate in Stock Ledger until stock become positive
…into tds_validity_v13
feat: Validity dates in Tax Withholding Rates
(cherry picked from commit 3e8e6ac)
(cherry picked from commit 0de735f)
(cherry picked from commit 18918e1)
(cherry picked from commit 3529622)
(cherry picked from commit e4b89d2)
(cherry picked from commit ff570f4)
…-release/pr-27748 fix: Chart Of Accounts import button not visible (backport frappe#27748)
- Use naming series for Website Item. There could be two items with same name and different item code - Fix: Website Item Page view breaks if cart is disabled - Fix: thumbnails not created for Website Items after patch - Fix: ‘Request for Quote’ button & cart summary not visible if checkout is disabled (cherry picked from commit 36b519c)
(cherry picked from commit 77d4849)
…-release/pr-27611 fix: Hero Slider Control & Alignment fixes (backport frappe#27611)
…-release/pr-27720 fix: Website Items with same Item name unhandled, thumbnails missing (backport frappe#27720)
(cherry picked from commit f0af24f)
…-release/pr-27712 fix(India): Internal transfer check fix (backport frappe#27712)
…) (frappe#27805) * fix: using DN for transfer w/o internal customer (frappe#27798) This used to be work before though not "advertised", since a lot of users have started using it as feature, it can't be broken now. (cherry picked from commit df1f8fd) * fix(ux): use toast instead of popup Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
(cherry picked from commit 0660d6e)
(cherry picked from commit 9507b2d)
…-release/pr-27792 fix: COA Importer showing blank validations (backport frappe#27792)
(cherry picked from commit 3d3655e)
…-release/pr-27813 fix: ignore random periodicity in validations (backport frappe#27813)
(cherry picked from commit cec66d2) Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
chore: change log for v13_12_0
Bug Fixes
Chore
Tests
Features
ContributorsGangaManoj, ankush, frappe-pr-bot, dj12djdjs, sagarvora, nextchamp-saqib, deepeshgarg007, nabinhait Commit-Lint commandsYou can trigger Commit-Lint actions by commenting on this PR:
|
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.