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,175 Commits 399 Branches 1,700 Tags
722abf1b6b60a68c8a91edc356c497ab3da3e349
Commit Graph

48175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohit Waghchaure
722abf1b6b fix: pick list validation didn't consider existing draft pick list 
(cherry picked from commit 3bce4d92f6)

# Conflicts:
#	erpnext/stock/doctype/pick_list/pick_list.py
 2024-04-09 11:25:22 +00:00
Sagar Vora
566d4fa76e Merge pull request #40907 from frappe/mergify/bp/version-15-hotfix/pr-40831 2024-04-08 10:19:31 +00:00
Smit Vora
4ef4466e67 feat: new hook fields_for_group_similar_items to group additional fields for print formats (#40831) 
(cherry picked from commit f7c9e1538b)
 2024-04-08 10:18:24 +00:00
ruthra kumar
6cefe45e5b Merge pull request #40905 from frappe/mergify/bp/version-15-hotfix/pr-40878 
refactor: merge taxes from delivery note to Sales Invoice (backport #40878)
 2024-04-08 15:47:11 +05:30
ruthra kumar
d4a74923c1 test: tax merging from 2 Delivery Note to Sales Invoice 
(cherry picked from commit 39a48a2e2a)
 2024-04-08 09:09:46 +00:00
ruthra kumar
e9b87fdd42 refactor: merge taxes from delivery note to Sales Invoice 
(cherry picked from commit 550cbbd91c)
 2024-04-08 09:09:46 +00:00
ruthra kumar
7f790ca908 Merge pull request #40903 from frappe/mergify/bp/version-15-hotfix/pr-40876 
fix: ledger entries for Payment against reverse payment reconciliation (backport #40876)
 2024-04-08 09:11:33 +05:30
ruthra kumar
2373dd9b95 chore: resolve conflicts 2024-04-08 08:52:41 +05:30
ruthra kumar
67df5ae0ec refactor(test): include new fields in assertion 
(cherry picked from commit 64b7f624a5)
 2024-04-08 01:59:13 +00:00
ruthra kumar
7c0d46409f test: advance payment against reverse payment reconciliation 
(cherry picked from commit 141f462368)
 2024-04-08 01:59:13 +00:00
ruthra kumar
4ad423b1b9 test: reverse payment against payment for supplier 
(cherry picked from commit 248cc6105b)
 2024-04-08 01:59:12 +00:00
ruthra kumar
3668de7cb7 fix(test): for reverse payments, only advance acc should have effect 
This applies for Payments against Reverse-Payment reconcilition

(cherry picked from commit 74bc38e0af)
 2024-04-08 01:59:12 +00:00
ruthra kumar
d9826e3dfc refactor: supplementary field to better handle reverse payments 
(cherry picked from commit bdd36b0001)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
 2024-04-08 01:59:12 +00:00
ruthra kumar
f3eb559a71 fix: invalid ledger entries on payment against reverse payments 
On Advance payments booked on separate party account, reconciliation
against a reverse payment posted invalid ledger entries.

(cherry picked from commit 9fd2dddfde)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.py
 2024-04-08 01:59:11 +00:00
ruthra kumar
4f13f4779a fix(test): Advance Received should be under liability account 
(cherry picked from commit a75e095d00)
 2024-04-08 01:59:10 +00:00
Nabin Hait
77fd0436a8 Merge pull request #40901 from nabinhait/pro-rata-depr-v15 
fix: Get pro-rata depreciation amount based on correct days
 2024-04-07 15:43:32 +05:30
Nabin Hait
16a5475c0c fix: pro-rata amount for straight line method 2024-04-07 15:21:46 +05:30
Nabin Hait
8247fd1727 fix:linter issue 2024-04-07 15:18:29 +05:30
rohitwaghchaure
159d633a62 Merge pull request #40836 from frappe/mergify/bp/version-15-hotfix/pr-40834 
fix: translatable web footer (backport #40834)
 2024-04-07 14:36:03 +05:30
rohitwaghchaure
99a57e689d Merge pull request #40860 from frappe/mergify/bp/version-15-hotfix/pr-40848 
fix: group warehouse added in the stock reconciliation (backport #40848)
 2024-04-07 14:34:58 +05:30
rohitwaghchaure
97bf4a829a Merge pull request #40894 from frappe/mergify/bp/version-15-hotfix/pr-40883 
fix: incorrect operator causing incorrect validation (backport #40883)
 2024-04-07 14:33:43 +05:30
Nabin Hait
350d53dbe1 fix: depr amount pro rata and related tests 2024-04-07 14:14:13 +05:30
Nabin Hait
1276855f40 fix: Get pro-rata amount based on correct days 2024-04-07 14:14:06 +05:30
Rohit Waghchaure
80c2a33fd7 fix: incorrect operator causing incorrect validation 
(cherry picked from commit 6b317b0c0d)
 2024-04-07 06:34:23 +00:00
rohitwaghchaure
25e0a808cd Merge pull request #40889 from frappe/mergify/bp/version-15-hotfix/pr-40887 
fix: query_report.trigger_refresh is not a function (backport #40887)
 2024-04-07 12:02:46 +05:30
Rohit Waghchaure
4f48ede7a0 fix: query_report.trigger_refresh is not a function 
(cherry picked from commit 30bbb58ca1)
 2024-04-07 06:27:51 +00:00
ruthra kumar
0532b1fd94 Merge pull request #40869 from frappe/mergify/bp/version-15-hotfix/pr-40856 
fix: unwanted Exc Gain/Loss journals on Payment against Journal entry (backport #40856)
 2024-04-05 10:52:43 +05:30
ruthra kumar
4b78eb7e76 test: payment against JE reconciliation with different rates 
(cherry picked from commit fe84558b77)
 2024-04-05 05:04:02 +00:00
ruthra kumar
5b62f2050b fix: use reference type name to update exc rate 
(cherry picked from commit c15690e475)
 2024-04-05 05:04:02 +00:00
Rohit Waghchaure
e6d6172b4c fix: group warehouse added in the stock reconciliation 
(cherry picked from commit 8f53bc0096)
 2024-04-04 10:10:24 +00:00
Deepesh Garg
91f689575e Merge pull request #40810 from frappe/mergify/bp/version-15-hotfix/pr-40796 
fix: Default company bank account (#40796)
 2024-04-04 14:28:07 +05:30
Deepesh Garg
5c5a0c965d Merge pull request #40809 from frappe/mergify/bp/version-15-hotfix/pr-40770 
fix: Recalculate sales commission on item update (#40770)
 2024-04-04 14:27:40 +05:30
Deepesh Garg
7131e7836d Merge pull request #40808 from frappe/mergify/bp/version-15-hotfix/pr-40755 
fix: Receive payment entry from Employee (#40755)
 2024-04-04 14:24:13 +05:30
rohitwaghchaure
806a802daa Merge pull request #40853 from frappe/mergify/bp/version-15-hotfix/pr-40852 
fix: workstation refresh after prompt (backport #40852)
 2024-04-04 12:07:47 +05:30
Nihantra C. Patel
9f12c964dc fix: workstation refresh after prompt 
(cherry picked from commit bed1af26e3)
 2024-04-04 06:21:36 +00:00
rohitwaghchaure
405719cd3d Merge pull request #40838 from frappe/mergify/bp/version-15-hotfix/pr-40723 
feat: allow to pick manually qty / batches / serial nos (backport #40723)
 2024-04-02 22:55:34 +05:30
rohitwaghchaure
52c4157723 chore: fix conflicts 2024-04-02 22:23:22 +05:30
Rohit Waghchaure
5ea11af36b feat: allow to pick manually qty / batches / serial nos 
(cherry picked from commit 50dd9fa8a3)

# Conflicts:
#	erpnext/stock/doctype/pick_list/pick_list.json
 2024-04-02 16:45:23 +00:00
Raffael Meyer
e8497b2d80 fix: translatable web footer (#40834) 
(cherry picked from commit f3bcdbe5bd)
 2024-04-02 15:16:15 +00:00
rohitwaghchaure
d3044e635e Merge pull request #40832 from frappe/mergify/bp/version-15-hotfix/pr-40828 
chore: remove rate of material based on Manual (backport #40828)
 2024-04-02 19:41:04 +05:30
rohitwaghchaure
ca6caa86bc chore: fix conflicts 2024-04-02 19:18:02 +05:30
rohitwaghchaure
152921b82a chore: fix conflicts 2024-04-02 19:17:41 +05:30
Rohit Waghchaure
ecc317d690 chore: remove rate of material based on Manual 
(cherry picked from commit 0b63dbf221)

# Conflicts:
#	erpnext/manufacturing/doctype/bom/bom.json
#	erpnext/manufacturing/doctype/bom_creator/bom_creator.json
 2024-04-02 12:42:22 +00:00
rohitwaghchaure
6607e6b2c3 Merge pull request #40822 from frappe/mergify/bp/version-15-hotfix/pr-40816 
fix: added validation if parent id is missing in BOM Creator (backport #40816)
 2024-04-02 15:37:29 +05:30
Rohit Waghchaure
87ce9d834f fix: added validation if parent id is missing in BOM Creator 
(cherry picked from commit 0a1fab762f)
 2024-04-02 09:43:37 +00:00
rohitwaghchaure
204aea856d Merge pull request #40817 from frappe/mergify/bp/version-15-hotfix/pr-40814 
fix: barcode not fetched on selection of item (backport #40814)
 2024-04-02 14:22:58 +05:30
Rohit Waghchaure
2b1b51b5bb fix: barcode not fetched on selection of item 
(cherry picked from commit b0730293e2)
 2024-04-02 05:52:11 +00:00
Deepesh Garg
d8c5f15bc0 fix: Default company bank account 
(cherry picked from commit 7ac91deb83)
 2024-04-01 15:09:57 +00:00
Deepesh Garg
5117494a52 fix: Recalculate sales commission on item update 
(cherry picked from commit f76da50b7e)
 2024-04-01 15:09:05 +00:00
Deepesh Garg
0cee954f84 fix: Receive payment entry from Employee 
(cherry picked from commit 29e5c6807e)
 2024-04-01 15:08:35 +00:00