nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-29 06:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,344 Commits 619 Branches 1,804 Tags
060d46af42679dc571cd4599054a02c5037add00
Commit Graph

37913 Commits

Author SHA1 Message Date
Deepesh Garg
060d46af42 fix: Payment entry against employee 
(cherry picked from commit 93e6c6ccab)
 2024-04-22 06:08:47 +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
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
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
Rohit Waghchaure
74ed656bb9 fix: balance qty for stock ledger report 
(cherry picked from commit f00ae0b92b)
 2024-04-19 16:22:16 +00:00
Rohit Waghchaure
85796b3534 fix: validation for zero qty in SABB 
(cherry picked from commit 497f560b4b)
 2024-04-19 09:41:27 +00:00
Gursheen Anand
572e844a91 fix: account and stock manager read perm 2024-04-19 13:05:25 +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
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
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
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
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
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
“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
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
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
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
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
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
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
Nabin Hait
ac99d8543d Merge pull request #40958 from frappe/mergify/bp/version-15-hotfix/pr-40920 
fix: Fetch correct outstanding and total amount for reference journal entry (backport #40920)
 2024-04-11 11:28:53 +05:30
Nabin Hait
5e9f31cf21 fix: Ignore permissions while fetching module settings properties 2024-04-11 11:23:19 +05:30
Nabin Hait
4e3c885808 fix: Show itemised TDS breakup based on Apply TDS checkbox on item level 2024-04-11 11:20:38 +05:30
Nabin Hait
711bc3ff1c Merge pull request #40951 from frappe/mergify/bp/version-15-hotfix/pr-40833 
fix: wrong value for total amount in payments (backport #40833)
 2024-04-11 11:12:07 +05:30