Saqib Ansari
0373347a97
Merge branch 'develop' into separate-discount-account
2022-04-11 14:55:42 +05:30
Nabin Hait
c7848089ab
tests: Added unit tests for income tax computation report
2022-04-11 14:51:23 +05:30
Deepesh Garg
3ce64170db
feat: Item-wise provisional accounting for service items
2022-04-11 14:35:22 +05:30
rahib-hassan
a7a5742375
fix: merge conflict(patch)
2022-04-11 14:28:36 +05:30
marination
dfff4beaf4
fix: Handle multiple item transfer in separate SEs against WO
...
- Check for pending qty in child items to show/hide "Start" button
- If no qty needed to transfer (FG qty is fulfilled), but RM qty pending: map pending in SE with For Quantity = 0
2022-04-11 14:10:57 +05:30
Ankush Menat
c3e1f0e369
refactor: ignore mandatory fields during setup
2022-04-11 13:19:17 +05:30
Ankush Menat
086d31b59f
fix: dont validate currency exchange in setup
...
Redues ~4-5 seconds of time and chances of setup failure.
2022-04-11 13:19:17 +05:30
Nabin Hait
e3a53590de
fix: Added filter to consider Tax Exemption Declaration if proof not submitted
2022-04-11 12:23:13 +05:30
Nabin Hait
535217a042
fix: Added income tax slab column
2022-04-11 12:23:13 +05:30
Nabin Hait
1f018a912b
fix: Get exemptions from declaration only if proof not submitted
2022-04-11 12:23:13 +05:30
Nabin Hait
b4900ef220
fix: duplicate exemption amount and rounded tax
2022-04-11 12:23:13 +05:30
Nabin Hait
a74eec01ea
fix: Added report link in the Payroll workspace
2022-04-11 12:23:13 +05:30
Nabin Hait
a9b5d990a4
fix: Removed designation filter
2022-04-11 12:23:13 +05:30
Nabin Hait
0480bb318e
fix: Modified column width
2022-04-11 12:23:13 +05:30
Nabin Hait
f9633bbd48
feat: Income Tax Computation Report
2022-04-11 12:23:11 +05:30
HENRY Florian
03c631d723
fix: update translation ( #30654 )
2022-04-11 10:49:18 +05:30
Deepesh Garg
227a711d70
Merge pull request #30585 from frappe/mergify/bp/develop/pr-30575
...
fix: Do not apply shipping rule for POS transactions (backport #30575 )
2022-04-10 20:12:53 +05:30
Deepesh Garg
0f414d51f4
Merge pull request #30443 from frappe/mergify/bp/develop/pr-30438
...
fix: Incorrect default amount to pay for POS invoices (backport #30438 )
2022-04-10 18:56:02 +05:30
Deepesh Garg
ddbd82af95
Merge pull request #30459 from frappe/mergify/bp/develop/pr-30385
...
fix(India): Auto tax fetching based on GSTIN (backport #30385 )
2022-04-10 18:55:26 +05:30
Deepesh Garg
809117229d
Merge pull request #30626 from nextchamp-saqib/einv-utgst
...
feat(india): e-invoicing for intra-state union territory transactions
2022-04-10 18:54:17 +05:30
Ankush Menat
8138e53cf3
test: flaky picklist tests
2022-04-10 17:50:57 +05:30
Ankush Menat
c14c513214
ci: collate codecov reports before uploading
...
Currently due to flake partial reports are submitting which results in
constant fluctuation of coverage reports.
Change: First collect coverage and if all builds pass then submit it.
2022-04-10 17:50:57 +05:30
Deepesh Garg
5ac3e7e16e
Merge pull request #30664 from frappe/mergify/bp/develop/pr-30662
...
fix: Implicit ignore pricing rule check on returns (backport #30662 )
2022-04-10 17:07:03 +05:30
Deepesh Garg
a2937cffc7
fix: Implicit ignore pricing rule check on returns
...
(cherry picked from commit 1b25a7fe765d334fce990d43224f8a790ccf8119)
2022-04-09 14:46:25 +00:00
Deepesh Garg
207bf85c74
Merge pull request #30488 from Havenir/fix-project-list-in-web-view
...
fix: web form filters for project
2022-04-09 20:06:49 +05:30
Deepesh Garg
cbd8998fc1
Merge branch 'develop' into mergify/bp/develop/pr-30438
2022-04-09 20:03:23 +05:30
Deepesh Garg
02c6b898a6
Merge branch 'develop' into mergify/bp/develop/pr-30385
2022-04-09 19:57:59 +05:30
Deepesh Garg
e30cc8422c
fix: Resolve conflicts
2022-04-09 19:53:40 +05:30
Deepesh Garg
2e00678c76
Merge pull request #30542 from deepeshgarg007/disabled_tax_category
...
fix: Ignore disabled tax categories
2022-04-09 19:52:31 +05:30
mergify[bot]
51d77cd85e
fix(pos): cannot change paid amount in pos payments ( #30660 )
2022-04-09 16:28:10 +05:30
Rucha Mahabal
cf2e6c6c08
fix: remove hardcoded employee fields that can be updated via Promotion
2022-04-09 13:15:37 +05:30
rahib-hassan
dc2944a041
fix[minor]: removed doc assignment
2022-04-09 03:55:25 +05:30
rahib-hassan
e19db77b73
Merge branch 'separate-discount-account' of github.com:rahib-hassan/erpnext into separate-discount-account
2022-04-09 03:53:51 +05:30
Suraj Shetty
199419db80
Merge branch 'develop' into exotel-fixes
2022-04-08 21:37:08 +05:30
Suraj Shetty
7ff5bc9e3d
test: Clean up form_dict
...
To avoid failures like
https://github.com/frappe/erpnext/runs/5887687369?check_suite_focus=true#step:12:783
2022-04-08 21:33:29 +05:30
rahib-hassan
ac16f3b71f
fix: lock timeout exceeded
2022-04-08 18:20:41 +05:30
Ankush Menat
af6b07f9b9
fix: block cancellation of SL/GL entries ( #30652 )
...
Individual GL/SLEs aren't supposed to be cancelled by users.
2022-04-08 18:05:04 +05:30
rahib-hassan
ac7f1cbd87
fix: minor fix
2022-04-08 17:46:49 +05:30
rahib-hassan
2173c8b114
fix(pathces): added to patches.txt
2022-04-08 17:29:08 +05:30
rahib-hassan
35e875c111
fix(patch): enable discount account in buying and selling if exist in accounts settings
2022-04-08 17:27:53 +05:30
Ankush Menat
fcbd25f27a
chore: formatting
2022-04-08 17:24:10 +05:30
Deepesh Garg
b532ade383
fix: Download JSON for GSTR-1 report
2022-04-08 17:14:10 +05:30
rahib-hassan
171c60ff37
fix: removed discount account field from account settings
2022-04-08 16:50:56 +05:30
rahib-hassan
786887768e
fix: removed discount-accounting code from account settings
2022-04-08 16:50:36 +05:30
Jannat Patel
59ad7e037c
Merge pull request #30596 from pateljannat/remove-courses-template
2022-04-08 16:27:31 +05:30
rahib-hassan
b6ce497601
fix: removed discount account field from account settings
2022-04-08 15:08:21 +05:30
Ankush Menat
d74181630a
test: prevent cancelling RIV of cancelled voucher
2022-04-08 14:57:55 +05:30
Ankush Menat
a281998bcb
fix: prevent deleting repost queue for cancelled transactions
2022-04-08 14:57:55 +05:30
Deepesh Garg
617deda2ff
Merge branch 'version-14-beta' into develop
2022-04-08 13:38:27 +05:30
Ankush Menat
49560d20bc
fix: remove bad defaults from BOM operation ( #30644 )
...
[skip ci]
2022-04-08 11:23:02 +05:30
