Smit Vora
|
3a02800fbc
|
chore: resolve conflicts
|
2024-08-24 12:38:11 +05:30 |
|
ljain112
|
5186872b9b
|
fix: do not copy date fields in opportunity doctype
(cherry picked from commit 74afa57a9f)
# Conflicts:
# erpnext/crm/doctype/opportunity/opportunity.json
|
2024-08-23 08:48:29 +00:00 |
|
rohitwaghchaure
|
54842ea0b3
|
fix: stock reco with incorrect serial numbers (#42865)
|
2024-08-22 19:33:44 +05:30 |
|
ruthra kumar
|
a95a0524d9
|
Merge pull request #42870 from frappe/mergify/bp/version-14-hotfix/pr-42867
fix: call 'process' directly instead of creating 'process_subscription' (backport #42867)
|
2024-08-22 17:51:25 +05:30 |
|
ruthra kumar
|
dffd5f291d
|
Merge pull request #42868 from frappe/mergify/bp/version-14-hotfix/pr-42851
refactor: Allow equity type Account in Payment Entry for shareholders (backport #42851)
|
2024-08-22 17:50:51 +05:30 |
|
ruthra kumar
|
164b417136
|
chore: resolve conflict
|
2024-08-22 17:34:31 +05:30 |
|
ruthra kumar
|
8412938442
|
fix: call 'process' directly instead of creating 'process_subscripti
reason: 'process' follows simple DB transaction model.
(cherry picked from commit b4d22c2936)
|
2024-08-22 11:53:32 +00:00 |
|
ruthra kumar
|
30ad25d86c
|
refactor: filter shareholder on company
(cherry picked from commit 63ad9f4f86)
# Conflicts:
# erpnext/accounts/doctype/payment_entry/payment_entry.js
|
2024-08-22 11:40:37 +00:00 |
|
ruthra kumar
|
651e853156
|
refactor: allow equity types on Payment Entry
(cherry picked from commit 6cbf98294a)
# Conflicts:
# erpnext/accounts/doctype/payment_entry/payment_entry.js
|
2024-08-22 11:40:37 +00:00 |
|
ruthra kumar
|
752f93c630
|
Merge pull request #42793 from frappe/mergify/bp/version-14-hotfix/pr-42791
fix(patch): Use sql to update 'against_voucher' rather than reposting (backport #42791)
|
2024-08-16 15:55:22 +05:30 |
|
ruthra kumar
|
d14e386e18
|
chore: resolve conflict
|
2024-08-16 15:34:48 +05:30 |
|
ruthra kumar
|
9f687eee4e
|
chore: update patches.txt
(cherry picked from commit 1721175a20)
# Conflicts:
# erpnext/patches.txt
|
2024-08-16 10:02:34 +00:00 |
|
ruthra kumar
|
c98ab15a44
|
fix(patch): replace repost with direct sql to update 'against_voucher
(cherry picked from commit 13bb48434f)
|
2024-08-16 10:02:33 +00:00 |
|
Nihantra C. Patel
|
54815b44e7
|
Merge pull request #42770 from frappe/mergify/bp/version-14-hotfix/pr-42769
fix: disable rename from warehouse (backport #42769)
|
2024-08-14 17:15:39 +05:30 |
|
Nihantra C. Patel
|
ed568fb01d
|
fix: disable rename from warehouse
|
2024-08-14 16:35:34 +05:30 |
|
Nihantra C. Patel
|
a520d06c3f
|
fix: disable rename from warehouse
(cherry picked from commit c1812f74e8)
# Conflicts:
# erpnext/stock/doctype/warehouse/warehouse.json
|
2024-08-14 11:03:41 +00:00 |
|
ruthra kumar
|
695297b917
|
Merge pull request #42760 from frappe/mergify/bp/version-14-hotfix/pr-42720
fix: incorrect 'against_voucher' for Pos return with 'Update Outstanding for Self' disabled. (backport #42720)
|
2024-08-14 12:27:13 +05:30 |
|
ruthra kumar
|
8882b85888
|
chore: resolve conflict
|
2024-08-14 12:04:30 +05:30 |
|
ruthra kumar
|
1cddb4ff39
|
refactor: move patch to v14 and update patches.txt
(cherry picked from commit da2286802a)
# Conflicts:
# erpnext/patches.txt
|
2024-08-14 06:26:35 +00:00 |
|
ruthra kumar
|
aaa6d66666
|
test: against_voucher for pos_returns without updating for self
(cherry picked from commit 3fb0858321)
|
2024-08-14 06:26:35 +00:00 |
|
ruthra kumar
|
fa44b0d745
|
refactor: update patches.txt
(cherry picked from commit 4dc0d3a003)
# Conflicts:
# erpnext/patches.txt
|
2024-08-14 06:26:35 +00:00 |
|
ruthra kumar
|
54735469c1
|
fix: patch to fix incorrect against_voucher references in ledger
(cherry picked from commit 487d0a55f5)
# Conflicts:
# erpnext/patches/v14_0/update_pos_return_ledger_entries.py
|
2024-08-14 06:26:34 +00:00 |
|
ruthra kumar
|
714a432c1c
|
fix: ledger entries for pos return with update outstanding for self
(cherry picked from commit 2cd9b28e5b)
|
2024-08-14 06:26:34 +00:00 |
|
ruthra kumar
|
367b4177c6
|
Merge pull request #42748 from frappe/mergify/bp/version-14-hotfix/pr-42221
fix: Force Fetching updates on Subscriptions (backport #42221)
|
2024-08-13 17:24:50 +05:30 |
|
ruthra kumar
|
2d0dca943a
|
chore: resolve conflict
|
2024-08-13 16:54:35 +05:30 |
|
ruthra kumar
|
456f5b644b
|
Merge pull request #42740 from frappe/mergify/bp/version-14-hotfix/pr-42726
fix: text color in sales funnel report based on theme (backport #42726)
|
2024-08-13 16:49:01 +05:30 |
|
ruthra kumar
|
cca5aa8a96
|
chore: resolve conflict
|
2024-08-13 16:28:07 +05:30 |
|
ruthra kumar
|
366f383d1f
|
refactor: test for force-fetch on future subscription
(cherry picked from commit fd680380bb)
# Conflicts:
# erpnext/accounts/doctype/subscription/test_subscription.py
|
2024-08-13 10:53:15 +00:00 |
|
ruthra kumar
|
7752de3a1c
|
chore: minor naming change
(cherry picked from commit d8b6767697)
|
2024-08-13 10:53:14 +00:00 |
|
ruthra kumar
|
f0f663e552
|
refactor: don't process future subscriptions
(cherry picked from commit 3a11577411)
|
2024-08-13 10:53:14 +00:00 |
|
ruthra kumar
|
f35bc43242
|
fix: force fetch updates for subcription
(cherry picked from commit 1ef890db73)
# Conflicts:
# erpnext/accounts/doctype/subscription/subscription.js
|
2024-08-13 10:53:14 +00:00 |
|
ruthra kumar
|
b0b5b25a53
|
chore: resolve conflict
|
2024-08-13 14:38:44 +05:30 |
|
ljain112
|
25096185c9
|
fix: text color in sales funnel report based on theme
(cherry picked from commit 61bc0925d5)
# Conflicts:
# erpnext/selling/page/sales_funnel/sales_funnel.js
|
2024-08-13 08:36:21 +00:00 |
|
ruthra kumar
|
a5b5b5e62c
|
Merge pull request #42734 from frappe/mergify/bp/version-14-hotfix/pr-42733
refactor: add a new filter flag in Process Statement of Accounts (backport #42733)
|
2024-08-13 11:49:19 +05:30 |
|
ruthra kumar
|
e421e16fdc
|
chore: resolve conflicts
|
2024-08-13 11:22:52 +05:30 |
|
ruthra kumar
|
cef3573d79
|
refactor: pass filter to General Ledger
(cherry picked from commit 90880c8c01)
|
2024-08-13 05:41:19 +00:00 |
|
ruthra kumar
|
1ebcc33cdd
|
refactor: cr and dr note filter in Statement of Accounts
(cherry picked from commit 0cf478c4c2)
# Conflicts:
# erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
# erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
|
2024-08-13 05:41:19 +00:00 |
|
ruthra kumar
|
a9871e379a
|
refactor: combine vouchers from both ignore
(cherry picked from commit 4cc5cd5a71)
|
2024-08-13 05:41:19 +00:00 |
|
ruthra kumar
|
34662e6e3c
|
Merge pull request #42724 from frappe/mergify/bp/version-14-hotfix/pr-42672
fix: update 'Paid Amount' on forex payment request (backport #42672)
|
2024-08-12 16:36:28 +05:30 |
|
ruthra kumar
|
1844cb60a4
|
chore: resolve conflict
|
2024-08-12 16:14:29 +05:30 |
|
ruthra kumar
|
71416902f6
|
test: currency conversion on foreign currency account
(cherry picked from commit f913c0fde1)
|
2024-08-12 10:38:33 +00:00 |
|
ruthra kumar
|
e289793308
|
test: make use of test fixture
(cherry picked from commit d6d0a1b38d)
# Conflicts:
# erpnext/accounts/doctype/payment_request/test_payment_request.py
|
2024-08-12 10:38:33 +00:00 |
|
ruthra kumar
|
365ef6b88a
|
fix: update 'Paid Amount' on forex payment request
(cherry picked from commit 7b0dfb2a05)
|
2024-08-12 10:38:33 +00:00 |
|
mergify[bot]
|
e44daf73fb
|
fix: warning message for negative stock (backport #42683) (#42709)
* fix: warning message for negative stock (#42683)
(cherry picked from commit deccb007c1)
# Conflicts:
# erpnext/stock/stock_ledger.py
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-08-12 11:20:44 +05:30 |
|
ruthra kumar
|
a43136da5d
|
Merge pull request #42694 from frappe/mergify/bp/version-14-hotfix/pr-42428
fix: Sort lists before calling itertools.groupby (backport #42428)
|
2024-08-09 12:44:24 +05:30 |
|
ruthra kumar
|
d0fbb4d532
|
Merge pull request #42692 from frappe/mergify/bp/version-14-hotfix/pr-42691
fix: typeerror on payment entry (backport #42691)
|
2024-08-09 11:55:49 +05:30 |
|
Corentin Forler
|
29cfb7cf25
|
fix: Sort lists before calling itertools.groupby
(cherry picked from commit 45a6ecbd38)
|
2024-08-09 06:23:57 +00:00 |
|
ruthra kumar
|
c4c001b6f9
|
fix: typeerror on payment entry
(cherry picked from commit 9cdca0d662)
|
2024-08-09 11:53:35 +05:30 |
|
Raffael Meyer
|
93d8e3f3b0
|
Merge pull request #42687 from frappe/mergify/bp/version-14-hotfix/pr-42684
fix: german translation of exit (backport #42684)
|
2024-08-08 23:25:58 +02:00 |
|
barredterra
|
db27dd8702
|
fix: german translation of exit
(cherry picked from commit a2df276880)
|
2024-08-08 21:15:03 +00:00 |
|