CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-05 03:23:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,581 Commits 411 Branches 1,710 Tags
d79de4a434dc1c4efe2fefa9c773ee0180fd079a
Commit Graph

51581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diptanil Saha
d79de4a434 Merge pull request #46969 from frappe/mergify/bp/version-15-hotfix/pr-46964 
fix: added missing project field on pos profile (backport #46964)
 2025-04-09 15:57:57 +05:30
Diptanil Saha
b8ef83e1ea chore: resolve conflict 2025-04-09 15:39:15 +05:30
diptanilsaha
8e9ddb7a69 fix: added missing project field on pos profile 
(cherry picked from commit 821d64241a)

# Conflicts:
#	erpnext/accounts/doctype/pos_profile/pos_profile.json
 2025-04-09 10:05:23 +00:00
Raffael Meyer
d43ce7f8e0 Merge pull request #46960 from frappe/mergify/bp/version-15-hotfix/pr-46959 
fix: interaction with due date / payment terms / payment schedule (backport #46959)
 2025-04-08 21:34:53 +02:00
barredterra
b5353e4ad1 chore: add german translation 2025-04-08 21:19:34 +02:00
barredterra
14efeb4acd chore: add context 
(cherry picked from commit c00f62d54a)
 2025-04-08 19:01:35 +00:00
barredterra
35daf669fe fix: clarify confirmation message 
(cherry picked from commit 57be8a85d6)
 2025-04-08 19:01:34 +00:00
barredterra
0c260baacd fix: use the actual field label 
(cherry picked from commit 8a4db69581)
 2025-04-08 19:01:34 +00:00
barredterra
cf00d42799 fix: recognize trigger from child table 
(cherry picked from commit c55c77f4e9)
 2025-04-08 19:01:34 +00:00
barredterra
b06a86541b refactor: use doc parameter instead of this.frm.doc 
(cherry picked from commit 87c21a89fe)
 2025-04-08 19:01:34 +00:00
Raffael Meyer
f762f7ec3e Merge pull request #46957 from barredterra/update-due-date 
feat: update due date in payment schedule
 2025-04-08 20:47:13 +02:00
Raffael Meyer
12bd9af3aa Merge pull request #46826 from frappe/mergify/bp/version-15-hotfix/pr-40050 
fix: handle due date change (backport #40050)
 2025-04-08 20:33:22 +02:00
barredterra
0b0a6b8cfa feat: update due date in payment schedule 
Partial backport of b629356b7c
 2025-04-08 20:12:25 +02:00
barredterra
830290c859 feat: clear payment terms and schedule 2025-04-08 20:10:31 +02:00
barredterra
98b75aaa38 Merge remote-tracking branch 'upstream/version-15-hotfix' into mergify/bp/version-15-hotfix/pr-40050 2025-04-08 19:59:34 +02:00
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
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
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