CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-13 23:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,172 Commits 415 Branches 1,717 Tags
8cd1952da3d07dc741aff6f3608480f9101f1e15
Commit Graph

49172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
8cd1952da3 fix: ledger entries for pos return with update outstanding for self 
(cherry picked from commit 2cd9b28e5b)
 2024-08-14 06:26:48 +00:00
Khushi Rawat
f128fcd86c Merge pull request #42759 from frappe/mergify/bp/version-15-hotfix/pr-42719 
fix: linkage between asset repair and asset value adjustment (backport #42719)
 2024-08-14 11:23:33 +05:30
Khushi Rawat
d890d02b5c test: new depreciation after cancelling asset repair 
(cherry picked from commit 88a5824e31)
 2024-08-13 19:01:02 +00:00
Khushi Rawat
defd5541b0 fix: resolved conflict 
(cherry picked from commit c085b6159b)
 2024-08-13 19:01:01 +00:00
mergify[bot]
8624a0abce fix: duplicate labels in stock entry (backport #42756) (#42758) 
fix: duplicate labels in stock entry (#42756)

(cherry picked from commit 8aadc18ee8)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-08-13 20:31:05 +05:30
ruthra kumar
13b79c6781 Merge pull request #42750 from frappe/mergify/bp/version-15-hotfix/pr-40964 
fix: price list when invoice created from timesheet (backport #40964)
 2024-08-13 17:35:50 +05:30
Nihantra C. Patel
2926915a06 fix: price list when invoice created from timesheet 
(cherry picked from commit 882227a460)
 2024-08-13 11:41:40 +00:00
Nihantra C. Patel
536dc47eb0 fix: price list when invoice created from timesheet 
(cherry picked from commit 39d6df7c7d)
 2024-08-13 11:41:39 +00:00
ruthra kumar
225843265e Merge pull request #42749 from frappe/mergify/bp/version-15-hotfix/pr-42221 
fix: Force Fetching updates on Subscriptions (backport #42221)
 2024-08-13 16:47:35 +05:30
ruthra kumar
a1f98603a6 refactor: test for force-fetch on future subscription 
(cherry picked from commit fd680380bb)
 2024-08-13 10:53:24 +00:00
ruthra kumar
ab59b33606 chore: minor naming change 
(cherry picked from commit d8b6767697)
 2024-08-13 10:53:24 +00:00
ruthra kumar
1f1e934675 refactor: don't process future subscriptions 
(cherry picked from commit 3a11577411)
 2024-08-13 10:53:24 +00:00
ruthra kumar
582fffca93 fix: force fetch updates for subcription 
(cherry picked from commit 1ef890db73)
 2024-08-13 10:53:23 +00:00
Khushi Rawat
e9b3a24221 Merge pull request #42742 from frappe/mergify/bp/version-15-hotfix/pr-42689 
fix: fetch month's last date to avoid miscalculation (backport #42689)
 2024-08-13 15:32:04 +05:30
ruthra kumar
0d5ac078f6 Merge pull request #42741 from frappe/mergify/bp/version-15-hotfix/pr-42726 
fix: text color in sales funnel report based on theme (backport #42726)
 2024-08-13 14:36:13 +05:30
ruthra kumar
f109164f88 Merge pull request #42739 from frappe/mergify/bp/version-15-hotfix/pr-42590 
fix: error message in coa importer (backport #42590)
 2024-08-13 14:35:53 +05:30
Khushi Rawat
765c1104c4 fix: fetch months last date to avoid miscalculation 
(cherry picked from commit 70ff4e7644)
 2024-08-13 08:42:33 +00:00
ljain112
a8de8aecf5 fix: text color in sales funnel report based on theme 
(cherry picked from commit 61bc0925d5)
 2024-08-13 08:36:31 +00:00
ljain112
20c1bcd654 fix: error message in coa importer 
(cherry picked from commit 5d0a38dfc7)
 2024-08-13 08:33:21 +00:00
ruthra kumar
6eaad90535 Merge pull request #42735 from frappe/mergify/bp/version-15-hotfix/pr-42733 
refactor: add a new filter flag in Process Statement of Accounts (backport #42733)
 2024-08-13 11:49:29 +05:30
Smit Vora
91a5c562d8 Merge pull request #42489 from frappe/mergify/bp/version-15-hotfix/pr-42050 
fix: Update Rate as per Valuation Rate for Internal Transfers only if Setting is Enabled (backport #42050)
 2024-08-13 11:25:09 +05:30
ruthra kumar
70d5593ace chore: resolve conflict 2024-08-13 11:21:09 +05:30
ruthra kumar
f3401243be refactor: pass filter to General Ledger 
(cherry picked from commit 90880c8c01)
 2024-08-13 05:41:35 +00:00
ruthra kumar
19dfeca96d 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
 2024-08-13 05:41:35 +00:00
ruthra kumar
774db56762 refactor: combine vouchers from both ignore 
(cherry picked from commit 4cc5cd5a71)
 2024-08-13 05:41:35 +00:00
Khushi Rawat
d15c535f86 Merge pull request #42730 from frappe/mergify/bp/version-15-hotfix/pr-42729 
fix: cancel Journal Entry on cancellation of asset value adjustment (backport #42729)
 2024-08-13 02:31:24 +05:30
Khushi Rawat
a429f2f626 fix: cancel Journal Entry on cancellation of asset value adjustment 
(cherry picked from commit 4b7f1f2d67)
 2024-08-12 20:43:30 +00:00
ruthra kumar
dfbc7e8b33 Merge pull request #42725 from frappe/mergify/bp/version-15-hotfix/pr-42672 
fix: update 'Paid Amount' on forex payment request (backport #42672)
 2024-08-12 16:31:35 +05:30
ruthra kumar
b41f10c1b9 chore: resolve conflict 2024-08-12 16:13:59 +05:30
ruthra kumar
44745a757d test: currency conversion on foreign currency account 
(cherry picked from commit f913c0fde1)
 2024-08-12 10:38:35 +00:00
ruthra kumar
47bf2d408b 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:35 +00:00
ruthra kumar
c71f06be9e fix: update 'Paid Amount' on forex payment request 
(cherry picked from commit 7b0dfb2a05)
 2024-08-12 10:38:34 +00:00
mergify[bot]
50b1fa5deb fix: currency changing while making PR from the PO (backport #42718) (#42721) 
fix: currency changing while making PR from the PO (#42718)

(cherry picked from commit 17ba0cff44)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-08-12 15:20:04 +05:30
mergify[bot]
a99057754d fix: warning message for negative stock (backport #42683) (#42710) 
fix: warning message for negative stock (#42683)

(cherry picked from commit deccb007c1)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-08-11 12:35:13 +05:30
mergify[bot]
6f16ae3e00 fix: delivery note creation issue (backport #42696) (#42697) 
fix: delivery note creation issue (#42696)

(cherry picked from commit b65072cd98)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-08-09 15:24:34 +05:30
ruthra kumar
38d80aab99 Merge pull request #42695 from frappe/mergify/bp/version-15-hotfix/pr-42428 
fix: Sort lists before calling itertools.groupby (backport #42428)
 2024-08-09 12:44:38 +05:30
Corentin Forler
d8939e0bb0 fix: Sort lists before calling itertools.groupby 
(cherry picked from commit 45a6ecbd38)
 2024-08-09 06:23:57 +00:00
ruthra kumar
f376abf0fe Merge pull request #42693 from frappe/mergify/bp/version-15-hotfix/pr-42691 
fix: typeerror on payment entry (backport #42691)
 2024-08-09 11:52:18 +05:30
ruthra kumar
64e75a8e08 fix: typeerror on payment entry 
(cherry picked from commit 9cdca0d662)
 2024-08-09 06:11:16 +00:00
Raffael Meyer
67a210f722 Merge pull request #42684 from barredterra/exit-translation 
fix: german translation of exit
 2024-08-08 22:23:34 +02:00
barredterra
a2df276880 fix: german translation of exit 2024-08-08 20:20:22 +02:00
Raffael Meyer
151d293aaf Merge pull request #42680 from frappe/mergify/bp/version-15-hotfix/pr-42679 
fix(Exchange Rate Revaluation): translatable strings (backport #42679)
 2024-08-08 13:17:27 +02:00
barredterra
13f6f3259d refactor(Exchange Rate Revaluation): remove unused variables 
(cherry picked from commit 8bd84e9d51)
 2024-08-08 10:09:53 +00:00
barredterra
da6eea7743 fix(Exchange Rate Revaluation): translatable strings 
(cherry picked from commit dc29fb8759)
 2024-08-08 10:09:52 +00:00
ruthra kumar
b28fa8b994 Merge pull request #42678 from frappe/mergify/bp/version-15-hotfix/pr-42673 
fix: Maintain same rate on qty change on Quotation to Sales Order (backport #42673)
 2024-08-08 13:43:46 +05:30
ruthra kumar
7ed7c22469 fix: Maintain same rate on qty change on Quotation to Sales Order 
(cherry picked from commit 91ce9fce9b)
 2024-08-08 08:04:30 +00:00
Shariq Ansari
a81bc28afb Merge pull request #42668 from frappe/mergify/bp/version-15-hotfix/pr-42596 
fix: changes in opportunity.py to show contacts and addresses created from opportunity (backport #42596)
 2024-08-08 11:39:44 +05:30
Smit Vora
70e40183bb Merge pull request #42551 from frappe/mergify/bp/version-15-hotfix/pr-42392 
fix: allow sale of asset for internal transfer (backport #42392)
 2024-08-08 11:22:00 +05:30
Smit Vora
bdfc1ddfc3 Merge pull request #42550 from frappe/mergify/bp/version-15-hotfix/pr-42432 
fix: promotional scheme doctype fields in consitency with pricing rule (backport #42432)
 2024-08-08 11:21:09 +05:30
Raffael Meyer
fb770f5633 Merge pull request #42669 from barredterra/incoterms-translation 2024-08-07 20:52:32 +02:00