Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,671 Commits 3 Branches 0 Tags 1 GiB
00ace8f62c
Commit Graph

31935 Commits

Author SHA1 Message Date
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
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
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
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
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
rahib-hassan
1babc5f367 feat: separated discount accounting settings for sales and purchase 2022-04-08 08:05:10 +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
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
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
Rucha Mahabal
f8f1c3d8b5 fix: enable Track Changes in Leave Allocation 2022-04-07 12:57:04 +05:30
Ankush Menat
e4c6d6a1a6
fix: strip html tags before checking for empty description (#30619) 2022-04-07 12:53:10 +05:30
Deepesh Garg
8feb4f08c5 fix: Exchange gain and loss button in Payment Entry 2022-04-06 20:51:51 +05:30
Ankush Menat
8e425252c4 chore: typo 2022-04-06 18:27:41 +05:30
Ankush Menat
9e2d54f9a4 chore: broken translation 
[skip ci]
 2022-04-06 18:21:28 +05:30
Ankush Menat
eebcf2a9f1
fix: only trigger onload checks on saved docs (#30603) 2022-04-06 18:13:55 +05:30
Deepesh Garg
9bf5f76ac8 fix: Deferred Revenue/Expense Account validation 2022-04-06 17:33:46 +05:30
Ankush Menat
8b090a9f7d
fix: hide pending qty only if original item is assigned (#30599) 2022-04-06 16:35:36 +05:30
Ankush Menat
ba42c87687
refactor: don't use pandas for basic reports (#30597) 2022-04-06 15:40:41 +05:30
Jannat Patel
bce1c2a028 fix: removed unused courses template 2022-04-06 14:44:10 +05:30
Ankush Menat
bb875fe217
fix: check null values in is_cancelled patch (#30594) 2022-04-06 14:20:39 +05:30
HENRY Florian
4895761d89
fix: update translation (#30474) 
* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation
 2022-04-06 14:00:05 +05:30
Deepesh Garg
a818acf66d
Merge pull request #30557 from deepeshgarg007/loan_repayment_issue 
fix: Issues on loan repayment
 2022-04-06 11:36:53 +05:30
Rucha Mahabal
00ddb4c42a
Merge branch 'develop' into multiple-shifts 2022-04-06 11:22:46 +05:30
Rucha Mahabal
c5850e3923
Revert "feat: Scheduling Multiple shifts and Auto Attendance" (#30587) 2022-04-06 11:18:47 +05:30
Deepesh Garg
4c8dae40cd
Merge branch 'develop' into loan_repayment_issue 2022-04-06 10:57:25 +05:30
Deepesh Garg
b8df82d23c
Merge pull request #30555 from deepeshgarg007/party_account_user_perm 
fix: Ignore user perm for party account company
 2022-04-06 10:57:13 +05:30
Rucha Mahabal
f208903250
feat: Scheduling Multiple shifts and Auto Attendance (#29955) 
* 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

* refactor: consider timeslots in `get_employee_shift`

* fix: handle shift grace overlap while finding current shift

* refactor: handle shifts spanning over 2 different days

* fix: fetching shift on timing boundaries

* refactor: rewrite docstrings and add type hints for functions

* refactor: Allow multiple attendance records creation for different shifts

* feat: auto attendance marking for multiple shifts on the same day

* 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

* chore: sort imports, remove unused imports

* refactor: Monthly Attendance Sheet

- split into smaller functions

- add type hints

- get rid of unnecessary db calls and loops

- add docstrings for functions

* feat: add colors for attendance status to lessen the cognitive load

- legend with colors and full form for status abbreviations

* feat: show shift-wise attendance in monthly attendance sheet

* test: monthly attendance sheet

* style: format code with black

* chore: ignore formatting changes in blame

* test: fetching shifts in Employee Checkins

* fix(test): make holiday list for shift and checkin tests

* fix: tests

* test: shift assignment creation

* 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

* test: Shift Type with Auto Attendance setup and working

fix test setups

* refactor: Overlapping validation for Shift Request

- commonify time overlap function between request and assignment

- add tests for shift request overlap

* chore: remove unused import

* 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

* test: validations for duplicate and overlapping shift attendance records

* test: skip auto attendance

* fix: skip validation for overlapping shift attendance if no shift is linked

* test: add holiday related shift and attendance tests

* test: add attendance sheet tests for employee filter, half days

* fix: sider
 2022-04-06 10:56:47 +05:30
Deepesh Garg
dec0c1b5bb test: Ignore parent company account creation 2022-04-06 10:21:27 +05:30
Deepesh Garg
41a979ef34 Merge branch 'develop' of https://github.com/frappe/erpnext into party_account_user_perm 2022-04-06 10:15:16 +05:30
Deepesh Garg
631545aa32 fix: Use get instead of dot 
(cherry picked from commit 95298f04000c0299f35cdee7bce0f5f0d8c59525)
 2022-04-06 04:31:13 +00:00
Deepesh Garg
714fc08150 fix: Do not apply shipping rule for POS transactions 
(cherry picked from commit c0ebcfb39331caa678d36cc4694490a2363f10a0)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
 2022-04-06 04:31:13 +00:00
Deepesh Garg
ec6f7040f4
Merge branch 'develop' into mergify/bp/develop/pr-30385 2022-04-06 10:00:51 +05:30
Deepesh Garg
4727e774c0
Merge branch 'develop' into loan_repayment_issue 2022-04-06 10:00:34 +05:30
Suraj Shetty
ce583c9a81
Merge branch 'develop' into exotel-fixes 2022-04-05 19:48:44 +05:30
Marica
ff7d81020c
Merge pull request #30578 from marination/e-com-acessibility 
chore: Accessibility for E-commerce Doctypes
 2022-04-05 18:11:59 +05:30
Saqib Ansari
c4b5fa8ed1
Merge pull request #30573 from frappe/mergify/bp/develop/pr-30382 
fix: Added validation for single_threshold in Tax With Holding Category (backport #30382)
 2022-04-05 15:52:28 +05:30
Saqib Ansari
7757790572
Merge pull request #30579 from nextchamp-saqib/eway-bill-dialog-fix 
fix: fetch from fields not working in eway bill dialog
 2022-04-05 15:51:38 +05:30
Saqib Ansari
c8779aa446 fix: fetch from fields not working in eway bill dialog 2022-04-05 15:44:17 +05:30
Saqib Ansari
2451452434
Merge branch 'develop' into e-inv-paid-invoice-fix 2022-04-05 13:12:08 +05:30
marination
065623ce25 chore: Add Prices, Stock and E-com Settings access from Website Item 2022-04-05 12:30:02 +05:30
marination
d4301d6d2f chore: Accessibility for E-commerce Doctypes 
- Add Website Item routing button and dashboard link in Item master
- Group Item variant buttons together
 2022-04-05 12:07:50 +05:30
ruthra kumar
16bfb930f8 test: added test cases for group filters 2022-04-05 11:08:09 +05:30
Rucha Mahabal
0e1528365d fix: sider 2022-04-04 21:31:14 +05:30
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