Rucha Mahabal
bd077dbb3b
test: add attendance sheet tests for employee filter, half days
2022-04-04 21:26:42 +05:30
Rucha Mahabal
fec47632bc
test: add holiday related shift and attendance tests
2022-04-04 21:02:22 +05:30
Suraj Shetty
ca66224d57
Merge branch 'develop' into exotel-fixes
2022-04-04 20:22:06 +05:30
Suraj Shetty
01909d2e8c
test: Fix used frappe._dict to avoid AttributeError down the line
...
ref: https://github.com/frappe/erpnext/runs/5816574721?check_suite_focus=true#step:12:880
2022-04-04 20:21:36 +05:30
Rucha Mahabal
7675542926
Merge pull request #30569 from ruchamahabal/fix-leave-alloc-update
2022-04-04 20:18:55 +05:30
Marica
3c3aca9568
Merge pull request #30522 from marination/redisearch-app-install
...
feat: Redisearch with consent
2022-04-04 19:24:06 +05:30
Sherin KR
e796267214
fix: Validation for single threshold in Tax With Holding Category ( #30382 )
...
(cherry picked from commit 0a2c72c594963f63551985a908c1c79302556e91)
2022-04-04 13:38:43 +00:00
Rucha Mahabal
793164ac2e
fix(test): set company for employee in leave allocation test setup
2022-04-04 19:08:27 +05:30
Rucha Mahabal
5499cecffd
test: leave allocation validations and total value for updates done before and after submission
2022-04-04 18:32:17 +05:30
Ankush Menat
a9811c601c
Merge pull request #30564 from rohitwaghchaure/fixed-rejected-warehouse-issue-for-pr
...
fix: if accepted warehouse not selected during rejection then stock ledger not created
2022-04-04 18:26:17 +05:30
Suraj Shetty
117e5d05a3
Merge branch 'develop' into exotel-fixes
2022-04-04 18:21:46 +05:30
Rucha Mahabal
7b406f422d
Merge branch 'develop' into multiple-shifts
2022-04-04 18:14:49 +05:30
Marica
0a592e085c
Merge branch 'develop' into redisearch-app-install
2022-04-04 18:00:56 +05:30
Rohit Waghchaure
ac5df1abbe
test: test case to validate rejected qty without accepted warehouse
2022-04-04 17:57:57 +05:30
Rucha Mahabal
3538656a7d
fix: total leaves allocated not validated and recalculated on updates post submission
2022-04-04 17:52:30 +05:30
Ankush Menat
de83511091
fix(ux): refresh update to zero val checkbox ( #30567 )
2022-04-04 17:29:51 +05:30
ruthra kumar
b2ed9fd3fe
refactor: use group fields from Sales Order and Sales Order Items
2022-04-04 17:00:47 +05:30
Marica
569eff4f27
Merge branch 'develop' into redisearch-app-install
2022-04-04 16:10:01 +05:30
Saqib Ansari
fed66038b5
fix(pos): do not reset search input on item selection ( #30537 )
2022-04-04 15:59:16 +05:30
Rohit Waghchaure
0a71cabab1
fix: if accepted warehouse not selected during rejection then stock ledger not created
2022-04-04 15:42:59 +05:30
Ankush Menat
12c01e2975
fix: maintain FIFO queue even if outgoing_rate is not found ( #30560 )
2022-04-04 15:22:15 +05:30
ruthra kumar
e324d668d3
refactor: item filters are linked with group filters
2022-04-04 14:52:19 +05:30
Saqib Ansari
b91bf40f1b
fix: server error while viewing gst e-invoice
2022-04-04 14:40:07 +05:30
Ankush Menat
52eb0a93bb
Merge pull request #30528 from s-aga-r/is-subcontracted-fieldtype
...
refactor!: change "is_subcontracted" field type from "Select" to "Check"
2022-04-04 14:01:20 +05:30
Ankush Menat
a896895a9e
fix: bulk fix (~330) missing translations
2022-04-04 13:59:51 +05:30
Sagar Sharma
e80cd29d2e
Merge branch 'develop' into is-subcontracted-fieldtype
2022-04-04 13:31:46 +05:30
Marica
bfb2fbea5f
Merge branch 'develop' into redisearch-app-install
2022-04-04 13:27:50 +05:30
Deepesh Garg
194605823e
fix: Issues on loan repayment
2022-04-04 13:25:35 +05:30
marination
397b46a08b
chore: Add TODOs(perf) for Redisearch Query
2022-04-04 13:24:56 +05:30
Saqib Ansari
92f632c4b1
Merge branch 'develop' into e-inv-paid-invoice-fix
2022-04-04 13:10:25 +05:30
marination
3445682563
fix: Payload incorrect data (pass item_group.name)
2022-04-04 12:33:25 +05:30
Deepesh Garg
18a3c5d536
fix: Ignore user perm for party account company
2022-04-04 12:32:33 +05:30
Saqib Ansari
0c26f9a8c8
fix(india): cannot generate e-invoice for is_pos invoices
...
* If mode of payment > 18 characters, the e-invoice portal throws error
2022-04-04 12:28:09 +05:30
Ankush Menat
cf5f37e6d8
refactor: move schema change patch higher up
2022-04-04 12:15:26 +05:30
Ankush Menat
e8118fcdf1
fix: doctype layout based on expected tab-order
2022-04-04 12:06:35 +05:30
Ankush Menat
deca1aaf06
fix: dont fetch qty in reco if batch is required
2022-04-04 12:06:35 +05:30
Ankush Menat
f83a1c1989
fix: dont reset barcode in scan mode
2022-04-04 12:06:35 +05:30
Ankush Menat
1736ab57ac
feat: Barcode scanning in Stock Reconciliation
...
[skip ci]
2022-04-04 12:06:35 +05:30
marination
7ef1ccbe84
fix: Add default score of 1 to Item Group Autocompleter
...
- If score 0 is inserted into suggestions, RS does not consider that suggestion
2022-04-04 12:04:35 +05:30
marination
97e3a855f7
fix: Convert payload to string before adding to autocompleter
2022-04-04 11:32:49 +05:30
Rucha Mahabal
d9f00409b9
Merge branch 'develop' into multiple-shifts
2022-04-04 11:19:03 +05:30
Suraj Shetty
40d33b5fec
test: Use FrappeAPITestCase to track coverage
2022-04-04 11:15:29 +05:30
Rucha Mahabal
1d4b1c42f2
fix: skip validation for overlapping shift attendance if no shift is linked
2022-04-04 11:14:40 +05:30
marination
ea036e4958
fix: Better Exception Handling and vaeiabl naming
...
- Function to handle RS exceptions (create log and raise error)
- Handle `ResponseError` where it is anticipated
- Misc: Better variables
2022-04-04 11:07:53 +05:30
Rucha Mahabal
62cdde9a84
test: skip auto attendance
2022-04-04 11:05:03 +05:30
Rucha Mahabal
277bda11dd
test: validations for duplicate and overlapping shift attendance records
2022-04-04 11:04:24 +05:30
Rucha Mahabal
83489be7d9
fix: add validation for overlapping shift attendance
...
- skip auto attendance in case of overlapping shift attendance record
- this case won't occur in case of shift assignment, since it will not allow overlapping shifts to be assigned
- can happen if manual attendance records are created
2022-04-04 11:00:26 +05:30
Suraj Shetty
f4b8573e64
test: Fix erroneous code
2022-04-04 09:31:15 +05:30
Suraj Shetty
cfee53eb55
fix: Handle exception where no employee is returned
2022-04-04 07:38:15 +05:30
Suraj Shetty
39abfae5fe
chore: Remove unused code
...
- and simplify get_call_log
2022-04-04 07:28:41 +05:30
Suraj Shetty
0e9ebad9c6
test: Refactor exotel test setup
...
- Remove unnecessary code
- Move test data to separate file
- Make proper test assertions
2022-04-04 07:23:08 +05:30
Rucha Mahabal
7bd84f2696
chore: remove unused import
2022-04-03 23:58:04 +05:30
Rucha Mahabal
58fb2f7dde
refactor: Overlapping validation for Shift Request
...
- commonify time overlap function between request and assignment
- add tests for shift request overlap
2022-04-03 23:54:03 +05:30
Rucha Mahabal
6fffdcf0c7
test: Shift Type with Auto Attendance setup and working
...
fix test setups
2022-04-03 22:37:10 +05:30
Rucha Mahabal
655c1dd6ab
fix: attendance fixes
...
- check half day attendance threshold before absent threshold to avoid half day getting marked as absent
- round working hours to 2 digits for better accuracy
- start and end dates for absent attendance marking
2022-04-03 21:47:32 +05:30
Suraj Shetty
6644ebd52d
Merge branch 'develop' into exotel-fixes
2022-04-03 21:17:29 +05:30
Deepesh Garg
a7e125a540
chore: format patch file
2022-04-02 20:36:36 +05:30
Deepesh Garg
c58fde2fb2
fix: Add competitor field back
2022-04-02 20:03:46 +05:30
Deepesh Garg
7e185fb0f2
Merge branch 'develop' of https://github.com/frappe/erpnext into patch-3
2022-04-02 17:42:09 +05:30
Deepesh Garg
485f5cfdfe
fix: Resolve conflicts
2022-04-02 17:25:29 +05:30
Deepesh Garg
0f6d52c625
Merge branch 'develop' of https://github.com/frappe/erpnext into mergify/bp/develop/pr-30385
2022-04-02 17:24:19 +05:30
Subin Tom
e57e7bb02c
fix: added tests(fixed)
2022-04-02 17:16:56 +05:30
Ankush Menat
c8ead0a7ab
fix: dont send empty serial no in get_item_details
...
[skip ci]
2022-04-01 21:11:03 +05:30
Ankush Menat
6a069d6efa
feat: dont trigger selector if all info is scanned
2022-04-01 21:11:03 +05:30
Ankush Menat
47f27a5171
refactor: move scan api to stock utils; add item_info
2022-04-01 21:11:03 +05:30
Ankush Menat
9bf427985f
fix!: remove barcode field triggers
...
use "scan barcode" field instead for scanning
[skip ci]
2022-04-01 21:11:03 +05:30
Ankush Menat
530f767098
revert: "fix: ignore circular dependencies on barcode scan"
...
This reverts commit 98468fab18
.
2022-04-01 21:11:03 +05:30
Ankush Menat
767b827b59
feat: return batch code while scanning serial no
2022-04-01 21:11:03 +05:30
marination
07f17453cd
fix: Use Payload in AutoCompleter (categories in search) and misc
...
- Separate Item group and Item autocomplete dict definition
- Add payload along with Item group, containing namke and route
- Pass weightage while defining item group autocomplete dict (auto sort)
- Use payload while getting results for categories in search
- Remove check to show categories, always show
- Search fields mandatory if reidsearch enabled
- Code separation (rough)
2022-04-01 18:47:01 +05:30
Gavin D'souza
f8c9fba52d
fix: Handle changes in frappe's get_monthly_goal_graph_data API
2022-04-01 17:18:47 +05:30
Sagar Sharma
01c64915c8
chore: remove unwanted validation
2022-04-01 15:51:48 +05:30
Ankush Menat
6c5b01c60d
perf: index barcode for faster scans ( #30543 )
2022-04-01 15:27:46 +05:30
Alberto826
5d14e7860e
Fix: Remove trailing slash "/" from route ( #30532 )
...
Routes with trailing slash "/" causes a redirect to port 8080 in docker host with reverse proxy.
The Student Admission Row template has this issue.
2022-04-01 14:48:00 +05:30
Deepesh Garg
9a6a181f14
fix: Ignore disabled tax categories
2022-04-01 14:46:26 +05:30
Rucha Mahabal
65763275ae
fix: convert dates to datetime before comparing in leave days calculation and fix half day edge case ( #30538 )
2022-04-01 13:47:52 +05:30
Sagar Sharma
0a3cdc2623
chore: rename "is_subcontracted" field label to "Is Subcontracted"
2022-04-01 13:22:54 +05:30
Sagar Sharma
d074c93ac7
refactor!: change "is_subcontracted" field type from "Select" to "Check"
2022-04-01 13:22:44 +05:30
Ankush Menat
257623509d
perf: use cached single docs ( #30536 )
...
frappe.local is request specific thread local, hence is almost as good
as no caching.
2022-04-01 11:55:19 +05:30
Saqib Ansari
bfc34e1084
fix: check for debit credit difference even after round-off adjustment ( #30050 )
2022-04-01 11:03:16 +05:30
Deepesh Garg
8598d64d2c
Merge pull request #30502 from dj12djdjs/fix-pe-ex-rate-precision
...
fix(accounts): payment entry exchange rate precision
2022-04-01 09:48:15 +05:30
Deepesh Garg
df06d263ae
Merge pull request #30510 from deepeshgarg007/tax_mapping
...
fix: Taxes getting overriden from mapped to target doc
2022-04-01 09:43:19 +05:30
rohitwaghchaure
8d16c7f44b
Merge pull request #30527 from rohitwaghchaure/feat-pick-list-item-reference-in-delivery-note
...
feat: minor, pick list item reference on delivery note item table
2022-03-31 20:22:49 +05:30
Rohit Waghchaure
2f51011f91
test: test case to check pick list name has mapped or not
2022-03-31 18:47:09 +05:30
Rohit Waghchaure
2f63ae2ee9
feat: minor, pick list item reference on delivery note item table
2022-03-31 18:43:42 +05:30
Deepesh Garg
02dab021c6
Merge pull request #30500 from deepeshgarg007/auto_tax_gst
...
fix(India): Tax fetching based on tax category
2022-03-31 18:01:32 +05:30
marination
7e207c8901
fix: Call Redisearch index creation functions on enabling redisearch in settings
2022-03-31 16:29:18 +05:30
Marica
cd9d07028d
Merge branch 'develop' into bom-update-tool
2022-03-31 14:54:05 +05:30
Marica
901d8eac57
Merge pull request #30509 from marination/buying-validate-items
...
fix: Add non-existent Item check and cleanup in `validate_for_items`
2022-03-31 14:52:34 +05:30
Saqib Ansari
9af353ffa9
Merge pull request #30461 from nextchamp-saqib/fix-asset-warehouse-validation
...
fix(asset): do not validate warehouse on asset purchase
2022-03-31 14:15:16 +05:30
Deepesh Garg
e0631474c0
Merge branch 'develop' into auto_tax_gst
2022-03-31 13:52:10 +05:30
Deepesh Garg
544533ced2
Merge pull request #30486 from deepeshgarg007/account_currenct_change_test
...
fix: Account currency validation
2022-03-31 13:39:04 +05:30
marination
93f6346cea
fix: (test) change expected exception due to https://github.com/frappe/frappe/pull/16454
2022-03-31 13:07:51 +05:30
marination
2fece523f6
chore: Added BOM std filters and update type in List View
2022-03-31 12:55:48 +05:30
Saqib Ansari
4623a1bc57
fix(test): Item MacBook does not exist
2022-03-31 12:48:00 +05:30
Marica
f482b184a0
Merge branch 'develop' into bom-update-tool
2022-03-31 12:42:56 +05:30
Rucha Mahabal
d45e286216
test: shift assignment creation
2022-03-31 12:15:38 +05:30
Deepesh Garg
4720969ce6
fix: Taxes getting overriden from mapped to target doc
2022-03-31 12:14:16 +05:30
marination
982a246eec
fix: Add non-existent Item check and cleanup in validate_for_items
...
- Added a validation if invalid item code ia passed via data import/API, etc.
- Used DB APIs instead of raw sql
- Separated checks into separate functions
- Added return types to functions
- Better variable naming and removed redundant utils import in function
2022-03-31 11:47:20 +05:30
Saqib Ansari
199a6da960
perf: skip warehouse validation for non-stock items
2022-03-31 11:41:52 +05:30
Rucha Mahabal
e4cc0c1c87
fix: tests
2022-03-31 00:21:23 +05:30
Rucha Mahabal
97547da7ee
fix(test): make holiday list for shift and checkin tests
2022-03-31 00:17:32 +05:30
Devin Slauenwhite
62266b29aa
fix: exchange rate precision
2022-03-30 14:22:44 -04:00
Rucha Mahabal
af139193a5
test: fetching shifts in Employee Checkins
2022-03-30 23:27:49 +05:30
Ankush Menat
b981fae5a4
fix: remove naming series from bin, repost queue ( #30497 )
...
Removing naming series from:
1. Bin
2. Repost queue
These doctypes are not user facing and dont really need naming series.
Current implementation of naming makes stock transaction sequential if
these documents are to be created during submission.
2022-03-30 21:46:15 +05:30
Deepesh Garg
45f78977bf
Merge pull request #30493 from nabinhait/party-account-in-ar-ap-report
...
feat: Receivable/Payable Account column and filter in AR/AP report
2022-03-30 21:16:32 +05:30
Deepesh Garg
d93edbc859
fix: make test record
2022-03-30 21:07:56 +05:30
Deepesh Garg
532961fad2
fix(India): Tax fetching based on tax category
2022-03-30 19:33:44 +05:30
ruthra kumar
7558f1b078
refactor: adding new filters and column to test cases
2022-03-30 18:50:18 +05:30
ruthra kumar
eaeadbc422
feat: additional filters in payment terms status report
2022-03-30 18:50:13 +05:30
marination
a945484af4
test: Added test for 2 more validations
...
- Covers full validate function
2022-03-30 18:20:54 +05:30
marination
620575a901
fix: Type Annotations, Redundancy, etc.
...
- Renamed public function`update_new_bom` to `update_new_bom_in_bom_items`
- Replaced `get_cached_doc` with `get_doc`
- Removed click progress bar (drive through update log)
- Removed `bom_obj.update_new_bom()`, was redundant. Did same job as `update_new_bom_in_bom_items`
- Removed `update_new_bom()` in `bom.py`, unused.
- Prettier query formatting
- `update_type` annotated as non optional Literal
- Removed redundant use of JobTimeoutException
- Corrected type annotations in `create_bom_update_log()`
2022-03-30 18:03:52 +05:30
mergify[bot]
89a9afab94
fix: cast array slice index integer while splitting serial_nos array ( #30468 ) ( #30496 )
...
(cherry picked from commit 3f3717952c94af428c3d4c919aceb6b8cbae7679)
Co-authored-by: Anoop <anoop@earthianslive.com>
2022-03-30 17:00:28 +05:30
Sagar Vora
7bece37918
fix: update get_cached_value
usage based on changes in definition
2022-03-30 15:35:56 +05:30
Saqib Ansari
5408980223
Merge pull request #30453 from rahib-hassan/fix-paymentorder-row-delete
...
fix: enable row deletion in reference table
2022-03-30 15:31:54 +05:30
Rucha Mahabal
72501f2161
Merge branch 'develop' into multiple-shifts
2022-03-30 15:28:51 +05:30
Rucha Mahabal
baec607ff5
style: format code with black
2022-03-30 15:23:13 +05:30
Rucha Mahabal
acb27430ac
test: monthly attendance sheet
2022-03-30 15:14:31 +05:30
Saqib Ansari
291415d255
Merge pull request #30453 from rahib-hassan/fix-paymentorder-row-delete
...
fix: enable row deletion in reference table
2022-03-30 15:00:16 +05:30
Saqib Ansari
03e6a6c699
Merge branch 'develop' into fix-asset-warehouse-validation
2022-03-30 14:58:49 +05:30
Rucha Mahabal
9ff1904aec
fix: explicitly check if additional salary is recurring while fetching components for payroll ( #30489 )
2022-03-30 14:47:11 +05:30
Ahmad
1fdc085d17
fix: web form filter for project
2022-03-30 13:23:30 +05:00
marination
ebf00946c9
fix: Semgrep
...
- Explain explicit commits and skip semgrep
- Format client side translated string correctly
2022-03-30 13:22:29 +05:30
Ankush Menat
8ab226a2fc
test: add class to uniquely id item dashboard ( #30487 )
2022-03-30 13:20:54 +05:30
marination
79495679e2
fix: Auto format bom_update_log.py
2022-03-30 13:08:58 +05:30
marination
1d1e925bcf
test: API hit via BOM Update Tool
...
- test creation of log and it's impact
2022-03-30 13:01:01 +05:30
Deepesh Garg
d4cc7c553e
fix: Account currency validation
2022-03-30 12:43:18 +05:30
Marica
7e719a12f1
Merge pull request #30377 from marination/stock-entry-items-idx
...
fix: Dont set `idx` while adding WO items to Stock Entry
2022-03-30 11:14:18 +05:30
Saqib Ansari
87dc9c6331
Merge pull request #30470 from nextchamp-saqib/fix-dn-credit-limit-validation
...
fix: credit limit validation in delivery note
2022-03-30 11:08:25 +05:30
Marica
a51ba4cedf
Merge branch 'develop' into bom-update-tool
2022-03-30 10:36:15 +05:30
marination
b5ad626d23
fix: Linter
2022-03-30 10:22:05 +05:30
Saqib Ansari
6528218ac3
perf: skip warehouse validation for non-stock items
2022-03-29 18:43:33 +05:30
Ankush Menat
b80fac03af
fix: validate 0 transfer qty in stock entry ( #30476 )
2022-03-29 17:19:22 +05:30
Rucha Mahabal
41cfcdba44
feat: show shift-wise attendance in monthly attendance sheet
2022-03-29 16:10:46 +05:30
Rucha Mahabal
865204a541
feat: add colors for attendance status to lessen the cognitive load
...
- legend with colors and full form for status abbreviations
2022-03-29 16:10:46 +05:30
Rucha Mahabal
e79d292233
refactor: Monthly Attendance Sheet
...
- split into smaller functions
- add type hints
- get rid of unnecessary db calls and loops
- add docstrings for functions
2022-03-29 16:10:41 +05:30
Rucha Mahabal
f2ee36579b
chore: sort imports, remove unused imports
2022-03-29 16:09:47 +05:30
Rucha Mahabal
4ef2911953
refactor: mark absent for employees with no attendance
...
- break down into smaller functions
- make it work with multiple shifts
- this will mark employee as absent per shift, meaning employee can be present for one shift and absent for another on the same day
2022-03-29 16:09:39 +05:30
Rucha Mahabal
742c8f0790
feat: auto attendance marking for multiple shifts on the same day
2022-03-29 16:08:43 +05:30
Rucha Mahabal
cb3b330097
refactor: Allow multiple attendance records creation for different shifts
2022-03-29 16:05:36 +05:30
Rucha Mahabal
f6a12a902f
refactor: rewrite docstrings and add type hints for functions
2022-03-29 16:05:01 +05:30
Rucha Mahabal
e7cbb5fe6b
fix: fetching shift on timing boundaries
2022-03-29 16:02:42 +05:30
Rucha Mahabal
62e72752dc
refactor: handle shifts spanning over 2 different days
2022-03-29 16:02:17 +05:30
Rucha Mahabal
ace3f8a023
fix: handle shift grace overlap while finding current shift
2022-03-29 16:01:25 +05:30
Rucha Mahabal
625a9f69f5
refactor: consider timeslots in get_employee_shift
2022-03-29 16:01:18 +05:30
Rucha Mahabal
3711119a66
refactor: overlapping shifts validation
...
- convert raw query to frappe.qb
- check for overlapping timings if dates overlap
- translation friendly error messages with link to overlapping doc
2022-03-29 15:59:56 +05:30
Ankush Menat
b12fe0f15b
fix: dont check for failed repost while freezing ( #30472 )
...
[skip ci]
2022-03-29 13:54:26 +05:30
marination
fa3b953cf7
test: idx mapping correctness
2022-03-29 13:54:14 +05:30
Saqib Ansari
c122882884
fix: credit limit validation in delivery note
2022-03-29 13:36:00 +05:30
Marica
88a460b54e
Merge branch 'develop' into stock-entry-items-idx
2022-03-29 13:18:08 +05:30
Ankush Menat
0cb9cdb414
Merge branch 'develop' into fix-asset-warehouse-validation
2022-03-29 11:48:35 +05:30