Commit Graph

39484 Commits

Author SHA1 Message Date
Ninad1306
9d899f3c4a fix: reset value conditionally based on merge taxes 2024-09-05 13:29:22 +05:30
Smit Vora
5442487b6c Merge pull request #42925 from Ninad1306/mapping_docs_fix
fix: Replace `add_if_empty` with `reset_value` flag
2024-09-04 13:13:57 +05:30
Lakshit Jain
38f925b376 fix: adjust price insertion logic for internal suppliers/customers (#42988)
* fix: adjust price insertion logic for internal suppliers/customers

* refactor: correct indentation, specify conditions within function

* fix: typo

---------

Co-authored-by: Smit Vora <smitvora203@gmail.com>
2024-09-04 12:56:04 +05:30
Khushi Rawat
4da289ec61 Merge pull request #42926 from khushi8112/asset-value-through-landed-cost-voucher
fix: link Purchase Invoice and Receipt Items to Asset
2024-09-04 00:49:46 +05:30
ruthra kumar
b7525ca4e5 Merge pull request #43030 from ruthra-kumar/default_currency_typeerror_on_payment_entry
fix: typerror on default_currency
2024-09-03 16:40:08 +05:30
Nihantra C. Patel
80ace72541 fix: company accounts setup_queries 2024-09-03 15:54:42 +05:30
ruthra kumar
4a7cc4da87 fix: typerror on default_currency 2024-09-03 15:54:39 +05:30
ruthra kumar
fb6b960806 Merge pull request #42974 from Vishnu7025/report_fix
fix: retain date filter when redirecting in Profit and Loss report
2024-09-03 15:43:01 +05:30
Khushi Rawat
2fdc56cebf Merge branch 'develop' of https://github.com/frappe/erpnext into asset-value-through-landed-cost-voucher 2024-09-03 10:15:29 +05:30
Khushi Rawat
07339e2ddf Merge pull request #43015 from khushi8112/test-case-fix-in-asset-capitalization
chore: test case failing issue
2024-09-03 03:38:29 +05:30
Khushi Rawat
418f7e97b9 chore: patch correction 2024-09-03 03:35:19 +05:30
Frappe PR Bot
861edd3041 fix: Esperanto translations 2024-09-02 23:00:49 +05:30
Frappe PR Bot
77ac87494a fix: Swedish translations 2024-09-02 23:00:46 +05:30
Frappe PR Bot
0a5b21d002 fix: Spanish translations 2024-09-02 23:00:42 +05:30
Frappe PR Bot
c50aba8333 fix: Arabic translations 2024-09-02 23:00:39 +05:30
Frappe PR Bot
c595bf684c fix: Bosnian translations 2024-09-02 23:00:35 +05:30
Frappe PR Bot
f51e9df921 fix: Turkish translations 2024-09-02 23:00:32 +05:30
Frappe PR Bot
6ebd52bdfe fix: French translations 2024-09-02 23:00:29 +05:30
Frappe PR Bot
aa57a98872 fix: Persian translations 2024-09-02 23:00:25 +05:30
Frappe PR Bot
f9d1bdd9f9 fix: German translations 2024-09-02 23:00:21 +05:30
Khushi Rawat
0bdffdfa98 chore: test case failing issue 2024-09-02 16:50:28 +05:30
Khushi Rawat
f369b583b9 chore: resolved conflicts 2024-09-02 16:09:09 +05:30
rohitwaghchaure
f3b91d4d62 fix: validate component quantity according to BOM (#43011) 2024-09-02 16:05:43 +05:30
Khushi Rawat
a84a5b43e2 refactor: rename to in SLE query functions 2024-09-02 11:48:41 +05:30
Nihantra C. Patel
01b345e046 fix: update develop_version in hooks 2024-09-02 10:40:31 +05:30
Raffael Meyer
e21fcbae6a Merge pull request #42953 from frappe/l10n_develop 2024-09-01 22:48:59 +02:00
frappe-pr-bot
d45e6781c1 chore: update POT file 2024-09-01 09:35:05 +00:00
rahulgupta8848
d4fdada83c feat: account heads changed along with journal entry type and descrip… (#42845)
* feat: account heads changed along with journal entry type and description

* feat: added patch for difference_amount for asset value adjustment and refactor

---------

Co-authored-by: “rahulgupta8848” <“rahul.gupta@8848digital.com”>
2024-09-01 10:39:48 +05:30
barredterra
ab2d7f7279 fix: show naming series only when needed 2024-08-31 19:14:45 +02:00
Shariq Ansari
1d9ed27a89 chore: linter fix 2024-08-30 16:57:17 +05:30
Shariq Ansari
e8f8fb8a8f fix: added app permission check for apps page 2024-08-30 16:51:26 +05:30
Khushi Rawat
272f42eaf2 chore: linters/semgrep check 2024-08-30 00:40:01 +05:30
Khushi Rawat
3baffffd1b chore: resolved linter warnings with #nosemgrep 2024-08-30 00:30:47 +05:30
Khushi Rawat
83fe78bcda fix: improve asset item matching logic 2024-08-29 17:10:12 +05:30
ruthra kumar
4500f22671 Merge pull request #42983 from ruthra-kumar/link_utility_rpt_to_bank_reconciliation_statement
refactor: link utility report with bank reconciliation statement
2024-08-29 16:11:09 +05:30
ruthra kumar
00eac65712 refactor: link utility report with bank reconciliation statement 2024-08-29 16:01:54 +05:30
Khushi Rawat
5d99f17583 fix(capitalization): debit cwip account instead of fixed asset account (#42857)
* fix(capitalization): debit cwip account instead of fixed asset account

* fix: post entries for capitalized asset through background jobs

* chore: run pre-commit

* fix: correct GL entries posting for composite assets

* fix(minor): resolve failing check

* chore: update gl entry check logic

* chore: handle none values
2024-08-29 15:50:02 +05:30
ruthra kumar
ac01686ded Merge pull request #42664 from Nihantra-Patel/fix_payment_req_del
fix: add the company in payment request bcz delete company transactions
2024-08-29 15:15:59 +05:30
Nihantra C. Patel
e3008843d1 fix: link company when make payment request 2024-08-29 14:42:45 +05:30
ruthra kumar
735558d073 Merge pull request #42979 from ruthra-kumar/bank_clearance_with_better_transaction_model
refactor: better UX on Bank Clearance tool
2024-08-29 13:53:48 +05:30
ruthra kumar
6a06e26d04 refactor: better UX on Bank Clearance tool 2024-08-29 12:11:48 +05:30
Khushi Rawat
f1d2138258 fix: don't allow capitalizing only service item for new composite asset 2024-08-29 01:51:45 +05:30
Frappe PR Bot
d51f9ce815 fix: Swedish translations 2024-08-28 21:10:02 +05:30
Frappe PR Bot
c73ea6bad9 fix: Turkish translations 2024-08-28 21:09:58 +05:30
Frappe PR Bot
7c5b88a4b9 fix: German translations 2024-08-28 21:09:53 +05:30
vishnu
598e9c1390 fix: indentation 2024-08-28 15:12:22 +00:00
vishnu
bb29fc4c3d fix: retain date filter when redirecting in Profit and Loss report 2024-08-28 15:10:08 +00:00
ruthra kumar
df3267ad3c Merge pull request #42966 from ruthra-kumar/typeerror_on_PE
fix: typeerror on Payment Entry
2024-08-28 12:26:25 +05:30
ruthra kumar
e9cf8937cd fix: typeerror on Payment Entry 2024-08-28 12:21:22 +05:30
rohitwaghchaure
663a08e4cd feat: Disassembly Order (#42655) 2024-08-27 22:25:20 +05:30