nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 08:35:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,121 Commits 401 Branches 1,698 Tags
2e79c4fd598cdff8d2e1ad3dd0230b2b39577f2c
Commit Graph

39121 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
2e79c4fd59 fix(ux): remove get item buttons from submitted production plan (#30224) 
(cherry picked from commit 1af13ca4bf)

fix(patch): remove dead links to ProdPlan Item

(cherry picked from commit d3e90ed8c8)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-14 15:17:46 +05:30
Ankush Menat
468964a3f7 ci: Revert fail on merge conflict label 
This reverts commit d32f229483.
 2022-03-14 14:43:15 +05:30
Nabin Hait
98a67967a3 fix: Search query of payroll entry reference in Journal Entry (#30225) 2022-03-14 14:40:00 +05:30
Saqib Ansari
75061cae66 Merge pull request #30220 from nextchamp-saqib/backport-#26872 
fix: pos return payment mode issue (#26872)
 2022-03-14 13:41:41 +05:30
Subin Tom
a1c9d1c67f fix: pos return payment mode issue (#26872) 2022-03-14 12:53:26 +05:30
Deepesh Garg
2e10e9ec33 Merge pull request #30210 from frappe/mergify/bp/version-13-hotfix/pr-30039 
fix: Nil and Exempted values in GSTR-3B Report (backport #30039)
 2022-03-14 12:51:31 +05:30
Deepesh Garg
5c285bc019 Merge pull request #30211 from frappe/mergify/bp/version-13-hotfix/pr-29979 
fix: Multi-currency bank reconciliation fixes (backport #29979)
 2022-03-14 12:51:14 +05:30
Ankush Menat
7aca949a33 fix(ux): skip items without batch series 
(cherry picked from commit 941ea1ec74)
 2022-03-14 12:50:59 +05:30
Ankush Menat
aadc2a8849 test: negative fifo test 
(cherry picked from commit 91fd9d917a)
 2022-03-14 12:50:59 +05:30
Saqib Ansari
1120a0f72f Merge pull request #30219 from frappe/mergify/bp/version-13-hotfix/pr-30217 
fix: cannot create purchase order from sales order (backport #30217)
 2022-03-14 12:45:51 +05:30
Saqib Ansari
1cee08f3e9 fix: cannot create purchase order from sales order 
(cherry picked from commit 58804b8436)
 2022-03-14 07:05:59 +00:00
Ankush Menat
fc257fa58d test: actual bom naming test 
(cherry picked from commit 94d0f8d4e7)
 2022-03-14 09:58:14 +05:30
Rohan Bansal
c8ca92e406 fix: cancelled document check 
(cherry picked from commit 67d8a7ba86)
 2022-03-14 09:58:14 +05:30
Ankush Menat
1a2a03ed98 refactor: split versioning code for testability 
(cherry picked from commit 6b58d53403)
 2022-03-14 09:58:14 +05:30
Rohan Bansal
6a031a87da fix: improve bom autoname logic 
(cherry picked from commit 7f2670941c)
 2022-03-14 09:58:14 +05:30
Ankush Menat
25df914bc6 test: bom for item_code that is >VARCHAR_LEN 
(cherry picked from commit e2c99e02a9)
 2022-03-14 09:58:14 +05:30
Rohan Bansal
404a82121d fix: if an item code is too long, truncate before setting BOM name 
(cherry picked from commit d9c91748f4)
 2022-03-14 09:58:14 +05:30
Rucha Mahabal
164d28a87a Merge pull request #30212 from frappe/mergify/bp/version-13-hotfix/pr-29439 2022-03-13 21:46:50 +05:30
Rucha Mahabal
465c117708 fix: conflicts 2022-03-13 21:05:06 +05:30
Rucha Mahabal
d50dbca844 fix: flaky tests 
(cherry picked from commit d61c437588)
 2022-03-13 15:26:33 +00:00
Rucha Mahabal
70febe468b fix: add more type hints 
(cherry picked from commit 558650bc3a)
 2022-03-13 15:26:33 +00:00
Rucha Mahabal
9449d11a4c fix: simplify insufficient leave balance message 
(cherry picked from commit 8173e6a8ea)
 2022-03-13 15:26:32 +00:00
Rucha Mahabal
c66a66e090 fix: conflicts 
(cherry picked from commit b2c549a464)
 2022-03-13 15:26:32 +00:00
Rucha Mahabal
d4301675d1 chore: linter issue 
(cherry picked from commit 921d6b25d7)
 2022-03-13 15:26:32 +00:00
Rucha Mahabal
fab0153e34 test: separate leave ledger entries for leave applications across allocations 
(cherry picked from commit 97b7b5012e)
 2022-03-13 15:26:31 +00:00
Rucha Mahabal
75833243ae fix: boundary determination for separate ledger entries 
(cherry picked from commit 70239158b9)
 2022-03-13 15:26:31 +00:00
Rucha Mahabal
b63cedc7d7 test: leave application validations 
(cherry picked from commit 6755d6e6f5)
 2022-03-13 15:26:31 +00:00
Rucha Mahabal
bfedac47e6 fix: clearer validation/warning messages for insufficient balance in leave application 
(cherry picked from commit a504ffcc4c)
 2022-03-13 15:26:31 +00:00
Rucha Mahabal
a30ec8bef6 feat: split ledger entries for applications created across allocations 
- fix: ledger entry for expiring cf leaves not considering holidays

(cherry picked from commit c0f1e269e4)
 2022-03-13 15:26:31 +00:00
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
Deepesh Garg
8a567b8d8c fix: Multi-currency bank reconciliation fixes 
(cherry picked from commit cbb5ffb6fe)
 2022-03-13 14:57:26 +00:00
Deepesh Garg
39d6cebf1a fix: Nil and Exempted values in GSTR-3B Report 
(cherry picked from commit abe580e8b0)
 2022-03-13 14:31:37 +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