schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,090 Commits 322 Branches 1,581 Tags
51b17cfbc09bbef1589d5d223b98f9fb2a904b8f
Commit Graph

39090 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rucha Mahabal
51b17cfbc0 fix: add type hints for employee leave balance report 
(cherry picked from commit 430bf00458)
 2022-03-13 15:26:30 +00:00
Rucha Mahabal
4cd89c3dac test: get leave details for leave application dashboard 
(cherry picked from commit 3f3b1766c2)

# Conflicts:
#	erpnext/hr/doctype/leave_application/test_leave_application.py
 2022-03-13 15:26:30 +00:00
Rucha Mahabal
758e095ffd test: fix test test_leave_balance_near_allocaton_expiry 
(cherry picked from commit a58dfecb23)
 2022-03-13 15:26:30 +00:00
Rucha Mahabal
d9ec973096 fix: earned leave policy assignment test 
(cherry picked from commit aaa1ae94f2)
 2022-03-13 15:26:30 +00:00
Rucha Mahabal
b1d3d8226c fix: leave application dashboard 
- total leaves allocated considering cancelled leaves

- optional plural for leave category labels

- show dashboard only once from date is set, else it fetches all allocations till date and generates incorrect balance

- change pending leaves to 'Leaves Pending Approval' for better context

- update labels in Salary Slip Leave Details table

(cherry picked from commit 942511cfff)
 2022-03-13 15:26:29 +00:00
Rucha Mahabal
73b104aa45 test: Employee Leave Balance Summary 
(cherry picked from commit 88141d6116)
 2022-03-13 15:26:29 +00:00
Rucha Mahabal
49434e443c chore: remove unused imports, sort imports, fix sider 
(cherry picked from commit c7d594984a)
 2022-03-13 15:26:28 +00:00
Rucha Mahabal
6af8e9790b test: employee leave balance report 
- fix expired leaves calculation when filters span across 2 different allocation periods

(cherry picked from commit c050ce49c2)

# Conflicts:
#	erpnext/payroll/doctype/salary_slip/test_salary_slip.py
 2022-03-13 15:26:28 +00:00
Rucha Mahabal
e96b661ca1 fix: show actual balance instead of consumption balance in opening balance 
- not changing opening balance based on remaining days

(cherry picked from commit dbfa463738)
 2022-03-13 15:26:28 +00:00
Rucha Mahabal
420cb8269c fix: sort imports, sider issues 
(cherry picked from commit b5c686ac40)
 2022-03-13 15:26:28 +00:00
Rucha Mahabal
4632d13dca refactor: balance in Balance Summary report near allocation expiry date 
- Leave Balance shows minimum leaves remaining after comparing with remaining days for allocation expiry causing ambiguity

- refactor remaining leaves calculation to return both, actual leave balance and balance for consumption

- show actual balance in leave application, use balance for consumption only in validations

(cherry picked from commit 55ac8519bf)
 2022-03-13 15:26:27 +00:00
Rucha Mahabal
60eb38c911 refactor: Leaves Taken calculation 
- fix issue where Leaves Taken also adds leaves expiring on boundary date as leaves taken, causing ambiguity

- remove unnecessary `skip_expiry_leaves` function

- `get_allocation_expiry` considering cancelled entries too

(cherry picked from commit 26b40e7cfd)
 2022-03-13 15:26:27 +00:00
Rucha Mahabal
d7a75a695d fix: expired leaves not calculated properly because of newly created expiry ledger entries 
(cherry picked from commit 1ea749cf1a)
 2022-03-13 15:26:27 +00:00
Rucha Mahabal
f7b06a622f refactor: Employee Leave Balance Report 
- incorrect opening balance on boundary allocation dates

- carry forwarded leaves accounted in leaves allocated column, should be part of opening balance

- leaves allocated column also adds expired leave allocations causing negative balances, should only consider non-expiry records

(cherry picked from commit 538b64b1fa)
 2022-03-13 15:26:27 +00:00
Ankush Menat
2a00380e5b fix: attach sr no si standalone credit note 
(cherry picked from commit 1a256c62c4)
 2022-03-13 19:24:41 +05:30
Ankush Menat
625034a016 test: standalone SI creates and attaches serial nos 
(cherry picked from commit 1c37d2711a)
 2022-03-13 19:24:41 +05:30
