Commit Graph

50794 Commits

Author SHA1 Message Date
Khushi Rawat
4bdc6a0021 style: move depreciation details to a new tab 2024-11-20 11:56:34 +05:30
ruthra kumar
3b9e226d93 Merge pull request #44220 from Abdeali099/payment-request-search-option-query
refactor: Update `Payment Request` search query in PE's reference
2024-11-20 11:50:48 +05:30
rohitwaghchaure
cc571aca8f fix: added Stock UOM field for RM in work order (#44185)
fix: added UOM field for RM in work order
2024-11-20 11:20:47 +05:30
ruthra kumar
8bd7ad5bf0 Merge pull request #44203 from ljain112/fix-so-calender
fix: disable conversion to user tz for sales order calender
2024-11-20 10:46:31 +05:30
ruthra kumar
a971417f25 Merge pull request #44207 from ljain112/validate-sales_person
fix: validate sales team to ensure all sales person are enabled
2024-11-20 10:40:34 +05:30
David Arnold
9673bf85ec refactor: pass typed arguments to get_item_details methods (#44230)
* refactor: pass proper types to get_item_details methods

* chore: excempt previous commit from git blame
2024-11-20 02:31:03 +01:00
David Arnold
4ec23b5525 refactor: make stem utility for normalizing ctx args from dict json-str or Document (#44228) 2024-11-20 00:40:16 +01:00
David Arnold
af2a622afb fix: partial fix for #44291 (#44229)
This is only a partial fix and improves the situaton.

A proper fix will need to have items _always_ track their tax-related
account head, namely for item-wise tax templates as well as default
document taxes that are applied "On Net Total", in order to achive
proper assignment of the net_amount.

Currently there is no way to always identify the orignating account head per item.
2024-11-19 23:15:22 +00:00
David Arnold
daabe847b0 refactor: cleanup args structure akin to some typing (#44226)
* refactor: cleanup args structure akin to some typing

this clarification is a human precondition to being able to fix https://github.com/frappe/erpnext/issues/44219

* chore: excempt previous commit from git blame

* fix: adapt signature
2024-11-19 22:27:57 +00:00
Abdeali Chharchhoda
4ab3499a17 refactor: Update Payment Request search query in PE's reference 2024-11-19 18:00:35 +05:30
ruthra kumar
a9bb6b9970 Merge pull request #44190 from cogk/fix-coa-setup-wizard
fix(setup): Fix typo in COA setup
2024-11-19 17:44:01 +05:30
David Arnold
8b05f954c2 Merge pull request #44215 from blaggacao/fix/item-tax-detail-ro
fix: field read only property on taxes net_amount
2024-11-19 12:58:28 +01:00
Corentin Forler
a245cc6b07 fix(setup): Fix typo in COA setup 2024-11-19 17:18:25 +05:30
ruthra kumar
cb4b4e212c Merge pull request #44213 from frappe/l10n_develop
fix: sync translations from crowdin
2024-11-19 17:11:39 +05:30
Nikolas Beckel
9d31bf7647 fix: check if pricing rule matches with coupon code (#44104)
* fix: check if pricing rule matches with coupon code

* fix: correct linting error
2024-11-19 17:10:55 +05:30
ruthra kumar
64833fccb4 Merge pull request #44214 from ruthra-kumar/wrong_eval_expression
fix: incorrect eval expression
2024-11-19 17:05:51 +05:30
David
b2f8b610fc fix: field read only property on taxes net_amount 2024-11-19 12:29:56 +01:00
ruthra kumar
76ea94d906 fix: incorrect eval expression 2024-11-19 16:36:34 +05:30
Frappe PR Bot
8a12104073 fix: Swedish translations 2024-11-19 16:17:20 +05:30
rohitwaghchaure
b21fb8f8b6 fix: update project cost from timesheet (#44211) 2024-11-19 16:12:22 +05:30
Khaled Bin Amir
a2199db5e5 feat: Add 'ABBR' variable to support company abbreviation in naming series (#43260)
* Add ABBR variable in naming settings

* Add ABBR variable in naming settings

* Update utils.py

* chore: resolve linter

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
2024-11-19 15:15:27 +05:30
hyaray
b3c558f0c0 chore: typo in Manufaturing Settings 2024-11-19 14:54:05 +05:30
ruthra kumar
7ff6901883 Merge pull request #44204 from ruthra-kumar/update_owners
chore: update codeowners
2024-11-19 14:46:59 +05:30
ljain112
548dbb33eb fix: validate sales team to ensure all sales person are enabled 2024-11-19 14:32:43 +05:30
ruthra kumar
ed54b9b8c7 Merge pull request #44145 from ajiragroup/ajiragroup-patch-1
fix: updated label "Is short year" to "Is Short/Long year" for both short and long fiscal years
2024-11-19 14:25:37 +05:30
ruthra kumar
8d4f2eeb07 Merge pull request #44189 from frappe/l10n_develop
fix: sync translations from crowdin
2024-11-19 14:14:53 +05:30
ruthra kumar
3273b808a0 chore: update codeowners 2024-11-19 14:12:36 +05:30
ljain112
cdf098c193 fix: disable conversion to user tz for sales order calender 2024-11-19 12:38:34 +05:30
ljain112
6f9ea6422d fix: added test cases 2024-11-19 12:17:35 +05:30
ruthra kumar
a202f564b1 Merge pull request #44188 from ismxilxrif/develop
chore: update oldest_items.json, change owner back to administrator
2024-11-19 12:02:40 +05:30
ajiragroup
1d6b9b405f refactor: update label and description on short year checkbox
Is short/long year.
2024-11-19 12:01:43 +05:30
Ismail Arif
7ceb24fb4c chore: update oldest_items.json, change owner back to administrator
Signed-off-by: Ismail Arif <38789073+ismxilxrif@users.noreply.github.com>
2024-11-19 09:56:35 +08:00
ljain112
fee79b9445 fix: payment reco for jv with negative dr or cr amount 2024-11-18 20:08:11 +05:30
rohitwaghchaure
495528a758 fix: patch (#44191) 2024-11-18 17:59:55 +05:30
ruthra kumar
44b0f92c72 Merge pull request #44134 from aerele/gl-debit-transaction-currency
fix: set debit in transaction currency in GL Entry
2024-11-18 17:11:59 +05:30
ruthra kumar
4aab6f55f5 refactor: update test case 2024-11-18 16:39:06 +05:30
ruthra kumar
6681882bd8 refactor: assume any of the foreign currency as transaction currency
On a foreign currency payment entry, assume any one of the foreign
currency as the transaction currency
2024-11-18 16:25:44 +05:30
venkat102
4820273595 test: add unit test for tax on excess amount 2024-11-18 15:48:39 +05:30
venkat102
b74f2896cd fix: include current invoice amount when tax_on_excess_amount is checked 2024-11-18 15:42:01 +05:30
Frappe PR Bot
a712ff603b fix: Esperanto translations 2024-11-18 15:38:31 +05:30
Frappe PR Bot
5122489790 fix: German translations 2024-11-18 15:38:27 +05:30
Frappe PR Bot
3468f27e8b fix: Bosnian translations 2024-11-18 15:38:22 +05:30
Frappe PR Bot
31a2fe4bd0 fix: Persian translations 2024-11-18 15:38:18 +05:30
Frappe PR Bot
94703698c0 fix: Chinese Simplified translations 2024-11-18 15:38:12 +05:30
Frappe PR Bot
92d76b5a63 fix: Turkish translations 2024-11-18 15:38:09 +05:30
Frappe PR Bot
d8c20f4dd8 fix: Swedish translations 2024-11-18 15:38:04 +05:30
Frappe PR Bot
26dd896741 fix: Russian translations 2024-11-18 15:37:59 +05:30
Frappe PR Bot
a1c88a6302 fix: Polish translations 2024-11-18 15:37:54 +05:30
Frappe PR Bot
1fbb5203c6 fix: Hungarian translations 2024-11-18 15:37:50 +05:30
Frappe PR Bot
41c7ce7cfb fix: Arabic translations 2024-11-18 15:37:45 +05:30