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