schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,352 Commits 322 Branches 1,581 Tags
3df5aa04b538bfbbfb04fe56fde1becf3c297724
Commit Graph

48352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
3df5aa04b5 Merge pull request #41153 from frappe/mergify/bp/version-15-hotfix/pr-41145 
fix: incorrect stock posting for current qty (backport #41145)
 2024-04-23 17:12:03 +05:30
Rohit Waghchaure
05d5c48d29 fix: incorrect stock posting for current qty 
(cherry picked from commit d4fe313de2)
 2024-04-23 11:21:47 +00:00
rohitwaghchaure
8591a151de Merge pull request #41143 from frappe/mergify/bp/version-15-hotfix/pr-41098 
fix: stock reconciliation negative qty validation (backport #41098)
 2024-04-23 13:43:08 +05:30
rohitwaghchaure
b2a0e4b810 chore: fix conflicts 2024-04-23 13:17:23 +05:30
Rohit Waghchaure
aee03fe2ef fix: stock reco negative qty validation 
(cherry picked from commit 289495c308)

# Conflicts:
#	erpnext/stock/stock_ledger.py
 2024-04-23 07:44:47 +00:00
Deepesh Garg
62702b8bd6 Merge pull request #41134 from frappe/mergify/bp/version-15-hotfix/pr-41104 
fix: Payment entry against employee (#41104)
 2024-04-23 12:04:13 +05:30
Deepesh Garg
cfb36cc9a8 Merge pull request #41131 from frappe/mergify/bp/version-15-hotfix/pr-40797 
fix: Party type in Payment Order (#40797)
 2024-04-23 12:03:47 +05:30
Deepesh Garg
060d46af42 fix: Payment entry against employee 
(cherry picked from commit 93e6c6ccab)
 2024-04-22 06:08:47 +00:00
Deepesh Garg
83931e872b fix: Party type in Payment Order 
(cherry picked from commit 91fa41c9ec)
 2024-04-22 06:05:12 +00:00
Gursheen Kaur Anand
a8866b61a1 Merge pull request #41124 from frappe/mergify/bp/version-15-hotfix/pr-40769 
fix: budget validation for purchase orders (backport #40769)
 2024-04-21 18:57:15 +05:30
rohitwaghchaure
f733eddf0b Merge pull request #41122 from frappe/mergify/bp/version-15-hotfix/pr-41120 
fix: search not working for so in the Production Plan (backport #36459) (backport #41120)
 2024-04-21 17:24:42 +05:30
Gursheen Anand
ba99bc5fff refactor: show list for expense breakup 
(cherry picked from commit 9a12376e29)
 2024-04-21 11:26:31 +00:00
Gursheen Anand
e047e1eb15 feat: show expense breakup 
(cherry picked from commit 59292a09c4)
 2024-04-21 11:26:31 +00:00
Gursheen Anand
c72478c74d fix: do not add actual expense twice for validating budget 
(cherry picked from commit af26ac96e9)
 2024-04-21 11:26:30 +00:00
rohitwaghchaure
544e56a71c fix: search not working for so in the Production Plan (#36459) 
fix: search not working for so
(cherry picked from commit 8c57d56240)
(cherry picked from commit 9a6e762b8b)
 2024-04-21 11:21:04 +00:00
rohitwaghchaure
bb5096075f Merge pull request #41114 from frappe/mergify/bp/version-15-hotfix/pr-41099 
fix: not able to update default supplier from Supplier Quotation Comparison report (backport #41099)
 2024-04-20 19:47:01 +05:30
Rohit Waghchaure
80891daaed fix: not able to update default supplier from Supplier Quotation Comparison report 
(cherry picked from commit ad8e189c26)
 2024-04-20 05:51:36 +00:00
rohitwaghchaure
77a764e5bd Merge pull request #41107 from frappe/mergify/bp/version-15-hotfix/pr-41102 
fix: balance qty for stock ledger report (backport #41102)
 2024-04-20 11:16:06 +05:30
Rohit Waghchaure
74ed656bb9 fix: balance qty for stock ledger report 
(cherry picked from commit f00ae0b92b)
 2024-04-19 16:22:16 +00:00
rohitwaghchaure
82ce228433 Merge pull request #41097 from frappe/mergify/bp/version-15-hotfix/pr-41067 
fix: validation for zero qty in SABB (backport #41067)
 2024-04-19 21:49:55 +05:30
Rohit Waghchaure
85796b3534 fix: validation for zero qty in SABB 
(cherry picked from commit 497f560b4b)
 2024-04-19 09:41:27 +00:00
Gursheen Kaur Anand
a1fb289290 Merge pull request #41093 from GursheenK/fy-accounts-manager-perm 
fix: accounts manager perm for FY
 2024-04-19 13:28:32 +05:30
Gursheen Anand
572e844a91 fix: account and stock manager read perm 2024-04-19 13:05:25 +05:30
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