1834 Commits

Author SHA1 Message Date
Gursheen Anand
9383f5da94 test: single account for multiple tax categories 2024-02-06 15:03:12 +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
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
Deepesh Garg
6e6c818084
feat: Period-wise closing entries for TB (#39712) 2024-02-05 14:10:42 +05:30
Gursheen Anand
25c2b79864 fix: precision for tds amount 2024-02-05 13:03:21 +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 Anand
ddecbeba75 fix: test JV totals using back calculation logic 2024-01-30 12:39:40 +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
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
barredterra
806696a003 fix: typos 2024-01-24 02:59:52 +01:00
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
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 Anand
b2d9380596 fix: party field in pdf html 2024-01-19 17:08:02 +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 Anand
99b94af49f fix: linting issue 2024-01-18 15:05:19 +05:30
Gursheen Kaur Anand
73625a2622
Revert "fix(minor): financial statements period end date" 2024-01-17 12:25:03 +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
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
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
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
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
ruthra kumar
641c3de0ca fix: incorrect sql error if account name has '%' 2024-01-14 17:37:34 +05:30
Deepesh Garg
0b1cc7fad1 Revert "fix: fetch against link value in gl report"
This reverts commit 9aeb3932d0f7dbf3daf5f8ba2e6e9f02082a0f54.
2024-01-14 11:24:00 +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
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
Gursheen Anand
c648090b5d fix: query for filter by party 2024-01-12 18:33:06 +05:30
barredterra
f32a870a58 Merge branch 'develop' into fix-pl-balance-sheet 2024-01-11 14:03:39 +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
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
bb18ae82cf refactor: use db.get_single_value 2024-01-09 21:57:50 +05:30
David Arnold
b5be17c6df
fix: use most reliable section reference per report line 2024-01-08 22:12:19 +01:00
ruthra kumar
0f1be03faf fix: ignore cancelled payments in Sales/Purchase Register 2024-01-03 20:57:01 +05:30
Deepesh Garg
beee98da6d
feat: Against voucher filter in General Ledger (#39100) 2024-01-03 10:03:27 +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
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