Dany Robert
0d8a4bf936
chore: linting issue
...
(cherry picked from commit ef90e24931 )
2023-01-30 13:35:50 +00:00
Dany Robert
be5edd329f
fix(gp): fetch buying amount from dn related to so
...
(cherry picked from commit e8e20da78e )
2023-01-30 13:35:50 +00:00
rohitwaghchaure
0902a5c440
Merge pull request #33847 from frappe/mergify/bp/version-13-hotfix/pr-33845
...
fix: item rate not fetching (backport #33845 )
2023-01-28 22:41:06 +05:30
Rohit Waghchaure
bb5641535b
fix: item rate not fetching
...
(cherry picked from commit 0d7f98b496 )
2023-01-28 09:41:20 +00:00
Sagar Vora
fc7aac9d41
Merge pull request #33833 from frappe/mergify/bp/version-13-hotfix/pr-33831
...
perf: show update items dialog (backport #33831 )
2023-01-27 04:19:30 +00:00
Devin Slauenwhite
0ff5099cbc
perf: show update items dialog
...
(cherry picked from commit a835c1a418 )
2023-01-27 04:18:50 +00:00
mergify[bot]
b38ad66012
fix: use correct filter name in item_query (backport #33814 ) ( #33817 )
...
fix: use correct filter name in `item_query` (#33814 )
(cherry picked from commit da323cbb40 )
Co-authored-by: Daizy Modi <modidaizy5217@gmail.com >
2023-01-25 17:38:03 +05:30
Deepesh Garg
1b11566485
fix: e-Invoicing for SEZ Customer(v13) ( #33796 )
2023-01-25 08:57:52 +05:30
mergify[bot]
28f5d28201
ci: documentation helper (backport #33757 ) ( #33799 )
...
ci: documentation helper (#33757 )
refactor: documentation helper
(cherry picked from commit d155042edd )
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com >
2023-01-24 16:47:13 +05:30
Anand Baburajan
421814e9b3
Merge pull request #33773 from AnandBaburajan/asset_bug_fixes_13
...
fix: backport #32226 and fix some asset bugs related to finance books [v13]
2023-01-23 21:09:05 +05:30
Anand Baburajan
814333b0cc
Merge branch 'version-13-hotfix' into asset_bug_fixes_13
2023-01-23 14:22:46 +05:30
rohitwaghchaure
0862f670ee
Merge pull request #33787 from frappe/mergify/bp/version-13-hotfix/pr-33684
...
feat: [minor] date type based on filter in Work Order Summary report (backport #33684 )
2023-01-23 14:16:43 +05:30
rohitwaghchaure
593d7f3dd6
fix: linter issue
2023-01-23 13:22:24 +05:30
Rohit Waghchaure
5ed6a74fc4
feat: provision to select date type based on filter
...
(cherry picked from commit 20c8873208 )
2023-01-23 07:44:08 +00:00
Anand Baburajan
76b6833b61
Merge branch 'version-13-hotfix' into asset_bug_fixes_13
2023-01-22 13:57:31 +05:30
anandbaburajan
b7e9e4a7c5
fix: accumulated_depreciation in reverse_depreciation_entry_made_after_disposal
2023-01-22 13:56:56 +05:30
Sagar Sharma
54b2f78a99
Merge pull request #33780 from frappe/mergify/bp/version-13-hotfix/pr-33778
...
fix: missing constant definition (backport #33778 )
2023-01-21 22:32:59 +05:30
barredterra
fc4be1b337
fix: missing constant definition
...
(cherry picked from commit 547d37b1db )
2023-01-21 16:59:37 +00:00
Anand Baburajan
b9b110674e
Merge branch 'version-13-hotfix' into asset_bug_fixes_13
2023-01-21 20:04:20 +05:30
anandbaburajan
7959e41a81
chore: fix circular import issue and rename date_of_sale to date_of_disposal
2023-01-21 19:58:26 +05:30
anandbaburajan
d6913fffe6
fix: backport of #32226
2023-01-21 19:29:39 +05:30
anandbaburajan
7174a2cd93
fix: incorrect row order and accumulated_depreciation when schedule with multiple FBs is scrapped
2023-01-21 18:41:19 +05:30
mergify[bot]
47e500c2eb
fix(minor): Label updates in Statement of Accounts ( #33639 )
...
fix(minor): Label updates in Statement of Accounts (#33639 )
2023-01-21 15:44:27 +05:30
mergify[bot]
4511d41329
Removed an unnecessary check in code which always evaluates to true ( #33710 )
...
fix: removed an unnecessary check which always evaluates to true
2023-01-21 12:03:33 +05:30
rohitwaghchaure
7243f71d7d
Merge pull request #33762 from frappe/mergify/bp/version-13-hotfix/pr-33759
...
fix: incorrect actual qty for the packed item (backport #33759 )
2023-01-21 09:46:59 +05:30
mergify[bot]
3daaa021eb
fix: Short closed order, receipt and delivery note status on cancellation ( #33743 )
...
fix: Short closed order, receipt, and delivery note status on cancellation (#33743 )
2023-01-20 23:41:14 +05:30
Rohit Waghchaure
09e13d279c
fix: incorrect actual qty for the packed item
...
(cherry picked from commit 02566a02a8 )
2023-01-20 18:10:16 +00:00
mergify[bot]
d6504320b1
fix: calculate correct amount for qty == 0 (backport #33739 ) ( #33752 )
...
fix: calculate correct amount for qty == 0 (#33739 )
(cherry picked from commit 327b6fdb32 )
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com >
2023-01-20 23:38:37 +05:30
Raffael Meyer
af3a0e56f6
chore: bump python version for docs-checker ( #33756 )
2023-01-20 22:52:33 +05:30
mergify[bot]
2da543ebd4
fix(ecommerce): breadcrumb: fallback to /all-products ( #33718 )
...
fix(ecommerce): breadcrumb: fallback to `/all-products` (#33718 )
* fix(ecommerce): breadcrumb: fallback to `/all-products`
* fix(item_group): use `==` instead of `is`
* test(ecommerce): breadcrumb
(cherry picked from commit a94aa7a79f )
Co-authored-by: Sabu Siyad <hello@ssiyad.com >
2023-01-20 19:26:05 +05:30
anandbaburajan
ae031cea63
fix: fb issue in asset chart
2023-01-20 15:39:01 +05:30
rohitwaghchaure
6135d2972e
Merge pull request #33742 from frappe/mergify/bp/version-13-hotfix/pr-33695
...
fix: patch item_reposting_for_incorrect_sl_and_gl (backport #33695 )
2023-01-20 14:35:10 +05:30
rohitwaghchaure
d717ca0325
fix: conflicts
2023-01-20 14:05:14 +05:30
Rohit Waghchaure
1c5c06716b
fix: patch item_reposting_for_incorrect_sl_and_gl
...
(cherry picked from commit dbde3a3421 )
# Conflicts:
# erpnext/patches.txt
2023-01-20 06:14:02 +00:00
rohitwaghchaure
61d06dd702
Merge pull request #33732 from frappe/mergify/bp/version-13-hotfix/pr-33723
...
fix: don't add template item in sales/purchase transaction (backport #33723 )
2023-01-20 08:30:41 +05:30
Sagar Sharma
b702a02f61
Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-33723
2023-01-19 22:04:05 +05:30
rohitwaghchaure
055f8536c3
fix: conflicts
2023-01-19 16:57:17 +05:30
Sagar Sharma
40ab5b034c
Merge pull request #33734 from frappe/mergify/bp/version-13-hotfix/pr-33619
...
fix: rewrite logic for duplicate check in Item Attribute (backport #33619 )
2023-01-19 15:29:17 +05:30
unknown
13906cba9a
fix: linting
...
(cherry picked from commit 2ca4d3fb71 )
2023-01-19 07:59:03 +00:00
unknown
4741ce13c6
fix: rewrite logic for duplicate check in Item Attribute
...
Previously, Item Attribute values were not checked for case-insensitive duplicates, and Item tttribute abbreviations were forced to be uppercase. This commit fixes both problems.
(cherry picked from commit 974e12c837 )
2023-01-19 07:59:02 +00:00
Rohit Waghchaure
f81d4a79ea
fix: don't add template item in sales/purchase transaction
...
(cherry picked from commit 2c83fff1a1 )
# Conflicts:
# erpnext/buying/doctype/purchase_order/test_purchase_order.py
2023-01-19 07:13:29 +00:00
Anand Baburajan
f2d83b1b21
Merge pull request #33689 from AnandBaburajan/misc_asset_fixes_v13
...
fix: handle asset depr entries posting failure and fix asset repair link [v13]
2023-01-17 15:14:10 +05:30
Anand Baburajan
f1670e922f
Merge branch 'version-13-hotfix' into misc_asset_fixes_v13
2023-01-17 11:21:29 +05:30
Ankush Menat
ec780ac263
chore: ignore b028
2023-01-17 10:59:03 +05:30
Sagar Sharma
847171bd14
Merge pull request #33693 from frappe/mergify/bp/version-13-hotfix/pr-33690
...
fix: Sales Order Connections Tabs do not show linked Material Request or "+" button (intoduce by #33304 ) (backport #33690 )
2023-01-17 10:08:17 +05:30
Florian HENRY
97488aee88
fix: Sales ORder Connections on Material Request
...
(cherry picked from commit e19161a8ee )
2023-01-17 04:37:12 +00:00
Anand Baburajan
2b3a0ba9c4
Merge branch 'version-13-hotfix' into misc_asset_fixes_v13
2023-01-17 00:44:05 +05:30
anandbaburajan
5f7dc8a5b9
fix: handle post depr entries fail and fix asset repair link
2023-01-17 00:39:35 +05:30
ruthra kumar
edc20ae8b8
Merge pull request #33672 from frappe/mergify/bp/version-13-hotfix/pr-33646
...
Revert "fix: Updating SO throws ordered_qty not allowed to change after submission" (backport #33646 )
2023-01-16 15:28:33 +05:30
ruthra kumar
6ebc9c5c82
Merge pull request #33669 from frappe/mergify/bp/version-13-hotfix/pr-33662
...
revert: Reverting changes done on 33495 (backport #33662 )
2023-01-16 14:25:55 +05:30