CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-12 06:48:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,929 Commits 416 Branches 1,717 Tags
6df730ce9688a92f9f6475fcae0cb30b6435ebe8
Commit Graph

43929 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Anand Baburajan
f487eae28e fix: manual depr entry not updating asset value [v14] (#33788) 
* fix: get value_after_depreciation functions and manual depr entry not updating asset value

* fix: reflect manual depr entry in chart and fixed asset register

* fix: add linked JEs in asset connections

* chore: add test

* chore: add patch and fix some things

* chore: get depreciation_expense_account properly

* chore: fix patch

* chore: fix patch

* chore: fix patch again

* chore: rename var in patch

* fix: filter assets with finance books properly

* chore: refactor get_value_after_depreciation

* chore: use dict format for filters in assets_linked_to_fb

* chore: refactor update_asset_value

* chore: sort manual depr entries
 2023-01-31 10:59:38 +05:30
mergify[bot]
868c8d65ae fix: Fetch commission rate from sales partner (#33851) 
fix: Fetch commission rate from sales partner (#33851)
 2023-01-31 10:15:56 +05:30
ruthra kumar
670df3061a Merge pull request #33877 from frappe/mergify/bp/version-14-hotfix/pr-33736 
fix(gp): fetch buying amount from dn related to so (backport #33736)
 2023-01-31 09:31:20 +05:30
mergify[bot]
f54e8625f6 fix: Currency symbol for tax withholding net total field (#33850) 
* fix: Currency symbol for tax withholding net total field (#33850)
 2023-01-31 09:21:59 +05:30
mergify[bot]
5605f1e3ef fix: Amount validation in Payment Request against Purchase Order (#33855) 
fix: Amount validation in Payment Request against Purchase Order (#33855)

fix: Amount validation in Payment Request againt Purchase Order
(cherry picked from commit a34a1f8fd2)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-01-31 09:20:33 +05:30
mergify[bot]
44692e9b57 fix: Lead to customer creation (#33859) 
fix: Lead to customer creation (#33859)

(cherry picked from commit faecf3ee40)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-01-31 09:20:10 +05:30
mergify[bot]
1b79837e1b chore: Resize numeric and date columns (#33858) 
chore: Resize numeric and date columns (#33858)
 2023-01-31 09:19:46 +05:30
mergify[bot]
3f87a0eceb ci: bump isort to 5.12.0 (backport #33875) (#33879) 
ci: bump isort to 5.12.0 (#33875)

[skip ci]

(cherry picked from commit 2bad86d8d8)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-01-31 08:49:43 +05:30
Anand Baburajan
5d3b2280d4 Merge pull request #33882 from AnandBaburajan/fix_disposal_was_made_on_original_schedule_date_v14 
fix: disposal_was_made_on_original_schedule_date [v14]
 2023-01-30 22:03:12 +05:30
Anand Baburajan
948a951c8a Merge branch 'version-14-hotfix' into fix_disposal_was_made_on_original_schedule_date_v14 2023-01-30 21:28:12 +05:30
anandbaburajan
4586806ed1 fix: disposal_was_made_on_original_schedule_date 2023-01-30 21:25:04 +05:30
Dany Robert
5caa9e2240 chore: linting issues 
(cherry picked from commit d69c839369)
 2023-01-30 13:36:14 +00:00
Dany Robert
7a793ea588 feat(gp): test for inv and dn related via so 
(cherry picked from commit 1f6ab86a65)
 2023-01-30 13:36:14 +00:00
Dany Robert
a659208ed1 chore: linting issue 
(cherry picked from commit ef90e24931)
 2023-01-30 13:36:13 +00:00