Deepesh Garg
d71a8886b4 Merge pull request #30205 from frappe/mergify/bp/version-13-hotfix/pr-30152 
fix: Sales and Purchase return optimization (backport #30152)
 2022-03-13 17:49:19 +05:30
Deepesh Garg
abc2dd9e3e fix: Update modified timestamp 
(cherry picked from commit a5befb6bf8)
 2022-03-13 11:44:13 +00:00
Deepesh Garg
f31a7bde82 fix: Update party type 
(cherry picked from commit e9d458b822)
 2022-03-13 11:44:13 +00:00
Deepesh Garg
5eeb09c84e fix: Sales and Purchase retrun optimization 
(cherry picked from commit 395b15058c)
 2022-03-13 11:44:13 +00:00
Deepesh Garg
d47b3517f3 Merge pull request #30188 from frappe/mergify/bp/version-13-hotfix/pr-30181 
fix: Shipping rule application fixes (backport #30181)
 2022-03-13 17:14:07 +05:30
Deepesh Garg
44fd94f6b2 fix: Shipping rule application fixes 
(cherry picked from commit d596e0e4df)
 2022-03-11 06:35:03 +00:00
Ankush Menat
a04c7fc27d test: submit PR directly 
(cherry picked from commit 472fe8e319)
 2022-03-10 18:27:57 +05:30
Ankush Menat
b13389b99a test: flaky MR report test 
all test records are on same day so sorting was random in report rows.

(cherry picked from commit 6c54be0dcd)
 2022-03-10 18:27:57 +05:30
Ankush Menat
e428c36053 fix: only update valuation rate if not None 
(cherry picked from commit 7dd10367f4)
 2022-03-10 18:27:57 +05:30
mergify[bot]
f06554236f fix: fetch new fields from routing to bom (backport #30169) (#30171) 
* fix: fetch new fields in bom from routing

(cherry picked from commit 18e2a33a9b)

* fix: dont hardcode hour rate precision

(cherry picked from commit 362102e802)

# Conflicts:
#	erpnext/manufacturing/doctype/bom_operation/bom_operation.json

* fix: resolve conflict

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-10 18:09:09 +05:30
Ankush Menat
33ddbb4f3c fix: handle duplicate bins during item merge renames 
(cherry picked from commit 73901aad6f)
 2022-03-10 17:23:23 +05:30
Ankush Menat
de5500817f test: refactor item merge test and disable commits 
(cherry picked from commit b4d4ae6aa3)
 2022-03-10 17:23:23 +05:30
mergify[bot]
a5b25db880 fix: dont reset UOM in MR on every get_item_detail call (#30164) (#30165) 
(cherry picked from commit 4126455975)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-10 15:44:25 +05:30
Saqib Ansari
e89c181179 Merge pull request #30162 from frappe/mergify/bp/version-13-hotfix/pr-30103 
fix: Ignore missing customer group while fetching price list (backport #30103)
 2022-03-10 15:29:34 +05:30
Marica
584f0698ff Merge pull request #30163 from frappe/mergify/bp/version-13-hotfix/pr-30160 
fix: 'save_quotations_as_draft' checkbox not honoured (backport #30160)
 2022-03-10 15:12:02 +05:30
Marica
b529b5c0cb fix: Remove extra empty line after frappe imports 2022-03-10 14:53:48 +05:30
Marica
aec1916a0f fix: Merge Conflicts in test_shopping_cart imports 2022-03-10 14:49:05 +05:30
marination
62b50b6b63 fix: 'save_quotations_as_draft' checkbox not honoured 
- Make sure `request_for_quotation` considers `save_quotations_as_draft`
- Added test for checkout disabled quote

(cherry picked from commit a13e06156b)

# Conflicts:
#	erpnext/e_commerce/shopping_cart/test_shopping_cart.py
 2022-03-10 09:09:00 +00:00
mergify[bot]
4febcd86f8 fix: flaky tests (backport #30154) (#30161) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-03-10 14:38:08 +05:30
Saqib Ansari
3f0a4d9921 fix: Ignore missing customer group while fetching price list 
(cherry picked from commit e5fb871ef4)
 2022-03-10 09:06:42 +00:00
ChillarAnand
bb0be1699b fix: Ignore missing customer group while fetching price list 
(cherry picked from commit 9ace7d606c)
 2022-03-10 09:06:42 +00:00
Deepesh Garg
5e6879a7f7 Merge pull request #30159 from frappe/mergify/bp/version-13-hotfix/pr-29696 
fix: do not reset asset_category (backport #29696)
 2022-03-10 14:19:55 +05:30
Himanshu
5081438748 fix: do not reset asset_category (#29696) 
(cherry picked from commit 5193a63781)
 2022-03-10 08:15:21 +00:00
mergify[bot]
6c21642f32 fix(psoa): no such element: dict object['account'] (#30156) 2022-03-10 13:36:52 +05:30
Saqib Ansari
92a59fabe5 chore: imports (#30157) 
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-10 13:26:11 +05:30
Saqib Ansari
903e5d03a7 Merge pull request #30151 from frappe/mergify/bp/version-13-hotfix/pr-30145 
fix(psoa): add company filter to account (backport #30145)
 2022-03-10 13:16:44 +05:30
Saqib Ansari
cef8820369 fix(psoa): add company filter to account 
(cherry picked from commit fc42041f8f)
 2022-03-10 05:25:24 +00:00
mergify[bot]
31ba09b3d0 fix: program enrollment button labels (backport #30148) (#30149) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-03-10 10:07:47 +05:30
Marica
c9d0692fb4 Merge pull request #30141 from frappe/mergify/bp/version-13-hotfix/pr-30091 
feat: Include child item group products in Item Group Page & cleanup (backport #30091)
 2022-03-09 18:11:35 +05:30
mergify[bot]
e3387a06b6 fix: customer credit limit validation on update (#30126) 
(cherry picked from commit a0dc79332d)

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
 2022-03-09 17:49:34 +05:30
mergify[bot]
eb90d50946 fix: ignore non-unique swift numbers while migrating (#30139) 
(cherry picked from commit 4d8798b0ea)

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
 2022-03-09 17:49:11 +05:30
mergify[bot]
63e7d8c651 perf(asset): fetch only distinct depreciable assets (#30138) 
(cherry picked from commit 66f20209f6)

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
 2022-03-09 17:48:49 +05:30
Marica
458f264575 fix: Remove extra line 2022-03-09 17:35:01 +05:30
Marica
6241f9b9aa Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-30091 2022-03-09 17:33:37 +05:30