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
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
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
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
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
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
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
