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
gavin
b9d37152ba
Merge pull request #30494 from resilient-tech/fix-get-cached-value
...
fix: update `get_cached_value` usage based on changes in definition
2022-03-30 16:26:51 +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
0a3cf64037
chore: ignore formatting changes in blame
2022-03-30 15:24:55 +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
Ankush Menat
62c57199f2
chore: remove ui test config
...
[skip ci]
2022-03-30 12:50:37 +05:30
Deepesh Garg
d4cc7c553e
fix: Account currency validation
2022-03-30 12:43:18 +05:30
Ankush Menat
fe96254730
chore: skip style checks in sider
...
[skip ci]
2022-03-30 12:36:09 +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
Ankush Menat
d29e314c81
ci: pin click for black ( #30464 )
...
[skip ci]
2022-03-29 11:47:28 +05:30
Ankush Menat
76dce2eddc
fix: use name for links not item_code ( #30462 )
2022-03-29 11:21:03 +05:30
Saqib Ansari
b60fad6113
Merge branch 'develop' of https://github.com/frappe/erpnext into fix-asset-warehouse-validation
2022-03-29 10:50:21 +05:30
Saqib Ansari
136466d255
fix(asset): do not validate warehouse on asset purchase
2022-03-29 10:47:27 +05:30
Deepesh Garg
03952f8819
fix(India): Auto tax fetching based on GSTIN
...
(cherry picked from commit 7cae669e814a958310ca1b8ee408450569c32d10)
# Conflicts:
# erpnext/patches.txt
# erpnext/regional/india/setup.py
# erpnext/selling/doctype/quotation/quotation.json
2022-03-29 04:56:49 +00:00
Deepesh Garg
760e68b656
Merge pull request #30426 from frappe/mergify/bp/develop/pr-30395
...
fix: Write off amount wrongly calculated in POS Invoice (backport #30395 )
2022-03-29 07:56:15 +05:30
marination
639d380c1f
chore: Remove redundant idx query and value setting
...
- idx can be removed from `select_columns` as it is already in the main query
- setting idx to '' is not required as it is not used further
2022-03-28 21:00:00 +05:30
