nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-09 00:01:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,993 Commits 459 Branches 1,746 Tags
1367e09f0fd14ecadb46ad0d4866ea84df0e5005
Commit Graph

43993 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
bb8e232aea fix: list view for Terms and Conditions (#33925) 
fix: list view for Terms and Conditions (#33925)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit ab7293bcd3)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-02-11 11:53:27 +05:30
Deepesh Garg
dc8fc813ff Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-33777 2023-02-11 11:20:53 +05:30
mergify[bot]
52bfb66729 feat: Add filters in Loan Interest Report (#33907) 
* feat: Add filters in Loan Interest Report (#33907)

(cherry picked from commit e478a5d0ce)

* chore: remove flaky tests

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-11 11:20:10 +05:30
mergify[bot]
6e8a985bc6 chore: typo in stock_entry get_uom_details (backport #33998) (#34003) 
chore: typo in stock_entry get_uom_details (#33998)

fix: typo in stock_entry get_uom_details
(cherry picked from commit 185c543b73)

Co-authored-by: Akshay <60477442+akshayitzme@users.noreply.github.com>
 2023-02-10 20:55:03 +05:30
Anand Baburajan
eab3c41a7b Merge pull request #33962 from frappe/mergify/bp/version-14-hotfix/pr-33946 
fix: allow cancelling purchase invoice if linked asset is already cancelled (backport #33946)
 2023-02-05 17:11:53 +05:30
anandbaburajan
68df9ad83c chore: use continue, not break 
(cherry picked from commit 3380dc5dea)
 2023-02-05 10:37:40 +00:00
anandbaburajan
c98b2b5918 fix: allow PI cancel if linked asset is cancelled 
(cherry picked from commit b961321de5)
 2023-02-05 10:37:40 +00:00
rohitwaghchaure
18a1707df9 Merge pull request #33955 from frappe/mergify/bp/version-14-hotfix/pr-33936 
fix: negative stock error (backport #33936)
 2023-02-05 12:13:30 +05:30
Sagar Sharma
6f8ff6f41d Merge pull request #33958 from frappe/mergify/bp/version-14-hotfix/pr-33942 
fix: stock entry from item dashboard (stock levels) (backport #33942)
 2023-02-05 10:05:13 +05:30
s-aga-r
04a474d0a1 fix: stock entry from item dashboard (stock levels) 
(cherry picked from commit dc0ddf8d7e)
 2023-02-05 04:17:17 +00:00
Rohit Waghchaure
388cc31e9e test: test case 
(cherry picked from commit 9ae7578b07)
 2023-02-04 18:05:47 +00:00
Rohit Waghchaure
e0cd6c20a3 fix: negative stock error 
(cherry picked from commit 6d513e2519)
 2023-02-04 18:05:47 +00:00
rohitwaghchaure
6df730ce96 Merge pull request #33954 from frappe/mergify/bp/version-14-hotfix/pr-33941 
fix: default due_date was wrong calculated on template "_Test Payment Term Template 1" (last day of next month) (backport #33941)
 2023-02-04 23:34:32 +05:30
developsessions
d2836c16a7 style: apply results of lint run 
(cherry picked from commit c8cd351b39)
 2023-02-04 17:05:39 +00:00
developsessions
7228a492ef fix: failed test, convert date time to string 
(cherry picked from commit 9d0096ad9e)
 2023-02-04 17:05:39 +00:00
developsessions
ced9274d1b fix: Add missing 1 required positional argument: 'bill_date' 
(cherry picked from commit be1f941996)
 2023-02-04 17:05:38 +00:00
developsessions
76c4dc8177 style: lint wrong from position 
(cherry picked from commit c80aaad437)
 2023-02-04 17:05:38 +00:00
developsessions
c8c9c50993 fix: default due_date was wrong calculated on template "_Test Payment Term Template 1" (last day of next month) 
(cherry picked from commit ce8a1086a7)
 2023-02-04 17:05:38 +00:00
Sagar Sharma
bccfb8184e Merge pull request #33950 from frappe/mergify/bp/version-14-hotfix/pr-33940 
chore: report `Warehouse wise Item Balance Age and Value` (backport #33940)
 2023-02-04 18:59:28 +05:30
s-aga-r
00e93dc076 chore: add Item Name column in Warehouse wise Item Balance Age and Value report 
(cherry picked from commit 56356ffbb9)
 2023-02-04 07:58:41 +00:00
s-aga-r
9f3bb84990 chore: column width in Warehouse wise Item Balance Age and Value report 
(cherry picked from commit d7a665cb84)
 2023-02-04 07:58:41 +00:00
ruthra kumar
3ce8dc70cb perf: reduce memory usage by paging through records 
While migrating GL entries to Payment Ledger, page through records using
primary key to reduce memory usage.

(cherry picked from commit fee0ca8cd9)
 2023-02-02 11:19:17 +00:00
ruthra kumar
c191a3f7c6 perf: reduce memory usage while migrating remarks 
Page through records using primary key

(cherry picked from commit 9bb64107c5)
 2023-02-02 11:18:12 +00:00
Sagar Sharma
6e7eee7fa3 Merge pull request #33913 from frappe/mergify/bp/version-14-hotfix/pr-33910 
feat: add incoterm named place to RFQ (backport #33910)
 2023-02-02 10:33:15 +05:30
Sagar Sharma
bf23984b4f Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-33910 2023-02-02 10:30:22 +05:30
rohitwaghchaure
f5a0da21a7 Merge pull request #33921 from frappe/mergify/bp/version-14-hotfix/pr-33918 
fix: incorrect actual qty in Bin (backport #33918)
 2023-02-01 22:21:39 +05:30
Rohit Waghchaure
01ff6a1f19 fix: incorrect actual qty in Bin 
(cherry picked from commit f8c852c54c)
 2023-02-01 12:53:57 +00:00
barredterra
68a1615eae feat: add incoterm named place to RFQ 
(cherry picked from commit 7156184933)
 2023-02-01 05:11:00 +00:00
Sagar Sharma
2605e8a049 Merge pull request #33899 from frappe/mergify/bp/version-14-hotfix/pr-33715 
fix: consider existing pick-list (backport #33715)
 2023-01-31 16:39:44 +05:30
Sagar Sharma
9c2aba6619 Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-33715 2023-01-31 16:15:19 +05:30
s-aga-r
075c547184 chore: conflicts 2023-01-31 16:14:45 +05:30
Sagar Sharma
cd00962b3a Merge pull request #33897 from frappe/mergify/bp/version-14-hotfix/pr-33869 
fix: `amount` in `Material Request` (backport #33869)
 2023-01-31 16:02:14 +05:30
Sagar Sharma
956b45ec2a Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-33869 2023-01-31 16:01:57 +05:30
rohitwaghchaure
b5baf3aa74 Merge pull request #33900 from frappe/mergify/bp/version-14-hotfix/pr-33896 
feat: mandatory and mandatory depends on in inventory dimension (backport #33896)
 2023-01-31 15:28:53 +05:30
Rohit Waghchaure
f47b05f58c test: added test case 
(cherry picked from commit 22d0e1373b)
 2023-01-31 09:49:06 +00:00
Rohit Waghchaure
3aca84c43f feat: mandatory and mandatory depends on in inventory dimension 
(cherry picked from commit 423f2b5627)
 2023-01-31 09:49:05 +00:00
s-aga-r
df72e4a221 fix: consider stock_qty if picked_qty is zero 
(cherry picked from commit 6ffdeb1af8)
 2023-01-31 09:41:20 +00:00
s-aga-r
4f56c72bed refactor: test_consider_existing_pick_list() 
(cherry picked from commit 0b76a26c8a)
 2023-01-31 09:41:20 +00:00
s-aga-r
cdb6abf569 test: add test cases 
(cherry picked from commit bb7fe795fe)
 2023-01-31 09:41:19 +00:00
s-aga-r
7124c0ca30 fix(test): test_pick_list_for_items_with_multiple_UOM() 
(cherry picked from commit 207eeefc85)
 2023-01-31 09:41:19 +00:00
s-aga-r
aa3dd33f56 fix: pymysql.err.ProgrammingError 
(cherry picked from commit 5138ef0160)
 2023-01-31 09:41:19 +00:00
s-aga-r
7afbd9201d fix: get_picked_items_details 
(cherry picked from commit 7b3d496ce0)
 2023-01-31 09:41:18 +00:00
s-aga-r
e8d617ada2 chore: add status field in Pick List 
(cherry picked from commit be41052dc8)

# Conflicts:
#	erpnext/patches.txt
 2023-01-31 09:41:18 +00:00
s-aga-r
466a791f68 fix: consider existing pick list 
(cherry picked from commit b642718f08)
 2023-01-31 09:41:17 +00:00
s-aga-r
140be10060 chore: add method get_picked_items_details() 
(cherry picked from commit 9ae3a54ce9)
 2023-01-31 09:41:17 +00:00
s-aga-r
6166a6e64f refactor: rewrite get_available_item_locations_for_serial_and_batched_item query in QB 
(cherry picked from commit 57c3216683)
 2023-01-31 09:41:16 +00:00
s-aga-r
d9d986a512 refactor: rewrite get_available_item_locations_for_serialized_item query in QB 
(cherry picked from commit 5b76e8b193)
 2023-01-31 09:41:16 +00:00
s-aga-r
167a5596cb refactor: rewrite get_available_item_locations_for_other_item query in QB 
(cherry picked from commit 58dd40a2d7)
 2023-01-31 09:41:15 +00:00
s-aga-r
a5d09270cb refactor: rewrite get_picked_items_qty query in QB 
(cherry picked from commit 29bf787313)
 2023-01-31 09:41:15 +00:00
s-aga-r
f1dd923a50 fix: amount in Material Request 
(cherry picked from commit 6b781d78e0)
 2023-01-31 09:15:25 +00:00