Merge from upstream v13 - #56

Merged

vjFaLk merged 192 commits into

ParsimonyGit:parsimony-production-v13from

Alchez:merge-v13

Mar 22, 2022

Commits on Feb 21, 2022

fix: Multiple fixes in Gross Profit report

deepeshgarg007
authored and
mergify-bot
committed
fix: Update columns in new format

deepeshgarg007
authored and
mergify-bot
committed
fix: Remove unused param

deepeshgarg007
authored and
mergify-bot
committed
fix: Gross profit for credit notes

deepeshgarg007
authored and
mergify-bot
committed

Commits on Feb 22, 2022

feat: Bank Reconciliation for loan documents

deepeshgarg007
authored and
mergify-bot
committed
fix: Add patch for account fields

deepeshgarg007
authored and
mergify-bot
committed
fix: Update queries in Bank Reconciliation Tool

deepeshgarg007
authored and
mergify-bot
committed
fix: Update bank reconciliation statement

deepeshgarg007
authored and
mergify-bot
committed
fix: Remove print statements

deepeshgarg007
authored and
mergify-bot
committed

Commits on Feb 23, 2022

Commits on Feb 28, 2022

Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-29865
deepeshgarg007
authored

Commits on Mar 7, 2022

fix: wrong payment days in salary slip for employees joining/leaving during mid payroll dates (backport #29082) (#30099)

authored

Commits on Mar 8, 2022

Commits on Mar 9, 2022

fix: Reload doctypes
deepeshgarg007
committed
fix: Ambigous column in picklist query

deepeshgarg007
authored and
mergify-bot
committed
fix: Remove unintentional changes

deepeshgarg007
authored and
mergify-bot
committed
fix: Item-wise sales history report

deepeshgarg007
authored and
mergify-bot
committed
Merge pull request #30122 from frappe/mergify/bp/version-13-hotfix/pr-30102
ankush
authored
Merge pull request #30123 from frappe/mergify/bp/version-13-hotfix/pr-30080
ankush
authored
fix: add filters in default_discount_account (#30095)
Mohamed-D-Ouf
authored
Merge pull request #29949 from frappe/mergify/bp/version-13-hotfix/pr-29865
deepeshgarg007
authored
fix(ux): Improve label for better understanding

deepeshgarg007
authored and
mergify-bot
committed
fix: dont fetch entire barcode table in get_item_details (#30131) (#30134)

mergify[bot]
and
ankush
authored
fix: dont fetch entire barcode table in get_item_details (#30131) (#30135)

mergify[bot]
and
ankush
authored
Merge pull request #30133 from frappe/mergify/bp/version-13-hotfix/pr-30096
deepeshgarg007
authored
chore: bump version
ankush
committed
fix: Remove tax invoice no field

deepeshgarg007
authored and
mergify-bot
committed
fix: Update timestamp

deepeshgarg007
authored and
mergify-bot
committed
Merge pull request #30137 from frappe/mergify/bp/version-13-hotfix/pr-30136
deepeshgarg007
authored
feat: Include child item group products in Item Group Page & cleanup

marination
authored and
mergify-bot
committed
test: Test include_descendants in Item Group Product Listing

marination
authored and
mergify-bot
committed
fix: Linter

marination
authored and
mergify-bot
committed
revert: BU Schlüssel (a21f76f) (#30142)

mergify[bot]
and
barredterra
authored
fix(translation) - correction for translation

HarryPaulo
authored and
mergify-bot
committed
fix: Merge conflicts
marination
authored
test: Added test for monthly attendance report (backport #29989) (#30143)

authored
Merge pull request #30144 from frappe/mergify/bp/version-13-hotfix/pr-30000
marination
authored
Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-30091
marination
authored
fix: Remove extra line
marination
authored
perf(asset): fetch only distinct depreciable assets (#30138)

mergify[bot]
and
nextchamp-saqib
authored
fix: ignore non-unique swift numbers while migrating (#30139)

mergify[bot]
and
nextchamp-saqib
authored
fix: customer credit limit validation on update (#30126)

mergify[bot]
and
nextchamp-saqib
authored
Merge pull request #30141 from frappe/mergify/bp/version-13-hotfix/pr-30091
marination
authored

Commits on Mar 10, 2022

Commits on Mar 11, 2022

fix: Shipping rule application fixes

deepeshgarg007
authored and
mergify-bot
committed

Commits on Mar 13, 2022

Merge pull request #30188 from frappe/mergify/bp/version-13-hotfix/pr-30181
deepeshgarg007
authored
fix: Sales and Purchase retrun optimization

deepeshgarg007
authored and
mergify-bot
committed
fix: Update party type

deepeshgarg007
authored and
mergify-bot
committed
fix: Update modified timestamp

deepeshgarg007
authored and
mergify-bot
committed
Merge pull request #30205 from frappe/mergify/bp/version-13-hotfix/pr-30152
deepeshgarg007
authored
test: standalone SI creates and attaches serial nos
ankush
committed
fix: attach sr no si standalone credit note
ankush
committed
fix: Nil and Exempted values in GSTR-3B Report

deepeshgarg007
authored and
mergify-bot
committed
fix: Multi-currency bank reconciliation fixes

deepeshgarg007
authored and
mergify-bot
committed
refactor: Employee Leave Balance Report

ruchamahabal
authored and
mergify-bot
committed
fix: expired leaves not calculated properly because of newly created expiry ledger entries

ruchamahabal
authored and
mergify-bot
committed
refactor: Leaves Taken calculation

ruchamahabal
authored and
mergify-bot
committed
refactor: balance in Balance Summary report near allocation expiry date

ruchamahabal
authored and
mergify-bot
committed
fix: sort imports, sider issues

ruchamahabal
authored and
mergify-bot
committed
fix: show actual balance instead of consumption balance in opening balance

ruchamahabal
authored and
mergify-bot
committed
test: employee leave balance report

ruchamahabal
authored and
mergify-bot
committed
chore: remove unused imports, sort imports, fix sider

ruchamahabal
authored and
mergify-bot
committed
test: Employee Leave Balance Summary

ruchamahabal
authored and
mergify-bot
committed
fix: leave application dashboard

ruchamahabal
authored and
mergify-bot
committed
fix: earned leave policy assignment test

ruchamahabal
authored and
mergify-bot
committed
test: fix test `test_leave_balance_near_allocaton_expiry`

ruchamahabal
authored and
mergify-bot
committed
test: get leave details for leave application dashboard

ruchamahabal
authored and
mergify-bot
committed
fix: add type hints for employee leave balance report

ruchamahabal
authored and
mergify-bot
committed
feat: split ledger entries for applications created across allocations

ruchamahabal
authored and
mergify-bot
committed
fix: clearer validation/warning messages for insufficient balance in leave application

ruchamahabal
authored and
mergify-bot
committed
test: leave application validations

ruchamahabal
authored and
mergify-bot
committed
fix: boundary determination for separate ledger entries

ruchamahabal
authored and
mergify-bot
committed
test: separate leave ledger entries for leave applications across allocations

ruchamahabal
authored and
mergify-bot
committed
chore: linter issue

ruchamahabal
authored and
mergify-bot
committed
fix: conflicts

ruchamahabal
authored and
mergify-bot
committed
fix: simplify insufficient leave balance message

ruchamahabal
authored and
mergify-bot
committed
fix: add more type hints

ruchamahabal
authored and
mergify-bot
committed
fix: flaky tests

ruchamahabal
authored and
mergify-bot
committed
fix: conflicts
ruchamahabal
authored
Merge pull request #30212 from frappe/mergify/bp/version-13-hotfix/pr-29439
ruchamahabal
authored

Commits on Mar 14, 2022

fix: if an item code is too long, truncate before setting BOM name

Rohan Bansal
authored and
ankush
committed
test: bom for item_code that is >VARCHAR_LEN
ankush
committed
fix: improve bom autoname logic

Rohan Bansal
authored and
ankush
committed
refactor: split versioning code for testability
ankush
committed
fix: cancelled document check

Rohan Bansal
authored and
ankush
committed
test: actual bom naming test
ankush
committed
fix: max_qty validation condition
s-aga-r
committed
fix: cannot create purchase order from sales order

nextchamp-saqib
authored and
mergify-bot
committed
Merge pull request #30219 from frappe/mergify/bp/version-13-hotfix/pr-30217
nextchamp-saqib
authored
test: negative fifo test
ankush
committed
fix(ux): skip items without batch series
ankush
committed
Merge pull request #30211 from frappe/mergify/bp/version-13-hotfix/pr-29979
deepeshgarg007
authored
Merge pull request #30210 from frappe/mergify/bp/version-13-hotfix/pr-30039
deepeshgarg007
authored
fix: pos return payment mode issue (#26872)

nemesis189
authored and
nextchamp-saqib
committed
Merge pull request #30220 from nextchamp-saqib/backport-#26872
nextchamp-saqib
authored
fix: Search query of payroll entry reference in Journal Entry (#30225)
nabinhait
authored
ci: Revert fail on merge conflict label
ankush
committed
fix(ux): remove get item buttons from submitted production plan (#30224)

mergify[bot]
and
ankush
authored
test(refactor): use FrappeTestCase
ankush
committed
test: add test for planned_qty
s-aga-r
committed
fix: Add missing currency option in Supplier Quotation's `rounded_total` field

marination
authored and
mergify-bot
committed
chore: Re-arrange fields for consistency with base currency LHS

marination
authored and
mergify-bot
committed
Merge pull request #30216 from s-aga-r/fix/production-plan/validation/max_qty
ankush
authored
fix: max_qty validation condition

s-aga-r
authored and
mergify-bot
committed
test: add test for planned_qty

s-aga-r
authored and
mergify-bot
committed
Merge pull request #30235 from frappe/mergify/bp/version-13-pre-release/pr-30216
ankush
authored
fix(ux): negative stock warning
ankush
committed
fix: Do not consider cancelled entries

deepeshgarg007
authored and
mergify-bot
committed
Merge pull request #30237 from frappe/mergify/bp/version-13-hotfix/pr-30207
ankush
authored
Merge pull request #30232 from frappe/mergify/bp/version-13-hotfix/pr-30229
marination
authored
fix(pos): do not reset mode of payments in case of consolidation (backport #30198) (#30218)
mergify[bot]
authored
fix: cannot create multicurrency sales order with product bundles (#30222)
mergify[bot]
authored
fix: BOM - clear Quality Inspection Template according to Inspection Quality Required

FHenry
authored and
ankush
committed
test: refactor BOM quality template test
ankush
committed
fix: show status in job card list view in Draft mode
akurungadam
committed
fix: job card - sub operations table status misbehaviour on pause / resume Job Card
akurungadam
committed
fix: Do not update ignore prcing rule check implicitly

deepeshgarg007
authored and
mergify-bot
committed
fix: KSA E-Invoice QR Code showing wrong VAT amount

deepeshgarg007
authored and
mergify-bot
committed
fix: Linting Issue

deepeshgarg007
authored and
mergify-bot
committed
fix: Itemised tax rate updation

deepeshgarg007
authored and
mergify-bot
committed
Update erpnext/regional/saudi_arabia/utils.py

authored and
mergify-bot
committed

Commits on Mar 15, 2022

Commits on Mar 16, 2022

Commits on Mar 17, 2022

fix: Non Profit fixes (#30280)
ruchamahabal
authored
test: fix holiday list creation causing flaky tests (backport #30260) (#30288)

mergify[bot]
and
ruchamahabal
authored
Merge pull request #30291 from ankush/13_23_pre_release
ankush
authored
fix: Clean and fixes in Dimension-wise Accounts Balance Report

deepeshgarg007
authored and
mergify-bot
committed
fix: Remove comments

deepeshgarg007
authored and
mergify-bot
committed
fix: Error in bank reco statement

deepeshgarg007
authored and
mergify-bot
committed
Merge pull request #30294 from frappe/mergify/bp/version-13-pre-release/pr-30261
deepeshgarg007
authored
fix: Validate income/expense account in sales and purchase invoice

deepeshgarg007
authored and
mergify-bot
committed
fix: Test case

deepeshgarg007
authored and
mergify-bot
committed
Merge pull request #30297 from frappe/mergify/bp/version-13-pre-release/pr-30266
deepeshgarg007
authored

Commits on Mar 18, 2022

Commits on Mar 20, 2022

chore: add change log for v13.23.0
ankush
committed

Commits on Mar 21, 2022