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

41393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Deepesh Garg
205c8c2bda
Merge pull request #30191 from abhinavxd/patch-3 
fix: incorrect payable amount for loan closure
 2022-04-02 19:53:07 +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
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
1d2e9e8e1c
Merge pull request #30521 from gavindsouza/misc-fixes-0 
fix: Handle changes in frappe's get_monthly_goal_graph_data API
 2022-04-01 17:28:59 +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
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
96fc6ad590
Merge pull request #30146 from marination/bom-update-tool 
refactor: Add exception handling in background job within BOM Update Tool
 2022-03-31 15:54:34 +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