Ankush Menat
3219b7c766
chore: codeowners
2022-10-03 16:27:13 +05:30
Sagar Sharma
3a6e4c8da7
Merge pull request #32474 from frappe/mergify/bp/version-13-hotfix/pr-32472
...
fix: pick list picked-qty for batch item (backport #32472 )
2022-10-03 15:24:02 +05:30
Sagar Sharma
96a6db0422
fix: pick list picked-qty for batch item
...
(cherry picked from commit ba02209f1d
2022-10-03 09:17:03 +00:00
rohitwaghchaure
4757a65863
fix: linter issue
2022-10-03 13:27:38 +05:30
rohitwaghchaure
0f8e34e972
fix: conflict
2022-10-03 13:18:58 +05:30
Rohit Waghchaure
2fd4485f2f
fix: not able to return sold expired batches
...
(cherry picked from commit 0b1727cf79
2022-10-03 07:46:13 +00:00
Maharshi Patel
299175e6fe
fix: payment request make bank field Link instead of Read Only
...
(cherry picked from commit dc8d49260c
2022-10-03 07:26:06 +00:00
Maharshi Patel
8251b843ec
Revert "fix: fetch swift_number in payment_request"
...
This reverts commit f42a8e4e039245d3b5cd
2022-10-03 07:26:05 +00:00
Maharshi Patel
60745705a8
fix: fetch swift_number in payment_request
...
There isn't direct link between payment_request and bank so swift_number wasn't fetched using Fetch form. I fixed it by fetching swift_number on_change of bank_account.
(cherry picked from commit f42a8e4e03
2022-10-03 07:26:04 +00:00
Deepesh Garg
caedc9f6ad
Merge pull request #32462 from frappe/mergify/bp/version-13-hotfix/pr-32456
...
fix: update with new Frappe color. fix #32455 (backport #32456 )
2022-10-03 09:15:21 +05:30
Deepesh Garg
fbeb86b9c0
Merge pull request #32453 from deepeshgarg007/intra_state_transfer_eway_bill_v13
...
fix: e-Way bill JSON for Intra-state internal transfers
2022-10-03 09:07:26 +05:30
Muvuk
ad43b18ace
fix: update with new Frappe color. fix #32455 ( #32456 )
...
* Update with new Frappe color.
* refactor: use css variables
Co-authored-by: Ankush Menat <ankushmenat@gmail.com >
(cherry picked from commit 73e5a7d671
2022-10-02 17:02:25 +00:00
Deepesh Garg
9f8d3e43ea
Merge pull request #32413 from AnandBaburajan/fix_asset_sold_status_v13
...
fix: status of assets with maintenance_required changing back to 'Partially Depreciated' some time after being sold [v13]
2022-10-02 17:43:09 +05:30
Deepesh Garg
9dbb2bf512
Merge pull request #32369 from maharshivpatel/fix-taxes-sez-without-payment-of-tax
...
fix: SEZ Without Payment of Tax don't add tax rows
2022-10-01 16:13:11 +05:30
Deepesh Garg
8c52c71299
Merge pull request #32344 from maharshivpatel/fix-payment-reconciliation-jv-cost-center
...
fix: consider cost center for journal entry in payment reconciliation tool
2022-10-01 16:12:30 +05:30
Deepesh Garg
c4c52c1cd3
chore: Linting Issues
2022-10-01 16:06:31 +05:30
Deepesh Garg
b7fbf75e10
fix: e-Way bill JSON for Intra-state internal transfers
2022-10-01 15:58:31 +05:30
Dany Robert
6dabfbedf1
Merge branch 'version-13-hotfix' into cst-ux-improvement
2022-10-01 14:19:31 +05:30
Dany Robert
68c592377b
chore: pre-commit
2022-09-30 23:41:01 -07:00
Deepesh Garg
d69d2217f6
Merge pull request #32431 from frappe/mergify/bp/version-13-hotfix/pr-32402
...
fix: Item details fetching on making transaction from item dashboard (backport #32402 )
2022-10-01 12:05:26 +05:30
mergify[bot]
cdc8297083
fix: typo in sales_register's filter mode_of_payment (backport #32371 ) ( #32447 )
...
fix: typo in sales_register's filter mode_of_payment (#32371 )
2022-10-01 12:04:40 +05:30
Dany Robert
f24f71f387
Merge branch 'version-13-hotfix' into cst-ux-improvement
2022-10-01 12:03:05 +05:30
Dany Robert
552c5951bd
feat: cst ux improvement
2022-09-30 23:25:55 -07:00
Deepesh Garg
562025eb45
Merge branch 'version-13-hotfix' into fix-payment-reconciliation-jv-cost-center
2022-10-01 11:10:21 +05:30
Deepesh Garg
f0a37f545a
chore: resolve conflicts
2022-10-01 11:02:40 +05:30
Deepesh Garg
001afb96ba
Merge pull request #32435 from frappe/mergify/bp/version-13-hotfix/pr-32412
...
fix: Incorrect TCS amount deducted in Sales Invoice (backport #32412 )
2022-10-01 11:01:05 +05:30
Deepesh Garg
61d3370527
chore: Remove print statements
...
(cherry picked from commit bff3cd9068
2022-09-30 10:36:20 +00:00
Deepesh Garg
32456bff30
fix: Incorrect TCS amount deducted in Sales Invoice
...
(cherry picked from commit 08443c6421
2022-09-30 10:36:20 +00:00
Deepesh Garg
1aed76f778
fix: Item details fetching on making transaction from item dashboard
...
(cherry picked from commit 0439e41a44
2022-09-30 10:27:36 +00:00
anandbaburajan
308c400c6a
chore: make linter happy
2022-09-30 15:33:34 +05:30
anandbaburajan
a9546dd01f
fix: mark attendance issue with relieving date
2022-09-30 15:27:03 +05:30
anandbaburajan
cb4fbd5432
fix: future attendance marking
2022-09-30 14:48:30 +05:30
anandbaburajan
6f8d62088e
fix: mark attendance issue with joining date
2022-09-30 14:46:57 +05:30
Anand Baburajan
5d66646fcd
Merge branch 'version-13-hotfix' into fix_asset_sold_status_v13
2022-09-29 22:49:10 +05:30
Sagar Sharma
6a58d15497
Merge pull request #32419 from frappe/mergify/bp/version-13-hotfix/pr-32404
...
fix(ux): show `Make Purchase Invoice` button based on permission (backport #32404 )
2022-09-29 17:16:15 +05:30
anandbaburajan
6b21deedae
chore: refactor by just using a filter
2022-09-29 15:37:04 +05:30
Sagar Sharma
7124328640
fix: show Make Purchase Invoice button based on permission
...
(cherry picked from commit 80080a3d7b
2022-09-29 09:27:03 +00:00
anandbaburajan
430a4c98a0
chore: refactor by creating is_sold
2022-09-29 08:59:49 +05:30
Anand Baburajan
c65fb64578
Merge branch 'version-13-hotfix' into fix_asset_sold_status_v13
2022-09-28 21:36:48 +05:30
anandbaburajan
14ab9d9158
fix: asset requiring maintenance sold status
2022-09-28 21:25:42 +05:30
Deepesh Garg
1095052479
Merge pull request #32410 from frappe/mergify/bp/version-13-hotfix/pr-32403
...
fix: Disbursement Account in patch to update old loans (backport #32403 )
2022-09-28 20:13:45 +05:30
Deepesh Garg
b4a511cbb4
fix: Disbursement Account in patch to update old loans
...
(cherry picked from commit be623ce8e8
2022-09-28 14:06:42 +00:00
Deepesh Garg
0b2405bbdf
Merge pull request #32395 from frappe/mergify/bp/version-13-hotfix/pr-32379
...
fix: POS only validate QTY if is_stock_item (backport #32379 )
2022-09-28 15:12:47 +05:30
Rucha Mahabal
255aa7a84a
fix: don't count half day in absent days in Monthly Attendance Sheet summarized view ( #32399 )
2022-09-28 15:02:21 +05:30
Deepesh Garg
a604eed1b9
chore: Resolve conflicts
2022-09-28 14:49:25 +05:30
Maharshi Patel
96fa14be88
fix: POS properly validate stock for bundle products
...
Stock availability was not calculated properly for Product Bundle with non stock item so i have added logic to properly calculate that as well.
(cherry picked from commit e392ea1104
2022-09-28 08:16:02 +00:00
Maharshi Patel
ac8100f1e5
fix: POS only validate QTY if is_stock_item
...
POS invoice raised " Item not available " validation error even though item is non_stock.
(cherry picked from commit e39e088f18
2022-09-28 08:16:00 +00:00
Deepesh Garg
07cc05785e
Merge pull request #32386 from frappe/mergify/bp/version-13-hotfix/pr-32382
...
fix: Move subscription process to hourly long queue (backport #32382 )
2022-09-28 10:39:08 +05:30
Deepesh Garg
f03fbc0e6d
chore: Resolve conflicts
2022-09-28 08:10:37 +05:30
Deepesh Garg
447c553954
fix: Move subscription process to hourly long quque
...
(cherry picked from commit 82a2f31ada
2022-09-27 18:09:32 +00:00
