Commit Graph

49724 Commits

Author SHA1 Message Date
ruthra kumar
6310497403 chore: resolve conflict 2024-08-27 17:11:10 +05:30
Syed Mujeer Hashmi
f960aac639 fix: Update get_amount to return currency precision grand total
In case of multi-currency purchase invoice, we are getting the error "Total Payment Request amount cannot be greater than Purchase Invoice amount" because of rounding difference.

(cherry picked from commit 976abf7b3c)

# Conflicts:
#	erpnext/accounts/doctype/payment_request/payment_request.py
2024-08-27 11:39:32 +00:00
ruthra kumar
ab2b2dc5d4 Merge pull request #41949 from Nihantra-Patel/refactor_item_wise_purchase_history_v15
refactor: item-wise purchase history (query to script report)
2024-08-27 16:44:45 +05:30
ruthra kumar
f88d5dcf5c Merge pull request #42936 from ruthra-kumar/fix_incorrect_attribute_on_payment_entry
fix: remove unnecessary condition on 'voucher_no'
2024-08-27 16:35:02 +05:30
ruthra kumar
520db864b5 Merge pull request #42923 from aerele/bank_reconciliation_statement
fix: get amount with taxes and charges from payment entry
2024-08-27 16:30:28 +05:30
Khushi Rawat
62873309e5 Merge pull request #42939 from khushi8112/depreciation-and-balances-report
feat: added finance book filter in depreciation and balances report
2024-08-27 16:22:47 +05:30
rohitwaghchaure
86d3a9ab03 fix: Cannot read properties of null (reading 'doctype') (#42941) 2024-08-27 16:21:36 +05:30
ruthra kumar
d855a8ec1c Merge pull request #42921 from aerele/party_naming_sequance
fix: make party naming sequential when naming_by set as auto name
2024-08-27 15:36:30 +05:30
Khushi Rawat
adf1e487e1 chore: resolved linter warnings with #nosemgrep 2024-08-27 15:27:37 +05:30
Khushi Rawat
45804c68f0 feat: added finance book filter in depreciation and balances report 2024-08-27 15:02:01 +05:30
ruthra kumar
fb32d2cafb fix: use of incorrect attribute 2024-08-27 14:46:10 +05:30
rohitwaghchaure
ca2fde891e fix: timeout while submitting stock entry (#42929) 2024-08-27 10:00:06 +05:30
Raffael Meyer
a132ca1857 Merge pull request #42841 from frappe/l10n_develop 2024-08-26 21:12:25 +02:00
Frappe PR Bot
6b88777829 fix: Persian translations 2024-08-26 20:30:01 +05:30
venkat102
b3a901b631 fix: get amount with taxes and charges from payment entry 2024-08-26 20:04:51 +05:30
venkat102
c9015f7c04 fix: make party naming sequential when naming_by set as auto name 2024-08-26 19:30:30 +05:30
rohitwaghchaure
27364b7e6b fix: same posting date and time, creation causing incorrect balance qty (#42904)
fix: same posting date and time, creation causing incorrect balance quantity
2024-08-26 18:19:25 +05:30
rohitwaghchaure
10434742e9 fix: unsupported operand type(s) for *: 'float' and 'NoneType' (#42916) 2024-08-26 17:59:14 +05:30
ruthra kumar
c64deac4d3 Merge pull request #42887 from ljain112/fix-dimension
fix: update dimesions in exchange_gain_loss jv based on base document
2024-08-26 17:30:03 +05:30
rohitwaghchaure
92bde71ab1 fix: Column 'valuation_rate' cannot be null (#42909) 2024-08-26 16:48:55 +05:30
Rushabh Mehta
0aae621d0e Merge pull request #42524 from blaggacao/fix/financial-statement-linking
fix: link cash flow rows and fix summary linking
2024-08-26 15:54:32 +05:30
ruthra kumar
94629e0b1b Merge pull request #42910 from ruthra-kumar/tools_for_bank_statement_analysis
feat: utility report to better diagnose incorrectly cleared Cheques and Deposits
2024-08-26 15:40:14 +05:30
ruthra kumar
2144e0337d refactor: build dictionary for Journal
remove redundant filter
2024-08-26 14:57:38 +05:30
ruthra kumar
06e5a3fe23 Merge pull request #42905 from ruthra-kumar/better_err_msg_clearance_tool
refactor: better err msg on clearance tool
2024-08-26 14:23:40 +05:30
ruthra kumar
74b36db24e chore: remove redundant column 2024-08-26 14:16:32 +05:30
ruthra kumar
092411b54f refactor: better err msg on clearance tool 2024-08-26 14:05:19 +05:30
Frappe PR Bot
ef7d9004d5 fix: Swedish translations 2024-08-25 20:33:55 +05:30
Frappe PR Bot
8bdb8e71d4 fix: Spanish translations 2024-08-25 20:33:52 +05:30
Frappe PR Bot
66d7b18204 fix: Persian translations 2024-08-24 20:03:57 +05:30
ruthra kumar
784dec24c8 refactor: build dict for payment entry 2024-08-24 08:16:10 +05:30
ruthra kumar
4cd023444a refactor: working state with minimum functions 2024-08-24 08:16:10 +05:30
ruthra kumar
ceaa1be729 refactor: barebones functions 2024-08-24 08:16:10 +05:30
ruthra kumar
28890fa833 feat: report to identify incorrectly cleared cheques 2024-08-24 08:16:10 +05:30
rohitwaghchaure
6721ae76de fix: LCV based on purchase invoice amount with multi-currency (#42890) 2024-08-23 22:34:38 +05:30
Frappe PR Bot
0d57a7d4a4 fix: Turkish translations 2024-08-23 19:35:37 +05:30
Smit Vora
18bc1df6b7 Merge pull request #42848 from ljain112/fix-oppurtunity
fix: do not copy date fields in opportunity doctype
2024-08-23 14:17:19 +05:30
Raffael Meyer
13eb9ea421 Merge pull request #42877 from barredterra/sb-in-setup-wizard 2024-08-22 17:20:31 +02:00
barredterra
fd51dd8999 fix: remove ugly column break in setup wizard 2024-08-22 17:16:33 +02:00
Raffael Meyer
cc4afc53e3 Merge pull request #42803 from barredterra/pseudo-translate-in-setup-wizard 2024-08-22 17:03:18 +02:00
rohitwaghchaure
ce7f6ee71c fix: incorrect in and out qty in the Batch-Wise Balance History (#42866) 2024-08-22 19:33:30 +05:30
rohitwaghchaure
63ca1025bc fix: not able to make stock entry against MR (#42874) 2024-08-22 19:33:14 +05:30
Raffael Meyer
f6371f4a0d Merge branch 'develop' into pseudo-translate-in-setup-wizard 2024-08-22 16:01:17 +02:00
Frappe PR Bot
b64f70d95a fix: Swedish translations 2024-08-22 18:43:20 +05:30
Frappe PR Bot
e7350f18f6 fix: Turkish translations 2024-08-22 18:43:16 +05:30
ruthra kumar
2ca0f416a9 Merge pull request #42867 from ruthra-kumar/respect_db_transaction_model
fix: call 'process' directly instead of creating 'process_subscription'
2024-08-22 17:22:06 +05:30
ruthra kumar
1efdc04e46 Merge pull request #42851 from ruthra-kumar/allow_equity_type_for_shareholders
refactor: Allow equity type Account in Payment Entry for shareholders
2024-08-22 17:09:45 +05:30
ruthra kumar
b4d22c2936 fix: call 'process' directly instead of creating 'process_subscripti
reason: 'process' follows simple DB transaction model.
2024-08-22 16:58:39 +05:30
ljain112
96df19149d fix: update dimesions in exchange_gain_loss jv based on base document 2024-08-22 11:50:19 +05:30
Khushi Rawat
930286e105 Merge pull request #42861 from khushi8112/slm-depreciation
fix(minor): calculation correction for annual depreciation
2024-08-22 11:17:14 +05:30
Khushi Rawat
f440243b75 fix: calculation correction for annual depreciation 2024-08-22 02:22:51 +05:30