nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 00:25:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,133 Commits 400 Branches 1,698 Tags
767a02cd15c3feef952de026154d0b262cecf685
Commit Graph

39133 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
767a02cd15 fix: cannot create multicurrency sales order with product bundles (#30222) 2022-03-14 18:33:42 +05:30
mergify[bot]
34d6031601 fix(pos): do not reset mode of payments in case of consolidation (backport #30198) (#30218) 2022-03-14 18:30:41 +05:30
Marica
9b2cb23b22 Merge pull request #30232 from frappe/mergify/bp/version-13-hotfix/pr-30229 
fix: Add missing currency option in Supplier Quotation's `rounded_total` field (backport #30229)
 2022-03-14 17:22:06 +05:30
Ankush Menat
2d8bbf1112 Merge pull request #30237 from frappe/mergify/bp/version-13-hotfix/pr-30207 
fix: Do not consider cancelled entries (backport #30207)
 2022-03-14 17:20:46 +05:30
Deepesh Garg
f23810749d fix: Do not consider cancelled entries 
(cherry picked from commit 6308e1be91)
 2022-03-14 11:49:53 +00:00
Ankush Menat
4768f4f278 fix(ux): negative stock warning 
(cherry picked from commit 02d64a32c2)
 2022-03-14 17:18:06 +05:30
Ankush Menat
aab677c26f Merge pull request #30216 from s-aga-r/fix/production-plan/validation/max_qty 
fix: max_qty validation condition in WO
 2022-03-14 17:08:21 +05:30
marination
d5b142e5ca chore: Re-arrange fields for consistency with base currency LHS 
(cherry picked from commit a579a211fd)
 2022-03-14 11:31:19 +00:00
marination
017624c270 fix: Add missing currency option in Supplier Quotation's rounded_total field 
(cherry picked from commit dcd88ddc87)
 2022-03-14 11:31:19 +00:00
Sagar Sharma
b22bdc5ff7 test: add test for planned_qty 2022-03-14 16:28:23 +05:30
Ankush Menat
1fd96f379f test(refactor): use FrappeTestCase 
(cherry picked from commit b0d1e6db54)
 2022-03-14 16:20:04 +05:30
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
Sagar Sharma
d198c488a4 fix: max_qty validation condition 2022-03-14 12:05:34 +05:30
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