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
