Ankush Menat
002ae8ae13
ci: disable test orchestrator v13 ( #32574 )
2022-10-12 12:13:51 +05:30
Deepesh Garg
558dc57b94
Merge pull request #32539 from frappe/mergify/bp/version-13-hotfix/pr-32536
...
fix: PO cancel post advance payment cancel against PO (backport #32536 )
2022-10-11 13:58:24 +05:30
Deepesh Garg
cd942d36a8
chore: resolve conflicts
2022-10-11 10:16:31 +05:30
Sagar Sharma
3257533ee3
Merge pull request #32544 from frappe/mergify/bp/version-13-hotfix/pr-32497
...
chore: set `Quality Inspection` status based on readings status (backport #32497 )
2022-10-10 12:10:29 +05:30
Sagar Sharma
2763d06307
fix(test): test_rejected_qi_validation
...
(cherry picked from commit 4992e4a2b8
2022-10-10 05:21:09 +00:00
Sagar Sharma
a0772ea8d7
test: add test cases for Quality Inspection status
...
(cherry picked from commit fcc1272d42
2022-10-10 05:21:08 +00:00
Sagar Sharma
d67b44fcec
fix: set Quality Inspection status based on readings status
...
(cherry picked from commit 2657ece2cd
2022-10-10 05:21:08 +00:00
Sagar Sharma
257a2a3d71
fix: make readings status mandatory in Quality Inspection
...
(cherry picked from commit d7c3b7633a
2022-10-10 05:21:07 +00:00
Sagar Sharma
e6abbd1c83
chore: add Manual Inspection field in Quality Inspection DocType
...
(cherry picked from commit 39707757a6
2022-10-10 05:21:06 +00:00
Deepesh Garg
41599cf29f
fix: PO cancel post advance payment cancel against PO
...
(cherry picked from commit d806e32030
2022-10-09 13:05:46 +00:00
Deepesh Garg
997990c69f
Merge pull request #32523 from frappe/mergify/bp/version-13-hotfix/pr-32522
...
fix: Tax withholding related fixes (backport #32522 )
2022-10-07 18:08:31 +05:30
Deepesh Garg
2bf76f64bd
chore: resolve conflicts
2022-10-07 17:33:03 +05:30
Deepesh Garg
e1c41b9195
fix: Do not add tax withheld vouchers post tax withheding in one document
...
(cherry picked from commit 781d160c68
2022-10-07 11:03:16 +00:00
Deepesh Garg
32a9575f07
fix: Tax withholding related fixes
...
(cherry picked from commit abf5b6be3e
2022-10-07 11:03:15 +00:00
Deepesh Garg
e031e095dd
Merge pull request #32521 from FHenry/13_fr_translation
...
chore: fr translation (backport #32385 )
2022-10-07 08:48:43 +05:30
Florian HENRY
39ce3756c8
chore: fr translation
2022-10-06 22:39:40 +02:00
Deepesh Garg
f2515d9c9c
Merge pull request #32449 from rtdany10/cst-ux-improvement
...
feat(ux): improved course scheduling tool
2022-10-05 18:44:05 +05:30
Deepesh Garg
27fe9c9179
Merge pull request #32426 from AnandBaburajan/fix_mark_attendance_joining_date_and_future
...
fix: mark attendance issue with joining and relieving date, and fix future attendance marking
2022-10-05 18:34:31 +05:30
Deepesh Garg
503183cb0b
Merge pull request #32502 from frappe/mergify/bp/version-13-hotfix/pr-32499
...
fix: TooManyWritesError during reposting of stock (backport #32499 )
2022-10-05 17:29:25 +05:30
Deepesh Garg
f1ea5de022
Merge pull request #32504 from frappe/mergify/bp/version-13-hotfix/pr-32478
...
feat(JE): trigger account field when fetched from template (backport #32478 )
2022-10-05 17:29:05 +05:30
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
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
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
