nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-18 10:57:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,364 Commits 632 Branches 1,812 Tags
7f261f34483aa3f8ebb38e55f480cc7d80d655c9
Commit Graph

10090 Commits

Author SHA1 Message Date
Khushi Rawat
1121c6663f fix: link Purchase Invoice and Receipt Items to Asset 2024-09-05 14:31:05 +05:30
ruthra kumar
7d6984c873 fix: typerror on default_currency 
(cherry picked from commit 4a7cc4da87)
 2024-09-03 11:11:29 +00:00
ruthra kumar
53e1b57354 refactor: link utility report with bank reconciliation statement 
(cherry picked from commit 00eac65712)
 2024-08-29 10:42:57 +00:00
mergify[bot]
42e7725442 fix: add the company in payment request bcz delete company transactions (backport #42664) (#42982) 
* fix: add the company in payment request bcz delete company transactions

(cherry picked from commit 12834ccf9a)

# Conflicts:
#	erpnext/accounts/doctype/payment_request/payment_request.json

* fix: link company when make payment request

(cherry picked from commit e3008843d1)

* fix: add the company in payment request bcz delete company transactions --conflicts

---------

Co-authored-by: Nihantra Patel <nihantra@frappe.io>
Co-authored-by: Nihantra C. Patel <141945075+Nihantra-Patel@users.noreply.github.com>
 2024-08-29 15:41:08 +05:30
ruthra kumar
db746a4def refactor: better UX on Bank Clearance tool 
(cherry picked from commit 6a06e26d04)
 2024-08-29 08:25:12 +00:00
ruthra kumar
6d51d14dfd fix: typeerror on Payment Entry 
(cherry picked from commit e9cf8937cd)
 2024-08-28 06:58:04 +00:00
ruthra kumar
3a5f19853a Merge pull request #42947 from frappe/mergify/bp/version-15-hotfix/pr-42923 
fix: get amount with taxes and charges from payment entry (backport #42923)
 2024-08-27 17:39:30 +05:30
Khushi Rawat
c0dd794e15 Merge pull request #42944 from frappe/mergify/bp/version-15-hotfix/pr-42939 
feat: added finance book filter in depreciation and balances report (backport #42939)
 2024-08-27 17:18:10 +05:30
ruthra kumar
80244bafa4 fix: use of incorrect attribute 
(cherry picked from commit fb32d2cafb)
 2024-08-27 11:06:38 +00:00
venkat102
c54e97b89a fix: get amount with taxes and charges from payment entry 
(cherry picked from commit b3a901b631)
 2024-08-27 11:01:36 +00:00
ruthra kumar
14202fae06 Merge pull request #42453 from mujeerhashmi/patch-2 
fix: Update get_amount to return currency precision grand total
 2024-08-27 16:29:08 +05:30
Khushi Rawat
9fc0ac1a92 chore: resolved linter warnings with #nosemgrep 
(cherry picked from commit adf1e487e1)
 2024-08-27 10:54:11 +00:00
Khushi Rawat
5bdd2989c6 feat: added finance book filter in depreciation and balances report 
(cherry picked from commit 45804c68f0)
 2024-08-27 10:54:10 +00:00
mergify[bot]
8d29dc6a81 fix: unsupported operand type(s) for *: 'float' and 'NoneType' (backport #42916) (#42918) 
fix: unsupported operand type(s) for *: 'float' and 'NoneType' (#42916)

(cherry picked from commit 10434742e9)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-08-26 18:18:31 +05:30
ruthra kumar
ecb0506dba refactor: build dictionary for Journal 
remove redundant filter

(cherry picked from commit 2144e0337d)
 2024-08-26 10:11:24 +00:00
ruthra kumar
42382b3945 chore: remove redundant column 
(cherry picked from commit 74b36db24e)
 2024-08-26 10:11:23 +00:00
ruthra kumar
993114942e refactor: build dict for payment entry 
(cherry picked from commit 784dec24c8)
 2024-08-26 10:11:23 +00:00
ruthra kumar
5a28a1728e refactor: working state with minimum functions 
(cherry picked from commit 4cd023444a)
 2024-08-26 10:11:23 +00:00
ruthra kumar
80a5df0e96 refactor: barebones functions 
(cherry picked from commit ceaa1be729)
 2024-08-26 10:11:23 +00:00
ruthra kumar
25193c5e92 feat: report to identify incorrectly cleared cheques 
(cherry picked from commit 28890fa833)
 2024-08-26 10:11:23 +00:00
ruthra kumar
a3e5ffe915 refactor: better err msg on clearance tool 
(cherry picked from commit 092411b54f)
 2024-08-26 08:55:01 +00:00
mergify[bot]
ff868a9290 fix: LCV based on purchase invoice amount with multi-currency (backport #42890) (#42894) 
fix: LCV based on purchase invoice amount with multi-currency (#42890)

(cherry picked from commit 6721ae76de)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-08-26 13:25:18 +05:30
ruthra kumar
85089d3d64 Merge pull request #42871 from frappe/mergify/bp/version-15-hotfix/pr-42867 
fix: call 'process' directly instead of creating 'process_subscription' (backport #42867)
 2024-08-22 17:51:37 +05:30
ruthra kumar
758282739e 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
49d995c3ac refactor: filter shareholder on company 
(cherry picked from commit 63ad9f4f86)
 2024-08-22 11:40:39 +00:00
ruthra kumar
72ca2ec9a5 refactor: allow equity types on Payment Entry 
(cherry picked from commit 6cbf98294a)
 2024-08-22 11:40:39 +00:00
barredterra
4914481105 fix: translatability of boldened text 
(cherry picked from commit af0ae930ca)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2024-08-17 00:21:05 +00:00
ruthra kumar
f782af8ab3 test: against_voucher for pos_returns without updating for self 
(cherry picked from commit 3fb0858321)
 2024-08-14 06:26:48 +00:00
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
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
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
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
ruthra kumar
64e75a8e08 fix: typeerror on payment entry 
(cherry picked from commit 9cdca0d662)
 2024-08-09 06:11:16 +00: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
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
ruthra kumar
838d341d91 test: dimension inheritance on Exc Gain/Loss JV on Common party 
(cherry picked from commit 8040544216)
 2024-08-07 10:34:09 +00:00