Compare commits

...

7579 Commits

Author SHA1 Message Date
coderabbitai[bot]
16f13c75de 📝 Add docstrings to fix-mt940-statement-number-parsing
Docstrings generation was requested by @srujan00123.

* https://github.com/frappe/erpnext/pull/49682#issuecomment-3322321445

The following files were modified:

* `erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py`
* `erpnext/accounts/doctype/bank_statement_import/test_bank_statement_import.py`
2025-09-23 03:58:23 +00:00
MochaMind
609164fb9a fix: sync translations from crowdin (#49660) 2025-09-22 16:21:27 +02:00
ruthra kumar
993ba4cf45 Merge pull request #49643 from aerele/po-super-class
fix(purchase order): invoke superclass onload method
2025-09-22 13:40:55 +05:30
ruthra kumar
bb081e46d7 Merge pull request #49644 from aerele/po-party-currency
fix(purchase order): get party type based on supplier field
2025-09-22 13:35:10 +05:30
ruthra kumar
6985f0efc3 Merge pull request #49653 from aerele/ar-exclude-employee
fix(accounts receivable): exclude employee transactions
2025-09-22 13:34:53 +05:30
Ravibharathi
302ff49b7f Merge pull request #49470 from aerele/bank-clearance-tax-calculation
fix(bank clearance): use base total taxes and charges if exists
2025-09-22 11:26:56 +05:30
Diptanil Saha
ee2b65806b Merge pull request #49649 from diptanilsaha/issue-replied
fix: set first_response_time on set_first_response
2025-09-22 00:05:07 +05:30
diptanilsaha
ba459204b0 fix: set first_response_time on status change of issue 2025-09-21 23:44:33 +05:30
MochaMind
7d4785784b fix: sync translations from crowdin (#49625) 2025-09-21 14:01:24 +02:00
MochaMind
35b503932d chore: update POT file (#49655) 2025-09-21 13:59:21 +02:00
venkat102
736a776d3d fix(accounts receivable): exclude employee transactions 2025-09-21 11:14:06 +05:30
venkat102
11b9b1adc5 fix(purchase order): get party type based on supplier field 2025-09-20 13:16:28 +05:30
venkat102
9f6bc7fe49 fix(purchase order): invoke superclass onload method 2025-09-20 13:07:57 +05:30
Mihir Kandoi
7e63f1d220 Merge pull request #49615 from aerele/fixed-support-48949
fix(stock): NoneType object error on stock entry
2025-09-18 20:16:40 +05:30
MochaMind
3d8502f408 fix: sync translations from crowdin (#49607) 2025-09-18 15:44:21 +02:00
ruthra kumar
c3e869c701 Merge pull request #49467 from aerele/qb-user-perm
fix: add condition for name
2025-09-18 16:41:16 +05:30
Kavin
aee03417de fix(stock): NoneType object error on stock entry 2025-09-18 16:31:07 +05:30
Diptanil Saha
14d8b87c8e Merge pull request #49608 from diptanilsaha/psoa_ar_show_future_payments
fix(process statement of accounts): total row in accounts receivable with future payments
2025-09-18 15:31:16 +05:30
rohitwaghchaure
2a86a1fb98 Merge pull request #49609 from rohitwaghchaure/fixed-drop-indexes-from-sle
fix: drop index batch_no_item_code_warehouse_index
2025-09-18 13:26:19 +05:30
Rohit Waghchaure
28180ccaa4 fix: drop index batch_no_item_code_warehouse_index 2025-09-18 13:08:26 +05:30
diptanilsaha
7bf17372b0 fix(process statement of accounts): total row in accounts receivable with future payments 2025-09-18 11:30:53 +05:30
venkat102
a5b881ea74 test: add test to validate user permission in qb 2025-09-18 00:02:10 +05:30
rohitwaghchaure
ac40b46a6d Merge pull request #49589 from rohitwaghchaure/fixed-op-cost-for-sfg
fix: operation cost for Semi FG item
2025-09-17 22:18:51 +05:30
Rohit Waghchaure
69682cb064 fix: operation cost for Semi FG item 2025-09-17 21:57:34 +05:30
Raheel Khan
8b543e5503 fix: skip receivable/payable account validation in payroll entry if party is not available (#49585)
* fix: skip receivable/payable account validation if party is not available in creation of payroll entry

* refactor: rename flag
2025-09-17 13:06:00 +00:00
Diógenes Souza
c4f90c3b34 fix: 'NoneType' object has no attribute 'get' in get_item_details.py (#49381) 2025-09-17 18:05:49 +05:30
Anwar Patel
244dce5098 fix: Incorrect filters in Voucher Child Table of Land Cost Voucher DocType (#49500)
* fix: company filter in receipt_document in landed cost voucher

* refactor: use strict equality
2025-09-17 17:43:29 +05:30
Bhavansathru
194ab87fef fix(payment-reconciliation): apply field precision for allocated and difference amounts (#49448)
fix(payment-reconciliation): handle allocated and difference amount with field precision for accurate exchange rate calculations
2025-09-17 17:04:02 +05:30
Logesh Periyasamy
e0299e1cbd fix: add option for currency field (#49572) 2025-09-17 17:01:53 +05:30
MochaMind
9c970acbda fix: sync translations from crowdin (#49581)
* fix: Norwegian Bokmal translations

* fix: French translations
2025-09-17 17:01:18 +05:30
rohitwaghchaure
06dde659c2 Merge pull request #49587 from rohitwaghchaure/fixed-support-48584
fix: incorrect current qty calculation for the batch
2025-09-17 17:00:23 +05:30
Logesh Periyasamy
9fc17e0e3a fix: project accounting dimension and gl posting date column width (#49563)
* fix: add width for posting_date

* fix: add project field for missing doctype

* fix: remove allow_on_submit to align with cost center
2025-09-17 16:57:48 +05:30
Rohit Waghchaure
535f8657ed fix: incorrect current qty calculation for the batch 2025-09-17 16:33:26 +05:30
Diptanil Saha
c77781a14f Merge pull request #49584 from diptanilsaha/custom-print-format-psoa
feat(accounts): enable print format selection in Process Statement of Accounts
2025-09-17 12:19:04 +05:30
diptanilsaha
c9d22386ed fix: added print format validation on process statement of accounts 2025-09-17 11:42:36 +05:30
diptanilsaha
2e7c3207c4 feat(accounts): enable print format selection in Process Statement of Accounts 2025-09-17 11:23:44 +05:30
Diptanil Saha
0aef591f5d Merge pull request #49281 from diptanilsaha/reporting_currency
feat: adding reporting_currency and dr/cr in reporting currency fields in GL Entry and Account Closing Balance
2025-09-17 10:44:04 +05:30
rohitwaghchaure
39049948b8 Merge pull request #49558 from rohitwaghchaure/fixed-valuation-rate-issue
fix: set basic rate on selection of the batch
2025-09-16 12:55:04 +05:30
ruthra kumar
39b9d798d9 Merge pull request #49511 from aerele/sales-invoice-tax-id
fix(sales invoice): fetch tax id from customer
2025-09-16 12:01:33 +05:30
Rohit Waghchaure
bebb8ae1ea fix: set basic rate on selection of the batch 2025-09-16 11:57:43 +05:30
ruthra kumar
1c8266af39 Merge pull request #49557 from frappe/l10n_develop
fix: sync translations from crowdin
2025-09-16 10:17:44 +05:30
MochaMind
73729f6ab0 fix: French translations 2025-09-16 07:06:51 +05:30
MochaMind
a287201011 fix: Norwegian Bokmal translations 2025-09-16 07:06:45 +05:30
MochaMind
a4e2fbdcf9 fix: Persian translations 2025-09-16 07:06:34 +05:30
MochaMind
21dc0a0b1a fix: Swedish translations 2025-09-16 07:06:18 +05:30
MochaMind
98626aaa6c fix: Portuguese translations 2025-09-16 07:06:09 +05:30
MochaMind
86a8015cea fix: German translations 2025-09-16 07:05:56 +05:30
MochaMind
8330b349d2 fix: Danish translations 2025-09-16 07:05:53 +05:30
Diptanil Saha
29197af11a Merge pull request #49438 from pipech/fix-thai-fiscal-year
fix(acc): thai fiscal year
2025-09-16 00:50:30 +05:30
rohitwaghchaure
a00a3868ed Merge pull request #49549 from rohitwaghchaure/fixed-not-allow-backdated-entries
fix: do not allow backdated entries if stock reco exists in future for serial or batch
2025-09-15 15:40:42 +05:30
Rohit Waghchaure
335dcc976c fix: do not allow backdated entries if stock reco exists in future for serial or batch 2025-09-15 15:22:41 +05:30
Raffael Meyer
6972f161b8 fix(accounts): dynamic zero cutoff (#48899)
* fix(accounts): dynamic zero cutoff

The cutoff for displaying zero values in accounting reports has so far been hardcoded to 0.005, giving wrong results for currencies that require a higher precision. This PR changes this to a dynamic value calculated from the Currency's _Fraction Units_.

* style: fix typo
2025-09-15 08:33:03 +02:00
Khushi Rawat
79b8505972 Merge pull request #49524 from KerollesFathy/fix-assets-movement-typos
fix: Assets Movement Typos
2025-09-15 11:54:56 +05:30
MochaMind
fe7b797e5f fix: sync translations from crowdin (#49550)
* fix: Spanish translations

* fix: Arabic translations

* fix: Czech translations

* fix: Danish translations

* fix: German translations

* fix: Hungarian translations

* fix: Italian translations

* fix: Dutch translations

* fix: Polish translations

* fix: Portuguese translations

* fix: Russian translations

* fix: Serbian (Cyrillic) translations

* fix: Swedish translations

* fix: Turkish translations

* fix: Chinese Simplified translations

* fix: Vietnamese translations

* fix: Portuguese, Brazilian translations

* fix: Indonesian translations

* fix: Persian translations

* fix: Thai translations

* fix: Croatian translations

* fix: Bosnian translations

* fix: Norwegian Bokmal translations

* fix: Serbian (Latin) translations

* fix: French translations

* fix: Esperanto translations
2025-09-15 07:45:05 +02:00
ravibharathi656
df329964dd fix(sales invoice): fetch tax id from customer 2025-09-15 10:12:20 +05:30
MochaMind
1845d12951 Merge pull request #49532 from frappe/l10n_develop 2025-09-14 20:33:38 +02:00
Raffael Meyer
67c2ab4c9f Merge pull request #49546 from frappe/pot_develop_2025-09-14
chore: update POT file
2025-09-14 13:40:25 +02:00
frappe-pr-bot
405e1ab6d3 chore: update POT file 2025-09-14 09:35:06 +00:00
rohitwaghchaure
cf066edd7f Merge pull request #49542 from rohitwaghchaure/fixed-validation-place
fix: validation for document status
2025-09-14 12:26:43 +05:30
Rohit Waghchaure
96e2e356b6 fix: validation for document status 2025-09-14 11:55:08 +05:30
rohitwaghchaure
0fef2d4b02 Merge pull request #49539 from rohitwaghchaure/fixed-support-48168
fix: precision issue for valuation rate calculation
2025-09-14 11:51:03 +05:30
rohitwaghchaure
b265b82f0b Merge pull request #49538 from rohitwaghchaure/fixed-docstatus-issue-of-sabb
fix: SABB document status validation
2025-09-14 11:25:33 +05:30
Rohit Waghchaure
c92a06d77d fix: precision issue for valuation rate calculation 2025-09-14 11:22:14 +05:30
Rohit Waghchaure
c0236191aa fix: SABB document status validation 2025-09-14 10:53:38 +05:30
KerollesFathy
5f083d55b5 fix: correct grammatical errors in asset movement validation messages 2025-09-10 18:00:44 +00:00
KerollesFathy
56da3bd2e4 fix: correct typo in asset movement purpose validation 2025-09-10 17:57:30 +00:00
Raffael Meyer
f27077a45f Merge pull request #49505 from frappe/l10n_develop
fix: sync translations from crowdin
2025-09-10 17:08:15 +02:00
MochaMind
38b51df17e fix: Norwegian Bokmal translations 2025-09-10 06:21:56 +05:30
rohitwaghchaure
f145e6267b Merge pull request #49503 from rohitwaghchaure/feat-allow-to-transfer-additonal-materials
Feat allow to transfer additional materials
2025-09-09 14:13:24 +05:30
Sagar Vora
09d9c0ddd3 Merge pull request #49506 from sagarvora/extend-not-override
fix: use the new `extend_doctype_class` hook
2025-09-09 06:21:19 +00:00
Rohit Waghchaure
e4b5507446 test: test case for additional material transfer 2025-09-09 11:44:17 +05:30
Sagar Vora
a028d856bc fix: use the new extend_doctype_class hook 2025-09-09 11:34:49 +05:30
MochaMind
e3e4680ad2 fix: Norwegian Bokmal translations 2025-09-09 06:13:49 +05:30
MochaMind
276406bc1c fix: Danish translations 2025-09-09 06:13:46 +05:30
MochaMind
156e46ccb0 fix: Esperanto translations 2025-09-09 06:13:42 +05:30
MochaMind
07a5aba2aa fix: Dutch translations 2025-09-09 06:13:38 +05:30
MochaMind
4ce8d9af6a fix: Serbian (Latin) translations 2025-09-09 06:13:35 +05:30
MochaMind
0474b8595b fix: Bosnian translations 2025-09-09 06:13:32 +05:30
MochaMind
ca8677a0ff fix: Croatian translations 2025-09-09 06:13:28 +05:30
MochaMind
03e5467ba2 fix: Thai translations 2025-09-09 06:13:25 +05:30
MochaMind
e960f8217b fix: Persian translations 2025-09-09 06:13:21 +05:30
MochaMind
a81e807a70 fix: Indonesian translations 2025-09-09 06:13:17 +05:30
MochaMind
3b4ee30dd7 fix: Portuguese, Brazilian translations 2025-09-09 06:13:14 +05:30
MochaMind
521ebc25aa fix: Vietnamese translations 2025-09-09 06:13:11 +05:30
MochaMind
1291df9a63 fix: Chinese Simplified translations 2025-09-09 06:13:08 +05:30
MochaMind
70d7ceb2f2 fix: Turkish translations 2025-09-09 06:13:04 +05:30
MochaMind
512419eee7 fix: Swedish translations 2025-09-09 06:13:01 +05:30
MochaMind
c6be380e83 fix: Serbian (Cyrillic) translations 2025-09-09 06:12:57 +05:30
MochaMind
200496254b fix: Russian translations 2025-09-09 06:12:53 +05:30
MochaMind
2596ef202b fix: Portuguese translations 2025-09-09 06:12:50 +05:30
MochaMind
ac71969512 fix: Polish translations 2025-09-09 06:12:46 +05:30
MochaMind
734a7b8be9 fix: Italian translations 2025-09-09 06:12:43 +05:30
MochaMind
aa9c4555fd fix: Hungarian translations 2025-09-09 06:12:39 +05:30
MochaMind
7e5be50997 fix: German translations 2025-09-09 06:12:36 +05:30
MochaMind
03e3a693ff fix: Czech translations 2025-09-09 06:12:33 +05:30
MochaMind
d4ae2f89b2 fix: Arabic translations 2025-09-09 06:12:30 +05:30
MochaMind
17c24a4168 fix: Spanish translations 2025-09-09 06:12:26 +05:30
MochaMind
c41824c4d0 fix: French translations 2025-09-09 06:12:23 +05:30
Rohit Waghchaure
3ad611966e feat: allow to transfer additional materials 2025-09-08 20:54:43 +05:30
Raffael Meyer
ddc97df31a Merge pull request #49355 from frappe/l10n_develop 2025-09-08 06:59:23 +02:00
Raffael Meyer
c21ebafaa5 Merge pull request #49494 from frappe/pot_develop_2025-09-07 2025-09-08 06:58:57 +02:00
MochaMind
17276a2c0c fix: Norwegian Bokmal translations 2025-09-08 05:47:32 +05:30
MochaMind
4ecdd1fd0e fix: Danish translations 2025-09-08 05:47:29 +05:30
MochaMind
7e093d08a9 fix: Swedish translations 2025-09-08 05:46:59 +05:30
rohitwaghchaure
955e8714ee Merge pull request #49477 from rohitwaghchaure/fixed-batch-qty-calculation
fix: batch qty calculation performance issue
2025-09-07 16:49:07 +05:30
Rohit Waghchaure
1a262483a4 fix: batch qty calculation performance issue 2025-09-07 16:24:00 +05:30
frappe-pr-bot
eead27560c chore: update POT file 2025-09-07 09:35:18 +00:00
MochaMind
b658330881 fix: Norwegian Bokmal translations 2025-09-07 05:45:53 +05:30
MochaMind
4f968f5c65 fix: Danish translations 2025-09-07 05:45:50 +05:30
MochaMind
838183941a fix: Swedish translations 2025-09-07 05:45:46 +05:30
Diptanil Saha
92d86eb30b Merge pull request #49485 from diptanilsaha/skip_bank_ac_creation
fix: skip 'Bank Account' creation on setup
2025-09-06 13:13:24 +05:30
diptanilsaha
efeda90cad fix: renamed temporary bank account to 'Demo Bank Account' 2025-09-06 02:38:53 +05:30
diptanilsaha
47d4319f83 fix: skip 'Bank Account' creation on setup 2025-09-06 02:03:03 +05:30
MochaMind
eb5a9db749 fix: Norwegian Bokmal translations 2025-09-05 05:50:49 +05:30
MochaMind
a2ccb5fa87 fix: Hungarian translations 2025-09-05 05:50:45 +05:30
MochaMind
b56dbe98cf fix: German translations 2025-09-05 05:50:42 +05:30
venkat102
cf5a2d6351 fix: add condition for name 2025-09-04 21:00:52 +05:30
rohitwaghchaure
564de01463 Merge pull request #49453 from rohitwaghchaure/fixed-fifo-valuation-for-non-batchwise-valuation
fix: non batch-wise valuation for batch item
2025-09-04 14:30:17 +05:30
rohitwaghchaure
ac8637d5a0 chore: fix test case 2025-09-04 13:00:32 +05:30
MochaMind
7c10775bc8 fix: Norwegian Bokmal translations 2025-09-04 05:09:55 +05:30
MochaMind
49a96f4306 fix: Serbian (Latin) translations 2025-09-04 05:09:52 +05:30
MochaMind
161ed5290e fix: Serbian (Cyrillic) translations 2025-09-04 05:09:48 +05:30
MochaMind
a0d3b931f3 fix: Hungarian translations 2025-09-04 05:09:44 +05:30
Rohit Waghchaure
11b82ba008 fix: non batch-wise valuation for batch item 2025-09-04 00:48:45 +05:30
rohitwaghchaure
1b73170e8c Merge pull request #49449 from rohitwaghchaure/fixed-support-46728
fix: incorrect stock value in the report
2025-09-04 00:47:16 +05:30
rohitwaghchaure
59c46a1789 Merge pull request #49425 from rohitwaghchaure/fixed-valuation-for-batch
fix: valuation for batch items
2025-09-04 00:47:02 +05:30
Rohit Waghchaure
24e0e3505d fix: valuation for batch items 2025-09-03 19:20:56 +05:30
Rohit Waghchaure
5824b5effd fix: incorrect stock value in the report 2025-09-03 19:03:08 +05:30
rohitwaghchaure
fba16efc07 Merge pull request #49442 from rohitwaghchaure/fixed-incorrect-batch-qty-issue
fix: incorrect batch qty
2025-09-03 16:42:09 +05:30
Mihir Kandoi
9aeb21d0c8 Merge pull request #49441 from mihir-kandoi/fix-wrong-wh-sre-transfer
fix: incorrect warehouse passed during SRE transfer in WO
2025-09-03 16:14:38 +05:30
Rohit Waghchaure
000135a3d4 fix: incorrect batch qty 2025-09-03 16:04:13 +05:30
Mihir Kandoi
260574719e fix: incorect warehouse passed during SRE transfer in WO 2025-09-03 15:53:53 +05:30
Mihir Kandoi
ead1ce2742 Merge pull request #49437 from mihir-kandoi/refactor-49320
refactor: PR 49320
2025-09-03 14:20:29 +05:30
Mihir Kandoi
991413608b refactor: PR 49320 2025-09-03 13:07:08 +05:30
pipech
fe74e0888b fix: thai fiscal year 2025-09-03 14:27:02 +07:00
diptanilsaha
ceff8c92fd fix: used wrong parameter for get_value to fetch previous fiscal year 2025-09-03 12:36:44 +05:30
diptanilsaha
d8babf66ae feat: add patch to set reporting_currency on GL Entry and Account Closing Balance 2025-09-03 12:36:44 +05:30
diptanilsaha
8dbbcf5ffb feat: dr/cr amounts in reporting_currency on account_closing_balance 2025-09-03 12:36:44 +05:30
diptanilsaha
fab9c4d7df feat: dr/cr amounts in reporting_currency on gl entries 2025-09-03 12:36:44 +05:30
diptanilsaha
2383051b74 feat: reporting_currency on company 2025-09-03 12:36:39 +05:30
MochaMind
d2d3294f02 fix: Norwegian Bokmal translations 2025-09-03 05:05:41 +05:30
MochaMind
62037301ee fix: Serbian (Latin) translations 2025-09-03 05:05:38 +05:30
MochaMind
b860f3d31d fix: Serbian (Cyrillic) translations 2025-09-03 05:05:34 +05:30
MochaMind
b8c72c05bb fix: Hungarian translations 2025-09-03 05:05:28 +05:30
Raffael Meyer
f1eda7c4ec Merge pull request #49374 from MarcCon/fix/ignore-permissions 2025-09-02 19:19:27 +02:00
Raffael Meyer
83eafe118e Merge pull request #49432 from barredterra/use-valid-ibans 2025-09-02 19:15:39 +02:00
barredterra
0b178b9449 test: use valid IBANs in party matching test case 2025-09-02 17:41:29 +02:00
ruthra kumar
1e7f374d6e Merge pull request #49306 from aerele/exchange-rate-revaluation-check-gain-loss
fix(exchange rate revaluation): add check for gain_loss
2025-09-02 13:33:55 +05:30
ruthra kumar
fcb86023cb Merge pull request #49332 from aerele/ticket-47028
perf: check PCV (smaller) table before checking GL Entries
2025-09-02 13:16:05 +05:30
Diptanil Saha
2dba591d37 Merge pull request #49407 from diptanilsaha/force_index_fetch_gle
fix(perf): applying consistent index to fetch gl entries for financial statements
2025-09-02 12:11:48 +05:30
ruthra kumar
385a2beaf9 Merge pull request #49379 from aerele/balance-type
fix: add is_cancelled in condition
2025-09-02 10:56:32 +05:30
MochaMind
cc2cc812cc fix: Norwegian Bokmal translations 2025-09-02 05:07:26 +05:30
MochaMind
a1c3c60fca fix: Danish translations 2025-09-02 05:07:23 +05:30
MochaMind
bbbd693c1c fix: Serbian (Latin) translations 2025-09-02 05:07:19 +05:30
MochaMind
f42f59a6b2 fix: Serbian (Cyrillic) translations 2025-09-02 05:07:16 +05:30
MochaMind
886cec797c fix: Hungarian translations 2025-09-02 05:07:10 +05:30
Raffael Meyer
2ea2c5c11e Merge pull request #49377 from barredterra/iban-options 2025-09-01 15:16:13 +02:00
ruthra kumar
b0f59ebf79 Merge pull request #49366 from aerele/tb-simple
fix(trial-balance-simple): ignore cancelled gl and add company filter
2025-09-01 16:45:38 +05:30
rohitwaghchaure
35fee187b6 Merge pull request #49403 from rohitwaghchaure/fixed-support-47626
fix: validation for Recreate Stock Ledgers
2025-09-01 16:12:10 +05:30
diptanilsaha
3e2fb85ae6 fix(perf): applying consistent index to fetch gl entries for financial statements 2025-09-01 15:15:42 +05:30
ruthra kumar
0cb5b571b0 Merge pull request #49335 from aerele/ticket-47331
fix: show company currency symbol
2025-09-01 15:06:10 +05:30
ruthra kumar
3131cf335e Merge pull request #49331 from aerele/patch-sync-auto-reconcile-config
fix: run sync auto reconcile config with force
2025-09-01 14:41:56 +05:30
Rohit Waghchaure
785845a425 fix: validation for Recreate Stock Ledgers 2025-09-01 13:39:35 +05:30
ruthra kumar
fa3ee91414 Merge pull request #49302 from aerele/fix/budget-warning
fix(budget):  fiscal year assignment and approver role in budget
2025-09-01 12:34:07 +05:30
MochaMind
f8fa8bdda7 fix: Norwegian Bokmal translations 2025-09-01 04:54:02 +05:30
MochaMind
69d509a098 fix: Danish translations 2025-09-01 04:53:59 +05:30
MochaMind
5a9fb3db1f fix: Esperanto translations 2025-09-01 04:53:56 +05:30
MochaMind
8c8bfd4277 fix: Dutch translations 2025-09-01 04:53:53 +05:30
MochaMind
47f0507643 fix: Serbian (Latin) translations 2025-09-01 04:53:50 +05:30
MochaMind
cb68c784fe fix: Bosnian translations 2025-09-01 04:53:47 +05:30
MochaMind
b1d3d39a11 fix: Croatian translations 2025-09-01 04:53:43 +05:30
MochaMind
31d9fc5367 fix: Thai translations 2025-09-01 04:53:40 +05:30
MochaMind
80a38732f9 fix: Persian translations 2025-09-01 04:53:37 +05:30
MochaMind
c228d1a05a fix: Indonesian translations 2025-09-01 04:53:33 +05:30
MochaMind
6bbba727a5 fix: Portuguese, Brazilian translations 2025-09-01 04:53:30 +05:30
MochaMind
0149bc633c fix: Vietnamese translations 2025-09-01 04:53:28 +05:30
MochaMind
574198bceb fix: Chinese Simplified translations 2025-09-01 04:53:24 +05:30
MochaMind
edd3383f7d fix: Turkish translations 2025-09-01 04:53:21 +05:30
MochaMind
2384b37305 fix: Swedish translations 2025-09-01 04:53:18 +05:30
MochaMind
c71dd00cc3 fix: Serbian (Cyrillic) translations 2025-09-01 04:53:14 +05:30
MochaMind
bd18ce7326 fix: Russian translations 2025-09-01 04:53:11 +05:30
MochaMind
9a85e1a811 fix: Portuguese translations 2025-09-01 04:53:08 +05:30
MochaMind
ad1b77f280 fix: Polish translations 2025-09-01 04:53:05 +05:30
MochaMind
99d89b207e fix: Italian translations 2025-09-01 04:53:02 +05:30
MochaMind
66f60c64bd fix: Hungarian translations 2025-09-01 04:52:58 +05:30
MochaMind
9f8abd585a fix: German translations 2025-09-01 04:52:55 +05:30
MochaMind
1f937a7c76 fix: Czech translations 2025-09-01 04:52:52 +05:30
MochaMind
9234e27a70 fix: Arabic translations 2025-09-01 04:52:49 +05:30
MochaMind
6ba476a3cd fix: Spanish translations 2025-09-01 04:52:46 +05:30
MochaMind
5f4c1f331d fix: French translations 2025-09-01 04:52:43 +05:30
MochaMind
c95b8e8d30 chore: update POT file (#49396) 2025-08-31 14:05:57 +02:00
Mihir Kandoi
b1d91f429c Merge pull request #49394 from fawaaaz111/patch-1
chore: remove unused import (Order) module
2025-08-31 13:19:47 +05:30
Fawaz Alhafiz
4e86a46008 chore: remove unused import (Order) module 2025-08-31 09:43:01 +03:00
MochaMind
0ad348d714 fix: Bosnian translations 2025-08-31 04:28:37 +05:30
MochaMind
7f1240e2eb fix: Croatian translations 2025-08-31 04:28:34 +05:30
MochaMind
6806c5e977 fix: Swedish translations 2025-08-31 04:28:31 +05:30
Mihir Kandoi
4bdb4fb170 fix(repost item valuation): validate voucher type in transaction (#49388) 2025-08-30 23:25:24 +05:30
rohitwaghchaure
06a999ebaa Merge pull request #49386 from rohitwaghchaure/fixed-support-47111
fix: Issue with Barcode Scanning in Stock Entry
2025-08-30 12:35:55 +05:30
ravibharathi656
5663c2a1ca fix(repost item valuation): validate voucher type in transaction 2025-08-29 23:27:14 +05:30
Rohit Waghchaure
13e3db3730 fix: Issue with Barcode Scanning in Stock Entry 2025-08-29 23:11:16 +05:30
rohitwaghchaure
bba77529f8 Merge pull request #49376 from aerele/reorder-repost-item-valuation-function
fix(repost item valuation): reorder function call
2025-08-29 22:21:28 +05:30
Raffael Meyer
625321ba8a fix: stop creating transaction logs (#49383) 2025-08-29 15:33:07 +00:00
barredterra
4dd428de41 chore(Bank Account): remove IBAN validation
This is now handled by the Frappe Framework.
2025-08-29 15:23:13 +02:00
Diptanil Saha
9ece6ebef8 Merge pull request #49373 from diptanilsaha/psoa_ar_future_payments
feat(Process Statment of Accounts): added show_future_payments filter for account_receivable report type
2025-08-29 18:02:26 +05:30
diptanilsaha
155bdd0251 refactor: renamed variables 2025-08-29 17:35:31 +05:30
l0gesh29
77a9cf6398 fix: add is_cancelled in condition 2025-08-29 16:30:29 +05:30
barredterra
c45ea53889 fix(Bank Account): length of IBAN field 2025-08-29 12:32:29 +02:00
ravibharathi656
d117411070 chore: remove console log 2025-08-29 15:31:47 +05:30
barredterra
cab262c147 feat: set options for IBAN fields
Sets options to "IBAN" for the respective Data fields to take advantage of a new formatting feature provided by the  Frappe Framework.
2025-08-29 11:56:42 +02:00
ravibharathi656
aaa4f0ae26 fix(repost item valuation): reorder function call 2025-08-29 14:56:29 +05:30
Marc-Constantin Enke
00fd1d2f26 feat: add permission check for custom button 2025-08-29 11:09:22 +02:00
Marc-Constantin Enke
7f55f421ab fix: remove ignore_permissions 2025-08-29 11:07:37 +02:00
diptanilsaha
170fe86f38 feat(Process Statment of Accounts): added show_future_payments filter for account_receivable report type 2025-08-29 13:34:03 +05:30
MochaMind
781c377588 fix: Norwegian Bokmal translations 2025-08-29 03:50:30 +05:30
MochaMind
7318c6007d fix: Danish translations 2025-08-29 03:50:27 +05:30
jll-02
aedb171dd4 fix: 🐛 fixing buying controller to include transaction controller… (#49140)
* fix: 🐛 fixing buying controller to include transaction controller function

* refactor: fixed formatting

---------

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
2025-08-28 23:37:42 +05:30
Anwar Patel
1fbde7b8c6 Merge pull request #49289 from anwarpatelnoori/stage
fix: Company currency label is not displayed in Landed Cost Voucher doctype for the field Total Vendor Invoices Cost
2025-08-28 23:36:38 +05:30
ravibharathi656
e8288a2f63 fix: run config with force 2025-08-28 19:41:13 +05:30
l0gesh29
afb067ce50 fix: ignore cancelled gl and add company filter 2025-08-28 19:16:10 +05:30
rohitwaghchaure
0c400f9355 Merge pull request #49345 from rohitwaghchaure/fxied-minor-fixes-08-27
chore: minor fixes
2025-08-28 07:35:29 +05:30
MochaMind
e36cc5641c fix: Norwegian Bokmal translations 2025-08-28 03:55:18 +05:30
MochaMind
a98eb60a27 fix: Danish translations 2025-08-28 03:55:14 +05:30
Mihir Kandoi
147e99a0cc Merge pull request #49308 from lauty95/settings_workspace
Removing Newsletter from Settings Workspace
2025-08-27 22:17:52 +05:30
Mihir Kandoi
b38b2d2283 fix: show create purchase receipt button in purchase invoice only when update stock is not checked (#49254)
fix: show create purchase receipt button only when update stock is not checked
2025-08-27 22:09:22 +05:30
Khushi Rawat
e065794838 Merge pull request #49190 from KerollesFathy/prevent-negative-repair-cost
fix: add non-negative constraint to Repair Cost field
2025-08-27 22:08:10 +05:30
Mihir Kandoi
903194abed Merge pull request #49244 from elshafei-developer/fix-convert-NaN-to-numerical-in-number_card
fix: convert NaN to numerical
2025-08-27 22:06:00 +05:30
0xD0M1M0
2bf0ba9802 feat: optional fixed outgoing email for RfQ (#49258)
* feat: optional fixed outgoing email for RfQ

* fix: linters

* fix: select only outgoing account

* fix: linters
2025-08-27 22:01:54 +05:30
Rohit Waghchaure
39ec44f169 chore: minor fixes 2025-08-27 19:39:59 +05:30
Raffael Meyer
e1cac75f85 fix: add option to disable Transaction Log (#49342) 2025-08-27 11:44:03 +00:00
MochaMind
5e9e95e00b fix: sync translations from crowdin (#49339) 2025-08-27 00:10:31 +02:00
rohitwaghchaure
58d9113fd6 Merge pull request #49320 from mihir-kandoi/fix-swh-scrap-reqd
fix: source warehouse in manufacture entry and reqd prop of scrap warehouse
2025-08-26 21:30:03 +05:30
Navin-S-R
49bb095152 fix: show company currency symbol 2025-08-26 20:29:24 +05:30
rohitwaghchaure
2f4caf755e Merge pull request #49333 from rohitwaghchaure/fixed-stock-reservation-issue
fix: validation issue for reserved batch
2025-08-26 19:47:44 +05:30
Rohit Waghchaure
f38abe38d7 fix: validation issue for reserved batch 2025-08-26 19:20:34 +05:30
Mihir Kandoi
fe0722c4f1 fix: source warehouse in manufacture entry and reqd prop of scrap warehouse 2025-08-26 17:34:30 +05:30
ruthra kumar
c585903a4a Merge pull request #49236 from aerele/immutable-ledger-ple
fix: handle ple for immutable ledger
2025-08-26 16:03:44 +05:30
l0gesh29
48eb488918 fix: handle ple for immutable ledger 2025-08-26 15:48:03 +05:30
Khushi Rawat
68e1f9d4b0 Merge pull request #49319 from khushi8112/set-value-for-asset-owner-company
fix: set value for asset owner company field
2025-08-26 14:36:01 +05:30
khushi8112
a24f1d056b fix: set value for asset owner company field 2025-08-26 12:35:37 +05:30
ruthra kumar
0b0365d559 Merge pull request #49316 from frappe/l10n_develop
fix: sync translations from crowdin
2025-08-26 11:05:09 +05:30
MochaMind
3401438878 fix: Persian translations 2025-08-26 03:12:01 +05:30
rohitwaghchaure
00ea513546 Merge pull request #48875 from aerele/sales-order-to-sales-invoice-item-quantity
fix: incorrect pending qty when creating sales invoice from sales order
2025-08-26 01:08:00 +05:30
Sagar Vora
4bf3a73b50 Merge pull request #49312 from sagarvora/fix-pick-list-scanning 2025-08-25 19:07:43 +00:00
Sagar Vora
72a38929e5 fix: correct logic for warehouse field label 2025-08-26 00:29:26 +05:30
Vignesh Sekar
4d3ddeae8d perf: check PCV (smaller) table before checking GL Entries 2025-08-26 00:14:15 +05:30
Sagar Vora
4005e4412d fix: match warehouse only when last_scanned_warehouse field exists 2025-08-26 00:10:16 +05:30
rohitwaghchaure
470efbeaf5 Merge pull request #49310 from rohitwaghchaure/fixed-sre-issues
fix: SRE status and delivered qty
2025-08-25 23:50:52 +05:30
ravibharathi656
368dbe3bbf chore: remove update_stock 2025-08-25 21:23:14 +05:30
ravibharathi656
e5affb16c7 fix(exchange rate revaluation): add check for gain_loss 2025-08-25 21:12:26 +05:30
ravibharathi656
e5d4b4f0f0 test: add pending quantity check for invoice creation 2025-08-25 21:05:12 +05:30
ravibharathi656
a5138f4899 fix: incorrect pending qty when creating sales invoice from sales order 2025-08-25 21:05:11 +05:30
Rohit Waghchaure
4cac80a968 fix: sre status and delivered qty 2025-08-25 21:00:08 +05:30
Lautaro Juarez
f74d8439a1 removing newsletter from workspace 2025-08-25 10:55:35 -03:00
ruthra kumar
fa182395f6 Merge pull request #49301 from aerele/fix/set-valid-naming-series-in-test
fix: set valid serial no naming series format
2025-08-25 17:21:48 +05:30
ruthra kumar
ed84d33b28 Merge pull request #49296 from emmanuel-mwendwa/fix/monthly-err-filter
fix(accounts): correct typo in monthly auto exchange rate revaluation filter
2025-08-25 17:07:05 +05:30
Bhavan23
770d6dd8e2 fix(budget): always set fiscal year before fetching company approver role 2025-08-25 11:14:44 +00:00
Kavin
46b85c7857 fix: set valid serial no naming series format 2025-08-25 16:37:59 +05:30
ruthra kumar
626be61218 Merge pull request #49252 from aerele/dr/cr-posting-date
feat(payment-reconciliation): add posting date field for debit/credit…
2025-08-25 16:08:40 +05:30
Diptanil Saha
9a5348b0e0 Merge pull request #49297 from diptanilsaha/test-sabb-serial-no
test: fix naming series for serial no on test_serial_no_valuation_for_legacy_ledgers
2025-08-25 15:28:39 +05:30
diptanilsaha
5ebd7d72fc test: fix naming series for serial no on test_serial_no_valuation_for_legacy_ledgers 2025-08-25 15:10:03 +05:30
ruthra kumar
a3bd10f6c6 Merge pull request #49295 from frappe/l10n_develop
fix: sync translations from crowdin
2025-08-25 11:00:56 +05:30
CoiledCoder
15040a362d refactor: centralize exchange rate revaluation scheduling logic
- Introduced a private helper `_auto_create_exchange_rate_revaluation_for(frequency)`
- Removed duplicate logic across daily, weekly, and monthly ERR functions
- Prevents future copy-paste bugs
- Keeps existing behavior unchanged
2025-08-25 03:35:55 +00:00
CoiledCoder
19729a307f fix: correct typo in monthly auto exchange rate revaluation filter
The "auto_create_exchange_rate_revaluation_monthly" function was
using the wrong filter key `"Montly"` instead of `"Monthly"`.
As a result, no companies configured for monthly ERR were being
processed.
2025-08-25 02:07:05 +00:00
MochaMind
42710f9ba1 fix: Esperanto translations 2025-08-25 02:16:10 +05:30
MochaMind
b2e94ed29d fix: Dutch translations 2025-08-25 02:16:06 +05:30
MochaMind
6908101735 fix: Serbian (Latin) translations 2025-08-25 02:16:03 +05:30
MochaMind
d211641ce2 fix: Bosnian translations 2025-08-25 02:16:00 +05:30
MochaMind
c3bca6ed60 fix: Croatian translations 2025-08-25 02:15:57 +05:30
MochaMind
9423f37e12 fix: Thai translations 2025-08-25 02:15:54 +05:30
MochaMind
c93da6cbbc fix: Persian translations 2025-08-25 02:15:51 +05:30
MochaMind
709ae67b3f fix: Indonesian translations 2025-08-25 02:15:48 +05:30
MochaMind
efad850ef3 fix: Portuguese, Brazilian translations 2025-08-25 02:15:44 +05:30
MochaMind
622eafdcc0 fix: Vietnamese translations 2025-08-25 02:15:41 +05:30
MochaMind
5cddf86c7c fix: Chinese Simplified translations 2025-08-25 02:15:38 +05:30
MochaMind
28931bd49a fix: Turkish translations 2025-08-25 02:15:34 +05:30
MochaMind
61360fa813 fix: Swedish translations 2025-08-25 02:15:31 +05:30
MochaMind
a41f6c7fcd fix: Serbian (Cyrillic) translations 2025-08-25 02:15:28 +05:30
MochaMind
22aa830f53 fix: Russian translations 2025-08-25 02:15:25 +05:30
MochaMind
5aaf1501a2 fix: Portuguese translations 2025-08-25 02:15:22 +05:30
MochaMind
6781c69d33 fix: Polish translations 2025-08-25 02:15:18 +05:30
MochaMind
9a1f033fb4 fix: Italian translations 2025-08-25 02:15:15 +05:30
MochaMind
259c74eb3a fix: Hungarian translations 2025-08-25 02:15:12 +05:30
MochaMind
b107cf7d03 fix: German translations 2025-08-25 02:15:09 +05:30
MochaMind
97b0985261 fix: Czech translations 2025-08-25 02:15:06 +05:30
MochaMind
055b1c3bdc fix: Arabic translations 2025-08-25 02:15:03 +05:30
MochaMind
fa0856de8b fix: Spanish translations 2025-08-25 02:14:59 +05:30
MochaMind
db1d77269a fix: French translations 2025-08-25 02:14:56 +05:30
MochaMind
44634cde63 chore: update POT file (#49292) 2025-08-24 15:32:02 +02:00
Raffael Meyer
eabf69ea00 Merge pull request #49285 from barredterra/create-pricing-rule 2025-08-22 20:01:18 +02:00
barredterra
7bc508004b chore!: remove unused utils 2025-08-22 19:44:14 +02:00
barredterra
831dfc8f6d perf: create Pricing Rule from Customer and Supplier 2025-08-22 19:44:14 +02:00
mergify[bot]
7435b28092 fix(Supplier): add make_method for Pricing Rule (backport #49282) (#49284)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2025-08-22 19:38:12 +02:00
Raffael Meyer
34584cd8f8 refactor!: remove whitelisted method make_bank_account (#49001) 2025-08-22 16:15:19 +00:00
MochaMind
677a5e829e fix: sync translations from crowdin (#49238) 2025-08-22 12:04:33 +02:00
Raffael Meyer
d1f8105abf ci: make coderabbit less chatty (#49203)
* ci: make coderabbit less chatty

* ci: disable high level summary

* ci: disable reviews on style PRs

* ci: fake tests on ignored paths

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
2025-08-22 03:37:31 +00:00
Raffael Meyer
c54ccc56c7 feat: add make methods for Bank Account (#49000)
* perf(make_bank_account): remove useless roundtrip to server

* feat: add make methods for Bank Account

Auto-fill Party Type and Party when creating a Bank Account from Customer, Supplier or Employee.
2025-08-22 01:09:47 +02:00
Mihir Kandoi
e909fd352a Merge pull request #49050 from mihir-kandoi/48873
fix: ensure variant conversion factor is returned before the template's
2025-08-22 00:23:52 +05:30
rohitwaghchaure
916ed3d6aa Merge pull request #49269 from rohitwaghchaure/fixed-github-49237
fix: Serial Nos popup only appears 1 time
2025-08-21 23:28:10 +05:30
Rohit Waghchaure
5503d4b05b fix: Serial Nos popup only appears 1 time 2025-08-21 23:24:35 +05:30
Hussain Nagaria
a5f200636a feat: show title in link field for Project DocType (#49265) 2025-08-21 12:47:06 +00:00
KerollesFathy
673bb99573 Merge branch 'develop' into prevent-negative-repair-cost 2025-08-20 22:58:19 +00:00
rohitwaghchaure
d64cd86f52 Merge pull request #49255 from rohitwaghchaure/fixed-github-49034
fix: sub-operation not working
2025-08-20 22:55:24 +05:30
rohitwaghchaure
3ddd5bb65a Merge pull request #49243 from aerele/transaction-cumulative
fix: hide is_cumulative for apply_on is set to Transaction
2025-08-20 22:54:32 +05:30
Rohit Waghchaure
876598f714 fix: sub-operation not working 2025-08-20 22:19:03 +05:30
anwarpatelnoori
ed550bb633 fix: show create purchase receipt button only when update stock is not checked 2025-08-20 14:18:35 +00:00
l0gesh29
6b4004b127 feat(payment-reconciliation): add posting date field for debit/credit note auto jv creation 2025-08-20 19:25:38 +05:30
Mihir Kandoi
96feae60da Merge pull request #49250 from mihir-kandoi/fix-child-item-picker-pr-pi
fix: child item picker picking all items when creating PI from PR
2025-08-20 17:48:04 +05:30
rohitwaghchaure
fb1bf29136 Merge pull request #49249 from rohitwaghchaure/fixed-stock-reservation
fix: stock reservation
2025-08-20 17:21:51 +05:30
Mihir Kandoi
738c1e0d0a fix: child item picker picking all items when creating PI from PR 2025-08-20 17:20:03 +05:30
Rohit Waghchaure
19b64d4b0f fix: stock reservation 2025-08-20 16:58:13 +05:30
Kavin
67e57018bc Merge pull request #49183 from aerele/fix/mr-status-from-wo
Fix/mr status from wo
2025-08-20 15:12:18 +05:30
El-Shafei H.
fac8013dba fix: convert NaN to numerical 2025-08-20 10:15:27 +03:00
Diptanil Saha
3c6b2a7c03 Merge pull request #49235 from barredterra/prty
style: format controllers with prettier
2025-08-20 12:03:38 +05:30
Navin-S-R
699d42b26c fix: hide is_cumulative for apply_on is set to Transaction 2025-08-20 11:56:13 +05:30
barredterra
1cdf32d807 style: format controllers with prettier 2025-08-19 15:43:35 +02:00
barredterra
a0f23339cc ci: update pre-commit config 2025-08-19 15:43:24 +02:00
Raffael Meyer
77478303fe fix: set missing due date in Purchase Invoice and POS Invoice (#49232) 2025-08-19 14:29:59 +02:00
rohitwaghchaure
3f354b78dc Merge pull request #49228 from rohitwaghchaure/fixed-set-default-company
fix: company issue in setup wizard
2025-08-19 16:21:22 +05:30
rohitwaghchaure
c7a2a26f50 Merge pull request #49223 from aerele/fix/putaway-rule-in-se
fix(stock): don't override t_warehouse if no rules found
2025-08-19 16:08:01 +05:30
Rohit Waghchaure
1fb0d1460a fix: company issue in setup wizard 2025-08-19 16:02:54 +05:30
rohitwaghchaure
acab260762 Merge pull request #49213 from rohitwaghchaure/feat-workstation-operating-component
refactor: workstation operating component
2025-08-19 14:26:21 +05:30
ruthra kumar
a7ec036d95 Merge pull request #49121 from rehanrehman389/je-reversal-duplicate
fix: prevent duplicate reverse Journal Entry
2025-08-19 14:10:07 +05:30
ruthra kumar
bb2236ba85 Merge pull request #49102 from aerele/duplicate-quotation-currency
fix(quotation): update currency on duplicate
2025-08-19 14:04:04 +05:30
Kavin
66f217c8e6 fix(stock): don't override t_warehouse if no rules found 2025-08-19 13:46:41 +05:30
Rohit Waghchaure
7cd0db219a refactor: workstation operating component 2025-08-19 13:29:32 +05:30
Logesh Periyasamy
d656e02441 Merge pull request #49185 from aerele/mop-sales-register
fix: handle mode of payment filter
2025-08-19 12:02:31 +05:30
ruthra kumar
67d3ad47d7 Merge pull request #49055 from aerele/accounting-dimension-filer-fieldname
fix: fetch fieldname in accounting dimension filter
2025-08-19 10:48:09 +05:30
ruthra kumar
4ec2e16b98 Merge pull request #49192 from diptanilsaha/sql_qb
fix: improve queries with query builder and input sanitization
2025-08-19 10:30:13 +05:30
rohitwaghchaure
645abe0c77 Merge pull request #49216 from aerele/pick-list-update-warehouse-property
fix(pick list): update warehouse property on refresh
2025-08-19 10:27:37 +05:30
ruthra kumar
e623b262ab Merge pull request #49214 from frappe/l10n_develop
fix: sync translations from crowdin
2025-08-19 10:11:55 +05:30
ravibharathi656
5472ff4ac3 fix(pick list): update warehouse property on refresh 2025-08-19 08:29:48 +05:30
Khushi Rawat
f377c94b64 Merge pull request #49141 from khushi8112/consider-asset-value-adjustments-in-report
refactor: consider asset value adjustments in report
2025-08-19 02:57:23 +05:30
MochaMind
6b7ceb92fa fix: Persian translations 2025-08-19 00:24:00 +05:30
MochaMind
9a15f4fc8d fix: Italian translations 2025-08-19 00:23:28 +05:30
Diptanil Saha
fc9fa2a7f8 Merge pull request #49211 from diptanilsaha/paid_amount_gt_mop
fix: prevent auto-setting payment amount if set_grand_total_to_default_mop is disabled
2025-08-18 17:32:59 +05:30
diptanilsaha
b617b5aa20 fix: prevent auto-setting payment amounts if set_grand_total_to_default_mop is disabled 2025-08-18 17:17:35 +05:30
ruthra kumar
15006c27cc Merge pull request #49206 from akhilnarang/update-codeowners
chore(codeowners): set ruthra for pyproject.toml
2025-08-18 16:31:46 +05:30
Sagar Vora
bd3892982f fix: update dunning status based on credit notes (#49066)
Co-authored-by: Sagar Vora <16315650+sagarvora@users.noreply.github.com>
2025-08-18 10:47:15 +00:00
Karm Soni
53520af2fd test: update test data for internal customer and supplier 2025-08-18 15:48:43 +05:30
Diptanil Saha
5ff508de2c Merge pull request #49205 from diptanilsaha/gt_default_mop
fix: apply grand total to default payment mode in Sales and POS invoices
2025-08-18 15:12:18 +05:30
Karm Soni
059c541875 fix: update payment schedule then make gl entries 2025-08-18 14:57:41 +05:30
Sagar Vora
d959ca1694 fix: handle dunning status change on all changes to outstanding amount 2025-08-18 14:57:41 +05:30
Sagar Vora
fe2d0ea43b refactor: commonify and improve perf 2025-08-18 14:57:41 +05:30
Karm Soni
6c644dd5d2 refactor: combine the return conditions 2025-08-18 14:57:41 +05:30
Karm Soni
b304c1d079 feat: add dunning resolution for credit notes and update hooks 2025-08-18 14:57:40 +05:30
Diptanil Saha
8cf672d878 Merge pull request #49169 from aerele/asset-make-journal-entry
fix(asset): prevent translation function shadowing in make_journal_entry
2025-08-18 14:55:39 +05:30
diptanilsaha
9aa7f87a27 fix: apply grand total to default payment mode in Sales and POS invoices 2025-08-18 14:47:43 +05:30
Akhil Narang
692c848154 chore(codeowners): set ruthra for pyproject.toml
Not sure why I was here tbh

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
2025-08-18 13:54:43 +05:30
rohitwaghchaure
4378be45e4 Merge pull request #49182 from aerele/item-searchfield-report
fix: handle all searchfields in items
2025-08-18 09:29:23 +05:30
rohitwaghchaure
dbb8c34486 Merge pull request #49186 from mihir-kandoi/reserve-extra-items-during-sre-transfer
fix: reserve extra items during SRE transfer
2025-08-18 09:26:20 +05:30
MochaMind
0933701f55 fix: sync translations from crowdin (#49202) 2025-08-17 20:43:53 +02:00
Raffael Meyer
5bd45b5a42 fix: ignore links in Dunning patch (#49201) 2025-08-17 20:36:16 +02:00
Raffael Meyer
48ff8175eb ci: disable coderabbit status comment (#49173) 2025-08-17 12:55:26 +02:00
MochaMind
8d4562d071 chore: update POT file (#49198) 2025-08-17 12:54:29 +02:00
rohitwaghchaure
334c17f8ab Merge pull request #49193 from rohitwaghchaure/fixed-support-45657
fix: additional cost not consider in valuation rate for Stock Entry transfer
2025-08-17 10:51:42 +05:30
Rohit Waghchaure
bbc772abe7 fix: additional cost not consider in valuation rate for Stock Entry transfer 2025-08-17 10:34:33 +05:30
diptanilsaha
1231ca17c9 fix: handle empty loyalty point details 2025-08-16 23:48:10 +05:30
diptanilsaha
e563ed0c75 fix: use query builder instead of raw SQL in get_timesheet_detail_rate 2025-08-16 23:08:29 +05:30
diptanilsaha
7f2a52ff71 fix: use query builder instead of raw SQL in get_rfq_containing_supplier 2025-08-16 23:08:12 +05:30
diptanilsaha
7fa4ed6139 fix: use query builder instead of raw SQL in unset_existing_data 2025-08-16 23:07:26 +05:30
diptanilsaha
eb22794f14 fix: sanitize column name for inventory_dimensions in get_stock_balance 2025-08-16 23:07:26 +05:30
diptanilsaha
1db135262d fix: use query builder instead of raw SQL in get_blanket_orders 2025-08-16 23:07:12 +05:30
diptanilsaha
6320f7290f fix: formatted string for disabled filter in get_income_account 2025-08-16 23:07:11 +05:30
diptanilsaha
de919568b4 fix: use query builder instead of raw SQL in get_material_requests_based_on_supplier 2025-08-16 23:06:57 +05:30
diptanilsaha
8696ba2f5d fix: use query builder instead of raw SQL in get_loyalty_details 2025-08-16 23:06:11 +05:30
KerollesFathy
c140596ab3 fix: add non-negative constraint to Repair Cost field 2025-08-16 13:42:45 +00:00
Mihir Kandoi
bba72e9b2f fix: reserve extra items during SRE transfer 2025-08-16 13:09:33 +05:30
ravibharathi656
ad559c3491 fix: handle all searchfields in items 2025-08-15 10:02:54 +05:30
divyalekha99
078b8439d9 fix: wrap inter-company order button labels in __() for translation (#49178)
* Updated purchase_order.js

* Update sales_order.js
2025-08-14 20:28:51 +05:30
Diptanil Saha
0b475aa13e Merge pull request #49108 from LewisMojica/develop
fix(pos): include Product Bundle components in reserved qty to preven…
2025-08-14 18:47:26 +05:30
Diptanil Saha
734880f314 Merge pull request #49163 from diptanilsaha/fix-product-bundle-qty
fix: product bundle child item quantity should be a positive number
2025-08-14 18:46:23 +05:30
barredterra
cff2629131 ci: skip patch and server tests for unrelated config changes 2025-08-14 14:52:15 +02:00
MochaMind
667213e52b fix: sync translations from crowdin (#49152) 2025-08-14 14:32:57 +02:00
barredterra
f0c9b3852f ci: disable coderabbit status comment
Disables this kind of comment: https://github.com/frappe/erpnext/pull/49152#issuecomment-3184835491
2025-08-14 14:30:36 +02:00
l0gesh29
5e82de1b71 fix(asset): prevent translation function shadowing in make_journal_entry 2025-08-14 16:25:53 +05:30
Sagar Vora
29ca1a1f40 chore: remove stale type hint 2025-08-14 13:06:31 +05:30
Sagar Vora
eb5946fa99 Merge pull request #49165 from karm1000/remove-last-scanned-warehouse-from-python 2025-08-14 07:00:45 +00:00
Sagar Vora
2fc39859ad Merge pull request #49164 from karm1000/reorder-last-scanned-warehouse-in-si 2025-08-14 06:39:45 +00:00
Karm Soni
58322c271b refactor: remove last_scanned_warehouse field from python 2025-08-14 12:01:45 +05:30
Karm Soni
319414486a fix: reorder last_scanned_warehouse in sales invoice 2025-08-14 11:51:33 +05:30
diptanilsaha
711076d02d fix: product bundle child item quantity should be a positive number 2025-08-14 11:49:09 +05:30
Soni Karm
227fadc541 feat: enhance barcode scanner to support warehouse scanning (#48865)
Co-authored-by: Sagar Vora <16315650+sagarvora@users.noreply.github.com>
2025-08-14 11:32:02 +05:30
rohitwaghchaure
4cd0db764f Merge pull request #49155 from rohitwaghchaure/fixed-ignore-message-bom-creator
chore: convert message to toast notification
2025-08-14 10:34:37 +05:30
Rohit Waghchaure
fc71001110 chore: convert message to toast notification 2025-08-14 08:50:21 +05:30
Lewis
54d3e5675f chore: improve code clarity per reviewer feedback
- Rename stock_qty variable to reserved_qty for clarity
- Update get_pos_reserved_qty_from_table to return float
- Simplify aggregation logic in get_pos_reserved_qty
- Ensure return values match docstring specifications
2025-08-13 16:25:58 -04:00
rohitwaghchaure
b9fc3db613 Merge pull request #49154 from rohitwaghchaure/fixed-incorrect-stock-reco-current-qty
fix: current qty for batch in stock reco
2025-08-13 23:56:51 +05:30
Rohit Waghchaure
817e719cc2 fix: current qty for batch in stock reco 2025-08-13 23:39:16 +05:30
Khushi Rawat
7ba61be796 Merge pull request #49075 from rehanrehman389/asset-docstatus-check
fix: add validation for draft PR/PI in Asset
2025-08-13 17:17:37 +05:30
Khushi Rawat
4a48b13715 refactor: validate linked purchase docs before field usage 2025-08-13 16:38:30 +05:30
khushi8112
cd2bab7c5f fix: add value adjustment amount in report for group by category filter 2025-08-13 16:19:51 +05:30
khushi8112
f8050f4278 fix: add value adjustment amount in asset value 2025-08-13 16:17:24 +05:30
Mihir Kandoi
3bcf1cbdce Merge pull request #49134 from karm1000/default-val-now-in-subcontracting-receipt
chore: add default value for posting_time field in subcontracting receipt
2025-08-13 14:04:18 +05:30
Mihir Kandoi
0f68dc4505 Merge pull request #49133 from mihir-kandoi/auto-reserve-serial-batch
fix: do not auto reserve serial/batch if SRE already has serial/batch set
2025-08-13 13:45:04 +05:30
Karm Soni
b7470617e0 chore: add default value for posting_time field in subcontracting receipt 2025-08-13 12:55:14 +05:30
Mihir Kandoi
ac9b0409f5 fix: do not auto reserve serial/batch if SRE already has serial/batch set 2025-08-13 12:24:44 +05:30
Lewis
d77d79e011 fix(pos): use packed_items snapshot for bundle reservations
Replaced live Product Bundle queries with `Packed Item` table
lookups to ensure historical reservation accuracy.
Addresses bundle qty underestimation and avoids errors when
bundle definitions change after sale.

Inspired by approach from @diptanilsaha in #49106.
2025-08-12 20:10:39 -04:00
Lewis
f5e5f7b588 fix: remove unclear message related to availability of product bundle 2025-08-12 18:53:09 -04:00
Lewis
a65b200eb7 fix(pos): populate packed_items table in POS Invoice 2025-08-12 18:33:02 -04:00
MochaMind
8290731253 fix: sync translations from crowdin (#49126) 2025-08-13 00:07:51 +02:00
Raffael Meyer
9429c05693 ci: disable Coderabbit on translation PRs (#49128) 2025-08-13 00:06:10 +02:00
Lewis
0fc187adc3 chore: apply pre-commit formatting 2025-08-12 16:36:00 -04:00
Mihir Kandoi
99956649e3 Merge pull request #49120 from mihir-kandoi/fix-auto-reserve-serial-batch
fix: check for auto reserve serial/batch before auto reserving
2025-08-12 22:03:59 +05:30
rohitwaghchaure
e91d886e76 Merge pull request #49123 from rohitwaghchaure/fixed-sub-assembl-in-pp
fix: do not fetch sub-assembly in PP
2025-08-12 22:01:34 +05:30
Mihir Kandoi
514cfe2c29 Merge pull request #49122 from mihir-kandoi/gh49113
feat: select child item when creating one document from another
2025-08-12 21:36:31 +05:30
Mihir Kandoi
a9936ae133 feat: select child item when creating one document from another 2025-08-12 21:05:51 +05:30
Rohit Waghchaure
1e87600119 fix: do not fetch sub-assembly in PP 2025-08-12 20:36:03 +05:30
rehansari26
a9aeb8ac54 fix: prevent duplicate reverse Journal Entry 2025-08-12 17:23:02 +05:30
Mihir Kandoi
2c64b76392 fix: check for auto reserve serial/batch before auto reserving 2025-08-12 16:51:06 +05:30
Sagar Vora
655a241958 Merge pull request #49118 from sagarvora/rm-query-exists 2025-08-12 11:19:39 +00:00
Sagar Vora
6bf63f66ec fix: guard against default not set in stock settings 2025-08-12 16:31:15 +05:30
Sagar Vora
8b75993d3a perf: remove unecessary calls to deepcopy 2025-08-12 16:17:02 +05:30
Sagar Vora
e11cadca58 perf: remove unnecessary branching and use cache in get_item_warehouse 2025-08-12 16:16:24 +05:30
l0gesh29
77021fff74 fix: handle default dimension for all company 2025-08-12 14:28:56 +05:30
l0gesh29
16e440f9a7 fix: handle default accounting dimension 2025-08-12 14:28:56 +05:30
l0gesh29
3cf765d985 fix: add patch 2025-08-12 14:28:18 +05:30
l0gesh29
42f9d27d79 fix: fetch fieldname in accounting dimension filter 2025-08-12 14:27:32 +05:30
l0gesh29
ac2acc535d fix: add fieldname in accounting dimension filter 2025-08-12 14:27:32 +05:30
Diptanil Saha
81c8972a66 Merge pull request #49112 from diptanilsaha/patch_set_invoice_doctype
fix: patch to set invoice_type on POS Settings
2025-08-12 12:49:55 +05:30
diptanilsaha
0941b908dd fix: patch to set invoice type on POS Settings 2025-08-12 12:23:45 +05:30
ruthra kumar
f9f4e4b84c Merge pull request #49104 from frappe/l10n_develop
fix: sync translations from crowdin
2025-08-12 10:53:56 +05:30
ruthra kumar
b8ea6fc708 Merge pull request #48419 from ljain112/experiment-ple
fix: do not create delinked payment ledger entries on cancel
2025-08-12 10:51:20 +05:30
ruthra kumar
0c7dcec5c2 Merge pull request #49086 from aerele/process-statement-of-accounts-auto-email
fix(process statement of accounts): use date instead of formatted date
2025-08-12 10:47:15 +05:30
ruthra kumar
92327729d6 Merge pull request #49096 from aerele/po-dialog
fix: table render issue on pop-up edit
2025-08-12 10:39:51 +05:30
Lewis Mojica
5a5804ca87 chore: remove unused variable 2025-08-11 16:06:08 -04:00
Lewis
984d744ac2 fix(pos): include Product Bundle components in reserved qty to prevent overselling
- Add `get_bundle_pos_reserved_qty` to account for component items in submitted POS Invoices
- Update `get_pos_reserved_qty` to sum direct and bundle reservations
- Remove double subtraction in `get_bundle_availability` to avoid underestimating bundle availability
- Prevents overselling when multiple POS sessions sell bundles with shared components
- Fixes #49021
2025-08-11 15:27:18 -04:00
MochaMind
1e992bb263 fix: Esperanto translations 2025-08-11 22:37:03 +05:30
MochaMind
21e7675a44 fix: Dutch translations 2025-08-11 22:36:58 +05:30
MochaMind
26586a42a4 fix: Serbian (Latin) translations 2025-08-11 22:36:55 +05:30
MochaMind
823413a9c4 fix: Bosnian translations 2025-08-11 22:36:51 +05:30
MochaMind
25240967ba fix: Croatian translations 2025-08-11 22:36:48 +05:30
MochaMind
4ce058fc47 fix: Thai translations 2025-08-11 22:36:44 +05:30
MochaMind
b9a08e7920 fix: Persian translations 2025-08-11 22:36:41 +05:30
MochaMind
68f23c7a70 fix: Indonesian translations 2025-08-11 22:36:37 +05:30
MochaMind
43dbc1efbb fix: Portuguese, Brazilian translations 2025-08-11 22:36:32 +05:30
MochaMind
472c0c2b27 fix: Vietnamese translations 2025-08-11 22:36:29 +05:30
MochaMind
d0e59b580e fix: Chinese Simplified translations 2025-08-11 22:36:25 +05:30
MochaMind
a8b69efa84 fix: Turkish translations 2025-08-11 22:36:22 +05:30
MochaMind
8b27c2b8ee fix: Swedish translations 2025-08-11 22:36:18 +05:30
MochaMind
e346e988ca fix: Serbian (Cyrillic) translations 2025-08-11 22:36:14 +05:30
MochaMind
a271fd2590 fix: Russian translations 2025-08-11 22:36:09 +05:30
MochaMind
7be3eb36d9 fix: Portuguese translations 2025-08-11 22:36:06 +05:30
MochaMind
62269b595a fix: Polish translations 2025-08-11 22:36:02 +05:30
MochaMind
7d03e609a6 fix: Italian translations 2025-08-11 22:35:59 +05:30
MochaMind
91652921a3 fix: Hungarian translations 2025-08-11 22:35:55 +05:30
MochaMind
cde9d3a9ce fix: German translations 2025-08-11 22:35:51 +05:30
MochaMind
c655d1db3a fix: Czech translations 2025-08-11 22:35:48 +05:30
MochaMind
4fa74d29a9 fix: Arabic translations 2025-08-11 22:35:44 +05:30
MochaMind
752253704c fix: Spanish translations 2025-08-11 22:35:41 +05:30
MochaMind
8d35676e5a fix: French translations 2025-08-11 22:35:37 +05:30
rohitwaghchaure
4cc6596d44 Merge pull request #49087 from rohitwaghchaure/sabb-traceability-expiry-date-report
fix: batch expiry date, serial no warranty and AMC expiry date in traceability report
2025-08-11 21:40:38 +05:30
Rohit Waghchaure
16d5caa719 fix: batch expiry date, serial no warranty and amc expiry date in traceability report 2025-08-11 19:42:12 +05:30
ravibharathi656
430a06d056 fix(quotation): update currency on duplicate 2025-08-11 17:59:59 +05:30
ruthra kumar
0c62e1a9ae Merge pull request #48862 from khushi8112/show-party-name-in-reports
feat: show party name in reports
2025-08-11 17:47:09 +05:30
Lakshit Jain
d45cd5af2b Merge pull request #49093 from ljain112/fix-account-coa
fix: allow creation of root accounts in account tree view
2025-08-11 17:07:03 +05:30
ruthra kumar
2713055447 Merge pull request #49092 from ruthra-kumar/opp_type
refactor: use translated value of set default in Opportunity
2025-08-11 16:53:00 +05:30
l0gesh29
3431c6c90e fix: table render issue on pop-up edit 2025-08-11 16:52:29 +05:30
Asmita Hase
f0e7eb44f1 Merge pull request #49088 from AssemBahnasy/fix-party-type-employee-filter-develop 2025-08-11 16:44:28 +05:30
ruthra kumar
2b777caa83 refactor: use translated value of set default in Opportunity 2025-08-11 16:27:10 +05:30
Assem Bahnasy
8a9bf166c6 refactor: Move Employee inclusion to SQL level to preserve search semantics 2025-08-11 12:41:34 +03:00
Assem Bahnasy
a08c7f37d3 refactor: Use parameterized SQL queries to prevent injection and handle None values 2025-08-11 11:55:56 +03:00
ruthra kumar
3302795e50 Merge pull request #48952 from frappe/l10n_develop
fix: sync translations from crowdin
2025-08-11 13:46:41 +05:30
ruthra kumar
e867a42181 Merge pull request #49077 from frappe/pot_develop_2025-08-10
chore: update POT file
2025-08-11 13:38:57 +05:30
ravibharathi656
aa3f50ab77 fix(process statement of accounts): use date instead of formatted date 2025-08-11 12:18:17 +05:30
ruthra kumar
fc5946c139 Merge pull request #48730 from rtdany10/vat_201_export
fix(regional-uae): mark export items as zero rated
2025-08-11 11:35:08 +05:30
Mihir Kandoi
2fd4db0891 Merge pull request #49082 from mihir-kandoi/fix-sre-closed-status-query
fix: modify all remaining SRE queries to consider new Closed status
2025-08-11 10:37:47 +05:30
Vishist16
3ee23d9ee8 fix: handle negative inventory check (#48558) (#48691)
* fix: handle negative inventory check (#48558)

* fix: updated DocField via Desk UI as suggested

* fix: update DocField via Desk UI and fix linting issues
2025-08-11 10:29:27 +05:30
Mihir Kandoi
dbaa44688e fix: modify all remaining SRE queries to consider new Closed status 2025-08-11 10:21:16 +05:30
Mihir Kandoi
fe4f7b9c2f Merge pull request #49068 from KerollesFathy/query-filter-disabled-scraped-items-on-job-card
fix(job-card): Add filter to item_code query for scrap_items to exclude disabled
2025-08-11 10:12:58 +05:30
Mihir Kandoi
7adab6f5ec Merge pull request #49071 from navinrc/add-item-name-to-material-request-dialog
feat: add item_name column to Material Request dialog in Purchase Order
2025-08-11 10:02:27 +05:30
MochaMind
5b4e28fac6 fix: Swedish translations 2025-08-10 22:40:23 +05:30
MochaMind
12c91af5bc fix: Italian translations 2025-08-10 22:40:20 +05:30
frappe-pr-bot
d1f24ca4a5 chore: update POT file 2025-08-10 09:37:20 +00:00
Rehan Ansari
4cf481cca8 fix: add validation for draft PR/PI in Asset 2025-08-10 00:40:52 +05:30
MochaMind
dd910d7c1a fix: Serbian (Latin) translations 2025-08-09 22:23:46 +05:30
MochaMind
1770fe6590 fix: Swedish translations 2025-08-09 22:23:43 +05:30
MochaMind
a72a1ca517 fix: Serbian (Cyrillic) translations 2025-08-09 22:23:39 +05:30
MochaMind
9d2e5391cc fix: Italian translations 2025-08-09 22:23:33 +05:30
navinrc
4312719010 feat: add item_name column to Material Request dialog in Purchase Order 2025-08-09 01:06:51 +05:30
MochaMind
9540ffeec0 fix: Italian translations 2025-08-08 22:14:35 +05:30
KerollesFathy
89c2bbed7c fix: Add filter to item_code query for scrap_items to exclude disabled items 2025-08-08 14:45:25 +00:00
rohitwaghchaure
a7e70b1094 Merge pull request #49067 from rohitwaghchaure/fixed-github-49064
fix: restrict fixed asset items in the BOM
2025-08-08 19:29:45 +05:30
Rohit Waghchaure
760c373eb2 fix: restrict fixed asset items in the BOM 2025-08-08 19:00:32 +05:30
rohitwaghchaure
89aab0af18 Merge pull request #49060 from mihir-kandoi/modify-all-queries-for-closed-status-sre
fix: modify all SRE queries to consider new Closed status
2025-08-08 16:12:22 +05:30
Mihir Kandoi
345ca405b0 fix: modify all SRE queries to consider new Closed status 2025-08-08 15:10:43 +05:30
Asmita Hase
7d06622881 Merge pull request #49053 from asmitahase/employee-party 2025-08-08 13:57:49 +05:30
Asmita Hase
fa5419dede Merge pull request #49051 from asmitahase/patch-again 2025-08-08 12:58:29 +05:30
Asmita Hase
e7a2ff1884 fix: dont validate account type in for employee party type 2025-08-08 12:58:06 +05:30
Asmita Hase
6d908f44a5 chore: trigger create_advance_payment_ledger_records patch 2025-08-08 12:18:36 +05:30
Mihir Kandoi
d61977d002 fix: ensure variant conversion factor is returned before the template's 2025-08-08 11:57:15 +05:30
Dany Robert
29c3ef8280 fix: handle case where taxes is added invoice changed to non-export later 2025-08-08 11:01:59 +05:30
Mihir Kandoi
f9c797a402 Merge pull request #48813 from aerele/filter-expense-head-account
fix(purchase invoice): filter only enabled account
2025-08-08 10:54:10 +05:30
Dany Robert
c8940a39b3 chore: code styling 2025-08-08 10:02:35 +05:30
Dany Robert
38471995e7 fix: show message only if no tax is applied 2025-08-08 09:58:16 +05:30
MochaMind
00b3576134 fix: Italian translations 2025-08-07 21:52:10 +05:30
Asmita Hase
94c45d1db3 Merge pull request #49042 from asmitahase/ignore-validation-flag 2025-08-07 17:58:43 +05:30
rohitwaghchaure
00518069ac Merge pull request #49040 from rohitwaghchaure/fixed-calculation-sabb-traceability
fix: qty calculation in SABB traceability
2025-08-07 17:32:23 +05:30
Asmita Hase
0665d13fd3 fix: added a flag on journal entry to ignore party account type validation if required 2025-08-07 17:31:36 +05:30
Rohit Waghchaure
505814c07a fix: qty calculation in SABB traceability 2025-08-07 16:22:52 +05:30
rohitwaghchaure
c15d7fe86e Merge pull request #49022 from rohitwaghchaure/fixed-valuation-rate-batch-ma
fix: zero valuation rate for the batch
2025-08-07 13:54:13 +05:30
mithili
23308f6d10 chore: add back filter 2025-08-07 11:10:43 +05:30
mithili
7c8dd86a35 fix: add condition to fetch active accounts 2025-08-07 11:10:43 +05:30
mithili
c3111db6e2 fix(purchase invoice): filter only enabled account 2025-08-07 11:10:42 +05:30
Diptanil Saha
09f65713ca Merge pull request #49023 from diptanilsaha/fix_account_reports_presentation_currency
fix: NoneType error on applying presentation_currency filter on financial statements and trial balance report
2025-08-07 02:10:10 +05:30
Rohit Waghchaure
c8410cb5ca fix: zero valuation rate for the batch 2025-08-07 01:47:54 +05:30
diptanilsaha
d7e22de44c fix: nonetype error on applying presentation_currency filter on financial statements and trial balance report 2025-08-07 01:37:33 +05:30
rohitwaghchaure
5918199845 Merge pull request #49020 from rohitwaghchaure/fixed-source-document-batch
fix: source document in batch
2025-08-06 23:18:11 +05:30
Rohit Waghchaure
8b0b938595 fix: source document in batch 2025-08-06 22:22:36 +05:30
rohitwaghchaure
2c35299cbb Merge pull request #49010 from rohitwaghchaure/fixed-support-45862-1
fix: timeout while submitting purchase receipt
2025-08-06 20:04:55 +05:30
Khushi Rawat
07d1663f2c Merge pull request #49011 from khushi8112/fixed-asset-register
fix: fetch revaluated asset value for fixed asset register
2025-08-06 17:13:48 +05:30
khushi8112
a33bcb47b3 chore: format code 2025-08-06 16:48:09 +05:30
khushi8112
67ec4fa477 fix: fetch revaluated asset value for all the assets 2025-08-06 16:47:01 +05:30
Rohit Waghchaure
c433943c46 fix: timeout while submitting purchase receipt 2025-08-06 16:43:26 +05:30
rohitwaghchaure
865956e537 Merge pull request #48950 from rohitwaghchaure/feat-batch-traceability-report
feat: batch traceability report
2025-08-06 15:55:43 +05:30
Rohit Waghchaure
7b05a2a097 feat: serial no and batch traceability report 2025-08-06 15:17:35 +05:30
Dany Robert
eb6c8d8938 chore: linters 2025-08-06 11:40:33 +05:30
Asmita Hase
28cbd18300 Merge pull request #49003 from asmitahase/fix-references-for-advance
refactor: get advance payment doctypes from hooks
2025-08-06 11:22:09 +05:30
Asmita Hase
b4f831a931 chore: removed uncessary comment 2025-08-06 10:42:47 +05:30
Asmita Hase
a273147b6e chore: add account type to employee advance account in standard chart of accounts 2025-08-06 10:36:18 +05:30
Asmita Hase
2cb2e05b19 refactor: get advance payment doctypes from hooks 2025-08-06 10:34:48 +05:30
MochaMind
f2d31e3b77 fix: Persian translations 2025-08-05 21:36:28 +05:30
Logesh Periyasamy
a8d17b7590 Merge pull request #48761 from aerele/exchange-gain-or-loss-on-repost
fix: prevent gain or loss entry cancellation upon reposting
2025-08-05 20:55:44 +05:30
ruthra kumar
c46b3d4b83 Merge pull request #48901 from aerele/cc-allocation-round-off
fix: do not split round off when there is a cost center allocation
2025-08-05 20:16:38 +05:30
ravibharathi656
dd24cce509 test: add test for cost center allocation commercial rounding 2025-08-05 17:58:33 +05:30
ruthra kumar
b0d9c4f563 Merge pull request #48947 from aerele/process-statement-of-accounts
fix(process statement of accounts): make date fields mandatory
2025-08-05 16:35:46 +05:30
Mihir Kandoi
ccc48f909a Merge pull request #48949 from KerollesFathy/add-work-order-on-project-dashboard
feat: add Manufacture section to project dashboard to show linked Work Orders
2025-08-05 16:29:18 +05:30
Mihir Kandoi
60b7e22e93 Merge pull request #48948 from KerollesFathy/prevent-negative-operation-time-and-batch-size
feat: add non-negative constraint to batch size and sub operation time fields
2025-08-05 16:28:45 +05:30
venkat102
f0df41d521 fix: do not split round off when there is a cost center allocation 2025-08-05 16:18:53 +05:30
Mihir Kandoi
9ad7dad86d Merge pull request #48946 from KerollesFathy/prevent-negative-completed-qty-on-job-card
feat: Add non-negative constraint to completed qty fields in job card and time log
2025-08-05 16:16:44 +05:30
KerollesFathy
ece7165022 Merge branch 'develop' into add-work-order-on-project-dashboard 2025-08-05 10:42:06 +00:00
KerollesFathy
e4db7f8d0a Merge branch 'develop' into prevent-negative-operation-time-and-batch-size 2025-08-05 10:41:29 +00:00
Diptanil Saha
9a61d2d531 Merge pull request #48988 from diptanilsaha/pos_set_grand_total_to_default_mop
refactor(pos): set/reset grand total to default mode of payment
2025-08-05 16:02:22 +05:30
diptanilsaha
265f7ce092 refactor(pos): set/reset grand total to default mode of payment 2025-08-05 15:59:46 +05:30
KerollesFathy
db8d368717 Merge branch 'develop' into prevent-negative-completed-qty-on-job-card 2025-08-05 10:17:23 +00:00
ruthra kumar
30c59bddf9 Merge pull request #48798 from aerele/gl-report-show-amount-in-company-currency
feat: add show_amount_in_company_currency in gl report
2025-08-05 15:21:52 +05:30
ruthra kumar
bc26c87a63 Merge pull request #48909 from aerele/tax-withholding-details-report
fix(tax withholding details): avoid voucher duplication
2025-08-05 15:15:04 +05:30
Khushi Rawat
338ee746ec Merge pull request #48968 from khushi8112/validate-asset-before-submitting-depreciation-schedule
fix: validate asset before submitting depreciation schedule
2025-08-05 15:01:41 +05:30
Khushi Rawat
3bda9c54ae Merge pull request #48974 from khushi8112/invalid-field-query-error
fix: use maintenance_status filter for indicators
2025-08-05 15:00:30 +05:30
Mihir Kandoi
8b6f328665 Merge pull request #48969 from frappe/mergify/bp/develop/pr-48767
Fix: Procurement Tracker - No permission to read Employee #48765 (backport #48767)
2025-08-05 14:43:16 +05:30
khushi8112
1b674a1051 fix: use maintenance_status filter for indicators 2025-08-05 14:39:26 +05:30
ruthra kumar
8a10e327ff Merge pull request #48848 from ernestoruiz89/patch-2
chore: add translation function to Update budget.py
2025-08-05 14:38:07 +05:30
ruthra kumar
2c80b2baa7 Merge pull request #48774 from aerele/batch-wise-bank-reconciliation
perf: process auto bank reconciliation in batches
2025-08-05 14:37:46 +05:30
khushi8112
d6fb99916e chore: fetch docstatus to validate 2025-08-05 14:34:39 +05:30
ruthra kumar
9502b163e1 Merge pull request #48853 from flaviacastro/fix/pricing-rule-help-content
fix: pricing rule help content
2025-08-05 14:32:38 +05:30
ruthra kumar
269020984b Merge pull request #48718 from aerele/subscription-settings-timeout
refactor: process subscriptions in batch wise
2025-08-05 14:26:56 +05:30
Liuyang
e058998689 Fix: Procurement Tracker - No permission to read Employee #48765
(cherry picked from commit 284e45011e)
2025-08-05 08:51:52 +00:00
ruthra kumar
349ad94ff3 Merge pull request #48861 from ljain112/chore-tds-label
chore: correct description for `consider_party_ledger_amount` in Tax Withholding Category
2025-08-05 14:21:16 +05:30
khushi8112
f5a71c6b88 chore: add mistakenly removed test records 2025-08-05 14:19:53 +05:30
khushi8112
d5edca2022 fix: validate if journal entry linked to schedule is in draft 2025-08-05 14:16:05 +05:30
ravibharathi656
283d69c0bd refactor: process subscriptions in batch wise 2025-08-05 14:09:06 +05:30
Mihir Kandoi
cc2a27315a Merge pull request #48693 from cogk/fix-correctly-get-attachments-folder
fix: Use correct Attachments folder in code list import
2025-08-05 14:03:29 +05:30
khushi8112
a4628c2024 fix: submit depreciation schedule only for submitted asset 2025-08-05 14:00:27 +05:30
Khushi Rawat
708ba3b229 Merge pull request #48929 from ernestoruiz89/patch-3
chore: add translation function on remarks in asset depreciation entry
2025-08-05 13:37:54 +05:30
Diptanil Saha
14e17f584a Merge pull request #48964 from diptanilsaha/remove_api_calls_to_set_default_payments
fix: remove api call to set default payments
2025-08-05 13:15:41 +05:30
diptanilsaha
871b8473fa fix: remove api call to set default payments 2025-08-05 12:58:53 +05:30
Khushi Rawat
a60db40fd2 fix: add missing parentheses 2025-08-05 12:50:33 +05:30
Dany Robert
86db6a5b06 Merge branch 'develop' into vat_201_export 2025-08-05 12:22:26 +05:30
ruthra kumar
e556616ad1 Merge pull request #48860 from aerele/build_qb_match_conditions
fix: add doctype fieldname in condition
2025-08-05 12:01:25 +05:30
Mihir Kandoi
88c2be7e68 Merge pull request #48940 from mihir-kandoi/fix-missing-account-gl-entry-subcontracting
fix: failing subcontracting patch
2025-08-05 11:37:36 +05:30
Diptanil Saha
3274285729 fix(bank statement import): return blank template instead of template with 5 records on download template (#48960) 2025-08-05 11:26:25 +05:30
Mihir Kandoi
14b47e81ce fix: failing subcontracting patch 2025-08-05 11:21:36 +05:30
diptanilsaha
7dc2abb516 fix(bank statement import): return blank template instead of template with 5 records on download template 2025-08-05 11:19:48 +05:30
ravibharathi656
23bc180d98 fix(process statement of accounts): make date fields mandatory 2025-08-05 10:54:02 +05:30
Flavia de Castro
aa7727d50a Merge branch 'frappe:develop' into fix/pricing-rule-help-content 2025-08-04 15:43:44 -03:00
Diptanil Saha
0212be2e58 Merge pull request #48945 from diptanilsaha/child_company_coa_currency
fix: set default_currency in accounts during child company creation
2025-08-05 00:05:42 +05:30
Diptanil Saha
cc26d5da14 chore: remove wrongly configured 'pos*' assignment from CODEOWNERS (#48954) 2025-08-04 23:53:34 +05:30
diptanilsaha
de153aeb1d fix: set default_currency in accounts during child company creation 2025-08-04 23:49:01 +05:30
rohitwaghchaure
7f6038208d Merge pull request #48951 from rohitwaghchaure/fixed-test-cases-posting_time
chore: added now as default value for the posting time
2025-08-04 22:51:00 +05:30
Rohit Waghchaure
b3cebd87c8 chore: added now as default value for the posting time 2025-08-04 22:22:55 +05:30
MochaMind
7bd24308d3 fix: Serbian (Latin) translations 2025-08-04 21:19:45 +05:30
MochaMind
cd9651afc1 fix: Persian translations 2025-08-04 21:19:32 +05:30
MochaMind
3aa950c32e fix: Serbian (Cyrillic) translations 2025-08-04 21:19:12 +05:30
KerollesFathy
2729d7521d feat: add 'Manufacture' section to project dashboard and show linked Work Orders 2025-08-04 13:43:42 +00:00
KerollesFathy
f4722d3b24 feat: add non-negative constraint to batch size and sub operation time fields 2025-08-04 13:20:30 +00:00
KerollesFathy
c30665fda7 feat: Add non-negative constraint to completed qty fields in job card and time log 2025-08-04 12:58:49 +00:00
Dany Robert
0c15b65756 fix: avoid property setter for custom field 2025-08-04 15:52:22 +05:30
Dany Robert
d25846f383 fix: simplify export determination logic 2025-08-04 15:45:43 +05:30
Ravibharathi
02380c3eab Merge pull request #48575 from aerele/company-payment-gateway
feat(payment gateway account): add company
2025-08-04 14:23:56 +05:30
ruthra kumar
655aff7c92 Merge pull request #48926 from pps190/fix-report-currency
fix: provide missing `company` in report records that require reference to `Company:company:default_currency`
2025-08-04 10:29:20 +05:30
rohitwaghchaure
1d8f1d66e4 Merge pull request #48933 from frappe/mergify/bp/develop/pr-48914
perf: process_gl_map causing performance issues in the reposting (backport #48914)
2025-08-04 09:56:22 +05:30
ruthra kumar
3395fc1fde Merge pull request #48136 from aerele/enable_dim_submit
fix(accounts):enable allow_on_submit for accounting dimensions in repost settings allowed doctypes
2025-08-04 09:04:27 +05:30
MochaMind
415b751bab fix: sync translations from crowdin (#48911) 2025-08-03 20:46:02 +02:00
rohitwaghchaure
67b95c4abf chore: fix conflicts 2025-08-03 16:21:45 +05:30
MochaMind
5c3c11cda3 chore: update POT file (#48931) 2025-08-03 12:30:10 +02:00
Rohit Waghchaure
af7dc363e1 perf: process_gl_map causing performance issues in the reposting
(cherry picked from commit a96fa55704)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/stock_entry.py
2025-08-03 09:46:15 +00:00
Ernesto Ruiz
803180d5de chore: add translation function on remark in setup_journal_entry_metadata in depreciation.py 2025-08-02 13:43:18 -06:00
Ernesto Ruiz
119904e44f chore: add translation function on remarks in make_journal_entry in asset.py 2025-08-02 13:29:33 -06:00
Diptanil Saha
2c44e4ec2c Merge pull request #48523 from ibrahim317/fix-lead-quick-entry
fix: add undefined check for cur_frm in lead doctype (#48522)
2025-08-03 00:01:57 +05:30
Mihir Kandoi
7358f44cc2 Merge pull request #48748 from devdusija/fix/account-currency-validation
fix: account currency validation to exclude cancelled entries
2025-08-02 22:17:14 +05:30
Devin Slauenwhite
c03f1c25cf fix: payment ledger voucher seperator row currencies 2025-08-02 12:29:40 -04:00
Devin Slauenwhite
97959dbe75 fix: provide company for outstanding record. 2025-08-02 12:23:12 -04:00
Devin Slauenwhite
7f3905185c fix: provide missing company in report records that require reference to Company:company:default_currency 2025-08-02 11:38:47 -04:00
Devin Slauenwhite
316470eee4 Revert "fix: set proper currency format"
This reverts PR https://github.com/frappe/erpnext/pull/42458
This reverts commit 2533808f1e.
2025-08-02 11:15:25 -04:00
Mihir Kandoi
fc56b1e8aa Merge pull request #48915 from aerele/fix/set_use_serial_batch_fields
fix: set use_serial_batch_fields when creating PR from PO
2025-08-02 20:41:39 +05:30
ibrahim
f4e5e0812b refactor: run pre-commit for formatting on lead client script (#48523) 2025-08-02 17:01:41 +03:00
Kavin
a384c96617 fix: set use_serial_batch_fields when creating PR from PO 2025-08-02 14:48:06 +05:30
Mihir Kandoi
9c5ba2b0b3 Merge pull request #48908 from mihir-kandoi/st45545
fix: include Sales Invoice in SABB validation for packed items
2025-08-01 17:18:57 +05:30
ravibharathi656
8837016243 fix(tax withholding details): avoid voucher duplication 2025-08-01 17:02:43 +05:30
Mihir Kandoi
2ce297aff8 fix: include Sales Invoice in SABB validation for packed items 2025-08-01 17:00:38 +05:30
ruthra kumar
4785f0b31d Merge pull request #48905 from ljain112/fix-advance-patch
fix: do not execute patch if no advance doctypes
2025-08-01 15:31:05 +05:30
ljain112
e38dfbfa91 fix: do not execute patch if no advance doctypes 2025-08-01 14:51:25 +05:30
Mihir Kandoi
f916f29e47 Merge pull request #48904 from mihir-kandoi/fix-stock-reco-reservation-error
fix: consider Closed SREs during Stock Reco
2025-08-01 13:26:19 +05:30
Mihir Kandoi
3a9b65ebef fix: consider Closed SREs during Stock Reco 2025-08-01 13:08:23 +05:30
MochaMind
34b0aef5ce fix: sync translations from crowdin (#48867) 2025-07-31 18:05:15 +02:00
Mihir Kandoi
1481bc80e3 Merge pull request #48898 from mihir-kandoi/st45012
fix: remove incorrect references from stock entry dashboard/connections tab
2025-07-31 21:18:53 +05:30
Mihir Kandoi
6d82e3cc28 fix: remove incorrect references from stock entry dashboard/connections tab 2025-07-31 21:01:55 +05:30
Vishist16
3a80e116e8 fix: prevent negative values in BOM fields (#48520, #48662) (#48696)
* fix: prevent negative values in BOM fields (#48520, #48662)

* fix: applied non_negative validation using Desk UI for BOM fields
2025-07-31 20:50:41 +05:30
rohitwaghchaure
6e8589a69a Merge pull request #48893 from rohitwaghchaure/feat-landed-cost-report
feat: landed cost report
2025-07-31 20:35:26 +05:30
Lakshit Jain
e70caedddc fix: multiple fixes for advance payment accounting 2025-07-31 20:17:14 +05:30
Rohit Waghchaure
a0bb8411ef feat: landed cost report 2025-07-31 16:22:02 +05:30
Mihir Kandoi
5a718d681a Merge pull request #48890 from mihir-kandoi/add-date-to-patch
chore: add date so patch can rerun
2025-07-31 16:16:07 +05:30
Mihir Kandoi
ba45f7610d chore: add date so patch can rerun 2025-07-31 15:58:25 +05:30
Mihir Kandoi
892dc1862a Merge pull request #48887 from mihir-kandoi/st45406
fix: failing subcontracting patch
2025-07-31 15:39:54 +05:30
Mihir Kandoi
bb43419944 fix: failing subcontracting patch 2025-07-31 15:23:14 +05:30
rohitwaghchaure
0707c9d732 Merge pull request #48869 from rohitwaghchaure/feat-link-vendor-invoices
feat: link vendor invoices in the LCV
2025-07-31 13:18:31 +05:30
Diptanil Saha
edd41fd693 Merge pull request #48619 from nikkothari22/bank-account-default
fix(accounts): allow default bank account per company
2025-07-31 12:02:51 +05:30
Mihir Kandoi
e2a25ae3c5 Merge pull request #48873 from mihir-kandoi/47305
fix: return conversion factor of variant and not template
2025-07-31 12:02:39 +05:30
Mihir Kandoi
732a9b86c6 fix: return conversion factor of variant and not template 2025-07-31 11:45:20 +05:30
ruthra kumar
d4ad4a2f6e Merge pull request #48684 from cogk/fix-add-title-to-payment-schedule-error-message
fix: Add title to payment schedule error message
2025-07-31 10:28:28 +05:30
Rohit Waghchaure
ee47c5eba9 feat: link vendor invoices in the LCV 2025-07-30 23:18:55 +05:30
khushi8112
70411ec086 fix: show name of the employee in general ledger report 2025-07-30 17:59:06 +05:30
khushi8112
b0c0a86fcf chore: code format 2025-07-30 17:01:44 +05:30
khushi8112
9dee411eb5 feat: add customer name column in gross profit report 2025-07-30 17:00:33 +05:30
khushi8112
3d94a7cf2c feat: add party name in GL entries 2025-07-30 16:58:38 +05:30
khushi8112
5f24061dd4 feat: add party name column in general ledger report 2025-07-30 16:56:12 +05:30
ljain112
f619bca2d6 chore: correct description for consider_party_ledger_amount in Tax Withholding Category 2025-07-30 16:50:49 +05:30
l0gesh29
e2d63e4c32 fix: add doctype fieldname in condition 2025-07-30 16:38:33 +05:30
Diptanil Saha
848d4d3767 Merge pull request #48858 from diptanilsaha/st_45201
fix: server error on opportunity summary by sales stage report
2025-07-30 15:49:08 +05:30
diptanilsaha
830b3ba1e5 fix: server error on opportunity summary by sales stage report 2025-07-30 15:22:56 +05:30
flaviacastro
8c736b5bbd fix: pricing rule help content 2025-07-29 19:25:26 +00:00
Mihir Kandoi
30b3570987 Merge pull request #48851 from mihir-kandoi/develop
Update CODEOWNERS
2025-07-29 22:17:38 +05:30
Mihir Kandoi
b9b3302b69 Update CODEOWNERS 2025-07-29 21:58:14 +05:30
Diptanil Saha
9c14aa08f8 Merge pull request #48839 from frappe/mihirs_fault
fix: change modified timestamp so migrations work
2025-07-29 20:59:24 +05:30
Diptanil Saha
89564bd10b Merge pull request #48844 from aerele/pos-search-fields
fix: set mandatory field for pos search fields
2025-07-29 20:55:04 +05:30
Diptanil Saha
c41adc4b9c Merge pull request #48845 from diptanilsaha/feat_item_selector_list_view
feat: list view on item selector in pos
2025-07-29 20:49:59 +05:30
Ernesto Ruiz
0b08fe2bac fix: add translation function to update budget.py 2025-07-29 09:07:04 -06:00
Ernesto Ruiz
0a34facb81 chore: add translation function to Update budget.py 2025-07-29 09:05:23 -06:00
Ravibharathi
99f7eb38d3 fix: update advance paid amount on unreconcile 2025-07-29 20:35:12 +05:30
ruthra kumar
bb129b7883 Merge pull request #48835 from aerele/user-permission-report
fix: include empty values in user permission
2025-07-29 19:55:14 +05:30
diptanilsaha
140698d676 feat: list view on item selector in pos 2025-07-29 19:23:23 +05:30
rohitwaghchaure
7970819904 Merge pull request #48743 from aerele/pick-list-location-warehouse
fix(pick list): make warehouse editable
2025-07-29 18:24:09 +05:30
mithili
f6212f7b51 fix: set mandatory field for pos search fields 2025-07-29 18:20:50 +05:30
rohitwaghchaure
a7a6ca197c Merge pull request #48841 from rohitwaghchaure/fixed-support-45167
fix: serial no warehouse for backdated stock reco
2025-07-29 18:15:38 +05:30
Rohit Waghchaure
1deedc766c fix: serial no warehouse for backdated stock reco 2025-07-29 17:49:46 +05:30
Ayush Chaudhari
c18d565d3e fix: change modified timestamp so migrations work 2025-07-29 17:13:26 +05:30
ruthra kumar
b8015d1032 Merge pull request #48837 from ruthra-kumar/fix_link_error_on_po_cancellation
fix: unable to cancel PO if unreconciliation is done
2025-07-29 17:03:42 +05:30
ruthra kumar
cf70147c0d fix: ignore is overridden by transaction.js upon clicking cancel
which overrides with 'Serial and Batch Bundle'
2025-07-29 17:00:57 +05:30
ruthra kumar
4c08165b69 Merge pull request #48782 from ljain112/fix-silly
fix: attribute error in payment entry
2025-07-29 16:41:53 +05:30
ljain112
f7ee9ee967 chore: added test case for reconciliation_effect_date 2025-07-29 16:11:46 +05:30
l0gesh29
f13d98fc7c fix: include empty values in user permission 2025-07-29 16:03:10 +05:30
Khushi Rawat
ac47b42c66 Merge pull request #48759 from aerele/revert-39776
revert: do not save when set email campaign status
2025-07-29 14:37:48 +05:30
Diptanil Saha
394b5b5b94 Merge pull request #48769 from aerele/letter-head-company
fix: set letter head from company if exists
2025-07-29 13:51:58 +05:30
ruthra kumar
8ae48f9baa Merge pull request #48593 from aerele/fix/so-disable-address-update
fix(sales-order): disallow address edits after sales order is submitted
2025-07-29 13:38:57 +05:30
Mihir Kandoi
1a1eb00689 Merge pull request #48700 from Vishist16/fix-negative-scrap-qty-jobcard-48545
fix: prevent negative scrap quantity in Job Card (#48545)
2025-07-29 13:26:55 +05:30
Bhavan23
daac7c589b fix(sales-order): disallow address edits after sales order is submitted 2025-07-29 13:23:37 +05:30
Logesh Periyasamy
88b9f8d68c feat: show opening/closing balance in cash flow report (#47877)
* feat: add checkbox to carryforward opening balance

* fix: ignore period closing voucher

* chore: rename filter check box

* feat: add total for opening and closing balance

* fix: update section name

* fix: remove section rename

---------

Co-authored-by: venkat102 <venkatesharunachalam659@gmail.com>
2025-07-29 13:05:29 +05:30
Mihir Kandoi
c86e75c091 Merge pull request #48557 from KerollesFathy/ft/cost-non-negative-on-ws
feat: Add non-negative constraint to workstation cost fields
2025-07-29 13:03:33 +05:30
ruthra kumar
444225f0ec Merge pull request #48757 from aerele/update-subscription-details
fix: add patch for update subscription details
2025-07-29 12:06:43 +05:30
Mihir Kandoi
3d5b46bdfc Merge pull request #48820 from mihir-kandoi/st44923
fix: over billed purchase receipt status
2025-07-29 11:31:21 +05:30
Mihir Kandoi
15e354f76e fix: over billed purchase receipt status 2025-07-29 11:15:14 +05:30
MochaMind
b1037eaade fix: sync translations from crowdin (#48817) 2025-07-28 16:56:08 +02:00
Diptanil Saha
a20d0d8f60 Merge pull request #48778 from aerele/payment-term-template-sales-invoice
fix: fetch payment term template from order
2025-07-28 20:24:35 +05:30
ruthra kumar
bf99f8095d Merge pull request #48797 from aerele/auto-repeat-field-no-copy
fix: avoid auto_repeat on duplicate
2025-07-28 17:58:12 +05:30
Diptanil Saha
7464fdb8e8 Merge pull request #48794 from diptanilsaha/internal_trans_valuation_rate
fix: fetch item valuation rate for internal transactions when server side reactivity is disabled
2025-07-28 17:45:29 +05:30
ruthra kumar
ea5761ee9c Merge pull request #48800 from frappe/mergify/bp/develop/pr-48041
fix: Misclassification of Journal Voucher Entries in Customer Ledger Summary (backport #48041)
2025-07-28 17:39:26 +05:30
ruthra kumar
c29fb45e10 Merge pull request #48796 from aerele/item-wise-sales-purchase-register-user-permission
fix: remove alias for order by field
2025-07-28 17:39:02 +05:30
diptanilsaha
9c4aac03df fix: fetch item valuation rate for internal transactions 2025-07-28 17:33:28 +05:30
ruthra kumar
f12b1bbf5d Merge pull request #48480 from aerele/currency-sales-partner-commision-report
Currency sales partner commision report
2025-07-28 17:11:24 +05:30
Mihir Kandoi
da498b0558 Merge pull request #48804 from mihir-kandoi/st44619
fix: sql error in quality inspection
2025-07-28 16:53:21 +05:30
Mihir Kandoi
062b245e3f fix: sql error in quality inspection 2025-07-28 16:37:29 +05:30
rohitwaghchaure
2b2c7bdf09 Merge pull request #48787 from rohitwaghchaure/fixed-pervent-concurrent-issue
fix: concurrency issues
2025-07-28 16:27:56 +05:30
rohitwaghchaure
d0504546ec Merge pull request #48801 from rohitwaghchaure/fixed-support-44546
fix: incorrect GL entries
2025-07-28 16:27:32 +05:30
Mihir Kandoi
da68fa0980 Merge pull request #48676 from mihir-kandoi/fix-no-account-in-gl-entry
fix: missing account in GL entries (subcontracting)
2025-07-28 16:20:45 +05:30
ruthra kumar
8d96acfc98 Merge pull request #48413 from ljain112/fix-ple
perf: multiple fixes related to ple and gle
2025-07-28 16:11:31 +05:30
ruthra kumar
96c59e0435 refactor(test): fix test data; no double counting 2025-07-28 15:49:18 +05:30
Mihir Kandoi
2ec69545ea Merge pull request #48793 from mihir-kandoi/st44120
fix: status in MR (material transfer) when using transit stock entries
2025-07-28 15:32:26 +05:30
Mihir Kandoi
baa612bc72 fix: status in MR (material transfer) when using transit stock entries 2025-07-28 15:16:50 +05:30
ruthra kumar
56085fe6a9 chore: resolve conflict 2025-07-28 15:00:09 +05:30
Rohit Waghchaure
4c273fcc99 fix: incorrect GL entries 2025-07-28 14:56:17 +05:30
l0gesh29
8fdda31e45 chore: rename variable 2025-07-28 14:52:03 +05:30
Mihir Kandoi
73e34ff9a9 Merge branch 'develop' into fix-no-account-in-gl-entry 2025-07-28 14:50:26 +05:30
Assem Bahnasy
d915c2b404 fix: Misclassification of Journal Voucher Entries in Customer Ledger Summary (#48041)
* fix: miscalculation of Invoiced Amount, Paid Amount, and Credit Amount in Customer Ledger Summary

* style: Apply ruff-format to customer_ledger_summary.py and ignore .venv/

* fix: Ensure .venv/ is ignored in .gitignore

* chore: removing backportrc line

* test: adding test_journal_voucher_against_return_invoice()

* fix: fixed test_journal_voucher_against_return_invoice function

* Revert .gitignore changes

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
(cherry picked from commit 01fcd98c84)

# Conflicts:
#	erpnext/accounts/report/customer_ledger_summary/test_customer_ledger_summary.py
2025-07-28 09:07:05 +00:00
l0gesh29
468e5e9b2e feat: add show_amount_in_company_currency in gl report 2025-07-28 13:54:02 +05:30
l0gesh29
048b87328b fix: remove alias for order by field 2025-07-28 12:57:06 +05:30
mithili
2c54f49cbc fix: avoid auto_repeat on duplicate 2025-07-28 12:30:14 +05:30
Diptanil Saha
fccfcd6b0e Merge pull request #48675 from aerele/item-price-internal-transaction
feat(internal-transaction): fetch valuation rate for internal transaction
2025-07-28 11:48:30 +05:30
Dany Robert
1170e4fb2c fix(regional-uae): restrict zero rated export to invoice 2025-07-28 05:32:04 +00:00
ruthra kumar
20c2af9cd4 Merge pull request #48788 from frappe/l10n_develop
fix: sync translations from crowdin
2025-07-28 10:36:46 +05:30
MochaMind
1d991af821 fix: Persian translations 2025-07-27 18:54:32 +05:30
Rohit Waghchaure
a186b1266d fix: prevent concurrency issues 2025-07-27 18:46:43 +05:30
ljain112
dc841fe661 fix: attribute error in payment entry 2025-07-26 12:56:10 +05:30
ruthra kumar
ac448988ca Merge pull request #48780 from frappe/l10n_develop
fix: sync translations from crowdin
2025-07-25 19:41:13 +05:30
MochaMind
cc48cfaa5d fix: Indonesian translations 2025-07-25 18:49:01 +05:30
ravibharathi656
5ed34d6ff9 fix: fetch payment term template from order 2025-07-25 13:30:05 +05:30
rohitwaghchaure
46e6e48495 Merge pull request #48773 from ShreyasTheNewbie/create_job_card
fix: create job card for selected operations only
2025-07-25 10:05:36 +05:30
mithili
9638151f9d refactor: remove join in sql 2025-07-24 18:41:44 +05:30
mithili
998617879c chore: update query to fetch company currency 2025-07-24 18:41:44 +05:30
mithili
984947f333 fix: get default company currency 2025-07-24 18:41:44 +05:30
mithili
2de2ea9f58 fix: set company as mandatory 2025-07-24 18:41:43 +05:30
ravibharathi656
657de2cc7e perf: process auto bank reconciliation in batches 2025-07-24 17:04:03 +05:30
Shreyas Sojitra
27e5344188 fix: create job card for selected operations only 2025-07-24 10:05:03 +00:00
ravibharathi656
d163da171f fix: set letter head from company if exists 2025-07-24 14:55:21 +05:30
ravibharathi656
d3253d7d06 revert: do not save when set email campaign status 2025-07-23 16:16:46 +05:30
l0gesh29
c7b1379a7f fix: update subscription details patch 2025-07-23 15:46:08 +05:30
Kitti U. @ Ecosoft
ed79adebc4 refactor: call hooks after gle & sle rename (#48706) 2025-07-23 11:18:06 +05:30
ravibharathi656
f5beda48dc fix(pick list): make warehouse editable 2025-07-23 08:34:52 +05:30
ruthra kumar
d45d20e4db Merge pull request #48650 from aerele/payment-entry-outstanding-amount
fix: update outstanding amount on payment reconcillation
2025-07-23 06:52:29 +05:30
ruthra kumar
f41c6c037b Merge pull request #48732 from aerele/dimension-wise-acc-balance-report
fix: resolve sql syntax on accounting dimension
2025-07-23 06:43:33 +05:30
MochaMind
313913b329 fix: sync translations from crowdin (#48724) 2025-07-22 23:22:26 +02:00
Dev Dusija
c9c45fe89f fix: account currency validation to exclude cancelled entries 2025-07-22 23:56:48 +05:30
ruthra kumar
56ddb16186 Merge pull request #48733 from aerele/item-wise-sales-purchase-register
fix: add alias for order by field
2025-07-22 17:53:41 +05:30
ruthra kumar
4f1acc9349 Merge pull request #48665 from aerele/exchange-gain-or-loss-account
fix: show amount for exchange gain or loss account
2025-07-22 12:13:02 +05:30
rohitwaghchaure
ecff9dfdd8 Merge pull request #48723 from aerele/company-filter-job-card
fix(job card): company filter
2025-07-22 09:48:10 +05:30
rohitwaghchaure
73d2878e08 Merge pull request #48720 from rohitwaghchaure/fixed-support-44556
fix: valuation for rejected materials
2025-07-22 09:47:26 +05:30
l0gesh29
feaf39a812 fix: add alias for order by field 2025-07-22 01:23:19 +05:30
l0gesh29
1662b7c311 fix: resolve sql syntax on accounting dimension 2025-07-21 23:58:19 +05:30
Dany Robert
dc72e6cf36 fix(regional-uae): split export determination 2025-07-21 14:47:14 +00:00
pugazhendhivelu
4edbe77f67 chore: rename function set company filters 2025-07-21 20:10:08 +05:30
rohitwaghchaure
fa228da29c Merge pull request #48382 from karm1000/feat/stock-balance-multiselect-items-warehouses
feat: stock balance and stock ledger report with multi-select items and warehouses
2025-07-21 20:02:25 +05:30
rohitwaghchaure
9aea4ba51a Merge pull request #48704 from aerele/production-plan-sub-assembly-warehouse
fix(production plan): add company filter to sub assembly warehouse
2025-07-21 19:56:35 +05:30
Rohit Waghchaure
b7039cc506 fix: valuation for rejected materials 2025-07-21 19:53:04 +05:30
Dany Robert
b8224693c4 fix(regional-uae): mark export items as zero rated 2025-07-21 14:22:05 +00:00
ruthra kumar
1e44e3c1f6 Merge pull request #48690 from aerele/sales-order-item-schedule-date
fix: set delivery date if missing
2025-07-21 19:43:04 +05:30
ruthra kumar
a8e2386daa Merge pull request #48671 from aerele/journal-entry-print-settings
revert: do not set pay_to_recd_from to None
2025-07-21 19:39:23 +05:30
ravibharathi656
7e12332ea5 test: add test for pay_to_recd_from 2025-07-21 18:45:31 +05:30
ravibharathi656
03d6550db3 revert: do not set pay_to_recd_from to None 2025-07-21 18:45:30 +05:30
pugazhendhivelu
b1311ceb30 fix(job card): company filter 2025-07-21 17:34:49 +05:30
MochaMind
5089cf2155 fix: sync translations from crowdin (#48685) 2025-07-21 12:57:24 +02:00
Khushi Rawat
204de4934a Merge pull request #48649 from khushi8112/post-gl-entry-on-completion-date-of-asset-repair
fix: post gl entry on completion date instead of current date
2025-07-21 15:14:14 +05:30
MochaMind
8f3ed909c3 chore: update POT file (#48712) 2025-07-20 11:59:11 +02:00
ravibharathi656
1728a95111 fix(production plan): add company filter to sub assembly warehouse 2025-07-19 08:18:22 +05:30
Vishist Singh Solanki
94ec76545c fix: prevent negative scrap quantity in Job Card (#48545) 2025-07-18 16:07:14 +00:00
Mihir Kandoi
4174269091 fix: job card linter error (#47561) 2025-07-18 14:51:41 +00:00
Corentin Forler
bc2cb1737a fix: Use correct Attachments folder in code list import 2025-07-18 16:17:42 +02:00
ravibharathi656
cf6913891a fix: set delivery date if missing 2025-07-18 18:37:29 +05:30
Corentin Forler
205037fd6b fix: Add title to payment schedule error message 2025-07-18 14:07:11 +02:00
Diptanil Saha
7591656491 feat: tabs in pos invoice doctype (#48683) 2025-07-18 17:12:13 +05:30
khushi8112
766c5bbe2b fix: make completion mandatory and fix test case 2025-07-18 17:10:58 +05:30
Mihir Kandoi
446264e496 fix: patch to set default buying price list in material request (#48680)
* fix: patch to set default buying price list in material request
2025-07-18 11:13:27 +00:00
Mihir Kandoi
1ff47f0780 Merge branch 'develop' into fix-no-account-in-gl-entry 2025-07-18 16:28:16 +05:30
Mihir Kandoi
cb02391f37 fix: recreate GL entry instead of repost 2025-07-18 16:26:57 +05:30
Mihir Kandoi
e01ff50833 Merge pull request #48653 from mihir-kandoi/st43557-2
feat: button to recalculate costing and billing fields in project
2025-07-18 16:25:04 +05:30
Karm Soni
8a97b39028 fix: update get_data function to use item_query 2025-07-18 16:10:32 +05:30
Mihir Kandoi
f6e16c1180 chore: rename recalculating to updating 2025-07-18 16:08:04 +05:30
Mihir Kandoi
dd23d4c81b feat: option to recalculate costing and billing fields in project 2025-07-18 16:08:04 +05:30
Mihir Kandoi
dfd115cee5 Merge pull request #48631 from mihir-kandoi/st43869-2
feat: consider process less when calculating pending qty in work order
2025-07-18 15:53:00 +05:30
Diptanil Saha
37a964c300 Merge pull request #48677 from diptanilsaha/fix_coa_company_view_ledger_btn
fix: view ledger button of company on chart of accounts
2025-07-18 15:41:53 +05:30
Mihir Kandoi
b53723acad fix: include cost center in patch 2025-07-18 15:33:31 +05:30
diptanilsaha
98eb115746 fix: view ledger button of company on chart of accounts 2025-07-18 15:28:57 +05:30
Mihir Kandoi
c022b80e05 fix: missing account in GL entries (subcontracting) 2025-07-18 15:13:59 +05:30
l0gesh29
a88c62a307 feat: fetch valuation rate for internal transaction 2025-07-18 14:08:36 +05:30
l0gesh29
98724dff32 feat: add fetch_valuation_rate_for_internal_transaction in accounts settings 2025-07-18 14:07:25 +05:30
Diptanil Saha
9dc583ffcb fix: remove incorrect report conditions and unset sales partner on consolidated sales invoice (#48669)
* fix: undo query changes for sales partner related reports

* fix: patch to remove sales partner from consolidated sales invoice
2025-07-18 00:30:04 +05:30
Diptanil Saha
971024ab99 Merge pull request #48667 from diptanilsaha/fix_pos_sales_partner
fix: sales partner on pos invoice
2025-07-17 20:33:01 +05:30
l0gesh29
b6da350c20 fix: add validation for account key 2025-07-17 18:52:41 +05:30
l0gesh29
4f90f50eb2 fix: show amount for exchange gain or loss account 2025-07-17 18:15:06 +05:30
diptanilsaha
84b9a2aefb fix: unset commission and sales partner on consolidated sales invoice 2025-07-17 18:09:11 +05:30
diptanilsaha
e70416c78c fix: fixed the query for sales invoice in sale partner related reports 2025-07-17 17:53:54 +05:30
diptanilsaha
4fb1202c30 fix: added POS Invoice option on sales partner related reports 2025-07-17 17:53:54 +05:30
diptanilsaha
2245731fc8 fix: prepare sales partner commission report from pos invoice and sales invoice 2025-07-17 17:53:54 +05:30
diptanilsaha
2b87de1000 fix: pos invoice fetch commission_rate from sales_partner doctype on empty 2025-07-17 17:53:14 +05:30
Karm Soni
063c4e9720 refactor: revert indentation 2025-07-17 15:39:12 +05:30
rohitwaghchaure
cc2ca58721 Merge pull request #48655 from rohitwaghchaure/fixed-support-44001
fix: precision issue for Sales Incoming Rate
2025-07-17 15:34:31 +05:30
Rohit Waghchaure
7b99275ceb fix: precision issue for Sales Incoming Rate 2025-07-17 15:10:06 +05:30
ravibharathi656
478766c600 fix: update outstanding amount on payment reconcillation 2025-07-17 14:48:56 +05:30
rohitwaghchaure
0ae080723c Merge pull request #48616 from rohitwaghchaure/fixed-support-44081
fix: stand-alone credit note gl entries
2025-07-17 13:57:52 +05:30
Rohit Waghchaure
f3d6a64156 fix: stand-alone credit note gl entries 2025-07-17 13:33:10 +05:30
khushi8112
da8f7b29c1 fix: post gl entry on completion date instead of current date 2025-07-17 13:10:50 +05:30
Mihir Kandoi
8900744fc4 Merge pull request #48645 from mihir-kandoi/st43688
fix: do not consider cancelled SLEs in report
2025-07-17 11:38:33 +05:30
Mihir Kandoi
71578cb2ef fix: do not consider cancelled SLEs in report 2025-07-17 11:20:05 +05:30
ruthra kumar
8d091f6821 Merge pull request #48637 from frappe/l10n_develop
fix: sync translations from crowdin
2025-07-16 20:28:46 +05:30
ruthra kumar
9c7c22ed20 Merge pull request #48612 from aerele/pcv-forex-accounts
fix(period closing voucher): closing account head debit and debit in account currency should be equal
2025-07-16 20:13:06 +05:30
MochaMind
f9a78e9b45 fix: Persian translations 2025-07-16 17:02:01 +05:30
MochaMind
13afd3301f fix: Portuguese translations 2025-07-16 17:01:57 +05:30
rohitwaghchaure
a27f3f737f Merge pull request #48633 from rohitwaghchaure/fixed-support-42610
fix: performance issue while submitting the purchase invoice
2025-07-16 16:45:36 +05:30
Karm Soni
bc46045cc7 refactor: remove unused imports in stock_balance.py 2025-07-16 16:12:43 +05:30
Rohit Waghchaure
47979871de fix: performance issue while submitting the purchase invoice 2025-07-16 15:55:21 +05:30
Diptanil Saha
c9675b3f7d feat: account name and number columns on financial statements report on export (#48630)
* feat: account name and number columns on trial balance report on export

* feat: account name and number columns on financial statement reports on export

* test: fixed test_profit_and_loss_output_and_summary for new columns
2025-07-16 15:24:43 +05:30
diptanilsaha
79f73ccca1 test: fixed test_profit_and_loss_output_and_summary for new columns 2025-07-16 15:06:28 +05:30
Mihir Kandoi
74c4ca68e5 feat: consider process less when calculating pending qty in work order 2025-07-16 14:46:37 +05:30
Mihir Kandoi
2a186ab8dd Merge pull request #48628 from mihir-kandoi/fix-get-reserved-serial-nos
fix: serial no reserved error when reservation is transferred
2025-07-16 13:22:42 +05:30
diptanilsaha
6b98323806 feat: account name and number columns on financial statement reports on export 2025-07-16 13:22:31 +05:30
Mihir Kandoi
52ac389661 fix: serial no reserved error when reservation is transferred 2025-07-16 12:57:58 +05:30
diptanilsaha
393c1d4bee feat: account name and number columns on trial balance report on export 2025-07-16 12:46:56 +05:30
Diptanil Saha
9b8e0eb5c5 revert: "feat: trial balance report account name and number in separate column" (#48624)
Revert "feat: trial balance report account name and number in separate column"
2025-07-16 11:43:36 +05:30
Diptanil Saha
33f2a23bd8 fix: pos customer selection on new order (#48622) 2025-07-16 11:04:56 +05:30
Mihir Kandoi
d40538968f Merge pull request #48621 from mihir-kandoi/fix-get-batch-against-sales-order-2
fix: possible issue in getting reserved batch against sales order
2025-07-16 10:21:25 +05:30
Mihir Kandoi
28ee5fbf2e fix: possible issue in getting reserved batch against sales order 2025-07-16 10:05:36 +05:30
Nikhil Kothari
982550b92c fix(accounts): allow default bank account per company 2025-07-15 21:32:07 -05:00
MochaMind
26f234fdbd fix: sync translations from crowdin (#48605)
* fix: French translations

* fix: Portuguese translations

* fix: Persian translations

* fix: Arabic translations

* fix: Turkish translations

* fix: Polish translations

* fix: Swedish translations

* fix: Vietnamese translations

* fix: Chinese Simplified translations

* fix: Spanish translations

* fix: Czech translations

* fix: German translations

* fix: Hungarian translations

* fix: Italian translations

* fix: Dutch translations

* fix: Russian translations

* fix: Serbian (Cyrillic) translations

* fix: Portuguese, Brazilian translations

* fix: Thai translations

* fix: Croatian translations

* fix: Bosnian translations

* fix: Serbian (Latin) translations

* fix: Esperanto translations
2025-07-15 17:44:34 +02:00
venkat102
d6fd613272 fix(period closing voucher): closing account head debit and debit in account currency should be equal 2025-07-15 18:16:23 +05:30
rohitwaghchaure
480e76d98e Merge pull request #48611 from rohitwaghchaure/fixed-job-card-stock-entry
fix: confirmation dialog for submitting the stock entry
2025-07-15 18:12:10 +05:30
rohitwaghchaure
8b06468490 Merge pull request #48610 from rohitwaghchaure/fixed-support-43674-1
fix: added serial no condition
2025-07-15 18:04:04 +05:30
Rohit Waghchaure
ea3d4ced5e fix: Confirmation dialog for submitting the stock entry 2025-07-15 17:52:08 +05:30
Rohit Waghchaure
bb7ddd11f1 fix: added serial no condition 2025-07-15 17:27:00 +05:30
Diptanil Saha
05e7db2362 Merge pull request #48565 from aerele/fix/qty-change
fix(transaction): recalculate tax and total when quantity changes
2025-07-15 17:01:12 +05:30
Sagar Vora
34e0a939e6 Merge pull request #48607 from ljain112/silly-fix 2025-07-15 11:23:48 +00:00
ljain112
0da8ed2daa fix: fix party account field access 2025-07-15 16:45:58 +05:30
Khushi Rawat
0caa0371dc Merge pull request #48360 from aerele/item-wise-sales-register-mode-of-payment
fix: fetch sales invoice based on mode_of_payment in item-wise sales register
2025-07-15 15:49:46 +05:30
Karm Soni
7a266113ed fix: warehouse filter query by chaining conditions 2025-07-15 15:15:31 +05:30
ruthra kumar
e725780c6d Merge pull request #48535 from ljain112/fix-dda
fix: handle cases where distributed discount amount is not set
2025-07-15 15:07:06 +05:30
rohitwaghchaure
0fb6b4eaf6 Merge pull request #48408 from aerele/make_purchase_order_for_default_supplier
fix: resolve bundle item into line item if againt default supplier ch…
2025-07-15 15:05:48 +05:30
rohitwaghchaure
403220c69a Merge pull request #48595 from rohitwaghchaure/fixed-support-43674
fix: system was allowing credit notes with serial numbers for any customer
2025-07-15 14:56:58 +05:30
rohitwaghchaure
6150106dee Merge pull request #48588 from mihir-kandoi/st43481
perf: optimize code for subcontracting
2025-07-15 14:14:24 +05:30
Rohit Waghchaure
e073075834 fix: system was allowing credit notes with serial numbers for any customer 2025-07-15 14:00:04 +05:30
Karm Soni
fca9843fc2 fix: handle empty warehouse condition in get_warehouse_condition function; typo; 2025-07-15 13:39:39 +05:30
Karm Soni
169caaf66f fix: use the item_query for get_data 2025-07-15 13:23:09 +05:30
ruthra kumar
dea3e326ba Merge pull request #48536 from frappe/l10n_develop
fix: sync translations from crowdin
2025-07-15 12:42:06 +05:30
MochaMind
26ecd7fd1b fix: Persian translations 2025-07-15 12:26:11 +05:30
MochaMind
f877f87b01 fix: Swedish translations 2025-07-15 12:26:11 +05:30
MochaMind
d33851367b fix: Persian translations 2025-07-15 12:26:11 +05:30
MochaMind
4c5d753ade fix: Turkish translations 2025-07-15 12:26:11 +05:30
Mihir Kandoi
bc6f69ad54 perf: optimize code for subcontracting 2025-07-15 11:55:03 +05:30
rohitwaghchaure
ee2ea11458 Merge pull request #48582 from barredterra/sabb-translatability
fix: make labels in serial_batch_prompt translatable
2025-07-15 11:53:59 +05:30
MochaMind
e1b2956cdb chore: update POT file (#48583) 2025-07-14 22:25:42 +02:00
barredterra
8757800888 fix: make labels in serial_batch_prompt translatable 2025-07-14 21:47:00 +02:00
Raffael Meyer
d99f258d61 fix(Employee): add context to status in List View (#48576) 2025-07-14 15:37:00 +02:00
Diptanil Saha
b8bf4319ac Merge pull request #48411 from thomasantony12/employee_query
fix: employee search based on the fields mentioned in the employee doctype search fields
2025-07-14 18:58:09 +05:30
mergify[bot]
7ae642e6fa Merge branch 'develop' into employee_query 2025-07-14 13:10:07 +00:00
Mihir Kandoi
70204b4464 Merge pull request #48526 from mihir-kandoi/st43470
fix: gross margin not set in project on submission of stock entry
2025-07-14 17:11:40 +05:30
rohitwaghchaure
e0895be7e9 Merge pull request #48568 from mihir-kandoi/st43465
fix: recalculate qty issue for stock reco
2025-07-14 17:07:15 +05:30
Mihir Kandoi
815220a3c6 Merge pull request #48542 from mihir-kandoi/st43593
fix: field name of price_list in material request
2025-07-14 16:43:31 +05:30
Mihir Kandoi
668574e4f0 fix: incorrect if condition 2025-07-14 16:36:29 +05:30
Mihir Kandoi
adb9a6bc15 fix: field name of price_list in material request 2025-07-14 16:27:14 +05:30
Mihir Kandoi
597d5aff02 fix: incorrect stock reco sle 2025-07-14 16:25:29 +05:30
ruthra kumar
896b21e78b Merge pull request #48321 from ljain112/fix-client-item-tax-template
fix: fetch item tax template after setting `base_net_rate`
2025-07-14 15:01:59 +05:30
ljain112
816b84be02 fix: handle cases where distributed discount amount is not set 2025-07-14 14:56:12 +05:30
ruthra kumar
290a9b7804 Merge pull request #48435 from ljain112/fix-ui-account
fix: prevent creation of root accounts in account tree view
2025-07-14 14:44:50 +05:30
Bhavan23
ac7b6c6a3d fix(transaction): recalculate tax and total when quantity changes 2025-07-14 13:23:56 +05:30
ruthra kumar
3ccb209bfd Merge pull request #48540 from aerele/payable/receivable-summary
feat: add calculate_ageing_with option in summary reports
2025-07-14 11:38:02 +05:30
Diptanil Saha
f2ce84c161 Merge pull request #48539 from diptanilsaha/feat_gh_37933
feat: trial balance report account name and number in separate column
2025-07-14 11:21:53 +05:30
diptanilsaha
52a6856f6c feat: trial balance report account name and number in separate column 2025-07-14 11:05:04 +05:30
KerollesFathy
92a12d7fea fix: Add non-negative constraint to job capacity field in workstation 2025-07-13 13:03:01 +00:00
KerollesFathy
a2bb557570 feat: Add non-negative constraint to workstation cost fields 2025-07-13 12:44:09 +00:00
rohitwaghchaure
a73c555574 Merge pull request #48550 from ljain112/fix-test-batch
chore: fix flacky test and remove redundant code
2025-07-13 17:20:39 +05:30
rohitwaghchaure
25838ba9b0 Merge pull request #48509 from mihir-kandoi/fix-reservation-on-manufacture-entry
fix: stock reservation on manufacture stock entry
2025-07-13 14:29:25 +05:30
ljain112
e6b9e82b2f chore: return doc if item already exists for test 2025-07-12 13:07:52 +05:30
ljain112
de8c3ba968 chore: fix flacky test and remove redundant code 2025-07-12 12:48:01 +05:30
Thomas antony
de56faf862 chore: add missing key value 2025-07-12 10:18:34 +05:30
Thomas antony
89233d2b87 Merge branch 'frappe:develop' into employee_query 2025-07-12 10:04:35 +05:30
Thomas antony
75a00928b5 chore: included value in "key" for search condition 2025-07-12 09:48:08 +05:30
l0gesh29
a3834eef46 feat: add calculate_ageing_with option in summary reports 2025-07-11 17:54:09 +05:30
Diptanil Saha
b38d472d7c Merge pull request #48495 from ljain112/refactor--acc-settings
perf: use `cached_doc` for Account Settings
2025-07-11 14:41:30 +05:30
Asmita Hase
96bfe7ccb7 Merge pull request #48395 from mahsem/eetr 2025-07-11 11:59:24 +05:30
ruthra kumar
146f98d026 Merge pull request #48508 from frappe/l10n_develop
fix: sync translations from crowdin
2025-07-11 11:49:49 +05:30
Mihir Kandoi
ec578ba231 fix: gross margin not set in project on submission of stock entry 2025-07-11 11:04:29 +05:30
rohitwaghchaure
29d94f71f3 Merge pull request #48512 from rohitwaghchaure/fixed-support-43409
fix: incorrect last sle for no batch wise valuation
2025-07-11 11:01:16 +05:30
Mihir Kandoi
a878dd3837 fix: stock reservation on manufacture stock entry 2025-07-11 10:31:17 +05:30
Rohit Waghchaure
93d3eb662f fix: incorrect last sle for no batch wise valuation 2025-07-11 09:03:04 +05:30
Ibrahim
d8371c41cf fix: add undefined check for cur_frm in lead doctype (#48522) 2025-07-10 23:24:08 +03:00
Diptanil Saha
73c08c1ecd Merge pull request #48517 from diptanilsaha/fix_pos_payment_keypress
fix: pos payment method amount using numpad and keyboard
2025-07-10 23:11:07 +05:30
Mihir Kandoi
ea05f81024 Merge pull request #48514 from mihir-kandoi/st43398
fix: no attribute error in old subcontracting flow
2025-07-10 23:02:18 +05:30
Mihir Kandoi
e16014e448 Merge pull request #48513 from mihir-kandoi/st42779
fix: error in available serial no report is no serial no present in company
2025-07-10 22:51:02 +05:30
diptanilsaha
15b1609d88 fix: pos payment method amount using numpad and keyboard 2025-07-10 22:47:10 +05:30
Mihir Kandoi
51751a7a05 fix: no attribute error in old subcontracting flow 2025-07-10 22:46:56 +05:30
Mihir Kandoi
0ae60b8b61 fix: error in available serial no report is no serial no present in company 2025-07-10 22:34:35 +05:30
Mihir Kandoi
7af9fa36d7 Merge pull request #48510 from mihir-kandoi/st42929
fix: missing parameter in precision function
2025-07-10 19:08:16 +05:30
Mihir Kandoi
3886641887 fix: missing parameter in precision function 2025-07-10 18:52:13 +05:30
MochaMind
b651d3f622 fix: Persian translations 2025-07-10 14:26:30 +05:30
MochaMind
d72825e279 fix: Portuguese translations 2025-07-10 14:26:24 +05:30
Diptanil Saha
6e73fbedb0 Merge pull request #48506 from diptanilsaha/fix_st_43111
fix: pos adding item multiple times on applying item group filter
2025-07-10 12:36:06 +05:30
diptanilsaha
e9f99e5a3f fix: pos adding item multiple times on item group filter 2025-07-10 12:31:15 +05:30
Mihir Kandoi
9f44de50eb Merge pull request #48503 from mihir-kandoi/convert-string-to-date
fix: invalid comparison error in sabb.py
2025-07-10 11:04:59 +05:30
Mihir Kandoi
ec1faf02ed fix: invalid comparison error in sabb.py 2025-07-10 10:48:33 +05:30
Mihir Kandoi
2397abaee5 Merge pull request #48499 from mihir-kandoi/st43376
fix: use planned_qty instead of pending_qty to check if WO should be created against PP
2025-07-09 21:03:30 +05:30
Mihir Kandoi
b11bf8eb79 fix: use planned_qty instead of pending_qty to check if WO should be created against PP 2025-07-09 20:59:11 +05:30
l0gesh29
f3460ec840 fix: carry forward the delivered_by_supplier check to PO 2025-07-09 19:26:41 +05:30
rohitwaghchaure
fbe14b79cc Merge pull request #48490 from rohitwaghchaure/fixed-support-39446
feat: update the modified date of the SLE after reposting
2025-07-09 19:20:45 +05:30
Patrick Eißler
ebd45878c3 feat(BOM): improve tree display with item_name and qty (#48176)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2025-07-09 13:52:12 +02:00
rohitwaghchaure
91881fad6b Merge pull request #48488 from rohitwaghchaure/fixe-support-42043
feat: parent item group support in Stock Projected Qty report
2025-07-09 16:48:17 +05:30
Rohit Waghchaure
c2cd4934e7 feat: update the modified date of the SLE after reposting 2025-07-09 16:45:13 +05:30
rohitwaghchaure
48485c27ec Merge pull request #48487 from rohitwaghchaure/feat-batch-rate-report
feat: batch rate (valuation) in Batch-Wise Balance History report
2025-07-09 16:28:19 +05:30
Rohit Waghchaure
6e80d89d13 feat: parent item group support in Stock Projected Qty report 2025-07-09 16:18:21 +05:30
Rohit Waghchaure
8a2a845a16 feat: batch rate (valuation) in Batch-Wise Balance History report 2025-07-09 16:07:20 +05:30
Diptanil Saha
376dcf50ec feat: filter to display trial balance report without group account (#48486) 2025-07-09 15:44:46 +05:30
ljain112
751f3abd95 perf: use cached_doc for Account Settings 2025-07-09 13:28:37 +05:30
rohitwaghchaure
6e98adecdd Merge pull request #48481 from rohitwaghchaure/fixed-support-43199
fix: stock settings save issue
2025-07-09 12:02:46 +05:30
Rohit Waghchaure
64ae1ec367 fix: stock settings save issue 2025-07-09 11:43:09 +05:30
ruthra kumar
b937b18e3d Merge pull request #47892 from ruthra-kumar/ar_report_procedures_and_sql
refactor: use sql for building voucher balance in Receivable report
2025-07-09 11:02:41 +05:30
ruthra kumar
fc8ca7d82c chore: rename method 2025-07-09 10:45:58 +05:30
ruthra kumar
7efeed54de refactor: build and pass match conditions as qb criterion 2025-07-09 10:43:41 +05:30
ruthra kumar
52c0df24e3 chore: drop unused utility method 2025-07-09 10:42:46 +05:30
ruthra kumar
9d0ebe3427 refactor: dynamic DB field types 2025-07-09 10:42:46 +05:30
ruthra kumar
1a90c0d031 refactor: better variable name 2025-07-09 10:42:46 +05:30
ruthra kumar
c5e35cc330 refactor: prefix-ed names for easy distinction 2025-07-09 10:42:46 +05:30
ruthra kumar
da32bb5f51 refactor: utility to drop existing procedures and include cost center 2025-07-09 10:42:46 +05:30
ruthra kumar
7b7440d44a refactor: order by posting date 2025-07-09 10:42:46 +05:30
ruthra kumar
e90c6a33bd refactor: call procedures based on config 2025-07-09 10:42:46 +05:30
ruthra kumar
8cf8f6abad refactor: introduce sql option for data fetch 2025-07-09 10:42:46 +05:30
ruthra kumar
097e74979f refactor: better readability 2025-07-09 10:42:45 +05:30
ruthra kumar
e5920c57aa refactor: using sql procedures for AR report
- dynamic filters are passed
2025-07-09 10:42:45 +05:30
Diptanil Saha
c714b724da fix: resolve sql error on dimension-wise accounts balance report (#48477) 2025-07-08 23:41:39 +05:30
Soham Kulkarni
f0697d8f27 Merge pull request #48349 from sokumon/remove-leaderboard
fix: remove Leaderboard shortcut
2025-07-08 22:57:20 +05:30
sokumon
27309d6714 fix: remove Leaderboard shortcut 2025-07-08 22:40:19 +05:30
Mihir Kandoi
c0631468db Merge pull request #48475 from mihir-kandoi/st42934 2025-07-08 22:14:52 +05:30
Mihir Kandoi
d10647a592 fix: indicator in material_request_list.js 2025-07-08 21:58:31 +05:30
Mihir Kandoi
269ac78a98 Merge pull request #48471 from mihir-kandoi/st43209
fix: sort available batches based on expiry when merging SLEs with SABB and those without
2025-07-08 19:47:44 +05:30
Mihir Kandoi
5c665c562a fix: test case 2025-07-08 19:31:03 +05:30
Mihir Kandoi
4d784b8fc7 fix: sort available batches based on expiry 2025-07-08 17:52:19 +05:30
ruthra kumar
dd027f09ac Merge pull request #48469 from ruthra-kumar/better_label_for_ignore_err
chore: better label for checkbox
2025-07-08 17:08:34 +05:30
ruthra kumar
2a16353cf6 Merge pull request #47142 from prateekkaramchandani/feat/ledger-preview-stock-entry
feat: Ledger Preview for Stock Entry
2025-07-08 17:03:19 +05:30
ruthra kumar
8c2e40e291 chore: better label for checkbox 2025-07-08 16:52:24 +05:30
Prateek Karamchandani
5f1ca4113d feat: Ledger Preview for Stock Entry 2025-07-08 16:46:44 +05:30
ruthra kumar
846f0350d8 Merge pull request #48427 from ljain112/fix-psoa-validations
fix: Add company validation to company related fields in Process Statement Of Accounts
2025-07-08 16:05:51 +05:30
Khushi Rawat
95a235e239 Merge pull request #48259 from aerele/item-wise-sales-register
fix: add not specified key for None respresented customer_group and t…
2025-07-08 16:01:57 +05:30
rohitwaghchaure
b7bf2fad84 Merge pull request #48378 from aerele/refactor-quality-inspection
fix: update item reference in quality inspection
2025-07-08 16:01:38 +05:30
ruthra kumar
d0537f2ee4 Merge pull request #48359 from aerele/get_fiscal_year_data
fix: get fiscal year based on date
2025-07-08 15:55:50 +05:30
Khushi Rawat
495afae178 Merge pull request #48402 from aerele/journal-entry-title-rename
fix: rename journal entry title on update
2025-07-08 15:54:33 +05:30
ruthra kumar
83f279410c Merge pull request #48450 from frappe/l10n_develop
fix: sync translations from crowdin
2025-07-08 15:46:06 +05:30
Mihir Kandoi
34f51ae0b2 Merge pull request #48456 from mihir-kandoi/st43167
fix: duplicate items being created when fetching items from warehouse in stock reco
2025-07-08 14:30:22 +05:30
ruthra kumar
5b619c7832 Merge pull request #48328 from ljain112/fix-pricing-rule
fix: update condition for blank tree fields in pricing rule
2025-07-08 14:22:15 +05:30
ruthra kumar
376191b31f Merge pull request #48361 from aerele/revert-48162
revert: do not convert exchange gain/loss amount to foreign currency
2025-07-08 14:22:04 +05:30
ruthra kumar
2c507c891c Merge pull request #48418 from ljain112/jv-paid-loan
chore: remove redundant field "paid_loan" from Journal Entry Doctype
2025-07-08 14:09:11 +05:30
Mihir Kandoi
73f6c29559 fix: duplicate items being created when fetching items from warehouse in stock reco 2025-07-08 13:27:10 +05:30
ruthra kumar
6cac0347ae Merge pull request #48416 from ljain112/refactor-payment-entry
refactor: remove duplicate reconciliation date logic
2025-07-08 13:03:25 +05:30
Diptanil Saha
f5de1ea5c8 Merge pull request #48343 from aerele/validate_with_previous_doc
fix: consider empty string in previous doc validation
2025-07-08 12:39:49 +05:30
rohitwaghchaure
161e336d97 Merge pull request #48444 from mihir-kandoi/st42689
refactor: remove do_reposting_for_each_stock_transaction feature
2025-07-08 12:31:06 +05:30
MochaMind
d2a4cebe54 fix: Persian translations 2025-07-08 12:17:56 +05:30
Diptanil Saha
88255d3d3d Merge pull request #48403 from aerele/validate_selling_price
fix: add selling price validation on update item
2025-07-08 12:14:06 +05:30
ruthra kumar
1cd2266da1 Merge pull request #48326 from ljain112/cost-center-advance-pe
fix: cost center for payment entry against advance payment doctypes in accounts payable/rece
2025-07-08 12:05:25 +05:30
Mihir Kandoi
288c3ee9c2 Merge pull request #48332 from mihir-kandoi/st42096
fix: valuation rate of raw materials in subcontracting receipt
2025-07-08 11:57:45 +05:30
Mihir Kandoi
cae34096c7 Merge pull request #48445 from mihir-kandoi/fix-mr-default-price-list
fix: use default buying price list when price list is falsy
2025-07-08 11:55:00 +05:30
Mihir Kandoi
27c73cf9e9 fix: use default buying price list when price list is falsy 2025-07-08 11:50:43 +05:30
Mihir Kandoi
84ea6afd01 fix: valuation rate of raw materials in subcontracting receipt 2025-07-08 11:42:07 +05:30
Mihir Kandoi
e342b1f7bd refactor: remove do_reposting_for_each_stock_transaction feature 2025-07-08 11:35:45 +05:30
rohitwaghchaure
9f32021d07 Merge pull request #48441 from frappe/revert-47918-fixed-support-40162
Revert "fix: stock reco qty with inventory dimension"
2025-07-08 10:36:18 +05:30
rohitwaghchaure
8ba66c9833 Revert "fix: stock reco qty with inventory dimension (#47918)"
This reverts commit 342cebc778.
2025-07-08 09:56:56 +05:30
ruthra kumar
2012045798 Merge pull request #48324 from ljain112/fix-pr-unreconcile
fix: update payment request outstanding on unreconciliation
2025-07-08 09:45:52 +05:30
MochaMind
7ec4d16403 fix: sync translations from crowdin (#48406) 2025-07-07 17:46:49 +02:00
Raffael Meyer
8cc6853c34 fix: make labels in error message translatable (#48327) 2025-07-07 17:44:56 +02:00
ljain112
3600f2f91b fix: prevent creation of root accounts in account tree view 2025-07-07 19:00:42 +05:30
rohitwaghchaure
7ed05e7d2d Merge pull request #48432 from rohitwaghchaure/fixed-support-42759
fix: fetch from parent optional in inventory dimension
2025-07-07 18:51:01 +07:00
Rohit Waghchaure
8aac6a6b18 fix: fetch from parent optional in inventory dimension 2025-07-07 17:01:01 +05:30
Mihir Kandoi
5fc07842eb Merge pull request #48428 from mihir-kandoi/st42480
fix: address not found when creating internal PR from DN
2025-07-07 15:20:14 +05:30
Mihir Kandoi
aa2c56e117 Merge pull request #48425 from mihir-kandoi/st42648-2
feat: add price list field to material request
2025-07-07 15:03:47 +05:30
Mihir Kandoi
97c48ed6d2 fix: address not found when creating internal PR from DN 2025-07-07 15:01:31 +05:30
ljain112
4e45e69247 fix: Add company validation to company related fields in Process Statement Of Accounts 2025-07-07 14:43:04 +05:30
Mihir Kandoi
0e881f2999 Merge pull request #48424 from mihir-kandoi/st42959
fix: item list and project not being set in work order when created from material request
2025-07-07 14:17:39 +05:30
Mihir Kandoi
f4c6bdf204 feat: add price list field to material request 2025-07-07 14:14:16 +05:30
Mihir Kandoi
099a5fbad9 fix: item list and project not being set in work order when created from material request 2025-07-07 13:01:41 +05:30
Karm Soni
e60c711fdc fix: correct query filter assignment in stock ledger and balance reports 2025-07-07 11:06:46 +05:30
MochaMind
0a41fe2541 chore: update POT file (#48417) 2025-07-06 14:57:09 +02:00
ljain112
901a89ebcd fix: do not create delinked payment ledger entries on cancel 2025-07-06 17:15:12 +05:30
ljain112
2ee463fa33 chore: remove redundant field "paid_loan" from Journal Entry Doctype 2025-07-06 15:24:45 +05:30
ljain112
398406082a refactor: remove duplicate reconciliation date logic 2025-07-06 15:03:06 +05:30
Lakshit Jain
277c1101fc fix: multiple fixes related Deferred Accounting 2025-07-06 14:55:45 +05:30
Diptanil Saha
ee0dd462b8 Merge pull request #48357 from aerele/fix-pos-merge-log
fix: add company field on POS Invoice Merge Log
2025-07-06 14:26:50 +05:30
ljain112
df0994c0d3 fix: query voucher outstanding only when all the conditions are true. 2025-07-06 14:09:05 +05:30
ljain112
fc622631c0 fix: do not query outstanding for Journal Entry 2025-07-06 13:59:07 +05:30
ljain112
46a6290ce9 perf: use cached value for account validations in gl and ple 2025-07-06 13:14:40 +05:30
thomasantony12
09541c52e1 fix: employee search based on the fields mentioned in the doctype searchfields 2025-07-06 11:22:24 +05:30
Kavin
9548f341bf test: test company fetching from POS Closing Entry 2025-07-05 21:59:53 +05:30
Kavin
b4b473185f fix: pass company on create_merge_logs 2025-07-05 21:58:07 +05:30
Kavin
d46b68230c fix: patch for updating company name on existing pos merge log records 2025-07-05 13:34:52 +05:30
Kavin
109658731b fix: add company field on POS Invoice Merge Log 2025-07-05 13:34:11 +05:30
l0gesh29
ec07549d5e fix: resolve bundle item into line item if againt default supplier checked 2025-07-05 12:48:50 +05:30
Diptanil Saha
90be3cddf7 fix: pos payment numpad error on currency precision not set (#48407) 2025-07-05 06:53:29 +00:00
Karm Soni
0a71ca6739 fix(test): update tests 2025-07-05 10:04:34 +05:30
Raffael Meyer
2928d39d58 fix(Quotation): hide buttons if user cannot use them (#48115) 2025-07-04 18:03:39 +00:00
Mihir Kandoi
407fdab487 feat: add subject field to project (#48368)
* feat: add subject field to project
2025-07-04 16:09:34 +00:00
ravibharathi656
9e633bddef chore: add none value 2025-07-04 20:03:25 +05:30
l0gesh29
327d067305 fix: add selling price validation on update item 2025-07-04 19:57:22 +05:30
ravibharathi656
acb9829159 fix: rename journal entry title on update 2025-07-04 19:26:55 +05:30
Mihir Kandoi
b0535bff34 Merge pull request #48372 from mihir-kandoi/st42648
fix: rate not being fetched for product bundles in material request
2025-07-04 12:45:34 +05:30
Mihir Kandoi
0da90f8092 Merge pull request #48374 from mihir-kandoi/st42781-d
fix: LCV from PR order mismatch
2025-07-04 12:45:02 +05:30
l0gesh29
efb8e7c0e4 fix: get fiscal year based on date 2025-07-04 12:23:06 +05:30
mahsem
80d6779210 fix: employee_exit_translatability 2025-07-04 08:26:52 +02:00
Mihir Kandoi
32a45cf635 fix: LCV from PR order mismatch 2025-07-04 11:37:15 +05:30
Mihir Kandoi
45c7bac2d0 fix: rate not being fetched for product bundles in material request 2025-07-04 11:36:51 +05:30
MochaMind
59ae667cce fix: sync translations from crowdin (#48316)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2025-07-04 05:50:27 +00:00
Diptanil Saha
50bf4017d6 fix: pos minor issues (#48384)
* fix: remove tax rate on pos

* fix: use toggle components to load invoices

* refactor: remove resize selector
2025-07-03 22:50:23 +05:30
Diptanil Saha
5f721f01d3 fix: pos recent order display customer code and name (#48379) 2025-07-03 22:49:09 +05:30
Karm Soni
f2afd98725 feat: update stock ledger report to support multi-select for warehouses and items 2025-07-03 18:04:05 +05:30
Karm Soni
2882576479 refactor: use existing functionality 2025-07-03 16:26:58 +05:30
Karm Soni
2ff1dcc391 feat: enhance apply_warehouse_filter to support multiple warehouses in filters 2025-07-03 16:24:27 +05:30
l0gesh29
dd43594ad6 fix: consider empty string in previous doc validation 2025-07-03 16:04:19 +05:30
venkat102
c17ae703c7 revert: do not convert exchange gain/loss amount to foreign currency 2025-07-03 16:03:21 +05:30
pugazhendhivelu
9da5010265 fix: update item reference in quality inspection 2025-07-03 15:44:00 +05:30
ravibharathi656
39cd7a29df fix: fetch sales invoice based on mode_of_payment in item-wise sales register 2025-07-03 15:38:05 +05:30
Diptanil Saha
86b37782fe fix: pos payment section (#48366) 2025-07-03 15:16:07 +05:30
ruthra kumar
1ee8a9f257 Merge pull request #48375 from ljain112/fix-flaky-test-tds
chore: fix flaky test in Tax Withholding Details
2025-07-03 14:21:06 +05:30
ruthra kumar
704223e5d0 fix(test): flaky budget test case 2025-07-03 14:06:09 +05:30
ljain112
7ee2418f60 fix: sort tax withhodling details report by section code and transaction date 2025-07-03 13:34:33 +05:30
ljain112
14a2f98521 chore: fix flaky test in Tax Withholding Details 2025-07-03 13:11:37 +05:30
Mihir Kandoi
7dbc821731 Merge pull request #48333 from mihir-kandoi/fix-job-card-buttons
fix: multiple buttons in job card showing in a single row
2025-07-03 13:07:58 +05:30
Karm Soni
0d2a88bafc feat: update stock balance report to support multi-select for items and warehouses 2025-07-03 12:59:00 +05:30
Akhil Narang
072518ed96 build: bump dependencies (#48122)
* build(deps): drop `pycountry`

Framework includes this

Signed-off-by: Akhil Narang <me@akhilnarang.dev>

* build(deps): bump unidecode

Signed-off-by: Akhil Narang <me@akhilnarang.dev>

* build(deps): bump holidays

Signed-off-by: Akhil Narang <me@akhilnarang.dev>

* build(deps): pin googlemaps

Signed-off-by: Akhil Narang <me@akhilnarang.dev>

* build(deps): bump python-youtube

Signed-off-by: Akhil Narang <me@akhilnarang.dev>

---------

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
2025-07-02 11:44:49 +05:30
rohitwaghchaure
863507ea28 Merge pull request #48173 from mihir-kandoi/st41207
fix: incorrect pending qty when creating PI from PO and PI rates differ from PO
2025-07-01 17:48:12 +05:30
ruthra kumar
0b7f73fa8b Merge pull request #48325 from ljain112/refactor-po-validate
perf: use get_all instead of get_value for validating po dates
2025-07-01 16:23:44 +05:30
ruthra kumar
37727448f6 Merge pull request #48244 from aerele/reconcile-drcr-posting-date
fix: use gain_loss_posting_date instead of today
2025-07-01 15:41:43 +05:30
Mihir Kandoi
74df63a28a fix: multiple button in job card showing in a single row 2025-07-01 11:44:03 +05:30
Jeba Jebas
bb62a01c0d feat: added chart of accounts and tax template for australian localisation (#48208)
* Add Australian Localisation Setup

* feat: added chart of accounts and tax template for australian localisation

* chore: linter fix

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
2025-07-01 10:11:37 +05:30
ljain112
7e0e9db4d2 fix: update condition for blank tree fields in pricing rule 2025-06-30 19:12:49 +05:30
ljain112
48e8e85617 refactor: function to fetch advance payment doctypes 2025-06-30 17:49:56 +05:30
ljain112
8f19f14004 fix: cost center for payment entry against advance payment doctypes in accounts Payable/Receivable report 2025-06-30 17:35:08 +05:30
ljain112
aac4ac0fae perf: use get_all instead of get_value for validating po dates 2025-06-30 15:58:04 +05:30
ljain112
31d12517f0 chore: fix test case for payment request 2025-06-30 15:04:27 +05:30
ljain112
8098229b55 fix: update payment request outstanding on unreconciliation 2025-06-30 14:18:40 +05:30
Diptanil Saha
8ea9cb1d34 Merge pull request #48279 from aerele/pos-search-by-customer-name
fix(pos invoice): search using customer name
2025-06-30 14:13:25 +05:30
ravibharathi656
6a401bcfbb refactor: use or_filters for customer and customer_name 2025-06-30 12:51:14 +05:30
ravibharathi656
20fd071c4e fix(pos invoice): search using customer name 2025-06-30 12:51:14 +05:30
ljain112
db654d5e59 fix: fetch item tax template after setting base_net_rate 2025-06-30 12:31:39 +05:30
rohitwaghchaure
abfff79095 Merge pull request #48298 from FHenry/dev_fix_support_42326
fix: default UOMs by new Stock Entry created by Stock Level section button (when Item is batch or serial)
2025-06-30 11:02:05 +05:30
rohitwaghchaure
8aafd893ed Merge pull request #48240 from mihir-kandoi/st41963
refactor: bom stock report
2025-06-30 11:01:14 +05:30
rohitwaghchaure
21118d5373 Merge pull request #48184 from iamkhanraheel/update-disassembly-items
fix: Disassembly order items calculation in stock entry & track it in work order
2025-06-30 11:00:58 +05:30
ruthra kumar
2c7262b033 Merge pull request #48291 from ljain112/fix-bank-clearance
perf: use lazy doc for updating bank clearance_date
2025-06-30 10:34:09 +05:30
ruthra kumar
dc1be35dbb Merge pull request #48271 from aerele/company-default-currency-for-commission
fix: use company default currency in amount_eligible_for_commission
2025-06-30 10:08:51 +05:30
ruthra kumar
ee3f4c21be Merge pull request #48304 from zaqoutabed/translation-patch-1
chore: fix translation message
2025-06-30 10:02:58 +05:30
Abdallah A. Zaqout
bc002937ad chore: fix translation message 2025-06-30 09:47:30 +05:30
rohitwaghchaure
2af95d2339 Merge pull request #48310 from rohitwaghchaure/fixed-support-40224
fix: accounting entries for standalone credit notes
2025-06-30 09:38:37 +05:30
Khushi Rawat
d69d5b498d Merge pull request #48311 from khushi8112/validate-asset-status-for-repair
fix: validate asset status for repair
2025-06-30 00:55:29 +05:30
khushi8112
cfe04a2aaf test: asset status validation 2025-06-30 00:29:23 +05:30
khushi8112
c6baa34812 fix: validate asset before repair 2025-06-29 22:46:39 +05:30
Rohit Waghchaure
52177cffcd fix: accounting entries for standalone credit notes 2025-06-29 21:45:57 +05:30
MochaMind
344bcf1448 fix: sync translations from crowdin (#48302) 2025-06-29 16:01:36 +02:00
MochaMind
45292700d4 chore: update POT file (#48307) 2025-06-29 13:12:24 +02:00
Diptanil Saha
c742a1dbe9 feat: partly paid pos invoices (#48246)
* fix: partial payment in pos

* fix: show alerts for update failure

* fix: partial payment validation

* fix: remove setting clearance date

* fix: partly paid invoices in pos

* fix: throw error if user tries to make payment for consolidated invoice

* fix: include unpaid invoices in partly paid invoice filter

* refactor: function rename

* feat: button to open form view for partly paid invoices in pos order summary

* fix: payment menu item visible for unpaid invoices

* refactor: update_payments function

* fix: set outstanding amount for pos invoice

* test: partly paid pos invoices

* test: removed frappe.db.commit

* refactor: using before_submit to set outstanding amount
2025-06-28 00:48:23 +05:30
rohitwaghchaure
1cb7d5126c Merge pull request #48296 from rohitwaghchaure/fixed-support-42161
fix: not able to save material request
2025-06-27 16:24:31 +05:30
Florian HENRY
e7da4992f3 fix: default UOMs by new stock Entry created by Stock Level section button 2025-06-27 12:54:28 +02:00
Rohit Waghchaure
c5e36eb323 fix: not able to save material request 2025-06-27 16:07:08 +05:30
rohitwaghchaure
4dbf4a214d Merge pull request #48293 from rohitwaghchaure/fixed-support-42204
fix: option to pick serial / batch for asset repair
2025-06-27 15:28:01 +05:30
Rohit Waghchaure
ae77c609ff fix: option to pick serial / batch for asset repair 2025-06-27 14:53:11 +05:30
MochaMind
195911ce4e fix: sync translations from crowdin (#48268) 2025-06-27 10:45:05 +02:00
ljain112
d2983b977c perf: use lazy doc for updating clearance_date 2025-06-27 13:54:27 +05:30
ljain112
824a86c503 chore: validate all payment entries before updating the clearance_date 2025-06-27 13:53:16 +05:30
rohitwaghchaure
a0a8428483 Merge pull request #48243 from rohitwaghchaure/fixed-status-stock-reservation
fix: multiple fixes related to stock reservation
2025-06-27 13:51:07 +05:30
Rohit Waghchaure
87a472c2d7 fix: multiple fixes related to stock reservation 2025-06-27 12:46:02 +05:30
Soham Kulkarni
a926c7eafd Merge pull request #48288 from sokumon/remove-newsletter
fix: remove newsletter related code
2025-06-27 11:59:40 +05:30
sokumon
b630ccc8e6 fix: remove newsletter related code 2025-06-27 01:21:33 +05:30
Raffael Meyer
0426b37f32 fix: use label "State/Province" for translatability (#48273) 2025-06-26 20:20:17 +02:00
Diptanil Saha
e1d9f863c6 fix: customer section on pos item cart (#48284)
* fix: customer recent transactions

* fix: pos customer section display customer_name instead of customer name
2025-06-26 22:49:18 +05:30
l0gesh29
24cc711a70 fix: add not specified key for None respresented customer_group and territory 2025-06-26 18:32:54 +05:30
ravibharathi656
7c7b392789 fix: use company default currency in amount_eligible_for_commission 2025-06-26 18:09:23 +05:30
Priyansh Shah
fab0f4f337 fix: Multiple Issues in Pick List to Delivery Note Flow (#48206)
* fix: get items from Pick List to DN even if not linked to Sales Order

* refactor: consistently return dn; better place to convert json to doc

* fix: update DN if already created instead of creating new DN when SO is not present in pick list location

* fix: set correct warehouse,batch no and serial no in packed items and allow multiple customer in a pick list

* fix: return 0 for minimum possible bundles if none exist

* fix: test cases

* test: add tests for product bundle items in pick list and handling pick lists with and without sales orders

* fix: minor change to test case

* refactor: simplify pick list creation by using create_pick_list function

* fix: update delivery note creation logic and remove unused function

* test: update pick list test for packed items

* fix: add conditional check for sales_order before setting customer in delivery note

* test: add test case for packed item multiple times in so

---------

Co-authored-by: Smit Vora <smitvora203@gmail.com>
2025-06-26 17:55:48 +05:30
iamkhanraheel
aee26c3550 test: added test case for disassembly order 2025-06-26 17:21:34 +05:30
Diptanil Saha
1e929e2c6c fix: pos opening and closing validation (#48059)
* fix: pos opening and closing validation

* test: pos opening entry tests

* test: added test for pos opening entry

* fix: patch to set status cancelled on cancelled POS Opening Entry and POS Closing Entry

* fix: error messages
2025-06-26 16:26:53 +05:30
Sagar Vora
664872a07b Merge pull request #48274 from sagarvora/rm-print-heading 2025-06-26 10:45:55 +00:00
Sagar Vora
19a8303c1a fix: remove print heading doctype 2025-06-26 15:13:18 +05:30
0xD0M1M0
1b18105bce fix: customer_group import from lead to customer (#48266)
In case customization happens and the lead has the field "customer_group", the get_mapped_doc function would fail and be overwritten by the default value.
2025-06-25 23:25:32 +02:00
Khushi Rawat
7181e67ad4 Merge pull request #48242 from khushi8112/salvage-value-update-for-cancellation
fix: add missing cancellation handling for salvage value update
2025-06-25 00:21:11 +05:30
rohitwaghchaure
66eeda6410 fix: stock adjustment entry to make stock balance zero (#48245) 2025-06-24 21:58:33 +05:30
ravibharathi656
0585bc5aef fix: use gain_loss_posting_date instead of today 2025-06-24 18:48:22 +05:30
khushi8112
c13df330f3 fix: add missing cancellation handling for salvage value update 2025-06-24 18:31:54 +05:30
Mihir Kandoi
ee4e0c646d refactor: bom stock report 2025-06-24 18:13:38 +05:30
Sagar Vora
a571a5bf70 Merge pull request #48038 from ljain112/fix-test 2025-06-24 11:32:22 +00:00
Sagar Vora
01bfc25161 Merge branch 'develop' into fix-test 2025-06-24 11:30:42 +00:00
Khushi Rawat
48d3e0d0a2 Merge pull request #48228 from khushi8112/update-salvage-value-after-revaluation
fix: update salvage value after value adjustment
2025-06-24 17:00:00 +05:30
ruthra kumar
b99dd34a4b Merge pull request #48226 from aerele/trends_reports
Trends reports
2025-06-24 15:47:51 +05:30
Lakshit Jain
47c3c4808e fix: get already billed amount from current doc instead of database (#48079)
* fix: get already billed amount from current doc instead of database

* fix: throw overbilling validation for all items in single call

* refactor: minor fixes

---------

Co-authored-by: Sagar Vora <16315650+sagarvora@users.noreply.github.com>
2025-06-24 15:40:00 +05:30
ljain112
7bc88ffe0e chore: cache clears on custom field and property setter creation/delete 2025-06-24 15:19:40 +05:30
ruthra kumar
635ce0e94a Merge pull request #47627 from ljain112/fix-item--tax-template-taxes
fix: auto append_taxes_from_item_tax_template in backend
2025-06-24 15:16:37 +05:30
khushi8112
dc28fa79a0 test: change in expected value after useful after asset revaluation 2025-06-24 14:36:22 +05:30
Karuppasamy923
b08d66113c fix: Update indexing to populate correct values in trends report chart 2025-06-24 13:30:06 +05:30
Karuppasamy923
b0e201a332 fix: Update transaction currency to company currency to show correct currency symbol 2025-06-24 13:27:52 +05:30
khushi8112
5e672990b3 fix: salvage value after value adjustment 2025-06-24 12:42:34 +05:30
Mihir Kandoi
ea6ff2defe fix: test case 2025-06-24 12:24:58 +05:30
Mihir Kandoi
ab77ee7f5a fix: incorrect pending qty when creating PI from PO and PI rates differ from PO 2025-06-24 12:15:03 +05:30
Mihir Kandoi
c4cd4a660b Merge pull request #48150 from mihir-kandoi/st41475
fix: disallow posting date of purchase receipt and invoice before PO transaction date
2025-06-24 12:09:55 +05:30
Mihir Kandoi
77e82f4a80 fix: disallow posting date of purchase receipt and invoice before PO transaction date 2025-06-24 11:54:02 +05:30
Mihir Kandoi
f40c78f838 Merge pull request #48078 from mihir-kandoi/st41233
fix: fallback expense account and cost center in subcontracting receipt
2025-06-24 11:48:51 +05:30
Mihir Kandoi
d294afa46e Merge pull request #48123 from mihir-kandoi/fix-zero-rate-toast
fix: allow zero valuation rate toast showing even when rate is not 0
2025-06-24 11:45:20 +05:30
Akhil Narang
c8c1c96298 fix(open_opportunity): remove company=null filter (#48222)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
2025-06-24 05:57:54 +00:00
ruthra kumar
23e3883c13 Merge pull request #48180 from aerele/journal-entry-title-change
fix: update journal entry title on amend
2025-06-24 09:32:40 +05:30
ruthra kumar
7c2812b7f2 Merge pull request #48210 from iamkhanraheel/add-item_name
feat: Display Item Name in items table shown while creating Work order from Sales Order
2025-06-24 09:22:41 +05:30
ljain112
4cb1fa2b6b fix: auto append_taxes_from_item_tax_template in backend 2025-06-24 09:16:28 +05:30
MochaMind
5840645663 fix: sync translations from crowdin (#48085) 2025-06-23 18:56:24 +02:00
Diptanil Saha
919684a787 fix: pos item price in get_item and item search (#47925)
* fix: pos get item and item search

* refactor: resolved linter issue and renamed variables

* fix: uom on get_item

* fix: incorrect item quantity on pos selector

* refactor: remove unused import
2025-06-23 22:25:32 +05:30
rohitwaghchaure
ce2b98a38d Merge pull request #48195 from rohitwaghchaure/fixed-support-41648
fix: incoming rate for the stand-alone credit note
2025-06-23 21:09:52 +05:30
rohitwaghchaure
51429b3642 Merge pull request #48204 from rohitwaghchaure/fixed-stock-reservation-status
fix: stock reservation status
2025-06-23 20:57:08 +05:30
Rohit Waghchaure
b06eca8dcb fix: incoming rate for the stand-alone credit note 2025-06-23 20:47:25 +05:30
Rohit Waghchaure
62cf0504d8 fix: stock reservation status 2025-06-23 20:40:12 +05:30
ruthra kumar
7cabf85f74 Merge pull request #48053 from aerele/fetch-barcode-items
fix: add descendants item groups to fetch the barcode items
2025-06-23 19:30:27 +05:30
ruthra kumar
2d3c8dd4f6 Merge pull request #48162 from aerele/gl_entry_exchange_gain_or_loss
fix: add validation for exchange gain/loss entries
2025-06-23 19:29:18 +05:30
iamkhanraheel
ddeeb194cd feat: add item name in items listed while creating work order 2025-06-23 17:44:47 +05:30
ruthra kumar
2dc05a369b Merge pull request #48200 from ruthra-kumar/better_description
chore: better label and desciption for pegged currency flag
2025-06-23 17:43:27 +05:30
ruthra kumar
c5cd7d91c4 chore: better label and desciption for pegged currency flag 2025-06-23 17:27:57 +05:30
ruthra kumar
05fb3a1304 Merge pull request #47761 from frappe/new-sql-functions-syntax-qb-query
fix: update sql function usage syntax
2025-06-23 17:24:58 +05:30
ruthra kumar
289694ed4c chore: resolve linter 2025-06-23 17:09:29 +05:30
rohitwaghchaure
64a83195e9 Merge pull request #48194 from iamkhanraheel/fix-party-specific-exist-filter
fix: filter to validate existing item in Party Specific Item
2025-06-23 16:49:46 +05:30
mergify[bot]
eb4455cb3e Merge branch 'develop' into new-sql-functions-syntax-qb-query 2025-06-23 11:03:08 +00:00
ruthra kumar
08ef197906 Merge pull request #48013 from aerele/mt940-bank-statement-import
feat(bank-statement-import): add support for uploading MT940 format b…
2025-06-23 15:45:27 +05:30
ruthra kumar
d152ab9b88 Merge pull request #48096 from aerele/sales-trend-party-link
fix: add party and party_name columns to trend reports
2025-06-23 15:41:53 +05:30
ruthra kumar
727c5ce323 Merge pull request #48186 from aerele/sales_order_filter_update
fix: add is_group filter for warehouse
2025-06-23 15:35:57 +05:30
ruthra kumar
9ba61b54e3 Merge pull request #47219 from barredterra/find-row
fix: find table row
2025-06-23 15:20:42 +05:30
iamkhanraheel
99bc02d0e0 fix: update fieldname in filter 2025-06-23 14:20:27 +05:30
ruthra kumar
0b23e808c7 Merge pull request #48148 from ruthra-kumar/fix_dormant_test_in_payment_request
chore: activate dormant test case in payment request
2025-06-23 11:46:42 +05:30
ruthra kumar
8289dc6885 chore: activate dormant test case in payment request 2025-06-23 11:32:03 +05:30
iamkhanraheel
ce6ace4b8a fix: func parameters 2025-06-22 21:33:02 +05:30
MochaMind
0769174206 chore: update POT file (#48189) 2025-06-22 11:51:36 +00:00
rohitwaghchaure
9e8d35bf62 Merge pull request #48126 from rohitwaghchaure/feat-periodic-accounting
feat: periodic accounting
2025-06-22 13:10:18 +05:30
Rohit Waghchaure
938be22ae9 feat: periodic accounting 2025-06-22 12:48:57 +05:30
Faris Ansari
74bd07f10b fix: sql function syntax 2025-06-21 16:50:59 +05:30
Faris Ansari
a397c1dea8 fix: update sql function usage syntax 2025-06-21 16:50:59 +05:30
Faris Ansari
300530d35a fix: change sql function string to pypika
sql function string not supported anymore
2025-06-21 16:50:59 +05:30
Faris Ansari
20e2fda183 fix: field can't be a dict 2025-06-21 16:50:59 +05:30
Faris Ansari
6a3fc36979 fix: update sql function usage syntax 2025-06-21 16:50:59 +05:30
Faris Ansari
495bf4b765 chore: set correct payments app branch 2025-06-21 16:50:59 +05:30
Faris Ansari
6bc59d23ea fix: update sql function usage syntax
based on https://github.com/frappe/frappe/pull/32381
2025-06-21 16:50:59 +05:30
Karuppasamy923
a29ae9cf90 fix: add is_group filter for warehouse 2025-06-21 14:06:59 +05:30
iamkhanraheel
3e4d160626 fix: disassemble qty calculation & max calculation to be allowed to create it 2025-06-21 01:14:26 +05:30
rohitwaghchaure
9491f6f83f Merge pull request #48181 from rohitwaghchaure/fixed-support-41516
fix: SABB validation during the LCV
2025-06-20 21:23:44 +05:30
Rohit Waghchaure
e958f886d3 fix: SABB validation during the LCV 2025-06-20 21:06:43 +05:30
ravibharathi656
4a3ee4df29 fix: update journal entry title on amend 2025-06-20 17:47:09 +05:30
Diptanil Saha
4aa4942a17 fix: pos item details fetch uoms on stock settings allow_uom_with_conversion_rate_defined_in_item configuration (#48178) 2025-06-20 16:19:58 +05:30
Sagar Vora
7502a4aba3 Merge pull request #48111 from sagarvora/use-frappe.in_test 2025-06-20 08:24:27 +00:00
Sagar Vora
7e897c4a5d Merge branch 'develop' into use-frappe.in_test 2025-06-20 08:09:35 +00:00
Khushi Rawat
5c24fc3485 Merge pull request #48151 from khushi8112/duplicate-naming-issue-in-contract-doctype
fix: duplicate naming issue in contract doctype
2025-06-20 12:58:10 +05:30
rohitwaghchaure
ed9346a435 Merge pull request #48165 from rohitwaghchaure/fixed-support-40642-1
fix: target inventory dimension for stock entry
2025-06-19 19:52:59 +05:30
Rohit Waghchaure
d65cb56d66 fix: target inventory dimension for stock entry 2025-06-19 19:33:26 +05:30
ravibharathi656
1e37fd8991 fix: include child doctypes in allow_on_submit patch for accounting dimensions 2025-06-19 18:47:13 +05:30
ravibharathi656
55e79c4dfd fix: enable allow_on_submit for accounting dimensions in allowed doctypes 2025-06-19 18:46:34 +05:30
ravibharathi656
fbd8fd7d22 fix: include child doctypes in repostable accounting types 2025-06-19 18:45:34 +05:30
khushi8112
a1c0727d7b chore: remove unused import 2025-06-19 18:40:37 +05:30
i-am-vimal
5c9eddd31e fix: add validation for exchange gain/loss entries 2025-06-19 18:14:32 +05:30
khushi8112
4a027125bc refactor: remove test case 2025-06-19 18:09:54 +05:30
rohitwaghchaure
9cd44833b3 Merge pull request #48050 from iamkhanraheel/rearrange-quotation-item-fields
feat: Move "Is Free Item", "Is Alternative Item", and "Has Alternative Item" Checkboxes to Item Section in Quotation Child Table
2025-06-19 18:09:42 +05:30
rohitwaghchaure
b11c72958e Merge pull request #48072 from iamkhanraheel/update-schedule-date
fix: update schedule date in items table in purchase order & disable selecting past date in schedule date
2025-06-19 18:09:18 +05:30
khushi8112
0665691b88 feat: add search field for contract doctype 2025-06-19 18:09:10 +05:30
rohitwaghchaure
b56337ecb9 Merge pull request #48089 from iamkhanraheel/add-margin-fields
fix: attribute error because of missing margin_type field in Supplier Quotation
2025-06-19 18:08:46 +05:30
rohitwaghchaure
44b51bdd02 Merge pull request #48137 from rohitwaghchaure/fixed-make-se-in-job-card
fix: make stock entry in job card
2025-06-19 17:55:45 +05:30
Diptanil Saha
2f8893439f fix: coa reset root_type on unchecking is_group on new_node (#48156) 2025-06-19 17:47:28 +05:30
khushi
bf56c73c6c feat: add naming series for Contract Doctype 2025-06-19 17:45:22 +05:30
rohitwaghchaure
f154c70289 Merge pull request #48131 from rohitwaghchaure/fixed-support-41105
fix: permission issue during reposting
2025-06-19 17:42:20 +05:30
rohitwaghchaure
a25356a99e Merge pull request #48130 from rohitwaghchaure/fixed-gl-entries-lcv-for-se-scr
fix: adjustment entries for SE and SCR after LCV
2025-06-19 17:42:07 +05:30
rohitwaghchaure
29ff258ccb Merge pull request #48127 from rohitwaghchaure/fixed-valuation-rate-stock-entry
fix: additional cost distribution
2025-06-19 17:38:24 +05:30
Rohit Waghchaure
abb05f59e2 fix: make stock entry in job card 2025-06-19 17:25:54 +05:30
Rohit Waghchaure
dcc9fc2fec fix: permission issue during reposting 2025-06-19 17:25:13 +05:30
Rohit Waghchaure
2f50ddae85 fix: adjustment entries for SE and SCR after LCV 2025-06-19 17:24:30 +05:30
Rohit Waghchaure
abbf2fac6d fix: additional cost distribution 2025-06-19 17:18:48 +05:30
rohitwaghchaure
d75bdd9f72 Merge pull request #48155 from rohitwaghchaure/fixed-test-case-for-sre-for-so
fix: test case
2025-06-19 17:18:14 +05:30
khushi
a4bb7c4e95 refactor: remove autoname 2025-06-19 17:13:01 +05:30
Rohit Waghchaure
2f0c0c2b59 fix: test case 2025-06-19 16:55:22 +05:30
Smit Vora
527cfe9c7d fix: better integration of Pick List with Delivery Note (#47831)
Co-authored-by: priyanshshah2442 <priyanshshah2442@gmail.com>
2025-06-19 15:42:37 +05:30
khushi
f7e63936a9 chore: linters check 2025-06-19 15:07:44 +05:30
khushi
b55d1e61c7 chore: test contract autoname 2025-06-19 15:04:24 +05:30
khushi
e13e2bffe2 fix: contract autoname 2025-06-19 15:04:24 +05:30
Khushi Rawat
1170c5c7d3 Merge pull request #48152 from khushi8112/fix-failing-test
chore: fix incorrect test
2025-06-19 14:50:17 +05:30
khushi
7e4db0f70e chore: fix incorrect test 2025-06-19 14:32:00 +05:30
Diptanil Saha
c94764ab52 fix: naming series field in bank transaction (#48121)
* fix: naming series field in bank transaction

* fix: default naming_series
2025-06-19 12:37:11 +05:30
Khushi Rawat
8c3ed5eccf Merge pull request #47789 from khushi8112/gl-entry-for-composite-component
fix: correct gl entry when capitalizing composite component
2025-06-18 19:16:24 +05:30
Diptanil Saha
80f992c87f test: purchase invoice provisional accounting entry (#48112)
* test: fixed purchase invoice provisional accounting entry

* test: added tests for multi currency
2025-06-18 18:26:49 +05:30
Diptanil Saha
14f0569a39 fix: setup wizard load chart of accounts and fiscal year on change of country (#48125) 2025-06-18 17:16:03 +05:30
Mihir Kandoi
41b876ff71 fix: allow zero valuation rate toast showing even when rate is not 0 2025-06-18 16:31:53 +05:30
rohitwaghchaure
e2c9e24f66 Merge pull request #47988 from rohitwaghchaure/fixed-support-40403
fix: stock reconciliation validation for serial nos
2025-06-17 23:00:07 +05:30
Rohit Waghchaure
69d54d2e0f fix: stock reconciliation validation for serial and batch 2025-06-17 22:31:40 +05:30
Sagar Vora
77f17c987d chore: ignore commit replacing flag usage 2025-06-17 21:31:14 +05:30
Sagar Vora
7a482a6998 chore: use frappe.in_test 2025-06-17 21:28:21 +05:30
rohitwaghchaure
5d4405c7f2 Merge pull request #48077 from mihir-kandoi/40957
fix: use set_query on sales_order link field in work order
2025-06-17 17:37:38 +05:30
Sagar Vora
d079db16d6 Merge pull request #48104 from ljain112/fix-conditions 2025-06-17 11:25:19 +00:00
ljain112
20565f5f19 fix: incorrect condition for setting party account on change of company 2025-06-17 16:30:56 +05:30
ruthra kumar
5683032434 Merge pull request #48103 from ruthra-kumar/restrictive_github_actions
ci: restrictive permission for GH actions
2025-06-17 16:08:50 +05:30
ruthra kumar
fa82d3fbb1 ci: restrictive permission for gh actions 2025-06-17 15:41:48 +05:30
ruthra kumar
10a83698eb Merge pull request #48098 from ljain112/fix-retunr-doc
fix: do not reset party account for return doc
2025-06-17 15:29:04 +05:30
Mihir Kandoi
6def182e1a fix: use set_query on sales_order link field in work order 2025-06-17 15:18:24 +05:30
Karuppasamy
cec0ffad06 Merge pull request #47898 from aerele/pegged-currency
Pegged currency
2025-06-17 15:08:31 +05:30
ljain112
7e758a9d5b fix: do not reset party account for return doc 2025-06-17 14:32:20 +05:30
Khushi Rawat
01cd3b6712 Merge pull request #47676 from khushi8112/better-ux-in-asset-capitalization
fix(UI): better ui/ux in asset capitalization
2025-06-17 14:10:03 +05:30
ruthra kumar
a69bfc2e78 Merge pull request #48082 from aerele/get-party-account
fix:add validation for party type
2025-06-17 13:54:59 +05:30
ruthra kumar
e4a35137b4 Merge pull request #47879 from aerele/gl_exchange_rate_entry
fix: add validation for exchange gain/loss entries
2025-06-17 13:33:55 +05:30
Karuppasamy923
d05204a960 fix: add party and party_name columns to trend reports 2025-06-17 13:29:08 +05:30
rohitwaghchaure
fa23f1a37e Merge pull request #48076 from iamkhanraheel/restrict-negative-qty-in-bom
fix: Prevent saving negative quantity in BOM
2025-06-17 13:18:41 +05:30
rohitwaghchaure
f4617d77a7 Merge pull request #48033 from rohitwaghchaure/fixed-reservation-entry-based-on
fix: Reservation Based On in the reservation entry
2025-06-17 12:54:05 +05:30
ruthra kumar
6a3e38e6ef Merge pull request #48087 from ruthra-kumar/restrictive_permissions_on_github_actions
ci: restrictive permission on github token
2025-06-17 12:22:13 +05:30
iamkhanraheel
67f96c66e4 fix: add missing margin related fields 2025-06-17 12:19:28 +05:30
l0gesh29
6ea32a8762 test: add test for debit/credit calculations in exchange gain/loss account filter in GL 2025-06-17 12:14:51 +05:30
l0gesh29
d992f67658 fix: add validation for exchange gain/loss entries 2025-06-17 12:13:23 +05:30
Khushi Rawat
7e5274f650 Merge pull request #48086 from khushi8112/update-asset-status-after-revaluation
fix: update asset status after making asset value adjustment record
2025-06-17 12:02:44 +05:30
ruthra kumar
237f9640d5 ci: restrictive permission on github token 2025-06-17 12:02:35 +05:30
Khushi Rawat
da2663b8dc fix: update asset status after making asset value adjustment record 2025-06-17 11:42:00 +05:30
Rohit Waghchaure
57429e5d90 fix: Reservation Based On in the reservation entry 2025-06-17 09:14:40 +05:30
rohitwaghchaure
28642dd9bd Merge pull request #47970 from rohitwaghchaure/feat-lcv-for-wo-scr
feat: LCV for Work Order and Subcontracting Receipt
2025-06-16 20:35:12 +05:30
Rohit Waghchaure
6be6eab6ff feat: LCV for Work Order and Subcontracting Receipt 2025-06-16 20:18:55 +05:30
AlcinSnowlina
7c9d6aaae2 fix: add validation for party type 2025-06-16 18:47:28 +05:30
ljain112
1e4fc043a8 chore: Refactor test cases to use context manager for user setting 2025-06-16 17:56:30 +05:30
Mihir Kandoi
cf1d4362e5 fix: fallback expense account and cost center in subcontracting receipt 2025-06-16 17:11:17 +05:30
Diptanil Saha
c4bdf2a721 fix: budget naming series (#48075) 2025-06-16 16:27:18 +05:30
iamkhanraheel
e52d83e756 fix: prevent saving negative quantity in BOM 2025-06-16 16:17:15 +05:30
iamkhanraheel
94b45d174a fix: code format 2025-06-16 16:07:52 +05:30
iamkhanraheel
f71a0fa9e1 fix: code format 2025-06-16 15:49:50 +05:30
iamkhanraheel
58565a9fb1 fix: add new line to pass pre commit 2025-06-16 15:28:11 +05:30
Sagar Vora
74af9e32f8 Merge pull request #48071 from sagarvora/test++ 2025-06-16 09:49:13 +00:00
Sagar Vora
b527bb771b test: use self.set_user instead of classname 2025-06-16 15:02:39 +05:30
iamkhanraheel
10825af531 fix: update schedule date in items child table, prevent selecting past dates in schedule date 2025-06-16 14:59:49 +05:30
rohitwaghchaure
43395f922f Merge pull request #48069 from rohitwaghchaure/fixed-fitures-perm-issue
fix: permission issue while completing setup wizard
2025-06-16 14:19:36 +05:30
Rohit Waghchaure
666bf65f48 fix: permission issue while completing setup wizard 2025-06-16 13:59:12 +05:30
MochaMind
36ab072072 fix: sync translations from crowdin (#48062)
* fix: Spanish translations

* fix: Arabic translations

* fix: German translations

* fix: Hungarian translations

* fix: Polish translations

* fix: Portuguese translations

* fix: Russian translations

* fix: Swedish translations

* fix: Turkish translations

* fix: Chinese Simplified translations

* fix: Portuguese, Brazilian translations

* fix: Persian translations

* fix: Thai translations

* fix: Croatian translations

* fix: Bosnian translations

* fix: Serbian (Latin) translations

* fix: French translations

* fix: Esperanto translations
2025-06-16 09:21:00 +02:00
rohitwaghchaure
cdcc692e01 Merge pull request #47903 from aerele/fix-return-qty
fix: modify query to fetch valid return qty
2025-06-16 10:23:42 +05:30
rohitwaghchaure
7211609725 Merge pull request #48061 from rohitwaghchaure/fixed-support-40585-1
fix: incorrect warehouse set from SO to MR
2025-06-16 10:11:11 +05:30
ruthra kumar
f1b8b7512e Merge pull request #48036 from aerele/accounts-receivable-summary-ageing
fix: add validation for calculate ageing with filter for summary and …
2025-06-16 08:38:38 +05:30
ruthra kumar
07805f17fc Merge pull request #48060 from frappe/pot_develop_2025-06-15
chore: update POT file
2025-06-16 08:12:45 +05:30
Rohit Waghchaure
0da8d9c869 fix: incorrect warehouse set from SO to MR 2025-06-15 19:17:01 +05:30
frappe-pr-bot
f5808f65c1 chore: update POT file 2025-06-15 09:36:44 +00:00
Sagar Vora
765fc27a9f Merge pull request #48048 from Abdeali099/fix-none-in-error-msg 2025-06-13 17:05:21 +00:00
Diptanil Saha
4178d9e2a1 fix: pos invoice consolidation row refer issue (#48057) 2025-06-13 19:52:15 +05:30
pugazhendhivelu
4b82fe2611 fix: add descendants item groups to fetch the barcode items 2025-06-13 18:16:25 +05:30
Akhil Narang
c275c55d6c build(deps): bump rapidfuzz (#47503)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
2025-06-13 15:57:25 +05:30
Diptanil Saha
f37d5f188e fix: company validation for accounts on item tax template (#47964)
* fix: company validation for accounts on item tax template

* fix: syntax error
2025-06-13 12:38:04 +05:30
Diptanil Saha
41509d37af fix: patch to update child table parentfield name in pos closing entry (#48008) 2025-06-13 12:32:51 +05:30
Abdeali Chharchhoda
0a8e42a358 fix: use flt value of bin qty 2025-06-13 12:24:50 +05:30
rohitwaghchaure
576e804dbf Merge pull request #48037 from rohitwaghchaure/fixed-support-40883
fix: float division by zero
2025-06-13 08:19:31 +05:30
iamkhanraheel
5d4d4f40a1 feat: move checkbox related to items in item section 2025-06-12 17:54:26 +05:30
Rohit Waghchaure
59cbe85817 fix: float division by zero 2025-06-12 17:20:22 +05:30
ljain112
e50467a593 chore: Refactor test to use clear_cache instead of reload_doc 2025-06-12 17:15:38 +05:30
l0gesh29
c630aa9fe8 fix: add validation for calculate ageing with filter for summary and other reports 2025-06-12 16:59:52 +05:30
Khushi Rawat
2c54933e3e Merge pull request #48031 from khushi8112/asset-capitalization-from-connection-tab
fix: do not allow capitalization from connection tab for submitted asset
2025-06-12 15:17:02 +05:30
Khushi Rawat
27bec4cde5 fix: do not allow capitalization from connection tab for submitted asset 2025-06-12 15:13:02 +05:30
ruthra kumar
46985e0f3c Merge pull request #48024 from frappe/l10n_develop
fix: sync translations from crowdin
2025-06-12 14:09:28 +05:30
MochaMind
37f9002b84 fix: Turkish translations 2025-06-12 05:58:06 +05:30
MochaMind
4d9d7b243d fix: Swedish translations 2025-06-12 05:58:02 +05:30
rohitwaghchaure
153a70cd70 Merge pull request #48018 from rohitwaghchaure/fixed-support-40869
fix: batch page length
2025-06-11 20:01:50 +05:30
Sagar Vora
66d1771b94 Merge pull request #48019 from priyanshshah2442/fix_unpack_non_iterable_error 2025-06-11 12:48:13 +00:00
priyanshshah2442
7d940faa4f fix: unpack non-iterable NoneType object error 2025-06-11 18:11:54 +05:30
Rohit Waghchaure
338256b799 fix: batch page length 2025-06-11 16:52:58 +05:30
Ankush Menat
d16a6d42a5 perf: Use lazy loaded documents (#48017)
* perf: Use lazy docs for status updaters and similar use cases

* perf: lazy load documents while reposting
2025-06-11 10:27:08 +00:00
Mihir Kandoi
76982fe133 Merge pull request #48015 from mihir-kandoi/zero_valuation_toast_2
feat: show warning toast if rate is 0 and allow zero valuation rate checkbox is not enabled
2025-06-11 15:06:31 +05:30
Mihir Kandoi
b23a2dd8e8 fix: if condition to validate doctype 2025-06-11 14:50:33 +05:30
Mihir Kandoi
7a1cebfa3e fix: show warning toast if rate is 0 and allow zero valuation rate checkbox is not enabled 2025-06-11 14:50:17 +05:30
Mihir Kandoi
5254057b11 Merge pull request #48014 from frappe/revert-47875-zero_valuation_toast
Revert "feat: show warning toast if rate is 0 and allow zero valuation rate c…"
2025-06-11 11:30:20 +05:30
Mihir Kandoi
1502515ed9 Revert "feat: show warning toast if rate is 0 and allow zero valuation rate c…" 2025-06-11 11:13:56 +05:30
Diptanil Saha
8f4a6d248f fix: fetch correct item tax template on item rate update (#47955) 2025-06-11 10:58:18 +05:30
ruthra kumar
a7974451fd Merge pull request #48012 from frappe/l10n_develop
fix: sync translations from crowdin
2025-06-11 09:41:57 +05:30
MochaMind
175200891c fix: Serbian (Latin) translations 2025-06-11 05:47:13 +05:30
MochaMind
ff868aeba8 fix: Swedish translations 2025-06-11 05:46:55 +05:30
Karuppasamy923
7987ba9b7c feat(bank-statement-import): add support for uploading MT940 format bank statements 2025-06-11 05:20:07 +05:30
Khushi Rawat
bd502c11cc Merge pull request #47901 from khushi8112/asset-transfer-and-movement-in-single-asset-movement-record
feat: Asset Transfer and Issue in single asset movement record
2025-06-11 01:16:51 +05:30
Diptanil Saha
3969a75635 fix: populate is_return and return_against fields in pos closing entry (#48009) 2025-06-11 00:00:47 +05:30
ravibharathi656
14646b1952 test: add test for validating sales invoice qty after return 2025-06-10 18:58:34 +05:30
ravibharathi656
161a186bcc fix: modify query to fetch valid return qty 2025-06-10 18:56:29 +05:30
rohitwaghchaure
37e97e1256 Merge pull request #47998 from rohitwaghchaure/fixed-support-40585
fix: incorrect warehouse in MR
2025-06-10 18:10:09 +05:30
Rahul Agrawal
bc87609264 feat: populate Timer dialog project field from Timesheet parent_project (#47971)
* feat: default parent project in timer dialog > project

* chore: fix formatting

* fix: remove unnecessary or condition

---------

Co-authored-by: Rahul Agrawal <deathstarconsole@Rahuls-MacBook-Air.local>
2025-06-10 18:02:05 +05:30
Diptanil Saha
4e537cdb74 refactor: sales invoice integration with pos (#47713)
* fix: invoice doctype selection in accounts settings

* test: change in accounts settings on sales invoice

* test: refactored pos_invoice_merge_log tests

* test: pos closing entry and pos invoice

* fix: closing voucher details style

* refactor: renamed fields and removed repeated methods

* fix: patch to rename pos closing entry fields

* refactor: replaced get_doc with sql query

* fix: restrict cancelling sales invoice on cancellation of pos closing entry

* fix: removed payment reconciliation summary field and rearranged total section fields

* refactor: set_posting_date_and_time

* test: create_sales_invoice added args for is_created_using_pos

* test: added test for sales invoice creation during pos invoice mode

* test: added test for pos invoice creation during sales invoice mode

* fix: moved invoice type selection in pos settings

* fix: pos additional fields label

* refactor: pos closing entry

rearranged fields, removed rate field from taxes field, fetching payments and taxes details

* test: moved invoice creation in functions

* refactor: using as_dict=1

* fix: wrong table chosen in query

* fix: variable rename

* test: fixed failing tests

* test: fixed pos_closing_entry tests
2025-06-10 17:51:11 +05:30
Rohit Waghchaure
2b9ca79291 fix: incorrect warehouse in MR 2025-06-10 17:36:54 +05:30
Debin Robert
6529b288c2 feat: confirm with user before resetting posting date (#47667)
* feat: confirm with user before resetting posting date

* chore: pre-commit

* changes made as per review

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
2025-06-10 15:20:18 +05:30
Debin Robert
751815745f fix: filter to ignore system generated cr / dr reconciliation journals on customer ledger summary 2025-06-10 15:15:50 +05:30
rohitwaghchaure
d38f3f4fae Merge pull request #47981 from barredterra/wo-query_sales_order
refactor(Work Order): query_sales_order
2025-06-10 14:31:12 +05:30
rohitwaghchaure
97923c3b2b Merge pull request #47969 from rohitwaghchaure/fixed-support-40445
fix: do not create repeat work orders
2025-06-10 14:29:29 +05:30
ruthra kumar
224c525b86 Merge pull request #47923 from aerele/currency_in_trends
fix: update currency based on transaction
2025-06-10 14:25:44 +05:30
Rohit Waghchaure
384f4e120a fix: do not create repeat work orders 2025-06-10 13:59:37 +05:30
Ankush Menat
a123de4884 Merge pull request #47984 from frappe/drop_empty_unit_tests
chore: Drop empty UnitTestCase
2025-06-10 12:59:02 +05:30
Ankush Menat
e8c8f6fb63 test: Use name instead of doc
Previous filters implicitly returned last document.
2025-06-10 12:44:05 +05:30
Sagar Vora
b3bfce56a8 Merge pull request #47989 from priyanshshah2442/fix_calculated_discount_mismatch_report 2025-06-10 07:10:21 +00:00
Ankush Menat
9f0df5ecf3 fix: Correct filter types 2025-06-10 12:40:07 +05:30
priyanshshah2442
4e1abc1814 fix: add draft transactions also in calculated mismatch report 2025-06-10 12:38:07 +05:30
rohitwaghchaure
c62fe1a8db Merge pull request #47942 from rohitwaghchaure/fixed-support-40499
fix: available qty in BOM Stock Report
2025-06-10 12:19:52 +05:30
Sagar Vora
964712301b Merge pull request #47946 from priyanshshah2442/fix_discount_mismatch 2025-06-10 06:00:38 +00:00
Ankush Menat
c222d5fa55 chore: Drop empty UnitTestCase 2025-06-10 10:55:43 +05:30
MochaMind
465ec357aa fix: sync translations from crowdin (#47953) 2025-06-10 05:13:55 +00:00
ruthra kumar
bf9d3eac6a Merge pull request #47983 from frappe/mergify/copy/develop/pr-47934
fix(sales order): error message on creation of work order from sales order (copy #47934)
2025-06-10 10:22:08 +05:30
thomasantony12
2a2af8d986 fix(sales order): error message on creation of work order from sales order
(cherry picked from commit 129cd7ae8a)
2025-06-10 04:51:00 +00:00
Ankush Menat
4861e6a1b8 Merge pull request #47972 from frappe/balance
perf: skip fetching balances in payment entry
2025-06-10 09:04:31 +05:30
Ankush Menat
1343d147bd perf: Skip fetching account balances unless required
This is very expensive operation and not requried when just finding
default account and account info.
2025-06-10 08:50:00 +05:30
Ankush Menat
0a043a4e0b perf: Avoid fetching account balance
This isn't shown anywhere in UI anymore since https://github.com/frappe/erpnext/pull/45630
2025-06-10 08:50:00 +05:30
l0gesh29
c8cec8cedf fix: add .length in list validation (#47974)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2025-06-10 01:15:31 +02:00
barredterra
2dbdacf905 refactor(Work Order): query_sales_order
- Use `get_list` instead of `db.sql_list`

    The method is used for setting link options in the frontend and the Link field doesn't ignore permissions, so get_list should be fine here.

- Added type hints to enable argument validation
2025-06-09 22:15:41 +02:00
Khushi Rawat
ffa014ecdc Merge pull request #47979 from khushi8112/attribute-error-fix-in-asset-capitalization
fix: AttributeError due to incorrect object
2025-06-10 00:15:18 +05:30
Khushi Rawat
351796bce6 fix: AttributeError due to incorrect object 2025-06-09 23:58:40 +05:30
Aayush Dalal
8b6a8d0c4f fix: throw permission error (#47976)
Co-authored-by: Sagar Vora <16315650+sagarvora@users.noreply.github.com>
2025-06-09 17:28:46 +00:00
Sagar Vora
e91b4f759c Merge branch 'develop' into fix_discount_mismatch 2025-06-09 17:15:41 +00:00
Sagar Vora
54ca0dd004 Merge pull request #47975 from sagarvora/fix-test
test: improve logic for `test_employee_query_with_user_permissions`
2025-06-09 17:12:33 +00:00
Sagar Vora
5e4554d14e test: ensure employees are created before using 2025-06-09 22:27:21 +05:30
Sagar Vora
2a85c401b4 test: improve logic for test_employee_query_with_user_permissions 2025-06-09 22:12:36 +05:30
priyanshshah2442
f781a39dbe fix: fieldtype to Currency for discount amounts 2025-06-09 19:20:40 +05:30
Sagar Vora
9bf9b34ac4 fix: remove currency col 2025-06-09 19:13:53 +05:30
Sagar Vora
33e793354c fix: changes in report 2025-06-09 19:13:03 +05:30
Sagar Vora
e3356ebfb6 Merge branch 'develop' into fix_discount_mismatch 2025-06-09 13:16:02 +00:00
priyanshshah2442
3f0c5be5d9 fix: test case to verify correct setting of discount amount and percentage 2025-06-09 18:43:58 +05:30
priyanshshah2442
9120927a65 fix: add change log for bug fix in Additional Discount functionality 2025-06-09 18:06:16 +05:30
priyanshshah2442
3dcb801a37 fix: ensure proper float conversion for discount values 2025-06-09 17:49:40 +05:30
ruthra kumar
ea68e94665 Merge pull request #47865 from aerele/accounts-receivable/payable-user-permission
fix: consider user permission while populating the data
2025-06-09 15:22:15 +05:30
Sagar Vora
daad6137f8 fix: changes to report and patch 2025-06-09 14:11:19 +05:30
ruthra kumar
1e9c34d4f8 Merge pull request #47626 from debinnn/word-order-date
fix: no validation to compare 'actual start date' and 'actual end date' when creating work order.
2025-06-09 12:12:56 +05:30
ruthra kumar
d83bc7be41 Merge pull request #47963 from frappe/mergify/copy/develop/pr-47590
fix(report): include descendants when filtering by parent item group (copy #47590)
2025-06-09 12:10:49 +05:30
Debin Robert
e1ae650d45 refactor: ensure end date is after start date on work order 2025-06-09 11:57:12 +05:30
FATHIH MOHAMMED
d25021d488 fix(report): include descendants when filtering by parent item group
(cherry picked from commit d21bfa219d)
2025-06-09 06:25:30 +00:00
priyanshshah2442
62dd6df24f feat: report to verify discount amount mismatch 2025-06-09 11:13:59 +05:30
ruthra kumar
8adb5e7e66 Merge pull request #47863 from khushi8112/closing-balance-in-dr-cr
feat: show Dr/Cr in Supplier ledger summary & Customer ledger summary
2025-06-09 10:15:30 +05:30
Ankush Menat
765c7c2bcc refactor: rename get_settings -> get_single_value (#47961) 2025-06-09 04:40:02 +00:00
MochaMind
26abf9f13a chore: update POT file (#47956) 2025-06-08 14:56:06 +02:00
MochaMind
75872925a2 fix: sync translations from crowdin (#47881)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2025-06-06 20:30:30 +00:00
Ankush Menat
bb693c0a4f perf: Batch GLE/SLE rename commits (#47950) 2025-06-06 14:51:59 +00:00
Ankush Menat
73746e2c71 perf: use cached selling settings (#47949)
* perf: Use cached stock repost settings

* perf: Use cached selling settings
2025-06-06 14:10:12 +00:00
Ankush Menat
7d88d9dd4d perf: use cached Authorization control doc (#47948) 2025-06-06 14:09:47 +00:00
Ankush Menat
45a4beb401 perf: Use cached accounts settings (#47947) 2025-06-06 13:59:18 +00:00
Ankush Menat
ea5c2c454b perf: use cached stock settings (#47945) 2025-06-06 18:54:49 +05:30
priyanshshah2442
f7eda8a156 fix: patch to set discount percentange in case of mismatch 2025-06-06 18:40:06 +05:30
Khushi Rawat
522b6ad49f Merge pull request #47547 from aerele/fix-empty-sequence
fix(asset): make purchase date mandatory
2025-06-06 17:39:10 +05:30
Ankush Menat
a38ed286bd perf: cache item metadata retrieval (#47929)
* perf(get_item_details): use cached doc, avoid full get_doc

* perf: short-circuit common usecase of same UOM

* perf: use cached doc for inspection

* perf: use cached valuation method and other item props

It rarely if ever changes after initial configuration
2025-06-06 11:39:27 +00:00
Rohit Waghchaure
ea689bbe3f fix: available qty in BOM Stock Report 2025-06-06 16:14:43 +05:30
rohitwaghchaure
534f90c33d Merge pull request #47888 from rohitwaghchaure/fixed-support-39929-1
fix: do not remove item which has zero qty and zero valuation
2025-06-06 15:32:03 +05:30
Rohit Waghchaure
86e4a658a5 fix: do not remove item which has zero qty and zero valuation 2025-06-06 13:15:25 +05:30
Khushi Rawat
7d3bec8ef8 fix: failing test case 2025-06-06 12:44:36 +05:30
Khushi Rawat
7e52cb2856 refactor: split set_latest_location_and_custodian_in_asset into smaller functions 2025-06-06 12:44:36 +05:30
Khushi Rawat
07d1a0ed9c fix: saperated validations for each purpose of validation 2025-06-06 12:44:36 +05:30
Khushi Rawat
f5e5146021 feat: added Transfer and Issue option in purpose 2025-06-06 12:44:36 +05:30
Ankush Menat
7bddd64771 perf: Skip fetching non-existing call log (#47930) 2025-06-06 07:13:44 +00:00
Sagar Vora
abad8050a3 Revert "fix: calculate discount percentage if discount amount is specified" (#47927) 2025-06-06 06:06:20 +00:00
Sagar Vora
27dc0f5b70 Revert "fix: calculate discount percentage if discount amount is specified (#…"
This reverts commit bb474f4f42.
2025-06-06 11:35:30 +05:30
Ankush Menat
c9413e0cbb Merge pull request #47899 from frappe/cruft
perf: remove misc random cruft
2025-06-05 22:48:07 +05:30
Ankush Menat
958cc6f8f8 perf: use estimated count on item table 2025-06-05 22:31:36 +05:30
Ankush Menat
8e17054b67 fix: invalid logic for cache hit
if there are no inventory dimensions then `[]` gets treated as a miss.
2025-06-05 22:31:36 +05:30
Ankush Menat
a36daec939 perf: cache pricing rule query 2025-06-05 22:31:36 +05:30
Ankush Menat
4dc2969fa6 perf: avoid duplicate fetching of stock qty 2025-06-05 22:31:35 +05:30
Ankush Menat
c06a361348 fix: get_value doesn't support named plucking 2025-06-05 22:31:35 +05:30
Ankush Menat
9870dd26f7 perf: avoid querying cost center allocation repeatedly 2025-06-05 22:31:33 +05:30
Ankush Menat
013011aa43 perf: cache existence of budgets while validating GL 2025-06-05 22:26:26 +05:30
DHINESH00
fc4f38eed1 fix: update currency based on transaction 2025-06-05 20:04:20 +05:30
rohitwaghchaure
342cebc778 fix: stock reco qty with inventory dimension (#47918) 2025-06-05 17:35:32 +05:30
rohitwaghchaure
8fa3473945 fix: consider expired batches in the stock reco (#47909) 2025-06-05 17:18:46 +05:30
Deepesh Garg
9167f1ff90 Merge pull request #47907 from deepeshgarg007/gl_dict_hook
feat: Add hook to update gl dict by apps
2025-06-05 16:32:51 +05:30
rohitwaghchaure
997ce4eaa7 fix: key-error for COGS By Item Group report (#47914)
fix: keyerror for COGS By Item Group report
2025-06-05 15:59:23 +05:30
Ankush Menat
7720163e4c test: remove manual cleanup of db.value_cache (#47904)
test: clear cache instead of replacing
2025-06-05 09:37:19 +00:00
Deepesh Garg
c4aecb15ce style: Linting issues 2025-06-05 12:48:28 +05:30
Deepesh Garg
10ff369ff2 feat: Add hook to update gl dict by apps 2025-06-05 12:42:16 +05:30
Diptanil Saha
bb903a4bef fix: pos permission error on strict permission (#47896) 2025-06-04 16:07:28 +05:30
Mihir Kandoi
bfff582fea Merge pull request #47875 from mihir-kandoi/zero_valuation_toast
feat: show warning toast if rate is 0 and allow zero valuation rate c…
2025-06-04 12:33:32 +05:30
rohitwaghchaure
dc4f701101 refactor: item tax amount calculation for valuation rate (#47532) 2025-06-04 10:37:54 +05:30
rohitwaghchaure
cbcd580daa fix: stock adjustment entry during reposting (#47878)
fix: stock adjustment entry
2025-06-04 10:37:08 +05:30
Mihir Kandoi
7c57f5a304 feat: show warning toast if rate is 0 and allow zero valuation rate checkbox is not enabled 2025-06-03 18:34:22 +05:30
Mihir Kandoi
67d82894c6 Merge pull request #47874 from mihir-kandoi/st40223
fix: zero division error in purchase receipt
2025-06-03 18:34:17 +05:30
Mihir Kandoi
32229fb646 fix: zero division error in purchase receipt 2025-06-03 18:18:55 +05:30
l0gesh29
1a4bb30923 fix: add user permission while fetching ple 2025-06-03 18:17:11 +05:30
ruthra kumar
3f6a132234 Merge pull request #47872 from nitefury7/fix-purchase-order-analysis-report
fix: typo
2025-06-03 17:38:19 +05:30
Ayush Marhatta
a243abb5fd fix: typo 2025-06-03 17:32:28 +05:45
Khushi Rawat
524ae1d368 fix: removed checkbox 2025-06-03 14:53:21 +05:30
ruthra kumar
b2ff5b4578 Merge pull request #47866 from ruthra-kumar/ci_suppress_compiled_files
ci: suppress compiled files in output
2025-06-03 14:01:57 +05:30
ruthra kumar
e70da0291e ci: suppress compiled files in output 2025-06-03 13:38:12 +05:30
l0gesh29
074dc6d7dd fix: consider user permission while populating the data 2025-06-03 13:28:01 +05:30
ruthra kumar
36f3bd473c Merge pull request #47854 from nitefury7/fix-purchase-order-analysis-report
fix: use user default for company instead of global default in purchase order analysis report
2025-06-03 13:17:13 +05:30
rohitwaghchaure
75b5ba6e67 refactor: track completed app setup wizards and re-run the setup wizard upon new app installation. (#47691) 2025-06-03 13:02:45 +05:30
Khushi Rawat
ff285307c6 chore: wrapped text in translate function 2025-06-03 12:33:46 +05:30
Khushi Rawat
0dbebe74c1 chore: update label 2025-06-03 12:23:56 +05:30
Khushi Rawat
22ea62e92f chore: hide currency column 2025-06-03 12:06:39 +05:30
Khushi Rawat
e7ba420687 feat: added column to show Dr/Cr 2025-06-03 12:05:43 +05:30
Khushi Rawat
d15e3bb52b feat: show Dr/Cr in Supplier ledger summary & Customer ledger summary 2025-06-03 12:04:27 +05:30
Mihir Kandoi
538e0d08e4 Merge pull request #47756 from mihir-kandoi/st38914
feat: specify expense account and cost center for raw materials in Su…
2025-06-03 12:04:04 +05:30
Marc Ramser
0670765baa fix(Timesheet): only update to_time if it's more than 1 second off (#47703)
* Only update to_time if it's more than 1 second off

Before, to_time was updated even when it was almost the same as the expected time (like 17:20 vs 17:19:59.998). This causes problems because of small rounding errors and caused valid times like 17:20 to be reset. Now, to_time is only updated if the difference is greater than 1 second.

To reproduce the current error:

From Time 09:00:00
To Time 17:20:00 Save
To Time is 17:19:59

* Change data to self in timesheet

* Update timesheet_detail.py
2025-06-03 11:58:00 +05:30
Mihir Kandoi
8b42582f3c test: added more assertions 2025-06-03 11:47:38 +05:30
Lakshit Jain
20b87512d1 fix: cash flow report fixes 2025-06-03 11:22:02 +05:30
Diptanil Saha
1c17419a9e fix: pos order summary new order action (#47856) 2025-06-02 18:40:51 +05:30
Diptanil Saha
0624556ef6 fix: pos settings invoice_fields not fetched at pos setup (#47855) 2025-06-02 18:24:06 +05:30
Ayush Marhatta
49f23513e0 fix: use user default for company instead of global default in purchase order analysis report 2025-06-02 18:21:07 +05:45
ruthra kumar
56fc76f180 Merge pull request #47780 from aerele/add-link-field
fix: add internal link field in Sales Order connections for internal …
2025-06-02 16:46:48 +05:30
ruthra kumar
ee8c0daf61 Merge pull request #47665 from mujeerhashmi/patch-3
fix: Project argument is not passed correctly for MR creation
2025-06-02 16:36:31 +05:30
Karuppasamy
3a2b863e7f refactor: add validation for inter company transactions rate
Add validation for inter company transactions rate
2025-06-02 16:34:45 +05:30
Abdeali Chharchhodawala
39f6d8ffb6 fix: Handle duplicate Items qty in Quotation
fix: Handle duplicate Items qty in Quotation
2025-06-02 14:49:15 +05:30
ruthra kumar
f7712c9dc0 Merge pull request #47781 from ljain112/fix-cc-psa
fix: add company filter to cost center and project in process statement of accounts
2025-06-02 13:37:54 +05:30
l0gesh29
c8e052f3c6 Accounts receivable show delivery note (#47821)
* fix: reorder function call

* fix: Add condition to fetch return entries for specific party types
2025-06-02 13:35:23 +05:30
rohitwaghchaure
0dbd9efc91 fix: decimal issue (#47839) 2025-06-02 13:24:41 +05:30
Ankush Menat
f86c3f7f8b perf: Use client cached configuration (#47838)
These are accessed on every document load, reaching to DB is excessive.
2025-06-02 06:14:51 +00:00
Ankush Menat
705b9e0181 perf: cache child warehouses during a single request (#47837)
Gets called for each row right now, warehouses often same on all
items in a document.
2025-06-02 05:36:17 +00:00
MochaMind
910c3cc5cf fix: sync translations from crowdin (#47802) 2025-06-01 21:55:53 +00:00
MochaMind
1c0f164670 chore: update POT file (#47835) 2025-06-01 12:33:11 +02:00
Mihir Kandoi
bb474f4f42 fix: calculate discount percentage if discount amount is specified (#47806) 2025-05-31 20:52:14 +05:30
rohitwaghchaure
e4c4ee79de fix: incorrect valuation for returned materials (#47824) 2025-05-31 18:43:21 +05:30
rohitwaghchaure
0557d4d180 fix: incorrect serial no status after delivery note cancel (#47825) 2025-05-31 18:42:40 +05:30
rohitwaghchaure
b49a835b4c fix: improved indexing for SLE queries. (#47194) 2025-05-30 13:41:14 +05:30
Ankush Menat
a61f065660 Merge pull request #47783 from frappe/perf/stock_reco
perf: speed up stock reconciliation
2025-05-29 18:09:51 +05:30
rohitwaghchaure
c544c3e018 fix: incorrect actual qty in product bundle balance report (#47791) 2025-05-29 18:09:33 +05:30
Ankush Menat
dc8d9dc7fa perf: fix incorrect usage of get_cached_value 2025-05-29 17:54:53 +05:30
Ankush Menat
e1d14d8ac2 perf: Ignore validating links
Framework does this anyway and does it faster.
2025-05-29 17:37:17 +05:30
Ankush Menat
0a1fc3e24f perf: use cached doc for validating item 2025-05-29 17:37:17 +05:30
Ankush Menat
e2920e2536 perf: Fix incorrect cache implementation
`if not {}` results to `True` so if someone doesn't have inventory dimensions, this gets called again and again.
2025-05-29 17:37:17 +05:30
Ankush Menat
076b765cb2 perf: Avoid Querying existence of item code
- This should be ensured by Framework.
- It's also there in validate hook.

So no need to do it again for each item.
2025-05-29 17:37:17 +05:30
Ramdani
4d98094783 Merge pull request #47784 from xhijack/fix_default_indonesia_vat
Fix default indonesia vat
2025-05-29 14:59:02 +05:30
ruthra kumar
45f7db6054 Merge pull request #47794 from ljain112/fix-ar-query
fix: use `query.walk() `for escaping special chars in receiable/payable report
2025-05-29 13:49:55 +05:30
Ankush Menat
6549047c3f fix: Drop duplicate index (#47799) 2025-05-29 12:18:39 +05:30
ljain112
a0a51b5074 fix: use query.walk() for escaping special chars in receiable/payable report 2025-05-29 11:18:08 +05:30
rohitwaghchaure
cb9e6f6655 chore: removed orphaned function (#47796) 2025-05-29 10:14:45 +05:30
Khushi Rawat
7d9379461a test: composite component 2025-05-29 00:15:36 +05:30
Mihir Kandoi
93ebd173cd Merge pull request #47792 from mihir-kandoi/st39718
feat: show item name for raw materials in BOM creator
2025-05-28 19:52:13 +05:30
Ankush Menat
2b4285374f fix: checkbox can't be mandatory (#47793)
fix: checkboxes can't be mandatory
2025-05-28 13:46:58 +00:00
Mihir Kandoi
90ba4ad1e1 feat: show item name for raw materials in BOM creator 2025-05-28 18:13:42 +05:30
Khushi Rawat
83b32f9646 fix: correct gl entry when capitalizing composite component 2025-05-28 17:48:04 +05:30
ljain112
14313b162a fix: add company filter to cost center and project in process statement of accounts 2025-05-28 13:56:42 +05:30
Karuppasamy923
e3e6503076 fix: add internal link field in Sales Order connections for internal transactions 2025-05-28 12:59:49 +05:30
ruthra kumar
82208f8513 Merge pull request #47778 from ruthra-kumar/ui_changes_for_budget_refactor
refactor: UI changes for budget refactor
2025-05-28 11:25:01 +05:30
ruthra kumar
5222e89250 refactor: more user friendly error message 2025-05-28 11:03:26 +05:30
ruthra kumar
5aaa866205 refactor: hide cumulative exp actions if new controller is disabled 2025-05-28 11:03:24 +05:30
ruthra kumar
776688d585 Merge pull request #47775 from frappe/l10n_develop
fix: sync translations from crowdin
2025-05-28 09:25:34 +05:30
MochaMind
aefa5308b7 fix: Serbian (Latin) translations 2025-05-28 02:11:54 +05:30
MochaMind
1026550051 fix: Persian translations 2025-05-28 02:11:44 +05:30
MochaMind
a10b8ecbe5 fix: Swedish translations 2025-05-28 02:11:32 +05:30
Raffael Meyer
3c0efcf7f1 Revert "fix: translate_pos_buttons" (#47773) 2025-05-27 19:08:49 +00:00
ruthra kumar
011084bdf9 Merge pull request #47766 from ljain112/fix-multiselect
fix: handle multiselect filters for tree doctypes in Customer Ledger Summary Report
2025-05-27 19:52:45 +05:30
Mihir Kandoi
4861856b8f test: add test 2025-05-27 18:23:44 +05:30
ruthra kumar
74fab3a539 Merge pull request #47767 from aerele/quotation-lost-reason
fix: add no_copy for lost reasons
2025-05-27 18:02:27 +05:30
ruthra kumar
f50b5b19fe Merge pull request #47765 from ljain112/fix-sls
fix: use pypika object `LiteralValue` for adding match conditions
2025-05-27 18:00:05 +05:30
ljain112
536f7d5ff8 fix: handle multiselect filters for tree doctypes in Customer Ledger Summary Report 2025-05-27 17:27:29 +05:30
l0gesh29
98e889a516 fix: add no_copy for lost reasons 2025-05-27 17:04:41 +05:30
ruthra kumar
d05132ab1d Merge pull request #47763 from aerele/item-tax-template-on-rate
feat: add validation for Item Tax Template on rate change
2025-05-27 16:59:07 +05:30
ljain112
9093e5e363 fix: use pypika object LiteralValue for adding match conditions 2025-05-27 16:51:52 +05:30
Mihir Kandoi
93b33faabf refactor: move logic to validate function 2025-05-27 16:23:42 +05:30
Karuppasamy923
a9a957edc7 feat: add validation for Item Tax Template on rate change 2025-05-27 16:19:43 +05:30
Mihir Kandoi
44bec1f981 feat: GL entries 2025-05-27 15:32:58 +05:30
Mihir Kandoi
0f53cc1922 feat: specify expense account and cost center for raw materials in Subcontracting Receipt for GL entries 2025-05-27 15:32:58 +05:30
Diptanil Saha
4d1d66e579 fix: patch to set status cancelled for already cancelled pos invoices (#47725) 2025-05-27 15:27:45 +05:30
Diptanil Saha
1523b38315 fix: patch to set grand total to default mop if old column exists (#47731)
* fix: patch to set grand total to default mop if old column exists

* chore: patches.txt
2025-05-27 14:48:25 +05:30
ruthra kumar
3bb44b5ef6 Merge pull request #47721 from xhijack/fix_default_indonesia_vat
fix indonesia tax
2025-05-27 14:11:43 +05:30
ruthra kumar
4fc7cc4c15 Merge pull request #47679 from ljain112/fix-pur-piad
fix: setting paid amount to 0 when is_paid is unchecked in purchase invoice
2025-05-27 13:57:20 +05:30
ljain112
e358a9e53f fix: setting paid amount to 0 when is_paid is unchecked in purchase invoice 2025-05-27 13:41:03 +05:30
Ramdani
e1b9f24b69 fix: indonesia tax 2025-05-27 13:18:31 +05:30
ruthra kumar
c3847e4300 Merge pull request #47736 from ljain112/fix-tcs-advance
fix: only include advances within the tcs period
2025-05-27 13:18:01 +05:30
ruthra kumar
bba2bb4561 Merge pull request #47737 from ljain112/fix-party-account
fix: party account based on party type's account type
2025-05-27 13:12:56 +05:30
rohitwaghchaure
d8cb073eaf fix: create Quality Inspection button not showing (#47746) 2025-05-27 12:18:39 +05:30
ruthra kumar
64cb693173 Merge pull request #47659 from mahsem/translate_pos_buttons
fix: translate_pos_buttons
2025-05-27 11:40:56 +05:30
ruthra kumar
114d42d26b Merge pull request #47654 from ljain112/fix-psa-currency
fix: show general ledger in doc currency in Process Statement Of Accounts
2025-05-27 11:39:27 +05:30
ruthra kumar
c40b4c4639 Merge pull request #47531 from Abdeali099/modern-check-for-array
refactor: simplify `source_name` assignment in `map_current_doc`
2025-05-27 11:17:18 +05:30
ruthra kumar
75ae131d81 Merge pull request #47697 from ruthra-kumar/fetch_party_name_for_contract
refactor: Fetch party name for contract
2025-05-26 17:40:32 +05:30
ruthra kumar
8e2221178b refactor: patch old contract with full party name 2025-05-26 17:17:31 +05:30
ruthra kumar
752024e222 refactor: fetch party name on selection 2025-05-26 17:17:11 +05:30
ruthra kumar
016924361a refactor: full name field in contract 2025-05-26 17:17:11 +05:30
maasanto
b7de5398a7 chore: Remove agriculture roles (#47335)
* feat: remove permissions of Agriculture Manager and Agriculture User

* feat: patch to remove agriculture roles

* chore: formatting issue

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
2025-05-26 17:15:46 +05:30
Ankush Menat
def9d8c9e0 perf: speed up customer import (#47738)
* perf: Avoid fetching customer from DB

This is likely code from bygone era where is_new and doc_before_save didn't exist?

I see no reason to do it in this weird manner. This code still appears
to be wrong but I'll leave it as is for now.

* fix: don't validate internal customer for non-internal customer

This was likely missed out while adding validations
2025-05-26 11:35:34 +00:00
ljain112
19b1650522 fix: party account based on party type's account type 2025-05-26 15:55:55 +05:30
Ankush Menat
ff59b89f3e Merge pull request #47734 from frappe/perf_item_import
perf: speedup item import
2025-05-26 15:43:26 +05:30
ljain112
477ec9fdcc fix: only include advances within the tcs period 2025-05-26 15:36:12 +05:30
Ankush Menat
7b811a93b4 perf: don't cleanup plaintext fallback 2025-05-26 15:27:49 +05:30
Ankush Menat
41d56c8e3a perf: fetch cached item group defaults, avoid query 2025-05-26 15:10:03 +05:30
Ankush Menat
31b8eb4922 perf: don't validate for change on new documents 2025-05-26 14:59:02 +05:30
Ankush Menat
a54d965d6d perf: validate variant change only if value changed 2025-05-26 14:57:11 +05:30
Ankush Menat
a52b2d8eb5 perf: don't update price of newly inserted item 2025-05-26 14:46:27 +05:30
ruthra kumar
4faab02e24 Merge pull request #47650 from frappe/l10n_develop
fix: sync translations from crowdin
2025-05-26 13:34:26 +05:30
Deepesh Garg
6174522028 Merge pull request #47709 from diptanilsaha/patch-custom-gl-report
fix: patch to rename group_by filter in custom reports
2025-05-26 12:41:24 +05:30
ruthra kumar
3b2e689957 Merge pull request #47253 from prateekkaramchandani/feat/currency-chart-warehouse-stock-value
fix: display stock value in currency format in chart warehouse wise stock value
2025-05-26 11:19:06 +05:30
MochaMind
7fc017d537 fix: Esperanto translations 2025-05-26 02:05:33 +05:30
MochaMind
a9440d5d43 fix: Portuguese translations 2025-05-26 02:05:29 +05:30
MochaMind
27a99d42df fix: Serbian (Latin) translations 2025-05-26 02:05:27 +05:30
MochaMind
4132e9a283 fix: Bosnian translations 2025-05-26 02:05:23 +05:30
MochaMind
d9c038cd43 fix: Croatian translations 2025-05-26 02:05:20 +05:30
MochaMind
4bc29a1c80 fix: Thai translations 2025-05-26 02:05:16 +05:30
MochaMind
8d00c2f6db fix: Persian translations 2025-05-26 02:05:14 +05:30
MochaMind
910e51005a fix: Portuguese, Brazilian translations 2025-05-26 02:05:10 +05:30
MochaMind
96d053edf7 fix: Chinese Simplified translations 2025-05-26 02:05:07 +05:30
MochaMind
5f9d42b7f5 fix: Turkish translations 2025-05-26 02:05:04 +05:30
MochaMind
6d9afe2bdb fix: Swedish translations 2025-05-26 02:05:01 +05:30
MochaMind
72b811bc6f fix: Russian translations 2025-05-26 02:04:58 +05:30
MochaMind
03e366999a fix: Polish translations 2025-05-26 02:04:55 +05:30
MochaMind
ca9cde986f fix: Hungarian translations 2025-05-26 02:04:52 +05:30
MochaMind
984037eea1 fix: German translations 2025-05-26 02:04:49 +05:30
MochaMind
82e41e79cf fix: Arabic translations 2025-05-26 02:04:46 +05:30
MochaMind
92ab31c54c fix: Spanish translations 2025-05-26 02:04:43 +05:30
MochaMind
1be24f948a fix: French translations 2025-05-26 02:04:40 +05:30
MochaMind
7755e77dfc chore: update POT file (#47720) 2025-05-25 12:45:56 +02:00
rohitwaghchaure
67c86ec028 fix: skip drop ship items (#47670) 2025-05-25 11:36:51 +05:30
rohitwaghchaure
874750f9ce fix: filter of item for manufacture type material request (#47712) 2025-05-25 11:36:02 +05:30
Frappe PR Bot
786963f0be fix: Serbian (Latin) translations 2025-05-25 00:57:00 +05:30
Frappe PR Bot
73b377a9b0 fix: Persian translations 2025-05-25 00:56:55 +05:30
Frappe PR Bot
6cf5e76685 fix: Chinese Simplified translations 2025-05-25 00:56:51 +05:30
rohitwaghchaure
1e8ed22421 fix: absence of rounding causing discrepancy in the valuation rate calculation (#47700) 2025-05-24 17:11:12 +05:30
diptanilsaha
48eccb1f73 fix: using python instead of sql query 2025-05-24 14:53:04 +05:30
diptanilsaha
0d19c18c06 fix: patch to rename group_by filter in custom reports 2025-05-24 12:55:05 +05:30
Diptanil Saha
89115688f7 fix: pos screen ui ux (#47680)
* fix: pos addl info dialog submit form on save

* feat: new invoice and recent order button on page action

* fix: item cart highlighted item scrolling

* fix: using icon instead of text in fullscreen button

* fix: search field clear button alignment

* fix: hide item selector on item details display

* fix: using add_action_icon

* fix: action of 'New Invoice' for unsaved changes

* fix: highlight numpad btns on hover

* fix: pos recent orders filter and list items

* chore: added icons for pos icon buttons

* fix: recent order toggle after invoice submission

* fix: capitalized text in select options
2025-05-23 12:36:21 +05:30
rohitwaghchaure
c3b17024bd fix: skip last purchase rate for free item (#47693) 2025-05-23 08:25:35 +05:30
Frappe PR Bot
70110be24b fix: Bosnian translations 2025-05-23 00:38:57 +05:30
Frappe PR Bot
b4aafd317e fix: Swedish translations 2025-05-23 00:38:47 +05:30
ruthra kumar
30e23a8c74 Merge pull request #47692 from ruthra-kumar/test_refactor_1
refactor(test): drop ignore test dependencies on some empty test modules
2025-05-22 20:29:14 +05:30
ruthra kumar
351f02cea0 refactor(test): project update drop ignore test record dependencies 2025-05-22 20:09:55 +05:30
ruthra kumar
9fa5bbae24 refactor(test): remove IGNORE_TEST_RECORD_DEPENDENCIES 2025-05-22 20:09:55 +05:30
ruthra kumar
10a5815805 chore: remove dead code 2025-05-22 20:09:55 +05:30
ruthra kumar
aae63afec9 Merge pull request #47690 from ruthra-kumar/deterministic_leaf_node_doctypes
refactor(test): remove dependency from sales partner and territory
2025-05-22 19:57:31 +05:30
ruthra kumar
b22efc0bb5 refactor(test): remove dependency from sales partner and territory 2025-05-22 16:59:11 +05:30
Khushi Rawat
6ed97b5fda fix: incorrect valuation rate due to positive qty (#47686) 2025-05-22 16:13:24 +05:30
ruthra kumar
6bd6e7d417 Merge pull request #47675 from ljain112/fix-terrirtory
fix: typo in TREE_DOCTYPES list "Terrirtory" should be "Territory"
2025-05-22 15:56:07 +05:30
ruthra kumar
07e11f94b6 Merge pull request #47656 from ruthra-kumar/new_budget_controller_cumulative_breach
fix: handle cumulative breach for monthly and annual
2025-05-22 15:28:01 +05:30
ruthra kumar
5a9b272f84 test: cumulative actions for budget 2025-05-22 15:04:17 +05:30
ruthra kumar
f077f60344 refactor(test): utlity method to set cumulative actions 2025-05-22 14:03:43 +05:30
ruthra kumar
3eb07fba2a refactor: use cumulative control action on new controller 2025-05-22 13:54:04 +05:30
ruthra kumar
45368f983b refactor: control actions for cumulative expense 2025-05-22 13:47:02 +05:30
Mihir Kandoi
483b572db0 Merge pull request #47658 from mihir-kandoi/st39010
fix: exchange rate not being fetched when creating supplier quotation…
2025-05-22 12:55:37 +05:30
Mihir Kandoi
8d9888b1b6 fix: include rejected amount in PI/PR overbilling validation logic (#47572)
* fix: include rejected amount in PI/PR overbilling validation logic

* fix: add check if amount is 0

* fix: unneccessary condition
2025-05-22 12:52:31 +05:30
Khushi Rawat
9d78485af8 chore: removed commented code 2025-05-22 12:42:08 +05:30
Khushi Rawat
92614cb446 fix: test cases 2025-05-22 12:42:08 +05:30
Khushi Rawat
2aecca50b9 refactor: updated related references 2025-05-22 12:42:08 +05:30
Khushi Rawat
17a5d5f561 refactor: removal of composite asset creation from asset capitalization 2025-05-22 12:42:01 +05:30
ljain112
51162cb1a3 fix: typo in TREE_DOCTYPES list "Terrirtory" should be "Territory" 2025-05-22 12:34:55 +05:30
Frappe PR Bot
0f89eb30ac fix: Serbian (Latin) translations 2025-05-22 00:34:38 +05:30
Frappe PR Bot
bf4350064a fix: Persian translations 2025-05-22 00:34:33 +05:30
Frappe PR Bot
26a1bdd0fe fix: Swedish translations 2025-05-22 00:34:29 +05:30
Frappe PR Bot
3f30404417 fix: French translations 2025-05-22 00:34:25 +05:30
Syed Mujeer Hashmi
9eab434ae8 fix: Project argument is passed correctly for MR creation 2025-05-21 18:56:46 +05:30
Diptanil Saha
b2696bf659 fix: pos additional information fields not updating on removal of data (#47663) 2025-05-21 18:36:26 +05:30
RAVIBHARATHI P C
e6f47be4b0 fix(asset): make purchase date mandatory 2025-05-21 17:57:34 +05:30
mahsem
2839fc9460 fix: prettier 2025-05-21 13:21:55 +02:00
mahsem
50a5b51909 fix: space 2025-05-21 13:04:08 +02:00
mahsem
a442ec4e80 fix: space 2025-05-21 13:01:11 +02:00
mahsem
1953c8489c fix: prettier 2025-05-21 12:59:07 +02:00
mahsem
4a6b5b9993 fix: linter 2025-05-21 12:54:25 +02:00
mahsem
ce45d1664d fix: translate_pos_buttons 2025-05-21 12:46:36 +02:00
Mihir Kandoi
9d12ae071a fix: exchange rate not being fetched when creating supplier quotation from MR 2025-05-21 15:42:51 +05:30
ljain112
22a94d6817 chore: update test case because currency is auto set to system currency 2025-05-21 14:37:47 +05:30
Diptanil Saha
8c86def018 fix: pos invoice status not updating on cancel (#47556) 2025-05-21 14:37:22 +05:30
ruthra kumar
4862ae42d5 fix: handle cumulative breach for monthly and annual
- better method names
2025-05-21 14:30:59 +05:30
ljain112
998f6a29a4 fix: show general ledger in doc currency in Process Statement Of Accounts 2025-05-21 13:18:09 +05:30
Frappe PR Bot
4e3652b1c1 fix: Serbian (Latin) translations 2025-05-21 00:28:48 +05:30
Frappe PR Bot
472c84ecdb fix: Bosnian translations 2025-05-21 00:28:45 +05:30
Frappe PR Bot
fe084d1953 fix: Persian translations 2025-05-21 00:28:38 +05:30
Frappe PR Bot
7196a4b603 fix: German translations 2025-05-21 00:28:34 +05:30
rohitwaghchaure
738cb6a0c1 fix: incorrect inventory dimension for material transfer (#47592) 2025-05-20 19:13:08 +05:30
Khushi Rawat
33ab64dec2 fix: asset cancellation issue (#47639) 2025-05-20 17:06:57 +05:30
Khushi Rawat
0f5be4b245 feat: is composite component checkbox (#47602)
* feat: composite component

* chore: update mandatory depends on according to the new checkbox

* chore: validate disposal date for composite component asset

* fix: updated modified time
2025-05-20 16:51:02 +05:30
ruthra kumar
ee27730b72 Merge pull request #47632 from akhilnarang/quotation-use-small-text
fix(quotation): use `Text Editor` field in alternative items dialog
2025-05-20 14:20:57 +05:30
Akhil Narang
c7ea91073e fix(quotation): use Text Editor field in alternative items dialog for item description
`Data` causes text to overflow - the field is originally a `Text Editor` field

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
2025-05-20 14:03:47 +05:30
ruthra kumar
13dd6272d7 Merge pull request #47629 from ljain112/fix-psa-ar
fix: date formatting in process_statement_of_accounts accounts_receivable print format
2025-05-20 13:52:52 +05:30
ljain112
67c32ce3c9 fix: date formatting in process_statement_of_accounts accounts_receivable print format 2025-05-20 13:19:02 +05:30
ruthra kumar
6f85a74f30 Merge pull request #47580 from aerele/calculate-ageing-with
feat: add option to calculate ageing based on report date or today's date
2025-05-20 13:02:26 +05:30
ruthra kumar
9dc27141c7 Merge pull request #47551 from cogk/fix-escape-uom-in-get_pricing_rules
fix: Escape UOM in pricing rule query
2025-05-20 11:26:00 +05:30
ruthra kumar
15b3ce1beb Merge pull request #47559 from ljain112/fix-billed-amt
fix: include only invoices with update_stock = 0  for billed amt in delivery note.
2025-05-20 11:01:04 +05:30
ruthra kumar
83879715e9 Merge pull request #47486 from aerele/sales-analytics-opening-entry
fix(SalesAnalytics): Ignore opening entries
2025-05-20 10:50:19 +05:30
ruthra kumar
0f27e100b2 Merge pull request #47614 from barredterra/make-return-doc
fix: remove hardcoded doctype in `make_return_doc`
2025-05-20 09:59:12 +05:30
Frappe PR Bot
2206f492ac fix: sync translations from crowdin (#47554) 2025-05-20 03:39:18 +02:00
Khushi Rawat
ff2ccf9bce fix: asset image field updation issue (#47615) 2025-05-20 01:07:14 +05:30
rohitwaghchaure
3e098da01f fix: GL entries for rejected returned materials (#47612) 2025-05-19 22:53:03 +05:30
barredterra
45a5c19dd4 fix: remove hardcoded doctype in make_return_doc 2025-05-19 15:40:57 +02:00
Debin Robert
a912e5ddae fix: wrong source fieldname in lead details report 2025-05-19 15:02:00 +05:30
ruthra kumar
2eea8c9e79 Merge pull request #47505 from aerele/fix/address-link
fix: validate inter company transaction address links
2025-05-19 13:08:51 +05:30
rohitwaghchaure
ca0e53dd78 feat: allow to set valuation rate for Rejected Materials (#47582) 2025-05-19 12:51:32 +05:30
rohitwaghchaure
a058fe7319 fix: incorrect qty during reset (#47593) 2025-05-18 22:50:46 +05:30
Frappe PR Bot
0daeb26e96 chore: update POT file (#47594) 2025-05-18 17:51:30 +02:00
l0gesh29
c67ba2d49b feat: add option to calculate ageing based on report date or today date 2025-05-16 15:50:02 +05:30
Khushi Rawat
7bc974b65a Merge pull request #47573 from khushi8112/asset-capitalization-child-table-row-deletion
fix: alias 'name' and 'parent' to prevent child row mapping issues
2025-05-16 15:34:28 +05:30
Khushi Rawat
1ca51e4f14 fix: removed invalid child param to prevent callback failure 2025-05-16 15:08:16 +05:30
Khushi Rawat
a418e377f4 fix: alias name and parent to prevent child row mapping issues 2025-05-16 15:02:26 +05:30
ruthra kumar
7f9f3027cc Merge pull request #47274 from ruthra-kumar/budget_validation_refactor
refactor: Budget validation
2025-05-16 13:20:29 +05:30
ruthra kumar
3a8075198b chore: patch to force default new controller 2025-05-16 13:03:36 +05:30
ruthra kumar
e1f32df5b3 refactor: make use of frappe._dict 2025-05-16 12:45:13 +05:30
ruthra kumar
6fabedd0da refactor: cleaner code with less verbosity 2025-05-16 12:45:13 +05:30
ruthra kumar
ee3d7db29d refactor(test): tests should use new controller 2025-05-16 12:45:13 +05:30
ruthra kumar
d4ac042d85 chore: make new budget controller configurable 2025-05-16 12:45:13 +05:30
ruthra kumar
58556c82bb refactor: handle exception approver role for budget 2025-05-16 12:45:13 +05:30
ruthra kumar
a7202201f7 refactor: fetch monthly distribution as well 2025-05-16 12:45:13 +05:30
ruthra kumar
3fb5d835f2 refactor: validate budget on cancel as well 2025-05-16 12:45:13 +05:30
ruthra kumar
55cb91ce20 refactor: use meta to identify tree 2025-05-16 12:45:13 +05:30
ruthra kumar
f886b50e7a refactor: handle group nodes 2025-05-16 12:45:13 +05:30
ruthra kumar
11f7c1e49a refactor: validate on GL creation 2025-05-16 12:45:13 +05:30
ruthra kumar
d9d2020b46 refactor: allow for better translation 2025-05-16 12:45:13 +05:30
ruthra kumar
b7e70bb746 refactor: better error message 2025-05-16 12:45:13 +05:30
ruthra kumar
2ecb2fa4af refactor: stateful variables 2025-05-16 12:45:13 +05:30
ruthra kumar
49bb72bcd2 refactor: better query parameters for PO and MR 2025-05-16 12:45:13 +05:30
ruthra kumar
3064646a8f refactor: better error message 2025-05-16 12:45:13 +05:30
ruthra kumar
fcf572e641 refactor: always query booked expenses 2025-05-16 12:45:13 +05:30
ruthra kumar
fc24bbf5ad refactor: handle breach on total expense 2025-05-16 12:45:13 +05:30
ruthra kumar
3e80248cde refactor: PO validation happens after submission 2025-05-16 12:45:13 +05:30
ruthra kumar
0e016a9c47 refactor: replace duplicate validation with single method 2025-05-16 12:45:13 +05:30
ruthra kumar
593729ac2b refactor: code refactor 2025-05-16 12:45:13 +05:30
ruthra kumar
388d901668 refactor: handle monthly distribution limit 2025-05-16 12:45:13 +05:30
ruthra kumar
d52469c51e refactor: handle actual expense 2025-05-16 12:45:13 +05:30
ruthra kumar
791ad16883 refactor: cleaner initialization 2025-05-16 12:45:13 +05:30
ruthra kumar
ec466d024a refactor: minor readbility changes 2025-05-16 12:45:13 +05:30
ruthra kumar
d933d0b478 refactor: handle budget for material request 2025-05-16 12:45:13 +05:30
ruthra kumar
626b345caf refactor: better local variables and contextual error messages 2025-05-16 12:45:13 +05:30
ruthra kumar
7791777d1a refactor: barebones validation 2025-05-16 12:45:13 +05:30
ruthra kumar
1c574561eb refactor: fetch amount booked in material request 2025-05-16 12:45:12 +05:30
ruthra kumar
10c3bb4971 refactor: move validate trigger to controller 2025-05-16 12:45:12 +05:30
ruthra kumar
fb667f5e09 refactor: fetch billed PO amount 2025-05-16 12:45:12 +05:30
ruthra kumar
31ac9a5ea0 refactor: make code more pythonic 2025-05-16 12:45:12 +05:30
ruthra kumar
bd42d09592 refactor: replace get_doc with sql 2025-05-16 12:45:12 +05:30
ruthra kumar
63dae6bd42 refactor: validate only for overlapping keys 2025-05-16 12:45:12 +05:30
ruthra kumar
22150d8175 refactor: budgetvaldiation class 2025-05-16 12:45:12 +05:30
Mihir Kandoi
9fb7490c40 Merge pull request #47570 from mihir-kandoi/enforce_time_logs
feat: add checkbox for validating time logs in job card
2025-05-16 12:06:59 +05:30
Mihir Kandoi
2d9a6a4de8 feat: add checbox for validating time logs in job card 2025-05-16 11:32:22 +05:30
ruthra kumar
b846686971 Merge pull request #47569 from ruthra-kumar/budget_cleanup_test_records
fix(test): clean up data so subsequent test cases don't flake
2025-05-16 10:15:05 +05:30
ruthra kumar
5c15b96d7d fix(test): clean up data so subsequent test cases don't flake 2025-05-16 09:55:56 +05:30
ruthra kumar
9175d0dbbf Merge pull request #47562 from ruthra-kumar/fix_dormant_broken_budget_test_case
fix(test): dormant broken test in Budget
2025-05-15 20:05:28 +05:30
ruthra kumar
9ed69f96e8 fix(test): pass sufficient amount to breach accumulated limit 2025-05-15 16:47:30 +05:30
ruthra kumar
ca07ec79ee fix(test): dormant broken test in Budget 2025-05-15 16:12:55 +05:30
rohitwaghchaure
31c4c1ccf3 fix: sales order qty issue (#47560) 2025-05-15 14:53:32 +05:30
ljain112
6dc459db58 fix: include only invoices with update_stock = 0 for billed amt in delivery note. 2025-05-15 14:06:04 +05:30
rohitwaghchaure
fc554ba599 fix: stop additional item (#47548) 2025-05-15 10:30:46 +05:30
Mihir Kandoi
82161e9cb5 fix: mapping of dispatch address when creating PO from SO (#47552)
* fix: mapping of dispatch address when creating PO from SO

* fix: add to default supplier function as well
2025-05-14 20:35:45 +05:30
Corentin Forler
89f98b835c fix: Escape UOM in pricing rule query 2025-05-14 14:59:09 +02:00
rohitwaghchaure
4241bfd4bc fix: allow FG as RM by default (#47543) 2025-05-14 16:20:28 +05:30
rohitwaghchaure
a18e1cffa7 fix: validation message format (#47542) 2025-05-14 16:20:02 +05:30
Diptanil Saha
5c28e01590 fix: pos item group filter fetching wrong items (#47545) 2025-05-14 15:51:02 +05:30
Kitti U. @ Ecosoft
b541b536c3 fix: POS Invoice can't use Loyalty Points when Global Rounded Total is Disabled (#47491) 2025-05-14 10:54:59 +05:30
barredterra
61e96f3fb5 fix: find table row 2025-05-13 18:13:26 +02:00
rohitwaghchaure
dfc4aa9a57 fix: stock reservation validation in the stock entry (#47524) 2025-05-13 21:13:42 +05:30
Mihir Kandoi
f1159b6ea6 feat: add routing/sequencing to work order operations (#46975)
* feat: add routing/sequencing to work order operations

* fix: add validation and remove reorderin for non sequence id operations

* chore: readability

* fix: logical error

* fix: logical error

* chore: added row number in error message
2025-05-13 17:14:57 +05:30
Khushi Rawat
0b1a316ad9 feat: non depreciable asset category
feat: non depreciable asset category
2025-05-13 17:03:13 +05:30
Khushi Rawat
d715db1226 fix: only depreciable category assets are allowed for depreciation 2025-05-13 16:44:13 +05:30
Abdeali Chharchhoda
80320ffa25 refactor: simplify source_name assignment in map_current_doc function 2025-05-13 16:43:13 +05:30
Khushi Rawat
32cb7d6388 fix: do not mandate depreciation accounts for non depreciable asset category 2025-05-13 16:43:03 +05:30
Khushi Rawat
fbbfd6531b feat: add non depreciable category checkbox in asset category 2025-05-13 16:40:59 +05:30
ruthra kumar
f67559bb1e Merge pull request #47525 from ruthra-kumar/drop_patch_for_advance_reconciliation
refactor: remove redundant patch
2025-05-13 15:08:23 +05:30
Khushi Rawat
2e992f937a refactor: Asset module code for better readability
refactor: Asset module code for better readability
2025-05-13 14:55:54 +05:30
ruthra kumar
c1bfa9f056 Merge pull request #47520 from ljain112/fic-pcv-acb
fix: ignore "Account Closing Balance" doctype on Period Closing Voucher cancellation
2025-05-13 14:50:22 +05:30
ruthra kumar
6c65a15758 refactor: remove redundant patch 2025-05-13 14:46:35 +05:30
Khushi Rawat
5e5795cba2 fix: patch conflict 2025-05-13 14:34:26 +05:30
ruthra kumar
c924f93614 Merge pull request #47521 from ljain112/fix-pe-cond
fix: condition for advance_account assignment
2025-05-13 14:12:27 +05:30
ruthra kumar
1139eaf751 Merge pull request #47468 from aerele/fix/reconciliation-takes-effect-on
fix(payment-reconciliation): use reconciliation_takes_effect_on from company
2025-05-13 14:10:00 +05:30
ljain112
ded46ce3d8 fix: condition for advance_account assignment 2025-05-13 13:39:01 +05:30
ljain112
d6602d63fc fix: ignore "Account Closing Balance" doctype on Period Closing Voucher cancellation 2025-05-13 13:12:39 +05:30
ruthra kumar
e7e3244e72 Merge pull request #47513 from frappe/l10n_develop
fix: sync translations from crowdin
2025-05-13 11:26:52 +05:30
Abdeali Chharchhodawala
e4e0bb68ec Merge pull request #47367 from Abdeali099/gl-report-field-float-to-currency
fix: Use `Currency` instead of `Float` in GL report to show details
2025-05-13 11:26:21 +05:30
Frappe PR Bot
898b5595a1 fix: Persian translations 2025-05-12 23:29:19 +05:30
rohitwaghchaure
963d1e502e fix: not able to reserve extra items against the work order (#47511) 2025-05-12 23:21:57 +05:30
Ankush Menat
a50251401f perf: move all hourly/daily jobs to maintenance queue (#47504)
None of them need to strictly happen at 00:00 or *:00, so moving them all to maintenance queue which executes with same frequency but spaced out.
2025-05-12 17:58:56 +05:30
ruthra kumar
7269dbc754 Merge pull request #47243 from ljain112/fix-p&l
fix: accumulate values for all the fiscal years in Profit And Loss Statement
2025-05-12 16:46:30 +05:30
ruthra kumar
54e4e7918e refactor(test): don't default to accumulate 2025-05-12 16:30:24 +05:30
Diptanil Saha
62cce38a06 fix: pos for small screen and checkout page (#47092)
* feat: Prevent need for scrolling in lower screens (Point of Sale)

* fix: pos checkout page

* refactor: renaming variable in pos profile conf

* fix: change variable name according to pos conf

* fix: removing redundant api call

* refactor: adding function

* refactor: moving pos settings invoice fields to modal

* fix: label for change amount and remaining amount

* fix: always display numpad

* refactor: function rename

* fix: better information

* fix: auto scroll to highlighted cart item

* chore: added patch

---------

Co-authored-by: devdiogenes <diogenes.cruz2001@gmail.com>
2025-05-12 16:07:22 +05:30
ruthra kumar
afff6b84ce test: accumulate filter on P&L report 2025-05-12 15:48:39 +05:30
ruthra kumar
61d13ce232 fix: typo 2025-05-12 15:07:02 +05:30
ljain112
6851322361 fix: accumulate values for all the fiscal years in Profit And Loss Statement 2025-05-12 14:54:39 +05:30
ruthra kumar
5c9e591297 Merge pull request #47224 from sagarvora/perf-gl
perf: improve general ledger report for larger data
2025-05-12 14:49:04 +05:30
Sagar Vora
07c7ce2d6a Merge branch 'develop' into perf-gl 2025-05-12 14:26:43 +05:30
ruthra kumar
4db3c7fc81 Merge pull request #47041 from Sanket322/pos_payment
fix: Check `return_against` and Await API Call
2025-05-12 14:10:04 +05:30
Diptanil Saha
57f3489dfa fix: POS non-stock item mistakenly hidden as unavailable (#47493) 2025-05-12 14:08:24 +05:30
Diptanil Saha
3965e2f3de fix: fiscal year error on new setup and continuous request (#47431)
fix: fiscal year error on new setup
2025-05-12 14:06:03 +05:30
ruthra kumar
04ef4c2b16 Merge pull request #47463 from ruthra-kumar/deterministic_sales_invoice_test_suite
refactor(test): flaky test case in sales invoice
2025-05-12 14:03:04 +05:30
Bhavan23
0caa757dd6 test: add test case to validate inter-company transaction address links 2025-05-12 12:48:27 +05:30
Bhavan23
aed46ad5b9 fix: validate inter-company transaction address links 2025-05-12 12:44:18 +05:30
rohitwaghchaure
0bc3cfe29d feat: stock reservation for production plan (#47373)
* feat: reservation for production plan

* test: test case for serial/batch

* feat: reserve & un-reserve options in the production plan
2025-05-12 12:19:23 +05:30
rohitwaghchaure
2ad16673f0 Merge pull request #47333 from mihir-kandoi/refactor_available_serial_no_report
refactor: available serial no report
2025-05-11 14:31:23 +05:30
Mihir Kandoi
c5686af7e2 Merge pull request #47481 from mihir-kandoi/st38118
fix: timesheet portal showing total billing hours
2025-05-10 11:37:24 +05:30
rohitwaghchaure
49df9ed32d Merge pull request #47385 from mihir-kandoi/st37286-3
fix: added PR/PI overbilling validation
2025-05-09 23:43:18 +05:30
l0gesh29
6d269b4409 fix(SalesAnalytics): Ignore opening entries 2025-05-09 17:27:48 +05:30
Patrick Eißler
b6b4ac5b4a feat: add column "Item Name" to "BOM Stock Report" (#47116) 2025-05-09 11:46:05 +00:00
Mihir Kandoi
b04a07fda0 fix: timesheet portal showing total billing hours 2025-05-09 13:38:42 +05:30
rohitwaghchaure
c770113f7c Merge pull request #47472 from rohitwaghchaure/fixed-validation-msg-bom-recursion
fix: better validation message with solution for BOM recursion
2025-05-08 20:39:29 +05:30
Rohit Waghchaure
7103cdd84a fix: better validation message with solution for BOM recursion 2025-05-08 17:45:21 +05:30
Bhavan23
7bc62cedc6 chore: simplify repeated condition checks 2025-05-08 16:32:30 +05:30
Soham Kulkarni
462ad4b6b3 Merge pull request #47464 from sokumon/collapsible-filters
fix: add options in report settings to become collapsible
2025-05-08 15:40:02 +05:30
Mihir Kandoi
653e0a2e3a chore: further optimizations 2025-05-08 15:24:38 +05:30
Mihir Kandoi
74eb611563 refactor: available serial no report 2025-05-08 15:18:31 +05:30
Khushi Rawat
04e46ea787 fix: more changes in the test 2025-05-08 15:13:13 +05:30
Mihir Kandoi
27e842ba02 fix: linter error 2025-05-08 14:47:19 +05:30
Mihir Kandoi
b406ec724b test: added test 2025-05-08 14:44:01 +05:30
Yaiphalemba Mangshatabam
edee75c757 fix: typo in event.js
"Sales Partners" -> "Sales Partner"
2025-05-08 14:09:06 +05:30
ruthra kumar
a9041e0c9b Merge pull request #47443 from frappe/l10n_develop
fix: sync translations from crowdin
2025-05-08 14:00:54 +05:30
Bhavan23
19f1ffbdc2 fix(payment-reconciliation): use reconciliation_takes_effect_on from company 2025-05-08 13:59:25 +05:30
ruthra kumar
fb92183679 refactor(test): set mandatory dimension at invidual test cases 2025-05-08 13:17:21 +05:30
sokumon
24184c21f0 fix: add options in report settings to become collapsible 2025-05-08 12:27:05 +05:30
ruthra kumar
74f8d65021 refactor(test): deterministic test suite for sales invoice 2025-05-08 12:07:45 +05:30
Khushi Rawat
3465c21090 fix: failing test 2025-05-08 11:57:02 +05:30
Khushi Rawat
dc06116425 fix: pass instance explicitly in static method 2025-05-08 11:57:02 +05:30
Khushi Rawat
c9980c59e7 chore: adjust regional depreciation logic after refactor 2025-05-08 11:57:02 +05:30
Khushi Rawat
0e93c573a6 chore: uncomment previously disabled code 2025-05-08 11:57:02 +05:30
Khushi Rawat
89d10ad4e6 fix: fiscal year check in depreciation logic 2025-05-08 11:57:02 +05:30
Khushi Rawat
782d16c1a3 fix: linters related fix 2025-05-08 11:57:02 +05:30
Khushi Rawat
e2cfd01bb2 test: asset splitting test 2025-05-08 11:57:02 +05:30
Khushi Rawat
6fa316177b fix(test): updated test for journal entry 2025-05-08 11:57:01 +05:30
Khushi Rawat
99e8c984ad fix(test): sales invoice test cases fixes 2025-05-08 11:57:01 +05:30
Khushi Rawat
3e32c30298 test: added tests on sale of an asset 2025-05-08 11:57:01 +05:30
Khushi Rawat
5d16936b9e fix(test): sales invoice test cases 2025-05-08 11:57:01 +05:30
Khushi Rawat
42ccce1687 test: added tests for reschedule depreciation after asset revaluation cancellation 2025-05-08 11:57:01 +05:30
Khushi Rawat
f5fa757bc6 fix(test): failing test cases 2025-05-08 11:57:01 +05:30
Khushi Rawat
cf1af451b8 fix(test): more fixes for failig test cases 2025-05-08 11:57:01 +05:30
Khushi Rawat
881e5e3417 fix(test): asset value adjustment test cases 2025-05-08 11:57:01 +05:30
Khushi Rawat
4b0279329f test: added tests for rescheduled depreciation after asset repair cancellation 2025-05-08 11:57:01 +05:30
Khushi Rawat
0e7ae25f65 fix(test): difference amount after asset revaluation 2025-05-08 11:57:01 +05:30
Khushi Rawat
b3ffdb6517 fix(test): increase in asset life after asset repair 2025-05-08 11:57:01 +05:30
Khushi Rawat
6ac68ed1e7 fix(test): failing test and bug fixes for basic depreciation process 2025-05-08 11:57:01 +05:30
Khushi Rawat
229d3634b1 fix(test): calculate total pending days of depreciation correctly 2025-05-08 11:57:01 +05:30
Khushi Rawat
2391c859b2 fix: reset consumed asset's depreciation on capitalization cancel 2025-05-08 11:57:01 +05:30
Khushi Rawat
a121c30b56 fix: update values of target asset on cancel of capitalization 2025-05-08 11:57:01 +05:30
Khushi Rawat
3855536ef1 fix: update status for composite asset 2025-05-08 11:57:01 +05:30
Khushi Rawat
8f1044a065 refactor: cleanup Assset Splitting code 2025-05-08 11:57:01 +05:30
Khushi Rawat
c7cc7d61d1 fix(test): value after depreciation for asset doc 2025-05-08 11:57:01 +05:30
Khushi Rawat
223e8e1bdb fix(test): set root type to Expense 2025-05-08 11:57:01 +05:30
Khushi Rawat
48311ee5c5 fix: set depreciation rate before return 2025-05-08 11:57:01 +05:30
Khushi Rawat
fe52e802ce refactor: depreciation booking code 2025-05-08 11:57:01 +05:30
Khushi Rawat
813164c25b fix: remove duplicate patch 2025-05-08 11:57:01 +05:30
Khushi Rawat
5f21d7ea1d chore: rebase from develop 2025-05-08 11:56:57 +05:30
Nabin Hait
44e45b55d4 refactor: asset value adjustment 2025-05-08 11:56:31 +05:30
Nabin Hait
c567a08470 refactor: Straight line depreciation after asset repair 2025-05-08 11:56:31 +05:30
Khushi Rawat
0e4706b074 fix: conflict in asset repair 2025-05-08 11:56:31 +05:30
Nabin Hait
0eb83a4474 chore: reorganised asset repair fields 2025-05-08 11:56:31 +05:30
Nabin Hait
f99d02b71e fix: remaining days for last row 2025-05-08 11:56:31 +05:30
Nabin Hait
2a89bac11d fix: missing args 2025-05-08 11:56:31 +05:30
Nabin Hait
9f3a1faa5e fix: add asset activity after insert 2025-05-08 11:56:31 +05:30
Nabin Hait
b433b125ff fix: removed commented code 2025-05-08 11:56:31 +05:30
Nabin Hait
c9487e0427 fix: Removed conflict 2025-05-08 11:56:31 +05:30
Frappe PR Bot
96071ae891 fix: Persian translations 2025-05-07 22:59:04 +05:30
rohitwaghchaure
c1edbc7e4b Merge pull request #47457 from rohitwaghchaure/fixed-stock-reco
fix: error while making SABB for backdated stock reco
2025-05-07 21:18:15 +05:30
Rohit Waghchaure
ad25636afb fix: error while making SABB for backdated stock reco 2025-05-07 20:56:05 +05:30
ruthra kumar
82ccdcfddd Merge pull request #47309 from ruthra-kumar/fix_broken_local_test_suite
chore: first step in the journey to reliable test suite
2025-05-07 18:45:43 +05:30
ruthra kumar
afc46a77f6 refactor(test): Timesheet will use ERPNextTestSuite 2025-05-07 18:31:39 +05:30
ruthra kumar
bc7cc6eac0 refactor(test): Project will use ERPNextTestSuite 2025-05-07 18:31:39 +05:30
ruthra kumar
835d08ab00 refactor(test): Project will use ERPNextTestSuite 2025-05-07 18:31:39 +05:30
ruthra kumar
fbdbcdd8c0 refactor(test): Activity Cost to use ERPNextTestSuite 2025-05-07 18:31:39 +05:30
ruthra kumar
1271ba3672 refactor(test): Opportunity will use ERPNextTestSuite 2025-05-07 18:31:39 +05:30
ruthra kumar
b2fd354d41 refactor(test): Lead with use ERPNextTestSuite 2025-05-07 18:31:39 +05:30
ruthra kumar
a55a86f300 refactor(test): Queries test suite to use ERPNextTestSuite 2025-05-07 18:31:39 +05:30
ruthra kumar
26915c622f refactor(test): move SI test data creation to erpnext test suite 2025-05-07 18:31:39 +05:30
ruthra kumar
543ba51009 refactor(test): create ERPNext specific test suite
and move data initialization there
2025-05-07 18:31:39 +05:30
ruthra kumar
4a4e314899 chore: handle duplicate data on sales invoice setup 2025-05-07 18:31:39 +05:30
ruthra kumar
8a3a9b985b refactor(test): deterministic test suite for 'Maintenance Schedule' 2025-05-07 18:31:39 +05:30
ruthra kumar
50551c1069 refactor(test): deterministic test suite for Task 2025-05-07 18:31:39 +05:30
ruthra kumar
80f7c507ba refactor(test): make 'Timesheet' test suite deterministic 2025-05-07 18:31:39 +05:30
ruthra kumar
66381f52ed chore: drop empty test suite for 'Monthly Distribution'
data from test records are moved to 'Budget' test suite
2025-05-07 18:31:39 +05:30
ruthra kumar
78b026a4ca refactor(test): deterministic 'Budget' test suite 2025-05-07 18:31:39 +05:30
ruthra kumar
9526f9d835 refactor(test): deterministic 'Queries' test suite 2025-05-07 18:31:39 +05:30
ruthra kumar
eda7595179 refactor(test): make tests for queries and Project deterministic 2025-05-07 18:31:39 +05:30
ruthra kumar
3ecc39a51f refactor(test): make 'Activity Cost' idempotent 2025-05-07 18:31:39 +05:30
ruthra kumar
b77e608264 refactor(test): idempotent Opportunity test suite 2025-05-07 18:31:39 +05:30
ruthra kumar
f7f3269c68 refactor(test): "Lead" test suite working locally 2025-05-07 18:31:39 +05:30
ruthra kumar
8d089218b5 chore: drop test suite for 'Sales Person' - there are no tests
it is only used to trigger dependent data creation
2025-05-07 18:31:39 +05:30
ruthra kumar
fb4ca8c386 chore: remove sales team from SI test records 2025-05-07 18:31:39 +05:30
ruthra kumar
c585bdb316 chore: setup test data in class initialization 2025-05-07 18:31:39 +05:30
ruthra kumar
520a54db0c chore: drop test records for sales person 2025-05-07 18:31:39 +05:30
ruthra kumar
9b2c89f704 chore: drop redundant test_records.json 2025-05-07 18:31:39 +05:30
Mihir Kandoi
f4ffc57b51 fix: added PR/PI overbilling validation 2025-05-07 17:51:36 +05:30
rohitwaghchaure
46eb7a7aa1 Merge pull request #47452 from rohitwaghchaure/fixed-support-37892
fix: warning message for COGS account in the stock entry
2025-05-07 16:18:50 +05:30
Rohit Waghchaure
bba6b0ff45 fix: warning message for COGS account in the stock entry 2025-05-07 16:03:59 +05:30
ruthra kumar
786f28e642 Merge pull request #47447 from ruthra-kumar/dont_update_opportunity_onload
fix: dont auto-fetch latest exchange rate
2025-05-07 11:16:43 +05:30
ruthra kumar
4ccd0a7407 fix: dont auto-fetch latest exchange rate
- also use correct currency field for comparison
2025-05-07 11:10:23 +05:30
Frappe PR Bot
208ac19650 fix: Persian translations 2025-05-06 22:36:31 +05:30
Frappe PR Bot
0bd6ffaee6 fix: Turkish translations 2025-05-06 22:36:20 +05:30
Frappe PR Bot
68e4be2887 fix: Swedish translations 2025-05-06 22:36:16 +05:30
Marica
e17f54ade0 Merge pull request #47432 from marination/iss-47424
fix: Relabel unit price settings for more clarity
2025-05-06 20:03:49 +05:30
marination
fbef81bcf6 chore: Relabel according to review changes 2025-05-06 15:28:56 +02:00
Marica
fcf874906f Merge pull request #47438 from marination/iss-47422
fix(portal): User cannot create 0 qty SQ from RFQ
2025-05-06 18:47:03 +05:30
rohitwaghchaure
bd1fb7357c Merge pull request #47435 from rohitwaghchaure/fixed-support-37539
fix: stock reco recalculate qty not works for opening stock reco
2025-05-06 18:26:53 +05:30
marination
879b966bd4 fix(portal): User cannot create 0 qty SQ from RFQ
- The portal uses `create_supplier_quotation` for SQ creation which excludes 0 qty items
2025-05-06 14:55:03 +02:00
Rohit Waghchaure
97095c7d24 fix: stock reco recalculate qty not works for opening stock reco 2025-05-06 17:58:06 +05:30
rohitwaghchaure
25264df18f Merge pull request #47397 from rohitwaghchaure/fixed-support-37756
fix: precision issue
2025-05-06 17:28:32 +05:30
Sagar Vora
7616b2b8e4 Merge pull request #47417 from sagarvora/update-pl-based-on 2025-05-06 16:45:26 +05:30
marination
e2fc10d558 fix: Relabel unit price settings for more clarity 2025-05-06 12:33:03 +02:00
Khushi Rawat
51ea33e743 fix: do not mandate depreciation account for assets without depreciation (#47427) 2025-05-06 14:53:13 +05:30
ruthra kumar
dc9dc2ca42 Merge pull request #47337 from Abdeali099/fix-error-on-paid-amount-change
fix: do not allocate amount when ref's doctype or name are not set
2025-05-06 14:32:27 +05:30
Sagar Vora
3ebde4526a feat!: configure which rate is used to auto-update price list 2025-05-06 13:01:13 +05:30
ruthra kumar
d065904431 Merge pull request #47408 from Abdeali099/proper-due-date-exceeds-msg
fix: show party type in due date exceeding message
2025-05-06 11:57:46 +05:30
ruthra kumar
682e6ceb9d Merge pull request #47411 from frappe/l10n_develop
fix: sync translations from crowdin
2025-05-06 11:29:52 +05:30
Vimal
0b4add2f2b fix: change shipping address fetching condition 2025-05-06 10:57:49 +05:30
Frappe PR Bot
9e07a48201 fix: Turkish translations 2025-05-05 22:32:40 +05:30
Marica
80bd5ced46 Merge pull request #46214 from marination/unit-price-contract-2
feat: Unit Price Items
2025-05-05 22:26:39 +05:30
Frappe PR Bot
0bbd94d549 fix: sync translations from crowdin (#47398) 2025-05-05 15:59:40 +02:00
Rohit Waghchaure
69bee93bfd fix: precision issue 2025-05-05 18:42:25 +05:30
Abdeali Chharchhoda
b6d9134014 fix: show party type in due date exceeding message 2025-05-05 18:25:56 +05:30
Diptanil Saha
45393d51a2 fix: 'time to resolve: failed' on issue (#47406)
* fix: 'time to resolve: failed' on issue

* fix: sla_resolution_date
2025-05-05 17:43:29 +05:30
Diptanil Saha
d4ffa54136 fix: backward compatibility for renamed group_by filter on reports (#47362)
* fix: backward compatibility for renamed group_by filter in general ledger report

* fix: backward compatibility for renamed group_by filter in supplier quotation comparison report
2025-05-05 17:21:41 +05:30
Diptanil Saha
3de249dcba fix: rename unchanged group_by filter related to general ledger report (#47366) 2025-05-05 17:20:23 +05:30
ruthra kumar
c31845c55a Merge pull request #47278 from barredterra/customer_supplier_ids
feat: store Customer Number at Supplier / Supplier Number at Customer
2025-05-05 16:22:54 +05:30
half-ware
e68883f0f9 feat: Algeria chart of accounts (#47038)
* Algeria chart of accounts

Algeria chart of accounts

* Update Algeria Chart Of Account

* Algeria chart of account

* Algeria Chart of Account

Algeria Chart of Account
2025-05-05 16:18:18 +05:30
Diptanil Saha
8067799692 fix: update accounts on change of mode of payment in sales invoice payment (#47381)
* fix: update accounts on change of mode of payment in sales invoice payment

* test: fixed tests
2025-05-05 15:58:53 +05:30
Marica
60201a9683 Merge branch 'develop' into unit-price-contract-2 2025-05-05 15:52:39 +05:30
ruthra kumar
5990752416 Merge pull request #47145 from ruthra-kumar/refactor_ar_ap_for_memory_usage
refactor: make AR / AP report more memory efficient
2025-05-05 15:43:09 +05:30
ruthra kumar
ca1e81e1b5 refactor: set default for fetch methods 2025-05-05 14:19:45 +05:30
ruthra kumar
b5bb6f3508 refactor: use fetch method based on configuration 2025-05-05 14:19:41 +05:30
rohitwaghchaure
f370b36b62 Merge pull request #47395 from rohitwaghchaure/fixed-serial-no-reservation-validation
fix: reserved serial nos validation
2025-05-05 14:10:13 +05:30
Rohit Waghchaure
a20951e1cd fix: reserved serial nos validation 2025-05-05 13:53:06 +05:30
ruthra kumar
66fd639b52 refactor: configurable fetch method for AR / AP report 2025-05-05 12:29:58 +05:30
ruthra kumar
08903459c2 refactor: use unbuffered cursor for fetching 2025-05-05 12:20:05 +05:30
ruthra kumar
bd4d1cd0d3 Merge pull request #47349 from frappe/l10n_develop
fix: sync translations from crowdin
2025-05-05 11:36:56 +05:30
Frappe PR Bot
1c322965b4 chore: update POT file (#47393) 2025-05-04 12:30:29 +02:00
rohitwaghchaure
fa1b706147 Merge pull request #47382 from rohitwaghchaure/fixed-serial-batch-reservation-wo
fix: serial batch from work order for fg
2025-05-03 13:21:42 +05:30
rohitwaghchaure
16306d1352 Merge pull request #47377 from rohitwaghchaure/fixed-support-37608
fix: not able to submit the stock entry
2025-05-03 13:21:30 +05:30
rohitwaghchaure
8c3af7738c Merge pull request #47376 from rohitwaghchaure/fixed-support-37187
fix: validation for difference account
2025-05-03 13:21:16 +05:30
Rohit Waghchaure
fb819c558e fix: validation for difference account 2025-05-03 11:36:42 +05:30
Rohit Waghchaure
5225d4c318 fix: serial batch from work order for fg 2025-05-03 11:35:28 +05:30
Rohit Waghchaure
1d862c111f fix: not able to submit the stock entry 2025-05-03 11:34:48 +05:30
ruthra kumar
e9663a55a3 Merge pull request #47380 from ruthra-kumar/broken_uae_vat_test_case
fix: broken CI - uae vat 201 tests failing
2025-05-03 11:26:25 +05:30
ruthra kumar
37d74e387d fix: broken test suite due to incorrect OR filter 2025-05-03 11:13:32 +05:30
rohitwaghchaure
97db9da10e fix: completed transactions showing in the list (#47374) 2025-05-02 15:23:15 +05:30
Diptanil Saha
13a84e7f82 fix: renaming group by fieldname and value in reports (#47352)
* fix: renaming in general ledger report

* fix: renaming in supplier quotation comparison report

* fix: renaming group by to categorize by in process statement of accounts

* fix: added patch

* fix: patch update to all documents

* chore: added patches to patch.txt

* chore: removing patch from v14
2025-04-30 11:15:53 +00:00
Mihir Kandoi
4fc7a8b71d refactor: portal query in timesheet.py (#47336)
* refactor: portal query in timesheet.py

* fix: use criterion.any to fix query
2025-04-30 16:13:55 +05:30
Nihantra C. Patel
e02de12ecc Merge pull request #47351 from Nihantra-Patel/fix_ledger_summary
fix: party name in Ledger Summary
2025-04-30 13:42:05 +05:30
Nihantra Patel
70bc86a4c6 fix: party name in Ledger Summary 2025-04-30 13:12:02 +05:30
Frappe PR Bot
553dd38c8d fix: Persian translations 2025-04-30 12:42:34 +05:30
Frappe PR Bot
88ebdffc9a fix: Swedish translations 2025-04-30 12:42:30 +05:30
rohitwaghchaure
ffdc4347e8 fix: warning message before changing the valuation method (#47340) 2025-04-29 22:59:22 +05:30
Abdeali Chharchhoda
b9a02b466b fix: do not allocate amount when ref's doctype or name are not set 2025-04-29 18:44:39 +05:30
Mihir Kandoi
795c2d104d Merge pull request #47334 from mihir-kandoi/fix-rfq-v16-error-2
fix: rfq error on item_code
2025-04-29 18:36:26 +05:30
Mihir Kandoi
48e6fee6a1 fix: rfq error on item_code 2025-04-29 18:19:45 +05:30
Khushi Rawat
05afad78fc fix: allow selling asset at zero rate (#47326) 2025-04-29 16:53:57 +05:30
Mihir Kandoi
b89bbe36d7 feat: add stock uom read only field to stock reconciliation item doctype (#47299) 2025-04-29 16:25:45 +05:30
Mihir Kandoi
fc02a6510e fix: require email OR phone in shipment doctype not both (#47300) 2025-04-29 16:24:51 +05:30
Mihir Kandoi
7499c25a3c fix: validate if from and to time are present on submission of job card (#47325) 2025-04-29 16:21:41 +05:30
ruthra kumar
14ac65b64d Merge pull request #47320 from frappe/l10n_develop
fix: sync translations from crowdin
2025-04-29 12:17:54 +05:30
ruthra kumar
cf29c3758a Merge pull request #47241 from ljain112/fix-ic-jv
fix: compare total debit/credit with precision for Inter Company Journal Entry
2025-04-29 12:16:57 +05:30
Diptanil Saha
7423e4187f fix: remove invalid email account creation (#47318) 2025-04-29 12:13:12 +05:30
ruthra kumar
02a25bcfcd Merge pull request #47231 from aerele/multi-currency-advance
fix(payment request): get advance amount based on transaction currency
2025-04-29 12:06:41 +05:30
Frappe PR Bot
d93b0af07c fix: Persian translations 2025-04-29 12:01:05 +05:30
Frappe PR Bot
3bd149ec3a fix: Portuguese, Brazilian translations 2025-04-29 12:01:01 +05:30
Mihir Kandoi
47927b38a9 feat: change sabb qty automatically incase of internal transfer PR if sabb only has 1 batch (#47256)
* feat: change sabb qty automatically incase of internal transfer PR if sabb only has 1 batch

* fix: prevent creation of SABB on every save

* perf: optimize code

* fix: remove unnecessary conditon

* refactor: change if to elif

* fix: remove dn_item_qty and set to item.qty

* test: added test
2025-04-29 11:45:46 +05:30
Mihir Kandoi
26564819fe Merge pull request #47302 from mihir-kandoi/46928
fix: commas in rfq portal js
2025-04-29 11:37:02 +05:30
Mihir Kandoi
ce0693be95 Merge pull request #47301 from mihir-kandoi/fix-rfq-item_name-fetch-from
fix: add fetch from to item name in rfq item doctype
2025-04-29 11:36:33 +05:30
Mihir Kandoi
710a77a327 Merge pull request #47296 from mihir-kandoi/st35392-2
fix: fix sub assembly qty calculation in production plan when bom level >= 1
2025-04-29 11:36:10 +05:30
Mihir Kandoi
e98dcfc668 Merge pull request #47257 from mihir-kandoi/st37118
fix: add transaction_date in field_no_map when creating PO from SQ
2025-04-29 11:35:39 +05:30
Mihir Kandoi
583f251edf Merge pull request #47234 from mihir-kandoi/st37040
fix: price currency in supplier quotation comparison
2025-04-29 11:35:07 +05:30
Khushi Rawat
9dee4ac891 fix: prevent cancellation of last asset movement (#47291)
* fix: prevent cancellation of last asset movement

* test: movement cancellation

* fix: allow cancellation of asset movement when cancelling asset
2025-04-29 11:34:35 +05:30
ruthra kumar
6a59744d8e Merge pull request #47111 from sokumon/supplier-address
fix: convert to text before setting value
2025-04-29 11:24:29 +05:30
Mihir Kandoi
bd727e069b fix: commas in rfq portal js 2025-04-28 23:51:51 +05:30
Mihir Kandoi
ab7973231a fix: add fetch from to item name in rfq item doctype 2025-04-28 23:31:57 +05:30
Mihir Kandoi
ee10afc074 fix: logical error 2025-04-28 21:29:47 +05:30
Mihir Kandoi
bfc4ce1d5d fix: fix sub assembly qty calculation in production plan when bom level >= 1 2025-04-28 21:09:12 +05:30
RitvikSardana
07c263d453 Merge pull request #47262 from RitvikSardana/ignore-flag-removal
fix: dont pass ignore permissions param to whitelist methods
2025-04-28 19:50:04 +05:30
rohitwaghchaure
0701a8cf5a fix: QI reference not set if 'Action If Quality Inspection Is Not Sub… (#47294)
fix: qi reference not set if 'Action If Quality Inspection Is Not Submitted' is blank
2025-04-28 19:38:37 +05:30
rohitwaghchaure
3d36d0b1df fix: validation if no stock ledger entries against stock reco (#47292) 2025-04-28 18:16:52 +05:30
Mihir Kandoi
9e640341fd fix: remove unused import 2025-04-28 17:49:27 +05:30
Mihir Kandoi
acd1529780 fix: test case 2025-04-28 17:43:19 +05:30
Marica
72113dc485 Merge branch 'develop' into unit-price-contract-2 2025-04-28 16:15:41 +05:30
Frappe PR Bot
9a7bcfe395 fix: sync translations from crowdin (#47230) 2025-04-28 12:14:45 +02:00
rohitwaghchaure
70787eb5e0 Merge pull request #47285 from rohitwaghchaure/fixed-support-34140-1
fix: allow to make quality inspection after Purchase / Delivery
2025-04-28 14:28:56 +05:30
Rohit Waghchaure
fad1a32e63 fix: allow to make quality inspection after Purchase / Delivery 2025-04-28 13:28:35 +05:30
l0gesh29
eae08bc619 fix: update quantity validation using asset quantity field instead of… (#46731)
* fix: update quantity validation using asset quantity field instead of total records

* fix: update throw message
2025-04-28 12:25:24 +05:30
ruthra kumar
cf3237a252 Merge pull request #46993 from karm1000/dispatch-field
feat: add dispatch address fields to purchase doctypes
2025-04-28 10:56:20 +05:30
ruthra kumar
c060cdc06c Merge pull request #46979 from Sanket322/refactor_report
fix: Proper Postal Code Order and Add Party Name Properly
2025-04-28 10:18:58 +05:30
ruthra kumar
dd4739c1aa Merge pull request #46774 from cogk/feat-past-events-and-todos-in-crm-activities
feat: Show past events and todos in crm_activities
2025-04-28 09:36:57 +05:30
barredterra
edcc1d39ae feat(Supplier): add table Customer Numbers 2025-04-27 18:09:13 +02:00
barredterra
be72e64633 feat(Customer): add table Supplier Numbers 2025-04-27 18:04:53 +02:00
rohitwaghchaure
a4e20c59d6 Merge pull request #47259 from rohitwaghchaure/fixed-support-36911
fix: enable use serial / batch fields on batch selection
2025-04-27 18:35:17 +05:30
Frappe PR Bot
1ed9872db1 chore: update POT file (#47275) 2025-04-27 14:53:35 +02:00
rohitwaghchaure
df08c92b4f Merge pull request #47268 from rohitwaghchaure/fixed-valuation-method-change
fix: allow to change valuation method from FIFO to Moving Average
2025-04-27 17:45:37 +05:30
Rohit Waghchaure
b454ed4b8f fix: allow to change valuation method from FIFO to Moving Average 2025-04-26 16:31:37 +05:30
Corentin Forler
aa18753f57 fix(PE): Set account types in get_payment_entry (#47246) 2025-04-25 15:30:53 +02:00
Diptanil Saha
c85edc3346 fix: consolidating pos invoices on the basis of accounting dimensions (#46961)
* fix: consolidating pos invoices on the basis of accounting dimensions

* fix: project field
2025-04-25 17:38:23 +05:30
Diptanil Saha
1ad61fb572 feat: sales invoice integration with pos (#46485)
* feat: pos configuration to activate real time update of gl and stock ledger

* feat: sales invoice on pos order list

* fix: syntax

* feat: past order list with sales invoice

* feat: customer recent transaction with sales invoice

* fix: real_time_update validation

added a validation to restrict switching between sales invoice and pos invoice in case there's already a pos opening entry

* fix: use sales invoice on accounts settings

moved the check to use sales invoice instead of pos invoice from pos profile to accounts settings.

* fix: using accounts settings to get frm doctype

* fix: added support for sales invoice in  process return

* feat: event listeners for sales invoice on pos

* fix: create and load return invoice

* fix: edit order

* refactor: function rename

* fix: sales invoice generation using pos

added fields to distinguish sales invoice generated using pos

* feat: credit note in pos invoice during sales invoice mode

* feat: pos closing entry support for sales invoices

* refactor: resolving linter issues

* refactor: fix linter issue

* fix: filters for sales invoice in toggle recent orders

* feat: disable partial payments on sales invoice transactions made using pos

* fix: resolve import error

* fix: recent order list and pos invoice returns during sales invoice mode

* fix: reset pos_closing_entry on return sales invoice

* fix: filtering out consolidated return sales invoice for pos invoice return

* fix: pos delete order

* fix: added missing reference to consolidated sales invoice item

* fix: added check to restrict sales invoice creation

* refactor: variable name

* fix: integrating sales_invoice in make_closing_entry_from_opening method

* test: test for sales invoice integration in pos

* fix: issue with accounting dimension on sales invoice

* refactor: moved invoice switching mode validation in backend

* test: removed test case

Removed Test Case for Full Payment of Sales Invoice created using POS as planning to add feature to accept Partial Payment from POS.

* test: fixed the failing tests

* test: remove explicit use of frappe.db.commit()

* test: fixing pos invoice test

* test: removed test
2025-04-25 17:33:39 +05:30
RitvikSardana
c28596f69d fix: dont pass ignore permissions param to whitelist methods 2025-04-25 15:31:02 +05:30
Rohit Waghchaure
a4471865a9 fix: enable use serial / batch fields on batch selection 2025-04-25 15:13:18 +05:30
Marica
3193e1c1a2 Merge pull request #47232 from marination/sn-warranty-report-missing
fix: Re-insert missing "Serial No Warranty Expiry" Report
2025-04-25 14:57:35 +05:30
Mihir Kandoi
3790c6c551 fix: add transaction_date in field_no_map when creating PO from SQ 2025-04-25 14:06:31 +05:30
Prateek Karamchandani
7a5cbc759c fix: display stock value in currency format in chart warehouse wise stock value 2025-04-25 06:19:00 +00:00
Diptanil Saha
483c4a3271 fix: prohibit consolidated sales invoice return (#47251) 2025-04-25 11:09:22 +05:30
Diptanil Saha
c8ee5d9a4e fix: cancel pos closing entry failure for return pos invoices (#47248) 2025-04-24 22:29:21 +05:30
ljain112
5fe247557e fix: compare total debit/credit with precision for Inter Company Journal Entry 2025-04-24 18:54:03 +05:30
Khushi Rawat
ed8a8532e1 fix: update additional cost and total asset cost after asset repair (#47233)
* fix: add consumed stock's cost to the asset value after repair

* fix: do not copy additional cost and total asset cost
2025-04-24 16:14:42 +05:30
Mihir Kandoi
88926eb2a7 fix: price currency in supplier quotation comparison 2025-04-24 16:10:12 +05:30
marination
deefac0abf fix: Re-insert missing "Serial No Warranty Expiry" Report 2025-04-24 09:50:43 +02:00
venkat102
b570d97b4d fix(payment request): get advance amount based on transaction currency 2025-04-24 11:33:18 +05:30
Khushi Rawat
0d53e6ed7c fix: make asset quantity and amount editable (#47226) 2025-04-24 01:54:00 +05:30
Raffael Meyer
cb111c43d4 fix(Rename Tool): allow more than 500 rows (#47117)
Co-authored-by: Sagar Vora <16315650+sagarvora@users.noreply.github.com>
2025-04-23 19:32:03 +02:00
Sagar Vora
7131396ac0 perf: evaluate conditions outside loop 2025-04-23 21:34:18 +05:30
Sagar Vora
af283d0d9e perf: improved gle map init 2025-04-23 21:34:18 +05:30
Sagar Vora
593ecb3d68 Merge pull request #47011 from sokumon/remove-eps
fix: remove default energy points from erpnext
2025-04-23 21:21:28 +05:30
Frappe PR Bot
0bc8d28969 fix: sync translations from crowdin (#47192) 2025-04-23 17:11:29 +02:00
ruthra kumar
709a2fa553 Merge pull request #47155 from sagarvora/fix-dr-cr-mismatch
fix: get total without rounding off tax amounts for distributing discount
2025-04-22 17:19:00 +05:30
ruthra kumar
1b2bde4c82 Merge pull request #47178 from aerele/delivery-note-per-billed
fix: keep per_billed 100 for billed delivery note after return
2025-04-22 17:10:33 +05:30
Sagar Vora
551639da7b chore: remove previously added logger calls 2025-04-22 17:04:16 +05:30
rohitwaghchaure
6857700eff Merge pull request #47183 from mihir-kandoi/st36696
fix: backslash in url
2025-04-22 16:15:42 +05:30
Mihir Kandoi
c3d172fac3 fix: remove unused import 2025-04-22 15:50:51 +05:30
Mihir Kandoi
5d07beee61 fix: change get_url_to_form to get_link_to_form 2025-04-22 15:50:02 +05:30
ruthra kumar
7e0681c4a4 Merge pull request #46717 from ljain112/fix-search
fix: respect field "ignore_user_permissions" property in employee query
2025-04-22 15:41:34 +05:30
ruthra kumar
bd4e9370de Merge pull request #47171 from ljain112/paid-amount
fix: set correct paid/receive amount if doc currency is different from party account currency
2025-04-22 15:35:48 +05:30
Mihir Kandoi
eaaf34cda6 fix: revert unintended changes 2025-04-22 15:27:09 +05:30
Mihir Kandoi
7a82b37f76 fix: use get_url_to_form instead 2025-04-22 15:22:54 +05:30
rohitwaghchaure
b9e09aa34e Merge pull request #47184 from mihir-kandoi/st36742
feat: add button to view Supplier Quotation Comparison directly from RFQ
2025-04-22 15:12:15 +05:30
ruthra kumar
5a6997455b Merge pull request #47180 from ljain112/fix-quo
fix: set default company address in selling Doctype on change of company
2025-04-22 14:26:22 +05:30
Soham Kulkarni
68ca4a77c9 Merge pull request #47175 from sokumon/purchase-receipt-quick-list
fix: add grand_total to show correct status in quick list widget
2025-04-22 14:19:41 +05:30
ruthra kumar
f01a9069b1 Merge pull request #47138 from ljain112/fix-tds-report
fix: rate based on posting date in Tax Withholding Report
2025-04-22 13:28:42 +05:30
rohitwaghchaure
3c53d628d9 Merge pull request #47191 from rohitwaghchaure/fixed-github-47076
fix: expense account in stock entry
2025-04-22 13:15:33 +05:30
ljain112
4be975f87c chore: added test case for employee query with user permissions 2025-04-22 13:00:37 +05:30
ruthra kumar
5eb83f763f Merge pull request #47124 from ljain112/fix-supp-led
fix: `TypeError` in group field filter in supplier ledger summary
2025-04-22 12:21:02 +05:30
Rohit Waghchaure
75874b4986 fix: expense account in stock entry 2025-04-22 08:07:09 +05:30
rohitwaghchaure
a599632f8a Merge pull request #47186 from rohitwaghchaure/fixed-github-47112
fix: disabled UOM showing in the list
2025-04-21 22:12:26 +05:30
Rohit Waghchaure
3745825052 fix: disbaled UOM showing in the list 2025-04-21 21:24:58 +05:30
rohitwaghchaure
5835502937 Merge pull request #47144 from rohitwaghchaure/fixed-bin-recalculate-qty
fix: provision to recalculate the qty in the Bin
2025-04-21 21:18:07 +05:30
Frappe PR Bot
c7e5442565 fix: sync translations from crowdin (#47163) 2025-04-21 17:26:25 +02:00
Mihir Kandoi
ef57d2b328 fix: show button only when RFQ is submitted 2025-04-21 20:25:31 +05:30
Mihir Kandoi
b4aa88b59b feat: add button to show request for comparison report directly from RFQ 2025-04-21 20:23:14 +05:30
Mihir Kandoi
ecf15130ba fix: backslash in url 2025-04-21 19:05:16 +05:30
Diptanil Saha
f3838c0b61 Merge pull request #47182 from diptanilsaha/fix-pos-item-selector-cart-ui
fix: pos item selector cart ui
2025-04-21 18:30:35 +05:30
diptanilsaha
83cf17f07c fix: row gap in item details form 2025-04-21 18:16:45 +05:30
diptanilsaha
52d73de6b6 fix: cart item toggle highlight 2025-04-21 17:57:40 +05:30
ljain112
a31075692c fix: set default company address in Sales Doctype on change of company 2025-04-21 17:38:34 +05:30
ruthra kumar
c5db4ca43a Merge pull request #47179 from frappe/broken_markdown
chore: broken markdown
2025-04-21 17:01:15 +05:30
ruthra kumar
9244ecdaff chore: broken markdown 2025-04-21 16:59:33 +05:30
ruthra kumar
21df80b750 Merge pull request #47106 from yashhhYB/yashhhYB-patch-1
docs(readme): add Frappe School badge for learning ERPNext
2025-04-21 16:41:25 +05:30
Yash Bodade
911c7b969c docs(readme): add Frappe School badge for learning ERPNext
This PR adds a badge linking to [Frappe School](https://frappe.school) to promote learning resources directly from the README. It helps newcomers discover structured tutorials and improves onboarding.

### Changes Made

- Added a Frappe School badge below the title in `README.md`

### Screenshot

[![Learn on Frappe School](https://img.shields.io/badge/Frappe%20School-Learn%20ERPNext-blue?style=flat-square)](https://frappe.school)

---
2025-04-21 16:39:55 +05:30
Sugesh393
02356029a8 refactor: update base_outstanding calculation 2025-04-21 16:24:08 +05:30
Sugesh393
fe5898a151 test: add new unit test to keep per_billed 100 for billed delivery note 2025-04-21 16:23:32 +05:30
Sugesh393
8290a83591 fix: keep per_billed 100 for billed delivery note after return 2025-04-21 16:22:14 +05:30
diptanilsaha
e035120f41 fix: item with no image 2025-04-21 16:17:24 +05:30
ruthra kumar
a7bf999a4f Merge pull request #47019 from Z4nzu/fix_italy_localization
fix(italy): Add tax-related custom fields to POS Invoice Item
2025-04-21 16:08:47 +05:30
ruthra kumar
b9fc173a98 Merge pull request #47067 from ljain112/fix-error-message
fix: correct error message in validate_internal_transfer_qty
2025-04-21 15:57:56 +05:30
diptanilsaha
374da68829 fix: added gap in item details form 2025-04-21 15:53:29 +05:30
diptanilsaha
3e9fc558a8 fix: item images on pos 2025-04-21 15:43:15 +05:30
ljain112
91d7bc55be fix: respect field "ignore_user_permissions" property in employee query 2025-04-21 14:21:56 +05:30
Diptanil Saha
cb2ad4acdb fix: update country wise fiscal year (#47141) 2025-04-21 14:19:24 +05:30
Smit Vora
ceaba4220b fix: map dispatch address correctly for inter company transactions 2025-04-21 13:49:14 +05:30
Smit Vora
fb3b7d8c34 refactor: set address details for transactions 2025-04-21 13:46:59 +05:30
Smit Vora
8ccd7a3e61 refactor: address field position 2025-04-21 13:44:20 +05:30
ljain112
9612521894 fix: set correct paid/receive amount if doc currency is different from party account currency 2025-04-21 12:11:13 +05:30
Diptanil Saha
f52cbf6165 fix: pos disable customer selection at payment (#47169) 2025-04-21 11:53:03 +05:30
Ankush Menat
8b602c4608 chore: translations link (#47168) 2025-04-21 05:54:34 +00:00
Frappe PR Bot
32d5597d23 chore: update POT file (#47165) 2025-04-20 13:45:26 +02:00
Frappe PR Bot
d19b197524 fix: sync translations from crowdin (#47139)
* fix: Chinese Simplified translations

* fix: Thai translations

* fix: Portuguese translations
2025-04-19 21:42:26 +02:00
Rohit Waghchaure
36081413d8 fix: provision to recalculate the qty in the Bin 2025-04-19 16:26:57 +05:30
Sagar Vora
5741458c94 fix: get total without rounding off tax amounts for distributing discount 2025-04-19 14:14:58 +05:30
Sagar Vora
eac96cb186 Merge pull request #47154 from sagarvora/fix-dimension-copying 2025-04-19 12:51:08 +05:30
Sagar Vora
7dbe27da19 fix: respect mapped accounting dimensions 2025-04-19 11:16:48 +05:30
ljain112
515fe340a8 chore: added test case for date period in multiple tax withholding rules 2025-04-18 13:25:42 +05:30
Karm Soni
999ffe86a7 fix: correct query for dispatch_address; remove unnecessary code; increase reusability; 2025-04-18 13:24:47 +05:30
ljain112
a32a79e90a fix: rate based on posting date in Tax Withholding Report 2025-04-17 20:23:48 +05:30
Raffael Meyer
baa0c8bd5f chore: migrate pre-commit config (#47132) 2025-04-17 11:59:48 +00:00
Raffael Meyer
e945b4cc06 fix: create default warehouse (#47125) 2025-04-17 13:17:02 +02:00
Karm Soni
d12998e524 feat: add display dispatch address when dispatch address is selected 2025-04-17 16:32:59 +05:30
ruthra kumar
048997f809 Merge pull request #47118 from aerele/tb-group-by-account
fix: add group by after user permission condition
2025-04-17 16:05:19 +05:30
Karm Soni
c4bd3123fb fix: remove use of cur_frm 2025-04-17 15:43:07 +05:30
Karm Soni
9a859e54b6 fix: enhance dispatch address query logic and add supplier address query 2025-04-17 15:43:07 +05:30
Karm Soni
53d0b7be23 feat: add dispatch address support in party details and controllers 2025-04-17 15:43:07 +05:30
ljain112
872e94a316 fix: TypeError in group field filter in supplier ledger summary 2025-04-17 15:39:50 +05:30
Frappe PR Bot
e5eafc49ee fix: sync translations from crowdin (#47035) 2025-04-17 11:41:55 +02:00
venkat102
756d496235 fix: add group by after user permission condition 2025-04-17 00:12:43 +05:30
rohitwaghchaure
5d35e31281 Merge pull request #46944 from rohitwaghchaure/fixed-production=plan-lables
fix: production plan label description
2025-04-16 23:17:55 +05:30
Rohit Waghchaure
2de61e955a fix: production plan label description 2025-04-16 23:03:58 +05:30
rohitwaghchaure
659119adc2 Merge pull request #47050 from mihir-kandoi/st35798
fix: consider per_ordered instead of per_billed when creating PO from MR
2025-04-16 16:28:00 +05:30
sokumon
8da5752059 fix: convert to text before setting value 2025-04-16 11:03:22 +05:30
Shariq Ansari
f4c4a0cc0f Merge pull request #47108 from shariquerik/revert-disable-customer 2025-04-16 10:21:06 +05:30
Shariq Ansari
fc16199a49 revert: disable customer if creating from opportunity 2025-04-16 10:18:29 +05:30
ruthra kumar
0b22f87db9 Merge pull request #46770 from ljain112/fix-dunnig
fix: correct outstanding amount for invoice in dunning
2025-04-15 17:50:25 +05:30
ruthra kumar
7728126b1f Merge pull request #46996 from Sanket322/contact_adress_in_add_column
fix: Allow adding Address/Contact fields to `Address And Contacts` report
2025-04-15 17:45:27 +05:30
rohitwaghchaure
88b5d40202 Merge pull request #46973 from rtdany10/reservation-precision
fix: precision issue on qty_to_be_reserved
2025-04-15 17:36:39 +05:30
ruthra kumar
67600b76e8 Merge pull request #47001 from aerele/inter-company-order-echange-rate
fix: fetch exchange rate while creating inter-company order and invoice
2025-04-15 17:35:58 +05:30
ruthra kumar
39174f9dc0 chore: translatable labels 2025-04-15 17:32:46 +05:30
Marica
445263bb85 Merge pull request #47007 from HUMENTH/patch-2
chore: Fix typo "Item Wise Tax Detail "
2025-04-15 17:01:04 +05:30
Khushi Rawat
e41720f1a3 fix: enabled allow on submit for asset name field (#47093) 2025-04-15 16:59:16 +05:30
marination
be556167b1 fix: Modify .json from desk to change modified 2025-04-15 13:15:50 +02:00
Marica
bbe641fd77 Merge branch 'develop' into unit-price-contract-2 2025-04-15 16:11:14 +05:30
ruthra kumar
573809cece Merge pull request #46951 from cogk/fix-use-party_name-instead-of-customer-in-set_query-of-quotation-items
fix: Use `party_name` instead of `customer` in `set_query` of Quotation items
2025-04-15 15:45:27 +05:30
ruthra kumar
a2b326a988 Merge pull request #46640 from ljain112/fix-ledger-summary
perf: refactored customer ledger summary for performance
2025-04-15 11:52:15 +05:30
ruthra kumar
eb1b401653 Merge pull request #46789 from aerele/order-tax-table
fix: map tax table while creating purchase order from sales order
2025-04-15 11:41:15 +05:30
ruthra kumar
71f0f7a0b5 test: basic supplier ledger summary 2025-04-15 11:37:59 +05:30
ruthra kumar
9a3a80dfd3 test: basic output of customer ledger summary report 2025-04-15 11:37:57 +05:30
ljain112
3b613c44a6 chore: added test for Fetch Overdue Payments in dunning 2025-04-15 11:36:19 +05:30
ruthra kumar
9bae57e2b4 Merge pull request #46754 from muruthigitau/create-payment-gateway-account
feat: add optional company parameter to create_payment_gateway_account
2025-04-15 11:07:49 +05:30
muruthigitau
6608735006 refactor: optional company param to create_payment_gateway_account 2025-04-15 10:55:26 +05:30
Raffael Meyer
fb9cb779f4 test(Payment Entry): account type is set (#47071) 2025-04-14 19:06:25 +02:00
Raffael Meyer
a854beeb40 fix(Payment Entry): set account type if missing (#47069) 2025-04-14 18:32:19 +02:00
ljain112
5063f1174e fix: correct error message in validate_internal_transfer_qty 2025-04-14 19:06:22 +05:30
rohitwaghchaure
e3f1677786 Merge pull request #47057 from rohitwaghchaure/fixed-github-46675
fix: not able to complete work order with reserved qty
2025-04-14 18:08:52 +05:30
rohitwaghchaure
083a666188 Merge pull request #47058 from rohitwaghchaure/fixed-support-36030
fix: consider negative stock qty in stock reconciliation
2025-04-14 18:08:30 +05:30
ruthra kumar
95686fc255 Merge pull request #46782 from iamkhanraheel/fix-customer-payment-autofetch
fix: fetch customer related data in making payment entry from customer
2025-04-14 17:32:49 +05:30
Rohit Waghchaure
15272d0e56 fix: consider negative stock qty in stock reco 2025-04-14 14:37:04 +05:30
Rohit Waghchaure
27d674d54a fix: not able to complete work order with reserved qty 2025-04-14 14:33:51 +05:30
ruthra kumar
46783c1377 Merge pull request #47049 from frappe/revert-46900-fix-against-voucher
Revert "fix: remove against_voucher and against_voucher_type column from General Ledger Report"
2025-04-14 13:18:36 +05:30
ruthra kumar
adb331ef71 fix: revert #46900 - against_voucher filter in general ledger 2025-04-14 13:01:40 +05:30
Mihir Kandoi
5a524854de fix: consider per_ordered instead of per_billed when creating PO from MR 2025-04-14 12:36:59 +05:30
rohitwaghchaure
61a3e01bd3 Merge pull request #46620 from mihir-kandoi/46618
fix: add fetch from to currency and set default to empty in item price
2025-04-14 12:13:07 +05:30
rohitwaghchaure
ea917f946c Merge pull request #46938 from mihir-kandoi/st35392
fix: group sub assemblies in production plan
2025-04-14 12:10:36 +05:30
Mihir Kandoi
8df18762a9 fix: test cases error 2025-04-14 11:09:45 +05:30
Sagar Vora
205443a9e0 Merge pull request #47016 from barredterra/employee-user-perms 2025-04-14 10:27:19 +05:30
Deepesh Garg
acfa2465df Merge pull request #47043 from deepeshgarg007/trial_balance_memory
fix: Group GLs by account for TB generation
2025-04-13 19:26:29 +05:30
barredterra
08f21c7905 fix: remove hook that does nothing 2025-04-13 15:29:38 +02:00
Deepesh Garg
f894c6d275 fix: Group GLs by account for TB generation 2025-04-13 18:53:11 +05:30
sokumon
6d93c3adad fix: remove energy points patch 2025-04-13 17:12:29 +05:30
Frappe PR Bot
eff2f34048 chore: update POT file (#47042) 2025-04-13 12:35:01 +02:00
Sanket322
c48db0b7c0 fix: ensure backend response is awaited before saving 2025-04-13 13:24:33 +05:30
Sanket322
00b6b97197 fix: check return_against exists before api call 2025-04-13 13:17:15 +05:30
ruthra kumar
8ef31c8fc0 Merge pull request #47012 from ljain112/fix-pur-resigister-item
fix: correct doctype in item_wise_purchase register
2025-04-12 07:10:32 +05:30
rohitwaghchaure
b4be1503e3 Merge pull request #47026 from rohitwaghchaure/fixed-removed-unused-code
fix: batchwise valuation for MA item
2025-04-11 21:56:30 +05:30
Rohit Waghchaure
504b8c0a68 fix: batchwise valuation for MA item 2025-04-11 21:20:05 +05:30
Frappe PR Bot
78583ac632 fix: sync translations from crowdin (#47009) 2025-04-11 16:41:50 +02:00
rohitwaghchaure
dc8616d2ab Merge pull request #47022 from rohitwaghchaure/fixed-condition-for-use_batchwise_valuation
fix: condition for use_batchwise_valuation
2025-04-11 19:34:45 +05:30
Mihir Kandoi
a7394329ca fix: test cases 2025-04-11 19:30:35 +05:30
Rohit Waghchaure
cc171d9706 fix: condition for use_batchwise_valuation 2025-04-11 19:17:47 +05:30
rohitwaghchaure
e2a7856a44 Merge pull request #47020 from rohitwaghchaure/fixed-display-depends-on
fix: removed display depends on
2025-04-11 19:14:57 +05:30
Rohit Waghchaure
e0bf45e03b fix: removed display depends on 2025-04-11 18:58:09 +05:30
Hardik Zinzuvadiya
02bb63a5f7 fix(italy): Add missing tax fields to POS Invoice Item 2025-04-11 12:57:25 +00:00
rohitwaghchaure
890040db86 Merge pull request #47015 from rohitwaghchaure/fixed-support-35994-1
fix: allow to use batch-wise valuation for moving average items
2025-04-11 17:07:20 +05:30
Rohit Waghchaure
65ba79bb85 fix: allow to use batchwise valuation for moving average items 2025-04-11 16:48:41 +05:30
barredterra
046bcfa606 fix(Employee): add/delete user permission 2025-04-11 13:14:52 +02:00
Mihir Kandoi
f071255340 fix: logic and added test case 2025-04-11 16:22:28 +05:30
ljain112
b8b8dce733 fix: correct doctype in item_wise_purchase register 2025-04-11 15:06:03 +05:30
sokumon
e3af7f639d fix: remove default energy points from erpnext 2025-04-11 14:03:53 +05:30
Himanshu Shivhare
9624d56abd chore: Fix typo "Item Wise Tax Detail " 2025-04-10 23:18:43 +05:30
rohitwaghchaure
4abc39ef62 Merge pull request #46997 from rohitwaghchaure/fixed-support-35003
fix: update the modified date in for SLEs and GLs after rename
2025-04-10 17:39:35 +05:30
rohitwaghchaure
8b0fd7b00f Merge pull request #47002 from rohitwaghchaure/fixed-support-34140
feat: Allow to Make Quality Inspection after Purchase / Delivery
2025-04-10 17:39:04 +05:30
Rohit Waghchaure
8eaa2afeb7 feat: Allow to Make Quality Inspection after Purchase / Delivery 2025-04-10 16:28:23 +05:30
venkat102
145a6c5e2a fix: fetch exchange rate while creating inter-company order and invoice 2025-04-10 16:07:20 +05:30
Rohit Waghchaure
dc5a5ef258 fix: update the modified date in for SLEs and GLs after rename 2025-04-10 15:53:06 +05:30
Sanket322
d9ca7e755f fix: add Address and Contact in Add Column 2025-04-10 13:03:11 +05:30
rohitwaghchaure
511a01c26c Merge pull request #46965 from rohitwaghchaure/fixed-reposting-error-recreate-ledgers
fix: Recreate Stock Ledgers issue
2025-04-10 11:42:51 +05:30
rohitwaghchaure
2ef8b581cd Merge pull request #46978 from rohitwaghchaure/fixed-support-32497
fix: bypass validation during reposting
2025-04-10 11:42:20 +05:30
Rohit Waghchaure
3697b9fd9b fix: bypass validation during reposting 2025-04-10 11:26:44 +05:30
Sanket322
54385dde24 fix: changed postalcode order and correct the condition for party_name 2025-04-10 01:15:27 +05:30
Frappe PR Bot
8383c826c3 Merge pull request #46963 from frappe/l10n_develop
fix: sync translations from crowdin
2025-04-09 16:47:24 +02:00
Karm Soni
54b5205221 feat: add dispatch address fields to purchase doctypes 2025-04-09 19:19:47 +05:30
Dany Robert
860699ee7b fix: precision issue on qty_to_be_reserved 2025-04-09 18:39:36 +05:30
rohitwaghchaure
358e3581c2 Merge pull request #46972 from rtdany10/reservation-precision
fix: precision loss causing reservation error
2025-04-09 18:09:37 +05:30
Dany Robert
e3c0dbe79f fix: precision loss causing reservation error 2025-04-09 17:38:00 +05:30
Diptanil Saha
67fcc172d7 Merge pull request #46964 from diptanilsaha/pos-profile-add-project-field
fix: added missing project field on pos profile
2025-04-09 15:34:26 +05:30
Marica
2fee4958d7 Merge pull request #46933 from rohitwaghchaure/fixed-support-32029
fix: item code not showing in the error message
2025-04-09 15:32:21 +05:30
Rohit Waghchaure
229a4cef45 fix: Recreate Stock Ledgers issue 2025-04-09 12:37:02 +05:30
diptanilsaha
821d64241a fix: added missing project field on pos profile 2025-04-09 11:37:51 +05:30
Raffael Meyer
147852a5af Merge pull request #46959 from barredterra/refactor-due-date
fix: interaction with due date / payment terms / payment schedule
2025-04-08 21:00:41 +02:00
barredterra
c00f62d54a chore: add context 2025-04-08 20:54:52 +02:00
barredterra
57be8a85d6 fix: clarify confirmation message 2025-04-08 20:53:29 +02:00
barredterra
8a4db69581 fix: use the actual field label 2025-04-08 20:53:04 +02:00
barredterra
c55c77f4e9 fix: recognize trigger from child table 2025-04-08 20:40:50 +02:00
barredterra
87c21a89fe refactor: use doc parameter instead of this.frm.doc 2025-04-08 20:39:14 +02:00
Corentin Forler
a16fd451ee fix: Use party_name instead of customer in Quotation set_query 2025-04-08 15:33:22 +02:00
Raffael Meyer
fa719d8695 fix: make report's "printed on" translatable (#46913)
* fix: make report's "printed on" translatable

* fix: go for lower case "on" because we already have translations for that

* fix: remove redundant letter head

* fix(General Ledger): make table header translatable
2025-04-08 15:22:13 +02:00
barredterra
6dc65f1a19 fix(General Ledger): make table header translatable 2025-04-08 15:19:46 +02:00
barredterra
5837f257bc fix: remove redundant letter head 2025-04-08 15:08:40 +02:00
barredterra
b0d5642785 fix: go for lower case "on" because we already have translations for that 2025-04-08 15:01:21 +02:00
rohitwaghchaure
495428ba4e Merge pull request #46383 from mihir-kandoi/st29657-2
feat: available serial no report
2025-04-08 17:46:12 +05:30
rohitwaghchaure
984bb7c7ea Merge pull request #46942 from mihir-kandoi/st35203
fix: ignore backflush setting on subcontracting return
2025-04-08 17:44:21 +05:30
ruthra kumar
6f89f7e945 Merge pull request #46892 from mihir-kandoi/st35406
fix: use get instead of dot operator to access dict value to prevent no attribute error
2025-04-08 17:03:22 +05:30
Mihir Kandoi
7479e1ec32 fix: ignore backflush setting on subcontracting return 2025-04-08 15:10:42 +05:30
Mihir Kandoi
f58abed935 fix: group sub assemblies in production plan 2025-04-08 15:02:12 +05:30
ruthra kumar
c8d6968a66 Merge pull request #46631 from aerele/fix/update_outstanding_for_self
fix: update outstanding for self
2025-04-08 14:27:13 +05:30
rohitwaghchaure
72846dc64f Merge pull request #46171 from JK-1117/fix-reconciliation-inventory-dimension
Fix validation mismatch in inventory dimension fields
2025-04-08 14:26:25 +05:30
Rohit Waghchaure
86dee69c2f fix: item code not showing in the error message 2025-04-08 13:30:12 +05:30
ruthra kumar
ea8ab256ad Merge pull request #46626 from ljain112/fix-pr-amount
fix: correct payment request amount
2025-04-08 13:18:35 +05:30
ruthra kumar
673e3c7849 Merge pull request #46821 from ljain112/cust-query
fix: removed customer_group query in customer.js
2025-04-08 12:57:02 +05:30
Shariq Ansari
5dfc0d32d6 Merge pull request #46903 from shariquerik/restrict-customer-change
fix: restrict customer change if creating from opportunity
2025-04-08 12:06:10 +05:30
ruthra kumar
c58e7c22f5 Merge pull request #46819 from cogk/fix-fieldtype-unreconcile-dialog
fix: Fix fieldtype in UnReconcile dialog
2025-04-08 11:25:35 +05:30
ruthra kumar
b1051dadd5 Merge pull request #46709 from ljain112/user-permission
fix: user permissions in sales and purchase report
2025-04-08 11:09:54 +05:30
ruthra kumar
49822c553a Merge pull request #46804 from ljain112/fix-os-precision
fix: update outstanding with precision
2025-04-08 09:58:44 +05:30
ruthra kumar
4f758701fe Merge pull request #46917 from frappe/l10n_develop
fix: sync translations from crowdin
2025-04-08 09:55:42 +05:30
Frappe PR Bot
b5d7fe6734 fix: Persian translations 2025-04-08 08:51:17 +05:30
rohitwaghchaure
6ee6d3508a Merge pull request #46893 from rohitwaghchaure/fixed-support-35192
fix: inventory dimensions columns visibility depends on filter
2025-04-08 08:49:33 +05:30
rohitwaghchaure
903ff67a22 Merge pull request #46898 from rohitwaghchaure/fixed-support-33798-1
fix: removed hardcoded search fields to fix performance issue
2025-04-08 08:49:10 +05:30
barredterra
186d7abf0a fix: make report's "printed on" translatable 2025-04-08 02:28:46 +02:00
Diptanil Saha
6fae98afda fix: pos opening entry's status not getting updated on cancel (#46909) 2025-04-07 20:44:47 +05:30
Diptanil Saha
3de1b22480 fix: validate if pos is opened before pos invoice creation (#46907)
* fix: validate if pos is opened before pos invoice creation

* fix: added title on throw dialog

* test: fixed failing test
2025-04-07 20:33:27 +05:30
ruthra kumar
79bd731188 Merge pull request #46895 from ljain112/fix-filter-gl
fix: empty party filter on change of party type in General Ledger Report
2025-04-07 17:42:02 +05:30
Shariq Ansari
dc4819e897 fix: restrict customer change if creating from opportunity 2025-04-07 17:17:42 +05:30
ruthra kumar
274cb898ea Merge pull request #46900 from ljain112/fix-against-voucher
fix: remove against_voucher and against_voucher_type column from General Ledger Report
2025-04-07 17:10:50 +05:30
ljain112
6d1f119a0f fix: remove against_voucher from General Ledger Report 2025-04-07 16:28:52 +05:30
Frappe PR Bot
56eaa504ec fix: sync translations from crowdin (#46872)
* fix: Persian translations

* fix: French translations

* fix: Spanish translations

* fix: Arabic translations

* fix: Hungarian translations

* fix: Polish translations

* fix: Russian translations

* fix: Swedish translations

* fix: Turkish translations

* fix: Chinese Simplified translations

* fix: Persian translations

* fix: Bosnian translations

* fix: German translations

* fix: Esperanto translations

* fix: Portuguese, Brazilian translations

* fix: Thai translations

* fix: Croatian translations
2025-04-07 12:13:55 +02:00
Rohit Waghchaure
216bf2456e fix: removed hardcoded search fields to fix performance issue 2025-04-07 14:46:16 +05:30
ruthra kumar
15d632f8de Merge pull request #46728 from rtdany10/inv_date_issue
fix: update posting date before running validations
2025-04-07 14:30:39 +05:30
ljain112
9c68bc22fa fix: empty party filter on change of party type in General Ledger Report. 2025-04-07 14:09:52 +05:30
Rohit Waghchaure
2b411fb7f5 fix: inventory dimensions columns visibility depends on filter 2025-04-07 11:47:27 +05:30
Mihir Kandoi
7fb75f0482 fix: use get instead of dot operator to access dict value 2025-04-07 11:06:19 +05:30
ruthra kumar
7f0af3c667 Merge pull request #46637 from aerele/allocate-payment-term
fix(payment term): allocate payment amount when payment term is fetched from order
2025-04-07 11:03:24 +05:30
ruthra kumar
8759824aa7 Merge pull request #46784 from mohsinalimat/develop
fix: correct mapping(schedule_date) sales order to material request
2025-04-07 10:43:26 +05:30
ruthra kumar
0d72d58860 Merge pull request #46743 from aerele/auto-bank-reconcile
fix: include auto_reconcile_vouchers flag in background job
2025-04-07 10:19:59 +05:30
rohitwaghchaure
9c685c5af0 Merge pull request #46836 from mihir-kandoi/st35124
fix: remove all serial/batch fields when use button is unselected
2025-04-07 10:19:16 +05:30
ruthra kumar
82bf88635c Merge pull request #46727 from aerele/apply_docstatus
fix: use docstatus for status filter
2025-04-07 10:13:00 +05:30
Diptanil Saha
21954b9f9c fix: pos closed dialog on pos closing entry (#46881) 2025-04-06 21:26:14 +05:30
Frappe PR Bot
b4430a14a6 chore: update POT file (#46876) 2025-04-06 13:50:52 +02:00
rohitwaghchaure
5786596fc0 Merge pull request #46845 from rohitwaghchaure/fixed-support-35337
fix: slow query
2025-04-06 16:10:28 +05:30
rohitwaghchaure
c9cc5122dd Merge pull request #46875 from TurkerTunali/patch-13
perf: Stock entry cancel is slow
2025-04-06 16:09:08 +05:30
ruthra kumar
2948a33f40 Merge pull request #46716 from barredterra/dunning-customer-dashboard
feat(Customer): add Dunning to dashboard
2025-04-06 15:50:45 +05:30
ruthra kumar
a55a4efb22 Merge pull request #46658 from SruthysCode/fix_accounts_payable
chore: adjusted dimension placement in Accounts Payable
2025-04-06 15:39:22 +05:30
Türker Tunalı
ddbb44c6a2 perf: Stock entry cancel is slow
Some queries still use "timestamp" function instead of "posting_datetime". In my instance single stock entry cancel ends with request timeout. Using "posting_datetime" field directly improves the situation.

cont: https://github.com/frappe/erpnext/pull/46293
2025-04-06 12:25:42 +03:00
Rohit Waghchaure
f82c8ea5eb fix: slow query 2025-04-06 13:41:14 +05:30
rohitwaghchaure
6fd15abd15 Merge pull request #46853 from rohitwaghchaure/fixed-support-35243
fix: stock entry repack amount calculation
2025-04-06 09:44:59 +05:30
Sagar Vora
4ef5f6a392 Merge pull request #46870 from sagarvora/perf-validate
perf: reduce query when validating any doc
2025-04-05 23:38:30 +05:30
Sagar Vora
b863296e53 perf: reduce query when validating any doc 2025-04-05 23:06:52 +05:30
Raffael Meyer
04df09cfca fix(Dunning): undefined variable (#46868) 2025-04-05 15:19:23 +00:00
Raffael Meyer
e25517a3ce refactor(Payment Entry): reduce indentation (#46864) 2025-04-05 16:41:23 +02:00
Raffael Meyer
7d12e9afd4 fix: make message translatable (#46863) 2025-04-05 15:56:33 +02:00
Frappe PR Bot
27deed6d94 fix: sync translations from crowdin (#46858)
* fix: Arabic translations

* fix: Hungarian translations

* fix: Polish translations

* fix: Russian translations

* fix: Swedish translations

* fix: Chinese Simplified translations

* fix: Bosnian translations

* fix: Esperanto translations

* fix: Portuguese, Brazilian translations

* fix: Thai translations

* fix: Croatian translations
2025-04-05 12:33:37 +02:00
ruthra kumar
ae1f6912f8 Merge pull request #46625 from Abdeali099/bank-transaction-entries
refactor: Update Bank Transaction `set_query` implemetation
2025-04-05 07:04:26 +05:30
Rohit Waghchaure
544ceb93cd fix: stock entry repack amount calculation 2025-04-04 13:38:45 +05:30
Frappe PR Bot
89f58f7822 fix: sync translations from crowdin (#46849)
* fix: Spanish translations

* fix: French translations

* fix: Swedish translations

* fix: Turkish translations

* fix: Persian translations

* fix: Bosnian translations

* fix: German translations

* fix: Croatian translations
2025-04-04 00:45:09 +02:00
ruthra kumar
4cb6b70048 Merge pull request #46818 from cogk/fix-translate-unreconcile-dialog
fix: Translate UnReconcile dialog title
2025-04-03 06:51:59 +05:30
Md Hussain Nagaria
ef4f662c31 chore: update links to Frappe School (#46823) 2025-04-02 12:15:10 +05:30
rohitwaghchaure
7b5406b940 Merge pull request #46832 from rohitwaghchaure/fixed-support-33851-3
fix: set draft QC in purchase document on creation of qc
2025-04-01 19:46:36 +05:30
ljain112
038355f87b fix: correct function name 2025-04-01 17:43:11 +05:30
ljain112
fca46e0b2d fix: child values for tree doctypes and query refactor 2025-04-01 17:18:01 +05:30
Rohit Waghchaure
2553dea78e fix: set draft QC in purchase document on creation of qc 2025-04-01 15:11:03 +05:30
Mihir Kandoi
22ffdb9e77 fix: remove all serial/batch fields when use button is unselected 2025-04-01 14:15:47 +05:30
rohitwaghchaure
8dae5047c2 Merge pull request #46831 from rohitwaghchaure/fixed-support-35187
fix: current batch qty showing zero in the stock reconciliation
2025-04-01 14:08:54 +05:30
Sagar Vora
db0c5ae48d Merge pull request #46829 from vishakhdesai/gt-diff
fix: use `grand_total_diff` instead of `rounding_adjustment` in `taxes_and_totals`
2025-04-01 13:30:48 +05:30
Rohit Waghchaure
a5c62f8623 fix: current batch qty showing zero in the stock reconciliation 2025-04-01 13:15:06 +05:30
vishakhdesai
fd252da6b1 fix: use grand_total_diff instead of rounding_adjustment in taxes_and_totals 2025-04-01 12:43:34 +05:30
Diptanil Saha
5d5b6acc79 fix: pos checking opened entry closed or not (#46726)
* fix: pos checking opened entry closed or not

* fix: linter issue

* fix: linter issue
2025-04-01 12:40:47 +05:30
Abdeali Chharchhoda
4ae11d4384 chore: formatting 2025-04-01 12:12:37 +05:30
Abdeali Chharchhoda
fb054d4904 Merge branch 'develop' into bank-transaction-entries 2025-04-01 12:12:07 +05:30
rohitwaghchaure
63ef0a5a99 Merge pull request #46808 from rohitwaghchaure/fixed-support-34914
fix: condition to update the last purchase rate
2025-03-31 20:44:28 +05:30
ljain112
f49adfdd98 fix: removed customer_group query in customer.js 2025-03-31 18:06:33 +05:30
Corentin Forler
665645721b fix: Fix fieldtype in UnReconcile dialog 2025-03-31 13:54:51 +02:00
Corentin Forler
f2cfb03c2c fix: Translate UnReconcile dialog title 2025-03-31 13:51:47 +02:00
rohitwaghchaure
c7db13c275 Merge pull request #46815 from rohitwaghchaure/fixed-support-35177
feat: allow UOMs to select for which conversion rate defined in item
2025-03-31 16:22:17 +05:30
Rohit Waghchaure
b1dfbbe85e feat: allow UOMs to select for which converstion rate defined in item master 2025-03-31 15:53:55 +05:30
Vishakh Desai
3a9dca0563 Merge pull request #46812 from vishakhdesai/fix-taxes-and-totals
fix: revert resetting `rounding_adjustment`
2025-03-31 10:23:13 +00:00
Vishakh Desai
f25bf6dbd2 fix: improved rounding adjustment when applying discount (#46720)
* fix: rounding adjustment in apply_discount_amount taxes_and_totals

* refactor: minor changes

* fix: set the rounding difference while calculating tax total in the last tax row and add test case

* fix: failing test case

* fix: made changes in get_total_for_discount_amount in taxes_and_totals

* fix: failing test cases

* fix: changes as per review

* refactor: remove unnecessary use of flt

* refactor: improve logic

* refactor: minor change

* refactor: minor changes

* fix: add a test case for applying discount with previous row total in taxes

* fix: failing test case

* refactor: flatter code, remove `flt` usage for accuracy

---------

Co-authored-by: Sagar Vora <sagar@resilient.tech>
2025-03-31 09:25:09 +00:00
Rohit Waghchaure
bad901e7da fix: condition to update the last puurchase rate 2025-03-31 14:23:47 +05:30
rohitwaghchaure
1e780945e8 Merge pull request #46806 from rohitwaghchaure/fixed-suupport-35020
feat: option to recreate Stock Ledger Entries against stock transactions
2025-03-31 14:13:35 +05:30
Marc Ramser
21b8ad6aa5 feat(regional): Address Template for Germany & Add Switzerland Template (#46737)
* Add Address template for Switzerland

* Fix address template for germany

If an ERPNext instance is set to German and used by a business outside Germany (e.g., in Switzerland or Austria), customer addresses in Germany are displayed in their national format. However, for postal services, the international format (including the country) is required.".

This is just a workaround. IMHO the correct fix would be to check where the company is located and based on that use the national or the international template.
2025-03-31 10:32:36 +02:00
Rohit Waghchaure
218dbd6911 feat: option to recreate Stock Ledger Entries against stock transactions 2025-03-31 13:48:21 +05:30
ljain112
aadda9f606 fix: update outstanding with precision 2025-03-31 12:37:28 +05:30
Vishakh Desai
646cf54679 fix: multiple Bank Reconciliation Tool issues (#46644)
* fix: bank reconciliation tool issue

* refactor: separate Bank Transaction linking from other logic

* fix: delink old pe on update_after_submit in bank transaction

* fix: failing test case fixed

* fix: changes as per review

* refactor: rename `gles` to `gl_entries`

---------

Co-authored-by: Sagar Vora <sagar@resilient.tech>
2025-03-31 05:55:41 +00:00
rohitwaghchaure
9aff191bb1 Merge pull request #46801 from rohitwaghchaure/fixed-ux-for-job-card
fix: UX for partial job card completion
2025-03-30 22:51:30 +05:30
Rohit Waghchaure
8e8a724d82 fix: UX for partial job card completion 2025-03-30 19:01:15 +05:30
Frappe PR Bot
6df932f789 chore: update POT file (#46798) 2025-03-30 13:25:09 +02:00
iamkhanraheel
19279dffea fix: change cur_frm to frm 2025-03-29 16:41:28 +05:30
Sugesh393
a393195866 test: add unit test to validate tax values in Purchase Order from Sales Order 2025-03-29 15:35:01 +05:30
Sugesh393
1e18569be7 fix: map tax table while creating purchase order from sales order 2025-03-29 15:34:22 +05:30
MohsinAli
732e950265 fix: correct mapping(schedule_date) sales order to material request 2025-03-29 11:03:24 +05:30
iamkhanraheel
4284701442 refactor: remove print func 2025-03-29 06:15:22 +05:30
iamkhanraheel
3a4ba0c790 fix: fetch customer related data in making payment entry from customer 2025-03-29 03:59:57 +05:30
rohitwaghchaure
f55e8d1f4a Merge pull request #46777 from rohitwaghchaure/fixed-support-33851-1
fix: incorrect condition
2025-03-28 23:48:07 +05:30
rohitwaghchaure
b93957197e Merge pull request #46775 from rohitwaghchaure/fixed-support-34440
fix: for deadlock issue keep status as In Progress
2025-03-28 23:45:25 +05:30
rohitwaghchaure
dc75a385b7 Merge pull request #46760 from rohitwaghchaure/fixed-support-29324
fix: valuation rate not updating for raw materials
2025-03-28 23:44:42 +05:30
Rohit Waghchaure
0c1a8e9c58 fix: incorrect condition 2025-03-28 23:43:25 +05:30
Corentin Forler
bb864c8345 feat: Show past events and todos in crm_activities 2025-03-28 14:07:45 +01:00
Abdeali Chharchhodawala
8c9d630ee4 Merge pull request #46683 from Abdeali099/set-employee-contact-details
fix: Set complete contact details for `Employee` in PE
2025-03-28 18:17:47 +05:30
ljain112
c2bdd30e6d fix: correct outstanding amount for invoice in dunning 2025-03-28 13:26:28 +05:30
Rohit Waghchaure
e6ff7f0e9f fix: for deadlock issue keep status as In Progress 2025-03-28 13:10:12 +05:30
Diptanil Saha
45b45efee5 fix: pos button and on hover color (#46762)
* fix: pos button and on hover color

Changed the POS 'New Order' button color to frappe's color scheme and fixed the on hover text color on 'Toggle Recent Orders'

* fix: on hover text unreadable in dark mode
2025-03-28 08:54:51 +05:30
venkat102
7bf1a39861 fix: update payment amount if automatically_fetch_payment_terms is enabled 2025-03-27 22:28:20 +05:30
Rohit Waghchaure
5af8378471 fix: valuation rate not updating for raw materials 2025-03-27 21:32:38 +05:30
Mihir Kandoi
036af54d54 refactor: split and clean execute function to be more readable 2025-03-27 21:10:03 +05:30
Mihir Kandoi
668fdc8f92 fix: remove incorrect default field 2025-03-27 20:56:05 +05:30
ruthra kumar
11800e3cd8 Merge pull request #46719 from ljain112/fix-val-contact
fix: do not use self object for setting party and party type
2025-03-27 11:07:41 +05:30
venkat102
35fbbc2057 fix: include auto_reconcile_vouchers flag in background job 2025-03-27 01:04:38 +05:30
rohitwaghchaure
6275b236ee Merge pull request #46739 from rohitwaghchaure/fixed-support-34851
fix: slow query
2025-03-26 22:08:53 +05:30
Rohit Waghchaure
5ddb36af87 fix: slow query 2025-03-26 21:50:18 +05:30
Frappe PR Bot
d35ae3ef5e fix: sync translations from crowdin (#46738)
* fix: French translations

* fix: Chinese Simplified translations
2025-03-26 16:43:53 +01:00
rohitwaghchaure
b9d70e2ea4 Merge pull request #46732 from rohitwaghchaure/fixed-job-card-hours-issue
fix: not able to set hours manually in job card
2025-03-26 15:54:31 +05:30
rohitwaghchaure
cf2d67f145 Merge pull request #46733 from rohitwaghchaure/fixed-support-34788
fix: decimal values causing incorrect batch picking
2025-03-26 15:42:47 +05:30
Rohit Waghchaure
338b09debb fix: not able to set hours manually in job card 2025-03-26 15:38:44 +05:30
Rohit Waghchaure
7bfe703b04 fix: decimal values causing incorrect batch picking 2025-03-26 15:20:21 +05:30
Mihir Kandoi
26de902496 perf: take query out of loop 2025-03-26 14:39:45 +05:30
rohitwaghchaure
1d8c252ee7 Merge pull request #46710 from rohitwaghchaure/fixed-support-34516
fix: expense account in the stock entry
2025-03-26 11:59:14 +05:30
Dany Robert
d04dbd8ed9 fix: update posting date before running validations 2025-03-26 11:37:35 +05:30
rethik
31e59354c9 fix: use docstatus for status filter 2025-03-26 11:10:08 +05:30
Frappe PR Bot
9d2f9ad4c0 fix: sync translations from crowdin (#46724)
* fix: Swedish translations

* fix: Chinese Simplified translations
2025-03-25 18:21:18 +01:00
ljain112
80b746d4dd fix: do not use self object for setting party and party type 2025-03-25 17:51:41 +05:30
rohitwaghchaure
e2412072d9 Merge pull request #46718 from rohitwaghchaure/fixed-github-46708
fix: disable use multi level BOM for track Semi Finished Goods
2025-03-25 17:29:08 +05:30
Rohit Waghchaure
bf3b0d607f fix: disable use multi level BOM for track Semi Finished Goods 2025-03-25 17:24:48 +05:30
barredterra
638d825d8c feat(Customer): add Dunning to dashboard 2025-03-25 11:12:35 +01:00
ljain112
f4bc1dfd00 fix: user permissions in sales and purchase report 2025-03-25 14:15:24 +05:30
ruthra kumar
435bb1c7b0 Merge pull request #46616 from ljain112/conversion-rate
fix: do not validate if conversion rate is 1 for different currency
2025-03-25 14:11:21 +05:30
Rohit Waghchaure
89569d4b32 fix: expense account in the stock entry 2025-03-25 13:41:27 +05:30
ruthra kumar
a88259591b Merge pull request #46617 from ljain112/fix-ui-sales
refactor: removed redundant message display for each item row cost center update
2025-03-25 12:15:43 +05:30
ruthra kumar
a8ed8b26f1 Merge pull request #46622 from ljain112/feat-pr-acc-repost
feat: repost accounting ledger for purchase receipt
2025-03-25 11:48:33 +05:30
Frappe PR Bot
9af130598a fix: sync translations from crowdin (#46698)
* fix: French translations

* fix: Spanish translations

* fix: Arabic translations

* fix: Hungarian translations

* fix: Polish translations

* fix: Russian translations

* fix: Swedish translations

* fix: Turkish translations

* fix: Chinese Simplified translations

* fix: Persian translations

* fix: Bosnian translations

* fix: German translations

* fix: Esperanto translations

* fix: Portuguese, Brazilian translations

* fix: Thai translations

* fix: Croatian translations
2025-03-24 16:54:40 +01:00
Raffael Meyer
eb350012b0 ci: apply label "skip-release-notes" based on PR title (#46694)
Workflow copied from frappe/frappe
2025-03-24 15:22:17 +00:00
Raffael Meyer
70d9db7557 ci: invert language mapping (#46693)
* ci: invert language mapping

* ci: add skip-release-notes on crowdin PRs
2025-03-24 16:17:51 +01:00
barredterra
56a0c4642f ci: add skip-release-notes on crowdin PRs 2025-03-24 16:05:13 +01:00
barredterra
41f2b136d5 ci: invert language mapping 2025-03-24 16:04:17 +01:00
Raffael Meyer
9a8f0f3aef ci: fix language code mapping (#46692)
* ci: fix language code mapping

Keys are expected to be not the locale_with_underscore but the codes according to https://support.crowdin.com/developer/language-codes/

* chore: remove redundant translation files
2025-03-24 13:35:35 +00:00
Sagar Vora
d35a533d8b Merge pull request #46669 from vishakhdesai/bank-clearance-fix
fix: don't filter payment entries on Bank Account in Payment Clearance
2025-03-24 17:49:02 +05:30
ruthra kumar
ea224e131c Merge pull request #46577 from ljain112/jv-ccl
fix: customer credit limit check based on `bypass_credit_limit_check` in Journal Entry
2025-03-24 13:30:42 +05:30
ruthra kumar
8f647b4172 Merge pull request #46574 from ljain112/fix-order-payment-reco
fix: correct invoice order in payment reconcillaiton
2025-03-24 12:23:22 +05:30
ruthra kumar
9c82f4bb0f Merge pull request #46440 from aerele/payable-receivable-report
fix: add base_outstanding and base_paid_amount in payment schedule table
2025-03-24 11:43:57 +05:30
vishakhdesai
fa2fd5bf88 fix: don't filter payment entries on Bank Account in Payment Clearance 2025-03-24 11:23:53 +05:30
ruthra kumar
eda0e2152d Merge pull request #46569 from barredterra/language_map
ci: configure language mapping for crowdin
2025-03-24 10:39:34 +05:30
ruthra kumar
becb53ba5d Merge pull request #46518 from barredterra/so-set-deliver_date
fix(Sales Order): make `set_missing_values` set delivery date in item rows
2025-03-24 10:09:40 +05:30
ruthra kumar
03fde2c039 Merge pull request #46386 from FHenry/dev_whitelist_getchart
feat(accounting/regional): allow chart_of_account.get_chart to be whilelist
2025-03-24 09:59:07 +05:30
Khushi Rawat
eec2e7e833 fix: correct accumulated depreciation calculation for disposed assets (#46660) 2025-03-23 18:38:06 +05:30
Frappe PR Bot
93bd9a40cd chore: update POT file (#46659) 2025-03-23 11:05:00 +01:00
Sruthy
361a55a703 chore: adjusted dimension placement in Accounts Payable 2025-03-23 05:50:03 +00:00
HarryPaulo
b0dccadd26 fix: decimal garbage on variable total (#46621)
* fix: decimal dirty on variable total

* fix: linters

* fix: decimal garbage, code improvement
2025-03-21 14:14:16 +01:00
rohitwaghchaure
d3f8263890 Merge pull request #46642 from rohitwaghchaure/fixed-patch-table-issue
fix: patch
2025-03-21 18:08:17 +05:30
rohitwaghchaure
91c899f3f9 Merge pull request #46641 from rohitwaghchaure/fixed-rename-costing-timeout
perf: timeout while renaming cost center
2025-03-21 18:07:36 +05:30
Md Hussain Nagaria
e0f8e72c4d Merge pull request #46636 from frappe/fix-arg-usage
fix: unwired order_by argument in get_transaction_list
2025-03-21 15:47:25 +05:30
Rohit Waghchaure
e73570910c fix: patch 2025-03-21 15:31:20 +05:30
Rohit Waghchaure
92be7cbbbf perf: timeout while renaming cost center 2025-03-21 15:30:23 +05:30
ljain112
e84e49345a perf: refactored customer ledger summary for performance 2025-03-21 15:18:18 +05:30
venkat102
7785296573 test: validate payment schedule based on invoice amount 2025-03-21 13:18:19 +05:30
venkat102
5618859bd8 fix(payment term): allocate payment amount when payment term is fetched from order 2025-03-21 13:17:32 +05:30
Hussain Nagaria
2c1077d332 fix: unwired order_by argument
* lol on how it was updated from modified in both the places (version 15), but wasn't fixed
2025-03-21 11:38:41 +05:30
Raffael Meyer
2fd1d4d3ab Merge pull request #46627 from mihir-kandoi/date_added_to_wrong_patch
fix: date added to wrong patch
2025-03-20 19:25:05 +01:00
Bhavan23
7b0882600a test: add unit test to validate outstanding amount for update_outstanding_for_self checkbox enabled 2025-03-20 19:20:41 +05:30
Bhavan23
222f1834f1 fix(accounting): update outstanding amount based on update_outstanding_for_self
fix(accounting): against voucher has been already paid show proper message and update update_outstanding_for_self as 1
2025-03-20 19:19:47 +05:30
ljain112
913c60d77b fix: correct payment request amount 2025-03-20 19:10:36 +05:30
Mihir Kandoi
dc45c3b39c fix: date added to wrong patch 2025-03-20 15:55:33 +05:30
Abdeali Chharchhoda
85dd1dd4c7 fix: add Not Cancelled filter for payment_entry in Bank Transaction 2025-03-20 15:19:01 +05:30
Mihir Kandoi
80c17cc005 fix: remove get_items query.run outside of if condition 2025-03-20 15:17:59 +05:30
Abdeali Chharchhoda
257802aeda refactor: move payment_document query to setup 2025-03-20 15:12:06 +05:30
ljain112
b36e356469 feat: repost accounting ledger for purchase receipt 2025-03-20 13:25:53 +05:30
Mihir Kandoi
393434dfd9 fix: add fetch from to currency and set default to empty in item price 2025-03-19 20:32:27 +05:30
ljain112
4376ca5f1d refactor: removed redundant message display for each item row cost center update 2025-03-19 17:20:25 +05:30
ljain112
e8a66d03bc fix: do not validate if conversion rate is 1 for different currency 2025-03-19 16:52:13 +05:30
ruthra kumar
21e22b577a Merge pull request #46591 from ruthra-kumar/revert_to_json_for_test_records
Revert "chore(tests): move to compact, human readable, commentable to…
2025-03-19 16:50:14 +05:30
rohitwaghchaure
f2da369a07 Merge pull request #46608 from mihir-kandoi/st34183
fix: fetch bom_no when updating items in sales order
2025-03-19 15:44:22 +05:30
Mihir Kandoi
386df968c2 fix: remove duplicate 2025-03-19 15:25:50 +05:30
rohitwaghchaure
97debcb27b Merge pull request #46573 from mihir-kandoi/fix_set_landed_cost_based_on_pi
Fix set landed cost based on pi
2025-03-19 15:20:45 +05:30
Marc Ramser
f4aba561ce feat(projects): add option to hide timesheets for project users (#46173)
* feat: add option to hide timesheets for project users

* Added a new "Hide timesheets" checkbox field to Project User doctype that allows to control timesheet visibility for specific users. When enabled, the timesheets section will not be displayed on the project page for that user.

* Update projects.html
2025-03-19 13:34:15 +05:30
rohitwaghchaure
eb7cf2608c Merge pull request #46595 from rohitwaghchaure/fixed-support-34185
fix: not able to make PR against stand alone Debit Note
2025-03-19 13:34:01 +05:30
ruthra kumar
c2cf1d14e6 Merge pull request #46605 from yatridholakia/fix-broken-links
fix: broken Frappe School links
2025-03-19 13:12:43 +05:30
Mihir Kandoi
b3c400f998 fix: take function call outside loop 2025-03-19 13:04:08 +05:30
Mihir Kandoi
508727a57a fix: fetch bom_no when updating items in sales order 2025-03-19 12:52:34 +05:30
ruthra kumar
b1f15358dd Merge pull request #46596 from rohitwaghchaure/fixed-support-32083-2
fix: debit in transaction currency
2025-03-19 11:55:52 +05:30
Yatri Dholakia
343940a9f3 fix: broken Frappe School links 2025-03-19 04:20:20 +00:00
Rohit Waghchaure
e4acf20a62 fix: debit in transaction currency 2025-03-18 21:26:25 +05:30
Rohit Waghchaure
6a52c30591 fix: not able to make PR against stand alone Debit Note 2025-03-18 21:20:40 +05:30
rohitwaghchaure
0985441fc3 Merge pull request #46593 from rohitwaghchaure/fixed-batch-valuation-test-case
test: test case for FIFO batch valuation
2025-03-18 19:19:38 +05:30
Rohit Waghchaure
ad9ac1f058 test: test case for FIFO batch valuation 2025-03-18 18:41:57 +05:30
ruthra kumar
4683e03353 chore: include company in test record 2025-03-18 17:50:44 +05:30
rohitwaghchaure
57d7ac4954 Merge pull request #46588 from rohitwaghchaure/fixed-support-34111
fix: SABB validation for packed items
2025-03-18 17:31:39 +05:30
ruthra kumar
54d96f34f2 Revert "chore(tests): move to compact, human readable, commentable toml layout for test records"
This reverts commit bb917207c2.
2025-03-18 17:27:01 +05:30
rohitwaghchaure
327af0ceac Merge pull request #46579 from rohitwaghchaure/fixed-valuation-for-batch-ma
fix: valuation for moving average with batches
2025-03-18 16:33:36 +05:30
Rohit Waghchaure
3756bf231b fix: SABB validation for packed items 2025-03-18 16:28:31 +05:30
Khushi Rawat
29d77aa19f fix: repost future sle and gle after capitalization (#46576) 2025-03-18 15:59:58 +05:30
rohitwaghchaure
182b4ef266 Merge pull request #46554 from mihir-kandoi/fix_rename_sc_fields
fix: add validation to rename_subcontracting_fields patch
2025-03-18 15:59:09 +05:30
rohitwaghchaure
59f2302b77 Merge pull request #46575 from mihir-kandoi/st34161
fix: fetch quality inspection parameter group
2025-03-18 15:56:18 +05:30
Rohit Waghchaure
cdfbc73f4c fix: valuation for moving average with batches 2025-03-18 15:54:23 +05:30
Smit Vora
1e2f5940fd Merge pull request #46515 from vorasmit/fix-qty-conversion
fix: ensure qty conversion when creating production plan from SO
2025-03-18 14:24:49 +05:30
ljain112
8a84faebed fix: customer credit limit check based on bypass_credit_limit_check in Journal Entry 2025-03-18 14:16:35 +05:30
Mihir Kandoi
0a482c7ea8 fix: fetch quality inspection parameter group 2025-03-18 13:08:48 +05:30
ljain112
5c34a5aaed fix: correct invoice order in payment reconcillaiton 2025-03-18 12:49:29 +05:30
Mihir Kandoi
7e669c0728 fix: patch 2025-03-18 11:43:16 +05:30
Mihir Kandoi
75ab5f2bd0 fix: set landed cost based on purchase invoice rate 2025-03-18 11:22:46 +05:30
ruthra kumar
e1ba08a28d Merge pull request #46566 from ruthra-kumar/correct_account_currency_in_offset_account
fix: set correct currency for offset account gl entries
2025-03-18 11:14:04 +05:30
ruthra kumar
3eaa9bfca4 Merge pull request #46508 from ruthra-kumar/use_base_total_for_uae_report
fix: use base currency total for UAE VAT 201 report
2025-03-18 10:58:58 +05:30
barredterra
c6cfbd7a65 chore: remove redundant translation files 2025-03-17 23:52:34 +01:00
barredterra
efeab38199 ci: configure language mapping for crowdin 2025-03-17 23:42:47 +01:00
marination
bf62f9ad57 fix: Headline rendered twice on first save
- `refresh` gets triggered twice and that renders the note twice
- Remove any existing note before rendering
2025-03-17 19:26:45 +01:00
marination
0447c7be0a fix: Treat rows as Unit Price rows only until the qty is 0
- The unit price check should depend on the row qty being 0
- Once the row ceases to be 0, it is treated as an ordinary row
- test: PO, SO and Quotation
2025-03-17 19:17:14 +01:00
ruthra kumar
c32e11e69d fix: set correct currency for offset account gl entries 2025-03-17 20:28:34 +05:30
Ejaaz Khan
dd214fedd8 Merge pull request #46564 from iamejaaz/remove-default-print
refactor: remove default print format from sales invoice
2025-03-17 20:07:07 +05:30
Ejaaz Khan
f10d1f2b1f refactor: remove default print format from sales invoice 2025-03-17 19:34:04 +05:30
ruthra kumar
a70354a0a4 Merge pull request #46563 from frappe/l10n_develop
fix: sync translations from crowdin
2025-03-17 17:08:42 +05:30
Frappe PR Bot
c7ad7eecbb fix: Croatian translations 2025-03-17 16:56:17 +05:30
Frappe PR Bot
4687ba22d4 fix: Bosnian translations 2025-03-17 16:56:04 +05:30
Frappe PR Bot
b25e0bd2b0 fix: Persian translations 2025-03-17 16:55:59 +05:30
Frappe PR Bot
ca1eec355c fix: Swedish translations 2025-03-17 16:55:50 +05:30
Frappe PR Bot
addc26fb2b fix: French translations 2025-03-17 16:55:33 +05:30
ruthra kumar
88ec083e4c Merge pull request #46557 from aerele/transaction-deletion-record
fix(Transaction Deletion Record): sql syntax error while deleting lead address
2025-03-17 16:37:41 +05:30
rohitwaghchaure
798664dfbf Merge pull request #46555 from rohitwaghchaure/fixed-support-33798
fix: performance issue for item list view
2025-03-17 16:36:53 +05:30
rohitwaghchaure
368892a82f Merge pull request #46553 from rohitwaghchaure/fixed-bom-uom
fix: not able to select the item in the BOM
2025-03-17 16:35:19 +05:30
rohitwaghchaure
173a954d8c Merge pull request #46552 from rohitwaghchaure/fixed-support-32083-1
fix: Debit and Credit not equal for Purchase Invoice
2025-03-17 16:34:51 +05:30
venkat102
af0d6eeae8 fix(Transaction Deletion Record): sql syntax error while fetching lead address 2025-03-17 16:13:42 +05:30
ruthra kumar
b666b8bbd4 Merge pull request #46539 from frappe/l10n_develop
fix: sync translations from crowdin
2025-03-17 15:13:45 +05:30
Rohit Waghchaure
d758fde881 fix: performance issue for item list view 2025-03-17 13:48:14 +05:30
Mihir Kandoi
6c3117dc0d fix: add validation to rename_subcontracting_fields patch 2025-03-17 13:11:46 +05:30
Rohit Waghchaure
96d0cd23f1 fix: not able to select the item in the BOM 2025-03-17 13:00:32 +05:30
Rohit Waghchaure
ecb31b7c9f fix: Debit and Credit not equal for Purchase Invoice 2025-03-17 12:57:44 +05:30
Ankush Menat
e47a87839b perf: faster count estimation (#46550)
These count queries themselves take quite a long time. `estimate_count`
uses info_schema stats to guess the time.

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2025-03-17 07:09:21 +00:00
rohitwaghchaure
90b6e00237 Merge pull request #46504 from rohitwaghchaure/fixed-support-33851
fix: dashboard link for QC from PR
2025-03-17 10:06:09 +05:30
Frappe PR Bot
ba50d01f6b fix: Croatian translations 2025-03-16 16:37:39 +05:30
Frappe PR Bot
5c5b29745b fix: Thai translations 2025-03-16 16:37:36 +05:30
Frappe PR Bot
350c4e5d9f fix: Portuguese, Brazilian translations 2025-03-16 16:37:33 +05:30
Frappe PR Bot
b68627240c fix: Esperanto translations 2025-03-16 16:37:31 +05:30
Frappe PR Bot
06732da687 fix: German translations 2025-03-16 16:37:28 +05:30
Frappe PR Bot
3fbbf5a609 fix: Bosnian translations 2025-03-16 16:37:24 +05:30
Frappe PR Bot
0e593fddf4 fix: Persian translations 2025-03-16 16:37:21 +05:30
Frappe PR Bot
a0d50e146e fix: Chinese Simplified translations 2025-03-16 16:37:17 +05:30
Frappe PR Bot
a3f3724fc6 fix: Turkish translations 2025-03-16 16:37:15 +05:30
Frappe PR Bot
0c58b2cf7e fix: Swedish translations 2025-03-16 16:37:12 +05:30
Frappe PR Bot
a536400a0c fix: Russian translations 2025-03-16 16:37:09 +05:30
Frappe PR Bot
825e8325eb fix: Polish translations 2025-03-16 16:37:06 +05:30
Frappe PR Bot
84889718ca fix: Hungarian translations 2025-03-16 16:37:03 +05:30
Frappe PR Bot
a30a5ce645 fix: Arabic translations 2025-03-16 16:37:00 +05:30
Frappe PR Bot
eaa386da2f fix: Spanish translations 2025-03-16 16:36:57 +05:30
Frappe PR Bot
63129cecf3 fix: French translations 2025-03-16 16:36:54 +05:30
Raffael Meyer
43791abdd3 Merge pull request #46545 from frappe/pot_develop_2025-03-16
chore: update POT file
2025-03-16 11:49:00 +01:00
frappe-pr-bot
40a84a3dfb chore: update POT file 2025-03-16 09:34:53 +00:00
Frappe PR Bot
0821a46302 fix: Bosnian translations 2025-03-15 16:33:06 +05:30
Frappe PR Bot
b21a823cc4 fix: Persian translations 2025-03-15 16:33:02 +05:30
Sagar Vora
e5fdbeefc3 Merge pull request #46536 from sagarvora/remove-init
chore: remove unnecessary init method
2025-03-15 11:55:36 +05:30
Sagar Vora
52ef4f38fe chore: remove unnecessary init method 2025-03-15 11:41:40 +05:30
Sagar Vora
dd8956a3cf Merge pull request #46531 from sagarvora/perf/mariadb-2
ci: use `mysqlclient` in tests
2025-03-15 10:01:22 +05:30
Sagar Vora
25623325ce ci: use mysqlclient in tests 2025-03-15 09:48:40 +05:30
Sagar Vora
70aa9e5f50 Merge pull request #46533 from sagarvora/fix-dupl-se
fix: exclude current doc when checking for duplicate
2025-03-15 00:06:33 +05:30
Sagar Vora
d8ef5e4d58 fix: exclude current doc when checking for duplicate 2025-03-14 23:51:30 +05:30
marination
55981c8358 test: Sales Order + fix: Mapping of Items from Quotation & SO 2025-03-14 18:54:11 +01:00
marination
eea758f5b2 test: Purchase Order with Unit Price Items
- chore: Fix error message in accounts controller
2025-03-14 18:00:40 +01:00
Raffael Meyer
3be570b44a Merge pull request #45924 from PatrickDEissler/develop
fix(Employee): remove User Permissions if create_user_permission is unchecked
2025-03-14 13:57:42 +01:00
Shariq Ansari
3c7583495e Merge pull request #46529 from shariquerik/handle-party-type-erpenxt-crm-integration
fix: also consider CRM Deal as party type for ERPNext CRM Integration
2025-03-14 16:03:03 +05:30
Shariq Ansari
f59620fd55 Merge branch 'develop' into handle-party-type-erpenxt-crm-integration 2025-03-14 16:00:42 +05:30
Shariq Ansari
04edbf7efe fix: also consider CRM Deal as party type for ERPNext CRM Integration 2025-03-14 15:54:03 +05:30
Mihir Kandoi
c7e7da6500 Merge pull request #46513 from mihir-kandoi/46043
fix: get bom_no from sales order item and material request item
2025-03-14 13:05:36 +05:30
Mihir Kandoi
1b560ce949 Merge pull request #46514 from mihir-kandoi/46060
fix: UOM conversion error when creating pick list from material trans…
2025-03-14 12:42:17 +05:30
Mihir Kandoi
8bb2a15732 Merge pull request #46512 from mihir-kandoi/hide_subcontracted_qty_field
fix: hide subcontracted qty field if PO is not subcontracted
2025-03-14 12:41:22 +05:30
ruthra kumar
e80129627a test: report ouput on foreign currency PI 2025-03-14 11:50:16 +05:30
ruthra kumar
229147a434 Merge pull request #46497 from Sanket322/use_party_explicitly
fix: use `party` explicitly instead of party_field
2025-03-14 10:21:35 +05:30
ruthra kumar
784e61e3e9 Merge pull request #46488 from aerele/validate-address-contact-permission
refactor: replace get_list with get_all for dynamic link child access
2025-03-14 09:51:03 +05:30
ruthra kumar
e6a3a19641 Merge pull request #46519 from frappe/l10n_develop
fix: sync translations from crowdin
2025-03-14 09:28:15 +05:30
Frappe PR Bot
3adb9eefd7 fix: Persian translations 2025-03-14 07:17:18 +05:30
barredterra
fc279c85bd fix(Sales Order): make set_missing_values set delivery date in item rows 2025-03-13 18:56:59 +01:00
Mihir Kandoi
8411e2e01f fix: wrong field mapping 2025-03-13 20:19:47 +05:30
Mihir Kandoi
840ea070a9 fix: UOM conversion error when creating pick list from material transfer request 2025-03-13 18:33:39 +05:30
Smit Vora
75882cc81c fix: ensure qty conversion when creating production plan from SO 2025-03-13 18:33:22 +05:30
Mihir Kandoi
ac354505ef fix: get bom_no from sales order item and material request item 2025-03-13 18:11:20 +05:30
Mihir Kandoi
6e8521d761 fix: hide subcontracted qty field if PO is not subcontracted 2025-03-13 17:28:48 +05:30
ruthra kumar
46f4babcd0 fix: use base currency total 2025-03-13 14:23:51 +05:30
Diptanil Saha
0552209310 refactor: print receipt on order complete on pos (#46501) 2025-03-13 14:22:05 +05:30
Rohit Waghchaure
551f89f14b fix: dashboard link for QC from PR 2025-03-13 13:50:25 +05:30
mergify[bot]
378a554ea2 fix: add parenttype condition to payment schedule query in accounts receivable report (backport #46370) 2025-03-13 12:00:29 +05:30
Sanket322
5057e3fe30 fix: use party explicitly 2025-03-13 11:29:20 +05:30
ruthra kumar
6572fba435 Merge pull request #46494 from frappe/l10n_develop
fix: sync translations from crowdin
2025-03-13 08:42:29 +05:30
ruthra kumar
f2a709f953 Merge pull request #46491 from cogk/fix-disable-and-rename-project-template
feat: Allow disabling and renaming Project Template
2025-03-13 08:42:19 +05:30
Frappe PR Bot
0ba9712935 fix: Croatian translations 2025-03-13 06:56:54 +05:30
Frappe PR Bot
cc2ce30bd4 fix: Bosnian translations 2025-03-13 06:56:48 +05:30
Frappe PR Bot
d9662959d2 fix: Persian translations 2025-03-13 06:56:44 +05:30
marination
8f96c0b546 test: Zero Qty in RFQ and Supplier Quotation 2025-03-12 18:42:12 +01:00
Sanket Shah
38955af802 fix: using in for lookup in list instead of directly assigning (#46492)
fix: using in for lookup in list instead of assigning

Co-authored-by: Sanket322 <shahsanket322003.com>
2025-03-12 22:37:08 +05:30
Corentin Forler
43303f2cf6 feat: Allow disabling and renaming Project Template 2025-03-12 14:27:44 +01:00
Sugesh393
8f7f0b81f6 refactor: replace get_list with get_all for dynamic link child access 2025-03-12 17:54:39 +05:30
ruthra kumar
95b8355cff Merge pull request #46251 from aerele/fix/bank-reconciliation-timeout
fix(bank-reconciliation): run bank reconciliation as a background job
2025-03-12 17:20:06 +05:30
Sugesh G
f8c659d8d5 fix: pricing rule not ignored in Sales Order (#46248)
* fix: pricing rule not ignored in Sales Order

* test: update parameter do_not_submit to do_not_save
2025-03-12 16:27:48 +05:30
Mihir Kandoi
08c7e8a602 feat: add is_transporter filter to supplier field in purchase invoice… (#46430)
* feat: add is_transporter filter to supplier field in purchase invoice and receipt

* fix: add filter to purchase order as well
2025-03-12 16:24:57 +05:30
Priyansh Shah
d371236684 fix: validations and account type filter for Tax Withholding Category (#46207)
fix: validations and account type filter for tax withholding category
2025-03-12 16:21:12 +05:30
Bhavansathru
ba96c86576 fix(invoice):validate return invoice qty (#46451)
* fix(invoice): validate return quantity when update stock is unchecked

* test: add unit test for validating fully returned invoice quantity
2025-03-12 16:19:24 +05:30
Sugesh G
0bdb81db53 fix: use shipping_address_name for address validation in sales invoice (#46473)
* fix: validate address and contact related to party

* fix: solve unboundlocal error

* refactor: improve variable scope

* refactor: translatable strings

* fix: use shipping_address_name for address validation in sales invoice

* test: add new unit test for address and contact validation

* chore: to avoid keyerror

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
2025-03-12 16:13:35 +05:30
Sudharsanan Ashok
9e808c832f fix: calculate due date based on payment term (#46416) 2025-03-12 16:10:14 +05:30
Mihir Kandoi
41c93c8832 fix: return None if document does not have status field in get_status… (#46415)
* fix: return None if document does not have status field in get_status function

* chore: add comment
2025-03-12 16:05:08 +05:30
Mihir Kandoi
67e9389a02 fix: error when creating delivery note from pick list (#46417) 2025-03-12 15:27:47 +05:30
Mihir Kandoi
5a72edcb82 fix: enable no copy for serial no field (#46381)
* fix: enable no copy for serial no field

* fix: remove no copy from serial no field of purchase receipt item

* fix: remove no copy from serial no field of delivery note item

* Revert "fix: remove no copy from serial no field of purchase receipt item"

This reverts commit 5d1752030b.

---------

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2025-03-12 15:11:55 +05:30
rohitwaghchaure
b6c0448075 Merge pull request #46470 from rohitwaghchaure/fixed-support-33560
fix: do not recalculate qty for batch items during reposting
2025-03-12 12:17:07 +05:30
Frappe PR Bot
b270140e61 fix: sync translations from crowdin (#46435)
* fix: French translations

* fix: Spanish translations

* fix: Arabic translations

* fix: Hungarian translations

* fix: Polish translations

* fix: Russian translations

* fix: Swedish translations

* fix: Turkish translations

* fix: Chinese Simplified translations

* fix: Persian translations

* fix: Bosnian translations

* fix: German translations

* fix: Esperanto translations

* fix: Portuguese, Brazilian translations

* fix: Thai translations

* fix: Croatian translations

* fix: Chinese Simplified translations

* fix: Bosnian translations
2025-03-12 10:49:50 +05:30
Rohit Waghchaure
0753c018d2 fix: do not recalculate qty for batch items during reposting 2025-03-12 10:49:21 +05:30
Venkatesh
b72f6f5a3d fix(payment entry): fetch default bank account based on company (#46379) 2025-03-12 10:49:13 +05:30
Diptanil Saha
8ba4ac3b86 fix: credit note creation during pos invoice consolidation (#46277)
* fix: credit note creation during pos invoice consolidation

* fix: added check to skip merging empty list of return pos invoices

* fix: sql query

* fix: using return invoice name instead of return invoice object

* fix: added pos invoice field in sales invoice item
2025-03-12 10:44:21 +05:30
Dany Robert
0a5ca0c35f fix: validate last_gl_update exists before comparing (#46464) 2025-03-12 10:36:50 +05:30
Mihir Kandoi
8bce42e633 fix: rename sla fields patch (#46465)
* fix: rename sla fields patch

* fix: rerun patch
2025-03-12 10:34:20 +05:30
Mihir Kandoi
6f010915fe Merge pull request #46424 from mihir-kandoi/45440
fix: show remaining qty on 'Complete Job' button instead of full qty
2025-03-12 00:30:55 +05:30
Mihir Kandoi
52b76736d3 Merge pull request #46455 from mihir-kandoi/fix_production_analytics
fix: error in production analytics report
2025-03-12 00:29:41 +05:30
Mihir Kandoi
f5d5508035 Merge pull request #46460 from mihir-kandoi/fix_rename_sle_fields_2
fix: rename sla fields patch
2025-03-12 00:26:35 +05:30
Mihir Kandoi
b6c18849c5 fix: rename sla fields patch 2025-03-12 00:03:08 +05:30
rohitwaghchaure
c1a8de9fcd Merge pull request #46452 from mihir-kandoi/fix_sla_fields_patch
fix: sla fields patch
2025-03-11 23:37:10 +05:30
Raffael Meyer
f1398a50e7 Merge pull request #46453 from barredterra/ignore-release-label
ci: ignore PRs labeled with "skip-release-notes" when generating release notes
2025-03-11 17:34:09 +01:00
Mihir Kandoi
03e66468f6 fix: error in production analytics report 2025-03-11 22:02:23 +05:30
barredterra
57007bf937 ci: ignore PRs labeled with "skip-release-notes" when generating release notes 2025-03-11 17:11:35 +01:00
Mihir Kandoi
d653899372 fix: sla fields patch 2025-03-11 21:18:18 +05:30
ruthra kumar
74208a3e06 Merge pull request #46448 from frappe/revert-45958-validate-party-address
Revert "fix: validate address and contact related to party"
2025-03-11 18:12:42 +05:30
ruthra kumar
b81ad55acd Merge pull request #46398 from aerele/coa-name-fix
chore: rename print and stationery account
2025-03-11 17:32:20 +05:30
ruthra kumar
24e4d92202 Revert "Merge pull request #45958 from aerele/validate-party-address"
This reverts commit 18fdd17e94.
2025-03-11 17:30:52 +05:30
ruthra kumar
44835126db Merge pull request #46344 from aerele/e-invoicing-regional-validation
fix: make 'company_tax_id' and 'company_fiscal_code' as mandatory
2025-03-11 17:11:26 +05:30
ruthra kumar
121798ba85 chore: translatable strings 2025-03-11 16:55:04 +05:30
ruthra kumar
a2881b5be0 Merge pull request #45818 from vishakhdesai/set-correct-account-currency-deferred-expense
fix: set correct account currency for deferred expense account
2025-03-11 16:35:19 +05:30
vishakhdesai
398083853c fix: set correct account currency for deferred expence account in PI 2025-03-11 15:33:36 +05:30
Sugesh G
18fdd17e94 Merge pull request #45958 from aerele/validate-party-address
fix: validate address and contact related to party
2025-03-11 14:28:23 +05:30
rohitwaghchaure
9b7e936169 Merge pull request #46436 from rohitwaghchaure/fixed-support-32871-1
fix: filter batches that going to be zero
2025-03-11 13:31:40 +05:30
Sugesh393
7e92e4967a fix: add patch to update base_outstanding and base_paid_amount 2025-03-11 11:52:42 +05:30
Sugesh393
6c2f9a563e fix: add base_outstanding and base_paid_amount in payment schedule table 2025-03-11 11:49:35 +05:30
ruthra kumar
66d5aab8ac Merge pull request #46372 from aerele/update-account-number
fix(account): update account number from parent company
2025-03-11 11:01:08 +05:30
ruthra kumar
9dd801ff3b Merge pull request #46426 from asmitahase/employee-tree
fix: clear cashe on employee hierarchy change
2025-03-11 10:41:46 +05:30
Rohit Waghchaure
aba512c1c6 fix: filter batches that going to be zero 2025-03-11 10:13:34 +05:30
Raffael Meyer
c962b2e97b Merge pull request #45955 from barredterra/buying-translatability
refactor: improve translatability in buying controller
2025-03-11 02:07:12 +01:00
Raffael Meyer
5caef24335 chore: fix file naming for Crowdin integration (#46434) 2025-03-11 01:03:56 +00:00
rohitwaghchaure
7a584d3228 Merge pull request #46427 from frappe/mergify/bp/develop/pr-46414
fix: not able to save work order with alternative item (backport #46414)
2025-03-10 23:14:05 +05:30
Frappe PR Bot
04e9134016 fix: sync translations from crowdin (#46394)
* fix: Croatian translations

* fix: Bosnian translations

* fix: Croatian translations

* fix: French translations

* fix: Spanish translations

* fix: Arabic translations

* fix: Hungarian translations

* fix: Polish translations

* fix: Russian translations

* fix: Swedish translations

* fix: Turkish translations

* fix: Chinese Simplified translations

* fix: Persian translations

* fix: Bosnian translations

* fix: German translations

* fix: Esperanto translations

* fix: Portuguese, Brazilian translations

* fix: Thai translations

* fix: Croatian translations
2025-03-10 13:43:58 +01:00
Rohit Waghchaure
ac7fc608aa fix: not able to save work order with alternative item
(cherry picked from commit 6ca1f9bc73)
2025-03-10 12:10:54 +00:00
Asmita Hase
6789578b27 fix: clear cashe on employee hierarchy change to reflect updated permissions 2025-03-10 17:06:03 +05:30
ruthra kumar
3376f37012 Merge pull request #46423 from frappe/revert-46172-credit_note_column
Revert "fix: Show Credit Note amount in credit note column"
2025-03-10 16:56:31 +05:30
ruthra kumar
9aacd90633 Merge pull request #46407 from mahsem/typo_sales_invoice_print
fix: typo in sales_invoice_print
2025-03-10 16:47:27 +05:30
Mihir Kandoi
db93302a53 fix: show remaining qty on 'Complete Job' button instead of full qty 2025-03-10 16:44:16 +05:30
Akhil Narang
f9cac1c186 fix(README): recommend using .localhost instead of .dev (#46422)
All `.dev` domains have HSTS enforced by default and so require SSL to access.

`.localhost` hosts automatically resolve without requiring edits to hosts files

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
2025-03-10 16:27:01 +05:30
ruthra kumar
5a9767ca67 Revert "fix: Show Credit Note amount in credit note column" 2025-03-10 16:24:43 +05:30
rohitwaghchaure
9026b67333 Merge pull request #46418 from rohitwaghchaure/fixed-support-33273
fix: stock balance in and out value
2025-03-10 15:34:45 +05:30
Rohit Waghchaure
e917bd5334 fix: stock balance in and out value 2025-03-10 14:44:29 +05:30
ruthra kumar
98690c42b0 Merge pull request #46412 from ruthra-kumar/revert_mergify_and_lock_thread_changes
ci: re-enable label backports and decrease lock frequency
2025-03-10 08:47:05 +05:30
ruthra kumar
97733c8974 ci: re-enable label backports and decrease lock frequency 2025-03-10 08:31:22 +05:30
Frappe PR Bot
0afcf59ba1 chore: update POT file (#46406) 2025-03-09 11:50:11 +01:00
mahsem
f7bcae83e4 fix: typo in sales_invoice_print 2025-03-09 11:11:54 +01:00
rohitwaghchaure
0bd80f98a8 Merge pull request #46395 from mihir-kandoi/st33499
fix: consider account freeze date in recalculate_amount_difference_fi…
2025-03-08 20:20:52 +05:30
ruthra kumar
262798e319 Merge pull request #46401 from ruthra-kumar/fix_typo
chore: fix typo
2025-03-08 15:11:00 +05:30
ruthra kumar
a4c913a794 chore: fix typo 2025-03-08 14:54:11 +05:30
ruthra kumar
60379241d8 Merge pull request #46400 from ruthra-kumar/lock_frequently
ci: increase conversion lock frequency
2025-03-08 14:40:02 +05:30
ruthra kumar
ab8134aec6 ci: lock frequently 2025-03-08 14:21:11 +05:30
ruthra kumar
eca5a8e6ab Merge pull request #46399 from ruthra-kumar/temp_disable_label_backports
ci: temporarily disable label based backports
2025-03-08 13:37:06 +05:30
ruthra kumar
d2732e376c ci: temporarily disable label based backports 2025-03-08 13:20:44 +05:30
chethank1407
615997b774 chore: rename print and stationery account 2025-03-08 13:04:50 +05:30
ruthra kumar
f5d061d2dd Merge pull request #46064 from ruthra-kumar/transaction_currency_from_parent_document
fix: Debit and Credit mismatch on transaction currency debit and credit values
2025-03-08 12:05:13 +05:30
ruthra kumar
f1d8feec15 refactor: internal transfer gl 2025-03-08 11:45:12 +05:30
Mihir Kandoi
cd72532789 fix: consider stock freeze date in recalculate_amount_difference_field patch 2025-03-08 11:38:28 +05:30
Mihir Kandoi
696f931678 fix: consider account freeze date in recalculate_amount_difference_field patch 2025-03-08 11:31:33 +05:30
ruthra kumar
55d0636123 test: assert total debit and credit for trx currency 2025-03-08 09:35:08 +05:30
ruthra kumar
455a55b2ce refactor: handle rounding diff for trx currency dr and cr 2025-03-08 09:35:08 +05:30
ruthra kumar
4cd3f3531c refactor: trx currency dr and cr for tax rows and item rows 2025-03-08 09:35:08 +05:30
ruthra kumar
7528ef147a refactor: convert tax amount using exchange rate 2025-03-08 09:35:08 +05:30
ruthra kumar
6545467aec fix: incorrect category in list 2025-03-08 09:35:08 +05:30
ruthra kumar
bc792c61e9 chore: typo 2025-03-08 09:35:08 +05:30
ruthra kumar
b348aa3b37 refactor: isolate to specific doctypes 2025-03-08 09:35:08 +05:30
ruthra kumar
23d465805b refactor(test): save first to let the tax table populate 2025-03-08 09:35:08 +05:30
ruthra kumar
a31770d122 fix(test): incorrect transaction exchange rate in test case 2025-03-08 09:35:08 +05:30
ruthra kumar
ceca5b4c72 refactor: set transaction currency and rate before gl map 2025-03-08 09:35:08 +05:30
ruthra kumar
5c86e3ce85 refactor: handle payment entry 2025-03-08 09:35:08 +05:30
ruthra kumar
9f3847c0f8 refactor: handle Journal entries 2025-03-08 09:35:08 +05:30
ruthra kumar
d1d06885dc refactor: move utility method to controller 2025-03-08 09:35:08 +05:30
ruthra kumar
3e292ef2cb refactor: set transaction currency dr/cr in sales invoice 2025-03-08 09:35:08 +05:30
ruthra kumar
ee93ed8c97 refactor: handle stocked items 2025-03-08 09:35:08 +05:30
ruthra kumar
7ff3977394 refactor: handle stocked items 2025-03-08 09:35:08 +05:30
ruthra kumar
e9af567033 refactor: set tr currency dr & cr directly on parent document 2025-03-08 09:35:08 +05:30
ruthra kumar
b115bf2e2a refactor: use highest precision for storing exc rate 2025-03-08 09:35:08 +05:30
ruthra kumar
f5f138ef9d Merge pull request #46393 from ruthra-kumar/fix_error_on_internal_transfer_po_so
fix: attribute error on internal so and po
2025-03-08 09:30:14 +05:30
ruthra kumar
f585fd6b88 fix: attribute error on internal so and po 2025-03-08 09:14:36 +05:30
Florian HENRY
49dcd96909 feat(accounting): allow chart_of_account.get_chart to be whilelist 2025-03-07 12:29:51 +01:00
Mihir Kandoi
501f07803e refactor: import functions in new report instead of redundant code 2025-03-07 12:05:31 +05:30
Mihir Kandoi
5592d8e87f feat: available serial no report 2025-03-07 11:54:15 +05:30
maasanto
faa340c8b5 feat: Add first and last name fields to quick entry customer creation (#46281)
* feat: Add First and Last Name Fields to Quick Entry Customer Creation Form

* fix: added first and last_name fields to customer dt

* chore: linter issues

* chore: linter issue

* chore: linter issue

---------

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2025-03-07 10:31:45 +05:30
Mihir Kandoi
98111dac17 Merge pull request #46374 from mihir-kandoi/33265
fix: rare precision issue preventing submission of subcontracting order
2025-03-06 22:15:18 +05:30
Mihir Kandoi
33b71544db fix: rare precision issue preventing submission of subcontracting order 2025-03-06 20:58:08 +05:30
venkat102
4a4894bc01 fix(account): update account number from parent company 2025-03-06 18:33:53 +05:30
mergify[bot]
18832c057c fix: auto email report creation (backport #46343) (#46364)
fix: auto email report creation (#46343)

* fix(financial_statements): mandatory based on filter_based_on value

* fix(financial_statements.js): include options for multiselect

(cherry picked from commit 5cc251a172)

Co-authored-by: Justine Jay <jjaycaneza@gmail.com>
2025-03-06 18:12:42 +05:30
Bhavansathru
7b6ebad9e6 fix: validate accounting dimension company in Journal Entry & Stock Entry (#46204)
* fix: validate accounting dimension company in journal entry and stock entry

* test: update test cases to validate company-based accounting dimension

* fix(test): ensure 'Pick List' company matches 'Delivery Note' to prevent test failures

* chore: remove redundant lines of code
2025-03-06 17:51:20 +05:30
Ninad Parikh
d01367eefe fix: base_net_rate Required to Check Valid Range (#46332)
fix: base_net_rate required to check valid range
2025-03-06 17:34:25 +05:30
ruthra kumar
ba2f887be9 Merge pull request #46363 from ruthra-kumar/incorrect_yaml_format
ci: fix incorrect yaml format
2025-03-06 17:33:09 +05:30
Sanket Shah
606dcb0ad1 fix: change fieldname for cash_flow to export (#46353)
fix: change fieldname for cash_flow

Co-authored-by: Sanket322 <shahsanket322003.com>
2025-03-06 17:20:12 +05:30
Shariq Ansari
884709deb8 fix: Allow rename prospect doctype (#46352)
fix: allow rename prospect doctype
2025-03-06 17:19:14 +05:30
ruthra kumar
81d460e4bd ci: fix incorrect yaml format 2025-03-06 17:17:37 +05:30
ruthra kumar
87e7f0f4d7 Merge pull request #46349 from frappe/l10n_develop
fix: sync translations from crowdin
2025-03-06 17:04:28 +05:30
rohitwaghchaure
2e207d651d Merge pull request #46354 from mihir-kandoi/46351
fix: recalculate_amount_difference_field patch
2025-03-06 13:27:43 +05:30
rohitwaghchaure
93779c88d2 Merge pull request #46355 from mihir-kandoi/46348
fix: rename_sla_fields patch
2025-03-06 13:18:01 +05:30
Mihir Kandoi
95d1976931 fix: check if set_landed_cost_based_on_purchase_invoice_rate is enabled before running patch 2025-03-06 13:11:31 +05:30
Mihir Kandoi
0492b941ff fix: recalculate_amount_difference_field patch 2025-03-06 12:58:53 +05:30
Mihir Kandoi
e8d4a487c6 fix: rename_sla_fields patch 2025-03-06 12:57:27 +05:30
Frappe PR Bot
40c92b0988 fix: Bosnian translations 2025-03-06 09:53:15 +05:30
rohitwaghchaure
137090ca77 Merge pull request #46339 from rohitwaghchaure/fixed-report-incorrect-sabb
fix: doctype name
2025-03-05 21:16:49 +05:30
Bhavan23
abd044eb0d fix: make 'company_tax_id' and 'company_fiscal_code' as mandatory 2025-03-05 20:09:21 +05:30
Rohit Waghchaure
d039310d80 fix: doctype name 2025-03-05 18:07:17 +05:30
Ejaaz Khan
38aa7cab8a feat: create sales invoice print format (#45403)
* feat: create sales invoice print format

* fix: linter issue

* style: remove border from table

* refactor: change label to uppercase and show taxes

* refactor: format date and add translation on label

* refactor: remove default header and format labels

* refactor: change label style and small fix

* chore: Qty in title case

---------

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2025-03-05 12:36:59 +00:00
Sugesh G
8caf7f275e fix(pos): get parent item group without user permission (#46020)
* fix(pos): get parent item group without user permission

* feat: add item group filter based on user permission

---------

Co-authored-by: venkat102 <venkatesharunachalam659@gmail.com>
2025-03-05 18:06:42 +05:30
Diptanil Saha
35512d40bb fix: replacing serial and batch bundle on pos with auto fetch serial nos (#46236)
* fix: replacing serial and batch bundle on pos with auto fetch serial nos

* fix: reserved serial no

added a check to look for serial no in reserved serial nos list before removing it as there might be a situation where an item is returned which was already consolidated.
2025-03-05 17:41:43 +05:30
Khushi Rawat
f50d479bfd fix: exclude already consumed purchase receipt items from asset capitalization (#46329)
* feat: link purchase receipt row item to capitalization

* fix: avoid fetching already consumed stock and asset items during capitalization

* fix(patch): added patch to link purchase receipt item to stock item child table

* fix: added nosemgrep

* refactor: rename  to
2025-03-05 17:39:24 +05:30
rohitwaghchaure
cb004709ff Merge pull request #46330 from rohitwaghchaure/fixed-support-33209
fix: Accounting Period validation throwing for different companies
2025-03-05 16:40:07 +05:30
Prateek Karamchandani
4f559b6df2 fix: allow variant uom to differ from template uom (#45850) 2025-03-05 16:37:42 +05:30
Mihir Kandoi
58ed697ba5 fix: uom reverts to default upon selecting do not explode (#45693)
* fix: uom reverts to default upon selecting do not explode

* fix: logical error failing tests
2025-03-05 16:33:57 +05:30
Venkatesh
4ef7e6424a fix: set stock adjustment account in difference account (#45606)
* fix: set stock adjustment account in difference account

* fix(stock entry): fetch stock difference account for manufacture entry
2025-03-05 16:32:03 +05:30
rohitwaghchaure
6c0b18b19f Merge pull request #46313 from mihir-kandoi/st33100
fix: production analytics report
2025-03-05 16:23:13 +05:30
Rohit Waghchaure
b1508efca2 fix: Accounting Period validation throwing for different companies 2025-03-05 16:19:47 +05:30
mergify[bot]
82c0995f2e fix: Close and Reopen buttons dissapear after saving changes (backport #46048) (#46325)
fix: Close and Reopen buttons dissapear after saving changes (#46048)

* fix: Close and Reopen buttons dissapear after saving changes

* style: linter issue

---------

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
(cherry picked from commit 506dd3c6b9)

Co-authored-by: Ben Kebdani <benkebdani@users.noreply.github.com>
2025-03-05 16:18:56 +05:30
Diptanil Saha
c4eb577a76 chore: erpnext demo url update (#46327) 2025-03-05 15:47:20 +05:30
Corentin Forler
a700345cee refactor: Remove duplicate inherited method (#46030)
The method add_taxes_from_item_tax_template is defined identically in the erpnext.taxes_and_totals class, that erpnext.TransactionController extends.
2025-03-05 15:38:05 +05:30
0xD0M1M0
104f60cc57 fix: Naming of Purchase Amount (#46051)
* fix: Naming of Purchase Amount

* fix: linters
2025-03-05 15:24:23 +05:30
Mihir Kandoi
6cc3d67835 feat: add new Closed and Stopped rows 2025-03-05 15:14:54 +05:30
Diptanil Saha
926e4ecc4f fix: adding cost center on pos invoice items while applying product discount (#46082) 2025-03-05 15:14:31 +05:30
Lakshit Jain
1f685efcaf fix: consolidate gl entries by project in General Ledger Report (#46314) 2025-03-05 15:08:52 +05:30
Sugesh G
425fb12e91 fix: consider journal entry and return invoice in paid_amount calculation (#46129)
* fix: consider journal entry and return invoice in paid_amount calculation

* test: add new unit test to consider journal entry and return invoice in paid_amount calculation
2025-03-05 14:47:22 +05:30
Fab
c5f90c823d Merge pull request #45840 from gms-electronics/40254-italian-einvoice
fix:[regional] Italian einvoice xml generated with wrong prices (#40254)
2025-03-05 14:45:54 +05:30
rohitwaghchaure
70128881a8 Merge pull request #45947 from mihir-kandoi/st31369
fix: set landed cost based on purchase invoice rate
2025-03-05 14:31:31 +05:30
rohitwaghchaure
694098a578 Merge pull request #45761 from rohitwaghchaure/fixed-support-31024
fix: incorrect batch picked in the pick list
2025-03-05 14:19:53 +05:30
Mihir Kandoi
961258a4ce fix: use else instead of unnecessary elif 2025-03-05 13:56:10 +05:30
Mihir Kandoi
772e9ecfaa fix: production analytics report 2025-03-05 13:48:34 +05:30
Raffael Meyer
94547188bf feat(Sales Invoice): add items row via "Fetch Timesheet" (#46071) 2025-03-05 13:21:40 +05:30
Diógenes Souza
89bcdd6fa5 fix: Wrong Overdue Status in Sales Invoices (Floating-point arithmetic) (#46146)
* fix: Wrong Overdue Status in Sales Invoices (Floating-point arithmetic)

* style: after run pre-commit
2025-03-05 13:16:45 +05:30
Venkatesh
2d26bff870 fix: use value from currency exchange when exchange api is disabled (#46137) 2025-03-05 13:15:20 +05:30
Mihir Kandoi
3bb6a311de Merge branch 'develop' into st31369 2025-03-05 12:48:19 +05:30
rohitwaghchaure
27446a68b7 Merge pull request #45987 from mihir-kandoi/st31052-3
fix: rename some sla fields
2025-03-05 12:45:53 +05:30
Nabin Hait
5513e24b00 fix(workspace): enable is_query_report on purchase reports (#46249)
* fix(workspace): enable is_query_report on purchase reports

* fix: resolved conflict

---------

Co-authored-by: venkat102 <venkatesharunachalam659@gmail.com>
2025-03-05 12:30:09 +05:30
Khushi Rawat
4a542b22a4 fix: depreciation and balances report correction (#46259) 2025-03-05 12:29:23 +05:30
Lakshit Jain
88fcdbb81e fix: only include submitted docs for internal received quantity validation (#46262) 2025-03-05 12:27:47 +05:30
ruthra kumar
0f6062efee Merge pull request #46294 from ruthra-kumar/temporary_exclude_old_prs
ci: dont lock really old pull requests
2025-03-05 12:26:22 +05:30
Sudharsanan Ashok
6117706ab5 feat(received items to be billed): add company and date filters (#46271)
* feat(received items to be billed): add company and date filters

* feat(delivered to be billed): add company and date filters

* feat: add company and date conditions

* chore: remove debugger
2025-03-05 12:25:43 +05:30
rohitwaghchaure
65a229abb1 Merge pull request #46226 from mihir-kandoi/refactor_sc_feilds
refactor: rename subcontracting fields
2025-03-05 12:25:08 +05:30
rohitwaghchaure
93fe9203da Merge pull request #46258 from mihir-kandoi/46196
fix: delivery note from sales order uom conversion mistake
2025-03-05 12:20:59 +05:30
Frappe PR Bot
4c810a878c fix: sync translations from crowdin (#46287)
* fix: French translations

* fix: Arabic translations

* fix: Persian translations

* fix: Bosnian translations

* fix: Portuguese, Brazilian translations

* fix: Thai translations

* fix: Croatian translations
2025-03-05 12:19:53 +05:30
Kunhi
a8d1cbc1c3 fix: Add company filter at get_invoice method (#46238) 2025-03-05 12:18:17 +05:30
Mihir Kandoi
01b5fb2f91 Merge branch 'develop' into st31052-3 2025-03-05 12:14:01 +05:30
Mihir Kandoi
ceaf217341 Merge branch 'develop' into st31369 2025-03-05 12:13:13 +05:30
rohitwaghchaure
62837099fc Merge pull request #46046 from mihir-kandoi/st32237-2
perf: optimize query in project.py
2025-03-05 12:10:16 +05:30
rohitwaghchaure
2b703c233b Merge pull request #46068 from mihir-kandoi/st32081
fix: use valuation method from settings in stock ageing report
2025-03-05 12:07:46 +05:30
Priyansh Shah
59e99f167d fix: Include additional account types for Expense Account in LCV (#46206)
fix: additional account types in filters for the Expense account selection
2025-03-05 12:07:25 +05:30
ruthra kumar
bb12551599 ci: dont lock really old pull requests
temporary change. mergify incorrectly triggers backport for really old
pull requests
2025-03-05 12:01:43 +05:30
Ankush Menat
41fe30ea6e chore: erpnext.com -> frappe.io/erpnext (#46288) 2025-03-05 05:32:21 +00:00
rohitwaghchaure
55de0176e8 Merge pull request #46279 from rohitwaghchaure/fixed-support-32979
fix: rate changing on the deliver note
2025-03-04 21:41:31 +05:30
rohitwaghchaure
1bdfd44d4c Merge pull request #46208 from rohitwaghchaure/fixed-support-32747
fix: stock reservation issue while making Purchase Invoice
2025-03-04 20:09:48 +05:30
Rohit Waghchaure
6f40849d55 fix: rate changing on the deliver note 2025-03-04 20:01:50 +05:30
Smit Vora
f006fd99d2 Merge pull request #46039 from Sanket322/address_template_for_usa
fix: Ensure new line is added regardless of postal code presence
2025-03-04 18:05:16 +05:30
Smit Vora
f8dd4e0961 Merge pull request #46010 from Sanket322/check_pos_permission
fix: Add permission check in POS's `Toggle Recent Orders`
2025-03-04 18:03:27 +05:30
Smit Vora
60247eeed5 Merge pull request #46260 from ljain112/fix-billed-items-report
fix: do not include opening invoices in billed items to be received report
2025-03-04 16:48:35 +05:30
Smit Vora
1332ea02d1 Merge pull request #45896 from ljain112/fix-pe-allocate
fix: auto allocation for negative amount outstanding for Customers in Payment Entry
2025-03-04 16:47:51 +05:30
ruthra kumar
6cbce114a6 Merge pull request #45682 from cogk/fix-filters-posting_date-not-always-string
fix(stock): Cast filters.to_date before string concatenation
2025-03-04 15:58:06 +05:30
ruthra kumar
24f684c58f Merge pull request #45751 from aerele/invoice-tds-link
fix: change voucher_type and voucher_name field type to data
2025-03-04 15:39:12 +05:30
ruthra kumar
6151f9c912 Merge pull request #46172 from Sanket322/credit_note_column
fix: Show Credit Note amount in credit note column
2025-03-04 13:27:33 +05:30
ljain112
c1ddf444c6 fix: do not include opening invoices in billed items to be received report 2025-03-04 12:49:48 +05:30
Mihir Kandoi
49a43d355d fix: delivery note from sales order uom conversion mistake 2025-03-04 11:48:28 +05:30
ruthra kumar
0d44b5d3ce Merge pull request #46257 from frappe/l10n_develop
fix: sync translations from crowdin
2025-03-04 10:05:56 +05:30
Frappe PR Bot
e6514eda50 fix: Bosnian translations 2025-03-04 09:40:48 +05:30
marination
e403d3f153 feat: Unit Price Items in Buying (RFQ, SQ, PO)
- chore: Extract `set_unit_price_items_note` into a util
2025-03-03 17:53:00 +01:00
Sanket Shah
e4b0ab6656 fix: Convert tuple of tuples to list of dicts for dot notation access (#46062)
fix: use as_dict to convert tuples into list of dict

Co-authored-by: Sanket322 <shahsanket322003.com>
2025-03-03 21:38:11 +05:30
marination
71f65bab5e fix: Linters 2025-03-03 16:24:22 +01:00
Bhavan23
a29c6a5aea fix: run bank reconciliation as a background job to prevent request timeout 2025-03-03 18:10:59 +05:30
barredterra
8db1fcd19c refactor: improve translatability in buying controller (2)
Added full stops and support for custom fieldnames. Improved wording.
2025-03-03 13:22:46 +01:00
Smit Vora
17eb57efdc Merge pull request #46192 from Ninad1306/budget_variance_report_fix
fix: Exclude Cancelled GL Entries
2025-03-03 16:58:09 +05:30
Smit Vora
117b847de7 Merge pull request #45972 from Ninad1306/update_taxes
fix: Set Taxes Before Calculating Taxes and Totals
2025-03-03 16:57:01 +05:30
Frappe PR Bot
03fc1d7a00 fix: sync translations from crowdin (#46234)
* fix: French translations

* fix: Spanish translations

* fix: Arabic translations

* fix: Hungarian translations

* fix: Polish translations

* fix: Russian translations

* fix: Swedish translations

* fix: Turkish translations

* fix: Chinese Simplified translations

* fix: Persian translations

* fix: Bosnian translations

* fix: German translations

* fix: Esperanto translations
2025-03-03 12:24:13 +01:00
rohitwaghchaure
25d39a38f1 Merge pull request #46231 from rohitwaghchaure/fixed-support-32871
fix: incorrect batch picked
2025-03-03 14:48:48 +05:30
rohitwaghchaure
d3a1fbbfef Merge pull request #46239 from rohitwaghchaure/fixed-support-32836
fix: incorrectly billed amount in the purchase receipt
2025-03-03 14:44:13 +05:30
ruthra kumar
efd7e05bb6 Merge pull request #46070 from nirmal2010/batch_price_update_billed
fix: Batch Price gets updated only if it is a billed item
2025-03-03 14:27:05 +05:30
ruthra kumar
0a2193e458 chore: linter fix 2025-03-03 14:05:41 +05:30
Nirmalrajaa K
1a56b83054 fix: Batch Price gets updated only if it is a billed item 2025-03-03 14:05:40 +05:30
Nirmalrajaa K
9597b1a69e fix: Batch Price gets updated only if it is a billed item 2025-03-03 14:05:26 +05:30
Rohit Waghchaure
a5271fdb2e fix: incorrectly billed amount in the purchase receipt 2025-03-03 13:55:52 +05:30
Khushi Rawat
4bf84f5c84 fix(asset depreciation schedules): enable auto commit
Merge pull request #46201 from aerele/asset-depreciation-patch
2025-03-03 12:11:08 +05:30
rohitwaghchaure
47648329ed Merge pull request #46223 from mihir-kandoi/st30672-3
fix: dont update rate of free item when batch is updated
2025-03-03 10:15:01 +05:30
Diptanil Saha
62c3915ecb refactor: using function to unset grand total to default mode of payment in pos (#46228) 2025-03-03 01:56:23 +05:30
Frappe PR Bot
9078e3798d fix: sync translations from crowdin (#46222)
fix: Bosnian translations
2025-03-02 19:04:06 +01:00
Frappe PR Bot
e803ed72e6 chore: update POT file (#46225) 2025-03-02 13:50:04 +01:00
Mihir Kandoi
b4f65154f5 refactor: rename subcontracting fields 2025-03-02 17:16:17 +05:30
Rohit Waghchaure
d2564cad68 fix: incorrect batch picked 2025-03-02 12:36:17 +05:30
rohitwaghchaure
5bee30ff2f Merge pull request #46219 from rohitwaghchaure/fixed-support-32834
fix: stock qty not recalculate on changing of the qty
2025-03-02 12:15:32 +05:30
Mihir Kandoi
7c9c0c7776 fix: error 2025-03-02 12:07:31 +05:30
Mihir Kandoi
a3596f717b fix: dont update rate of free item when batch is updated 2025-03-02 11:29:39 +05:30
Rohit Waghchaure
464e3339fe fix: stock qty not recalculate on changing of the qty 2025-03-01 21:34:06 +05:30
Frappe PR Bot
912f9bfd8e fix: sync translations from crowdin (#46216)
* fix: French translations

* fix: Chinese Simplified translations
2025-03-01 09:05:40 +01:00
rohitwaghchaure
1c124b3c90 Merge pull request #46202 from rohitwaghchaure/fixed-fields-stock-settings
fix: rearrange stock settings fields
2025-03-01 12:26:32 +05:30
marination
c1e4e7af28 feat: Unit Price Contract 2025-02-28 23:04:29 +01:00
Diptanil Saha
d2fad44e89 fix: pos item detail serial no field (#46211) 2025-02-28 22:36:24 +05:30
Ankush Menat
999f1cf96d fix: don't allow renaming account while system is actively in use (#46176) 2025-02-28 19:39:50 +05:30
Rohit Waghchaure
64985bffe0 fix: stock reservation issue while making Purchase Invoice 2025-02-28 19:28:20 +05:30
Diptanil Saha
8fb09decd2 fix: pos item selection using serial no (#46200) 2025-02-28 15:38:21 +05:30
Rohit Waghchaure
93f461c6f3 fix: rearrange stock settings fields 2025-02-28 15:30:42 +05:30
venkat102
a4b24f7451 fix(asset depreciation schedules): enable auto commit 2025-02-28 15:14:25 +05:30
Frappe PR Bot
48f9769c05 fix: sync translations from crowdin (#46170)
* fix: Persian translations

* fix: Bosnian translations

* fix: Swedish translations

* fix: Chinese Simplified translations

* fix: Persian translations

* fix: Bosnian translations
2025-02-28 10:25:48 +01:00
ruthra kumar
e965c44908 Merge pull request #46169 from frappe/mergify/ruthra-kumar/config-update
ci(Mergify): configuration update
2025-02-28 13:34:29 +05:30
ruthra kumar
0c1e8bbfbb Merge pull request #46186 from rohitwaghchaure/fixed-support-32566
fix: removed mandatory property for the cost center field
2025-02-28 13:33:00 +05:30
Ninad1306
3251a331dd fix: exclude cancelled gl entries 2025-02-28 11:08:30 +05:30
Sagar Vora
453bcd7513 Merge pull request #46177 from vishakhdesai/payment-entry-fix 2025-02-28 10:42:26 +05:30
Ankush Menat
ded0aab680 perf: don't track seen for POS Invoice (#46187)
This is a moving doctype. Do people even browse the list view? 

It doesn't make much sense, either. POS INvoices are rarely "reviewed" by multiple users.
2025-02-28 04:57:57 +00:00
Rohit Waghchaure
079cf772aa fix: removed mandatory property for the cost center field 2025-02-28 09:48:19 +05:30
vishakhdesai
2dbef23244 fix: payment entry exchange gain loss issue 2025-02-27 18:18:49 +05:30
Sanket322
6719bbeb10 fix: test case for debit note 2025-02-27 17:14:29 +05:30
Sanket322
9b2b477ae0 fix: fixing test case 2025-02-27 16:52:13 +05:30
Sanket322
ccb4bdbe4c fix: if invoice is return then add amount in proper column 2025-02-27 13:17:57 +05:30
JK1117
daa5bebdd0 fix: use source_fieldname to validate inventory dimension 2025-02-27 15:17:39 +08:00
JK1117
4e63ee1a70 feat: fetch source_fieldname for inventory dimension 2025-02-27 15:17:10 +08:00
ruthra kumar
967f5ac7f3 ci(Mergify): configuration update
Signed-off-by: ruthra kumar <null>
2025-02-27 06:54:24 +05:30
ruthra kumar
fcf374928f Merge pull request #46155 from frappe/l10n_develop
fix: sync translations from crowdin
2025-02-26 13:52:06 +05:30
ruthra kumar
ac640a22b7 Merge pull request #46156 from aerele/autofetch-timesheet
fix: no permission to get project settings in sales invoice
2025-02-26 13:51:01 +05:30
venkat102
221f1468cb fix: no permission to get project settings in sales invoice 2025-02-26 11:01:40 +05:30
Frappe PR Bot
da4b28bf2f fix: Bosnian translations 2025-02-26 08:32:13 +05:30
rohitwaghchaure
5a6e06a140 Merge pull request #46097 from rohitwaghchaure/fixed-valuation-for-batch-sabb
fix: valuation rate for batch
2025-02-25 23:14:00 +05:30
ruthra kumar
45d72cbefc Merge pull request #45908 from aerele/autofetch-timesheet
fix(projects settings): add checkbox to auto fetch timesheet in sales invoice
2025-02-25 22:26:16 +05:30
Smit Vora
fd3fec3912 Merge pull request #46117 from Ninad1306/add_status_in_po_analysis_report 2025-02-25 18:36:41 +05:30
Ninad1306
936d7d4342 fix(report): filter sales / purchase orders based on date filters 2025-02-25 17:13:09 +05:30
Ninad1306
2394e76e7d fix(report): allow Closed sales orders to be visible 2025-02-25 15:59:46 +05:30
Ankush Menat
f62aa8fc57 fix(patch): Ensure SLE indexes (#46131)
Because of the way this change was pushed in parts, some sites don't see
this as "update" and don't have the new indexes.
2025-02-25 09:43:53 +00:00
Frappe PR Bot
8284efdf66 fix: sync translations from crowdin (#46111)
* fix: Spanish translations

* fix: Swedish translations

* fix: Bosnian translations

* fix: Persian translations

* fix: Bosnian translations
2025-02-25 10:21:09 +01:00
Patrick Eissler
3876cf0c2b refactor: make linter happy 2025-02-24 08:51:36 +01:00
Patrick Eissler
85f46d6e32 fix: only update User Permissions if a relevant field has changed 2025-02-24 08:47:17 +01:00
Ninad1306
3b2879d3a1 fix(report): allow Closed purchase orders to be visible 2025-02-24 12:42:05 +05:30
Mihir Kandoi
6073f5a6f9 test: added test 2025-02-23 22:26:52 +05:30
Rohit Waghchaure
b88305a95f fix: valuation rate for batch 2025-02-23 22:04:52 +05:30
Frappe PR Bot
987a95d2b5 fix: sync translations from crowdin (#46036)
* fix: Persian translations

* fix: Bosnian translations

* fix: Turkish translations

* fix: Persian translations

* fix: Bosnian translations
2025-02-23 10:38:54 +01:00
Marica
c3b45c933a Merge pull request #45932 from 0xD0M1M0/fix_discount_payment_entry
fix: discount accounting
2025-02-21 20:37:06 +05:30
Ravibharathi
1ec182430d feat: add total weight in shipment (#46049)
Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
2025-02-21 15:15:21 +01:00
Mihir Kandoi
da09c278c8 fix: use valuation method from settings in stock ageing report 2025-02-21 19:08:12 +05:30
Diptanil Saha
8e6959dfad fix: pos opening entry dialog not saving on change data (#46066) 2025-02-21 17:50:51 +05:30
Mihir Kandoi
f7594e2ff9 fix: revamp logic (split parent and child) 2025-02-21 11:04:14 +05:30
0xD0M1M0
a91fe5cbb3 feat: add testcase for discount_payment_entry 2025-02-20 17:12:21 +01:00
0xD0M1M0
8c5aea15ac Merge branch 'frappe:develop' into fix_discount_payment_entry 2025-02-20 15:57:51 +01:00
Mihir Kandoi
2f1e253e19 fix: syntax error 2025-02-20 15:28:13 +05:30
Mihir Kandoi
5e66231ca4 perf: replace if function in query 2025-02-20 15:03:19 +05:30
rohitwaghchaure
f68730f444 Merge pull request #46037 from rohitwaghchaure/fixed-support-31955
fix: inventory dimension for maintenance visit
2025-02-20 11:41:41 +05:30
Sanket322
746adfd057 refactor: add new line ragardless of postal code 2025-02-20 11:33:53 +05:30
Rohit Waghchaure
cd4ba69262 fix: inventory dimension for maintence visit 2025-02-20 09:05:35 +05:30
Frappe PR Bot
78dedc0773 fix: sync translations from crowdin (#45997) 2025-02-19 14:20:18 +01:00
rohitwaghchaure
75379b79fc Merge pull request #46021 from rohitwaghchaure/fixed-support-31874
fix: incorrect stock value difference for adjustment entry
2025-02-19 16:39:45 +05:30
Khushi Rawat
83cafb892c Merge pull request #46022 from khushi8112/fetch-asset-location-from-purchase-doc
fix: reset location only if there is value in row item location field
2025-02-19 16:30:20 +05:30
Akhil Narang
a1cbcda4c5 Merge pull request #46003 from akhilnarang/fix-xss
fix(send_message): escape HTML in the text
2025-02-19 16:14:19 +05:30
Mihir Kandoi
0c465b0f32 Merge branch 'develop' into st31369 2025-02-19 16:04:26 +05:30
Rohit Waghchaure
df83e427a3 fix: incorrect stock value difference for adjustment entry 2025-02-19 16:02:39 +05:30
Khushi Rawat
7f8d08c8eb fix: reset location only if there is value in row item location field 2025-02-19 16:02:01 +05:30
rohitwaghchaure
8e42764274 Merge pull request #45838 from CaseSolvedUK/item-fix
fix: remove public access to list items
2025-02-19 15:50:13 +05:30
mergify[bot]
65c45a3f5b feat: added ability to use custom html format for process statement of accounts (copy #45746) (#46011)
feat: added ability to use custom html format for process statement of accounts (#45746)

* feat: added ability to use custom print format for process statement of accounts documents.

* fix: handles missing hook issues

* chore: linter changes

---------

Co-authored-by: Boy4099 <mashtawayne4099@gmail.com>
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
(cherry picked from commit a0cd08e9ea)

Co-authored-by: Steve Wilson <stevew9009@gmail.com>
2025-02-19 15:44:35 +05:30
Ejaaz Khan
941085000a fix: round sum amount in JE auditing PF (#45961) 2025-02-19 15:40:55 +05:30
Venkatesh
17a2f44290 fix(pos profile): check company while validating mandatory accounting dimension (#45974) 2025-02-19 15:39:01 +05:30
Sanket Shah
24394765a6 fix: handle division by zero error (#45966)
Co-authored-by: Sanket322 <shahsanket322003.com>
2025-02-19 15:37:54 +05:30
Khushi Rawat
fa31a0282e Merge pull request #45898 from nabinhait/asset-depr-schedule-patch
fix: patch for creating asset depreciation schedule records
2025-02-19 15:37:27 +05:30
Khushi Rawat
38e1054eb7 Merge pull request #45872 from khushi8112/set-purchase-doc-row-item-to-asset
fix: enable asset value editing for duplicate item code
2025-02-19 15:30:53 +05:30
Khushi Rawat
2bb79197aa fix: reset location only if there is value in row item location field 2025-02-19 15:04:26 +05:30
Sanket322
a08bc6b913 fix: use get_list to check permissions 2025-02-19 14:02:11 +05:30
Bhavansathru
73e82b7afa fix: fetch child account data for selected parent (#45904)
* fix: fetch child account data for selected parent

* fix: change reference name

---------

Co-authored-by: venkat102 <venkatesharunachalam659@gmail.com>
2025-02-19 13:57:31 +05:30
Mihir Kandoi
dcec446e55 fix: patch path 2025-02-19 13:10:13 +05:30
Khushi Rawat
4821c44227 Merge pull request #45895 from khushi8112/fix-scrapping-of-fully-depreciated-asset
fix: do not reschedule depreciation for fully depreciated asset on scrap
2025-02-19 13:06:39 +05:30
Mihir Kandoi
1230127d24 fix: patch 2025-02-19 13:03:45 +05:30
Khushi Rawat
44c1425e73 fix: validate if no matching item found 2025-02-19 13:01:27 +05:30
rohitwaghchaure
4b87610d95 Merge pull request #45750 from mihir-kandoi/st20447
feat: added option to enforce free item qty in pricing rule
2025-02-19 12:49:01 +05:30
Akhil Narang
448a5db20f fix(send_message): escape HTML in the text
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
2025-02-19 12:23:10 +05:30
ruthra kumar
5fed3866b6 Merge pull request #45882 from aerele/quotation-exchange-rate
fix(quotation): fetch exchange rate on currency change
2025-02-19 10:50:38 +05:30
Mihir Kandoi
019303dd12 fix: tests 2025-02-18 22:02:13 +05:30
Mihir Kandoi
1b831e9abd fix: tests 2025-02-18 21:30:24 +05:30
Mihir Kandoi
baa0dd1235 fix: rename some sla fields 2025-02-18 21:30:21 +05:30
rohitwaghchaure
f05c1d7e7b Merge pull request #45980 from mihir-kandoi/st31872
fix: check if employee is currently working on another workstation
2025-02-18 20:41:22 +05:30
rohitwaghchaure
32f616ad87 Merge pull request #45977 from rohitwaghchaure/fixed-support-31935
fix: millisecond issue for posting datetime
2025-02-18 20:08:15 +05:30
rohitwaghchaure
93a8440908 Merge pull request #45971 from mihir-kandoi/st32087
fix: set sco_qty field of PO to non negative
2025-02-18 19:58:00 +05:30
rohitwaghchaure
be813b5bba Merge pull request #45976 from rohitwaghchaure/fixed-support-32073
fix: slow query
2025-02-18 19:56:37 +05:30
Rohit Waghchaure
ac9e5c0163 fix: millisecond issue for posting datetime 2025-02-18 18:58:45 +05:30
Mihir Kandoi
4487edb255 fix: throw correct exception 2025-02-18 14:49:52 +05:30
Mihir Kandoi
8234e659c8 fix: check if employee is currently working on another workstation 2025-02-18 14:22:39 +05:30
ruthra kumar
927eae79d5 Merge pull request #45765 from aerele/dimensions-in-order-item
fix: add accounting dimensions section in sales order item
2025-02-18 14:10:49 +05:30
Ninad1306
196ef7ac4e test: validate fetching of taxes based on taxes and charges template 2025-02-18 14:03:35 +05:30
Rohit Waghchaure
8cfab57fc8 fix: slow query 2025-02-18 13:52:26 +05:30
rohitwaghchaure
74621eeb1b Merge pull request #45970 from rohitwaghchaure/fixed-support-32040
fix: serial no status for internal transfer delivery note
2025-02-18 13:51:00 +05:30
ruthra kumar
1eea76cbad Merge pull request #45723 from aerele/validate-payment-request-total
fix: validate payment request total of partly paid invoice
2025-02-18 13:11:08 +05:30
Rohit Waghchaure
3333331a3d fix: serial no status for internal transfer delivery note 2025-02-18 12:59:10 +05:30
Ninad1306
0fd0695bbb fix: set taxes before calculating taxes and totals 2025-02-18 12:52:33 +05:30
Mihir Kandoi
dfc3dc4944 fix: set sco_qty field of PO to non negative 2025-02-18 12:37:07 +05:30
ruthra kumar
7c7aa831ec Merge pull request #45965 from frappe/l10n_develop
fix: sync translations from crowdin
2025-02-18 12:12:22 +05:30
Diptanil Saha
70260c8c86 fix: pos checkout button color on dark mode (#45967) 2025-02-18 11:48:04 +05:30
ruthra kumar
c46af238d4 Merge pull request #45687 from aerele/validate_equity_account
fix: add validation to allow equity account
2025-02-18 11:44:34 +05:30
Frappe PR Bot
7e61b67ba8 fix: German translations 2025-02-18 05:48:36 +05:30
Frappe PR Bot
5e8124900f fix: Bosnian translations 2025-02-18 05:48:32 +05:30
Frappe PR Bot
3788339ea0 fix: Swedish translations 2025-02-18 05:48:20 +05:30
Frappe PR Bot
fe47ca8566 fix: sync translations from crowdin (#45927)
* fix: Swedish translations

* fix: Bosnian translations

* fix: Bosnian translations

* fix: French translations

* fix: Spanish translations

* fix: Arabic translations

* fix: Hungarian translations

* fix: Polish translations

* fix: Russian translations

* fix: Swedish translations

* fix: Turkish translations

* fix: Chinese Simplified translations

* fix: Persian translations

* fix: Bosnian translations

* fix: German translations

* fix: Esperanto translations
2025-02-17 20:07:11 +01:00
Mihir Kandoi
154e9813c4 fix: revert last commit 2025-02-17 21:52:49 +05:30
Mihir Kandoi
844f1636c0 fix: set default value to 0 as per new logic 2025-02-17 18:47:35 +05:30
Mihir Kandoi
7cf8e498c4 fix: fiscal year error 2025-02-17 18:44:33 +05:30
Mihir Kandoi
f3d598881c refactor: rename field 2025-02-17 18:21:22 +05:30
Mihir Kandoi
a41024813b perf: patch 2025-02-17 18:08:31 +05:30
rohitwaghchaure
2fcc5e3f55 Merge pull request #45946 from rohitwaghchaure/fixed-support-32008
fix: provision to enable naming series for SABB
2025-02-17 17:00:34 +05:30
barredterra
b9450288f5 refactor: improve translatability in buying controller 2025-02-17 12:16:39 +01:00
Rohit Waghchaure
fe43975cdd fix: provision to enable naming series for SABB 2025-02-17 16:36:55 +05:30
rohitwaghchaure
c2b4a79b5b Merge pull request #45950 from rohitwaghchaure/fixed-bom-creator-issue
fix: remove unused fields
2025-02-17 16:11:55 +05:30
Soham Kulkarni
98cc1558d3 Small UI changes (#45938)
* fix: change erpnext logo and home workpsace icon

* fix: actually change home workspace icon

* fix: typo in hooks.py
2025-02-17 15:40:22 +05:30
Rohit Waghchaure
f206034a79 fix: remove unused fields 2025-02-17 15:40:17 +05:30
0xD0M1M0
6f1bc5225a fix: auto create asset due to message error (#45934)
* fix: auto create asset due to message error

* fix: linters
2025-02-17 15:12:26 +05:30
Diptanil Saha
5506b44b6f fix: improve pos return (#45671)
* fix: pos return validation for zero qty item

* fix: pos return invoice onload ui

* feat: added item qty returned in pos ui

* refactor: removed console log statement

* feat: check return can be made before loading it on pos

* fix: pos edit invoice onload ui

* fix: returned

* refactor: code cleanup
2025-02-17 15:00:56 +05:30
venkat102
5880f1d5c6 fix: enable fetch_timesheet_in_sales_invoice in test 2025-02-17 14:49:32 +05:30
Mihir Kandoi
17d415b105 fix: set landed cost based on purchase invoice rate 2025-02-17 14:36:15 +05:30
Diptanil Saha
d94802067b fix: disable partial payment in pos (#45752)
* fix: disable partial payment in pos

* test: disable partial payment

* test: removed print statement

* test: using save method to auto calculate paid_amount

* test: paid_amount calculation using save method

* test: added save method to calculate paid_amount

* test: outstanding amount

* test: added test for partial payments in pos invoice

* fix: custom validation error for partial payment

* test: using partial payment validation

* fix: validate only on submit
2025-02-17 14:26:50 +05:30
rohitwaghchaure
6c8cb9717d Merge pull request #45941 from rohitwaghchaure/fixed-support-31066
fix: letter head for quality inspection
2025-02-17 13:57:23 +05:30
Rohit Waghchaure
cdd41373b6 fix: letter head for quality inspection 2025-02-17 13:20:52 +05:30
ruthra kumar
419b149d05 Merge pull request #45630 from ruthra-kumar/remove_acc_balance_field_from_payment_entry
refactor: remove redundant balance fields from Payment Entry
2025-02-17 10:58:02 +05:30
Frappe PR Bot
019f6422be chore: update POT file (#45935) 2025-02-16 12:15:43 +01:00
0xD0M1M0
947a4fb091 fix: only negative for "Pay" 2025-02-15 22:36:34 +01:00
0xD0M1M0
03d515208a fix: discount accounting 2025-02-15 21:23:05 +01:00
rohitwaghchaure
9e4c82e055 Merge pull request #45914 from rohitwaghchaure/fixed-reposting-issue
fix: start reposting button not working
2025-02-14 21:28:20 +05:30
Patrick Eissler
92f63a026b chore: use existing utility function 2025-02-14 16:28:40 +01:00
Patrick Eissler
dee46c6954 fix(Employee): remove User Permissions if create_user_permission is unchecked 2025-02-14 15:14:03 +01:00
Diptanil Saha
60a5f4f30d fix: pos accounting dimension fieldname error (#45899)
* fix: pos accounting dimension fieldname error

* fix: method to get enabled accounting dimensions

* fix: fetch enabled accounting dimensions

* fix: clear flags for accounting_dimensions_details on_update

* refactor: validation for doctype

* fix: using get_checks_for_pl_and_bs_accounts for accounting dimensions
2025-02-14 17:31:53 +05:30
Diptanil Saha
bee26e046e fix: prevent duplicate pos fields in pos settings (#45873)
fix: restrict duplicate pos fields in pos settings
2025-02-14 17:26:54 +05:30
Frappe PR Bot
e6b6849940 fix: sync translations from crowdin (#45876)
* fix: Swedish translations

* fix: Turkish translations

* fix: Persian translations

* fix: Bosnian translations

* fix: Spanish translations

* fix: Swedish translations

* fix: Turkish translations

* fix: Persian translations

* fix: Bosnian translations

* fix: Swedish translations

* fix: Turkish translations

* fix: Chinese Simplified translations

* fix: Persian translations

* fix: Bosnian translations
2025-02-14 12:26:34 +01:00
ruthra kumar
6e67a1ba7c Merge pull request #45912 from aerele/add-payment-gateway
fix: include missing payment_gateway parameter in Payment Request URL
2025-02-14 16:44:04 +05:30
Diptanil Saha
f0a6399056 feat: disable auto setting grand total to default mode of payment (#45591) 2025-02-14 16:43:11 +05:30
Rohit Waghchaure
c81ce29e4c fix: start reposting button not working 2025-02-14 15:33:45 +05:30
rohitwaghchaure
0a364ed1c9 Merge pull request #45903 from rohitwaghchaure/fixed-support-31510
fix: allow scrap item with zero qty
2025-02-14 15:15:55 +05:30
Navin-S-R
dbac8cfc94 fix: include missing payment_gateway parameter in Payment Request URL 2025-02-14 13:14:27 +05:30
venkat102
43b13b91be fix: check value as int 2025-02-13 23:24:05 +05:30
venkat102
914ad357fd fix(sales invoice): check fetch_timesheet_in_sales_invoice enabled before fetching the timesheet 2025-02-13 23:07:45 +05:30
venkat102
876082ea2f fix(project settings): add checkbox to auto fetch timesheet in sales invoice 2025-02-13 23:05:34 +05:30
Rohit Waghchaure
706cb64279 fix: allow scrap item with zero qty 2025-02-13 19:10:21 +05:30
Nabin Hait
7324dcb7c8 fix: patch for creating asset depreciation schedule records 2025-02-13 18:02:56 +05:30
ljain112
6275b44a0b fix: auto allocation for negative amount outstanding for Customers in Payment Entry 2025-02-13 14:56:11 +05:30
Khushi Rawat
fd4c4f98fa fix: do not reschedule depreciation for fully depreciated asset on scrap 2025-02-13 14:21:29 +05:30
ruthra kumar
a81867bc43 Merge pull request #45804 from aerele/auto-email-multiselect
fix(report): add options to multiselectlist fields
2025-02-13 14:16:16 +05:30
ruthra kumar
6886f5ef41 Merge pull request #45874 from ruthra-kumar/incorrect_taxable_amount_on_other_charges_calculation
fix: incorrect taxable_amount on `other_charges_calculation`
2025-02-13 13:08:56 +05:30
Diptanil Saha
72f8fc8a7b style: pos checkout button color (#45890)
style: pos checkout button color
2025-02-13 00:09:21 +05:30
rohitwaghchaure
5f554e1ec3 Merge pull request #45786 from barredterra/skip-warning-for-free-items
fix: skip warning for free items
2025-02-12 14:48:25 +05:30
venkat102
2f77a8bed1 fix(quotation): fetch exchange rate on currency change 2025-02-12 12:54:30 +05:30
rohitwaghchaure
b839094551 Merge pull request #45879 from rohitwaghchaure/fixed-SABB-naming
fix: changed naming series to random for SABB
2025-02-12 10:19:17 +05:30
Rohit Waghchaure
a007dc285d fix: changed naming series to random for SABB 2025-02-12 09:55:20 +05:30
rohitwaghchaure
3e990153a4 Merge pull request #45865 from mihir-kandoi/st30672-2
fix: dont update rate of free item on save
2025-02-12 08:42:19 +05:30
rohitwaghchaure
591ad7641f Merge pull request #45875 from mihir-kandoi/serial-batch-bundle-precision-fix
fix: add precision in serial_batch_bundle.py
2025-02-12 08:35:29 +05:30
Mihir Kandoi
4bf85d1a5a fix: add precision in serial_batch_bundle.py 2025-02-11 22:51:17 +05:30
ruthra kumar
6ab2106322 fix: incorrect taxable_amount on other_charges_calculation 2025-02-11 17:52:15 +05:30
rohitwaghchaure
c522071b58 Merge pull request #45862 from rohitwaghchaure/fixed-support-31345
fix: remove serial no if qty is zero
2025-02-11 16:56:56 +05:30
rohitwaghchaure
5df8609b33 Merge pull request #45869 from rohitwaghchaure/fixed-support-31464
fix: stock reco current valuation rate
2025-02-11 16:53:04 +05:30
Mihir Kandoi
4dcac56486 fix: add is_new in if condition 2025-02-11 16:29:01 +05:30
Khushi Rawat
da1b4cb9ab fix: link correct row item of purchase doc 2025-02-11 16:17:42 +05:30
Rohit Waghchaure
8d8f3afb39 fix: stock reco current valuation rate 2025-02-11 16:14:39 +05:30
Khushi Rawat
8af9dcb33e fix: make purchase_receipt_item and purchase_invoice_item fields of data type 2025-02-11 16:05:02 +05:30
Diptanil Saha
b95b13ecd8 fix: added validation for required invoice_fields in POS (#45780)
fix: added missing validation for required invoice_fields
2025-02-11 16:04:36 +05:30
Mihir Kandoi
6591e76a63 fix: dont update rate of free item on save 2025-02-11 15:32:35 +05:30
Smit Vora
c33c6b6560 Merge pull request #45532 from ljain112/fix-lcv-gl
fix: correct amt in account currency for lcv with manually distributed charges.
2025-02-11 15:32:01 +05:30
Rohit Waghchaure
e1b7688a17 fix: incorrect batch picked in the pick list 2025-02-11 15:13:13 +05:30
Smit Vora
0fdaa541f1 Merge pull request #45772 from ljain112/po-portal
fix: Party name in Supplier Portal for Purchase Order
2025-02-11 15:01:27 +05:30
Smit Vora
0bae273d41 fix: do not allow "Finance Book" in Accounting Dimensions (#45696) 2025-02-11 14:55:32 +05:30
Lakshit Jain
494310293c fix(regional): removed payment schedule validation in sales invoice for italy (#45852) 2025-02-11 14:50:55 +05:30
Rohit Waghchaure
3a4ae8c463 fix: remove serial no if qty is zero 2025-02-11 13:31:24 +05:30
ruthra kumar
110412d8ad Merge pull request #45794 from ljain112/fix-gl-rev
fix: correct amount in transaction currency for reverse gl entries
2025-02-11 12:59:24 +05:30
ruthra kumar
675b3330d9 Merge pull request #45792 from ljain112/fix-gl-val
fix: do not validate party against Receivable and Payable account for cancelled gl entries
2025-02-11 12:13:40 +05:30
ruthra kumar
8296e28689 Merge pull request #45839 from frappe/l10n_develop
fix: sync translations from crowdin
2025-02-11 10:39:43 +05:30
ruthra kumar
3977a7a06e Merge pull request #45781 from Sanket322/total_row_in_non_group
fix: Added Total Row for `Gross Profit` Report in Non-Grouped Invoices
2025-02-11 10:20:08 +05:30
ruthra kumar
1c725dee5d Merge pull request #45832 from ruthra-kumar/fix_migration_issue_for_reconciliation_sync
fix: possible model sync issue
2025-02-11 09:54:48 +05:30
Frappe PR Bot
e8871257a2 fix: Bosnian translations 2025-02-11 03:39:50 +05:30
Frappe PR Bot
a11b8db389 fix: Turkish translations 2025-02-11 03:39:41 +05:30
Frappe PR Bot
3c8214827c fix: Swedish translations 2025-02-11 03:39:37 +05:30
CaseSolved
2bd596ee3d fix: remove public access to list items 2025-02-10 20:46:41 +00:00
ruthra kumar
0069581aa3 fix: possible model sync issue 2025-02-10 17:16:09 +05:30
Raffael Meyer
cbcdc5e7e5 Merge pull request #45745 from HenningWendtland/buying-project
fix: map project from rfq to supplier quotation
2025-02-10 12:05:51 +01:00
Diptanil Saha
0b9c28620f fix: pos numpad editable action buttons (#45823) 2025-02-10 16:23:54 +05:30
HenningWendtland
8fa39bec61 fix: add project field map from mr to rfq 2025-02-10 11:45:58 +01:00
rohitwaghchaure
03290ef45f Merge pull request #45774 from DaizyModi/fix-attribute-error
fix: AttributeError in `get_item_details` when selecting/scanning batch in Delivery Note
2025-02-10 15:47:19 +05:30
ruthra kumar
71a507d30b Merge pull request #45747 from Sanket322/valid_response_json
fix: Handle Empty JSON in Report Parsing
2025-02-10 11:42:01 +05:30
ruthra kumar
e6176db2c9 Merge pull request #45809 from frappe/l10n_develop
fix: sync translations from crowdin
2025-02-10 11:01:56 +05:30
ruthra kumar
bcad6cb757 Merge pull request #45762 from ruthra-kumar/sync_received_and_paid_if_unset
refactor: set received and paid amount based on each other, if unset
2025-02-10 10:36:43 +05:30
ruthra kumar
95f6b586ff Merge pull request #45793 from asmitahase/employee-image
fix: unable to remove image from employee
2025-02-10 10:32:12 +05:30
ruthra kumar
c636cc33b3 refactor: remove paid_to_account_balance 2025-02-10 10:16:19 +05:30
ruthra kumar
9b5c4a0144 refactor: remove paid_from_account_balance 2025-02-10 10:16:04 +05:30
ruthra kumar
1bb6cd33a3 refactor: remove party_balance 2025-02-10 10:15:39 +05:30
rohitwaghchaure
4178154b19 Merge pull request #45810 from rohitwaghchaure/fixed-support-31257
fix: not able to select the item in the sales invoice
2025-02-10 10:08:50 +05:30
Rohit Waghchaure
35388e7a04 fix: not able to select the item in the sales invoice 2025-02-10 09:27:36 +05:30
Frappe PR Bot
91f6c65c0a fix: Esperanto translations 2025-02-10 03:17:28 +05:30
Frappe PR Bot
7137331355 fix: German translations 2025-02-10 03:17:25 +05:30
Frappe PR Bot
5e2879e9ea fix: Bosnian translations 2025-02-10 03:17:22 +05:30
Frappe PR Bot
06a93ffc80 fix: Persian translations 2025-02-10 03:17:19 +05:30
Frappe PR Bot
862ca7ddd3 fix: Chinese Simplified translations 2025-02-10 03:17:16 +05:30
Frappe PR Bot
e4530232e4 fix: Turkish translations 2025-02-10 03:17:12 +05:30
Frappe PR Bot
ed7ad79c2c fix: Swedish translations 2025-02-10 03:17:09 +05:30
Frappe PR Bot
ec9af4ae29 fix: Russian translations 2025-02-10 03:17:06 +05:30
Frappe PR Bot
5c002df014 fix: Polish translations 2025-02-10 03:17:03 +05:30
Frappe PR Bot
814be2b80a fix: Hungarian translations 2025-02-10 03:17:00 +05:30
Frappe PR Bot
b0bb3ca798 fix: Arabic translations 2025-02-10 03:16:57 +05:30
Frappe PR Bot
7e752756cf fix: Spanish translations 2025-02-10 03:16:54 +05:30
Frappe PR Bot
613c2a0379 fix: French translations 2025-02-10 03:16:50 +05:30
Frappe PR Bot
e2b586d5a3 fix: sync translations from crowdin (#45798)
* fix: Swedish translations

* fix: Bosnian translations

* fix: Swedish translations

* fix: Persian translations

* fix: Bosnian translations
2025-02-09 13:47:15 +01:00
Frappe PR Bot
b0d197119f chore: update POT file (#45805) 2025-02-09 11:20:14 +01:00
venkat102
8785342fce fix(report): add options to multiselectlist fields 2025-02-08 22:55:20 +05:30
ljain112
0809e00455 fix: do not validate party against Receivable and Payable account for cancelled gl entries 2025-02-07 18:30:26 +05:30
ljain112
6077c248b0 fix: correct amount in tansaction currency for reverse gl entries 2025-02-07 17:48:45 +05:30
Asmita Hase
0207d2d7b6 fix: unable to remove image from employee
fix: employee image disappears when newly created user_id is linked to employee
2025-02-07 17:27:44 +05:30
ruthra kumar
7b955b2ea6 Merge pull request #45725 from karm1000/set_max_date
fix: set max_date range for date of birth to today in employee
2025-02-07 16:15:10 +05:30
barredterra
772776ad8a fix: skip warning for free items 2025-02-07 11:43:25 +01:00
ruthra kumar
0df18daf10 Merge pull request #45644 from aerele/update-party-balance
fix: add allow_on_submit for party_balance, paid_from_account_balance and paid_to_account_balance
2025-02-07 16:10:17 +05:30
ruthra kumar
8f3cc6af16 Merge pull request #45640 from aerele/repost-accounting-ledger-payment-entry
feat: add repost accounting ledger entry for payment entry
2025-02-07 16:09:42 +05:30
harshpwctech
88e68bb803 Bug fix in email_campaign's update_status function. (#45679)
During the scheduler event of set_email_campaign_status, the function calling update_status isn't saving the modified status field.
2025-02-07 13:13:19 +05:30
ruthra kumar
b80b5574d3 Merge pull request #45639 from ruthra-kumar/incorrect_tds_on_0_rate_ldc
fix: '0' rate LDC's Invoice net totals should be ignored
2025-02-07 13:12:53 +05:30
Sanket322
2d32ddacc3 fix: add total row in non_grouped_invoices 2025-02-07 12:37:33 +05:30
ruthra kumar
0cdd346f8f test: ldc @ 0 rate 2025-02-07 12:18:01 +05:30
Frappe PR Bot
3d5b52f3bf fix: sync translations from crowdin (#45776)
* fix: Swedish translations

* fix: Bosnian translations
2025-02-07 00:17:18 +01:00
rohitwaghchaure
c83398471c Merge pull request #45767 from rohitwaghchaure/fixed-support-30947
fix: the project document timed out while opening
2025-02-06 22:07:22 +05:30
DaizyModi
820b32eb8a fix: Attibute error selling_price_list 2025-02-06 21:54:57 +05:30
ljain112
fc8663421b fix: Party name in Supplier Portal for Purchase Order 2025-02-06 18:37:22 +05:30
Rohit Waghchaure
33d03b1542 fix: the project document timed out while opening 2025-02-06 16:04:51 +05:30
rohitwaghchaure
fd8c78628f Merge pull request #45763 from rohitwaghchaure/fixed-support-30415
fix: stock reservation not working for sales invoice with update stock
2025-02-06 15:05:07 +05:30
Rohit Waghchaure
0c9d0ea1f4 fix: stock reservation not working for sales invoice with update stock 2025-02-06 14:46:19 +05:30
ruthra kumar
99e721e622 refactor: set paid amount based on received amount if unset 2025-02-06 14:15:24 +05:30
ruthra kumar
5ff540bd82 refactor: set received amount based on paid amount 2025-02-06 14:00:48 +05:30
Sugesh393
7d47869f4b fix: add accounting dimensions section in sales order item 2025-02-06 13:31:10 +05:30
Sugesh393
f8472c32d9 test: add unit test to validate payment request grand_total for partly paid invoice 2025-02-06 11:59:29 +05:30
ruthra kumar
325c4e3536 fix: '0' rate LDC's Invoice net totals should be ignored 2025-02-06 11:05:04 +05:30
Frappe PR Bot
52c687ecc9 fix: sync translations from crowdin (#45756)
* fix: Swedish translations

* fix: Turkish translations

* fix: Bosnian translations
2025-02-05 23:32:06 +01:00
Mihir Kandoi
ac3259b8f1 test: added test 2025-02-05 21:34:19 +05:30
Mihir Kandoi
366ae85d85 fix: tests 2025-02-05 19:18:01 +05:30
Mihir Kandoi
19c01b1457 feat: added option to enforce free item qty in pricing rule 2025-02-05 18:48:52 +05:30
Sugesh393
f8ab021920 fix: change voucher_type and voucher_no field type to data 2025-02-05 18:40:21 +05:30
Sanket322
133e0417b8 fix: handle response when json is None 2025-02-05 17:41:07 +05:30
HenningWendtland
d0479036bb fix: map project from rfq to supplier quotation 2025-02-05 12:11:13 +01:00
rohitwaghchaure
54a8d41f88 Merge pull request #45739 from mihir-kandoi/st30984
fix: create job card with wip warehouse set to source warehouse if material transfer to wip warehouse is skipped in work order
2025-02-05 16:39:11 +05:30
rohitwaghchaure
e72687d3eb Merge pull request #45741 from rohitwaghchaure/fixed-removed-unused-field
fix: removed unused field
2025-02-05 16:38:45 +05:30
ruthra kumar
fb7bba8cd0 Merge pull request #45604 from aerele/item_tax_template
fix: filter the item tax template using the input text
2025-02-05 16:30:07 +05:30
rohitwaghchaure
ab486d2515 Merge pull request #45734 from mihir-kandoi/st31003
fix: added correct options for incoming_rate field of delivery note item
2025-02-05 16:16:42 +05:30
Rohit Waghchaure
2d7a576da5 fix: removed unused field 2025-02-05 16:11:44 +05:30
rohitwaghchaure
6a2f2ae3fe Merge pull request #45692 from mihir-kandoi/st30672
fix: fetch rate from item price list when document is saved
2025-02-05 15:52:37 +05:30
Mihir Kandoi
723e902470 fix: create job card with wip warehouse set to source warehouse if material transfer to wip warehouse is skipped in work order 2025-02-05 15:48:08 +05:30
Khushi Rawat
f6fca3acec Merge pull request #45735 from khushi8112/asset-value-adjustment-cancellation-issue
fix: set asset value correctly after cancelling value adjustment
2025-02-05 15:25:47 +05:30
ruthra kumar
218670a720 Merge pull request #45717 from iamejaaz/30567-purchase-invoice-duplicate
fix(Purchase Invoice): default payment terms template selected while duplicating
2025-02-05 15:16:57 +05:30
Khushi Rawat
fee3846144 fix: set asset value correctly after cancelling value adjustment 2025-02-05 15:06:55 +05:30
Mihir Kandoi
417bf49a8d fix: added correct options for incoming_rate field of delivery note item 2025-02-05 14:55:51 +05:30
ruthra kumar
54279ee21d Merge pull request #45590 from aerele/tax-withholding-category
fix: remove tds account in taxes table on change of Tax Withholding C…
2025-02-05 14:08:29 +05:30
ruthra kumar
98e727a061 Merge pull request #45447 from aerele/pricing-rule-pos-qty
fix(pos): add item in the existing item row when discount is applied
2025-02-05 13:59:08 +05:30
ruthra kumar
79d4852d7d Merge pull request #45686 from aerele/process-statement-of-accounts
fix: allow multiple email ids
2025-02-05 13:48:57 +05:30
Mihir Kandoi
07adfadd58 test: added test 2025-02-05 13:12:25 +05:30
ruthra kumar
7f34b490f4 Merge pull request #45610 from ljain112/fix-pe-inv
fix: respect user set account if not advance account for getting outsanding invoices in payment entry
2025-02-05 12:09:16 +05:30
ruthra kumar
85378f9d1a chore: fix typo 2025-02-05 11:52:52 +05:30
Sugesh393
899c18df18 fix: validate payment request total of partly paid invoice 2025-02-05 11:00:55 +05:30
Frappe PR Bot
848b98e6d6 fix: sync translations from crowdin (#45720)
* fix: Swedish translations

* fix: Turkish translations

* fix: Chinese Simplified translations

* fix: Persian translations

* fix: Bosnian translations
2025-02-05 00:22:13 +01:00
rohitwaghchaure
b57a2612ce Merge pull request #45678 from mihir-kandoi/45572-2
fix: copy correct uom from delivery note when creating packing list
2025-02-05 00:35:19 +05:30
rohitwaghchaure
0edba914fa Merge pull request #45710 from mihir-kandoi/30355
fix: show only items with inspection enabled on create QI dialog
2025-02-05 00:33:39 +05:30
Ejaaz Khan
bfc01441a0 refactor: remove log 2025-02-05 00:09:16 +05:30
Ejaaz Khan
fb3f08a441 fix: payment schedule table is empty while duplicating record 2025-02-05 00:06:48 +05:30
Ejaaz Khan
18127603fe fix: default payment terms template selected while duplicating 2025-02-04 23:39:29 +05:30
Karm Soni
cd87ad0613 fix: set max_date range for date of birth to today in employee 2025-02-04 19:22:51 +05:30
Mihir Kandoi
ffd10d1fe9 fix: semgrep 2025-02-04 17:50:26 +05:30
Aayush Dalal
d1c927530e fix: handling company in bank reconciliation tool (#45582)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2025-02-04 11:44:01 +00:00
Mihir Kandoi
c92ec312b9 fix: show only items with inspection enabled on create QI dialog 2025-02-04 16:33:27 +05:30
rohitwaghchaure
3947b5943e Merge pull request #45701 from mihir-kandoi/st30429
fix: subcontracting validation precision issue
2025-02-04 15:23:03 +05:30
rohitwaghchaure
ab2d6fdefd Merge pull request #45698 from rohitwaghchaure/feat-report-incorrect-sabb
feat: report to find incorrect SABB
2025-02-04 15:15:41 +05:30
Diptanil Saha
a20116816e fix: pos payment cash shortcut decimal (#45702) 2025-02-04 15:08:37 +05:30
Rohit Waghchaure
7e24395e00 feat: report to find incorrect SABB 2025-02-04 13:47:55 +05:30
Mihir Kandoi
8720d412bd fix: subcontracting valiation precision issue 2025-02-04 13:21:09 +05:30
Diptanil Saha
51a65899ec fix: point of sale padding (#45697) 2025-02-04 13:09:27 +05:30
ljain112
a44be73a98 fix: do not allow "Finance Book" in Accounting Dimensions 2025-02-04 12:24:15 +05:30
Shariq Ansari
2482a3a205 Merge pull request #45694 from shariquerik/cannot-create-customer 2025-02-04 12:10:19 +05:30
Shariq Ansari
716edeb465 fix: only system manager was able to create customer & prospect 2025-02-04 11:54:05 +05:30
Mihir Kandoi
fee318a275 fix: logical error failing tests 2025-02-04 11:46:11 +05:30
rethik
f82837a4a2 fix: remove party type from validate 2025-02-04 11:07:41 +05:30
Sudharsanan11
9950e4aa0c fix: check billing address 2025-02-04 10:59:10 +05:30
Mihir Kandoi
1e4b9fbdf0 fix: fetch rate from item price list when document is saved 2025-02-04 10:54:57 +05:30
Frappe PR Bot
4c39dc5493 fix: sync translations from crowdin (#45691) 2025-02-04 01:35:52 +01:00
rohitwaghchaure
2394dd71e6 Merge pull request #45680 from rohitwaghchaure/fixed-sabb-query
fix: slow SABB query
2025-02-03 20:56:38 +05:30
rethik
9422ce5aee test: add unit test to validate account type and party type 2025-02-03 19:29:59 +05:30
rethik
2c8e3f3409 fix: add validate to allow equity account and party_type shareholder 2025-02-03 19:22:37 +05:30
Sudharsanan11
423decb93c fix: allow multiple email ids 2025-02-03 18:27:32 +05:30
ruthra kumar
daf9c9d34a Merge pull request #45247 from UmakanthKaspa/feature/update-item-name
feat: show item name alongside item code in the update items dialog
2025-02-03 16:53:21 +05:30
ruthra kumar
d762180231 refactor: reuse values from get_item_details 2025-02-03 16:45:12 +05:30
Corentin Forler
b7d801d571 fix(stock): Cast filters.to_date before string concatenation 2025-02-03 11:32:03 +01:00
Rohit Waghchaure
81978a0bd8 fix: slow SABB query 2025-02-03 15:34:29 +05:30
UmakanthKaspa
7b6e8b9c29 feat: show item name alongside item code in the update items dialog 2025-02-03 15:31:16 +05:30
Mihir Kandoi
3cdaa80526 fix: copy correct uom from devliery note when creating packing list 2025-02-03 14:49:50 +05:30
ruthra kumar
adfbfe5b32 Merge pull request #45660 from frappe/pot_develop_2025-02-02
chore: update POT file
2025-02-03 14:31:41 +05:30
Ankush Menat
827afbfa2e fix: track employee changes (#45674)
closes https://github.com/frappe/erpnext/issues/45571
2025-02-03 08:51:50 +00:00
ruthra kumar
1fb3a4333d Merge pull request #45631 from deepeshgarg007/current_subscription_invoice
fix: Do not check for cancelled invoices
2025-02-03 14:11:13 +05:30
ruthra kumar
4b434d01f3 Merge pull request #45659 from frappe/mergify/bp/develop/pr-45617
fix: ignore expired batch for pick list (backport #45617)
2025-02-03 14:07:45 +05:30
ruthra kumar
cd0faf12a4 Merge pull request #45661 from frappe/l10n_develop
fix: sync translations from crowdin
2025-02-03 14:06:20 +05:30
Shariq Ansari
1362e2b6bf Merge pull request #45637 from shariquerik/notes-tab 2025-02-03 13:22:36 +05:30
Shariq Ansari
018df3135a fix: renamed Commments Tab to Notes tab in Lead doctype 2025-02-03 12:12:36 +05:30
rohitwaghchaure
0a25fe981b Merge pull request #45619 from mihir-kandoi/45442
feat: set bank account of company to default company bank account fro…
2025-02-03 12:00:35 +05:30
rohitwaghchaure
60da21be55 Merge pull request #45621 from mihir-kandoi/delivered-button
fix: delivered button of purchase order
2025-02-03 11:51:37 +05:30
rohitwaghchaure
3cdc636111 Merge pull request #45648 from mihir-kandoi/st30593
fix: consider process_loss_qty in work order
2025-02-03 11:50:31 +05:30
Frappe PR Bot
bd2c3711c0 fix: Bosnian translations 2025-02-03 03:17:38 +05:30
Frappe PR Bot
589325e14b fix: Persian translations 2025-02-03 03:17:35 +05:30
Frappe PR Bot
cd20d7aa8e fix: Chinese Simplified translations 2025-02-03 03:17:31 +05:30
frappe-pr-bot
99c3fb6ba5 chore: update POT file 2025-02-02 09:35:01 +00:00
Dany Robert
2a258c1629 fix: ignore expired batch for pick list
(cherry picked from commit 786db3d0fa)
2025-02-02 08:04:04 +00:00
Frappe PR Bot
4b345cf495 fix: sync translations from crowdin (#45656)
* fix: Swedish translations

* fix: Persian translations

* fix: Bosnian translations
2025-02-01 23:48:25 +01:00
Frappe PR Bot
33ce49730a fix: sync translations from crowdin (#45650) 2025-02-01 20:01:17 +01:00
Mihir Kandoi
95fda47b6c fix: consider process_loss_qty in work order 2025-02-01 00:35:12 +05:30
rohitwaghchaure
75567dc9ff Merge pull request #45646 from rohitwaghchaure/fixed-support-30611
fix: not able to make manufacturing entry for alternate items
2025-01-31 23:47:43 +05:30
Rohit Waghchaure
1607aa1a44 fix: not able to make manufacturing entry for alternate items 2025-01-31 23:28:54 +05:30
rohitwaghchaure
1a83316112 Merge pull request #45642 from rohitwaghchaure/fixed-support-30559
fix: actual qty showing blank for sub-assembly items
2025-01-31 22:38:04 +05:30
Sugesh393
707c01487e fix: add allow_on_submit for party_balance, paid_from_account_balance and paid_to_account_balance 2025-01-31 17:49:28 +05:30
Rohit Waghchaure
5be2e71a35 fix: actual qty showing blank for sub-assembly items 2025-01-31 16:49:55 +05:30
l0gesh29
5676d60ed3 feat: add repost accounting ledger entry for payment entry 2025-01-31 16:00:00 +05:30
rohitwaghchaure
3e35c48cf7 Merge pull request #45626 from rohitwaghchaure/fixed-support-29212-1
fix: validation to prevent submission, if the SABB is not linked to a stock transaction
2025-01-31 14:43:12 +05:30
Rohit Waghchaure
f976115a2b fix: validation to prevent submission if the SABB is not linked to a stock transaction 2025-01-31 14:04:27 +05:30
ruthra kumar
e2db3b9cfc Merge pull request #45615 from ljain112/fix-pe-erroe
fix: correct error message in payment entry
2025-01-31 12:56:14 +05:30
Deepesh Garg
2c94867b0e fix: Do not check for cancelled invoices 2025-01-31 12:17:53 +05:30
rohitwaghchaure
a913c9b202 Merge pull request #45629 from mihir-kandoi/st30495
fix: attribute 'msgbox' not found in sales invoice.js
2025-01-31 12:03:47 +05:30
Diptanil Saha
fe51535392 fix: pos print receipt on submit (#45632) 2025-01-31 12:00:00 +05:30
Deepesh Garg
701fc02050 fix: Do not check for cancelled invoices 2025-01-31 11:44:51 +05:30
Mihir Kandoi
5643385c22 fix: attribute 'msgbox' not found in sales invoice.js 2025-01-31 11:26:01 +05:30
Diptanil Saha
5a1851dfe3 fix: loading print receipt only at order complete (#45627) 2025-01-31 11:17:48 +05:30
ruthra kumar
437444fe04 Merge pull request #45623 from frappe/l10n_develop
fix: sync translations from crowdin
2025-01-31 10:54:40 +05:30
Frappe PR Bot
00f9a36980 fix: Swedish translations 2025-01-31 03:11:13 +05:30
Mihir Kandoi
41649cf52d fix: bind this to function 2025-01-30 22:53:00 +05:30
ljain112
592704cfd0 fix: correct error message in payment entry 2025-01-30 17:27:44 +05:30
rohitwaghchaure
b3ffb82586 Merge pull request #45612 from rohitwaghchaure/fixed-posting-date
fix: posting_date to posting_datetime in stock related queries
2025-01-30 17:05:26 +05:30
Rohit Waghchaure
e61ab48145 fix: posting_date to posting_datetime in stock related queries 2025-01-30 16:04:06 +05:30
rohitwaghchaure
b8ee15269c Merge pull request #45609 from rohitwaghchaure/fixed-support-30336
fix: reposting issue with s3 backup
2025-01-30 15:58:14 +05:30
Mihir Kandoi
ce7702cc19 feat: set bank account of company to default company bank account from masters 2025-01-30 12:50:01 +05:30
ljain112
9faf78d3e5 fix: respect user set account if not advance account for getting outstanding invoices in payment entry 2025-01-30 12:32:14 +05:30
Rohit Waghchaure
6b454ca9a7 fix: reposting issue with s3 backup 2025-01-30 11:59:40 +05:30
Frappe PR Bot
9a34c4c1ec fix: sync translations from crowdin (#45608)
* fix: Turkish translations

* fix: Persian translations
2025-01-30 11:20:01 +05:30
Bhavan23
4dd37ba033 fix: filter the item tax template using the input text 2025-01-29 22:19:30 +05:30
rohitwaghchaure
968e235a3f Merge pull request #45486 from rohitwaghchaure/fixed-SABB-performance-issue
perf: stock entry with batch
2025-01-29 20:49:09 +05:30
rohitwaghchaure
90eefac6f6 Merge pull request #45600 from rohitwaghchaure/fixed-validation-msg
fix: validation message
2025-01-29 20:41:39 +05:30
Rohit Waghchaure
4c8dff942d fix: validation message 2025-01-29 20:36:58 +05:30
rohitwaghchaure
378afd2f65 Merge pull request #45596 from frappe/mergify/bp/develop/pr-45595
fix: do not allow to manually submit the SABB (backport #45595)
2025-01-29 16:44:12 +05:30
Sanket Shah
aaf720ab61 fix: Gross Profit Report with Correct Totals and Gross Margin (#45548)
Co-authored-by: Sanket322 <shahsanket322003.com>
2025-01-29 16:42:51 +05:30
Rohit Waghchaure
d042c841e4 fix: do not allow to manually submit the SABB
(cherry picked from commit 2b16eb5381)
2025-01-29 11:08:59 +00:00
ruthra kumar
409e512d47 Merge pull request #45569 from ljain112/fix-vch-outstanding
fix: update voucher outstanding from payment ledger
2025-01-29 16:11:02 +05:30
Safvan Huzain
3f2e93dcb6 fix(query): remove duplicate docstatus condition (#45586)
fix: remove duplicate docstatus condition in query
2025-01-29 10:27:01 +00:00
l0gesh29
79b5a3e1dd fix: remove tds account in taxes table on change of Tax Withholding Category 2025-01-29 15:37:38 +05:30
ruthra kumar
72b940e3d3 Merge pull request #45441 from ljain112/fix-tax-withhel-details
fix: show payment entries in tax withheld vouchers
2025-01-29 15:35:50 +05:30
ruthra kumar
9ae8e94e6c Merge pull request #45585 from ruthra-kumar/auto_add_taxes
refactor: auto add taxes from template
2025-01-29 15:28:12 +05:30
ruthra kumar
d1086722bf refactor: auto add taxes from template 2025-01-29 14:38:50 +05:30
Sugesh G
d748b491ee fix: use currency from opportunity while creating quotation (#45540) 2025-01-29 12:35:45 +05:30
rohitwaghchaure
5e8e7dd3d8 Merge pull request #45536 from rtdany10/precision-return
fix: return qty error due to precision
2025-01-29 12:19:54 +05:30
Ejaaz Khan
5a023dc8d4 fix: add multiple item issue in stock entry (#45544) 2025-01-29 12:19:01 +05:30
Lakshit Jain
9f20854bd9 fix: get stock balance filtered by company for validating stock value in jv (#45549)
* fix: get stock balance filtered by company for validating stock value in jv

* test: error is raised  on validate
2025-01-29 12:16:11 +05:30
ruthra kumar
a64a4f9b20 Merge pull request #45575 from frappe/l10n_develop
fix: sync translations from crowdin
2025-01-29 11:25:43 +05:30
Frappe PR Bot
ac32c554af fix: Turkish translations 2025-01-29 03:14:46 +05:30
Frappe PR Bot
ceb4f249cb fix: Swedish translations 2025-01-29 03:14:43 +05:30
rohitwaghchaure
2609f9809d Merge pull request #43270 from rohitwaghchaure/feat-stock-reservation-for-wo
feat: stock reservation for Work Order
2025-01-28 18:06:57 +05:30
ljain112
dd77070351 fix: update voucher outstanding from payment ledger 2025-01-28 17:54:16 +05:30
Rohit Waghchaure
4d050441b3 feat: stock reservation for Work Order 2025-01-28 16:42:57 +05:30
Akhil Narang
8e77b26641 Merge pull request #45554 from akhilnarang/fixup-44604
fix(book_appointment): stop trying to use pytz api with zoneinfo
2025-01-28 16:25:27 +05:30
Akhil Narang
b08da0f6bd fix(book_appointment): stop trying to use pytz api with zoneinfo
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
2025-01-28 16:09:26 +05:30
ruthra kumar
b1eb604363 Merge pull request #45560 from ruthra-kumar/rename_swiss_coa
chore: rename file to standard name format
2025-01-28 16:03:19 +05:30
ruthra kumar
7bc075376b chore: rename file to standard name format 2025-01-28 14:34:49 +05:30
ruthra kumar
7e7209e448 Merge pull request #45452 from aerele/payment-entry-transaction-currency
fix(payment entry): get amount in transaction currency
2025-01-28 14:33:30 +05:30
ruthra kumar
9964ddc0e9 Merge pull request #45551 from eagleautomate/swiss_coa
feat: Add chart of accounts for Switzerland
2025-01-28 11:33:57 +05:30
Sanket Shah
9933d3c8ff fix: update fields on change of item code In Update Items of Sales Order (#45125)
* fix: update fields on change of item code

* fix: minor update

* fix: set the new values always

* Revert "fix: set the new values always"

This reverts commit 44daa0a641.

---------

Co-authored-by: Sanket322 <shahsanket322003.com>
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
2025-01-28 11:27:28 +05:30
ruthra kumar
813cfdfff6 Merge pull request #45552 from frappe/l10n_develop
fix: sync translations from crowdin
2025-01-28 11:03:49 +05:30
Rohit Waghchaure
0b1b964b77 perf: stock entry with batch 2025-01-28 09:49:37 +05:30
Frappe PR Bot
d1fbeb11cb fix: Turkish translations 2025-01-28 03:03:54 +05:30
Frappe PR Bot
dc7e7118af fix: Swedish translations 2025-01-28 03:03:50 +05:30
Frappe PR Bot
26afba142e fix: French translations 2025-01-28 03:03:33 +05:30
eagleautomate
2c644ec2ef feat: Add chart of accounts for Switzerland
240812 Schulkontenrahmen VEB - DE
2025-01-27 19:29:36 +05:30
ruthra kumar
47c2c5377c Merge pull request #45345 from Sanket322/set_discount_properly
fix:  maintain existing discounts in get_pricing_rule_for_item
2025-01-27 16:01:46 +05:30
Dany Robert
3078578692 fix: return qty error due to precision 2025-01-27 09:54:06 +00:00
ruthra kumar
49570a5544 Merge pull request #45302 from aerele/validate-dimensions-company
feat: add company level validation for accounting dimension
2025-01-27 14:53:49 +05:30
meera-greycube
e88f96b92d feat : company field required for multi company setup (#45415)
* Update vehicle.json

feat : company field required for multi company setup

* Update vehicle.json

allow_rename fixed in vehicle.json

* fix: fix permission issue
2025-01-27 14:28:11 +05:30
ruthra kumar
e55d4030ec Merge pull request #45284 from aerele/pos-return-currency
fix: set party_account_currency for pos_invoice returns
2025-01-27 14:27:41 +05:30
ljain112
db38e7bf5a fix: correct amt in account currency for lcv with manually distributed charges. 2025-01-27 14:22:36 +05:30
Raffael Meyer
11f65f20a0 feat(Sales Invoice): allow linking to project without adding timesheets (#44295)
* feat(Sales Invoice): allow linking to project without adding timesheets

* test: add timesheet data
2025-01-27 13:20:57 +05:30
Diptanil Saha
2ac8c92e7f fix: currency decimal on POS Past Order List (#45524)
* fix: currency decimal on POS

* fix: removed precision
2025-01-27 13:02:24 +05:30
ruthra kumar
fb285749dd Merge pull request #45300 from HarryPaulo/fix-prevent-commit
fix: prevent unnecessary db.commit for contact insert
2025-01-27 12:18:07 +05:30
Frappe PR Bot
887645e55f fix: sync translations from crowdin (#45522)
* fix: French translations

* fix: Spanish translations

* fix: Arabic translations

* fix: Hungarian translations

* fix: Polish translations

* fix: Russian translations

* fix: Swedish translations

* fix: Turkish translations

* fix: Chinese Simplified translations

* fix: Persian translations

* fix: Bosnian translations

* fix: German translations

* fix: Esperanto translations
2025-01-26 23:19:32 +01:00
venkat102
af97f42429 fix(payment entry): get amount in transaction currency 2025-01-26 19:52:06 +05:30
Frappe PR Bot
eabdd5992b chore: update POT file (#45451) 2025-01-26 13:54:13 +01:00
Frappe PR Bot
29341245b8 fix: sync translations from crowdin (#45444)
* fix: Swedish translations

* fix: Turkish translations

* fix: Swedish translations

* fix: Turkish translations

* fix: Persian translations
2025-01-26 12:15:18 +05:30
rohitwaghchaure
b5afd901f3 Merge pull request #45443 from rohitwaghchaure/fixed-support-29487
fix: allow to fix negative stock for batch using stock reco
2025-01-25 15:03:22 +05:30
Rohit Waghchaure
2e8cde3378 fix: allow to fix negative stock for batch using stock reco 2025-01-25 14:44:25 +05:30
ljain112
d97e78e5d3 fix: variable names 2025-01-25 13:16:06 +05:30
ljain112
55733d4f18 fix: show payment entries in Tax Withheld Vouchers 2025-01-25 13:04:12 +05:30
venkat102
bee2c04d0b fix(pos): add item in the existing item row when discount is applied 2025-01-25 12:59:04 +05:30
rohitwaghchaure
53704b98b5 fix: do not check budget during reposting (#45432) 2025-01-24 12:00:45 +00:00
rohitwaghchaure
bad1ac9fbc Merge pull request #45423 from rohitwaghchaure/fixed-support-29882
fix: precision issue in stock entry
2025-01-24 17:07:16 +05:30
Raffael Meyer
4008ca5ddd feat(UX): scroll to required field (#44367) 2025-01-24 16:36:46 +05:30
Rohit Waghchaure
9f3b8520fe fix: precision issue in stock entry 2025-01-24 16:07:25 +05:30
Sanket Shah
d862e9b771 fix: validate items against selling settings (#45288)
fix: validate_for_duplicate_items

Co-authored-by: Sanket322 <shahsanket322003.com>
2025-01-24 15:10:43 +05:30
Venkatesh
97acbb3134 fix: disable load_after_mapping when purchase order created from sales order (#45405) 2025-01-24 15:02:56 +05:30
Raffael Meyer
a9bc395e98 fix: secure bulk transaction (#45386) 2025-01-24 14:44:26 +05:30
Tufan Kaynak
42edb9f5b1 fix(material request): mapping Sales Order Item Delivery Date to Mate… (#45227)
* fix(material request): mapping Sales Order Item Delivery Date to Material Request Item Required By

as mentioned in https://discuss.frappe.io/t/item-delivery-date-on-sales-order-is-not-transferred-to-material-request-item-required-by-date/140479 
fixing
When you create a Material Request directly on the Sales Order via → Create → Material Request, Delivery Date on Sales Order Item is not transferred to Material Request Item Required By date.

* fix(linters): meaningless linters formatting message applied

In order to pass the linters test which I find meaningless as it asks for the comma after the last item in a dictionary data type

* fix(linters): formatting code for linters pass

Linters formatting applied
2025-01-24 14:20:20 +05:30
Martin Luessi
e82911041d fix: remove unnecessary auth from plaid connector (#44305) 2025-01-24 13:11:32 +05:30
rohitwaghchaure
3d7f1026ca Merge pull request #45335 from rohitwaghchaure/fixed-valuation-for-batch
fix: valuation for batch
2025-01-24 12:50:55 +05:30
Diptanil Saha
54d234e05d fix: resolved pos return setting to default mode of payment instead of user selection (#45377)
* fix: resolved pos return setting to default mode of payment instead of user selection

* refactor: removed console log statement

* refactor: moved get_payment_data to sales_and_purchase_return.py
2025-01-24 12:41:01 +05:30
Diptanil Saha
78c7c1c631 feat: full screen on pos (#45404)
* feat: full screen on pos

* refactor: variables for label

* fix: refactor and handled button label change

* refactor: rename enable fullscreen label
2025-01-24 07:07:36 +00:00
Rohit Waghchaure
8028dd2683 fix: version 2025-01-24 12:32:16 +05:30
mahsem
cd3f03696e fix: use frappe.datetime.str_to_user (#45216)
* fix: default_datetime_format

* fix: add_format_datetime

* fix: update to str_to_user  in point_of_sale/pos_controller.js

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>

* fix: convert_to_str_to_user

* fix: linters

* fix: whitespace

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2025-01-24 12:16:47 +05:30
Sugesh G
6ec18fb40d fix: set expense_account and cost_center based on company in stock entry (#45159)
* fix: set expense_account and cost_center based on company in stock entry

* fix: remove is_perpetual_inventory_enabled validation for cost_center
2025-01-24 12:13:44 +05:30
ruthra kumar
5bf90dccbb Merge pull request #45412 from frappe/l10n_develop
fix: sync translations from crowdin
2025-01-24 11:05:12 +05:30
Frappe PR Bot
9888c62e13 fix: Swedish translations 2025-01-24 02:26:17 +05:30
Rohit Waghchaure
5088d8576f fix: valuation for batch 2025-01-23 20:38:14 +05:30
Raffael Meyer
d92f9330fa fix: get default stock uom (#45384)
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2025-01-23 14:32:39 +01:00
mergify[bot]
d1329c2910 fix: add condition to check if item is delivered by supplier in make_purchase_order_for_default_supplier() (backport #45370) (#45409)
fix: add condition to check if item is delivered by supplier in make_purchase_order_for_default_supplier() (#45370)

(cherry picked from commit 69464ab7ff)

Co-authored-by: Shanuka Hewage <89955436+Shanuka-98@users.noreply.github.com>
2025-01-23 18:18:58 +05:30
meike289
1758e125e0 fix: fix creating documents from sales invoice (#45346)
Co-authored-by: Meike Nedwidek <nedwidek@kk-software.de>
2025-01-23 17:54:00 +05:30
ruthra kumar
85b6fdd067 Merge pull request #45248 from niyazrazak/patch-22
chore: consider currency precision in bank clearance
2025-01-23 16:57:28 +05:30
ruthra kumar
c889bdba0f chore: import statements and linter 2025-01-23 16:39:03 +05:30
ruthra kumar
766b5fa5ed Merge pull request #44790 from ruthra-kumar/configurable_posting_date_for_exc_gain_loss
refactor: configurable posting date for Exc Gain / Loss journal
2025-01-23 16:28:21 +05:30
ruthra kumar
3923b784e3 Merge pull request #45129 from marination/ac-match-simplify
fix: Wrong `bank_ac_no` filter + simplify logic in automatch
2025-01-23 16:27:49 +05:30
ruthra kumar
7b8a099d95 Merge pull request #44950 from mahsem/postal_code_move_and_fixes
fix: postal_code_move_and_fixes
2025-01-23 16:17:15 +05:30
ruthra kumar
a71718883e refactor: support JE posting date in semi-auto reconciilation tool 2025-01-23 16:11:35 +05:30
ruthra kumar
2f3281579a test: exc gain/loss posting date based on configuration 2025-01-23 14:44:40 +05:30
ruthra kumar
b2c3da135e refactor: only apply configuration on normal payments
patch to update default value
2025-01-23 14:12:24 +05:30
ruthra kumar
95af63e305 refactor: allow reconciliation date for exchange gain / loss 2025-01-23 13:48:09 +05:30
rohitwaghchaure
f79eea2261 Merge pull request #45394 from rohitwaghchaure/fixed-support-30031
fix: JobCardTimeLog' object has no attribute 'remaining_time_in_mins'
2025-01-23 13:22:17 +05:30
ruthra kumar
5257413a93 refactor: configurable posting date for Exc Gain / Loss journal 2025-01-23 13:06:30 +05:30
Rohit Waghchaure
41dda35db7 fix: JobCardTimeLog' object has no attribute 'remaining_time_in_mins' 2025-01-23 13:03:37 +05:30
Sanket322
50223c6bec fix: remove applied pricing rule 2025-01-23 11:55:12 +05:30
Sanket Shah
2a400dd3f8 perf: optimize DB calls with frappe.get_all (#45289)
* perf: reduce multiple db queries

* fix: use frappe._dict instread of extra iteration

---------

Co-authored-by: Sanket322 <shahsanket322003.com>
2025-01-23 11:29:41 +05:30
Frappe PR Bot
551fa500e8 fix: sync translations from crowdin (#45387)
* fix: Swedish translations

* fix: Turkish translations
2025-01-23 11:18:59 +05:30
Mihir Kandoi
fe43d20545 fix: added item_group filter in item_code field in stock balance report (#45340)
* fix: added item_group filter in item_code field in stock balance report

* feat: added filter to not show non stock items
2025-01-23 11:17:35 +05:30
rohitwaghchaure
8e18c572f4 Merge pull request #45367 from rohitwaghchaure/fixed-incorrect-calculation-of-qty
fix: batch qty calculation
2025-01-23 09:40:16 +05:30
Rohit Waghchaure
f07a71a882 fix: batch qty calculation 2025-01-22 21:06:43 +05:30
rohitwaghchaure
c5f21a5686 Merge pull request #45382 from rohitwaghchaure/fixed-support-29769
fix: precision issue causing incorrect status
2025-01-22 20:17:20 +05:30
Rohit Waghchaure
4a7586cc01 fix: precision issue causing incorrect status 2025-01-22 18:04:52 +05:30
ruthra kumar
3fbd2ca0d9 refactor: configurable posting date for Exc Gain / Loss journal 2025-01-22 17:54:00 +05:30
Diógenes Souza
b26f0b6633 fix: System was allowing to save payment schedule amount less than grand total (#45322)
* fix: System was allowing to save payment schedule amount less than grand_total

* style: After run pre-commit
2025-01-22 17:52:26 +05:30
Rethik M
05579959f2 fix: validate non-stock item for exchange loss/gain (#45306)
* fix: validate non-stock item

* test: add unit test to validate non-stock item exchange difference

* fix: use usd supplier
2025-01-22 17:44:53 +05:30
gavin
4481ca83ff fix: set preferred email in Employee via backend controller (#45320)
fix: set preferred email in Employee (backend)

Set "Preferred Email" for Employee via validate. Unset value when
prefered_contact_email is also unset.
2025-01-22 17:41:41 +05:30
Khushi Rawat
9ff3101b2d fix: added debounce to prevent multiple clicks (#45369)
* fix: added debounce to prevent multiple clicks

* fix: linters check
2025-01-22 17:26:38 +05:30
mergify[bot]
8b6a20d501 fix: precision on work order total qty (backport #45341) (#45361)
fix: precision on work order total qty (#45341)

* fix: precision on work order total qty

* chore: linters

(cherry picked from commit 53468202de)

Co-authored-by: Dany Robert <rtdany10@gmail.com>
2025-01-22 17:25:50 +05:30
Raffael Meyer
be2593bb51 refactor!: remove redundant title field from sales transactions (#45115)
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2025-01-22 11:35:41 +00:00
Ejaaz Khan
5207917993 feat: set default view as tree-view (#45365)
feat: set default view as treeview
2025-01-22 16:18:31 +05:30
Deepesh Garg
84d379914c Merge pull request #45371 from deepeshgarg007/closing_balance_patch_rerun
fix: Do no query GLs if no PCVs are posted
2025-01-22 14:02:23 +05:30
Deepesh Garg
f4d1a54588 fix: Do no query GLs if no PCVs are posted 2025-01-22 13:46:37 +05:30
ruthra kumar
1c6a7830c3 Merge pull request #45363 from frappe/l10n_develop
fix: sync translations from crowdin
2025-01-22 12:12:43 +05:30
Frappe PR Bot
4455312b73 fix: Turkish translations 2025-01-22 01:34:43 +05:30
Sugesh393
36bae55299 chore: update variable names for improved readability 2025-01-21 17:38:24 +05:30
Niklas Liechti
dedb96d337 refactor: return job_id to be able to react to it when job is finished. (#45111) 2025-01-21 17:38:12 +05:30
ruthra kumar
d73c17aa98 Merge pull request #45242 from aerele/pos-invoice-item
fix: include pos invoice in modifing key for returned item validation
2025-01-21 16:34:59 +05:30
ruthra kumar
4f55356c79 Merge pull request #45215 from aerele/handle_aed_exchange_rate_manually
fix: calculate AED exchange rate based on pegged value with USD
2025-01-21 13:58:21 +05:30
Deepesh Garg
993f40fa43 perf: Ignore is_opening column in GL Queries (#45327)
* perf: Ignore is_opening column in GL Queries

* chore: Remove unwanted changes

* chore: Remove unwanted changes

* chore: Remove unwanted changes

* chore: Remove unwanted changes

* chore: Remove unwanted changes

* chore: Remove unwanted changes
2025-01-21 13:45:25 +05:30
ruthra kumar
2e535955b3 refactor: use dictionary for better expandability 2025-01-21 12:15:26 +05:30
ruthra kumar
dd923332cb refactor: fix type error 2025-01-21 12:15:26 +05:30
Frappe PR Bot
7b0c21e989 fix: sync translations from crowdin (#45323)
* fix: Swedish translations

* fix: Turkish translations

* fix: French translations

* fix: Spanish translations

* fix: Arabic translations

* fix: Hungarian translations

* fix: Polish translations

* fix: Russian translations

* fix: Swedish translations

* fix: Turkish translations

* fix: Chinese Simplified translations

* fix: Persian translations

* fix: Bosnian translations

* fix: German translations

* fix: Esperanto translations

* fix: Swedish translations

* fix: Turkish translations

* fix: Persian translations
2025-01-20 22:57:21 +01:00
rohitwaghchaure
6c32397313 Merge pull request #45282 from mihir-kandoi/44976
feat: Add corrective job card operating cost as additional costs in s…
2025-01-20 22:48:46 +05:30
rohitwaghchaure
5638dac414 Merge pull request #45344 from iamejaaz/broken-bom-tree
fix: broken image issue in BOM Tree
2025-01-20 22:48:05 +05:30
Sanket322
e2a32b7257 fix: use user defined discount amount or default 2025-01-20 18:01:31 +05:30
Ejaaz Khan
7c6e279599 fix: broken image issue in BOM Tree 2025-01-20 17:49:18 +05:30
Diptanil Saha
68fb1b28eb fix: set invoice start date to subscription start date (#45342) 2025-01-20 17:06:02 +05:30
Mihir Kandoi
47f8a86003 fix: logical error in where condition of qb query 2025-01-20 12:41:28 +05:30
ruthra kumar
5fb158a6f7 Merge pull request #45202 from DaizyModi/fix-party-bank-acc-in-pe
fix: Correct Party Bank Account mapping in `Payment Entry` from Transactional Doctypes
2025-01-20 12:22:10 +05:30
ruthra kumar
30e87c37dc Merge pull request #45334 from mahsem/translation_fixes
fix: translation fixes
2025-01-20 12:11:32 +05:30
ruthra kumar
f9200a9575 Merge pull request #45167 from aerele/validate-sales-person
fix: validate linked sales person
2025-01-20 11:49:14 +05:30
mahsem
3697ba0772 fix: linters 2025-01-19 21:00:02 +01:00
mahsem
1d81a9f933 fix: translation fixes 2025-01-19 20:52:58 +01:00
Frappe PR Bot
da34d7923d chore: update POT file (#45331) 2025-01-19 11:47:50 +01:00
rohitwaghchaure
04364d680f Merge pull request #44783 from rohitwaghchaure/fixed-support-27273
fix: do not reset picked items
2025-01-18 14:22:54 +05:30
Rohit Waghchaure
34a80bfcd3 fix: do not reset picked items 2025-01-18 12:44:30 +05:30
rohitwaghchaure
76ba17808b Merge pull request #45298 from rohitwaghchaure/fixed-qi-company
fix: company in quality inspection
2025-01-18 12:14:54 +05:30
Rohit Waghchaure
397cd79e1e fix: company in quality inspection 2025-01-18 11:09:00 +05:30
Diptanil Saha
97e3770872 fix: fixed typo in manufacturing settings and field rename (#45238)
* chore: field rename and patch entry

* chore: patch file rename and description improvement

---------

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2025-01-17 11:54:39 +00:00
ruthra kumar
8f9b5aaae7 Merge pull request #44811 from sagarvora/fix-pcv-patch-99
fix!: ensure multiple PCVs in same fiscal year are considered in patch
2025-01-17 17:00:40 +05:30
Diptanil Saha
d13c03676b chore: quickbooks migrator integration removal (#45240) 2025-01-17 16:53:36 +05:30
Diptanil Saha
98d401bee4 fix: fetching items from blanket order to sales/purchase order (#45262)
* fix: blanket order with zero item quantity

* fix: item quantity validation

* refactor: resolve linter issue
2025-01-17 16:53:06 +05:30
Nabin Hait
ec487c14d9 fix: Ambiguous column error while creating Sales Return (#45275) 2025-01-17 16:51:07 +05:30
Nabin Hait
2d45d0e5d5 fix: updated modified timestamp for stock entry type (#45280) 2025-01-17 16:50:43 +05:30
Lakshit Jain
ada272a29b fix: round off tax withholding amount (#45271) 2025-01-17 16:50:15 +05:30
Patrick Eißler
8d66142865 fix(Project): re-phrase welcome email (#45175) 2025-01-17 12:17:32 +01:00
Sagar Vora
84e0b41c4f fix: ensure multiple PCVs in same fiscal year are considered in patch 2025-01-17 16:44:06 +05:30
Sanket Shah
19c8708e5e fix: don't update party-type on change of cost center in Journal Entry (#45291)
fix: don't update party-type on change of cost center

Co-authored-by: Sanket322 <shahsanket322003.com>
2025-01-17 16:42:04 +05:30
Ejaaz Khan
aa38895caf feat: add option to update modified on communication recieved (#45307) 2025-01-17 16:40:35 +05:30
rohitwaghchaure
9163f60191 fix: sales return for multi-uom (#45303) 2025-01-17 16:35:59 +05:30
Sugesh393
454067198e fix: set company related values 2025-01-17 11:46:17 +05:30
Sugesh393
c94091d68f test: add new unit test for company validation in accounting dimension 2025-01-17 11:45:51 +05:30
Sugesh393
60efd3e219 feat: add company level validation for accounting dimension 2025-01-17 11:41:52 +05:30
Frappe PR Bot
0e7e9b5f0a fix: sync translations from crowdin (#45299)
* fix: Turkish translations

* fix: Persian translations
2025-01-16 22:49:23 +01:00
HarryPaulo
87de5c7450 fix: prevent unnecessary db.commit for contact insert [Linters] 2025-01-16 17:51:22 -03:00
HarryPaulo
5f15b0b65b fix: prevent unnecessary db.commit 2025-01-16 17:40:54 -03:00
Mihir Kandoi
063a205e5a refactor: added condition which checks for corrective operation setting 2025-01-16 20:55:27 +05:30
rohitwaghchaure
43ce185429 Merge pull request #45283 from rohitwaghchaure/fixed-github-45219
fix: Does not allow to create Sub-Asseblies of Sub Assemblies
2025-01-16 14:57:56 +05:30
Rohit Waghchaure
318a945d66 fix: Does not allow to create Sub-Asseblies of Sub Assemblies 2025-01-16 13:51:11 +05:30
ruthra kumar
6628d290de Merge pull request #45285 from frappe/l10n_develop
fix: sync translations from crowdin
2025-01-16 11:10:32 +05:30
Mihir Kandoi
4fb48b7f22 test: Added test for new feature 2025-01-16 10:08:47 +05:30
Frappe PR Bot
ed2764ab8d fix: Persian translations 2025-01-15 23:49:21 +05:30
Frappe PR Bot
a7cd17ac8b fix: Turkish translations 2025-01-15 23:49:14 +05:30
Sugesh393
484ecf2479 test: add new unit test to check payments amount of pos_invoice returns 2025-01-15 18:27:57 +05:30
Sugesh393
2af6fca7fa fix: set party_account_currency for pos_invoice returns 2025-01-15 18:20:20 +05:30
Mihir Kandoi
2bf10f68a8 feat: Add corrective job card operating cost as additional costs in stock entry 2025-01-15 18:14:19 +05:30
rohitwaghchaure
cb91e8e69e Merge pull request #45278 from rohitwaghchaure/fixed-github-45246
fix: status of the serial no for the raw materials
2025-01-15 18:13:34 +05:30
Rohit Waghchaure
9607b16dcf fix: status of the serial no for the raw materials 2025-01-15 17:53:11 +05:30
Lakshit Jain
37a5767be5 fix: check if tds deducted based on Purchase Taxes and Charges (#45161) 2025-01-15 15:31:56 +05:30
rohitwaghchaure
195254756f Merge pull request #45270 from mihir-kandoi/st29053
fix: Skip WIP Warehouse transfer
2025-01-15 15:05:49 +05:30
Lakshit Jain
a4453fb77b fix: use currency defined in plan for subscription invoice (#45104) 2025-01-15 14:52:25 +05:30
Mihir Kandoi
6edb454eea test: Added new test to check wip skip 2025-01-15 13:49:11 +05:30
rohitwaghchaure
001d1eb3f9 Merge pull request #45259 from rohitwaghchaure/fixed-support-29045
fix: incorrect valuation for sales return with different warhouse
2025-01-14 18:33:34 +05:30
Rohit Waghchaure
3a2e816759 fix: incorrect valuation for sales return with different warhouse 2025-01-14 18:11:17 +05:30
ruthra kumar
ce9c606f71 refactor: allow users to configure interval for Semi-Auto payment reconciliation (#45211)
* refactor: configurable interval for reconciliation trigger

* refactor: set default value for interval

* refactor: configurable queue size

* refactor: use patch to setup default cron job

* refactor: use 'after_migrate' to setup cron for reconciliation

User specified interval will be used

* chore: type casting

* refactor: use scheduler_event to persist cron

* chore: rename field

* chore: use configured queue size

* chore: remove unwanted field
2025-01-14 16:59:15 +05:30
Mihir Kandoi
09d26a835f fix: tests 2025-01-14 16:27:49 +05:30
ruthra kumar
aea69af4ff Merge pull request #45182 from ruthra-kumar/configurable_reconciliation_dates
refactor: configurable reconciliation dates for Advance Payments
2025-01-14 15:18:46 +05:30
ruthra kumar
fd442a36a9 Merge pull request #45260 from ruthra-kumar/incorrect_label
fix: incorrect label in Item-wise sales register
2025-01-14 13:55:20 +05:30
ruthra kumar
9ee5fcc602 refactor: only update reconcile_effect_on advance in separate acc 2025-01-14 13:52:21 +05:30
ruthra kumar
d9013e1054 fix: incorrect label in Item-wise sales register 2025-01-14 13:34:12 +05:30
rohitwaghchaure
9bb7d4e428 Merge pull request #45241 from rohitwaghchaure/fixed-support-28979
fix: auto fetch batch and serial no for draft stock transactions
2025-01-14 12:35:17 +05:30
mahsem
a3165c5719 fix: change string to be able to translate (#45090)
* fix: change_string_to_translate

* fix: debit note translation

* chore: update 'modified' field

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
2025-01-14 06:26:01 +00:00
ruthra kumar
601bc3026d Merge pull request #45249 from frappe/l10n_develop
fix: sync translations from crowdin
2025-01-14 11:17:27 +05:30
ruthra kumar
aeedaae761 Merge pull request #45078 from Sanket322/cancel_subscription
fix: don't create invoice if `current_invoice_start ` is in future
2025-01-14 10:12:33 +05:30
ruthra kumar
2e8723407f Merge pull request #45074 from Sanket322/set_shipping_address
fix: set billing and shipping address on change of company
2025-01-14 10:04:13 +05:30
ruthra kumar
4b483e176d Merge pull request #45001 from ljain112/fix-tds-excess
fix: deduct tds on excess amount if checked
2025-01-14 10:02:06 +05:30
ruthra kumar
f7a93640b0 Merge pull request #44798 from aerele/apply_pricing_rule
fix: update  discounting on mixed conditions
2025-01-14 09:58:03 +05:30
Frappe PR Bot
8f8cddb03c fix: Persian translations 2025-01-13 23:39:50 +05:30
Frappe PR Bot
ea4526ad30 fix: Turkish translations 2025-01-13 23:39:40 +05:30
Frappe PR Bot
6c5a9f5a74 fix: sync translations from crowdin (#45174) 2025-01-13 18:02:50 +01:00
Mihir Kandoi
bbb5f8056b fix: Skip WIP Warehouse transfer 2025-01-13 21:32:34 +05:30
NIYAZ RAZAK
83bb3926b1 chore: consider currency precision 2025-01-13 18:53:59 +03:00
ruthra kumar
9fa1865cb7 refactor: backwards compatibility 2025-01-13 17:17:18 +05:30
Rohit Waghchaure
88ab9be79c fix: auto fetch batch and serial no for draft stock transactions 2025-01-13 17:17:03 +05:30
venkat102
2936139c79 fix: include pos invoice in modifing key for returned item validation 2025-01-13 16:51:25 +05:30
ruthra kumar
a4271aa5d1 refactor: save reconcile effect on reference table 2025-01-13 16:20:58 +05:30
ruthra kumar
7e7775aa44 refactor: store reconciliation date in reference
Helps with reposting
2025-01-13 15:56:41 +05:30
Diptanil Saha
e529f82392 fix: batch number search on pos (#45209)
* fix: price of items with batch number not having seperate item price on pos search bar

* fix: introduced batch number based sorting
2025-01-13 12:06:46 +05:30
Ejaaz Khan
eea0eff001 fix: ui issues across multiple pages (#45224)
* fix: ui issues across multiple pages

* refactor: change cur_from to frm
2025-01-13 11:56:59 +05:30
Ejaaz Khan
6eb3b0b1c2 refactor: remove columns from list in child table (#45189) 2025-01-13 11:54:44 +05:30
Ejaaz Khan
53c282c86e refactor: remove party type from general ledger print format (#45196)
refactor: remove party type from print format
2025-01-13 11:52:45 +05:30
Frappe PR Bot
959434601d chore: update POT file (#45231) 2025-01-12 11:27:09 +01:00
rohitwaghchaure
c6c7d7832a Merge pull request #45207 from rohitwaghchaure/fixed-support-29140
fix: incorrect valuation rate for PI based revaluation
2025-01-11 10:07:54 +05:30
rohitwaghchaure
edb254e43e Merge pull request #45214 from rohitwaghchaure/fixed-support-29172
fix: delivery_document_no column issue
2025-01-11 10:07:26 +05:30
Kavin
455ef6f084 fix: calculate AED exchange rate based on pegged value with USD 2025-01-10 18:20:47 +05:30
Rohit Waghchaure
61efb2bb39 fix: delivery_document_no column issue 2025-01-10 18:19:48 +05:30
ruthra kumar
856ec08484 Merge pull request #45195 from sokumon/coa-ui
fix: coa actions cleanup
2025-01-10 16:08:19 +05:30
rohitwaghchaure
31005c5984 Merge pull request #45076 from frappe/valuation_in_ageing_report
feat: Added valuation of quantity for each age group in stock ageing …
2025-01-10 14:25:50 +05:30
Rohit Waghchaure
14ce2337df fix: incorrect valuation rate for PI based revaluation 2025-01-10 14:20:48 +05:30
ruthra kumar
e0517852bc test: ensure reconciliation date config takes effect 2025-01-10 12:17:13 +05:30
rohitwaghchaure
e4d3235b9c Merge pull request #45204 from frappe/mergify/bp/develop/pr-45197
fix: precision loss causing process loss variance (backport #45197)
2025-01-10 12:00:37 +05:30
rohitwaghchaure
5ccf4a1783 chore: fix conflicts 2025-01-10 11:25:53 +05:30
FATHIH MOHAMMED
1ef9f7f8fd fix: precision loss causing process loss variance
(cherry picked from commit d84601b2a3)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/stock_entry.py
2025-01-10 05:49:59 +00:00
DaizyModi
376bdc75f4 fix: Correct Party Bank Account mapping in Payment Entry 2025-01-10 11:06:39 +05:30
ruthra kumar
c8e93e7a61 refactor: hide old checkbox 2025-01-09 20:41:29 +05:30
ruthra kumar
bb8d2c994c refactor: payment entry to handle posting date on configuation 2025-01-09 20:41:29 +05:30
ruthra kumar
fb6c72a247 refactor: test cases updated 2025-01-09 20:41:29 +05:30
ruthra kumar
a8a8ac71b6 refactor: patch to migrate checkbox to select 2025-01-09 20:41:27 +05:30
ruthra kumar
8b2c981fc3 refactor: introduce select fields in company and payment entry 2025-01-09 20:22:05 +05:30
sokumon
108a91d788 fix: coa actions cleanup 2025-01-09 16:49:24 +05:30
rohitwaghchaure
1f1c01d88e Merge pull request #44988 from frappe/35225
feat: Validate sub assembly and material request items in Production …
2025-01-09 16:28:29 +05:30
rohitwaghchaure
90339511aa Merge pull request #45190 from diptanilsaha/fix-typo-in-manufacturing-settings
fix: typo in manufacturing settings
2025-01-09 16:26:01 +05:30
diptanilsaha
a9b761f862 fix: typo in manufacturing settings 2025-01-09 16:05:40 +05:30
rohitwaghchaure
4ec824d71e Merge pull request #45183 from rohitwaghchaure/fixed-support-29059
fix: not able to see create Quality Inspection button
2025-01-09 14:36:52 +05:30
rohitwaghchaure
bb9dd7b8cc Merge pull request #45180 from rohitwaghchaure/fixed-support-28867
fix: do not add ordered items from Quotation to new Sales Order
2025-01-09 14:34:13 +05:30
Rohit Waghchaure
b291835ccd fix: not able to see create Quality Inspection button 2025-01-09 14:31:01 +05:30
Rohit Waghchaure
2e930eb97b fix: do not add ordered items from Quotation to new Sales Order 2025-01-09 13:52:34 +05:30
rohitwaghchaure
00dadc1a89 Merge pull request #45177 from rohitwaghchaure/fixed-support-29008
fix: timeout error for work order
2025-01-09 13:47:17 +05:30
Rohit Waghchaure
b4ceda6f2c fix: timeout error for work order 2025-01-09 13:27:43 +05:30
Khushi Rawat
7ea73d8265 chore: removal of decapitalization feature (#45162)
* chore: removal of decapitalization feature

* fix: rearrangement of asset capitalization doctype fields
2025-01-08 20:44:12 +05:30
Raffael Meyer
9e760e54a5 fix(Timesheet): ignore permissions when updating Task and Project (#45168) 2025-01-08 13:36:31 +01:00
Sudharsanan11
e614f07795 fix: validate linked sales person 2025-01-08 13:51:33 +05:30
Ejaaz Khan
81d8f257aa refactor: validate due date code and message according to doctype (#45126)
* refactor: change message of date comparision and refactor code

* refactor: commonify function call for sales and purchase invoice

* refactor: remove redundant mandatory error validation
2025-01-08 12:49:02 +05:30
Mihir Kandoi
dbb572eec1 test: Valuation of ageing stock 2025-01-08 11:52:24 +05:30
ruthra kumar
2b453219fc Merge pull request #45148 from frappe/l10n_develop
fix: sync translations from crowdin
2025-01-08 09:01:02 +05:30
ruthra kumar
ca44a31420 Merge pull request #45154 from ruthra-kumar/remove_possible_deadlock_in_auto_reconcile
fix: possible deadlock while using auto reconciliation
2025-01-08 09:00:42 +05:30
ruthra kumar
4620025dcd chore: remove 'Experimental' tag 2025-01-08 08:22:37 +05:30
ruthra kumar
5df9a8ab99 Merge pull request #45112 from marination/bank-reco-bank-balance
fix: Missing company filter breaks `get_account_balance` in Bank Reco
2025-01-08 08:16:21 +05:30
Frappe PR Bot
731822efac fix: Spanish translations 2025-01-07 21:48:22 +05:30
rohitwaghchaure
a24d7e8ecd Merge pull request #45144 from rohitwaghchaure/fixed-support-28796
fix: issue in returning components against the SCO
2025-01-07 18:31:18 +05:30
Rohit Waghchaure
729ce1dc50 fix: issue in returning components against the SCO 2025-01-07 18:11:56 +05:30
Diptanil Saha
31dd32dcdf fix: serial and batch no. buttons on pos (#45048) 2025-01-07 18:06:02 +05:30
Khushi Rawat
6850019649 feat: work in progress status for asset (#45066)
* feat: work in progress status for asset

* fix: test case correction

* fix(patch): added patch to update status of assets

* fix: updated tests
2025-01-07 17:38:21 +05:30
Diptanil Saha
2788739c1e feat: pos configuration for print receipt on complete order (#45024) 2025-01-07 17:35:01 +05:30
Diptanil Saha
9f77793f16 chore: removal of tally migration feature (#45100) 2025-01-07 17:28:46 +05:30
Ejaaz Khan
a0f17f8e73 refactor: change sales invoice button position (#45130) 2025-01-07 17:17:59 +05:30
Venkatesh
dc5bff9008 fix: ignore crm deal in tax_rule search filter (#45134) 2025-01-07 17:11:31 +05:30
marination
8521796811 fix: Wrong bank_ac_no filter + simplify convoluted logic 2025-01-07 13:28:55 +05:30
Sanket322
61d4593236 fix: minor update for readability 2025-01-07 12:44:29 +05:30
ruthra kumar
3bc74f219a Merge pull request #45121 from ruthra-kumar/revert_44989
fix: discount resetting on date change
2025-01-07 11:20:43 +05:30
ruthra kumar
886281f81a fix: discount resetting on date change
revert #44989
2025-01-07 11:14:42 +05:30
Raffael Meyer
9eede907f8 fix(Project): make status in confirmation dialog translatable (#45118) 2025-01-06 22:12:53 +00:00
Raffael Meyer
6f5fea6b52 refactor(Project): extract custom button function (#45116) 2025-01-06 21:58:38 +00:00
Frappe PR Bot
3ca3707603 fix: sync translations from crowdin (#45113) 2025-01-06 18:25:54 +01:00
marination
d7bf73cffa fix: Override pre-commit behaviour due to conflicts with CI 2025-01-06 21:14:41 +05:30
marination
8de0fe78ea fix: Missing company filter breaks get_account_balance in Bank Reco 2025-01-06 20:27:06 +05:30
Mihir Kandoi
87f1f6e15c fix: Attempt to fix status updater 1 2025-01-06 19:47:44 +05:30
rohitwaghchaure
7afe3cccd6 Merge pull request #45107 from rohitwaghchaure/fixed-support-28773
fix: Returned Qty in Work Order Consumed Materials report
2025-01-06 16:05:54 +05:30
Rohit Waghchaure
30d68a31e0 fix: Returned Qty in Work Order Consumed Materials report 2025-01-06 15:23:57 +05:30
Diptanil Saha
d79e561248 fix: update customer contact details on pos (#45071)
* fix: update customer contact details on pos

* refactor: removed console log statement
2025-01-06 14:53:44 +05:30
ruthra kumar
03abde6993 Merge pull request #45006 from diptanilsaha/fix-price_list_rate-for-pos-search-term
fix: pos search by term items price
2025-01-06 14:08:51 +05:30
ruthra kumar
c7370e214f Merge pull request #45099 from sokumon/new-button-in-coa
fix: show new button in coa if create access
2025-01-06 13:49:12 +05:30
sokumon
3125bc8a16 fix: show new button in coa if create access 2025-01-06 12:26:06 +05:30
rohitwaghchaure
7bbd70a7e2 Merge pull request #45097 from iamejaaz/subcontracting-links
feat: add subcontracting links in manufacturing workspace
2025-01-06 12:22:23 +05:30
rohitwaghchaure
acb5eeb281 Merge pull request #45084 from frappe/45082
fix: Alternative Items button in Work Order
2025-01-06 12:21:25 +05:30
Mihir Kandoi
b8838bd9b9 fix: Alternative Item button dissapearing on Save event 2025-01-06 11:22:06 +05:30
Ejaaz Khan
d42ee40b17 refactor: revert modified by in subcontracting 2025-01-06 11:00:54 +05:30
ruthra kumar
19f1e089bd Merge pull request #45047 from Abdeali099/use-constants
refactor: use variables for app name, title, and home route in hooks
2025-01-06 10:51:32 +05:30
Ejaaz Khan
bddffbb04f feat: add subcontracting links on manufacturing 2025-01-06 10:49:26 +05:30
ruthra kumar
2b88c13002 Merge pull request #45081 from frappe/mergify/copy/develop/pr-44949
Add phone number field when channel is phone on Payment Request doctype (copy #44949)
2025-01-06 10:09:54 +05:30
ruthra kumar
988b680244 Merge pull request #44952 from mahsem/Hold_to_On_Hold
fix: Hold_to_On_Hold
2025-01-06 08:44:33 +05:30
ruthra kumar
4d74724a34 Merge pull request #44943 from creative-paramu/bank_reconcilation_company_filter
fix: Bank Reconciliation Statement Report Company Filter
2025-01-06 08:35:44 +05:30
ruthra kumar
b6fe43b63a Merge pull request #45051 from aerele/currency-validation
fix: ignore currency validation while canceling the voucher
2025-01-06 08:25:05 +05:30
ruthra kumar
d39fa07620 Merge pull request #45088 from frappe/l10n_develop
fix: sync translations from crowdin
2025-01-06 06:19:28 +05:30
Frappe PR Bot
34a4efbc59 fix: Esperanto translations 2025-01-05 20:36:22 +05:30
Frappe PR Bot
d34ebcfe9a fix: German translations 2025-01-05 20:36:19 +05:30
Frappe PR Bot
7b5f026b8b fix: Bosnian translations 2025-01-05 20:36:16 +05:30
Frappe PR Bot
630009e28f fix: Persian translations 2025-01-05 20:36:12 +05:30
Frappe PR Bot
9727bcc281 fix: Chinese Simplified translations 2025-01-05 20:36:09 +05:30
Frappe PR Bot
3c96ccf990 fix: Turkish translations 2025-01-05 20:36:06 +05:30
Frappe PR Bot
74791fd619 fix: Swedish translations 2025-01-05 20:36:02 +05:30
Frappe PR Bot
ee3f3fc799 fix: Russian translations 2025-01-05 20:35:59 +05:30
Frappe PR Bot
7bcd5f5bcb fix: Polish translations 2025-01-05 20:35:56 +05:30
Frappe PR Bot
af027cf980 fix: Hungarian translations 2025-01-05 20:35:53 +05:30
Frappe PR Bot
b3e2e8e123 fix: Arabic translations 2025-01-05 20:35:49 +05:30
Frappe PR Bot
43408c1b6d fix: Spanish translations 2025-01-05 20:35:46 +05:30
Frappe PR Bot
609f789807 fix: French translations 2025-01-05 20:35:42 +05:30
Frappe PR Bot
cacc90c224 chore: update POT file (#45092) 2025-01-05 11:26:50 +01:00
rohitwaghchaure
a76c3b5f3f Merge pull request #45087 from rohitwaghchaure/fixed-support-28646
fix: invoice against purchase receipt with returned quantity
2025-01-04 20:37:08 +05:30
Frappe PR Bot
ae4e55bf3a fix: Persian translations 2025-01-04 20:28:58 +05:30
Frappe PR Bot
07ba0281f7 fix: Swedish translations 2025-01-04 20:28:52 +05:30
Rohit Waghchaure
d5babf4237 fix: invoice against purchase receipt with returned quantity 2025-01-04 19:59:19 +05:30
rohitwaghchaure
9e86a02a91 Merge pull request #45083 from rohitwaghchaure/fixed-support-28669
fix: consider expired batches in stock reco
2025-01-04 19:26:05 +05:30
Mihir Kandoi
e28382afc1 fix: Alternative Items button in Work Order 2025-01-04 17:22:16 +05:30
Mihir Kandoi
1f2d7da426 fix: Fixed final test case 2025-01-04 15:22:28 +05:30
Mihir Kandoi
f996f71d16 fix: Fixed more test cases 2025-01-04 15:17:31 +05:30
Rohit Waghchaure
f51c9f578c fix: consider expired batches in stock reco 2025-01-04 12:58:07 +05:30
ruthra kumar
ba90a6a4bf chore: fix json 2025-01-04 05:45:58 +05:30
Joseph Mania
947ab72441 refactor: phone number field when channel is phone on Payment Request (#44949)
Co-authored-by: maniamartial <martialamania19@gmail.com>
(cherry picked from commit cfa062df86)
2025-01-04 05:29:34 +05:30
ruthra kumar
5245c54de9 Merge pull request #44983 from Sanket322/budget_based_on_distribution
fix: add monthly distributation and write query in qb
2025-01-04 05:17:10 +05:30
Frappe PR Bot
e39638bdcd fix: sync translations from crowdin (#45055) 2025-01-03 16:07:51 +01:00
Mihir Kandoi
839b79ffd0 fix: Test case for ageing report 2025-01-03 20:00:36 +05:30
Sanket322
ce99764772 fix: pass right existing address 2025-01-03 18:04:56 +05:30
Sanket322
058fdca981 fix: don't create invoice if invoice start date is in future 2025-01-03 17:44:05 +05:30
Mihir Kandoi
2f80c4dee5 feat: Added valuation of quantity for each age group in stock ageing report 2025-01-03 16:51:44 +05:30
Sanket322
f46f1bead4 fix: set billing and shipping address on change of company 2025-01-03 16:44:24 +05:30
Ankush Menat
4f690affc9 perf: Skip link checking on repost's remove_attached_file (#45061)
This is internal detail, doesn't need to do horrible link checks in
framework.
2025-01-02 16:59:31 +00:00
ruthra kumar
413fef332a Merge pull request #45056 from ruthra-kumar/partial_revert_44989
chore: partial revert #44989
2025-01-02 20:56:33 +05:30
ruthra kumar
63d547fb4a chore: partial revert #44989 2025-01-02 20:50:28 +05:30
rohitwaghchaure
3221c89218 Merge pull request #45053 from sokumon/ux-issues
fix(style): set image width in BOM
2025-01-02 19:00:25 +05:30
sokumon
b634ba7f54 fix(style): set image width in BOM 2025-01-02 17:37:46 +05:30
venkat102
49885f8eae fix: ignore party account validation while canceling the voucher 2025-01-02 17:27:34 +05:30
Abdeali Chharchhoda
71d1205f53 refactor: use variables for app name, title, and home route in hooks 2025-01-02 16:40:12 +05:30
venkat102
15d488b9aa fix: ignore currency validation while canceling the voucher 2025-01-02 16:10:12 +05:30
rohitwaghchaure
bdece96510 Merge pull request #45043 from rohitwaghchaure/fixed-github-44909
fix: validate components and their qty as per BOM in the stock entry
2025-01-02 13:44:29 +05:30
Rohit Waghchaure
b1de82ddad fix: validate components and their qty as per BOM in the stock entry 2025-01-02 13:11:19 +05:30
Mihir Kandoi
5dacfd5cda fix: Test case and refactored some code 2025-01-02 12:28:01 +05:30
ruthra kumar
e609a6a038 Merge pull request #45040 from ruthra-kumar/use_idx_for_identifying
refactor: use `idx` for identifying row
2025-01-02 12:16:40 +05:30
rohitwaghchaure
1f26feca2e Merge pull request #45039 from rohitwaghchaure/fixed-github-34729
fix: removed unused code
2025-01-02 12:16:16 +05:30
ruthra kumar
51354c894a refactor: use idx for identifying row 2025-01-02 11:54:55 +05:30
ruthra kumar
53d8e32961 Merge pull request #45033 from frappe/l10n_develop
fix: sync translations from crowdin
2025-01-02 10:47:35 +05:30
Rohit Waghchaure
dc5f2d35ac fix: removed unused code 2025-01-02 10:26:51 +05:30
rohitwaghchaure
d2b0e0fa2d Merge pull request #45036 from rohitwaghchaure/fixed-support-28464
fix: Auto BOM cost update issue
2025-01-02 10:24:25 +05:30
Rohit Waghchaure
28ea3ddd51 fix: BOM cost update issue 2025-01-02 09:44:32 +05:30
Frappe PR Bot
81a6e42620 fix: Persian translations 2025-01-01 19:47:03 +05:30
Mihir Kandoi
015fd4a05b fix: Made requested changes by mentor and fixed some bugs in Production Plan Summary report 2025-01-01 16:51:48 +05:30
rohitwaghchaure
5e977cf5a7 Merge pull request #44999 from frappe/fix_multiple_sco_pr
fix: Added patch and fallback code to prevent future issues similar …
2025-01-01 16:35:41 +05:30
rohitwaghchaure
e92af10f14 fix: slow stock transactions (#45025) 2025-01-01 14:50:26 +05:30
Mihir Kandoi
d1d01482df fix: Removed patch as instructed by mentor 2025-01-01 13:49:49 +05:30
ruthra kumar
8aa3157307 Merge pull request #44989 from aerele/update_apply_pricing_rules
fix: apply apply_pricing_rule on date change
2025-01-01 10:11:30 +05:30
rohitwaghchaure
b84c8ff960 fix: incorrect quality inspection linked in purchase receipt (#44985) 2025-01-01 08:30:00 +05:30
rohitwaghchaure
7db9bcaeac fix: precision issue (#45013) 2025-01-01 08:29:14 +05:30
rohitwaghchaure
a9cc23f242 fix: duplicate validate for stock closing entry (#45016) 2025-01-01 08:28:52 +05:30
Mihir Kandoi
575fb43f9c fix: Fixed logic in if condition causing tests to fail 2024-12-31 20:33:05 +05:30
Frappe PR Bot
2cd915fb4d fix: sync translations from crowdin (#45014)
* fix: Swedish translations

* fix: Persian translations
2024-12-31 15:41:15 +01:00
ruthra kumar
b60bd17d1d refactor: store result in variable before enumeration
helps to inspect result while debugging
2024-12-31 17:04:37 +05:30
ruthra kumar
c6634d03ad Merge pull request #44987 from frappe/l10n_develop
fix: sync translations from crowdin
2024-12-31 16:58:45 +05:30
ruthra kumar
fa3c882656 Merge pull request #44940 from aerele/bank_reconciliation_multi_currency
fix(Bank Reconciliation Tool): fetch amount in company  currency
2024-12-31 15:57:27 +05:30
ruthra kumar
e58d73525b Merge pull request #44903 from ljain112/fix-bank-reco
fix: set paid amount in party currency in bank reco payment entry
2024-12-31 15:52:35 +05:30
ruthra kumar
ebc0ed8a31 Merge pull request #44884 from ljain112/fix-item-tax-template
fix: update item_tax_rate in backend
2024-12-31 15:50:39 +05:30
diptanilsaha
2beb485d77 fix: load search term price with customer default price list 2024-12-31 14:55:01 +05:30
ljain112
a203e3ffaf fix: deduct tds on excess amount if checked 2024-12-31 13:46:50 +05:30
diptanilsaha
4b6cae156e fix: load price list rate for pos search term 2024-12-31 13:22:18 +05:30
Mihir Kandoi
65dc3505c4 fix: Added patch and fallback code to prevent future issues similiar to helpdesk ticket 28246 2024-12-31 12:53:30 +05:30
Khushi Rawat
079ec864de fix: copy accounting dimensions to asset and sales invoice (#44964)
* fix: copy accounting dimensions to asset and sales invoice

* fix: replace sql query with query builder

* refactor: reuse function for accounting dimensions

* fix: loop handling

* fix: use explicit param
2024-12-31 07:05:51 +00:00
rohitwaghchaure
7c4aecf834 fix: negative stock balance (#44990) 2024-12-31 12:30:15 +05:30
Vishnu VS
d6980a9493 fix(report): Purchase Order Analysis pymysql.err (#44957) 2024-12-31 12:21:57 +05:30
Diptanil Saha
d1ae0d784e fix: load customer default price list in pos during item selection (#44991)
fix: load customer default price list in pos
2024-12-31 12:14:29 +05:30
DHINESH00
2cbab9b875 fix: apply apply_pricing_rule date change 2024-12-30 22:47:37 +05:30
Mihir Kandoi
22d38c2af4 feat: Validate sub assembly and material request items in Production Plan and fix Production Plan summary reports not showing correct received quantity from subcontracted POs 2024-12-30 20:12:14 +05:30
Frappe PR Bot
7a5d958aba fix: Swedish translations 2024-12-30 19:48:02 +05:30
Sanket322
27195c7c96 fix: add monthly distributation and write query in qb 2024-12-30 17:56:17 +05:30
ruthra kumar
54cb99eae3 Merge pull request #44855 from mahsem/in_contex_translation_fixes
fix: in_context_translation_fixes
2024-12-30 15:56:01 +05:30
ruthra kumar
7926bf066a Merge pull request #44975 from aerele/filter-project
fix: add company filter to project
2024-12-30 15:27:37 +05:30
DHINESH00
a984aaae36 fix: fetch amount in company currency 2024-12-30 15:15:33 +05:30
ruthra kumar
bb0cf3bf78 Merge pull request #44761 from aerele/pos_discount
fix: apply discount on qty change
2024-12-30 14:56:02 +05:30
venkat102
b92f8bc514 fix: include company in filter condition 2024-12-30 14:18:55 +05:30
venkat102
1a7b09e576 fix: add company filter to project 2024-12-30 14:18:13 +05:30
ruthra kumar
ee418ffefa Merge pull request #44883 from aerele/account-party-validation
fix: Validate party on non receivable / payable account
2024-12-30 13:32:54 +05:30
Diptanil Saha
98cbb7e900 fix: pos payment using non-default mode of payment (#44920)
* fix: pos payment using non-default mode of payment (#41108)

* fix: included css syntax

* refactor: created a function to sanitize the class name

* refactor: reusing method to sanitize class name

* refactor: function rename
2024-12-30 13:27:49 +05:30
ruthra kumar
867aa9dd86 Merge pull request #44552 from HUMENTH/develop
Fix: Added Order Number and Order Date fields to the Blanket Order form.
2024-12-30 12:32:34 +05:30
ruthra kumar
4f398d8edc Merge pull request #44921 from ljain112/fix-val-itt
fix: get item tax template based on posting date
2024-12-30 12:28:58 +05:30
ruthra kumar
93b70b98bb Merge pull request #44906 from Sanket322/company_address_in_purchase_invoice
fix: set/update billing address on change of company
2024-12-30 12:22:08 +05:30
Himanshu Shivhare
5a284df51d refactor: Order Number and Order Date fields to Blanket Order 2024-12-30 12:11:32 +05:30
ruthra kumar
784a62eae8 Merge pull request #44958 from ruthra-kumar/fix_test_data_issue_on_manufacturing
refactor(test): make manufacturing test idempotent
2024-12-30 11:29:58 +05:30
ruthra kumar
f3be246df3 refactor(test): make manufacturing test idempotent 2024-12-30 11:03:25 +05:30
rohitwaghchaure
9fdeb5f826 fix: incorrect filter for BOM (#44954) 2024-12-30 09:47:16 +05:30
Frappe PR Bot
e216547084 fix: sync translations from crowdin (#44944) 2024-12-29 18:31:46 +01:00
mahsem
92b1f314ef fix: Hold_to_On_Hold 2024-12-29 14:15:52 +01:00
Frappe PR Bot
6e0dd271f5 chore: update POT file (#44951) 2024-12-29 11:33:25 +01:00
mahsem
185bbb4c20 fix: postal_code_move_and_fixes 2024-12-28 09:25:30 +01:00
creative-paramu
50c92034ba Bank Reconciliation Statement Report Company Filter 2024-12-27 17:54:20 +05:30
rohitwaghchaure
9661c1d081 fix: ignore validate while making WO from MR (#44939) 2024-12-27 16:43:11 +05:30
ruthra kumar
6f8d6c81d5 Merge pull request #44904 from Sanket322/ignore_duplicate
fix: ignore duplicate while creating default templates
2024-12-27 14:46:58 +05:30
ljain112
70b1077286 fix: set paid amount in party currency in bank reco payment entry 2024-12-27 14:21:00 +05:30
ruthra kumar
bcae2810b9 Merge pull request #44892 from Sanket322/payment_schedule_in_is_paid
fix: clear payment schedule in purchase invoice for is_paid
2024-12-27 13:23:07 +05:30
rohitwaghchaure
303c52f134 fix: ignore inventory dimension for SABB and Pick List (#44933) 2024-12-27 12:57:52 +05:30
Sanket322
187c74ae09 fix: use meta to check field instead of doctype 2024-12-27 12:53:41 +05:30
ruthra kumar
0589fa7f3e refactor: early return is always better
validate_advance_entries() has a heavy IO bound operation. Early
return on unwanted cases is always better.
2024-12-27 12:48:25 +05:30
Sanket322
cb197fd01f fix: move code from purchase invoice to buying controller 2024-12-27 12:35:36 +05:30
Diptanil Saha
cfcc24a341 fix (pos closing entry): validation for 100 pc discount on pos invoice (#44899) 2024-12-27 11:34:41 +05:30
ruthra kumar
4f29908aa9 Merge pull request #44907 from frappe/l10n_develop
fix: sync translations from crowdin
2024-12-27 11:34:32 +05:30
ruthra kumar
e85142f996 Merge pull request #44816 from mahsem/strings_for_translation
fix: strings for translation
2024-12-27 10:56:57 +05:30
ruthra kumar
78b0b3047c Merge pull request #44815 from mahsem/relabel_rate_to_tax_rate
fix: relabel rate to tax rate
2024-12-27 10:54:30 +05:30
Shreyas Sojitra
751a0a93ef fix: attribute order in create multiple variants dialog (#44800)
* Fix : show multiple variants dialog

Fixed attribute order in create multiple variant dialog.

* fix(dialog): attribute order in create multiple variants dialog

Fixed attribute order in create multiple variant dialog.
2024-12-27 10:53:17 +05:30
rohitwaghchaure
c9088f4955 refactor: stock closing balance -> stock closing entry (#44489)
* refactor: stock closing balance

* perf: batchwise balance history report

* fix: stock ageing data for stock balance report
2024-12-26 22:57:58 +05:30
rohitwaghchaure
ab1cca0c40 fix: not able to make purchase receipt from SCR (#44919) 2024-12-26 19:09:45 +05:30
Frappe PR Bot
8f82219986 fix: Turkish translations 2024-12-26 18:35:12 +05:30
Frappe PR Bot
f5e53c9661 fix: Swedish translations 2024-12-26 18:35:08 +05:30
Nabin Hait
b998933ef0 fix: Show order tax amount in customer currency on the portal (#44915) 2024-12-26 18:18:35 +05:30
Diptanil Saha
ac26622d6e fix: limit discount value to 100 in pos cart (#44916)
* fix: limit discount value to 100 in pos cart

* fix: error message on invalid discount
2024-12-26 12:45:53 +00:00
ljain112
976e35d547 fix: get item tax template based on posting date 2024-12-26 17:18:39 +05:30
rohitwaghchaure
1319ce4bc1 fix: material request status (#44917) 2024-12-26 15:58:39 +05:30
rohitwaghchaure
614a8f106d fix: allow zero valuation rate (#44902) 2024-12-25 22:20:23 +05:30
Frappe PR Bot
888da9c1ab fix: Turkish translations 2024-12-25 18:30:08 +05:30
Frappe PR Bot
9f8448bb15 fix: Spanish translations 2024-12-25 18:29:59 +05:30
Sanket322
0adfebee85 fix: set/update billing address on change of company 2024-12-25 18:14:10 +05:30
Sanket322
9368485594 fix: ignore duplicate while creating default templates 2024-12-25 15:22:53 +05:30
Frappe PR Bot
8bcfd2429d fix: sync translations from crowdin (#44898)
* fix: Swedish translations

* fix: Turkish translations

* fix: Persian translations
2024-12-24 12:47:12 +00:00
ruthra kumar
42c8ce68ad Merge pull request #44787 from vishakhdesai/refactor-bt-allocation-query
fix: refactor query in`get_total_allocated_amount` in bank_transaction
2024-12-24 17:52:30 +05:30
ruthra kumar
0b113815c9 Merge pull request #44860 from frappe/l10n_develop
fix: sync translations from crowdin
2024-12-24 17:03:44 +05:30
ruthra kumar
7378eff0ca Merge pull request #44878 from aerele/consolidated-financial-pnl
fix: show profit and loss after period closing
2024-12-24 17:02:43 +05:30
ruthra kumar
f0a34aa587 Merge pull request #44889 from aerele/payment-entry-clearance-date
refactor: use db_set instead of set_value to trigger notification
2024-12-24 16:42:02 +05:30
Sanket322
e1fc239f3d fix: clear payment schedule in purchase invoice for is_paid 2024-12-24 16:38:51 +05:30
Karuppasamy923
8abbece7c4 fix: Set account type payable for advance account 2024-12-24 16:00:40 +05:30
venkat102
f8b923edfe refactor: use db_set instead of set_value to trigger notification 2024-12-24 15:34:39 +05:30
ljain112
de54c0b41f fix: update item_tax_rate in backend 2024-12-24 15:15:30 +05:30
rohitwaghchaure
021d077808 fix: set project in GL from the SLE (#44879) 2024-12-24 14:49:41 +05:30
Karuppasamy923
a10a15b2c3 test: add unit test to validate on non receivable / payable account 2024-12-24 13:54:37 +05:30
Karuppasamy923
c6a2d86ba6 fix: validate party on non receivable / payable account 2024-12-24 13:53:25 +05:30
ruthra kumar
c59d3bda7e Merge pull request #44794 from ljain112/fix-ldc
fix: correct tds rate with lower deduction certificate
2024-12-24 13:44:30 +05:30
venkat102
dc5cd93bf0 fix: show profit and loss after period closing 2024-12-24 12:35:38 +05:30
Abdeali Chharchhodawala
d4b21f532a fix: add Stock UOM when adding new item in POS list (#44780) 2024-12-24 10:22:32 +05:30
ruthra kumar
60694838f3 Merge pull request #44763 from vishakhdesai/fix-si-issue
fix: Paid + Write Off Amount issue in Sales Invoice
2024-12-24 10:17:16 +05:30
rohitwaghchaure
079b86044e fix: posting_time issue (#44870) 2024-12-24 09:06:37 +05:30
Khushi Rawat
0b1c3208a0 Merge pull request #44854 from khushi8112/asset-fields-precision-check
fix: asset fields precision check
2024-12-24 00:00:34 +05:30
Khushi Rawat
2f7e6230a6 fix: test case correction 2024-12-23 23:37:51 +05:30
mahsem
1f4e1811de fix: whitespace 2024-12-23 17:42:33 +01:00
Diptanil Saha
948556def5 Merge pull request #44856 from diptanilsaha/fix-pos-invoice-advanced-received
fix: fetch advance payment entries on pos invoice
2024-12-23 20:59:00 +05:30
rohitwaghchaure
c9b143b509 fix: stock entry not fetching expired batches (#44863) 2024-12-23 20:28:06 +05:30
rohitwaghchaure
7d41805d0e fix: Warehouse wise Stock Value chart roles (#44865) 2024-12-23 20:27:19 +05:30
rohitwaghchaure
54d7b742ab perf: slow query related to stock ledger entry (#44861) 2024-12-23 18:36:43 +05:30
Frappe PR Bot
2aff3ced52 fix: Esperanto translations 2024-12-23 17:32:50 +05:30
Frappe PR Bot
7497f0ca52 fix: German translations 2024-12-23 17:32:46 +05:30
Frappe PR Bot
42f2b965d1 fix: Bosnian translations 2024-12-23 17:32:43 +05:30
Frappe PR Bot
70405d9026 fix: Persian translations 2024-12-23 17:32:39 +05:30
Frappe PR Bot
4c5e9c005c fix: Chinese Simplified translations 2024-12-23 17:32:34 +05:30
Frappe PR Bot
789469f784 fix: Turkish translations 2024-12-23 17:32:31 +05:30
Frappe PR Bot
643163cc24 fix: Swedish translations 2024-12-23 17:32:26 +05:30
Frappe PR Bot
e98881cc56 fix: Russian translations 2024-12-23 17:32:21 +05:30
Frappe PR Bot
ab36dfe5ef fix: Polish translations 2024-12-23 17:32:17 +05:30
Frappe PR Bot
3892f2a1fa fix: Hungarian translations 2024-12-23 17:32:14 +05:30
Frappe PR Bot
abf624b994 fix: Arabic translations 2024-12-23 17:32:10 +05:30
Frappe PR Bot
05ceb25abc fix: Spanish translations 2024-12-23 17:32:04 +05:30
Frappe PR Bot
5cb86b1367 fix: French translations 2024-12-23 17:32:00 +05:30
rohitwaghchaure
a515a399cf fix: incoming rate should be zero for rejected items (#44857) 2024-12-23 16:58:07 +05:30
mahsem
a87e7fde03 fix: in_contex_translation_fixes 2024-12-23 11:30:00 +01:00
Diptanil Saha
a7078e5702 fix: fetch advance payment entries on pos invoice 2024-12-23 15:54:16 +05:30
Khushi Rawat
92b8768ae2 fix: asset field precision check 2024-12-23 15:42:18 +05:30
rohitwaghchaure
a2c2b8b5ad fix: do not validate qc for scrap item (#44844) 2024-12-23 15:39:04 +05:30
ruthra kumar
2dfd7472a4 Merge pull request #44850 from ruthra-kumar/remove_hardcoded_names_in_test
refacto(test): remove hardcoded names
2024-12-23 15:25:26 +05:30
ruthra kumar
ab91abb144 refacto(test): remove hardcoded names 2024-12-23 14:54:15 +05:30
Nijith anil
6f00a87a9c fix(ux): purchase invoice link in error message (#44797)
* fix(ux): purchase invoice link in error message

* chore: fix linter

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
2024-12-23 09:18:32 +00:00
ruthra kumar
ab01b8fc63 Merge pull request #44738 from aerele/tds-section-code
fix: fetch tax withholding category from the voucher
2024-12-23 14:34:17 +05:30
ruthra kumar
10b7c3e0ac Merge pull request #44716 from ljain112/fix-gp-serial
fix: avg. buying amount for product bundle item with serial and batch no in gross profit report
2024-12-23 14:33:14 +05:30
ruthra kumar
fc57fb22a5 Merge pull request #44813 from vishakhdesai/acc-rec-fix
fix: update correct cost center in Accounts Receivable Report
2024-12-23 14:20:28 +05:30
ruthra kumar
fad00fedaa Merge pull request #44808 from aerele/difference_posting_date_in_si_pi
feat: Added difference_posting_date field in Sales Invoice Advance and Purchase Invoice Advance
2024-12-23 14:09:07 +05:30
Mihir Kandoi
b7699012b2 feat: Create subcontracted PO from Material Request (#44745)
* feat: Create subcontracted PO from Material Request

* fix: Made minor changes in logic to pass all test cases

* refactor: Made changes suggested by mentor and simplified logic

* test: Made changes to tests
2024-12-23 13:11:44 +05:30
ruthra kumar
cf57cb73f0 Merge pull request #44786 from ljain112/fic-adv-pv
fix: correct args for get_advance_payment_entries_for_regional
2024-12-23 12:57:42 +05:30
ruthra kumar
a2a642a5b1 Merge pull request #44751 from ljain112/fix-gp-service-item
fix: buying rate for service item in gross profit report
2024-12-23 11:45:18 +05:30
DHINESH00
547c8004eb fix: Semgrep rules 2024-12-23 11:23:23 +05:30
ljain112
cc3f4bb0b0 fix: avg. buying amount for product bundle item with serial and batch no in gross profit report 2024-12-23 11:22:41 +05:30
ruthra kumar
5567a41a2a Merge pull request #44681 from frappe/mergify/bp/develop/pr-44679
fix: Stock Entry uses incorrect company when generated from Pick List (backport #44679)
2024-12-23 11:12:34 +05:30
ruthra kumar
bcb7617630 Merge pull request #44644 from barredterra/lost-quotation-permissions
fix: permissions for marking Quotation as lost
2024-12-23 11:10:26 +05:30
rohitwaghchaure
fe0036e707 fix: incorrect Material Transferred for Manufacturing qty (#44823) 2024-12-23 10:57:47 +05:30
ruthra kumar
b1c9716fec Merge pull request #44812 from frappe/l10n_develop
fix: sync translations from crowdin
2024-12-23 10:21:55 +05:30
ruthra kumar
c100b68ad1 Merge pull request #44826 from Abdeali099/bank-account-typo-fix
fix: Remove typo from `Bank Account` on trash
2024-12-23 10:21:24 +05:30
ruthra kumar
085ef5df8f Merge pull request #44825 from deepeshgarg007/ledger_repost
fix: Ledger repost support for extending app doctypes
2024-12-23 09:44:43 +05:30
Abdeali Chharchhoda
ba28f6bf73 fix: Remove typo 2024-12-23 08:48:46 +05:30
Deepesh Garg
919abd2c03 fix: Add hooks for repost allowed doctypes 2024-12-22 20:34:31 +05:30
Frappe PR Bot
31803a2f53 chore: update POT file (#44822) 2024-12-22 15:09:01 +01:00
Frappe PR Bot
a4c34ad759 fix: Swedish translations 2024-12-22 17:22:40 +05:30
mahsem
3be633f6f1 fix: strings for translation 2024-12-21 15:08:19 +01:00
mahsem
1eb8b0ceef fix: relabel rate to tax rate 2024-12-21 13:49:54 +01:00
Frappe PR Bot
bf4d696f17 fix: Persian translations 2024-12-21 17:09:33 +05:30
Frappe PR Bot
7cd6bfc8a4 fix: Swedish translations 2024-12-21 17:09:29 +05:30
rohitwaghchaure
56f561cdaa fix: Duplicate entry ' EF1DE8B2E1B6' for key 'PRIMARY' (#44809) 2024-12-21 10:01:12 +05:30
vishakhdesai
3b36ce560c fix: do not set cost_center update_voucher_balance as it is set in init_voucher_balance 2024-12-20 18:41:51 +05:30
vishakhdesai
09776e9a5a fix: update correct cost center in Accounts Receivable Report 2024-12-20 18:03:42 +05:30
Frappe PR Bot
913001e44c fix: Turkish translations 2024-12-20 17:02:43 +05:30
Frappe PR Bot
5057a4e1b2 fix: Swedish translations 2024-12-20 17:02:40 +05:30
Frappe PR Bot
afea92c01d fix: Spanish translations 2024-12-20 17:02:36 +05:30
ruthra kumar
a764d16674 Merge pull request #44703 from mahsem/Swedish_tax_templates
fix: Swedish tax templates
2024-12-20 14:11:47 +05:30
rs-rethik
854e37c05c fix: update query 2024-12-20 14:00:54 +05:30
rs-rethik
2d58e845e6 refactor: convert sql query to query builder 2024-12-20 12:42:47 +05:30
ruthra kumar
6db1b3fef8 Merge pull request #44795 from frappe/l10n_develop
fix: sync translations from crowdin
2024-12-20 12:14:33 +05:30
rs-rethik
c14a2d73bf test: add unit test to validate journal entry posting date 2024-12-20 12:13:35 +05:30
rs-rethik
ff1d040a6e feat: use difference_posting_date for journal entry posting_date 2024-12-20 12:10:08 +05:30
rs-rethik
225e56cbca feat: add difference_posting_date field 2024-12-20 12:07:20 +05:30
ruthra kumar
82306c5a85 Merge pull request #44665 from mahsem/Swedish_2024_COA
fix: add Swedish_2024_COA
2024-12-20 11:56:11 +05:30
rohitwaghchaure
a7b5e2565b fix: slow posting datetime update (#44799) 2024-12-20 10:12:12 +05:30
DHINESH00
d541259da9 fix: update discounting on mixed conditions 2024-12-19 17:15:11 +05:30
Deepesh Garg
ed231abb54 fix: Ledger repost support for extending app doctypes 2024-12-19 17:06:54 +05:30
Frappe PR Bot
e3a7f2f2e7 fix: Persian translations 2024-12-19 17:05:19 +05:30
Frappe PR Bot
b9e96f62ef fix: Turkish translations 2024-12-19 17:05:14 +05:30
Frappe PR Bot
51137cf001 fix: Swedish translations 2024-12-19 17:05:10 +05:30
ljain112
cb9c12d495 fix: correct tds rate with lower deduction certificate 2024-12-19 16:27:04 +05:30
rohitwaghchaure
3662a6a41d fix: closing stock balance permissions (#44791) 2024-12-19 14:59:33 +05:30
ruthra kumar
93ec962aae Merge pull request #44746 from ljain112/fix-itt
fix: correct args for get_item_tax_map
2024-12-19 13:52:33 +05:30
rohitwaghchaure
90baa38f64 perf: SABB (#44764) 2024-12-19 13:00:31 +05:30
vishakhdesai
2ce07865d3 fix: failing tests fixed 2024-12-19 12:55:11 +05:30
vishakhdesai
6b847cdb62 fix: refactor query in get_total_allocated_amount in bank_transaction 2024-12-19 12:27:06 +05:30
ljain112
df13a4cc2f fix: correct args for get_advance_payment_entries_for_regional 2024-12-19 12:04:04 +05:30
ruthra kumar
700dc05b55 Merge pull request #44785 from ruthra-kumar/expanded_screenshot
chore: expand screenshot section by default
2024-12-19 10:55:45 +05:30
ruthra kumar
ce9f10b387 chore: expand screenshot section by default 2024-12-19 10:43:36 +05:30
Mihir Kandoi
3eba6bf3dd feat(subcontracting): Added provision to create multiple Subcontracting Orders against a single Purchase Order (#44711)
* feat(subcontracting): Added provision to create multiple Subcontracting Orders from a single Subcontracted Purchase Order

* refactor(new_sc_flow_2): Fixed error thrown by semgrep
2024-12-18 20:38:21 +05:30
rohitwaghchaure
779dd2d798 fix: POS Closing entry issue (#44772) 2024-12-18 20:19:36 +05:30
ruthra kumar
6f99e9959d Merge pull request #44771 from frappe/l10n_develop
fix: sync translations from crowdin
2024-12-18 17:54:02 +05:30
vishakhdesai
1fd7ba7c88 fix: Paid + Write Off Amount issue in Sales Invoice 2024-12-18 17:29:55 +05:30
Nabin Hait
febdf4c61e fix: added docs.frappe.io in documentation_url (#44776) 2024-12-18 11:58:22 +00:00
Frappe PR Bot
c798a68e5d fix: Persian translations 2024-12-18 15:42:28 +05:30
Frappe PR Bot
663372a23e fix: Swedish translations 2024-12-18 15:42:23 +05:30
ruthra kumar
7fed467354 Merge pull request #44765 from ljain112/fix-pl-error
fix: 'str' object has no attribute 'get_sql'
2024-12-18 14:12:29 +05:30
ljain112
9a43acb65c fix: 'str' object has no attribute 'get_sql' 2024-12-18 13:47:37 +05:30
ruthra kumar
54eedaeeff Merge pull request #44758 from ruthra-kumar/fix_broken_link
fix: use utility method to generate url
2024-12-18 11:02:01 +05:30
ruthra kumar
b970eb8b15 fix: use utility method to generate url 2024-12-18 10:54:21 +05:30
DHINESH00
352b82bc0b fix: apply discount on qty change 2024-12-18 10:51:04 +05:30
ruthra kumar
878f76455b Merge pull request #44708 from aerele/pricing-rule-discount
fix: update discount when pricing rule is changed
2024-12-17 20:42:04 +05:30
ruthra kumar
5c9e8fb4da Merge pull request #44695 from ljain112/fix-fin-stat
fix: User permissions in financial statements
2024-12-17 20:37:35 +05:30
ljain112
5ea131c763 fix: using query.walk() for escaping 2024-12-17 18:49:38 +05:30
ljain112
8d6e79a16f fix: buying rate for service item in gross profit report 2024-12-17 17:54:08 +05:30
ruthra kumar
7ac7a40aec Merge pull request #44739 from frappe/l10n_develop
fix: sync translations from crowdin
2024-12-17 17:30:04 +05:30
ruthra kumar
3342fa1440 Merge pull request #44685 from aerele/mop-bank-account
fix: set company bank account if default account not set in mode of p…
2024-12-17 17:18:35 +05:30
ljain112
fe4eb8e6db fix: correct args for get_item_tax_map 2024-12-17 17:03:41 +05:30
ruthra kumar
a819b1feaa Merge pull request #44742 from ruthra-kumar/readme_update
chore: update readme
2024-12-17 15:55:16 +05:30
ruthra kumar
8205000195 chore: move screenshots to key features 2024-12-17 15:41:26 +05:30
Frappe PR Bot
4387e09ee8 fix: Swedish translations 2024-12-17 14:52:45 +05:30
Frappe PR Bot
3be6390a12 fix: Spanish translations 2024-12-17 14:52:34 +05:30
ruthra kumar
c33b9922a5 chore: more screenshots 2024-12-17 14:17:08 +05:30
ruthra kumar
c25ef357a5 chore: update headers 2024-12-17 14:15:12 +05:30
venkat102
09e64594db fix: fetch tax withholding category from the voucher 2024-12-17 13:15:41 +05:30
venkat102
1663c7983e chore: use get function 2024-12-17 13:15:02 +05:30
rohitwaghchaure
1f5d7072e7 fix: purchase return entry issue (#44721) 2024-12-17 12:29:20 +05:30
ruthra kumar
37fb6d12da Merge pull request #44660 from vorasmit/tds-jv-base-total
fix: better indicator base amount for Tax Witholding in Journal Entry
2024-12-17 11:49:37 +05:30
ruthra kumar
94c64235d4 Merge pull request #44650 from aerele/multiselect_cc_in_process_statement_of_accounts
feat: Multiselect cc in process statement of accounts
2024-12-17 11:34:54 +05:30
ruthra kumar
8b89cc69c1 Merge pull request #44712 from frappe/l10n_develop
fix: sync translations from crowdin
2024-12-17 11:29:19 +05:30
mahsem
8a5f7ec4d7 feat: swedish COA 2024-12-17 11:22:42 +05:30
rs-rethik
5401cf9647 chore: remove irrelevant import 2024-12-17 11:10:25 +05:30
rs-rethik
494ac04f8e refactor: convert sql query to query builder 2024-12-17 11:10:25 +05:30
rs-rethik
2a6be127ef fix: update cc_to multiselect in process statement of accounts 2024-12-17 11:10:25 +05:30
rs-rethik
4de180feee feat: change type link to multiselect 2024-12-17 11:10:25 +05:30
rohitwaghchaure
852596dbe6 fix: pos invoice return reference missing (#44720) 2024-12-17 11:05:18 +05:30
ruthra kumar
84dff3601a Merge pull request #44646 from barredterra/validate-discount-date
feat: validate discount date in payment schedule
2024-12-17 10:58:15 +05:30
Frappe PR Bot
b565b67cc7 fix: Esperanto translations 2024-12-17 10:38:22 +05:30
Frappe PR Bot
12634d0bd6 fix: German translations 2024-12-17 10:38:22 +05:30
Frappe PR Bot
fda57420a5 fix: Bosnian translations 2024-12-17 10:38:22 +05:30
Frappe PR Bot
bf0cfc4704 fix: Persian translations 2024-12-17 10:38:22 +05:30
Frappe PR Bot
4af0365719 fix: Chinese Simplified translations 2024-12-17 10:38:22 +05:30
Frappe PR Bot
30d2a2bce5 fix: Turkish translations 2024-12-17 10:38:22 +05:30
Frappe PR Bot
e82f993d94 fix: Swedish translations 2024-12-17 10:38:22 +05:30
Frappe PR Bot
9e8304c16f fix: Russian translations 2024-12-17 10:38:21 +05:30
Frappe PR Bot
efa00fd9c6 fix: Polish translations 2024-12-17 10:38:21 +05:30
Frappe PR Bot
e90d2c2cfe fix: Hungarian translations 2024-12-17 10:38:21 +05:30
Frappe PR Bot
30735b339d fix: Arabic translations 2024-12-17 10:38:21 +05:30
Frappe PR Bot
7eb7a7fa36 fix: Spanish translations 2024-12-17 10:38:21 +05:30
Frappe PR Bot
0e68c433db fix: French translations 2024-12-17 10:38:21 +05:30
rohitwaghchaure
95da0913f6 fix: unsupported operand type (#44722) 2024-12-17 09:19:58 +05:30
rohitwaghchaure
5f539619bc fix: delink SABB from cancelled SLEs (#44691) 2024-12-16 22:23:13 +05:30
ruthra kumar
5d16e4aefe Merge pull request #44714 from ruthra-kumar/update_readme
chore: update readme
2024-12-16 19:55:39 +05:30
ruthra kumar
ac4ee1b005 chore: more changes
- reduce image count and update hero image
- update docker setup
2024-12-16 19:28:30 +05:30
ruthra kumar
9ebdd4d79a Merge pull request #44713 from ruthra-kumar/ci_trigger
fix: broken CI
2024-12-16 16:52:18 +05:30
ruthra kumar
dc02cb8119 chore: update readme 2024-12-16 16:44:38 +05:30
ruthra kumar
eb1e36ca22 fix: broken CI
- always install wkhtmltopdf
- remove specific version on mariadb-client
2024-12-16 16:27:13 +05:30
ruthra kumar
f8cf1983a4 Merge pull request #44704 from frappe/l10n_develop
fix: sync translations from crowdin
2024-12-16 10:45:17 +05:30
venkat102
8338d1d5b4 fix: update discount when pricing rule is changed 2024-12-15 22:55:24 +05:30
Frappe PR Bot
62c553edeb chore: update POT file (#44707) 2024-12-15 12:27:21 +01:00
Frappe PR Bot
37fc2068b5 fix: Persian translations 2024-12-15 12:55:00 +05:30
Frappe PR Bot
15d2ca0c06 fix: Persian translations 2024-12-14 12:54:15 +05:30
Frappe PR Bot
4d34eefde4 fix: Swedish translations 2024-12-14 12:54:09 +05:30
mahsem
73112fa3c9 fix: Swedish tax templates 2024-12-14 07:12:19 +01:00
mahsem
6119d4384a fix: better description of tab name (#44697) 2024-12-13 19:46:31 +01:00
ruthra kumar
4409dadfe2 Merge pull request #44585 from blaggacao/fix/old-data-from-2009-in-migration
fix: migration; make it resilient against old, non-conforming data
2024-12-13 18:22:06 +05:30
ruthra kumar
3a4d8a7bbd Merge pull request #44676 from ljain112/fix-ac-rec-pay,emt-term
fix: remove invalid filter in Account Receivable report
2024-12-13 17:08:41 +05:30
ljain112
578ca230fe fix: remove invalid filter in Account Receivable report 2024-12-13 16:37:19 +05:30
ruthra kumar
d07f9d746a refactor: ignore selective malformed json 2024-12-13 16:00:39 +05:30
Navin R C
48b49cdea4 fix: SQL syntax error in Purchase Receipt query for empty filters (#44636)
fix(po-analysis): handle SQL error due to empty data in IN() clause

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2024-12-13 10:19:38 +00:00
ruthra kumar
168baae118 Merge pull request #44696 from akhilnarang/add-type-selling-workspace
fix(selling): set workspace type and app
2024-12-13 15:17:06 +05:30
ruthra kumar
693b073088 Merge pull request #44556 from aerele/ledger-summary-report
feat: add accounting dimensions in ledger summary reports
2024-12-13 15:12:18 +05:30
ruthra kumar
2c5b5d4117 Merge pull request #44604 from akhilnarang/drop-pytz-usage
refactor: drop pytz
2024-12-13 15:02:14 +05:30
Akhil Narang
f704ade417 fix(selling): set workspace type and app
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
2024-12-13 14:40:15 +05:30
Khushi Rawat
d8f55923c9 Merge pull request #44690 from khushi8112/handle-zero-salvage-value-case
fix: handle zero salvage value case
2024-12-13 14:31:03 +05:30
ljain112
a626372d66 fix: User permissions in financial statements 2024-12-13 13:46:15 +05:30
Khushi Rawat
325b20491a fix: make rate of depreciation mandatory 2024-12-13 12:36:30 +05:30
Khushi Rawat
d84aeef0bb fix: handle zero salvage value case 2024-12-13 12:31:38 +05:30
ruthra kumar
faa6a3dec0 Merge pull request #43930 from lbrandh/fix_timestrings
fix: use get_datetime_as_string with correct time format
2024-12-13 12:07:56 +05:30
Diógenes Souza
d2cab83003 fix: Wrong allocated_amount for sales_team in gross_profit report (#42989)
* fix: Wrong allocated_amount for sales_team in gross_profit report

* style: Removes whitespaces

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
2024-12-13 11:56:55 +05:30
venkat102
91c7e3d5f3 fix: set company bank account if default account not set in mode of payment 2024-12-13 11:22:17 +05:30
Nicolas Pereira
cd693b5fa4 fix: Stock Entry uses incorrect company when generated from Pick List (#44679)
(cherry picked from commit 00898be8e4)
2024-12-13 04:52:54 +00:00
ruthra kumar
63123471b3 Merge pull request #44621 from mahsem/doc.status_POS
fix: add doc.status to translation from POS
2024-12-13 10:22:23 +05:30
ruthra kumar
ecc213b06f Merge pull request #44668 from frappe/l10n_develop
fix: sync translations from crowdin
2024-12-13 10:12:57 +05:30
ruthra kumar
b584212edb chore: Update images in readme (#44667)
* chore: image files

* chore: typo and links

* chore: update logo

* chore: link screenshots

* chore: change image width

* chore: border radius for images

* chore: more formatting
2024-12-12 17:09:22 +05:30
rohitwaghchaure
4385349e36 fix: validate returned serial nos and batches (#44669) 2024-12-12 15:24:40 +05:30
Venkatesh
9ef9ff3de8 fix: make projected qty editable after submit (#44670) 2024-12-12 14:56:20 +05:30
Frappe PR Bot
4d12134552 fix: German translations 2024-12-12 12:37:03 +05:30
Frappe PR Bot
7199b6c094 fix: Swedish translations 2024-12-12 12:36:59 +05:30
rohitwaghchaure
15c7d26378 fix: valuation rate for batch in stock reconciliation (#44657)
fix: valuation rate for batch in stock reco
2024-12-11 21:02:38 +05:30
ruthra kumar
033075c023 Merge pull request #44663 from ruthra-kumar/update_readme
chore: update readme
2024-12-11 20:59:44 +05:30
ruthra kumar
4c68fa46e7 chore: use numbered list 2024-12-11 20:33:34 +05:30
ruthra kumar
a793017628 chore: update readme 2024-12-11 20:28:15 +05:30
Smit Vora
56a0a0db18 fix: better indicator base amount for Tax Witholding in Journal Entry 2024-12-11 17:57:47 +05:30
Venkatesh
3595783202 Merge pull request #44533 from aerele/consolidated-gl
Consider against_voucher_no when voucher_no is filtered
2024-12-11 10:32:30 +00:00
ruthra kumar
67ac3a5173 Merge pull request #44651 from frappe/l10n_develop
fix: sync translations from crowdin
2024-12-11 14:58:17 +05:30
ruthra kumar
3f4832631f Merge pull request #44493 from aerele/free-item-seperate-row
fix: update free item qty while adding same item in seperate row
2024-12-11 14:53:59 +05:30
ruthra kumar
542d0140f2 Merge pull request #44652 from frappe/ruthra-kumar-patch-1 2024-12-11 12:57:57 +05:30
ruthra kumar
d9408eae44 chore: footer logo 2024-12-11 12:55:41 +05:30
ruthra kumar
644c48ba46 chore: add end tag 2024-12-11 12:51:59 +05:30
ruthra kumar
687894584f chore(readme): update links 2024-12-11 12:46:24 +05:30
ruthra kumar
f03a0d8015 Update README.md 2024-12-11 12:40:53 +05:30
Frappe PR Bot
3a2b805a55 fix: Persian translations 2024-12-11 12:38:28 +05:30
Frappe PR Bot
ae89a81ecb fix: Swedish translations 2024-12-11 12:38:24 +05:30
Sugesh393
79fd881ad5 chore: update variable names 2024-12-11 11:29:21 +05:30
Khushi Rawat
eac3ae5627 Merge pull request #44647 from khushi8112/rename-cost-to-value
fix: switched asset terminology from cost to value
2024-12-11 01:09:26 +05:30
Khushi Rawat
ee9a2952d6 fix: switched asset terminology from cost to value 2024-12-11 00:18:04 +05:30
barredterra
11644241fa feat: validate discount date in payment schedule 2024-12-10 17:23:00 +01:00
ruthra kumar
a7d964212e Merge pull request #44293 from ruthra-kumar/refactor_transaction_js
refactor: move `item_code` reactivity to server-side
2024-12-10 21:12:42 +05:30
barredterra
4d5241486f fix: permissions for marking Quotation as lost 2024-12-10 14:28:22 +01:00
ruthra kumar
1467610109 fix: linter; dont change doc after DB update 2024-12-10 17:48:13 +05:30
ruthra kumar
267d9606f8 refactor(test): disable unwanted dimensions 2024-12-10 17:48:13 +05:30
ruthra kumar
22c1608745 test: assert all reqd are set 2024-12-10 17:48:13 +05:30
ruthra kumar
c97e058bc6 chore: rename and move test file 2024-12-10 17:48:13 +05:30
ruthra kumar
8a710f85e2 refactor: replcate deprecated cur_frm 2024-12-10 17:48:13 +05:30
ruthra kumar
6ea9c0c48d refactor: pass config through boot 2024-12-10 17:48:13 +05:30
ruthra kumar
67b28a7864 refactor: configurable reactivity 2024-12-10 17:48:13 +05:30
ruthra kumar
b21d5934e6 refactor: make it configurable 2024-12-10 17:48:13 +05:30
ruthra kumar
a06a6ccaa6 test: auto-filling of basic details on items 2024-12-10 17:48:13 +05:30
ruthra kumar
5b4987e160 chore: cleanup code 2024-12-10 17:48:13 +05:30
ruthra kumar
364126d2e4 refactor: remove unneccesary 'item' variable 2024-12-10 17:48:13 +05:30
ruthra kumar
d68f30769a refactor: only use 'item_obj' 2024-12-10 17:48:13 +05:30
ruthra kumar
d0153065b0 chore: rename method 2024-12-10 17:48:13 +05:30
ruthra kumar
af580c9977 refactor: dynamic dimension handling and more 2024-12-10 17:48:13 +05:30
ruthra kumar
88e6b572a8 refactor: move remaining logic
Handle internal parties
conversion factor and applying pricing list rate
2024-12-10 17:48:13 +05:30
ruthra kumar
600d92100c refactor: use helper method to fetch item details 2024-12-10 17:48:12 +05:30
ruthra kumar
ce1ee98a12 refactor: moving item code trigger to server side
1 to 1 barebones migration
2024-12-10 17:48:12 +05:30
ruthra kumar
f2783fbb55 Merge pull request #44630 from frappe/l10n_develop
fix: sync translations from crowdin
2024-12-10 15:47:29 +05:30
Khushi Rawat
968762cb3e Merge pull request #44631 from khushi8112/salvage-value-precision
fix: precision check for salvage value
2024-12-10 13:38:05 +05:30
Khushi Rawat
da09316d4c fix: precision check for salvage value 2024-12-10 12:54:02 +05:30
Frappe PR Bot
b839663c48 fix: Swedish translations 2024-12-10 12:32:47 +05:30
ruthra kumar
01d1c67869 Merge pull request #44581 from ljain112/fix-drop-ship
fix: allow all dispatch address for drop ship invoice
2024-12-10 10:17:47 +05:30
mahsem
94d7e5964b fix: add doc.status to translation from POS 2024-12-09 16:24:23 +01:00
rohitwaghchaure
f5c038cd1b fix: 'Use Multi-Level BOM' checkbox default value (#44618) 2024-12-09 20:22:51 +05:30
rohitwaghchaure
616bb383c5 fix: do not allow to inward same serial nos multiple times (#44617) 2024-12-09 19:01:33 +05:30
Sugesh393
7614f166d8 refactor: convert sql queries to qb queries 2024-12-09 18:32:45 +05:30
ruthra kumar
6e02e29e4e Merge pull request #44545 from ljain112/fix-pr-adv
fix: only show advance payment entries where "book_advance_payments_in_separate_party_account" is true
2024-12-09 16:25:47 +05:30
ruthra kumar
d847f75ade chore: remove 'debug' param and linter fix 2024-12-09 15:59:40 +05:30
rohitwaghchaure
314c7b8d2a fix: not able to make sales return entry (#44605) 2024-12-09 14:55:47 +05:30
ruthra kumar
2195529c26 Merge pull request #44607 from frappe/l10n_develop
fix: sync translations from crowdin
2024-12-09 14:02:32 +05:30
ruthra kumar
f9f8ef0e17 Merge pull request #44513 from ljain112/draft-status-color
fix: correct color for draft in list view
2024-12-09 13:33:48 +05:30
rohitwaghchaure
9ad79625e0 fix: description overwrite on qty change (#44606) 2024-12-09 12:37:36 +05:30
Frappe PR Bot
603ca0963a fix: Turkish translations 2024-12-09 12:35:01 +05:30
Frappe PR Bot
0c18fb575e fix: Swedish translations 2024-12-09 12:34:58 +05:30
ruthra kumar
a08a66df92 Merge pull request #44495 from devdiogenes/prevent-set_payment_schedule-si-return
fix: Prevent set_payment_schedule when creating Sales Invoice that is return
2024-12-09 12:21:04 +05:30
Akhil Narang
af3743f09e refactor: drop pytz
Follow up to https://github.com/frappe/frappe/pull/28093 so I can drop the pytz dependency

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
2024-12-09 11:37:09 +05:30
ruthra kumar
a6aaaa5525 Merge pull request #44582 from mahsem/doc.status
fix: add doc.status for translation
2024-12-09 11:20:46 +05:30
Frappe PR Bot
f0270f69f0 fix: sync translations from crowdin (#44583)
* fix: Swedish translations

* fix: Swedish translations

* fix: French translations

* fix: Spanish translations

* fix: Arabic translations

* fix: Hungarian translations

* fix: Polish translations

* fix: Russian translations

* fix: Swedish translations

* fix: Turkish translations

* fix: Chinese Simplified translations

* fix: Persian translations

* fix: Bosnian translations

* fix: German translations

* fix: Esperanto translations
2024-12-08 19:49:02 +01:00
Frappe PR Bot
426fe96e5f chore: update POT file (#44599) 2024-12-08 11:04:16 +01:00
rohitwaghchaure
42d238da14 fix: BOM has not attr required items (#44598) 2024-12-08 15:28:35 +05:30
rohitwaghchaure
8806d17ef1 fix: currency symbol in SCO and SCR (#44577) 2024-12-07 14:05:36 +05:30
rohitwaghchaure
d871e21a40 fix: BOM name issue (#44586) 2024-12-07 12:20:58 +05:30
David
14a57795d5 fix: migration; make it resilient against old, non-conforming data 2024-12-06 17:52:54 +01:00
rohitwaghchaure
93e9517f5d fix: BOM for variant items (#44580) 2024-12-06 22:14:50 +05:30
mahsem
dda272220b fix: add docstatus for translation 2024-12-06 14:59:16 +01:00
ljain112
125a352bc2 fix: allow all dispatch address for drop ship invoice 2024-12-06 17:41:44 +05:30
rohitwaghchaure
b7a3c6b6ca fix: BOM name issue (#44575)
fix: bom name issue
2024-12-06 16:54:38 +05:30
Raffael Meyer
72256565bb fix(Bank Transaction): error in party matching should not block submitting (#44416) 2024-12-06 10:19:23 +01:00
ruthra kumar
d5a208cf69 Merge pull request #44538 from mahsem/patch-10
fix: add labels for translation in purchase_order_analysis.py
2024-12-06 12:18:43 +05:30
ruthra kumar
cc931d20c2 Merge pull request #44539 from mahsem/patch-11
fix: add labels for translation in production_analytics.py
2024-12-06 12:14:36 +05:30
ruthra kumar
0e38e9417d Merge pull request #44541 from mahsem/patch-12
fix: add labels for translation in quality_inspection_summary.py
2024-12-06 12:13:34 +05:30
ruthra kumar
c116815c14 Merge pull request #44558 from mahsem/patch-4
fix: add string for translation in delayed_tasks_summary.py
2024-12-06 12:12:42 +05:30
ruthra kumar
53d183ae03 Merge pull request #44559 from mahsem/patch-9
fix: add strings for translation payment_terms_status_for_sales_order.py
2024-12-06 12:07:58 +05:30
ruthra kumar
93c75901cf Merge pull request #44560 from mahsem/patch-13
fix: add labels for translation in sales_order_analysis.py
2024-12-06 11:37:54 +05:30
ruthra kumar
e8e13674ef Merge pull request #44557 from frappe/l10n_develop
fix: sync translations from crowdin
2024-12-06 11:32:45 +05:30
Sugesh393
b9f9fc0afe Merge branch 'develop' of https://github.com/aerele/erpnext into ledger-summary-report 2024-12-05 21:34:36 +05:30
mahsem
8a554a5538 fix: add labels for translation in sales_order_analysis.py 2024-12-05 16:40:00 +01:00
mahsem
7d244051c8 fix: add strings for translation payment_terms_status_for_sales_order.py 2024-12-05 16:20:31 +01:00
mahsem
84b54f549a fix: add string for translation in delayed_tasks_summary.py 2024-12-05 16:13:07 +01:00
Frappe PR Bot
c26114b66a fix: Turkish translations 2024-12-05 19:52:53 +05:30
Frappe PR Bot
98da9b56e9 fix: Swedish translations 2024-12-05 19:52:48 +05:30
Sugesh393
9610a33d23 fix: remove irrelavent conditions 2024-12-05 18:51:29 +05:30
Deepesh Garg
1ac292285e chore: Ignore stock validation for non stock invoices (#44549)
* chore: Ignore stock validation for non stock invoices

* chore: Ignore stock validation for non stock invoices
2024-12-05 18:14:23 +05:30
David Arnold
30c3892f9d chore: adapt filter signature to frappe/frappe#28218 (#44553) 2024-12-05 11:32:32 +00:00
rohitwaghchaure
1571dff3ef fix: variant qty while making work order from BOM (#44548) 2024-12-05 15:51:33 +05:30
rohitwaghchaure
024c442087 fix: not able to make PO for returned qty from material request (#44540) 2024-12-05 15:29:34 +05:30
rohitwaghchaure
7249cf0001 fix: update qty in SABB if qty changed in stock reco (#44542) 2024-12-05 15:28:38 +05:30
ljain112
ffd6a8424b fix: only show advance payment entries where "book_advance_payments_in_separate_party_account" is true 2024-12-05 15:18:44 +05:30
Khushi Rawat
322c788760 Merge pull request #44537 from mahsem/patch-9
fix: add title for translation in  asset.js
2024-12-05 15:12:39 +05:30
mahsem
6ff4704345 fix: add labels for translation in quality_inspection_summary.py 2024-12-05 09:17:35 +01:00
mahsem
9b09116576 fix: add labels for translation in production_analytics.py 2024-12-05 09:02:05 +01:00
mahsem
342a398bec fix: add labels for translation in purchase_order_analysis.py 2024-12-05 08:41:02 +01:00
mahsem
61439132a4 fix: add title for translation in asset.js 2024-12-05 08:37:43 +01:00
rohitwaghchaure
14f2b0ab0e fix: consider zero valuation rate for serial nos (#44532) 2024-12-05 12:50:27 +05:30
rohitwaghchaure
5413cf9f1f fix: incorrect stock UOM for BOM raw materials (#44528)
fix: incorrect stock uom for BOM raw materials
2024-12-05 11:00:11 +05:30
ruthra kumar
707d8eddc5 Merge pull request #44503 from mahsem/patch-7
fix: add strings for translation in pos_item_cart.js
2024-12-05 10:18:10 +05:30
Sugesh393
901bcd5c43 feat: add accounting dimensions in ledger summary reports 2024-12-05 10:14:15 +05:30
ruthra kumar
abd2314894 Merge pull request #44511 from frappe/l10n_develop
fix: sync translations from crowdin
2024-12-05 10:13:24 +05:30
ruthra kumar
fb5cbc43a2 Merge pull request #44512 from mahsem/patch-8
fix: add label strings for translation in pos_controller.js
2024-12-05 10:11:40 +05:30
ruthra kumar
31efaf6dbf chore: linter fix 2024-12-05 10:10:34 +05:30
ruthra kumar
2f38390b48 Merge pull request #44501 from mahsem/patch-5
fix: strings for translation in pos_past_order_summary.js
2024-12-05 10:00:17 +05:30
mahsem
138ffc4e93 refactor: translatable label on pos payments (#42081)
* Use better description in pos_payment.js 

Use Change Amount instead of Change and To Be Paid in pos_payment.js and be consistent with other strings

* change_amount_pos_payment.js
2024-12-05 09:59:43 +05:30
ruthra kumar
ba8ba79335 Merge pull request #44500 from mahsem/patch-4
fix: add labels for translation in sales_order.js
2024-12-05 09:58:05 +05:30
rohitwaghchaure
353610ce61 fix: inv dimensions fields not creating for standard doctype (#44504) 2024-12-04 21:26:15 +05:30
ljain112
143acf2330 fix: correct color for draft in list view 2024-12-04 20:40:08 +05:30
mahsem
bd77a5557d fix: add label strings for translation in pos_controller.js 2024-12-04 15:40:55 +01:00
Frappe PR Bot
163ff71ece fix: Persian translations 2024-12-04 19:48:36 +05:30
Frappe PR Bot
6a9a4f10f0 fix: Turkish translations 2024-12-04 19:48:28 +05:30
Frappe PR Bot
663b66ca1d fix: Swedish translations 2024-12-04 19:48:24 +05:30
David Arnold
029dc948fe fix: client-side taxes calculation (#44510)
closes: #44328
2024-12-04 13:08:50 +00:00
rohitwaghchaure
4001166ecc fix: required by date in the reorder material request (#44497) 2024-12-04 17:45:07 +05:30
rohitwaghchaure
b4534e56e4 fix: duplicate required items in the CSV (#44498) 2024-12-04 17:43:51 +05:30
mahsem
4b72b60f1a fix: add strings for translation in pos_item_cart.js 2024-12-04 10:12:34 +01:00
mahsem
23c846d4b9 fix: strings for translation in pos_past_order_summary.js 2024-12-04 09:07:09 +01:00
mahsem
d544328ffe fix: add labels for translation in sales_order.js 2024-12-04 08:58:16 +01:00
mahsem
6585fabdb1 fix: add strings for translation in timesheet.js (#44496) 2024-12-04 13:05:48 +05:30
ruthra kumar
e6be1021f9 Merge pull request #44453 from n-traore/vf_ohada_charts_accounts
feat: Create Syscohada charts of accounts
2024-12-04 11:44:05 +05:30
Diógenes Souza
d1dc7ec7bf Merge branch 'frappe:develop' into prevent-set_payment_schedule-si-return 2024-12-03 17:51:03 -03:00
Frappe PR Bot
f74c99be9d fix: sync translations from crowdin (#44486)
fix: Turkish translations
2024-12-03 21:09:01 +01:00
Raffael Meyer
032ef62b14 fix: if-block + indentation (#44494) 2024-12-03 20:06:50 +00:00
venkat102
329d14957b fix: validate negative qty 2024-12-04 01:08:54 +05:30
venkat102
8bce382834 fix: update free item qty while adding same item in seperate row 2024-12-04 00:56:36 +05:30
Raffael Meyer
657c85638c fix: get value from dict (#44492)
`doc.taxes` is not always a `frappe._dict`, it can also be a regular `dict`. Resolves #44328
2024-12-03 19:03:57 +00:00
ruthra kumar
483fd124fc Merge pull request #44339 from vishakhdesai/hd-ticket-20084
fix: move `validate_total_debit_and_credit` from`validate` to`on_submit` in Journal Entry
2024-12-03 18:08:59 +05:30
ruthra kumar
c3ace82db8 refactor: validate debit and credit on before_submit 2024-12-03 17:42:11 +05:30
ruthra kumar
88b0af1696 Merge pull request #44467 from ljain112/fix-multi-gp
fix: Multiple Fixes in Gross Profit Report
2024-12-03 17:29:31 +05:30
ruthra kumar
fc0122ce76 chore: fix typo 2024-12-03 15:39:30 +05:30
ruthra kumar
d0c522ee46 Merge pull request #44450 from aerele/payment-request-partial-payment-pr
fix: calculate submitted payment entry amount for grand total
2024-12-03 14:51:47 +05:30
ruthra kumar
f11eab06c3 Merge pull request #44415 from ljain112/fix-incoming-rate
fix: adjusted incoming rate for zero rated item in purchase receipt
2024-12-03 14:24:33 +05:30
ruthra kumar
9bbb953e26 Merge pull request #44373 from Ninad1306/valuation_rate_fix
fix: Always Calculate `sales_incoming_rate` for Internal Transfers
2024-12-03 14:17:04 +05:30
ruthra kumar
f21283d829 Merge pull request #44470 from ruthra-kumar/rearrange_fields_in_company
refactor(UI): Rearranging fields under new sections
2024-12-03 10:29:25 +05:30
ruthra kumar
94de5c4e7e Merge pull request #44473 from frappe/l10n_develop
fix: sync translations from crowdin
2024-12-03 10:16:39 +05:30
Frappe PR Bot
dc645b3906 fix: Persian translations 2024-12-02 17:26:34 +05:30
Frappe PR Bot
f758dfcbe1 fix: Swedish translations 2024-12-02 17:26:22 +05:30
Frappe PR Bot
fdfd51c0fd fix: Spanish translations 2024-12-02 17:26:07 +05:30
ruthra kumar
7244754d28 refactor(UI): Rearranging fields under new sections 2024-12-02 15:37:38 +05:30
ljain112
4e6a5893e7 fix: correct buying amount for product bundel 2024-12-02 15:20:20 +05:30
Sagar Vora
7cc111f790 fix: set correct unallocated amount in Payment Entry (#43958)
* fix: set correct unallocated amount in Payment Entry

* fix: add checkbox and other logic fix

* fix: patch to set is_exchange_gain_loss in Payment Entry deductions

* fix: consider deductions except exch. gain/loss

* fix: set exchange gain loss in payment entry

* fix: separate function to set exchange gain loss

* fix: failing test cases

* fix: add cash disc. row first

* fix: review changes

* fix: changes as per review

* fix: failing test cases

* fix: review

* fix: wait for request to complete before updating exchange gain loss

* fix: review

---------

Co-authored-by: vishakhdesai <vishakhdesai@gmail.com>
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
2024-12-02 14:54:29 +05:30
rohitwaghchaure
7de9c14a2c fix: incorrect Gross Margin on project (#44461) 2024-12-02 14:22:41 +05:30
ljain112
a86b223aed fix: remove queries 2024-12-02 14:08:21 +05:30
ruthra kumar
810a2c8fc1 Merge pull request #44412 from ljain112/fix-common-party
fix: handle multi currency in common party journal entry
2024-12-02 12:38:34 +05:30
ruthra kumar
6b6798bee6 Merge pull request #44437 from Abdeali099/report-data-trnslation
fix: Added translation for `Account` column
2024-12-02 12:22:38 +05:30
Abdeali Chharchhoda
e355b18c0c Merge branch 'develop' into report-data-trnslation 2024-12-02 11:33:00 +05:30
Abdeali Chharchhoda
a4f8315602 fix: Translate Party Account column label 2024-12-02 11:23:10 +05:30
Frappe PR Bot
6df0ea153d fix: sync translations from crowdin (#44432)
* fix: Swedish translations

* fix: Turkish translations

* fix: Swedish translations

* fix: Persian translations

* fix: French translations

* fix: Spanish translations

* fix: Arabic translations

* fix: Hungarian translations

* fix: Polish translations

* fix: Russian translations

* fix: German translations

* fix: Swedish translations

* fix: Turkish translations

* fix: Chinese Simplified translations

* fix: Persian translations

* fix: Bosnian translations

* fix: Esperanto translations
2024-12-01 22:35:17 +00:00
Khushi Rawat
74624828e7 Merge pull request #44456 from khushi8112/missing-ctx-argument
fix: missing ctx in API function calls
2024-12-01 20:28:54 +05:30
Khushi Rawat
55cb1c54e0 fix: missing ctx in API function calls 2024-12-01 17:59:44 +05:30
Frappe PR Bot
bd042d0fff chore: update POT file (#44455) 2024-12-01 11:18:19 +01:00
Nelly Traore
aa8254963c feat: add Syscohada charts of accounts 2024-11-30 19:51:48 +00:00
Nabin Hait
04c7c0bb66 fix: Reordered fields for asset doctype (#44423) 2024-11-30 22:00:17 +05:30
Sagar Vora
279dcabf38 Merge pull request #44443 from sagarvora/minor-perfs
perf: reduce queries during transaction save
2024-11-30 00:45:46 +05:30
Sagar Vora
9ee4f58e1b Merge pull request #44439 from Abdeali099/translation-bug
fix: added fieldname to avoid fieldname to translate
2024-11-30 00:24:53 +05:30
Sagar Vora
b6b8a06fda perf: reduce queries during transaction save 2024-11-30 00:20:18 +05:30
Sagar Vora
6de7320ef4 perf: cache product bundle items at document level (#44440) 2024-11-29 17:21:32 +00:00
Abdeali Chharchhoda
b80022133c fix: added fieldname to avoid fieldname to translate 2024-11-29 18:13:03 +05:30
rohitwaghchaure
810c72a30c fix: number format in the message (#44435) 2024-11-29 18:12:48 +05:30
Sugesh393
9bee2d430c test: add new unit test to validate paid amount in payment request 2024-11-29 17:44:22 +05:30
Abdeali Chharchhoda
de6cbd382f fix: Added translation for Account column 2024-11-29 17:42:11 +05:30
Sugesh393
561a159aec fix: calculate submitted payment entry as paid amount 2024-11-29 17:39:40 +05:30
rohitwaghchaure
7f7564b581 fix: precision calculation causing 0.1 discrepancy (#44431) 2024-11-29 17:09:41 +05:30
rohitwaghchaure
4050ea07eb fix: source warehouse not set in required items of WO (#44426)
fix: source warehouse not set in required items of WO on data import
2024-11-29 17:01:08 +05:30
rohitwaghchaure
5266f236b7 fix: SABB print for packed items (#44413) 2024-11-29 15:49:00 +05:30
rohitwaghchaure
d37d7b9811 fix: do not validate stock during inward (#44417) 2024-11-29 15:24:06 +05:30
ruthra kumar
76bd1017f4 Merge pull request #44302 from Abdeali099/refactor-payment-request
fix: Minor Updates in `Payment Request` and `Payment Entry`
2024-11-29 14:39:49 +05:30
ruthra kumar
2b3c829662 Merge pull request #44414 from blaggacao/fix/configure-test-type-checking
test: configure test-time type checking
2024-11-29 12:16:35 +05:30
ruthra kumar
da5dba997d Merge pull request #44411 from frappe/l10n_develop
fix: sync translations from crowdin
2024-11-29 10:36:59 +05:30
David
2394da419e test: configure test-time type checking
see: https://github.com/frappe/frappe/pull/28554
2024-11-28 23:36:24 +01:00
ljain112
3182c6981c fix: adjusted incoming rate for zero rated item in purchase receipt 2024-11-28 20:45:17 +05:30
ljain112
e371f68d66 fix: handle multi currency in common party journal entry 2024-11-28 19:50:01 +05:30
Frappe PR Bot
44c33cd12a fix: Turkish translations 2024-11-28 16:25:23 +05:30
Frappe PR Bot
4066df8652 fix: Swedish translations 2024-11-28 16:25:18 +05:30
Frappe PR Bot
a6d8383e43 fix: Spanish translations 2024-11-28 16:25:11 +05:30
Ninad Parikh
69bd90b038 fix: Data Should be Computed in Backend to Maintain Consistent Behaviour (#44195) 2024-11-28 15:59:52 +05:30
ruthra kumar
5de7db2be0 Merge pull request #44405 from ruthra-kumar/typeerror_on_transactionjs
fix: typeerror on transaction.js
2024-11-28 14:46:10 +05:30
ruthra kumar
46ce8780f2 fix: typeerror on transaction.js 2024-11-28 14:41:26 +05:30
Khushi Rawat
af5dae8682 Merge pull request #44400 from khushi8112/asset-depreciation-error-index-error
fix: IndexError in Asset Depreciation Ledger when query result is empty
2024-11-28 12:56:21 +05:30
Khushi Rawat
1737de7c10 chore: removed print statement 2024-11-28 11:41:00 +05:30
Khushi Rawat
7c393e5aa0 fix: IndexError in Asset Depreciation Ledger when query result is empty 2024-11-28 11:36:05 +05:30
Khushi Rawat
9a5d68f1f4 Merge pull request #44187 from khushi8112/progressive-disclosure-assets
style: added progressive disclosure to assets
2024-11-27 22:00:19 +05:30
Raffael Meyer
f6776c7d6b feat: add Company Contact Person in selling transactions (#44362) 2024-11-27 15:51:59 +01:00
ruthra kumar
ea6ddd5df6 Merge pull request #44346 from aerele/payment-request-partial-payment-pr
fix: reduce paid amount from grand total
2024-11-27 20:08:22 +05:30
ruthra kumar
e7808981cf Merge pull request #44382 from frappe/l10n_develop
fix: sync translations from crowdin
2024-11-27 19:56:32 +05:30
ruthra kumar
78a1b211a1 Merge pull request #44316 from Ninad1306/pos_closing_entry_fix
fix: Initially Closing Amount Should be Equal to Expected Amount
2024-11-27 19:56:05 +05:30
ruthra kumar
4d164d5854 Merge pull request #44392 from aerele/purchase_receipt_typo
chore: Fix typo "Purchase Reecipt"
2024-11-27 19:53:58 +05:30
vimalraj27
21049bae91 chore: Fix typo "Purchase Reecipt" 2024-11-27 18:03:39 +05:30
Sugesh393
82907672d9 fix: reduce paid amount from grand total 2024-11-27 17:41:16 +05:30
ruthra kumar
7efe05baf2 Merge pull request #44386 from Abdeali099/popup-msg-translation
fix: Add translation for showing mandatory fields in error msg
2024-11-27 17:28:54 +05:30
ruthra kumar
46b15f6040 Merge pull request #44327 from aerele/gl-transaction-currency
fix: set debit transaction currency in gl entry
2024-11-27 17:28:00 +05:30
akashdubey22
3de5ce74e1 refactor: updated print format for general ledger (#44057)
* refactor: update General Ledger print format

* Update general_ledger.html

* Update general_ledger.html

Removed extra spaces

* refactor: use letter-spacing for titles

* Update general_ledger.html

Comment added back

* Update general_ledger.html

* refactor: adding Remarks conditions & print party_type

* refactor: added Remarks column & adjusted spaces

Remarks column will be printed when Show Remarks is checked.

* Update general_ledger.html

Removed whitespace

* Update general_ledger.html

Fixed by removing colspan=2 in Opening Balance.

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
2024-11-27 17:26:47 +05:30
ruthra kumar
676c93411e Merge pull request #44378 from aerele/pb-item-filter
fix: filter item with search fields
2024-11-27 17:19:39 +05:30
Abdeali Chharchhoda
214dfab269 fix: Add filter for outstanding_amount to fetch open PRs 2024-11-27 17:18:10 +05:30
Abdeali Chharchhoda
e1b3193b04 Merge branch 'develop' into refactor-payment-request 2024-11-27 17:05:39 +05:30
Abdeali Chharchhoda
f42ec6a124 fix: Add translation for showing mandatory fields in error msg 2024-11-27 16:53:50 +05:30
ruthra kumar
e3770bc9e1 Merge pull request #44359 from aerele/period-closing-voucher
fix: check difference with company currency
2024-11-27 16:53:22 +05:30
ruthra kumar
4dbd8054e8 Merge pull request #44323 from ljain112/fix-gross-profit-returned-invoices
fix: update gross profit for returned invoices
2024-11-27 16:49:17 +05:30
ruthra kumar
1ea5c5d821 Merge pull request #44376 from vishakhdesai/remove-precision
fix: remove field precision in Sales and Purchase Order for percentage fields
2024-11-27 16:48:31 +05:30
Frappe PR Bot
c9fb59a158 fix: Persian translations 2024-11-27 16:28:19 +05:30
Frappe PR Bot
02225e6a33 fix: Turkish translations 2024-11-27 16:28:14 +05:30
Abdeali Chharchhoda
2db2c8bce1 refactor: Move PR link filters to client side 2024-11-27 15:52:45 +05:30
Abdeali Chharchhoda
cabe7ea028 Merge branch 'develop' into refactor-payment-request 2024-11-27 15:36:35 +05:30
ruthra kumar
1b45ba81a5 Merge pull request #44377 from ljain112/fix-payment-ref
fix:  correct placeholder index in message
2024-11-27 14:55:00 +05:30
venkat102
ebfbee3da5 fix: filter item with search fields 2024-11-27 14:02:11 +05:30
ljain112
d61cb9a4bf fix: correct placeholder index in message 2024-11-27 13:44:33 +05:30
vishakhdesai
eff9cd10cd fix: remove field precision in SO and PO for percentage fields 2024-11-27 12:43:34 +05:30
Abdeali Chharchhoda
2dd2083463 Merge branch 'develop' into refactor-payment-request 2024-11-27 12:07:16 +05:30
Ninad1306
94d3fc9fde test: validate buying workflow 2024-11-27 12:06:11 +05:30
Ninad1306
d049c97884 fix: always set sales incoming rate for internal transfers 2024-11-27 12:05:39 +05:30
ruthra kumar
d03dc1b855 Merge pull request #44343 from aerele/process-statement-of-account-email
fix: show cc on the process statement of accounts email
2024-11-27 10:22:17 +05:30
rohitwaghchaure
123e3ef263 feat: provision to disable item attribute (#44358) 2024-11-27 09:46:36 +05:30
Raffael Meyer
e094473c65 feat(Dunning): separate tab "Address & Contact" (#44363) 2024-11-26 21:10:34 +01:00
Raffael Meyer
3f92a57d63 fix: unify company address query in sales transactions (#44361)
* fix: unify company address query in sales transactions

* refactor: get the correct field label
2024-11-26 20:03:06 +01:00
venkat102
e2bae4cf07 fix: check difference with company currency 2024-11-26 22:13:57 +05:30
rohitwaghchaure
0fd50b5048 fix: added validation for quality inspection (#44351) 2024-11-26 19:48:42 +05:30
rohitwaghchaure
2ab7ec5437 fix: billed qty and received amount in PO analysis report (#44349) 2024-11-26 18:07:43 +05:30
ruthra kumar
6c5f57b22b Merge pull request #44347 from frappe/l10n_develop
fix: sync translations from crowdin
2024-11-26 17:52:25 +05:30
ruthra kumar
f8655cb26a Merge pull request #44345 from ruthra-kumar/fix_broken_export_in_p_l_statements
fix: broken export on financial statements
2024-11-26 17:48:29 +05:30
ruthra kumar
ea6e022fad test: export functionality on P&L statement 2024-11-26 16:36:18 +05:30
Frappe PR Bot
ce27d37fc3 fix: Persian translations 2024-11-26 16:27:41 +05:30
Frappe PR Bot
60a2d74d74 fix: Turkish translations 2024-11-26 16:27:36 +05:30
ruthra kumar
1da61a43e7 chore: remove debugging statement 2024-11-26 15:48:54 +05:30
ruthra kumar
c66d57d490 fix: broken export on statements 2024-11-26 15:33:04 +05:30
venkat102
2dd5699f6d fix: show cc on the email 2024-11-26 14:58:57 +05:30
vishakhdesai
8b5d4c0236 fix: move validate_total_debit_and_credit from validate to on_submit in Journal Entry 2024-11-26 14:26:02 +05:30
Sugesh393
bbe3bc95d0 test: add unit test to validate outstanding amount in payment request 2024-11-26 13:59:45 +05:30
Sugesh393
38e7d0a41e fix: set outstanding amount while creating payment request for invoices 2024-11-26 13:58:52 +05:30
Abdeali Chharchhoda
37ceb09955 revert: remove default Payment Request indicator color 2024-11-26 12:10:05 +05:30
ruthra kumar
4983dac27b Merge pull request #44319 from vishakhdesai/hd-ticket-21161
fix: use field precision in Sales and Purchase Order
2024-11-26 11:46:50 +05:30
ruthra kumar
1baed9f46e Merge pull request #44304 from ernestoruiz89/patch-2
chore: Add translations to QI validations in Update stock_controller.py
2024-11-26 11:36:05 +05:30
ruthra kumar
2fcfd41eb6 Merge pull request #44257 from aerele/number-card-dynamic-filter
fix: add company dynamic filters in number cards
2024-11-26 10:53:48 +05:30
ruthra kumar
48d9e9c362 Merge pull request #44320 from Abdeali099/fix-pos-qty
fix: Increase quantity by `1 UOM` when adding an item from the selector in `POS`
2024-11-26 10:29:41 +05:30
venkat102
6e19c06e58 fix: set debit transaction currency in gl entry 2024-11-26 00:03:42 +05:30
rohitwaghchaure
e56a98d5ba fix: Required By date issue (#44326) 2024-11-25 20:28:56 +05:30
rohitwaghchaure
bf28b2c771 fix: item none not found (#44324) 2024-11-25 20:12:12 +05:30
rohitwaghchaure
52f0d67bae Merge pull request #44260 from rohitwaghchaure/fixed-github-40144
feat: available qty at company in sales transactions
2024-11-25 19:58:54 +05:30
ljain112
af5a3e5a48 fix: test case 2024-11-25 19:05:08 +05:30
ljain112
00403515a8 fix: gp for return invoice 2024-11-25 18:45:17 +05:30
ljain112
8a42601e99 fix: update gross profit for returned invoices 2024-11-25 17:31:07 +05:30
Frappe PR Bot
e5bfdf8cfb fix: sync translations from crowdin (#44322) 2024-11-25 11:19:33 +00:00
ruthra kumar
ca0e20b2cf Merge pull request #44321 from ruthra-kumar/clear_unallocated_payments_on_pos
refactor: clear unallocated payments from POS Invoice
2024-11-25 16:40:35 +05:30
Rohit Waghchaure
d8b9aef14f feat: available qty at company in sales transactions 2024-11-25 16:27:46 +05:30
Abdeali Chharchhoda
112b4c705b revert: use + flt(value) instead of direct increment 2024-11-25 16:18:22 +05:30
ruthra kumar
eebd058891 refactor: clear unallocated payments from POS Invoice 2024-11-25 15:56:41 +05:30
Abdeali Chharchhoda
e37a039660 Merge branch 'develop' into fix-pos-qty 2024-11-25 15:10:06 +05:30
Abdeali Chharchhoda
84dcbe6639 fix: Show available stock qty in stock_uom instead of uom 2024-11-25 14:48:41 +05:30
Abdeali Chharchhoda
bbab850135 fix: Increase quantity by 1 UOM when adding an item from the selector in POS 2024-11-25 14:13:26 +05:30
vishakhdesai
1a1e2c7e01 fix: use field precision instead of hardcoded precision in so and po 2024-11-25 12:50:35 +05:30
ruthra kumar
efc22d5615 Merge pull request #44274 from aerele/rfq-price-list-currency
fix: set price_list_currency only if it exists
2024-11-25 12:38:31 +05:30
ruthra kumar
d8af140770 Merge pull request #44163 from aerele/show_child_data_for_company
feat: Show Aggregate Value from Subsidiary Companies
2024-11-25 12:08:47 +05:30
Ninad1306
af9524920b fix: initially closing amt should be equal to expected amt 2024-11-25 10:44:25 +05:30
ruthra kumar
8e72e35a21 Merge pull request #44290 from frappe/l10n_develop
fix: sync translations from crowdin
2024-11-25 10:23:20 +05:30
ruthra kumar
f4ad935f15 Merge pull request #44297 from Abdeali099/report-column-label-translation
refactor: added translate function for some columns of report
2024-11-25 10:08:34 +05:30
Frappe PR Bot
7e06e05584 chore: update POT file (#44309) 2024-11-24 16:49:43 +01:00
Frappe PR Bot
026c5b76ff fix: Persian translations 2024-11-24 16:25:10 +05:30
Frappe PR Bot
ae0ed1f56f fix: Swedish translations 2024-11-24 16:25:05 +05:30
David Arnold
a9485b91b0 feat: add more fine-grained deprecation warning control (#44307)
* feat: add more fine-grained deprecation warning control

see: https://github.com/frappe/frappe/wiki/Deprecations

* chore: ensure frappe deprecation dumpster is reused where possible; and loaded to parse PYTHONWARNINGS (!)
2024-11-24 00:37:42 +01:00
David Arnold
f1bd6e492a chore: use local deprecation (#44306) 2024-11-23 22:25:12 +00:00
David Arnold
2e04eeb661 fix: net_amount calculation (#44231)
fix: tax_item_rate calculation
2024-11-23 22:10:33 +00:00
Ernesto Ruiz
6754f15487 chore: Add translations to QI validations in Update stock_controller.py
chore: Add translations to QI validations in Update stock_controller.py
2024-11-23 09:07:18 -06:00
Frappe PR Bot
4289804681 fix: Persian translations 2024-11-23 16:29:52 +05:30
Abdeali Chharchhoda
91955e27c3 fix: Dashboard for Payment Request 2024-11-23 15:10:23 +05:30
Abdeali Chharchhoda
e1c4d6e1e6 refactor: Used object to get payment request status indicator 2024-11-23 14:47:31 +05:30
David Arnold
e9ea9ee57b fix: update calling signature (#44299) 2024-11-23 00:29:00 +00:00
Abdeali Chharchhoda
e545c913b5 refactor: added translate function for some columns of report 2024-11-22 19:50:52 +05:30
Frappe PR Bot
f244ad78df fix: Swedish translations 2024-11-22 16:30:25 +05:30
ruthra kumar
15c607306a Merge pull request #44246 from aerele/validate_for_closed_fiscal_year
fix: Get submitted documents in validate_for_closed_fiscal_year
2024-11-22 15:51:37 +05:30
ruthra kumar
367f56179b Merge pull request #44266 from aerele/pricing-rule-round-free-qty
fix: make free qty round on large transaction qty
2024-11-22 15:50:10 +05:30
ruthra kumar
2a31807407 Merge pull request #44277 from aerele/pos-item-group-filter
fix: filter with item group only if it is mentioned in pos profile
2024-11-22 15:44:44 +05:30
ruthra kumar
c3e5d6336c Merge pull request #44264 from frappe/l10n_develop
fix: sync translations from crowdin
2024-11-22 15:43:54 +05:30
Smit Vora
30f9b2b806 Merge pull request #44263 from vorasmit/fix-toggle-amount 2024-11-22 12:08:58 +05:30
venkat102
09641073e3 fix: filter with item group only if it is mentioned in pos profile 2024-11-22 11:53:07 +05:30
Sugesh393
f0b9cb4019 fix: set price_list_currency only if it exists 2024-11-22 11:36:57 +05:30
ruthra kumar
160bb10db8 Merge pull request #44194 from aerele/tds-tax-on-excess-amount
fix: include current invoice amount when tax_on_excess_amount is checked
2024-11-22 11:06:25 +05:30
Smit Vora
a10e175bc9 test: test case for toggling debit and credit if negative 2024-11-21 19:44:02 +05:30
venkat102
013a6fc6ec test: add unit test to validate free qty round on large transaction qty 2024-11-21 18:37:14 +05:30
Smit Vora
8e759c32c4 fix: toggle debit credit amounts for transaction currency too; minor refactor 2024-11-21 18:30:37 +05:30
venkat102
f9b8165385 fix: make free qty round on large transaction qty 2024-11-21 18:27:15 +05:30
Frappe PR Bot
fbdc40114b fix: Persian translations 2024-11-21 16:34:12 +05:30
Frappe PR Bot
4eb32023f5 fix: Swedish translations 2024-11-21 16:34:07 +05:30
rohitwaghchaure
57293aa18a fix: no permission to read Doctype (#44256) 2024-11-21 13:13:21 +05:30
Sugesh393
29762c4826 fix: remove irrelavent filters 2024-11-21 12:09:24 +05:30
Sugesh393
4e7725de66 fix: add company dynamic filters in number cards 2024-11-21 11:05:49 +05:30
Raffael Meyer
4b53075f84 refactor: use frappe._dict() instead of {} (#44255)
* refactor: use `frappe._dict()` instead of `{}`

A downstream function (`_get_item_tax_template`) expects this to be a frappe._dict and fails otherwise.

* refactor: use `ItemDetails()`
2024-11-21 00:36:20 +01:00
Raffael Meyer
8d8070e8eb fix: use of ctx (#44253)
* fix: rename args to ctx in caller

* fix: use `.get("items")` to avoid conflict with `.items()` method
2024-11-20 19:03:26 +01:00
ruthra kumar
4d96a20205 Merge pull request #44249 from frappe/l10n_develop
fix: sync translations from crowdin
2024-11-20 17:06:57 +05:30
Frappe PR Bot
f5cf417f53 fix: Persian translations 2024-11-20 16:34:49 +05:30
Frappe PR Bot
93fef93a1d fix: Turkish translations 2024-11-20 16:34:41 +05:30
Frappe PR Bot
77cba04b13 fix: Swedish translations 2024-11-20 16:34:36 +05:30
vimalraj27
c607e5f940 fix: Get submitted documents in validate_for_closed_fiscal_year 2024-11-20 13:27:21 +05:30
ruthra kumar
1737269358 Merge pull request #44197 from ljain112/fi-rev-dr-credit-reco
fix: payment reco for jv with negative dr or cr amount
2024-11-20 12:46:57 +05:30
Nihantra C. Patel
9ea8bd7a3c Merge pull request #44240 from Nihantra-Patel/fix_pos_warehouse
fix: non group pos warehouse
2024-11-20 12:10:42 +05:30
Nihantra C. Patel
d526be0394 fix: non group pos warehouse 2024-11-20 12:00:41 +05:30
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
Frappe PR Bot
7f0e881894 fix: Spanish translations 2024-11-18 15:37:40 +05:30
Frappe PR Bot
475611697f fix: French translations 2024-11-18 15:37:35 +05:30
Khushi Rawat
87065d0387 chore: pre-commit check 2024-11-18 14:45:02 +05:30
Khushi Rawat
e3d734c890 style: added progressive disclosure to assets 2024-11-18 14:40:32 +05:30
Smit Vora
2ada270e78 Merge pull request #44025 from Ninad1306/disable_rounded_total_for_quotation 2024-11-18 11:29:19 +05:30
ruthra kumar
806ec72a0e Merge pull request #44127 from vishakhdesai/set-default-party-type-pe
fix: set default Party Type based on Payment Type in Payment Entry
2024-11-18 10:13:44 +05:30
ruthra kumar
f00693c043 Merge pull request #44147 from vishakhdesai/pos-rate-calculation-issue
fix: set conversion factor before applying price list
2024-11-18 10:07:52 +05:30
ruthra kumar
cdc4b02964 Merge pull request #44157 from UmakanthKaspa/bugfix-disable-add-rows-allocations-table
fix: apply "cannot_add_rows" directly to table field for more efficient solution
2024-11-18 10:04:38 +05:30
ruthra kumar
345955e021 Merge pull request #44170 from frappe/l10n_develop
fix: sync translations from crowdin
2024-11-18 09:57:42 +05:30
Frappe PR Bot
7d4ff2777a chore: update POT file (#44169) 2024-11-17 15:06:37 +01:00
Raffael Meyer
2a8dbc5cd5 feat: new DocTypes "Code List" and "Common Code" (#43425)
Co-authored-by: David <dgx.arnold@gmail.com>
2024-11-17 15:05:33 +01:00
David Arnold
d3fb375260 Merge pull request #44171 from blaggacao/fix/migration-item-tax-detail
fix(migration): to new item_wise_tax_detail
2024-11-17 12:25:12 +01:00
David
2ec8a0e943 fix(migration): to new item_wise_tax_detail 2024-11-17 11:58:53 +01:00
Frappe PR Bot
4dbe2fdfd3 fix: Swedish translations 2024-11-17 15:40:10 +05:30
Frappe PR Bot
c5f22e7616 fix: sync translations from crowdin (#44164)
* fix: Swedish translations

* fix: Spanish translations

* fix: Swedish translations

* fix: Persian translations
2024-11-16 12:24:02 +01:00
rohitwaghchaure
9bf16df41e feat: inventory dimension for rejected materials (#44156) 2024-11-15 17:03:22 +05:30
l0gesh29
c23af6af41 feat: Show Aggregate Value from Subsidiary Companies 2024-11-15 12:54:04 +05:30
ruthra kumar
29f8777079 Merge pull request #43414 from vishakhdesai/exchange-rate-revaluation-issue
fix: Get Entries not showing accounts with no gain or loss in Exchange Rate Revaluation issue fixed
2024-11-15 12:47:31 +05:30
ruthra kumar
98fa51be5a Merge pull request #44158 from ruthra-kumar/broken_ui_on_currency_exchange
fix: broken UI on currency exchange
2024-11-15 12:21:12 +05:30
ruthra kumar
e91b65e7bd fix: broken UI on currency exchange 2024-11-15 12:14:42 +05:30
UmakanthKaspa
5dd8eafdfc refactor: set 'cannot_add_rows' directly in the allocations table field (optimized approach) 2024-11-15 05:43:25 +00:00
ruthra kumar
f908112935 Merge pull request #44089 from UmakanthKaspa/fix/invoice-sorting-payment-reconciliation
fix: apply posting date sorting to invoices in Payment Reconciliation similar to payments
2024-11-15 10:28:51 +05:30
ruthra kumar
a16ab653f2 Merge pull request #44148 from UmakanthKaspa/bugfix-disable-add-rows-allocations-table
Fix: Disable "Add Row" button in allocations table during UnReconcile process
2024-11-15 10:16:37 +05:30
rohitwaghchaure
93c8b4c39a fix: validation for serial no (#44133) 2024-11-15 10:04:59 +05:30
rohitwaghchaure
e8bbf6492f fix: stock ledger variance report filter options (#44137) 2024-11-15 10:04:37 +05:30
UmakanthKaspa
13ca2700f8 fix: correctly set 'cannot_add_rows' property on allocations table field 2024-11-15 09:38:11 +05:30
ruthra kumar
31ca9eaf2d Merge pull request #44142 from frappe/l10n_develop
fix: sync translations from crowdin
2024-11-15 06:19:44 +05:30
vishakhdesai
9749fe23cc fix: set conversion factor before applying price list 2024-11-14 17:31:34 +05:30
David Arnold
7e9fc9f4df Merge pull request #43372 from blaggacao/feat/log-net-total-on-taxes-and-charges
fix: item wise tax details and net amounts
2024-11-14 12:40:59 +01:00
Frappe PR Bot
897dc51cb7 fix: Turkish translations 2024-11-14 14:32:38 +05:30
Frappe PR Bot
7a2df9f0b8 fix: Swedish translations 2024-11-14 14:32:28 +05:30
Frappe PR Bot
4f9a0f23fd fix: Spanish translations 2024-11-14 14:32:17 +05:30
ruthra kumar
7be10a744d Merge pull request #43189 from ruthra-kumar/fix_for_rule_on_other
fix: broken apply on other item
2024-11-14 13:23:18 +05:30
ruthra kumar
0cb5a0cd0f Merge pull request #44138 from frappe/mergify/copy/develop/pr-43651
fix: bulk update invoice remarks during site upgrade (copy #43651)
2024-11-14 13:15:10 +05:30
ruthra kumar
e5119a749c fix: broken apply on other item pricing rule 2024-11-14 12:53:21 +05:30
Varun Verma
b7ad525960 fix: bulk update invoice remarks during site upgrade
fixes issue #43634

(cherry picked from commit cc07402b5e)
2024-11-14 07:19:17 +00:00
sudarsan2001
4a1cd5a8d6 chore: change account name 2024-11-14 10:59:51 +05:30
sudarsan2001
e8b8a589be test: add unit test to validate gl values 2024-11-14 01:28:16 +05:30
sudarsan2001
29a6eb21a3 fix: set debit in transaction currency in GL Entry 2024-11-14 01:11:12 +05:30
Frappe PR Bot
972d62bca7 fix: sync translations from crowdin (#44086) 2024-11-13 18:19:02 +01:00
vishakhdesai
19222690d3 fix: set default party type in Payment Entry 2024-11-13 17:27:49 +05:30
ruthra kumar
6d4b0e242e Merge pull request #44124 from ruthra-kumar/add_partialy_billed_in_purchase_receipt
refactor: 'Partly Billed' status for Purchase Receipt
2024-11-13 17:22:31 +05:30
ruthra kumar
c58bbd25f2 refactor: 'Partly Billed' status for Purchase Receipt 2024-11-13 16:56:08 +05:30
rohitwaghchaure
13834014b5 fix: Cannot read properties of undefined (reading 'work_order_closed') (#44117) 2024-11-13 15:52:48 +05:30
Nihantra C. Patel
6dc4934e59 Merge pull request #44116 from Nihantra-Patel/fix_dropshipping_address
fix: Drop Shipping address based on customer shopping address
2024-11-13 15:30:45 +05:30
Nihantra Patel
c7499f3528 fix: Drop Shipping address based on customer shopping address 2024-11-13 14:55:45 +05:30
NaviN
494fd7ceea fix: update per_billed value in Purchase Receipt while creating Debit Note (#43977)
* fix: update per_billed value in Purchase Receipt while creating Debit Note

* test: add unit test for validating per_billed value for partial Debit Note
2024-11-13 12:23:16 +05:30
rohitwaghchaure
0828c74fe3 fix: incorrect produced qty in Production Plan Summary (#44112) 2024-11-13 12:10:37 +05:30
rohitwaghchaure
c0ffaa444c fix: consider service item cost in the RM cost of the BOM (#43962) 2024-11-12 21:59:04 +05:30
rohitwaghchaure
e8882718c9 fix: not able to cancel DN (#44108) 2024-11-12 17:41:55 +05:30
David
3732dd1b1f refactor!: store item wise tax details as a more flexible dict 2024-11-12 12:39:04 +01:00
David
5af88a7fb1 fix: pos invoice merge to more detailed item wise tax detail 2024-11-12 12:39:04 +01:00
David
27a07b9eb3 test: adapt pos invoice text 2024-11-12 12:39:04 +01:00
David
2b0cc76523 test: add test for item tax detail 2024-11-12 12:39:03 +01:00
David (aider)
961e7b107d feat: Add net_total to Taxes And Charges doctypes and modify relevant controllers 2024-11-12 12:39:00 +01:00
David Arnold
ab1593654e Merge pull request #44018 from blaggacao/feat/add-deprecation-dumpster
feat: add deprecation dumpster
2024-11-12 12:38:46 +01:00
David
8463247dcf feat: don't enforce dumpster location; allow in-place deprecations; diverge from frappe practice 2024-11-12 11:40:30 +01:00
rohitwaghchaure
8805e74784 fix: not able to reconcile expired batches (#44012) 2024-11-12 15:48:28 +05:30
rohitwaghchaure
774845f886 fix: purchase receipt creation from SCR (#44095) 2024-11-12 15:43:20 +05:30
Ninad1306
5a6261d3b4 test: test to validate rounded total 2024-11-12 15:25:14 +05:30
ruthra kumar
586864c8ea Merge pull request #44053 from aerele/pos_barcode_search_fix
Pos barcode search fix
2024-11-12 12:44:32 +05:30
ruthra kumar
f072b1266e refactor: simpler filtering 2024-11-12 11:39:30 +05:30
ruthra kumar
f0e5036879 Merge pull request #44065 from aerele/pos-partial-return-payment-fix
fix: update payment amount for partial pos return
2024-11-12 09:48:54 +05:30
UmakanthKaspa
d6703eb88b fix: remove trailing whitespace 2024-11-11 18:06:53 +05:30
ruthra kumar
46676de341 Merge pull request #44072 from aerele/pos-create-return-button-fix
fix: bind this object explicitly on callback event function
2024-11-11 16:50:02 +05:30
HarryPaulo
cfe6af1f68 fix: add field conversion_factor when include_uom is settled (#43701) 2024-11-11 16:08:30 +05:30
rohitwaghchaure
9223ef2f37 fix: item mapping from modal to batch form (#44090) 2024-11-11 16:07:16 +05:30
UmakanthKaspa
0bd83d920d fix: apply posting date sorting to invoices in Payment Reconciliation similar to payments 2024-11-11 09:18:09 +00:00
ruthra kumar
ed56a1e26a Merge pull request #43695 from Vishv-024/sales_register_and_parchase_register
fix: exception on register reports when filtered on cost center
2024-11-11 14:47:09 +05:30
ruthra kumar
1d11131afe refactor(test): assertion refactoring and exact decimals 2024-11-11 14:16:49 +05:30
ruthra kumar
c53e9637dd refactor(test): pass all mandatory fields 2024-11-11 13:06:09 +05:30
Nihantra C. Patel
c81eb6c824 fix: populate payment schedule from payment terms (#44082) 2024-11-11 13:04:54 +05:30
s-aga-r
9a758ea826 chore: update CODEOWNERS (#44074) 2024-11-11 07:19:30 +00:00
ruthra kumar
d6030e7112 refactor(test): fix incorrect assertion 2024-11-11 12:37:02 +05:30
ruthra kumar
c255f34eea test: journals with cost center 2024-11-11 12:34:51 +05:30
Nihantra C. Patel
8c99acb1b9 fix: task path (#44073) 2024-11-11 12:33:30 +05:30
rohitwaghchaure
6cb169cd6b Merge pull request #44071 from aerele/pos-page-item-selector-fix
fix: add default height to POS item card selector
2024-11-11 12:09:14 +05:30
Kavin
5e790a0fce fix: bind this object explicitly on callback event function 2024-11-11 11:56:56 +05:30
Kavin
5f5a514d6f fix: add default height to POS item card selector 2024-11-11 11:53:49 +05:30
rohitwaghchaure
7cfd6a5151 Merge pull request #44058 from Vishnu7025/type_error_fix
fix: type error while saving pick list
2024-11-11 11:53:14 +05:30
rohitwaghchaure
0e6425486a Merge pull request #44064 from rohitwaghchaure/fixed-support-25064
fix: slow reposting due to SABB update
2024-11-11 11:52:28 +05:30
Kavin
53ef6336b6 fix: update payment amount for partial pos return 2024-11-11 11:21:48 +05:30
Rohit Waghchaure
2447b3f424 fix: slow reposting due to SABB update 2024-11-11 11:12:33 +05:30
HENRY Florian
1fe6efdeb9 feat: add template taxe for charts of account France - Plan Comptable General avec code (#42757)
* feat: add template taxe for charts of account France - Plan Comptable General avec code

* feat: add template taxe for charts of account France - Plan Comptable General avec code

* feat: add template taxe for charts of account France - Plan Comptable General avec code

* feat: add template taxe for charts of account France - Plan Comptable General avec code

* feat: add template taxe for charts of account France - Plan Comptable General avec code
2024-11-11 10:17:51 +05:30
HENRY Florian
8383883977 fix: when company is created with other company template Chart of Account the Create Taxe Template failed (#42755)
fix: when company if create with other company template Created Template Taxe failed
2024-11-11 10:16:17 +05:30
Frappe PR Bot
c9cb359815 fix: sync translations from crowdin (#44036) 2024-11-10 18:38:25 +01:00
Frappe PR Bot
56f05c5dd6 chore: update POT file (#44059) 2024-11-10 18:33:17 +01:00
vishnu
22de0ecbdc fix: tyeerror while saving pick list 2024-11-10 06:55:16 +00:00
Bhavan23
488b60fc27 refactor: Relocate doc variable for better scope management 2024-11-09 19:55:50 +05:30
Bhavan23
5e7cf3899b feat: Add item group filtering for search results 2024-11-09 19:54:50 +05:30
Smit Vora
e3cd6539c3 fix: better gls for purchases with tax witholding (#42743)
* fix: better gls for purchases with tax witholding

* test: test case for purchase invoice gl entries with tax witholding

* fix: use flag `_skip_merge` instead of skipping merge based on against account

* test: fix test `test_single_threshold_tds` for newer implementation
2024-11-09 09:44:21 +00:00
Ninad1306
f8524d526b fix: added disable_rounded_total field 2024-11-08 12:51:05 +05:30
Nihantra C. Patel
4ea2071265 fix: duplicate items and outdated item price in POS (#42978)
* fix: duplicate items and outdated item price in POS

* fix: duplicate items and outdated item price in POS --formatter
2024-11-08 12:42:19 +05:30
Venkatesh
42dcdcde1a fix: sort by ascending to get the first period closing voucher (#44029) 2024-11-08 12:30:54 +05:30
rohitwaghchaure
0399ccc51e fix: item not set in the batch quick entry form (#44028) 2024-11-08 12:10:51 +05:30
ruthra kumar
657201b324 test: basic report output 2024-11-08 12:08:05 +05:30
Vishv-silveroak
f01e1a8e20 fix: exception on register reports when filtered on cost center
1
2024-11-08 12:03:38 +05:30
ruthra kumar
dfe233fa0a Merge pull request #43873 from NethminaHiker360/fix-43865-sales-order
fix: add missing fields to field_no_map array
2024-11-08 11:29:05 +05:30
ruthra kumar
a978fd13e0 Merge pull request #43762 from bhavesh95863/fix-item-update
fix: handle NoneType error when updating ordered_qty in SO for remove…
2024-11-08 10:39:35 +05:30
Ravindu Nethmina
70f090c1ec refactor: add "margin_type" and "margin_rate_or_amount" to no copy 2024-11-08 10:24:06 +05:30
ruthra kumar
625ce41f39 Merge pull request #43273 from ljain112/fix-voucher-types
fix: improved the conditions for determining voucher subtypes
2024-11-08 10:19:41 +05:30
bhaveshkumar.j
442cdd7ce4 fix: NoneType while updating ordered_qty in SO for removed items 2024-11-08 10:14:20 +05:30
David
1313d81c5f feat: add deprecation dumpster 2024-11-07 19:51:50 +01:00
Frappe PR Bot
284fffe334 fix: sync translations from crowdin (#44002) 2024-11-07 13:38:37 +01:00
ruthra kumar
a10b38e8dd Merge pull request #43689 from ruthra-kumar/allow_multiple_payment_requests
refactor: allow multiple payment requests through customer portal
2024-11-07 15:20:00 +05:30
ruthra kumar
18c13a2cff refactor: handle PR's in advance stage 2024-11-07 14:49:41 +05:30
Smit Vora
ad6cc352f1 test: test voucher subtype for sales invoice 2024-11-07 13:35:54 +05:30
Smit Vora
f9dc9bdc0f Merge branch 'develop' into fix-voucher-types 2024-11-07 13:11:55 +05:30
Nihantra C. Patel
44832c3b5c fix: task showing limit in customer portal (#44003) 2024-11-07 06:55:48 +00:00
ruthra kumar
cda7800777 refactor: cancel old PR and invalidate tokens 2024-11-06 17:35:46 +05:30
ruthra kumar
e14a8f7752 Merge pull request #43972 from frappe/l10n_develop
fix: sync translations from crowdin
2024-11-06 14:31:31 +05:30
Sagar Vora
77aabce95e Merge pull request #43993 from sagarvora/fix-m00 2024-11-06 14:06:28 +05:30
Sagar Vora
e13e688987 fix: ensure list has items 2024-11-06 14:04:30 +05:30
Sagar Vora
c62596b323 fix: error when saving POS merge log (#43989) 2024-11-06 07:51:19 +00:00
Nihantra C. Patel
834d18840c fix: removed single quotes from deferred revenue (#43985) 2024-11-06 12:02:29 +05:30
Frappe PR Bot
2cb69f81c5 fix: Turkish translations 2024-11-06 11:03:21 +05:30
Ikko Eltociear Ashimine
30954ed645 chore: update serial_batch_bundle.py (#43981)
Avaliable -> Available
2024-11-06 10:06:00 +05:30
rohitwaghchaure
134c24b9c5 perf: too many writes error during reposting (#43978)
perf: too many writes error
2024-11-06 09:30:33 +05:30
Khushi Rawat
f5a8e72198 Merge pull request #43979 from khushi8112/correct-precision-for-asset-values
fix: added precision validation
2024-11-06 00:31:42 +05:30
Khushi Rawat
7daadcf420 fix: add precision validation 2024-11-05 23:36:26 +05:30
ruthra kumar
29a1fe8040 Merge pull request #43971 from ruthra-kumar/additional_changes_to_advance_ledger
refactor: update permission requirement for advance ledger
2024-11-05 10:58:30 +05:30
Frappe PR Bot
a817f21a8e fix: Swedish translations 2024-11-05 10:49:43 +05:30
Frappe PR Bot
c698b95523 fix: Spanish translations 2024-11-05 10:49:28 +05:30
ruthra kumar
e41560d30b refactor: update advance ledger role requirement 2024-11-05 10:32:02 +05:30
ruthra kumar
c832d9fb9a refactor: avoid permission issue for non-admin 2024-11-05 10:25:32 +05:30
Raffael Meyer
65088cbb1b fix: show "Send SMS" only when enabled (#43941) 2024-11-05 01:27:35 +01:00
ruthra kumar
dcaadbd528 Merge pull request #43388 from CaseSolvedUK/po-so-dash
fix: SO link on PO and add in missing dashboard references on both
2024-11-04 14:01:05 +05:30
ruthra kumar
50e477c3a3 Merge pull request #43955 from frappe/l10n_develop
fix: sync translations from crowdin
2024-11-04 13:16:23 +05:30
rohitwaghchaure
7cfe1c8d59 perf: avoid reposting of entries created after stock reco (#43950) 2024-11-04 13:04:35 +05:30
ruthra kumar
98a22b28b3 Merge pull request #43929 from ramyasusee/ramya-dev
fix: Map reference number while reversing Journal Entry
2024-11-04 12:27:54 +05:30
ramyasusee
77de783cd4 fix: map reference number while reversing journal 2024-11-04 12:03:08 +05:30
ruthra kumar
2b25f0ebc2 Merge pull request #43835 from hyaray/patch-16
Update fiscal_year.js
2024-11-04 11:17:27 +05:30
hyaray
d54283ded5 refactor: use year current year start date as default 2024-11-04 11:14:03 +05:30
Frappe PR Bot
280b5477d1 fix: Esperanto translations 2024-11-04 10:39:11 +05:30
Frappe PR Bot
6474b4551d fix: German translations 2024-11-04 10:39:07 +05:30
Frappe PR Bot
81181a8ec0 fix: Bosnian translations 2024-11-04 10:39:04 +05:30
Frappe PR Bot
0c3e59d852 fix: Persian translations 2024-11-04 10:39:00 +05:30
Frappe PR Bot
ec3d7c48b4 fix: Chinese Simplified translations 2024-11-04 10:38:52 +05:30
Frappe PR Bot
400b315309 fix: Turkish translations 2024-11-04 10:38:49 +05:30
Frappe PR Bot
a01917c6bd fix: Swedish translations 2024-11-04 10:38:45 +05:30
Frappe PR Bot
b4e772291c fix: Russian translations 2024-11-04 10:38:41 +05:30
Frappe PR Bot
f4d22fc26a fix: Polish translations 2024-11-04 10:38:38 +05:30
Frappe PR Bot
b43990962b fix: Hungarian translations 2024-11-04 10:38:36 +05:30
Frappe PR Bot
bb171c3db6 fix: Arabic translations 2024-11-04 10:38:32 +05:30
Frappe PR Bot
2414b9c0fc fix: Spanish translations 2024-11-04 10:38:29 +05:30
Frappe PR Bot
4e38524f07 fix: French translations 2024-11-04 10:38:26 +05:30
ruthra kumar
09d012cebf Merge pull request #43945 from frappe/l10n_develop
fix: sync translations from crowdin
2024-11-04 10:13:26 +05:30
Frappe PR Bot
8f7ce743e1 chore: update POT file (#43953) 2024-11-03 09:59:19 +00:00
Frappe PR Bot
a399142bd1 fix: Swedish translations 2024-11-03 09:25:50 +05:30
Frappe PR Bot
67d3f90c8c fix: Turkish translations 2024-11-02 09:15:49 +05:30
ruthra kumar
b3b7b1ad1f Merge pull request #43709 from ruthra-kumar/ledger_for_advance_payment
feat: Ledger for advance payment
2024-11-01 14:04:02 +05:30
Frappe PR Bot
7e6fc95db4 fix: Turkish translations 2024-11-01 09:00:58 +05:30
Frappe PR Bot
2d540c7110 fix: Swedish translations 2024-11-01 09:00:54 +05:30
rohitwaghchaure
ba9fb4effc fix: validation trigger (#43926) 2024-10-31 22:55:01 +05:30
rohitwaghchaure
01bb1612da fix: valuation rate for sales / purchase return for serial / batch nos (#43925) 2024-10-31 22:54:29 +05:30
ruthra kumar
cf7b8f1b41 test: PO advance and currency from journal 2024-10-31 10:36:22 +05:30
ruthra kumar
ca85c75e39 test: PO 'Advance Paid' and curreny when using payment 2024-10-31 10:36:22 +05:30
ruthra kumar
14cef3d4c4 chore: move tests to advance payment ledger doctype 2024-10-31 10:36:22 +05:30
ruthra kumar
1825082512 test: advance and currency from Journal 2024-10-31 10:36:22 +05:30
ruthra kumar
9c1a4e284c refactor: use dr / cr account currency field for journals 2024-10-31 10:36:22 +05:30
ruthra kumar
6c731561f3 test: USD Sales Order with advance payment 2024-10-31 10:36:22 +05:30
ruthra kumar
ae6a81cd07 refactor: handle currency on advance payment ledger 2024-10-31 10:36:22 +05:30
ruthra kumar
ad88bde448 refactor: move creation logic to controller 2024-10-31 10:36:22 +05:30
ruthra kumar
8e3bf7dc09 refactor: handle 'no data' situation in patch 2024-10-31 10:36:22 +05:30
ruthra kumar
767ae6a372 chore: update ignore_linked_doctypes for Journal Entry 2024-10-31 10:36:22 +05:30
ruthra kumar
8ab7194b1d chore: update patchex.txt 2024-10-31 10:36:22 +05:30
ruthra kumar
b927f2f4a0 refactor: patch to migrating old SO / PO to advance ledger 2024-10-31 10:36:22 +05:30
ruthra kumar
35a8a18728 refactor(test): reconciliation shouldn't affect advance paid 2024-10-31 10:36:22 +05:30
ruthra kumar
fca5e95248 refactor: link journal entry to advance payment ledger 2024-10-31 10:36:22 +05:30
ruthra kumar
14357bccba fix: deleting SO/PO will remove its advance payment ledger entry 2024-10-31 10:36:22 +05:30
ruthra kumar
c4197c3f31 refactor(test): advance_paid stays after reconciliation 2024-10-31 10:36:22 +05:30
ruthra kumar
e2891a60d5 chore: remove duplicate test class 2024-10-31 10:36:22 +05:30
ruthra kumar
3c53b92f05 refactor: remove advance payment ledgers on document deletion 2024-10-31 10:36:22 +05:30
ruthra kumar
2b2360bf7b refactor: calculate advance from advance ledger 2024-10-31 10:36:22 +05:30
ruthra kumar
575ca5b900 refactor: create advance ledger entries on submit and cancel 2024-10-31 10:36:22 +05:30
ruthra kumar
f176a82198 refactor: make all fields readonly 2024-10-31 10:36:22 +05:30
ruthra kumar
2d6efd7cc8 feat: advance payment ledger doctype 2024-10-31 10:36:22 +05:30
ruthra kumar
c7d6923452 Merge pull request #43937 from frappe/l10n_develop
fix: sync translations from crowdin
2024-10-31 09:55:02 +05:30
Frappe PR Bot
9006b8da2e fix: Chinese Simplified translations 2024-10-31 08:47:31 +05:30
Frappe PR Bot
91f745ce14 fix: Turkish translations 2024-10-31 08:47:28 +05:30
Raffael Meyer
2dd0f8b7e2 feat: remove Payroll Entry from Bank Account dashboard (#43931) 2024-10-30 14:15:53 +00:00
lukas.brandhoff
0c83f48f78 fix: use get_datetime_as_string with correct time format 2024-10-30 11:46:21 +00:00
Shariq Ansari
46c96f6e95 Merge pull request #43921 from shariquerik/create-opp-fix 2024-10-30 13:47:42 +05:30
Shariq Ansari
603383bca7 fix: cannot create opp from lead without prospect 2024-10-30 12:04:17 +05:30
ruthra kumar
f12ec7a87e Merge pull request #43869 from aerele/tds-single-threshold
fix: calculate tds with net amount when invoice exceeds single threshold amount
2024-10-30 10:43:16 +05:30
ruthra kumar
5c8adbbd42 Merge pull request #43913 from nabinhait/pcv-opening-entry-fix
fix: find first PCV to consider opening entries
2024-10-30 10:24:02 +05:30
ruthra kumar
cce70f6657 Merge pull request #43886 from peniel-technology/develop
fix: remarks field in payment reconciliation
2024-10-30 10:19:25 +05:30
ruthra kumar
2564b7076f Merge pull request #43884 from ljain112/fix-pos-os
fix: recalculate outstanding after save on checkout for POS Invoice
2024-10-30 10:06:29 +05:30
ruthra kumar
24c86fb07d Merge pull request #43914 from frappe/l10n_develop
fix: sync translations from crowdin
2024-10-30 09:31:36 +05:30
Frappe PR Bot
64469fa328 fix: Swedish translations 2024-10-30 08:48:37 +05:30
Frappe PR Bot
237c972864 fix: Spanish translations 2024-10-30 08:48:20 +05:30
Nabin Hait
2201fc62a2 fix: find first PCV to consider opening entries 2024-10-30 00:25:18 +05:30
Khushi Rawat
22d46adf63 Merge pull request #43899 from khushi8112/rate-of-depreciation
fix: consider opening asset values while calculating depreciation rate
2024-10-30 00:05:22 +05:30
Nabin Hait
7994b05cef fix: restored report tests for manufacturing (#43907) 2024-10-29 23:22:38 +05:30
Nabin Hait
3a0d27b393 fix: Patch for reposting account closing balance (#43905) 2024-10-29 23:00:41 +05:30
Nabin Hait
966e8fa85e fix: rounding issue of required qty in subcontracting order (#43810)
* fix: rounding issue of required qty in subcontracting order

* fix: uom issue in test case

* fix: test case
2024-10-29 22:36:56 +05:30
Nabin Hait
0bba6442c0 fix: Calculate gross margin on update of project costing from invoices (#43876)
* fix: Calculate gross margin on update of project costing from invoices

* chore: linter issues
2024-10-29 18:21:19 +05:30
Ahmed Shareef
2d5b079949 fix: remarks field in payment reconciliation 2024-10-29 16:47:44 +04:00
Khushi Rawat
9d0fe7aa56 fix: consider opening asset values while calculating asset depreciation rate 2024-10-29 17:47:48 +05:30
Nabin Hait
adba1168c1 fix: calculate percentage received and delivered considering over-receipt and over-delivery (#43870) 2024-10-29 16:54:07 +05:30
Nabin Hait
34295d0344 fix: post account closing balance against pcv closing account (#43887) 2024-10-29 16:53:11 +05:30
ruthra kumar
aff63b92b7 Merge pull request #43856 from IMS94/fix-43811-sales-register
fix: add parenttype clause to invoice tax query in sales_register report
2024-10-29 15:39:20 +05:30
ruthra kumar
3edab67c55 Merge pull request #43698 from lbrandh/project_chart
fix: Project name instead of ID in chart
2024-10-29 15:23:23 +05:30
rohitwaghchaure
0c93bc31a5 fix: do not copy serial numbers from DN to SI (#43885) 2024-10-29 15:07:10 +05:30
lukas.brandhoff
736d1a1105 refactor: include 'Project Name' in Project summary report
Keep name field for backwards compatibility
2024-10-29 14:58:08 +05:30
ruthra kumar
a93d89c126 Merge pull request #43823 from ljain112/fix-portal
fix: Handle None value for item description in customer portal invoice view
2024-10-29 14:44:18 +05:30
ruthra kumar
85ccc9e0d8 Merge pull request #43824 from ljain112/fix-ad-field
fix: accounting dimension fieldname
2024-10-29 13:45:28 +05:30
ljain112
9ce2184c66 fix: recalculate outstanding after save on checkout for POS Invoice 2024-10-29 12:15:59 +05:30
Venkatesh
99d1c5f342 fix: use period closing voucher object to call get_account_closing_ba… (#43880)
fix: use period closing voucher object to call get_account_closing_balances method
2024-10-29 11:47:40 +05:30
ruthra kumar
624293750c Merge pull request #43803 from aerele/party_name_payment_request
feat: add party name in payment request
2024-10-29 11:16:32 +05:30
Raffael Meyer
b42e7d4b32 refactor(Timesheet): move methods to Timesheet Detail (#43794) 2024-10-29 01:05:32 +01:00
mergify[bot]
b4d4c4a736 fix: purchase return validation issue (backport #43871) (#43874)
fix: purchase return validation issue (#43871)

(cherry picked from commit a7cc7b28c0)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-10-28 17:21:36 +05:30
rohitwaghchaure
0a70be5b99 fix: work order finish button not showing (#43875) 2024-10-28 17:21:06 +05:30
venkat102
94badb464d test: add unit test to validate purchase invoice exceeding single threshold value 2024-10-28 12:43:55 +05:30
venkat102
ef694a40a1 fix: calculate tds with net amount when invoice exceeds single threshold amount 2024-10-28 12:42:58 +05:30
ruthra kumar
c74bc51b41 Merge pull request #43862 from ruthra-kumar/fix_garbage_description_in_razorpay
refactor: fix garbage title, desc and name in razorpay
2024-10-28 12:22:54 +05:30
ruthra kumar
7e45d1555a Merge pull request #43685 from ljain112/fix-arap-report
fix: do not check for payment terms details for return invoices.
2024-10-28 11:22:36 +05:30
ruthra kumar
7332ec8fbd refactor: fix garbage title, desc and name in razorpay 2024-10-28 10:47:34 +05:30
rohitwaghchaure
ad6ce09b86 fix: incorrect value of available_qty_for_consumption in subcontracti… (#43836)
fix: incorrect value of available_qty_for_consumption in subcontracting receipt
2024-10-28 10:42:07 +05:30
ruthra kumar
6d7c5871de Merge pull request #43833 from ljain112/fix-exp-acc
refactor: query for expense_account moved to setup hook in purchase invoice
2024-10-28 09:43:20 +05:30
ruthra kumar
31da5c0cc0 Merge pull request #43851 from frappe/l10n_develop
fix: sync translations from crowdin
2024-10-28 09:37:42 +05:30
Imesha Sudasingha
e30ab141f4 fix: add parenttype clause to invoice tax query in sales_register report 2024-10-28 03:43:56 +00:00
Frappe PR Bot
99a3a07e63 fix: Russian translations 2024-10-28 08:27:16 +05:30
Frappe PR Bot
dc19fe02d3 fix: Polish translations 2024-10-28 08:27:12 +05:30
Frappe PR Bot
d2306f67ef fix: Chinese Simplified translations 2024-10-28 08:27:09 +05:30
Frappe PR Bot
2c3f60f74d fix: Hungarian translations 2024-10-28 08:27:06 +05:30
Frappe PR Bot
da798ee9c5 fix: Esperanto translations 2024-10-28 08:27:03 +05:30
Frappe PR Bot
2cae324924 fix: Swedish translations 2024-10-28 08:27:00 +05:30
Frappe PR Bot
1c0550e944 fix: Spanish translations 2024-10-28 08:26:56 +05:30
Frappe PR Bot
49443a01aa fix: Arabic translations 2024-10-28 08:26:53 +05:30
Frappe PR Bot
b6feff03a0 fix: Bosnian translations 2024-10-28 08:26:50 +05:30
Frappe PR Bot
4223a2b73e fix: Turkish translations 2024-10-28 08:26:45 +05:30
Frappe PR Bot
b5b63d5ae6 fix: French translations 2024-10-28 08:26:42 +05:30
Frappe PR Bot
67a0022d37 fix: Persian translations 2024-10-28 08:26:38 +05:30
Frappe PR Bot
67423e0b09 fix: German translations 2024-10-28 08:26:35 +05:30
Frappe PR Bot
46adceb8a7 chore: update POT file (#43853) 2024-10-27 11:10:31 +01:00
Frappe PR Bot
147b07f1c2 fix: German translations 2024-10-27 08:23:56 +05:30
Frappe PR Bot
ffbc9f8dfd fix: sync translations from crowdin (#43827) 2024-10-26 19:52:05 +02:00
Raffael Meyer
1d40e3dbe3 fix(RFQ): make strings translatable (#43843) 2024-10-26 19:22:29 +02:00
Nabin Hait
c330a292d2 fix: Negative stock validation against inventory dimension (#43834) 2024-10-26 13:03:38 +05:30
rohitwaghchaure
5a967bc868 fix: basic rate not editable in Stock Entry Detail (#43837) 2024-10-25 18:41:49 +05:30
ljain112
912e1e3f3d fix: hide payment terms for return and paid purchase invoices 2024-10-25 18:14:07 +05:30
ljain112
8b700eadc7 fix: do not set payment terms for return invoices 2024-10-25 18:09:01 +05:30
ljain112
a9ac0cc223 refactor: query for expense_account moved to setup hook in purchase invoice 2024-10-25 17:11:27 +05:30
ruthra kumar
8647c67b35 Merge pull request #43830 from ruthra-kumar/missing_bill_no_in_general_ledger
fix: set bill_no before `against_voucher` gets concatenated
2024-10-25 14:00:11 +05:30
ruthra kumar
7bade7f1fe fix: set bill_no before against_voucher gets concatenated 2024-10-25 13:31:01 +05:30
Nabin Hait
91f6f75a5b fix: map item_ID instead of item_code while creating subcontracting order from PO (#43822) 2024-10-24 22:10:43 +05:30
David Arnold
349c2b1cdc Merge pull request #43821 from blaggacao/ci/add-upstream-dispatch
ci: trigger ci runs from upstream fix
2024-10-24 14:52:13 +02:00
ljain112
ceb449c75b fix: Handle None value for item description in customer portal invoice view 2024-10-24 18:10:08 +05:30
David
2f747a274f ci: trigger ci runs from upstream fix 2024-10-24 14:26:55 +02:00
David Arnold
6a2ed74de2 Merge pull request #43819 from blaggacao/ci/add-upstream-dispatch
ci: trigger ci runs from upstream
2024-10-24 13:12:29 +02:00
David
c314b71917 ci: trigger ci runs from upstream 2024-10-24 12:11:07 +02:00
Deepesh Garg
af472054f6 fix: Unnecessary validation for non deferred sales invoices (#43816) 2024-10-24 12:58:47 +05:30
ruthra kumar
076486e1f8 Merge pull request #43813 from frappe/l10n_develop
fix: sync translations from crowdin
2024-10-24 10:26:20 +05:30
Frappe PR Bot
67fe7f294a fix: Turkish translations 2024-10-24 08:26:06 +05:30
Raffael Meyer
fe1e1b12c3 chore(Timesheet): add type hints (#43793) 2024-10-23 22:52:42 +00:00
ljain112
ca31a19eb7 fix: validate fieldname 2024-10-23 18:14:30 +05:30
ljain112
023b7b9a60 fix: scrub "-" from fieldname in accounting dimension 2024-10-23 18:13:42 +05:30
Nabin Hait
96ea64fd00 fix: consider gle based on balances in company currency (#43804) 2024-10-23 17:08:48 +05:30
ruthra kumar
e8f3d1323c Merge pull request #43755 from IamSaiyyamChhetri/company_filter_issue
fix: Add Company Filter
2024-10-23 16:49:29 +05:30
IamSaiyyamChhetri
9909d760a5 fix: add company filter for project
- In Project dt Sales Order field
- In Sales Order dt Project field
2024-10-23 16:45:44 +05:30
ruthra kumar
031e33a2d1 Merge pull request #43796 from frappe/l10n_develop
fix: sync translations from crowdin
2024-10-23 16:17:19 +05:30
Nabin Hait
0c71df9a75 fix: wrong fieldname (#43799) 2024-10-23 14:35:09 +05:30
RAVIBHARATHI P C
0acb609d97 feat: add party name in payment request 2024-10-23 14:27:13 +05:30
Nabin Hait
8b7e153616 perf: performance optimizations for accounting reports by refactoring account closing balance and period closing voucher (#43435)
* fix: Gl Entry form cleanup

* fix: Added indexes in gl entry table

* perf: Refactored period closing voucher to handle large volume of gle

* fix: fixes as per new period start and end date fields in PCV

* perf: performance optimization for  accounting reports

* perf: performance optimizations for account closing balance patch

* fix: test cases

* fix: lenter issues - direct use of sql query

* fix: test cases

* fix: test cases

* fix: test cases
2024-10-23 11:53:09 +05:30
Frappe PR Bot
4183581515 fix: Russian translations 2024-10-23 08:18:54 +05:30
Frappe PR Bot
4250c9c8ed fix: Polish translations 2024-10-23 08:18:51 +05:30
Frappe PR Bot
b44d309466 fix: Swedish translations 2024-10-23 08:18:47 +05:30
Frappe PR Bot
977f6a1121 fix: Spanish translations 2024-10-23 08:18:42 +05:30
Frappe PR Bot
2a113831e1 fix: German translations 2024-10-23 08:18:37 +05:30
Raffael Meyer
345d32432b fix: use correct variable in error message (#43790) 2024-10-22 17:24:40 +02:00
Smit Vora
c9c8755a2a Merge pull request #43787 from ljain112/refactor-payment-request 2024-10-22 20:17:38 +05:30
Smit Vora
679bab1d09 Merge pull request #43769 from Ninad1306/auto_create_pr_from_sr 2024-10-22 20:12:08 +05:30
ljain112
669ea3ad35 refactor: condition check before get_doc 2024-10-22 19:51:50 +05:30
Smit Vora
cc7ac8bcc7 Merge pull request #43462 from vishakhdesai/journal-entry-issue 2024-10-22 19:34:31 +05:30
Ninad Parikh
004c4e21d4 fix: Required Changes to Support e-Waybill Generation for Material Transfer Return (#43061) 2024-10-22 19:28:02 +05:30
Smit Vora
f8f7335412 Merge pull request #43752 from ljain112/fix-order-pages 2024-10-22 19:09:05 +05:30
Ninad1306
66211dafd6 fix: better implementation, handle missing purchase order 2024-10-22 17:24:46 +05:30
Raffael Meyer
c4faa0e101 refactor: validate_return_against_account (#43778) 2024-10-22 13:44:28 +02:00
Ninad1306
59887bbc13 test: auto create purchase receipt 2024-10-22 17:00:11 +05:30
ruthra kumar
cfe1c8fd6a Merge pull request #43775 from cogk/fix-deferred-accounting
fix(deferred_revenue): Escape account in query
2024-10-22 16:11:08 +05:30
Corentin Forler
c7b3ae41d4 fix(deferred_revenue): Escape account in query 2024-10-22 12:14:28 +02:00
Khushi Rawat
bd0c6056a5 Merge pull request #43770 from frappe/revert-43703-update-depreciation-checkbox-to-select
chore: revert use selectbox instead of checkbox
2024-10-22 13:16:58 +05:30
Khushi Rawat
d47ab7870d Revert "chore: use selectbox instead of checkbox" 2024-10-22 12:37:06 +05:30
Ninad1306
60ceb91ace fix: map doc from purchase order 2024-10-22 12:16:59 +05:30
ruthra kumar
18bc82fc9c Merge pull request #43766 from ruthra-kumar/allow_unreconcile_on_bank_cash_entry
refactor: allow unreconcile on bank and cash entry type journals
2024-10-22 12:04:41 +05:30
ruthra kumar
2c4f37f488 refactor: allow unreconcile on bank and cash entry type journals 2024-10-22 11:59:57 +05:30
ruthra kumar
f3fd07f0ca Merge pull request #43761 from bhavesh95863/fix-coupon-code
fix: coupon code validation logic
2024-10-22 10:06:25 +05:30
Khushi Rawat
10f359700e Merge pull request #43378 from khushi8112/add-email-field-to-asset-maintenance-log
feat: added task assignee email field in asset maintenance log
2024-10-22 01:13:14 +05:30
bhaveshkumar.j
1561a9e1bf fix: remove extra space 2024-10-21 18:23:39 +00:00
bhaveshkumar.j
d04257a32d fix: coupon code validation logic 2024-10-21 18:22:30 +00:00
Shariq Ansari
01fcb083c0 Merge pull request #43759 from shariquerik/lead-connection-fix 2024-10-21 20:24:58 +05:30
Shariq Ansari
0dc518b1c3 fix: lead create opp from connection not working 2024-10-21 20:16:35 +05:30
Nabin Hait
e94ffb87cd fix: Workspace link for Work Order Consumed Materials report (#43753) 2024-10-21 15:33:30 +05:30
ljain112
fc2cac62c1 fix: only show pay button for specific doctype in portal 2024-10-21 13:53:40 +05:30
Khushi Rawat
52f1c7fac2 Merge pull request #43703 from khushi8112/update-depreciation-checkbox-to-select
chore: use selectbox instead of checkbox
2024-10-21 13:47:09 +05:30
ruthra kumar
66c726bf86 Merge pull request #42461 from HarryPaulo/fix-lock-screen-on-load-invoices
fix: Freeze Screen on load invoices on POS Closing Entry
2024-10-21 12:26:13 +05:30
ruthra kumar
feed761a5e Merge pull request #43720 from ljain112/fix-party-balance
fix: party_balance based on company in payment entry
2024-10-21 12:22:49 +05:30
ruthra kumar
0f19b59d53 Merge pull request #43727 from aerele/deferred-expense-period
fix: get period estimate till service end date
2024-10-21 12:19:09 +05:30
ruthra kumar
9404303755 Merge pull request #43726 from ljain112/fix-process-statemets--of-accounts
fix: "show_remarks" checkbox in Process statement of accounts
2024-10-21 12:13:28 +05:30
ruthra kumar
51536f8433 Merge pull request #43730 from frappe/l10n_develop
fix: sync translations from crowdin
2024-10-21 12:10:57 +05:30
ruthra kumar
1acfc5446e Merge pull request #43735 from ZeWaren/adds-french-npo-accounts
feat: Add the chart of accounts for French NPOs
2024-10-21 11:21:31 +05:30
ruthra kumar
3eaaca7309 Merge pull request #43728 from aerele/reconciliation-against-advance
fix: get party advance amount based on account
2024-10-21 11:16:44 +05:30
Frappe PR Bot
55cd72256f fix: Chinese Simplified translations 2024-10-21 07:56:34 +05:30
Frappe PR Bot
ff7fdec107 fix: Hungarian translations 2024-10-21 07:56:31 +05:30
Frappe PR Bot
fc37cfb6fd fix: Esperanto translations 2024-10-21 07:56:28 +05:30
Frappe PR Bot
820e7e958b fix: Swedish translations 2024-10-21 07:56:25 +05:30
Frappe PR Bot
37e5c1999f fix: Spanish translations 2024-10-21 07:56:21 +05:30
Frappe PR Bot
04bde39527 fix: Arabic translations 2024-10-21 07:56:17 +05:30
Frappe PR Bot
2f1014d2b7 fix: Bosnian translations 2024-10-21 07:56:14 +05:30
Frappe PR Bot
9c9f455324 fix: Turkish translations 2024-10-21 07:56:11 +05:30
Frappe PR Bot
5bf78bf8cf fix: French translations 2024-10-21 07:56:08 +05:30
Frappe PR Bot
0ad49936e6 fix: Persian translations 2024-10-21 07:56:04 +05:30
Frappe PR Bot
18cbb01700 fix: German translations 2024-10-21 07:56:01 +05:30
Khushi Rawat
de47f3aa00 fix: removed checkbox 2024-10-21 04:40:55 +05:30
Khushi Rawat
1e60e8db03 chore: Merge branch develop to head branch 2024-10-21 01:27:18 +05:30
Frappe PR Bot
89abe25c56 chore: update POT file (#43736) 2024-10-20 14:33:32 +02:00
Frappe PR Bot
3157427d76 fix: Swedish translations 2024-10-20 07:48:50 +05:30
Erwan Martin
548f23e440 feat: Add the chart of accounts for French NPOs
The French chart of accounts for NPOs is a variation of the general chart.
This adds the latest version of it: .2018-06.
Reference: https://www.associations.gouv.fr/le-nouveau-plan-comptable-depuis-le-1er-janvier-2020.html
2024-10-19 18:18:01 +02:00
Khushi Rawat
d24634fe2a Merge pull request #43723 from khushi8112/depreciation-on-sale-of-asset
fix: do not make new depreciation for fully depreciated asset
2024-10-19 21:47:28 +05:30
Frappe PR Bot
10bd442902 fix: Spanish translations 2024-10-19 07:49:46 +05:30
venkat102
d7fa95dd2f fix: get party advance amount based on account 2024-10-18 18:42:45 +05:30
ljain112
f4600df1f7 fix: "show_remarks" checkbox in Process statement of accounts 2024-10-18 18:02:25 +05:30
venkat102
a7ba7e9c28 fix: get period estimate till service end date 2024-10-18 18:00:40 +05:30
Khushi Rawat
25de412371 fix: do not make new depreciation for fully depreciated asset 2024-10-18 16:47:57 +05:30
ljain112
97c9adf06b fix: party_balance based on company in payment entry 2024-10-18 13:28:46 +05:30
ruthra kumar
ee8cae11ee Merge pull request #43295 from doancan/patch-1
fix: translate Update default_success_action.py
2024-10-18 11:47:03 +05:30
Doğancan
804558e5bf refactor: update default_success_action.py
The _(doctype) inside get_message is removed from the .format() method. The reason is that _(doctype) would attempt to translate the doctype itself, which is generally not required since the doctypes in doctype_list are system-level terms. The main string "{0} has been submitted successfully" should be translated, and then it should receive the doctype name as an argument.
2024-10-18 11:19:31 +05:30
ruthra kumar
61566f7171 Merge pull request #43180 from devdiogenes/pos-invoice-call-super-onload_post_render
fix: Call super onload_post_render inside pos_invoice.js
2024-10-18 10:41:07 +05:30
ruthra kumar
8db68d3495 Merge pull request #42898 from niyazrazak/patch-21
fix: incorrect amount in bank clearance
2024-10-18 10:32:38 +05:30
ruthra kumar
272e9f2dd3 Merge pull request #43714 from frappe/l10n_develop
fix: sync translations from crowdin
2024-10-18 10:19:34 +05:30
Frappe PR Bot
e828cd383e fix: Persian translations 2024-10-18 07:46:29 +05:30
rohitwaghchaure
4fd4a37dc9 fix: added validation for UOM must be whole number (#43710) 2024-10-17 15:07:34 +05:30
David Arnold
21f5482022 Merge pull request #43694 from blaggacao/chore/remove-no-op-ad-hoc-test-record-creation
chore(tests): remove noop ad-hoc record creation
2024-10-17 08:53:22 +02:00
ruthra kumar
a91ca4d822 Merge pull request #43704 from frappe/l10n_develop
fix: sync translations from crowdin
2024-10-17 10:14:22 +05:30
Frappe PR Bot
97a27aba9e fix: Chinese Simplified translations 2024-10-17 07:31:12 +05:30
David Arnold
2047246e20 Merge pull request #43702 from blaggacao/tests/fix-setup-class-methods
fix(testing): setup class must invoke super
2024-10-16 20:36:14 +02:00
Khushi Rawat
7ba0015de6 chore: use selectbox instead of checkbox 2024-10-16 23:44:02 +05:30
David
895143a847 fix(testing): setup class must invoke super 2024-10-16 18:56:18 +02:00
David Arnold
05569466be Merge pull request #43700 from blaggacao/tests/no-global-record-deletions
test: don't delete global test records (it's forbidden)
2024-10-16 17:46:05 +02:00
David
e46736ce35 test: don't delete global test records (it's forbidden) 2024-10-16 17:07:23 +02:00
David Arnold
dcf08604da Merge pull request #43697 from blaggacao/fix/fy-test-record-creation
test: don't create current fiscal year as it fails to create
2024-10-16 16:15:35 +02:00
David
d7ab7fd672 test: don't create current fiscal year as it fails to create 2024-10-16 15:50:55 +02:00
David Arnold
f6b55d14d5 Merge pull request #43696 from blaggacao/tests/remove-unneeded-flags
test: remove no-op flags in preparation of cleaning upstream
2024-10-16 15:26:57 +02:00
David
0b98fbe960 test: remove no-op flags in preparation of cleaning upstream 2024-10-16 15:01:03 +02:00
David
ac5e449592 chore(tests): remove noop ad-hoc record creation 2024-10-16 13:26:23 +02:00
rohitwaghchaure
a671fe13d4 fix: list view and form status not same for purchase order (#43690) 2024-10-16 13:42:39 +05:30
ruthra kumar
07f8899f80 Merge pull request #43488 from cogk/fix-hide-print-labels-for-terms-and-conditions
fix: Hide print labels for Terms and Conditions
2024-10-16 10:45:19 +05:30
ruthra kumar
cca02fffab Merge pull request #43688 from frappe/l10n_develop
fix: sync translations from crowdin
2024-10-16 10:33:41 +05:30
Frappe PR Bot
1cc010a161 fix: Turkish translations 2024-10-16 07:35:54 +05:30
ljain112
6703b7d1ae fix: do not check for payment terms details for return invoices. 2024-10-15 18:38:42 +05:30
ruthra kumar
e3ab46a1af Merge pull request #43663 from ljain112/fix-pcv-eneque
fix: run gl_entries and closing voucher processes in same function
2024-10-15 17:03:35 +05:30
ruthra kumar
f0adc16d86 Merge pull request #43661 from ljain112/fix-consolidated-report
fix: missing child company accounts in consolidated balance sheet
2024-10-15 16:59:08 +05:30
ruthra kumar
fc66408194 Merge pull request #43602 from ljain112/fix-closing-balances
fix: added parentheses for correct query formation for logical OR condition
2024-10-15 16:44:31 +05:30
Frappe PR Bot
4e8f3fefac fix: sync translations from crowdin (#43583) 2024-10-15 13:09:05 +02:00
ruthra kumar
14c649108c Merge pull request #43600 from ljain112/fix-bank-reco-stmt
fix: added string for translation in bank reconciliation statement
2024-10-15 16:31:00 +05:30
ruthra kumar
bfdb896a4e Merge pull request #43643 from Sanket322/ensure_db_before_fetch
fix: check for the existence of a doctype before querying.
2024-10-15 16:28:44 +05:30
rohitwaghchaure
05915415de fix: refetch items from BOM if 'Use Multi-Level BOM' has changed usin… (#43672)
fix: refetch items from BOM if 'Use Multi-Level BOM' has changed using api
2024-10-15 16:08:58 +05:30
rohitwaghchaure
a52756f1d4 fix: conversion factor issue (#43645) 2024-10-15 15:45:13 +05:30
rohitwaghchaure
29ff682eca fix: incorrect warehouse in the serial no selector for rejection (#43671) 2024-10-15 15:43:29 +05:30
ruthra kumar
0a7da4f1f6 Merge pull request #43557 from ljain112/fix-promo-scheme
fix: delete invalid pricing rule on change of applicable_for values
2024-10-15 15:24:40 +05:30
ruthra kumar
0a56bd79e5 Merge pull request #43662 from ljain112/fix-tax
fix: removed unused query
2024-10-15 13:22:33 +05:30
ljain112
af4daa5b0f fix: run gl_entries and closing voucher processes in same function 2024-10-15 12:42:48 +05:30
rohitwaghchaure
6087a57b0c fix: zero incoming rate for delivery note return (#43642) 2024-10-15 11:57:02 +05:30
rohitwaghchaure
7979d3a534 Merge pull request #43570 from aerele/update_actual_qty
fix: update item details with actual quantity
2024-10-15 11:55:59 +05:30
ljain112
5f590ddfa2 fix: removed unused query 2024-10-15 11:52:44 +05:30
ljain112
7fae9d57d2 fix: missing child company accounts in consolidated balance sheet 2024-10-15 11:41:00 +05:30
ruthra kumar
d42ea3d400 Merge pull request #43655 from frappe/mergify/copy/develop/pr-43521
fix: Link opportunity from RFQ to supplier quotation (copy #43521)
2024-10-15 10:33:53 +05:30
Syed Mujeer Hashmi
528748d37c fix: Link opportunity from RFQ to supplier quotation
(cherry picked from commit eb1f1255eb)
2024-10-15 04:39:54 +00:00
ruthra kumar
7dedcc428b Merge pull request #43426 from aerele/balancesheet-report-summary
fix: show total amount on report summary
2024-10-15 06:02:33 +05:30
ruthra kumar
22dd6f01e4 Merge pull request #43601 from aerele/unreconcile-payment-naming
refactor: remove 'format:' based naming
2024-10-14 21:14:22 +05:30
Venkatesh
8751d09d69 Merge branch 'frappe:develop' into balancesheet-report-summary 2024-10-14 21:11:41 +05:30
venkat102
e8e1ec0e85 refactor: remove 'format:' based naming 2024-10-14 20:49:59 +05:30
Smit Vora
5a8224886d Merge pull request #43614 from Ninad1306/pricing_rule_fix
fix: ignore free item when qty is zero
2024-10-14 16:19:45 +05:30
Nihantra C. Patel
d57624b182 fix: quotation to so frappe crm (#43644) 2024-10-14 14:04:47 +05:30
Sanket322
48ed12bdd7 fix: check for existence of doctype before querying 2024-10-14 12:25:32 +05:30
Smit Vora
1587d2063f Merge pull request #43638 from Abdeali099/payment-request-fixes
fix: Use `ref_doc.get()` for `party_account_currency`
2024-10-14 11:37:12 +05:30
Abdeali Chharchhoda
b79549422a fix: Use ref_doc.get() for party_account_currency 2024-10-13 19:58:20 +05:30
Frappe PR Bot
61dba713f5 chore: update POT file (#43636) 2024-10-13 13:57:01 +01:00
ruthra kumar
a9afd7efd2 Merge pull request #43627 from ruthra-kumar/fix_approach2_advance_order_to_invoice
fix: reconciled advance from reported in reconciliation tool
2024-10-13 08:36:48 +05:30
ruthra kumar
e7505e92c9 chore: better comments for context 2024-10-13 08:08:54 +05:30
ruthra kumar
f1ec61c19e test: reconciled Invoice should not showup in tool
Scenario should be tested on 'Advance in separate party account'
2024-10-13 08:04:34 +05:30
ruthra kumar
8a6978e550 test: unreconciliation of individual SO from Advance Payment 2024-10-13 08:04:34 +05:30
ruthra kumar
a21a406d04 refactor(test): utility methods for enabling advance in separate acc 2024-10-13 08:04:34 +05:30
ruthra kumar
e7bb960bb5 refactor: use hooks to identify advance doctypes 2024-10-13 08:04:34 +05:30
ruthra kumar
a112581acd refactor: reference update logic in advance 2024-10-13 08:04:34 +05:30
ruthra kumar
b409f74620 fix: don't update reference to SI / PI on advances 2024-10-13 08:04:34 +05:30
David Arnold
043bfdffbf ci: add action to matrix-run individual tests 2024-10-13 03:22:55 +02:00
David
969994c4a3 ci: run each test individually 2024-10-13 02:58:27 +02:00
David Arnold
6efcb91bce Merge pull request #43630 from blaggacao/chore/move-to-toml
chore(tests): move to compact, human readable, commentable toml layout for test records
2024-10-13 02:03:45 +02:00
David
b1bfc2f791 chore(tests): fix wrong unscrub 2024-10-13 01:40:08 +02:00
David
bb917207c2 chore(tests): move to compact, human readable, commentable toml layout for test records 2024-10-13 01:31:28 +02:00
David Arnold
cc954d9c67 Merge pull request #43612 from blaggacao/refactor/alignment-in-test-record-creation
test: step 2 refactor towards idempotency
2024-10-13 00:31:30 +02:00
David
8867702f2c chore: update imports 2024-10-13 00:06:58 +02:00
David
c17de26e44 test: make tests independent of selling price validation 2024-10-13 00:06:48 +02:00
David Arnold
727b395e62 Merge pull request #43620 from blaggacao/test/item-group-test-idempotency
test: prepare item group test idempotency
2024-10-12 12:18:51 +02:00
David
5cc86dae2b test: increase error context on test_item_group 2024-10-12 11:58:11 +02:00
David
eeee06fd7c test: fix test_sales_invoice setup 2024-10-12 11:28:19 +02:00
David
4f2db78247 test: fix test_purchase_invoice setup 2024-10-12 11:28:19 +02:00
David
fc6a7ca56a test: fix test_pos_invoice setup 2024-10-12 11:28:19 +02:00
David
cba398f186 test: fix test_asset_repair setup 2024-10-12 11:28:18 +02:00
David
56c99fe7e1 refactor: use cls.globalTestRecords instead of declaring test_records 2024-10-12 11:28:18 +02:00
David Arnold
d8b0b92925 test: don't load test records into db during module import
test: don't load test records into db during module import
2024-10-11 13:42:50 +02:00
David
d32326fca1 test: don't load test records into db during module import 2024-10-11 13:24:30 +02:00
rohitwaghchaure
8beee1982f fix: show incorrect entries filter in Stock Ledger Invariant Check report (#43619)
fix: show incorrect entry filter in Stock Ledger Invariant Check report
2024-10-11 14:17:34 +05:30
Ninad1306
a2b41a0c16 test: test case to validate free item is ignored when qty is zero 2024-10-11 14:02:50 +05:30
rohitwaghchaure
16e8156f01 fix: height and font size plant floor (#43618) 2024-10-11 13:41:16 +05:30
Ninad1306
7ae98f77ee fix: ignore free item when qty is zero 2024-10-11 11:33:27 +05:30
ljain112
c0da8f11f7 fix: added parentheses for correct query formation for logical OR condition 2024-10-11 11:07:19 +05:30
David Arnold
172b2835b8 Merge pull request #43610 from blaggacao/refactor/alignment-in-test-record-creation
test: step 1 refactor towards idempotency
2024-10-11 05:19:22 +02:00
David
a2d22c3f42 chore: remove redundant declarations of test_records 2024-10-11 05:00:20 +02:00
Khushi Rawat
ec51a981e5 Merge branch 'develop' into add-email-field-to-asset-maintenance-log 2024-10-11 01:23:06 +05:30
David Arnold
922b5d1be5 refactor: clarify test record module iface (treewide)
This aims at reducing the deprecation warning pressure on a standard Erpnext test run.
2024-10-10 19:21:19 +02:00
David
ed5bead87d refactor: clarify test record module iface (treewide) 2024-10-10 13:26:26 +02:00
David Arnold
2fc4f86191 Merge pull request #43603 from blaggacao/ci/fix-ill-specced-test
tests: fix item detail test module
2024-10-10 12:31:50 +02:00
David
9bb00d53bd test: fix item detail test module
```console
======================================================================
 ERROR  setUpClass (erpnext.stock.tests.test_get_item_details.TestGetItemDetail)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/runner/frappe-bench/apps/frappe/frappe/tests/classes/integration_test_case.py", line 53, in setUpClass
    raise NotImplementedError(
    __class__ = <class 'frappe.tests.classes.integration_test_case.IntegrationTestCase'>
    cls = <class 'erpnext.stock.tests.test_get_item_details.TestGetItemDetail'>
    ignore = ['BOM']
    to_add = ['Customer', 'Supplier', 'Item', 'Price List', 'Item Price']
NotImplementedError: IGNORE_TEST_RECORD_DEPENDENCIES is only implement for test modules within a doctype folder <module 'erpnext.stock.tests.test_get_item_details' from '/home/runner/frappe-bench/apps/erpnext/erpnext/stock/tests/test_get_item_details.py'> None
```
2024-10-10 12:13:47 +02:00
venkat102
d60600efb2 fix: check for empty row to get total amount 2024-10-10 12:07:20 +05:30
ljain112
c99d9f7037 fix: added string for translation in bank reconciliation statement 2024-10-10 11:27:26 +05:30
rohitwaghchaure
ab171326f3 fix: production plan bom error (#43591) 2024-10-09 15:15:42 +05:30
rohitwaghchaure
48a12e7213 fix: make LCV button not working for PI and PR (#43592) 2024-10-09 15:15:24 +05:30
rohitwaghchaure
fc67867a60 fix: allow to change the batch in the subcontracting receipt (#43584) 2024-10-09 13:04:13 +05:30
Nihantra C. Patel
7fc51cc832 Merge pull request #43585 from Vishv-024/trends_report
fix: the purchase receipt trends and delivery note trends report
2024-10-09 12:35:44 +05:30
Nihantra C. Patel
b3e4463a4f fix: trends date filter issue --formatter 2024-10-09 12:15:36 +05:30
Vishv-silveroak
2e9dda1588 fix: fix the purchase receipt trends and delivery note trends report 2024-10-09 10:51:01 +05:30
Frappe PR Bot
22a0da929f fix: sync translations from crowdin (#43389) 2024-10-08 17:58:18 +01:00
Bhavan23
5044297321 fix: update formatings 2024-10-08 18:14:00 +05:30
Bhavan23
5f4a523340 fix: update formatings 2024-10-08 17:49:12 +05:30
rohitwaghchaure
6ddda6c949 fix: 'NoneType' object has no attribute 'has_serial_no' (#43514) 2024-10-08 17:41:09 +05:30
rohitwaghchaure
5130f7d411 fix: Accepted and Rejected warehouse cannot be same (#43568) 2024-10-08 17:40:35 +05:30
Smit Vora
3e5ecb44db Merge pull request #43271 from ljain112/fix-tcs
fix: deduct advances adjusted for threshold check for tcs
2024-10-08 17:34:30 +05:30
ljain112
2613bdd868 test: added test for change in applicable_for_value in promotional scheme 2024-10-08 17:06:05 +05:30
rohitwaghchaure
69127e8609 fix: Unknown column 'serial_no' in 'field list' (#43515) 2024-10-08 16:50:26 +05:30
Bhavan23
17fdd42645 test: Validate the actual quantity when creating a material request from the sales order 2024-10-08 16:24:28 +05:30
Bhavan23
930208117c Merge branch 'develop' of github.com:aerele/erpnext into update_actual_qty 2024-10-08 16:23:25 +05:30
Bhavan23
9dbdfec9b7 fix: update item details with actual quantity. 2024-10-08 16:18:31 +05:30
rohitwaghchaure
7a0a893d08 fix: validation for corrective job card (#43555) 2024-10-08 13:48:36 +05:30
ljain112
42746fc630 fix: delete invalid pricing rule on change of applicable_for 2024-10-08 12:54:28 +05:30
ljain112
efe238cefd test: added test cases for the tcs deduction for advances adjusted. 2024-10-08 11:24:44 +05:30
Smit Vora
6909d271e5 Merge pull request #43397 from ljain112/fix-tds-advance
fix: do not include advances for tds vouchers
2024-10-08 10:38:03 +05:30
Deepesh Garg
7e012708a6 Merge pull request #43528 from frappe/extend_voucher_types
chore: Allow apps to extend voucher subtypes
2024-10-08 08:55:00 +05:30
David Arnold
726abae8b5 Merge pull request #43549 from blaggacao/test-refactoring/batch-1728346378
Refactor: Use IntegrationTestCase in multiple files
2024-10-08 02:33:10 +02:00
David
58c49dc9d2 refactor: Use IntegrationTestCase in multiple files
Signed-off-by: David <dgx.arnold@gmail.com>
2024-10-08 02:13:00 +02:00
David Arnold
ef464ecab8 Merge pull request #43548 from blaggacao/test-refactoring/batch-1728345166
Refactor: Use IntegrationTestCase in multiple files
2024-10-08 02:12:57 +02:00
David
9024621231 refactor: Use IntegrationTestCase in multiple files
Signed-off-by: David <dgx.arnold@gmail.com>
2024-10-08 01:52:47 +02:00
David Arnold
504bd428d5 Merge pull request #43547 from blaggacao/test-refactoring/batch-1728343954
Refactor: Use IntegrationTestCase in multiple files
2024-10-08 01:52:45 +02:00
David
d1fa1af271 refactor: Use IntegrationTestCase in multiple files
Signed-off-by: David <dgx.arnold@gmail.com>
2024-10-08 01:32:35 +02:00
David Arnold
2e975810a0 Merge pull request #43545 from blaggacao/try/fix
fix: underspecified test
2024-10-08 01:28:02 +02:00
David
76ec548bf0 fix: underspecified test 2024-10-08 01:09:41 +02:00
David Arnold
a321552879 Merge pull request #43543 from blaggacao/test-refactoring/batch-1728340917
Refactor: Use IntegrationTestCase in multiple files
2024-10-08 01:02:13 +02:00
David
e75eebc7a0 refactor: Use IntegrationTestCase in multiple files
Signed-off-by: David <dgx.arnold@gmail.com>
2024-10-08 00:42:00 +02:00
David Arnold
c6d6ef2aa9 Merge pull request #43539 from blaggacao/test-refactoring/test-bank-guarantee-py
Refactor: Use IntegrationTestCase in test_bank_guarantee.py
2024-10-08 00:12:30 +02:00
David
87cab90451 refactor: Use IntegrationTestCase in test_bank_guarantee.py
Signed-off-by: David <dgx.arnold@gmail.com>
2024-10-07 23:53:15 +02:00
David Arnold
8d3a8ed460 Merge pull request #43538 from blaggacao/test-refactoring/test-bank-clearance-py
Refactor: Use IntegrationTestCase in test_bank_clearance.py
2024-10-07 23:04:52 +02:00
David
a0a98b149f refactor: Use IntegrationTestCase in test_bank_clearance.py
Signed-off-by: David <dgx.arnold@gmail.com>
2024-10-07 22:44:41 +02:00
David Arnold
ab3da9bf84 Merge pull request #43537 from blaggacao/test-refactoring/test-bank-account-type-py
Refactor: Use IntegrationTestCase in test_bank_account_type.py
2024-10-07 22:44:40 +02:00
David
36ae2436a3 refactor: Use IntegrationTestCase in test_bank_account_type.py
Signed-off-by: David <dgx.arnold@gmail.com>
2024-10-07 22:24:29 +02:00
David Arnold
14f33304ca Merge pull request #43536 from blaggacao/test-refactoring/test-bank-account-subtype-py
Refactor: Use IntegrationTestCase in test_bank_account_subtype.py
2024-10-07 22:24:28 +02:00
David
9979efce56 refactor: Use IntegrationTestCase in test_bank_account_subtype.py
Signed-off-by: David <dgx.arnold@gmail.com>
2024-10-07 22:04:16 +02:00
David Arnold
c8385ebef4 Merge pull request #43535 from blaggacao/test-refactoring/test-bank-account-py
Refactor: Use IntegrationTestCase in test_bank_account.py
2024-10-07 22:04:15 +02:00
David
34fc2c1e81 refactor: Use IntegrationTestCase in test_bank_account.py
Signed-off-by: David <dgx.arnold@gmail.com>
2024-10-07 21:44:04 +02:00
David Arnold
b50506d0a1 Merge pull request #43534 from blaggacao/test-refactoring/test-bank-py
Refactor: Use IntegrationTestCase in test_bank.py
2024-10-07 21:44:03 +02:00
David
f0c433de9f refactor: Use IntegrationTestCase in test_bank.py
Signed-off-by: David <dgx.arnold@gmail.com>
2024-10-07 21:23:52 +02:00
David Arnold
d7d8802939 Merge pull request #43533 from blaggacao/test-refactoring/test-accounts-settings-py
Refactor: Use IntegrationTestCase in test_accounts_settings.py
2024-10-07 21:23:51 +02:00
David
fbce860f00 refactor: Use IntegrationTestCase in test_accounts_settings.py
Signed-off-by: David <dgx.arnold@gmail.com>
2024-10-07 20:18:35 +02:00
David Arnold
05bb9fe167 Merge pull request #43532 from blaggacao/test-refactoring/test-accounting-period-py
Refactor: Use IntegrationTestCase in test_accounting_period.py
2024-10-07 20:17:27 +02:00
Deepesh Garg
ca8820b566 chore: Allow apps to extend voucher subtypes 2024-10-07 23:32:50 +05:30
David
3461e50e89 refactor: Use IntegrationTestCase in test_accounting_period.py
Signed-off-by: David <dgx.arnold@gmail.com>
2024-10-07 19:57:11 +02:00
David Arnold
12b20ddf7f Merge pull request #43530 from blaggacao/test-refactoring/test-accounting-dimension-py
Refactor: Use IntegrationTestCase for test_accounting_dimension.py
2024-10-07 19:33:41 +02:00
David
8c80dcef7e refactor: Use IntegrationTestCase in test_accounting_dimension.py 2024-10-07 19:13:09 +02:00
Deepesh Garg
8a1e38a43b chore: Allow apps to extend voucher subtypes 2024-10-07 22:14:10 +05:30
Deepesh Garg
a1525d9b8e chore: Allow apps to extend voucher subtypes 2024-10-07 21:43:49 +05:30
Smit Vora
3eabc2bcde Merge pull request #43391 from ljain112/fix-pcv
fix: create Account Closing Balance even though there are no transaction in period
2024-10-07 21:40:34 +05:30
Smit Vora
e5d47c2337 Merge pull request #43384 from ljain112/fix-parenttype-pur-reg
fix: add parenttype condition for item table in Purchase Register Report
2024-10-07 21:21:01 +05:30
Smit Vora
da0720ce14 Merge pull request #43385 from ljain112/fix-pos-item
fix: include parent item group in query
2024-10-07 21:16:25 +05:30
David Arnold
622c8590f4 Merge pull request #43522 from blaggacao/test-refactoring/test-account-py
Refactor: Use IntegrationTestCase for test_account.py
2024-10-07 17:06:53 +02:00
Smit Vora
e8a0896848 Merge pull request #43520 from Abdeali099/payment-request-fixes
fix: Payment Request's minor fixes
2024-10-07 20:32:10 +05:30
David
a46e6b69dc refactor: Use IntegrationTestCase in test_account.py 2024-10-07 16:44:04 +02:00
Abdeali Chharchhoda
3d303e7fad test: fixes after developed merge 2024-10-07 19:33:31 +05:30
Abdeali Chharchhoda
a31c4e97c6 Merge branch 'develop' into payment-request-fixes 2024-10-07 19:12:29 +05:30
David Arnold
cd112795d3 Merge pull request #43507 from blaggacao/tests/unit-test-case
treewide: unit test cases boilerplate
2024-10-07 15:03:53 +02:00
David
d937a6cfcd test: fix purchase invoice creation in test 2024-10-07 14:45:41 +02:00
David
2adb417408 refactor: add bare unit test cases
mainly for LLMs to catch up with the convention
2024-10-07 13:13:00 +02:00
David
bda415a83d refactor: import from new location 2024-10-07 13:12:57 +02:00
Abdeali Chharchhoda
4444d90470 test: Change Accounts Settings for multi currency (https://github.com/frappe/erpnext/pull/42427#discussion_r1789859737) 2024-10-07 16:24:36 +05:30
Abdeali Chharchhoda
48d153825f fix: Remove the get_paid_amount_against_order function as it is no longer used 2024-10-07 16:17:06 +05:30
Abdeali Chharchhoda
ebe09e05ec chore: Added last empty line in PR's json 2024-10-07 16:08:03 +05:30
rohitwaghchaure
13eb3c5c14 fix: read only filters in multidialog fields (#43503) 2024-10-07 13:43:37 +05:30
Frappe PR Bot
8c43b44cf6 chore: update POT file (#43506) 2024-10-06 11:20:13 +01:00
Corentin Forler
ade121dac6 fix(stock): Grab posting date/time from SABB (#43493) 2024-10-06 09:48:22 +05:30
Ninad Parikh
26fc8ce209 fix: Update Values before after_mapping hook is called (#42682)
* fix: update values before after_mapping hook is called

* fix: appropriate function name
2024-10-06 08:52:58 +05:30
Raffael Meyer
9872645d3e fix(Quotation): calculate row values for alternative items (#43054) 2024-10-03 20:33:58 +00:00
Raffael Meyer
4912288433 fix: translate display text passed to validate_expense_account (#43057) 2024-10-03 20:18:51 +00:00
Raffael Meyer
b24722e60f fix(Dunning): logic for fetching text (#43160) 2024-10-02 15:02:08 +01:00
Raffael Meyer
89e855f210 fix: generalize link formatter (#43199) 2024-10-02 15:01:12 +01:00
Corentin Forler
e3b93b7d4b fix: Hide print labels for Terms and Conditions 2024-10-02 15:02:30 +02:00
David Arnold
82f4fcf138 Merge pull request #43474 from blaggacao/ci/add-trick
ci: use dynamic total job
2024-10-02 13:44:45 +02:00
David
33229381c7 ci: use dynamic total job 2024-10-02 13:25:39 +02:00
Sagar Vora
7d4b73eacc Merge pull request #43475 from sagarvora/set-margin-values
fix: set margin fields for purchase documents when updating items
2024-10-02 15:20:58 +05:30
Sagar Vora
7bc51d7d30 Merge pull request #43481 from sagarvora/ces-patch 2024-10-02 15:12:03 +05:30
Sagar Vora
c5889c5d2e fix: patch to update Currency Exchange Settings for frankfurter.app 2024-10-02 15:10:19 +05:30
Sagar Vora
70a7d1b75d Merge pull request #43476 from cogk/fix-api-endpoint-for-frankfurter 2024-10-02 14:40:55 +05:30
Sagar Vora
c444de017a test: update test for API change 2024-10-02 14:28:54 +05:30
Corentin Forler
33e72111c7 fix: Fix API endpoint for Frankfurter 2024-10-02 10:07:05 +02:00
Sagar Vora
7be4d56be2 fix: set margin fields for purchase documents when updating items 2024-10-02 13:14:30 +05:30
rohitwaghchaure
6433019624 fix: status plant floor (#43466) 2024-10-01 14:37:57 +05:30
rohitwaghchaure
895b072bad fix: Stock UOM not fetched when Stock Entry create from Item Dashboard (#43457) 2024-10-01 14:27:55 +05:30
rahulgupta8848
2384309b43 feat: multiple purchase invoice in asset repair doctype (#43460)
Co-authored-by: “rahulgupta8848” <“rahul.gupta@8848digital.com”>
2024-10-01 13:00:51 +05:30
V Shankar
c5d5421c0f feat: search attribute value in multiple variant creation dialog (#43408)
* feat: search attr value in multiple variant creation dialog

* fix: pre commit
2024-10-01 12:55:32 +05:30
Vishakh Desai
30954586d8 fix: get stock accounts from the doc instead of db in validate_stock_accounts 2024-10-01 12:53:42 +05:30
rohitwaghchaure
1c7154c7ca fix: removed validation for materials return (#43461) 2024-10-01 12:53:34 +05:30
Vishv-silveroak
661efadf41 Serial no report (#43444)
* chore: remove the field that which is not exiting in serial no

* chore: remove the field that which is not exiting in serial no

* chore: remove the field that which is not exiting in serial no
2024-10-01 12:27:05 +05:30
Nihantra C. Patel
c492a5ba9d Merge pull request #43455 from Nihantra-Patel/fix_wwibav
fix: add company filter in Warehouse wise Item Balance Age and Value
2024-10-01 11:16:13 +05:30
Nihantra Patel
75950f86cf fix: add company filter in Warehouse wise Item Balance Age and Value 2024-10-01 10:50:43 +05:30
rohitwaghchaure
912ba7789c fix: negative stock error for batch (#43450) 2024-10-01 08:19:05 +05:30
David Arnold
d25feedb7e Merge pull request #43428 from blaggacao/fix/no-undue-tax-rounding
fix!: don't round unduly
2024-09-30 17:22:02 +02:00
ljain112
d76cc21086 fix: patch 2024-09-30 20:10:36 +05:30
rohitwaghchaure
94092bb749 Merge pull request #43448 from rohitwaghchaure/fixed-support-22814
fix: last purchase rate for purchase invoice
2024-09-30 20:05:00 +05:30
Rohit Waghchaure
fb9d106633 fix: last purchase rate for purchase invoice 2024-09-30 18:28:12 +05:30
David Arnold
37f03444c1 Merge pull request #43446 from blaggacao/fix/return-default-wh
fix(return): set default return warehouse
2024-09-30 14:27:00 +02:00
David
fa65291e98 fix(return): set default return warehouse
This captures the case of manual modifications to the return and ensures
that by default, the correct return warehouse will be set
2024-09-30 14:07:25 +02:00
David Arnold
6f61d88472 Merge pull request #43282 from blaggacao/feat/email-to-empty-pi
feat: allow to create empty pi via email append to
2024-09-30 14:05:56 +02:00
rohitwaghchaure
06b99e2020 Merge pull request #43437 from rohitwaghchaure/fixed-support-22559
fix: adjustment entry for stock reco
2024-09-30 14:26:25 +05:30
rohitwaghchaure
d4e8ce232f Merge pull request #43436 from rohitwaghchaure/fixed-support-22504
fix: 'NoneType' object has no attribute 'has_serial_no'
2024-09-30 13:39:59 +05:30
Rohit Waghchaure
4e463b7d6d fix: adjustmen entry for stock reco 2024-09-30 13:38:54 +05:30
Rohit Waghchaure
28f9fd2507 fix: 'NoneType' object has no attribute 'has_serial_no' 2024-09-30 12:05:17 +05:30
rohitwaghchaure
1abcb29cef Merge pull request #43382 from rohitwaghchaure/plant-floor-design-changes
fix: plant floor design changes
2024-09-29 22:36:32 +05:30
rohitwaghchaure
b3033da254 Merge pull request #43420 from rohitwaghchaure/fixed-ledger-report
fix: Stock Ledger Invariant Check report
2024-09-29 22:35:50 +05:30
Richard Case
ca3c680909 fix: tests for work order consumption (#41814)
* fix: tests for work order automatic SABB creation

* fix: qty

* chore: show created sabb

* chore: fix syntax

* fix: check SABB qty

* fix: add batched consumable to manufacture

* fix: missing fg qty field

* fix: improve test debug

* chore: linting

* chore: removed extra hash icons

---------

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
2024-09-29 21:24:28 +05:30
Rohit Waghchaure
3c1cdeb3ec fix: plant floor design changes 2024-09-29 21:17:47 +05:30
David
eeb8aba950 fix!: don't round unduly
BREAKING: If you previously relied on the undue rounding of the tax
amount within the item wise tax detail, revise your code and config.
2024-09-29 16:56:15 +02:00
venkat102
c87cd5da04 fix: show total amount on report summary 2024-09-29 17:42:23 +05:30
rohitwaghchaure
8e33e0e1d2 fix: Data missing in table: None, MandatoryError (#43422) 2024-09-29 11:10:24 +05:30
rohitwaghchaure
ca16089d9d fix: use serial and batch fields (#43421) 2024-09-29 10:12:19 +05:30
Rohit Waghchaure
d7daedc5b2 fix: Stock Ledger Invariant Check report 2024-09-29 09:18:52 +05:30
rohitwaghchaure
a594c05296 fix: quality inspection creation (#43416) 2024-09-28 23:53:44 +05:30
Vishakh Desai
9cc22b4cac fix: linters 2024-09-28 12:53:43 +05:30
Vishakh Desai
6de6f55b39 fix: Get Entries not showing accounts with no gain or loss in Exchange Rate Revaluation issue 2024-09-28 12:48:14 +05:30
Khushi Rawat
cb32e2b526 Merge pull request #43399 from khushi8112/added-capitalized-asset-column
feat: added 'cost of new capitalized asset' column
2024-09-27 23:52:22 +05:30
Deepesh Garg
3faabd29c2 Merge pull request #43410 from frappe/ignore_transaciton_deletion_check
fix: Ignore transaction deletion check on ledger entry insertion
2024-09-27 23:51:38 +05:30
Deepesh Garg
998f6a92a4 fix: Ignore transaction deletion check on ledger entry insertion 2024-09-27 23:29:39 +05:30
ljain112
7ef918421e fix: do not include advances for tds vouchers 2024-09-26 19:52:57 +05:30
Khushi Rawat
1eb9cc33fc feat: added 'cost of new capitalized asset' column 2024-09-26 16:49:01 +05:30
ljain112
43deaea96b fix: create Account Closing Balance even though there are no transaction in period 2024-09-26 13:41:16 +05:30
CaseSolved
be6970c850 chore: linting 2024-09-25 19:29:06 +01:00
CaseSolved
2017fd80d1 fix: SO link on PO and add in missing dashboard references on both 2024-09-25 19:18:48 +01:00
rohitwaghchaure
e4e96d2a44 fix: serial and batch no selector (#43387) 2024-09-25 22:15:10 +05:30
ljain112
28abf191fc fix: add parenttype condition for item table in Purchase Register Report 2024-09-25 18:26:10 +05:30
ljain112
ad0090068d fix: include parent item group in query 2024-09-25 18:24:42 +05:30
Frappe PR Bot
9998aa2deb fix: sync translations from crowdin (#43350) 2024-09-25 01:31:42 +02:00
rohitwaghchaure
a63dca0984 fix: Cannot read properties of undefined (reading 'price_list_rate') (#43376) 2024-09-25 00:02:33 +05:30
rohitwaghchaure
8c32ebee68 fix: not able to cancel Quality Inspection (#43374) 2024-09-24 22:05:23 +05:30
Frappe PR Bot
05102a887f chore: update POT file (#43373) 2024-09-24 15:38:04 +00:00
Khushi Rawat
0dd9fd3ded Merge pull request #43348 from khushi8112/missing-condition-in-asset-depreciation-report
fix: asset depreciation and balances report correction
2024-09-24 17:59:17 +05:30
Khushi Rawat
5911934dc7 feat: added assignee email field in asset maintenance log 2024-09-24 17:43:04 +05:30
Khushi Rawat
07d40d29a7 style: added comment 2024-09-24 17:40:33 +05:30
Khushi Rawat
bdfbec4de8 chore: Merge branch 'develop' 2024-09-24 17:28:21 +05:30
Raffael Meyer
5172629e06 fix(Bank Account): dashboard connections (#43365)
* refactor(Bank Account): move dashboard links to DocType definition

* fix(Bank Account): rearrange dashboard links

* fix(Bank Account): add Bank Transaction to connections
2024-09-24 17:03:22 +05:30
jabir-elat
9974b7c4ae fix: closing amount reset to expected amount on save (#43358) 2024-09-24 16:04:30 +05:30
ruthra kumar
59071f1cd4 Merge pull request #43356 from ruthra-kumar/ignore_0_outstanding_on_ar_report
fix: AR / AP report to ignore 0.0 outstanding
2024-09-24 15:43:29 +05:30
ruthra kumar
6954bfcb10 Merge pull request #43235 from vishakhdesai/general-ledger-duplicate-rows-issue
fix: set group_by condition to "Group by Voucher (Consolidated)" if `None` and voucher_no is set
2024-09-24 14:53:12 +05:30
ruthra kumar
6e2cf79e2c fix: AR / AP report to ignore 0.0 outstanding 2024-09-24 12:14:36 +05:30
ruthra kumar
c671a6c42f Merge pull request #43310 from aerele/pos-bank-clearance
fix: update clearance date in invoice payment table
2024-09-24 10:58:43 +05:30
Khushi Rawat
9f4ed22368 Merge branch 'develop' of https://github.com/frappe/erpnext into missing-condition-in-asset-depreciation-report 2024-09-24 01:42:13 +05:30
Khushi Rawat
c06039028c fix(minor): include condition to check docstatus 2024-09-24 01:41:54 +05:30
rohitwaghchaure
9e8be8db51 fix: stock dashboard (#43347) 2024-09-24 00:05:18 +05:30
Khushi Rawat
4242ac527d fix: added date condition 2024-09-23 23:47:48 +05:30
ruthra kumar
2f6003c360 Merge pull request #43283 from barredterra/shipping-rule-query
fix: shipping rule must match the company
2024-09-23 20:10:26 +05:30
ruthra kumar
c202be6d2e Merge pull request #43257 from ljain112/fix-pos-invoice
fix: item_query in pos_invoice
2024-09-23 19:58:47 +05:30
ruthra kumar
3e13a43278 Merge pull request #43253 from Nihantra-Patel/pos_return_v15
fix: partial return on POS invoice
2024-09-23 19:54:51 +05:30
ruthra kumar
8e7659ea0e Merge pull request #43307 from aerele/gl-ple-column
fix: change dynamic link doctype fieldtype to data
2024-09-23 17:51:29 +05:30
ruthra kumar
8fccc70136 Merge pull request #43308 from aerele/report-chart-currency
fix: show chart tool tip in report currency
2024-09-23 17:39:46 +05:30
ruthra kumar
fc9b1ef7a3 Merge pull request #43316 from ruthra-kumar/fix_incorrect_outstanding_on_non_pos_with_write_off_account
fix: incorrect outstanding on non-pos invoice with write_off_account
2024-09-23 17:35:53 +05:30
ruthra kumar
3fb4d8fbf1 Merge pull request #43331 from ruthra-kumar/incorrect_transaction_currency_val_in_gl_entry
fix: transaction exchange rate on GL's for Multi currency Journals
2024-09-23 17:32:00 +05:30
ruthra kumar
4be6878e58 Merge pull request #43321 from ljain112/fix-payment-advance
fix: handle missing liability account scenario in `set_liability_account`
2024-09-23 17:29:45 +05:30
ruthra kumar
0db382123c Merge pull request #43328 from aerele/tax-rule-filter
fix: allow tax rule filter on tax category name with %
2024-09-23 17:16:07 +05:30
ruthra kumar
c524825d2d test: transaction exchange rate on multi-currency journals 2024-09-23 17:12:31 +05:30
ruthra kumar
8cd9ad5361 fix: transaction exchange rate on GL's for Multi currency Journals 2024-09-23 17:02:00 +05:30
Frappe PR Bot
8e3b84ff5c fix: sync translations from crowdin (#43313) 2024-09-23 10:02:27 +02:00
venkat102
3aaa13cb29 fix: make to tax category on tax rule to filter with percent 2024-09-23 12:45:14 +05:30
Frappe PR Bot
621f0f343a chore: update POT file (#43324) 2024-09-22 12:51:08 +02:00
HENRY Florian
6e34d52506 fix: bump pycountry version in ERPNext to be compatible with the frappe one (#43317)
* fix: pycountry dependency is now in frappe develop branch with 24.6.1 version

* fix: bump pycountry version in ERPNext to be compatible with the frappe one
2024-09-21 12:19:42 +02:00
ljain112
ee7ab4b065 fix: handle missing liability account scenario in set_liability_account 2024-09-21 15:02:40 +05:30
ruthra kumar
d5e2906e59 fix: incorrect outstanding on non-pos invoice with write_off_account 2024-09-21 12:37:16 +05:30
Abdeali Chharchhodawala
93f867570f fix: multiple issues in Payment Request (#42427)
* fix: multiple issues in Payment Request

* chore: minor changes

* fix: remove  bug

* fix: replace `round` with `flt`

* fix: update `set_advance_payment_status()` logic

* fix: removed bug of `set_advance_payment_status`

* fix: changes as per review

* refactor: replace sql query of `matched_payment_requests` to query builder

* fix: replace `locals` with `get_doc` in set_query

* fix: changes during review

* fix: minor review changes

* fix: remove unnecessary code for setting payment entry received amount

* fix: logic for ser payment_request if PE made from transaction

* fix: Use rounded total to make Payment Request from `Sales Invoice` or `Purchase Invoice`

* refactor: enhance logic of `set_open_payment_requests_to_references`

* fix: added one optional arg `created_from_payment_request`

* fix: handle multiple allocation of PR at PE's reference

* fix: logic for PR if outstanding docs fetch

* fix: formatted Link field for `Payment Request` for PE's references

* fix: replace `get_all()` with `get_list()` for getting Payment Request for Link field

* fix: replace `get_all()` with `get_list()` for getting Payment Request for Link field

* chore: format `payment_entry.js` file

* style: Show preview popup of `Payment Request`

* fix: remove minor bug

* fix: add virtual field for Payment Term and Request `outstanding_amount` in PE's reference

* fix: get outstanding amount in PE's reference on realtime

* fix: move allocation of allocated_amount to server side (no change)

* fix: some minor changes to allocation

* fix: Split `Payment Request` if PE is created from PR and there are `Payment Terms`

* fix: minor logic changes

* fix: Allocation of allocated_amount if `paid_amount` is changes

* fix: improve logic of allocation

* fix: set matched payment request if unset

* fix: minor changes

* fix: Allocate single Payment Request if PE created from PR

* fix: improve code logic

* fix: Removed duplication code

* fix: proper message title

* refactor: Rename method of Allocation Amount to References

* refactor: Changing `grand_total` description based on `party_type`

* refactor: update Payment Request

* fix: Remove virtual property of payment_term_oustanding from references

* fix: fetch party account currency for creating payment request

* fix: use transaction currency as base in payment request

* fix: party amount for creating payment entry

* fix: allow for proportional amount paid by bank

* fix: Changed field order in Payment Request

* fix: Minor refactor in Payment Entry Reference table data

* test: Added test cases for allow Payment at `Partially Paid` status for PR

* test: Update partial paid status test case

* test: Update test case for same currency PR

* refactor: Wider the `msgprint` dialog for after save PE

* test: Update PR test cases

* chore: Remove dirty lines

* test: Checking `Advance Payment Status`

* fix: formatting update

* fix: Use `flt` where doing subtraction

* test: PR test case with Payment Term for same currency

* fix: remove redundant `flt`

* test: Add test cases for PR

---------

Co-authored-by: Sagar Vora <sagar@resilient.tech>
2024-09-21 07:04:46 +05:30
HENRY Florian
40d97f4fe9 refactor: use common functionality to validate account number (#42842)
feat: Allow unique Account number by root type (not unique for accros all Accounts)
2024-09-21 06:46:57 +05:30
Kavin
c218f7527f refactor: update clearance date in payment entry 2024-09-20 18:24:00 +05:30
rohitwaghchaure
b127a0c8b7 fix: ui clean-up (#43305)
fix: ui cleanup
2024-09-20 15:42:17 +05:30
Frappe PR Bot
b05bee4d53 fix: sync translations from crowdin (#43263) 2024-09-20 11:14:14 +02:00
Kavin
ce8600520f test: add test case for updating clearance date on pos invoice 2024-09-20 14:33:03 +05:30
Kavin
487c2a29a6 fix: update clearance date in invoice payment table 2024-09-20 14:29:10 +05:30
venkat102
91a27bda84 fix: add currency in financial statement 2024-09-20 12:22:03 +05:30
venkat102
827b3f4542 fix: show chart tool tip in report currency 2024-09-20 11:43:00 +05:30
venkat102
1e46f7344a fix: change dynamic link doctype fieldtype to data 2024-09-20 10:53:45 +05:30
David Arnold
3e54ad55ac Merge pull request #43301 from blaggacao/fix/undue-db-write-on-payment-entry
chore: cant write in (potential) read-only mode
2024-09-19 16:49:31 +02:00
David
87d7c4f70e chore: cant write in (potential) read-only mode 2024-09-19 16:30:26 +02:00
ruthra kumar
444f085fc5 Merge pull request #43291 from frappe/mergify/copy/develop/pr-43213
fix: Payment Ledger Report currency fieldtype fix (copy #43213)
2024-09-19 09:17:48 +05:30
ruthra kumar
729c3c6344 Merge pull request #43274 from doancan/translate-fix
fix: translate in js
2024-09-19 08:55:34 +05:30
sameer Chauhan
67c6010273 fix: Payment Ledger Report currency fieldtype fix
(cherry picked from commit ad2d6a1625)
2024-09-19 03:21:29 +00:00
rohitwaghchaure
3e7a7a54bf fix: incorrect stock balance for inventory dimension (#43284) 2024-09-19 08:47:27 +05:30
barredterra
df8f4086f6 fix: shipping rule must match the company 2024-09-18 19:39:51 +02:00
David
0cab2ae644 feat: allow to create empty pi via email append to 2024-09-18 19:35:28 +02:00
Shariq Ansari
256d0208d7 Merge pull request #43279 from shariquerik/crm-erpnext-2
fix: create_address is failing while creating customer
2024-09-18 22:15:08 +05:30
Shariq Ansari
acc1d52ac8 fix: create_address is failing 2024-09-18 21:56:53 +05:30
Nihantra C. Patel
16177f277c Merge pull request #43276 from Nihantra-Patel/fix_tran_so_to_po
fix: Translation for button SO to PO
2024-09-18 21:43:05 +05:30
Nihantra C. Patel
a5275e9f28 fix: Translation for button SO to PO 2024-09-18 21:36:02 +05:30
ljain112
00eee16190 fix: improved the conditions for determining voucher subtypes 2024-09-18 19:38:14 +05:30
Doğancan
25faec5662 fix: translate in js 2024-09-18 17:06:07 +03:00
ljain112
767c8f92be fix: deduct advances adjusted for threshold check for tcs 2024-09-18 13:08:38 +05:30
ruthra kumar
6d59039955 Merge pull request #43239 from aerele/pricing-rule-list-currency
fix: add currency in options for rate field in pricing rule
2024-09-18 11:58:18 +05:30
ruthra kumar
f388f8682f Merge pull request #43216 from aerele/cc-allocation
fix: get cost center allocation percentage only from the applicable allocation
2024-09-18 11:18:22 +05:30
Khushi Rawat
a5e9af3f4d Merge pull request #43210 from khushi8112/finance-book-filter
fix: updated filtering in depreciation and balances report
2024-09-18 01:55:50 +05:30
ruthra kumar
063348434c Merge pull request #43226 from aerele/reconcile-after-period-closing
fix: map rows on journal entry by validating account, party, debit and credit value
2024-09-17 20:03:51 +05:30
ljain112
7f82a06e65 fix: item_query in pos_invoice 2024-09-17 19:10:31 +05:30
Navin-S-R
720a330617 fix: create fiscal year without overlapping existing Fiscal Years 2024-09-17 18:55:28 +05:30
Navin-S-R
768bb0312a refactor: update formatting changes 2024-09-17 17:21:26 +05:30
ruthra kumar
f45638015f refactor(test): make use existing test data and dynamic fy creation 2024-09-17 16:49:23 +05:30
Nihantra C. Patel
18bdd06652 fix: partial return on POS invoice 2024-09-17 15:35:07 +05:30
Nihantra C. Patel
76289fa8dc fix: partial return on POS invoice 2024-09-17 14:51:26 +05:30
ruthra kumar
75babd4c18 fix: ignore repost logic on Payment Reconciliation 2024-09-17 14:40:04 +05:30
ruthra kumar
e29e1e45c4 Merge pull request #43188 from rtdany10/gp_so_issue
fix: invalid gp calculation
2024-09-17 12:02:13 +05:30
Sumit Bhanushali
891d383d09 Merge pull request #43247 from frappe/revert-43236-fix-app-route
Revert "fix: dont hardcode workspace in app route"
2024-09-17 11:11:54 +05:30
Sumit Bhanushali
ea8912b916 Revert "fix: dont hardcode workspace in app route" 2024-09-17 10:37:06 +05:30
ruthra kumar
fdd62f7400 Merge pull request #42969 from lbrandh/project_completion
fix: A project without tasks should be able to complete
2024-09-17 10:18:26 +05:30
ruthra kumar
d228ac325e Merge pull request #43225 from aerele/jv-fx-amount
fix(ux): set amount based on account currency while adding new row
2024-09-17 10:17:48 +05:30
Sumit Bhanushali
5ef81f2ef1 Merge pull request #43236 from frappe/fix-app-route
fix: dont hardcode workspace in app route
2024-09-17 10:01:42 +05:30
Frappe PR Bot
b36569938d fix: sync translations from crowdin (#43219) 2024-09-16 20:27:22 +00:00
Khushi Rawat
cd484c5f50 Merge pull request #43233 from khushi8112/gl-entry-for-capitalized-asset
fix: do not validate purchase document for composite asset
2024-09-17 00:17:15 +05:30
Shariq Ansari
614f6489e7 Merge pull request #43238 from shariquerik/crm-erpnext-1
fix: create and link address while creating prospect & customer
2024-09-16 22:14:17 +05:30
Smit Vora
d9d8404217 Merge pull request #43176 from ljain112/fix-pos-discount
fix: hide and reset discount control on new POS order
2024-09-16 19:53:04 +05:30
Shariq Ansari
035c15794c fix: create and link address while creating prospect & customer 2024-09-16 18:53:42 +05:30
krishna
636c0131fa fix: add currency in options for rate field in pricing rule 2024-09-16 18:44:58 +05:30
Smit Vora
705d3dec53 Merge pull request #42849 from ljain112/fix-tds-po
fix: TDS workflow consistency in Purchase Order
2024-09-16 18:44:48 +05:30
Sumit Bhanushali
26774ebd78 fix: dont hardcode workspace in app route 2024-09-16 18:21:48 +05:30
Vishakh Desai
a6b0cb6cac fix: set group_by condition if empty and voucher_no is set 2024-09-16 15:40:49 +05:30
Khushi Rawat
5fd058dde9 fix: do not validate purchase document for composite asset 2024-09-16 12:35:35 +05:30
ruthra kumar
902ce9c46d Merge pull request #43224 from aerele/journal-last-row-fx-amount
fix(ux): set amount on foreign currency when foreign currency account…
2024-09-16 11:44:54 +05:30
ruthra kumar
4eeae8011e refactor(test): fix linter 2024-09-16 11:14:54 +05:30
ruthra kumar
309f74cafb Merge pull request #42809 from Vishnu7025/fix_so
fix: warehouse not mapping correctly during Delivery Note creation.
2024-09-16 11:01:12 +05:30
ruthra kumar
e5b699821f refactor(test): set valuation rate for stocked item 2024-09-16 10:18:51 +05:30
ruthra kumar
44767e9baa Merge pull request #43212 from ljain112/fix-patch
fix: prevent KeyError by checking `report_filter` existence
2024-09-16 09:17:14 +05:30
Frappe PR Bot
42f01d4302 chore: update POT file (#43227) 2024-09-15 12:45:46 +02:00
Navin-S-R
0ff04f774d fix(ux): set amount based on account currency while adding new row 2024-09-14 17:39:50 +05:30
Navin-S-R
f47ea46806 test: reconcile payment jv from closed fiscal year 2024-09-14 17:31:53 +05:30
venkat102
2b66842d34 fix(ux): set amount on foreign currency when foreign currency account is selected on last row of journal 2024-09-14 16:00:53 +05:30
Navin-S-R
b634aa9cfb fix: map rows on journal entry by validating account, party, debit and credit value 2024-09-14 15:58:02 +05:30
Shariq Ansari
4b125eab55 Merge pull request #43198 from nabinhait/crm-integration
feat: API for crm integration
2024-09-14 14:28:56 +05:30
Ananyobrata Pal
a435441536 fix(holiday-list): use same date format for same holiday error message (#42606)
* fix(holiday-list): use same date format for same holiday error message

* chore: fix formatting

---------

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2024-09-14 07:25:14 +00:00
David Arnold
4acd12d610 Merge pull request #43181 from frappe/chore/no-stale-on-draft
chore: exempt draft prs from stale bot
2024-09-13 17:48:21 +02:00
David
08771a6d70 chore: exempt draft prs from stale bot 2024-09-13 17:30:30 +02:00
venkat102
3c65b98b49 fix: cancel cost center allocation and journal entry after test 2024-09-13 18:46:10 +05:30
ljain112
c1d2cc2c14 fix: prevent KeyError by checking report_filter existence 2024-09-13 17:30:52 +05:30
venkat102
4d5d6150e1 test: add unit test for validating multiple cost center allocation with different child cost center 2024-09-13 16:54:29 +05:30
venkat102
36e5945c66 fix: fetch cost center allocation percentage only from the applicable allocation 2024-09-13 16:48:32 +05:30
Khushi Rawat
af52f0e71f chore: resolved failing check 2024-09-13 14:49:01 +05:30
Khushi Rawat
8c8e25214c chore: resolved linter check with #nosemgrep 2024-09-13 14:45:29 +05:30
Khushi Rawat
a7a0499f83 Merge branch 'develop' of https://github.com/frappe/erpnext into finance-book-filter 2024-09-13 13:26:45 +05:30
Khushi Rawat
3a34eecdcf fix: updated filtering in depreciation and balances report 2024-09-13 13:26:21 +05:30
rohitwaghchaure
ce34bb9793 fix: item list view in website (#43165) 2024-09-13 12:03:57 +05:30
rohitwaghchaure
d9e4ed13cb fix: batch based item price not working (#43172) 2024-09-13 12:03:36 +05:30
rohitwaghchaure
2b96e37c34 fix: currency changing while making PO from Supplier Quotation (#43187) 2024-09-13 12:03:12 +05:30
ruthra kumar
38db54fdb1 Merge pull request #43192 from ruthra-kumar/use_fixture_on_pricing_rule_tests
refactor(test): use test fixture on pricing rule test suite
2024-09-13 10:48:09 +05:30
ruthra kumar
fb07d4ba9b Merge pull request #43191 from aerele/delete-gain-loss-exchange-jv
fix: delete exchange gain loss journal entry while deleting payment entry
2024-09-13 10:47:45 +05:30
Frappe PR Bot
e3246db973 fix: sync translations from crowdin (#43141)
* fix: Persian translations

* fix: Persian translations

* fix: Turkish translations

* fix: Swedish translations

* fix: Turkish translations

* fix: Turkish translations
2024-09-12 21:36:31 +02:00
Nabin Hait
b7bf9f80f2 feat: API for crm integration 2024-09-12 19:38:30 +05:30
ruthra kumar
0ea1d6d960 refactor(test): use test fixture on pricing rule test suite 2024-09-12 16:48:25 +05:30
Navin-S-R
7855d3034b test: add unit test for deletion of gain loss jv while deleting payment entry 2024-09-12 15:26:55 +05:30
Navin-S-R
9886cf0d46 fix: delete exchange gain loss journal entry while deleting payment entry 2024-09-12 15:25:54 +05:30
Dany Robert
c79851239c fix: invalid gp calculation 2024-09-12 09:18:19 +00:00
Sagar Vora
941177ed62 Merge pull request #43171 from vishakhdesai/payment-entry-bug-fix 2024-09-12 12:01:31 +05:30
rahulgupta8848
e07bc5af41 feat: validating asset scrap date (#43093)
* feat: validating asset scrap date

* refactor: refactorization of scrap asset function

---------

Co-authored-by: “rahulgupta8848” <“rahul.gupta@8848digital.com”>
2024-09-12 11:37:17 +05:30
Smit Vora
9cfb91a025 Merge pull request #43182 from vorasmit/fix-type
fix: typo with po_date when creating remarks
2024-09-12 11:13:31 +05:30
Smit Vora
a55502e0f1 fix: typo with po_date when creating remarks 2024-09-12 10:36:32 +05:30
David Arnold
b615bf65d7 Merge pull request #42074 from blaggacao/feat/utm-analytics
feat/utm analytics
2024-09-12 05:15:29 +02:00
David
96a6673510 feat(analytics): comply erpnext with utm methodology 2024-09-12 04:47:51 +02:00
devdiogenes
4a3eca963c fix: Call super onload_post_render inside pos_invoice.js 2024-09-11 20:42:45 +00:00
David Arnold
7a21574cfb Merge pull request #43177 from frappe/chore/make-stalebot-more-bearable
chore: add no-stale label
2024-09-11 17:24:33 +02:00
David
941564daf8 chore: add no-stale label 2024-09-11 17:06:22 +02:00
ljain112
5b0053f8dd fix: hide and reset discount control on new POS order 2024-09-11 18:54:55 +05:30
Vishakh Desai
502cf0eb8d fix: set party_type null when payment_type is changed to Internal Transfer 2024-09-11 14:21:48 +05:30
rohitwaghchaure
1bf60248d9 perf: timeout error (#43154) 2024-09-10 18:41:46 +05:30
rohitwaghchaure
05f9015c0b fix: bom cost update is not working (#43155) 2024-09-10 18:41:10 +05:30
rohitwaghchaure
5c7dff0e84 fix: concurrency issue while picking materials (#43087) 2024-09-10 15:11:13 +05:30
ruthra kumar
4807ec266e Merge pull request #43146 from ruthra-kumar/fix_permission_issue_on_guest_pr_creation
fix: permission on Payment Request creation by Guest
2024-09-10 14:47:25 +05:30
ruthra kumar
cfb9caca58 Merge pull request #43144 from ruthra-kumar/utility_report_for_invalid_ledger_entries
feat: utility report for identifying invalid ledger entries
2024-09-10 14:35:12 +05:30
ruthra kumar
ea02e5f15a fix: permission on guest PR creation 2024-09-10 14:29:13 +05:30
ljain112
0b942a0614 fix: do not auto apply tds in purchase order 2024-09-10 13:11:09 +05:30
ruthra kumar
43198c946b refactor: allow all accounts 2024-09-10 13:03:49 +05:30
ruthra kumar
2126b10a92 refactor: fetch as dictionary 2024-09-10 12:58:05 +05:30
ruthra kumar
b05b378ef0 refactor: barebones methods with basic logic 2024-09-10 12:08:48 +05:30
Khushi Rawat
82cf85be6c Merge pull request #43114 from khushi8112/primary-action-button-not-showing
fix: primary action button not showing
2024-09-09 22:28:40 +05:30
ruthra kumar
71412a7b7e refactor(test): set company on item 2024-09-09 17:55:59 +05:30
ruthra kumar
dccbc1f432 refactor: standard filters 2024-09-09 17:16:57 +05:30
ruthra kumar
58a879bb39 refactor(test): DN should auto-select warehouses based on reservation 2024-09-09 17:07:37 +05:30
ruthra kumar
c345c75dca refactor(test): create and reserve stock against 2 diff warehouses 2024-09-09 16:19:37 +05:30
ruthra kumar
dab6709549 test: utilize test mixin and barebones test case 2024-09-09 16:19:29 +05:30
rohitwaghchaure
80f101f92e fix: incorrect actual cost in Procurement Tracker report (#43109) 2024-09-09 15:53:41 +05:30
Raffael Meyer
1bb2745fc3 fix: return type of get_party_details (#43131) 2024-09-09 10:00:49 +00:00
Martin Heini
2a44242746 refactor: update default sales tax for Switzerland (#42902)
* Updated default sales tax for switzerland

* Add new reduced rate and special rate too
2024-09-09 15:13:01 +05:30
ruthra kumar
ad0619a60c Merge pull request #42801 from barredterra/dn-translatability
fix(Delivery Note): translatability of validation errors
2024-09-09 14:43:00 +05:30
ruthra kumar
62113ab789 Merge pull request #43056 from barredterra/msg-opening-invoice
fix(Opening Invoice Creation Tool): translatability of messages
2024-09-09 14:29:55 +05:30
ruthra kumar
6c3a8400af Merge pull request #43051 from pra17shant/fix-unreconcile-redirect
fix: unreconcile allocation child table redirect url voucher no issue
2024-09-09 14:28:49 +05:30
ruthra kumar
3b8f0df239 Merge pull request #43064 from aerele/pricing_rule
fix: validate the item code when updating the other item's price rule
2024-09-09 14:13:00 +05:30
Nihantra C. Patel
c998c1ed35 Merge pull request #43121 from Nihantra-Patel/fix_available_batch_report
fix: set today in 'On This Date' in Available Batch Report
2024-09-09 13:55:37 +05:30
ruthra kumar
832c4aaf82 feat: utility report to identify invalid ledger entries 2024-09-09 12:31:32 +05:30
rahulgupta8848
8202f505cc feat: added revaluation surplus and impairment acc in standard charts… (#43022)
feat: added revaluation surplus and impairment acc in standard charts of accounts

Co-authored-by: “rahulgupta8848” <“rahul.gupta@8848digital.com”>
2024-09-09 12:12:00 +05:30
ruthra kumar
6a811ea24a Merge pull request #43058 from kittiu/enh-bulk_transaction_hook
refactor: use hooks to extend bulk_transaction
2024-09-09 11:32:08 +05:30
Nihantra C. Patel
9fd55e4c83 fix: set today in 'On This Date' in Available Batch Report 2024-09-09 11:27:59 +05:30
ruthra kumar
d8b988dd9c Merge pull request #43095 from aerele/common_party_on_foreign_currency
fix: check multi-currency on jv for common party accounting with foreign currency
2024-09-09 10:34:47 +05:30
rohitwaghchaure
5a1a37e915 Merge pull request #43071 from rohitwaghchaure/fixed-support-21512
fix: Cannot read properties of null (reading 'doc')
2024-09-09 09:00:13 +05:30
Smit Vora
e5a49f738b fix: multiple fixes related to remarks for GL Report (#42753)
* fix: show remarks in report only if it exists

* fix: additional fixes to reduce redundancy in report print format

* fix: revert changes for supplier invoice reference

* fix: update remarks before submit to ensure all available details before submit are used

* fix: patch to update invoice remarks where it's not set

* fix: update remarks in payment ledger entry
2024-09-09 01:53:44 +00:00
Smit Vora
6b1acc3283 Merge pull request #42816 from sagarvora/onload-tx
fix: ensure `SellingController.onload` gets called for SO & DN
2024-09-09 07:13:30 +05:30
Sanket322
05de8994b0 refactor: age range in one field (#42736)
* fix: age range in one field

* fix: patch for custom reports

* refactor: stock ageing and account payable report

* fix: fixing the test cases

* fix: common patch for reports with ageing

* refactor: rename variable and minor refactor

* fix: fixing the test case
2024-09-09 06:40:17 +05:30
Khushi Rawat
f3445d645d fix: pass company from asset to asset capitalization 2024-09-08 23:23:54 +05:30
Frappe PR Bot
da48d4599a fix: sync translations from crowdin (#43034)
* fix: Turkish translations

* fix: Swedish translations

* fix: German translations

* fix: Turkish translations

* fix: German translations

* fix: Turkish translations

* fix: Turkish translations

* fix: Persian translations

* fix: Swedish translations
2024-09-08 12:19:58 +02:00
rohitwaghchaure
5ff87edc85 fix: incorrect qty after transaction in SLE (#43103) 2024-09-07 16:38:04 +05:30
Kitti U
d4dd01d8d1 feat: provide hook point for bulk transaction tasks 2024-09-07 17:46:19 +07:00
ruthra kumar
ee94fb37c8 refactor(test): use change_settings decorator 2024-09-07 11:39:06 +05:30
David Arnold
a1af6af121 Merge pull request #43100 from frappe/fix/lp-duing-refdoc-save-oversight
fix: oversight
2024-09-06 22:35:58 +02:00
David
8e2f1e3033 fix: oversight 2024-09-06 22:17:33 +02:00
Khushi Rawat
5ce5b1b6a2 fix: unhide action button after form redirect 2024-09-07 01:33:12 +05:30
Khushi Rawat
32749954de Merge pull request #43098 from khushi8112/reorder-expected-value-validation
fix(minor): reorder expected value validation
2024-09-07 00:13:20 +05:30
Khushi Rawat
0a6bf1559b fix(minor): reorder expected value validation 2024-09-06 23:46:29 +05:30
ruthra kumar
f9136c5d87 Merge pull request #43077 from aerele/common_party_jv
fix: cancel common party advance jv while canceling the invoice
2024-09-06 20:18:55 +05:30
venkat102
454e18ad5f fix: uncomment internal parties 2024-09-06 20:03:56 +05:30
venkat102
740a04a704 test: add unit test for common party with foreign currency 2024-09-06 20:01:35 +05:30
venkat102
00938bfd4d fix: check multi-currency on jv for common party accounting with foreign currency 2024-09-06 19:53:40 +05:30
David Arnold
c6e2470c92 Merge pull request #42135 from blaggacao/feat/lpe-discretionary
feat(lpe): add discretionary reason
2024-09-06 15:47:52 +02:00
David
b276b1d823 fix: format collection table properly 2024-09-06 15:30:08 +02:00
David (aider)
c638e57be4 feat: add test cases for loyalty point entry 2024-09-06 15:29:44 +02:00
David
586422424a feat(lpe): add distretionary reason 2024-09-06 13:13:25 +02:00
Smit Vora
816aae968e Merge pull request #43013 from ljain112/fix-process-payment-recp
fix: `default_advance_account` field in Process Payment Reconciliation
2024-09-06 15:16:29 +05:30
Rushabh Mehta
87662403d9 Merge pull request #43090 from rmehta/logo-2024
fix(logo): updated logo
2024-09-06 14:35:50 +05:30
Rushabh Mehta
8a71b54572 fix(logo): updated logo 2024-09-06 14:14:15 +05:30
ruthra kumar
75cf3e245f Merge pull request #42588 from ruthra-kumar/round_off_account_for_opening
refactor: separate round off account for opening
2024-09-06 10:10:23 +05:30
David Arnold
6652806e7a Merge pull request #43084 from blaggacao/payments/pr-6
fix: unhide payment url in pr
2024-09-06 00:52:53 +02:00
David
19c6bf2f92 fix: unhide payment url in pr 2024-09-06 00:35:17 +02:00
David Arnold
aa54516444 Merge pull request #41718 from blaggacao/fix/lp-on-si
fix: loyalty points application on si
2024-09-06 00:10:31 +02:00
David
74fb070959 test: loyalty points redemption from shopping cart 2024-09-05 23:53:30 +02:00
David Arnold
7ca9ec14a4 Merge pull request #42071 from blaggacao/fix/coupon-code-limits
fix: coupon code limits and add external plaftorm code
2024-09-05 23:42:30 +02:00
David (aider)
3413bad51d test: add test case for coupon without maximum use 2024-09-05 23:25:08 +02:00
David
70ed75a397 fix: coupon code limits and add external plaftorm code 2024-09-05 22:52:49 +02:00
venkat102
8c6e3f3c12 test: add unit test for canceling the common party advance jv created from sales invoice 2024-09-05 23:30:35 +05:30
David Arnold
873571272d Merge pull request #41719 from blaggacao/fix/lp-during-refdoc-save
fix: lp during ref_doc save event
2024-09-05 16:50:45 +02:00
David
48b5567af4 fix: loyalty points application on si 2024-09-05 16:39:52 +02:00
David
340e35f209 fix: lp during ref_doc save event 2024-09-05 16:32:56 +02:00
David Arnold
2ae1704d11 Merge pull request #41871 from blaggacao/perf/reduce-critical-path
perf: hot path in page load
2024-09-05 15:50:23 +02:00
venkat102
6a928b92df fix: cancel common party advance jv while canceling the invoice 2024-09-05 19:13:31 +05:30
David Arnold
e93ff9b267 Merge pull request #41564 from blaggacao/fix/loyalty
fix: tiered loyalty program
2024-09-05 15:02:04 +02:00
David (aider)
efd8f1e978 feat: Add validation to ensure lowest tier has min_spent of 0 in LoyaltyProgram 2024-09-05 14:30:40 +02:00
David
4bd26b845e fix: test ensures min spent respected 2024-09-05 14:29:10 +02:00
David
ad02e4112f fix: loyalty test case -> validate against actual database state 2024-09-05 14:08:29 +02:00
David
c914ea4adc test: add tests for loyalty tier selection 2024-09-05 14:08:22 +02:00
David
81dc5872c4 fix: tiered loyalty program 2024-09-05 14:08:22 +02:00
David
618e737b0b fix: add lp collection min to list 2024-09-05 14:08:21 +02:00
David Arnold
b38b8ded7b Merge pull request #43017 from blaggacao/fix/status-updater-notifications
fix: updater tigger notifications on status updates & perf
2024-09-05 13:54:35 +02:00
ruthra kumar
613830bfba Merge pull request #43070 from ruthra-kumar/handle_emp_advance_as_separate_unit
fix: AP filter to simulate employee advance as a ledger impacting voucher
2024-09-05 17:12:30 +05:30
David
d72d858efa fix: Update status field in parent transaction 2024-09-05 13:00:18 +02:00
David
00b70d7654 chore: calculate in python code 2024-09-05 13:00:17 +02:00
David
5b3e0c5543 chore: refactor set status into a getter & setter (future perf) 2024-09-05 12:58:51 +02:00
Rohit Waghchaure
62c3389bd6 fix: Cannot read properties of null (reading 'doc') 2024-09-05 16:20:56 +05:30
ruthra kumar
257e13c299 refactor: filter to toggle employee advance scenario in AP 2024-09-05 16:12:52 +05:30
ruthra kumar
eedf22b07a refactor: Handle Emp Advance as separate row in AP report 2024-09-05 16:01:26 +05:30
rohitwaghchaure
c13a147df1 fix: disabled batches showing in the list (#43024) 2024-09-05 15:39:15 +05:30
rohitwaghchaure
a8055a6da9 fix: auto reorder material request mail issue (#43066)
fix: auto reorder matreial request mail issue
2024-09-05 15:39:03 +05:30
David Arnold
5f25cde788 Merge pull request #41721 from blaggacao/fix/distributed-discounts
fix: distributed discounts on si
2024-09-05 12:07:18 +02:00
David (aider)
a464bd861b feat: add unit tests for distributed_discount_amount 2024-09-05 11:50:24 +02:00
David
0bab6f34c1 fix: distributed discounts on si 2024-09-05 11:49:24 +02:00
David Arnold
146ce59b87 Merge pull request #43036 from blaggacao/chore/ignore-aider-files
chore: ignore aider files
2024-09-05 11:43:32 +02:00
David
6fdb8659cc chore: ignore aider files 2024-09-05 11:26:26 +02:00
ruthra kumar
ef0682a216 Merge pull request #43065 from Ninad1306/merge_taxes_fix
fix: Reset Value Conditionally Based on Merge Taxes
2024-09-05 14:32:41 +05:30
Ninad1306
9d899f3c4a fix: reset value conditionally based on merge taxes 2024-09-05 13:29:22 +05:30
Bhavan23
e2f3e8713e Merge branch 'develop' of github.com:aerele/erpnext into pricing_rule 2024-09-05 10:44:28 +05:30
barredterra
f3c5803198 fix(Opening Invoice Creation Tool): translatability of messages 2024-09-04 18:05:02 +02:00
Prashant Kamble
5d6f6a2fb9 fix: unreconcile allocation child table redirect url voucher no issue 2024-09-04 11:21:05 +00:00
ljain112
b9048ca6fa fix: set tax_withholding_category from Purchase Order while creating pi form po 2024-09-04 13:57:03 +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
c4ed04cb31 refactor: fetch advance account on party seleection 2024-09-03 17:27:50 +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
890016695f Merge pull request #43029 from Nihantra-Patel/fix_company_filter
fix: move setup_queries to refresh event for company
2024-09-03 16:05:09 +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
ruthra kumar
cf11ac87fb refactor(test): filter for active ledger entries 2024-09-03 15:05:15 +05:30
ruthra kumar
b7edc6dea9 test: opening purchase invoice with rounding adjustment 2024-09-03 15:05:15 +05:30
ruthra kumar
a5d6a25a96 refactor: handle opening round off on purchase invoice 2024-09-03 15:05:15 +05:30
ruthra kumar
193ea9ad8f refactor: filter on account_type 2024-09-03 15:05:14 +05:30
ruthra kumar
79267358d0 test: opening round off with inclusive tax 2024-09-03 15:05:14 +05:30
ruthra kumar
5021c7ca2c test: rounding adjustment validation and posting 2024-09-03 15:05:14 +05:30
ruthra kumar
96e3c2ad10 refactor: handle opening round off from sales invoice 2024-09-03 15:05:14 +05:30
ruthra kumar
fc46ebcd7c chore: default should return 3 elements 2024-09-03 15:05:14 +05:30
ruthra kumar
88e68168e3 refactor: use separate round off for opening entries 2024-09-03 15:05:14 +05:30
ruthra kumar
a5b228549c feat: round off for opening entries 2024-09-03 15:05:14 +05:30
ljain112
b216d71278 fix: consistent behaviour on refresh 2024-09-03 13:58:30 +05:30
ljain112
be6c174b43 fix: do not check appy_tds in Purchase Order Automatically 2024-09-03 11:44:55 +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
Raffael Meyer
baff301e8a Merge pull request #43016 from frappe/l10n_develop 2024-09-02 20:09:43 +02:00
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
78be5fc276 Merge pull request #43008 from Nihantra-Patel/upd_develop_version
fix: update develop_version in hooks
2024-09-02 11:42:38 +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
Raffael Meyer
a5314165c1 Merge pull request #43005 from frappe/pot_develop_2024-09-01 2024-09-01 22:47:44 +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
Raffael Meyer
9b4bb30af2 Merge pull request #43003 from barredterra/toggle_naming 2024-08-31 19:21:16 +02:00
barredterra
ab2d7f7279 fix: show naming series only when needed 2024-08-31 19:14:45 +02:00
Bhavan23
45de18069c fix: validate the item code when updating the other item's price rule 2024-08-31 17:32:19 +05:30
Shariq Ansari
9d4ad987e1 Merge pull request #42993 from shariquerik/apps-page-fix
fix: added app permission check for apps page
2024-08-30 17:34:30 +05:30
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
David Arnold
b01ac4d6fd Merge pull request #42975 from blaggacao/chore/fix-editorconfig-json
chore: fix editorconfig for json
2024-08-30 08:54:13 +02:00
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
4e29654458 Merge pull request #42976 from khushi8112/capitalization-for-new-composite-asset
fix: don't allow capitalizing only service item for new composite asset
2024-08-29 02:12:13 +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
David
a07100d5b3 chore: fix editorconfig for json 2024-08-28 21:00:09 +02:00
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
lukas.brandhoff
268962c25f fix: A project without tasks should be able to complete 2024-08-28 09:17:28 +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
Raffael Meyer
758d1606a9 Merge pull request #42955 from barredterra/fix-item-error 2024-08-27 17:44:09 +02:00
barredterra
c34737f4c6 fix(Item): error message on tax rate 2024-08-27 17:27:13 +02:00
Frappe PR Bot
193d13be0d fix: Turkish translations 2024-08-27 20:43:48 +05:30
Frappe PR Bot
5d0c25f5b5 fix: German translations 2024-08-27 20:43:44 +05:30
Raffael Meyer
1064d7636d Merge pull request #42681 from barredterra/psa-translatability 2024-08-27 16:55:51 +02:00
ruthra kumar
33e37cfbff Merge pull request #42951 from frappe/mergify/copy/develop/pr-42453
fix: Update get_amount to return currency precision grand total (copy #42453)
2024-08-27 17:38:59 +05:30
David Arnold
d3d0af3815 Merge pull request #41925 from blaggacao/fix/customer-mobile-email
fix: spec mobile and email fields for notifications
2024-08-27 13:42:40 +02:00
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
ljain112
143209f91a fix: default_advance_account field in Process Payment Reconciliation 2024-08-27 16:53:34 +05:30
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
Khushi Rawat
a1aaffbebe fix: link Purchase Invoice and Receipt Items to Asset 2024-08-26 23:33:10 +05:30
Ninad1306
8dcb1ab63b fix: update child table from last source_doc 2024-08-26 22:32:16 +05:30
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
NIYAZ RAZAK
9a11df59fc fix: incorrect amount in bank clearance 2024-08-24 12:56:33 +03:00
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
ljain112
a7888b26a7 fix: tds workflow in purchase order 2024-08-23 12:34:07 +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
Frappe PR Bot
28df8aa9cf fix: Turkish translations 2024-08-21 18:36:37 +05:30
rohitwaghchaure
fb846ffa12 fix: incorrect Received Qty Amount in Purchase Order Analysis (#42852) 2024-08-21 15:22:19 +05:30
rohitwaghchaure
5b9309cf34 fix: last purchase rate not updated from purchase invoice (#42847) 2024-08-21 14:52:24 +05:30
ruthra kumar
63ad9f4f86 refactor: filter shareholder on company 2024-08-21 14:19:30 +05:30
ruthra kumar
6cbf98294a refactor: allow equity types on Payment Entry 2024-08-21 14:13:04 +05:30
rohitwaghchaure
9c82c2b5d3 fix: custom stock entry type issue (#42835) 2024-08-21 12:11:22 +05:30
Frappe PR Bot
ee9c3e12b4 fix: Turkish translations 2024-08-20 18:33:35 +05:30
Nihantra C. Patel
a1183f0165 refactor: brand js and allow quick entry (#42829)
* refactor: brand js and allow quick entry

* refactor: brand js and allow quick entry --prettier

* refactor: brand js and allow quick entry --prettier
2024-08-20 14:42:32 +05:30
ljain112
74afa57a9f fix: do not copy date fields in opportunity doctype 2024-08-20 13:45:57 +05:30
Khushi Rawat
85641fd21c Merge pull request #42824 from khushi8112/asset-creation-timeout-error
perf: asset creation from purchase receipt
2024-08-20 13:41:46 +05:30
ljain112
eeb6e75dcf fix: revert 091c5496b2 2024-08-20 10:58:45 +05:30
ruthra kumar
c039cfd5c3 Merge pull request #42379 from Nihantra-Patel/fix_so_prospect_dev_v15
fix: Create Sales Order from Quotation for Prospect
2024-08-20 10:40:44 +05:30
Nabin Hait
f48b3c41de chore: Deleted all the form tours (#42773) 2024-08-20 10:37:50 +05:30
Nabin Hait
b7f5012f15 fix: Removed quick entry for Brand (#42822) 2024-08-20 10:37:19 +05:30
Nabin Hait
0b7657ecf1 chore: Remove module onboarding records (#42790) 2024-08-20 10:36:49 +05:30
ruthra kumar
5c5e2c3ac2 Merge pull request #42731 from creative-paramu/bank_reconcilation_filter
fix: bank reconcilation tool cost center company filter adding
2024-08-20 10:13:19 +05:30
Parameshwari Palanisamy
6d19aae423 refactor: update dialog_manager.js 2024-08-20 10:09:25 +05:30
Raffael Meyer
3ddb18de41 Merge pull request #42797 from frappe/l10n_develop 2024-08-19 15:26:43 +02:00
Frappe PR Bot
7ceb294aab fix: Swedish translations 2024-08-19 18:15:49 +05:30
Frappe PR Bot
fbfc5b4b1d fix: Spanish translations 2024-08-19 18:15:45 +05:30
Frappe PR Bot
0448ea3daa fix: Arabic translations 2024-08-19 18:15:40 +05:30
Frappe PR Bot
9cfbd8c8e3 fix: Turkish translations 2024-08-19 18:15:32 +05:30
Frappe PR Bot
2238ca55a5 fix: French translations 2024-08-19 18:15:28 +05:30
Khushi Rawat
6e84fc5143 perf: asset creation from purchase receipt 2024-08-19 17:24:31 +05:30
rohitwaghchaure
5404b21c7d fix: dropping index to improve performance (#42820)
fix: droping index to improve peformance
2024-08-19 16:58:25 +05:30
rohitwaghchaure
1511280464 perf: data import for stock entries (#42711) 2024-08-19 12:04:47 +05:30
Sagar Vora
8431e3c275 fix: ensure SellingController.onload gets called for SO & DN 2024-08-19 08:16:11 +05:30
Frappe PR Bot
949c0cab72 fix: Swedish translations 2024-08-18 18:07:18 +05:30
Frappe PR Bot
4d41e1538d fix: Esperanto translations 2024-08-18 18:07:15 +05:30
Frappe PR Bot
5e8700f0b4 fix: Spanish translations 2024-08-18 18:07:11 +05:30
Frappe PR Bot
73c4d8a8e6 fix: Arabic translations 2024-08-18 18:07:08 +05:30
Frappe PR Bot
5ae756a93b fix: Bosnian translations 2024-08-18 18:07:05 +05:30
Frappe PR Bot
c9d474bc87 fix: Turkish translations 2024-08-18 18:07:01 +05:30
Frappe PR Bot
226095c6b8 fix: French translations 2024-08-18 18:06:58 +05:30
Frappe PR Bot
200a43e41f fix: Persian translations 2024-08-18 18:06:55 +05:30
Frappe PR Bot
834d8c64c2 fix: German translations 2024-08-18 18:06:51 +05:30
Raffael Meyer
d32fdaaff5 Merge pull request #42808 from frappe/pot_develop_2024-08-18
chore: update POT file
2024-08-18 13:52:29 +02:00
vishnu
3b9f8aa378 fix: warehouse not mapping correctly during Delivery Note creation. 2024-08-18 09:56:12 +00:00
frappe-pr-bot
63b772a7a3 chore: update POT file 2024-08-18 09:36:00 +00:00
Frappe PR Bot
2142f8b4a3 fix: Turkish translations 2024-08-17 17:44:21 +05:30
Frappe PR Bot
fa20320f39 fix: Persian translations 2024-08-17 17:44:18 +05:30
Frappe PR Bot
0e52ef4fd9 fix: German translations 2024-08-17 17:44:14 +05:30
barredterra
08646b7ab7 refactor: extract common validation method 2024-08-17 02:36:16 +02:00
barredterra
34df6e39dc fix(Delivery Note): translatability of validation errors 2024-08-17 02:27:36 +02:00
Raffael Meyer
5f3963b3e6 Merge pull request #42800 from barredterra/translatability-fixes 2024-08-17 02:19:43 +02:00
Raffael Meyer
4db7054542 Merge pull request #42802 from barredterra/extract-setup-wizard-data 2024-08-17 02:14:23 +02:00
barredterra
97c2853497 feat: enable "Translate Link Fields" for fixture doctypes 2024-08-17 02:02:20 +02:00
barredterra
48513b1087 refactor: remove useless line 2024-08-17 02:01:35 +02:00
barredterra
505cd95150 fix: remove pseudo-translation for UOM Category variable
Has no effect and even if it had, it's not really needed.
2024-08-17 02:00:34 +02:00
barredterra
c08cd938bc fix: add pseudo-translation for Project Type 2024-08-17 01:58:48 +02:00
barredterra
11f6e570a5 fix: add pseudo-translation for Stock Entry Type 2024-08-17 01:58:27 +02:00
barredterra
77e5787036 fix: use pseudo-translation while creating fixtures 2024-08-17 01:57:44 +02:00
barredterra
60aaeefd70 feat: add extractor for setup wizard txt files 2024-08-17 01:50:55 +02:00
barredterra
af0ae930ca fix: translatability of boldened text 2024-08-16 21:38:56 +02:00
Frappe PR Bot
9d4165b9f9 fix: Turkish translations 2024-08-16 17:35:39 +05:30
ruthra kumar
1bdeddcb04 Merge pull request #42791 from ruthra-kumar/refactor_pos_return_patch
fix(patch): Use sql to update 'against_voucher' rather than reposting
2024-08-16 15:31:22 +05:30
rohitwaghchaure
48c3b0d094 fix: Auto Create Serial and Batch Bundle For Outward (#42778) 2024-08-16 15:10:22 +05:30
ruthra kumar
1721175a20 chore: update patches.txt 2024-08-16 14:32:53 +05:30
ruthra kumar
13bb48434f fix(patch): replace repost with direct sql to update 'against_voucher 2024-08-16 14:31:13 +05:30
rohitwaghchaure
32c4fab14f fix: not able to create the batch (#42784) 2024-08-16 11:27:08 +05:30
ruthra kumar
c1a5a0510e Merge pull request #42774 from ruthra-kumar/loosen_account_currency_validation_on_groups
refactor: Loosen account currency validation on groups
2024-08-16 09:58:52 +05:30
Raffael Meyer
5011b76de9 Merge pull request #42713 from frappe/l10n_develop 2024-08-15 17:00:52 +02:00
Frappe PR Bot
4c0c0d3eb3 fix: Turkish translations 2024-08-15 16:53:43 +05:30
ruthra kumar
164498bafb refactor: allow foreign currency accounts in Supplier Group 2024-08-14 17:31:19 +05:30
ruthra kumar
066e935892 refactor: allow foreign currency accounts in customer group 2024-08-14 17:30:46 +05:30
Nihantra C. Patel
3dfee0ae43 Merge pull request #42769 from Nihantra-Patel/fix_rename_stop_warehouse
fix: disable rename from warehouse
2024-08-14 16:32:50 +05:30
Frappe PR Bot
85c47b9a5a fix: Spanish translations 2024-08-14 16:28:41 +05:30
Frappe PR Bot
6f8eb4d9ed fix: Turkish translations 2024-08-14 16:28:37 +05:30
Frappe PR Bot
3231bedfb3 fix: Persian translations 2024-08-14 16:28:33 +05:30
Frappe PR Bot
e79b57975e fix: German translations 2024-08-14 16:28:29 +05:30
Nihantra C. Patel
c1812f74e8 fix: disable rename from warehouse 2024-08-14 16:11:50 +05:30
rohitwaghchaure
0db82ec93a fix: ignore pricing rule while making DN from Pick List (#42763) 2024-08-14 15:22:19 +05:30
Khushi Rawat
ad4991dc47 Merge pull request #42765 from khushi8112/set-filters-in-asset-capitalization-fields
fix: set up filters for dimensions
2024-08-14 14:35:52 +05:30
Khushi Rawat
0d42793397 chore: linters check 2024-08-14 14:31:56 +05:30
Khushi Rawat
6fa29376a0 fix: removed extra filter condition 2024-08-14 14:26:47 +05:30
Khushi Rawat
2fd8de2f76 fix: set up filters for dimensions 2024-08-14 14:21:48 +05:30
Smit Vora
9e8f25d020 Merge pull request #42458 from Sanket322/currency_format_in_report
fix: use company default currency in report
2024-08-14 13:38:21 +05:30
ruthra kumar
144cad81a4 Merge pull request #42720 from ruthra-kumar/pos_return_with_self_flag
fix: incorrect 'against_voucher' for Pos return with 'Update Outstanding for Self' disabled.
2024-08-14 11:55:22 +05:30
ruthra kumar
da2286802a refactor: move patch to v14 and update patches.txt 2024-08-14 11:35:05 +05:30
ruthra kumar
3fb0858321 test: against_voucher for pos_returns without updating for self 2024-08-14 11:32:26 +05:30
Khushi Rawat
ad5aadde0f Merge pull request #42719 from khushi8112/recalculate-depreciation-correctly-after-asset-repair
fix: linkage between asset repair and asset value adjustment
2024-08-14 00:30:03 +05:30
Khushi Rawat
88a5824e31 test: new depreciation after cancelling asset repair 2024-08-14 00:06:09 +05:30
Khushi Rawat
c085b6159b fix: resolved conflict 2024-08-14 00:03:35 +05:30
rohitwaghchaure
8aadc18ee8 fix: duplicate labels in stock entry (#42756) 2024-08-13 19:32:15 +05:30
ruthra kumar
f6933111ac Merge pull request #40964 from Nihantra-Patel/fix_timesheet_to_invoice_pricelist
fix: price list when invoice created from timesheet
2024-08-13 17:10:49 +05:30
ruthra kumar
7eb811c71a Merge pull request #42221 from ruthra-kumar/fix_subscription_issue
fix: Force Fetching updates on old subscriptions
2024-08-13 16:22:23 +05:30
ruthra kumar
fd680380bb refactor: test for force-fetch on future subscription 2024-08-13 16:05:06 +05:30
Frappe PR Bot
54ed6a9868 fix: Turkish translations 2024-08-13 15:54:38 +05:30
Frappe PR Bot
f65292612b fix: Persian translations 2024-08-13 15:54:34 +05:30
Khushi Rawat
616ce2dbec Merge pull request #42689 from khushi8112/depreciation-amount-correction
fix: fetch month's last date to avoid miscalculation
2024-08-13 14:11:35 +05:30
ruthra kumar
af11480b7f Merge pull request #42726 from ljain112/sales-funnel
fix: text color in sales funnel report based on theme
2024-08-13 14:05:08 +05:30
ruthra kumar
44261223d5 Merge pull request #42590 from ljain112/coa
fix: error message in coa importer
2024-08-13 14:01:49 +05:30
ruthra kumar
d8b6767697 chore: minor naming change 2024-08-13 12:36:42 +05:30
ruthra kumar
3a11577411 refactor: don't process future subscriptions 2024-08-13 12:36:39 +05:30
ruthra kumar
1ef890db73 fix: force fetch updates for subcription 2024-08-13 12:26:59 +05:30
ruthra kumar
4dc0d3a003 refactor: update patches.txt 2024-08-13 11:58:57 +05:30
ruthra kumar
487d0a55f5 fix: patch to fix incorrect against_voucher references in ledger 2024-08-13 11:58:57 +05:30
ruthra kumar
2cd9b28e5b fix: ledger entries for pos return with update outstanding for self 2024-08-13 11:58:57 +05:30
ruthra kumar
6c2700cd8f Merge pull request #42733 from ruthra-kumar/default_ignore_in_soa
refactor: add a new filter flag in Process Statement of Accounts
2024-08-13 11:10:15 +05:30
ruthra kumar
90880c8c01 refactor: pass filter to General Ledger 2024-08-13 10:42:32 +05:30
ruthra kumar
0cf478c4c2 refactor: cr and dr note filter in Statement of Accounts 2024-08-13 10:41:31 +05:30
ruthra kumar
4cc5cd5a71 refactor: combine vouchers from both ignore 2024-08-13 10:37:55 +05:30
Khushi Rawat
245549951d Merge pull request #42729 from khushi8112/cancel-jl-entry-on-doctype-cancellation
fix: cancel Journal Entry on cancellation of asset value adjustment
2024-08-13 02:12:57 +05:30
Khushi Rawat
4b7f1f2d67 fix: cancel Journal Entry on cancellation of asset value adjustment 2024-08-13 01:48:36 +05:30
Shariq Ansari
18b4b09371 Merge pull request #42727 from shariquerik/include-erpnext
fix: include erpnext in apps page
2024-08-12 19:41:55 +05:30
Shariq Ansari
5280132423 chore: renamed include_as_app to include_in_apps_screen 2024-08-12 19:23:43 +05:30
Shariq Ansari
1d52ef7afe fix: include erpnext in apps page 2024-08-12 17:48:54 +05:30
rohitwaghchaure
4abdb28a1a fix: test case for work order (#42723) 2024-08-12 17:45:29 +05:30
ljain112
61bc0925d5 fix: text color in sales funnel report based on theme 2024-08-12 17:09:39 +05:30
ruthra kumar
0a4db47c69 Merge pull request #42672 from ruthra-kumar/correct_paid_and_received_amt_on_payment_request
fix: update 'Paid Amount' on forex payment request
2024-08-12 16:07:21 +05:30
Frappe PR Bot
f194615057 fix: Swedish translations 2024-08-12 15:55:38 +05:30
Frappe PR Bot
5a68e918cd fix: Persian translations 2024-08-12 15:55:33 +05:30
rohitwaghchaure
17ba0cff44 fix: currency changing while making PR from the PO (#42718) 2024-08-12 15:03:53 +05:30
Frappe PR Bot
61a57aaed5 fix: Swedish translations 2024-08-11 15:58:22 +05:30
rohitwaghchaure
deccb007c1 fix: warning message for negative stock (#42683) 2024-08-11 11:35:45 +05:30
Raffael Meyer
2a999e8f58 Merge pull request #42703 from frappe/l10n_develop
fix: sync translations from crowdin
2024-08-10 23:23:00 +02:00
rohitwaghchaure
bf39e3ab32 perf: data import with 99 stock entries (#42685)
perf: data import for stock entries
2024-08-10 22:34:58 +05:30
Frappe PR Bot
534243a4c8 fix: Swedish translations 2024-08-10 15:48:04 +05:30
Frappe PR Bot
d8de6cb708 fix: Spanish translations 2024-08-10 15:48:01 +05:30
Frappe PR Bot
14c40d17d3 fix: Arabic translations 2024-08-10 15:47:58 +05:30
Frappe PR Bot
aa652c8e15 fix: Bosnian translations 2024-08-10 15:47:55 +05:30
Frappe PR Bot
54d6d346c8 fix: Turkish translations 2024-08-10 15:47:52 +05:30
Frappe PR Bot
4070359174 fix: French translations 2024-08-10 15:47:49 +05:30
Frappe PR Bot
908ca511e7 fix: Persian translations 2024-08-10 15:47:46 +05:30
Frappe PR Bot
2ee70c3968 fix: German translations 2024-08-10 15:47:42 +05:30
Raffael Meyer
2c6938120e Merge pull request #42502 from frappe/l10n_develop 2024-08-09 15:12:26 +02:00
ruthra kumar
f913c0fde1 test: currency conversion on foreign currency account 2024-08-09 17:54:45 +05:30
ruthra kumar
d6d0a1b38d test: make use of test fixture 2024-08-09 16:10:05 +05:30
Frappe PR Bot
2028e52c33 fix: Swedish translations 2024-08-09 15:52:25 +05:30
rohitwaghchaure
b65072cd98 fix: delivery note creation issue (#42696) 2024-08-09 12:45:53 +05:30
ruthra kumar
2312757a1d Merge pull request #42428 from cogk/fix-sort-before-groupby
fix: Sort lists before calling itertools.groupby
2024-08-09 11:52:42 +05:30
ruthra kumar
1dcd1b2a23 Merge pull request #42691 from ruthra-kumar/typeerror_on_payment_entry
fix: typeerror on payment entry
2024-08-09 11:39:59 +05:30
ruthra kumar
9cdca0d662 fix: typeerror on payment entry 2024-08-09 11:34:05 +05:30
Khushi Rawat
70ff4e7644 fix: fetch months last date to avoid miscalculation 2024-08-09 03:21:09 +05:30
barredterra
1d6d383ec8 fix(Process Statement Of Accounts): translatable strings in print 2024-08-08 13:07:33 +02:00
barredterra
34089ba230 style(PSA): fix indentation 2024-08-08 12:40:23 +02:00
Raffael Meyer
38568a3e15 Merge pull request #42679 from barredterra/fix-translatable-string-jv 2024-08-08 12:09:02 +02:00
barredterra
8bd84e9d51 refactor(Exchange Rate Revaluation): remove unused variables 2024-08-08 12:05:25 +02:00
barredterra
dc29fb8759 fix(Exchange Rate Revaluation): translatable strings 2024-08-08 12:05:08 +02:00
Frappe PR Bot
29fe8377a1 fix: Swedish translations 2024-08-08 15:27:45 +05:30
ruthra kumar
657acab32f Merge pull request #42673 from ruthra-kumar/maintain_rate_on_quotation_to_sales_order
fix: Maintain same rate on qty change on Quotation to Sales Order
2024-08-08 13:32:52 +05:30
ruthra kumar
91ce9fce9b fix: Maintain same rate on qty change on Quotation to Sales Order 2024-08-08 11:58:58 +05:30
ruthra kumar
7b0dfb2a05 fix: update 'Paid Amount' on forex payment request 2024-08-08 10:37:57 +05:30
Raffael Meyer
755c162093 Merge pull request #42670 from barredterra/extract-incoterms 2024-08-07 20:45:57 +02:00
barredterra
e177ece008 fix: extract incoterm titles as translatable strings 2024-08-07 20:28:39 +02:00
Shariq Ansari
47c2127a31 Merge pull request #42596 from Didiman1998/bugfix/fix-opportunity-contact-address-bug
fix: changes in opportunity.py to show contacts and addresses created from opportunity
2024-08-07 19:58:36 +05:30
Nihantra Patel
12834ccf9a fix: add the company in payment request bcz delete company transactions 2024-08-07 16:48:29 +05:30
ruthra kumar
efadf94cf3 Merge pull request #42578 from ljain112/fix-dimensions
fix: dimensions in common party journal entry
2024-08-07 16:02:46 +05:30
Khushi Rawat
b1c23ba85c Merge pull request #42593 from khushi8112/disable-submit-button-for-composite-asset
fix: disable primary action button only when there are no active capitalization
2024-08-06 19:11:58 +05:30
Raffael Meyer
82b02d6c9b Merge pull request #42400 from barredterra/root-supplier-group 2024-08-06 14:46:02 +02:00
ruthra kumar
8040544216 test: dimension inheritance on Exc Gain/Loss JV on Common party 2024-08-06 17:46:19 +05:30
ruthra kumar
34ad9d33ff Merge pull request #41708 from Mutantpenguin/patch-1
refactor: use doctype File directly instead of save_file from file_manager.py
2024-08-06 14:34:07 +05:30
ruthra kumar
113362e2d9 Merge pull request #42592 from ljain112/tds-filters
fix: company filter for filtring tax withheld vouchers
2024-08-06 13:16:13 +05:30
ruthra kumar
165ec2ed53 Merge pull request #42545 from ljain112/fix-sales-funnel
fix: min height for rows in sales funnel
2024-08-06 13:01:41 +05:30
rohitwaghchaure
faff84c6e5 feat: expiry date column in Available Batch Report (#42628) 2024-08-06 12:20:41 +05:30
ruthra kumar
4a4e1d36f2 Merge pull request #42636 from ruthra-kumar/ignore_on_gl_should_pull_all_records
refactor: posting date should not be considered for ignore filters in GL
2024-08-06 10:54:54 +05:30
ruthra kumar
c930f8ba9d refactor: posting date is not considered for ignore filters in GL 2024-08-06 10:36:26 +05:30
Frappe PR Bot
42885a81f0 fix: Swedish translations 2024-08-06 03:08:20 +05:30
rohitwaghchaure
c8af544ef3 fix: do not update item price and last purchase rate for inter transf… (#42616)
fix: do not update item price and last purchase rate for inter transfer transaction
2024-08-05 20:20:36 +05:30
ruthra kumar
0f0b19688a Merge pull request #42555 from ruthra-kumar/sales_pipeline_analytics_filters
refactor: date filters should be mandatory in Sales Pipeline Analytics report
2024-08-05 15:07:59 +05:30
ruthra kumar
4253caf910 refactor(test): use test fixture and supply from and to dates 2024-08-05 14:47:09 +05:30
ruthra kumar
213b2ba942 refactor: consider empty-string as Not Assigned 2024-08-05 14:08:08 +05:30
ruthra kumar
e78e948b7c Merge pull request #42621 from ruthra-kumar/clear_data_on_gl_tests
refactor(test): clear data before GL report tests
2024-08-05 13:43:59 +05:30
ruthra kumar
56620785a0 refactor(test): clear old records on GL report tests 2024-08-05 13:26:03 +05:30
ruthra kumar
751a25c4b7 refactor: report columns should be based on from and to dates 2024-08-05 11:31:13 +05:30
ruthra kumar
05b92c5321 Merge pull request #42597 from ruthra-kumar/ignore_reconciliation_jv_on_general_ledger
refactor: filter to ignore system generated cr / dr reconciliation journals on general ledger
2024-08-05 11:12:56 +05:30
ruthra kumar
9ade269b7a refactor(test): filter and reconcile concerned vouchers 2024-08-05 10:46:35 +05:30
ruthra kumar
991069bfbc test: clear old data 2024-08-05 10:23:52 +05:30
ruthra kumar
3617b41b95 refactor: make 'from_date' and 'to_date' mandatory 2024-08-05 10:18:42 +05:30
ruthra kumar
03f3ab522f refactor: make use of date filters on ignore filterss 2024-08-05 10:01:09 +05:30
ruthra kumar
3ffac73598 test: ignore filter for system generated cr / dr note journals 2024-08-05 10:01:07 +05:30
Frappe PR Bot
f7c0ccce0a fix: Swedish translations 2024-08-05 03:03:25 +05:30
Frappe PR Bot
a1bcc6b418 fix: Esperanto translations 2024-08-05 03:03:22 +05:30
Raffael Meyer
6d2a36c4f9 Merge pull request #42612 from frappe/pot_develop_2024-08-04 2024-08-04 13:48:21 +02:00
frappe-pr-bot
5040e3ca7d chore: update POT file 2024-08-04 09:34:51 +00:00
rohitwaghchaure
da22a8df42 Merge pull request #42584 from rohitwaghchaure/fixed-support-19715
fix: all warehouse filter for the stock report
2024-08-02 18:55:42 +05:30
Dietmar Fischer
511a0b9f37 fix: pre-commit for better code formatting 2024-08-02 12:51:48 +02:00
Khushi Rawat
5d58eb67a6 fix: use get_last_day to get the correct date (#42564) 2024-08-02 16:21:21 +05:30
ruthra kumar
bb8c9b5a58 refactor: ignore system generated cr / dr notes on general ledger 2024-08-02 15:47:47 +05:30
ruthra kumar
59d5beee20 refactor: ignore filter in general ledger for cr / dr notes 2024-08-02 15:43:04 +05:30
Khushi Rawat
bb877f4a6b fix: disable primary action button only when there are no active capitalization 2024-08-02 13:37:59 +05:30
ljain112
cfe2ae604b fix: company filter for filtring tax withheld vouchers 2024-08-02 13:12:04 +05:30
ljain112
5d0a38dfc7 fix: error message in coa importer 2024-08-02 11:50:57 +05:30
David
41e395a7e3 fix: hot path in page load 2024-08-01 23:23:48 +02:00
Rohit Waghchaure
a4311e345d fix: all warehouse filter for the stock report 2024-08-01 23:10:46 +05:30
Dietmar Fischer
61576ca030 feat: changes in opportunity.py to show contacts and addresses from referenced and opportunities 2024-08-01 17:01:43 +02:00
Nabin Hait
281198456d fix: Discount and taxes in return document should follow the reference document (#41911)
* fix: Discount and taxes in return document should follow the reference document

* fix: Ignore Pricing rule on debit/credit note if created against PI/SI with test cases

* fix: linter issue
2024-08-01 14:51:01 +05:30
ljain112
ac629ede79 fix: dimensions in common party journal entry 2024-07-31 18:49:19 +05:30
ruthra kumar
fb2aa7d205 Merge pull request #42563 from ruthra-kumar/set_query_filter_on_pe_tax_templates
fix: set query filters for sales / purchase tax template on PE
2024-07-31 17:08:11 +05:30
ruthra kumar
9fe47ac101 fix: set query filters for sales / purchase tax template on PE 2024-07-31 16:42:33 +05:30
ruthra kumar
d811fdf675 Merge pull request #42558 from ruthra-kumar/fix_undefined_in_consolidate_report
fix: 'undefined' in PL and BS report summary on Consolidated report
2024-07-31 15:32:36 +05:30
ruthra kumar
dd5a5e4919 fix: 'undefined' in PL and BS report summary on Consolidated report 2024-07-31 14:40:55 +05:30
rohitwaghchaure
f620ef20ae fix: inter transfer delivery note issue with batch (#42552) 2024-07-31 14:17:22 +05:30
ruthra kumar
40c166a0a0 refactor: date filters should be explicit 2024-07-31 14:01:27 +05:30
Smit Vora
33a0a529a5 Merge pull request #42392 from ljain112/fix-asset
fix: allow sale of asset for internal transfer
2024-07-31 13:22:20 +05:30
Lakshit Jain
8624aeca54 fix: promotional scheme doctype fields in consitency with pricing rule (#42432)
* fix: add "round_free_qty" check box in promotional scheme

* fix: add `add_for_price_list` field

* fix: set_query in setup for promotional scheme

---------
2024-07-31 13:19:54 +05:30
Lakshit Jain
a694390a12 fix: reverse debit credit for party gl entry in payment entry based on negative amount (#42367)
* fix: do not absolute the amount for party gl entries

* fix: reverse debit credit for party gl entry based on negative amount

* refactor: reduce nesting of if condition

---------
2024-07-31 12:46:10 +05:30
Nabin Hait
4986f28a89 fix: set currency on change of company considering customer default currency (#42405) 2024-07-31 11:44:05 +05:30
Khushi Rawat
0e5e503b42 Merge pull request #42525 from khushi8112/depreciation-adjustment-for-existing-asset
fix: Adjust initial month's depreciation to end of depreciation period
2024-07-30 19:04:26 +05:30
ljain112
fd71d8af52 fix: min height for rows in sales funnel 2024-07-30 17:49:56 +05:30
rohitwaghchaure
1c7f7c8d1a perf: huge number of serial no creation (#42522) 2024-07-30 16:33:53 +05:30
ruthra kumar
93ee922c5f Merge pull request #42393 from blaggacao/payments/pr-5
refactor: explicate intent on make_payment_request interface
2024-07-30 16:31:53 +05:30
rohitwaghchaure
23fed831a0 fix: price_list_currency not found error (#42534) 2024-07-30 14:26:29 +05:30
rohitwaghchaure
0ecfa709d8 fix: warehouse filter in Product Bundle Balance (#42532) 2024-07-30 14:26:06 +05:30
rohitwaghchaure
c5d68333c9 fix: purchase return from rejected warehouse (#42531) 2024-07-30 14:24:35 +05:30
ruthra kumar
ff3a5058c1 Merge pull request #42476 from ruthra-kumar/configuration_to_control_payment_request_creation
refactor: checkbox to control Payment Request creation
2024-07-30 13:35:59 +05:30
ruthra kumar
5ec9df8d1c Merge pull request #42528 from ruthra-kumar/rename_button_on_payment_order
chore: button name should reflect what it creates
2024-07-30 11:59:46 +05:30
ruthra kumar
0b6e7f83cd chore: button name should reflect what it creates 2024-07-30 11:54:41 +05:30
Khushi Rawat
f0768010d9 fix(tests): added tests for usecase 2024-07-30 01:28:52 +05:30
Khushi Rawat
cbb749a3a5 fix: Adjust initial month's depreciation to end of depreciation period 2024-07-29 23:50:57 +05:30
David
b94af28587 fix: link cash flow rows and fix summary linking 2024-07-29 20:02:52 +02:00
rohitwaghchaure
8eff168d76 fix: Warranty Expiry Date not set in the serial number (#42513)
* fix: Warranty Expiry Date not set in the serial number

* chore: fix linters issue
2024-07-29 14:47:42 +05:30
rohitwaghchaure
25dac1f18e fix: builtins.KeyError: ('ABC', 'Store - CP') (#42505) 2024-07-29 09:49:53 +05:30
rohitwaghchaure
cb522f8f22 fix: performance issue for the report Purchase Order Analysis report (#42503) 2024-07-28 23:41:00 +05:30
Frappe PR Bot
0b27b19c35 fix: Swedish translations 2024-07-28 23:06:42 +05:30
Raffael Meyer
21d8b09f47 Merge pull request #42499 from frappe/l10n_develop
fix: sync translations from crowdin
2024-07-28 14:49:19 +02:00
Frappe PR Bot
e9c1a7e3e3 fix: Esperanto translations 2024-07-27 22:53:17 +05:30
Raffael Meyer
24b26627e7 Merge pull request #42498 from frappe/pot_develop_2024-07-27 2024-07-27 19:18:38 +02:00
frappe-pr-bot
9aaf6e47d5 chore: update POT file 2024-07-27 17:02:08 +00:00
Raffael Meyer
4931b74b3f Merge pull request #42466 from frappe/l10n_develop 2024-07-27 19:00:36 +02:00
Raffael Meyer
532bc163f6 Merge pull request #42457 from barredterra/review-translations 2024-07-27 18:59:26 +02:00
Raffael Meyer
4c3ec767ce Merge pull request #42418 from barredterra/si-queries 2024-07-27 18:58:27 +02:00
devdiogenes
ac0cb9db5a fix: Prevent set_payment_schedule when creating Sales Invoice that is return 2024-07-26 14:33:42 -03:00
ruthra kumar
0d77e0b0cd Merge pull request #42477 from ruthra-kumar/incorrect_cost_center_on_AR_AP_report
fix: incorrect cost_center on AR/AP report
2024-07-26 19:42:56 +05:30
Ninad Parikh
723ac0ffc4 fix: Update Rate as per Valuation Rate for Internal Transfers only if Setting is Enabled (#42050)
* fix: update rate for internal transfers only if settings enabled

* fix: better naming

* fix: create field for storing incoming rate in purchase doctypes

* fix: use qty instead of qty_in_stock_uom

* fix: add description, refactor for readablility

* test: test case to validate internal transfers at arm's length price

* fix: minor fix

* fix: deletion of code not required

---------

Co-authored-by: Smit Vora <smitvora203@gmail.com>
2024-07-26 18:22:40 +05:30
ruthra kumar
9a0894fd65 test: invoice cost center reported in AR/AP report 2024-07-26 18:16:40 +05:30
Smit Vora
096ec2db6a Merge pull request #42470 from Ninad1306/field_changes_for_subcontracting
fix: Fields Alteration Related to Subcontracting
2024-07-26 16:24:47 +05:30
Smit Vora
3b481ae656 Merge pull request #42305 from ljain112/fix-tds-adv
fix: consider payment entries for checking if tds is deducted
2024-07-26 14:40:15 +05:30
Smit Vora
ad31b63537 Merge pull request #42444 from ljain112/parenttype
fix: parenttype in purchase and sales item query
2024-07-26 14:23:21 +05:30
ruthra kumar
3e19041fa3 fix: incorrect cost_center on AR/AP report 2024-07-26 08:00:13 +05:30
ruthra kumar
ce81fd9ba6 refactor: checkbox to control Payment Request creation 2024-07-26 06:52:55 +05:30
ruthra kumar
07281d30bb Merge pull request #42472 from ruthra-kumar/index_on_release_date
refactor: index on Purchase Invoice 'release_date'
2024-07-25 21:26:22 +05:30
ruthra kumar
764dd12b10 refactor: index on Purchase Invoice 'release_date' 2024-07-25 19:51:54 +05:30
Ninad1306
77590e6077 fix: fields alteration related to subcontracting 2024-07-25 18:05:31 +05:30
ljain112
40b59de4cd fix: consider payment entries for checking if tds is deducted 2024-07-25 17:26:52 +05:30
Ninad Parikh
302339998f fix: Fields Modification for Subcontracting DocTypes (#42383)
* fix: fields renaming and reordering for enhanced user experience

* fix: dashboard data for stock entry
2024-07-25 10:18:21 +05:30
rohitwaghchaure
0e817f42ef fix: dynamic condition in the pricing rule not working (#42467) 2024-07-25 10:15:05 +05:30
Frappe PR Bot
8c6d666163 fix: Swedish translations 2024-07-24 20:18:54 +05:30
Frappe PR Bot
4ab6134306 fix: Esperanto translations 2024-07-24 20:18:50 +05:30
ruthra kumar
e062ec38b0 Merge pull request #42462 from ruthra-kumar/monthly_err_revaluation
refactor: provision for re-evaluating Exchange Rates in monthly frequency
2024-07-24 18:44:04 +05:30
ruthra kumar
fc4e5f165c refactor: hooks for monthly re-evaluation jobs 2024-07-24 18:18:21 +05:30
ruthra kumar
ce2b9e0f1a refactor: provision for monthly re-evaluation 2024-07-24 18:18:13 +05:30
HarryPaulo
486d396174 fix: Freeze Screen on load invoices on POS Closing Entry 2024-07-24 08:57:27 -03:00
rohitwaghchaure
06e2d7265c fix: keyerror posting_time (#42452)
fix: keyerror: posting_time
2024-07-24 16:39:11 +05:30
rohitwaghchaure
9cd3374101 fix: incorrect current qty for the batch in stock reco (#42434) 2024-07-24 16:38:20 +05:30
Sanket322
2533808f1e fix: set proper currency format 2024-07-24 13:42:04 +05:30
barredterra
89c458e229 chore: set PR reviewer for translations 2024-07-24 09:59:46 +02:00
Raffael Meyer
ffc5bbfa4c Merge pull request #42319 from frappe/pot_develop_2024-07-14 2024-07-24 09:51:13 +02:00
Raffael Meyer
92a6fc8c2e Merge pull request #42206 from frappe/l10n_develop 2024-07-24 09:50:43 +02:00
ruthra kumar
8ccf8c0ea2 Merge pull request #42390 from ruthra-kumar/remove_stale_code_from_reposting
refactor: cleaning up stale code related to reposting
2024-07-24 12:57:51 +05:30
ljain112
972329cc16 fix: allow sale of asset for internal transfer 2024-07-23 17:44:37 +05:30
ljain112
35981b8730 fix: parenttype in item wise purchase and sales register 2024-07-23 17:36:33 +05:30
Khushi Rawat
6e1fc33d01 Merge pull request #42372 from khushi8112/correct-validation-for-depreciation-posting-date
fix: correct validation for depreciation posting date
2024-07-23 15:23:41 +05:30
Smit Vora
c8e85f4bb7 Merge pull request #42377 from vorasmit/ignore-duplicates
fix: ignore duplicates while creating default templates
2024-07-23 10:25:29 +05:30
Raffael Meyer
bf2c9a7f41 Merge pull request #42419 from barredterra/si-initial-value 2024-07-22 20:40:49 +02:00
rohitwaghchaure
be2648245b fix: qty in the 'Serial No Ledger' report (#42429) 2024-07-22 17:45:48 +05:30
Corentin Forler
45a6ecbd38 fix: Sort lists before calling itertools.groupby 2024-07-22 10:13:10 +02:00
HarryPaulo
669cf6094e fix: process on background based on number of invoices on POS Closing Entry (#42417)
* fix: process on background based on number of invoices on POS Closing Entry

* fix: process on background based on number of invoices on POS Closing Entry
2024-07-20 10:17:34 +05:30
barredterra
65f80abf2f fix: provide initial value for .reduce() call
Fixes the error "TypeError: Reduce of empty array with no initial value" (https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Errors/Reduce_of_empty_array_with_no_initial_value#invalid_cases)
2024-07-20 00:44:31 +02:00
barredterra
9b463753b7 refactor(Sales Invoice): queries 2024-07-20 00:27:16 +02:00
Khushi Rawat
f4d4658cbb Merge pull request #42412 from khushi8112/set-filter-on-asset-name-field
fix: set filter to show only submitted asset
2024-07-19 19:16:38 +05:30
Khushi Rawat
69b8e10e20 fix: set filter to show only submitted asset 2024-07-19 19:10:33 +05:30
Frappe PR Bot
9e93bc5819 fix: Swedish translations 2024-07-19 17:47:54 +05:30
ruthra kumar
ebb95b7d9a Merge pull request #42407 from ruthra-kumar/test_for_item_wise_purchase_register
test: basic test case for item-wise purchase register
2024-07-19 16:50:06 +05:30
ruthra kumar
c3c5d3f615 test: basic test case for item-wise purchase register 2024-07-19 16:31:58 +05:30
HENRY Florian
1bbe020cfd feat: add make_regional_gl_entries override for Sales Invoice (#42399)
* feat: add make_regional_gl_entries override for Sales Invoice and Stock Controler

* chore: remove regionnal override for stock management
2024-07-19 16:22:11 +05:30
Poorvi-R-Bhat
d62eb0f5c1 fix: Billing hours is not updated in Time sheet#19026 (#42404) 2024-07-19 14:46:24 +05:30
ruthra kumar
930ecb3170 Merge pull request #41959 from hiteshprajapati/bug-Don't_allow_negative_amount_on_Payment_Request
fix: Don't allow negative amount on Payment Request #41905
2024-07-19 10:33:49 +05:30
ruthra kumar
f44de670ca Merge pull request #42386 from ljain112/fix-pos
fix: set pos data if not return doc
2024-07-19 10:23:55 +05:30
barredterra
5d4578a172 refactor(Supplier Group): use frm.is_new() instead of frm.doc.__islocal 2024-07-18 21:00:42 +02:00
barredterra
45391c951b fix(Supplier Group): remove useless headline
Not sure what it was supposed to mean. It was only visible on root group, along with the other message.
2024-07-18 20:59:26 +02:00
barredterra
741fc54eca fix(Supplier Group): properly call frm.set_read_only() 2024-07-18 20:56:56 +02:00
rohitwaghchaure
e5dfc5e545 fix: serial and batch bundle for POS Invoice (#41491) 2024-07-18 19:54:00 +05:30
rohitwaghchaure
e1b9b432c3 fix: rounding issue causing incorrect quantity in SE (#42380) 2024-07-18 19:53:45 +05:30
rohitwaghchaure
67bf9bec47 fix: Purchase Order Analysis Report Data (#42387) 2024-07-18 19:52:30 +05:30
David
6d83c11d8e refactor: explicate intent on make_payment_request interface 2024-07-18 15:18:27 +02:00
ljain112
65d672da65 fix: set pos data if not return doc 2024-07-18 17:40:19 +05:30
ruthra kumar
79a46ad6f8 Merge pull request #42148 from blaggacao/payments/pr-4
feat(payment): add more payment channels than just email and phone (think: chat)
2024-07-18 17:20:33 +05:30
ruthra kumar
a912e07b74 Merge pull request #39638 from blaggacao/feat/add-login-user-to-driver
feat: add login user to driver if available for notifications
2024-07-18 17:18:10 +05:30
ruthra kumar
e71cb4eab7 refactor(test): remove assert on 'repost_required' 2024-07-18 15:39:30 +05:30
ruthra kumar
07fc952a43 refactor: remove attribute check on 'repost_required' 2024-07-18 15:38:15 +05:30
ruthra kumar
09f429ffba refactor: repost without checking on flag 2024-07-18 15:34:59 +05:30
ruthra kumar
fe46e1d089 chore: remove stale UI code related to repost 2024-07-18 15:34:02 +05:30
ruthra kumar
e81373bb6a chore: remove 'repost_required' from Journal Entry 2024-07-18 15:32:51 +05:30
ruthra kumar
a467888a67 chore: remove 'repost_required' from purchase invoice 2024-07-18 15:31:59 +05:30
ruthra kumar
06c5334f2a chore: remove stale 'repost_required' flag from sales invoice 2024-07-18 15:31:01 +05:30
ruthra kumar
f3fda9ce98 chore: remove stale code from sales invoice 2024-07-18 15:29:30 +05:30
ruthra kumar
57f928da55 Merge pull request #42374 from nabinhait/ar_ap_fix
fix: Show the rows in AR/AP report where outstanding equals to 0.01
2024-07-18 13:43:56 +05:30
ruthra kumar
bb9e42cce2 test: AR/AP report on miniscule outstanding 2024-07-18 12:58:09 +05:30
ruthra kumar
c587ede548 Merge pull request #42369 from ruthra-kumar/fix_missing_cr_note_on_payment_reconciliation
fix: missing cr/dr notes on payment reconciliation
2024-07-18 12:37:49 +05:30
Nihantra Patel
ee44022249 fix: update the testcase format 2024-07-18 12:26:23 +05:30
Nihantra Patel
29d50b770e fix: update the testcase format 2024-07-18 12:24:52 +05:30
Nihantra Patel
2f63fae31d fix: Create Sales Order from Quotation for Prospect 2024-07-18 12:14:53 +05:30
Smit Vora
cf55c2ab3d fix: ignore duplicates while creating default templates 2024-07-18 10:07:02 +05:30
Nabin Hait
e1dedc5402 fix: Show the rows in AR/AP report where outstanding equals to 0.01 2024-07-17 21:23:56 +05:30
rohitwaghchaure
62fb495a65 fix: not able to save QC (#42371) 2024-07-17 19:49:53 +05:30
Khushi Rawat
da4ed90a3e fix: correct validation for depreciation posting date 2024-07-17 19:19:31 +05:30
ruthra kumar
2d686c06ea test: payment filter should not affect dr/cr notes 2024-07-17 17:52:55 +05:30
ruthra kumar
a30af68e9e fix: missing cr/dr notes on payment reconciliation 2024-07-17 15:27:58 +05:30
Smit Vora
c8dad976e2 Merge pull request #42307 from Sanket322/update_proprietorship_to_individual
fix: remove redundant proprietorship field from customer type and supplier type
2024-07-17 14:01:18 +05:30
Smit Vora
ea03ce3662 Merge pull request #42352 from ljain112/balance-sheet
fix: show total rows credit row in balance sheet
2024-07-16 19:27:29 +05:30
rohitwaghchaure
001e5b612b fix: items not fetching in End Transit entry (#42358) 2024-07-16 17:49:24 +05:30
Khushi Rawat
81e0b96c30 fix: service item capitalization (#42188)
* feat: capitalize with service expenses only

* chore: added test

* refactor: removed Capitalized In field from asset doc
2024-07-16 17:45:29 +05:30
rohitwaghchaure
85d2d34116 fix: same posting date and time causing incorrect valuation rate (#42351) 2024-07-16 16:08:39 +05:30
rohitwaghchaure
21df38bf18 fix: bin deadlock issue (#42342) 2024-07-16 16:08:03 +05:30
ljain112
327b19cba6 fix: show total rows credit row in balance sheet 2024-07-16 14:33:52 +05:30
Frappe PR Bot
656e363aef fix: Swedish translations 2024-07-16 02:32:01 +05:30
rohitwaghchaure
6a50b40976 fix: extra qty pick in pick list (#42345) 2024-07-15 23:00:12 +05:30
Nihantra C. Patel
17b437709c fix: remove doctype link from serial no ledger report (#42327)
* fix: remove doctype link from serial no ledger report

* fix: remove doctype link from serial no ledger report

* fix: remove doctype link from serial no ledger report --update
2024-07-15 22:59:43 +05:30
Nihantra C. Patel
66b35ec9fb feat: create variant with/without image (#41317)
* feat: create variant with/without image

* feat: create variant with/without image

* feat: create variant with/without image

* feat: create variant with/without image

* feat: create variant with/without image

* feat: create variant with/without image

* fix: change the variable name use_same_image to use_template_image
2024-07-15 16:59:41 +05:30
rohitwaghchaure
6d42cd0f4c fix: not able to cancel the inter transfer DN (#42333) 2024-07-15 16:21:07 +05:30
ruthra kumar
58bfd3b973 Merge pull request #42339 from ruthra-kumar/refactor_gp_test_for_dict_assert
fix(test): incorrect linter changes on test_gross_profit.py by ruff
2024-07-15 16:13:56 +05:30
ruthra kumar
fde348c8a0 fix(test): incorrect ruff changes 2024-07-15 15:52:59 +05:30
ruthra kumar
40cebf257b fix(test): incorrect linter fix from ruff 2024-07-15 15:49:37 +05:30
ruthra kumar
8784966138 Merge pull request #42294 from ruthra-kumar/implicit_repost_on_invoice_update
refactor: make reposting implicit
2024-07-15 15:10:33 +05:30
ruthra kumar
794a62aecb chore: contextual comments 2024-07-15 14:29:07 +05:30
ruthra kumar
c283cda169 refactor(test): reposting happens implicitly 2024-07-15 14:28:15 +05:30
ruthra kumar
8f135e9859 refactor(test): no need to assert repost_required flag
Reposting happens implicitly upon 'Update After Submit'
2024-07-15 14:24:25 +05:30
ruthra kumar
05fedf046c Merge pull request #42330 from ruthra-kumar/fix_gross_profit_valuation_rate_for_diff_warehouse
fix: incorrect valuation rate for items from different warehouses in Gross Profit
2024-07-15 14:19:10 +05:30
ruthra kumar
577ce5ccd4 test(gross profit): valuation rate from different warehouse 2024-07-15 13:05:09 +05:30
ruthra kumar
f9d2dd0a62 fix(gross profit): incorrect valuation rate on different warehouses 2024-07-15 11:44:35 +05:30
frappe-pr-bot
372b5a4ca7 chore: update POT file 2024-07-14 09:35:44 +00:00
Frappe PR Bot
5e3359c5c5 fix: Swedish translations 2024-07-14 02:09:38 +05:30
rohitwaghchaure
61daa318fe fix: incoming rate zero for supplied items in returned SCR (#42314) 2024-07-13 16:06:24 +05:30
rohitwaghchaure
7656220075 fix: address and contact filters for SCO and SCR (#42310) 2024-07-13 15:29:37 +05:30
Sanket322
c8ad6d1b2c fix: remove proprietorship and update it with individual 2024-07-12 18:58:14 +05:30
rohitwaghchaure
9cf92eaeab fix: not able to submit LCV entry (#42303) 2024-07-12 16:57:50 +05:30
Khushi Rawat
b04da63aad feat: configurable depreciation calculation via accounts settings (#42276)
* feat: configurable depreciation calculation via accounts settings

* refactor: code optimization

* style: changes in description and label
2024-07-12 14:25:57 +05:30
Nabin Hait
d0bbc8ca70 fix: While submitting PCV ensure previous FY is closed (#42284) 2024-07-12 14:24:42 +05:30
rohitwaghchaure
9838f7e6ba fix: cost center filter by company (#42297) 2024-07-12 12:36:39 +05:30
rohitwaghchaure
10280d6140 fix: keep status as In Progress for RIV for Timeout Error (#42274) 2024-07-12 11:54:35 +05:30
ruthra kumar
722ef92324 refactor: make reposting implicit 2024-07-12 10:30:19 +05:30
rohitwaghchaure
b17696a8ae fix: slowness in reposting dependent vouchers. (#42282) 2024-07-11 19:05:46 +05:30
ruthra kumar
3bde29c98b Merge pull request #42192 from ruthra-kumar/tests_for_item_wise_sales_and_purchase_reports
refactor: tests for item wise sales register report
2024-07-11 18:02:52 +05:30
ruthra kumar
cf4fbfb601 refactor(test): use each instance UOM for assertion 2024-07-11 17:40:34 +05:30
ruthra kumar
a4a6d90857 Merge pull request #42287 from ruthra-kumar/fix_missing_discount_on_pos_credit_note
fix: missing discount on POS Credit Notes
2024-07-11 17:28:07 +05:30
ruthra kumar
1049550951 fix: missing discount on POS Credit Notes 2024-07-11 17:21:41 +05:30
Frappe PR Bot
62fc3bd586 fix: Swedish translations 2024-07-11 01:37:52 +05:30
Raffael Meyer
22549186ab Merge pull request #42232 from barredterra/warehouse-buttons 2024-07-10 13:14:44 +02:00
ruthra kumar
d4c16c1740 Merge pull request #42247 from ruthra-kumar/fix_purchase_receipt_tax_on_stock_rbnb
fix: don't merge tax into stock account on purchase receipt repost
2024-07-10 15:27:19 +05:30
ruthra kumar
9562628ed6 test: tax account heads on PR report without LCV 2024-07-10 15:05:31 +05:30
ruthra kumar
8633080dff fix: tax on stock_rbnb on repost of Purchase Receipt 2024-07-10 15:05:28 +05:30
Smit Vora
3ef7e6ce5c Merge pull request #42204 from DaizyModi/fix-project-status
fix: Reopen Project if Completion Percentage is Below 100%
2024-07-10 12:38:57 +05:30
Smit Vora
d3520a62cc Merge pull request #42127 from ljain112/fix-disc-validation
fix: removed max discount validation for sales return
2024-07-10 12:30:04 +05:30
Smit Vora
5c0d52f783 fix(tds): use doctype reference when mapping keys across multiple doctypes (#42258)
* fix(tds): use doctype reference when mapping keys across multiple doctypes

* fix: changes as per review

---------

Co-authored-by: ljain112 <ljain112@gmail.com>
2024-07-10 06:26:38 +00:00
Smit Vora
d86e0ad694 Merge pull request #42060 from ljain112/fix-tds
fix: updated logic for calculating tax_withholding_net_total in payment entry
2024-07-10 10:40:14 +05:30
Khushi Rawat
0893a06b42 Merge pull request #42233 from khushi8112/show-only-submitted-assets
fix: added filter to show only submitted assets
2024-07-09 16:40:13 +05:30
rohitwaghchaure
1186ee128c fix: actual qty in sales order (#42248) 2024-07-09 15:09:17 +05:30
Poorvi-R-Bhat
623b4c21cd fix: corrected mismatch in the Purchase Receipt Status #15620 (#42138) 2024-07-09 14:59:31 +05:30
Rucha Mahabal
ad137250fc fix(Holiday List): sort holidays on save to avoid disorienting the user (#42236)
fix: sort holidays on save to avoid disorienting the user
2024-07-09 14:56:25 +05:30
Nihantra C. Patel
0c76a8cc9e fix: Billed Qty and Qty to Bill Calculation in Purchase Order Analysis (#42100) 2024-07-09 14:53:04 +05:30
Raffael Meyer
4936514c8d fix(Stock Entry Type): reduce perms for Stock User (#42225) 2024-07-09 12:15:52 +05:30
Raffael Meyer
96b275c61e fix(Putaway Rule): reduce perms for Stock User (#42227) 2024-07-09 12:13:59 +05:30
Raffael Meyer
edc1f84250 fix(Inventory Dimension): reduce perms for Stock User (#42226) 2024-07-09 12:13:42 +05:30
rohitwaghchaure
5f53ad3117 fix: auto serial and batch bundle not creating for Asset Capitalization (#42231) 2024-07-09 11:11:44 +05:30
ruthra kumar
2383a1a18e Merge pull request #42026 from ljain112/fix-bank-import
fix:  Multiple fixes in Bank Statement Import
2024-07-09 10:09:32 +05:30
Frappe PR Bot
e7ee508de4 fix: Esperanto translations 2024-07-09 00:53:26 +05:30
Khushi Rawat
cd3a900495 fix: added filter to show only submitted assets 2024-07-08 20:48:53 +05:30
barredterra
10ae5aaf52 fix(Warehouse): add buttons only if the user can use them 2024-07-08 17:08:38 +02:00
Raffael Meyer
fa614dd8d3 Merge pull request #42211 from frappe/pot_develop_2024-07-07 2024-07-08 15:04:43 +02:00
Frappe PR Bot
4b415987f9 fix: Swedish translations 2024-07-08 00:51:51 +05:30
frappe-pr-bot
b4d3dfc234 chore: update POT file 2024-07-07 09:35:29 +00:00
Frappe PR Bot
cfda332faf fix: Swedish translations 2024-07-07 00:29:52 +05:30
DaizyModi
c52fdffdaf fix: Project Status should be Open again if percent_complete is not 100 2024-07-06 19:05:36 +05:30
ruthra kumar
4cea34c1c6 Merge pull request #42146 from ljain112/fix-general-ledger
fix: Multiple fixes for General Ledger Report
2024-07-06 17:14:36 +05:30
rohitwaghchaure
f06ba0cc36 fix: provision to enable do not use batch-wise valuation (#42186)
fix: provision to enable do not use batchwise valuation
2024-07-05 20:14:32 +05:30
ruthra kumar
3aaa22e672 refactor: test suite for item-wise sales register 2024-07-05 10:04:58 +05:30
ruthra kumar
9474f72776 chore: rename test suite for payable report 2024-07-05 09:40:33 +05:30
ruthra kumar
36403cde98 Merge pull request #42183 from ruthra-kumar/empty_item_on_select
fix: empty item-wise sales/purchase register reports on initial load
2024-07-04 15:06:17 +05:30
ruthra kumar
ee862126e4 fix: empty item-wise sales/purchase register reports on initial load 2024-07-04 15:01:35 +05:30
Syed Mujeer Hashmi
55e2b876a2 fix: Consider adding warranty period to serial nos (#42051) 2024-07-04 14:38:06 +05:30
ruthra kumar
ddaf81fc33 Merge pull request #41975 from Nihantra-Patel/fix_iwpr_v15
fix: group by in item-wise purchase register
2024-07-04 14:37:35 +05:30
Richard Case
9cfe09bdf6 fix: BOM Creator Recursion Error on duplicate save (#41622) 2024-07-04 14:35:56 +05:30
ruthra kumar
1594e7bc25 Merge pull request #42143 from ruthra-kumar/validation_to_prevent_recurse_with_mixed
refactor: validation to prevent recursion with mixed conditions
2024-07-03 20:56:31 +05:30
ruthra kumar
6a2a6667d2 Merge pull request #42165 from ruthra-kumar/fix_recursize_free_items_on_item_group
fix: multiple free items on same Item Group
2024-07-03 17:57:28 +05:30
ruthra kumar
eb4af58bf0 test: validation on mixed condition and recursion on pricing rule 2024-07-03 17:54:41 +05:30
ruthra kumar
9bd4e7b709 test: validation on mixed condition with recursion 2024-07-03 17:11:32 +05:30
ruthra kumar
9d7be293ae fix: use standard method to get _doc_before_save 2024-07-03 17:05:13 +05:30
Raffael Meyer
e923e539d8 Merge pull request #42157 from Nihantra-Patel/fix_asset_log_path 2024-07-03 12:54:48 +02:00
ruthra kumar
c4ae0d283f fix: multiple free items on same Item Group 2024-07-03 15:58:19 +05:30
Markus Lobedann
4512432816 refactor: remove obsolete function call (#42162) 2024-07-03 12:21:12 +02:00
rohitwaghchaure
938dd4b2aa fix: manual pick allow to pick more than available stock (#42155) 2024-07-03 13:33:17 +05:30
Nihantra C. Patel
909aa8f359 fix: path of automatically updates the status of asset maintenance log 2024-07-03 13:12:00 +05:30
rohitwaghchaure
1dae2156e3 fix: show zero stock items filter in the stock balance report (#42147) 2024-07-03 07:39:47 +05:30
ruthra kumar
dc5d3b69be Merge pull request #42073 from ruthra-kumar/fix_lcv_repost_on_item_revaluation
fix: always post to tax account heads if LCV is booked
2024-07-03 07:03:48 +05:30
Frappe PR Bot
9eb0521e95 fix: sync translations from crowdin (#41635) 2024-07-03 00:00:10 +02:00
David Arnold
c39a44c016 perf: flush db at once 2024-07-02 19:48:23 +02:00
ljain112
c8a34cde7f fix: updated logic for calculating tax_withholding_net_total in payment entry 2024-07-02 19:07:31 +05:30
Sagar Vora
97f02015c2 fix: Multiple fixes for General Ledger Report 2024-07-02 17:38:40 +05:30
ruthra kumar
0e256b8b29 refactor(test): fix flaky test 2024-07-02 17:00:16 +05:30
Khushi Rawat
bd98f2f685 Merge pull request #42144 from khushi8112/site-migration-issue
fix: handle none type object error
2024-07-02 16:36:50 +05:30
Khushi Rawat
6760c9c4e2 fix: handle none type object error 2024-07-02 16:10:47 +05:30
ruthra kumar
6ba6b5aa33 refactor(test): cleanup test data 2024-07-02 15:50:01 +05:30
ruthra kumar
406dfd528f refactor: validation to prevent recursion with mixed conditions 2024-07-02 15:44:54 +05:30
ruthra kumar
fa56555150 test: Repost should not merge expense accounts from LCV 2024-07-02 12:45:01 +05:30
ruthra kumar
0fcd5d5130 fix: always post to tax account heads if LCV is booked 2024-07-02 12:10:22 +05:30
rohitwaghchaure
99f2735ad3 fix: stock qty validation in SCR (#42124) 2024-07-01 18:19:20 +05:30
ruthra kumar
cbd25aeaa4 Merge pull request #42126 from ruthra-kumar/sales_order_credit_limit_check_on_reopen
fix: Re-open allows SO's to be over credit limit
2024-07-01 17:02:31 +05:30
Khushi Rawat
c5e474f4f5 fix: add auto-update for overdue status (#42105)
* fix: auto-update for overdue status

* chore: use qb.update
2024-07-01 16:55:49 +05:30
ruthra kumar
60694e09c4 test: credit check on Sales Order re-open 2024-07-01 16:43:33 +05:30
ljain112
db807d433b fix: removed max discount validation for sales return 2024-07-01 16:07:38 +05:30
ruthra kumar
5eed781263 fix: Re-open allows SO's to be over credit limit 2024-07-01 15:49:48 +05:30
rohitwaghchaure
8f424528dd fix: batch reset while making SABB (#42076) 2024-07-01 14:14:19 +05:30
ruthra kumar
7c9129d0be Merge pull request #42119 from ruthra-kumar/ui_typerror_on_lead
fix: broken button under `Actions` in Lead doctype
2024-07-01 13:20:07 +05:30
ruthra kumar
f440e7cd94 fix: broken UI buttons under Actions in Lead 2024-07-01 13:15:36 +05:30
Khushi Rawat
55a4bd469b fix: resolve gl entries duplication in asset purchase workflow (#41845)
* fix: resolve gl entries duplication in asset purchase workflow

* fix: prevent duplicate entry when creating purchase receipt from purchase invoice

* chore: test case added

* fix: fixed missing asset category issue
2024-07-01 13:08:51 +05:30
ruthra kumar
9d8794f3ca Merge pull request #42014 from Nihantra-Patel/fix_lead_issue_dev
fix: creation of contact, customer, opportunity, quotation and prospect from lead
2024-07-01 13:05:41 +05:30
ruthra kumar
ec9ab6d762 Merge pull request #42000 from blaggacao/payments/pr-3
perf: flush db at once
2024-07-01 09:58:08 +05:30
Smit Vora
188f0e0f32 Merge pull request #41896 from cogk/fix-so-supplier-change-detection
fix(SO): Fix logic to check if supplier has changed
2024-07-01 08:09:51 +05:30
creative-paramu
6e2ac09821 fix: bank reconcilation tool cost center company filter adding 2024-06-30 20:37:09 +05:30
ruthra kumar
8b0de4aaf7 Merge pull request #42029 from ruthra-kumar/bug_in_advance_against_journal
fix: incorrect ledger entries on Advance payment against Journals for customer
2024-06-30 05:37:51 +05:30
rohitwaghchaure
32bdcdb08f fix: timeout error while submitting JV (#42040) 2024-06-29 07:35:13 +05:30
rohitwaghchaure
03e674e21d fix: reposting file attachment permission issue (#42068) 2024-06-28 23:25:17 +05:30
ruthra kumar
9ec6aef95d refactor: handle purchase invoice as reference 2024-06-28 20:48:22 +05:30
ruthra kumar
ad7efd5939 chore: better test name 2024-06-28 20:40:35 +05:30
ruthra kumar
1b384b9942 test: advance payment entry against journal - supplier type 2024-06-28 20:40:35 +05:30
ruthra kumar
5e84272cf9 test: advance payment against journal entry - customer type 2024-06-28 20:40:35 +05:30
ruthra kumar
f6c1dffb35 fix: incorrect dr/cr on Adv Payment against Journals 2024-06-28 20:40:35 +05:30
tonspar
affaaee1f4 fix: Correct dunnings resolving after PE submit (#41792)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2024-06-28 13:47:51 +02:00
Raffael Meyer
0c5cda1380 Merge pull request #42063 from barredterra/stage-only-pot-file 2024-06-28 13:24:17 +02:00
Smit Vora
252d052f86 Merge pull request #41979 from ljain112/fix-dashboard
fix: dynamic_link for party in customer and supplier dashboard
2024-06-28 12:04:23 +05:30
barredterra
1f74439b16 ci: explicitly stage pot file
Avoid accidentally adding any other changed files, like yarn.lock, to the commit.
2024-06-27 19:43:46 +02:00
Khushi Rawat
ba79e68190 fix: refactor Asset Repair and Stock Entry linkage to resolve amendme… (#41919)
* fix: refactor Asset Repair and Stock Entry linkage to resolve amendment issues

* chore: added missing patch to patches.txt

* chore: fixing previous changes

* chore: fixing minor issues

* fix: code changes to enhance efficiency

* chore: replaced frappe.qb with db.sql because of conflict

* fix: minor changes
2024-06-27 17:34:25 +05:30
rohitwaghchaure
9738c04ef0 fix: not able to make purchase return (#42053) 2024-06-27 16:01:51 +05:30
Raffael Meyer
f850ccc4d8 Merge pull request #42054 from frappe/pot_develop_2024-06-27 2024-06-27 12:31:43 +02:00
frappe-pr-bot
7b5e041928 chore: update POT file 2024-06-27 10:15:22 +00:00
Raffael Meyer
42d401a1dd Merge pull request #42048 from barredterra/ci-typo 2024-06-26 18:58:26 +02:00
barredterra
26aa1a128f ci: fix typo in pot file regeneration 2024-06-26 17:54:51 +02:00
Khushi Rawat
80c6981cfa fix: unhide serial no field (#42045) 2024-06-26 12:22:52 +00:00
Nihantra C. Patel
8ae2b8ff8c fix: lead status filter (#41816) 2024-06-26 17:45:57 +05:30
Khushi Rawat
625f16dee0 fix: incorrect time period in asset depreciation schedule (#41805)
* fix(wip): depreciation calculation for existing asset

* fix(wip): added validation for incorrect depreciation period

* fix: depreciation schedule time period issue for existing asset

* chore: run pre-commit checks and apply fixes

* style: apply formatting changes

* style: made some necessary changes

* chore: modified test
2024-06-26 16:33:53 +05:30
Khushi Rawat
5fdd1d3278 chore: patch to enable total number of booked depreciations field (#41940)
* chore: patch to enable total number of booked depreciations field

* fix: conflict resolved

* refactor: replaced fb_row.db_set with set_value
2024-06-26 16:28:27 +05:30
rohitwaghchaure
eca3e02f8d fix: manufacturing date issue in the batch (#42034) 2024-06-26 09:11:20 +05:30
Poorvi-R-Bhat
1a9899b32b fix: Stock Reservation Entry was not getting created (#42033) 2024-06-25 18:42:07 +05:30
mergify[bot]
2e76b9f9db fix: timeout while cancelling LCV (backport #42030) (#42031)
fix: timeout while cancelling LCV (#42030)

fix: timeout while canelling LCV
(cherry picked from commit 21bf7fd1f8)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-06-25 18:11:41 +05:30
ljain112
ba08b2e8e8 fix: changes as per review 2024-06-25 17:48:10 +05:30
Raffael Meyer
61fe95a0bd Merge pull request #41756 from fzozyurt/tr_account_plan-#41536 2024-06-25 12:56:09 +02:00
Khushi Rawat
1c643a0ead fix: fixed asset value in Fixed Asset Register (#41930) 2024-06-25 16:05:04 +05:30
Khushi Rawat
5738d93f95 perf: code optimization to handle large asset creation (#42018) 2024-06-25 15:30:17 +05:30
ljain112
98ad01c736 fix: field position 2024-06-25 15:04:21 +05:30
ljain112
2112d8f772 fix: download_import_log if rows are greater than 5000 2024-06-25 14:55:51 +05:30
ljain112
1ad264de48 fix: import log preview 2024-06-25 14:47:23 +05:30
rohitwaghchaure
97c9941143 fix: batch picking in pick list based on Stock Settings (#42021) 2024-06-25 14:28:31 +05:30
ljain112
07f68884e0 fix: import status 2024-06-25 14:27:28 +05:30
ljain112
b202409428 fix: remove deprecated field "statement_import_log" 2024-06-25 14:27:04 +05:30
ljain112
13fb560401 fix: custom delimiters 2024-06-25 13:05:30 +05:30
rohitwaghchaure
9ab333d105 fix: valuation rate for the legacy batches (#42011) 2024-06-25 12:32:27 +05:30
Nihantra Patel
5844897c34 fix: creation of contact, customer, opportunity, quotation and prospect from lead --prettier 2024-06-24 16:03:39 +05:30
Nihantra Patel
8304d19e8b fix: creation of contact, customer, opportunity, quotation and prospect from lead 2024-06-24 15:54:01 +05:30
rohitwaghchaure
d50487ce53 fix: Wrong Delete Batch on Purchase Receipt (#42007) 2024-06-24 14:56:08 +05:30
rohitwaghchaure
7d91c6cbd5 fix: incorrect Difference Amount (#42008) 2024-06-24 14:55:57 +05:30
Deepesh Garg
379a290625 Merge pull request #41751 from rtdany10/gp-dimension
feat: accounting dimension filters in gp report
2024-06-24 10:51:55 +05:30
David
cf6c13ecae perf: flush db at once 2024-06-23 16:47:41 +02:00
ruthra kumar
73d56c4b33 Merge pull request #41704 from blaggacao/payments/pr-2
chore: clarify codepath around mute email and make invoice
2024-06-23 05:39:00 +05:30
ruthra kumar
5ec62756fb Merge pull request #41976 from ruthra-kumar/pricing_rule_priority_and_apply_multiple
fix: pricing rule with and without 'apply multiple' and priority
2024-06-23 05:31:20 +05:30
ruthra kumar
a4c0115b5e Merge pull request #41844 from ruthra-kumar/forex_accounts_support_for_advance_accounts
refactor: allow foreign currency advance accounts
2024-06-23 05:26:52 +05:30
Sagar Vora
ac6d85aed6 perf: dont run queries unnecessarily, improved filters (#41993)
* perf: dont run queries unnecessarily, improved filters

* perf: dont run query if `in` filter is empty
2024-06-22 21:27:00 +05:30
ruthra kumar
efebc3662e test: priority takes effect on with and without apply multiple 2024-06-22 20:30:55 +05:30
ruthra kumar
3fabf4aaa4 refactor(test): make and use a different party for subscription 2024-06-22 19:32:07 +05:30
rohitwaghchaure
fd7666a029 feat: default account head for operating cost (#41985) 2024-06-21 18:56:48 +05:30
ruthra kumar
4f92ab0ac7 Merge pull request #41981 from ruthra-kumar/repost_should_update_against_account
fix: incorrect against_account upon reposting
2024-06-21 17:58:14 +05:30
rohitwaghchaure
21adc7b63e fix: decimal issue in pick list (#41972) 2024-06-21 17:41:48 +05:30
ruthra kumar
20c4098399 fix: incorrect against_account upon reposting 2024-06-21 17:21:32 +05:30
ljain112
c0a8800832 fix: dynamic_link for party in customer and supplier dashboard 2024-06-21 16:08:04 +05:30
ruthra kumar
5f8f81c0ba Merge pull request #41956 from ruthra-kumar/discount_on_other_item
fix: incorrect discount on other item
2024-06-21 15:51:17 +05:30
Nihantra C. Patel
3fab00135b fix: group by in item-wise purchase register 2024-06-21 15:49:40 +05:30
ruthra kumar
5e875b238c fix: pricing rule with and without 'apply multiple' and priority
Either all of the pricing rules identified for an item should have
'apply multiple' enabled. If not, Priority is applied and only the
highest priority is applied
2024-06-21 15:46:16 +05:30
Raffael Meyer
86869ac8b8 Merge pull request #41966 from barredterra/per-for-shipment 2024-06-20 14:34:39 +02:00
barredterra
100d8e2007 fix: move condition for shipment 2024-06-20 14:33:03 +02:00
rohitwaghchaure
d5ed4582c3 fix: this.frm.events.update_cost is not a function (#41960) 2024-06-20 17:05:19 +05:30
mahsem
f28c692dca fix: add string for translation (#41903)
fix: add string for translation
2024-06-20 14:23:57 +05:30
rohitwaghchaure
306ab454d5 Merge pull request #41957 from rohitwaghchaure/fixed-17237
fix: expense account from item group not fetched
2024-06-20 14:22:22 +05:30
rohitwaghchaure
ef744c1f2c Merge pull request #41958 from rohitwaghchaure/fixed-17439
fix: do not show zero balance stock items in stock balance report
2024-06-20 14:19:13 +05:30
hiteshprajapati
b823aa66bf fix: Don't allow negative amount on Payment Request #41905 2024-06-20 14:11:18 +05:30
Rohit Waghchaure
7f7b363d48 fix: do not show zero balance stock in stock balance 2024-06-20 13:59:02 +05:30
Rohit Waghchaure
86ebe58231 fix: expense account from item group not fetched 2024-06-20 13:42:45 +05:30
ruthra kumar
654764e398 fix: incorrect discount on other item
When discount is applied on other item, don't update `discount_amount`
as the amount is calculated for current item
2024-06-20 12:04:00 +05:30
Nihantra Patel
2851764ed6 refactor: item-wise purchase history (query to script report) --upd 2024-06-19 16:09:44 +05:30
Nihantra Patel
7bae18aba8 refactor: item-wise purchase history (query to script report) --prettier 2024-06-19 15:06:09 +05:30
Nihantra Patel
f740c94363 refactor: item-wise purchase history (query to script report) --prettier 2024-06-19 14:59:24 +05:30
Nihantra Patel
003a9608dc refactor: item-wise purchase history (query to script report) -- formatter 2024-06-19 14:57:02 +05:30
Nihantra Patel
49331e6109 refactor: item-wise purchase history (query to script report) 2024-06-19 14:37:29 +05:30
Nihantra Patel
5de91cf55e refactor: item-wise purchase history (query to script report) 2024-06-19 14:31:52 +05:30
Raffael Meyer
a9910817f5 Merge pull request #41421 from frappe/migrate_lead_notes 2024-06-19 00:56:04 +02:00
ruthra kumar
64e63887be refactor(test): enfore use of customer/supplier master
While using advance accounts in foreign currency, always use
Customer/Supplier master to maintain them
2024-06-18 15:10:25 +05:30
ruthra kumar
c696d13a5e fix(test): incorrect field for customer default billing currency 2024-06-18 14:35:35 +05:30
ruthra kumar
8a397a4506 Merge pull request #41900 from ljain112/unreco
refactor: ignore unreconcile doc for PO and SO on cancel/delete
2024-06-18 10:26:58 +05:30
rohitwaghchaure
1cce7064e0 Merge pull request #41936 from casesolved-co-uk/prodplan_bomqty_test
feat: add production plan test for complex bom qtys
2024-06-18 09:42:35 +05:30
Richard Case
3025501500 chore: linting 2024-06-17 17:55:23 +01:00
Richard Case
a2ba0f51a0 feat: add production plan test for complex bom qtys 2024-06-17 17:49:31 +01:00
rohitwaghchaure
46d33d27cf Merge pull request #41931 from rohitwaghchaure/fixed-validation-for-reposting
fix: reposting validation related PCV
2024-06-17 17:49:35 +05:30
rohitwaghchaure
8141eacb02 Merge pull request #41907 from mahsem/fix-add-strings-for-translation-in-pos_item_cart.js
fix: add strings for translation in pos_item_cart.js
2024-06-17 17:09:42 +05:30
Rohit Waghchaure
194f1dc674 fix: reposting validation related PCV 2024-06-17 16:54:02 +05:30
rohitwaghchaure
28f195023e Merge pull request #41920 from ljain112/fix-sales-register
fix: handle NoneType error where customer details are not available in sales register
2024-06-17 14:58:07 +05:30
rohitwaghchaure
2e5b85c329 Merge pull request #41927 from ljain112/fix-item-pur-report
fix: consistent query field name in item wise purchase register with item wise sales register
2024-06-17 14:57:08 +05:30
ljain112
6d539e0fc0 fix: consistent query field name in item wise purchase register with item wise sales register 2024-06-17 14:30:31 +05:30
rohitwaghchaure
1b072228d3 Merge pull request #41921 from Nihantra-Patel/item-wise-sales_purchase_report_v15
fix: item_code filter in item-wise sales-purchase register
2024-06-17 14:01:06 +05:30
David
18993a97ce fix: spec mobile and email fields for notifications 2024-06-17 10:28:38 +02:00
rohitwaghchaure
2c0f03d43a Merge pull request #41922 from rohitwaghchaure/fixed-17235
fix: duplicate rows fetching in RFQ
2024-06-17 13:05:18 +05:30
Rohit Waghchaure
555510c128 fix: duplicate rows fetching in RFQ 2024-06-17 12:48:44 +05:30
Nihantra Patel
757aef3972 fix: item_code filter in item-wise sales-purchase register 2024-06-17 12:33:14 +05:30
ljain112
f876fec6f5 fix: handle NoneType error where customer details are not available in sales register 2024-06-17 12:32:17 +05:30
rohitwaghchaure
3f13554bfb Merge pull request #41898 from Nihantra-Patel/upd_mr_received_qty_v15
fix: update received qty in MR on purchase invoice submit with update stock
2024-06-17 11:35:36 +05:30
rohitwaghchaure
4fc43b9009 Merge pull request #41916 from rohitwaghchaure/fixed-incorrect-batch-returned
fix: incorrect batch return from sales return
2024-06-17 11:16:31 +05:30
Rohit Waghchaure
317047c808 fix: incorrect batch return from sales return 2024-06-17 10:22:06 +05:30
ruthra kumar
7e318c0132 chore: remove dead code 2024-06-17 08:45:54 +05:30
ruthra kumar
07d59443b7 chore: fix test data 2024-06-17 07:39:52 +05:30
ruthra kumar
83ff94b9b8 refactor: better error messages 2024-06-17 07:29:24 +05:30
fzozyurt
b401ba2c26 feat: Create Turkish Chart Of Accounts 2024-06-15 20:58:24 +03:00
ruthra kumar
7479459cb6 Merge pull request #40187 from GursheenK/valuation-tax-gle-via-lcv
fix: valuation tax entries on LCV after billing PR
2024-06-15 20:41:22 +05:30
barredterra
895aede590 fix: only show user and date if available 2024-06-14 17:47:02 +02:00
mahsem
2fb3e5da4a fix: add strings for translation in pos_item_cart.js
fix: add strings for translation in pos_item_cart.js
2024-06-14 15:40:08 +02:00
Nihantra Patel
77959596db fix: add test case for update received qty in MR - import sorter 2024-06-14 16:50:49 +05:30
Nihantra Patel
73f22ba9a0 fix: add test case for update received qty in MR - import sorter 2024-06-14 16:50:04 +05:30
Nihantra Patel
62e4e88f1d fix: add test case for update received qty in MR 2024-06-14 16:47:30 +05:30
Nihantra Patel
cff1050159 fix: add test case for update received qty in MR 2024-06-14 16:46:23 +05:30
Nihantra Patel
ebb0cef601 fix: add test case for update received qty in MR 2024-06-14 16:44:26 +05:30
ljain112
b618d685c6 refactor: ignore unreconcile doc for PO and SO on cancel/delete 2024-06-14 13:13:11 +05:30
Nihantra Patel
13cb53fa89 fix: update received qty in MR on purchase invoice submit with update stock 2024-06-14 12:39:45 +05:30
Corentin Flr
339b6692fe fix(SO): Fix logic to check if supplier has changed 2024-06-13 18:11:42 +02:00
Smit Vora
99695df7bc Merge pull request #41842 from ljain112/fix-item-valuation
fix: regional overide for updating item valution
2024-06-13 13:38:24 +05:30
rohitwaghchaure
7996723e07 Merge pull request #41886 from Kishan0330/bugfix/download-materials-required-v15
fix: download materials request plan in production plan
2024-06-13 11:14:02 +05:30
Deepesh Garg
8b3c0f6d69 Merge pull request #41112 from barredterra/print-language
fix: language in sales transactions
2024-06-13 00:09:49 +05:30
Kishan0330
f4e369977a refactor: change warehousesData variable name 2024-06-12 22:08:29 +05:30
Kishan0330
6e55651795 fix: download materials request plan in production plan 2024-06-12 21:46:30 +05:30
mergify[bot]
b44630a28c Merge branch 'develop' into print-language 2024-06-12 15:40:34 +00:00
Bernhard Sirlinger
d85f316995 fix: correct creation of opportunity with lead dashboard plus button (#40987) 2024-06-12 16:52:25 +05:30
Rucha Mahabal
56082f5a29 fix: allow Employee role to select Department (#41877) 2024-06-12 11:19:39 +00:00
rohitwaghchaure
75983ead33 Merge pull request #41872 from rohitwaghchaure/fixed-purchase-receipt-return-issue-16966
fix: return from accepted and rejected warehouse at a same time not working
2024-06-12 15:45:35 +05:30
Rohit Waghchaure
17731f09ef fix: return from accepted and rejected warehouse at a same time not working 2024-06-12 15:13:59 +05:30
rohitwaghchaure
9f3b1ce5d5 Merge pull request #41867 from Nihantra-Patel/download_materials_required_v15
fix: download materials request plan in PP
2024-06-12 13:02:06 +05:30
Himanshu Shivhare
7ee2a19f53 chore: typo in bom_operation.json (#41650)
chore: typo in bom_operation.json
2024-06-12 13:01:28 +05:30
rohitwaghchaure
53d99b7c8c Merge pull request #41865 from rohitwaghchaure/fixed-batch-qty-16601
fix: batch qty in the dropdown field
2024-06-12 13:00:30 +05:30
Nihantra C. Patel
a1c4e0e93c fix: download materials request plan in PP -prettier 2024-06-12 12:36:53 +05:30
Nihantra C. Patel
cb52b76342 fix: download materials request plan in PP 2024-06-12 12:34:46 +05:30
Nihantra C. Patel
f4acdd9636 fix: download materials request plan in PP 2024-06-12 12:26:40 +05:30
Rohit Waghchaure
eb426c69fe fix: batch qty in the dropdown field 2024-06-12 12:12:58 +05:30
rohitwaghchaure
7249a691b3 fix: valuation rate for serial and batch bundle for current bundle (#41850) 2024-06-11 18:10:02 +05:30
Deepesh Garg
db313706a7 Merge pull request #41852 from deepeshgarg007/ledger_views
fix: Add timestamp to key for immutable views
2024-06-11 15:04:55 +05:30
Deepesh Garg
6bded59f1c fix: Add timestamp to key for immutable views 2024-06-11 14:47:08 +05:30
Khushi Rawat
857c689405 fix: asset depreciations and balances report correction (#41824)
* fix: asset depreciations and balances report correction

* chore: suppress linter warnings with # nosemgrep
2024-06-11 14:27:28 +05:30
ruthra kumar
8d7e68d355 Merge pull request #41707 from ruthra-kumar/is_opening_for_payment_entry
refactor: add `Is opening` flag for payment entry
2024-06-11 10:26:01 +05:30
ruthra kumar
4c03dcb4ba Merge pull request #41685 from ruthra-kumar/allow_partial_tds_on_purchase_invoice
refactor: enabling partial TDS application on partial invoice
2024-06-11 10:10:43 +05:30
ruthra kumar
17f968e1e1 test: is_opening flag for advance in separate party account 2024-06-11 10:08:49 +05:30
ruthra kumar
107b614518 refactor: validation in Supplier Group 2024-06-10 20:16:23 +05:30
ruthra kumar
4f9a228175 refactor: validation in customer group 2024-06-10 20:16:23 +05:30
ruthra kumar
0f0b4d88bc refactor: validation to force accounts to be on same currency 2024-06-10 20:16:23 +05:30
ruthra kumar
90c84822d0 test: advance against purchase invoice 2024-06-10 20:16:23 +05:30
ruthra kumar
827d67d02f test: exc gain/loss booking on advances under asset/liability 2024-06-10 20:16:23 +05:30
ruthra kumar
475e0ddeee refactor(test): simpler create_account helper method 2024-06-10 20:16:23 +05:30
ruthra kumar
7dce6e03c7 refactor: for advances uses the party account in references table 2024-06-10 20:16:23 +05:30
ruthra kumar
c9ede1ffbe refactor: convert amount to base currency for advances 2024-06-10 20:16:23 +05:30
ruthra kumar
e7740033ca chore: remove validation on payment entry 2024-06-10 20:16:14 +05:30
ljain112
1a10f0bcbd fix: regional overide for updating item valution 2024-06-10 20:06:05 +05:30
rohitwaghchaure
7ce9f7bc12 chore: patch to enable old serial/batch fields (#41723)
* chore: patch to enable old serial/batch fields

* chore: fix linters issue
2024-06-10 19:08:59 +05:30
Poorvi-R-Bhat
d9ddad0f1f fix:Tasks with duration less than a day not displayed correctly#15554 (#41633)
* fix: Tasks with duration less than a day not displayed correctly#15554

* fix: Tasks with duration less than a day not displayed correctly#15554
2024-06-10 17:30:35 +05:30
ruthra kumar
cf0a29b05f fix: use invoice outstanding on Dunning (#41817) 2024-06-10 17:14:27 +05:30
ruthra kumar
fec9d45ab3 Merge pull request #41793 from Nihantra-Patel/update_totals_taxes_15
fix: calculate totals and taxes
2024-06-10 15:17:28 +05:30
rohitwaghchaure
4b026d66dc fix: terms and conditions for material request (#41834) 2024-06-10 14:47:03 +05:30
rohitwaghchaure
36413d14d8 fix: do not fetch items with no active BOM in PP (#41833) 2024-06-10 14:18:39 +05:30
Deepesh Garg
c9bcd70173 Merge pull request #41424 from Poorvi-R-Bhat/item-code-purchase-sales-register
fix: Item-wise Sales and Purchase register with no item codes #41373
2024-06-09 11:42:09 +05:30
rohitwaghchaure
f6a4d391c0 fix: stock_value_change for legacy serial nos (#41825) 2024-06-07 22:34:05 +05:30
Deepesh Garg
8ec364df6f fix: Add additional condition application 2024-06-07 18:48:16 +05:30
rohitwaghchaure
3956354e08 fix: valuation rate for backdated legacy serial/batches (#41788) 2024-06-07 16:15:38 +05:30
Nihantra C. Patel
699cfd85c6 fix: typo in method - holiday list (#41811) 2024-06-06 19:05:57 +05:30
Deepesh Garg
c992656fa8 Merge pull request #41808 from deepeshgarg007/general_ledger_key
fix: Add posting date to key for consolidated view
2024-06-06 17:43:43 +05:30
Deepesh Garg
2c164b47a1 fix: Add posting date to key for consolidated view 2024-06-06 17:22:27 +05:30
ruthra kumar
746f95660d Merge pull request #41804 from ruthra-kumar/allow_system_manager_for_repost_settings
chore: repost settings permission overhaul
2024-06-06 15:56:33 +05:30
ruthra kumar
458d8f5ed8 chore: repost settings permission overhaul 2024-06-06 13:57:14 +05:30
Deepesh Garg
49e180a9b9 Merge pull request #41727 from deepeshgarg007/price_rule_change
fix: Do no apply pricing rule on qty change for mapped docs
2024-06-06 09:13:24 +05:30
Nihantra C. Patel
a7ec0c1cec fix: calculate totals and taxes 2024-06-05 15:49:44 +05:30
fzozyurt
5c8ea86a3f feat: Create Turkish Chart Of Accounts 2024-06-05 06:17:42 +03:00
Viny Selopal
c76f466528 fix(Vehicle): allow doc renaming and add test (#41729)
fix(Vehicle): allow renaming doc and add test
2024-06-04 21:55:27 +05:30
Nabin Hait
689e1cfc23 fix: Copy depreciation schedule on asset split only if it exists (#41775) 2024-06-04 21:50:43 +05:30
Nabin Hait
d163dbec7d fix: bank account no fieldname mismatch (#41778) 2024-06-04 21:50:05 +05:30
Nabin Hait
4ff3e6caaa fix: local var referenced before assignment (#41780) 2024-06-04 21:49:56 +05:30
Nabin Hait
71f5470dfd fix: convert percentage from str to float (#41766) 2024-06-04 15:19:42 +05:30
Nabin Hait
12e48f0b63 fix: link opportunity in prospect after creating opportunity from prospect (#41769) 2024-06-04 15:19:24 +05:30
rohitwaghchaure
cb6d8afa26 fix: incorrect batch selection while sales return (#41768) 2024-06-04 14:34:10 +05:30
rohitwaghchaure
cf508ce1ed fix: TypeError: 'float' object is not iterable (#41758) 2024-06-04 11:58:32 +05:30
Khushi Rawat
a8fc32dc32 fix: incorrect accumulated depr amount in asset depr ledger (#41654)
* fix: incorrect accumulated depr amount in asset depr ledger

* refactor: depreciation amount retrieval with query builder

* style: apply formatting changes from pre-commit
2024-06-04 11:44:39 +05:30
Khushi Rawat
60eb03a6c6 fix(minor): corrected wrong filter condition (#41755) 2024-06-04 11:43:15 +05:30
Nabin Hait
80f6228d45 fix: Ignore disabling default currency field while creating new company (#41699) 2024-06-04 11:42:20 +05:30
mergify[bot]
c3ae5bc6a5 fix: get assets received but not billed account only if any asset item is received (backport #41734) (#41750)
fix: get assets received but not billed account only if any asset item is received (#41734)

fix: get assets received but not billed account only if any asset item received
(cherry picked from commit 39885b2b01)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2024-06-04 11:22:13 +05:30
Dany Robert
e26bc17c75 feat(gp): group by cost center 2024-06-03 13:55:12 +00:00
Dany Robert
d165638bbb feat: accounting dimension filters in gp report 2024-06-03 13:45:55 +00:00
mergify[bot]
a2039bae10 fix: set expense account as Assets RBNB only if it is booked in linked PR (backport #41368) (#41733)
fix: set expense account as Assets RBNB only if it is booked in linked PR (#41368)

* fix: set expense account as Assets RBNB only if it is booked in linked PR

* fix: broken translations

(cherry picked from commit 014486de39)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2024-06-03 18:36:37 +05:30
Nabin Hait
740c495014 fix(stock settings): Allowed any number in stock frozen upto days field (#41736) 2024-06-03 18:34:57 +05:30
Nabin Hait
9a3569ff15 fix: Use full name instead of abbreviation (#41738) 2024-06-03 18:34:27 +05:30
Nabin Hait
d30c797d24 fix(Company): Allow Equity type account in unrealised exchange gain/loss account (#41740) 2024-06-03 18:33:48 +05:30
ruthra kumar
2be8e0dce0 Merge pull request #41742 from ruthra-kumar/allow_submit_for_repost
chore: System Manager shluld have  submit permission for repost doctypes
2024-06-03 17:49:31 +05:30
Nihantra C. Patel
441596f795 fix: payment term when creating PO from SO (#41376)
* fix: payment term when creating PO from SO

* fix: payment term when creating PO from SO

* fix: payment term when creating PO from SO

* fix: payment term when creating PO from SO
2024-06-03 17:45:31 +05:30
ruthra kumar
4558f64c0f chore: Sys Manager shluld have submit permission for repost doctypes 2024-06-03 17:31:27 +05:30
Nihantra C. Patel
4f0214d00e fix: completed DC will not appear in a delivery trip (#41655)
* fix: completed DC will not appear in a delivery trip

* fix: completed DC will not appear in a delivery trip
2024-06-03 17:26:14 +05:30
Nihantra C. Patel
3c3313594d fix: correcting balance sheet calculation for zero liabilities and equity (#41497)
* fix: correcting balance sheet calculation for zero liabilities and equity

* fix: correcting balance sheet calculation for zero liabilities and equity
2024-06-03 16:05:49 +05:30
Nihantra C. Patel
5a75c847fe fix: Select both account number and company in the account form (#41731)
* fix: Both the account number and the company should be selected in the account form

* fix: select both account number and company in the account form
2024-06-03 15:40:07 +05:30
Deepesh Garg
2b1242170c fix: Do no apply pricing rule on qty change for mapped docs 2024-06-03 10:09:20 +05:30
Deepesh Garg
d2af36e1eb chore: update condition queries in qb 2024-06-02 20:17:24 +05:30
rohitwaghchaure
9e9296e444 feat: track Semi-finished goods (including subcontracted items) against Job Cards (#38341)
* feat: Track Semi-finished goods (including subcontracted items) against Job Cards

* feat: option to add raw materials manually against operation
2024-06-02 01:28:58 +05:30
Deepesh Garg
24926ab665 Merge pull request #41717 from deepeshgarg007/jv_transaction_currency_new
fix: Transaction currency value in Journal Entry
2024-06-01 20:46:43 +05:30
Deepesh Garg
169d77da54 fix: Transaction currency value in Journal Entry 2024-06-01 19:31:28 +05:30
ruthra kumar
666232fd1c Merge pull request #41658 from rtdany10/pr-transaction-condition
fix: condition-wise filter for transaction based pricing rule
2024-06-01 16:18:50 +05:30
rohitwaghchaure
ee846f5950 feat: optional to reconcile all serial nos / batches in stock reconciliation (#41696)
feat: optional to reconcile all serial/batch
2024-06-01 15:25:51 +05:30
Markus Lobedann
0ba4bff943 Merge branch 'frappe:develop' into patch-1 2024-05-31 14:39:41 +02:00
ruthra kumar
c36f0e4a33 refactor: restrict to 'Advance in Separate Party Account' type 2024-05-31 17:11:40 +05:30
ruthra kumar
05d17d0d73 refactor: is_opening in payment entry 2024-05-31 16:55:04 +05:30
David
ee69ec97dd chore: clarify codepath around mute email and make invoice 2024-05-31 11:00:03 +02:00
rohitwaghchaure
4e37ed9033 fix: key error for stock ledger report (#41700) 2024-05-31 11:55:51 +05:30
ruthra kumar
07c421228b Merge pull request #41232 from FHenry/dev_fix_french_chart_of_account
fix: French chart of account the 4191 code must be of type Income Account
2024-05-31 10:17:21 +05:30
ruthra kumar
c6c696247a Merge pull request #41629 from blaggacao/payments/pr-1
test: add payment channel tests
2024-05-30 20:43:09 +05:30
rohitwaghchaure
968120d0eb fix: batch selection issue (#41692) 2024-05-30 18:06:29 +05:30
rohitwaghchaure
be9f960705 fix: show material to supplier button (#41686) 2024-05-30 14:05:20 +05:30
ruthra kumar
091c5496b2 refactor: enabling partial TDS application on partial invoice 2024-05-30 11:49:47 +05:30
Dany Robert
3f2343614b fix: test for pricing rule transaction with cond 2024-05-30 05:21:22 +00:00
Nijith anil
388ba7f945 fix: work order created message pops up if no items are selected (#41677) 2024-05-29 23:32:07 +05:30
Deepesh Garg
289d216552 Merge pull request #41676 from deepeshgarg007/account_balace_report
fix: Filters in account balance report
2024-05-29 12:48:02 +05:30
Deepesh Garg
1c9fe691ea fix: Filters in account balance report 2024-05-29 12:25:56 +05:30
Deepesh Garg
c41b239881 Merge pull request #41548 from Nihantra-Patel/feat_trends_report
fix: add include closed orders option in so/po trends report
2024-05-29 10:31:51 +05:30
Deepesh Garg
9f85483199 Merge pull request #41374 from Nihantra-Patel/no_add_variant_item_dev
fix: not allow template item in product bundle item
2024-05-29 10:30:21 +05:30
Nihantra C. Patel
882227a460 fix: price list when invoice created from timesheet 2024-05-29 10:26:49 +05:30
Deepesh Garg
006b1f553c Merge pull request #40873 from Nihantra-Patel/upd_timesheet_task
fix: update the task status from timesheet
2024-05-29 10:00:53 +05:30
Khushi Rawat
6b0ce33030 refactor: renamed number of depreciations booked to opening booked de… (#41515)
* refactor: renamed number of depreciations booked to opening booked depreciations

* feat: introduced new field for showing total number of booked depreciations
2024-05-28 20:37:52 +05:30
rohitwaghchaure
ce834f5dba fix: multiple issues related to serial and batch bundle (#41662) 2024-05-28 18:48:09 +05:30
Marica
e3cf53a8b7 feat: Add Party details to Serial No Ledger Report (#41656)
- Since no party details are present in Serial No anymore, it is hard to get a view of which SN was sold to/purchased from which party
- Add Party fields to report
2024-05-28 15:28:02 +05:30
barredterra
4165fd44b5 Merge branch 'develop' into print-language 2024-05-27 18:52:05 +02:00
Raffael Meyer
d3bdd41358 Merge pull request #41659 from barredterra/auditor-perms 2024-05-27 18:48:50 +02:00
barredterra
eaa4efbc45 fix: allow Auditor to read a Fiscal Year 2024-05-27 17:40:08 +02:00
barredterra
06401cc84f fix: allow Auditor to select a company 2024-05-27 17:39:46 +02:00
Dany Robert
e3fd82766f fix: condition filter for transaction pricing rule 2024-05-27 14:50:28 +00:00
ruthra kumar
537e0e32b2 Merge pull request #40775 from casesolved-co-uk/sa_report
feat: significant enhancements to sales analytics report to support charts
2024-05-27 14:31:02 +05:30
ruthra kumar
47bc5691a1 refactor: remove use of can_create for Payment Request (#41647) 2024-05-27 09:57:11 +02:00
ruthra kumar
c5c4d5c61f Merge pull request #41401 from Nihantra-Patel/fix_project_cost_center_filter
fix: cost center filter according to the company in project
2024-05-27 10:09:37 +05:30
David
25931c4db2 test: add payment channel tests 2024-05-24 11:08:23 +02:00
rohitwaghchaure
683c1f04c8 fix: Unable to 'Get Suppliers' using tags in Request for Quotation (#41626) 2024-05-24 13:03:57 +05:30
Akhil Narang
b6350c86d1 Merge pull request #41601 from akhilnarang/add-indices
fix: add in some indices to speed up Purchase Order deletion
2024-05-24 10:57:04 +05:30
ruthra kumar
fac0fcb9d5 Merge pull request #41443 from cogk/fix-use-get-all-for-advance-status-update
fix(AccountsController): Use get_all to get payment requests when updating advance payment status
2024-05-24 10:40:15 +05:30
Akhil Narang
3f06f1905f refactor: use json directly instead of using frappe.json (#41609) 2024-05-23 16:00:42 +02:00
Frappe PR Bot
954ef85b95 fix: sync translations from crowdin (#41549) 2024-05-23 15:56:33 +02:00
Raffael Meyer
06c7ce1e95 Merge branch 'develop' into print-language 2024-05-23 14:36:49 +02:00
ruthra kumar
fffcb5dc9f Merge pull request #41594 from ruthra-kumar/refactor_payment_period_report
refactor: 'Payment Period Based On Invoice Date' report
2024-05-23 17:45:28 +05:30
ruthra kumar
5d0e82f40b Merge pull request #41603 from ruthra-kumar/remove_format_based_naming_on_internal_doctypes
refactor: remove 'format:' based naming in internal doctypes
2024-05-23 17:44:14 +05:30
ruthra kumar
e2ec3e453a refactor: remove 'format:' based naming in internal doctypes 2024-05-23 17:01:24 +05:30
Akhil Narang
0303d7dbdc fix: add in some indices to speed up Purchase Order deletion
`tabSales Order`.`inter_company_order_reference`
`tabSales Invoice Item`.`purchase_order`

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
2024-05-23 16:36:41 +05:30
rohitwaghchaure
418439b58f fix: SCR batch qty issue (#41595) 2024-05-23 14:51:54 +05:30
Akhil Narang
e39d2e1e69 Merge pull request #41576 from akhilnarang/sync-ruff-config
chore: sync ruff config with framework
2024-05-23 12:50:33 +05:30
ruthra kumar
c4e2abb973 refactor: replace against_voucher with against_voucher_no 2024-05-23 12:08:51 +05:30
ruthra kumar
014b542cf3 refactor: remove debit and credit 2024-05-23 11:59:57 +05:30
ruthra kumar
cb3c20dcd3 refactor: query payment ledger for payments 2024-05-23 11:52:53 +05:30
rohitwaghchaure
ad817cddad perf: sales order UI render (#41591) 2024-05-22 19:57:52 +05:30
rohitwaghchaure
04a49cef24 fix: opening stock not showing in the stock ledger report for the bat… (#41584)
fix: opening stock not showing in the stock ledger report for the batch filter
2024-05-22 18:22:40 +05:30
Poorvi-R-Bhat
eafa88b8e9 fix: fixing Item-wise sales register #41373 2024-05-22 12:39:22 +05:30
Poorvi-R-Bhat
76073ae228 fix: fixing Item-wise sales register and purchase register #41373 2024-05-22 12:26:02 +05:30
Ankush Menat
85b1a8001b ci: ruff only fix imports 2024-05-21 16:05:16 +05:30
Ankush Menat
3b4913ec81 ci: dont auto apply fixes
I've personally encountered ~5 instances of bad auto fixes, let
developers apply the fixes.
2024-05-21 16:03:31 +05:30
jabir-elat
d7df2cbdc5 fix: correct report name in inner button (#41568)
Previously, the report name was incorrectly listed as "Cash Flow Statement" instead of "Cash Flow". This mismatch caused the "Cash Flow" report to not open correctly in the chart of accounts tree view, as the report ID is "Cash Flow".
2024-05-21 14:38:13 +05:30
rohitwaghchaure
ac4bcd5ca7 fix: job card time logs overlap issue (#41567) 2024-05-21 14:37:04 +05:30
rohitwaghchaure
4261c3474b fix: not able to delete line items in the subcontracting receipt (#41569) 2024-05-21 14:36:35 +05:30
rohitwaghchaure
4e4c1e4bef fix: Deadlock on submitting Sales Invoice (#41417) 2024-05-21 10:33:29 +05:30
rohitwaghchaure
ae3f5a38e1 fix: BOM creator validation for parent row no (#41413)
fix: bom creator valiation for parent row no
2024-05-20 19:19:45 +05:30
Nabin Hait
dfdb95bbbe patch: create custom field for accounting dimensions only if the field not exists already (#41484)
fix: create custom field for accounting dimensions only if the field not exists already
2024-05-20 12:54:20 +00:00
Nabin Hait
a1d489195d fix: convert invoice_portion value from str to float (#41485) 2024-05-20 17:57:59 +05:30
Nabin Hait
f24d61daea fix: Auto reconcile only after selecting bank account (#41489) 2024-05-20 17:57:33 +05:30
Nabin Hait
0191727149 Merge pull request #41502 from khushi8112/gross-purchase-amount-too-low-to-make-depr-schedule
fix: added validation message for low gross purchase amount
2024-05-20 17:55:09 +05:30
Nabin Hait
e22b0fd6e1 Merge pull request #41495 from nabinhait/target-variance-for-parent-item-groups
fix: Show acheived amount and variance for parent item groups
2024-05-20 16:25:01 +05:30
Nihantra Patel
91c9d964f9 fix: add include closed orders option in so/po trends report 2024-05-20 16:02:10 +05:30
Nihantra Patel
6e3782a061 fix: add include closed orders option in so/po trends report 2024-05-20 15:59:45 +05:30
Nihantra Patel
eb4f94ddf2 fix: add include closed orders option in so/po trends report 2024-05-20 15:51:27 +05:30
ruthra kumar
be1fce2da6 Merge pull request #41492 from ruthra-kumar/reconciliation_on_advance_payment_date
refactor: For advances booked in Separate account, reconciliation date can be configured
2024-05-20 14:58:58 +05:30
ruthra kumar
30aa4e031d test: reconciliation date for advance payments 2024-05-20 14:42:41 +05:30
rohitwaghchaure
214b38f7c8 fix: valuation rate for legacy serial nos (#41543)
fix: valuation rate for serial nos
2024-05-20 13:41:16 +05:30
Frappe PR Bot
28e10dd703 fix: sync translations from crowdin (#41411) 2024-05-19 17:14:23 +02:00
Raffael Meyer
f7eb9d44a8 Merge pull request #41540 from frappe/pot_develop_2024-05-19 2024-05-19 15:22:28 +02:00
frappe-pr-bot
b071e952dd chore: update POT file 2024-05-19 09:35:33 +00:00
Raffael Meyer
7b9fd394b0 feat: enter serial range in Serial/Batch Selector (#41530)
* feat: util for generating serial nos from range string

* feat: enter serial range in Serial/Batch Selector
2024-05-18 10:25:50 +05:30
ruthra kumar
7ce8fc9ba2 Merge pull request #41529 from ruthra-kumar/ignore_internal_doctypes_on_cancel_for_dunning
refactor: ignore internal doctypes on Dunning cancellation
2024-05-17 21:00:22 +05:30
ruthra kumar
63c2cf13fd refactor: ignore internal doctypes on Dunning cancellation 2024-05-17 20:43:19 +05:30
Nabin Hait
37d97fad17 Merge pull request #41523 from ruthra-kumar/fix_pr_and_pi_debit_credit_difference
fix: minor Dr and Cr between Purchase Receipt and Purchase Invoice
2024-05-17 17:46:10 +05:30
rohitwaghchaure
5cf5b18aea fix: priority not working for multiple pricing rules (#41516) 2024-05-17 17:09:01 +05:30
ruthra kumar
1c0a24424a fix: minor Dr and Cr between Purchase Receipt and Purchase Invoice
This applies for Provisional Accounting for Non-stock items
2024-05-17 17:06:39 +05:30
rohitwaghchaure
61a4188440 fix: timeout error while submitting purchase invoice (#41520) 2024-05-17 16:36:38 +05:30
ruthra kumar
3f6787b267 Merge pull request #41517 from ruthra-kumar/fix_typeerror_in_purchase_invoice
fix: typerror on hide_fields
2024-05-17 14:47:07 +05:30
ruthra kumar
deb9766f2a fix: typerror on hide_fields 2024-05-17 14:41:17 +05:30
ruthra kumar
d61f56207c Merge pull request #41511 from ruthra-kumar/possible_sql_error_on_general_ledger
fix: possible sql error on General Ledger
2024-05-17 10:55:19 +05:30
ruthra kumar
76131f8e10 fix: possible sql error on General Ledger 2024-05-17 10:37:07 +05:30
ruthra kumar
cafa2f52e5 refactor: enable no-copy on advance payment flags 2024-05-17 10:21:37 +05:30
Deepesh Garg
e883d6a7d3 Merge pull request #41451 from deepeshgarg007/demo_deletion_fixes
fix: Demo data clearing
2024-05-17 09:16:11 +05:30
Deepesh Garg
44e6563af6 Merge pull request #41504 from deepeshgarg007/pos_error_message
fix: Unable to add items in POS Invoice
2024-05-16 19:31:53 +05:30
Deepesh Garg
7a3f8a5afb fix: Unable to add items in POS Invoice 2024-05-16 19:19:52 +05:30
Khushi Rawat
8a30701893 fix: added validation message for low gross purchase amount 2024-05-16 16:37:49 +05:30
rohitwaghchaure
500c546691 fix: stock levels for batch (#41494) 2024-05-16 15:58:58 +05:30
ruthra kumar
af8275c321 Merge pull request #40072 from Nihantra-Patel/fix_print_bold
fix: print format bold for field "total"
2024-05-16 15:19:37 +05:30
Samuel Danieli
bd381cc0c6 chore(BOM Explorer): display items in the same order as in the BOM (#41496) 2024-05-16 15:13:22 +05:30
Nabin Hait
8ac11ae88d fix: Show achieved amount and variance for parent item groups 2024-05-16 14:28:22 +05:30
Nihantra C. Patel
2761705c62 Merge branch 'develop' into fix_print_bold 2024-05-16 14:11:31 +05:30
ruthra kumar
000c1b49dc chore: better description 2024-05-16 12:40:09 +05:30
ruthra kumar
070e2d4d26 refactor: advance payments, allow configurable reconciliation date 2024-05-16 12:07:19 +05:30
Florian HENRY
3c1ca1cfbb Merge branch 'develop' of https://github.com/frappe/erpnext into dev_fix_french_chart_of_account 2024-05-15 18:37:09 +02:00
rohitwaghchaure
81a9521f04 fix: not able to submit landed cost voucher (#41481) 2024-05-15 17:49:02 +05:30
rohitwaghchaure
0363afcfd0 fix: validate reorder group warehouse (#41478) 2024-05-15 14:03:51 +05:30
Ankush Menat
7a47b2157b ci: remove mergify from release notes (#41475)
Mergify isn't author, just backporter.

All our stable branch PRs don't have authors so eh.
2024-05-15 05:37:30 +00:00
Florian HENRY
abfb8a7201 Merge branch 'develop' of https://github.com/frappe/erpnext into dev_fix_french_chart_of_account 2024-05-15 07:34:20 +02:00
Nabin Hait
fc797836af Merge pull request #41235 from khushi8112/depreciation_based_daily_prorata
Depreciation based on daily prorata
2024-05-15 08:40:16 +05:30
Nabin Hait
7d86881579 style: new line before function 2024-05-15 08:18:05 +05:30
Khushi Rawat
d22df324ec fix: removed same named function 2024-05-15 01:10:54 +05:30
Nabin Hait
4a4c674553 Merge pull request #41467 from khushi8112/unlink-asset-reference-issue
Asset cancelation issue
2024-05-14 22:41:45 +05:30
Khushi Rawat
7b264e5e11 refactor: code optimization 2024-05-14 20:12:01 +05:30
Khushi Rawat
c0c8c1bb02 fix: pro rata based depreciation with opening accumulated depreciation 2024-05-14 20:12:01 +05:30
Khushi Rawat
d40b55468c test: made minor change in existing test 2024-05-14 20:12:01 +05:30
Khushi Rawat
fccd37d32d fix: incorrect total days calculation 2024-05-14 20:12:01 +05:30
Khushi Rawat
b8a98a273b fix: daily prorata based depreciation bug in wdv method 2024-05-14 20:11:52 +05:30
Nabin Hait
99d417bbc2 Merge pull request #41457 from khushi8112/comparison-between-none-type-and-date-time-instances
fix: filtered out data having none values in date field
2024-05-14 20:10:52 +05:30
Khushi Rawat
f337392f3e fix(wip): daily depreciation bug 2024-05-14 20:10:42 +05:30
Khushi Rawat
e843683ad1 style: code optimization 2024-05-14 20:03:58 +05:30
Khushi Rawat
a36b7fb95a style: code optimization 2024-05-14 19:52:57 +05:30
Nabin Hait
16751ec935 Merge pull request #41420 from khushi8112/get-prorata-depreciation-based-on-total-days-per-year
Get prorata depreciation based on total days per year
2024-05-14 19:24:30 +05:30
Nabin Hait
0736154074 Merge pull request #41089 from khushi8112/rename-purchase-receipt-amount-field-to-purchase-amount
Refactor: Rename purchase receipt amount field to purchase amount
2024-05-14 18:16:39 +05:30
Khushi Rawat
fa2b6c4490 fix: Asset cancelation issue 2024-05-14 17:56:06 +05:30
Khushi Rawat
3bd455ac85 fix: filtered out data having none values in date field 2024-05-14 14:24:18 +05:30
Deepesh Garg
d6fe220fab fix: Demo data clearing 2024-05-14 10:27:56 +05:30
Deepesh Garg
e3f539325e Merge pull request #41412 from deepeshgarg007/party_name_ar_ap_report
fix: Duplicate party name column in AR/AP report
2024-05-14 08:22:22 +05:30
rohitwaghchaure
e3a80ebdf3 fix: zero valuation rate for batched item (#41446) 2024-05-14 05:19:32 +05:30
rohitwaghchaure
3309359822 fix: 'Bill for Rejected Quantity in Purchase Invoice' feature not working (#41437) 2024-05-13 21:38:24 +05:30
rohitwaghchaure
6bd13d7452 fix: Unknown column 'tabBatch.batch_no' in 'where clause' (#41418)
fix: unknown column 'tabBatch.batch_no' in 'where clause'
2024-05-13 21:37:35 +05:30
Corentin Flr
13a3a6a82e fix(AccountsController): Use get_all to get payment requests when updating advance payment status 2024-05-13 17:11:08 +02:00
Raffael Meyer
64333373ca Merge pull request #41384 from barredterra/sales-order-actions 2024-05-13 15:40:58 +02:00
Deepesh Garg
c6fd42fe60 Merge pull request #41429 from deepeshgarg007/immutable_ledger
feat: Config to enable immutable ledger
2024-05-13 17:42:59 +05:30
Deepesh Garg
77bfea975f Merge branch 'develop' of https://github.com/frappe/erpnext into immutable_ledger 2024-05-13 17:22:27 +05:30
rohitwaghchaure
663fcb374d fix: data getting override in delivery trip (#41431)
fix: data getting override
2024-05-13 16:24:46 +05:30
rohitwaghchaure
065163146c fix: valuation issue for batch (#41425) 2024-05-13 16:03:44 +05:30
Deepesh Garg
d56f52b0ba feat: Config to enable immutable ledger 2024-05-13 15:39:22 +05:30
Deepesh Garg
32a463652e Merge pull request #40468 from Nihantra-Patel/upd_accounts_description
fix: update description of Supplier Invoice Number
2024-05-13 15:12:23 +05:30
Nihantra C. Patel
7f2062e2c5 Merge branch 'develop' into upd_accounts_description 2024-05-13 14:56:23 +05:30
Poorvi-R-Bhat
1b45ecfcae fix: Item-wise Sales and Purchase register with no item codes #41373 2024-05-13 09:35:10 +05:30
barredterra
382d0ff453 fix: migrate lead notes 2024-05-12 23:01:19 +02:00
Khushi Rawat
98e7dfe97f fix(minor): removed extra parameter 2024-05-13 00:10:43 +05:30
Khushi Rawat
6b24143f72 refactor: removed code duplicacies 2024-05-12 23:01:44 +05:30
Khushi Rawat
d3200fb67f fix(wip): depreciation calculation after asset value adjustment 2024-05-12 23:01:44 +05:30
Deepesh Garg
7501fe8ebd fix: Duplicate party name column in AR/AP report 2024-05-11 19:35:52 +05:30
Frappe PR Bot
3fa8706f57 chore: update POT file (#41326) 2024-05-10 16:29:49 +02:00
Frappe PR Bot
f92aabd0f3 fix: sync translations from crowdin (#41262) 2024-05-10 16:28:17 +02:00
rehanrehman389
628d7e6458 chore: typo in Stock Settings (#41396) 2024-05-10 15:40:02 +05:30
Khushi Rawat
360c3b36ed fix: removed unrelated code modification 2024-05-10 14:39:59 +05:30
“Khushi
31841b4ab2 refactor: renamed purchase receipt amount field to purchase amount 2024-05-10 14:17:03 +05:30
Nihantra C. Patel
ba60b5911a fix: bold total in exponential smoothing forecasting (#41393)
* fix: bold total in exponential smoothing forecasting

* fix: bold total in exponential smoothing forecasting
2024-05-10 13:12:23 +05:30
Nihantra C. Patel
501c6aa126 fix: cost center filter according to the company in project 2024-05-10 12:40:01 +05:30
Nihantra C. Patel
cfde8088b4 fix: cost center filter according to the company in project 2024-05-10 12:35:24 +05:30
Nihantra C. Patel
249e8264dd fix: cost center filter according to the company in project 2024-05-10 12:31:15 +05:30
Poorvi
c90185f533 fix: fixing Item-wise sales register 2024-05-10 11:47:57 +05:30
ruthra kumar
08899d05fb Merge pull request #41040 from Nihantra-Patel/fix_quot_prospect
fix: address filter and quotation to for prospect
2024-05-09 12:14:41 +05:30
ruthra kumar
754c7f6d1c refactor: make use of doc.quotation_to 2024-05-09 11:58:33 +05:30
Nabin Hait
92673d706c Merge pull request #41024 from khushi8112/expense-account-based-on-asset-category
fix: expense account should be fetched from related asset category
2024-05-09 01:30:45 +05:30
Raffael Meyer
9c3a105f85 fix: consistent use of "Address & Contact" (#41386) 2024-05-08 16:20:35 +00:00
barredterra
418bdc1dcc fix(Delivery Note): only show permitted actions 2024-05-08 17:55:16 +02:00
barredterra
c29d955371 fix(Sales Order): only show permitted actions 2024-05-08 16:23:46 +02:00
Khushi Rawat
272ce24016 style: code changes for better readability
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2024-05-08 19:17:09 +05:30
“Khushi
651e4696fd fix: expense account should be fetched from related asset category 2024-05-08 19:14:51 +05:30
rohitwaghchaure
5ed1b6b8fb fix: incorrect qty picked in the pick list (#41378) 2024-05-08 17:56:10 +05:30
Nabin Hait
cd5d244d2c Merge pull request #41236 from nabinhait/merge_gle_in_transaction_currency
fix: Merge debit and credit in transaction currency while merging gle with similar head
2024-05-08 17:50:56 +05:30
Nihantra C. Patel
db5ed972e5 fix: not allow template item in product bundle item 2024-05-08 10:17:49 +05:30
rohitwaghchaure
0887161f2a perf: index on item code for the Pick List Item doctype (#41357) 2024-05-07 16:29:20 +05:30
rohitwaghchaure
544fc60093 fix: filter validation for batch-wise balance history report (#41356)
fix: filter validation for batchwise balance history report
2024-05-07 16:29:08 +05:30
ruthra kumar
c50663c640 Merge pull request #41288 from ruthra-kumar/bug_in_promotional_scheme
fix: pricing rule rounding
2024-05-07 10:01:00 +05:30
ruthra kumar
c41a037174 refactor(test): test floor based rounding 2024-05-07 09:44:10 +05:30
Raffael Meyer
c710ad822c fix(Item): allow UOM conversion for non-stock items (#41267) 2024-05-06 18:50:30 +02:00
rohitwaghchaure
ebfbe94aaf fix: pick list with multiple batch issue (#41335)
fix: pick list with batchb issue
2024-05-06 13:17:07 +05:30
ruthra kumar
e51ccecd8a Merge pull request #41334 from ruthra-kumar/fix_gp_purchase_invoice_item
fix: incorrect query for Purchase Invoice rate in GP
2024-05-06 12:53:46 +05:30
ruthra kumar
bd8382c592 fix: incorrect query for Purchase Invoice rate in GP 2024-05-06 12:07:33 +05:30
Ankush Menat
6142d07f1a fix: update project URLs (#41331) 2024-05-06 06:02:57 +00:00
Deepesh Garg
ed5344d58b Merge pull request #41318 from deepeshgarg007/psoa_cost_center
fix: Cost center not getting saved in PSOA
2024-05-04 13:55:40 +05:30
Deepesh Garg
44228b754f Merge pull request #41314 from deepeshgarg007/tcs_opening
fix: Do not deduct TCS for opening invoices
2024-05-04 13:54:46 +05:30
Deepesh Garg
d19ae4ce4c Merge pull request #41279 from deepeshgarg007/order_advance
fix: GL Entries against orders as an advance
2024-05-03 19:41:24 +05:30
Deepesh Garg
58f7039630 fix: Cost center not getting saved in PSOA 2024-05-03 18:34:27 +05:30
Deepesh Garg
eac7be2d0f test: Add bank account 2024-05-03 18:30:47 +05:30
Deepesh Garg
42ef95759d test: Update failing tests 2024-05-03 17:04:37 +05:30
Deepesh Garg
eb31017058 fix: Add PO reference 2024-05-03 15:56:29 +05:30
Deepesh Garg
69d68592ad Merge pull request #41311 from deepeshgarg007/future_subscription_updates
fix: future subscription updates
2024-05-03 12:04:39 +05:30
Deepesh Garg
eb9f579b8f fix: Do not deduct TCS for opening invoices 2024-05-03 11:47:43 +05:30
Raffael Meyer
e4db0562ac fix: search for item price in stock UOM (#41075) 2024-05-03 10:06:52 +05:30
Raffael Meyer
a61148c464 feat(Item Price): make UOM mandatory (#40588) 2024-05-03 10:04:24 +05:30
Deepesh Garg
7fa22069d8 test: Add posting dates 2024-05-03 09:25:26 +05:30
Deepesh Garg
54a12c5186 Merge pull request #41260 from deepeshgarg007/pi_gl_entries_pi
fix: Purchase Invoice gain loss gl entry for periodic inventory
2024-05-03 08:54:57 +05:30
HENRY Florian
c8e92cb1b2 fix: missing Item Name on Save for Quotation created from Item (#41233)
* fix: missing Item Name on Save for Quotation created from Item

* fix: missing Item Name on Save for Quotation created from Item
2024-05-02 22:22:12 +05:30
Akhil Narang
93c6324115 Merge pull request #41299 from frappe/revert-41146-fix-add-import
Revert "fix(supplier): add back import that got removed by ruff"
2024-05-02 17:59:10 +05:30
Akhil Narang
f26be2a303 Revert "fix(supplier): add back import that got removed by ruff" 2024-05-02 17:42:33 +05:30
David Arnold
61f5ebd2dd feat: create delivery trip on draft notes (#38559)
feat: create draft delivery trips from draft delivery notes
2024-05-02 16:00:21 +05:30
Akhil Narang
22c345a24a Merge pull request #41146 from akhilnarang/fix-add-import
fix(supplier): add back import that got removed by ruff
2024-05-02 12:23:58 +05:30
ruthra kumar
9bf37426c1 fix: pricing rule rounding
Consider a pricing rule of 20:1 with recursion enabled, free items
should follow the below progression

|   Qty | Free item qty |
|-------+---------------|
|  0-19 |             0 |
| 20-39 |             1 |
| 40-59 |             2 |
2024-05-02 09:40:07 +05:30
rohitwaghchaure
1cbc200770 fix: added brand column in Warehouse wise Item Balance Age and Value … (#41280)
fix: added brand coulmn in Warehouse wise Item Balance Age and Value report
2024-05-01 15:46:43 +05:30
Deepesh Garg
8289f3c724 fix: GL Entries against orders as an advance 2024-05-01 12:17:08 +05:30
mergify[bot]
da3010a41f fix: multiple pricing rules with discount amount and discount percentage not working (backport #41211) (#41241)
fix: multiple pricing rules with discount amount and discount percentage not working (#41211)

(cherry picked from commit 54313b5db9)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-04-30 21:48:46 +05:30
ruthra kumar
ed9af7d12e Merge pull request #41268 from ruthra-kumar/validation_to_prevent_overallocation_on_reconciliation
fix: validation to prevent overallocation
2024-04-30 17:37:46 +05:30
ruthra kumar
bf755fab55 fix: validation to prevent overallocation 2024-04-30 17:19:41 +05:30
Deepesh Garg
2402447568 fix: Purchase Invoice gain loss gl entry for periodic inventory 2024-04-30 13:28:43 +05:30
Deepesh Garg
f77d5db38e Merge pull request #41258 from deepeshgarg007/psoa_ageing
fix: PSOA ageing
2024-04-30 13:10:12 +05:30
Deepesh Garg
fed2d11905 fix: PSOA ageing 2024-04-30 12:50:21 +05:30
ruthra kumar
8861a76bd0 Merge pull request #41252 from ruthra-kumar/permission_issue_on_tax_withholding_category
fix: permission issue when user permission restricts on company
2024-04-30 11:20:18 +05:30
Deepesh Garg
56f0b2628e Merge pull request #41171 from deepeshgarg007/deferred_revenue_expense_report
fix: Invoice with no GLEs in deferred report
2024-04-30 11:14:54 +05:30
ruthra kumar
7a6cc84d41 fix: permission issue when user permission restricts on company 2024-04-30 10:26:55 +05:30
Deepesh Garg
a34c99385c Merge pull request #41173 from deepeshgarg007/br_paid_amount
fix: paid amount in bank reconciliation tool
2024-04-30 10:25:03 +05:30
Deepesh Garg
94339c569e Merge pull request #41219 from deepeshgarg007/br_company_user_perm
fix: Ignore user perm in Bank Reco Tool for company
2024-04-30 10:22:27 +05:30
ruthra kumar
1df06efd97 Merge pull request #41240 from ruthra-kumar/fix_based_on_payment_term_for_single_term
fix: display term name for single term invoices in AR/AP
2024-04-30 07:09:00 +05:30
ruthra kumar
52e52e83a9 Merge pull request #41194 from ruthra-kumar/fix_incorrectly_applying_tds_when_advance_in_prev_fiscal_year
fix: TDS incorrectly applied when Advance is in previous FY
2024-04-30 06:56:49 +05:30
Frappe PR Bot
9f092dbe9f chore: update POT file (#41220) 2024-04-30 00:51:38 +02:00
Frappe PR Bot
b324a02fbb fix: sync translations from crowdin (#40965) 2024-04-30 00:50:41 +02:00
ruthra kumar
5fa4cfee04 fix: display term name for single term invoices 2024-04-29 19:31:21 +05:30
Deepesh Garg
5e48c1ac51 Merge pull request #41237 from nikkothari22/fix-party-type-label-on-accounting-preview
fix: party and party type label on accounting preview
2024-04-29 18:53:39 +05:30
Nabin Hait
e0d12ba4d0 fix: Patch to fix the incorrect debit and credit in transaction currency 2024-04-29 17:44:41 +05:30
Nikhil Kothari
f7f3b22786 fix: party and party type label on accounting preview 2024-04-29 17:31:39 +05:30
Nabin Hait
e43697d359 fix: Merge debit and credit in transaction currency while merging gle with similar head 2024-04-29 17:01:48 +05:30
Florian HENRY
72057adc94 fix: French chart of account the 4191 code must be of type Income Account 2024-04-29 10:18:02 +02:00
ruthra kumar
2f9a144023 test: TDS deduction across fiscal year 2024-04-29 12:29:05 +05:30
Deepesh Garg
9e2ecd67f9 Merge pull request #40865 from rtdany10/def-expns
fix: missing def expense if no exp in first month
2024-04-29 10:24:35 +05:30
ruthra kumar
b195f519e2 fix: incorrectly applying TDS when Advance is in previous FY 2024-04-29 08:24:20 +05:30
Deepesh Garg
9f346e7ba0 fix: Ignore user perm in Bank Reco Tool for company 2024-04-28 14:41:34 +05:30
Deepesh Garg
8e30debc10 fix: future subscripition updates 2024-04-27 23:07:14 +05:30
ruthra kumar
41695e601d Merge pull request #41208 from ruthra-kumar/incorrect_receivable_account_handling_on_reconciliation_tool
fix: set receivable account based on response type
2024-04-26 14:12:02 +05:30
ruthra kumar
066859cca0 fix: handle and receivable accounts based on response type 2024-04-26 13:59:22 +05:30
rohitwaghchaure
44f9059338 Merge pull request #41165 from rohitwaghchaure/feat-allow-to-do-reposting-for-all-transactions
feat: allow to do reposting for all stock transactions (audit)
2024-04-26 13:43:34 +05:30
rohitwaghchaure
d95d00b7c8 Merge pull request #41167 from rohitwaghchaure/feat-warehouse-type-filter-for-reports
fix: warehouse type filter for stock reports
2024-04-26 13:10:25 +05:30
rohitwaghchaure
880d061164 Merge pull request #41182 from Nihantra-Patel/email_-rendering
fix: rendering the email template when user HTML
2024-04-26 13:09:53 +05:30
rohitwaghchaure
bb5f1dae75 Merge pull request #41185 from Nihantra-Patel/delivery_trip
fix: args when get the delivery note in delivery trip
2024-04-26 13:09:11 +05:30
Rushabh Mehta
1bb1b69dea Merge pull request #40716 from khushi8112/incorrect-cash-flow-report
Incorrect cash flow report
2024-04-26 12:52:57 +05:30
rohitwaghchaure
3562c2d1d1 Merge pull request #41195 from rohitwaghchaure/fixed-incorrect-basic-rate-13963
fix: basic rate for SABB
2024-04-26 12:49:46 +05:30
Khushi Rawat
46736a737f fix(minor): don't translate voucher type 2024-04-26 12:36:34 +05:30
Rushabh Mehta
5b1e860489 Merge pull request #40915 from khushi8112/company-field-should-be-fetch-from-parent-acc
fix: company field should be fetch from parent acc
2024-04-26 12:28:06 +05:30
rohitwaghchaure
8e095335be Merge pull request #41192 from rohitwaghchaure/fixed-13960
fix: duplicate column in the stock ledger report
2024-04-26 12:21:47 +05:30
Rohit Waghchaure
7fa94843aa fix: basic rate for SABB 2024-04-26 12:20:08 +05:30
Rohit Waghchaure
be7fd6bfb4 fix: duplicate column in the stock ledger report 2024-04-26 10:43:30 +05:30
ruthra kumar
90d1873ad0 Merge pull request #41183 from ruthra-kumar/disable_advance_for_non_customer_or_supplier
fix: restrict Advance in separate party to customer and supplier
2024-04-25 19:59:16 +05:30
Ankush Menat
341fb6d8f3 fix: handle stock balance unbuffered_cursor error (#41186) 2024-04-25 11:43:58 +00:00
Nihantra Patel
ca577f7aaa fix: args when get the delivery note in delivery trip 2024-04-25 16:46:29 +05:30
Nihantra Patel
2f359e201d fix: args when get the delivery note in delivery trip 2024-04-25 16:42:38 +05:30
ruthra kumar
3c1af2acf0 fix: enable advance in separate acc only for customer and Supplier 2024-04-25 13:26:15 +05:30
Nihantra C. Patel
7cb66f7fd3 fix: rendering the email template when user HTML 2024-04-25 12:01:28 +05:30
Deepesh Garg
a48966f08c fix: paid amount in bank reconciliation tool 2024-04-24 21:50:03 +05:30
Deepesh Garg
ecf07bd128 chore: remove debug flag 2024-04-24 19:44:47 +05:30
Deepesh Garg
1c613ada6f fix: Invoice with no GLEs in deferred report 2024-04-24 19:40:05 +05:30
Rohit Waghchaure
4250ac821f fix: warehouse type filter for stock reports 2024-04-24 14:41:10 +05:30
Rohit Waghchaure
aefbe21b46 feat: allow to do reposting for all transactions (audit) 2024-04-24 14:31:29 +05:30
Deepesh Garg
5f6bf4c369 Merge pull request #41106 from deepeshgarg007/heatmap_remove
chore: Remove heatmap from party dashboards
2024-04-24 12:01:14 +05:30
Deepesh Garg
cfa3c85f3c Merge pull request #41160 from ruchamahabal/cost-center-perm
fix: allow Employee role to select cost center & project (accounting dimensions)
2024-04-24 11:14:22 +05:30
Rucha Mahabal
d0d496a515 fix: allow Employee role to select cost center & project (accounting dimensions) 2024-04-24 10:57:41 +05:30
rohitwaghchaure
14bdd5da6e Merge pull request #41135 from rohitwaghchaure/available-batch-report
feat: Available batches as on specific date report
2024-04-23 22:17:08 +05:30
Rohit Waghchaure
b8f7979794 feat: Available batches report as on specific date 2024-04-23 17:18:31 +05:30
rohitwaghchaure
3bd598bd1b Merge pull request #41145 from rohitwaghchaure/fixed-13815
fix: incorrect stock posting for current qty
2024-04-23 16:50:09 +05:30
Rohit Waghchaure
d4fe313de2 fix: incorrect stock posting for current qty 2024-04-23 16:18:40 +05:30
ruthra kumar
6d51105082 Merge pull request #41147 from ruthra-kumar/better_description_and_validation
refactor: better description and pop up on Advance accounts
2024-04-23 14:45:04 +05:30
ruthra kumar
9dbd321133 refactor: popup to inform on limited support for Advance accounts 2024-04-23 13:57:12 +05:30
Akhil Narang
808dbfcade fix(supplier): add back import that got removed by ruff
It isn't unused, just isn't directly called

Fixes 3effaf21ef

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
2024-04-23 13:26:05 +05:30
rohitwaghchaure
3b62237570 Merge pull request #41098 from rohitwaghchaure/fixed-stock-reco-negative-qty-validation-13584
fix: stock reconciliation negative qty validation
2024-04-23 13:08:41 +05:30
Rohit Waghchaure
289495c308 fix: stock reco negative qty validation 2024-04-23 12:45:33 +05:30
ruthra kumar
de9c8fc9d6 refactor: better description for advance account 2024-04-23 12:38:44 +05:30
ruthra kumar
6b8f65b7de Merge pull request #41142 from ruthra-kumar/toggle_auto_bank_account_update
fix: mode of payment has precedance in Payment Entry
2024-04-23 11:54:53 +05:30
rohitwaghchaure
eadd892b03 Merge pull request #41013 from Nihantra-Patel/fix_dc_qc
fix: inspection type when create a qc from dc
2024-04-23 11:33:43 +05:30
ruthra kumar
4aef969879 fix: mode of payment has precedance
Mode of Payment is given precedence over company/party bank account
2024-04-23 10:40:36 +05:30
Nabin Hait
4eee3f52a3 Merge pull request #41136 from nabinhait/installation-note-fix
fix: Missing args while fetching items from delivery note in Installation Note
2024-04-23 10:24:01 +05:30
ruthra kumar
3e7ccb24a6 Merge pull request #41086 from ruthra-kumar/prevent_multi_currency_advance_in_separate_party
fix: prevent foreign currency  accounts as advance accounts.
2024-04-23 07:14:16 +05:30
Nabin Hait
bbe323fbb4 fix: Missing args while fetching items from delivery note 2024-04-22 16:28:31 +05:30
Deepesh Garg
7286df86c5 Merge pull request #41104 from deepeshgarg007/payment_entry_test
fix: Payment entry against employee
2024-04-22 11:36:05 +05:30
Gursheen Kaur Anand
58c7922c36 Merge branch 'develop' into valuation-tax-gle-via-lcv 2024-04-21 19:15:21 +05:30
Gursheen Anand
54a58e9205 chore: resolve conflicts 2024-04-21 19:07:08 +05:30
Gursheen Kaur Anand
affe304d47 Merge pull request #40769 from GursheenK/budget-actual-expense
fix: budget validation for purchase orders
2024-04-21 16:54:44 +05:30
rohitwaghchaure
b4cbd5fafa Merge pull request #41120 from frappe/mergify/bp/develop/pr-36459
fix: search not working for so in the Production Plan (backport #36459)
2024-04-21 16:49:58 +05:30
rohitwaghchaure
9a6e762b8b fix: search not working for so in the Production Plan (#36459)
fix: search not working for so
(cherry picked from commit 8c57d56240)
2024-04-21 07:56:37 +00:00
rohitwaghchaure
41035ccba0 Merge pull request #41099 from rohitwaghchaure/fixed-report-13659
fix: not able to update default supplier from Supplier Quotation Comparison report
2024-04-20 11:20:31 +05:30
barredterra
eb119dcb4d fix: language in sales transactions 2024-04-20 01:24:35 +02:00
rohitwaghchaure
29153ed3b4 Merge pull request #41102 from rohitwaghchaure/fixed-stock-ledeger-report-balance-qty-13622
fix: balance qty for stock ledger report
2024-04-19 21:50:14 +05:30
Deepesh Garg
a8f03e8baa chore: Remove heatmap from party dashboards 2024-04-19 19:09:55 +05:30
Deepesh Garg
93e6c6ccab fix: Payment entry against employee 2024-04-19 17:38:11 +05:30
Rohit Waghchaure
f00ae0b92b fix: balance qty for stock ledger report 2024-04-19 17:30:27 +05:30
Deepesh Garg
a4b6eda8a9 Merge pull request #41085 from deepeshgarg007/ldc_permission
fix: Permission for lower deduction certificate
2024-04-19 15:39:35 +05:30
Rohit Waghchaure
ad8e189c26 fix: not able to update default supplier from Supplier Quotation Comparison report 2024-04-19 15:39:22 +05:30
rohitwaghchaure
7ad1bf5840 Merge pull request #41067 from rohitwaghchaure/fixed-validation-for-voucher-no-and-qty
fix: validation for zero qty in SABB
2024-04-19 15:10:19 +05:30
Markus Lobedann
9d9331408f Merge branch 'frappe:develop' into patch-1 2024-04-18 14:51:05 +02:00
ruthra kumar
1ad065fc54 fix: advance account validation in company master 2024-04-18 17:15:52 +05:30
Rohit Waghchaure
497f560b4b fix: validation for zero qty in SABB 2024-04-18 15:53:42 +05:30
Deepesh Garg
f6f118855b fix: Permission for lower dedcution certificate 2024-04-18 15:26:03 +05:30
rohitwaghchaure
e706b4534c Merge pull request #41083 from rohitwaghchaure/fixed-work-order-qty-to-manuufacture
fix: validation for fraction number in Work Order
2024-04-18 14:44:18 +05:30
Rohit Waghchaure
f8305c2fc0 fix: validation for fraction number in Work Order 2024-04-18 14:24:51 +05:30
ruthra kumar
e3fc5990ee fix: validation to prevent foreign currency advance accounts in PE 2024-04-18 12:24:45 +05:30
s-aga-r
fb6b98c85d Merge pull request #41074 from s-aga-r/FIX-13339-2
fix: validate uom is integer for PR item
2024-04-17 22:29:38 +05:30
s-aga-r
9a290fdfc9 fix: validate uom is integer for PR item 2024-04-17 22:09:28 +05:30
Raffael Meyer
34fd290edb fix: don't attempt to set gender from salutation (#40997) 2024-04-17 17:26:08 +02:00
s-aga-r
244d62df70 Merge pull request #41061 from s-aga-r/FIX-13339
fix: do not add qty to supplied items
2024-04-17 16:33:38 +05:30
s-aga-r
8233c392fb fix: do not add qty to supplied items 2024-04-17 16:15:37 +05:30
rohitwaghchaure
e36f6453d5 Merge pull request #41053 from rohitwaghchaure/fixed-duplicate-serial-batch-in-stock-entry
fix: duplicate serial and batch bundle in stock entry and stock reco
2024-04-17 13:18:48 +05:30
Rohit Waghchaure
732b6e1417 fix: duplicate serial and batch bundle in stock entry and stock reco 2024-04-17 13:00:49 +05:30
Deepesh Garg
7ce6687b68 Merge pull request #40962 from deepeshgarg007/allow_on_submit_ad_v1
fix: Allow updating cost center and project for repostable doctypes
2024-04-17 11:21:50 +05:30
ruthra kumar
96d96bb500 Merge pull request #41047 from ruthra-kumar/incorrect_use_of_wildcard
fix: possible wildcard issue on variable name
2024-04-17 11:04:32 +05:30
ruthra kumar
5357b9e727 fix: possible wildcard issue on variable name 2024-04-17 10:46:00 +05:30
rohitwaghchaure
5b1493b56c fix: not able to submit subcontracting receipt (#41041) 2024-04-17 00:22:09 +05:30
Nihantra Patel
2896e3666c fix: address filter and quotation to for prospect 2024-04-16 18:13:49 +05:30
Nihantra Patel
24a68a79df fix: address filter and quotation to for prospect 2024-04-16 18:12:20 +05:30
Nihantra Patel
fe5b88522e fix: address filter and quotation to for prospect 2024-04-16 18:06:42 +05:30
rohitwaghchaure
d69a18b826 fix: Delayed Order Report not working (#41037) 2024-04-16 17:14:59 +05:30
ruthra kumar
42a5e61ac3 Merge pull request #40373 from Nihantra-Patel/fix_mutiple_address_so
fix: get address if multiple companies
2024-04-16 16:30:17 +05:30
rohitwaghchaure
03231e99ef fix: expense account set as COGS for stock entry Material Issue (#41026) 2024-04-16 13:55:35 +05:30
RitvikSardana
85c63f29c0 Merge pull request #41025 from RitvikSardana/develop-ritvik-remove-customer-check
fix: remove validate_name_in_customer function
2024-04-16 12:44:47 +05:30
RitvikSardana
2b32d3644f fix: remove validate_name_in_customer function 2024-04-16 12:20:16 +05:30
ruthra kumar
9445bd410c Merge pull request #41020 from ruthra-kumar/fix_incorrect_exc_gain_loss_for_pe_against_journals
fix: incorrect exc gain/loss for PE against JE for payable accounts
2024-04-16 10:58:49 +05:30
ruthra kumar
8821c98625 test: exc gain/loss journals booking in Payable accounts 2024-04-16 10:41:54 +05:30
ruthra kumar
81b574053f fix: incorrect exc gain/loss for PE against JE for payable accounts 2024-04-16 10:41:52 +05:30
Deepesh Garg
67a8f50711 Merge pull request #40812 from deepeshgarg007/multi_pr_pi
fix: Multiple partial payment requests against Purchase Invoice
2024-04-15 21:50:11 +05:30
Deepesh Garg
071e5ed648 fix: Test case 2024-04-15 20:49:40 +05:30
Deepesh Garg
b9243569ca Merge branch 'develop' of https://github.com/frappe/erpnext into multi_pr_pi 2024-04-15 19:58:48 +05:30
Nihantra Patel
098b62f0f6 fix: inspection type when create a qc from dc 2024-04-15 17:46:21 +05:30
Nabin Hait
760e341cd0 Merge pull request #40858 from nabinhait/quote-so-delivery-date
fix: Don't set delivery date as today while making SO from Quotation
2024-04-15 12:31:06 +05:30
Gursheen Anand
9a12376e29 refactor: show list for expense breakup 2024-04-14 17:06:01 +05:30
Gursheen Anand
59292a09c4 feat: show expense breakup 2024-04-14 17:03:22 +05:30
rohitwaghchaure
2d82631509 Merge pull request #40993 from rohitwaghchaure/fixed-get_link_to_form-for-SABB
fix: get_link_to_form for serial and batch bundle
2024-04-13 15:27:34 +05:30
Rohit Waghchaure
18ca953d5a fix: get_link_to_form for serial and batch bundle 2024-04-13 15:01:42 +05:30
rohitwaghchaure
a6ed77d378 Merge pull request #40986 from rohitwaghchaure/fixed-validation-to-check-type-of-transaction
fix: type of transaction validation for the stock entry
2024-04-13 14:33:15 +05:30
Rohit Waghchaure
8ad0295f1b fix: type of transaction validation for the stock entry 2024-04-13 13:38:33 +05:30
Deepesh Garg
8d94238db8 Merge pull request #40985 from ruthra-kumar/add_payment_request_to_dimension_list
fix: Add payment request to dimension list
2024-04-13 10:21:11 +05:30
ruthra kumar
3f8d785f02 chore: patch to setup exiting dimensions in Payment Request 2024-04-12 17:23:54 +05:30
ruthra kumar
e93b4a1f2c refactor: add payment request to dimension list 2024-04-12 16:51:11 +05:30
rohitwaghchaure
65bddd2930 Merge pull request #40975 from rohitwaghchaure/fixed-donot-validate-for-lcv
fix: do not validate batch qty for LCV
2024-04-12 14:04:11 +05:30
Rohit Waghchaure
baf0c83cc5 fix: do not validate batch qty for LCV 2024-04-12 13:29:45 +05:30
s-aga-r
bb46f2d8fb Merge pull request #40707 from s-aga-r/FIX-12241
fix(ux): Sales Order Stock Reservation Dialog
2024-04-12 13:20:28 +05:30
rohitwaghchaure
b04d0dfe70 Merge pull request #40773 from s-aga-r/FIX-12181
fix: Subcontracting Receipt GL Entries
2024-04-12 13:14:31 +05:30
ruthra kumar
140fdd4a7e Merge pull request #40973 from ruthra-kumar/fix_link_error_on_dunning_cancellation
fix: Link Validation Error on Dunning cancellation
2024-04-12 10:26:37 +05:30
ruthra kumar
205fd9888c fix: Link Validation Error on Dunning cancellation 2024-04-12 09:26:46 +05:30
rohitwaghchaure
773b63c691 Merge pull request #40967 from rohitwaghchaure/fixed-13250
fix: zero division error
2024-04-11 17:54:23 +05:30
rohitwaghchaure
fac69d852c Merge pull request #40966 from rohitwaghchaure/fixed-legacy-purchase-receipt-landed-cost-issue-13215
fix: landed cost voucher for legacy pr with batch
2024-04-11 17:41:38 +05:30
Rohit Waghchaure
f9e230e758 fix: zero division error 2024-04-11 17:35:06 +05:30
Rohit Waghchaure
fa91cda46c fix: landed cost voucher for legacy pr with batch 2024-04-11 16:49:01 +05:30
Nihantra C. Patel
39d6df7c7d fix: price list when invoice created from timesheet 2024-04-11 12:09:27 +05:30
Deepesh Garg
c3845ac0f1 fix: Allow updating cost center and project for repostable doctypes 2024-04-11 11:30:56 +05:30
Nabin Hait
fc835ed6b1 Merge pull request #40920 from nabinhait/pe-fetch-reference-docs-amounts
fix: Fetch correct outstanding and total amount for reference journal entry
2024-04-11 11:04:05 +05:30
Nabin Hait
65c74fa3c7 fix: test cases 2024-04-11 11:01:28 +05:30
Nabin Hait
a70f3ef873 Merge pull request #40861 from nabinhait/default-bank-account
fix: Get default party bank account and company bank account for a party
2024-04-11 10:53:49 +05:30
Nabin Hait
6810227be0 Merge pull request #40886 from nabinhait/permission-issue
fix: Ignore permissions while fetching module settings properties
2024-04-11 10:53:22 +05:30
Nabin Hait
9aa361fe1f Merge pull request #40916 from nabinhait/existing-depr-schedule-check
fix: check if there is any existing depreciation schedule
2024-04-11 10:52:43 +05:30
Deepesh Garg
51baa95ad2 Merge pull request #40924 from khushi8112/indicate-correct-currency-code-for-the-payment
Fix: Indicate correct currency code for the payment
2024-04-10 22:22:28 +05:30
Deepesh Garg
f3ec4f1964 chore: remove unwanted changes 2024-04-10 22:06:03 +05:30
Deepesh Garg
b558a4c871 Merge pull request #40940 from Nihantra-Patel/fix_debit_creation_dev
fix: creation of return/debit note from purchase invoice
2024-04-10 21:39:08 +05:30
Deepesh Garg
eb241d0a86 Merge pull request #40941 from Nihantra-Patel/fix_credit_note_creation_dev
fix: creation of return/credit note from sales invoice
2024-04-10 21:38:57 +05:30
Deepesh Garg
8c0ea11f33 Merge pull request #40833 from HarryPaulo/fix-total-payment-decimal
fix: wrong value for total amount in payments
2024-04-10 21:26:00 +05:30
Deepesh Garg
165641e495 Merge pull request #40917 from frappe/l10n_develop
fix: sync translations from crowdin
2024-04-10 21:24:53 +05:30
Deepesh Garg
455565412f Merge pull request #40863 from nabinhait/gl-amount-in-transaction-currency
fix: Show amount in transaction currency in general ledger report
2024-04-10 20:54:01 +05:30
Deepesh Garg
6ab3527987 Merge pull request #40911 from nabinhait/itemised-tds-breakup
fix: Show itemised TDS breakup based on Apply TDS checkbox on item level
2024-04-10 20:51:33 +05:30
Deepesh Garg
c8ae124436 Merge pull request #40931 from cogk/fix-dont-call-get_fiscal_year-before-setup-is-done
fix: Don't call get_fiscal_year if setup is not done yet
2024-04-10 20:45:27 +05:30
Deepesh Garg
3e216e2f95 Merge pull request #40844 from HarryPaulo/notify-update-for-doc
fix: notify update when update outstanding amount
2024-04-10 20:43:49 +05:30
Deepesh Garg
20f20db179 Merge pull request #40849 from deepeshgarg007/transaction_currency_values
fix: Values in transaction currency
2024-04-10 20:42:08 +05:30
Nihantra C. Patel
78bef654ed fix: creation of return/credit note from sales invoice 2024-04-10 15:02:18 +05:30
Nihantra C. Patel
71f3883613 fix: creation of return/debit note from sales invoice prettier 2024-04-10 14:43:38 +05:30
Nihantra C. Patel
dd10087db6 fix: creation of return/debit note from sales invoice 2024-04-10 14:36:58 +05:30
Frappe PR Bot
6b8de22210 fix: Bosnian translations 2024-04-10 14:10:26 +05:30
Frappe PR Bot
2a3a35315b fix: Persian translations 2024-04-10 14:10:21 +05:30
ruthra kumar
9905b9e4b0 Merge pull request #40936 from ruthra-kumar/ignore_dimension_validation_on_pl
fix: ignore dimension validation for cancelled entries
2024-04-10 13:57:29 +05:30
ruthra kumar
971c867f29 fix: ignore dimension validation for cancelled entries 2024-04-10 13:21:24 +05:30
Corentin Flr
c203fafb1b fix: Don't call get_fiscal_year if setup is not done yet 2024-04-09 15:01:09 +02:00
ruthra kumar
5446ed7642 Merge pull request #40695 from ruthra-kumar/ledger_health_monitor
feat: Periodically monitor ledger health
2024-04-09 17:52:55 +05:30
ruthra kumar
3c3009f086 Merge pull request #40926 from ruthra-kumar/incorrect_currency_symbol_on_general_ledger_print
fix: incorrect currency symbol in General Ledger print
2024-04-09 17:45:47 +05:30
ruthra kumar
429e036e8c fix: incorrect currency symbol in General Ledger print 2024-04-09 17:39:32 +05:30
ruthra kumar
24d37d22a3 chore: use super() instead of super(__class__, self) 2024-04-09 17:35:15 +05:30
“Khushi
549ea8a63c fix: indicate correct currency code for the payment 2024-04-09 17:06:56 +05:30
rohitwaghchaure
b5e017a626 Merge pull request #40909 from rohitwaghchaure/fixed-13083
fix: pick list validation didn't consider existing draft pick list
2024-04-09 16:53:39 +05:30
Rohit Waghchaure
3bce4d92f6 fix: pick list validation didn't consider existing draft pick list 2024-04-09 15:36:21 +05:30
Nabin Hait
f331f9b15c fix: Fetch outstanding and total amount for reference journal entry 2024-04-09 15:25:36 +05:30
Khushi Rawat
5f7e06ba6f Merge branch 'develop' into company-field-should-be-fetch-from-parent-acc 2024-04-09 14:36:04 +05:30
Frappe PR Bot
0ade33dd1a fix: Bosnian translations 2024-04-09 13:19:31 +05:30
Frappe PR Bot
9f3a1567b5 fix: Esperanto translations 2024-04-09 13:19:28 +05:30
Frappe PR Bot
cf806fb2d4 fix: Turkish translations 2024-04-09 13:19:24 +05:30
Frappe PR Bot
680dfbfd2b fix: Arabic translations 2024-04-09 13:19:20 +05:30
Frappe PR Bot
6e2475a266 fix: French translations 2024-04-09 13:19:17 +05:30
Frappe PR Bot
f127c33acc fix: Persian translations 2024-04-09 13:19:12 +05:30
Frappe PR Bot
f529386b20 fix: Spanish translations 2024-04-09 13:19:09 +05:30
Frappe PR Bot
fd6195f8cd fix: German translations 2024-04-09 13:19:05 +05:30
Nabin Hait
433c8c450c fix: check if there is any existing depreciation schedule 2024-04-09 11:26:03 +05:30
ruthra kumar
dc79213bb3 chore: make ledger health doctype read_only 2024-04-09 11:18:53 +05:30
ruthra kumar
4776d660b5 test: ledger monitoring function 2024-04-09 11:18:49 +05:30
“Khushi
d791fa7460 fix: by default company field value is fetched from parent account 2024-04-09 11:18:33 +05:30
Raffael Meyer
10c5ed8a3c fix: make help items translatable (#40913) 2024-04-08 23:55:20 +00:00
Frappe PR Bot
b02d5a226c chore: update POT file (#40899) 2024-04-09 01:40:55 +02:00
Frappe PR Bot
6a8bd64c40 fix: sync translations from crowdin (#40772) 2024-04-09 01:40:28 +02:00
Nabin Hait
c66dde6318 fix: Show itemised TDS breakup based on Apply TDS checkbox on item level 2024-04-08 20:26:44 +05:30
Smit Vora
f7c9e1538b feat: new hook fields_for_group_similar_items to group additional fields for print formats (#40831) 2024-04-08 10:17:18 +00:00
ruthra kumar
503687a224 Merge pull request #40878 from ruthra-kumar/merge_taxes_from_DN_to_sales_invoice
refactor: merge taxes from delivery note to Sales Invoice
2024-04-08 14:37:44 +05:30
ruthra kumar
39a48a2e2a test: tax merging from 2 Delivery Note to Sales Invoice 2024-04-08 14:20:45 +05:30
ruthra kumar
286268567e Merge pull request #40876 from ruthra-kumar/fix_advance_against_reverse_advance_for_payable_types
fix: ledger entries for Payment against reverse payment reconciliation
2024-04-08 07:28:00 +05:30
Nabin Hait
219d5a5e8b Merge pull request #40900 from nabinhait/pro-rata-calc-fix
fix: pro-rata amount for straight line method
2024-04-07 15:37:42 +05:30
Nabin Hait
46a2d3cad9 fix: pro-rata amount for straight line method 2024-04-07 15:20:50 +05:30
rohitwaghchaure
4ded8ca07b Merge pull request #40827 from Nihantra-Patel/fix_po_quot_cre
fix: purchase order and quotation creation
2024-04-07 14:36:35 +05:30
rohitwaghchaure
3f6dcfe0a2 Merge pull request #40883 from rohitwaghchaure/fixed-13004
fix: incorrect operator causing incorrect validation
2024-04-07 12:03:03 +05:30
Nabin Hait
a180c502f9 Merge pull request #40698 from nabinhait/pro-rata-fix
fix: Get pro-rata amount based on correct days
2024-04-07 12:01:25 +05:30
rohitwaghchaure
c4ffeedffb Merge pull request #40887 from rohitwaghchaure/fixed-12539
fix: query_report.trigger_refresh is not a function
2024-04-07 11:56:38 +05:30
Rohit Waghchaure
30bbb58ca1 fix: query_report.trigger_refresh is not a function 2024-04-07 11:48:07 +05:30
Rohit Waghchaure
6b317b0c0d fix: incorrect operator causing incorrect validation 2024-04-07 11:43:55 +05:30
Nabin Hait
f61faa85a1 fix: Ignore permissions while fetching module settings properties 2024-04-07 11:33:40 +05:30
Dany Robert
01888c98bc fix: expense causing p&l test case to fail 2024-04-06 06:13:42 +00:00
Dany Robert
581af4eced chore: semgrep 2024-04-05 18:16:26 +00:00
Dany Robert
7ef4dbcaf6 fix: test case for zero deferred expense 2024-04-05 17:59:48 +00:00
ruthra kumar
550cbbd91c refactor: merge taxes from delivery note to Sales Invoice 2024-04-05 16:22:55 +05:30
ruthra kumar
64b7f624a5 refactor(test): include new fields in assertion 2024-04-05 15:31:57 +05:30
ruthra kumar
141f462368 test: advance payment against reverse payment reconciliation 2024-04-05 14:34:36 +05:30
ruthra kumar
248cc6105b test: reverse payment against payment for supplier 2024-04-05 14:06:11 +05:30
Nihantra Patel
4e5bc82a17 fix: update the task status from timesheet 2024-04-05 12:27:34 +05:30
ruthra kumar
74bc38e0af fix(test): for reverse payments, only advance acc should have effect
This applies for Payments against Reverse-Payment reconcilition
2024-04-05 11:08:12 +05:30
ruthra kumar
bdd36b0001 refactor: supplementary field to better handle reverse payments 2024-04-05 10:58:02 +05:30
ruthra kumar
9fd2dddfde fix: invalid ledger entries on payment against reverse payments
On Advance payments booked on separate party account, reconciliation
against a reverse payment posted invalid ledger entries.
2024-04-05 10:39:16 +05:30
ruthra kumar
a75e095d00 fix(test): Advance Received should be under liability account 2024-04-05 10:39:16 +05:30
ruthra kumar
8b9079d62e Merge pull request #40856 from ruthra-kumar/better_approach_for_exc_rate_updating
fix: unwanted Exc Gain/Loss journals on Payment against Journal entry
2024-04-05 10:32:10 +05:30
s-aga-r
9808ae92a4 fix: Subcontracting Receipt GL Entries 2024-04-05 09:53:23 +05:30
Dany Robert
5c9ce575f6 fix: missing def expense if no exp in first month 2024-04-04 16:18:20 +00:00
ruthra kumar
fe84558b77 test: payment against JE reconciliation with different rates 2024-04-04 20:41:27 +05:30
ruthra kumar
c15690e475 fix: use reference type name to update exc rate 2024-04-04 20:41:24 +05:30
Nabin Hait
be0cb5289f fix:linter issue 2024-04-04 20:11:09 +05:30
Nabin Hait
d868122f12 fix: Show amount in transaction currency in general ledger report 2024-04-04 19:58:17 +05:30
Nabin Hait
68b076cb61 Merge branch 'develop' into pro-rata-fix 2024-04-04 18:19:33 +05:30
Nabin Hait
f87be1d96e fix: Get default party bank account and company bank account for a party 2024-04-04 16:54:42 +05:30
rohitwaghchaure
1816f1d5f0 Merge pull request #40848 from rohitwaghchaure/fixed-12763
fix: group warehouse added in the stock reconciliation
2024-04-04 15:38:58 +05:30
Nabin Hait
fec20decc1 fix: Don't set delivery date as today while making SO from Quotation 2024-04-04 15:25:46 +05:30
Rohit Waghchaure
8f53bc0096 fix: group warehouse added in the stock reconciliation 2024-04-04 15:01:06 +05:30
Markus Lobedann
a2f878e1d1 fix: 🐛 use doctype File directly instead of save_file from file_manager.py
`save_file` will change the filename and not clean up after itself after a rollback
2024-04-04 10:31:34 +02:00
rohitwaghchaure
ea1b66931a Merge pull request #40852 from Nihantra-Patel/fix_workstation_refresh
fix: workstation refresh after prompt
2024-04-04 11:50:24 +05:30
Nihantra C. Patel
bed1af26e3 fix: workstation refresh after prompt 2024-04-04 10:58:36 +05:30
Deepesh Garg
a3c9fd6567 fix: Values in transaciton currency 2024-04-03 17:28:24 +05:30
ruthra kumar
7d22df2af5 Merge pull request #40643 from blaggacao/fix/adv-pay-status
fix(pr): set adv. pay. status base on PR stati
2024-04-03 15:05:25 +05:30
David
46e12e0981 chore: smaller loop; less indirection 2024-04-03 02:23:37 +02:00
David
b4c815b804 test: differentiate progressing and non progressing flows 2024-04-03 02:23:36 +02:00
David
a8cd850bb6 test: patch payments app interface 2024-04-03 02:23:36 +02:00
David
ec675ea3d8 fix(pr): set adv. pay. status base on pr stati 2024-04-03 02:09:56 +02:00
David
c9c6211009 test: trigger so to invoice flow (fails) 2024-04-03 02:09:56 +02:00
HarryPaulo
198b90eb01 fix: notify update when update outstanding amount - Linters 2024-04-02 18:50:51 -03:00
HarryPaulo
f67f163e7d fix: notify update when update outstanding amount 2024-04-02 18:42:30 -03:00
David
c705a393fe fix(pr): set adv. pay. status for po (still fails; differently) 2024-04-02 20:15:48 +02:00
David
bcdfbee23e test: correctly trigger po payment request ["Outward"] (fails) 2024-04-02 19:36:13 +02:00
David
3228841e68 fix: individual accounting tests
without this no 'run-tests' during development can be run
as soon as payment requests are involved
2024-04-02 19:36:13 +02:00
rohitwaghchaure
c3b2ed57f6 Merge pull request #40723 from rohitwaghchaure/fixed-allow-to-manually-pick-batches
feat: allow to pick manually qty / batches / serial nos
2024-04-02 22:13:50 +05:30
Rohit Waghchaure
50dd9fa8a3 feat: allow to pick manually qty / batches / serial nos 2024-04-02 21:08:04 +05:30
Raffael Meyer
f3bcdbe5bd fix: translatable web footer (#40834) 2024-04-02 15:14:38 +00:00
Nabin Hait
e8dcbe2625 fix: depr amount pro rata and related tests 2024-04-02 18:28:40 +05:30
HarryPaulo
bf88b8eb65 fix: wrong value for total amount in payments 2024-04-02 09:50:30 -03:00
rohitwaghchaure
1e4b920fd2 Merge pull request #40828 from rohitwaghchaure/chore-removed-manual-option-from-bom
chore: remove rate of material based on Manual
2024-04-02 18:10:32 +05:30
Rohit Waghchaure
0b63dbf221 chore: remove rate of material based on Manual 2024-04-02 16:32:03 +05:30
Nihantra C. Patel
7768544226 fix: purchase order and quotation creation upd 2024-04-02 16:18:19 +05:30
Nihantra C. Patel
7acbfc06a0 fix: purchase order and quotation creation 2024-04-02 16:15:27 +05:30
Nihantra C. Patel
f2b96869aa fix: purchase order and quotation creation 2024-04-02 16:06:38 +05:30
Nabin Hait
5281553b61 Merge pull request #40584 from nabinhait/fixed-asset-register-currency
fix: show currency symbol in base currency in fixed asset register report
2024-04-02 15:56:10 +05:30
Nabin Hait
21a40a2236 fix: linter issues 2024-04-02 15:35:06 +05:30
rohitwaghchaure
4c8dfb2e6a Merge pull request #40816 from rohitwaghchaure/fixed-12159
fix: added validation if parent id is missing in BOM Creator
2024-04-02 15:11:56 +05:30
rohitwaghchaure
271fea69b8 Merge pull request #40814 from rohitwaghchaure/fixed-barcode-not-fetch-on-stock-entry
fix: barcode not fetched on selection of item
2024-04-02 11:21:07 +05:30
Rohit Waghchaure
0a1fab762f fix: added validation if parent id is missing in BOM Creator 2024-04-02 11:19:31 +05:30
Rohit Waghchaure
b0730293e2 fix: barcode not fetched on selection of item 2024-04-02 10:39:48 +05:30
rohitwaghchaure
15c3f09898 Merge pull request #40720 from mmdanny89/warehouse-pos
Set default warehouse for pos invoice
2024-04-01 22:37:27 +05:30
Deepesh Garg
45d5f6e00a fix: Multiple partial payment requests against Purchase Invoice 2024-04-01 21:21:46 +05:30
Deepesh Garg
edf51c9ab9 Merge pull request #40797 from deepeshgarg007/po_filter
fix: Party type in Payment Order
2024-04-01 20:38:33 +05:30
Deepesh Garg
6416a6ad94 Merge pull request #40796 from deepeshgarg007/pe_default_company_bank_account
fix: Default company bank account
2024-04-01 20:38:17 +05:30
Deepesh Garg
4f8990602e Merge pull request #40770 from deepeshgarg007/so_commission_update
fix: Recalculate sales commission on item update
2024-04-01 20:37:57 +05:30
Deepesh Garg
81cf970883 Merge pull request #40755 from deepeshgarg007/employee_payment_entry_receive
fix: Receive payment entry from Employee
2024-04-01 20:37:40 +05:30
rohitwaghchaure
4c79d92faa Merge pull request #40735 from rohitwaghchaure/fixed-stock-balance-report
fix: Show Stock Ageing Data filter not working in stock balance report
2024-04-01 16:54:12 +05:30
Rohit Waghchaure
621421bda2 fix: Show Stock Ageing Data filter not working in stock balance report 2024-04-01 16:19:21 +05:30
ruthra kumar
2dd07d9292 Merge pull request #40790 from frappe/pot_develop_2024-03-31
chore: update POT file
2024-04-01 15:49:06 +05:30
ruthra kumar
d2b96b415c Merge pull request #40181 from pps190/fix-show-future-payments
fix: show future payments consider allocated sales returns
2024-04-01 13:03:23 +05:30
Deepesh Garg
91fa41c9ec fix: Party type in Payment Order 2024-03-31 20:08:39 +05:30
Deepesh Garg
7ac91deb83 fix: Default company bank account 2024-03-31 19:48:40 +05:30
Deepesh Garg
b542f21eea Merge pull request #40714 from khushi8112/general_ledger_report_voucher_no
fix: voucher no. is link field for non english user interface
2024-03-31 19:23:01 +05:30
frappe-pr-bot
6283ff5d52 chore: update POT file 2024-03-31 09:35:24 +00:00
rohitwaghchaure
9bacf53f04 Merge pull request #40786 from rtdany10/gp-wh-issue
fix(gp): SLEs not fetched for correct warehouse
2024-03-31 11:45:49 +05:30
rohitwaghchaure
4f91effca9 Merge pull request #40778 from blaggacao/chore/into-child-mapper
chore(stock): use the into child mapper mapper frappe/frappe#22592
2024-03-31 11:43:56 +05:30
Dany Robert
f958e8be06 fix(gp): SLEs not fetched for correct warehouse 2024-03-30 16:32:43 +05:30
rohitwaghchaure
3231ee4d9d Merge pull request #40783 from rohitwaghchaure/fixed-provision-to-add-serial-batch-bundle-in-subcontracting-receipt
fix: button to select serial / batch bundle in the subcontracting receipt
2024-03-30 11:23:20 +05:30
Rohit Waghchaure
d73b1f3e6a fix: button to select serial / batch bundle in the subcontracting receipt 2024-03-30 10:46:56 +05:30
jeshani
679aea607b fix: Warehouse linked company name in multicompany setup (#40779) 2024-03-30 10:16:22 +05:30
Richard Case
ee140369a3 feat: significant enhancements to sales analytics report to support charts 2024-03-29 22:51:28 +00:00
David Arnold
28c75b8f4d chore(stock): use the into child mapper mapper frappe/frappe#22592 2024-03-29 23:28:33 +01:00
Deepesh Garg
2a8a404c69 Merge branch 'develop' of https://github.com/frappe/erpnext into so_commission_update 2024-03-29 18:02:53 +05:30
Deepesh Garg
f76da50b7e fix: Recalculate sales commission on item update 2024-03-29 17:57:58 +05:30
Gursheen Anand
af26ac96e9 fix: do not add actual expense twice for validating budget 2024-03-29 17:22:48 +05:30
David Arnold
7032a108a8 Merge branch 'develop' into feat/add-login-user-to-driver 2024-03-29 10:51:30 +01:00
rohitwaghchaure
8e522183bc Merge pull request #40758 from ashish-greycube/patch-12
fix: payment_order_status should be no_copy
2024-03-29 13:25:13 +05:30
ruthra kumar
66a06ca1a5 Merge pull request #40760 from ruthra-kumar/fix_cost_center_update_in_gain_loss_journal
fix: cost center shouldn't update debit/credit in Exc gain/loss JV
2024-03-29 11:42:44 +05:30
rohitwaghchaure
a3fbeff333 Merge pull request #40757 from rohitwaghchaure/fixed-validation-message
chore: show item name in the validation message
2024-03-29 11:35:07 +05:30
ruthra kumar
398d3022ef fix: cost center shouldn't update debit/credit in Exc gain/loss JV 2024-03-29 11:32:34 +05:30
Rohit Waghchaure
d05412f96a chore: show item name in the validation message 2024-03-29 10:53:04 +05:30
Ashish Shah
adee2ba541 fix: payment_order_status should be no_copy
payment_order_status should be no_copy
2024-03-29 10:52:52 +05:30
rohitwaghchaure
ce2b9de9be Merge pull request #40752 from rohitwaghchaure/provision-to-override-batch-dialog
chore: allow to override serial batch selector using custom app
2024-03-29 09:10:36 +05:30
Deepesh Garg
29e5c6807e fix: Receive payment entry from Employee 2024-03-29 09:05:35 +05:30
Frappe PR Bot
10bf6529ef fix: sync translations from crowdin (#40717)
Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
2024-03-28 17:16:11 +01:00
Raffael Meyer
2e15b224aa Merge pull request #40749 from barredterra/crowdin-config 2024-03-28 14:31:51 +01:00
barredterra
e5f87ef8da chore: copy crowdin config from frappe 2024-03-28 14:14:50 +01:00
Raffael Meyer
a2961a427d Merge pull request #40725 from barredterra/in-context-translation 2024-03-28 14:11:54 +01:00
Deepesh Garg
fe1290a89a Merge pull request #40734 from deepeshgarg007/trend_report_filters
fix: Filters in trend reports
2024-03-28 18:16:14 +05:30
rohitwaghchaure
e04cad3368 Merge pull request #40741 from rohitwaghchaure/fixed-sales-purchase-return-validation-issue
fix: sales / purchase return validation issue
2024-03-28 17:52:55 +05:30
ruthra kumar
139c18f2cc Merge pull request #40739 from ruthra-kumar/use_sql_to_clear_comments_and_communications
refactor: use sql to clear comments
2024-03-28 17:40:54 +05:30
Rohit Waghchaure
59dc4a96e1 fix: sales / prchase return validation issue 2024-03-28 16:45:09 +05:30
ruthra kumar
1f46c1530e refactor: use sql to clear comments 2024-03-28 13:56:20 +05:30
Deepesh Garg
5a151189ad Merge pull request #40731 from Nihantra-Patel/fix_tax_format
fix: markdown to text editor set for supplier quotation
2024-03-28 12:44:45 +05:30
Deepesh Garg
c15a320940 chore: remove hardcoded FY 2024-03-28 12:25:42 +05:30
Deepesh Garg
87324c7349 fix: Filters in trend reports 2024-03-28 12:07:49 +05:30
rohitwaghchaure
4d41516abb Merge pull request #40713 from rohitwaghchaure/fixed-12091
fix: enable list view for the issues on the portal
2024-03-28 11:07:07 +05:30
Nihantra Patel
9828d34b19 fix: markdown to text editor set for supplier quotation 2024-03-28 10:30:13 +05:30
ruthra kumar
6b2f745afe Merge pull request #40719 from frappe/fix-ruff-qb-formatting
fix: exclude some query builder lines from ruff rules
2024-03-28 09:48:05 +05:30
ruthra kumar
eee86d2e4b fix: use 'eq' and isnull() on qb conditions 2024-03-28 09:18:33 +05:30
barredterra
04c91e263d chore: add crowin identifiers for in-context translation 2024-03-27 19:31:19 +01:00
rohitwaghchaure
9709a18ef5 Merge pull request #40718 from rohitwaghchaure/fixed-do-not-fetch-recived-items-12005
fix: do not fetch received items in purchase receipt
2024-03-27 22:40:18 +05:30
Danny
b156937254 fix: set default warehouse for pos invoice 2024-03-27 12:41:58 -04:00
Akhil Narang
ac69513f60 fix: exclude some query builder lines from ruff rules
`== None` and `== True` are intentional here

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
2024-03-27 21:51:09 +05:30
Rohit Waghchaure
5bff434902 fix: do not fetch received items in purchase receipt 2024-03-27 20:05:27 +05:30
“Khushi
db1f7fcf63 fix: fixed incorrect cash flow data in finacial statement report 2024-03-27 16:48:49 +05:30
“Khushi
2b8928cae6 fix: voucher no. is link field for non english user interface 2024-03-27 16:25:13 +05:30
Akhil Narang
a4dd1c2bf6 Merge pull request #40681 from barredterra/ruff
chore: switch to ruff for python formatting/linting
2024-03-27 16:23:00 +05:30
Rohit Waghchaure
bddc1e3974 fix: enable list view for the issues on the portal 2024-03-27 16:17:22 +05:30
Akhil Narang
89b5e061af ci: sync up action versions with framework
Fixup some tests for py312

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
2024-03-27 16:06:04 +05:30
Akhil Narang
54cd492217 chore: update list of revisions for git blame to ignore
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
2024-03-27 16:06:04 +05:30
Akhil Narang
f63396ef47 fix(treewide): manual ruff fixes
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
2024-03-27 16:06:04 +05:30
Akhil Narang
3effaf21ef refactor(treewide): formatting and ruff fixes, + manually enabled F401
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
2024-03-27 16:06:04 +05:30
barredterra
8afb7790de chore: switch to ruff for python formatting/linting 2024-03-27 16:06:04 +05:30
rohitwaghchaure
8c7213ad7d Merge pull request #40708 from rohitwaghchaure/fixed-priority-has-not-copied-11942
fix: Priority not copied from project template
2024-03-27 15:43:30 +05:30
Rohit Waghchaure
33fd7b8a1f fix: Priority not copied from project template 2024-03-27 15:13:51 +05:30
s-aga-r
5daf19da40 fix(ux): Sales Order Stock Reservation Dialog 2024-03-27 14:52:05 +05:30
ruthra kumar
19e054c7a7 Merge pull request #40706 from ruthra-kumar/typeerror_in_purchase_order
fix: typeerror on Purchase Order form UI
2024-03-27 14:38:49 +05:30
ruthra kumar
57f67faba1 fix: typeerror on Purchase Order form UI 2024-03-27 14:28:37 +05:30
Ankush Menat
c2470ccc70 refactor: usage of modified ordering (#40705)
Audited some important code:
- general_ledger.py
- stock_ledger.py
2024-03-27 08:48:01 +00:00
Ankush Menat
dfde490c02 refactor!: switch to creation sort (#40699) 2024-03-27 13:45:34 +05:30
rohitwaghchaure
95dcb75e93 Merge pull request #40700 from rohitwaghchaure/fixed-rate-changing-on-qty-change-11659
fix: rate changed on changing of the qty
2024-03-27 13:36:22 +05:30
Rohit Waghchaure
cd36a1051f fix: rate changed on changing of the qty 2024-03-27 13:29:22 +05:30
Nabin Hait
6c1e9fab27 fix: Get pro-rata amount based on correct days 2024-03-27 12:24:20 +05:30
Rohit Waghchaure
0d9d42ae61 chore: allow to override serial batch selector 2024-03-27 11:52:06 +05:30
Deepesh Garg
1b0f95088a Merge pull request #40641 from deepeshgarg007/cur_frm_reduce
chore: Reduce usage of cur_frm
2024-03-27 11:45:26 +05:30
ruthra kumar
f96cf111ed chore: schedule job to run daily 2024-03-27 10:33:54 +05:30
ruthra kumar
1a43ed763b chore: permission and UI changes 2024-03-27 10:14:29 +05:30
ruthra kumar
00eeacd06a refactor: only run checks on specified companies 2024-03-27 10:10:55 +05:30
ruthra kumar
704925549b refactor: make health check configurable for companies 2024-03-27 10:08:17 +05:30
ruthra kumar
a42482ce35 refactor: control monitoring through settings page 2024-03-27 10:01:50 +05:30
ruthra kumar
b2fb7843d1 chore: settings page for health monitor 2024-03-27 09:53:27 +05:30
Raffael Meyer
652b4e5dcd Merge pull request #40663 from barredterra/uom-data 2024-03-27 00:28:21 +01:00
Frappe PR Bot
edced3fd21 fix: sync translations from crowdin (#40683) 2024-03-27 00:25:03 +01:00
“Khushi
f189be501b fix: default accounting dimension in journal entry child table 2024-03-27 00:08:39 +05:30
ruthra kumar
8c8d9be810 refactor: barebones method to run checks 2024-03-26 20:04:43 +05:30
ruthra kumar
d620b9eae8 refactor: flag for general and payment ledger mismatch 2024-03-26 20:04:43 +05:30
rohitwaghchaure
533627df3b Merge pull request #40685 from rohitwaghchaure/fixed-incorrect-validation-11901
fix: validation error for the subcontracting receipt
2024-03-26 19:54:55 +05:30
Rohit Waghchaure
016585c248 fix: validation error for the subcontracting receipt 2024-03-26 19:33:48 +05:30
rohitwaghchaure
683da71c5e Merge pull request #40684 from rohitwaghchaure/fixed-incorrect-total-qty
fix: incorrect total qty in job card
2024-03-26 19:32:04 +05:30
Rohit Waghchaure
c3546cf8e2 fix: incorrect total qty in job card 2024-03-26 18:16:37 +05:30
ruthra kumar
402ffc6d27 refactor: date on which vouchers was reported 2024-03-26 17:57:04 +05:30
ruthra kumar
9ed74dd8cc feat: ledger health doctype 2024-03-26 17:53:47 +05:30
rohitwaghchaure
2e30dda0cd Merge pull request #40674 from rohitwaghchaure/fixed-batch-queries-in-popup
fix: existing batch from different warehouse not showing in the dropdown
2024-03-26 16:04:14 +05:30
Rohit Waghchaure
662cf21afb fix: existing batch from different warehouse not showing in the dropdown 2024-03-26 14:31:18 +05:30
Nabin Hait
8b6220efd8 fix: show currency symbol in base currency in fixed asset register report 2024-03-26 12:54:50 +05:30
rohitwaghchaure
b3e163e9d8 Merge pull request #40672 from rohitwaghchaure/fixed-item-issue-11972
fix: item not coming in quick entry
2024-03-26 11:42:33 +05:30
Rohit Waghchaure
dcbb54c41f fix: item not coming in quick entry 2024-03-26 11:38:09 +05:30
ruthra kumar
064127935b Merge pull request #40634 from wojosc/patch-42
refactor: better pop up message for Internal Customer validation
2024-03-26 09:47:45 +05:30
Frappe PR Bot
5ed13fa913 chore: sync translations from crowdin (#40343)
chore: sync translations from crowdin
2024-03-26 09:06:11 +05:30
Deepesh Garg
d0e654528b Merge pull request #40431 from FHenry/dev_fix_opportunity_type_translatable
fix: Opportunity Type Doctype must be translatable
2024-03-26 09:04:39 +05:30
Raffael Meyer
1be2df81c9 Merge pull request #40586 from barredterra/validate-item-price-uom 2024-03-25 23:27:18 +01:00
barredterra
4d4d88ec5f fix: use untranslated UOM as default 2024-03-25 23:19:27 +01:00
barredterra
b49d64de63 feat: add translatable string extractor for UOM names 2024-03-25 23:19:13 +01:00
barredterra
8fa5707911 refactor: create UOMs during setup 2024-03-25 23:18:36 +01:00
barredterra
34344a062e fix: translate uom names 2024-03-25 22:59:22 +01:00
barredterra
679204ecb8 chore: enhance uom data
- sort by uom_name
- add common_code and symbol
2024-03-25 22:55:46 +01:00
Raffael Meyer
f20c54a6c1 Merge pull request #40593 from barredterra/uom-fields 2024-03-25 21:53:22 +01:00
Raffael Meyer
f316a29ba6 Merge pull request #40635 from frappe/pot_develop_2024-03-24 2024-03-25 21:41:07 +01:00
David Arnold
462204fc65 fix(Payment Entry): get contact details from existing contact (#40556) 2024-03-25 20:12:44 +01:00
Deepesh Garg
e04a3b107a Merge pull request #40627 from deepeshgarg007/da_code_cleanup
chore: Discount accounting code cleanup
2024-03-25 19:06:26 +05:30
Raffael Meyer
441969d7d6 Merge branch 'develop' into validate-item-price-uom 2024-03-25 14:25:54 +01:00
Deepesh Garg
7d7d10e422 Merge pull request #40577 from barredterra/one-item-price
perf: query one item price only
2024-03-25 17:22:49 +05:30
Deepesh Garg
12945341ce Merge pull request #40589 from barredterra/get_prices_as_dict
refactor: get prices as dict
2024-03-25 17:18:31 +05:30
Deepesh Garg
5ab9656e8f Merge pull request #40640 from deepeshgarg007/default_fb_pl
fix: Add default finance book check in P&L statement
2024-03-25 14:43:29 +05:30
Ankush Menat
e055147849 fix: address_display, text -> text editor (#40621)
* fix: address_display, text -> text editor

* fix: text -> text editor for shipping and dispatch_address
2024-03-25 05:46:16 +00:00
Wolfram Schmidt
b132892b25 refactor: better pop message for Internal Customer validation
-added more meaningful description to message when using "internal Customer" scenario
2024-03-25 09:35:32 +05:30
Deepesh Garg
e44809bcc9 chore: Reduce usage of cur_frm 2024-03-24 19:27:07 +05:30
Deepesh Garg
5be3417fdf fix: Add default finance book check in P&L statement 2024-03-24 19:02:38 +05:30
rohitwaghchaure
c89b0e37ab Merge pull request #40638 from rohitwaghchaure/fixed-40578
fix: Batch No is mandatory while making manufacture entry
2024-03-24 18:31:19 +05:30
Rohit Waghchaure
43fd60a877 fix: Batch No is mandatory while making manufacture entry 2024-03-24 17:44:37 +05:30
rohitwaghchaure
079cc8bd21 Merge pull request #40594 from rohitwaghchaure/fixed-serial-batch-bundle-scr
fix: use serial/batch fields for subcontracting receipt and in transit in stock entry
2024-03-24 16:03:46 +05:30
frappe-pr-bot
d47b87ba71 chore: update POT file 2024-03-24 09:35:26 +00:00
Deepesh Garg
ae31f2c5ad Merge pull request #40504 from khushi8112/selling-coupon-code
feat: Coupon code in sales invoice
2024-03-23 17:07:41 +05:30
Deepesh Garg
24e2672fde Merge branch 'develop' into selling-coupon-code 2024-03-23 14:42:47 +05:30
Deepesh Garg
aaa1df6a1f chore: Discount accounting code cleanup 2024-03-23 00:19:27 +05:30
Rohit Waghchaure
3423334e4f fix: use serial/batch fields for subcontracting receipt and in transit stock entry 2024-03-22 23:13:47 +05:30
ruthra kumar
b1a9b6d64a Merge pull request #40622 from ruthra-kumar/refactor_flag_update_patch
refactor: reset update_outstanding_for_self flag for old records
2024-03-22 20:22:14 +05:30
ruthra kumar
fdcdc8a56e refactor: hide on print formats 2024-03-22 17:50:51 +05:30
ruthra kumar
a88bf8419e refactor: reset flag for old records 2024-03-22 16:16:07 +05:30
rohitwaghchaure
6d603cc35f Merge pull request #40616 from rohitwaghchaure/fixed-rate-reset-to-zero-11988
fix: rate reset to zero
2024-03-22 15:19:54 +05:30
Rohit Waghchaure
6821baa850 fix: rate reset to zero 2024-03-22 15:03:38 +05:30
ruthra kumar
844ad405ff Merge pull request #40509 from blaggacao/fix/cutoff-date-implementation
fix: permissions sales user for selling settings
2024-03-22 10:13:58 +05:30
ruthra kumar
6940c2b0aa Merge pull request #40520 from blaggacao/fix/bulk-tx-log-permissions
fix: permissions during bulk transaction logs
2024-03-22 10:07:08 +05:30
ruthra kumar
f30e5eab11 fix: query 'Selling Settings' 2024-03-22 09:55:47 +05:30
ruthra kumar
4972f6b66f Merge pull request #40208 from barredterra/refactor-semgrep
refactor: reduce usage of `cur_frm`
2024-03-22 09:28:19 +05:30
Akhil Narang
1cd38c860a perf: add in some indexes (#40590)
`Sales Invoice Item.purchase_order`
`Delivery Note Item.purchase_order`

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
2024-03-22 08:47:03 +05:30
rohitwaghchaure
eb45a71997 Merge pull request #40595 from rohitwaghchaure/fixed-rate-not-fetch-from-item-price
fix: rate not fetching from the item price
2024-03-21 22:18:28 +05:30
ruthra kumar
2bd9c5b001 Merge pull request #40386 from rtdany10/gp-report-rate
fix: wrong buying amount if delivered and billed qty varies
2024-03-21 21:13:32 +05:30
Rohit Waghchaure
d893a465d7 fix: rate not fetching from the item price 2024-03-21 21:04:03 +05:30
ruthra kumar
ccb51ded95 test: buying amt calculation if DN and SI differ in qty 2024-03-21 20:57:52 +05:30
barredterra
4a49618cd7 feat(UOM): add common code, symbol and description 2024-03-21 15:49:45 +01:00
Raffael Meyer
9fcddc3378 Merge pull request #40587 from barredterra/validate-price-dates 2024-03-21 14:12:37 +01:00
barredterra
58b3ce6a19 refactor: get prices as dict 2024-03-21 13:48:05 +01:00
barredterra
cbcc47b5c4 refactor(Item Price): validate dates 2024-03-21 11:57:22 +01:00
barredterra
69824eff80 feat(Item Price): validate UOM 2024-03-21 11:52:10 +01:00
ruthra kumar
64f686d943 Merge pull request #40580 from ruthra-kumar/config_changes_in_transaction_deletion_record
refactor: config changes in Transaction Deletion Record
2024-03-21 10:45:54 +05:30
ruthra kumar
4ba67fb3ec refactor: config changes in Transaction Deletion Record 2024-03-21 10:29:56 +05:30
barredterra
be9fe7331a perf: query one item price only 2024-03-20 19:37:34 +01:00
Deepesh Garg
1714ac6587 Merge pull request #40572 from GursheenK/pcv-validate-only-valid-gles
fix: PCV validation for previous fiscal year
2024-03-20 20:55:08 +05:30
ruthra kumar
0a495bf65e Merge pull request #39717 from ruthra-kumar/redesign_transaction_deletion_record
refactor: Transaction Deletion record for large volumes
2024-03-20 19:41:39 +05:30
Gursheen Anand
a1d108c062 fix: validate gl for previous fiscal year 2024-03-20 18:45:04 +05:30
Deepesh Garg
986357428d Merge pull request #40563 from GursheenK/tax-breakup-table-docfield
fix: use `Text Editor` for rendering tax breakup table
2024-03-20 18:32:38 +05:30
Ankush Menat
967540da18 fix: style for tax breakup 2024-03-20 16:56:30 +05:30
rohitwaghchaure
e1ce7bfb11 Merge pull request #40545 from barredterra/bom-configurator-labels
fix: translatability of bom configurator labels
2024-03-20 16:18:22 +05:30
Gursheen Anand
1c63983873 fix: use Text Editor for rendering tax breakup table 2024-03-20 16:09:14 +05:30
ruthra kumar
02c522b7cd chore: fix linting issue in JS 2024-03-20 16:01:09 +05:30
ruthra kumar
81309576b0 refactor(test): test cases modified to handle new approach 2024-03-20 15:16:33 +05:30
ruthra kumar
a158b825d7 refactor: ability to process in single transaction 2024-03-20 15:12:26 +05:30
rohitwaghchaure
50bfb8eaa9 Merge pull request #40561 from rohitwaghchaure/fixed-11260
fix: Cannot read properties of undefined (reading 'rate')
2024-03-20 15:00:14 +05:30
Rohit Waghchaure
ac92a22914 fix: Cannot read properties of undefined (reading 'rate') 2024-03-20 14:56:07 +05:30
ruthra kumar
5a3afea8c7 refactor: link running doc validation to company master 2024-03-20 14:47:11 +05:30
ruthra kumar
5fe0b20be1 chore: rename entry point 2024-03-20 14:10:08 +05:30
rohitwaghchaure
dfffaddf03 Merge pull request #40559 from rohitwaghchaure/fixed-pick-list-issue-11688
fix: pick list not picked materials having required qty less than 1
2024-03-20 13:51:43 +05:30
Rohit Waghchaure
1a9ae33110 fix: pick list not picked qty less than 1 2024-03-20 13:18:23 +05:30
Nabin Hait
1d91e1788c Merge pull request #40549 from nabinhait/provisional-entry-fix2
fix: provisional entry for non-stock item
2024-03-19 21:59:11 +05:30
Nabin Hait
b73f51a9bd fix: get unique provisional accounts 2024-03-19 21:06:46 +05:30
rohitwaghchaure
0725707cb1 fix: currency symbol for Landed Cost Voucher Amount (#40550) 2024-03-19 20:15:36 +05:30
Nabin Hait
9996d6b7e6 fix: provisional entry for non-stock item 2024-03-19 18:44:13 +05:30
ruthra kumar
3cec62d4f8 chore: move status and error log to their own section 2024-03-19 17:49:05 +05:30
ruthra kumar
0455d0c46c refactor: minor UI tweaks 2024-03-19 17:41:37 +05:30
ruthra kumar
4a55240e63 refactor: exception propogation 2024-03-19 17:39:20 +05:30
Raffael Meyer
815df8e795 Merge pull request #40546 from barredterra/fix-group-by 2024-03-19 12:50:37 +01:00
barredterra
87e36d290e fix(Supplier Quotation Comparison): group by options 2024-03-19 12:34:23 +01:00
barredterra
4cfe99d74f fix: translatability of bom configurator labels 2024-03-19 12:29:50 +01:00
barredterra
e9e985aea0 refactor: use this.frm instead of cur_frm 2024-03-19 12:26:54 +01:00
barredterra
775e8db04e refactor: reduce usage of cur_frm 2024-03-19 12:26:50 +01:00
Raffael Meyer
a8d458b979 Merge pull request #40542 from barredterra/remove-in-list 2024-03-19 12:11:16 +01:00
barredterra
d238751e6b refactor: usage of in_list 2024-03-19 12:03:36 +01:00
Nabin Hait
5691cc6323 Merge pull request #40456 from nabinhait/pi-optimization-dev
perf: Performance optimization for Purchase Invoice submission
2024-03-19 16:09:17 +05:30
rohitwaghchaure
8136954484 fix: rate changing while making PR (negative discount) (#40539) 2024-03-19 15:26:09 +05:30
rohitwaghchaure
a64c2ecf39 fix: stock reco negative batch (#40533) 2024-03-19 14:54:17 +05:30
Gursheen Kaur Anand
5a8004bc58 Merge pull request #40528 from GursheenK/add-range-for-psoa
fix(minor): missing range for ageing summary in PSOA
2024-03-19 12:39:47 +05:30
Gursheen Anand
643cc022fd fix: missing range for ageing summary 2024-03-19 12:12:26 +05:30
rohitwaghchaure
09ea7edb86 fix: Update Existing Price List Rate not working (#40333) 2024-03-19 12:10:24 +05:30
ruthra kumar
eea260b9f9 chore: code cleanup 2024-03-19 11:18:11 +05:30
ruthra kumar
0182713dd6 Merge pull request #40502 from ruthra-kumar/toggle_http_and_https_on_currency_exchange_settings
refactor: toggle between 'http' and 'https' on exchange rate API
2024-03-19 09:59:16 +05:30
Raffael Meyer
12f97e3c63 Merge pull request #40521 from barredterra/rfq-supplier-count 2024-03-19 02:33:52 +01:00
barredterra
8d1b530070 fix(RFQ): load up to 100 suppliers 2024-03-19 02:22:52 +01:00
David
49dd4c1ef3 fix: permissions during bulk transaction logs 2024-03-18 23:08:38 +01:00
David
2f3d6cd304 fix: permissions for selling settings 2024-03-18 19:52:24 +01:00
Nabin Hait
e43beac086 fix: provisional entry for non-stock item 2024-03-18 22:07:12 +05:30
ruthra kumar
3dd6686d8a Merge pull request #40511 from ruthra-kumar/incorrect_exc_gain_loss
fix: invalid exchange loss booking on invoice against base accounts
2024-03-18 20:39:40 +05:30
ruthra kumar
e1c2d006ca refactor(test): ensure Exchange gain/loss journals aren't created 2024-03-18 20:24:05 +05:30
ruthra kumar
3d5dba6976 fix: invalid exchange loss booking on invoice againts base accounts 2024-03-18 15:34:21 +05:30
rohitwaghchaure
7695759f3c fix: not able to delete cancelled delivery note (#40508) 2024-03-18 15:09:55 +05:30
rohitwaghchaure
00de529a1e fix: balance qty in the stock ledger report (#40506) 2024-03-18 12:41:43 +05:30
“Khushi
08893d1f75 chore: fixed merged conflicts 2024-03-18 11:46:17 +05:30
“Khushi
11616bec26 style: removed print statement 2024-03-18 11:18:14 +05:30
ruthra kumar
8b81274769 refactor: toggle between 'http' and 'https' on exchange rate API 2024-03-18 09:26:27 +05:30
Deepesh Garg
6d47b8a24e Merge pull request #40459 from Nihantra-Patel/fix_sp_address
fix: sales partner address display Issue
2024-03-17 11:05:48 +05:30
Nihantra C. Patel
cefb8f69e5 chore: minor cleanup | add comma 2024-03-17 10:51:34 +05:30
ruthra kumar
1fc099dacf Merge pull request #40494 from ruthra-kumar/bank_statement_import_error
fix: AttributeError in Bank Statement Import
2024-03-17 07:52:19 +05:30
ruthra kumar
c46c329ed8 Merge pull request #40495 from ruthra-kumar/indexerror_on_err_creation
fix: index error on Exchange Rate Revaluation creation
2024-03-17 07:50:21 +05:30
ruthra kumar
bb279e368c fix: index error on Exchange Rate Revaluation creation 2024-03-17 07:32:13 +05:30
ruthra kumar
aec630c74f fix: attribute error on Bank Statement Import retry 2024-03-17 06:46:06 +05:30
ruthra kumar
3cde81be65 fix: don't validate for currency, if account is unavailable 2024-03-17 06:35:31 +05:30
Devin Slauenwhite
3381d0d945 fix: show future payments allocated sales returns is considered as payment 2024-03-16 15:24:12 -04:00
Devin Slauenwhite
daaa00bd4a test: show future payments allocated sales returns is considered as payment 2024-03-16 15:24:12 -04:00
Deepesh Garg
2fadfd7cfc Merge pull request #40428 from deepeshgarg007/search_field_fix
chore: Remove custom party queries
2024-03-16 20:03:31 +05:30
Deepesh Garg
60ba25caf2 fix: Remove custom queries for customer 2024-03-16 19:47:39 +05:30
Deepesh Garg
f3f6bc8042 chore: minor cleanup 2024-03-16 19:15:59 +05:30
Ankush Menat
b171784d85 Merge pull request #40491 from frappe/make_bom_tests_work
test: fix bom test
2024-03-16 19:12:29 +05:30
Deepesh Garg
eccd5b4c5d chore: better description 2024-03-16 19:11:59 +05:30
Ankush Menat
c80356c7c9 test: remove broken bom test
These variables never existed, the test was passing because of a bug in
timeout decorator https://github.com/frappe/frappe/pull/25491
2024-03-16 18:58:19 +05:30
ruthra kumar
c9039d767b Merge pull request #40485 from ruthra-kumar/prevent_partial_links_between_so_and_dn
refactor: validate SO and SI references in Delivery Notes
2024-03-16 14:57:41 +05:30
ruthra kumar
4f396d3049 test: SO reference validation 2024-03-16 14:39:57 +05:30
ruthra kumar
4d090bd3b8 refactor: validate SO and SI references 2024-03-16 14:28:14 +05:30
ruthra kumar
30463657bf refactor: better method naming 2024-03-16 10:41:05 +05:30
ruthra kumar
ec194ef076 refactor: barebones hook on all doctypes with 'company' field 2024-03-16 10:41:05 +05:30
ruthra kumar
78c9cc63b1 refactor: make sure only one task is running for doc 2024-03-16 10:41:05 +05:30
ruthra kumar
98afb4d468 chore: hide docfield in list view 2024-03-16 10:41:05 +05:30
ruthra kumar
31a2da552b refactor: validations to prevent duplicate jobs 2024-03-16 10:41:05 +05:30
ruthra kumar
55e93b3fe1 refactor: no copy on summary table and more validations 2024-03-16 10:41:05 +05:30
ruthra kumar
2dbe68a09d refactor: reset all flags and remove unwanted code 2024-03-16 10:41:05 +05:30
ruthra kumar
1014940953 chore: show correct status in list view 2024-03-16 10:41:04 +05:30
ruthra kumar
86b5e2e277 refactor: validate status before running events 2024-03-16 10:40:26 +05:30
ruthra kumar
7c4cff2649 refactor: make Excluded doctype table read only 2024-03-16 10:40:24 +05:30
ruthra kumar
b98a5e4edc chore: remove unwanted UI code 2024-03-16 10:40:06 +05:30
ruthra kumar
49d3bcbc8d refactor: use separate child table for summary 2024-03-16 10:39:17 +05:30
ruthra kumar
b12ca65fcc refactor: chained callback 2024-03-16 10:38:32 +05:30
ruthra kumar
cccb2d5141 refactor: reorder flags in Tasks section 2024-03-16 10:38:32 +05:30
ruthra kumar
6a77d86a53 refactor: use flags to decide on current stage 2024-03-16 10:38:31 +05:30
ruthra kumar
8944ab8b6a refactor: UI trigger 2024-03-16 10:37:18 +05:30
ruthra kumar
d0dc2c6e77 refactor: tasks section and UI niceties 2024-03-16 10:35:59 +05:30
ruthra kumar
6fbb67b1d2 refactor: set status and trigger job on submit 2024-03-16 10:35:59 +05:30
ruthra kumar
0d65d878de refactor: more options for 'status' and move it to top 2024-03-16 10:35:59 +05:30
rohitwaghchaure
1ff8a6f24f fix: stopped mr showing in the popup (#40478) 2024-03-15 18:20:09 +05:30
rohitwaghchaure
59222813af fix: serial and batch for internal transfer (#40467)
* fix: serial and batch for internal transfer

* chore: fix test cases
2024-03-15 17:55:41 +05:30
ruthra kumar
a84b9434a9 Merge pull request #40473 from ruthra-kumar/config_changes_on_cr_note_self_update_flag
refactor: enable no-copy for update_outstanding_for_self
2024-03-15 17:01:41 +05:30
ruthra kumar
a1e8caa5c1 refactor: enable no-copy for update_outstanding_for_self 2024-03-15 16:44:54 +05:30
Gursheen Kaur Anand
05e8b6c9f6 Merge branch 'develop' into valuation-tax-gle-via-lcv 2024-03-15 12:51:40 +05:30
ruthra kumar
ec55831440 Merge pull request #40260 from ruthra-kumar/support_payment_against_payment
refactor: support payment against reverse payment reconciliation
2024-03-15 12:51:38 +05:30
Gursheen Kaur Anand
a06c3e9f9f Merge pull request #40429 from GursheenK/sales-partner-targets-achieved
fix: achieved targets for territory / partners
2024-03-15 12:45:01 +05:30
Gursheen Kaur Anand
80d3dd2846 Merge pull request #40198 from GursheenK/due-date-for-invoices-via-data-import
fix: auto-update due date for invoices via data import
2024-03-15 12:44:36 +05:30
Nihantra Patel
d721de13aa fix: update description of Supplier Invoice Number 2024-03-15 12:14:34 +05:30
ruthra kumar
a3d4aff29c refactor(test): generate and use unique party 2024-03-15 12:10:57 +05:30
Gursheen Anand
3e0c798cca chore: merge upstream 2024-03-15 12:08:33 +05:30
Gursheen Anand
f504f2caf3 fix: use in_import flag for checking imported records 2024-03-15 12:00:38 +05:30
ruthra kumar
ad42389352 Merge pull request #40461 from ruthra-kumar/prevent_zero_qty_cr_note_on_stock_items
refactor: disallow '0' qty return invoices with stock effect
2024-03-15 11:06:05 +05:30
ruthra kumar
2a08072443 test: advance payment reconciliation against payment
'advance' payments booked in separate party account
2024-03-15 10:55:00 +05:30
ruthra kumar
6d9074d585 test: reverse payment reconciliation 2024-03-15 10:55:00 +05:30
ruthra kumar
5f15297f28 refactor: support payment against reverse payment reconciliation 2024-03-15 10:55:00 +05:30
ruthra kumar
647bba0f00 test: validation to prevent '0' qty return with stock effect 2024-03-15 10:47:32 +05:30
ruthra kumar
898affbee9 refactor: disallow '0' qty return invoices with stock effect 2024-03-14 16:48:55 +05:30
ruthra kumar
4ed7e3eacd Merge pull request #40420 from ruthra-kumar/fix_advance_journal_fixing_logic
fix: advance journal fetching logic in Advances section
2024-03-14 15:35:06 +05:30
ruthra kumar
12029557fe Merge pull request #40445 from ruthra-kumar/fix_flaky_ar_test
fix: flaky Accounts Receivable test case
2024-03-14 15:31:22 +05:30
Nihantra C. Patel
b62a6b6ab0 fix: sales partner address display Issue --upd 2024-03-14 15:21:28 +05:30
ruthra kumar
a9a9b1297e fix(test): manually filter rows and assert 2024-03-14 15:16:29 +05:30
ruthra kumar
437bdc2d8c fix: flaky Accounts Receivable test case 2024-03-14 15:16:29 +05:30
Nihantra Patel
62d2fe50d2 fix: sales partner address display Issue 2024-03-14 15:12:25 +05:30
Nabin Hait
26202d90cb Merge pull request #40263 from nabinhait/pi-optimization
perf: Performance optmization for Purchase Invoice submission
2024-03-14 14:19:24 +05:30
Nabin Hait
c417e7d800 Merge pull request #40457 from rohitwaghchaure/fixed-test-case-closing-stock-balance
chore: fix test case
2024-03-14 14:17:35 +05:30
Rohit Waghchaure
ec83d54826 chore: fix test case 2024-03-14 13:48:51 +05:30
Gursheen Anand
4cda88690f fix: show correct variance for durations with no vouchers 2024-03-14 12:51:51 +05:30
Deepesh Garg
d15cdd9190 Merge pull request #40433 from deepeshgarg007/client_side_tax_updates
fix: Taxes not getting updated on change
2024-03-14 12:13:16 +05:30
“Khushi
a0247d11bd feat: added coupon code functionality onsales invoice 2024-03-14 12:04:09 +05:30
rohitwaghchaure
cd79dcccb6 fix: Data too long for column 'stock_queue' (#40436) 2024-03-14 11:19:57 +05:30
rohitwaghchaure
f4a945aee4 fix: incorrect gross profit on the quotation (#40438) 2024-03-13 17:48:06 +05:30
“Khushi
10bb1c31a2 feat: added coupon code functionality onsales invoice 2024-03-13 17:47:40 +05:30
Deepesh Garg
65ae9616ba fix: Taxes not getting updated on change 2024-03-13 13:59:50 +05:30
Florian HENRY
560eb174f1 fix: Opportunity Type must be translatable 2024-03-13 09:11:14 +01:00
Gursheen Anand
9f3a310300 test: sales partner targets with invoices 2024-03-13 13:35:24 +05:30
Nabin Hait
8d405684ce Merge pull request #40385 from nabinhait/depreciation-asset-sale-dev
fix: Book depreciation until the asset disposal date and removed unwanted commits
2024-03-13 13:17:23 +05:30
Nabin Hait
d7a4c0dfde Merge pull request #40126 from nabinhait/document-modified-error-dev
fix: Reload document on cancel to avoid document modified error
2024-03-13 13:17:13 +05:30
Gursheen Anand
7690a40ebb fix: achieved targets for sales partners 2024-03-13 12:18:25 +05:30
Deepesh Garg
effc9d1492 chore: Add supplier query back 2024-03-13 12:06:32 +05:30
Deepesh Garg
e87b44f758 chore: remove invalid comment 2024-03-13 12:02:06 +05:30
Deepesh Garg
c9623b6fd6 chore: Remove custom party queries 2024-03-13 11:59:43 +05:30
ruthra kumar
83d48ca8d7 Merge pull request #40372 from ruthra-kumar/toggle_for_standalone_cr_dr_notes
refactor: checkbox to toggle standalone Credit/Debit note behaviour
2024-03-13 11:41:44 +05:30
ruthra kumar
445d2acf50 chore: better popup message 2024-03-13 11:04:09 +05:30
ruthra kumar
ce3b1f09f5 test: cr note flag to update self 2024-03-13 10:57:12 +05:30
ruthra kumar
4d0c2d8e82 refactor: make AR/AP report aware of always standalone cr/dr notes 2024-03-13 09:55:23 +05:30
Raffael Meyer
98a12dd66f Merge pull request #39748 from blaggacao/fix/pe-fill-in-contact-fields 2024-03-13 00:40:41 +01:00
David Arnold
98c7f44280 fix(pe): set contact fields 2024-03-12 23:39:20 +01:00
David
9941469fca Merge remote-tracking branch 'upstream/develop' into feat/add-login-user-to-driver 2024-03-12 23:38:24 +01:00
HENRY Florian
f24f51b7de fix: if input manualy material request on WO the material_request_item is not set so validate WO give error (#40180) 2024-03-12 21:53:21 +05:30
ruthra kumar
e786a93c2e fix: advance journal fetching logic in Advances section 2024-03-12 21:29:44 +05:30
Ernesto Ruiz
f3b4237ab6 chore: Add translation to buttons in Update stock_summary_template.html (#40099)
chore: Add translation to buttons in Update stock_summary_template.html
2024-03-12 21:28:07 +05:30
ruthra kumar
849f478894 chore: patch for updating flag in Cr/Dr notes 2024-03-12 20:41:37 +05:30
Rucha Mahabal
daf4ae2a6b fix: conditionally apply is_group filter in accounting dimension query (#40414) 2024-03-12 14:46:59 +00:00
rohitwaghchaure
f8a1a7f515 fix: qc created for raw materials during manufacture entry (#40408) 2024-03-12 18:11:12 +05:30
rohitwaghchaure
948297692e fix: incorrect work order status (#40407) 2024-03-12 18:11:00 +05:30
Raffael Meyer
79a0473705 fix: error message wording (#40403) 2024-03-12 11:24:49 +00:00
rohitwaghchaure
72614bb8ff fix: recursion issue while submitting work order (#40400) 2024-03-12 16:27:49 +05:30
ruthra kumar
77aac6f571 refactor: post ledger entries based on toggle 2024-03-12 15:58:26 +05:30
rohitwaghchaure
4a02d1497c fix: decimal issue while making the stock entry (#40394) 2024-03-12 15:15:31 +05:30
Gursheen Kaur Anand
5ac5b7f258 Merge pull request #40388 from GursheenK/promotional-scheme-recurse-for
feat: add recursion qty field in promotional scheme
2024-03-12 14:28:17 +05:30
rohitwaghchaure
a419812864 fix: negative stock error for the batch (#40389) 2024-03-12 14:18:39 +05:30
Gursheen Anand
0ffc5cf012 test: pricing rule for product discounts 2024-03-12 13:55:43 +05:30
Gursheen Anand
7075c50b85 feat: add recursion qty field in promotional scheme 2024-03-12 13:16:39 +05:30
Dany Robert
b8da0d9334 fix: wrong buying amount if delivered and billed qty varies 2024-03-12 12:52:19 +05:30
Nabin Hait
dedae4fecf fix: Book depreciation until the asset disposal date and removed unwanted commits 2024-03-12 12:32:57 +05:30
rohitwaghchaure
0da19a40a7 fix: barcode field on line item not working (#40381) 2024-03-12 12:27:21 +05:30
Nabin Hait
7e301f02df fix: convert str to date 2024-03-12 12:25:01 +05:30
rohitwaghchaure
b9a8dd468b fix: Use serial/batch fields for delivery note return (#40374)
fix: User serial/batch fields for delivery note return
2024-03-11 17:06:24 +05:30
Nihantra C. Patel
655a1797be fix: get address if multiple companies 2024-03-11 16:46:00 +05:30
ruthra kumar
a97a851333 Merge pull request #40299 from ruthra-kumar/rewrite_fetch_query_on_bank_reconciliation_tool
refactor: run qb directly instead of converting to sql
2024-03-11 16:44:32 +05:30
Nihantra Patel
c6cf1bec76 fix: get address if multiple companies 2024-03-11 16:34:44 +05:30
ruthra kumar
0344ff2aac chore: replace parameter with qb conditions 2024-03-11 16:01:42 +05:30
ruthra kumar
767f2157e6 refactor: checkbox in purchase invoice 2024-03-11 15:00:26 +05:30
ruthra kumar
adf13a19c4 chore: update popup message 2024-03-11 15:00:26 +05:30
ruthra kumar
2cefe2a20e refactor: checkbox to toggle always standalone credit note 2024-03-11 15:00:24 +05:30
Nabin Hait
d2b34ea05d Merge pull request #40121 from nabinhait/asset-cancel-deletion
fix: Patch to remove cancelled asset capitalization from asset
2024-03-11 12:28:55 +05:30
Rushabh Mehta
cde5b934e5 Merge pull request #40368 from frappe/fix-chore-sales-order
fix(chore): remove inscrutable message via DOM injection (via Sentry)
2024-03-11 12:25:35 +05:30
Rushabh Mehta
c4570ccfad fix(chore): remove inscrutable message via DOM injection (via Sentry) 2024-03-11 12:17:22 +05:30
Deepesh Garg
58e1548640 Merge pull request #40248 from ernestoruiz89/patch-5
chore: Add translate function to text "after"
2024-03-10 22:33:28 +05:30
Deepesh Garg
b660d98f20 Merge pull request #40349 from pps190/fix-rename-tax-rule
fix: allow tax rule to be renamed
2024-03-10 21:14:38 +05:30
Deepesh Garg
dee49e6078 Merge pull request #40344 from pps190/fix-get-default-company
fix: get_user_default_as_list args order
2024-03-10 21:14:08 +05:30
Ankush Menat
f4d69f16c0 Merge pull request #40206 from barredterra/bulk-format-js
ci: add prettier to pre-commit
2024-03-10 20:01:49 +05:30
Deepesh Garg
c5b94df188 Merge pull request #40195 from Nihantra-Patel/fix_timesheet_invoice
fix: skip timesheet on return time
2024-03-10 19:59:03 +05:30
Ankush Menat
0b100782e2 chore: update blame ignore 2024-03-10 19:46:53 +05:30
Ankush Menat
ec74a5e566 style: format js files 2024-03-10 19:45:40 +05:30
barredterra
2c16036ef3 ci: add prettier to pre-commit 2024-03-10 19:45:18 +05:30
Deepesh Garg
1f4c86136f Merge pull request #39886 from barredterra/refactor-sales-invoice-item
refactor(Sales Invoice): move methods into child row controller
2024-03-10 19:44:16 +05:30
Deepesh Garg
b0fcb014c1 Merge pull request #40294 from barredterra/fix-bisect-accounting-statements
fix: define dates before usage
2024-03-10 19:30:29 +05:30
Deepesh Garg
65c8605b88 Merge pull request #40325 from deepeshgarg007/psoa_sender_email
fix: Sender email in process statements of accounts
2024-03-10 19:26:05 +05:30
Deepesh Garg
4c6d28a299 Merge pull request #40323 from deepeshgarg007/project_sales_filter
fix: Filter for projects in Sales Cycle
2024-03-10 19:25:48 +05:30
Deepesh Garg
962b51d6d5 Merge pull request #40355 from deepeshgarg007/blanket_order_rate
fix: Blanket order rate getting changed on converting to order
2024-03-10 18:44:11 +05:30
Deepesh Garg
9702a65a0f fix: Blanket order rate getting changed on converting to order 2024-03-10 17:39:20 +05:30
ruthra kumar
d69c593f93 Merge pull request #39681 from ruthra-kumar/fix_gl_logic_in_advance_as_liability
fix: incorrect advance paid in Sales/Purchase Order
2024-03-10 16:38:43 +05:30
s-aga-r
1e09f584d5 Merge pull request #40273 from s-aga-r/FIX-40272
fix: MR Default Supplier search query
2024-03-10 11:39:59 +05:30
Devin Slauenwhite
0d6afda6b8 fix: allow tax rule to be renamed 2024-03-09 08:09:16 -05:00
Devin Slauenwhite
ac1961b687 fix: get_user_default_as_list args order 2024-03-08 18:09:11 -05:00
s-aga-r
c0a1f298a1 fix: MR Default Supplier search query 2024-03-08 20:32:00 +05:30
Frappe PR Bot
55b9664115 fix: sync translations from crowdin (#40287) 2024-03-07 13:35:21 +01:00
Nihantra C. Patel
68baa3612a fix: load ignored doctype and include Mode of Payment Account (#40334) 2024-03-07 17:43:00 +05:30
rohitwaghchaure
01856a6e9d fix: use serial/batch field for rejected items (#40327) 2024-03-07 14:14:19 +05:30
Deepesh Garg
65a2f3d12c fix: Sender email in process statements of accounts 2024-03-07 10:08:51 +05:30
Deepesh Garg
d0e0b66b2f fix: Filter for projects in Sales Cycle 2024-03-07 09:14:56 +05:30
Raffael Meyer
4b38139b44 Merge pull request #40317 from barredterra/parcel-mandatory-fields 2024-03-06 19:24:47 +01:00
barredterra
898c6e30eb fix(Shipment Parcel): make length, width and height non-mandatory
It's tedious to enter all these values and some shipping providers only need to know the weigth and quantity. Companies can alwas cutomize the values to be mandatory, but the reverse is not possible. I'll make sure that the erpnext-shipping app does not break because of this (or fix any problems).
2024-03-06 16:52:19 +01:00
rohitwaghchaure
cef6291311 fix: use serial batch fields for subcontracting receipt (#40311) 2024-03-06 19:43:36 +05:30
Corentin Flr
a93d14b3f7 fix(accounts): Allow setting Number of new Cost Center (#40212) 2024-03-06 19:33:15 +05:30
rohitwaghchaure
48da952fd7 fix: not able to cancel purchase receipt for old subcontracting flow (#40298) 2024-03-06 12:51:04 +05:30
rohitwaghchaure
e178ffc3c1 fix: stock ledger balance qty for the batch (#40274) 2024-03-06 12:50:44 +05:30
rohitwaghchaure
1eaa386657 fix: batch no not copied while making Material Consumption entry (#40290) 2024-03-06 12:50:26 +05:30
ruthra kumar
711b72b26c refactor: run qb directly instead of converting to sql 2024-03-06 12:05:11 +05:30
barredterra
171b8af3ee fix: define dates before usage 2024-03-05 15:56:42 +01:00
Raffael Meyer
031465f5ec Merge pull request #40286 from barredterra/crowdin-pr-title
chore: set PR title for translation updates
2024-03-05 15:15:12 +01:00
Raffael Meyer
f44a841af7 ci: auto-generate potfile (#40288) 2024-03-05 18:06:31 +05:30
barredterra
28ac53a704 chore: set PR title for translation updates 2024-03-05 11:27:46 +01:00
Frappe PR Bot
bdc0175fe3 chore: sync translations from crowdin 2024-03-05 11:24:35 +01:00
ruthra kumar
e58c2dd43d Merge pull request #40278 from ruthra-kumar/filter_on_party_type_as_well_on_tcs
fix: incorrect TCS on customer and suppliers with same name
2024-03-05 15:22:41 +05:30
Harsh Khatri
092999f2a6 fix: update status of Email Campaign (#39776) 2024-03-05 09:44:32 +00:00
ruthra kumar
e52c4c8f22 refactor(test): make sure party has USD account
1. Don't reset 'party_account_currency' of SO/PO  upon Payment Entry
cancellation. This happens when there are no payments against a SO/PO
2024-03-05 14:56:29 +05:30
ruthra kumar
d9a0494fc3 fix: advance paid amount and ledger entries against SO/PO 2024-03-05 14:56:29 +05:30
ruthra kumar
cb2529cec8 refactor(test): use get_party_account for reference details section 2024-03-05 14:56:29 +05:30
ruthra kumar
158112896e refactor(test): reference details will have account 2024-03-05 14:56:29 +05:30
ruthra kumar
9d9b83362a fix: incorrect advance paid in Sales/Purchase Order 2024-03-05 14:56:29 +05:30
ruthra kumar
9904a9868c fix: incorrect TCS on customer and suppliers with same name 2024-03-05 14:55:51 +05:30
rohitwaghchaure
34051bc04f chore: fixed fetch from (#40270) 2024-03-05 13:44:02 +05:30
Nihantra C. Patel
8e2f9787c1 fix: report path from the Item and Putaway Rule list (#40190) 2024-03-04 19:43:33 +05:30
rohitwaghchaure
6379238893 perf: serial and batch bundle valuation (reposting) (#40255)
perf: serial and batch bundle valuation
2024-03-04 12:04:41 +05:30
Gursheen Kaur Anand
031b99f373 Merge pull request #40250 from GursheenK/company-filter-in-cost-center-allocation
fix(minor): company filter in cost center allocation
2024-03-03 18:13:48 +05:30
Gursheen Anand
51909077bd feat: add company filter to child table field 2024-03-03 18:08:23 +05:30
Ernesto Ruiz
d0140412cd chore: Add translate function to text "after" 2024-03-02 15:46:43 -06:00
David Arnold
c6a3403270 Merge remote-tracking branch 'origin/develop' into feat/add-login-user-to-driver 2024-03-02 13:16:54 +01:00
rohitwaghchaure
e7d707797a fix: rate change on changing of the qty (#40241) 2024-03-02 16:44:07 +05:30
ruthra kumar
f2f5c1a0eb Merge pull request #40220 from ruthra-kumar/exc_gain_loss_on_journal_against_journals
refactor: Gain/Loss Journal creation for Journals against Journals
2024-03-02 15:36:27 +05:30
ruthra kumar
ceee93e0e8 Merge pull request #40149 from ruthra-kumar/filter_on_party_while_fetching_exc_rate_on_je
fix: incorrect exchange rate if JE has multi parties
2024-03-02 13:51:20 +05:30
ruthra kumar
ed95d41a51 test: exchange rate fetch on JE with multiple forex parties 2024-03-02 13:18:31 +05:30
ruthra kumar
eaac02655b fix: don't override reference exchange rate 2024-03-02 13:18:27 +05:30
rohitwaghchaure
72ac56b6c4 fix: do not allow to cancel incomplete reposting (#40224) 2024-03-02 12:59:59 +05:30
ruthra kumar
e017421708 Merge pull request #38561 from blaggacao/feat/add-delivery-cutoff-date-on-so
feat(delivery): add cutoff item date for so delivery items
2024-03-02 12:55:00 +05:30
Nihantra C. Patel
13b05aa7fb fix: uom wise price in sales or purchase transaction (#40216)
fix: uom wise price
2024-03-02 05:18:30 +05:30
rohitwaghchaure
a5232d9c10 fix: serial no valuation rate (#40221) 2024-03-01 22:26:54 +05:30
ruthra kumar
8a5078b826 test: gain/loss on Journals against Journals 2024-03-01 20:10:57 +05:30
ruthra kumar
5b67631d40 fix: allow gain/loss for Journals against Journals 2024-03-01 17:46:42 +05:30
ruthra kumar
0aa72f841d fix: make use of 'flt' to prevent really low precision exc gain/loss 2024-03-01 17:36:56 +05:30
David Arnold
b8dac84a90 feat: add selling setting for cutoff date 2024-03-01 12:12:07 +01:00
Nihantra Patel
79c492cc4b fix: skip timesheet on return time and revert code 2024-03-01 09:26:49 +05:30
Nihantra C. Patel
a8eb5e5c85 Merge branch 'frappe:develop' into fix_timesheet_invoice 2024-03-01 09:17:34 +05:30
Raffael Meyer
863abc3ee5 Merge pull request #40203 from barredterra/filter-project-department 2024-02-29 18:28:59 +01:00
Deepesh Garg
93c2762f7b Merge pull request #39701 from GursheenK/check-paid-amount-for-orders-before-request
fix: check order paid amount before payment request
2024-02-29 21:24:16 +05:30
Rushabh Mehta
c067ac16a7 Merge pull request #39584 from GursheenK/provisional-accounting-reverse-amt
fix: use receipt amount for reverse provisional entry
2024-02-29 21:16:05 +05:30
barredterra
5e736f0d06 fix(Project): filter department by company 2024-02-29 16:44:46 +01:00
ruthra kumar
983f71975a Merge pull request #40197 from ruthra-kumar/ignore_self_on_gl_account_valiation
fix: ignore self on GL account validation for Bank Account
2024-02-29 19:54:32 +05:30
Raffael Meyer
b235f48067 Merge pull request #39936 from barredterra/label-context 2024-02-29 15:09:49 +01:00
ruthra kumar
9d3614597c Merge pull request #40196 from ruthra-kumar/use_debit_or_credit_to_account_while_fetching_advance
fix: include debit_to or credit_to account while fetching advance on Sales/Purchase Invoice
2024-02-29 17:51:04 +05:30
Gursheen Anand
c096133897 fix: auto-update due date for invoices via data import 2024-02-29 17:42:25 +05:30
ruthra kumar
3c19186654 fix: ignore self on GL account validation for Bank Account 2024-02-29 17:39:29 +05:30
ruthra kumar
646e9ca0dd test: advance pulling logic on Sales/Purchase Invoice 2024-02-29 17:31:08 +05:30
ruthra kumar
3327599c9d fix: include Debit To/Credit To account while fetching advance 2024-02-29 17:18:42 +05:30
Nihantra Patel
dd70fb5f7e fix: skip timesheet link on return time 2024-02-29 15:31:53 +05:30
Gursheen Anand
0b36cbe307 fix: reset perpetual inventory flag after test 2024-02-29 13:04:01 +05:30
Gursheen Anand
8b3d46610e fix: parameters for PI references 2024-02-29 11:58:14 +05:30
Gursheen Kaur Anand
ac2b53bf15 Merge pull request #40176 from GursheenK/validating-po-in-so-ux
fix(minor): make warning for previously existing SO an alert
2024-02-29 11:32:44 +05:30
Gursheen Anand
53642e7417 test: LCV entries after billing 2024-02-29 11:26:31 +05:30
Raffael Meyer
5c47087f20 feat: add persian language (#40178)
* chore: remove locale dir from .gitignore

* feat: add persian language
2024-02-29 05:28:57 +00:00
Rucha Mahabal
29f91a7919 fix(setup): avoid duplicate entry for Analytics role (#40183) 2024-02-29 05:23:30 +00:00
Gursheen Kaur Anand
f6fdfd2c01 Merge pull request #40174 from GursheenK/common-free-item-promotional-scheme
fix: promotional scheme remove free item if pricing rule matches
2024-02-29 10:18:27 +05:30
Gursheen Anand
baa3fee1bf fix: add LCV flag to determine negative expenses 2024-02-29 09:04:24 +05:30
Gursheen Anand
24dcd64c16 fix: make warning for previously existing SO an alert 2024-02-28 18:01:27 +05:30
Frappe PR Bot
9dcdd5b5ef chore: New Crowdin updates (#40052)
* New translations main.pot (French)

* New translations main.pot (Spanish)

* New translations main.pot (Arabic)

* New translations main.pot (German)

* New translations main.pot (French)

* New translations main.pot (Spanish)

* New translations main.pot (Arabic)

* New translations main.pot (German)

* New translations main.pot (German)

* New translations main.pot (German)

* New translations main.pot (German)

* New translations main.pot (German)

* New translations main.pot (German)

* New translations main.pot (German)
2024-02-28 16:32:43 +05:30
Gursheen Anand
fea20db262 fix: remove free item row only if pricing rule matches 2024-02-28 12:47:41 +05:30
rohitwaghchaure
043d9e3986 fix: Email Template None not found (#40167) 2024-02-27 22:30:01 +05:30
Deepesh Garg
dde4d9e53c Merge pull request #40162 from vorasmit/ic-deps
fix: add flags for repost to ensure correct accounting from India Compliance App
2024-02-27 22:08:09 +05:30
Deepesh Garg
36a0569df2 Merge pull request #40137 from ljain112/fix-tax-breakup
fix: default taxable value for item not found in item list
2024-02-27 22:07:39 +05:30
rohitwaghchaure
f8ba560394 fix: Supplier users not able to see RFQ on the Portal (#40161) 2024-02-27 21:05:19 +05:30
Smit Vora
93170a56a9 fix: add flags for repost to ensure correct accounting from India Compliance App 2024-02-27 20:28:18 +05:30
rohitwaghchaure
6f5815e44f fix: parent warehouse checks in the production plan for sub-assemblies (#40150) 2024-02-27 16:46:47 +05:30
Nabin Hait
0c52eb913b Merge pull request #40102 from GursheenK/update_billed_amount_for_purchases
feat: toggle updation of billed amount in previous purchase docs
2024-02-27 15:49:22 +05:30
Gursheen Kaur Anand
519682bb0e Merge pull request #40095 from GursheenK/unique-gl-account-for-plaid-bank-accounts
fix: unique GL account for plaid bank accounts
2024-02-27 15:38:03 +05:30
ruthra kumar
694c17487d fix: incorrect exchange rate if JE has multi parties 2024-02-27 15:34:34 +05:30
Gursheen Kaur Anand
5b8b40c13b Merge pull request #40143 from GursheenK/hide-company-typeerror
fix(minor): type error for missing form object in hide_company util
2024-02-27 13:14:02 +05:30
Gursheen Anand
ceeb8fc9e5 fix: use frm instead of cur_frm 2024-02-27 13:05:29 +05:30
Gursheen Kaur Anand
b193fafe49 Merge pull request #37477 from GursheenK/editable-journal-entries
feat: editable journal entries
2024-02-27 12:59:18 +05:30
Sajad Alimoradi
c310da7b29 fix: Translate 'mode of payments' in the 'point of sale'. (#39467)
- Due to a language change, the name of 'mode of payments' was not translated in the placeholder.
2024-02-27 07:15:20 +00:00
Rushabh Mehta
d6b29d1cd7 Merge pull request #39719 from niyazrazak/patch-18
feat: project field in installation note
2024-02-27 12:44:39 +05:30
Gursheen Kaur Anand
303433c0ae Merge branch 'develop' into editable-journal-entries 2024-02-27 12:43:32 +05:30
Gursheen Anand
20fa3da950 fix: type error for missing frm obj 2024-02-27 11:18:58 +05:30
rohitwaghchaure
bc9c480246 fix: use serial batch fields for packed items (#40140) 2024-02-26 23:57:52 +05:30
rohitwaghchaure
8aa2b7c183 fix: currency symbol in landed cost voucher and material request (#40138) 2024-02-26 22:48:10 +05:30
rohitwaghchaure
08caa7cfa1 fix: Data too long for column 'serial_no' at row 1 (#40098) 2024-02-26 18:49:56 +05:30
ljain112
5885978fc2 fix: default taxable value for item not found in item list 2024-02-26 18:41:33 +05:30
ruthra kumar
122373fcd3 Merge pull request #40133 from ruthra-kumar/reset_advance_amount_on_unreconciliation
fix: reset advance amount on unreconciliation of Sales/Purchase Orders
2024-02-26 17:51:36 +05:30
ruthra kumar
1f01ff3487 test: advance paid update on sales/purchase order unreconciliation 2024-02-26 17:32:25 +05:30
ruthra kumar
c9e2f03a3a fix: on unreconciliation, update advance paid 2024-02-26 17:08:56 +05:30
Nabin Hait
287eff533a fix: Reload document on cancel to avoid document modified error 2024-02-26 14:55:06 +05:30
Nabin Hait
1951f71eeb fix: Patch to remove cancelled asset capitalization from asset 2024-02-26 12:57:19 +05:30
ruthra kumar
924b08e395 Merge pull request #40113 from ruthra-kumar/patch_for_dimension_creation_in_reconciliation_tool
refactor: patch to setup dimensions in Reconciliation tool
2024-02-26 11:58:51 +05:30
ruthra kumar
461fb183fc refactor: patch to setup dimensions in Reconciliation tool 2024-02-26 11:34:37 +05:30
Gursheen Kaur Anand
c9ff769d28 Merge pull request #40062 from GursheenK/sales-person-target-contributions
fix: sales person / partner achieved targets in report
2024-02-26 10:37:14 +05:30
Gursheen Kaur Anand
3658c4754f Merge pull request #40105 from GursheenK/tax-amount-label
fix(minor): tax amount label according to party type
2024-02-26 10:33:32 +05:30
Gursheen Anand
9c8d103d8a fix: amount label according to party type 2024-02-25 21:32:24 +05:30
Gursheen Anand
6d40844894 test: pr billed amount against debit note 2024-02-25 20:03:33 +05:30
Gursheen Anand
81dbfe189e test: po billed amount against debit note 2024-02-25 19:40:28 +05:30
rohitwaghchaure
75f8464724 fix: capacity planning issue in the job card (#40092)
* fix: capacity planning issue in the job card

* test: test case to test capacity planning for workstation
2024-02-25 19:06:52 +05:30
ruthra kumar
e240ccd305 Merge pull request #40096 from ruthra-kumar/fix_fiscal_year_exception_on_demo_data_setup
fix: Fiscal Year exception on demo data setup
2024-02-25 15:42:04 +05:30
ruthra kumar
3c3c57c674 fix: Fiscal Year exception on demo data setup 2024-02-25 15:26:16 +05:30
Gursheen Anand
c42444ab3b fix: remove config for default bank account in test 2024-02-25 13:18:30 +05:30
Gursheen Anand
bf6e32a960 fix: unique gl account for plaid bank accounts 2024-02-25 13:17:41 +05:30
Gursheen Anand
9f6535472d feat: update billed amount in PO and PR 2024-02-25 11:59:44 +05:30
ruthra kumar
7cb07425b1 Merge pull request #40073 from ruthra-kumar/update_payments_section_on_item_removal
refactor: update payments section on item removal
2024-02-25 09:26:52 +05:30
rohitwaghchaure
4c9048fb39 fix: do not make MR against raw materials of available sub assemblies (#40085) 2024-02-24 17:04:55 +05:30
rohitwaghchaure
f4222be027 Merge pull request #40081 from rohitwaghchaure/fixed-10401
fix: Cannot read properties of undefined
2024-02-24 15:57:21 +05:30
Rohit Waghchaure
44ed52c5cf fix: Cannot read properties of undefined 2024-02-24 15:33:59 +05:30
rohitwaghchaure
8aaddb0f9e Merge pull request #40079 from rohitwaghchaure/fixed-linter-issue
chore: change label name
2024-02-24 13:09:57 +05:30
Rohit Waghchaure
635174f1ce fix: change label name 2024-02-24 12:51:52 +05:30
ruthra kumar
406793a6ff refactor: update payments section on item removal 2024-02-23 17:29:08 +05:30
Nihantra C. Patel
3c9640df27 fix: print format bold for field "total" 2024-02-23 16:37:11 +05:30
Gursheen Anand
7566c1ee78 test: sales person target variance 2024-02-23 15:05:36 +05:30
ruthra kumar
97c3e27c60 Merge pull request #39830 from Nihantra-Patel/fix_check_credit_limit
fix: check_credit_limit on_update_after_submit of Sales Order
2024-02-23 14:20:36 +05:30
ruthra kumar
467c0898e9 test: credit limit on update after submit 2024-02-23 14:03:09 +05:30
Gursheen Kaur Anand
26ec697a0b Merge pull request #40040 from GursheenK/skip-discount-validation-for-rate-adjustment-entries
fix: skip max discount validation for rate adjustment
2024-02-23 12:56:38 +05:30
Gursheen Kaur Anand
3294282880 Merge pull request #40035 from GursheenK/delete-ple-on-deletion-of-transactions
fix: delete PLE containing invoice in against
2024-02-23 12:36:14 +05:30
Gursheen Anand
a823f16dff feat: show contributed qty in transaction summary 2024-02-23 12:17:54 +05:30
Gursheen Anand
339698d172 fix: only consider contributed qty towards achieved targets 2024-02-23 12:14:54 +05:30
ruthra kumar
dd23ddcd6c Merge pull request #40011 from ruthra-kumar/cr_dr_note_with_payments
fix: Ledger entries for Cr/Dr notes with POS Payments
2024-02-23 06:01:37 +05:30
ruthra kumar
20eff568b1 Merge pull request #39831 from Nihantra-Patel/fix_payment_period_si
fix: remove cancelled payment entry from Payment Period Based On Invoice Date
2024-02-23 06:00:02 +05:30
ruthra kumar
3634c4c284 refactor: skip popup for POS invoices 2024-02-23 05:45:04 +05:30
Raffael Meyer
2e0aaf3521 Merge pull request #40051 from barredterra/transaction-due-date-translatability 2024-02-22 18:43:19 +01:00
barredterra
6249965605 feat: clear payment terms and schedule 2024-02-22 18:39:17 +01:00
Raffael Meyer
a9f8af2fd1 Merge pull request #40050 from barredterra/transaction-due-date-translatability 2024-02-22 18:32:03 +01:00
barredterra
6d43d46fbc fix: translatability 2024-02-22 18:30:20 +01:00
ruthra kumar
4288713abe test: ledger entries of Cr Note of POS Invoice 2024-02-22 20:46:07 +05:30
ruthra kumar
b03c683898 Merge pull request #39828 from Nihantra-Patel/fix_translate_sales_pip_report
fix: translate Sales Pipeline Analytics report
2024-02-22 20:24:00 +05:30
Nihantra C. Patel
c5050c935b fix: translatable columns in Sales Pipeline Analytics report 2024-02-22 20:08:11 +05:30
Gursheen Anand
e2d16955dd fix: skip SO & DN validation for debit note 2024-02-22 16:24:42 +05:30
Gursheen Anand
5a3b133d65 fix: skip max discount validation for rate adjustment 2024-02-22 16:09:29 +05:30
Gursheen Anand
146c5b3e16 fix: only check for delinked PLEs 2024-02-22 16:00:52 +05:30
Gursheen Anand
c1e1fd8829 fix: delete PLE containing invoice in against 2024-02-22 15:12:02 +05:30
rohitwaghchaure
da184d709b fix: negative stock error while making stock reconciliation (#40016)
fix: negative stock error while making stock reco
2024-02-22 09:22:58 +05:30
rohitwaghchaure
864d7ae04c fix: incorrect item name in MR (#40018) 2024-02-22 09:22:30 +05:30
rohitwaghchaure
0b04d04da3 fix: remove microsecond from posting datetime (#40017) 2024-02-22 09:22:05 +05:30
Gursheen Kaur Anand
6707425baa Merge pull request #40005 from GursheenK/communication_date_for_party_dashboard
fix: communication_date in party dashboards
2024-02-22 09:08:22 +05:30
Gursheen Kaur Anand
6cfb8fe439 Merge pull request #39999 from GursheenK/pricing_rule_type_error
fix: TypeError for item pricing rules
2024-02-22 09:06:27 +05:30
rohitwaghchaure
45b25e09c1 fix: negative stock error while submitting stock reconciliation (#40012)
fix: negative stock error while submitting stok reco
2024-02-21 23:01:15 +05:30
Ankush Menat
38e88db2c9 fix: timesheet per billed state edge case (#40010)
If value is 100.0000x then it won't set status correctly but will set it the next time it's loaded from db.
2024-02-21 15:27:26 +00:00
Gursheen Anand
87df7ff717 fix: accommodate for changed orderby statement 2024-02-21 18:44:29 +05:30
rohitwaghchaure
4c061d61fa Merge pull request #39800 from rohitwaghchaure/persistent-indexing
perf: new column Posting Datetime in SLE to optimize stock ledger related queries
2024-02-21 18:39:27 +05:30
Rohit Waghchaure
a73ba2c0d2 chore: remove microsecond from posting_datetime 2024-02-21 18:14:20 +05:30
Gursheen Anand
ecd83b12ab fix: check for pricing rules on item 2024-02-21 16:39:28 +05:30
rohitwaghchaure
408ea0432b Merge pull request #39998 from rohitwaghchaure/fixed-10262
fix: Completed Work Orders report not working
2024-02-21 16:30:08 +05:30
Rohit Waghchaure
11f4cb914a fix: Completed Work Orders report not working 2024-02-21 14:36:14 +05:30
Nabin Hait
66bf6e4041 Merge pull request #39983 from nabinhait/asset-cancel-deletion
fix: Issues regarding asset cancellation and deletion
2024-02-21 11:14:27 +05:30
rohitwaghchaure
f37f7ca5c3 Merge branch 'develop' into persistent-indexing 2024-02-21 11:02:23 +05:30
Nabin Hait
85471533e9 fix: removed unwanted patch 2024-02-21 08:44:03 +05:30
rohitwaghchaure
4b24fcd221 fix: set batch created from bundle to batch field in stock transaction (#39966)
* fix: set batch created from bundle to batch field in stock transaction

* fix: validation for serial and batch no
2024-02-20 23:45:07 +05:30
ruthra kumar
68a23730f3 fix: Cr/Dr notes with POS Payments 2024-02-20 21:53:33 +05:30
Nabin Hait
17f85de6fb fix: Issues regarding asset cancellation and deletion 2024-02-20 18:10:34 +05:30
rohitwaghchaure
8e7d47b3a7 fix: 'NoneType' object is not iterable (#39977) 2024-02-20 15:19:06 +05:30
rohitwaghchaure
133f8bd92a fix: show active bom in the dropdown while making stock entry and MR (#39974) 2024-02-20 12:35:35 +05:30
rohitwaghchaure
d4264f7ba1 fix: reposting failed status not updated (#39970) 2024-02-20 12:13:18 +05:30
rohitwaghchaure
fa1113f912 Merge pull request #39967 from rohitwaghchaure/fixed-subcontracting-pr-10107
fix: float division by zero
2024-02-20 06:30:57 +05:30
Rohit Waghchaure
e8ae4ed61d fix: float division by zero 2024-02-19 22:18:57 +05:30
rohitwaghchaure
a4cbfabe0e fix: do not empty serial batch fields (#39948) 2024-02-19 10:25:36 +05:30
ruthra kumar
9cb83d2198 Merge pull request #39914 from ruthra-kumar/total_row_when_filtered_on_party
refactor: add total row if only one party is being filtered
2024-02-19 08:25:20 +05:30
ruthra kumar
e25b4e24df Merge pull request #39942 from ruthra-kumar/filter_warehouse_on_group
fix: group node in warehouse filter in Item-wise Sales Register
2024-02-19 08:24:49 +05:30
ruthra kumar
4f23d88f62 Merge pull request #39943 from ruthra-kumar/disclaimer_on_credit_debit_notes
refactor: use popup to inform on additional reconciliation step for Cr/Dr Notes
2024-02-19 07:13:08 +05:30
barredterra
0bbf45cd8b refactor: make_gle_for_change_amount 2024-02-17 20:46:52 +01:00
barredterra
2ff06af154 refactor: validate_serial_numbers 2024-02-17 20:29:38 +01:00
barredterra
9c0755d3de refactor: set_income_account_for_fixed_assets 2024-02-17 20:08:49 +01:00
barredterra
701671b2bd refactor: validate_dropship_item 2024-02-17 19:50:34 +01:00
barredterra
4d7d7dac01 refactor(Sales Invoice): validate_delivery_note 2024-02-17 19:40:02 +01:00
Rohit Waghchaure
f04676aaed test: test cases to test clash timestamp entries 2024-02-17 15:01:18 +05:30
ruthra kumar
0d260faa00 refactor: use popup to inform on additional reconciliation step 2024-02-17 07:19:32 +05:30
ruthra kumar
44538bd02a fix: group node in warehouse filter in Item-wise Sales Register 2024-02-17 06:41:00 +05:30
barredterra
75230ece9a refactor: set actual and projected qty in Packed Item and Sales Invoice Item 2024-02-16 23:50:32 +01:00
barredterra
f99f7fd2cf refactor(Sales Invoice): convert to guard clause 2024-02-16 23:17:41 +01:00
barredterra
cc83af0dd4 refactor: move code for unlinking sales invoice to Timesheet 2024-02-16 23:14:50 +01:00
Raffael Meyer
028d31a6f9 Merge pull request #39938 from barredterra/issue-communication 2024-02-16 20:13:58 +01:00
barredterra
3f1d008741 fix(Issue): create communication
Ignore permisions and mandatory. Required, for example, when Issue is created by Customer via portal.
2024-02-16 19:58:58 +01:00
barredterra
0b3ecd24e2 feat: pass doctype as context when translating label 2024-02-16 16:29:40 +01:00
rohitwaghchaure
506fefa186 Merge pull request #39934 from rohitwaghchaure/fixed-batch-filter-in-stock-ledger
fix: batch filter not working in stock ledger report
2024-02-16 20:16:43 +05:30
Rohit Waghchaure
a995e87567 fix: batch filter not working in stock ledger report 2024-02-16 19:43:34 +05:30
rohitwaghchaure
fa4ea7c96d Merge pull request #39930 from rohitwaghchaure/fixed-use-serial-batch-fields-for-se
fix: use serial batch fields not enabled for new stock entry
2024-02-16 15:48:52 +05:30
Rohit Waghchaure
dc9115a586 fix: use serial batch fields not enabled for new stock entry 2024-02-16 15:46:58 +05:30
Raffael Meyer
f3bd53193d Merge pull request #39926 from barredterra/bt-precision 2024-02-15 20:03:31 +01:00
barredterra
8a702a6338 fix(Bank Transaction): precision for (un)allocated_amount 2024-02-15 19:48:54 +01:00
rohitwaghchaure
8360339119 Merge pull request #39916 from rohitwaghchaure/fixed-pr-issue-9877
fix: not able to make purchase receipt
2024-02-15 17:32:57 +05:30
rohitwaghchaure
799794cafb Merge pull request #39905 from rohitwaghchaure/fixed-item-reference-9906
fix: party item code in Blanket Order
2024-02-15 14:58:49 +05:30
Rohit Waghchaure
2fb0499923 fix: not able to make purchase receipt 2024-02-15 14:58:34 +05:30
rohitwaghchaure
230a7d8d53 chore: fix linter issue 2024-02-15 14:28:06 +05:30
ruthra kumar
b1dfa2537b refactor: add total row if only one party is being filtered 2024-02-15 12:53:27 +05:30
Rohit Waghchaure
1a8f7f9403 fix: party item code in Blanket Order 2024-02-14 18:45:11 +05:30
rohitwaghchaure
d0df5df4a6 fix: production plan issue with sales order (#39901) 2024-02-14 16:39:33 +05:30
rohitwaghchaure
6239fd704b fix: landed cost voucher not submitting because of incorrect reference (#39898) 2024-02-14 15:29:20 +05:30
Rohit Gunjegaonkar
b124081065 fix: use correct field name in accounts controller (#39884)
Changes to get advance payments in SI or PI from JV's
2024-02-14 12:08:36 +05:30
Raffael Meyer
4bef6707ec Merge pull request #38649 from pps190/ux-delivery_date-schedule_date 2024-02-14 01:56:29 +01:00
barredterra
76023f1fdc refactor(Sales Invoice Item): validate cost center 2024-02-14 01:14:42 +01:00
Raffael Meyer
f1f8f59bdb Merge pull request #39868 from barredterra/fix-stock-value-diff 2024-02-14 00:50:58 +01:00
Raffael Meyer
24ba26fef3 Merge pull request #39857 from kunhimohamed/company_terms 2024-02-14 00:27:59 +01:00
kunhi
e6949d71f6 fix: update_dimension is required and not need party account method 2024-02-13 22:49:39 +04:00
kunhi
e3bd8d10b0 fix: no need call for company method in sales invoice js 2024-02-13 22:32:10 +04:00
Rohit Waghchaure
d80ca523a4 perf: new column posting datetime in SLE to optimize stock ledger related queries 2024-02-13 11:42:39 +05:30
Nihantra C. Patel
22291d32e6 fix: corrective_operation_cost in Job Card (#39829) 2024-02-13 00:48:38 +05:30
barredterra
5df5851798 fix: calculate stock_value_diff
`d.item_tax_amount` is already in base currency.
2024-02-12 17:05:03 +01:00
s-aga-r
1d1cb86c75 Merge pull request #39862 from s-aga-r/FIX-9779
fix: validate duplicate SBB
2024-02-12 19:59:36 +05:30
s-aga-r
1c2a7801b7 Merge pull request #39835 from s-aga-r/FIX-9623
fix: create SBB for `transfer_qty` in SE
2024-02-12 18:18:46 +05:30
s-aga-r
55e66db315 test: duplicate SBB 2024-02-12 18:16:29 +05:30
s-aga-r
094ecc1f62 fix: validate duplicate SBB 2024-02-12 18:15:42 +05:30
s-aga-r
2b1e0d3bd0 Merge pull request #39846 from s-aga-r/FIX-9699
perf: production plan submission
2024-02-12 15:28:37 +05:30
kunhi
d97b6d38ef fix: fetch company terms 2024-02-12 12:18:37 +04:00
rohitwaghchaure
b966c06a4f perf: cached get_last_purchase_details to fix performance issue (#39854) 2024-02-12 12:49:09 +05:30
Nijith anil
2ee642fb2c fix(ux): sales invoice link in error message (#39841)
fix: sales invoice link in error message

Co-authored-by: Nijith anil <nijithanil501@email.com>
2024-02-11 18:12:01 +05:30
Deepesh Garg
4b1c851da1 fix: Brazilian COA for demo data creation (#39839)
fix: Brazilian COA
2024-02-11 17:18:57 +05:30
s-aga-r
39067c7614 feat: get RM costs from consumption entry in manufacture SE (#39822) 2024-02-11 17:10:57 +05:30
s-aga-r
aa1c69dd7a perf: production plan submission 2024-02-11 16:34:30 +05:30
rohitwaghchaure
e5824fc3f1 fix: stock entry for use serial batch fields (#39843) 2024-02-11 11:10:21 +05:30
s-aga-r
d59caf08e6 fix: create SBB for transfer_qty in SE 2024-02-09 19:13:03 +05:30
Nihantra C. Patel
186cc3d748 fix: remove cancelled payment entry from PPBOID report 2024-02-09 16:27:52 +05:30
Nihantra C. Patel
a2a8a8f2e0 fix: remove cancelled payment entry from Payment Period Based On Invoice Date 2024-02-09 16:13:44 +05:30
Nihantra C. Patel
17452b7693 fix: check_credit_limit on_update_after_submit of Sales Order 2024-02-09 15:18:45 +05:30
Gursheen Anand
8c85404191 fix: test for repost accounting in JVs 2024-02-09 13:11:51 +05:30
rohitwaghchaure
159a123dc7 fix: warehouse issue in pick list (#39826) 2024-02-09 11:14:54 +05:30
s-aga-r
1568af2a7b Merge pull request #39816 from s-aga-r/FIX-9595
fix(ux): set rate as price list rate on uom change in MR
2024-02-08 17:54:19 +05:30
s-aga-r
1745371cd6 chore: linter 2024-02-08 16:44:31 +05:30
Gursheen Anand
ecdc4c8e9b feat: add patch for making repostable dimension fields editable 2024-02-08 16:36:30 +05:30
s-aga-r
5cf0759b0c fix: set rate as price list rate on uom change 2024-02-08 16:34:26 +05:30
s-aga-r
61a29eb5fb fix: add price list rate field in MR Item 2024-02-08 16:33:48 +05:30
Gursheen Anand
8bb83e267c fix: allow editable accounting dimensions for repostable doctypes 2024-02-08 16:09:28 +05:30
Gursheen Anand
781bdd2ec9 fix: disable editable account heads 2024-02-08 15:35:10 +05:30
Gursheen Anand
2d78dba66f chore: rebase 2024-02-08 15:20:50 +05:30
mergify[bot]
2c8e4c1ab3 fix: do not consider rejected warehouses in pick list (backport #39539) (#39804)
* fix: do not consider rejected warehouses in pick list (#39539)

* fix: do not picked rejected materials

* test: test case for pick list without rejected materials

(cherry picked from commit f6725e4342)

# Conflicts:
#	erpnext/selling/doctype/sales_order/test_sales_order.py
#	erpnext/stock/doctype/pick_list/pick_list.json
#	erpnext/stock/doctype/pick_list/pick_list.py

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

* chore: fixed test case

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-02-08 13:54:08 +05:30
ruthra kumar
22a187c3be Merge pull request #39783 from ruthra-kumar/cancel_cr_dr_note_jes_on_cancel
fix: cancelling cr/dr notes should update the linked Invoice status
2024-02-07 20:25:53 +05:30
ruthra kumar
2f676ced5c refactor(test): Forex Credit Note cancellation against Invoice 2024-02-07 19:59:33 +05:30
s-aga-r
e9251c3775 Merge pull request #39785 from s-aga-r/FIX-9505
fix: incorrect planned qty in PP
2024-02-07 19:02:31 +05:30
Ankush Menat
294f562fb9 build: Pin frappe requirements to ^16.0.0 (#39782) 2024-02-07 18:30:35 +05:30
s-aga-r
81e82b0595 Merge pull request #39780 from s-aga-r/FIX-9577
fix: add permissions to SRE
2024-02-07 18:14:08 +05:30
s-aga-r
a8ebc94a36 fix: incorrect planned qty in PP 2024-02-07 18:13:34 +05:30
ruthra kumar
33efe0d12d refactor(test): assert Invoice status as well 2024-02-07 17:33:55 +05:30
ruthra kumar
31a8c3bdc4 test: Invoice status on Cr/Dr note cancellation 2024-02-07 17:21:29 +05:30
ruthra kumar
0549535603 refactor: cancel Cr/Dr JE's on Sales/Purchase return cancel 2024-02-07 16:35:07 +05:30
s-aga-r
50f54d983d fix: add permissions to SRE 2024-02-07 16:06:28 +05:30
Gursheen Kaur Anand
146147316d Merge pull request #39757 from GursheenK/duplicates-in-tax-category-map
fix: duplicates in tax category map
2024-02-07 15:11:59 +05:30
rohitwaghchaure
ab9d6576d0 Merge pull request #39769 from rohitwaghchaure/fixed-inventory-dimension-validation-8004
fix: do not throw validation for canceled SLE
2024-02-06 23:11:50 +05:30
Rohit Waghchaure
32ccf3524a fix: do not throw validation for cancelled sle 2024-02-06 22:48:13 +05:30
rohitwaghchaure
d6d91257b6 Merge pull request #39764 from rohitwaghchaure/fixed-remove-file-from-disk-9515
fix: remove file from the disk after the completion of reposting
2024-02-06 21:26:28 +05:30
s-aga-r
40ce0c851d Merge pull request #39765 from s-aga-r/FIX-9412
fix: set rate for PO created against BO
2024-02-06 21:18:48 +05:30
Rohit Waghchaure
76b57a4338 test: test case to check removed attached file 2024-02-06 21:09:58 +05:30
s-aga-r
0e5b4e5f07 fix: set rate for PO created against BO 2024-02-06 19:21:51 +05:30
Rohit Waghchaure
fb330d1b5a fix: remove file from the disk after the completion of reposting 2024-02-06 19:13:48 +05:30
Ankush Menat
9636458ae1 ci: codecov changes (#39760)
- don't report coverage on individual PRs, instead do it daily
- update tokens for reporting
2024-02-06 10:21:46 +00:00
rohitwaghchaure
4671f65cbd Merge pull request #39718 from rohitwaghchaure/create-bundle-using-old-fields
fix: use old serial / batch fields to make serial batch bundle
2024-02-06 15:47:08 +05:30
Gursheen Anand
9383f5da94 test: single account for multiple tax categories 2024-02-06 15:03:12 +05:30
Rohit Waghchaure
01650120d4 test: test case to check use serial / batch fields feature 2024-02-06 14:31:19 +05:30
Gursheen Kaur Anand
943dcb6dea Merge branch 'frappe:develop' into duplicates-in-tax-category-map 2024-02-06 14:17:40 +05:30
Gursheen Anand
3a26823c62 refactor: fetch rate once tax category is set 2024-02-06 14:01:06 +05:30
Gursheen Anand
e55611497b fix: duplicate for tax category in map 2024-02-06 13:56:41 +05:30
Ankush Menat
798a0510e6 refactor: change server_action args (#39756)
args are now flat, no need to accept them as dict

ref: https://github.com/frappe/frappe/pull/24782
2024-02-06 08:04:28 +00:00
Gursheen Kaur Anand
e38b46300c Merge pull request #39349 from GursheenK/JVs-in-withholding-report
fix: TDS accounts GLE query for withholding category report
2024-02-06 13:00:13 +05:30
s-aga-r
41f58476e1 Merge pull request #39746 from s-aga-r/FIX-9365
fix: show warehouse title field in sales docs
2024-02-06 12:03:33 +05:30
Ankush Menat
56e5611337 chore: update CI badges (#39753) 2024-02-06 06:01:11 +00:00
ruthra kumar
2e509f69d4 Merge pull request #39694 from ruthra-kumar/enforce_separate_account_for_each_bank_account
refactor: enforce unique GL Account for each 'Bank Account'
2024-02-06 09:29:12 +05:30
s-aga-r
ee14faaa39 fix: show warehouse title field in sales docs 2024-02-05 22:08:59 +05:30
s-aga-r
ae4ebcd987 Merge pull request #39733 from s-aga-r/FIX-9458
fix: update company in serial no doc
2024-02-05 21:54:02 +05:30
rohitwaghchaure
1bfbbfe393 Merge pull request #39742 from rohitwaghchaure/fixed-performance-issue-9247
perf: timeout while submitting the purchase receipt entry
2024-02-05 21:01:17 +05:30
Rohit Waghchaure
1fa6233377 perf: timeout while submitting the purchase receipt entry 2024-02-05 19:46:51 +05:30
Rohit Waghchaure
c1e869f040 test: fixed test cases 2024-02-05 19:39:58 +05:30
s-aga-r
3b671d5875 Merge pull request #39725 from s-aga-r/FIX-9411
fix: Blanket Order Ordered Quantity
2024-02-05 16:07:50 +05:30
Gursheen Anand
c5770f2ecc test: partial billing for provisional accounting 2024-02-05 15:58:06 +05:30
Gursheen Anand
ff3ca50a4b test: overbilling for provisional accounting 2024-02-05 15:55:17 +05:30
Gursheen Anand
cc96d2b50c fix: over billing qty along with rate 2024-02-05 15:52:46 +05:30
s-aga-r
4d614c1589 Merge pull request #39688 from s-aga-r/FIX-9169
fix: remove applied pricing rule on qty change
2024-02-05 15:40:44 +05:30
s-aga-r
27d6c8b6d5 test: BO on PO Close/Open 2024-02-05 15:38:31 +05:30
s-aga-r
61ded697a7 fix: update BO Ordered Quantity on PO Close/Open 2024-02-05 15:38:31 +05:30
s-aga-r
5ce5c352e4 fix: disable no-copy for blanket order in PO 2024-02-05 15:38:31 +05:30
Deepesh Garg
6e6c818084 feat: Period-wise closing entries for TB (#39712) 2024-02-05 14:10:42 +05:30
Deepesh Garg
b834ed10d6 perf: Move dimension validation out of GL Entry doctype (#39730) 2024-02-05 14:05:01 +05:30
Gursheen Anand
25c2b79864 fix: precision for tds amount 2024-02-05 13:03:21 +05:30
s-aga-r
7a04f0f7ba fix: update company in serial no doc 2024-02-05 12:35:26 +05:30
rohitwaghchaure
b70f3de16b perf: memory consumption for the stock balance report (#39626) 2024-02-05 11:46:39 +05:30
RitvikSardana
955098c4c0 Merge pull request #39651 from RitvikSardana/develop-ritvik-ignore-permission-flag
fix: add ignore_permissions flag while creating a payment entry.
2024-02-05 11:45:02 +05:30
rohitwaghchaure
675a0b810f Merge pull request #39659 from rohitwaghchaure/fixed-timeout-error-while-making-auto-mr
perf: timeout for auto material request through reorder level
2024-02-05 11:38:11 +05:30
rohitwaghchaure
d7e4a6be13 Merge pull request #39684 from rohitwaghchaure/fixed-landed-cost-voucher-issue-manually
fix: incorrect landed cost voucher amount
2024-02-05 11:37:41 +05:30
Raffael Meyer
617d923f0d Merge pull request #38647 from barredterra/copy-emails-to-customer 2024-02-04 22:13:48 +01:00
Gursheen Kaur Anand
407045a1de fix: production plan date filters for orders (#39702) 2024-02-04 23:01:51 +05:30
NIYAZ RAZAK
d73e42fc41 feat: project field 2024-02-04 17:23:08 +03:00
Rohit Waghchaure
9fafc83632 fix: use old serial / batch fields to make serial batch bundle 2024-02-04 18:32:19 +05:30
Vishnu VS
c81d597ca5 fix(work order): resolve type error during job card creation (#39713)
fix: type error
2024-02-04 06:47:18 +00:00
mergify[bot]
50cff656b4 Merge branch 'develop' into copy-emails-to-customer 2024-02-03 08:37:59 +00:00
Gursheen Kaur Anand
d9a72c1e61 feat: reference for POS SI payments (#39523)
* feat: reference field in SI payment

* fix: document link for pos si

* refactor: pos invoice queries
2024-02-03 13:05:41 +05:30
ruthra kumar
322cdbaccf refactor(test): make use of test fixtures in Payment Order 2024-02-03 12:09:50 +05:30
ruthra kumar
a9a2ec81de refactor(test): generate uniq GL acc and Bank acc for each test case 2024-02-03 12:07:43 +05:30
Raffael Meyer
93259cab1d fix(Bank Statement Import): scheduler not needed in dev mode (#39678) 2024-02-03 09:12:28 +05:30
Gursheen Anand
7efb5a8cb5 fix(portal): context pay_amount for button 2024-02-02 22:01:42 +05:30
Gursheen Anand
c18ff5bd25 fix(portal): payment amount for orders 2024-02-02 21:59:53 +05:30
Gursheen Anand
f7face43cd fix: check payments against orders for getting request amount 2024-02-02 21:57:45 +05:30
ruthra kumar
2caa2d677c refactor: ensure unique accounts for each Bank Account's 2024-02-02 21:03:41 +05:30
Deepesh Garg
6d87cfeb8d fix: Percentage handling in queries (#39692)
* fix: Percentage handling in queries

* test: Account with percent sign

* chore: add test records
2024-02-02 18:08:33 +05:30
s-aga-r
2693fcb446 Merge pull request #39687 from s-aga-r/FIX-9316
fix: out of range for valuation_rate column in SE
2024-02-02 13:35:00 +05:30
s-aga-r
7c6a5a0f23 fix: remove pricing rule 2024-02-02 13:18:52 +05:30
s-aga-r
1e15a3cc15 fix: out of range for valuation_rate column in SE 2024-02-02 13:07:26 +05:30
Rohit Waghchaure
d78a1e7814 fix: incorrect landed cost voucher amount 2024-02-01 19:29:06 +05:30
ruthra kumar
12affa70cf Merge pull request #39674 from ruthra-kumar/add_account_type_warning
refactor: use pop up to inform of possible data issue
2024-02-01 17:11:39 +05:30
ruthra kumar
78483e2ee6 refactor: use pop up to inform of possible data issue
and leave a comment in communcation trail as well
2024-02-01 16:24:47 +05:30
Divyam Mistry
e9fe10c6f1 fix: fetch/change tax template on basis of base_net_rate instead of net_rate (#39448)
fix: change tax template on basis of base_net_rate instead of net_rate

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2024-02-01 16:15:43 +05:30
ruthra kumar
518b06c8eb Merge pull request #39671 from ruthra-kumar/filter_to_ignore_err_journals_in_general_ledger
refactor: move ignore ERR filter from SOA to General Ledger
2024-02-01 16:09:53 +05:30
Gursheen Kaur Anand
27b557bef9 Merge branch 'develop' into editable-journal-entries 2024-02-01 16:08:14 +05:30
ruthra kumar
beff566c82 refactor(test): use party with USD billing currency 2024-02-01 15:46:57 +05:30
ruthra kumar
affca3a519 test: ignore_err filter out in General Ledger 2024-02-01 15:13:28 +05:30
ruthra kumar
c077eda64e refactor: move ignore ERR filters from SOA to General Ledger 2024-02-01 14:53:01 +05:30
Gursheen Kaur Anand
772f540bef fix: correctly calculate diff amount for included taxes (#39655) 2024-02-01 10:13:29 +05:30
David Arnold
b39f7b1c2f Merge remote-tracking branch 'origin/develop' into feat/add-login-user-to-driver 2024-01-31 21:11:03 +01:00
Rohit Waghchaure
951023f434 perf: timeout for auto material request through reorder level 2024-01-31 17:27:32 +05:30
rohitwaghchaure
5e71d6ac4e Merge pull request #39643 from GursheenK/portal-po-pay-btn
fix(portal): show PO pay button if payments installed
2024-01-31 14:44:25 +05:30
Gursheen Kaur Anand
7475233fa6 Merge branch 'develop' into portal-po-pay-btn 2024-01-31 13:39:49 +05:30
Gursheen Anand
0c9572bb48 fix: conditionally display show btn setting 2024-01-31 13:37:01 +05:30
Rucha Mahabal
6b8f046fb4 chore: cleanup doctype descriptions (#39637)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2024-01-31 12:15:52 +05:30
RitvikSardana
1ff473b615 fix: add ignore_permissions flag while creating a payment entry 2024-01-31 11:34:20 +05:30
Deepesh Garg
cfd1666181 fix: Exchange rate on MR to PO creation for muticurrency POs (#39646) 2024-01-31 09:27:52 +05:30
Raffael Meyer
0c6c650c08 Merge pull request #39519 from barredterra/dont-override-tc 2024-01-31 01:12:27 +01:00
rohitwaghchaure
31f586f716 Merge pull request #38362 from rohitwaghchaure/feat-visual-plant-floor
feat: visual plant floor
2024-01-30 22:35:42 +05:30
Rohit Waghchaure
6fea9d6dfe feat: make material request for job card from workstation dashboard 2024-01-30 22:12:34 +05:30
Raffael Meyer
212d656d85 Merge pull request #39468 from blaggacao/feat/payment-request-failure-reason 2024-01-30 15:58:42 +01:00
David Arnold
9a705169fd fix: remove empty dn from bulk creation if date filter renders them empty 2024-01-30 13:51:48 +01:00
David Arnold
00a915b741 feat: hanled payment request failure reasons 2024-01-30 13:00:55 +01:00
Gursheen Anand
ae7be84d87 fix(portal): show PO pay button if payments installed 2024-01-30 17:24:59 +05:30
Raffael Meyer
f8a9554bbd Merge pull request #38157 from blaggacao/fix/notification-comply-with-upstream 2024-01-30 12:33:25 +01:00
David Arnold
d86186ec47 fix: correct receiver field 2024-01-30 12:12:15 +01:00
David Arnold
3fd43cd6bb chore: remove old md files 2024-01-30 12:11:08 +01:00
mergify[bot]
12a4f2761c Merge branch 'develop' into feat/add-delivery-cutoff-date-on-so 2024-01-30 09:56:24 +00:00
mergify[bot]
e9dfb45fca Merge branch 'develop' into fix/notification-comply-with-upstream 2024-01-30 09:49:57 +00:00
rohitwaghchaure
b14886b227 fix: perf issue while submitting stock entry (#39634) 2024-01-30 15:16:52 +05:30
Raffael Meyer
2e49423d3f Merge branch 'develop' into dont-override-tc 2024-01-30 10:44:16 +01:00
David Arnold
ff7e0eaba5 feat: add login user to driver if available for notifications 2024-01-30 10:31:17 +01:00
Gursheen Anand
ddecbeba75 fix: test JV totals using back calculation logic 2024-01-30 12:39:40 +05:30
ruthra kumar
2e5d716408 Merge pull request #39559 from ruthra-kumar/prevent_cr_note_with_different_account_to_sales_invoice
fix: prevent Return Invoices(Credit/Debit Note) from using a different account
2024-01-30 11:00:44 +05:30
ruthra kumar
bdca718103 test: debit note account mismatch 2024-01-30 10:38:44 +05:30
ruthra kumar
8bdc760733 test: account mismatch validation 2024-01-30 10:38:44 +05:30
ruthra kumar
6f2fae1b61 refactor: prevent '{debit/credit}_to' account mismatch 2024-01-30 10:38:44 +05:30
Raffael Meyer
91b913b5bb chore: regenerate pot file (#39627) 2024-01-30 08:32:55 +05:30
rohitwaghchaure
5cf47ae5f9 fix: not able to submit subcontracting pr (old flow) (#39622) 2024-01-29 20:41:26 +05:30
Deepesh Garg
a673220feb feat: Partly billed status in Purchase Receipt (#39543) 2024-01-29 19:56:46 +05:30
rohitwaghchaure
4e182b89ce fix: not able to save BOM (duplicate key error) (#39620) 2024-01-29 19:35:05 +05:30
Rohit Waghchaure
68c997aa06 feat: visual plant floor 2024-01-29 18:48:35 +05:30
Gursheen Kaur Anand
866df9f1c7 Merge pull request #39616 from GursheenK/item-delivery-date-from-qtn
fix(minor): do not auto-populate item delivery date from qtn
2024-01-29 15:50:23 +05:30
Gursheen Anand
079cd30b9c fix: qtn tests using delivery date 2024-01-29 14:19:25 +05:30
Gursheen Anand
49cb11c1f3 fix: do not auto-populate item delivery date 2024-01-29 13:15:00 +05:30
Jeffry Suryadharma
efade9b9ae fix amount not updated when change rate in material request (#39606)
* fix amount not updated when change rate in material request

* make code consistent
2024-01-29 12:57:49 +05:30
Gursheen Anand
2a46799188 fix: handle partial invoice against provisional entry 2024-01-29 11:34:06 +05:30
Dany Robert
50d56db0c2 fix: specify precision for net_amount (#39481)
* fix: specify precision for net_amount

* fix: correct existing test to account for precision

* fix: rounding issue in test cases

* fix: optional grand total manipulation

* fix: use `grand_total_diff` for manipulation

* fix: patch to set default for grand total manipulation

* fix: wrong rounding assertion for USD

* fix: undefined this.frm error

* chore: linters

* fix: `net_amount` percision and method rename

* fix: missing frm reference

* chore: minor cleanups and depr message

* refactor: remove optional adjusting of grand total
2024-01-29 09:32:44 +05:30
Deepesh Garg
16404110a8 Merge pull request #39588 from CitrusLeafSoft/New-Financial-report-views
feat: New financial views - Growth and margin views for P&L and balance sheet
2024-01-28 11:36:55 +05:30
mergify[bot]
6a63a8997d Merge branch 'develop' into fix/notification-comply-with-upstream 2024-01-28 05:42:37 +00:00
Deepesh Garg
88ff945e40 Merge pull request #39562 from GursheenK/JV-timeout-issue
fix: enqueue JV submission when > 100 accounts
2024-01-28 10:30:25 +05:30
Deepesh Garg
8f6c23cb53 Merge pull request #39598 from GursheenK/type-error-dashboard-report
fix(minor): type error in financial statements for dashboard
2024-01-28 09:55:49 +05:30
mergify[bot]
4c197c8dbd Merge branch 'develop' into copy-emails-to-customer 2024-01-28 04:23:49 +00:00
Deepesh Garg
f2891229ab Merge pull request #38643 from barredterra/quotation-to-customer
refactor: get/create customer for Sales Order
2024-01-28 09:53:15 +05:30
Gursheen Anand
2486b646a1 fix: check page obj before adding menu 2024-01-27 23:30:17 +05:30
rohitwaghchaure
8fdc244e16 fix: prevent extra transfer against inter transfer transaction (#39213)
* fix: prevent extra transfer against inter transfer transaction

* fix: internal transfer dashboard
2024-01-27 21:37:58 +05:30
ruthra kumar
5be868c7f6 Merge pull request #39591 from ruthra-kumar/conversion_on_future_payments
refactor: Do proper currency conversion on Future Payments column in AR/AP report
2024-01-27 12:52:18 +05:30
rohitwaghchaure
67d828dab3 fix: not able to save subcontracting purchase receipt (old flow) (#39590) 2024-01-27 12:00:06 +05:30
ruthra kumar
7b37389115 test: future payment with foreign currency 2024-01-27 11:48:22 +05:30
ruthra kumar
0de4197c88 refactor: do currency conversion on future amount columns 2024-01-27 11:48:19 +05:30
nitmit
92649de5c6 Adding growth and margin views for P&L and balance sheet financial reports in collaboration with Sapcon Instruments Pvt Ltd 2024-01-27 10:18:35 +05:30
Gursheen Anand
3e59c66806 fix: provisional reverse entry amount 2024-01-26 21:46:19 +05:30
Gursheen Anand
fc677811b7 fix: return doc obj after submit 2024-01-26 20:03:21 +05:30
mergify[bot]
19ff10dfeb Merge branch 'develop' into quotation-to-customer 2024-01-26 13:56:08 +00:00
Deepesh Garg
4173203382 Merge pull request #39578 from deepeshgarg007/fix_ci
fix: apply no copy on source docs
2024-01-26 19:25:22 +05:30
Deepesh Garg
dbd4dae3d9 test: Internal transfer using purchase receipt 2024-01-26 18:42:29 +05:30
Deepesh Garg
99b839d2b6 chore: failing ci tests 2024-01-26 10:46:44 +05:30
Deepesh Garg
30cc65d2b7 Merge pull request #39511 from barredterra/set-account-for-mode-of-payments
refactor(Sales Invoice): set account and sum for payments
2024-01-26 09:44:11 +05:30
Deepesh Garg
722ee53fb1 Merge branch 'develop' of https://github.com/frappe/erpnext into copy-emails-to-customer 2024-01-26 09:39:13 +05:30
Deepesh Garg
6173b34b10 Merge branch 'develop' of https://github.com/frappe/erpnext into quotation-to-customer 2024-01-26 09:35:38 +05:30
Deepesh Garg
f7a3af7473 Merge pull request #39532 from GursheenK/type-error-in-transaction-js
fix: type error in transaction.js
2024-01-26 09:30:53 +05:30
Deepesh Garg
d491036f2d Merge pull request #39108 from deepeshgarg007/in_words_pe
feat: In words in payment entry
2024-01-26 09:30:26 +05:30
Deepesh Garg
d2057588dd Merge branch 'develop' of https://github.com/frappe/erpnext into type-error-in-transaction-js 2024-01-26 09:29:05 +05:30
rohitwaghchaure
2bdfdeeb9a fix: incorrect amount in the material request item (#39567)
fix: incoorect amount in the material request
2024-01-25 16:49:12 +05:30
Nabin Hait
be074a2972 Merge pull request #39489 from nabinhait/grouped-asset-value
fix: fetch correct quantity and amount for grouped asset
2024-01-25 16:20:35 +05:30
Gursheen Kaur Anand
2b3cc5ba2d Merge pull request #39557 from GursheenK/validate-item-code-with-prevdoc
fix: make SO item code mandatory
2024-01-25 16:19:23 +05:30
Nabin Hait
06f48c678b fix: fetch correct quantity and amount for grouped asset 2024-01-25 16:18:54 +05:30
Gursheen Anand
53b44ccf29 fix: enqueue JV submission when more than 100 accounts 2024-01-25 16:13:24 +05:30
Deepesh Garg
69db569ca5 Merge pull request #39446 from GursheenK/payment-reco-company-field
fix: ignore user permissions for company in payment reco
2024-01-25 15:06:10 +05:30
Gursheen Anand
7f8303a493 fix: make SO item code reqd 2024-01-25 14:27:35 +05:30
Ankush Menat
dfda5ad673 ci: Add fake passing tests when CI is skipped (#39555) 2024-01-25 14:18:27 +05:30
ruthra kumar
1e89c1c875 Merge pull request #39535 from ruthra-kumar/rename_advance_doctype_variable_hook
refactor: use generic name for advance doctypes variable
2024-01-25 13:25:56 +05:30
rohitwaghchaure
d1fb90edff fix: default enable closing stock balance (#39551) 2024-01-25 12:42:16 +05:30
ruthra kumar
4f215f1b70 Merge pull request #38218 from rtdany10/account-balance-mismatch
fix: honour currency precision while fetching balance
2024-01-25 12:28:36 +05:30
Gursheen Kaur Anand
3f383d81bd Merge branch 'develop' into payment-reco-company-field 2024-01-25 11:44:53 +05:30
rohitwaghchaure
c0a1188067 Merge pull request #39547 from rohitwaghchaure/fixed-item-tax-template-not-working-for-e-commerce
fix: Item Tax template is not working for e-commerce
2024-01-25 11:36:48 +05:30
Nabin Hait
ca02dfa652 Merge pull request #39498 from nabinhait/asset-cancellation-fix
fix: cancellation of asset/asset capitalization
2024-01-25 11:36:19 +05:30
Rohit Waghchaure
7d3240ae3a fix: Item Tax template is not working for e-commerce 2024-01-25 11:08:33 +05:30
ruthra kumar
93681cfa24 Merge branch 'develop' into pr/38218 2024-01-25 09:58:54 +05:30
ruthra kumar
4f1e729b7c Merge pull request #39331 from FHenry/dev_fix_payment_terms_status_for_sales_order_report
fix: Payment Terms Status for Sales Order report show all payment terms from orders (not only when there is a payment terms template)
2024-01-24 16:11:52 +05:30
ruthra kumar
735576ab27 Merge branch 'develop' into dev_fix_payment_terms_status_for_sales_order_report 2024-01-24 15:45:46 +05:30
rohitwaghchaure
23199a3271 Merge pull request #39389 from rohitwaghchaure/fixed-incorrect-active-serial-nos
fix: incorrect active serial nos
2024-01-24 15:36:31 +05:30
Rohit Waghchaure
64cb1153de fix: incorrect active serial nos 2024-01-24 15:15:50 +05:30
ruthra kumar
9fcd89d456 refactor: use generic name for advance doctypes variable 2024-01-24 14:19:21 +05:30
ruthra kumar
4a4c4ba21b Merge pull request #39529 from ruthra-kumar/typeerror_on_company_transaction_deletion
fix: AttributeError in company transaction deletion
2024-01-24 13:09:49 +05:30
Gursheen Anand
030d35628d fix: type error on company doc 2024-01-24 12:47:55 +05:30
rohitwaghchaure
a552df8a9f Merge pull request #39525 from rohitwaghchaure/fixed-auto-mr-email-with-user-permissions-issue
fix: email list for auto reorder material request
2024-01-24 12:35:35 +05:30
ruthra kumar
b127aa308e fix: AttributeError in company transaction deletion 2024-01-24 12:24:02 +05:30
rohitwaghchaure
02028becb3 Merge pull request #39521 from rohitwaghchaure/fixed-not-able-to-edit-adddress
fix: not able to edit address through portal
2024-01-24 11:50:02 +05:30
Rohit Waghchaure
764f3422a0 fix: email list for auto reorder material request 2024-01-24 11:45:15 +05:30
Deepesh Garg
236c7e1e95 Merge pull request #39493 from GursheenK/skip-liability-acc-for-internal-transfers
fix: skip setting liability account for internal transfer
2024-01-24 10:34:19 +05:30
Deepesh Garg
9f1ddeb4e4 Merge pull request #39520 from barredterra/fix-typos
fix: typos
2024-01-24 10:33:27 +05:30
Rohit Waghchaure
b046d980ad fix: not able to edit address through portal 2024-01-24 10:29:55 +05:30
barredterra
806696a003 fix: typos 2024-01-24 02:59:52 +01:00
barredterra
77b044f1a6 fix: don't overwrite existing terms in transaction 2024-01-24 01:48:10 +01:00
Raffael Meyer
7a6a789199 Merge pull request #39512 from barredterra/refactor-split-batch 2024-01-23 17:54:28 +01:00
David Arnold
252fae68df feat: use new bulk creation arguments and contrue a cut-off date selector for dn-from-so 2024-01-23 17:46:12 +01:00
David Arnold
e5a5b6afc8 feat: add better preselection (cut-off: tomorrow) to dn-from-so creation dialogue 2024-01-23 17:45:40 +01:00
David Arnold
ffd38362d5 feat: add an argument pass mechanism to bulk transactions 2024-01-23 17:42:56 +01:00
barredterra
7a7a213285 refactor(Batch): use const instead of var 2024-01-23 15:02:42 +01:00
barredterra
34ec2f8a2b fix(Batch): reload doc after splitting
to show updated qty
2024-01-23 14:57:23 +01:00
rohitwaghchaure
4832175341 Merge pull request #39503 from rohitwaghchaure/fixed-serial-no-ledger-permission
fix: Serial No Ledger permission issue
2024-01-23 19:06:40 +05:30
barredterra
3c7e7a76f0 refactor: split batch 2024-01-23 14:23:32 +01:00
barredterra
3815f07c33 refactor(Sales Invoice): set account for mode of payment 2024-01-23 13:11:06 +01:00
ruthra kumar
ebaa5d3add Merge pull request #39054 from ruthra-kumar/provision_to_set_dimension_in_reconciliation_tool
refactor: provision to filter on dimensions in reconciliation tool
2024-01-23 17:28:21 +05:30
ruthra kumar
0d7dd93284 Merge pull request #38560 from blaggacao/feat/so-po-advance-payment-status
feat!: advance payment status on advance payment doctypes
2024-01-23 16:39:22 +05:30
ruthra kumar
9b4e757b0b test: advance payment status for Purchase Order 2024-01-23 15:53:05 +05:30
ruthra kumar
8de03ef836 test: advance payment status for Sales Order 2024-01-23 15:50:52 +05:30
David Arnold
bd6a4ca1d7 fix: move value initialization to ensure it is commited 2024-01-23 10:30:09 +01:00
David Arnold
7d8aa469d7 fix: align with 'Partly/Fully X' nomenclature in so & po 2024-01-23 10:30:08 +01:00
David Arnold
b1aef01a1f fix: always update the advance payment status 2024-01-23 10:30:08 +01:00
David Arnold
c88ce55242 fix: advance payment doctypes to keep input/output distinction 2024-01-23 10:30:07 +01:00
Rohit Waghchaure
1a670ff266 fix: Serial No Ledger permission issue 2024-01-23 13:27:37 +05:30
Nabin Hait
1a686cb66d fix: Use db_set to set a value in on_cancel 2024-01-23 12:46:15 +05:30
Nabin Hait
31592b8f3a fix: cancellation of asset/asset capitalization 2024-01-23 12:42:54 +05:30
rohitwaghchaure
f8675817e2 Merge pull request #39478 from rohitwaghchaure/fixed-ux-improvement-for-SABB
fix: UX improvements for Serial and Batch Bundle
2024-01-23 11:57:03 +05:30
Gursheen Anand
236b73565e fix: skip liability account for internal transfer 2024-01-22 21:13:32 +05:30
ruthra kumar
72614fe9e1 Merge branch 'develop' into pr/38560 2024-01-22 17:26:35 +05:30
rohitwaghchaure
60809ced85 Merge pull request #39488 from rohitwaghchaure/fixed-validate-stock-uom-integer-value
fix: UOM needs to be whole number not being checked in quotations
2024-01-22 17:24:32 +05:30
Rohit Waghchaure
aaf83da3e9 fix: UOM needs to be whole number not being checked in quotations 2024-01-22 16:43:54 +05:30
ruthra kumar
4c20a4710b Merge pull request #39484 from ruthra-kumar/move_project_filter_to_common
refactor: move 'project' set_query to sales_common.js
2024-01-22 15:50:17 +05:30
ruthra kumar
52814724eb refactor: move 'project' set_query to sales_common.js 2024-01-22 15:32:16 +05:30
Rohit Waghchaure
fc0d2aeeff fix: auto create serial no on scan 2024-01-22 13:42:33 +05:30
ruthra kumar
7c2cb70387 refactor: handle dynamic dimension in order query 2024-01-22 12:06:07 +05:30
ruthra kumar
ec0f17ca8b refactor: update dimensions, only if provided 2024-01-22 11:59:20 +05:30
ruthra kumar
f8bbb0619c refactor: dynamic dimension filters in pop up 2024-01-22 10:43:09 +05:30
ruthra kumar
b17e632a85 Merge pull request #39457 from ruthra-kumar/background_job_transaction_deletion
refactor: delete transactions in background
2024-01-22 09:57:25 +05:30
Deepesh Garg
13aae34e9c Merge branch 'develop' of https://github.com/frappe/erpnext into in_words_pe 2024-01-22 09:33:46 +05:30
Deepesh Garg
6d8949adea Merge pull request #39462 from GursheenK/pdf-party-ap-ar
fix: party field in PDF for AP / AR reports
2024-01-22 09:31:34 +05:30
rohitwaghchaure
faab225126 Merge pull request #39476 from rohitwaghchaure/fixed-added-button-to-create-serial-batch-from-PI
fix: added button to make serial / batch from Purchase Invoice
2024-01-21 22:22:42 +05:30
Rohit Waghchaure
63ffce58cc test: fixed test 2024-01-21 20:59:38 +05:30
Rohit Waghchaure
5d94f0bde5 fix: UX improvements for Serial and Batch Bundle 2024-01-21 20:46:57 +05:30
Rohit Waghchaure
b4393bc03d fix: added button to make serial / batch from Purchase Invoice 2024-01-21 20:17:15 +05:30
rohitwaghchaure
da0ad3bc00 Merge pull request #39475 from rohitwaghchaure/fixed-key-error-during-reposting
fix: key error during reposting
2024-01-21 19:51:43 +05:30
David Arnold
9fc5c0cc58 Merge remote-tracking branch 'origin/develop' into feat/so-po-advance-payment-status 2024-01-21 15:16:13 +01:00
Rohit Waghchaure
ebc8230d45 fix: key error during reposting 2024-01-21 18:05:20 +05:30
Gursheen Anand
e9526b112d test: journals in withholding report 2024-01-21 18:04:47 +05:30
Gursheen Kaur Anand
a6afe50a92 Merge branch 'frappe:develop' into JVs-in-withholding-report 2024-01-21 17:55:56 +05:30
Gursheen Kaur Anand
273bc1b1e3 Merge pull request #39229 from blaggacao/fix/tds-report
fix: use most reliable section reference per report line
2024-01-21 13:39:38 +05:30
Gursheen Kaur Anand
c40719caa5 Merge pull request #39424 from frappe/revert-38556-period-end-date-for-financial-statements
Revert "fix(minor): financial statements period end date"
2024-01-20 17:57:46 +05:30
Gursheen Anand
b2d9380596 fix: party field in pdf html 2024-01-19 17:08:02 +05:30
ruthra kumar
fcf4687c52 test: dimension inheritance on adv allocation 2024-01-19 16:50:54 +05:30
ruthra kumar
cbd443a78a refactor: pass dimensions on advance allocation 2024-01-19 16:44:59 +05:30
ruthra kumar
6148fb024b test: dimension inheritance in PE reconciliation 2024-01-19 15:57:13 +05:30
Gursheen Kaur Anand
9678d050a4 Merge pull request #39426 from GursheenK/insufficient-permissions-for-manager
fix: FY permission for accounts and stock managers
2024-01-19 11:54:20 +05:30
Gursheen Kaur Anand
d468accb02 Merge branch 'frappe:develop' into payment-reco-company-field 2024-01-19 11:52:34 +05:30
ruthra kumar
a50808a077 refactor: delete transactions in background 2024-01-19 11:43:08 +05:30
Gursheen Anand
125847c69f Merge branch 'develop' into revert-38556-period-end-date-for-financial-statements 2024-01-19 11:40:50 +05:30
Gursheen Kaur Anand
4ca63c07f6 Merge branch 'frappe:develop' into insufficient-permissions-for-manager 2024-01-19 11:19:32 +05:30
Rucha Mahabal
35067282cf refactor(UX): Accounts workspace cleanup (#39232)
* refactor(UX): Accounts workspace cleanup

* chore: move asset workspace outside accounting

* fix: remove redundant links from parent workspace

* chore: change icons for payable & receivable workspaces

* chore: remove redundant links from subworkspaces
2024-01-19 11:13:09 +05:30
ruthra kumar
c44eb432a5 refactor: pass dimension values to Gain/Loss journal 2024-01-18 16:42:22 +05:30
Gursheen Kaur Anand
871a1f4565 Merge pull request #39449 from GursheenK/payment-entry-unallocated-amount-after-taxes
fix: unallocated amount after taxes and charges
2024-01-18 16:13:31 +05:30
Gursheen Anand
99b94af49f fix: linting issue 2024-01-18 15:05:19 +05:30
Gursheen Anand
e9bc63aacf fix: set unallocated amount after base tax 2024-01-18 14:33:10 +05:30
ruthra kumar
ba5a7c8cd8 test: dimension inheritance for cr note reconciliation 2024-01-18 13:29:33 +05:30
Gursheen Anand
527cfcd87f fix: ignore user permissions for company field 2024-01-18 11:58:06 +05:30
Ankush Menat
ef7aefeb45 ci: split pre-commit and semgrep jobs (#39445) 2024-01-18 11:29:53 +05:30
rohitwaghchaure
45aea56198 Merge pull request #39436 from rohitwaghchaure/fixed-duplicate-name-error-for-variant-creation
fix: duplicate name error while making variant
2024-01-18 06:50:50 +05:30
Nabin Hait
daf954057f Merge pull request #39429 from nabinhait/composite-asset-using-asset
fix: composite asset capitalization using asset components
2024-01-17 21:04:49 +05:30
Rohit Waghchaure
d7e6b83e64 fix: duplicate name error while making variant 2024-01-17 20:52:16 +05:30
rohitwaghchaure
80dc5a7b1c Merge pull request #39433 from FHenry/dev_better_display_item_BomCreator
refactor: BOM creator item selector with short description
2024-01-17 20:28:50 +05:30
Florian HENRY
0f881bc90a refactor: BOM creator item selector with short description 2024-01-17 13:37:22 +01:00
mergify[bot]
6efa92de70 Merge branch 'develop' into composite-asset-using-asset 2024-01-17 12:20:05 +00:00
Nabin Hait
2adb710751 Merge pull request #39427 from nabinhait/test-fix333
fix: Asset module tests
2024-01-17 17:21:47 +05:30
Nabin Hait
97f69986ff fix: Asset module tests 2024-01-17 16:39:39 +05:30
Nabin Hait
5df40661d2 fix: composite asset capitalization using asset components 2024-01-17 16:17:53 +05:30
Deepesh Garg
889d67bcee Merge pull request #39367 from deepeshgarg007/revert_dynamic_splitting
Revert dynamic splitting
2024-01-17 15:03:13 +05:30
Gursheen Anand
8b91287034 fix: account and stock manager read perm 2024-01-17 13:09:51 +05:30
Deepesh Garg
1148ed1566 Merge pull request #39423 from deepeshgarg007/fix_subscription_period_update
fix: Update subscription period
2024-01-17 12:57:40 +05:30
ruthra kumar
e3c44231ab chore: test dimension filter output 2024-01-17 12:51:44 +05:30
ruthra kumar
188ff8cde7 refactor: apply dimension filters on cr/dr notes 2024-01-17 12:51:41 +05:30
Deepesh Garg
3aa17fa0d6 chore: freezing date check 2024-01-17 12:47:27 +05:30
Deepesh Garg
4f3aeaefc1 chore: Remove unwanted changes 2024-01-17 12:42:22 +05:30
Deepesh Garg
120bfdf33d Merge branch 'develop' of https://github.com/frappe/erpnext into revert_dynamic_splitting 2024-01-17 12:33:07 +05:30
Gursheen Kaur Anand
73625a2622 Revert "fix(minor): financial statements period end date" 2024-01-17 12:25:03 +05:30
Nabin Hait
9f2b62dd1c Merge pull request #39386 from nabinhait/asset-capitalisation-calcellation
fix: Cancel asset capitalisation record on cancellation of asset and vice-versa
2024-01-17 12:14:15 +05:30
Nabin Hait
60f52adc90 Merge pull request #39385 from nabinhait/wdv-as-per-income-tax-act
fix: WDV as per IT Act: calculate yearly amount first and then split it based on months
2024-01-17 12:13:23 +05:30
Deepesh Garg
7eefedfb11 fix: Update subscription period 2024-01-17 10:57:19 +05:30
HENRY Florian
af80d253db fix: consistency in display reserved_stock checkbox on Sales Order Item according global settings and item.is_stock_item (#38322)
* fix: consistency in display reserved_stock checkbox on Sales Order Item according global settings and item.is_stock_item

* fix: evaluate depends_on for fdata visibility in grid

* fix: evaluate depends_on for fdata visibility in grid

* chore: change after review

* chore: change for review
2024-01-17 10:43:36 +05:30
ruthra kumar
ab939cc6e8 refactor: Credit Note and its Exc gain/loss JE inherits dimensions 2024-01-16 16:48:50 +05:30
ruthra kumar
ca9413bc64 Merge pull request #39402 from ruthra-kumar/fix_project_query
fix: project query controller logic
2024-01-16 16:24:02 +05:30
ruthra kumar
bfe42fdccb refactor: better ordering of query result 2024-01-16 15:58:19 +05:30
rohitwaghchaure
ce2dd28a25 Merge pull request #39406 from rohitwaghchaure/fixed-bin-permission-issue
fix: permission issue for the Bin
2024-01-16 15:50:46 +05:30
Deepesh Garg
96dcfba65a Merge branch 'develop' of https://github.com/frappe/erpnext into revert_dynamic_splitting 2024-01-16 15:42:02 +05:30
Rohit Waghchaure
6e4d4a55cd fix: permission issue for the BIN 2024-01-16 15:12:28 +05:30
ruthra kumar
3349dde5e2 fix(test): test case for project query 2024-01-16 14:28:09 +05:30
ruthra kumar
4eefb445a7 fix: project query controller logic 2024-01-16 13:38:53 +05:30
Ankush Menat
ed927f102e perf: use unbuffered_cursor for stock_ageing report (#39399)
perf: use unbuffered_cursor for stock stock_ageing report

Unbuffered cursor lets us load one row at a time in memory from mysql instead of lowing all at once.

This makes it possible to run the report for large number of SLEs.
2024-01-16 11:43:35 +05:30
ruthra kumar
82026f780d Merge pull request #39400 from ruthra-kumar/fix_broken_subscription_test
fix: broken multi currency test case in subscription
2024-01-16 11:39:42 +05:30
ruthra kumar
e5aeab7e7e fix: broken multi currency test case in subscription 2024-01-16 11:16:39 +05:30
Deepesh Garg
32738637ce Merge pull request #39394 from noec764/Fix_UntranslatedColumnsInGlobalLedger
fix: Untranslated columns in Global Ledger Report
2024-01-16 11:03:47 +05:30
Alexandre Lumertz Damiani
80f5026208 fix: translate (#39395) 2024-01-16 10:46:00 +05:30
Alexandre Lumertz Damiani
00619342e1 fix: translate (#39396) 2024-01-16 10:44:59 +05:30
Alexandre Lumertz Damiani
b719585a2f fix: translate (#39397) 2024-01-16 10:44:17 +05:30
Alexandre Lumertz Damiani
4970b5d5bc fix: translate (#39398) 2024-01-16 10:43:33 +05:30
Noé
bdd382bdfd fix: Untranslated columns in Global Ledger 2024-01-15 16:40:45 +01:00
ruthra kumar
92a5cda61a Merge pull request #39391 from ruthra-kumar/multiple_typeerror_fixes
fix: possible typerror in utils.js
2024-01-15 20:45:27 +05:30
ruthra kumar
60b26ad8b2 fix: possible typerror in utils.js
and remove unwanted debugging statements
2024-01-15 20:37:21 +05:30
Nabin Hait
efe9f6656f fix: Cancel asset capitalisation record on cancellation of asset and vice-versa 2024-01-15 17:54:47 +05:30
Nabin Hait
22bd6a54b2 fix: WDV as per IT Act: calculate yearly amount first and then split it based on months 2024-01-15 16:54:19 +05:30
Deepesh Garg
a36b6cb102 Merge pull request #39384 from deepeshgarg007/income_account_filter
feat: Income account filter in item-wise reports
2024-01-15 16:52:39 +05:30
Deepesh Garg
d91813c277 feat: Income account filter in item-wise reports 2024-01-15 16:50:14 +05:30
ruthra kumar
0ec17590ae fix: typo's and parameter changes 2024-01-15 16:17:33 +05:30
ruthra kumar
2154502955 refactor: partial change on outstanding invoice popup 2024-01-15 16:17:33 +05:30
ruthra kumar
a4ddf93492 Merge pull request #39332 from ruthra-kumar/validate_subscription_billing_currency
refactor: prevent foreign currency subscription for a party
2024-01-15 15:05:31 +05:30
ruthra kumar
9c5a79209e refactor: replace sql with query builder for Jourals query 2024-01-15 14:55:15 +05:30
ruthra kumar
5dc22e1811 refactor: pass dimension details to query 2024-01-15 14:55:15 +05:30
ruthra kumar
ad8475cb8b refactor: set query filters for dimensions 2024-01-15 14:55:15 +05:30
ruthra kumar
ff60ec85b8 refactor: pass dimension filters to query 2024-01-15 14:55:15 +05:30
ruthra kumar
c1fe4bcc64 refactor: handle dimension filters 2024-01-15 14:55:15 +05:30
ruthra kumar
20576e0f47 refactor: column break in dimension section 2024-01-15 14:55:15 +05:30
ruthra kumar
20e0acc20a refactor: dimensions filter section in payment reconciliation 2024-01-15 14:55:15 +05:30
ruthra kumar
cfb3d87267 refactor: update dimension doctypes in hooks 2024-01-15 14:55:15 +05:30
ruthra kumar
1cde804c77 refactor: dimensions section in allocation table in reconciliation 2024-01-15 14:55:15 +05:30
ruthra kumar
1387b0ba7f refactor(test): supply default currency for subscription plans 2024-01-15 14:42:57 +05:30
Ankush Menat
2e03af7ac4 perf: use iterator for stock ageing report (#39346) 2024-01-15 14:35:28 +05:30
s-aga-r
749c735627 Merge pull request #39377 from s-aga-r/BUMP-NODE
ci: bump node in release workflow
2024-01-15 11:58:51 +05:30
s-aga-r
aef87cced7 ci: bump node in release workflow 2024-01-15 11:54:26 +05:30
ruthra kumar
6bb2d9195f Merge pull request #39336 from ruthra-kumar/better_validation_on_bank_transaction
refactor: disallow bank transactions on different currencies
2024-01-15 10:01:50 +05:30
ruthra kumar
28ebc4cfee Merge pull request #39371 from ruthra-kumar/fix_customer_ledger_summary_report
fix: incorrect sql error if account name has '%'
2024-01-15 09:38:50 +05:30
rohitwaghchaure
ad5906916d Merge pull request #39372 from rohitwaghchaure/fixed-get-query-for-batch-no-field
fix: batches not coming correctly in the batch selector
2024-01-14 23:48:48 +05:30
Rohit Waghchaure
114f2b4326 fix: batches not coming correctly in the batch selector 2024-01-14 23:27:29 +05:30
ruthra kumar
a27a4db3de refactor(test): supply default currency to Bank Transaction 2024-01-14 18:09:19 +05:30
ruthra kumar
b4354cbc8d refactor: better error message 2024-01-14 18:04:15 +05:30
Deepesh Garg
02fde73545 fix: Against account variable 2024-01-14 18:01:44 +05:30
ruthra kumar
19975dcb7b refactor: making currency mandatory for subcscription plans 2024-01-14 17:59:43 +05:30
ruthra kumar
641c3de0ca fix: incorrect sql error if account name has '%' 2024-01-14 17:37:34 +05:30
rohitwaghchaure
cf6b52e543 Merge pull request #39224 from mahsem/patch-1
Update purchase_taxes_and_charges.json label Rate to Tax Rate
2024-01-14 11:26:35 +05:30
Deepesh Garg
9500254861 Revert "chore: orderby in gle"
This reverts commit 005c5a587f.
2024-01-14 11:25:58 +05:30
Deepesh Garg
13e5578bc6 Revert "fix: check for unmerged gle in purchase receipt test"
This reverts commit 47c78a5a73.
2024-01-14 11:25:50 +05:30
Deepesh Garg
24137ff54f Revert "fix: subcontracting receipt gle test"
This reverts commit 24ccb3eb78.
2024-01-14 11:25:39 +05:30
Deepesh Garg
9a13842751 Revert "fix: check for split entries in stock entry test"
This reverts commit a56b79cc72.
2024-01-14 11:25:30 +05:30
Deepesh Garg
13b4ddec63 Revert "fix: query for against types"
This reverts commit 262cafc430.
2024-01-14 11:25:09 +05:30
Gursheen Anand
39c8507dc2 fix: query for against types 2024-01-14 11:24:51 +05:30
Deepesh Garg
0b1cc7fad1 Revert "fix: fetch against link value in gl report"
This reverts commit 9aeb3932d0.
2024-01-14 11:24:00 +05:30
Deepesh Garg
8bc1efcf8b Revert "refactor: set against account link for jv"
This reverts commit 450c2470e9.
2024-01-14 11:23:34 +05:30
Deepesh Garg
1a67d7d95f Revert "refactor: use both fields to store against values"
This reverts commit 09439334ca.
2024-01-14 11:22:50 +05:30
Deepesh Garg
4dad4b50fb Revert "refactor: keep old against fields intact"
This reverts commit f9c88ea7bc.
2024-01-14 11:21:19 +05:30
Deepesh Garg
0f9734ae37 Revert "fix: split expected jv entries for scrap asset"
This reverts commit 291a499124.
2024-01-14 11:19:46 +05:30
Deepesh Garg
a43ee34bd5 Revert "fix: purchase receipt test"
This reverts commit 5ce395a60a.
2024-01-14 11:16:29 +05:30
Deepesh Garg
e6f599b32d Revert "fix: single dr cr entries"
This reverts commit e845b63228.
2024-01-14 11:16:17 +05:30
Deepesh Garg
8cf6ff69c0 Revert "fix: remove join for against in purchase receipt"
This reverts commit 758ec720de.
2024-01-14 11:14:14 +05:30
Deepesh Garg
2249b7c793 Revert "fix: auto separate against accounts"
This reverts commit ff0343d2cc.
2024-01-14 11:13:34 +05:30
Deepesh Garg
591de1338b Revert "fix: combine jv entries for rate revaluation"
This reverts commit 3d00d74fed.
2024-01-14 11:12:36 +05:30
Deepesh Garg
2c95cd206b Revert "fix: remove multiple against account values from gle"
This reverts commit 35d92abe73.
2024-01-14 11:12:15 +05:30
Deepesh Garg
8ee6dbc1e2 Revert "fix: make JV account against field a dynamic link"
This reverts commit aab5737ff3.
2024-01-14 11:10:22 +05:30
Deepesh Garg
beb169cf75 Revert "fix: asset capitalization tests"
This reverts commit 952e8cf60c.
2024-01-14 11:09:28 +05:30
Deepesh Garg
b40d3b0a05 Revert "fix: purchase receipt tests"
This reverts commit fcfdb9b566.
2024-01-14 11:09:18 +05:30
Deepesh Garg
93ff84bf56 Revert "fix: remove multiple accounts from against in capitalization"
This reverts commit f705bf2efe.
2024-01-14 11:06:01 +05:30
Deepesh Garg
498c9c7955 Revert "fix: set against type in asset"
This reverts commit 6e1565c32c.
2024-01-14 11:04:51 +05:30
Deepesh Garg
073f2fa302 Revert "fix: set against type in stock controller"
This reverts commit 4ea43ebc5d.
2024-01-14 11:04:40 +05:30
Deepesh Garg
9339a8b57f Revert "fix: set against type in utils"
This reverts commit f292a0cc4c.
2024-01-14 11:04:13 +05:30
Deepesh Garg
fbeaf2b398 Revert "fix: set against type in controllers"
This reverts commit 4c5a83d6cf.
2024-01-14 11:04:00 +05:30
Deepesh Garg
7c0e180fd9 Revert "fix: set against type in deferred revenue"
This reverts commit 82774f89b1.
2024-01-14 11:01:40 +05:30
Deepesh Garg
1710e10b31 Revert "fix: set against type in inv gl dict"
This reverts commit 19b220f39c.
2024-01-14 11:01:27 +05:30
Deepesh Garg
8ae7ca7f14 Revert "fix: use dynamic link for against field"
This reverts commit 725a7f90e9.
2024-01-14 10:56:17 +05:30
Deepesh Garg
5fc29ac913 Merge pull request #39366 from frappe/revert-38914-multi_currency_ledger_jv_pe
Revert "fix: GL values in transaction currency via JV"
2024-01-14 10:52:30 +05:30
Deepesh Garg
41d9225bd1 Revert "fix: GL values in transaction currency via JV" 2024-01-14 10:51:30 +05:30
Deepesh Garg
53f6cfb216 Merge pull request #39363 from frappe/revert-39248-set-against-accounts-for-backend-JVs
Revert "fix: JV GLEs for auto-set against accounts"
2024-01-14 10:51:06 +05:30
rohitwaghchaure
6827edb2c5 fix: modified date 2024-01-14 10:45:43 +05:30
rohitwaghchaure
0b525f9d87 Merge pull request #39359 from rohitwaghchaure/fixed-added-field-item-group-in-stock-reco
fix: added item group in stock reco
2024-01-14 10:27:40 +05:30
Deepesh Garg
c7509d8ebf Revert "fix: JV GLEs for auto-set against accounts" 2024-01-14 10:23:19 +05:30
rohitwaghchaure
566876ae7a fix: modified date was not set 2024-01-14 10:15:50 +05:30
rohitwaghchaure
2820a0ac0a Merge pull request #39225 from mahsem/patch-2
Update sales_taxes_and_charges.json
2024-01-14 10:15:22 +05:30
Rohit Waghchaure
116ff8241c fix: added item group in stock reco 2024-01-14 10:05:26 +05:30
rohitwaghchaure
89623aba57 Merge pull request #39201 from rmehta/remove-homepage
fix!(portal): remove Homepage
2024-01-14 09:56:25 +05:30
rohitwaghchaure
f567af49a6 fix: modified date was not updated 2024-01-14 09:48:05 +05:30
Raffael Meyer
1aecb578e6 chore: update po files (#39340) 2024-01-14 09:46:13 +05:30
Deepesh Garg
a87bb21246 Merge pull request #39084 from deepeshgarg007/pricing_rule_remove
fix: Pricing rule application/removal on qty change
2024-01-13 12:47:19 +05:30
Deepesh Garg
ec5c0deb0e Merge pull request #39166 from barredterra/remove-je-list-indicators
refactor(Journal Entry): remove unused/redundant list indicators
2024-01-13 12:21:39 +05:30
Deepesh Garg
3b14c59133 Merge pull request #39048 from barredterra/fix-pl-balance-sheet
fix: calculation of P/L in balance sheet
2024-01-13 11:09:24 +05:30
Deepesh Garg
98e2b6575d Merge pull request #39235 from GursheenK/validation-for-payment-requests
fix(minor): validate doctype before creating payment request
2024-01-13 09:45:56 +05:30
Deepesh Garg
9947bae60e Merge pull request #38984 from Gubbu77/patch-1
fix(Report): Increased the column width in the Account Balance Report
2024-01-13 09:26:42 +05:30
rohitwaghchaure
402a1b91f9 Merge pull request #39335 from s-aga-r/FIX-8359
fix: SBB Total Qty validation for SE
2024-01-12 20:59:46 +05:30
rohitwaghchaure
3b07700ef6 Merge pull request #39333 from rohitwaghchaure/fixed-added-indexing-to-improve-performance
fix: added indexing to improve performance
2024-01-12 18:39:04 +05:30
rohitwaghchaure
d3aff000d9 Merge pull request #38970 from GursheenK/item-variant-local-attributes
fix: use local attribute range in multiple item variant dialog
2024-01-12 18:37:35 +05:30
Gursheen Anand
c648090b5d fix: query for filter by party 2024-01-12 18:33:06 +05:30
s-aga-r
d0687788b5 Merge pull request #39337 from s-aga-r/FIX-1882992786
chore: remove share, print and email permissions from Buying Settings
2024-01-12 16:47:36 +05:30
s-aga-r
3c46abca6c chore: remove share, print and email permissions from Buying Settings 2024-01-12 16:45:39 +05:30
ruthra kumar
cdd0acc672 refactor: disallow bank transactions on different currencies 2024-01-12 16:36:17 +05:30
s-aga-r
c20241fcb5 fix: SBB Total Qty validation for SE 2024-01-12 15:26:35 +05:30
Rohit Waghchaure
ac81323fec fix: added indexing to improve performance 2024-01-12 14:11:37 +05:30
ruthra kumar
6b5fa2c673 refactor: prevent foreign currency subscription for a party 2024-01-12 13:19:03 +05:30
Deepesh Garg
e4755778ae Merge pull request #39248 from GursheenK/set-against-accounts-for-backend-JVs
fix: JV GLEs for auto-set against accounts
2024-01-11 22:45:17 +05:30
Florian HENRY
6c8f52b26f fix: Payment Terms Status for Sales Order report should show all payment terms from order not only this comming from template 2024-01-11 16:00:48 +01:00
Raffael Meyer
0c47396785 Merge pull request #39293 from blaggacao/feat/add-account-preview 2024-01-11 15:12:52 +01:00
Ankush Menat
935622bde8 Update Crowdin configuration file 2024-01-11 19:08:14 +05:30
Raffael Meyer
ea33f902e7 Merge pull request #38974 from barredterra/unreconcile-bank-transaction-on-cancel 2024-01-11 14:36:24 +01:00
Ankush Menat
ea1624fba5 chore: regen po files 2024-01-11 19:03:02 +05:30
Raffael Meyer
f31c6f52e8 Merge pull request #39117 from barredterra/fix-holiday-list 2024-01-11 14:26:38 +01:00
Nabin Hait
3036a6afdc Merge pull request #39305 from GursheenK/naming_series_FY
fix: naming series variable parsing for FY
2024-01-11 18:55:14 +05:30
barredterra
e67ed4fb2d Merge branch 'develop' into quotation-to-customer 2024-01-11 14:04:09 +01:00
barredterra
f32a870a58 Merge branch 'develop' into fix-pl-balance-sheet 2024-01-11 14:03:39 +01:00
barredterra
e69f9ddf8b Merge branch 'develop' into remove-je-list-indicators 2024-01-11 14:03:13 +01:00
barredterra
2bcd032a44 Merge branch 'develop' into fix-holiday-list 2024-01-11 13:55:27 +01:00
barredterra
33bffe8201 Merge branch 'develop' into copy-emails-to-customer 2024-01-11 13:54:59 +01:00
barredterra
8039dc5194 Merge branch 'develop' into unreconcile-bank-transaction-on-cancel 2024-01-11 13:54:07 +01:00
ruthra kumar
2a195d457e Merge pull request #39320 from ruthra-kumar/possible_typeerror_in_consolidated_report
fix: possible typeerror in consolidated report
2024-01-11 16:54:30 +05:30
ruthra kumar
951e8e3a73 Merge pull request #39317 from ruthra-kumar/fix_broken_dimension_filters_in_sales_purchase_register_report
fix: broken dimension filters in Sales/Purchase register
2024-01-11 16:50:12 +05:30
ruthra kumar
268731aec4 fix: possible typeerror in consolidated report 2024-01-11 16:45:49 +05:30
ruthra kumar
7b3f9386d7 fix: broken dimension filters in Sales/Purchase register 2024-01-11 16:24:43 +05:30
Ankush Menat
d9e2427aa8 chore: migrate translations to gettext (#39313) 2024-01-11 15:46:55 +05:30
rohitwaghchaure
eb0bc5c6ad Merge pull request #39215 from rohitwaghchaure/fixed-incorrect-per-received-in-pi
fix: incorrect percentage received in purchase invoice
2024-01-11 14:50:19 +05:30
rohitwaghchaure
fde6fadf4d Merge pull request #39299 from rohitwaghchaure/fixed-cicular-dependecy-error
fix: circular dependency error on deletion of QC and Stock Entry
2024-01-11 14:49:12 +05:30
Ankush Menat
432a14c84c refactor: remove usage of raise_exception (#39309) 2024-01-11 14:02:28 +05:30
Gursheen Anand
813b7a96fb fix: reset default after test 2024-01-11 12:22:08 +05:30
Gursheen Anand
bbdf98a8f0 test: naming series variable parsing 2024-01-10 22:06:06 +05:30
Gursheen Anand
d96a777edd fix: date in master document for dictionary condition 2024-01-10 22:05:02 +05:30
rohitwaghchaure
c67b0a3a64 fix: performance issue related to stock entry (#39301) 2024-01-10 22:01:40 +05:30
Rohit Waghchaure
7cc324e31e fix: circular dependency error while deleting QC 2024-01-10 20:26:51 +05:30
Deepesh Garg
f057dc6867 Merge pull request #39256 from deepeshgarg007/opening_ignore_tempplate
fix: Ignore default payment terms template for opening invoices
2024-01-10 16:06:03 +05:30
David Arnold
e53931e27a feat(accounts): add preview for accounts 2024-01-10 11:07:39 +01:00
Raffael Meyer
6f9fe6a792 fix: wrong usage of get_single_value (#39268)
* fix: wrong usage of get_single_value

* test: fix wrong fieldname

* chore: typo

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
2024-01-10 12:32:27 +05:30
Ankush Menat
38c5ecf007 fix: set parent doctype on chart (#39286) 2024-01-10 12:26:03 +05:30
Nabin Hait
c1922ea5de Merge pull request #39052 from anandbaburajan/asset_wdv_india_dev
fix: asset WDV depreciation calc according to IT act [dev]
2024-01-10 12:17:09 +05:30
ruthra kumar
54bcbd0bc6 Merge pull request #39282 from ruthra-kumar/type_error_on_transaction_js
fix: possible typeerror on transaction.js
2024-01-10 11:53:22 +05:30
ruthra kumar
9f27ac142b fix: possible typeerror on transaction.js 2024-01-10 11:34:28 +05:30
Nabin Hait
2ef0596df2 Merge pull request #39275 from nabinhait/fetch-timesheet-in-invoice
fix: Show timesheet table after fetching data from timesheet
2024-01-10 11:33:51 +05:30
Nabin Hait
3ff562cb8a Merge pull request #39191 from nabinhait/asset-lcv-validation-fix
fix: Ignore asset qty and status validation while cancelling LCV
2024-01-10 11:33:17 +05:30
Nabin Hait
8fdf0ca2d3 Merge pull request #39207 from nabinhait/get-fixed-asset-acc
fix: Get fixed_asset_account from asset category
2024-01-10 11:32:06 +05:30
Nabin Hait
01f507ebcb Merge pull request #39238 from nabinhait/asset-purchase-amount
fix: Set asset purchase amount based on qty and valuation_rate
2024-01-10 11:31:30 +05:30
Nabin Hait
e1ba5878a3 fix: Show timesheet table after fetching data from timesheet 2024-01-10 11:26:33 +05:30
hyaray
6dceb25fb2 chore: typo 2024-01-10 10:53:14 +05:30
Ankush Menat
2178fdc65a fix: get_single_value doesn't support multiple fields 2024-01-10 10:39:45 +05:30
0xD0M1M0
eabf706f37 fix: projects website list visible for guests and all logged in customers (#39164)
* fix: projects website list visible for guests

fix: projects website list visible for guests and all logged in customers

see the issue for details

fixes issue #39009

* fix: remove user = frappe.session.user
2024-01-10 10:29:38 +05:30
barredterra
5b4c5d59d8 Merge branch 'develop' into unreconcile-bank-transaction-on-cancel 2024-01-09 18:12:30 +01:00
barredterra
28626cd7c0 Merge branch 'develop' into copy-emails-to-customer 2024-01-09 17:50:42 +01:00
barredterra
58343e5b7c Merge branch 'develop' into fix-holiday-list 2024-01-09 17:46:28 +01:00
Ankush Menat
b897225136 fix: Remove reference to non-existing doctype 2024-01-09 22:04:24 +05:30
Ankush Menat
bb18ae82cf refactor: use db.get_single_value 2024-01-09 21:57:50 +05:30
Gursheen Anand
8e1f6c8149 test: split and auto set against in JV 2024-01-09 21:47:59 +05:30
s-aga-r
74ceb6da5e Merge pull request #39242 from s-aga-r/FIX-8184
fix: skip rate validation for return `DN Items` with `Moving Average` valuation
2024-01-09 21:45:45 +05:30
s-aga-r
e0ad52b500 fix: skip rate validation for return DN Items with Moving Average valuation 2024-01-09 21:18:19 +05:30
s-aga-r
8252d92e6a Merge pull request #39262 from s-aga-r/FIX-8208
fix: Duplicate Closing Stock Balance
2024-01-09 19:31:53 +05:30
s-aga-r
b15795392b fix: Duplicate Closing Stock Balance 2024-01-09 19:03:06 +05:30
rohitwaghchaure
274c65c451 fix: TypeError is pricing rules (#39252) 2024-01-09 16:20:42 +05:30
s-aga-r
1b4fbbb115 Merge pull request #39158 from s-aga-r/FIX-8011
fix: add read permission to Buying Settings
2024-01-09 16:13:04 +05:30
ruthra kumar
f95403d1dc Merge pull request #39251 from ruthra-kumar/continues_pr_39196
fix: update status on manual allocation
2024-01-09 15:59:03 +05:30
Deepesh Garg
53bf44d2b8 fix: Ignore default payment terms template for opening invoices 2024-01-09 15:57:38 +05:30
rohitwaghchaure
2d2ff7cf52 fix: incorrect indicator title for portal sales order (#39247) 2024-01-09 15:37:46 +05:30
ruthra kumar
d32a407e08 fix: update status on manual allocation 2024-01-09 15:35:42 +05:30
rohitwaghchaure
5e0d017497 fix: BOM replace tool does not update exploded items of root (#39244) 2024-01-09 15:32:45 +05:30
Gursheen Anand
ce7d05aa1f fix: gl_map for auto-set against accounts 2024-01-09 15:08:30 +05:30
Nabin Hait
ec07b42ea2 Merge pull request #38530 from bosue/duplicate_zero_quantity_check2
refactor: Consolidate duplicate zero-quantity Items checks for transactions.
2024-01-09 13:12:25 +05:30
ruthra kumar
3b861798e6 Merge pull request #39237 from ruthra-kumar/github_issue_38868
fix: sales team commission overallocation on fetching items from multiple quotations to Sales Order
2024-01-09 13:06:28 +05:30
Nabin Hait
135e19d0aa fix: Set asset purchase amount based on qty and valuation_rate 2024-01-09 12:51:57 +05:30
ruthra kumar
b498094a97 fix: total allocated percentage for sales team issue 2024-01-09 12:40:41 +05:30
Gursheen Anand
bb421c8b07 fix: validate doctype before creating payment request 2024-01-09 11:33:52 +05:30
David Arnold
b5be17c6df fix: use most reliable section reference per report line 2024-01-08 22:12:19 +01:00
mahsem
2b93be1139 Update sales_taxes_and_charges.json
Change Rate label to existing Tax Rate label so it can be correctly translated in other languages
2024-01-08 18:47:44 +01:00
mahsem
bd464197c4 Update purchase_taxes_and_charges.json label Rate to Tax Rate
Change Rate label to existing Tax Rate label so it can be correctly translated in other languages
2024-01-08 18:45:39 +01:00
Nabin Hait
62bbcbc7ef Merge pull request #39202 from GursheenK/fiscal-year-naming-keyerror
fix: parse naming series with FY name
2024-01-08 21:48:39 +05:30
Nabin Hait
96530b9c0b Merge pull request #39193 from GursheenK/coa-from-existing-company
fix: account currency from existing company COA
2024-01-08 21:46:52 +05:30
Nabin Hait
0cbcc55d9a Merge pull request #39195 from GursheenK/no-copy-party-balance
fix: avoid copying party balance on duplication of PE
2024-01-08 21:38:53 +05:30
Nabin Hait
6b5c54bcbc Merge pull request #39209 from nabinhait/asset-depreciation-currency
fix: Introduced company field to show amounts in company currency
2024-01-08 21:37:57 +05:30
Nabin Hait
c2dde04aa2 Merge pull request #39214 from nabinhait/item-quick-entry
fix: Show maintain-stock and is-fixed-asset checkbox in item quick entry dialog
2024-01-08 21:35:55 +05:30
Rohit Waghchaure
8d2c78867e fix: incorrect percentage received in purchase invoice 2024-01-08 18:17:01 +05:30
Nabin Hait
c14986f9e6 fix: Show maintain-stock and is-fixed-asset checkbox in item quick entry dialog 2024-01-08 18:15:55 +05:30
ruthra kumar
62a6945bd2 Merge pull request #39196 from ruthra-kumar/incorrect_status_in_bank_transaction
fix: bank transaction status upon reconciliation
2024-01-08 18:06:30 +05:30
Shariq Ansari
be8bb235dc chore: linter fix 2024-01-08 18:00:02 +05:30
Shariq Ansari
498bf15ecd chore: linter fix 2024-01-08 17:58:59 +05:30
ruthra kumar
210d7711b4 Merge pull request #39212 from ruthra-kumar/make_use_of_doc_level_proj_filter
fix: project filters on Delivery Note and Sales Order
2024-01-08 17:37:57 +05:30
ruthra kumar
cf988434e9 refactor: remove 'Bank Trasaction' logic from status_update 2024-01-08 17:32:22 +05:30
rohitwaghchaure
466625213b fix: FG Item incorrect qty in the work order (#39200) 2024-01-08 17:18:29 +05:30
ruthra kumar
9ba6ff67d5 fix: project filters on Delivery Note and Sales Order 2024-01-08 17:11:26 +05:30
Nabin Hait
eab22eb282 fix: Introduced company field to show amounts in company currency 2024-01-08 16:35:45 +05:30
Nabin Hait
8548eae368 fix: Get fixed_asset_account from asset category 2024-01-08 16:11:04 +05:30
Shariq Ansari
7e198ccb21 Merge pull request #39204 from shariquerik/add-expected-start-date-in-sort
fix: add expected_start_date in sort by
2024-01-08 16:09:13 +05:30
Shariq Ansari
3d54fd8389 fix: add expected_start_date in sort by 2024-01-08 16:04:40 +05:30
Rushabh Mehta
d319caa2ee fix(minor): remove Homepage patch 2024-01-08 15:51:09 +05:30
Gursheen Anand
d0ea598cdf fix: fetch name for fy 2024-01-08 15:50:50 +05:30
Rushabh Mehta
f01f6d50b5 fix!(portal): remove Homepage 2024-01-08 15:49:49 +05:30
ruthra kumar
6de8c18f98 fix: bank transction status upon reconciliation 2024-01-08 15:38:43 +05:30
Gursheen Anand
5923b48ede fix: avoid copying party balance 2024-01-08 13:18:01 +05:30
Gursheen Anand
7d264696f3 fix: account currency from existing company coa 2024-01-08 13:07:42 +05:30
rohitwaghchaure
b96c063c93 fix: duplicate entry for serial / batch creation (#39188) 2024-01-08 12:51:14 +05:30
Nabin Hait
e9d36242ce fix: Ignore asset qty and status validation while cancelling LCV 2024-01-08 12:45:42 +05:30
Nabin Hait
2bad706dcf Merge pull request #39163 from nabinhait/asset-fix1
fix: Purchase information is not required for creating a composite asset
2024-01-08 12:21:35 +05:30
s-aga-r
7fa3e82ac7 Merge pull request #39167 from s-aga-r/FIX-7864
fix: update Maintenance Schedule status on Maintenance Visit submit
2024-01-08 11:49:36 +05:30
ruthra kumar
7ddbfa10c9 Merge pull request #39161 from ruthra-kumar/allow_sales_invoice_in_bank_reconciliation
refactor: allow sales invoice in Bank Reconciliation tool
2024-01-08 10:31:31 +05:30
ruthra kumar
4bd437b59d Merge pull request #39165 from ruthra-kumar/bug_in_payment_entry_outstanding_reference
fix: incorrect outstanding amt validation on advance as liability
2024-01-08 10:14:15 +05:30
ruthra kumar
fca8028e3c Merge pull request #39159 from ruthra-kumar/testing_bulk_transaction_permissions
refactor: prevent permission error by always processing bulk transaction in background
2024-01-08 10:11:47 +05:30
s-aga-r
cd293a5173 fix: update Maintenance Schedule status on Maintenance Visit submit 2024-01-06 11:36:22 +05:30
David Arnold
b73507abe0 Merge remote-tracking branch 'origin/develop' into feat/so-po-advance-payment-status 2024-01-05 21:36:14 +01:00
Raffael Meyer
07b605a287 fix: make Dr/Cr in CoA translatable (#39033)
* fix: make Dr/Cr in CoA translatable

* fix: german translations
2024-01-05 23:33:42 +05:30
s-aga-r
54383cfb55 Merge pull request #39140 from s-aga-r/FIX-8018
fix: don't set rate for non-stock item in Internal Transfer
2024-01-05 22:51:47 +05:30
barredterra
5d33bbaff0 refactor(Journal Entry): remove unused/redundant list indicators 2024-01-05 17:26:54 +01:00
ruthra kumar
4cc3c1b765 fix: incorrect outstanding amt validation on advance as liability 2024-01-05 20:42:38 +05:30
s-aga-r
4d56f725fe fix: make Sales Person non-mandatory 2024-01-05 18:44:06 +05:30
Nabin Hait
c34f09c503 fix: Purchase date and amount is not mandatory for composite asset creation 2024-01-05 17:38:51 +05:30
Nabin Hait
fe43dab4d7 fix: improved validation message 2024-01-05 17:12:08 +05:30
ruthra kumar
b69cdeb4a6 refactor: allow sales invoice in Bank Reconciliation tool 2024-01-05 16:13:49 +05:30
ruthra kumar
15dc5c7e99 refactor: prevent permissions by always processing in background 2024-01-05 15:47:02 +05:30
s-aga-r
e05bf9d32a fix: add read permission to Buying Settings 2024-01-05 15:35:14 +05:30
mergify[bot]
3fb7886418 fix: Creating Asset Activity while Importing Asset (backport #39113) (#39156)
fix: Creating Asset Activity while Importing Asset (#39113)

* fix: import asset not working on activity

* chore: fix linting issue in asset_activity.py

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
(cherry picked from commit 5e4693763a)

Co-authored-by: Aulia Bismar <auliabismar@yahoo.com>
2024-01-05 10:50:49 +05:30
rohitwaghchaure
bae7c64964 fix: inventory dimension negative stock validation (#39149) 2024-01-04 18:47:06 +05:30
Raffael Meyer
68c0e188e8 fix: remove parent_field parameter from calls to rebuild_tree (#39146)
fix: remove parent_field parameter from calls to rebuild_tree

The parent_field parameter became redundant with https://github.com/frappe/frappe/pull/24107
2024-01-04 18:12:41 +05:30
Raffael Meyer
e912e9597d fix(Employee): treeview (#39126) 2024-01-04 18:03:28 +05:30
s-aga-r
610d4f5cb6 Merge pull request #39127 from s-aga-r/FIX-38702
feat: provision to close SCO
2024-01-04 16:38:21 +05:30
s-aga-r
cdd5441435 fix(text): test_update_status 2024-01-04 15:52:11 +05:30
barredterra
60329ade9e test: improve test for local holidays 2024-01-04 11:04:25 +01:00
rohitwaghchaure
f09e2130a1 fix: serial / batch barcode scanner (#39114) 2024-01-04 14:58:02 +05:30
s-aga-r
0819675fce fix: auto close and reopen SCO based on PO status 2024-01-04 13:44:53 +05:30
s-aga-r
784b6dcfea fix: don't allow to reopen SCO if PO is closed 2024-01-04 13:05:17 +05:30
s-aga-r
245effcccd fix: update qty on SCO status change 2024-01-04 12:56:57 +05:30
s-aga-r
0d01bd8a5a fix: don't close PO on SCO close 2024-01-04 12:34:25 +05:30
s-aga-r
57b6a98703 test: internal transfer for non-stock item 2024-01-04 12:20:53 +05:30
s-aga-r
e1b0fffd0c fix: don't set rate for non-stock item in Internal Transfer 2024-01-04 11:43:02 +05:30
Deepesh Garg
c2f88f29dc Merge pull request #39138 from deepeshgarg007/subscription_patch_fix
fix: Subscription update patch
2024-01-04 11:23:33 +05:30
Deepesh Garg
277dade9f9 fix: Subscription update patch 2024-01-04 11:22:42 +05:30
Deepesh Garg
e2cf1ea73e Merge pull request #39125 from ruthra-kumar/ignore_cancelled_payment_in_sales_register
fix: ignore cancelled payments in Sales/Purchase Register
2024-01-04 11:14:25 +05:30
Deepesh Garg
df409d80e0 Merge pull request #39135 from deepeshgarg007/demo_test_case
fix: flaky demo test case
2024-01-04 11:14:08 +05:30
Deepesh Garg
5b1571879c fix: flaky demo test case 2024-01-04 10:48:01 +05:30
s-aga-r
bb839b2924 fix(ux): filter closed SCO in Get Items From dialog 2024-01-03 22:37:01 +05:30
s-aga-r
5bc2035bd0 fix: don't allow to submit/cancel SE against a closed SCO 2024-01-03 22:20:06 +05:30
s-aga-r
9e973476b2 fix: don't allow to submit/cancel SCR against a closed SCO 2024-01-03 22:13:37 +05:30
s-aga-r
5e2669f4b6 feat: provision to close SCO 2024-01-03 21:43:38 +05:30
ruthra kumar
0f1be03faf fix: ignore cancelled payments in Sales/Purchase Register 2024-01-03 20:57:01 +05:30
ruthra kumar
351ee5b8fe Merge pull request #39116 from ruthra-kumar/fix_multi_select_dialog_for_invoices
fix: typerror on multi select dialog
2024-01-03 20:53:46 +05:30
Ankush Menat
e84c9f7c51 fix(UX): dont override framework's permission check messages (#39118) 2024-01-03 20:10:19 +05:30
barredterra
300aaa39fe fix: consider all years in holiday list 2024-01-03 13:39:28 +01:00
ruthra kumar
7da9ffa3bd fix: typerror on multi select dialog 2024-01-03 17:59:15 +05:30
Deepesh Garg
b21da472f6 feat: In words in payment entry 2024-01-03 13:34:22 +05:30
Ankush Menat
4415212a2d chore: use diff secret 2024-01-03 12:50:25 +05:30
Ankush Menat
6401908f41 fix: Ignore UP on "allowed to transact with" (#39103)
If a customer is allowed to transact with some company it usually
doesn't imply that customer is somehow "linked with" that company.
2024-01-03 11:15:34 +05:30
Deepesh Garg
beee98da6d feat: Against voucher filter in General Ledger (#39100) 2024-01-03 10:03:27 +05:30
ruthra kumar
60c33ac3e6 Merge pull request #39097 from ruthra-kumar/make_loyalty_program_editable
refactor: flag to control loyalty point creation at invoice level
2024-01-03 09:46:43 +05:30
barredterra
73ecf51a27 test: balance sheet 2024-01-02 20:39:32 +01:00
barredterra
0d3a77dce9 fix: calculation of P/L in balance sheet 2024-01-02 17:26:29 +01:00
ruthra kumar
1bc74bde29 refactor: flag to control loyalty point creation at invoice level 2024-01-02 17:26:39 +05:30
Rushabh Mehta
12c40ef2e4 Merge pull request #39093 from rmehta/rename-workspace
fix(minor): Rename "ERPNext Settings" to "Settings" and remove "ERPNe…
2024-01-02 15:52:45 +05:30
Rushabh Mehta
b250a21a2b fix(minor): remove "hide_workspaces" from erpnext/install.py 2024-01-02 15:50:54 +05:30
Rushabh Mehta
4e28b5a199 fix(minor): Rename "ERPNext Settings" to "Settings" and remove "ERPNext Integrations" workspace 2024-01-02 15:27:41 +05:30
Ankush Menat
739434b727 perf: index item_code in bom explosion item (#39085) 2024-01-02 14:31:41 +05:30
Parameshwari Palanisamy
9ea963bfe9 fix: Variant Items, List View Enabled to Variant Status Change (#38468)
* feat: Purchase Register Report Supplier Group filter Adding

* fix: Variant Items, List View Enabled to Variant Status Change

* Update purchase_register.js

* Update purchase_register.py
2024-01-02 14:04:56 +05:30
Deepesh Garg
f52d7c7665 fix: Pricing rule application/removal on qty change 2024-01-02 13:37:39 +05:30
rohitwaghchaure
6e5484ea03 fix: on cancellation of document cancel the serial and batch bundle (#39076) 2024-01-02 12:54:18 +05:30
ruthra kumar
d048644327 Merge pull request #39067 from ruthra-kumar/fix_undefined_error_in_budget_variance_report
fix: undefined error in Budget Variance and Profitability report
2024-01-01 17:37:07 +05:30
ruthra kumar
1a9e091d12 fix: select options should dynamically load dimensions 2024-01-01 17:32:33 +05:30
ruthra kumar
1b0d9643cd Merge pull request #39023 from ruthra-kumar/refactor_customer_ledger_summary
refactor(perf): replace account subquery with 'in' condition
2024-01-01 15:42:24 +05:30
ruthra kumar
92bc962f60 fix: undefined error in Budget Variance and Profitability report
'Budget' and 'Budget Account' doesn't have support for dynamic
dimension. It only supports hard-coded ones -  Project and Cost Center
2024-01-01 15:30:35 +05:30
Anand Baburajan
a9576f0cf6 feat: group by Asset in Asset Depreciations and Balances report (#38923)
feat: group by asset in asset depreciations and balances report
2024-01-01 15:03:21 +05:30
David Arnold
4f8a16848f chore: default_roles hook doesn't exist anymore (#39032) 2024-01-01 13:34:36 +05:30
Deepesh Garg
bacf2b7431 fix: Unable to save Sales Invoice (#39059) 2024-01-01 13:23:26 +05:30
Ankush Menat
34d8bc4701 chore: disable v13 auto releases 2024-01-01 13:13:25 +05:30
Ankush Menat
510fdf7bf6 fix(DX): capture tracebacks with context (#39060) 2024-01-01 13:10:03 +05:30
Anand Baburajan
0346f47c1d fix: take quantity into account when setting asset's gross purchase amt (#39056)
fix: take quantity into account when setting asset's gross purchase amount
2024-01-01 11:24:42 +05:30
anandbaburajan
026824880d fix: asset WDV depreciation calc according to IT act 2024-01-01 00:23:19 +05:30
Deepesh Garg
3f9693b31f fix: GL values in transaction currency via JV (#38914) 2023-12-31 20:00:03 +05:30
Smit Vora
877cc7255d fix: enqueue demo data setup on setup complete (#39043) 2023-12-31 10:54:07 +05:30
rohitwaghchaure
70abedc57a fix: work order with multi level, fetch operting cost from sub-assembly (#38992) 2023-12-29 16:50:31 +05:30
rohitwaghchaure
0c6de4ecb2 fix: non stock uom validation for serial and batch (#39018)
* fix: non stock uom validation for serial and batch

* test: delivery note for batch with non stock uom
2023-12-29 16:50:01 +05:30
ruthra kumar
a517125d64 refactor(perf): replace account subquery with 'in' condition 2023-12-29 14:57:16 +05:30
Gursheen Kaur Anand
b7f283b2f0 feat: skip disabled accounts in COA (#38551)
* feat: skip disabled accounts in coa

* fix: add parameter to other tree doctype utils
2023-12-29 12:55:37 +05:30
Deepesh Garg
cd37fd790b fix: Validate account in Sales/Purchase Taxes and Charges Template (#39013) 2023-12-29 12:52:22 +05:30
rohitwaghchaure
f983e09f92 fix: purchase return without item code not working (#39014) 2023-12-29 12:06:04 +05:30
Deepesh Garg
3b4b2275de fix: Multiple subscription fixes (#39005) 2023-12-29 08:25:38 +05:30
Devin Slauenwhite
c86deceaba fix(ux): default parent delivery_date or schedule_date 2023-12-28 15:19:21 +00:00
rohitwaghchaure
b5340c5ec0 fix: auto fetch not working if bundle exists (#39002) 2023-12-28 18:32:27 +05:30
rohitwaghchaure
10074e9980 fix: serial and batch bundle company mandatory error (#38994) 2023-12-28 17:56:24 +05:30
Deepesh Garg
bbee9b5637 fix: Opening balance in bank reconciliation tool (#38977) 2023-12-28 17:50:16 +05:30
ruthra kumar
915d864166 Merge pull request #38969 from ruthra-kumar/bug_in_p_l_report
fix: incorrect net profit in Profit and Loss Statement
2023-12-28 16:23:21 +05:30
ruthra kumar
8555617295 test: profit and loss report output 2023-12-28 15:56:35 +05:30
Ankush Menat
b71b0d5997 fix: remove bad defaults (#38986)
Child tables can't have a default.
2023-12-28 08:45:40 +00:00
Indrajith.vs
37767738b0 fix(Report): Increased the column width in the Account Balance Report 2023-12-28 12:12:52 +05:30
rohitwaghchaure
a117ef3cb8 fix: not able to cancel sales invoice (#38979) 2023-12-28 11:14:27 +05:30
Raffael Meyer
33b631e395 Merge pull request #38805 from barredterra/remove-unused-coa 2023-12-28 00:06:50 +01:00
barredterra
517bedeb7e test: cancel voucher linked to Bank Transaction 2023-12-28 00:00:04 +01:00
barredterra
0a95b38166 fix: unreconcile Bank Transaction on cancel of payment voucher 2023-12-27 23:05:37 +01:00
Deepesh Garg
9b1c22250f feat: Merge taxes from mapped docs (#38346)
* feat: Merge taxes from mapped docs

* chore: ci failures
2023-12-27 22:37:01 +05:30
Gursheen Anand
43fed29514 fix: use child table values instead of global min max 2023-12-27 19:32:48 +05:30
Ankush Menat
4feecb69d8 ci: lock old resolved issue/PRs 2023-12-27 19:31:45 +05:30
ruthra kumar
12560e2407 Merge pull request #38496 from ruthra-kumar/bisect_accounting_reports
feat: utility to debug financial reports
2023-12-27 17:54:36 +05:30
ruthra kumar
0890b414b1 chore: resolve linter issues 2023-12-27 17:31:34 +05:30
ruthra kumar
d54f8318fb fix: incorrect total when Accumulating values 2023-12-27 16:50:07 +05:30
VihangT
fe77b9d633 fix : correct logic for overlap error (#38967)
fixing overlap error logic with taking care of sequential time job cards in overlap job card list
2023-12-27 16:11:29 +05:30
rohitwaghchaure
47ee801d37 fix: incorrect qty in serial batch bundle against pick list (#38964) 2023-12-27 13:09:23 +05:30
s-aga-r
705ae7da14 Merge pull request #38962 from s-aga-r/FIX-38781
fix: use `Stock Qty` while getting `POS Reserved Qty`
2023-12-27 12:50:37 +05:30
s-aga-r
7223106417 fix: use Stock Qty while getting POS Reserved Qty 2023-12-27 10:32:13 +05:30
barredterra
5a5758423e Merge remote-tracking branch 'upstream/develop' into remove-unused-coa 2023-12-26 16:06:43 +01:00
rohitwaghchaure
b09c9354fb fix: min order qty optional in production plan (#38956)
* fix: min order qty optional in production plan

* fix: test cases
2023-12-26 20:11:58 +05:30
rohitwaghchaure
d00f6672a8 fix: not able to import serial batch bundle using csv (#38950) 2023-12-26 15:24:04 +05:30
rohitwaghchaure
06d6220a2a fix: do not make serial batch bundle for zero qty (#38949) 2023-12-26 15:23:32 +05:30
ruthra kumar
3011322b22 Merge pull request #38891 from ruthra-kumar/customer_wise_report_price_issue
fix: incorrect price list in customer-wise item price report
2023-12-26 11:27:20 +05:30
s-aga-r
e560029736 Merge pull request #38942 from s-aga-r/FIX-38151-2
fix(ux): make PR and PI Item rate field readonly based on `Maintain Same Rate`
2023-12-26 10:20:34 +05:30
s-aga-r
b1ba210332 fix(ux): make PR Item rate field readonly based on Maintain Same Rate 2023-12-25 22:41:18 +05:30
s-aga-r
cb9114442b fix(ux): make PI Item rate field readonly based on Maintain Same Rate 2023-12-25 22:29:17 +05:30
s-aga-r
eb5bb9f9a9 fix(ux): make PI Item rate field editable 2023-12-25 22:05:02 +05:30
Wolfram Schmidt
87ba3b64f7 chore: german translation for actual time (#38837)
chore: german translation for actual time
2023-12-24 16:22:26 +05:30
Gursheen Kaur Anand
47f7b65058 feat: voucher subtype for general ledger (#38822)
* feat: add voucher subtype column to gle

* feat: add logic to set voucher subtypes

* feat: fetch voucher subtype in ledger report

* fix: order of conditions
2023-12-24 16:13:31 +05:30
rohitwaghchaure
161ae1edd1 fix: reset the incoming rate on changing of the warehouse (#38925) 2023-12-22 17:37:17 +05:30
s-aga-r
d097ad6c19 Merge pull request #38922 from s-aga-r/FIX-38558
fix: `Reserved Stock` report
2023-12-22 16:27:27 +05:30
s-aga-r
a5d5223c0e fix: Reserved Stock report 2023-12-22 15:46:06 +05:30
s-aga-r
1a1629196d chore: improve Allowed Qty error msg 2023-12-22 15:29:56 +05:30
s-aga-r
d0ed8ef83b Merge pull request #38558 from s-aga-r/ADD-ITEMS-STOCK-RESERVATION-DIALOG
feat: provision to add items in Stock Reservation dialog
2023-12-22 12:15:07 +05:30
hyaray
0773f66feb chore: Update company.py (#38660)
chore: Update company.py
2023-12-22 08:41:51 +05:30
Ankush Menat
2dc49c834a chore: fixup broken JSON files (#38915) 2023-12-22 07:36:27 +05:30
Ankush Menat
787333896c perf: Drop unused/duplicate/sub-optimal indexes (#38884)
* ci: enable more checks

* perf: Drop unused/duplicate indexes
2023-12-21 20:09:10 +05:30
Anand Baburajan
283763dfb2 chore: additional_asset_cost field (#38904) 2023-12-21 16:52:25 +05:30
mergify[bot]
07175367d8 fix: reposting not fixing valuation rate for sales return using movin… (backport #38895) (#38897)
* fix: reposting not fixing valuation rate for sales return using movin… (#38895)

fix: reposting not fixing valuation rate for sales return using moving average method
(cherry picked from commit 3a668bbe96)

# Conflicts:
#	erpnext/stock/stock_ledger.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-21 14:40:52 +05:30
mergify[bot]
61219ca4ce fix: do not reset the basic rate for the material receipt stock entry (backport #38896) (#38898)
fix: do not reset the basic rate for the material receipt stock entry (#38896)

(cherry picked from commit 98bfcc4c75)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-21 14:23:08 +05:30
ruthra kumar
c20995ec2f Merge pull request #38893 from ruthra-kumar/typeerror_in_pos
fix: typeerror on pos order summary to new order screen
2023-12-21 12:21:59 +05:30
ruthra kumar
6a0a08b59c fix: typeerror on pos order summary to new order screen 2023-12-21 12:13:33 +05:30
Anand Baburajan
d370c60a6c feat: total_asset_cost field (#38879) 2023-12-20 19:02:32 +05:30
mergify[bot]
a6ab53236e fix: allow to set rate manually for service item in BOM (backport #38880) (#38882)
fix: allow to set rate manually for service item in BOM (#38880)

(cherry picked from commit c2f692a4e4)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-20 18:33:26 +05:30
ruthra kumar
9a00edb031 fix: incorrect price list in customer-wise item price report 2023-12-20 17:47:31 +05:30
David Arnold
f73685f4f6 Merge remote-tracking branch 'origin/develop' into feat/so-po-advance-payment-status 2023-12-20 12:47:48 +01:00
NIYAZ RAZAK
ae353398d9 fix: local reference error in BOM (#38850)
fix: local reference error
2023-12-20 14:34:38 +05:30
Ankush Menat
9983283f95 perf: use estimated rows instead of actual rows (#38830) 2023-12-20 13:16:09 +05:30
ruthra kumar
6d5bdc6c68 fix: typerror on tree doctypes - Item Group, Customer Group, Supplier Group and Territory (#38870)
* refactor: typerror on set_root_readonly

* refactor: remove 'cur_frm' usage in supplier_group

* refactor: remove 'cur_frm' usage in territory.js

* refactor: remove 'cur_frm' from sales_person.js
2023-12-20 12:30:10 +05:30
ruthra kumar
80e69210db Merge pull request #38838 from pps190/fix-use-party-account-currency
fix: use party account currency when party account is specified
2023-12-20 12:29:04 +05:30
mergify[bot]
793e3ad78e fix: if not budget then don't validate (backport #38861) (#38864)
fix: if not budget then don't validate (#38861)

(cherry picked from commit d375164100)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-19 18:31:18 +05:30
mergify[bot]
4057682c87 fix: incoming rate for sales return with Moving Average valuation method (backport #38849) (#38863)
* fix: incoming rate for sales return with Moving Average valuation method (#38849)

(cherry picked from commit 7fdac62393)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/test_delivery_note.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-19 18:29:56 +05:30
mergify[bot]
5e68b7e3a6 fix: on closed unreserved the production plan qty (backport #38848) (#38859)
fix: on closed unreserved the production plan qty (#38848)

(cherry picked from commit 2184e8ef58)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-19 18:01:37 +05:30
s-aga-r
495b47db16 Merge pull request #38842 from SvbZ3r0/po-get-fg-item-qty
fix: set `fg-itm-qty` based on `qty` instead of the other way round in Subcontracting POs
2023-12-19 15:23:30 +05:30
mergify[bot]
4aa960b744 fix: item variant with manufacturer (backport #38845) (#38847)
* fix: item variant with manufacturer (#38845)

(cherry picked from commit e0c8ff10da)

* chore: fix test case

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-19 14:59:33 +05:30
ruthra kumar
dd6c192695 Merge pull request #38797 from rtdany10/ar-credit-note-fix
fix: wrong paid and cn amount on pos invoice
2023-12-19 11:02:01 +05:30
Dany Robert
8772628912 test: partial payment for pos invoice 2023-12-19 10:00:51 +05:30
Gughan Ravikumar
a99d0a65b0 fix: set fg-itm-qty based on qty instead of the other way round 2023-12-19 07:56:02 +05:30
Devin Slauenwhite
a09241e3c7 fix(test): expect account currency when party account is specified. 2023-12-18 19:09:25 +00:00
Devin Slauenwhite
c7b961ffa2 fix: use party account currency when party account is specified 2023-12-18 18:03:53 +00:00
mergify[bot]
32a608f948 fix: not able to make inter-company po from so (backport #38826) (#38828)
fix: not able to make inter-company po from so (#38826)

(cherry picked from commit 23042dfc3c)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-18 18:13:47 +05:30
Ankush Menat
8d79365e0d perf: index return_against on delivery note (#38827)
There's a multi-column index but that's useful IFF all parts of column
are part of query.

return against on it's own is VERY unique because it's a primary key, we
don't need a multi-column index here.
2023-12-18 18:06:44 +05:30
mergify[bot]
71e833c3f2 fix: not able to cancel SCR with Batch (backport #38817) (#38821)
* fix: not able to cancel SCR with Batch (#38817)

(cherry picked from commit fb5090fd3f)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py

* chore: fix test case

* chore: fix test case

* chore: fix test case

* chore: fix test case

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-18 17:56:05 +05:30
ruthra kumar
b5f3013005 Merge pull request #38820 from ruthra-kumar/ignore_err_in_statements
refactor: ignore ERR journals in Statment of Accounts
2023-12-18 15:55:11 +05:30
ruthra kumar
39ef75e2d0 refactor: ignore ERR journals in Statment of Accounts 2023-12-18 13:39:26 +05:30
Raffael Meyer
42813d38c3 Merge pull request #38803 from barredterra/group-current-accounts 2023-12-17 19:23:01 +01:00
Deepesh Garg
55147781f3 Merge pull request #38807 from deepeshgarg007/canada_demo
fix(demo): Demo setup for Canadian COA
2023-12-17 14:05:07 +05:30
Deepesh Garg
c9fd182268 fix(demo): Demo setup for canadian COA 2023-12-17 13:36:58 +05:30
rohitwaghchaure
0743289925 fix: serial and batch bundle return not working (#38754)
* fix: serial and batch bundle return not working

* test: added test case for delivery note return against denormalized serial no
2023-12-17 12:42:07 +05:30
barredterra
4d75159247 chore: consistent naming for German CoA files 2023-12-16 21:27:38 +01:00
barredterra
baa1978128 feat: remove german CoA "SKR04 ohne Kontonummern"
To the best of my knwoledge, this is outdated, unused and not maintained.
2023-12-16 21:27:09 +01:00
barredterra
259f313af7 fix: groups for current accounts in German CoAs 2023-12-16 21:11:54 +01:00
Deepesh Garg
863116f1cd Merge pull request #37232 from GursheenK/make-against-field-dynamic
fix: make GL and JV against fields dynamic links
2023-12-16 22:27:50 +05:30
Dany Robert
5cb5e09dbb fix: wrong paid and cn amount on pos invoice 2023-12-16 04:35:43 +00:00
David Arnold
c61925598a fix: translatable strings
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2023-12-15 18:24:34 +01:00
Ankush Menat
fa1c7b663c fix: Reset SLA on issue doesn't work (#38789)
This was broken since last refactor where it was spun off to work with
all types of doctypes but client side code was never adapted.
2023-12-15 22:00:01 +05:30
Raffael Meyer
a9a84cc7d4 Merge pull request #38742 from ljain112/fix-pur-reg 2023-12-15 15:22:19 +01:00
Deepesh Garg
ff967c45f7 Merge pull request #38691 from deepeshgarg007/init_values
fix: Init internal child table values
2023-12-15 18:14:45 +05:30
s-aga-r
9a5c422074 Merge pull request #38778 from s-aga-r/FIX-7327
fix: wrong currency in Stock Balance report
2023-12-15 15:28:52 +05:30
s-aga-r
5a83a16e60 fix: wrong currency in Stock Balance report 2023-12-15 14:45:09 +05:30
Anand Baburajan
1704180f38 fix: asset patch failure due to missing shift_based column (#38776)
* fix: add missing daily_prorata_based in get_asset_finance_books_map

* fix: reload Asset Finance Book doctype
2023-12-15 14:43:33 +05:30
ruthra kumar
0cf9ff0a04 Merge pull request #38766 from ruthra-kumar/7101_only_treat_none
fix: validation error on reconciling PE to Journals as Invoice
2023-12-15 13:09:06 +05:30
Gursheen Kaur Anand
41ae2a2dc5 Merge pull request #38767 from GursheenK/skip-bank-jvs-in-tax-report
fix: skip JVs against bank accounts in tax report
2023-12-15 12:57:40 +05:30
Gursheen Anand
f7b2380ec1 fix: skip jvs against bank accounts 2023-12-15 12:30:15 +05:30
ruthra kumar
5eeb650dfd fix: validation error on reconciling PE to Journals as Invoice
With the same exchange rate on Journal Entry and Payment Entry,
reconcilition should not post exc gain/loss journal and should not
throw validation error
2023-12-15 11:46:12 +05:30
s-aga-r
a1b95606b1 Merge pull request #38720 from s-aga-r/FIX-6545
fix(ux): don't override Item Name and Description in MR
2023-12-15 10:57:24 +05:30
s-aga-r
726ac6bda1 fix(ux): don't override Item Name and Description in MR 2023-12-15 10:56:54 +05:30
rohitwaghchaure
d6201ce5c7 fix: homepage not working (#38755) 2023-12-14 22:47:32 +05:30
Raffael Meyer
e7e23fbc96 Merge pull request #38533 from barredterra/date-format-system-settings 2023-12-14 16:38:00 +01:00
Raffael Meyer
e7544e9fc1 Merge pull request #38505 from barredterra/lead_name_from_email 2023-12-14 13:48:19 +01:00
Ankush Menat
eaf86a6461 fix: timezone aware SLA banner (#38745) 2023-12-14 15:53:57 +05:30
ljain112
f53ba178a8 fix: show bill_date and bill_no in Purchase Register 2023-12-14 12:28:32 +05:30
ruthra kumar
c68ad73c6e Merge pull request #38717 from ruthra-kumar/7101_payment_reconciiation_bug
fix: fetch exc rate of multi currency journals on reconciliation
2023-12-14 09:35:12 +05:30
Ankush Menat
6851c5042f Revert "fix(ux): don't update qty blindly" (#38728) 2023-12-13 23:14:20 +05:30
Raffael Meyer
da96578afb Merge pull request #38725 from barredterra/preview-rfq 2023-12-13 17:31:08 +01:00
barredterra
27f05145ae feat: RFQ print preview 2023-12-13 17:00:58 +01:00
ruthra kumar
1b3ba25220 fix: fetch exc rate of multi currency journals 2023-12-13 16:39:42 +05:30
rohitwaghchaure
13cba5068b fix: barcode scanning for the stock entry (#38716) 2023-12-13 15:08:16 +05:30
rohitwaghchaure
db24e24882 fix: supplier removed on selection of item (#38712) 2023-12-13 14:06:45 +05:30
Anand Baburajan
e7984b3ef9 fix: 1st row depr. sch. value of asset put to less than 180 days acc. to I.T. S. 32 (#38696)
fix: 1st row value of asset put to less than 180 days acc. to IT S. 32
2023-12-12 20:53:37 +05:30
rohitwaghchaure
b562b4cf99 fix: show stock qty in popup (#38698) 2023-12-12 16:41:10 +05:30
rohitwaghchaure
69d7a640ee fix: negative batch issue (#38688) 2023-12-12 16:18:32 +05:30
ruthra kumar
fa2d33cb50 fix: typeerror on new sites (#38692) 2023-12-12 15:43:39 +05:30
Deepesh Garg
2588970d55 fix: Init internal child table values 2023-12-12 15:18:54 +05:30
ruthra kumar
d4ac57704c Merge pull request #38685 from ruthra-kumar/get_list_for_virtual_child_doctypes
refactor: add `get_list` for virtual child doctypes
2023-12-12 14:40:43 +05:30
ruthra kumar
15c90551b6 refactor: add get_list for virtual child doctypes 2023-12-12 13:36:03 +05:30
ruthra kumar
0acd0f50c5 Merge pull request #38679 from ruthra-kumar/refactor_repost_test
refactor(test): repost utility deletion flag test
2023-12-12 12:43:58 +05:30
ruthra kumar
acb6e8e120 refactor(test): update repost settings before test case 2023-12-12 11:39:55 +05:30
ruthra kumar
ccff588563 refactor: increase limit and remove explicit call to start_repost 2023-12-12 11:30:33 +05:30
rohitwaghchaure
780c4278e6 fix: serial no filter in the Serial No Ledger report (#38669) 2023-12-12 11:24:07 +05:30
s-aga-r
2d6506ecec Merge pull request #38667 from s-aga-r/FIX-38658
fix: close PO on SCO close
2023-12-12 10:54:46 +05:30
ruthra kumar
a97b3db749 refactor: remove explicit commit on repost 2023-12-12 10:34:51 +05:30
ruthra kumar
cc15f695b4 refactor(test): repost utility deletion flag test 2023-12-12 10:24:24 +05:30
s-aga-r
c41cbb3e29 Merge pull request #38644 from barredterra/fix-attribute-error
fix: attribute error
2023-12-12 10:02:16 +05:30
Raffael Meyer
6ad298adfc fix: typo in unittest (#38673) 2023-12-12 09:55:15 +05:30
Ankush Menat
db9829e83f Merge pull request #38672 from barredterra/fix-leaderboard
fix: get data for leaderboard
2023-12-12 09:53:23 +05:30
barredterra
956c3c50a0 chore: deprecate unused method 2023-12-11 19:46:37 +01:00
barredterra
40c1acc961 fix: get sales partner for leaderboard 2023-12-11 19:45:32 +01:00
barredterra
7babfd4ac4 fix: get sales person for leaderboard 2023-12-11 19:44:24 +01:00
barredterra
65df4b6aa8 fix: get suppliers for leaderboard 2023-12-11 19:34:54 +01:00
barredterra
2721ee3a8d fix: get items for leaderboard 2023-12-11 19:34:24 +01:00
barredterra
137b5a6108 fix: get customers for leaderboard 2023-12-11 18:32:49 +01:00
s-aga-r
b023e5d6b3 fix: close PO on SCO close 2023-12-11 12:36:08 +05:30
rohitwaghchaure
89a0e9c245 fix: not able to make serial and batch using csv import (#38659) 2023-12-11 10:35:31 +05:30
rohitwaghchaure
89326bd657 fix: auto delete draft serial and batch bundle (#38637) 2023-12-10 11:05:58 +05:30
Dany Robert
a8949174c8 chore: avoid explicit escaping for precision
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2023-12-09 09:30:17 +05:30
barredterra
906ac093e3 feat: copy emails from lead to customer 2023-12-08 14:56:10 +01:00
s-aga-r
8ddc26eb2e Merge pull request #38634 from creative-paramu/shipping_address_link
fix: Shipping Address Link Showing in Buying
2023-12-08 18:59:26 +05:30
creative-paramu
ca0c3eb184 fix(ux): Shipping Address Link 2023-12-08 18:57:31 +05:30
barredterra
0465c9aabb fix: attribute error 2023-12-08 14:15:26 +01:00
barredterra
8e0a7a8dbc refactor: get/create customer for Sales Order 2023-12-08 14:06:01 +01:00
s-aga-r
a045916aca Merge pull request #38608 from s-aga-r/FIX-6766
fix(ux): don't update qty blindly
2023-12-08 16:30:42 +05:30
Shariq Ansari
be312cea4c Merge pull request #38623 from shariquerik/bypass-unnessary-formatting 2023-12-07 20:46:26 +05:30
Ankush Menat
9611e9bd7f fix: ignore non-existing regional customizations (#38621) 2023-12-07 14:12:40 +00:00
Shariq Ansari
08ed3cd313 fix: format only if searched text contain link value text 2023-12-07 19:39:24 +05:30
rohitwaghchaure
231ab83562 fix: serial and batch bundle permission (#38618) 2023-12-07 18:00:07 +05:30
rohitwaghchaure
f45dd740c5 chore: minor code cleanup (#38615) 2023-12-07 15:29:50 +05:30
s-aga-r
0156339f34 fix(ux): don't update qty blindly 2023-12-07 10:16:46 +05:30
Raffael Meyer
f99bb61181 Merge pull request #38591 from barredterra/de-morgan 2023-12-06 22:30:03 +01:00
Ankush Menat
6a47a2ceaf chore: remove unused cache=True 2023-12-06 20:53:55 +05:30
Richard Case
525f656cc1 feat: add employee number to client user bootinfo (#38477) 2023-12-06 20:48:13 +05:30
sandratridz
d34787cf6d fix: only highest eligible coupon applied (#38416)
* fix: application of pricing rule when coupon is used
2023-12-06 14:41:02 +05:30
s-aga-r
9424bbc01c Merge pull request #38592 from s-aga-r/FIX-STOCK-VARIANCE
fix: consider the `Valuation Method` while picking incorrect SLE
2023-12-05 18:08:01 +05:30
s-aga-r
16c297c2ec feat: add Valuation Method column in Stock Ledger Variance report 2023-12-05 18:06:14 +05:30
s-aga-r
8beec58670 fix: incorrect SLE for Moving Average valuation method 2023-12-05 17:51:01 +05:30
barredterra
bac811bd5e chore: git blame ignore rev 2023-12-05 11:23:58 +01:00
barredterra
eb9ee3f79b refactor: simplify conditional logic
Command: `sourcery review --fix --enable de-morgan .`
2023-12-05 11:22:55 +01:00
ruthra kumar
5da3e532c9 Merge pull request #38580 from ruthra-kumar/finance_book_filter_bug_in_general_ledger
fix: sql error while filtering on finance book in GL
2023-12-05 14:40:34 +05:30
ruthra kumar
b1d9f3132d fix: sql error while filtering on finance book in GL 2023-12-05 14:06:15 +05:30
rohitwaghchaure
aaa9036eca fix: incorrect material request quantity in Production Plan (#38566) 2023-12-05 13:34:54 +05:30
Gursheen Anand
005c5a587f chore: orderby in gle 2023-12-05 13:16:54 +05:30
Gursheen Anand
47c78a5a73 fix: check for unmerged gle in purchase receipt test 2023-12-05 12:48:25 +05:30
Gursheen Anand
24ccb3eb78 fix: subcontracting receipt gle test 2023-12-05 12:47:06 +05:30
Gursheen Anand
a56b79cc72 fix: check for split entries in stock entry test 2023-12-05 12:46:22 +05:30
ruthra kumar
84ee50e492 Merge pull request #38570 from ruthra-kumar/ignore_unreconcile_on_pi_cancel
refactor: ignore unreconcile doc on PI cancel/delete
2023-12-05 12:02:44 +05:30
s-aga-r
16b7401d4c Merge pull request #38553 from s-aga-r/STOCK-VARIANCE-COMPANY
feat: `Company` filter in `Stock Ledger Variance` report
2023-12-05 11:56:17 +05:30
ruthra kumar
1a5d56977e refactor: ingore on JE cancel as well 2023-12-05 11:34:25 +05:30
Gursheen Kaur Anand
6812e91893 Merge pull request #38556 from GursheenK/period-end-date-for-financial-statements
fix(minor): financial statements period end date
2023-12-05 11:22:08 +05:30
ruthra kumar
4ca84eadb6 refactor: ignore unreconcile doc on PI cancel/delete 2023-12-05 10:14:44 +05:30
Shariq Ansari
27aba02d16 Merge pull request #38562 from shariquerik/existing-customer-issue-in-lead 2023-12-04 19:20:29 +05:30
Shariq Ansari
3d7ad71b22 fix: get dynamic link with parenttype contact 2023-12-04 19:19:09 +05:30
David Arnold
e824cd012b Merge remote-tracking branch 'upstream/develop' into feat/so-po-advance-payment-status 2023-12-04 13:35:32 +01:00
s-aga-r
8d5045ef4c feat: provision to add items in Stock Reservation dialog 2023-12-04 18:03:22 +05:30
David Arnold
083da7d8a4 Merge remote-tracking branch 'upstream/develop' into fix/notification-comply-with-upstream 2023-12-04 13:31:02 +01:00
s-aga-r
00261094c8 fix(ux): show row index and field label while selecting the Sales Order Item 2023-12-04 18:00:06 +05:30
s-aga-r
9471d8fff9 feat: provision to update items in Stock Reservation dialog 2023-12-04 17:56:32 +05:30
Gursheen Anand
ab6e92aae1 fix: limit end date to current date 2023-12-04 16:47:28 +05:30
s-aga-r
fb3421fcce feat: Company filter in Stock Ledger Variance report 2023-12-04 15:39:25 +05:30
rohitwaghchaure
c8693cdf37 fix: scan for serial or batch in bundle (#38534) 2023-12-04 15:02:47 +05:30
NIYAZ RAZAK
3df1d75bdd fix: incorrect customer outstanding amount (#38475)
* fix: incorrect customer outstanding amount

* chore: resolve linting error

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2023-12-04 13:39:49 +05:30
s-aga-r
fc12238fcc Merge pull request #38543 from s-aga-r/FIX-6734
fix: don't show non-stock items in Stock Analytics report
2023-12-04 12:08:07 +05:30
s-aga-r
15fff84bb5 fix: linter 2023-12-04 12:05:27 +05:30
s-aga-r
01aadbef85 fix: don't show non-stock items in Stock Analytics report 2023-12-04 12:00:36 +05:30
s-aga-r
ccdcb7dfcc fix(ux): stock-item filter for Item Code field 2023-12-04 11:58:44 +05:30
ruthra kumar
94fabe0321 Merge pull request #38220 from rtdany10/wrong-advance
fix: exclude `invoice_doctypes` from party advance
2023-12-04 10:57:15 +05:30
ruthra kumar
dd39da0b77 fix: incorrectly treating normal payment as advance (#38437)
fix: treating normal payment as advance
2023-12-04 10:08:37 +05:30
Bernd Oliver Sünderhauf
3688d9412e chore: Adapt translations to reworded message. 2023-12-03 22:55:58 +01:00
Bernd Oliver Sünderhauf
4918aeb4c6 refactor: Consolidate duplicate zero-quantity transaction Items checks. 2023-12-03 19:57:32 +01:00
Nihantra C. Patel
d659d407a0 fix: Group By in Item-wise Purchase Register (#38503) 2023-12-03 23:22:04 +05:30
Gursheen Anand
262cafc430 fix: query for against types 2023-12-03 22:36:54 +05:30
Gursheen Anand
11190aac4c fix: unhide against type field 2023-12-03 22:35:01 +05:30
Gursheen Anand
6d31563920 feat: auto set against accounts for value pairs 2023-12-03 22:33:21 +05:30
barredterra
b6957ddac2 fix: set date format from system settings 2023-12-03 17:21:48 +01:00
Bernd Oliver Sünderhauf
b2d8a44199 test: Add, expand and refine test-cases for zero-quantity transactions. 2023-12-03 16:33:29 +01:00
ruthra kumar
2815d196de Merge pull request #38525 from ruthra-kumar/multiple_minor_fixes
fix: multiple minor fixes in report and Exchange Rate Revaluation
2023-12-03 16:43:01 +05:30
ruthra kumar
64266c4d38 fix: remove hardcoded, implicit rounding loss allowance 2023-12-03 10:58:14 +05:30
ruthra kumar
f4d418ea6d fix: item group filter in sales person wise report 2023-12-03 10:58:10 +05:30
s-aga-r
a008f5f611 Merge pull request #38493 from s-aga-r/FIX-6325
fix: don't update previous doc on rate change
2023-12-03 10:08:44 +05:30
rohitwaghchaure
74eab91042 fix: better overlap logic for job card (#38432) 2023-12-02 23:12:12 +05:30
Gursheen Anand
9aeb3932d0 fix: fetch against link value in gl report 2023-12-02 20:30:38 +05:30
Sagar Vora
b6a7549407 fix: use predefined onload property load_after_mapping (#38209) 2023-12-02 20:06:19 +05:30
Gursheen Kaur Anand
9087e1443e fix: SO ordered qty on PO item removal (#38378)
* fix: update ordered_qty for SO when PO items removed

* refactor: use cached value

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-12-02 19:53:00 +05:30
Raffael Meyer
5952cfa673 fix: german translations for Lost Quotations (#38435) 2023-12-02 19:52:11 +05:30
noec764
a1e0197a8b fix: Add missing french translations (#38368)
fix: Add missing french translation

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
2023-12-02 19:49:13 +05:30
Deepesh Garg
af7bc4f178 Merge pull request #38401 from pps190/fix-pe-jv-outstanding
fix: don't consider cancelled entries
2023-12-02 19:44:10 +05:30
Corin Wenger
023bc36592 fix: Move SMS Log module from ERPNext to Frappe (#38506)
Move SMS Log module from ERPNext to Frappe

SMS Log module moved to Frappe Core from ERPNext Utilities so that Frappe send_sms() works sans-ERPNext.
2023-12-02 19:24:46 +05:30
barredterra
ceeb724acc feat: set lead name from email 2023-12-01 20:10:51 +01:00
rohitwaghchaure
5e9016ffab fix: validation error has not throw for the batch (#38494)
* fix: validation error has not throw for the batch

* chore: fix test cases
2023-12-01 21:42:22 +05:30
Sherin KR
6bc40373f2 chore: changed sort_order to DESC for customer (#38498) 2023-12-01 19:07:28 +05:30
ruthra kumar
14c8c8c33d refactor: cache results 2023-12-01 18:01:58 +05:30
ruthra kumar
0925706d5e refactor: flag to differentiate generated and default values 2023-12-01 17:46:28 +05:30
ruthra kumar
ca14ae8f1b refactor: save results in node 2023-12-01 17:07:39 +05:30
ruthra kumar
90c6d4dc85 chore: restrict only to administrator and type info 2023-12-01 16:50:17 +05:30
ruthra kumar
228aa1a244 chore: change data type for summary fields 2023-12-01 16:42:15 +05:30
ruthra kumar
993e2bfbf9 refactor: adding labels to important section 2023-12-01 16:42:15 +05:30
ruthra kumar
ea3071db66 chore: UI cleanup 2023-12-01 16:42:15 +05:30
ruthra kumar
395299803f chore: add screen freeze on wait 2023-12-01 16:42:15 +05:30
ruthra kumar
5e2d21c033 chore: code cleanup 2023-12-01 16:42:15 +05:30
ruthra kumar
c4c3090f46 chore: hide internal variables section 2023-12-01 16:42:15 +05:30
ruthra kumar
6492019383 chore: rename btree and remove debugging statements 2023-12-01 16:42:15 +05:30
ruthra kumar
f6831fba13 chore: hide internal fields and better painting logic for heatmap 2023-12-01 16:42:15 +05:30
ruthra kumar
16db6c2f47 refactor: working heatmap 2023-12-01 16:42:15 +05:30
ruthra kumar
bd3dc6482e chore: hide some internal fields 2023-12-01 16:42:15 +05:30
ruthra kumar
f7b7b2b438 refactor: calculate summary on tree navigation 2023-12-01 16:42:15 +05:30
ruthra kumar
99fbd8ad18 refactor: use DB to store tree and state 2023-12-01 16:42:15 +05:30
ruthra kumar
9d20256366 chore: use doctype as btree 2023-12-01 16:42:15 +05:30
ruthra kumar
85f2a6dd54 feat: nodes doctype 2023-12-01 16:42:15 +05:30
ruthra kumar
de2eba0d98 chore: remove unwanted code 2023-12-01 16:42:15 +05:30
ruthra kumar
705ef4f5a3 refactor: add basic navigation
1. remove unnecessary columns
2. added basic tree navigation
2023-12-01 16:42:15 +05:30
ruthra kumar
b2dde55f2c refactor: ability to build and load tree from DB 2023-12-01 16:42:15 +05:30
ruthra kumar
d53b34c0ce refactor: introduce node class 2023-12-01 16:42:15 +05:30
ruthra kumar
a427029151 refactor: more buttons 2023-12-01 16:42:15 +05:30
ruthra kumar
2de3e6ce6d refactor: date validation 2023-12-01 16:42:15 +05:30
ruthra kumar
03a38ed025 refactor: support for BFS and DFS 2023-12-01 16:42:15 +05:30
ruthra kumar
26503a205f refactor: simplify DFS 2023-12-01 16:42:15 +05:30
ruthra kumar
5a25c80f2e refactor: Depth First Search(DFS) 2023-12-01 16:42:15 +05:30
ruthra kumar
4c8a8c3bcd refactor: some logic 2023-12-01 16:42:15 +05:30
ruthra kumar
decdbd2782 feat: bisect doctype 2023-12-01 16:42:15 +05:30
ruthra kumar
eb4c476490 refactor: primitive summary for p&l and balance sheet 2023-12-01 16:42:15 +05:30
s-aga-r
68f5dd3e7b fix: don't update previous doc on rate change 2023-12-01 14:45:01 +05:30
s-aga-r
68aee8c144 Merge pull request #38482 from s-aga-r/FIX-38476
fix: `AttributeError` while saving Purchase Invoice
2023-12-01 13:54:42 +05:30
Ernesto Ruiz
b24e28953b chore: add translate function to email subject in digest frecuency (#38474)
chore: add translate function to email subject in digest frecuency
2023-12-01 12:41:14 +05:30
ruthra kumar
9656412bba Merge pull request #38440 from rtdany10/pe-split-message
fix(pe): show split alert only on splitting
2023-12-01 12:39:39 +05:30
ruthra kumar
61280117eb Merge pull request #38393 from ruthra-kumar/refactor_advance_as_liability
refactor: GL entries build logic for `Advance in Separate Party Account` option.
2023-12-01 12:36:59 +05:30
ruthra kumar
961bdf0d24 refactor: handle forex payment advance entries 2023-12-01 12:13:00 +05:30
ruthra kumar
080aa30407 refactor(test): filter on document names 2023-12-01 12:09:37 +05:30
ruthra kumar
eecf9cd1d8 fix(test): use correct account type for testing 2023-12-01 11:43:57 +05:30
NandhiniDevi
e2a519464b add supplier group filter in purchase register (#38421)
* add supplier group field in purchase register

* Update purchase_register.js
2023-12-01 11:34:38 +05:30
s-aga-r
60a81a563e fix: AttributeError while saving Purchase Invoice 2023-12-01 11:27:54 +05:30
Gughan Ravikumar
3a66aefd2c fix: show item name as title instead of item group in BOM (#38478)
Item fields in BOM used to show Item Group when Items were set to show title as link fields. Now they show Item Name instead
2023-12-01 11:07:17 +05:30
Ankush Menat
54f7cf59fd chore: version bump 2023-12-01 10:37:35 +05:30
rohitwaghchaure
ba10f7d04c Merge pull request #38455 from rohitwaghchaure/fixed-incorrect-requested-qty-in-mr-for-sco
fix: incorrect requested quantity for the subcontracting order
2023-11-30 19:07:55 +05:30
Rohit Waghchaure
691e3bb24f fix: incorrect requested quantity for the subcontracting order 2023-11-30 17:32:55 +05:30
s-aga-r
832734ff4c Merge pull request #38450 from s-aga-r/FIX-38151
fix(ux): make valuation field read only when it can't be modified
2023-11-30 17:22:54 +05:30
s-aga-r
3d4156cc7d fix(ux): make PI rate field read-only having PR ref 2023-11-30 16:28:03 +05:30
ruthra kumar
cc053ad894 Merge pull request #38457 from ruthra-kumar/use_flt_on_outstanding_on_ar_ap_summary
refactor: use flt on outstanding on AR/AP summary report
2023-11-30 16:23:28 +05:30
s-aga-r
ae294ee470 fix(ux): make PR rate field read-only having PO ref 2023-11-30 16:16:12 +05:30
ruthra kumar
e4bdd3a28d refactor: use flt on outstanding on AR/AP summary report 2023-11-30 15:57:57 +05:30
Ankush Menat
63313eef6f feat: enable automatic type annotations (#38452) 2023-11-30 08:23:48 +00:00
Ankush Menat
1da9087cc4 refactor: Simpler log settings setup (#38449)
Depends on https://github.com/frappe/frappe/pull/23507
2023-11-30 07:58:55 +00:00
ruthra kumar
de3795a7d4 Merge pull request #38446 from ruthra-kumar/filter_bug_on_payment_reconciliation
refactor: pass on filter to up front outstanding query as well
2023-11-30 12:54:46 +05:30
ruthra kumar
cfd3230c75 refactor: pass on filter to upfront outstanding query as well 2023-11-30 12:22:55 +05:30
s-aga-r
e38b06bf2d Merge pull request #38441 from s-aga-r/FIX-38434
fix: exploded items in Subcontracting Receipt
2023-11-30 12:10:18 +05:30
s-aga-r
7cb0b1b7c3 Merge pull request #38439 from s-aga-r/FIX-38433
fix: use `docstatus` instead of `status`
2023-11-30 12:09:43 +05:30
s-aga-r
62b4a263f8 fix: exploded items in Subcontracting Receipt 2023-11-30 12:07:52 +05:30
Dany Robert
96b13c59c1 fix(pe): show split alert only on splitting 2023-11-30 06:20:15 +00:00
s-aga-r
1423b38d50 fix: use docstatus instead of status 2023-11-30 11:43:28 +05:30
Devin Slauenwhite
ff27cccff4 refactor: get outstanding journal entry using query builder 2023-11-29 21:44:56 +00:00
s-aga-r
abc7d30024 fix(ux): make basic_rate field read-only based on purpose 2023-11-29 19:49:58 +05:30
Deepesh Garg
591f4ebdca Merge pull request #38429 from GursheenK/set-cwip-account-for-asset-tests
fix(minor): set capital WIP account before asset tests
2023-11-29 18:50:05 +05:30
Gursheen Anand
ef8e4191cd fix: set cwip account before asset tests 2023-11-29 18:25:52 +05:30
rohitwaghchaure
cf97e3c21f Merge pull request #38427 from Nandhinidevi123/stock_entry
Update Serial No issue
2023-11-29 18:11:22 +05:30
s-aga-r
2e8739fff7 Merge pull request #38290 from s-aga-r/FIX-36704
feat: auto create PR on SCR submission
2023-11-29 17:57:11 +05:30
s-aga-r
3da0aa6a0b fix(test): test_auto_create_purchase_receipt 2023-11-29 17:35:21 +05:30
Nandhinidevi123
97be527ee9 fix:change default qty 2023-11-29 17:21:51 +05:30
Nandhinidevi123
cac3b4a0d8 Merge branch 'develop' of https://github.com/Nandhinidevi123/erpnext into develop 2023-11-29 17:20:38 +05:30
Gursheen Anand
96f31847b2 fix: set cwip account for company before tests 2023-11-29 16:04:36 +05:30
Deepesh Garg
85f9f8d176 Merge pull request #38250 from GursheenK/unset-discount-amount-based-on-coupon-code
fix: unset discount amount based on coupon code
2023-11-29 15:53:46 +05:30
s-aga-r
7b0cd03f88 test: auto create PR on SCR submit 2023-11-29 14:10:48 +05:30
s-aga-r
68585f6f2b test: auto create SCO on PO submit 2023-11-29 13:58:36 +05:30
s-aga-r
857f2b5a01 chore: linter 2023-11-29 13:39:14 +05:30
rohitwaghchaure
258148b615 Merge pull request #38365 from Nandhinidevi123/sales_register
feat:add customer group filter in sales register
2023-11-29 13:37:22 +05:30
s-aga-r
7145b040f1 fix(ux): hide Create Purchase Receipt button for Subcontract Return 2023-11-29 13:21:24 +05:30
s-aga-r
874766a82f fix: map warehouses in return SCR 2023-11-29 13:07:39 +05:30
s-aga-r
096a2c8cd0 chore: PR ref in SCR connections 2023-11-29 12:46:31 +05:30
Gursheen Kaur Anand
4a047fefb8 Merge branch 'develop' into make-against-field-dynamic 2023-11-29 12:30:20 +05:30
rohitwaghchaure
fddf341f44 fix: incorrect ordered qty for Subcontracting Order (#38415) 2023-11-29 12:21:11 +05:30
Anand Baburajan
fe5fc5bd3a feat: shift depreciation for assets (#38327)
* feat: shift depreciation for assets

* chore: create new asset depr schedule on shift change

* refactor: move create_depr_schedule to after_insert

* fix: args in get_depreciation_amount test

* refactor: rename shift adjustment to shift allocation

* chore: asset shift factor doctype and auto allocate shift diff

* chore: use check instead of depr type, and add tests

* chore: make linter happy

* chore: give permissions to accounts users
2023-11-29 12:14:12 +05:30
ruthra kumar
0255e09285 test: ledger pre and post reconciliation on advance as liability 2023-11-29 10:57:28 +05:30
s-aga-r
2b0b15f4d1 Merge pull request #38394 from s-aga-r/FIX-38330
fix: `OperationalError` while selecting Serial No in `Warranty Claim`
2023-11-29 10:37:07 +05:30
Patrick Eissler
8e4b591ea2 fix: make create button translatable (#38165)
* fix: make all create buttons translatable

* style: use double quotes

---------

Co-authored-by: PatrickDenis-stack <77415730+PatrickDenis-stack@users.noreply.github.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2023-11-29 10:22:47 +05:30
Dany Robert
663bb8726c fix(regional): use net figures for sales calc (#38260) 2023-11-29 09:03:47 +05:30
ruthra kumar
2add802d0d refactor(test): advance allocation on purchase invoice 2023-11-29 08:59:14 +05:30
Devin Slauenwhite
adfcdb3b65 fix: don't consider cancelled entries 2023-11-28 13:19:49 -05:00
s-aga-r
9fadf5f426 refactor: don't use cur_frm 2023-11-28 21:34:07 +05:30
ruthra kumar
3e6306348a refactor: redefine dr_or_cr for unallocated amount 2023-11-28 20:04:47 +05:30
Shariq Ansari
458dd51af7 Merge pull request #38398 from shariquerik/create-contact-only-if-not-exist 2023-11-28 19:49:22 +05:30
Shariq Ansari
23b0b8ba36 fix: create contact if existing customer doesn't have contact 2023-11-28 19:24:15 +05:30
rohitwaghchaure
592fc81260 fix: serial no status (#38391) 2023-11-28 18:28:48 +05:30
Gursheen Kaur Anand
c232acbe9b Merge pull request #38392 from GursheenK/report-rename-import
fix: imports for renamed report
2023-11-28 18:22:59 +05:30
s-aga-r
640dfab827 refactor: use frm.set_query to add filters 2023-11-28 17:45:17 +05:30
s-aga-r
01044ca8e9 refactor: use DocType Fetch From instead of frm.add_fetch 2023-11-28 17:33:27 +05:30
ruthra kumar
2633d7dca3 refactor: 'partial' flag to only cancel unlinked ledger entries 2023-11-28 17:28:31 +05:30
ruthra kumar
ecb533c4d1 refactor: return the newly added reference upon reconciliation 2023-11-28 17:27:49 +05:30
ruthra kumar
5fc19dab54 refactor: 'make_advance_gl_entries' method
make_advance_gl_entries -> add_advance_gl_entries -> add_advance_gl_for_reference

'make_advance_gl_entries' - main method thats builds and post GL
entries for all or one specific reference based on parameters

'add_advance_gl_entries' - build GL map for all or one specific
reference. Return an array of dict.

'add_advance_gl_for_reference' - utility function to build gl
entries. returns dict.
2023-11-28 17:26:06 +05:30
ruthra kumar
58114e7b24 refactor: use different GL build logic for advance as liability 2023-11-28 17:25:28 +05:30
s-aga-r
1763824e5f refactor: use arrow function 2023-11-28 17:20:05 +05:30
Gursheen Anand
aee2e12f39 chore: fix imports for renamed report 2023-11-28 17:11:35 +05:30
s-aga-r
500573067a Merge branch 'develop' into FIX-36704 2023-11-28 17:01:48 +05:30
s-aga-r
8052103197 feat: provision to create PR from SCR 2023-11-28 16:28:54 +05:30
ruthra kumar
78ab11f991 refactor: post to GL and Payment Ledger on advance as liability 2023-11-28 16:25:55 +05:30
ruthra kumar
3263f2023c test: assert ledger entries on partial reconciliation
with `Advance as Liability`, partial reconciliation should not post
duplicate ledger entries for same reference
2023-11-28 16:16:24 +05:30
Raffael Meyer
8f00481c5f fix: no fstring in translation (#38381) 2023-11-28 09:35:28 +00:00
s-aga-r
9872e371a2 Merge pull request #38377 from s-aga-r/FIX-PB-SEARCH-INPUT
fix: Product Bundle Parent Item input
2023-11-28 14:34:26 +05:30
s-aga-r
37b3ac7952 feat: SCR Item ref in PR Item 2023-11-28 13:39:15 +05:30
s-aga-r
d891bd7fac feat: Subcontracting Receipt ref in Purchase Receipt 2023-11-28 13:27:27 +05:30
s-aga-r
d366a91d9e fix: use checkbox instead of select field 2023-11-28 13:06:52 +05:30
s-aga-r
8c3713b649 fix: don't select all fields 2023-11-28 11:12:55 +05:30
s-aga-r
729fc738af fix: product bundle search input 2023-11-28 11:08:52 +05:30
Deepesh Garg
add238c892 fix: debit credit mismatch in multi-currecy asset purchase receipt (#38342)
* fix: Debit credit mimatch in multicurrecy asset purchase receipt

* test: multi currency purchase receipt

* chore: update init files

* test: roolback
2023-11-28 08:21:45 +05:30
rohitwaghchaure
ad3634be7c chore: fix flaky test case (#38369) 2023-11-28 06:24:21 +05:30
Sagar Vora
5a53a4b044 fix: make parameters of create_subscription_process optional (and other minor fixes) (#38360) 2023-11-27 20:21:19 +05:30
Nandhinidevi123
5a97fa6336 feat:add customer group filter in sales register 2023-11-27 19:51:05 +05:30
ruthra kumar
657bb9d682 Merge pull request #38354 from ruthra-kumar/handle_rounding_loss_on_ar_ap
refactor: handle rounding loss on AR/AP reports
2023-11-27 11:51:46 +05:30
Marica
b9f5a1c85d fix: Negative Qty and Rates in SO/PO (#38252)
* fix: Don't allow negative qty in SO/PO

* fix: Type casting for safe comparisons

* fix: Grammar in error message

* fix: Negative rates should be allowed via Update Items in SO/PO

* fix: Use `non_negative` property in docfield & emove code validation
2023-11-27 09:05:22 +05:30
ruthra kumar
592ce45da7 refactor: handle rounding loss on AR/AP reports 2023-11-27 08:51:22 +05:30
NandhiniDevi
d9b3b95854 fix : Payment Reco Issue and chart of account importer (#38321)
fix : Payment Reco Issue and chart of account importer
2023-11-26 18:40:31 +05:30
Raffael Meyer
5426b93387 refactor: bank transaction (#38182) 2023-11-26 18:37:55 +05:30
Monolithon Administrator
284a40aa63 fix: Add name to Hungary - Chart of Accounts for Microenterprises json (#38278)
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-11-26 18:17:10 +05:30
Deepesh Garg
2989e36b1d Merge pull request #38284 from vorasmit/fetch-item-tax-values
fix: fetch item_tax_template values if fields with fetch_from exisit
2023-11-26 17:54:35 +05:30
rohitwaghchaure
d8245cef72 fix: job card overlap validation (#38345) 2023-11-26 16:13:39 +05:30
s-aga-r
edf4514d8b Merge pull request #38261 from s-aga-r/FIX-STOCK-RESERVATION-DIALOG-BOX
fix(ux): Sales Order Stock Reservation Dialog
2023-11-26 11:02:02 +05:30
Raffael Meyer
477d9fa87e feat: new Report "Lost Quotations" (#38309) 2023-11-24 22:27:01 +01:00
Gursheen Kaur Anand
01f133f8c8 Merge branch 'develop' into make-against-field-dynamic 2023-11-24 15:23:44 +05:30
Gursheen Kaur Anand
d32147f8fe Merge pull request #38273 from GursheenK/email-digest-annual-income-expense
fix: annual income and expenses in email digest
2023-11-24 15:19:09 +05:30
NandhiniDevi
86aeacf393 add condition 2023-11-24 14:18:44 +05:30
s-aga-r
dd80d3b9b9 fix: dont show View button on cancelled SCR 2023-11-24 12:17:05 +05:30
s-aga-r
98cba5ed30 feat: add Subcontracting Receipt link in PO connections 2023-11-24 12:14:38 +05:30
s-aga-r
ca8a5b45ba feat: add Purchase Order link in SCR connections 2023-11-24 12:09:21 +05:30
ruthra kumar
9d6a06aec5 Merge pull request #38298 from ruthra-kumar/simplied_purchase_cost_update
perf: optimize update_purchase_cost method
2023-11-24 11:48:36 +05:30
ruthra kumar
dd016e6ced refactor: update project costing based on frequency 2023-11-24 11:18:51 +05:30
ruthra kumar
0fe6dcd742 refactor: make update_project_cost optional through Buying Settings 2023-11-24 11:18:51 +05:30
ruthra kumar
bcbe6c4a53 refactor: provide UI button to recalculate when needed 2023-11-24 11:18:48 +05:30
NandhiniDevi
f09c5f32cf add flt() for None type error 2023-11-24 11:17:35 +05:30
ruthra kumar
3ca7e442bc Merge pull request #38283 from ruthra-kumar/move_patch_to_pre_model
chore: move reconciliation cleanup patch to pre-model
2023-11-24 10:06:46 +05:30
Deepesh Garg
8ac647ece7 Merge pull request #38269 from GursheenK/skip-fixed-assets-in-product-bundle
fix: skip fixed assets in product bundle
2023-11-24 09:59:35 +05:30
ruthra kumar
4307d3b5c9 Merge pull request #38296 from ruthra-kumar/indexes_on_journal_entry_child_tables
chore: index to speed up basic submit/cancel functions on purchase invoice
2023-11-24 09:45:14 +05:30
ruthra kumar
aa17110bde perf: optimize total_purchase_cost update 2023-11-24 09:41:38 +05:30
Devin Slauenwhite
3f6d805033 fix: display all item rate stop messages (#38289) 2023-11-23 22:42:12 +05:30
NandhiniDevi
64b44a360a add flt() for None type error (#38299) 2023-11-23 22:40:17 +05:30
s-aga-r
040cc8d22f feat: auto create PR on SCR submission 2023-11-23 22:16:27 +05:30
Raffael Meyer
3be345e605 feat: add Bank Transaction to connections in Journal and Payment Entry (#38297)
* feat(Payment Entry): Bank Transaction connection

* feat(Journal Entry): Bank Transaction connection
2023-11-23 14:02:27 +01:00
s-aga-r
e1cea25781 fix: maintain PO and PO Item ref in SCR Item 2023-11-23 17:48:34 +05:30
s-aga-r
a2ede7d6d5 feat: add field Purchase Order Item in SCO Item 2023-11-23 17:06:13 +05:30
s-aga-r
7e4dd33ab0 fix: hold PO item ref in SCO Service Item 2023-11-23 17:06:13 +05:30
s-aga-r
45d5cff47d feat: add field Purchase Order Item in SCO Service Item 2023-11-23 17:06:09 +05:30
s-aga-r
745e3bfb73 chore: notify user on SCO creation 2023-11-23 17:04:19 +05:30
s-aga-r
762906f240 feat: add field Action on Subcontracting Receipt Submission 2023-11-23 17:04:13 +05:30
s-aga-r
9ec6f1e1d6 feat: auto create SCO on PO submission 2023-11-23 17:04:07 +05:30
s-aga-r
628ea42b63 feat: add field Action on Purchase Order Submission 2023-11-23 17:03:59 +05:30
ruthra kumar
1efff268b0 chore: speed up Purchase Invoice cancellation 2023-11-23 16:56:35 +05:30
Smit Vora
b206b0583b fix: fetch item_tax_template values if fields with fetch_from exisit 2023-11-23 15:10:47 +05:30
Anand Baburajan
816b1b6bd5 fix: don't depreciate assets with no schedule on scrapping (#38276)
fix: don't depreciate non-depreciable assets on scrapping
2023-11-23 13:48:46 +05:30
ruthra kumar
24fcd67f8b chore: index to speed up queries on JE child table reference 2023-11-23 11:44:34 +05:30
s-aga-r
c99c805743 Merge pull request #38268 from s-aga-r/FIX-38222
fix: Supplier `Primary Contact`
2023-11-23 11:07:30 +05:30
ruthra kumar
f258ab5e98 chore: move reconciliation cleanup patch to pre-model 2023-11-23 10:39:41 +05:30
ruthra kumar
880a85d2af Merge pull request #38148 from ruthra-kumar/prevent_lock_on_reconciliation
refactor: convert Payment Reconciliation to virtual doctype
2023-11-23 10:16:55 +05:30
ruthra kumar
efd31a429c Merge pull request #38257 from ruthra-kumar/optimize_ple_outstanding_query
refactor: optmize outstanding amount query
2023-11-23 09:41:21 +05:30
Gursheen Anand
728cc9f725 fix: fiscal year using future date 2023-11-22 19:28:57 +05:30
Gursheen Anand
52305e3000 fix: annual income and expenses in digest 2023-11-22 18:38:33 +05:30
Gursheen Anand
1657337887 chore: linting issues 2023-11-22 16:45:14 +05:30
Gursheen Anand
362f377f61 fix: skip disabled bundles for non-report utils 2023-11-22 16:26:09 +05:30
Gursheen Anand
8bdb61cb87 fix: condition in other bundle utils 2023-11-22 16:17:23 +05:30
Gursheen Anand
67f43d37df fix: validation for existing bundles 2023-11-22 16:10:49 +05:30
Gursheen Anand
3543f86c63 fix: has_product_bundle util to only check for enabled bundles 2023-11-22 16:04:05 +05:30
s-aga-r
627165dc7c fix: Supplier Primary Contact 2023-11-22 15:27:07 +05:30
Gursheen Anand
874774fe6c fix: filter bundle items based on disabled check 2023-11-22 15:24:56 +05:30
Gursheen Anand
ee76af7681 feat: add disabled field in product bundle 2023-11-22 15:23:17 +05:30
Gursheen Anand
f9713eeb56 fix: skip fixed assets in parent 2023-11-22 15:22:42 +05:30
rohitwaghchaure
0ca7527f7a fix: patch - Duplicate entry quality inspection parameter (#38262) 2023-11-22 14:02:01 +05:30
s-aga-r
2a41da94d4 fix(ux): no need to select rows to unreserve the stock 2023-11-22 11:38:08 +05:30
s-aga-r
73586fd9b2 fix: use field sales_order_item instead name 2023-11-22 11:37:14 +05:30
s-aga-r
9c889b37fb fix(ux): no need to select rows to reserve the stock 2023-11-22 11:27:58 +05:30
Ankush Menat
b11ae4b54c chore: remove dead link 2023-11-22 10:26:50 +05:30
ruthra kumar
e3af1dc864 Merge pull request #38258 from ruthra-kumar/rename_unreconcile
refactor: rename 'Unreconcile Payments' doctype to singular 'Unreconcile Payment'
2023-11-22 10:03:13 +05:30
ruthra kumar
8b04c1d4f6 refactor: optimize outstanding vouchers query 2023-11-22 10:00:12 +05:30
ruthra kumar
74f9e34182 chore: update new unreconcile doctype name in JS and PY files 2023-11-22 05:59:20 +05:30
ruthra kumar
1fddc30350 Merge pull request #38081 from GursheenK/validate-repost-ledger-settings-for-editable-invoices
fix: check reposting ledger settings before setting repost flag
2023-11-22 05:22:59 +05:30
Anand Baburajan
e2bb4e2baa fix: set asset's valuation_rate according to asset quantity (#38254) 2023-11-21 22:32:43 +05:30
Dany Robert
383a4b132e chore: change f-string to sql params 2023-11-21 12:46:56 +00:00
ruthra kumar
9006c9b747 chore: rename 'unreconcile payments' to 'unreconcile payment' 2023-11-21 16:44:01 +05:30
Gursheen Anand
6518582ed3 fix: unset discount amount based on coupon code 2023-11-21 15:14:55 +05:30
rohitwaghchaure
5c308a4f9a fix: valuation rate for FG item for subcontracting receipt (#38244) 2023-11-21 14:42:26 +05:30
Rucha Mahabal
ac91030b31 fix(Timesheet): warn user if billing hours > actual hours instead of resetting (#38239)
* revert: "fix(Timesheet): reset billing hours equal to hours if they exceed actual hours"

This reverts commit 0ec8034507.

* fix: warn user if billing hours > actual hours
2023-11-21 13:18:34 +05:30
ruthra kumar
9680edfcc3 Merge pull request #38234 from ruthra-kumar/test_case_for_rounding_issue
test: prevent rounding loss based validation error
2023-11-21 12:09:54 +05:30
ruthra kumar
56e991b7f4 test: prevent rounding loss based validation error 2023-11-21 11:46:45 +05:30
Anand Baburajan
9903049c7a fix: set default asset quantity as 1 [dev] (#38223)
* fix: make default asset quantity as 1

* fix: get rate_of_depreciation from asset category for asset auto-creation

* chore: create asset depr schedules on PR submit, not asset submit

* fix: set default asset quantity as 1

* chore: move patch from v15 to v14
2023-11-20 22:27:16 +05:30
Dany Robert
f34ffc2062 fix: exclude invoice_doctypes from party advance 2023-11-20 11:10:56 +00:00
Dany Robert
bfaa93b0ca fix: honour currency precision while fetching balance 2023-11-20 09:43:02 +00:00
ruthra kumar
f50d933a25 Merge pull request #38212 from ruthra-kumar/update_hook
refactor: update scheduled job for bulk transaction
2023-11-20 14:16:11 +05:30
ruthra kumar
ce092bf23b Merge pull request #38210 from ruthra-kumar/set_default_on_billed_amt_update
refactor: extend billed amount update flag to POS Invoice as well
2023-11-20 14:05:45 +05:30
ruthra kumar
fb06ad7330 refactor: update scheduled job for bulk transaction 2023-11-20 13:28:55 +05:30
s-aga-r
80ab4eea8c Merge pull request #38207 from s-aga-r/FIX-37809
fix(ux): `Task` creation from `Timesheet`
2023-11-20 12:39:30 +05:30
ruthra kumar
83a13e22b7 refactor: add flag to POS Invoice 2023-11-20 12:29:37 +05:30
ruthra kumar
ee0c64215d refactor: set default for 'update_billed_amount_in_delivery_note' 2023-11-20 12:29:35 +05:30
s-aga-r
5ac8bd7f08 Merge pull request #38200 from s-aga-r/FIX-38188
fix: TypeError in Subcontracting Receipt
2023-11-20 12:14:23 +05:30
s-aga-r
2f3fc12c08 fix: add route options for new Task 2023-11-20 12:05:25 +05:30
s-aga-r
331ad62f3c fix(ux): enable Quick Entry for Task 2023-11-20 12:04:03 +05:30
s-aga-r
f6e93f084a fix: TypeError in Subcontracting Receipt 2023-11-20 10:23:57 +05:30
ruthra kumar
7b2eacd4d8 Merge pull request #38159 from ruthra-kumar/provision_to_truncate_remarks
refactor: provision to truncate `remarks` in General Ledger and Accounts Receivable/Payable reports
2023-11-20 10:07:10 +05:30
ruthra kumar
a9bf906545 refactor: add substring logic in ar/ap report 2023-11-20 09:38:26 +05:30
ruthra kumar
97090ff367 refactor: provision to set remarks length in accounts settings 2023-11-20 09:38:23 +05:30
Deepesh Garg
6c8b6de4c9 Merge pull request #38171 from rtdany10/rounded-total
fix: wrong round off and rounded total
2023-11-19 19:18:38 +05:30
Deepesh Garg
f91752cad2 Merge pull request #38177 from pps190/fix-pe-precision
fix: payment entry rounding error
2023-11-19 18:46:00 +05:30
Dany Robert
cc60c328fe fix: test case for rounded total with cash disc 2023-11-19 02:53:09 +00:00
Raffael Meyer
ff5b1b7ded style: remove trailing whitespace (#38183) 2023-11-18 17:45:14 +00:00
Raffael Meyer
a1ff7cab7e Merge pull request #38178 from barredterra/item-modified-timestamp 2023-11-18 18:07:11 +01:00
Patrick Eissler
32f622ef80 fix: valuation rate in report Item Prices (#38161)
Co-authored-by: PatrickDenis-stack <77415730+PatrickDenis-stack@users.noreply.github.com>
2023-11-18 15:54:34 +01:00
barredterra
969616ed09 fix: update modified timestamp
Was missing in 434c2a1815
2023-11-18 15:43:23 +01:00
Raffael Meyer
ca62cde9aa Merge pull request #38163 from PatrickDEissler/fix/table-was-mandatory-for-manufacturer 2023-11-18 15:37:51 +01:00
Devin Slauenwhite
3d1e3a9cde fix: payment entry rounding error 2023-11-18 14:36:20 +00:00
Deepesh Garg
184848edf9 Merge pull request #38147 from kunhimohamed/develop
fix: issue occured when creating supplier with contact details
2023-11-18 19:47:38 +05:30
Deepesh Garg
65ba5b3000 Merge pull request #38142 from deepeshgarg007/supplier_quotation_ad
feat: Add accounting dimensions to Supplier Quotation
2023-11-18 19:40:42 +05:30
Dany Robert
3a487bd33a fix: wrong round off and rounded total 2023-11-18 13:32:04 +00:00
Sagar Vora
56e92b702c Merge pull request #38167 from vishakhdesai/perm-check-fix 2023-11-18 17:37:34 +05:30
Vishakh Desai
45299fe4b3 fix: pass check permission in render_address 2023-11-18 17:10:01 +05:30
PatrickDenis-stack
434c2a1815 fix: attributes were mandatory for manufacturers 2023-11-18 11:16:06 +01:00
ruthra kumar
f31002636b chore: clear singles table and reconciliation related tables 2023-11-18 09:28:02 +05:30
ruthra kumar
b5dd0c8630 chore: remove reconciliation defaults from patch 2023-11-18 09:28:02 +05:30
ruthra kumar
9c7b19e0b7 refactor: virtual doctype methods 2023-11-18 09:27:59 +05:30
ruthra kumar
3a51a3f37e refactor: convert payment reconciliation tool to virtual doctype 2023-11-18 08:06:44 +05:30
David Arnold
1662a4c9c3 fix(notification): align with https://github.com/frappe/frappe/pull/22595 2023-11-17 15:02:30 +01:00
s-aga-r
a5a5341643 Merge pull request #38127 from s-aga-r/FIX-37162
feat: add `Supplier Delivery Note` field in SCR
2023-11-17 18:46:58 +05:30
Rucha Mahabal
20c6e9fca2 fix(Timesheet): reset billing hours equal to hours if they exceed actual hours (#38134) 2023-11-17 18:08:55 +05:30
Gursheen Kaur Anand
5b3eba7bee Merge branch 'develop' into validate-repost-ledger-settings-for-editable-invoices 2023-11-17 14:21:02 +05:30
Gursheen Kaur Anand
8c6e341a71 Merge pull request #38144 from GursheenK/tax-report-party-without-naming-series
fix(minor): show party instead of party name where naming series not set
2023-11-17 14:18:16 +05:30
Kunhi
545ef3c234 fix: Suppier name was not taken when creating address from supplier 2023-11-17 11:43:36 +04:00
kunhi
7842c9fba8 fix: issue occured when creating supplier with contact details 2023-11-17 11:22:08 +04:00
Smit Vora
7e43d7b131 fix: allow regional gl in payment entry for gl preview (#38136) 2023-11-17 12:38:08 +05:30
Deepesh Garg
089da459f7 feat: Add accounting dimensions to Supplier Quotation 2023-11-17 12:37:14 +05:30
Gursheen Anand
b27af6b5c8 fix: show party instead of party name where naming series not set 2023-11-17 12:36:57 +05:30
ruthra kumar
c69fb80222 Merge pull request #38119 from ruthra-kumar/missing_filter_in_payable_report
fix: add revaluation journal filter in Payable report
2023-11-17 09:56:51 +05:30
ruthra kumar
134201794a fix: add revaluation journal filter in Payable report 2023-11-17 09:48:17 +05:30
rohitwaghchaure
2df767f596 fix: bom creator not able to amend / duplicate (#38128)
fix: bom creator not able to amend
2023-11-16 16:01:35 +05:30
s-aga-r
da80e4dbce feat: add Supplier Delivery Note field in SCR 2023-11-16 13:05:49 +05:30
s-aga-r
5cc8603cff Merge pull request #38090 from blaggacao/fix/dn-mapper
fix(dn): regression from bulk transaction fix
2023-11-16 12:42:25 +05:30
David Arnold
426c245032 fix(dn): regression from bulk transaction fix 2023-11-16 12:21:23 +05:30
Deepesh Garg
9731b74ad3 Merge pull request #38071 from GursheenK/unequal-dr-cr-for-payments-with-partial-credit-note
fix: handle partial return against invoices in payment entries
2023-11-16 10:35:55 +05:30
ruthra kumar
ee29526bbe Merge pull request #38038 from ruthra-kumar/refactor_bulk_transaction
refactor: supercharge Bulk actions
2023-11-16 09:51:34 +05:30
ruthra kumar
3e884d347a Merge pull request #38082 from ruthra-kumar/fix_fy_exception
refactor: use 'boolean' parameter while fetching FY year
2023-11-16 09:47:30 +05:30
Anand Baburajan
6e0362dee8 chore: change read only condition of asset quantity field (#38111)
chore: change read only condition of asset quantity
2023-11-15 17:58:37 +05:30
Gursheen Anand
2499675ad1 fix: test total unallocated amount in payment 2023-11-15 13:32:23 +05:30
Arjun
908b21f7fd fix: duplicate field in Closing Stock Balance (#38105) 2023-11-15 12:34:38 +05:30
Anand Baburajan
e93a19ffb5 chore: refetch item images on transaction save (#38095)
chore: re fetch item images on transaction save
2023-11-14 19:38:15 +05:30
rohitwaghchaure
3e77c0b564 fix: valuation rate for the subcontracting receipt supplied items with Serial and Batch Bundle (#38094)
fix: valuation rate for the subcontracting receipt supplied items with batch
2023-11-14 19:27:41 +05:30
rohitwaghchaure
e769e750ec fix: Not able to save subcontracting receipt (#38085) 2023-11-14 15:08:37 +05:30
ruthra kumar
c31ee8ea33 refactor: use 'boolean' parameter while fetching FY year 2023-11-14 07:25:10 +05:30
Gursheen Anand
894ae1fe0f fix: check reposting settings before allowing editable si 2023-11-13 20:28:44 +05:30
Gursheen Anand
5fae2f6d57 fix: allow on submit for child table fields 2023-11-13 20:27:09 +05:30
Gursheen Anand
ad5edbb1de fix: do not set repost flag without validating voucher 2023-11-13 20:25:26 +05:30
Gursheen Anand
780b827adc refactor: validate reposting settings for editables inv 2023-11-13 20:24:32 +05:30
Anand Baburajan
8e010ef063 Merge pull request #38077 from anandbaburajan/trans_delete_att_comm
chore: delete comments and unlink attachments on company transactions deletion
2023-11-13 18:55:44 +05:30
Gursheen Anand
09f9764bbd test: payment against partial return invoices 2023-11-13 18:11:00 +05:30
Gursheen Anand
a59c942cd4 fix: reset dr_or_cr for every reference 2023-11-13 18:09:49 +05:30
anandbaburajan
b097bb20d9 fix: unrelated transation date typo 2023-11-13 18:09:09 +05:30
anandbaburajan
2f9e96e324 chore: delete comments and unlink attachments on company transactions deletion 2023-11-13 18:03:33 +05:30
Dany Robert
56b8d1b927 fix: remove ESS role when not mapped to employee (#37867)
* fix: remove ESS role when not mapped to employee

* fix: emp role removal on unlinking

* fix: test case for user employee role mapping

* fix: mapped employee and user on creation
2023-11-13 17:00:02 +05:30
Gursheen Anand
5b446d4575 fix: handle partial return against invoices 2023-11-13 15:05:34 +05:30
mergify[bot]
9ae5c979e8 fix: Identical items are added line by line instead of grouped together in POS (#37986)
fix: Identical items are added line by line instead of grouped together in POS (#37986)

fix: Identical items are added line by line instead of grouped together in POS (#37986)
(cherry picked from commit 011cf3d73e)

Co-authored-by: bVisible <info@bvisible.ch>
2023-11-13 14:43:46 +05:30
David Arnold
c2f0fadb6e Merge remote-tracking branch 'upstream/develop' into feat/so-po-advance-payment-status 2023-11-13 10:06:14 +01:00
David Arnold
ea7565889f feat(customer): add button to quick-create sales order and quotation (#37320)
* feat(customer): add button to quick-create sales order and quotation

* fix: create buttons in customer

* refactor: don't repeat yourself

---------

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
2023-11-13 14:19:22 +05:30
rohitwaghchaure
4a111f7362 fix: indentation issue in the Production Plan Summary report (#38019)
fix: Production Plan Summary report
2023-11-13 13:26:55 +05:30
ruthra kumar
ffd171a26b Merge pull request #38064 from ruthra-kumar/revaluation_checkbox_for_ar_summary
refactor: add revaluation journal checkbox in AR/AP summary reports
2023-11-13 12:07:33 +05:30
ruthra kumar
95edd82638 refactor: add revaluation journal checkbox in AR/AP summary reports 2023-11-13 11:56:43 +05:30
Raffael Meyer
e07c3aad6b Merge pull request #38063 from barredterra/remove-create-contact 2023-11-13 06:25:30 +01:00
ruthra kumar
a393a6b76c refactor: raise exception on invalid date 2023-11-13 10:39:40 +05:30
barredterra
d380bf8179 feat: remove unused method create_contact 2023-11-12 20:04:38 +01:00
Raffael Meyer
8062d2be3b Merge pull request #38060 from barredterra/refactor-fullname-parsing
refactor: parse full name
2023-11-12 16:16:15 +01:00
barredterra
d17e37c581 test: parse full name 2023-11-12 14:51:40 +01:00
barredterra
6f432b8e45 refactor: parse full name 2023-11-12 14:48:18 +01:00
Arjun
94faa44697 fix: close Credit Limit Crossed dialog (#38052) 2023-11-12 18:02:13 +05:30
David Arnold
9fde782403 fix(customer): contact creation for companies (#38055) 2023-11-12 17:51:18 +05:30
ViralKansodiya
ecc305dd59 fix: add customer name and supplier name columns (#37557)
fix: add customer name and supplier name columns
2023-11-12 17:48:37 +05:30
Niraj Gautam
6f6d5cb4cf fix(POS): 100 % Discount on Point of Sales (#37411)
fix: Allow 100% discount in POS
2023-11-12 11:52:35 +05:30
Deepesh Garg
8634abc021 fix: COA Importer app related issues (#37238)
* fix: COA Importer app related issues

* fix: Clear all account links fields befor import

* fix: Attribute error
2023-11-12 11:42:26 +05:30
David Arnold
a74e1f1600 fix(crm): ensure primary address and contact follows customer setting (#37710)
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-11-11 20:20:21 +05:30
hyaray
59438ee8d4 chore: Add missing translations (#38043)
chore: Add missing translations
2023-11-11 19:38:24 +05:30
David Arnold
4ed9927a30 fix(patch): to migrate properly in post section (#38045) 2023-11-11 19:37:23 +05:30
David Arnold
ae508144cd fix(customer): quick form and integration fixes (#37386) 2023-11-11 19:35:07 +05:30
ruthra kumar
a52a1b49af refactor: update traceback on retry 2023-11-11 05:20:27 +05:30
ruthra kumar
93295bf25b refactor: support list view filters 2023-11-11 05:10:16 +05:30
ruthra kumar
73639db910 chore: resolve linting issue 2023-11-10 15:27:28 +05:30
ruthra kumar
c320288690 refactor: rollback for retries and UI alerts 2023-11-10 13:45:52 +05:30
ruthra kumar
0aa1636d04 refactor: barebones retry functionality 2023-11-10 13:18:41 +05:30
ruthra kumar
194d70f8a0 chore: show retried in list view 2023-11-10 13:18:41 +05:30
ruthra kumar
af35590549 refactor: add basic functionalities 2023-11-10 13:18:41 +05:30
ruthra kumar
a248b13cc3 feat: virtual parent doctype 2023-11-10 13:18:41 +05:30
ruthra kumar
b0dfc936a1 chore: make from_doctype readonly 2023-11-10 13:18:41 +05:30
ruthra kumar
73090fa130 chore: add indexes 2023-11-10 13:18:41 +05:30
ruthra kumar
ade09bc709 chore: add list view filters 2023-11-10 13:18:33 +05:30
ruthra kumar
8d9f391309 Merge pull request #38004 from ruthra-kumar/ar_report_refactor_in_handling_gain_loss
fix: handling of exchange rate journals in AR/AP
2023-11-10 11:06:03 +05:30
ruthra kumar
ebd74a4e5b refactor: simplify logging logic bulk_transaction 2023-11-10 10:33:32 +05:30
ruthra kumar
c4f8f3613f chore: rearrange fields 2023-11-10 10:33:31 +05:30
ruthra kumar
e5a8ad54e2 chore: convert child to normal table 2023-11-10 10:33:31 +05:30
ruthra kumar
815c616f18 chore: remove 'Bulk Transaction Log' doctype 2023-11-10 10:33:31 +05:30
ruthra kumar
1d8fcd66e6 fix: new logic for handling revaluation journals 2023-11-10 10:31:39 +05:30
ruthra kumar
6ca3b26820 Merge pull request #37859 from marination/split-invoice-refactor
fix: `split_invoices_based_on_payment_terms`
2023-11-10 10:22:37 +05:30
s-aga-r
18a2e6ecb2 Merge pull request #38010 from s-aga-r/FIX-ITEM-READ-ONLY
fix: make item field read-only in batch
2023-11-10 10:21:20 +05:30
David Arnold
922fffda1f fix(payments): incoming payment requests aren't supposed to be in 'initiated' state (only outgoing are) (#37447)
* fix(payments): incoming payment requests aren't supposed to be in 'initiated' state (only outgoing are)

* fixup! fix(payments): incoming payment requests aren't supposed to be in 'initiated' state (only outgoing are)
2023-11-09 22:04:27 +05:30
marination
1fc5844025 fix: Re-add no.of rows split in alert message 2023-11-09 15:01:58 +01:00
jabir-elat
45b4bfc947 fix: sales order not assigned to territory orders (#37905)
filtered sales order are not assigned to 'territory_orders' which results in 0 order amount and 0 billing amount in the output
2023-11-09 18:30:00 +05:30
Sympatron GmbH
92f6d2c87c chore: Update de.csv (#37810)
chore: chore: Update de.csv
2023-11-09 18:27:11 +05:30
Vishakh Desai
c2bda2c705 fix: Supplier Quotation fields (#37963) 2023-11-09 18:26:34 +05:30
marination
4b4b176fcf style: Remove spaces introduced via merge conflict 2023-11-09 13:03:52 +01:00
Marica
a27374fd8f Merge branch 'develop' into split-invoice-refactor 2023-11-09 17:28:01 +05:30
marination
56ac3424d2 fix: Alert message and make sure invoice due dates are different for effective test
- Make invoice due dates are different so that the invoice with the earliest due date is allocated first in the test
- Translate voucher type, simplify alert message. The invoice could be "split" into 1 row, no. of rows in the message seems unnecessary.
2023-11-09 12:50:44 +01:00
ruthra kumar
696e2108ac Merge pull request #37746 from casesolved-co-uk/ar_billed_cur
feat: in_party_currency option for AR/AP reports
2023-11-09 13:04:47 +05:30
ruthra kumar
89612f2605 Merge pull request #37716 from vishdha/ar_report
feat: multi-select customer group in AR Report
2023-11-09 13:04:01 +05:30
rohitwaghchaure
a8216b9727 fix: make adjustment entry using stock reconciliation (#37995)
fix: do adjustment entry using stock reconciliation
2023-11-09 12:22:26 +05:30
s-aga-r
779260fb49 fix: make item field read-only in batch 2023-11-09 12:19:45 +05:30
Deepesh Garg
860b67e9c0 Merge pull request #37828 from GursheenK/payments-irrespective-of-party-types
fix: payments irrespective of party types
2023-11-09 12:14:58 +05:30
Deepesh Garg
47ba357bea Merge pull request #38000 from bosue/payment_entry_status
fix: Mark Status field in Payment Entry 'no_copy'.
2023-11-09 12:14:02 +05:30
ruthra kumar
3502c01aa4 Merge pull request #37860 from ruthra-kumar/filter_disable_accounts
refactor: ignore disabled account while selecting Income Accounts
2023-11-09 10:14:10 +05:30
ruthra kumar
6e3e094c95 refactor: ignore disabled account while selecting Income Accounts 2023-11-09 09:39:39 +05:30
Bernd Oliver Sünderhauf
a89afb65d7 fix: Mark Status field in Payment Entry 'no_copy'. 2023-11-08 21:52:32 +01:00
Anand Baburajan
9a171db97f fix: asset depreciation ledger (#37991)
* fix: include opening acc depr while calculating asset depr ledger report

* chore: include opening acc depr properly in acc depr amt

* chore: add cost_center in asset depr ledger report

* fix: handle finance books properly in asset depr ledger report

* chore: rename 'include default book entries' to 'include default FB entries'
2023-11-08 22:02:09 +05:30
s-aga-r
48567ef755 Merge pull request #37979 from s-aga-r/FIX-STOCK-RESERVATION
fix: ignore Stock Reservation for future dated PR
2023-11-08 19:45:15 +05:30
Deepesh Garg
b57eba6eaf Merge pull request #37987 from frappe/revert-37496-reset-tax-template-in-item-details
Revert "fix: set empty value for tax template in item details"
2023-11-08 19:13:30 +05:30
Deepesh Garg
70d99eebc0 Revert "fix: set empty value for tax template in item details (#37496)"
This reverts commit b0d440c34b.
2023-11-08 18:38:39 +05:30
Wolfram Schmidt
4783e4beee Update de.csv (#37981)
added translation for DocType Competitor https://www.duden.de/rechtschreibung/Konkurrent
2023-11-08 15:12:47 +05:30
Gursheen Anand
450c2470e9 refactor: set against account link for jv 2023-11-08 14:08:57 +05:30
Gursheen Anand
09439334ca refactor: use both fields to store against values 2023-11-08 12:57:00 +05:30
Gursheen Anand
f9c88ea7bc refactor: keep old against fields intact 2023-11-08 12:55:41 +05:30
s-aga-r
33eedb97dc fix: ignore Stock Reservation for future dated PR 2023-11-08 12:38:09 +05:30
Gursheen Anand
2984a86f37 fix: use get_all instead of get_list 2023-11-08 12:30:24 +05:30
Gursheen Anand
5f5d75a0bb chore: linting issues 2023-11-08 11:19:45 +05:30
ruthra kumar
6f231e4c83 Merge branch 'develop' into ar_billed_cur 2023-11-08 10:30:15 +05:30
ruthra kumar
c750e4d7ef Merge pull request #37971 from ruthra-kumar/performance_optimization_on_bulk_transaction_processing
refactor: optimize bulk transaction for speed
2023-11-08 06:32:23 +05:30
Gursheen Anand
291a499124 fix: split expected jv entries for scrap asset 2023-11-08 00:46:52 +05:30
s-aga-r
67b36a0823 Merge pull request #37970 from s-aga-r/FIX-5528
chore: typo in `Stock Entry` enqueue msg
2023-11-07 20:57:45 +05:30
marination
162c0497d1 test: get_outstanding_reference_documents (triggered via UI) 2023-11-07 14:44:04 +01:00
ruthra kumar
416bd400bb refactor: optimize for speed 2023-11-07 17:57:20 +05:30
s-aga-r
ee60fa940c chore: typo in Stock Entry enqueue msg 2023-11-07 17:33:29 +05:30
ruthra kumar
6210b24c64 Merge pull request #37954 from ruthra-kumar/expense_claim_repost
refactor: expand repost to `Expense Claim` and make it configurable
2023-11-07 15:40:55 +05:30
Gursheen Anand
68c6ad6036 fix: test for balance in forex account after revaluation 2023-11-07 15:31:52 +05:30
ruthra kumar
10b9570429 refactor: update permissions for repost settings 2023-11-07 14:30:06 +05:30
ruthra kumar
11c8d9fcf1 refactor(test): repost test case for purchase invoice 2023-11-07 14:18:07 +05:30
ruthra kumar
61705047b0 refactor: select distinct types 2023-11-07 13:42:09 +05:30
Gursheen Anand
ea4b6ff27b fix: remove string from against field in loyalty point entry 2023-11-07 13:05:38 +05:30
Gursheen Anand
5ce395a60a fix: purchase receipt test 2023-11-07 12:52:49 +05:30
ruthra kumar
ac79b8483f refactor(test): update repost settings for test cases 2023-11-07 12:46:06 +05:30
ruthra kumar
0135293127 Merge pull request #37956 from ruthra-kumar/type_error_on_payment_entry
fix: type error on new payment entry
2023-11-07 12:21:29 +05:30
ruthra kumar
adff287160 fix: type error on new payment entry 2023-11-07 12:15:25 +05:30
ruthra kumar
b651b36fff refactor: support for expense claim repost 2023-11-07 11:59:33 +05:30
ruthra kumar
5a068410c6 refactor: configurable repost settings 2023-11-07 11:59:33 +05:30
ruthra kumar
ebb186c8df chore: patch to update default repost settings value 2023-11-07 11:59:30 +05:30
ruthra kumar
d582a73795 feat: settings page for repost 2023-11-07 10:12:12 +05:30
Gursheen Anand
e845b63228 fix: single dr cr entries 2023-11-06 20:37:05 +05:30
ruthra kumar
cfe0479dfb Merge pull request #37948 from ruthra-kumar/typo_in_ar_report
fix: typo in AR report
2023-11-06 20:25:10 +05:30
ruthra kumar
67e74d03ed fix: typo in AR report 2023-11-06 20:23:26 +05:30
hyaray
8722318081 fix: add translation wrapper 2023-11-06 19:49:45 +05:30
s-aga-r
2d272fa51c Merge pull request #37903 from s-aga-r/FIX-5333
fix: link between parent and child procedure
2023-11-06 19:26:05 +05:30
s-aga-r
15840d408b Merge pull request #37935 from s-aga-r/FIX-5365
fix: don't reset rate if greater than zero in standalone debit note
2023-11-06 19:25:42 +05:30
s-aga-r
f9fc6c9c9d fix(test): test_gl_entries_for_standalone_debit_note 2023-11-06 19:02:01 +05:30
s-aga-r
30c6b83a10 test: add test case for Quality Procedure` 2023-11-06 18:55:06 +05:30
s-aga-r
1754d027b3 Merge pull request #37928 from s-aga-r/FIX-5227
fix: make `Material Request Item` required if `Material Request` is set in PO
2023-11-06 17:22:27 +05:30
Gursheen Anand
a1f8595a6a chore: linting issue 2023-11-06 17:20:11 +05:30
s-aga-r
5cce522ecd fix: don't reset rate if greater than zero in standalone debit note 2023-11-06 17:18:33 +05:30
Gursheen Anand
758ec720de fix: remove join for against in purchase receipt 2023-11-06 17:14:55 +05:30
Gursheen Kaur Anand
6280031722 Merge branch 'develop' into make-against-field-dynamic 2023-11-06 17:06:03 +05:30
Gursheen Anand
ff0343d2cc fix: auto separate against accounts 2023-11-06 16:46:43 +05:30
Gursheen Anand
3d00d74fed fix: combine jv entries for rate revaluation 2023-11-06 16:45:56 +05:30
vishal
30402033bc fix: minor change added to test_case 2023-11-06 13:02:04 +05:30
vishal
de445b32f5 feat(accounts_receivable): test_case added for multi-select customer group 2023-11-06 12:39:11 +05:30
rohitwaghchaure
34d3eb88b3 feat: reserved production plan sub assembly items (#37884) 2023-11-06 11:07:09 +05:30
s-aga-r
a9d91189b0 fix: make Material Request Item required if Material Request is set in PO 2023-11-06 11:05:04 +05:30
Gursheen Anand
84f0d1ff1f chore: linting issues 2023-11-06 10:30:49 +05:30
Gursheen Anand
98a8288da2 fix: handle gle for standalone credit and debit notes 2023-11-06 09:53:11 +05:30
Gursheen Anand
0e100cd451 fix: skip check for removed validation 2023-11-06 09:51:26 +05:30
ruthra kumar
e5a018f84c Merge pull request #37879 from ruthra-kumar/flag_to_toggle_dn_update_on_cr_note
refactor: flag to toggle billed amy update in DN for Credit Note
2023-11-06 08:40:27 +05:30
Deepesh Garg
2b02ef0066 fix: POS change amount gl entry with no amount (#37799) 2023-11-05 17:25:05 +05:30
viralkansodiya15
e5bc8fccb1 fix: list index out of range (#37890)
* fix: list index out of range

* fix: solve linter test failing
2023-11-05 11:54:35 +05:30
ruthra kumar
0c5bdbdcf3 refactor(test): enable billed amt update on Sales Return(Cr Note) 2023-11-05 08:32:27 +05:30
ruthra kumar
a3191f1c8c refactor: flag to toggle billed amy update in DN for Credit Note 2023-11-05 08:16:13 +05:30
ruthra kumar
787784e937 Merge pull request #37886 from ruthra-kumar/add_rounding_effect_in_reconciliation_tool
refactor: avoid precision based validation error while reconciling
2023-11-05 05:16:31 +05:30
Raffael Meyer
539ff03a7e Merge pull request #37299 from marination/party-name-match 2023-11-04 16:47:26 +01:00
s-aga-r
e42a3e0084 Merge pull request #37754 from s-aga-r/VALIDATE-RESERVED-STOCK
fix: consider reserved stock while cancelling a stock transaction
2023-11-04 15:36:49 +05:30
s-aga-r
8fbd4cea5b chore: add missing filters for Parent Procedure 2023-11-04 14:17:26 +05:30
s-aga-r
05f24ede96 fix: link between parent and child procedure 2023-11-04 14:17:24 +05:30
s-aga-r
54b323e557 test: add test case for stock stock reservation 2023-11-04 14:15:21 +05:30
s-aga-r
9231706227 fix: qty based check for stock reservation of serial-batch items based on qty 2023-11-04 14:15:21 +05:30
s-aga-r
1f88b1ef84 chore: patch to set reserved stock in Bin 2023-11-04 14:15:19 +05:30
s-aga-r
10242235bc fix(test): test_stock_reservation_against_sales_order 2023-11-04 14:14:58 +05:30
s-aga-r
73b65ac82e fix: consider reserved stock while cancelling a stock transaction 2023-11-04 14:14:58 +05:30
s-aga-r
f52916a2c3 feat: maintain Reserved Stock in Bin 2023-11-04 14:14:58 +05:30
s-aga-r
98d6cdd53c feat: add field reserved_stock in Bin 2023-11-04 14:14:58 +05:30
s-aga-r
e1a87a802d fix: consider reserved batches while cancelling a stock transaction 2023-11-04 14:14:58 +05:30
s-aga-r
d9e284366d fix: consider reserved serial nos while cancelling a stock transaction 2023-11-04 14:14:58 +05:30
ruthra kumar
56e9a46c17 Merge pull request #37887 from ruthra-kumar/add_index_to_payment_ledger
chore: performance optimization on payment ledger entry doctype
2023-11-04 08:56:52 +05:30
Anand Baburajan
2ce6bbf291 chore: rename depreciation_amount_based_on_num_days_in_month to daily_prorata_based [dev] (#37897)
chore: rename depreciation_amount_based_on_num_days_in_month to daily_prorata_based
2023-11-03 20:11:46 +00:00
Anand Baburajan
568d5bfbe8 chore: rename daily_depreciation in asset to depreciation_amount_based_on_num_days_in_month [dev] (#37893)
* chore: rename daily_depreciation to depreciation_based_on_num_days_in_month

* chore: add patch

* chore: remove unnecessary files

* chore: add amount in field name

* chore: add amount in label
2023-11-03 22:35:08 +05:30
ruthra kumar
60435daba3 refactor: avoid precision based validation error while reconciling 2023-11-03 17:58:19 +05:30
ruthra kumar
f14d1eb871 chore: performance optimization on payment ledger entry doctype 2023-11-03 17:56:40 +05:30
rohitwaghchaure
d4c0dbfacc fix: incorrect available qty for backdated stock reco with batch (#37858)
* fix: incorrect available qty for backdated stock reco with batch

* test: added test case
2023-11-03 17:19:06 +05:30
Ankush Menat
469ae2c7f1 perf: index return against for purchase invoice (#37881) 2023-11-03 15:57:52 +05:30
ruthra kumar
a9372c42cd Merge pull request #37869 from ruthra-kumar/reconcile_only_on_voucher
refactor: 'group only by voucher' flag in AR/AP report
2023-11-03 12:29:33 +05:30
ruthra kumar
edf67444ea Merge pull request #37852 from ruthra-kumar/better_gl_and_pl_comparision_report
refactor: better ledger comparision report
2023-11-03 12:29:18 +05:30
Gursheen Anand
4867ca353c refactor: move common util for fetching party types using account type 2023-11-03 12:00:56 +05:30
Gursheen Anand
4015723591 fix: credit note receive payment entry 2023-11-03 11:58:25 +05:30
s-aga-r
f70d779034 Merge pull request #37864 from s-aga-r/FIX-5139
fix: permission error while creating Supplier Quotation from Portal
2023-11-03 11:57:06 +05:30
ruthra kumar
23beb46d15 refactor: group only by voucher flag in AR/AP report 2023-11-03 11:47:02 +05:30
s-aga-r
e019d43d0b fix: permission error while creating Supplier Quotation from Portal 2023-11-03 00:53:30 +05:30
Deepesh Garg
c37e374fdd fix: Add index to supplier invoice field (#37861)
* fix: Add index to supplier invoice field

* chore: remove unintetional changes
2023-11-02 21:00:45 +05:30
Gursheen Anand
cd1e016163 test: receive payments from payable party 2023-11-02 17:39:27 +05:30
Gursheen Anand
1f4b381748 fix: test for invoice returns 2023-11-02 17:38:43 +05:30
rohitwaghchaure
fb9a80923b Merge pull request #37856 from rohitwaghchaure/fixed-test-cases-reposting-valuation
chore: fix test cases related repost item valuation
2023-11-02 14:52:15 +05:30
Rohit Waghchaure
ed1c198897 chore: fix test cases 2023-11-02 14:21:16 +05:30
Gursheen Kaur Anand
1b808e1d7c fix: standard submit perm in repost ledger for editable invoices (#37826)
* fix: ignore perm while reposting ledger

* fix: use flag in save

* fix: remove unnecessary save
2023-11-02 14:01:26 +05:30
ruthra kumar
639f427d6d refactor(test): for ledger comparision report 2023-11-02 13:40:40 +05:30
ruthra kumar
539f0251d9 refactor: better output on gl and pl comparison report 2023-11-02 13:37:25 +05:30
rohitwaghchaure
d91d9b02d4 Merge pull request #37849 from rohitwaghchaure/fixed-remove-voucher_type_no
fix: remove voucher type and no for Item and Warehouse based reposting
2023-11-02 13:26:44 +05:30
Rohit Waghchaure
0104897d69 fix: remove voucher type and no for Item and Warehouse based reposting 2023-11-02 13:24:56 +05:30
ruthra kumar
5530a5b303 Merge pull request #37845 from ruthra-kumar/std_permissions_for_process_payment_reconciliation_log
chore: add std permissions for Process Payment Reconciilation log
2023-11-02 12:10:19 +05:30
ruthra kumar
a9fceeb00f chore: std permissions for Process Payment Reconciilation log 2023-11-02 11:32:24 +05:30
ruthra kumar
34e3538b55 Merge pull request #37838 from ruthra-kumar/pass_limits_to_je_and_pe_queries
refactor: pass limits to JE and PE queries in reconciliation tool
2023-11-02 10:42:11 +05:30
s-aga-r
851a234988 Merge pull request #37819 from s-aga-r/FIX-5274
fix: `TypeError` in PR for non-stock item
2023-11-02 10:39:35 +05:30
s-aga-r
17893eff59 Merge pull request #37836 from barredterra/filters-from-route-in-stock-balance
feat(Stock Balance): add filters from route
2023-11-02 10:12:48 +05:30
ruthra kumar
54e8ce1ac5 refactor: pass limits to JE and PE queries in reconciliation tool 2023-11-02 09:16:26 +05:30
barredterra
38e5e4a893 feat(Stock Balance): add filters from route 2023-11-01 18:05:50 +01:00
ruthra kumar
65cc804186 Merge pull request #37832 from ruthra-kumar/checkbox_to_toggle_remarks_in_general_ledger
refactor: checkbox to toggle remarks in General Ledger
2023-11-01 21:15:47 +05:30
ruthra kumar
8fa677b8e8 refactor: checkbox to toggle remarks in General Ledger 2023-11-01 20:30:16 +05:30
marination
6bd56d2d5f refactor: split_invoices_based_on_payment_terms
- Invoices were in the wrong order due to the logic. The invoices with payment terms were added first and the rest after.
- Overly long function with unnecessary loops (reduced to one main loop) and complexity
- The split row as per payment terms was not ordered. So the second installment was allocated first
2023-11-01 20:11:00 +05:30
s-aga-r
204face50d Merge pull request #37827 from s-aga-r/REFACTOR-BIN
refactor: update fields label and remove unused fields from BIN
2023-11-01 16:25:40 +05:30
Raffael Meyer
c5f5aa8208 feat: report Timesheet Billing Summary (#37451) 2023-11-01 15:49:21 +05:30
Gursheen Anand
3d9938221a fix: remove validation for negative outstanding invoices 2023-11-01 15:40:54 +05:30
s-aga-r
f0a1f4ac7c refactor: remove unused fields fcfs_rate and ma_rate from Bin 2023-11-01 15:36:41 +05:30
s-aga-r
ec1a7869f8 refactor: rearrange fields and update label 2023-11-01 15:35:18 +05:30
mrchenxxx
7e67d42d1d chore: Update translations
chore: Update translations
2023-11-01 15:25:36 +05:30
Deepesh Garg
da9a7ff63d Merge pull request #37278 from barredterra/translate-accounts-settings-de
fix: german translations of Accounts Settings
2023-11-01 15:11:52 +05:30
Deepesh Garg
47f913abcb Merge pull request #37694 from viralpatel15/develop
fix: set docstatus filter to ignore cancel document
2023-11-01 14:16:31 +05:30
Deepesh Garg
fc4199504f Merge pull request #37590 from GursheenK/gov-compliance-for-tax-withholding-report
fix: gov compliance for tax withholding report
2023-11-01 14:09:29 +05:30
Deepesh Garg
0fc14b72ca Merge pull request #37635 from GursheenK/validation-for-order-item-from-qtn
fix: validate sales order item with quotation
2023-11-01 14:03:41 +05:30
Deepesh Garg
804ed0d26a Merge pull request #37680 from GursheenK/workaround-for-SO-status-updater
fix: status when over delivery or billing in SO
2023-11-01 12:29:28 +05:30
s-aga-r
028b3e2fbf fix: TypeError in PR for non-stock item 2023-11-01 11:48:27 +05:30
marination
e0a03789ae fix: Use process.extract to get the corresponding party doc name of the result
- rapidfuzz accepts an iterable or a dict. dict input gives the dict key and value in the result
2023-10-31 16:53:08 +01:00
s-aga-r
7a3e4a8a05 Merge pull request #37742 from aadhilpm/patch-1
fix: remove GoCardless Settings and Mpesa Settings from Workspace
2023-10-31 20:02:39 +05:30
Aadhil
e16cc38b70 fix: remove GoCardless Settings and Mpesa Settings from Workspace 2023-10-31 19:59:52 +05:30
ruthra kumar
c43b30cf36 Merge pull request #37795 from ruthra-kumar/patch_for_reconciliation_limits
chore: update default limit values in reconciliation tool
2023-10-31 19:51:13 +05:30
ruthra kumar
07a8024b45 Merge pull request #37793 from ruthra-kumar/refactor_ar_remarks_fetching
refactor: pull remarks only if needed on AR/AP report
2023-10-31 19:50:38 +05:30
s-aga-r
b64147cce9 Merge pull request #37644 from bosue/fix_typo_overrridden
chore: Fix typo followup to #37636
2023-10-31 19:45:37 +05:30
s-aga-r
058bb95171 Merge pull request #37743 from barredterra/translate-project-page
fix: make project page translatable
2023-10-31 19:41:02 +05:30
hyaray
daf2ec063c fix: In-Transit Warehouse company filter (#37796) 2023-10-31 18:51:27 +05:30
rohitwaghchaure
77af247450 chore: fixed test cases (#37792) 2023-10-31 18:02:24 +05:30
ruthra kumar
1fd888175f chore: update default limit values in reconciliation tool 2023-10-31 17:47:55 +05:30
David Arnold
fb0ec74d08 fix(packed_item): ensure proper names for ref integrity (#37597) 2023-10-31 17:41:44 +05:30
ruthra kumar
eb73017798 refactor: pull remarks only if needed on AR/AP report 2023-10-31 17:31:28 +05:30
David Arnold
139a68fd0f test: fix bad test data (#37773)
* test(stock): fix bad test data

* test(asset): fix bad test data

* test(stock): fix bad test data

* test(manufacturing): fix bad test data
2023-10-31 16:50:09 +05:30
mergify[bot]
d758fc1b89 fix: incorrect material request quantity in production plan (backport #37785) (#37789)
fix: incorrect material request quantity in production plan (#37785)

(cherry picked from commit 25718d9f1b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-10-31 16:28:27 +05:30
rohitwaghchaure
056b74b162 fix: indexing on Delivery Note Item (#37766)
fix: added indexing on Delivery Note Item
2023-10-31 12:32:52 +05:30
David Arnold
c78fdaae90 Merge remote-tracking branch 'upstream/develop' into feat/so-po-advance-payment-status 2023-10-30 17:25:08 +01:00
s-aga-r
e752f8f0ef Merge pull request #37758 from s-aga-r/FIX-37566
fix: `PermissionError` while creating DN from SO
2023-10-30 18:08:27 +05:30
ruthra kumar
54a32adef3 Merge pull request #37761 from ruthra-kumar/add_index_to_posting_date_in_ple
chore: add index to posting_date in PLE
2023-10-30 16:48:46 +05:30
ruthra kumar
ca69845238 chore: add index to posting_date in PLE 2023-10-30 16:15:05 +05:30
ruthra kumar
d2fdda8bcd Merge pull request #37720 from ruthra-kumar/ignore_cancelled_entries_while_looking_for_currency
refactor: ignore cancelled GLE's while looking for currency of existing entries
2023-10-30 16:11:05 +05:30
s-aga-r
afc64ed9ee fix: ignore permissions while mapping DN Item 2023-10-30 15:39:11 +05:30
Didiman1998
500435b856 fix: make changes that enable gantt view for job cards (#37661)
* fix: make changes that enable gantt view for job cards

* fix: add fields on listview and remove from json file

* fix: undo modified date

---------

Co-authored-by: Dietmar Fischer <fischer@kk-software.de>
2023-10-30 15:18:41 +05:30
viralkansodiya15
a15484fe3d fix: solve linter test and update 2023-10-30 13:01:25 +05:30
viralkansodiya15
76c61c1b04 Merge branch 'frappe:develop' into develop 2023-10-30 12:12:47 +05:30
viralkansodiya15
de58c67991 fix: linter test solve 2023-10-30 10:44:17 +05:30
s-aga-r
8a34a4ba68 Merge pull request #37732 from bosue/remove_extraneous_disabled_filters
refactor: remove extraneous disabled filters
2023-10-30 09:54:05 +05:30
Richard Case
208d5042ee chore: update tests 2023-10-30 00:48:17 +00:00
Richard Case
ece7049390 feat: in_party_currency option for AR/AP reports 2023-10-30 00:15:05 +00:00
barredterra
e72afd0bd6 fix: make project page translatable 2023-10-29 17:48:48 +01:00
Deepesh Garg
83db7c6a65 Merge pull request #37737 from deepeshgarg007/arbnb_account_fetch
fix: fetch asset received but not billed account only when needed
2023-10-29 13:55:24 +05:30
s-aga-r
62384e9321 Merge pull request #37722 from s-aga-r/FIX-TYPO
fix: typo in function name and msg
2023-10-29 12:17:27 +05:30
Deepesh Garg
1081df3d7e Merge pull request #37674 from GursheenK/item-variant-tax-template
fix(minor): set tax values for item variants
2023-10-29 10:33:03 +05:30
Deepesh Garg
3a8736374c fix: fetch asset received but not billed account only when needed 2023-10-29 10:18:47 +05:30
Bernd Oliver Sünderhauf
f276fbba4f refactor: remove extraneous disabled filters 2023-10-28 02:10:28 +02:00
rohitwaghchaure
fd78f868e1 fix: unsupported operand type(s) for serial and batch bundle in POS Invoice (#37721) 2023-10-27 23:33:04 +05:30
Anand Baburajan
d99a56bc27 chore: allow wip_composite_asset in the MR PO PR PI flow (#37723) 2023-10-27 18:54:36 +05:30
s-aga-r
48c66b68ab fix: typo in function name and msg 2023-10-27 17:07:16 +05:30
ruthra kumar
8d9b90f3f5 refactor: ignore cancelled GLE's while looking for currency 2023-10-27 13:58:44 +05:30
Deepesh Garg
4a86375e89 Merge pull request #37690 from deepeshgarg007/plaid_fixes
fix(plaid): Do not sync pending transactions
2023-10-27 11:37:33 +05:30
vishal
b60c57a97d fix: minor issue 2023-10-27 11:22:55 +05:30
vishal
8903c1bc6f feat: multi-select customer group in AR Report 2023-10-27 11:12:55 +05:30
ruthra kumar
e33fd450fd Merge pull request #37707 from ruthra-kumar/typeerror_on_tds_payable_monthly
fix: typeerror on TDS payable monthly report
2023-10-27 07:36:19 +05:30
ruthra kumar
dc5d2c7406 fix: typerror on TDS payable monthly report 2023-10-26 20:36:52 +05:30
David Arnold
1612d7ba3f fix(defaults): apply discount and provisonal defaults from item group and brand if available (#37466) 2023-10-26 12:03:22 +00:00
David Arnold
681782121c fix: avoid name clash in delivery stop (#37306)
* fix(stock): avoid name clash in delivery stop with Document.lock()

* chore(stock): format delivery stop json according to doctype builder
2023-10-26 11:46:50 +00:00
s-aga-r
35cf944cb7 Merge pull request #37604 from blaggacao/feat/link-dn-list-from-dt-form
feat(delivery): link to delivery notes list view from delivery trip
2023-10-26 13:01:55 +05:30
viralkansodiya15
4bbad7f448 fix: set docstatus filter to ignore cancel document 2023-10-26 11:45:47 +05:30
s-aga-r
74b6bfb9eb Merge pull request #37686 from s-aga-r/FIX-37423
feat: allow return of components for SCO that don't have SCR created
2023-10-26 11:15:36 +05:30
Deepesh Garg
46ea868559 fix(plaid): Do not sync pending transactions 2023-10-25 22:58:24 +05:30
s-aga-r
3290df5593 fix: consider returned qty while calculating unsupplied qty 2023-10-25 19:08:51 +05:30
s-aga-r
8e3b9ec879 feat: allow return of components for SCO that don't have SCR created 2023-10-25 18:06:23 +05:30
s-aga-r
787fc8737f Merge pull request #37669 from s-aga-r/FIX-37664
refactor: rename field `Over Order Allowance` to `Blanket Order Allowance`
2023-10-25 14:53:25 +05:30
s-aga-r
fcfcf6957e chore: patch to rename field over_order_allowance 2023-10-25 14:03:53 +05:30
s-aga-r
8ffa2bfe25 refactor: rename field Over Order Allowance to Blanket Order Allowance 2023-10-25 14:03:51 +05:30
Gursheen Anand
d69b0d76dd fix: status for over delivery or billing 2023-10-25 13:59:37 +05:30
rohitwaghchaure
2bcff4c7f2 chore: fixed test case non_internal_transfer_delivery_note (#37671) 2023-10-25 13:24:34 +05:30
Gursheen Anand
d436a40739 fix: only update if variant table empty 2023-10-25 13:06:03 +05:30
Gursheen Anand
5deba1b6f9 fix: copy all child fields to item variant 2023-10-25 12:50:16 +05:30
mergify[bot]
886102d462 chore: fixed test cases related to Internal Transfer (backport #37659) (#37662)
* chore: fixed test cases related to Internal Transfer (#37659)

(cherry picked from commit 72d32a4901)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py

* chore: fix conflicts

* chore: fix conflicts

* chore: fix test cases

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-10-25 12:46:39 +05:30
Ankush Menat
7be578485e fix: force delete removed report (#37668) 2023-10-25 07:12:35 +00:00
ruthra kumar
7c1b990c55 Merge pull request #37625 from ruthra-kumar/set_multi_currency_fields_for_je_in_bank_reconciliation
refactor: set exchange rate on foreign currency JE from Bank Reconciliation
2023-10-25 11:08:55 +05:30
ruthra kumar
74a0d6408a refactor: handle bank transaction in foreign currency 2023-10-25 09:45:05 +05:30
rohitwaghchaure
92cbe580e6 fix: incorrect process loss validation for multiple finished items (#37576) 2023-10-24 15:28:55 +05:30
Ankush Menat
d92eb0c603 Update initiate_release.yml 2023-10-24 15:25:03 +05:30
Deepesh Garg
11d956fa18 fix: Purchase Receipt GL Entries (#37642)
* fix: Purchase Receipt GL Entries

* chore: cleanup

* test: set cwip account
2023-10-24 14:28:19 +05:30
s-aga-r
8e523961dc fix(patch): update_sre_from_voucher_details (#37649) 2023-10-24 14:13:26 +05:30
s-aga-r
cdbe1c87d4 Merge pull request #37603 from s-aga-r/AUTO-RESERVATION
feat: auto reserve stock for Sales Order on purchase
2023-10-24 10:14:18 +05:30
ruthra kumar
3f42128fff Merge pull request #37586 from ruthra-kumar/overallocation_on_po_to_multiple_invoices
fix: overallocation on purchase order to multiple invoices
2023-10-24 08:44:00 +05:30
ruthra kumar
4dff2c7a0d chore: fix flakiness test_sales_order_partial_advance_payment 2023-10-24 08:09:22 +05:30
ruthra kumar
547993f801 refactor(test): make use of utility methods 2023-10-24 06:40:14 +05:30
ruthra kumar
946228d783 test: overalloction on reconciliation when PO is involved 2023-10-24 06:40:14 +05:30
ruthra kumar
23df4205f8 fix: overallocation on Payment with PO/SO 2023-10-24 06:40:14 +05:30
ruthra kumar
89f484282a refactor: exc rate on foreign currency JE from Bank Reconciliation 2023-10-24 06:39:37 +05:30
Bernd Oliver Sünderhauf
9ef26e1df0 chore: Fix typo followup to #37636 2023-10-23 19:41:55 +02:00
ruthra kumar
025acc0e48 Merge pull request #37630 from ruthra-kumar/provision_to_set_for_gain_loss_journal
refactor: configurable exchange gain or loss posting date
2023-10-23 21:25:48 +05:30
s-aga-r
6942ab1012 chore: patch to update From Voucher details 2023-10-23 19:12:55 +05:30
Deepesh Garg
3bfb7b79f2 refactor: Remove expense included in valuation accounts (#37632)
* refactor: Remove expense included in valuation accounts

* test: Deprecate tests

* test: Depricate tests

* test: Depricate tests
2023-10-23 18:23:45 +05:30
s-aga-r
24788ddcc0 chore: add SRE link in PR Connections 2023-10-23 18:00:58 +05:30
s-aga-r
adf313a6d3 test: add test case for auto-reservation from PR 2023-10-23 17:52:59 +05:30
Raffael Meyer
7f39318340 Merge branch 'develop' into translate-accounts-settings-de 2023-10-23 13:24:27 +02:00
s-aga-r
a432290a82 fix: ignore qty msg if From Voucher is set 2023-10-23 16:26:00 +05:30
Imesha Sudasingha
2b64e1ca8b chore: typo in description (#37636)
chore: typo in description
2023-10-23 15:28:52 +05:30
ruthra kumar
514d5434a3 test: varying posting date for gain loss journal 2023-10-23 12:32:10 +05:30
ruthra kumar
7e600a6494 refactor: pass gain loss posting date to controller 2023-10-23 12:12:59 +05:30
Gursheen Anand
17ebc1ea80 fix: validate so item with qtn 2023-10-23 11:56:28 +05:30
Richard Case
b099590b2c fix: Quality Inspection Parameter migration - DuplicateEntryError due to case sensitivity (#37499)
* fix: account for case-insensitive database primary key for parameter names

* chore: linting
2023-10-23 11:40:07 +05:30
ruthra kumar
5323bb7bee refactor: introduce fields in popup 2023-10-23 10:45:21 +05:30
ruthra kumar
55dbcee36a refactor: gain_loss posting date fields in the allocation table 2023-10-23 10:45:17 +05:30
HENRY Florian
ec9434aae3 refactor: remove fr translation duplicate in frappe app (#37288) 2023-10-23 10:15:23 +05:30
Deepesh Garg
d1ec0a6093 chore: Add missing commits back (#37618)
* chore: Add missing commits back

* test: cwip accounting unit tests

* chore: Attribute error

* chore: Purchase Invoice tests

* chore: Missing asset account

* chore: Missing asset account

* chore: update tests

* fix: Internal transfer GL Entries
2023-10-23 00:16:40 +05:30
rohitwaghchaure
5136fe196b fix: remove from or target warehouse for non internal transfer entries (#37612) 2023-10-22 20:03:02 +05:30
Niraj Gautam
4aa841786f fix: Update user profile picture, if employee profile pic is changed (#37483)
* fix: Update user pic if employee pic is changed.

* fix: Update condition
2023-10-21 18:13:53 +05:30
Vishnu VS
98cc7434d2 feat(Supplier Scorecard): added method for invoiced quantity in supplier scorecard (#37580)
feat(Supplier Scorecard): added method for invoiced quantity in supplier scorecard

Co-authored-by: vishnu <vishnuviswambara2002@gmail.com>
2023-10-21 18:04:54 +05:30
Vishnu VS
35020a9423 fix: error while loading Financial Ratios report (#37613) 2023-10-21 18:02:32 +05:30
William Moreno
1cc1c9aa38 fix: Typo in Nicaraguan chart of accounts (#37620)
fix: Typo in Nicaraguan chart of accounts
2023-10-21 18:02:02 +05:30
Gursheen Kaur Anand
9d392970f0 fix(minor): filter bank accounts in bank statement import (#37525)
fix: filter by company in bank account
2023-10-21 17:59:12 +05:30
Gursheen Kaur Anand
b0d440c34b fix: set empty value for tax template in item details (#37496)
* fix: empty tax template for items with invalid templates

* fix: test for empty tax template

* fix: test for item tax template calculation

* fix: test for pos inv tax template calculation
2023-10-21 17:58:43 +05:30
Akhil Narang
21c3d9c371 refactor: use gzip library's compress() and decompress() methods directly (#37611)
The util methods in framework were added for python2.7 compat, so can be removed

Signed-off-by: Akhil Narang <me@akhilnarang.dev>

[skip ci]
2023-10-21 11:19:45 +05:30
Deepesh Garg
dae66eab36 Merge branch 'develop' of https://github.com/frappe/erpnext into asset_purchase_receipt_gl 2023-10-20 20:12:43 +05:30
Deepesh Garg
9474908449 fix: Purchase Invoice GL entires for assets 2023-10-20 19:49:41 +05:30
Deepesh Garg
eec4057e8d fix: Purchase Invoice GL entires for assets 2023-10-20 19:42:14 +05:30
Ankush Menat
08bc77fb95 Merge pull request #37614 from maharshivpatel/fix-new-logo
chore: new erpnext logo as per espresso
2023-10-20 17:53:41 +05:30
Maharshi Patel
fff97b1cd2 chore: new erpnext logo as per espresso 2023-10-20 17:34:57 +05:30
Deepesh Garg
2a7d1c4c8d Merge pull request #37595 from vorasmit/purchase-gl
fix: add regional support to extend purchase gl entries
2023-10-20 16:51:58 +05:30
Deepesh Garg
0b674b608b Merge branch 'develop' of https://github.com/frappe/erpnext into asset_purchase_receipt_gl 2023-10-20 16:50:52 +05:30
rohitwaghchaure
14b009b093 fix: incorrect cost center in the purchase invoice (#37591) 2023-10-20 16:22:29 +05:30
s-aga-r
530922848f Merge pull request #37605 from blaggacao/fix/rename-dt-fetch-stop-link-action
fix(delivery): rename dt fetch stop action
2023-10-20 16:08:44 +05:30
David Arnold
79d51a0a0b fix(delivery): rename dt fetch stop action 2023-10-20 12:31:46 +02:00
David Arnold
85488cd0dc feat(delivery): link to delivery notes list view from delivery trip 2023-10-20 12:25:19 +02:00
Ankush Menat
ce7ac29d06 fix: Correctly extract last message (#37602)
frappe.message_log now contains plain dictionary and not JSON strings,
so no need to load them.
2023-10-20 10:20:40 +00:00
s-aga-r
4f363f5bf3 fix: partial reservation against SBB 2023-10-20 15:46:06 +05:30
Smit Vora
ff7108a3b1 fix: update existing doc if possible 2023-10-20 09:33:37 +05:30
Smit Vora
77cc91d06b fix: add regional support to extend purchase gl entries 2023-10-19 22:35:55 +05:30
s-aga-r
45395027d3 fix: incorrect serial and batch get reserved 2023-10-19 19:57:50 +05:30
Gursheen Anand
6d5ccde864 feat: add cols for supplier inv details 2023-10-19 17:55:24 +05:30
s-aga-r
961d2d9926 refactor: rename field against_pick_list 2023-10-19 17:51:34 +05:30
Gursheen Anand
75441017c6 chore: linting issues 2023-10-19 17:13:58 +05:30
Gursheen Anand
ed2457bddf feat: proprietorship & partnership options in entity type 2023-10-19 16:59:49 +05:30
Gursheen Anand
4471ad581e fix: sort by section code 2023-10-19 16:54:10 +05:30
Gursheen Anand
7ecc0d5a04 chore: change column order 2023-10-19 16:44:08 +05:30
s-aga-r
78fe567419 refactor: rename field against_pick_list_item 2023-10-19 16:38:43 +05:30
s-aga-r
5ae9c2f62b feat: add field From Voucher Type in SRE 2023-10-19 16:21:32 +05:30
Gursheen Anand
705dadae8e refactor: avoid relying only on against in tds docs query 2023-10-19 16:21:15 +05:30
Ankush Menat
40cdde8820 ci: seutp v15 config
https://github.com/frappe/frappe/issues/22817
2023-10-19 15:55:02 +05:30
s-aga-r
64497c9228 feat: reserve stock for SO on PR submission 2023-10-19 15:53:38 +05:30
s-aga-r
188175be84 feat: add fields to hold SO and SO Item ref in PR Item 2023-10-19 14:50:38 +05:30
s-aga-r
2b4fa98941 refactor: rename field Auto Reserve Stock for Sales Order 2023-10-19 14:50:35 +05:30
s-aga-r
36a996d704 chore: make Reserve Stock checkbox visible in SO 2023-10-18 12:42:25 +05:30
Deepesh Garg
7f1d916f04 chore: rearrange functions 2023-10-18 08:59:28 +05:30
Deepesh Garg
e15546b42f chore: rearrange functions 2023-10-17 21:28:59 +05:30
Deepesh Garg
8c61fe2ca5 fix: rearrange functions 2023-10-17 20:36:09 +05:30
Deepesh Garg
7f865492d0 chore: pass stock value diff 2023-10-17 17:14:37 +05:30
Deepesh Garg
726fba61f3 Merge branch 'develop' of https://github.com/frappe/erpnext into asset_purchase_receipt_gl 2023-10-17 15:59:16 +05:30
Deepesh Garg
0b85a525fb fix: GL Entries for receiving non CWIP assets using Purchase Receipt 2023-10-17 13:28:56 +05:30
David Arnold
8b21ca2db9 fixup! feat(payment): add advance payment status to advance payment doctypes to better track advance payments 2023-10-17 00:12:19 +02:00
Gursheen Anand
fed8cf4196 fix: test for reposting pi 2023-10-12 17:40:57 +05:30
Gursheen Anand
528ed9c986 fix: check child rows before update 2023-10-12 16:54:41 +05:30
Gursheen Anand
e2cccc4005 chore: correct typo 2023-10-12 15:57:38 +05:30
Gursheen Anand
569d0961f2 test: reposting entries for JV 2023-10-12 15:06:04 +05:30
Gursheen Anand
de46fa8e66 refactor: use qb for JV tests 2023-10-12 15:04:56 +05:30
Gursheen Anand
bfa0c0981c feat: repost ledger button in JV 2023-10-12 13:31:15 +05:30
Gursheen Anand
c77c296b8b feat: validate before allowing repost 2023-10-12 13:10:59 +05:30
Gursheen Anand
9ab55a5bd8 refactor: better abstraction for controller code 2023-10-12 12:48:14 +05:30
Gursheen Anand
e4d657e6fd feat: update after submit in JV 2023-10-12 12:46:50 +05:30
Gursheen Anand
f4c8d63fe0 feat: allow on submit for selected fields 2023-10-12 12:20:01 +05:30
Gursheen Anand
d94f45531a refactor: remove controller logic for setting balances 2023-10-12 12:13:21 +05:30
Gursheen Anand
4d38bd8517 refactor: exclude balances while setting currency 2023-10-12 12:09:58 +05:30
Gursheen Anand
c99e7ca999 refactor: exclude balance while setting acc details 2023-10-12 12:07:36 +05:30
Gursheen Anand
aba3065573 refactor: remove balance formatter 2023-10-12 12:04:44 +05:30
Gursheen Anand
e95dce6d8d refactor: remove balance fields from jv account 2023-10-12 11:54:12 +05:30
Gursheen Anand
35d92abe73 fix: remove multiple against account values from gle 2023-10-11 15:56:59 +05:30
Gursheen Anand
28445058ef fix: split exchange gain loss account entries 2023-10-11 15:56:13 +05:30
Gursheen Anand
aab5737ff3 fix: make JV account against field a dynamic link 2023-10-11 15:55:02 +05:30
David Arnold
e97af14ff4 fixup! feat(payment): add advance payment status to advance payment doctypes to better track advance payments 2023-10-10 23:50:57 +02:00
David Arnold
c809e61103 feat(payment): add advance payment status to advance payment doctypes to better track advance payments 2023-10-10 22:33:06 +02:00
barredterra
115f024260 fix(translations): suggestions from review 2023-10-03 23:06:48 +02:00
Gursheen Anand
952e8cf60c fix: asset capitalization tests 2023-10-03 15:55:34 +05:30
Gursheen Anand
fcfdb9b566 fix: purchase receipt tests 2023-10-03 15:19:33 +05:30
marination
ff1dc72d74 fix: Set right party name in bank transaction
- If party name and docname are different, set the docname in Bank Transaction
2023-09-29 15:19:09 +05:30
barredterra
b3486b43c4 fix: german translations of Accounts Settings 2023-09-27 18:51:09 +02:00
Gursheen Anand
f705bf2efe fix: remove multiple accounts from against in capitalization 2023-09-25 20:10:01 +05:30
Gursheen Anand
6e1565c32c fix: set against type in asset 2023-09-25 20:08:42 +05:30
Gursheen Anand
4ea43ebc5d fix: set against type in stock controller 2023-09-25 20:01:13 +05:30
Gursheen Anand
f292a0cc4c fix: set against type in utils 2023-09-25 19:58:12 +05:30
Gursheen Anand
4c5a83d6cf fix: set against type in controllers 2023-09-25 19:55:40 +05:30
Gursheen Anand
82774f89b1 fix: set against type in deferred revenue 2023-09-25 19:50:47 +05:30
Gursheen Anand
19b220f39c fix: set against type in inv gl dict 2023-09-25 19:49:17 +05:30
Gursheen Anand
725a7f90e9 fix: use dynamic link for against field 2023-09-25 19:45:19 +05:30
2964 changed files with 2210257 additions and 655048 deletions

12
.coderabbit.yml Normal file
View File

@@ -0,0 +1,12 @@
reviews:
auto_review:
ignore_title_keywords:
- "sync translations"
- "update POT file"
- "style: "
review_status: false
poem: false
collapse_walkthrough: true
sequence_diagrams: false
changed_files_summary: false
high_level_summary: false

View File

@@ -9,6 +9,13 @@ trim_trailing_whitespace = true
charset = utf-8
# python, js indentation settings
[{*.py,*.js}]
[{*.py,*.js,*.vue,*.css,*.scss,*.html}]
indent_style = tab
indent_size = 4
max_line_length = 110
# JSON files - mostly doctype schema files
[{*.json}]
insert_final_newline = false
indent_style = space
indent_size = 1

View File

@@ -124,6 +124,7 @@
"beforeEach": true,
"onScan": true,
"extend_cscript": true,
"localforage": true
"localforage": true,
"Plaid": true
}
}

View File

@@ -28,4 +28,20 @@ b147b85e6ac19a9220cd1e2958a6ebd99373283a
494bd9ef78313436f0424b918f200dab8fc7c20b
# bulk format python code with black
baec607ff5905b1c67531096a9cf50ec7ff00a5d
baec607ff5905b1c67531096a9cf50ec7ff00a5d
# bulk refactor with sourcery
eb9ee3f79b94e594fc6dfa4f6514580e125eee8c
# js formatting
ec74a5e56617bbd76ac402451468fd4668af543d
# ruff formatting
a308792ee7fda18a681e9181f4fd00b36385bc23
# noisy typing refactoring of get_item_details
7b7211ac79c248a79ba8a999ff34e734d874c0ae
d827ed21adc7b36047e247cbb0dc6388d048a7f9
# `frappe.flags.in_test` => `frappe.in_test`
7a482a69985c952de0e8193c9d4e086aee65ee6d

View File

@@ -1,7 +1,7 @@
import sys
import requests
from urllib.parse import urlparse
import requests
WEBSITE_REPOS = [
"erpnext_com",
@@ -10,6 +10,7 @@ WEBSITE_REPOS = [
DOCUMENTATION_DOMAINS = [
"docs.erpnext.com",
"docs.frappe.io",
"frappeframework.com",
]
@@ -36,11 +37,7 @@ def is_documentation_link(word: str) -> bool:
def contains_documentation_link(body: str) -> bool:
return any(
is_documentation_link(word)
for line in body.splitlines()
for word in line.split()
)
return any(is_documentation_link(word) for line in body.splitlines() for word in line.split())
def check_pull_request(number: str) -> "tuple[int, str]":
@@ -53,12 +50,7 @@ def check_pull_request(number: str) -> "tuple[int, str]":
head_sha = (payload.get("head") or {}).get("sha")
body = (payload.get("body") or "").lower()
if (
not title.startswith("feat")
or not head_sha
or "no-docs" in body
or "backport" in body
):
if not title.startswith("feat") or not head_sha or "no-docs" in body or "backport" in body:
return 0, "Skipping documentation checks... 🏃"
if contains_documentation_link(body):

View File

@@ -6,15 +6,22 @@ cd ~ || exit
sudo apt update
sudo apt remove mysql-server mysql-client
sudo apt install libcups2-dev redis-server mariadb-client-10.6
sudo apt install libcups2-dev redis-server mariadb-client libmariadb-dev
pip install frappe-bench
githubbranch=${GITHUB_BASE_REF:-${GITHUB_REF##*/}}
frappeuser=${FRAPPE_USER:-"frappe"}
frappebranch=${FRAPPE_BRANCH:-$githubbranch}
frappecommitish=${FRAPPE_BRANCH:-$githubbranch}
mkdir frappe
pushd frappe
git init
git remote add origin "https://github.com/${frappeuser}/frappe"
git fetch origin "${frappecommitish}" --depth 1
git checkout FETCH_HEAD
popd
git clone "https://github.com/${frappeuser}/frappe" --branch "${frappebranch}" --depth 1
bench init --skip-assets --frappe-path ~/frappe --python "$(which python)" frappe-bench
mkdir ~/frappe-bench/sites/test_site
@@ -44,13 +51,9 @@ fi
install_whktml() {
if [ "$(lsb_release -rs)" = "22.04" ]; then
wget -O /tmp/wkhtmltox.deb https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.jammy_amd64.deb
sudo apt install /tmp/wkhtmltox.deb
else
echo "Please update this script to support wkhtmltopdf for $(lsb_release -ds)"
exit 1
fi
wget -O /tmp/wkhtmltox.deb https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.jammy_amd64.deb
sudo apt install /tmp/wkhtmltox.deb
}
install_whktml &
wkpid=$!
@@ -63,7 +66,7 @@ sed -i 's/schedule:/# schedule:/g' Procfile
sed -i 's/socketio:/# socketio:/g' Procfile
sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile
bench get-app payments --branch ${githubbranch%"-hotfix"}
bench get-app payments --branch develop
bench get-app erpnext "${GITHUB_WORKSPACE}"
if [ "$TYPE" == "server" ]; then bench setup requirements --dev; fi

View File

@@ -8,6 +8,7 @@
"mail_login": "test@example.com",
"mail_password": "test",
"admin_password": "admin",
"use_mysqlclient": 1,
"root_login": "root",
"root_password": "root",
"host_name": "http://test_site:8000",

View File

@@ -2,7 +2,9 @@ import re
import sys
errors_encounter = 0
pattern = re.compile(r"_\(([\"']{,3})(?P<message>((?!\1).)*)\1(\s*,\s*context\s*=\s*([\"'])(?P<py_context>((?!\5).)*)\5)*(\s*,(\s*?.*?\n*?)*(,\s*([\"'])(?P<js_context>((?!\11).)*)\11)*)*\)")
pattern = re.compile(
r"_\(([\"']{,3})(?P<message>((?!\1).)*)\1(\s*,\s*context\s*=\s*([\"'])(?P<py_context>((?!\5).)*)\5)*(\s*,(\s*?.*?\n*?)*(,\s*([\"'])(?P<js_context>((?!\11).)*)\11)*)*\)"
)
words_pattern = re.compile(r"_{1,2}\([\"'`]{1,3}.*?[a-zA-Z]")
start_pattern = re.compile(r"_{1,2}\([f\"'`]{1,3}")
f_string_pattern = re.compile(r"_\(f[\"']")
@@ -10,14 +12,14 @@ starts_with_f_pattern = re.compile(r"_\(f")
# skip first argument
files = sys.argv[1:]
files_to_scan = [_file for _file in files if _file.endswith(('.py', '.js'))]
files_to_scan = [_file for _file in files if _file.endswith((".py", ".js"))]
for _file in files_to_scan:
with open(_file, 'r') as f:
print(f'Checking: {_file}')
with open(_file) as f:
print(f"Checking: {_file}")
file_lines = f.readlines()
for line_number, line in enumerate(file_lines, 1):
if 'frappe-lint: disable-translate' in line:
if "frappe-lint: disable-translate" in line:
continue
start_matches = start_pattern.search(line)
@@ -28,7 +30,9 @@ for _file in files_to_scan:
has_f_string = f_string_pattern.search(line)
if has_f_string:
errors_encounter += 1
print(f'\nF-strings are not supported for translations at line number {line_number}\n{line.strip()[:100]}')
print(
f"\nF-strings are not supported for translations at line number {line_number}\n{line.strip()[:100]}"
)
continue
else:
continue
@@ -36,25 +40,29 @@ for _file in files_to_scan:
match = pattern.search(line)
error_found = False
if not match and line.endswith((',\n', '[\n')):
if not match and line.endswith((",\n", "[\n")):
# concat remaining text to validate multiline pattern
line = "".join(file_lines[line_number - 1:])
line = line[start_matches.start() + 1:]
line = "".join(file_lines[line_number - 1 :])
line = line[start_matches.start() + 1 :]
match = pattern.match(line)
if not match:
error_found = True
print(f'\nTranslation syntax error at line number {line_number}\n{line.strip()[:100]}')
print(f"\nTranslation syntax error at line number {line_number}\n{line.strip()[:100]}")
if not error_found and not words_pattern.search(line):
error_found = True
print(f'\nTranslation is useless because it has no words at line number {line_number}\n{line.strip()[:100]}')
print(
f"\nTranslation is useless because it has no words at line number {line_number}\n{line.strip()[:100]}"
)
if error_found:
errors_encounter += 1
if errors_encounter > 0:
print('\nVisit "https://frappeframework.com/docs/user/en/translations" to learn about valid translation strings.')
print(
'\nVisit "https://frappeframework.com/docs/user/en/translations" to learn about valid translation strings.'
)
sys.exit(1)
else:
print('\nGood To Go!')
print("\nGood To Go!")

40
.github/helper/update_pot_file.sh vendored Normal file
View File

@@ -0,0 +1,40 @@
#!/bin/bash
set -e
cd ~ || exit
echo "Setting Up Bench..."
pip install frappe-bench
bench -v init frappe-bench --skip-assets --skip-redis-config-generation --python "$(which python)"
cd ./frappe-bench || exit
echo "Get ERPNext..."
bench get-app --skip-assets erpnext "${GITHUB_WORKSPACE}"
echo "Generating POT file..."
bench generate-pot-file --app erpnext
cd ./apps/erpnext || exit
echo "Configuring git user..."
git config user.email "developers@erpnext.com"
git config user.name "frappe-pr-bot"
echo "Setting the correct git remote..."
# Here, the git remote is a local file path by default. Let's change it to the upstream repo.
git remote set-url upstream https://github.com/frappe/erpnext.git
echo "Creating a new branch..."
isodate=$(date -u +"%Y-%m-%d")
branch_name="pot_${BASE_BRANCH}_${isodate}"
git checkout -b "${branch_name}"
echo "Commiting changes..."
git add erpnext/locale/main.pot
git commit -m "chore: update POT file"
gh auth setup-git
git push -u upstream "${branch_name}"
echo "Creating a PR..."
gh pr create --fill --base "${BASE_BRANCH}" --head "${branch_name}" --reviewer ${PR_REVIEWER} -R frappe/erpnext

4
.github/release.yml vendored Normal file
View File

@@ -0,0 +1,4 @@
changelog:
exclude:
labels:
- skip-release-notes

8
.github/stale.yml vendored
View File

@@ -12,6 +12,14 @@ exemptProjects: true
# Set to true to ignore issues in a milestone (defaults to false)
exemptMilestones: true
# Skip the stale action for draft PRs
exemptDraftPr: true
# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
exemptLabels:
- hotfix
- no-stale
pulls:
daysUntilStale: 15
daysUntilClose: 3

View File

@@ -5,6 +5,9 @@ on:
- closed
- labeled
permissions:
contents: read
jobs:
main:
runs-on: ubuntu-latest
@@ -21,6 +24,6 @@ jobs:
- name: Run backport
uses: ./actions/backport
with:
token: ${{secrets.BACKPORT_BOT_TOKEN}}
token: ${{secrets.RELEASE_TOKEN}}
labelsToAdd: "backport"
title: "{{originalTitle}}"

View File

@@ -2,6 +2,10 @@ name: Trigger Docker build on release
on:
release:
types: [released]
permissions:
contents: read
jobs:
curl:
runs-on: ubuntu-latest

View File

@@ -3,6 +3,9 @@ on:
pull_request:
types: [ opened, synchronize, reopened, edited ]
permissions:
contents: read
jobs:
build:
runs-on: ubuntu-latest

39
.github/workflows/generate-pot-file.yml vendored Normal file
View File

@@ -0,0 +1,39 @@
# This workflow is agnostic to branches. Only maintain on develop branch.
# To add/remove branches just modify the matrix.
name: Regenerate POT file (translatable strings)
on:
schedule:
# 9:30 UTC => 3 PM IST Sunday
- cron: "30 9 * * 0"
workflow_dispatch:
jobs:
regenerate-pot-file:
name: Regenerate POT file
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
branch: ["develop"]
permissions:
contents: write
steps:
- name: Checkout
uses: actions/checkout@v4
with:
ref: ${{ matrix.branch }}
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: "3.12"
- name: Run script to update POT file
run: |
bash ${GITHUB_WORKSPACE}/.github/helper/update_pot_file.sh
env:
GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
BASE_BRANCH: ${{ matrix.branch }}
PR_REVIEWER: barredterra # change to your GitHub username if you copied this file

View File

@@ -2,6 +2,10 @@
# To add/remove versions just modify the matrix.
name: Create weekly release pull requests
permissions:
contents: read
on:
schedule:
# 9:30 UTC => 3 PM IST Tuesday
@@ -15,7 +19,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: ["13", "14"]
version: ["14", "15"]
steps:
- uses: octokit/request-action@v2.x

View File

@@ -0,0 +1,30 @@
name: "Auto-label PRs based on title"
on:
pull_request_target:
types: [opened, reopened]
jobs:
add-label-if-prefix-matches:
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-latest
steps:
- name: Check PR title and add label if it matches prefixes
uses: actions/github-script@v7
continue-on-error: true
with:
script: |
const title = context.payload.pull_request.title.toLowerCase();
const prefixes = ['chore', 'ci', 'style', 'test', 'refactor'];
// Check if the PR title starts with any of the prefixes
if (prefixes.some(prefix => title.startsWith(prefix))) {
await github.rest.issues.addLabels({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.payload.pull_request.number,
labels: ['skip-release-notes']
});
}

View File

@@ -3,6 +3,10 @@ on:
pull_request_target:
types: [opened, reopened]
permissions:
issues: write
pull-requests: write
jobs:
triage:
runs-on: ubuntu-latest

View File

@@ -3,6 +3,9 @@ name: Linters
on:
pull_request: { }
permissions:
contents: read
jobs:
linters:
@@ -20,6 +23,18 @@ jobs:
- name: Install and Run Pre-commit
uses: pre-commit/action@v3.0.0
semgrep:
name: semgrep
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: '3.10'
cache: pip
- name: Download Semgrep rules
run: git clone --depth 1 https://github.com/frappe/semgrep-rules.git frappe-semgrep-rules

21
.github/workflows/lock.yml vendored Normal file
View File

@@ -0,0 +1,21 @@
name: 'Lock threads'
on:
schedule:
- cron: '0 0 * * *'
workflow_dispatch:
permissions:
issues: write
pull-requests: write
jobs:
lock:
runs-on: ubuntu-latest
steps:
- uses: dessant/lock-threads@v5
with:
github-token: ${{ github.token }}
issue-inactive-days: 14
pr-inactive-days: 14

View File

@@ -8,8 +8,14 @@ on:
- '**.md'
- '**.html'
- '**.csv'
- 'crowdin.yml'
- '.coderabbit.yml'
- '.mergify.yml'
workflow_dispatch:
permissions:
contents: read
concurrency:
group: patch-develop-${{ github.event_name }}-${{ github.event.number || github.event_name == 'workflow_dispatch' && github.run_id || '' }}
cancel-in-progress: true
@@ -32,23 +38,23 @@ jobs:
steps:
- name: Clone
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Check for valid Python & Merge Conflicts
run: |
python -m compileall -f "${GITHUB_WORKSPACE}"
python -m compileall -fq "${GITHUB_WORKSPACE}"
if grep -lr --exclude-dir=node_modules "^<<<<<<< " "${GITHUB_WORKSPACE}"
then echo "Found merge conflicts"
exit 1
fi
- name: Setup Python
uses: "actions/setup-python@v4"
uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.11'
- name: Setup Node
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: 18
check-latest: true
@@ -57,7 +63,7 @@ jobs:
run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
- name: Cache pip
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }}
@@ -66,7 +72,7 @@ jobs:
${{ runner.os }}-
- name: Cache node modules
uses: actions/cache@v2
uses: actions/cache@v4
env:
cache-name: cache-node-modules
with:
@@ -81,7 +87,7 @@ jobs:
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- uses: actions/cache@v2
- uses: actions/cache@v4
id: yarn-cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -134,9 +140,11 @@ jobs:
}
update_to_version 14
update_to_version 15
echo "Updating to latest version"
git -C "apps/frappe" checkout -q -f "${GITHUB_BASE_REF:-${GITHUB_REF##*/}}"
git -C "apps/frappe" fetch --depth 1 upstream "${GITHUB_BASE_REF:-${GITHUB_REF##*/}}"
git -C "apps/frappe" checkout -q -f FETCH_HEAD
git -C "apps/erpnext" checkout -q -f "$GITHUB_SHA"
pgrep honcho | xargs kill

28
.github/workflows/patch_faux.yml vendored Normal file
View File

@@ -0,0 +1,28 @@
# Tests are skipped for these files but github doesn't allow "passing" hence this is required.
name: Skipped Patch Test
on:
pull_request:
paths:
- "**.js"
- "**.css"
- "**.md"
- "**.html"
- "**.csv"
- 'crowdin.yml'
- '.coderabbit.yml'
- '.mergify.yml'
permissions:
contents: read
jobs:
test:
runs-on: ubuntu-latest
name: Patch Test
steps:
- name: Pass skipped tests unconditionally
run: "echo Skipped"

View File

@@ -3,6 +3,10 @@ on:
push:
branches:
- version-13
permissions:
contents: read
jobs:
release:
name: Release
@@ -16,7 +20,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v2
with:
node-version: 18
node-version: 20
- name: Setup dependencies
run: |
npm install @semantic-release/git @semantic-release/exec --no-save

View File

@@ -29,7 +29,11 @@ jobs:
steps:
- name: Update notes
run: |
NEW_NOTES=$(gh api --method POST -H "Accept: application/vnd.github+json" /repos/frappe/erpnext/releases/generate-notes -f tag_name=$RELEASE_TAG | jq -r '.body' | sed -E '/^\* (chore|ci|test|docs|style)/d' )
NEW_NOTES=$(gh api --method POST -H "Accept: application/vnd.github+json" /repos/frappe/erpnext/releases/generate-notes -f tag_name=$RELEASE_TAG \
| jq -r '.body' \
| sed -E '/^\* (chore|ci|test|docs|style)/d' \
| sed -E 's/by @mergify //'
)
RELEASE_ID=$(gh api -H "Accept: application/vnd.github+json" /repos/frappe/erpnext/releases/tags/$RELEASE_TAG | jq -r '.id')
gh api --method PATCH -H "Accept: application/vnd.github+json" /repos/frappe/erpnext/releases/$RELEASE_ID -f body="$NEW_NOTES"

View File

@@ -0,0 +1,133 @@
name: Individual
on:
workflow_dispatch:
concurrency:
group: server-individual-tests-develop-${{ github.event_name }}-${{ github.event.number || github.event_name == 'workflow_dispatch' && github.run_id || '' }}
cancel-in-progress: false
permissions:
contents: read
jobs:
discover:
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- name: Clone
uses: actions/checkout@v4
- id: set-matrix
run: |
# Use grep and find to get the list of test files
matrix=$(find . -path '*/doctype/*/test_*.py' | xargs grep -l 'def test_' | awk '{
# Remove ./ prefix, file extension, and replace / with .
gsub(/^\.\//, "", $0)
gsub(/\.py$/, "", $0)
gsub(/\//, ".", $0)
# Add to array
tests[NR] = $0
}
END {
# Start JSON array
printf "{\n \"include\": [\n"
# Loop through array and create JSON objects
for (i=1; i<=NR; i++) {
printf " {\"test\": \"%s\"}", tests[i]
if (i < NR) printf ","
printf "\n"
}
# Close JSON array
printf " ]\n}"
}')
# Output the matrix
echo "matrix=$(echo "$matrix" | jq -c)" >> $GITHUB_OUTPUT
# For debugging (optional)
echo "Generated matrix:"
echo "$matrix"
test:
needs: discover
runs-on: ubuntu-latest
timeout-minutes: 60
env:
NODE_ENV: "production"
strategy:
fail-fast: false
matrix: ${{fromJson(needs.discover.outputs.matrix)}}
name: Test
services:
mysql:
image: mariadb:10.6
env:
MARIADB_ROOT_PASSWORD: 'root'
ports:
- 3306:3306
options: --health-cmd="mariadb-admin ping" --health-interval=5s --health-timeout=2s --health-retries=3
steps:
- name: Clone
uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: '3.12'
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 18
check-latest: true
- name: Add to Hosts
run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
- name: Cache pip
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }}
restore-keys: |
${{ runner.os }}-pip-
${{ runner.os }}-
- name: Cache node modules
uses: actions/cache@v4
env:
cache-name: cache-node-modules
with:
path: ~/.npm
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- uses: actions/cache@v4
id: yarn-cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- name: Install
run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
env:
DB: mariadb
TYPE: server
FRAPPE_USER: ${{ github.event.inputs.user }}
FRAPPE_BRANCH: ${{ github.event.inputs.branch }}
- name: Run Tests
run: 'cd ~/frappe-bench/ && bench --site test_site run-tests --app erpnext --module ${{ matrix.test }}'

View File

@@ -0,0 +1,30 @@
# Tests are skipped for these files but github doesn't allow "passing" hence this is required.
name: Skipped Tests
on:
pull_request:
paths:
- "**.js"
- "**.css"
- "**.md"
- "**.html"
- 'crowdin.yml'
- '.coderabbit.yml'
- '.mergify.yml'
permissions:
contents: read
jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
container: [1, 2, 3, 4]
name: Python Unit Tests
steps:
- name: Pass skipped tests unconditionally
run: "echo Skipped"

View File

@@ -1,12 +1,17 @@
name: Server (Mariadb)
on:
repository_dispatch:
types: [frappe-framework-change]
pull_request:
paths-ignore:
- '**.js'
- '**.css'
- '**.md'
- '**.html'
- 'crowdin.yml'
- '.coderabbit.yml'
- '.mergify.yml'
schedule:
# Run everday at midnight UTC / 5:30 IST
- cron: "0 0 * * *"
@@ -23,6 +28,9 @@ on:
required: false
type: string
permissions:
contents: read
concurrency:
group: server-mariadb-develop-${{ github.event_name }}-${{ github.event.number || github.event_name == 'workflow_dispatch' && github.run_id || '' }}
cancel-in-progress: true
@@ -31,6 +39,9 @@ jobs:
test:
runs-on: ubuntu-latest
timeout-minutes: 60
env:
NODE_ENV: "production"
WITH_COVERAGE: ${{ github.event_name != 'pull_request' }}
strategy:
fail-fast: false
@@ -51,23 +62,23 @@ jobs:
steps:
- name: Clone
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.12'
- name: Check for valid Python & Merge Conflicts
run: |
python -m compileall -f "${GITHUB_WORKSPACE}"
python -m compileall -fq "${GITHUB_WORKSPACE}"
if grep -lr --exclude-dir=node_modules "^<<<<<<< " "${GITHUB_WORKSPACE}"
then echo "Found merge conflicts"
exit 1
fi
- name: Setup Node
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: 18
check-latest: true
@@ -76,7 +87,7 @@ jobs:
run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
- name: Cache pip
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }}
@@ -85,7 +96,7 @@ jobs:
${{ runner.os }}-
- name: Cache node modules
uses: actions/cache@v2
uses: actions/cache@v4
env:
cache-name: cache-node-modules
with:
@@ -100,7 +111,7 @@ jobs:
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- uses: actions/cache@v2
- uses: actions/cache@v4
id: yarn-cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -114,21 +125,22 @@ jobs:
DB: mariadb
TYPE: server
FRAPPE_USER: ${{ github.event.inputs.user }}
FRAPPE_BRANCH: ${{ github.event.inputs.branch }}
FRAPPE_BRANCH: ${{ github.event.client_payload.sha || github.event.inputs.branch }}
- name: Run Tests
run: 'cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --app erpnext --with-coverage --total-builds 4 --build-number ${{ matrix.container }}'
run: 'cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --app erpnext --total-builds ${{ strategy.job-total }} --build-number ${{ matrix.container }}'
env:
TYPE: server
CI_BUILD_ID: ${{ github.run_id }}
ORCHESTRATOR_URL: http://test-orchestrator.frappe.io
CAPTURE_COVERAGE: ${{ github.event_name != 'pull_request' }}
- name: Show bench output
if: ${{ always() }}
run: cat ~/frappe-bench/bench_start.log || true
- name: Upload coverage data
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: github.event_name != 'pull_request'
with:
name: coverage-${{ matrix.container }}
path: /home/runner/frappe-bench/sites/coverage.xml
@@ -137,16 +149,18 @@ jobs:
name: Coverage Wrap Up
needs: test
runs-on: ubuntu-latest
if: ${{ github.event_name != 'pull_request' }}
steps:
- name: Clone
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Download artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
- name: Upload coverage data
uses: codecov/codecov-action@v2
uses: codecov/codecov-action@v4
with:
name: MariaDB
token: ${{ secrets.CODECOV_TOKEN }}
fail_ci_if_error: true
verbose: true

View File

@@ -6,12 +6,18 @@ on:
- '**.js'
- '**.md'
- '**.html'
- 'crowdin.yml'
- '.coderabbit.yml'
- '.mergify.yml'
types: [opened, labelled, synchronize, reopened]
concurrency:
group: server-postgres-develop-${{ github.event_name }}-${{ github.event.number || github.event_name == 'workflow_dispatch' && github.run_id || '' }}
cancel-in-progress: true
permissions:
contents: read
jobs:
test:
if: ${{ contains(github.event.pull_request.labels.*.name, 'postgres') }}
@@ -41,23 +47,23 @@ jobs:
steps:
- name: Clone
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.12'
- name: Check for valid Python & Merge Conflicts
run: |
python -m compileall -f "${GITHUB_WORKSPACE}"
python -m compileall -fq "${GITHUB_WORKSPACE}"
if grep -lr --exclude-dir=node_modules "^<<<<<<< " "${GITHUB_WORKSPACE}"
then echo "Found merge conflicts"
exit 1
fi
- name: Setup Node
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: 18
check-latest: true
@@ -66,7 +72,7 @@ jobs:
run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
- name: Cache pip
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }}
@@ -75,7 +81,7 @@ jobs:
${{ runner.os }}-
- name: Cache node modules
uses: actions/cache@v2
uses: actions/cache@v4
env:
cache-name: cache-node-modules
with:
@@ -90,7 +96,7 @@ jobs:
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- uses: actions/cache@v2
- uses: actions/cache@v4
id: yarn-cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

6
.gitignore vendored
View File

@@ -2,7 +2,6 @@
*.py~
.DS_Store
conf.py
locale
latest_updates.json
.wnf-lang-status
*.egg-info
@@ -15,5 +14,8 @@ __pycache__
*~
.idea/
.vscode/
.helix/
node_modules/
.backportrc.json
.backportrc.json
# Aider AI Chat
.aider*

View File

@@ -2,38 +2,27 @@ pull_request_rules:
- name: Auto-close PRs on stable branch
conditions:
- and:
- and:
- author!=surajshetty3416
- author!=gavindsouza
- author!=rohitwaghchaure
- author!=nabinhait
- author!=ankush
- author!=deepeshgarg007
- author!=frappe-pr-bot
- author!=mergify[bot]
- or:
- base=version-13
- base=version-12
- base=version-14
- base=version-15
- and:
- author!=surajshetty3416
- author!=gavindsouza
- author!=rohitwaghchaure
- author!=nabinhait
- author!=ankush
- author!=deepeshgarg007
- author!=frappe-pr-bot
- author!=mergify[bot]
- or:
- base=version-13
- base=version-12
- base=version-14
- base=version-15
- base=version-16
actions:
close:
comment:
message: |
@{{author}}, thanks for the contribution, but we do not accept pull requests on a stable branch. Please raise PR on an appropriate hotfix branch.
https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist#which-branch
- name: Auto-close PRs on pre-release branch
conditions:
- base=version-13-pre-release
actions:
close:
comment:
message: |
@{{author}}, pre-release branch is not maintained anymore. Releases are directly done by merging hotfix branch to stable branches.
message: |
@{{author}}, thanks for the contribution, but we do not accept pull requests on a stable branch. Please raise PR on an appropriate hotfix branch.
https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist#which-branch
- name: backport to develop
conditions:
- label="backport develop"
@@ -43,7 +32,6 @@ pull_request_rules:
- develop
assignees:
- "{{ author }}"
- name: backport to version-14-hotfix
conditions:
- label="backport version-14-hotfix"
@@ -53,57 +41,15 @@ pull_request_rules:
- version-14-hotfix
assignees:
- "{{ author }}"
- name: backport to version-14-pre-release
- name: backport to version-15-hotfix
conditions:
- label="backport version-14-pre-release"
- label="backport version-15-hotfix"
actions:
backport:
branches:
- version-14-pre-release
- version-15-hotfix
assignees:
- "{{ author }}"
- name: backport to version-13-hotfix
conditions:
- label="backport version-13-hotfix"
actions:
backport:
branches:
- version-13-hotfix
assignees:
- "{{ author }}"
- name: backport to version-13-pre-release
conditions:
- label="backport version-13-pre-release"
actions:
backport:
branches:
- version-13-pre-release
assignees:
- "{{ author }}"
- name: backport to version-12-hotfix
conditions:
- label="backport version-12-hotfix"
actions:
backport:
branches:
- version-12-hotfix
assignees:
- "{{ author }}"
- name: backport to version-12-pre-release
conditions:
- label="backport version-12-pre-release"
actions:
backport:
branches:
- version-12-pre-release
assignees:
- "{{ author }}"
- name: Automatic merge on CI success and review
conditions:
- status-success=linters
@@ -134,6 +80,6 @@ pull_request_rules:
merge:
method: squash
commit_message_template: |
{{ title }} (#{{ number }})
{{ title }} (#{{ number }})
{{ body }}
{{ body }}

View File

@@ -1,11 +1,11 @@
exclude: 'node_modules|.git'
default_stages: [commit]
default_stages: [pre-commit]
fail_fast: false
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.0.1
rev: v4.3.0
hooks:
- id: trailing-whitespace
files: "erpnext.*"
@@ -15,6 +15,25 @@ repos:
args: ['--branch', 'develop']
- id: check-merge-conflict
- id: check-ast
- id: check-json
- id: check-toml
- id: check-yaml
- id: debug-statements
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.7.1
hooks:
- id: prettier
types_or: [javascript, vue, scss]
# Ignore any files that might contain jinja / bundles
exclude: |
(?x)^(
erpnext/public/dist/.*|
cypress/.*|
.*node_modules.*|
.*boilerplate.*|
erpnext/templates/includes/.*
)$
- repo: https://github.com/pre-commit/mirrors-eslint
rev: v8.44.0
@@ -34,29 +53,18 @@ repos:
erpnext/templates/includes/.*
)$
- repo: https://github.com/PyCQA/flake8
rev: 6.0.0
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.2.0
hooks:
- id: flake8
additional_dependencies: [
'flake8-bugbear',
'flake8-tuple',
]
args: ['--config', '.github/helper/.flake8_strict']
exclude: ".*setup.py$"
- id: ruff
name: "Run ruff import sorter"
args: ["--select=I", "--fix"]
- repo: https://github.com/adityahase/black
rev: 9cb0a69f4d0030cdf687eddf314468b39ed54119
hooks:
- id: black
additional_dependencies: ['click==8.0.4']
- repo: https://github.com/PyCQA/isort
rev: 5.12.0
hooks:
- id: isort
exclude: ".*setup.py$"
- id: ruff
name: "Run ruff linter"
- id: ruff-format
name: "Run ruff formatter"
ci:
autoupdate_schedule: weekly

View File

@@ -3,22 +3,21 @@
# These owners will be the default owners for everything in
# the repo. Unless a later match takes precedence,
erpnext/accounts/ @deepeshgarg007 @ruthra-kumar
erpnext/assets/ @anandbaburajan @deepeshgarg007
erpnext/regional @deepeshgarg007 @ruthra-kumar
erpnext/selling @deepeshgarg007 @ruthra-kumar
erpnext/support/ @deepeshgarg007
pos*
erpnext/accounts/ @ruthra-kumar
erpnext/assets/ @khushi8112
erpnext/regional @ruthra-kumar
erpnext/selling @ruthra-kumar
erpnext/support/ @ruthra-kumar
erpnext/buying/ @rohitwaghchaure @s-aga-r
erpnext/maintenance/ @rohitwaghchaure @s-aga-r
erpnext/manufacturing/ @rohitwaghchaure @s-aga-r
erpnext/quality_management/ @rohitwaghchaure @s-aga-r
erpnext/stock/ @rohitwaghchaure @s-aga-r
erpnext/subcontracting @rohitwaghchaure @s-aga-r
erpnext/buying/ @rohitwaghchaure @mihir-kandoi
erpnext/maintenance/ @rohitwaghchaure
erpnext/manufacturing/ @rohitwaghchaure @mihir-kandoi
erpnext/quality_management/ @rohitwaghchaure
erpnext/stock/ @rohitwaghchaure @mihir-kandoi
erpnext/subcontracting @mihir-kandoi
erpnext/controllers/ @deepeshgarg007 @rohitwaghchaure
erpnext/patches/ @deepeshgarg007
erpnext/controllers/ @ruthra-kumar @rohitwaghchaure @mihir-kandoi
erpnext/patches/ @ruthra-kumar
.github/ @deepeshgarg007
pyproject.toml @phot0n
.github/ @ruthra-kumar
pyproject.toml @ruthra-kumar

172
README.md
View File

@@ -1,58 +1,101 @@
<div align="center">
<a href="https://erpnext.com">
<img src="https://raw.githubusercontent.com/frappe/erpnext/develop/erpnext/public/images/erpnext-logo.png" height="128">
<a href="https://frappe.io/erpnext">
<img src="./erpnext/public/images/v16/erpnext.svg" alt="ERPNext Logo" height="80px" width="80xp"/>
</a>
<h2>ERPNext</h2>
<p align="center">
<p>ERP made simple</p>
<p>Powerful, Intuitive and Open-Source ERP</p>
</p>
[![CI](https://github.com/frappe/erpnext/actions/workflows/server-tests.yml/badge.svg?branch=develop)](https://github.com/frappe/erpnext/actions/workflows/server-tests.yml)
[![UI](https://github.com/erpnext/erpnext_ui_tests/actions/workflows/ui-tests.yml/badge.svg?branch=develop&event=schedule)](https://github.com/erpnext/erpnext_ui_tests/actions/workflows/ui-tests.yml)
[![Open Source Helpers](https://www.codetriage.com/frappe/erpnext/badges/users.svg)](https://www.codetriage.com/frappe/erpnext)
[![codecov](https://codecov.io/gh/frappe/erpnext/branch/develop/graph/badge.svg?token=0TwvyUg3I5)](https://codecov.io/gh/frappe/erpnext)
[![Learn on Frappe School](https://img.shields.io/badge/Frappe%20School-Learn%20ERPNext-blue?style=flat-square)](https://frappe.school)<br><br>
[![CI](https://github.com/frappe/erpnext/actions/workflows/server-tests-mariadb.yml/badge.svg?event=schedule)](https://github.com/frappe/erpnext/actions/workflows/server-tests-mariadb.yml)
[![docker pulls](https://img.shields.io/docker/pulls/frappe/erpnext-worker.svg)](https://hub.docker.com/r/frappe/erpnext-worker)
[https://erpnext.com](https://erpnext.com)
</div>
ERPNext as a monolith includes the following areas for managing businesses:
1. [Accounting](https://erpnext.com/open-source-accounting)
1. [Warehouse Management](https://erpnext.com/distribution/warehouse-management-system)
1. [CRM](https://erpnext.com/open-source-crm)
1. [Sales](https://erpnext.com/open-source-sales-purchase)
1. [Purchase](https://erpnext.com/open-source-sales-purchase)
1. [HRMS](https://erpnext.com/open-source-hrms)
1. [Project Management](https://erpnext.com/open-source-projects)
1. [Support](https://erpnext.com/open-source-help-desk-software)
1. [Asset Management](https://erpnext.com/open-source-asset-management-software)
1. [Quality Management](https://erpnext.com/docs/user/manual/en/quality-management)
1. [Manufacturing](https://erpnext.com/open-source-manufacturing-erp-software)
1. [Website Management](https://erpnext.com/open-source-website-builder-software)
1. [Customize ERPNext](https://erpnext.com/docs/user/manual/en/customize-erpnext)
1. [And More](https://erpnext.com/docs/user/manual/en/)
ERPNext is built on the [Frappe Framework](https://github.com/frappe/frappe), a full-stack web app framework built with Python & JavaScript.
## Installation
<div align="center" style="max-height: 40px;">
<a href="https://frappecloud.com/erpnext/signup">
<img src=".github/try-on-f-cloud-button.svg" height="40">
</a>
<a href="https://labs.play-with-docker.com/?stack=https://raw.githubusercontent.com/frappe/frappe_docker/main/pwd.yml">
<img src="https://raw.githubusercontent.com/play-with-docker/stacks/master/assets/images/button.png" alt="Try in PWD" height="37"/>
</a>
<div align="center">
<img src="./erpnext/public/images/v16/hero_image.png"/>
</div>
> Login for the PWD site: (username: Administrator, password: admin)
<div align="center">
<a href="https://erpnext-demo.frappe.cloud/api/method/erpnext_demo.erpnext_demo.auth.login_demo">Live Demo</a>
-
<a href="https://frappe.io/erpnext">Website</a>
-
<a href="https://docs.frappe.io/erpnext/">Documentation</a>
</div>
### Containerized Installation
## ERPNext
Use docker to deploy ERPNext in production or for development of [Frappe](https://github.com/frappe/frappe) apps. See https://github.com/frappe/frappe_docker for more details.
100% Open-Source ERP system to help you run your business.
### Motivation
Running a business is a complex task - handling invoices, tracking stock, managing personnel and even more ad-hoc activities. In a market where software is sold separately to manage each of these tasks, ERPNext does all of the above and more, for free.
### Key Features
- **Accounting**: All the tools you need to manage cash flow in one place, right from recording transactions to summarizing and analyzing financial reports.
- **Order Management**: Track inventory levels, replenish stock, and manage sales orders, customers, suppliers, shipments, deliverables, and order fulfillment.
- **Manufacturing**: Simplifies the production cycle, helps track material consumption, exhibits capacity planning, handles subcontracting, and more!
- **Asset Management**: From purchase to perishment, IT infrastructure to equipment. Cover every branch of your organization, all in one centralized system.
- **Projects**: Delivery both internal and external Projects on time, budget and Profitability. Track tasks, timesheets, and issues by project.
<details open>
<summary>More</summary>
<img src="https://erpnext.com/files/v16_bom.png"/>
<img src="https://erpnext.com/files/v16_stock_summary.png"/>
<img src="https://erpnext.com/files/v16_job_card.png"/>
<img src="https://erpnext.com/files/v16_tasks.png"/>
</details>
### Under the Hood
- [**Frappe Framework**](https://github.com/frappe/frappe): A full-stack web application framework written in Python and Javascript. The framework provides a robust foundation for building web applications, including a database abstraction layer, user authentication, and a REST API.
- [**Frappe UI**](https://github.com/frappe/frappe-ui): A Vue-based UI library, to provide a modern user interface. The Frappe UI library provides a variety of components that can be used to build single-page applications on top of the Frappe Framework.
## Production Setup
### Managed Hosting
You can try [Frappe Cloud](https://frappecloud.com), a simple, user-friendly and sophisticated [open-source](https://github.com/frappe/press) platform to host Frappe applications with peace of mind.
It takes care of installation, setup, upgrades, monitoring, maintenance and support of your Frappe deployments. It is a fully featured developer platform with an ability to manage and control multiple Frappe deployments.
<div>
<a href="https://erpnext-demo.frappe.cloud/app/home" target="_blank">
<picture>
<source media="(prefers-color-scheme: dark)" srcset="https://frappe.io/files/try-on-fc-white.png">
<img src="https://frappe.io/files/try-on-fc-black.png" alt="Try on Frappe Cloud" height="28" />
</picture>
</a>
</div>
### Self-Hosted
#### Docker
Prerequisites: docker, docker-compose, git. Refer [Docker Documentation](https://docs.docker.com) for more details on Docker setup.
Run following commands:
```
git clone https://github.com/frappe/frappe_docker
cd frappe_docker
docker compose -f pwd.yml up -d
```
After a couple of minutes, site should be accessible on your localhost port: 8080. Use below default login credentials to access the site.
- Username: Administrator
- Password: admin
See [Frappe Docker](https://github.com/frappe/frappe_docker?tab=readme-ov-file#to-run-on-arm64-architecture-follow-this-instructions) for ARM based docker setup.
## Development Setup
### Manual Install
The Easy Way: our install script for bench will install all dependencies (e.g. MariaDB). See https://github.com/frappe/bench for more details.
@@ -60,9 +103,35 @@ The Easy Way: our install script for bench will install all dependencies (e.g. M
New passwords will be created for the ERPNext "Administrator" user, the MariaDB root user, and the frappe user (the script displays the passwords and saves them to ~/frappe_passwords.txt).
### Local
To setup the repository locally follow the steps mentioned below:
1. Setup bench by following the [Installation Steps](https://frappeframework.com/docs/user/en/installation) and start the server
```
bench start
```
2. In a separate terminal window, run the following commands:
```
# Create a new site
bench new-site erpnext.localhost
```
3. Get the ERPNext app and install it
```
# Get the ERPNext app
bench get-app https://github.com/frappe/erpnext
# Install the app
bench --site erpnext.localhost install-app erpnext
```
4. Open the URL `http://erpnext.localhost:8000/app` in your browser, you should see the app running
## Learning and community
1. [Frappe School](https://frappe.school) - Learn Frappe Framework and ERPNext from the various courses by the maintainers or from the community.
1. [Frappe School](https://school.frappe.io) - Learn Frappe Framework and ERPNext from the various courses by the maintainers or from the community.
2. [Official documentation](https://docs.erpnext.com/) - Extensive documentation for ERPNext.
3. [Discussion Forum](https://discuss.erpnext.com/) - Engage with community of ERPNext users and service providers.
4. [Telegram Group](https://erpnext_public.t.me) - Get instant help from huge community of users.
@@ -73,17 +142,20 @@ New passwords will be created for the ERPNext "Administrator" user, the MariaDB
1. [Issue Guidelines](https://github.com/frappe/erpnext/wiki/Issue-Guidelines)
1. [Report Security Vulnerabilities](https://erpnext.com/security)
1. [Pull Request Requirements](https://github.com/frappe/erpnext/wiki/Contribution-Guidelines)
1. [Translations](https://translate.erpnext.com)
2. [Translations](https://crowdin.com/project/frappe)
## License
GNU/General Public License (see [license.txt](license.txt))
The ERPNext code is licensed as GNU General Public License (v3) and the Documentation is licensed as Creative Commons (CC-BY-SA-3.0) and the copyright is owned by Frappe Technologies Pvt Ltd (Frappe) and Contributors.
By contributing to ERPNext, you agree that your contributions will be licensed under its GNU General Public License (v3).
## Logo and Trademark Policy
Please read our [Logo and Trademark Policy](TRADEMARK_POLICY.md).
<br />
<br />
<div align="center" style="padding-top: 0.75rem;">
<a href="https://frappe.io" target="_blank">
<picture>
<source media="(prefers-color-scheme: dark)" srcset="https://frappe.io/files/Frappe-white.png">
<img src="https://frappe.io/files/Frappe-black.png" alt="Frappe Technologies" height="28"/>
</picture>
</a>
</div>

3
babel_extractors.csv Normal file
View File

@@ -0,0 +1,3 @@
**/setup/setup_wizard/data/uom_data.json,erpnext.gettext.extractors.uom_data.extract
**/setup/doctype/incoterm/incoterms.csv,erpnext.gettext.extractors.incoterms.extract
**/setup/setup_wizard/data/*.txt,erpnext.gettext.extractors.lines_from_txt_file.extract
1 **/setup/setup_wizard/data/uom_data.json erpnext.gettext.extractors.uom_data.extract
2 **/setup/doctype/incoterm/incoterms.csv erpnext.gettext.extractors.incoterms.extract
3 **/setup/setup_wizard/data/*.txt erpnext.gettext.extractors.lines_from_txt_file.extract

View File

@@ -1,25 +1,13 @@
module.exports = {
parserPreset: 'conventional-changelog-conventionalcommits',
parserPreset: "conventional-changelog-conventionalcommits",
rules: {
'subject-empty': [2, 'never'],
'type-case': [2, 'always', 'lower-case'],
'type-empty': [2, 'never'],
'type-enum': [
"subject-empty": [2, "never"],
"type-case": [2, "always", "lower-case"],
"type-empty": [2, "never"],
"type-enum": [
2,
'always',
[
'build',
'chore',
'ci',
'docs',
'feat',
'fix',
'perf',
'refactor',
'revert',
'style',
'test',
],
"always",
["build", "chore", "ci", "docs", "feat", "fix", "perf", "refactor", "revert", "style", "test"],
],
},
};

14
crowdin.yml Normal file
View File

@@ -0,0 +1,14 @@
files:
- source: /erpnext/locale/main.pot
translation: /erpnext/locale/%two_letters_code%.po
pull_request_title: "fix: sync translations from crowdin"
pull_request_labels:
- translation
- skip-release-notes
pull_request_reviewers:
- barredterra # change to your GitHub username if you copied this file
commit_message: "fix: %language% translations"
append_commit_message: false
languages_mapping:
two_letters_code:
pt-BR: pt_BR

View File

@@ -1,9 +1,12 @@
import functools
import inspect
from typing import TypeVar
import frappe
from frappe.model.document import Document
from frappe.utils.user import is_website_user
__version__ = "15.0.0-dev"
__version__ = "16.0.0-dev"
def get_default_company(user=None):
@@ -13,7 +16,7 @@ def get_default_company(user=None):
if not user:
user = frappe.session.user
companies = get_user_default_as_list(user, "company")
companies = get_user_default_as_list("company", user)
if companies:
default_company = companies[0]
else:
@@ -36,10 +39,8 @@ def get_default_cost_center(company):
if not frappe.flags.company_cost_center:
frappe.flags.company_cost_center = {}
if not company in frappe.flags.company_cost_center:
frappe.flags.company_cost_center[company] = frappe.get_cached_value(
"Company", company, "cost_center"
)
if company not in frappe.flags.company_cost_center:
frappe.flags.company_cost_center[company] = frappe.get_cached_value("Company", company, "cost_center")
return frappe.flags.company_cost_center[company]
@@ -47,7 +48,7 @@ def get_company_currency(company):
"""Returns the default company currency"""
if not frappe.flags.company_currency:
frappe.flags.company_currency = {}
if not company in frappe.flags.company_currency:
if company not in frappe.flags.company_currency:
frappe.flags.company_currency[company] = frappe.db.get_value(
"Company", company, "default_currency", cache=True
)
@@ -56,7 +57,7 @@ def get_company_currency(company):
def set_perpetual_inventory(enable=1, company=None):
if not company:
company = "_Test Company" if frappe.flags.in_test else get_default_company()
company = "_Test Company" if frappe.in_test else get_default_company()
company = frappe.get_doc("Company", company)
company.enable_perpetual_inventory = enable
@@ -76,12 +77,12 @@ def encode_company_abbr(name, company=None, abbr=None):
def is_perpetual_inventory_enabled(company):
if not company:
company = "_Test Company" if frappe.flags.in_test else get_default_company()
company = "_Test Company" if frappe.in_test else get_default_company()
if not hasattr(frappe.local, "enable_perpetual_inventory"):
frappe.local.enable_perpetual_inventory = {}
if not company in frappe.local.enable_perpetual_inventory:
if company not in frappe.local.enable_perpetual_inventory:
frappe.local.enable_perpetual_inventory[company] = (
frappe.get_cached_value("Company", company, "enable_perpetual_inventory") or 0
)
@@ -96,7 +97,7 @@ def get_default_finance_book(company=None):
if not hasattr(frappe.local, "default_finance_book"):
frappe.local.default_finance_book = {}
if not company in frappe.local.default_finance_book:
if company not in frappe.local.default_finance_book:
frappe.local.default_finance_book[company] = frappe.get_cached_value(
"Company", company, "default_finance_book"
)
@@ -108,7 +109,7 @@ def get_party_account_type(party_type):
if not hasattr(frappe.local, "party_account_types"):
frappe.local.party_account_types = {}
if not party_type in frappe.local.party_account_types:
if party_type not in frappe.local.party_account_types:
frappe.local.party_account_types[party_type] = (
frappe.db.get_value("Party Type", party_type, "account_type") or ""
)
@@ -151,3 +152,44 @@ def allow_regional(fn):
return frappe.get_attr(overrides[function_path][-1])(*args, **kwargs)
return caller
def check_app_permission():
if frappe.session.user == "Administrator":
return True
if is_website_user():
return False
return True
T = TypeVar("T")
def normalize_ctx_input(T: type) -> callable:
"""
Normalizes the first argument (ctx) of the decorated function by:
- Converting Document objects to dictionaries
- Parsing JSON strings
- Casting the result to the specified type T
"""
def decorator(func: callable):
# conserve annotations for frappe.utils.typing_validations
@functools.wraps(func, assigned=(a for a in functools.WRAPPER_ASSIGNMENTS if a != "__annotations__"))
def wrapper(ctx: T | Document | dict | str, *args, **kwargs):
if isinstance(ctx, Document):
ctx = T(**ctx.as_dict())
elif isinstance(ctx, dict):
ctx = T(**ctx)
else:
ctx = T(**frappe.parse_json(ctx))
return func(ctx, *args, **kwargs)
# set annotations from function
wrapper.__annotations__.update({k: v for k, v in func.__annotations__.items() if k != "ctx"})
return wrapper
return decorator

View File

@@ -10,27 +10,29 @@ from frappe.contacts.doctype.address.address import (
class ERPNextAddress(Address):
def validate(self):
self.validate_reference()
self.update_compnay_address()
super(ERPNextAddress, self).validate()
self.update_company_address()
if hasattr(super(), "validate"):
super().validate()
def link_address(self):
"""Link address based on owner"""
if self.is_your_company_address:
return
return super(ERPNextAddress, self).link_address()
return super().link_address()
def update_compnay_address(self):
def update_company_address(self):
for link in self.get("links"):
if link.link_doctype == "Company":
self.is_your_company_address = 1
def validate_reference(self):
if self.is_your_company_address and not [
row for row in self.links if row.link_doctype == "Company"
]:
if self.is_your_company_address and not [row for row in self.links if row.link_doctype == "Company"]:
frappe.throw(
_("Address needs to be linked to a Company. Please add a row for Company in the Links table."),
_(
"Address needs to be linked to a Company. Please add a row for Company in the Links table."
),
title=_("Company Not Linked"),
)
@@ -38,6 +40,10 @@ class ERPNextAddress(Address):
"""
After Address is updated, update the related 'Primary Address' on Customer.
"""
if hasattr(super(), "on_update"):
super().on_update()
address_display = get_address_display(self.as_dict())
filters = {"customer_primary_address": self.name}
customers = frappe.db.get_all("Customer", filters=filters, as_list=True)

View File

@@ -1,4 +1,4 @@
frappe.provide('frappe.dashboards.chart_sources');
frappe.provide("frappe.dashboards.chart_sources");
frappe.dashboards.chart_sources["Account Balance Timeline"] = {
method: "erpnext.accounts.dashboard_chart_source.account_balance_timeline.account_balance_timeline.get",
@@ -9,14 +9,14 @@ frappe.dashboards.chart_sources["Account Balance Timeline"] = {
fieldtype: "Link",
options: "Company",
default: frappe.defaults.get_user_default("Company"),
reqd: 1
reqd: 1,
},
{
fieldname: "account",
label: __("Account"),
fieldtype: "Link",
options: "Account",
reqd: 1
reqd: 1,
},
]
],
};

View File

@@ -37,7 +37,7 @@ def get(
filters = frappe.parse_json(filters) or frappe.parse_json(chart.filters_json)
account = filters.get("account")
company = filters.get("company")
filters.get("company")
if not account and chart_name:
frappe.throw(
@@ -83,7 +83,6 @@ def build_result(account, dates, gl_entries):
# get balances in debit
for entry in gl_entries:
# entry date is after the current pointer, so move the pointer forward
while getdate(entry.posting_date) > result[date_index][0]:
date_index += 1
@@ -133,8 +132,6 @@ def get_dates_from_timegrain(from_date, to_date, timegrain):
dates = [get_period_ending(from_date, timegrain)]
while getdate(dates[-1]) < getdate(to_date):
date = get_period_ending(
add_to_date(dates[-1], years=years, months=months, days=days), timegrain
)
date = get_period_ending(add_to_date(dates[-1], years=years, months=months, days=days), timegrain)
dates.append(date)
return dates

View File

@@ -24,14 +24,10 @@ from erpnext.accounts.utils import get_account_currency
def validate_service_stop_date(doc):
"""Validates service_stop_date for Purchase Invoice and Sales Invoice"""
enable_check = (
"enable_deferred_revenue" if doc.doctype == "Sales Invoice" else "enable_deferred_expense"
)
enable_check = "enable_deferred_revenue" if doc.doctype == "Sales Invoice" else "enable_deferred_expense"
old_stop_dates = {}
old_doc = frappe.db.get_all(
"{0} Item".format(doc.doctype), {"parent": doc.name}, ["name", "service_stop_date"]
)
old_doc = frappe.db.get_all(f"{doc.doctype} Item", {"parent": doc.name}, ["name", "service_stop_date"])
for d in old_doc:
old_stop_dates[d.name] = d.service_stop_date or ""
@@ -62,16 +58,14 @@ def build_conditions(process_type, account, company):
)
if account:
conditions += "AND %s='%s'" % (deferred_account, account)
conditions += f"AND {deferred_account}={frappe.db.escape(account)}"
elif company:
conditions += f"AND p.company = {frappe.db.escape(company)}"
return conditions
def convert_deferred_expense_to_expense(
deferred_process, start_date=None, end_date=None, conditions=""
):
def convert_deferred_expense_to_expense(deferred_process, start_date=None, end_date=None, conditions=""):
# book the expense/income on the last day, but it will be trigger on the 1st of month at 12:00 AM
if not start_date:
@@ -81,16 +75,14 @@ def convert_deferred_expense_to_expense(
# check for the purchase invoice for which GL entries has to be done
invoices = frappe.db.sql_list(
"""
f"""
select distinct item.parent
from `tabPurchase Invoice Item` item, `tabPurchase Invoice` p
where item.service_start_date<=%s and item.service_end_date>=%s
and item.enable_deferred_expense = 1 and item.parent=p.name
and item.docstatus = 1 and ifnull(item.amount, 0) > 0
{0}
""".format(
conditions
),
{conditions}
""",
(end_date, start_date),
) # nosec
@@ -103,9 +95,7 @@ def convert_deferred_expense_to_expense(
send_mail(deferred_process)
def convert_deferred_revenue_to_income(
deferred_process, start_date=None, end_date=None, conditions=""
):
def convert_deferred_revenue_to_income(deferred_process, start_date=None, end_date=None, conditions=""):
# book the expense/income on the last day, but it will be trigger on the 1st of month at 12:00 AM
if not start_date:
@@ -115,16 +105,14 @@ def convert_deferred_revenue_to_income(
# check for the sales invoice for which GL entries has to be done
invoices = frappe.db.sql_list(
"""
f"""
select distinct item.parent
from `tabSales Invoice Item` item, `tabSales Invoice` p
where item.service_start_date<=%s and item.service_end_date>=%s
and item.enable_deferred_revenue = 1 and item.parent=p.name
and item.docstatus = 1 and ifnull(item.amount, 0) > 0
{0}
""".format(
conditions
),
{conditions}
""",
(end_date, start_date),
) # nosec
@@ -232,7 +220,7 @@ def calculate_monthly_amount(
if amount + already_booked_amount_in_account_currency > item.net_amount:
amount = item.net_amount - already_booked_amount_in_account_currency
if not (get_first_day(start_date) == start_date and get_last_day(end_date) == end_date):
if get_first_day(start_date) != start_date or get_last_day(end_date) != end_date:
partial_month = flt(date_diff(end_date, start_date)) / flt(
date_diff(get_last_day(end_date), get_first_day(start_date))
)
@@ -243,9 +231,7 @@ def calculate_monthly_amount(
already_booked_amount, already_booked_amount_in_account_currency = get_already_booked_amount(
doc, item
)
base_amount = flt(
item.base_net_amount - already_booked_amount, item.precision("base_net_amount")
)
base_amount = flt(item.base_net_amount - already_booked_amount, item.precision("base_net_amount"))
if account_currency == doc.company_currency:
amount = base_amount
else:
@@ -265,17 +251,13 @@ def calculate_amount(doc, item, last_gl_entry, total_days, total_booking_days, a
if account_currency == doc.company_currency:
amount = base_amount
else:
amount = flt(
item.net_amount * total_booking_days / flt(total_days), item.precision("net_amount")
)
amount = flt(item.net_amount * total_booking_days / flt(total_days), item.precision("net_amount"))
else:
already_booked_amount, already_booked_amount_in_account_currency = get_already_booked_amount(
doc, item
)
base_amount = flt(
item.base_net_amount - already_booked_amount, item.precision("base_net_amount")
)
base_amount = flt(item.base_net_amount - already_booked_amount, item.precision("base_net_amount"))
if account_currency == doc.company_currency:
amount = base_amount
else:
@@ -296,26 +278,22 @@ def get_already_booked_amount(doc, item):
gl_entries_details = frappe.db.sql(
"""
select sum({0}) as total_credit, sum({1}) as total_credit_in_account_currency, voucher_detail_no
select sum({}) as total_credit, sum({}) as total_credit_in_account_currency, voucher_detail_no
from `tabGL Entry` where company=%s and account=%s and voucher_type=%s and voucher_no=%s and voucher_detail_no=%s
and is_cancelled = 0
group by voucher_detail_no
""".format(
total_credit_debit, total_credit_debit_currency
),
""".format(total_credit_debit, total_credit_debit_currency),
(doc.company, item.get(deferred_account), doc.doctype, doc.name, item.name),
as_dict=True,
)
journal_entry_details = frappe.db.sql(
"""
SELECT sum(c.{0}) as total_credit, sum(c.{1}) as total_credit_in_account_currency, reference_detail_no
SELECT sum(c.{}) as total_credit, sum(c.{}) as total_credit_in_account_currency, reference_detail_no
FROM `tabJournal Entry` p , `tabJournal Entry Account` c WHERE p.name = c.parent and
p.company = %s and c.account=%s and c.reference_type=%s and c.reference_name=%s and c.reference_detail_no=%s
and p.docstatus < 2 group by reference_detail_no
""".format(
total_credit_debit, total_credit_debit_currency
),
""".format(total_credit_debit, total_credit_debit_currency),
(doc.company, item.get(deferred_account), doc.doctype, doc.name, item.name),
as_dict=True,
)
@@ -337,11 +315,9 @@ def get_already_booked_amount(doc, item):
def book_deferred_income_or_expense(doc, deferred_process, posting_date=None):
enable_check = (
"enable_deferred_revenue" if doc.doctype == "Sales Invoice" else "enable_deferred_expense"
)
enable_check = "enable_deferred_revenue" if doc.doctype == "Sales Invoice" else "enable_deferred_expense"
accounts_frozen_upto = frappe.db.get_single_value("Accounts Settings", "acc_frozen_upto")
accounts_frozen_upto = frappe.get_single_value("Accounts Settings", "acc_frozen_upto")
def _book_deferred_revenue_or_expense(
item,
@@ -384,45 +360,45 @@ def book_deferred_income_or_expense(doc, deferred_process, posting_date=None):
)
if not amount:
return
gl_posting_date = end_date
prev_posting_date = None
# check if books nor frozen till endate:
if accounts_frozen_upto and getdate(end_date) <= getdate(accounts_frozen_upto):
gl_posting_date = get_last_day(add_days(accounts_frozen_upto, 1))
prev_posting_date = end_date
if via_journal_entry:
book_revenue_via_journal_entry(
doc,
credit_account,
debit_account,
amount,
base_amount,
gl_posting_date,
project,
account_currency,
item.cost_center,
item,
deferred_process,
submit_journal_entry,
)
else:
make_gl_entries(
doc,
credit_account,
debit_account,
against,
amount,
base_amount,
gl_posting_date,
project,
account_currency,
item.cost_center,
item,
deferred_process,
)
gl_posting_date = end_date
prev_posting_date = None
# check if books nor frozen till endate:
if accounts_frozen_upto and getdate(end_date) <= getdate(accounts_frozen_upto):
gl_posting_date = get_last_day(add_days(accounts_frozen_upto, 1))
prev_posting_date = end_date
if via_journal_entry:
book_revenue_via_journal_entry(
doc,
credit_account,
debit_account,
amount,
base_amount,
gl_posting_date,
project,
account_currency,
item.cost_center,
item,
deferred_process,
submit_journal_entry,
)
else:
make_gl_entries(
doc,
credit_account,
debit_account,
against,
amount,
base_amount,
gl_posting_date,
project,
account_currency,
item.cost_center,
item,
deferred_process,
)
# Returned in case of any errors because it tries to submit the same record again and again in case of errors
if frappe.flags.deferred_accounting_error:
@@ -440,9 +416,7 @@ def book_deferred_income_or_expense(doc, deferred_process, posting_date=None):
via_journal_entry = cint(
frappe.db.get_singles_value("Accounts Settings", "book_deferred_entries_via_journal_entry")
)
submit_journal_entry = cint(
frappe.db.get_singles_value("Accounts Settings", "submit_journal_entries")
)
submit_journal_entry = cint(frappe.db.get_singles_value("Accounts Settings", "submit_journal_entries"))
book_deferred_entries_based_on = frappe.db.get_singles_value(
"Accounts Settings", "book_deferred_entries_based_on"
)
@@ -462,9 +436,7 @@ def process_deferred_accounting(posting_date=None):
posting_date = today()
if not cint(
frappe.db.get_singles_value(
"Accounts Settings", "automatically_process_deferred_accounting_entry"
)
frappe.db.get_singles_value("Accounts Settings", "automatically_process_deferred_accounting_entry")
):
return
@@ -554,7 +526,7 @@ def make_gl_entries(
make_gl_entries(gl_entries, cancel=(doc.docstatus == 2), merge_entries=True)
frappe.db.commit()
except Exception as e:
if frappe.flags.in_test:
if frappe.in_test:
doc.log_error(f"Error while processing deferred accounting for Invoice {doc.name}")
raise e
else:
@@ -587,16 +559,13 @@ def book_revenue_via_journal_entry(
deferred_process=None,
submit="No",
):
if amount == 0:
return
journal_entry = frappe.new_doc("Journal Entry")
journal_entry.posting_date = posting_date
journal_entry.company = doc.company
journal_entry.voucher_type = (
"Deferred Revenue" if doc.doctype == "Sales Invoice" else "Deferred Expense"
)
journal_entry.voucher_type = "Deferred Revenue" if doc.doctype == "Sales Invoice" else "Deferred Expense"
journal_entry.process_deferred_accounting = deferred_process
debit_entry = {
@@ -645,7 +614,6 @@ def book_revenue_via_journal_entry(
def get_deferred_booking_accounts(doctype, voucher_detail_no, dr_or_cr):
if doctype == "Sales Invoice":
credit_account, debit_account = frappe.db.get_value(
"Sales Invoice Item",

View File

@@ -22,23 +22,17 @@ frappe.ui.form.on("Account", {
// hide fields if group
frm.toggle_display(["tax_rate"], cint(frm.doc.is_group) == 0);
// disable fields
frm.toggle_enable(["is_group", "company"], false);
frm.toggle_enable(["is_group", "company", "account_number"], frm.is_new());
if (cint(frm.doc.is_group) == 0) {
frm.toggle_display(
"freeze_account",
frm.doc.__onload && frm.doc.__onload.can_freeze_account
);
frm.toggle_display("freeze_account", frm.doc.__onload && frm.doc.__onload.can_freeze_account);
}
// read-only for root accounts
if (!frm.is_new()) {
if (!frm.doc.parent_account) {
frm.set_read_only();
frm.set_intro(
__("This is a root account and cannot be edited.")
);
frm.set_intro(__("This is a root account and cannot be edited."));
} else {
// credit days and type if customer or supplier
frm.set_intro(null);
@@ -80,27 +74,33 @@ frappe.ui.form.on("Account", {
);
if (frm.doc.is_group == 1) {
frm.add_custom_button(__('Convert to Non-Group'), function () {
return frappe.call({
doc: frm.doc,
method: 'convert_group_to_ledger',
callback: function() {
frm.refresh();
}
});
}, __('Actions'));
} else if (cint(frm.doc.is_group) == 0
&& frappe.boot.user.can_read.indexOf("GL Entry") !== -1) {
frm.add_custom_button(__('General Ledger'), function () {
frappe.route_options = {
"account": frm.doc.name,
"from_date": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
"to_date": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
"company": frm.doc.company
};
frappe.set_route("query-report", "General Ledger");
}, __('View'));
frm.add_custom_button(
__("Convert to Non-Group"),
function () {
return frappe.call({
doc: frm.doc,
method: "convert_group_to_ledger",
callback: function () {
frm.refresh();
},
});
},
__("Actions")
);
} else if (cint(frm.doc.is_group) == 0 && frappe.boot.user.can_read.indexOf("GL Entry") !== -1) {
frm.add_custom_button(
__("General Ledger"),
function () {
frappe.route_options = {
account: frm.doc.name,
from_date: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
to_date: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
company: frm.doc.company,
};
frappe.set_route("query-report", "General Ledger");
},
__("View")
);
frm.add_custom_button(
__("Convert to Group"),
@@ -193,14 +193,8 @@ frappe.ui.form.on("Account", {
if (r.message) {
frappe.set_route("Form", "Account", r.message);
} else {
frm.set_value(
"account_number",
data.account_number
);
frm.set_value(
"account_name",
data.account_name
);
frm.set_value("account_number", data.account_number);
frm.set_value("account_name", data.account_name);
}
d.hide();
}

View File

@@ -3,6 +3,7 @@
"allow_copy": 1,
"allow_import": 1,
"creation": "2013-01-30 12:49:46",
"default_view": "Tree",
"description": "Heads (or groups) against which Accounting Entries are made and balances are maintained.",
"doctype": "DocType",
"document_type": "Setup",
@@ -55,8 +56,7 @@
"fieldtype": "Data",
"in_list_view": 1,
"in_standard_filter": 1,
"label": "Account Number",
"read_only": 1
"label": "Account Number"
},
{
"default": "0",
@@ -65,6 +65,8 @@
"label": "Is Group"
},
{
"fetch_from": "parent_account.company",
"fetch_if_empty": 1,
"fieldname": "company",
"fieldtype": "Link",
"in_standard_filter": 1,
@@ -72,7 +74,6 @@
"oldfieldname": "company",
"oldfieldtype": "Link",
"options": "Company",
"read_only": 1,
"remember_last_selected_value": 1,
"reqd": 1
},
@@ -108,6 +109,7 @@
"fieldname": "parent_account",
"fieldtype": "Link",
"ignore_user_permissions": 1,
"in_preview": 1,
"label": "Parent Account",
"oldfieldname": "parent_account",
"oldfieldtype": "Link",
@@ -123,13 +125,14 @@
"label": "Account Type",
"oldfieldname": "account_type",
"oldfieldtype": "Select",
"options": "\nAccumulated Depreciation\nAsset Received But Not Billed\nBank\nCash\nChargeable\nCapital Work in Progress\nCost of Goods Sold\nCurrent Asset\nCurrent Liability\nDepreciation\nDirect Expense\nDirect Income\nEquity\nExpense Account\nExpenses Included In Asset Valuation\nExpenses Included In Valuation\nFixed Asset\nIncome Account\nIndirect Expense\nIndirect Income\nLiability\nPayable\nReceivable\nRound Off\nStock\nStock Adjustment\nStock Received But Not Billed\nService Received But Not Billed\nTax\nTemporary"
"options": "\nAccumulated Depreciation\nAsset Received But Not Billed\nBank\nCash\nChargeable\nCapital Work in Progress\nCost of Goods Sold\nCurrent Asset\nCurrent Liability\nDepreciation\nDirect Expense\nDirect Income\nEquity\nExpense Account\nExpenses Included In Asset Valuation\nExpenses Included In Valuation\nFixed Asset\nIncome Account\nIndirect Expense\nIndirect Income\nLiability\nPayable\nReceivable\nRound Off\nRound Off for Opening\nStock\nStock Adjustment\nStock Received But Not Billed\nService Received But Not Billed\nTax\nTemporary",
"search_index": 1
},
{
"description": "Rate at which this tax is applied",
"fieldname": "tax_rate",
"fieldtype": "Float",
"label": "Rate",
"label": "Tax Rate",
"oldfieldname": "tax_rate",
"oldfieldtype": "Currency"
},
@@ -192,7 +195,7 @@
"idx": 1,
"is_tree": 1,
"links": [],
"modified": "2023-07-20 18:18:44.405723",
"modified": "2025-01-22 10:40:35.766017",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Account",
@@ -249,7 +252,8 @@
],
"search_fields": "account_number",
"show_name_in_global_search": 1,
"sort_field": "modified",
"show_preview_popup": 1,
"sort_field": "creation",
"sort_order": "ASC",
"states": [],
"track_changes": 1

View File

@@ -4,7 +4,7 @@
import frappe
from frappe import _, throw
from frappe.utils import cint, cstr
from frappe.utils import add_to_date, cint, cstr, pretty_date
from frappe.utils.nestedset import NestedSet, get_ancestors_of, get_descendants_of
import erpnext
@@ -23,18 +23,76 @@ class InvalidAccountMergeError(frappe.ValidationError):
class Account(NestedSet):
# begin: auto-generated types
# This code is auto-generated. Do not modify anything in this block.
from typing import TYPE_CHECKING
if TYPE_CHECKING:
from frappe.types import DF
account_currency: DF.Link | None
account_name: DF.Data
account_number: DF.Data | None
account_type: DF.Literal[
"",
"Accumulated Depreciation",
"Asset Received But Not Billed",
"Bank",
"Cash",
"Chargeable",
"Capital Work in Progress",
"Cost of Goods Sold",
"Current Asset",
"Current Liability",
"Depreciation",
"Direct Expense",
"Direct Income",
"Equity",
"Expense Account",
"Expenses Included In Asset Valuation",
"Expenses Included In Valuation",
"Fixed Asset",
"Income Account",
"Indirect Expense",
"Indirect Income",
"Liability",
"Payable",
"Receivable",
"Round Off",
"Round Off for Opening",
"Stock",
"Stock Adjustment",
"Stock Received But Not Billed",
"Service Received But Not Billed",
"Tax",
"Temporary",
]
balance_must_be: DF.Literal["", "Debit", "Credit"]
company: DF.Link
disabled: DF.Check
freeze_account: DF.Literal["No", "Yes"]
include_in_gross: DF.Check
is_group: DF.Check
lft: DF.Int
old_parent: DF.Data | None
parent_account: DF.Link
report_type: DF.Literal["", "Balance Sheet", "Profit and Loss"]
rgt: DF.Int
root_type: DF.Literal["", "Asset", "Liability", "Income", "Expense", "Equity"]
tax_rate: DF.Float
# end: auto-generated types
nsm_parent_field = "parent_account"
def on_update(self):
if frappe.local.flags.ignore_update_nsm:
return
else:
super(Account, self).on_update()
super().on_update()
def onload(self):
frozen_accounts_modifier = frappe.db.get_value(
"Accounts Settings", "Accounts Settings", "frozen_accounts_modifier"
)
frozen_accounts_modifier = frappe.get_single_value("Accounts Settings", "frozen_accounts_modifier")
if not frozen_accounts_modifier or frozen_accounts_modifier in frappe.get_roles():
self.set_onload("can_freeze_account", True)
@@ -44,14 +102,12 @@ class Account(NestedSet):
self.name = get_autoname_with_number(self.account_number, self.account_name, self.company)
def validate(self):
from erpnext.accounts.utils import validate_field_number
if frappe.local.flags.allow_unverified_charts:
return
self.validate_parent()
self.validate_parent_child_account_type()
self.validate_root_details()
validate_field_number("Account", self.name, self.account_number, self.company, "account_number")
self.validate_account_number()
self.validate_group_or_ledger()
self.set_root_and_report_type()
self.validate_mandatory()
@@ -59,6 +115,7 @@ class Account(NestedSet):
self.validate_balance_must_be_debit_or_credit()
self.validate_account_currency()
self.validate_root_company_and_sync_account_to_children()
self.validate_receivable_payable_account_type()
def validate_parent_child_account_type(self):
if self.parent_account:
@@ -110,7 +167,7 @@ class Account(NestedSet):
if par.root_type:
self.root_type = par.root_type
if self.is_group:
if cint(self.is_group):
db_value = self.get_doc_before_save()
if db_value:
if self.report_type != db_value.report_type:
@@ -129,20 +186,36 @@ class Account(NestedSet):
"Balance Sheet" if self.root_type in ("Asset", "Liability", "Equity") else "Profit and Loss"
)
def validate_receivable_payable_account_type(self):
doc_before_save = self.get_doc_before_save()
receivable_payable_types = ["Receivable", "Payable"]
if (
doc_before_save
and doc_before_save.account_type in receivable_payable_types
and doc_before_save.account_type != self.account_type
):
# check for ledger entries
if frappe.db.get_all("GL Entry", filters={"account": self.name, "is_cancelled": 0}, limit=1):
msg = _(
"There are ledger entries against this account. Changing {0} to non-{1} in live system will cause incorrect output in 'Accounts {2}' report"
).format(
frappe.bold(_("Account Type")), doc_before_save.account_type, doc_before_save.account_type
)
frappe.msgprint(msg)
self.add_comment("Comment", msg)
def validate_root_details(self):
doc_before_save = self.get_doc_before_save()
if doc_before_save and not doc_before_save.parent_account:
throw(_("Root cannot be edited."), RootNotEditable)
if not self.parent_account and not self.is_group:
if not self.parent_account and not cint(self.is_group):
throw(_("The root account {0} must be a group").format(frappe.bold(self.name)))
def validate_root_company_and_sync_account_to_children(self):
# ignore validation while creating new compnay or while syncing to child companies
if (
frappe.local.flags.ignore_root_company_validation or self.flags.ignore_root_company_validation
):
if frappe.local.flags.ignore_root_company_validation or self.flags.ignore_root_company_validation:
return
ancestors = get_root_company(self.company)
if ancestors:
@@ -186,7 +259,7 @@ class Account(NestedSet):
if self.check_gle_exists():
throw(_("Account with existing transaction cannot be converted to ledger"))
elif self.is_group:
elif cint(self.is_group):
if self.account_type and not self.flags.exclude_account_type_check:
throw(_("Cannot covert to Group because Account Type is selected."))
elif self.check_if_child_exists():
@@ -229,12 +302,30 @@ class Account(NestedSet):
self.account_currency = frappe.get_cached_value("Company", self.company, "default_currency")
self.currency_explicitly_specified = False
gl_currency = frappe.db.get_value("GL Entry", {"account": self.name}, "account_currency")
gl_currency = frappe.db.get_value(
"GL Entry", {"account": self.name, "is_cancelled": 0}, "account_currency"
)
if gl_currency and self.account_currency != gl_currency:
if frappe.db.get_value("GL Entry", {"account": self.name}):
frappe.throw(_("Currency can not be changed after making entries using some other currency"))
def validate_account_number(self, account_number=None):
if not account_number:
account_number = self.account_number
if account_number:
account_with_same_number = frappe.db.get_value(
"Account",
{"account_number": account_number, "company": self.company, "name": ["!=", self.name]},
)
if account_with_same_number:
frappe.throw(
_("Account Number {0} already used in account {1}").format(
account_number, account_with_same_number
)
)
def create_account_for_child_company(self, parent_acc_name_map, descendants, parent_acc_name):
for company in descendants:
company_bold = frappe.bold(company)
@@ -340,7 +431,7 @@ class Account(NestedSet):
if self.check_gle_exists():
throw(_("Account with existing transaction can not be deleted"))
super(Account, self).on_trash(True)
super().on_trash(True)
@frappe.whitelist()
@@ -348,9 +439,8 @@ class Account(NestedSet):
def get_parent_account(doctype, txt, searchfield, start, page_len, filters):
return frappe.db.sql(
"""select name from tabAccount
where is_group = 1 and docstatus != 2 and company = %s
and %s like %s order by name limit %s offset %s"""
% ("%s", searchfield, "%s", "%s", "%s"),
where is_group = 1 and docstatus != 2 and company = {}
and {} like {} order by name limit {} offset {}""".format("%s", searchfield, "%s", "%s", "%s"),
(filters["company"], "%%%s%%" % txt, page_len, start),
as_list=1,
)
@@ -389,21 +479,9 @@ def get_account_autoname(account_number, account_name, company):
return " - ".join(parts)
def validate_account_number(name, account_number, company):
if account_number:
account_with_same_number = frappe.db.get_value(
"Account", {"account_number": account_number, "company": company, "name": ["!=", name]}
)
if account_with_same_number:
frappe.throw(
_("Account Number {0} already used in account {1}").format(
account_number, account_with_same_number
)
)
@frappe.whitelist()
def update_account_number(name, account_name, account_number=None, from_descendant=False):
_ensure_idle_system()
account = frappe.get_cached_doc("Account", name)
if not account:
return
@@ -424,7 +502,7 @@ def update_account_number(name, account_name, account_number=None, from_descenda
"name",
)
if old_name:
if old_name and not from_descendant:
# same account in parent company exists
allow_child_account_creation = _("Allow Account Creation Against Child Company")
@@ -442,7 +520,7 @@ def update_account_number(name, account_name, account_number=None, from_descenda
frappe.throw(message, title=_("Rename Not Allowed"))
validate_account_number(name, account_number, account.company)
account.validate_account_number(account_number)
if account_number:
frappe.db.set_value("Account", name, "account_number", account_number.strip())
else:
@@ -465,6 +543,7 @@ def update_account_number(name, account_name, account_number=None, from_descenda
@frappe.whitelist()
def merge_account(old, new):
_ensure_idle_system()
# Validate properties before merging
new_account = frappe.get_cached_doc("Account", new)
old_account = frappe.get_cached_doc("Account", old)
@@ -516,7 +595,33 @@ def sync_update_account_number_in_child(
if old_acc_number:
filters["account_number"] = old_acc_number
for d in frappe.db.get_values(
"Account", filters=filters, fieldname=["company", "name"], as_dict=True
):
for d in frappe.db.get_values("Account", filters=filters, fieldname=["company", "name"], as_dict=True):
update_account_number(d["name"], account_name, account_number, from_descendant=True)
def _ensure_idle_system():
# Don't allow renaming if accounting entries are actively being updated, there are two main reasons:
# 1. Correctness: It's next to impossible to ensure that renamed account is not being used *right now*.
# 2. Performance: Renaming requires locking out many tables entirely and severely degrades performance.
if frappe.in_test:
return
last_gl_update = None
try:
# We also lock inserts to GL entry table with for_update here.
last_gl_update = frappe.db.get_value("GL Entry", {}, "modified", for_update=True, wait=False)
except frappe.QueryTimeoutError:
# wait=False fails immediately if there's an active transaction.
last_gl_update = add_to_date(None, seconds=-1)
if not last_gl_update:
return
if last_gl_update > add_to_date(None, minutes=-5):
frappe.throw(
_(
"Last GL Entry update was done {}. This operation is not allowed while system is actively being used. Please wait for 5 minutes before retrying."
).format(pretty_date(last_gl_update)),
title=_("System In Use"),
)

View File

@@ -1,4 +1,4 @@
frappe.provide("frappe.treeview_settings")
frappe.provide("frappe.treeview_settings");
frappe.treeview_settings["Account"] = {
breadcrumb: "Accounts",
@@ -7,12 +7,13 @@ frappe.treeview_settings["Account"] = {
filters: [
{
fieldname: "company",
fieldtype:"Select",
fieldtype: "Select",
options: erpnext.utils.get_tree_options("company"),
label: __("Company"),
render_on_toolbar: true,
default: erpnext.utils.get_tree_default("company"),
on_change: function() {
var me = frappe.treeview_settings['Account'].treeview;
on_change: function () {
var me = frappe.treeview_settings["Account"].treeview;
var company = me.page.fields_dict.company.get_value();
if (!company) {
frappe.throw(__("Please set a Company"));
@@ -22,30 +23,36 @@ frappe.treeview_settings["Account"] = {
args: {
company: company,
},
callback: function(r) {
if(r.message) {
callback: function (r) {
if (r.message) {
let root_company = r.message.length ? r.message[0] : "";
me.page.fields_dict.root_company.set_value(root_company);
frappe.db.get_value("Company", {"name": company}, "allow_account_creation_against_child_company", (r) => {
frappe.flags.ignore_root_company_validation = r.allow_account_creation_against_child_company;
});
frappe.db.get_value(
"Company",
{ name: company },
"allow_account_creation_against_child_company",
(r) => {
frappe.flags.ignore_root_company_validation =
r.allow_account_creation_against_child_company;
}
);
}
}
},
});
}
},
},
{
fieldname: "root_company",
fieldtype:"Data",
fieldtype: "Data",
label: __("Root Company"),
hidden: true,
disable_onchange: true
}
disable_onchange: true,
},
],
root_label: "Accounts",
get_tree_nodes: 'erpnext.accounts.utils.get_children',
on_get_node: function(nodes, deep=false) {
get_tree_nodes: "erpnext.accounts.utils.get_children",
on_get_node: function (nodes, deep = false) {
if (frappe.boot.user.can_read.indexOf("GL Entry") == -1) return;
let accounts = [];
@@ -57,151 +64,224 @@ frappe.treeview_settings["Account"] = {
}
frappe.db.get_single_value("Accounts Settings", "show_balance_in_coa").then((value) => {
if(value) {
if (value) {
const get_balances = frappe.call({
method: 'erpnext.accounts.utils.get_account_balances',
method: "erpnext.accounts.utils.get_account_balances",
args: {
accounts: accounts,
company: cur_tree.args.company
company: cur_tree.args.company,
},
});
get_balances.then(r => {
get_balances.then((r) => {
if (!r.message || r.message.length == 0) return;
for (let account of r.message) {
const node = cur_tree.nodes && cur_tree.nodes[account.value];
if (!node || node.is_root) continue;
// show Dr if positive since balance is calculated as debit - credit else show Cr
const balance = account.balance_in_account_currency || account.balance;
const dr_or_cr = balance > 0 ? "Dr": "Cr";
const dr_or_cr = balance > 0 ? __("Dr") : __("Cr");
const format = (value, currency) => format_currency(Math.abs(value), currency);
if (account.balance!==undefined) {
node.parent && node.parent.find('.balance-area').remove();
$('<span class="balance-area pull-right">'
+ (account.balance_in_account_currency ?
(format(account.balance_in_account_currency, account.account_currency) + " / ") : "")
+ format(account.balance, account.company_currency)
+ " " + dr_or_cr
+ '</span>').insertBefore(node.$ul);
if (account.balance !== undefined) {
node.parent && node.parent.find(".balance-area").remove();
$(
'<span class="balance-area pull-right">' +
(account.balance_in_account_currency
? format(
account.balance_in_account_currency,
account.account_currency
) + " / "
: "") +
format(account.balance, account.company_currency) +
" " +
dr_or_cr +
"</span>"
).insertBefore(node.$ul);
}
}
});
}
});
},
add_tree_node: 'erpnext.accounts.utils.add_ac',
menu_items:[
add_tree_node: "erpnext.accounts.utils.add_ac",
menu_items: [
{
label: __('New Company'),
action: function() { frappe.new_doc("Company", true) },
condition: 'frappe.boot.user.can_create.indexOf("Company") !== -1'
}
label: __("New Company"),
action: function () {
frappe.new_doc("Company", true);
},
condition: 'frappe.boot.user.can_create.indexOf("Company") !== -1',
},
],
fields: [
{fieldtype:'Data', fieldname:'account_name', label:__('New Account Name'), reqd:true,
description: __("Name of new Account. Note: Please don't create accounts for Customers and Suppliers")},
{fieldtype:'Data', fieldname:'account_number', label:__('Account Number'),
description: __("Number of new Account, it will be included in the account name as a prefix")},
{fieldtype:'Check', fieldname:'is_group', label:__('Is Group'),
description: __('Further accounts can be made under Groups, but entries can be made against non-Groups')},
{fieldtype:'Select', fieldname:'root_type', label:__('Root Type'),
options: ['Asset', 'Liability', 'Equity', 'Income', 'Expense'].join('\n'),
depends_on: 'eval:doc.is_group && !doc.parent_account'},
{fieldtype:'Select', fieldname:'account_type', label:__('Account Type'),
options: frappe.get_meta("Account").fields.filter(d => d.fieldname=='account_type')[0].options,
description: __("Optional. This setting will be used to filter in various transactions.")
{
fieldtype: "Data",
fieldname: "account_name",
label: __("New Account Name"),
reqd: true,
description: __(
"Name of new Account. Note: Please don't create accounts for Customers and Suppliers"
),
},
{
fieldtype: "Data",
fieldname: "account_number",
label: __("Account Number"),
description: __("Number of new Account, it will be included in the account name as a prefix"),
},
{
fieldtype: "Check",
fieldname: "is_group",
label: __("Is Group"),
description: __(
"Further accounts can be made under Groups, but entries can be made against non-Groups"
),
onchange: function () {
if (!this.value) {
this.layout.set_value("root_type", "");
}
},
},
{
fieldtype: "Select",
fieldname: "root_type",
label: __("Root Type"),
options: ["Asset", "Liability", "Equity", "Income", "Expense"].join("\n"),
depends_on: "eval:doc.is_group && !doc.parent_account",
},
{
fieldtype: "Select",
fieldname: "account_type",
label: __("Account Type"),
options: frappe.get_meta("Account").fields.filter((d) => d.fieldname == "account_type")[0]
.options,
description: __("Optional. This setting will be used to filter in various transactions."),
},
{
fieldtype: "Float",
fieldname: "tax_rate",
label: __("Tax Rate"),
depends_on: 'eval:doc.is_group==0&&doc.account_type=="Tax"',
},
{
fieldtype: "Link",
fieldname: "account_currency",
label: __("Currency"),
options: "Currency",
description: __("Optional. Sets company's default currency, if not specified."),
},
{fieldtype:'Float', fieldname:'tax_rate', label:__('Tax Rate'),
depends_on: 'eval:doc.is_group==0&&doc.account_type=="Tax"'},
{fieldtype:'Link', fieldname:'account_currency', label:__('Currency'), options:"Currency",
description: __("Optional. Sets company's default currency, if not specified.")}
],
ignore_fields:["parent_account"],
onload: function(treeview) {
frappe.treeview_settings['Account'].treeview = {};
$.extend(frappe.treeview_settings['Account'].treeview, treeview);
ignore_fields: ["parent_account"],
onload: function (treeview) {
frappe.treeview_settings["Account"].treeview = {};
$.extend(frappe.treeview_settings["Account"].treeview, treeview);
function get_company() {
return treeview.page.fields_dict.company.get_value();
}
// tools
treeview.page.add_inner_button(__("Chart of Cost Centers"), function() {
frappe.set_route('Tree', 'Cost Center', {company: get_company()});
}, __('View'));
treeview.page.add_inner_button(
__("Chart of Cost Centers"),
function () {
frappe.set_route("Tree", "Cost Center", { company: get_company() });
},
__("View"),
"default",
true
);
treeview.page.add_inner_button(__("Opening Invoice Creation Tool"), function() {
frappe.set_route('Form', 'Opening Invoice Creation Tool', {company: get_company()});
}, __('View'));
treeview.page.add_inner_button(
__("Opening Invoice Creation Tool"),
function () {
frappe.set_route("Form", "Opening Invoice Creation Tool", { company: get_company() });
},
__("View"),
"default",
true
);
treeview.page.add_inner_button(__("Period Closing Voucher"), function() {
frappe.set_route('List', 'Period Closing Voucher', {company: get_company()});
}, __('View'));
treeview.page.add_inner_button(__("Journal Entry"), function() {
frappe.new_doc('Journal Entry', {company: get_company()});
}, __('Create'));
treeview.page.add_inner_button(__("Company"), function() {
frappe.new_doc('Company');
}, __('Create'));
treeview.page.add_divider_to_button_group(__("View"));
// financial statements
for (let report of ['Trial Balance', 'General Ledger', 'Balance Sheet',
'Profit and Loss Statement', 'Cash Flow Statement', 'Accounts Payable', 'Accounts Receivable']) {
treeview.page.add_inner_button(__(report), function() {
frappe.set_route('query-report', report, {company: get_company()});
}, __('Financial Statements'));
for (let report of [
"Trial Balance",
"General Ledger",
"Balance Sheet",
"Profit and Loss Statement",
"Cash Flow",
"Accounts Payable",
"Accounts Receivable",
]) {
treeview.page.add_inner_button(
__(report),
function () {
frappe.set_route("query-report", report, { company: get_company() });
},
__("View")
);
}
},
post_render: function(treeview) {
frappe.treeview_settings['Account'].treeview["tree"] = treeview.tree;
treeview.page.set_primary_action(__("New"), function() {
let root_company = treeview.page.fields_dict.root_company.get_value();
if(root_company) {
frappe.throw(__("Please add the account to root level Company - {0}"), [root_company]);
} else {
treeview.new_node();
}
}, "add");
post_render: function (treeview) {
frappe.treeview_settings["Account"].treeview["tree"] = treeview.tree;
if (treeview.can_create) {
treeview.page.set_primary_action(
__("New"),
function () {
let root_company = treeview.page.fields_dict.root_company.get_value();
if (root_company) {
frappe.throw(__("Please add the account to root level Company - {0}"), [
root_company,
]);
} else {
treeview.new_node();
}
},
"add"
);
}
},
toolbar: [
{
label:__("Add Child"),
condition: function(node) {
return frappe.boot.user.can_create.indexOf("Account") !== -1
&& (!frappe.treeview_settings['Account'].treeview.page.fields_dict.root_company.get_value()
|| frappe.flags.ignore_root_company_validation)
&& node.expandable && !node.hide_add;
label: __("Add Child"),
condition: function (node) {
return (
frappe.boot.user.can_create.indexOf("Account") !== -1 &&
(!frappe.treeview_settings[
"Account"
].treeview.page.fields_dict.root_company.get_value() ||
frappe.flags.ignore_root_company_validation) &&
node.expandable &&
!node.hide_add
);
},
click: function() {
var me = frappe.views.trees['Account'];
click: function () {
var me = frappe.views.trees["Account"];
me.new_node();
},
btnClass: "hidden-xs"
btnClass: "hidden-xs",
},
{
condition: function(node) {
return !node.root && frappe.boot.user.can_read.indexOf("GL Entry") !== -1
condition: function (node) {
return !node.root && frappe.boot.user.can_read.indexOf("GL Entry") !== -1;
},
label: __("View Ledger"),
click: function(node, btn) {
click: function (node, btn) {
frappe.route_options = {
"account": node.label,
"from_date": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
"to_date": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
"company": frappe.treeview_settings['Account'].treeview.page.fields_dict.company.get_value()
from_date: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
to_date: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
company:
frappe.treeview_settings["Account"].treeview.page.fields_dict.company.get_value(),
};
if (node.parent_label) {
frappe.route_options["account"] = node.label;
}
frappe.set_route("query-report", "General Ledger");
},
btnClass: "hidden-xs"
}
btnClass: "hidden-xs",
},
],
extend_toolbar: true
}
extend_toolbar: true,
};

View File

@@ -18,6 +18,7 @@ def create_charts(
accounts = []
def _import_accounts(children, parent, root_type, root_account=False):
nonlocal custom_chart
for account_name, child in children.items():
if root_account:
root_type = child.get("root_type")
@@ -31,7 +32,6 @@ def create_charts(
"tax_rate",
"account_currency",
]:
account_number = cstr(child.get("account_number")).strip()
account_name, account_name_in_db = add_suffix_if_duplicate(
account_name, account_number, accounts
@@ -39,7 +39,9 @@ def create_charts(
is_group = identify_is_group(child)
report_type = (
"Balance Sheet" if root_type in ["Asset", "Liability", "Equity"] else "Profit and Loss"
"Balance Sheet"
if root_type in ["Asset", "Liability", "Equity"]
else "Profit and Loss"
)
account = frappe.get_doc(
@@ -54,7 +56,8 @@ def create_charts(
"account_number": account_number,
"account_type": child.get("account_type"),
"account_currency": child.get("account_currency")
or frappe.get_cached_value("Company", company, "default_currency"),
if custom_chart
else frappe.get_cached_value("Company", company, "default_currency"),
"tax_rate": child.get("tax_rate"),
}
)
@@ -74,7 +77,7 @@ def create_charts(
# after all accounts are already inserted.
frappe.local.flags.ignore_update_nsm = True
_import_accounts(chart, None, None, root_account=True)
rebuild_tree("Account", "parent_account")
rebuild_tree("Account")
frappe.local.flags.ignore_update_nsm = False
@@ -115,6 +118,7 @@ def identify_is_group(child):
return is_group
@frappe.whitelist()
def get_chart(chart_template, existing_company=None):
chart = {}
if existing_company:
@@ -141,7 +145,7 @@ def get_chart(chart_template, existing_company=None):
for fname in os.listdir(path):
fname = frappe.as_unicode(fname)
if fname.endswith(".json"):
with open(os.path.join(path, fname), "r") as f:
with open(os.path.join(path, fname)) as f:
chart = f.read()
if chart and json.loads(chart).get("name") == chart_template:
return json.loads(chart).get("tree")
@@ -173,7 +177,7 @@ def get_charts_for_country(country, with_standard=False):
for fname in os.listdir(path):
fname = frappe.as_unicode(fname)
if (fname.startswith(country_code) or fname.startswith(country)) and fname.endswith(".json"):
with open(os.path.join(path, fname), "r") as f:
with open(os.path.join(path, fname)) as f:
_get_chart_name(f.read())
# if more than one charts, returned then add the standard
@@ -231,6 +235,8 @@ def build_account_tree(tree, parent, all_accounts):
tree[child.account_name]["account_type"] = child.account_type
if child.tax_rate:
tree[child.account_name]["tax_rate"] = child.tax_rate
if child.account_currency:
tree[child.account_name]["account_currency"] = child.account_currency
if not parent:
tree[child.account_name]["root_type"] = child.root_type
@@ -247,7 +253,13 @@ def validate_bank_account(coa, bank_account):
def _get_account_names(account_master):
for account_name, child in account_master.items():
if account_name not in ["account_number", "account_type", "root_type", "is_group", "tax_rate"]:
if account_name not in [
"account_number",
"account_type",
"root_type",
"is_group",
"tax_rate",
]:
accounts.append(account_name)
_get_account_names(child)

View File

@@ -26,7 +26,7 @@
"0360 Bauliche Investitionen in fremden (gepachteten) Betriebs- und Geschäftsgebäuden": {"account_type": "Fixed Asset"},
"0370 Bauliche Investitionen in fremden (gepachteten) Wohn- und Sozialgebäuden": {"account_type": "Fixed Asset"},
"0390 Kumulierte Abschreibungen zu Grundstücken ": {"account_type": "Fixed Asset"},
"0400 Maschinen und Geräte ": {"account_type": "Fixed Asset"},
"0400 Maschinen und Geräte ": {"account_type": "Fixed Asset"},
"0500 Maschinenwerkzeuge ": {"account_type": "Fixed Asset"},
"0510 Allgemeine Werkzeuge und Handwerkzeuge ": {"account_type": "Fixed Asset"},
"0520 Prototypen, Formen, Modelle ": {"account_type": "Fixed Asset"},
@@ -65,42 +65,41 @@
"0980 Geleistete Anzahlungen auf Finanzanlagen ": {"account_type": "Fixed Asset"},
"0990 Kumulierte Abschreibungen zu Finanzanlagen ": {"account_type": "Fixed Asset"},
"root_type": "Asset"
},
},
"Klasse 1 Aktiva: Vorr\u00e4te": {
"1000 Bezugsverrechnung": {"account_type": "Stock"},
"1100 Rohstoffe": {"account_type": "Stock"},
"1200 Bezogene Teile": {"account_type": "Stock"},
"1300 Hilfsstoffe": {"account_type": "Stock"},
"1350 Betriebsstoffe": {"account_type": "Stock"},
"1360 Vorrat Energietraeger": {"account_type": "Stock"},
"1360 Vorrat Energietraeger": {"account_type": "Stock"},
"1400 Unfertige Erzeugnisse": {"account_type": "Stock"},
"1500 Fertige Erzeugnisse": {"account_type": "Stock"},
"1600 Handelswarenvorrat": {"account_type": "Stock Received But Not Billed"},
"1700 Noch nicht abrechenbare Leistungen": {"account_type": "Stock"},
"1900 Wertberichtigungen": {"account_type": "Stock"},
"1800 Geleistete Anzahlungen": {"account_type": "Stock"},
"1900 Wertberichtigungen": {"account_type": "Stock"},
"root_type": "Asset"
},
},
"Klasse 3 Passiva: Verbindlichkeiten": {
"3000 Allgemeine Verbindlichkeiten (Schuld)": {"account_type": "Payable"},
"3010 R\u00fcckstellungen f\u00fcr Pensionen": {"account_type": "Payable"},
"3020 Steuerr\u00fcckstellungen": {"account_type": "Tax"},
"3041 Sonstige R\u00fcckstellungen": {"account_type": "Payable"},
"3041 Sonstige R\u00fcckstellungen": {"account_type": "Payable"},
"3110 Verbindlichkeiten gegen\u00fcber Bank": {"account_type": "Payable"},
"3150 Verbindlichkeiten Darlehen": {"account_type": "Payable"},
"3185 Verbindlichkeiten Kreditkarte": {"account_type": "Payable"},
"3185 Verbindlichkeiten Kreditkarte": {"account_type": "Payable"},
"3380 Verbindlichkeiten aus der Annahme gezogener Wechsel u. d. Ausstellungen eigener Wechsel": {
"account_type": "Payable"
},
"3400 Verbindlichkeiten gegen\u00fc. verb. Untern., Verbindl. gegen\u00fc. Untern., mit denen eine Beteiligungsverh\u00e4lnis besteht": {},
"3460 Verbindlichkeiten gegenueber Gesellschaftern": {"account_type": "Payable"},
"3470 Einlagen stiller Gesellschafter": {"account_type": "Payable"},
"3585 Verbindlichkeiten Lohnsteuer": {"account_type": "Tax"},
"3590 Verbindlichkeiten Kommunalabgaben": {"account_type": "Tax"},
"3595 Verbindlichkeiten Dienstgeberbeitrag": {"account_type": "Tax"},
"3585 Verbindlichkeiten Lohnsteuer": {"account_type": "Tax"},
"3590 Verbindlichkeiten Kommunalabgaben": {"account_type": "Tax"},
"3595 Verbindlichkeiten Dienstgeberbeitrag": {"account_type": "Tax"},
"3600 Verbindlichkeiten Sozialversicherung": {"account_type": "Payable"},
"3640 Verbindlichkeiten Loehne und Gehaelter": {"account_type": "Payable"},
"3640 Verbindlichkeiten Loehne und Gehaelter": {"account_type": "Payable"},
"3700 Sonstige Verbindlichkeiten": {"account_type": "Payable"},
"3900 Passive Rechnungsabgrenzungsposten": {"account_type": "Payable"},
"3100 Anleihen (einschlie\u00dflich konvertibler)": {"account_type": "Payable"},
@@ -119,13 +118,13 @@
},
"3515 Umsatzsteuer Inland 10%": {
"account_type": "Tax"
},
},
"3520 Umsatzsteuer aus i.g. Erwerb 20%": {
"account_type": "Tax"
},
"3525 Umsatzsteuer aus i.g. Erwerb 10%": {
"account_type": "Tax"
},
},
"3560 Umsatzsteuer-Evidenzkonto f\u00fcr erhaltene Anzahlungen auf Bestellungen": {},
"3360 Verbindlichkeiten aus Lieferungen u. Leistungen EU": {
"account_type": "Payable"
@@ -141,7 +140,7 @@
"account_type": "Tax"
},
"root_type": "Liability"
},
},
"Klasse 2 Aktiva: Umlaufverm\u00f6gen, Rechnungsabgrenzungen": {
"2030 Forderungen aus Lieferungen und Leistungen Inland (0% USt, umsatzsteuerfrei)": {
"account_type": "Receivable"
@@ -154,7 +153,7 @@
},
"2040 Forderungen aus Lieferungen und Leistungen Inland (sonstiger USt-Satz)": {
"account_type": "Receivable"
},
},
"2100 Forderungen aus Lieferungen und Leistungen EU": {
"account_type": "Receivable"
},
@@ -192,7 +191,7 @@
"account_type": "Receivable"
},
"2570 Einfuhrumsatzsteuer (bezahlt)": {"account_type": "Tax"},
"2460 Eingeforderte aber noch nicht eingezahlte Einlagen": {
"account_type": "Receivable"
},
@@ -243,10 +242,10 @@
},
"2800 Guthaben bei Bank": {
"account_type": "Bank"
},
},
"2801 Guthaben bei Bank - Sparkonto": {
"account_type": "Bank"
},
},
"2810 Guthaben bei Paypal": {
"account_type": "Bank"
},
@@ -264,19 +263,19 @@
},
"2895 Schwebende Geldbewegugen": {
"account_type": "Bank"
},
},
"2513 Vorsteuer Inland 5%": {
"account_type": "Tax"
},
"2515 Vorsteuer Inland 20%": {
"account_type": "Tax"
},
},
"2520 Vorsteuer aus innergemeinschaftlichem Erwerb 10%": {
"account_type": "Tax"
},
"2525 Vorsteuer aus innergemeinschaftlichem Erwerb 20%": {
"account_type": "Tax"
},
},
"2530 Vorsteuer \u00a719/Art 19 ( reverse charge ) ": {
"account_type": "Tax"
},
@@ -286,16 +285,16 @@
"root_type": "Asset"
},
"Klasse 4: Betriebliche Erträge": {
"4000 Erlöse 20 %": {"account_type": "Income Account"},
"4020 Erl\u00f6se 0 % steuerbefreit": {"account_type": "Income Account"},
"4000 Erlöse 20 %": {"account_type": "Income Account"},
"4020 Erl\u00f6se 0 % steuerbefreit": {"account_type": "Income Account"},
"4010 Erl\u00f6se 10 %": {"account_type": "Income Account"},
"4030 Erl\u00f6se 13 %": {"account_type": "Income Account"},
"4040 Erl\u00f6se 0 % innergemeinschaftliche Lieferungen": {"account_type": "Income Account"},
"4400 Erl\u00f6sreduktion 0 % steuerbefreit": {"account_type": "Expense Account"},
"4030 Erl\u00f6se 13 %": {"account_type": "Income Account"},
"4040 Erl\u00f6se 0 % innergemeinschaftliche Lieferungen": {"account_type": "Income Account"},
"4400 Erl\u00f6sreduktion 0 % steuerbefreit": {"account_type": "Expense Account"},
"4410 Erl\u00f6sreduktion 10 %": {"account_type": "Expense Account"},
"4420 Erl\u00f6sreduktion 20 %": {"account_type": "Expense Account"},
"4430 Erl\u00f6sreduktion 13 %": {"account_type": "Expense Account"},
"4440 Erl\u00f6sreduktion 0 % innergemeinschaftliche Lieferungen": {"account_type": "Expense Account"},
"4430 Erl\u00f6sreduktion 13 %": {"account_type": "Expense Account"},
"4440 Erl\u00f6sreduktion 0 % innergemeinschaftliche Lieferungen": {"account_type": "Expense Account"},
"4500 Ver\u00e4nderungen des Bestandes an fertigen und unfertigen Erzeugn. sowie an noch nicht abrechenbaren Leistungen": {"account_type": "Income Account"},
"4580 Aktivierte Eigenleistungen": {"account_type": "Income Account"},
"4600 Erl\u00f6se aus dem Abgang vom Anlageverm\u00f6gen, ausgen. Finanzanlagen": {"account_type": "Income Account"},
@@ -304,15 +303,15 @@
"4700 Ertr\u00e4ge aus der Aufl\u00f6sung von R\u00fcckstellungen": {"account_type": "Income Account"},
"4800 \u00dcbrige betriebliche Ertr\u00e4ge": {"account_type": "Income Account"},
"root_type": "Income"
},
},
"Klasse 5: Aufwand f\u00fcr Material und Leistungen": {
"5000 Einkauf Partnerleistungen": {"account_type": "Cost of Goods Sold"},
"5000 Einkauf Partnerleistungen": {"account_type": "Cost of Goods Sold"},
"5100 Verbrauch an Rohstoffen": {"account_type": "Cost of Goods Sold"},
"5200 Verbrauch von bezogenen Fertig- und Einzelteilen": {"account_type": "Cost of Goods Sold"},
"5300 Verbrauch von Hilfsstoffen": {"account_type": "Cost of Goods Sold"},
"5340 Verbrauch Verpackungsmaterial": {"account_type": "Cost of Goods Sold"},
"5470 Verbrauch von Kleinmaterial": {"account_type": "Cost of Goods Sold"},
"5450 Verbrauch von Reinigungsmaterial": {"account_type": "Cost of Goods Sold"},
"5450 Verbrauch von Reinigungsmaterial": {"account_type": "Cost of Goods Sold"},
"5400 Verbrauch von Betriebsstoffen": {"account_type": "Cost of Goods Sold"},
"5500 Verbrauch von Werkzeugen und anderen Erzeugungshilfsmittel": {"account_type": "Cost of Goods Sold"},
"5600 Verbrauch von Brenn- und Treibstoffen, Energie und Wasser": {"account_type": "Cost of Goods Sold"},
@@ -340,7 +339,7 @@
"6700 Sonstige Sozialaufwendungen": {"account_type": "Payable"},
"6900 Aufwandsstellenrechnung Personal": {"account_type": "Payable"},
"root_type": "Expense"
},
},
"Klasse 7: Abschreibungen und sonstige betriebliche Aufwendungen": {
"7010 Abschreibungen auf das Anlageverm\u00f6gen (ausgenommen Finanzanlagen)": {"account_type": "Depreciation"},
"7100 Sonstige Steuern und Geb\u00fchren": {"account_type": "Tax"},
@@ -349,7 +348,7 @@
"7310 Fahrrad - Aufwand": {"account_type": "Expense Account"},
"7320 Kfz - Aufwand": {"account_type": "Expense Account"},
"7330 LKW - Aufwand": {"account_type": "Expense Account"},
"7340 Lastenrad - Aufwand": {"account_type": "Expense Account"},
"7340 Lastenrad - Aufwand": {"account_type": "Expense Account"},
"7350 Reise- und Fahraufwand": {"account_type": "Expense Account"},
"7360 Tag- und N\u00e4chtigungsgelder": {"account_type": "Expense Account"},
"7380 Nachrichtenaufwand": {"account_type": "Expense Account"},
@@ -409,7 +408,7 @@
"8990 Gewinnabfuhr bzw. Verlust\u00fcberrechnung aus Ergebnisabf\u00fchrungsvertr\u00e4gen": {"account_type": "Expense Account"},
"8350 nicht ausgenutzte Lieferantenskonti": {"account_type": "Expense Account"},
"root_type": "Income"
},
},
"Klasse 9 Passiva: Eigenkapital, R\u00fccklagen, stille Einlagen, Abschlusskonten": {
"9000 Gezeichnetes bzw. gewidmetes Kapital": {
"account_type": "Equity"
@@ -435,5 +434,5 @@
},
"root_type": "Equity"
}
}
}
}

View File

@@ -1,531 +0,0 @@
{
"country_code": "tr",
"name": "Turkey - Tek D\u00fczen Hesap Plan\u0131",
"tree": {
"Duran Varl\u0131klar": {
"Di\u011fer Alacaklar": {
"Ba\u011fl\u0131 Ortakl\u0131klardan Alacaklar": {},
"Di\u011fer Alacak Senetleri Reeskontu(-)": {},
"Di\u011fer \u00c7e\u015fitli Alacaklar": {},
"Ortaklardan Alacaklar": {},
"Personelden Alacaklar": {},
"\u0130\u015ftiraklerden Alacaklar": {},
"\u015e\u00fcpheli Di\u011fer Alacaklar Kar\u015f\u0131l\u0131\u011f\u0131(-)": {}
},
"Di\u011fer Duran Varl\u0131klar": {
"Birikmi\u015f Amortismanlar(-)": {},
"Di\u011fer KDV": {},
"Di\u011fer \u00c7e\u015fitli Duran Varl\u0131klar": {},
"Elden \u00c7\u0131kar\u0131lacak Stoklar Ve Maddi Duran Varl\u0131klar": {},
"Gelecek Y\u0131llar \u0130htiyac\u0131 Stoklar": {},
"Gelecek Y\u0131llarda \u0130ndirilecek KDV": {},
"Pe\u015fin \u00d6denen Vergi Ve Fonlar": {},
"Stok De\u011fer D\u00fc\u015f\u00fckl\u00fc\u011f\u00fc Kar\u015f\u0131l\u0131\u011f\u0131(-)": {}
},
"Gelecek Y\u0131llara Ait Giderler ve Gelir Tahakkuklar\u0131": {
"Gelecek Y\u0131llara Ait Giderler": {},
"Gelir Tahakkuklar\u0131": {}
},
"Maddi Duran Varl\u0131klar": {
"Arazi Ve Arsalar": {},
"Binalar": {},
"Birikmi\u015f Amortismanlar(-)": {},
"Demirba\u015flar": {},
"Di\u011fer Maddi Duran Varl\u0131klar": {},
"Ta\u015f\u0131tlar": {},
"Tesis, Makine Ve Cihazlar": {},
"Verilen Avanslar": {},
"Yap\u0131lmakta Olan Yat\u0131r\u0131mlar": {},
"Yer Alt\u0131 Ve Yer \u00dcst\u00fc D\u00fczenleri": {}
},
"Maddi Olmayan Duran Varl\u0131klar": {
"Ara\u015ft\u0131rma Ve Geli\u015ftirme Giderleri": {},
"Birikmi\u015f Amortismanlar(-)": {},
"Di\u011fer Maddi Olmayan Duran Varl\u0131klar": {},
"Haklar": {},
"Kurulu\u015f Ve \u00d6rg\u00fctlenme Giderleri": {},
"Verilen Avanslar": {},
"\u00d6zel Maliyetler": {},
"\u015eerefiye": {}
},
"Mali Duran Varl\u0131klar": {
"Ba\u011fl\u0131 Menkul K\u0131ymetler": {},
"Ba\u011fl\u0131 Menkul K\u0131ymetler De\u011fer D\u00fc\u015f\u00fckl\u00fc\u011f\u00fc Kar\u015f\u0131l\u0131\u011f\u0131(-)": {},
"Ba\u011fl\u0131 Ortakl\u0131klar": {},
"Ba\u011fl\u0131 Ortakl\u0131klar Sermaye Paylar\u0131 De\u011fer D\u00fc\u015f\u00fckl\u00fc\u011f\u00fc Kar\u015f\u0131l\u0131\u011f\u0131(-)": {},
"Ba\u011fl\u0131 Ortakl\u0131klara Sermaye Taahh\u00fctleri(-)": {},
"Di\u011fer Mali Duran Varl\u0131klar": {},
"Di\u011fer Mali Duran Varl\u0131klar Kar\u015f\u0131l\u0131\u011f\u0131(-)": {},
"\u0130\u015ftirakler": {},
"\u0130\u015ftirakler Sermaye Paylar\u0131 De\u011fer D\u00fc\u015f\u00fckl\u00fc\u011f\u00fc Kar\u015f\u0131l\u0131\u011f\u0131(-)": {},
"\u0130\u015ftiraklere Sermaye Taahh\u00fctleri(-)": {}
},
"Ticari Alacaklar": {
"Alacak Senetleri": {},
"Alacak Senetleri Reeskontu(-)": {},
"Al\u0131c\u0131lar": {},
"Kazaqn\u0131lmam\u0131\u015f Finansal Kiralama Faiz Gelirleri(-)": {},
"Verilen Depozito Ve Teminatlar": {},
"\u015e\u00fcpheli Ticari Alacaklar Kar\u015f\u0131l\u0131\u011f\u0131(-)": {}
},
"root_type": "",
"\u00d6zel T\u00fckenmeye Tabi Varl\u0131klar": {
"Arama Giderleri": {},
"Birikmi\u015f T\u00fckenme Paylar\u0131(-)": {},
"Di\u011fer \u00d6zel T\u00fckenmeye Tabi Varl\u0131klar": {},
"Haz\u0131rl\u0131k Ve Geli\u015ftirme Giderleri": {},
"Verilen Avanslar": {}
}
},
"D\u00f6nen Varl\u0131klar": {
"Di\u011fer Alacaklar": {
"Ba\u011fl\u0131 Ortakl\u0131klardan Alacaklar": {},
"Di\u011fer Alacak Senetleri Reeskontu(-)": {},
"Di\u011fer \u00c7e\u015fitli Alacaklar": {},
"Ortaklardan Alacaklar": {},
"Personelden Alacaklar": {},
"\u0130\u015ftiraklerden Alacaklar": {},
"\u015e\u00fcpheli Di\u011fer Alacaklar": {},
"\u015e\u00fcpheli Di\u011fer Alacaklar Kar\u015f\u0131l\u0131\u011f\u0131(-)": {}
},
"Di\u011fer D\u00f6nen Varl\u0131klar": {
"Devreden KDV": {},
"Di\u011fer D\u00f6nen Varl\u0131klar Kar\u015f\u0131l\u0131\u011f\u0131(-)": {},
"Di\u011fer KDV": {},
"Di\u011fer \u00c7e\u015fitli D\u00f6nen Varl\u0131klar": {},
"Personel Avanslar\u0131": {},
"Pe\u015fin \u00d6denen Vergiler Ve Fonlar": {},
"Say\u0131m Ve Tesell\u00fcm Noksanlar\u0131": {},
"\u0130ndirilecek KDV": {},
"\u0130\u015f Avanslar\u0131": {}
},
"Gelecek Aylara Ait Giderler ve Gelir Tahakkuklar\u0131": {
"Gelecek Aylara Ait Giderler": {},
"Gelir Tahakkuklar\u0131": {}
},
"Haz\u0131r De\u011ferler": {
"Al\u0131nan \u00c7ekler": {},
"Bankalar": {
"account_type": "Bank"
},
"Di\u011fer Haz\u0131r De\u011ferler": {},
"Kasa": {
"account_type": "Cash"
},
"Verilen \u00c7ekler ve \u00d6deme Emirleri(-)": {}
},
"Menkul K\u0131ymetler": {
"Di\u011fer Menkul K\u0131ymetler": {},
"Hisse Senetleri": {},
"Kamu Kesimi Tahvil, Senet ve Bonolar\u0131": {},
"Menkul K\u0131ymetler De\u011fer D\u00fc\u015f\u00fckl\u00fc\u011f\u00fc Kar\u015f\u0131l\u0131\u011f\u0131(-)": {},
"\u00d6zel Kesim Tahvil Senet Ve Bonolar\u0131": {}
},
"Stoklar": {
"Mamuller": {},
"Stok De\u011fer D\u00fc\u015f\u00fckl\u00fc\u011f\u00fc Kar\u015f\u0131l\u0131\u011f\u0131(-)": {},
"Ticari Mallar": {},
"Verilen Sipari\u015f Avanslar\u0131": {},
"Yar\u0131 Mamuller": {},
"\u0130lk Madde Malzeme": {}
},
"Ticari Alacaklar": {
"Alacak Senetleri": {},
"Alacak Senetleri Reeskontu(-)": {},
"Al\u0131c\u0131lar": {},
"Di\u011fer Ticari Alacaklar": {},
"Kazan\u0131lmam\u0131\u015f Finansal Kiralama Faiz Gelirleri(-)": {},
"Verilen Depozito ve Teminatlar": {},
"\u015e\u00fcpheli Ticari Alacaklar": {},
"\u015e\u00fcpheli Ticari Alacaklar Kar\u015f\u0131l\u0131\u011f\u0131": {}
},
"Y\u0131llara Yayg\u0131n \u0130n\u015faat ve Onar\u0131m Maliyetleri": {
"Ta\u015feronlara Verilen Avanslar": {},
"Y\u0131llara Yayg\u0131n \u0130n\u015faat Ve Onar\u0131m Maliyetleri": {}
},
"root_type": ""
},
"Gelir Tablosu Hesaplar\u0131": {
"Br\u00fct Sat\u0131\u015flar": {
"Di\u011fer Gelirler": {},
"Yurt D\u0131\u015f\u0131 Sat\u0131\u015flar": {},
"Yurt \u0130\u00e7i Sat\u0131\u015flar": {}
},
"Di\u011fer Faaliyetlerden Olu\u015fan Gelir ve K\u00e2rlar": {
"Ba\u011fl\u0131 Ortakl\u0131klardan Temett\u00fc Gelirleri": {},
"Di\u011fer Ola\u011fan Gelir Ve K\u00e2rlar": {},
"Enflasyon D\u00fczeltme K\u00e2rlar\u0131": {},
"Faiz Gelirleri": {},
"Kambiyo K\u00e2rlar\u0131": {},
"Komisyon Gelirleri": {},
"Konusu Kalmayan Kar\u015f\u0131l\u0131klar": {},
"Menkul K\u0131ymet Sat\u0131\u015f K\u00e2rlar\u0131": {},
"Reeskont Faiz Gelirleri": {},
"\u0130\u015ftiraklerden Temett\u00fc Gelirleri": {}
},
"Di\u011fer Faaliyetlerden Olu\u015fan Gider ve Zararlar (-)": {
"Di\u011fer Ola\u011fan Gider Ve Zararlar(-)": {},
"Enflasyon D\u00fczeltmesi Zararlar\u0131(-)": {},
"Kambiyo Zararlar\u0131(-)": {},
"Kar\u015f\u0131l\u0131k Giderleri(-)": {},
"Komisyon Giderleri(-)": {},
"Menkul K\u0131ymet Sat\u0131\u015f Zararlar\u0131(-)": {},
"Reeskont Faiz Giderleri(-)": {}
},
"D\u00f6nem Net K\u00e2r\u0131 Ve Zarar\u0131": {
"D\u00f6nem K\u00e2r\u0131 Vergi Ve Di\u011fer Yasal Y\u00fck\u00fcml\u00fcl\u00fck Kar\u015f\u0131l\u0131klar\u0131(-)": {},
"D\u00f6nem K\u00e2r\u0131 Veya Zarar\u0131": {},
"D\u00f6nem Net K\u00e2r\u0131 Veya Zarar\u0131": {},
"Enflasyon D\u00fczeltme Hesab\u0131": {},
"Y\u0131llara Yayg\u0131n \u0130n\u015faat Ve Enflasyon D\u00fczeltme Hesab\u0131": {}
},
"Faaliyet Giderleri(-)": {
"Ara\u015ft\u0131rma Ve Geli\u015ftirme Giderleri(-)": {},
"Genel Y\u00f6netim Giderleri(-)": {},
"Pazarlama Sat\u0131\u015f Ve Da\u011f\u0131t\u0131m Giderleri(-)": {}
},
"Finansman Giderleri": {
"K\u0131sa Vadeli Bor\u00e7lanma Giderleri(-)": {},
"Uzun Vadeli Bor\u00e7lanma Giderleri(-)": {}
},
"Ola\u011fan D\u0131\u015f\u0131 Gelir Ve K\u00e2rlar": {
"Di\u011fer Ola\u011fan D\u0131\u015f\u0131 Gelir Ve K\u00e2rlar": {},
"\u00d6nceki D\u00f6nem Gelir Ve K\u00e2rlar\u0131": {}
},
"Ola\u011fan D\u0131\u015f\u0131 Gider Ve Zaralar(-)": {
"Di\u011fer Ola\u011fan D\u0131\u015f\u0131 Gider Ve Zararlar(-)": {},
"\u00c7al\u0131\u015fmayan K\u0131s\u0131m Gider Ve Zararlar\u0131(-)": {},
"\u00d6nceki D\u00f6nem Gider Ve Zararlar\u0131(-)": {}
},
"Sat\u0131\u015f \u0130ndirimleri (-)": {
"Di\u011fer \u0130ndirimler": {},
"Sat\u0131\u015f \u0130ndirimleri(-)": {},
"Sat\u0131\u015ftan \u0130adeler(-)": {}
},
"Sat\u0131\u015flar\u0131n Maliyeti(-)": {
"Di\u011fer Sat\u0131\u015flar\u0131n Maliyeti(-)": {},
"Sat\u0131lan Hizmet Maliyeti(-)": {},
"Sat\u0131lan Mamuller Maliyeti(-)": {},
"Sat\u0131lan Ticari Mallar Maliyeti(-)": {}
},
"root_type": ""
},
"K\u0131sa Vadeli Yabanc\u0131 Kaynaklar": {
"Al\u0131nan Avanslar": {
"Al\u0131nan Di\u011fer Avanslar": {
"account_type": "Payable"
},
"Al\u0131nan Sipari\u015f Avanslar\u0131": {
"account_type": "Payable"
},
"account_type": "Payable"
},
"Bor\u00e7 ve Gider Kar\u015f\u0131l\u0131klar\u0131": {
"Di\u011fer Bor\u00e7 Ve Gider Kar\u015f\u0131l\u0131klar\u0131": {
"account_type": "Payable"
},
"D\u00f6nem K\u00e2r\u0131 Vergi Ve Di\u011fer Yasal Y\u00fck\u00fcml\u00fcl\u00fck Kar\u015f\u0131l\u0131klar\u0131": {
"account_type": "Tax"
},
"D\u00f6nem K\u00e2r\u0131n\u0131n Pe\u015fin \u00d6denen Vergi Ve Di\u011fer Y\u00fck\u00fcml\u00fcl\u00fckler(-)": {
"account_type": "Tax"
},
"K\u0131dem Tazminat\u0131 Kar\u015f\u0131l\u0131\u011f\u0131": {},
"Maliyet Giderleri Kar\u015f\u0131l\u0131\u011f\u0131": {},
"account_type": "Payable"
},
"Di\u011fer Bor\u00e7lar": {
"Ba\u011fl\u0131 Ortakl\u0131klara Bor\u00e7lar": {
"account_type": "Payable"
},
"Di\u011fer Bor\u00e7 Senetleri Reeskontu(-)": {
"account_type": "Payable"
},
"Di\u011fer \u00c7e\u015fitli Bor\u00e7lar": {
"account_type": "Payable"
},
"Ortaklara Bor\u00e7lar": {
"account_type": "Payable"
},
"Personele Bor\u00e7lar": {
"account_type": "Payable"
},
"account_type": "Payable",
"\u0130\u015ftiraklere Bor\u00e7lar": {
"account_type": "Payable"
}
},
"Di\u011fer K\u0131sa Vadeli Yabanc\u0131 Kaynaklar": {
"Di\u011fer KDV": {
"account_type": "Tax"
},
"Di\u011fer \u00c7e\u015fitli Yabanc\u0131 Kaynaklar": {},
"Hesaplanan KDV": {
"account_type": "Tax"
},
"Merkez Ve \u015eubeler Cari Hesab\u0131": {},
"Say\u0131m Ve Tesell\u00fcm Fazlalar\u0131": {},
"account_type": "Payable"
},
"Gelecek Aylara Ait Gelirler Ve Gider Tahakkuklar\u0131": {
"Gelecek Aylara Ait Gelirler": {},
"Gider Tahakkuklar\u0131": {}
},
"Mali Bor\u00e7lar": {
"Banka Kredileri": {
"account_type": "Payable"
},
"Di\u011fer Mali Bor\u00e7lar": {
"account_type": "Payable"
},
"Ertelenmi\u015f Finansal Kiralama Bor\u00e7lanma Maliyetleri(-)": {
"account_type": "Payable"
},
"Finansal Kiralama \u0130\u015flemlerinden Bor\u00e7lar": {
"account_type": "Payable"
},
"Menkul K\u0131ymetler \u0130hra\u00e7 Fark\u0131(-)": {
"account_type": "Payable"
},
"Tahvil Anapara Bor\u00e7, Taksit Ve Faizleri": {
"account_type": "Payable"
},
"Uzun Vadeli Kredilerin Anapara Taksitleri Ve Faizleri": {
"account_type": "Payable"
},
"account_type": "Payable",
"\u00c7\u0131kar\u0131lan Bonolar Ve Senetler": {
"account_type": "Payable"
},
"\u00c7\u0131kar\u0131lm\u0131\u015f Di\u011fer Menkul K\u0131ymetler": {
"account_type": "Payable"
}
},
"Ticari Bor\u00e7lar": {
"Al\u0131nan Depozito Ve Teminatlar": {
"account_type": "Payable"
},
"Bor\u00e7 Senetleri": {
"account_type": "Payable"
},
"Bor\u00e7 Senetleri Reeskontu(-)": {
"account_type": "Payable"
},
"Di\u011fer Ticari Bor\u00e7lar": {
"account_type": "Payable"
},
"Sat\u0131c\u0131lar": {
"account_type": "Payable"
},
"account_type": "Payable"
},
"Y\u0131llara Yayg\u0131n \u0130n\u015faat Ve Onar\u0131m Hakedi\u015fleri": {
"350 Y\u0131llara Yayg\u0131n \u0130n\u015faat Ve Onar\u0131m Hakedi\u015fleri Bedelleri": {
"account_type": "Payable"
},
"account_type": "Payable"
},
"root_type": "",
"\u00d6denecek Vergi ve Di\u011fer Y\u00fck\u00fcml\u00fcl\u00fckler": {
"Vadesi Ge\u00e7mi\u015f, Ertelenmi\u015f Veya Taksitlendirilmi\u015f Vergi Ve Di\u011fer Y\u00fck\u00fcml\u00fcl\u00fckler": {
"account_type": "Tax"
},
"account_type": "Tax",
"\u00d6denecek Di\u011fer Y\u00fck\u00fcml\u00fcl\u00fckler": {
"account_type": "Tax"
},
"\u00d6denecek Sosyal G\u00fcvenl\u00fck Kesintileri": {
"account_type": "Tax"
},
"\u00d6denecek Vergi Ve Fonlar": {
"account_type": "Tax"
}
}
},
"Maliyet Hesaplar\u0131": {
"Ara\u015ft\u0131rma Ve Geli\u015ftirme Giderleri": {},
"Direkt \u0130lk Madde Ve Malzeme Giderleri": {
"Direk \u0130lk Madde Ve Malzeme Giderleri Hesab\u0131": {},
"Direkt \u0130lk Madde Ve Malzeme Fiyat Fark\u0131": {},
"Direkt \u0130lk Madde Ve Malzeme Miktar Fark\u0131": {},
"Direkt \u0130lk Madde Ve Malzeme Yans\u0131tma Hesab\u0131": {}
},
"Direkt \u0130\u015f\u00e7ilik Giderleri": {
"Direkt \u0130\u015f\u00e7ilik Giderleri": {},
"Direkt \u0130\u015f\u00e7ilik Giderleri Yans\u0131tma Hesab\u0131": {},
"Direkt \u0130\u015f\u00e7ilik S\u00fcre Farklar\u0131": {},
"Direkt \u0130\u015f\u00e7ilik \u00dccret Farklar\u0131": {}
},
"Finansman Giderleri": {
"Finansman Giderleri": {},
"Finansman Giderleri Fark Hesab\u0131": {},
"Finansman Giderleri Yans\u0131tma Hesab\u0131": {}
},
"Genel Y\u00f6netim Giderleri": {
"Genel Y\u00f6netim Gider Farklar\u0131 Hesab\u0131": {},
"Genel Y\u00f6netim Giderleri": {},
"Genel Y\u00f6netim Giderleri Yans\u0131tma Hesab\u0131": {}
},
"Genel \u00dcretim Giderleri": {
"Genel \u00dcretim Giderleri": {},
"Genel \u00dcretim Giderleri B\u00fct\u00e7e Farklar\u0131": {},
"Genel \u00dcretim Giderleri Kapasite Farklar\u0131": {},
"Genel \u00dcretim Giderleri Verimlilik Giderleri": {},
"Genel \u00dcretim Giderleri Yans\u0131tma Hesab\u0131": {}
},
"Hizmet \u00dcretim Maliyeti": {
"Hizmet \u00dcretim Maliyeti": {},
"Hizmet \u00dcretim Maliyeti Fark Hesaplar\u0131": {},
"Hizmet \u00dcretim Maliyeti Yans\u0131tma Hesab\u0131": {}
},
"Maliyet Muhasebesi Ba\u011flant\u0131 Hesaplar\u0131": {
"Maliyet Muhasebesi Ba\u011flant\u0131 Hesab\u0131": {},
"Maliyet Muhasebesi Yans\u0131tma Hesab\u0131": {}
},
"Pazarlama, Sat\u0131\u015f Ve Da\u011f\u0131t\u0131m Giderleri": {
"Atra\u015ft\u0131rma Ve Geli\u015ftirme Giderleri": {},
"Pazarlama Sat\u0131\u015f Ve Dag\u0131t\u0131m Giderleri Yans\u0131tma Hesab\u0131": {},
"Pazarlama Sat\u0131\u015f Ve Da\u011f\u0131t\u0131m Giderleri Fark Hesab\u0131": {}
},
"root_type": ""
},
"Naz\u0131m Hesaplar": {
"root_type": ""
},
"Serbest Hesaplar": {
"root_type": ""
},
"Uzun Vadeli Yabanc\u0131 Kaynaklar": {
"Al\u0131nan Avanslar": {
"Al\u0131nan Di\u011fer Avanslar": {
"account_type": "Payable"
},
"Al\u0131nan Sipari\u015f Avanslar\u0131": {
"account_type": "Payable"
},
"account_type": "Payable"
},
"Bor\u00e7 Ve Gider Kar\u015f\u0131l\u0131klar\u0131": {
"Di\u011fer Bor\u00e7 Ve Gider Kar\u015f\u0131l\u0131klar\u0131": {
"account_type": "Payable"
},
"K\u0131dem Tazminat\u0131 Kar\u015f\u0131l\u0131\u011f\u0131": {},
"account_type": "Payable"
},
"Di\u011fer Bor\u00e7lar": {
"Ba\u011fl\u0131 Ortakl\u0131klara Bor\u00e7lar": {
"account_type": "Payable"
},
"Di\u011fer Bor\u00e7 Senetleri Reeskontu(-)": {
"account_type": "Payable"
},
"Di\u011fer \u00c7e\u015fitli Bor\u00e7lar": {
"account_type": "Payable"
},
"Kamuya Olan Ertelenmi\u015f Veya Taksitlendirilmi\u015f Bor\u00e7lar": {
"account_type": "Payable"
},
"Ortaklara Bor\u00e7lar": {
"account_type": "Payable"
},
"account_type": "Payable",
"\u0130\u015ftiraklere Bor\u00e7lar": {
"account_type": "Payable"
}
},
"Di\u011fer Uzun Vadeli Yabanc\u0131 Kaynaklar": {
"Di\u011fer \u00c7e\u015fitli Uzun Vadeli Yabanc\u0131 Kaynaklar": {
"account_type": "Payable"
},
"Gelecek Y\u0131llara Ertelenmi\u015f Veya Terkin Edilecek KDV": {
"account_type": "Payable"
},
"Tesise Kat\u0131lma Paylar\u0131": {
"account_type": "Payable"
},
"account_type": "Payable"
},
"Gelecek Y\u0131llara Ait Gelirler Ve Gider Tahakkuklar\u0131": {
"Gelecek Y\u0131llara Ait Gelirler": {},
"Gider Tahakkuklar\u0131": {}
},
"Mali Bor\u00e7lar": {
"Banka Kredileri": {
"account_type": "Payable"
},
"Di\u011fer Mali Bor\u00e7lar": {
"account_type": "Payable"
},
"Ertelenmi\u015f Finansal Kiralama Bor\u00e7lanma Maliyetleri(-)": {
"account_type": "Payable"
},
"Finansal Kiralama \u0130\u015flemlerinden Bor\u00e7lar": {
"account_type": "Payable"
},
"Menkul K\u0131ymetler \u0130hra\u00e7 Fark\u0131(-)": {
"account_type": "Payable"
},
"account_type": "Payable",
"\u00c7\u0131kar\u0131lm\u0131\u015f Di\u011fer Menkul K\u0131ymetler": {
"account_type": "Payable"
},
"\u00c7\u0131kar\u0131lm\u0131\u015f Tahviller": {
"account_type": "Payable"
}
},
"Ticari Bor\u00e7lar": {
"Al\u0131nan Depozito Ve Teminatlar": {
"account_type": "Payable"
},
"Bor\u00e7 Senetleri": {
"account_type": "Payable"
},
"Bor\u00e7 Senetleri Reeskontu(-)": {
"account_type": "Payable"
},
"Di\u011fer Ticari Bor\u00e7lar": {
"account_type": "Payable"
},
"Sat\u0131c\u0131lar": {
"account_type": "Payable"
},
"account_type": "Payable"
},
"root_type": ""
},
"\u00d6z Kaynaklar": {
"D\u00f6nem Net K\u00e2r\u0131 (Zarar\u0131)": {
"D\u00f6nem Net K\u00e2r\u0131": {},
"D\u00f6nem Net Zarar\u0131(-)": {}
},
"Ge\u00e7mi\u015f Y\u0131llar K\u00e2rlar\u0131": {
"Ge\u00e7mi\u015f Y\u0131llar K\u00e2rlar\u0131": {}
},
"Ge\u00e7mi\u015f Y\u0131llar Zararlar\u0131(-)": {
"Ge\u00e7mi\u015f Y\u0131llar Zararlar\u0131(-)": {}
},
"K\u00e2r Yedekleri": {
"Di\u011fer K\u00e2r Yedekleri": {},
"Ola\u011fan\u00fcst\u00fc Yedekler": {},
"Stat\u00fc Yedekleri": {},
"Yasal Yedekler": {},
"\u00d6zel Fonlar": {}
},
"Sermaye Yedekleri": {
"Di\u011fer Sermaye Yedekleri": {},
"Hisse Senedi \u0130ptal K\u00e2rlar\u0131": {},
"Hisse Senetleri \u0130hra\u00e7 Primleri": {},
"Maddi Duran Varl\u0131k Yeniden De\u011ferlenme Art\u0131\u015flar\u0131": {},
"Maliyet Art\u0131\u015flar\u0131 Fonu": {},
"\u0130\u015ftirakler Yeniden De\u011ferleme Art\u0131\u015flar\u0131": {}
},
"root_type": "",
"\u00d6denmi\u015f Sermaye": {
"Sermaye": {},
"\u00d6denmi\u015f Sermaye(-)": {
"account_type": "Payable"
}
}
}
}
}

View File

@@ -0,0 +1,817 @@
{
"country_code": "au",
"name": "Australia - Chart of Accounts with Account Numbers",
"tree": {
"Assets": {
"Current Assets": {
"Cash On Hand": {
"Cash On Hand": {
"account_number": "11010",
"account_type": "Cash"
},
"account_number": "110",
"is_group": 1
},
"Cash at Bank": {
"Every Day Bank Account": {
"account_number": "11510",
"account_type": "Bank"
},
"Business Savings Account": {
"account_number": "11520"
},
"Business Term Deposit": {
"account_number": "11530"
},
"account_number": "115",
"is_group": 1
},
"Trade Receivables": {
"Trade Debtors": {
"account_number": "12010",
"account_type": "Receivable"
},
"Provision for Doubtful Debts": {
"account_number": "12020"
},
"Sundry Debtors": {
"account_number": "12030"
},
"Debtor Refund": {
"account_number": "12040"
},
"account_number": "120",
"is_group": 1
},
"Inventory": {
"Stock On Hand": {
"account_number": "13010",
"account_type": "Stock"
},
"WIP - Work In Progress - Manufacturing": {
"account_number": "13020"
},
"account_number": "130",
"is_group": 1
},
"Prepayments": {
"Prepayments": {
"account_number": "14010"
},
"Provisional Tax Paid": {
"account_number": "14020"
},
"account_number": "140",
"is_group": 1
},
"account_number": "11",
"is_group": 1
},
"Non Current Assets": {
"Plant & Equipment": {
"Plant & Equipment": {
"account_number": "16010",
"account_type": "Fixed Asset"
},
"Accumulated Depreciation Plant & Equipment": {
"account_number": "16020",
"account_type": "Accumulated Depreciation"
},
"account_number": "160",
"is_group": 1
},
"Motor Vehicle": {
"Motor Vehicle": {
"account_number": "16110",
"account_type": "Fixed Asset"
},
"Accumulated Depreciation Motor Vehicle": {
"account_number": "16120",
"account_type": "Accumulated Depreciation"
},
"account_number": "161",
"is_group": 1
},
"Office Equipment": {
"Office Furniture & Equipment": {
"account_number": "16210",
"account_type": "Fixed Asset"
},
"Accumulated Depreciation Office Furniture & Equipment": {
"account_number": "16220",
"account_type": "Accumulated Depreciation"
},
"account_number": "162",
"is_group": 1
},
"Computer Equipment": {
"Computer Equipment": {
"account_number": "16310",
"account_type": "Fixed Asset"
},
"Accumulated Depreciation Computer Equipment": {
"account_number": "16320",
"account_type": "Accumulated Depreciation"
},
"account_number": "163",
"is_group": 1
},
"Building": {
"Buildings": {
"account_number": "16410",
"account_type": "Fixed Asset"
},
"Accumulated Depreciation Buildings": {
"account_number": "16420",
"account_type": "Accumulated Depreciation"
},
"CWIP - Construction Work In Progress": {
"account_number": "16430",
"account_type": "Capital Work in Progress"
},
"Accumulated Depreciation - Others": {
"account_number": "16440",
"account_type": "Accumulated Depreciation"
},
"account_number": "164",
"is_group": 1
},
"Related Party": {
"Loan to Party 1": {
"account_number": "17010"
},
"account_number": "170",
"is_group": 1
},
"Investments & Unlisted Entities": {
"Investment - Entity 1": {
"account_number": "17510"
},
"account_number": "175",
"is_group": 1
},
"Intagible Assets": {
"Goodwill": {
"account_number": "18010"
},
"Opening Balance Temporary ": {
"account_number": "18090",
"account_type": "Temporary"
},
"account_number": "180",
"is_group": 1
},
"account_number": "16",
"is_group": 1
},
"account_number": "1",
"root_type": "Asset"
},
"Liabilities": {
"Current Liabilities": {
"Trade Payables - Current": {
"Trade Creditors": {
"account_number": "21010",
"account_type": "Payable"
},
"Goods Received Not Invoiced": {
"account_number": "21050",
"account_type": "Stock Received But Not Billed"
},
"Service Received Not Invoiced": {
"account_number": "21060"
},
"Asset Received Not Invoiced": {
"account_number": "21070",
"account_type": "Asset Received But Not Billed"
},
"account_number": "210",
"is_group": 1
},
"Other Payables - Current": {
"Accrued Expenses": {
"account_number": "21510"
},
"Payroll - Wages Clearing": {
"account_number": "21550"
},
"Payroll - Superannuation Deductions": {
"account_number": "21555"
},
"Payroll - Misc Deductions": {
"account_number": "21560"
},
"Payroll - Withholding Tax Payable": {
"account_number": "21565"
},
"account_number": "215",
"is_group": 1
},
"GST": {
"GST Payments to ATO": {
"account_number": "22030"
},
"Provision for PAYG Tax": {
"account_number": "22040"
},
"account_number": "220",
"account_type": "Tax",
"is_group": 1
},
"Interest & Non Bearing Liabilities - Current": {
"Credit Card - VISA": {
"account_number": "22510"
},
"account_number": "225",
"is_group": 1
},
"Bank Overdraft": {
"Bank Overdraft Cash at Bank": {
"account_number": "23010"
},
"account_number": "230",
"is_group": 1
},
"Trade Finance": {
"Trade Finance": {
"account_number": "23510"
},
"account_number": "235",
"is_group": 1
},
"Lease Liabilities": {
"Finance Lease - Current": {
"account_number": "24010"
},
"account_number": "240",
"is_group": 1
},
"Provisions": {
"Provision for Long Service Leave": {
"account_number": "24510"
},
"Provision for Holiday Pay": {
"account_number": "24520"
},
"account_number": "245",
"is_group": 1
},
"account_number": "21",
"is_group": 1
},
"Non Current Liabilities": {
"Trade & Other Payables - Non Current": {
"Loan Account - Party 1": {
"account_number": "25010"
},
"account_number": "250",
"is_group": 1
},
"Interest & Non Bearing Liabilities - Non Current": {
"Non Current Liability - Director Loan": {
"account_number": "25510"
},
"account_number": "255",
"is_group": 1
},
"Bank Loans - Non Current": {
"Bank Loan 1 - Non Current": {
"account_number": "26010"
},
"account_number": "260",
"is_group": 1
},
"Lease Liabilities - Non Current": {
"Finance Lease - Non Current": {
"account_number": "27010"
},
"account_number": "270",
"is_group": 1
},
"Provisions - Non Current": {
"Provision for Long Service Leave": {
"account_number": "27510"
},
"Provision for Holiday Pay": {
"account_number": "27520"
},
"account_number": "275",
"is_group": 1
},
"account_number": "25",
"is_group": 1
},
"account_number": "2",
"root_type": "Liability"
},
"Equity": {
"Equity": {
"Owner's/Shareholder's Equity": {
"Owner's/Shareholders Capital": {
"account_number": "31010",
"account_type": "Equity"
},
"Owner's/Shareholders Drawings": {
"account_number": "31020",
"account_type": "Equity"
},
"account_number": "310",
"is_group": 1
},
"Earnings": {
"Current Year Earnings": {
"account_number": "35010",
"account_type": "Equity"
},
"Retained Earnings": {
"account_number": "35020",
"account_type": "Equity"
},
"account_number": "350",
"is_group": 1
},
"account_number": "31",
"is_group": 1
},
"account_number": "3",
"root_type": "Equity"
},
"Revenue": {
"Revenue": {
"Sales Revenue": {
"Sales Income": {
"account_number": "41010",
"account_type": "Income Account"
},
"Freight Income": {
"account_number": "41020",
"account_type": "Income Account"
},
"Other Income": {
"account_number": "41030",
"account_type": "Income Account"
},
"Service Income": {
"account_number": "41040",
"account_type": "Income Account"
},
"account_number": "410",
"is_group": 1
},
"Other Revenue": {
"Commission Received": {
"account_number": "42010"
},
"Discounts Received": {
"account_number": "42020"
},
"Interest received": {
"account_number": "42030"
},
"Profit/Loss on Sales of Assets": {
"account_number": "42040"
},
"Rent Received": {
"account_number": "42050"
},
"Sundry Income": {
"account_number": "42060"
},
"account_number": "420",
"is_group": 1
},
"account_number": "41",
"is_group": 1
},
"account_number": "4",
"root_type": "Income"
},
"Cost of Goods": {
"Cost of Goods": {
"Cost of Goods Sold": {
"Cost of Goods Sold": {
"account_number": "51010",
"account_type": "Cost of Goods Sold"
},
"Freight Expenses (sales related)": {
"account_number": "51020"
},
"Discounts Given": {
"account_number": "51030"
},
"Subcontracting Charges": {
"account_number": "51040"
},
"account_number": "510",
"is_group": 1
},
"Other COGS": {
"Purchases - Miscellaneous": {
"account_number": "52010"
},
"Duty & Customs Fees": {
"account_number": "52020",
"account_type": "Tax"
},
"Freight Inwards": {
"account_number": "52030",
"account_type": "Chargeable"
},
"Stock Adjustment": {
"account_number": "52040",
"account_type": "Stock Adjustment"
},
"Stock Wirte Off": {
"account_number": "52050",
"account_type": "Stock Adjustment"
},
"Stock Valuation Expenses": {
"account_number": "52060",
"account_type": "Expenses Included In Valuation"
},
"Asset Valuation Expenses": {
"account_number": "52070",
"account_type": "Expenses Included In Asset Valuation"
},
"account_number": "520",
"is_group": 1
},
"account_number": "51",
"is_group": 1
},
"account_number": "5",
"root_type": "Expense"
},
"Expenses": {
"Fixed Expenses": {
"Payroll & Related Expenses": {
"Salaries & Wages": {
"account_number": "61010"
},
"Superannuation": {
"account_number": "61015"
},
"Staff Amenities - GST Paid": {
"account_number": "61020"
},
"Staff Amenities - GST Free": {
"account_number": "61025"
},
"Staff Recruitment": {
"account_number": "61030"
},
"Staff Training": {
"account_number": "61035"
},
"Fringe Benefits Tax": {
"account_number": "61040"
},
"Payroll Tax": {
"account_number": "61045"
},
"Workers Compensation": {
"account_number": "61050"
},
"Long Service Leave": {
"account_number": "61060"
},
"Mileage Reimbursement": {
"account_number": "61070"
},
"Overtime": {
"account_number": "61080"
},
"Worksafe Insurance": {
"account_number": "61090"
},
"account_number": "610",
"is_group": 1
},
"Depreciation Expenses": {
"Depreciation - Plant & Equipment": {
"account_number": "62010",
"account_type": "Depreciation"
},
"Depreciation - Motor Vehicle": {
"account_number": "62020",
"account_type": "Depreciation"
},
"Depreciation - Office Equipment": {
"account_number": "62030",
"account_type": "Depreciation"
},
"Depreciation - Computer Equipment": {
"account_number": "62040",
"account_type": "Depreciation"
},
"Depreciation - Building": {
"account_number": "62050",
"account_type": "Depreciation"
},
"Depreciation - Others": {
"account_number": "62510",
"account_type": "Depreciation"
},
"account_number": "620",
"is_group": 1
},
"account_number": "61",
"is_group": 1
},
"Accrued Expenses": {
"Accrued Expenses": {
"Accrued Expenses - Salaries & Wages": {
"account_number": "63010"
},
"Accrued Expenses - Interest": {
"account_number": "63020"
},
"account_number": "630",
"is_group": 1
},
"account_number": "63",
"is_group": 1
},
"Operating Expenses": {
"General and Administrative Expenses": {
"Low Value Assets less than $300": {
"account_number": "64010"
},
"Office Supplies": {
"account_number": "64020"
},
"Postage & Courier": {
"account_number": "64025"
},
"Printing & Stationery": {
"account_number": "64030"
},
"Registration Fees / Filing Fees": {
"account_number": "64040"
},
"Travel & Accommodation - Local": {
"account_number": "64050"
},
"Travel & Accommodation - Overseas": {
"account_number": "64060"
},
"Relocation Costs": {
"account_number": "64070"
},
"Hire Charges": {
"account_number": "64080"
},
"Repairs & Maintenance": {
"account_number": "64210"
},
"Cleaning Expenses": {
"account_number": "64215"
},
"Uniforms": {
"account_number": "64220"
},
"Security": {
"account_number": "64225"
},
"Subscriptions & Licences": {
"account_number": "64510"
},
"Software Expenses": {
"account_number": "64515"
},
"Marketing Expenses": {
"account_number": "64520"
},
"Advertising Expenses": {
"account_number": "64525"
},
"Website Hosting & Domain Expenses": {
"account_number": "64530"
},
"Computer Repairs / Supplies": {
"account_number": "64540"
},
"Conferences": {
"account_number": "64550"
},
"Consultancy /Contract Services": {
"account_number": "64560"
},
"Training Services": {
"account_number": "64570"
},
"Workshop Supplies": {
"account_number": "64580"
},
"Consumables": {
"account_number": "64585"
},
"Entertainment Expenses - Deductible": {
"account_number": "64810"
},
"Entertainment Expenses - Non Deductible": {
"account_number": "64820"
},
"Amortisation Of Goodwill": {
"account_number": "64910"
},
"General / Miscellaneous Expenses": {
"account_number": "64915",
"account_type": "Chargeable"
},
"Donations": {
"account_number": "64920"
},
"Client Gifts": {
"account_number": "64930"
},
"Employee Gifts": {
"account_number": "64935"
},
"account_number": "640",
"is_group": 1
},
"Occupancy Expenses": {
"Rental Expenses": {
"account_number": "65010"
},
"Property Insurance": {
"account_number": "65020"
},
"Electricity Expenses": {
"account_number": "65030"
},
"Water Rates": {
"account_number": "65040"
},
"Gas Expenses": {
"account_number": "65050"
},
"Property Taxes": {
"account_number": "65060"
},
"Rates": {
"account_number": "65070"
},
"account_number": "650",
"is_group": 1
},
"Communication & Vehicle Expenses": {
"Internet Expenses": {
"account_number": "66010"
},
"Mobile Telephone": {
"account_number": "66020"
},
"Telephone Expenses": {
"account_number": "66030"
},
"Motor Vehicle - Fuel Expenses": {
"account_number": "66040"
},
"Motor Vehicle - Parking & Tolls": {
"account_number": "66050"
},
"Motor Vehicle - Registration & Insurance": {
"account_number": "66060"
},
"Motor Vehicle - Service & Repairs": {
"account_number": "66070"
},
"Taxi": {
"account_number": "66080"
},
"account_number": "660",
"is_group": 1
},
"account_number": "64",
"is_group": 1
},
"Non-Operating Expenses": {
"Finance Costs": {
"Interest - Bank Loans": {
"account_number": "67010"
},
"Interest - Finance Leases": {
"account_number": "67020"
},
"Interest - Other Loans": {
"account_number": "67025"
},
"Insurance": {
"account_number": "67030"
},
"Bank Charges": {
"account_number": "67050"
},
"Rounding off": {
"account_number": "67055",
"account_type": "Round Off"
},
"Audit Fees": {
"account_number": "67060"
},
"Accounting Fees": {
"account_number": "67070"
},
"Legal Fees": {
"account_number": "67080"
},
"Management Fees": {
"account_number": "67090"
},
"account_number": "670",
"is_group": 1
},
"Other Costs": {
"Doubtful Debts": {
"account_number": "67510"
},
"Fines": {
"account_number": "67520"
},
"Debt Collection": {
"account_number": "67530"
},
"Bad Debts": {
"account_number": "67540"
},
"account_number": "675",
"is_group": 1
},
"account_number": "67",
"is_group": 1
},
"Variable Expenses": {
"Variable Expenses": {
"Bonus & Commissions Paid": {
"account_number": "68010"
},
"Bonus & Commissions To be Paid": {
"account_number": "68020"
},
"Warranty Claims": {
"account_number": "68030"
},
"account_number": "680",
"is_group": 1
},
"account_number": "68",
"is_group": 1
},
"account_number": "6",
"root_type": "Expense"
},
"Other Income": {
"Other Income": {
"Interest Income": {
"Interest Income": {
"account_number": "71010"
},
"account_number": "710",
"is_group": 1
},
"Asset Disposal Income": {
"Gain on Asset Disposal": {
"account_number": "73010"
},
"account_number": "730",
"is_group": 1
},
"account_number": "71",
"is_group": 1
},
"account_number": "7",
"root_type": "Income"
},
"Other Expenses": {
"Other Expenses": {
"Income Tax Expenses": {
"Income Tax Expenses": {
"account_number": "81010"
},
"account_number": "810",
"is_group": 1
},
"Foreign Exchange Gain/Loss": {
"Exchange Loss/Gain - Realized": {
"account_number": "82010"
},
"account_number": "820",
"is_group": 1
},
"Asset Disposal Expenses": {
"Loss on Asset Disposal": {
"account_number": "83010"
},
"account_number": "830",
"is_group": 1
},
"account_number": "81",
"is_group": 1
},
"account_number": "8",
"root_type": "Expense"
}
}
}

View File

@@ -56,7 +56,9 @@
"Constru\u00e7\u00f5es em Andamento de Im\u00f3veis Destinados \u00e0 Venda": {},
"Estoques Destinados \u00e0 Doa\u00e7\u00e3o": {},
"Im\u00f3veis Destinados \u00e0 Venda": {},
"Insumos (materiais diretos)": {},
"Insumos (materiais diretos)": {
"account_type": "Stock"
},
"Insumos Agropecu\u00e1rios": {},
"Mercadorias para Revenda": {},
"Outras 11": {},
@@ -146,6 +148,65 @@
"root_type": "Asset"
},
"CUSTOS DE PRODU\u00c7\u00c3O": {
"CUSTO DOS PRODUTOS E SERVI\u00c7OS VENDIDOS": {
"CUSTO DOS PRODUTOS VENDIDOS": {
"CUSTO DOS PRODUTOS VENDIDOS PARA AS DEMAIS ATIVIDADES": {
"Custos dos Produtos Vendidos em Geral": {
"account_type": "Cost of Goods Sold"
},
"Outros Custos 4": {},
"account_type": "Cost of Goods Sold"
},
"CUSTO DOS PRODUTOS VENDIDOS PARA ASSIST\u00caNCIA SOCIAL": {
"Custos dos Produtos para Assist\u00eancia Social - Gratuidades": {},
"Custos dos Produtos para Assist\u00eancia Social - Vendidos": {},
"Outras": {}
},
"CUSTO DOS PRODUTOS VENDIDOS PARA EDUCA\u00c7\u00c3O": {
"Custos dos Produtos para Educa\u00e7\u00e3o - Gratuidades": {},
"Custos dos Produtos para Educa\u00e7\u00e3o - Vendidos": {},
"Outros Custos 6": {}
},
"CUSTO DOS PRODUTOS VENDIDOS PARA SA\u00daDE": {
"Custos dos Produtos para Sa\u00fade - Gratuidades": {},
"Custos dos Produtos para Sa\u00fade \u2013 Vendidos": {},
"Outros Custos 5": {}
},
"account_type": "Cost of Goods Sold"
},
"CUSTO DOS SERVI\u00c7OS PRESTADOS": {
"CUSTO DOS SERVI\u00c7OS PRESTADOS PARA AS DEMAIS ATIVIDADES": {
"Custo dos Servi\u00e7os Prestados em Geral": {},
"Outros Custos": {}
},
"CUSTO DOS SERVI\u00c7OS PRESTADOS PARA ASSIST\u00caNCIA SOCIAL": {
"Custo dos Servi\u00e7os Prestados a Conv\u00eanios/Contratos/Parcerias": {},
"Custo dos Servi\u00e7os Prestados a Doa\u00e7\u00f5es 1": {},
"Custo dos Servi\u00e7os Prestados a Doa\u00e7\u00f5es/Subven\u00e7\u00f5es Vinculadas 1": {},
"Custo dos Servi\u00e7os Prestados a Gratuidade 1": {},
"Custo dos Servi\u00e7os Prestados a Pacientes Particulares": {},
"Outros Custos 2": {}
},
"CUSTO DOS SERVI\u00c7OS PRESTADOS PARA EDUCA\u00c7\u00c3O": {
"Custo dos Servi\u00e7os Prestados a Alunos N\u00e3o Bolsistas": {},
"Custo dos Servi\u00e7os Prestados a Conv\u00eanios/Contratos/Parcerias (Exceto PROUNI)": {},
"Custo dos Servi\u00e7os Prestados a Doa\u00e7\u00f5es": {},
"Custo dos Servi\u00e7os Prestados a Doa\u00e7\u00f5es/Subven\u00e7\u00f5es Vinculadas": {},
"Custo dos Servi\u00e7os Prestados a Gratuidade": {},
"Custo dos Servi\u00e7os Prestados ao PROUNI": {},
"Outros Custos 1": {}
},
"CUSTO DOS SERVI\u00c7OS PRESTADOS PARA SA\u00daDE": {
"Custo dos Servi\u00e7os Prestados a Conv\u00eanios SUS": {},
"Custo dos Servi\u00e7os Prestados a Conv\u00eanios/Contratos/Parcerias 1": {},
"Custo dos Servi\u00e7os Prestados a Doa\u00e7\u00f5es 2": {},
"Custo dos Servi\u00e7os Prestados a Doa\u00e7\u00f5es/Subven\u00e7\u00f5es Vinculadas 2": {},
"Custo dos Servi\u00e7os Prestados a Gratuidade 2": {},
"Custo dos Servi\u00e7os Prestados a Pacientes Particulares 1": {},
"Outros Custos 3": {}
}
}
},
"CUSTO DOS BENS E SERVI\u00c7OS PRODUZIDOS": {
"CUSTO DOS PRODUTOS DE FABRICA\u00c7\u00c3O PR\u00d3PRIA PRODUZIDOS": {
"Alimenta\u00e7\u00e3o do Trabalhador": {},
@@ -621,7 +682,9 @@
"Receita das Unidades Imobili\u00e1rias Vendidas": {},
"Receita de Exporta\u00e7\u00e3o Direta de Mercadorias e Produtos": {},
"Receita de Exporta\u00e7\u00e3o de Servi\u00e7os": {},
"Receita de Loca\u00e7\u00e3o de Bens M\u00f3veis e Im\u00f3veis": {},
"Receita de Loca\u00e7\u00e3o de Bens M\u00f3veis e Im\u00f3veis": {
"account_type": "Income Account"
},
"Receita de Vendas de Mercadorias e Produtos a Comercial Exportadora com Fim Espec\u00edfico de Exporta\u00e7\u00e3o": {}
}
}
@@ -645,65 +708,6 @@
}
},
"RESULTADO OPERACIONAL": {
"CUSTO DOS PRODUTOS E SERVI\u00c7OS VENDIDOS": {
"CUSTO DOS PRODUTOS VENDIDOS": {
"CUSTO DOS PRODUTOS VENDIDOS PARA AS DEMAIS ATIVIDADES": {
"Custos dos Produtos Vendidos em Geral": {
"account_type": "Cost of Goods Sold"
},
"Outros Custos 4": {},
"account_type": "Cost of Goods Sold"
},
"CUSTO DOS PRODUTOS VENDIDOS PARA ASSIST\u00caNCIA SOCIAL": {
"Custos dos Produtos para Assist\u00eancia Social - Gratuidades": {},
"Custos dos Produtos para Assist\u00eancia Social - Vendidos": {},
"Outras": {}
},
"CUSTO DOS PRODUTOS VENDIDOS PARA EDUCA\u00c7\u00c3O": {
"Custos dos Produtos para Educa\u00e7\u00e3o - Gratuidades": {},
"Custos dos Produtos para Educa\u00e7\u00e3o - Vendidos": {},
"Outros Custos 6": {}
},
"CUSTO DOS PRODUTOS VENDIDOS PARA SA\u00daDE": {
"Custos dos Produtos para Sa\u00fade - Gratuidades": {},
"Custos dos Produtos para Sa\u00fade \u2013 Vendidos": {},
"Outros Custos 5": {}
},
"account_type": "Cost of Goods Sold"
},
"CUSTO DOS SERVI\u00c7OS PRESTADOS": {
"CUSTO DOS SERVI\u00c7OS PRESTADOS PARA AS DEMAIS ATIVIDADES": {
"Custo dos Servi\u00e7os Prestados em Geral": {},
"Outros Custos": {}
},
"CUSTO DOS SERVI\u00c7OS PRESTADOS PARA ASSIST\u00caNCIA SOCIAL": {
"Custo dos Servi\u00e7os Prestados a Conv\u00eanios/Contratos/Parcerias": {},
"Custo dos Servi\u00e7os Prestados a Doa\u00e7\u00f5es 1": {},
"Custo dos Servi\u00e7os Prestados a Doa\u00e7\u00f5es/Subven\u00e7\u00f5es Vinculadas 1": {},
"Custo dos Servi\u00e7os Prestados a Gratuidade 1": {},
"Custo dos Servi\u00e7os Prestados a Pacientes Particulares": {},
"Outros Custos 2": {}
},
"CUSTO DOS SERVI\u00c7OS PRESTADOS PARA EDUCA\u00c7\u00c3O": {
"Custo dos Servi\u00e7os Prestados a Alunos N\u00e3o Bolsistas": {},
"Custo dos Servi\u00e7os Prestados a Conv\u00eanios/Contratos/Parcerias (Exceto PROUNI)": {},
"Custo dos Servi\u00e7os Prestados a Doa\u00e7\u00f5es": {},
"Custo dos Servi\u00e7os Prestados a Doa\u00e7\u00f5es/Subven\u00e7\u00f5es Vinculadas": {},
"Custo dos Servi\u00e7os Prestados a Gratuidade": {},
"Custo dos Servi\u00e7os Prestados ao PROUNI": {},
"Outros Custos 1": {}
},
"CUSTO DOS SERVI\u00c7OS PRESTADOS PARA SA\u00daDE": {
"Custo dos Servi\u00e7os Prestados a Conv\u00eanios SUS": {},
"Custo dos Servi\u00e7os Prestados a Conv\u00eanios/Contratos/Parcerias 1": {},
"Custo dos Servi\u00e7os Prestados a Doa\u00e7\u00f5es 2": {},
"Custo dos Servi\u00e7os Prestados a Doa\u00e7\u00f5es/Subven\u00e7\u00f5es Vinculadas 2": {},
"Custo dos Servi\u00e7os Prestados a Gratuidade 2": {},
"Custo dos Servi\u00e7os Prestados a Pacientes Particulares 1": {},
"Outros Custos 3": {}
}
}
},
"DESPESAS OPERACIONAIS": {
"DESPESAS OPERACIONAIS 1": {
"DESPESAS OPERACIONAIS 2": {

View File

@@ -33,7 +33,9 @@
},
"Stocks": {
"Mati\u00e8res premi\u00e8res": {},
"Stock de produits fini": {},
"Stock de produits fini": {
"account_type": "Stock"
},
"Stock exp\u00e9di\u00e9 non-factur\u00e9": {},
"Travaux en cours": {},
"account_type": "Stock"
@@ -395,9 +397,11 @@
},
"Produits": {
"Revenus de ventes": {
" Escomptes de volume sur ventes": {},
"Escomptes de volume sur ventes": {},
"Autres produits d'exploitation": {},
"Ventes": {},
"Ventes": {
"account_type": "Income Account"
},
"Ventes avec des provinces harmonis\u00e9es": {},
"Ventes avec des provinces non-harmonis\u00e9es": {},
"Ventes \u00e0 l'\u00e9tranger": {}

View File

@@ -0,0 +1,532 @@
{
"country_code": "ch",
"name": "240812 Schulkontenrahmen VEB - DE",
"tree": {
"Aktiven": {
"account_number": "1",
"is_group": 1,
"root_type": "Asset",
"Umlaufvermögen": {
"account_number": "10",
"is_group": 1,
"Flüssige Mittel": {
"account_number": "100",
"is_group": 1,
"Kasse": {
"account_number": "1000",
"account_type": "Cash"
},
"Bankguthaben": {
"account_number": "1020",
"account_type": "Bank"
}
},
"Kurzfristig gehaltene Aktiven mit Börsenkurs": {
"account_number": "106",
"is_group": 1,
"Wertschriften": {
"account_number": "1060"
},
"Wertberichtigungen Wertschriften": {
"account_number": "1069"
}
},
"Forderungen aus Lieferungen und Leistungen": {
"account_number": "110",
"is_group": 1,
"Forderungen aus Lieferungen und Leistungen (Debitoren)": {
"account_number": "1100"
},
"Delkredere": {
"account_number": "1109"
}
},
"Übrige kurzfristige Forderungen": {
"account_number": "114",
"is_group": 1,
"Vorschüsse und Darlehen": {
"account_number": "1140"
},
"Wertberichtigungen Vorschüsse und Darlehen": {
"account_number": "1149"
},
"Vorsteuer MWST Material, Waren, Dienstleistungen, Energie": {
"account_number": "1170"
},
"Vorsteuer MWST Investitionen, übriger Betriebsaufwand": {
"account_number": "1171"
},
"Verrechnungssteuer": {
"account_number": "1176"
},
"Forderungen gegenüber Sozialversicherungen und Vorsorgeeinrichtungen": {
"account_number": "1180"
},
"Quellensteuer": {
"account_number": "1189"
},
"Sonstige kurzfristige Forderungen": {
"account_number": "1190"
},
"Wertberichtigungen sonstige kurzfristige Forderungen": {
"account_number": "1199"
}
},
"Vorräte und nicht fakturierte Dienstleistungen": {
"account_number": "120",
"is_group": 1,
"Handelswaren": {
"account_number": "1200"
},
"Rohstoffe": {
"account_number": "1210"
},
"Werkstoffe": {
"account_number": "1220"
},
"Hilfs- und Verbrauchsmaterial": {
"account_number": "1230"
},
"Handelswaren in Konsignation": {
"account_number": "1250"
},
"Fertige Erzeugnisse": {
"account_number": "1260"
},
"Unfertige Erzeugnisse": {
"account_number": "1270"
},
"Nicht fakturierte Dienstleistungen": {
"account_number": "1280"
}
},
"Aktive Rechnungsabgrenzungen": {
"account_number": "130",
"is_group": 1,
"Bezahlter Aufwand des Folgejahres": {
"account_number": "1300"
},
"Noch nicht erhaltener Ertrag": {
"account_number": "1301"
}
}
},
"Anlagevermögen": {
"account_number": "14",
"is_group": 1,
"Finanzanlagen": {
"account_number": "140",
"is_group": 1,
"Wertschriften": {
"account_number": "1400"
},
"Wertberichtigungen Wertschriften": {
"account_number": "1409"
},
"Darlehen": {
"account_number": "1440"
},
"Hypotheken": {
"account_number": "1441"
},
"Wertberichtigungen langfristige Forderungen": {
"account_number": "1449"
}
},
"Beteiligungen": {
"account_number": "148",
"is_group": 1,
"Beteiligungen": {
"account_number": "1480"
},
"Wertberichtigungen Beteiligungen": {
"account_number": "1489"
}
},
"Mobile Sachanlagen": {
"account_number": "150",
"is_group": 1,
"Maschinen und Apparate": {
"account_number": "1500"
},
"Wertberichtigungen Maschinen und Apparate": {
"account_number": "1509"
},
"Mobiliar und Einrichtungen": {
"account_number": "1510"
},
"Wertberichtigungen Mobiliar und Einrichtungen": {
"account_number": "1519"
},
"Büromaschinen, Informatik, Kommunikationstechnologie": {
"account_number": "1520"
},
"Wertberichtigungen Büromaschinen, Informatik, Kommunikationstechnologie": {
"account_number": "1529"
},
"Fahrzeuge": {
"account_number": "1530"
},
"Wertberichtigungen Fahrzeuge": {
"account_number": "1539"
},
"Werkzeuge und Geräte": {
"account_number": "1540"
},
"Wertberichtigungen Werkzeuge und Geräte": {
"account_number": "1549"
}
},
"Immobile Sachanlagen": {
"account_number": "160",
"is_group": 1,
"Geschäftsliegenschaften": {
"account_number": "1600"
},
"Wertberichtigungen Geschäftsliegenschaften": {
"account_number": "1609"
}
},
"Immaterielle Werte": {
"account_number": "170",
"is_group": 1,
"Patente, Know-how, Lizenzen, Rechte, Entwicklungen": {
"account_number": "1700"
},
"Wertberichtigungen Patente, Know-how, Lizenzen, Rechte, Entwicklungen": {
"account_number": "1709"
},
"Goodwill": {
"account_number": "1770"
},
"Wertberichtigungen Goodwill": {
"account_number": "1779"
}
},
"Nicht einbezahltes Grund-, Gesellschafter- oder Stiftungskapital": {
"account_number": "180",
"is_group": 1,
"Nicht einbezahltes Aktien-, Stamm-, Anteilschein- oder Stiftungskapital": {
"account_number": "1850"
}
}
}
},
"Passiven": {
"account_number": "2",
"is_group": 1,
"root_type": "Liability",
"Kurzfristiges Fremdkapital": {
"account_number": "20",
"is_group": 1,
"Verbindlichkeiten aus Lieferungen und Leistungen": {
"account_number": "200",
"is_group": 1,
"Verbindlichkeiten aus Lieferungen und Leistungen (Kreditoren)": {
"account_number": "2000"
},
"Erhaltene Anzahlungen": {
"account_number": "2030"
}
},
"Kurzfristige verzinsliche Verbindlichkeiten": {
"account_number": "210",
"is_group": 1,
"Bankverbindlichkeiten": {
"account_number": "2100"
},
"Verbindlichkeiten aus Finanzierungsleasing": {
"account_number": "2120"
},
"Übrige verzinsliche Verbindlichkeiten": {
"account_number": "2140"
}
},
"Übrige kurzfristige Verbindlichkeiten": {
"account_number": "220",
"is_group": 1,
"Geschuldete MWST (Umsatzsteuer)": {
"account_number": "2200"
},
"Abrechnungskonto MWST": {
"account_number": "2201"
},
"Verrechnungssteuer": {
"account_number": "2206"
},
"Direkte Steuern": {
"account_number": "2208"
},
"Sonstige kurzfristige Verbindlichkeiten": {
"account_number": "2210"
},
"Beschlossene Ausschüttungen": {
"account_number": "2261"
},
"Sozialversicherungen und Vorsorgeeinrichtungen": {
"account_number": "2270"
},
"Quellensteuer": {
"account_number": "2279"
}
},
"Passive Rechnungsabgrenzungen und kurzfristige Rückstellungen": {
"account_number": "230",
"is_group": 1,
"Noch nicht bezahlter Aufwand": {
"account_number": "2300"
},
"Erhaltener Ertrag des Folgejahres": {
"account_number": "2301"
},
"Kurzfristige Rückstellungen": {
"account_number": "2330"
}
}
},
"Langfristiges Fremdkapital": {
"account_number": "24",
"is_group": 1,
"Langfristige verzinsliche Verbindlichkeiten": {
"account_number": "240",
"is_group": 1,
"Bankverbindlichkeiten": {
"account_number": "2400"
},
"Verbindlichkeiten aus Finanzierungsleasing": {
"account_number": "2420"
},
"Obligationenanleihen": {
"account_number": "2430"
},
"Darlehen": {
"account_number": "2450"
},
"Hypotheken": {
"account_number": "2451"
}
},
"Übrige langfristige Verbindlichkeiten": {
"account_number": "250",
"is_group": 1,
"Übrige langfristige Verbindlichkeiten (unverzinslich)": {
"account_number": "2500"
}
},
"Rückstellungen sowie vom Gesetz vorgesehene ähnliche Positionen": {
"account_number": "260",
"is_group": 1,
"Rückstellungen": {
"account_number": "2600"
}
}
},
"Eigenkapital (juristische Personen)": {
"account_number": "28",
"is_group": 1,
"Grund-, Gesellschafter- oder Stiftungskapital": {
"account_number": "280",
"is_group": 1,
"Aktien-, Stamm-, Anteilschein- oder Stiftungskapital": {
"account_number": "2800"
}
},
"Reserven und Jahresgewinn oder Jahresverlust": {
"account_number": "290",
"is_group": 1,
"Gesetzliche Kapitalreserve": {
"account_number": "2900"
},
"Reserve für eigene Kapitalanteile": {
"account_number": "2930"
},
"Aufwertungsreserve": {
"account_number": "2940"
},
"Gesetzliche Gewinnreserve": {
"account_number": "2950"
},
"Freiwillige Gewinnreserven": {
"account_number": "2960"
},
"Gewinnvortrag oder Verlustvortrag": {
"account_number": "2970"
},
"Jahresgewinn oder Jahresverlust": {
"account_number": "2979"
},
"Eigene Aktien, Stammanteile oder Anteilscheine (Minusposten)": {
"account_number": "2980"
}
}
}
},
"Betrieblicher Ertrag aus Lieferungen und Leistungen": {
"account_number": "3",
"is_group": 1,
"root_type": "Income",
"Produktionserlöse": {
"account_number": "3000"
},
"Handelserlöse": {
"account_number": "3200"
},
"Dienstleistungserlöse": {
"account_number": "3400"
},
"Übrige Erlöse aus Lieferungen und Leistungen": {
"account_number": "3600"
},
"Eigenleistungen": {
"account_number": "3700"
},
"Eigenverbrauch": {
"account_number": "3710"
},
"Erlösminderungen": {
"account_number": "3800"
},
"Verluste Forderungen (Debitoren), Veränderung Delkredere": {
"account_number": "3805"
},
"Bestandesänderungen unfertige Erzeugnisse": {
"account_number": "3900"
},
"Bestandesänderungen fertige Erzeugnisse": {
"account_number": "3901"
},
"Bestandesänderungen nicht fakturierte Dienstleistungen": {
"account_number": "3940"
}
},
"Aufwand für Material, Handelswaren, Dienstleistungen und Energie": {
"account_number": "4",
"is_group": 1,
"root_type": "Expense",
"Materialaufwand Produktion": {
"account_number": "4000"
},
"Handelswarenaufwand": {
"account_number": "4200"
},
"Aufwand für bezogene Dienstleistungen": {
"account_number": "4400"
},
"Energieaufwand zur Leistungserstellung": {
"account_number": "4500"
},
"Aufwandminderungen": {
"account_number": "4900"
}
},
"Personalaufwand": {
"account_number": "5",
"is_group": 1,
"root_type": "Expense",
"Lohnaufwand": {
"account_number": "5000"
},
"Sozialversicherungsaufwand": {
"account_number": "5700"
},
"Übriger Personalaufwand": {
"account_number": "5800"
},
"Leistungen Dritter": {
"account_number": "5900"
}
},
"Übriger betrieblicher Aufwand, Abschreibungen und Wertberichtigungen sowie Finanzergebnis": {
"account_number": "6",
"is_group": 1,
"root_type": "Expense",
"Raumaufwand": {
"account_number": "6000"
},
"Unterhalt, Reparaturen, Ersatz mobile Sachanlagen": {
"account_number": "6100"
},
"Leasingaufwand mobile Sachanlagen": {
"account_number": "6105"
},
"Fahrzeug- und Transportaufwand": {
"account_number": "6200"
},
"Fahrzeugleasing und -mieten": {
"account_number": "6260"
},
"Sachversicherungen, Abgaben, Gebühren, Bewilligungen": {
"account_number": "6300"
},
"Energie- und Entsorgungsaufwand": {
"account_number": "6400"
},
"Verwaltungsaufwand": {
"account_number": "6500"
},
"Informatikaufwand inkl. Leasing": {
"account_number": "6570"
},
"Werbeaufwand": {
"account_number": "6600"
},
"Sonstiger betrieblicher Aufwand": {
"account_number": "6700"
},
"Abschreibungen und Wertberichtigungen auf Positionen des Anlagevermögens": {
"account_number": "6800"
},
"Finanzaufwand": {
"account_number": "6900"
},
"Finanzertrag": {
"account_number": "6950"
}
},
"Betrieblicher Nebenerfolg": {
"account_number": "7",
"is_group": 1,
"root_type": "Income",
"Ertrag Nebenbetrieb": {
"account_number": "7000"
},
"Aufwand Nebenbetrieb": {
"account_number": "7010"
},
"Ertrag betriebliche Liegenschaft": {
"account_number": "7500"
},
"Aufwand betriebliche Liegenschaft": {
"account_number": "7510"
}
},
"Betriebsfremder, ausserordentlicher, einmaliger oder periodenfremder Aufwand und Ertrag": {
"account_number": "8",
"is_group": 1,
"root_type": "Expense",
"Betriebsfremder Aufwand": {
"account_number": "8000"
},
"Betriebsfremder Ertrag": {
"account_number": "8100"
},
"Ausserordentlicher, einmaliger oder periodenfremder Aufwand": {
"account_number": "8500"
},
"Ausserordentlicher, einmaliger oder periodenfremder Ertrag": {
"account_number": "8510"
},
"Direkte Steuern": {
"account_number": "8900"
}
},
"Abschluss": {
"account_number": "9",
"is_group": 1,
"root_type": "Equity",
"Jahresgewinn oder Jahresverlust": {
"account_number": "9200"
}
}
}
}

View File

@@ -53,8 +53,13 @@
},
"II. Forderungen und sonstige Vermögensgegenstände": {
"is_group": 1,
"Ford. a. Lieferungen und Leistungen": {
"Forderungen aus Lieferungen und Leistungen mit Kontokorrent": {
"account_number": "1400",
"account_type": "Receivable",
"is_group": 1
},
"Forderungen aus Lieferungen und Leistungen ohne Kontokorrent": {
"account_number": "1410",
"account_type": "Receivable"
},
"Durchlaufende Posten": {
@@ -180,8 +185,13 @@
},
"IV. Verbindlichkeiten aus Lieferungen und Leistungen": {
"is_group": 1,
"Verbindlichkeiten aus Lieferungen u. Leistungen": {
"Verbindlichkeiten aus Lieferungen und Leistungen mit Kontokorrent": {
"account_number": "1600",
"account_type": "Payable",
"is_group": 1
},
"Verbindlichkeiten aus Lieferungen und Leistungen ohne Kontokorrent": {
"account_number": "1610",
"account_type": "Payable"
}
},

View File

@@ -1525,7 +1525,8 @@
"41-Clients et comptes rattach\u00e9s (PASSIF)": {
"Clients cr\u00e9diteurs": {
"Clients - Avances et acomptes re\u00e7us sur commandes": {
"account_number": "4191"
"account_number": "4191",
"account_type": "Income Account"
},
"Clients - Dettes pour emballages et mat\u00e9riels consign\u00e9s": {
"account_number": "4196"
@@ -3141,4 +3142,4 @@
"account_number": "7"
}
}
}
}

View File

@@ -1,4 +1,6 @@
{
"country_code": "hu",
"name": "Hungary - Chart of Accounts for Microenterprises",
"tree": {
"SZ\u00c1MLAOSZT\u00c1LY BEFEKTETETT ESZK\u00d6Z\u00d6K": {
"account_number": 1,
@@ -1651,4 +1653,4 @@
}
}
}
}
}

View File

@@ -96,8 +96,20 @@
"account_number": "1132.000"
},
"account_number": "1130.000"
},
},
"Pajak Dibayar di Muka": {
"PPN Masukan": {
"account_number": "1151.001",
"account_type": "Tax"
},
"PPh 23 Dibayar di Muka": {
"account_number": "1152.001",
"account_type": "Tax"
},
"account_number": "1150.000"
},
"account_number": "1100.000"
},
"Aktiva Tetap": {
"Aktiva": {
@@ -557,6 +569,10 @@
"Hutang Pajak": {
"account_number": "2141.000",
"account_type": "Payable"
},
"PPN Keluaran": {
"account_number": "2142.000",
"account_type": "Tax"
},
"account_number": "2140.000"
},

View File

@@ -36,16 +36,16 @@
}
},
"Fixed Assets": {
"Capital Equipments": {
"Capital Equipment": {
"account_type": "Fixed Asset"
},
"Electronic Equipments": {
"Electronic Equipment": {
"account_type": "Fixed Asset"
},
"Furnitures and Fixtures": {
"Furniture and Fixtures": {
"account_type": "Fixed Asset"
},
"Office Equipments": {
"Office Equipment": {
"account_type": "Fixed Asset"
},
"Plants and Machineries": {
@@ -98,7 +98,7 @@
"Office Maintenance Expenses": {},
"Office Rent": {},
"Postal Expenses": {},
"Print and Stationary": {},
"Print and Stationery": {},
"Rounded Off": {
"account_type": "Round Off"
},
@@ -109,7 +109,8 @@
"Utility Expenses": {},
"Write Off": {},
"Exchange Gain/Loss": {},
"Gain/Loss on Asset Disposal": {}
"Gain/Loss on Asset Disposal": {},
"Impairment": {}
},
"root_type": "Expense"
},
@@ -132,7 +133,8 @@
"Source of Funds (Liabilities)": {
"Capital Account": {
"Reserves and Surplus": {},
"Shareholders Funds": {}
"Shareholders Funds": {},
"Revaluation Surplus": {}
},
"Current Liabilities": {
"Accounts Payable": {

View File

@@ -1,6 +1,6 @@
{
"country_code": "ni",
"name": "Nicaragua - Catalogo de Cuentas",
"name": "Nicaragua - Catálogo de Cuentas",
"tree": {
"Activo": {
"Activo Corriente": {
@@ -491,4 +491,4 @@
"root_type": "Liability"
}
}
}
}

View File

@@ -13,7 +13,7 @@ def get():
_("Bank Accounts"): {"account_type": "Bank", "is_group": 1},
_("Cash In Hand"): {_("Cash"): {"account_type": "Cash"}, "account_type": "Cash"},
_("Loans and Advances (Assets)"): {
_("Employee Advances"): {},
_("Employee Advances"): {"account_type": "Payable"},
},
_("Securities and Deposits"): {_("Earnest Money"): {}},
_("Stock Assets"): {
@@ -23,13 +23,13 @@ def get():
_("Tax Assets"): {"is_group": 1},
},
_("Fixed Assets"): {
_("Capital Equipments"): {"account_type": "Fixed Asset"},
_("Electronic Equipments"): {"account_type": "Fixed Asset"},
_("Furnitures and Fixtures"): {"account_type": "Fixed Asset"},
_("Office Equipments"): {"account_type": "Fixed Asset"},
_("Capital Equipment"): {"account_type": "Fixed Asset"},
_("Electronic Equipment"): {"account_type": "Fixed Asset"},
_("Furniture and Fixtures"): {"account_type": "Fixed Asset"},
_("Office Equipment"): {"account_type": "Fixed Asset"},
_("Plants and Machineries"): {"account_type": "Fixed Asset"},
_("Buildings"): {"account_type": "Fixed Asset"},
_("Softwares"): {"account_type": "Fixed Asset"},
_("Software"): {"account_type": "Fixed Asset"},
_("Accumulated Depreciation"): {"account_type": "Accumulated Depreciation"},
_("CWIP Account"): {
"account_type": "Capital Work in Progress",
@@ -72,6 +72,7 @@ def get():
_("Write Off"): {},
_("Exchange Gain/Loss"): {},
_("Gain/Loss on Asset Disposal"): {},
_("Impairment"): {},
},
"root_type": "Expense",
},
@@ -104,6 +105,7 @@ def get():
_("Dividends Paid"): {"account_type": "Equity"},
_("Opening Balance Equity"): {"account_type": "Equity"},
_("Retained Earnings"): {"account_type": "Equity"},
_("Revaluation Surplus"): {"account_type": "Equity"},
"root_type": "Equity",
},
}

View File

@@ -20,7 +20,7 @@ def get():
"account_number": "1100",
},
_("Loans and Advances (Assets)"): {
_("Employee Advances"): {"account_number": "1610"},
_("Employee Advances"): {"account_number": "1610", "account_type": "Payable"},
"account_number": "1600",
},
_("Securities and Deposits"): {
@@ -36,13 +36,13 @@ def get():
"account_number": "1100-1600",
},
_("Fixed Assets"): {
_("Capital Equipments"): {"account_type": "Fixed Asset", "account_number": "1710"},
_("Electronic Equipments"): {"account_type": "Fixed Asset", "account_number": "1720"},
_("Furnitures and Fixtures"): {"account_type": "Fixed Asset", "account_number": "1730"},
_("Office Equipments"): {"account_type": "Fixed Asset", "account_number": "1740"},
_("Capital Equipment"): {"account_type": "Fixed Asset", "account_number": "1710"},
_("Electronic Equipment"): {"account_type": "Fixed Asset", "account_number": "1720"},
_("Furniture and Fixtures"): {"account_type": "Fixed Asset", "account_number": "1730"},
_("Office Equipment"): {"account_type": "Fixed Asset", "account_number": "1740"},
_("Plants and Machineries"): {"account_type": "Fixed Asset", "account_number": "1750"},
_("Buildings"): {"account_type": "Fixed Asset", "account_number": "1760"},
_("Softwares"): {"account_type": "Fixed Asset", "account_number": "1770"},
_("Software"): {"account_type": "Fixed Asset", "account_number": "1770"},
_("Accumulated Depreciation"): {
"account_type": "Accumulated Depreciation",
"account_number": "1780",

View File

@@ -0,0 +1,34 @@
import json
from pathlib import Path
syscohada_countries = [
"bj", # Bénin
"bf", # Burkina-Faso
"cm", # Cameroun
"cf", # Centrafrique
"ci", # Côte d'Ivoire
"cg", # Congo
"km", # Comores
"ga", # Gabon
"gn", # Guinée
"gw", # Guinée-Bissau
"gq", # Guinée Equatoriale
"ml", # Mali
"ne", # Niger
"cd", # République Démocratique du Congo
"sn", # Sénégal
"td", # Tchad
"tg", # Togo
]
folder = Path(__file__).parent
generic_charts = Path(folder).glob("syscohada*.json")
for file in generic_charts:
with open(file) as f:
chart = json.load(f)
for country in syscohada_countries:
chart["country_code"] = country
json_object = json.dumps(chart, indent=4)
with open(Path(folder, file.name.replace("syscohada", country)), "w") as outfile:
outfile.write(json_object)

Some files were not shown because too many files have changed in this diff Show More