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
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
