Raffael Meyer
d319d89988
Merge pull request #46949 from frappe/mergify/bp/version-15-hotfix/pr-46913
...
fix: improve translatability of query report print formats (backport #46913 )
2025-04-08 16:11:18 +02:00
barredterra
d94ebd0c78
chore: add missing german translation
2025-04-08 15:56:48 +02:00
barredterra
7896f8a855
fix: remove redundant letter head
2025-04-08 15:33:12 +02:00
barredterra
7cf83ffce7
fix: go for lower case "on" because we already have translations for that
2025-04-08 15:31:25 +02:00
barredterra
18e9a9881c
fix: make report's "printed on" translatable
2025-04-08 15:30:54 +02:00
rohitwaghchaure
10cf575bba
Merge pull request #46946 from frappe/mergify/bp/version-15-hotfix/pr-46942
...
fix: ignore backflush setting on subcontracting return (backport #46942 )
2025-04-08 18:12:52 +05:30
Mihir Kandoi
6fedb7b9db
refactor: split and clean execute function to be more readable
...
(cherry picked from commit 036af54d54 )
2025-04-08 12:17:05 +00:00
Mihir Kandoi
9af50528f1
perf: take query out of loop
...
(cherry picked from commit 26de902496 )
2025-04-08 12:17:05 +00:00
Mihir Kandoi
e7b5303782
fix: remove get_items query.run outside of if condition
...
(cherry picked from commit 80c17cc005 )
2025-04-08 12:17:05 +00:00
Mihir Kandoi
0ec026ec7e
refactor: import functions in new report instead of redundant code
...
(cherry picked from commit 501f07803e )
2025-04-08 12:17:04 +00:00
Mihir Kandoi
c472af87b2
feat: available serial no report
...
(cherry picked from commit 5592d8e87f )
2025-04-08 12:17:04 +00:00
Mihir Kandoi
ca56150918
fix: ignore backflush setting on subcontracting return
...
(cherry picked from commit 7479e1ec32 )
2025-04-08 12:15:44 +00:00
ruthra kumar
617bebfa8f
Merge pull request #46945 from frappe/mergify/bp/version-15-hotfix/pr-46892
...
fix: use get instead of dot operator to access dict value to prevent no attribute error (backport #46892 )
2025-04-08 17:20:45 +05:30
Mihir Kandoi
f2df8e531d
fix: use get instead of dot operator to access dict value
...
(cherry picked from commit 7fb75f0482 )
2025-04-08 11:34:11 +00:00
ruthra kumar
c47b3c3642
Merge pull request #46932 from frappe/mergify/bp/version-15-hotfix/pr-46626
...
fix: correct payment request amount (backport #46626 )
2025-04-08 16:56:25 +05:30
ruthra kumar
e271933e43
chore: resolve conflict
2025-04-08 16:33:07 +05:30
ljain112
23c76aa530
fix: correct payment request amount
...
(cherry picked from commit 913c60d77b )
# Conflicts:
# erpnext/accounts/doctype/payment_request/payment_request.py
2025-04-08 16:33:07 +05:30
ruthra kumar
bed960df36
Merge pull request #46939 from frappe/mergify/bp/version-15-hotfix/pr-39701
...
fix: check order paid amount before payment request (backport #39701 )
2025-04-08 16:30:28 +05:30
ruthra kumar
36bc87270c
Merge pull request #46936 from frappe/mergify/bp/version-15-hotfix/pr-46631
...
fix: update outstanding for self (backport #46631 )
2025-04-08 16:21:49 +05:30
ljain112
4d8984e4e9
fix: resolve conflicts
2025-04-08 15:54:44 +05:30
ruthra kumar
4eb0f39af7
chore: pass doctype and name
2025-04-08 15:15:24 +05:30
Gursheen Anand
b7ae17aaaf
fix(portal): context pay_amount for button
...
(cherry picked from commit 7efb5a8cb5 )
# Conflicts:
# erpnext/templates/pages/order.html
2025-04-08 09:33:20 +00:00
Gursheen Anand
b0302d71b7
fix(portal): payment amount for orders
...
(cherry picked from commit c18ff5bd25 )
# Conflicts:
# erpnext/templates/pages/order.py
2025-04-08 09:33:20 +00:00
Gursheen Anand
cf7252d3e7
fix: check payments against orders for getting request amount
...
(cherry picked from commit f7face43cd )
# Conflicts:
# erpnext/accounts/doctype/payment_request/payment_request.py
2025-04-08 09:33:19 +00:00
ruthra kumar
d6b488f529
chore: resolve conflict
2025-04-08 14:36:15 +05:30
Bhavan23
88e11d6fd9
test: add unit test to validate outstanding amount for update_outstanding_for_self checkbox enabled
...
(cherry picked from commit 7b0882600a )
2025-04-08 08:59:04 +00:00
Bhavan23
fb06f886d2
fix(accounting): update outstanding amount based on update_outstanding_for_self
...
fix(accounting): against voucher has been already paid show proper message and update update_outstanding_for_self as 1
(cherry picked from commit 222f1834f1 )
# Conflicts:
# erpnext/controllers/accounts_controller.py
2025-04-08 08:59:04 +00:00
JK1117
250b67076d
fix: use source_fieldname to validate inventory dimension
...
(cherry picked from commit daa5bebdd0 )
2025-04-08 08:57:59 +00:00
JK1117
2ed6c211f9
feat: fetch source_fieldname for inventory dimension
...
(cherry picked from commit 4e63ee1a70 )
2025-04-08 08:57:59 +00:00
rohitwaghchaure
bbc9cedf4d
Merge pull request #46916 from frappe/mergify/bp/version-15-hotfix/pr-46898
...
fix: removed hardcoded search fields to fix performance issue (backport #46898 )
2025-04-08 14:18:16 +05:30
rohitwaghchaure
b824038d37
chore: fix conflicts
2025-04-08 13:32:49 +05:30
ruthra kumar
b730fdd007
Merge pull request #46930 from frappe/mergify/bp/version-15-hotfix/pr-46821
...
fix: removed customer_group query in customer.js (backport #46821 )
2025-04-08 13:09:37 +05:30
Shariq Ansari
df744135ff
Merge pull request #46927 from frappe/mergify/bp/version-15-hotfix/pr-46903
...
fix: restrict customer change if creating from opportunity (backport #46903 )
2025-04-08 13:08:34 +05:30
ljain112
1aac8d31f4
fix: removed customer_group query in customer.js
...
(cherry picked from commit f49adfdd98 )
2025-04-08 07:28:31 +00:00
Shariq Ansari
26611475f6
fix: restrict customer change if creating from opportunity
...
(cherry picked from commit dc4819e897 )
2025-04-08 06:37:36 +00:00
ruthra kumar
5b3ae9508a
Merge pull request #46925 from frappe/mergify/bp/version-15-hotfix/pr-46709
...
fix: user permissions in sales and purchase report (backport #46709 )
2025-04-08 11:52:46 +05:30
ruthra kumar
81f061634e
Merge pull request #46926 from frappe/mergify/bp/version-15-hotfix/pr-46819
...
fix: Fix fieldtype in UnReconcile dialog (backport #46819 )
2025-04-08 11:51:56 +05:30
rohitwaghchaure
1e4918fb17
Merge pull request #46918 from frappe/mergify/bp/version-15-hotfix/pr-46893
...
fix: inventory dimensions columns visibility depends on filter (backport #46893 )
2025-04-08 11:48:20 +05:30
Corentin Forler
7dfff8d3a2
fix: Fix fieldtype in UnReconcile dialog
...
(cherry picked from commit 665645721b )
2025-04-08 05:56:37 +00:00
ljain112
c705623fdc
fix: user permissions in sales and purchase report
...
(cherry picked from commit f4bc1dfd00 )
2025-04-08 05:41:01 +00:00
ruthra kumar
6ba4c092ba
Merge pull request #46921 from frappe/mergify/bp/version-15-hotfix/pr-46804
...
fix: update outstanding with precision (backport #46804 )
2025-04-08 11:08:09 +05:30
ljain112
e1154090f6
fix: update outstanding with precision
...
(cherry picked from commit aadda9f606 )
2025-04-08 04:29:48 +00:00
Rohit Waghchaure
fe0e5c2d48
fix: inventory dimensions columns visibility depends on filter
...
(cherry picked from commit 2b411fb7f5 )
2025-04-08 03:21:15 +00:00
Rohit Waghchaure
48822f6fee
fix: removed hardcoded search fields to fix performance issue
...
(cherry picked from commit 216bf2456e )
# Conflicts:
# erpnext/manufacturing/doctype/bom/bom.py
2025-04-08 03:20:13 +00:00
Raffael Meyer
8276e8e8b3
chore: fix german translations ( #46912 )
2025-04-08 02:39:04 +02:00
mergify[bot]
8b11d13cd4
fix: pos opening entry's status not getting updated on cancel (backport #46909 ) ( #46911 )
...
fix: pos opening entry's status not getting updated on cancel (#46909 )
(cherry picked from commit 6fae98afda )
Co-authored-by: Diptanil Saha <diptanil@frappe.io >
2025-04-07 21:03:20 +05:30
mergify[bot]
999ab28bf0
fix: validate if pos is opened before pos invoice creation (backport #46907 ) ( #46910 )
...
fix: validate if pos is opened before pos invoice creation (#46907 )
* fix: validate if pos is opened before pos invoice creation
* fix: added title on throw dialog
* test: fixed failing test
(cherry picked from commit 3de1b22480 )
Co-authored-by: Diptanil Saha <diptanil@frappe.io >
2025-04-07 20:54:23 +05:30
ruthra kumar
ed36fc0530
Merge pull request #46905 from frappe/mergify/bp/version-15-hotfix/pr-46895
...
fix: empty party filter on change of party type in General Ledger Report (backport #46895 )
2025-04-07 17:56:07 +05:30
ljain112
95cc2827c6
fix: empty party filter on change of party type in General Ledger Report.
...
(cherry picked from commit 9c68bc22fa )
2025-04-07 12:13:16 +00:00
ruthra kumar
03aa5a1294
Merge pull request #46902 from frappe/mergify/bp/version-15-hotfix/pr-46900
...
fix: remove against_voucher and against_voucher_type column from General Ledger Report (backport #46900 )
2025-04-07 17:36:42 +05:30