nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 09:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,329 Commits 399 Branches 1,700 Tags
906b9562de55eea02dd69b2e7818eab09e26e2df
Commit Graph

48329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
906b9562de Merge pull request #41084 from frappe/mergify/bp/version-15-hotfix/pr-41083 
fix: validation for fraction number in Work Order (backport #41083)
 2024-04-18 15:56:07 +05:30
Rohit Waghchaure
ef2553edf9 fix: validation for fraction number in Work Order 
(cherry picked from commit f8305c2fc0)
 2024-04-18 09:15:49 +00:00
mergify[bot]
93242ca883 fix: validate uom is integer for PR item (backport #41074) (#41077) 
fix: validate uom is integer for PR item

(cherry picked from commit 9a290fdfc9)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-04-18 07:53:20 +05:30
mergify[bot]
ee7aaf0ea4 fix: don't attempt to set gender from salutation (backport #40997) (#41073) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix: don't attempt to set gender from salutation (#40997)
 2024-04-17 17:53:43 +02:00
mergify[bot]
1ae447e4fc fix: do not add qty to supplied items (backport #41061) (#41066) 
fix: do not add qty to supplied items

(cherry picked from commit 8233c392fb)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-04-17 17:30:43 +05:30
rohitwaghchaure
5195d8a765 Merge pull request #41056 from frappe/mergify/bp/version-15-hotfix/pr-41053 
fix: duplicate serial and batch bundle in stock entry and stock reco (backport #41053)
 2024-04-17 14:29:14 +05:30
Rohit Waghchaure
c10c21157d fix: duplicate serial and batch bundle in stock entry and stock reco 
(cherry picked from commit 732b6e1417)
 2024-04-17 07:50:06 +00:00
ruthra kumar
088aa94fa1 Merge pull request #40789 from frappe/mergify/bp/version-15-hotfix/pr-40786 
fix(gp): SLEs not fetched for correct warehouse (backport #40786)
 2024-04-17 10:35:09 +05:30
ruthra kumar
c34b814c16 Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-40786 2024-04-17 10:19:08 +05:30
Dany Robert
881dc02349 fix(gp): SLEs not fetched for correct warehouse 
(cherry picked from commit f958e8be06)
 2024-04-17 10:17:40 +05:30
mergify[bot]
b27ad76557 fix: not able to submit subcontracting receipt (backport #41041) (#41045) 
fix: not able to submit subcontracting receipt (#41041)

(cherry picked from commit 5b1493b56c)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-04-17 06:37:38 +05:30
mergify[bot]
40d059c7c1 fix: Delayed Order Report not working (backport #41037) (#41039) 
fix: Delayed Order Report not working (#41037)

(cherry picked from commit d69a18b826)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-04-16 18:24:38 +05:30
ruthra kumar
52b42dfc14 Merge pull request #41035 from frappe/mergify/bp/version-15-hotfix/pr-40373 
fix: get address if multiple companies (backport #40373)
 2024-04-16 16:39:39 +05:30
Nihantra C. Patel
dcfc768d33 fix: get address if multiple companies 
(cherry picked from commit 655a1797be)
 2024-04-16 11:01:58 +00:00
Nihantra Patel
ccdbad9f90 fix: get address if multiple companies 
(cherry picked from commit c6cf1bec76)
 2024-04-16 11:01:57 +00:00
mergify[bot]
f59e43320b fix: expense account set as COGS for stock entry Material Issue (backport #41026) (#41029) 
fix: expense account set as COGS for stock entry Material Issue (#41026)

(cherry picked from commit 03231e99ef)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-04-16 14:22:43 +05:30
ruthra kumar
ec337d3465 Merge pull request #41023 from frappe/mergify/bp/version-15-hotfix/pr-41020 
fix: incorrect exc gain/loss for PE against JE for payable accounts (backport #41020)
 2024-04-16 11:22:26 +05:30
ruthra kumar
59950290a2 test: exc gain/loss journals booking in Payable accounts 
(cherry picked from commit 8821c98625)
 2024-04-16 05:29:53 +00:00
ruthra kumar
361d7f1ba5 fix: incorrect exc gain/loss for PE against JE for payable accounts 
(cherry picked from commit 81b574053f)
 2024-04-16 05:29:52 +00:00
Deepesh Garg
80adafc207 Merge pull request #41017 from frappe/mergify/bp/version-15-hotfix/pr-40812 
fix: Multiple partial payment requests against Purchase Invoice (#40812)
 2024-04-16 09:35:17 +05:30
Deepesh Garg
641b2a4705 fix: Test case 
(cherry picked from commit 071e5ed648)
 2024-04-15 16:21:41 +00:00
Deepesh Garg
e287376cc8 fix: Multiple partial payment requests against Purchase Invoice 
(cherry picked from commit 45d5f6e00a)
 2024-04-15 16:21:41 +00:00
ruthra kumar
21dfb68763 Merge pull request #41009 from frappe/mergify/bp/version-15-hotfix/pr-40714 
fix: voucher no. is link field for non english user interface (backport #40714)
 2024-04-15 14:26:54 +05:30
“Khushi
1c28ed4d5b fix: voucher no. is link field for non english user interface 
(cherry picked from commit 2b8928cae6)
 2024-04-15 14:02:33 +05:30
Nabin Hait
10059309da Merge pull request #41005 from frappe/mergify/bp/version-15-hotfix/pr-40858 
fix: Don't set delivery date as today while making SO from Quotation (backport #40858)
 2024-04-15 13:05:27 +05:30
Nabin Hait
0ee91a2e54 fix: test cases 
(cherry picked from commit 65c74fa3c7)
 2024-04-15 07:03:39 +00:00
Nabin Hait
fea906b883 fix: Don't set delivery date as today while making SO from Quotation 
(cherry picked from commit fec20decc1)
 2024-04-15 07:03:38 +00:00
Deepesh Garg
128391be0a Merge pull request #40990 from frappe/mergify/bp/version-15-hotfix/pr-40985 
fix: Add payment request to dimension list (#40985)
 2024-04-13 16:37:21 +05:30
mergify[bot]
4342b891eb fix: type of transaction validation for the stock entry (backport #40986) (#40992) 
* fix: type of transaction validation for the stock entry

(cherry picked from commit 8ad0295f1b)

* chore: fix test case

---------

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2024-04-13 15:30:58 +05:30
ruthra kumar
2d94ea074c chore: patch to setup exiting dimensions in Payment Request 
(cherry picked from commit 3f8d785f02)
 2024-04-13 04:52:23 +00:00
ruthra kumar
4dbeabc8ef refactor: add payment request to dimension list 
(cherry picked from commit e93b4a1f2c)
 2024-04-13 04:52:23 +00:00
mergify[bot]
9abc71f9c8 fix: Subcontracting Receipt GL Entries (backport #40773) (#40979) 
* fix: Subcontracting Receipt GL Entries

(cherry picked from commit 9808ae92a4)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-04-12 15:15:11 +05:30
rohitwaghchaure
52ee6dcaed Merge pull request #40981 from frappe/mergify/bp/version-15-hotfix/pr-40975 
fix: do not validate batch qty for LCV (backport #40975)
 2024-04-12 14:52:54 +05:30
Rohit Waghchaure
5de9b6ac75 fix: do not validate batch qty for LCV 
(cherry picked from commit baf0c83cc5)
 2024-04-12 08:36:12 +00:00
mergify[bot]
14a1a18243 fix(ux): Sales Order Stock Reservation Dialog (backport #40707) (#40980) 
fix(ux): Sales Order Stock Reservation Dialog

(cherry picked from commit 5daf19da40)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-04-12 13:28:17 +05:30
ruthra kumar
3762259d3d Merge pull request #40974 from frappe/mergify/bp/version-15-hotfix/pr-40973 
fix: Link Validation Error on Dunning cancellation (backport #40973)
 2024-04-12 10:44:18 +05:30
ruthra kumar
0053d57ec4 fix: Link Validation Error on Dunning cancellation 
(cherry picked from commit 205fd9888c)
 2024-04-12 04:57:40 +00:00
rohitwaghchaure
ea8c57263b Merge pull request #40969 from frappe/mergify/bp/version-15-hotfix/pr-40967 
fix: zero division error (backport #40967)
 2024-04-11 18:15:36 +05:30
rohitwaghchaure
af0679076b Merge pull request #40968 from frappe/mergify/bp/version-15-hotfix/pr-40966 
fix: landed cost voucher for legacy pr with batch (backport #40966)
 2024-04-11 17:59:36 +05:30
Rohit Waghchaure
e9c6c5a8eb fix: zero division error 
(cherry picked from commit f9e230e758)
 2024-04-11 12:25:39 +00:00
Rohit Waghchaure
4e215c6b7b fix: landed cost voucher for legacy pr with batch 
(cherry picked from commit fa91cda46c)
 2024-04-11 12:12:52 +00:00
Nabin Hait
3b166ea249 Merge pull request #40891 from frappe/mergify/bp/version-15-hotfix/pr-40698 
fix: Get pro-rata amount based on correct days (backport #40698)
 2024-04-11 11:56:32 +05:30
Nabin Hait
694187b853 Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-40698 2024-04-11 11:53:20 +05:30
Nabin Hait
91fe25356e Merge pull request #40960 from nabinhait/itemised-tds-breakup-v15-hotfix 
fix: Show itemised TDS breakup based on Apply TDS checkbox on item level
 2024-04-11 11:49:34 +05:30
Nabin Hait
2e35065070 Merge pull request #40961 from nabinhait/permission-issue-v15 
fix: Ignore permissions while fetching module settings properties
 2024-04-11 11:49:21 +05:30
Nabin Hait
cca7f17b19 Merge pull request #40963 from frappe/revert-40630-mergify/bp/version-15-hotfix/pr-40514 
Revert "fix: pass empty string email content of pos invoice (backport #40514)"
 2024-04-11 11:48:49 +05:30
Nabin Hait
4591ba063c Revert "fix: pass empty string email content of pos invoice (backport #40514)" 2024-04-11 11:43:59 +05:30
Nabin Hait
5ba9fbcbdb Merge pull request #40953 from frappe/mergify/bp/version-15-hotfix/pr-40916 
fix: check if there is any existing depreciation schedule (backport #40916)
 2024-04-11 11:32:44 +05:30
Nabin Hait
23d4b01137 Merge pull request #40825 from frappe/mergify/bp/version-15-hotfix/pr-40584 
fix: show currency symbol in base currency in fixed asset register report (backport #40584)
 2024-04-11 11:30:51 +05:30
Nabin Hait
a93a9122bb Merge pull request #40955 from frappe/mergify/bp/version-15-hotfix/pr-40861 
fix: Get default party bank account and company bank account for a party (backport #40861)
 2024-04-11 11:29:30 +05:30