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
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
Ankush Menat
fcbd25f27a
chore: formatting
2022-04-08 17:24:10 +05:30
Jannat Patel
59ad7e037c
Merge pull request #30596 from pateljannat/remove-courses-template
2022-04-08 16:27:31 +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
Ankush Menat
8d57c853f3
feat: barcode scanning in quotation ( #30637 )
2022-04-07 21:40:03 +05:30
Ankush Menat
225deb949b
fix: use empty row when batch is scanned ( #30638 )
2022-04-07 21:38:18 +05:30
Sam
8fbfba4f2f
chore: class selectors for customizability ( #30185 )
...
* Update project_row.html
Really helpful those fields has own class when styling for mobile or desktop by using Website Settings --> HTML Header, Robots and Redirects
* chore: skewercase
2022-04-07 19:27:27 +05:30
Rucha Mahabal
0562eb5f56
Merge pull request #30588 from ruchamahabal/multiple-shifts
2022-04-07 18:44:16 +05:30
Ankush Menat
bc2c6018f7
ci: mergify auto merge on passing CI + approvals
2022-04-07 18:27:47 +05:30
Rucha Mahabal
7ba66b0320
Merge branch 'develop' into multiple-shifts
2022-04-07 18:07:39 +05:30
Ankush Menat
f1fd4e5c27
test: cant_change validations on item
2022-04-07 17:30:12 +05:30
Ankush Menat
fba68541d6
refactor(Item): linked doc checking
2022-04-07 17:30:12 +05:30
Ankush Menat
2f1e98d1e8
feat: show Stock Reconciliation links on item dashboard
2022-04-07 17:30:12 +05:30
Sagar Vora
26abfd4d7c
Merge pull request #30634 from resilient-tech/fix-mutable-reassignment
...
fix: dont reassign mutable (list) to a different field
2022-04-07 17:24:52 +05:30
Sagar Vora
3b4754f3f6
fix: define tax_columns below consistency
2022-04-07 17:01:10 +05:30
Sagar Vora
fa4f57f470
fix: dont reassign mutable (list) to a different field
2022-04-07 16:51:27 +05:30
Deepesh Garg
18b1a93c7e
Merge pull request #30606 from deepeshgarg007/exchange_gain_loss_button
...
fix: Exchange gain and loss button in Payment Entry
2022-04-07 16:49:05 +05:30
Deepesh Garg
c9d6618b9b
Merge pull request #30628 from deepeshgarg007/pricng_rule_test
...
test: Pricing rule test for transactions
2022-04-07 16:37:02 +05:30
Ankush Menat
be04eaf723
fix: warehouse naming when suffix is present ( #30621 )
2022-04-07 13:21:08 +05:30
Deepesh Garg
22e8ae9dac
test: Pricing rule test for transactions
2022-04-07 13:20:53 +05:30
Saqib Ansari
45fca6bed7
feat(india): e-invoicing for intra-state union territory transactions
2022-04-07 13:09:05 +05:30
Ankush Menat
a6e26cce87
chore: broken translations
2022-04-07 13:07:14 +05:30
Deepesh Garg
f3e6a26d34
Merge pull request #30499 from ruthra-kumar/payment_terms_status_filter
...
feat: 'customer' column and more filter to Payment terms status report
2022-04-07 13:01:16 +05:30
Rucha Mahabal
ec65af5f38
fix: show allocation history for earned leaves allocated via scheduler
2022-04-07 12:57:04 +05:30
Rucha Mahabal
6203ffc8fa
fix: make New Leaves Allocated read-only if policy assignment is linked to the allocation and leave type is earned leave
2022-04-07 12:57:04 +05:30
