Dany Robert
baa4fec611
feat(JE): trigger account field when fetched from template
...
Closes #32409
(cherry picked from commit c35adcf5a1
2022-10-05 10:38:21 +00:00
Rohit Waghchaure
476175b307
fix: TooManyWritesError during reposting of stock
...
(cherry picked from commit aaabba9b1e
2022-10-05 10:35:55 +00:00
Frappe PR Bot
de584535e9
chore(release): Bumped to Version 13.39.4
...
## [13.39.4](https://github.com/frappe/erpnext/compare/v13.39.3...v13.39.4 ) (2022-10-04)
### Bug Fixes
* asset requiring maintenance sold status ([14ab9d914ab9d91580f8e34e0f8e34e972b4a511cb4a511cbb4b7fbf75b7fbf75e10607457060745705a832456bf32456bff301aed76f1aed76f7784757a654757a658632fd44852fd4485f2f9f988919f988910b5299175e299175e6fe96a6db096a6db0422a13eecca13eecc96171243287124328640#32371 ](https://github.com/frappe/erpnext/issues/32371 )) ([#32447 ](https://github.com/frappe/erpnext/issues/32447 )) ([cdc8297cdc8297083#32455 ](https://github.com/frappe/erpnext/issues/32455 ) ([#32456 ](https://github.com/frappe/erpnext/issues/32456 )) ([ad43b18ad43b18ace8251b848251b843ec
2022-10-04 12:14:27 +00:00
Deepesh Garg
d95d234aa4
Merge pull request #32494 from frappe/version-13-hotfix
...
chore: release v13
2022-10-04 17:41:06 +05:30
rohitwaghchaure
3648745e5e
Merge pull request #32470 from frappe/mergify/bp/version-13-hotfix/pr-32466
...
fix: not able to return sold expired batches (backport #32466 )
2022-10-04 07:35:10 +05:30
Deepesh Garg
8e1e6a194b
Merge pull request #32467 from frappe/mergify/bp/version-13-hotfix/pr-32394
...
fix: fetch swift number in payment request from bank doctype (backport #32394 )
2022-10-03 21:54:05 +05:30
Ankush Menat
663e9b403f
chore: codeowners
2022-10-03 16:27:32 +05:30
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
Frappe PR Bot
34284216cd
chore(release): Bumped to Version 13.39.3
...
## [13.39.3](https://github.com/frappe/erpnext/compare/v13.39.2...v13.39.3 ) (2022-10-02)
### Bug Fixes
* asset requiring maintenance sold status ([a668d4ea668d4e789
2022-10-02 15:39:08 +00:00
Deepesh Garg
5c6c9812c0
Merge pull request #32458 from frappe/mergify/bp/version-13/pr-32413
...
fix: status of assets with maintenance_required changing back to 'Partially Depreciated' some time after being sold [v13] (backport #32413 )
2022-10-02 21:07:00 +05:30
anandbaburajan
4afd2b7470
chore: refactor by just using a filter
...
(cherry picked from commit 6b21deedae
2022-10-02 12:14:41 +00:00
anandbaburajan
bc21ce412b
chore: refactor by creating is_sold
...
(cherry picked from commit 430a4c98a0
2022-10-02 12:14:41 +00:00
anandbaburajan
a668d4e789
fix: asset requiring maintenance sold status
...
(cherry picked from commit 14ab9d9158
2022-10-02 12:14:40 +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
