Noah Jacob
8261b2bb4f
refactor: trigger generate schedule when any change made in items table ( #29874 )
...
* refactor: trigger generate schedule when any change made in items table
* chore: added serial validation on server side
* test: serials updated in schedules after save
* fix: schedule not generating after updating some fields
* feat: generate_schedule is triggered on_save when items table is changed
* test: updated tests to check other field changes on save
* chore: removed serial validation function for schedules table and added no_of_visits validation function
* test: updated for manually deleted schedele rows
* refactor: updated validate_items_table_change to return bool
* test: updated test_schedule_with_serials to cover validate_items_table_change
* fix: linting
2022-04-12 15:30:49 +05:30
Deepesh Garg
9a1c560c82
fix: Do not show disabled dimensions in reports
2022-04-12 15:27:08 +05:30
marination
2777c5c67c
fix: Map Production Plan company in subassembly WO created from it
2022-04-12 14:30:01 +05:30
Nabin Hait
993c6c0de9
feat: Ignore permlevel for specific fields
2022-04-12 12:24:47 +05:30
Ankush Menat
60fb71bd2a
fix: ignore item-less maintenance visit for sr no ( #30684 )
2022-04-12 11:14:02 +05:30
Deepesh Garg
7d263e9ecf
Merge pull request #30651 from deepeshgarg007/gst_download_json_key_error
...
fix: Download JSON for GSTR-1 report
2022-04-12 00:06:25 +05:30
Marica
014298a867
Merge pull request #30674 from marination/work-order-partial-transfer
...
fix: Handle multiple item transfer in separate SEs against WO
2022-04-11 17:23:57 +05:30
Deepesh Garg
79b90118e1
Merge branch 'develop' into gst_download_json_key_error
2022-04-11 17:15:04 +05:30
Deepesh Garg
76d3c3d617
Merge pull request #30602 from deepeshgarg007/deferred_revenue_default_account_fixes
...
fix: Deferred Revenue/Expense Account validation
2022-04-11 17:03:01 +05:30
Marica
3f8be3ac10
Merge branch 'develop' into work-order-partial-transfer
2022-04-11 16:49:22 +05:30
marination
5aa60bb651
test: Multiple RM transfer in separate Stock Entries
...
- Added test and acceptance of 0 as For Quantity in test helper
2022-04-11 16:44:55 +05:30
Nabin Hait
e46898f5f5
fix: test cases
2022-04-11 16:37:34 +05:30
Nabin Hait
aad29ad572
fix: removed unused imports
2022-04-11 15:33:22 +05:30
marination
be2e5ce966
style: Missing Semicolon
2022-04-11 15:32:57 +05:30
Nabin Hait
c27e3ef03e
fix: Show message is no employee found
2022-04-11 15:30:26 +05:30
Deepesh Garg
553178bfe7
test: Add test
2022-04-11 15:29:20 +05:30
Nabin Hait
7072dda31f
fix: sider issues
2022-04-11 15:19:42 +05:30
Deepesh Garg
54eef3daad
Merge branch 'develop' of https://github.com/frappe/erpnext into deferred_revenue_default_account_fixes
2022-04-11 15:09:30 +05:30
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
