Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,649 Commits 3 Branches 0 Tags 1 GiB
3d75e3f434
Commit Graph

1513 Commits

Author SHA1 Message Date
HarryPaulo
ebbe27c183
fix: subtract change_amount from paid_amount field on POS Register (#30922) 2022-05-09 15:14:57 +05:30
Deepesh Garg
c05144fb60
Merge pull request #30897 from deepeshgarg007/general_ledger_consolidated 
fix: Consider party and party type as well in group by consolidated view
 2022-05-06 13:10:00 +05:30
Deepesh Garg
c2d52a1ac0 fix: Consider paryt and party type as well in group by consolidated view 2022-05-04 15:59:24 +05:30
Deepesh Garg
e8d6eb207d fix: Ignore loan repayments made from salary slip 
(cherry picked from commit b7e1d40e43c136f0e967111e10af95ddc80e2fd5)
 2022-05-04 04:15:07 +00:00
Deepesh Garg
44c54f69f8 chore: Remove references for Student doctype 2022-04-28 16:16:47 +05:30
Sagar Vora
3b4754f3f6 fix: define tax_columns below consistency 2022-04-07 17:01:10 +05:30
Sagar Vora
fa4f57f470 fix: dont reassign mutable (list) to a different field 2022-04-07 16:51:27 +05:30
Ankush Menat
52eb0a93bb
Merge pull request #30528 from s-aga-r/is-subcontracted-fieldtype 
refactor!: change "is_subcontracted" field type from "Select" to "Check"
 2022-04-04 14:01:20 +05:30
Ankush Menat
a896895a9e fix: bulk fix (~330) missing translations 2022-04-04 13:59:51 +05:30
Sagar Sharma
d074c93ac7 refactor!: change "is_subcontracted" field type from "Select" to "Check" 2022-04-01 13:22:44 +05:30
Saqib Ansari
5408980223 Merge pull request #30453 from rahib-hassan/fix-paymentorder-row-delete 
fix: enable row deletion in reference table
 2022-03-30 15:31:54 +05:30
Ankush Menat
494bd9ef78 style: format code with black 2022-03-28 18:52:46 +05:30
Saqib Ansari
5450542fdb fix: unsupported operand type(s) for +=: 'int' and 'NoneType' 2022-03-25 16:44:37 +05:30
HarryPaulo
3eb5440aa9
fix: linters erros on report sales payments summary (#30345) 
* fix: wrong values for report and get change amout based on payment TYPE.

* charcase for select field.

* fix: linter check erros

* fix: linters errors

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-22 11:39:15 +05:30
HarryPaulo
01fd3adedf
fix: report sales payments summary (#30264) 2022-03-21 16:57:27 +05:30
Saqib Ansari
6dc7d6b085
Merge pull request #30287 from nextchamp-saqib/fix-cash-flow-query 
fix: custom cash flow mapper doesn't show any data
 2022-03-21 10:32:42 +05:30
Deepesh Garg
01638a01cb
Merge pull request #30292 from frappe/mergify/bp/develop/pr-30284 
fix: Cleanup and fixes in Dimension-wise Accounts Balance Report (backport #30284)
 2022-03-18 17:36:59 +05:30
Saqib Ansari
00bfee97c7 refactor: convert raw sql to frappe.qb 2022-03-18 14:31:30 +05:30
Deepesh Garg
8819ba07a9
Merge pull request #30266 from deepeshgarg007/expense_income_account_validation 
fix: Validate income/expense account in sales and purchase invoice
 2022-03-17 18:32:34 +05:30
Deepesh Garg
5390d5e65a
Merge branch 'develop' into mergify/bp/develop/pr-30284 2022-03-17 18:02:57 +05:30
Deepesh Garg
4237e5d928 fix: Test case 2022-03-17 18:00:39 +05:30
Deepesh Garg
a651a0ffc8
Merge pull request #30261 from deepeshgarg007/bank_reco_error 
fix: Error in bank reconciliation statement
 2022-03-17 17:29:15 +05:30
Deepesh Garg
5f89cb2cca fix: Remove comments 
(cherry picked from commit cab69fe1f298b44613be21c06591e868c24ee249)
 2022-03-17 11:57:50 +00:00
Deepesh Garg
2dd0e20003 fix: Clean and fixes in Dimension-wise Accounts Balance Report 
(cherry picked from commit 08a06ce5c68023c41f53b584082b5e1c4ddb1f59)
 2022-03-17 11:57:50 +00:00
Saqib Ansari
119273e633 fix: custom cash flow mapper doesn't show any data 2022-03-17 14:47:50 +05:30
Deepesh Garg
fbcb413d96 fix: Error in bank reco statement 2022-03-15 18:20:11 +05:30
Saqib Ansari
12d99ed69a test: foreign_account_balance_after_exchange_rate_revaluation 2022-03-15 17:56:42 +05:30
Saqib Ansari
83a5fae591 fix: incorrect debit credit amount in presentation currency 2022-03-14 20:14:46 +05:30
Deepesh Garg
6308e1be91 fix: Do not consider cancelled entries 2022-03-13 18:13:12 +05:30
Ankush Menat
9c7df2eec5 fix: ignore duplicates explicitly 2022-02-23 14:27:45 +05:30
Deepesh Garg
0d8c24f488 Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco 2022-02-21 22:22:02 +05:30
Deepesh Garg
b7c388976d Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco 2022-02-21 16:58:52 +05:30
Deepesh Garg
6bf7bd6a9f
Merge branch 'develop' into gross_profit_non_stock_item 2022-02-21 16:56:49 +05:30
Deepesh Garg
40a45a3139
Merge pull request #29907 from deepeshgarg007/tds_payable_total_amount 
fix: Total Credit amount in TDS Payable monthly report
 2022-02-21 15:33:58 +05:30
Deepesh Garg
a82cf7214e fix: Total Credit amount in TDS Payable monthly report 2022-02-21 13:58:56 +05:30
Deepesh Garg
e13d774e8e
Merge branch 'develop' into gross_profit_non_stock_item 2022-02-21 12:34:14 +05:30
Deepesh Garg
0b5e618e3a fix: Update bank reconciliation statement 2022-02-21 11:46:44 +05:30
Deepesh Garg
8b3d9088df
Merge branch 'develop' into consolidated_financial_statment_error 2022-02-17 23:32:50 +05:30
Deepesh Garg
fec40aac7a fix: Linting issues 2022-02-15 12:15:35 +05:30
Deepesh Garg
42cdd6d237 fix: Remove commented out code 2022-02-15 12:05:51 +05:30
Deepesh Garg
973f6b1bbd fix: Gross profit for credit notes 2022-02-14 22:14:17 +05:30
Deepesh Garg
04cbde2e52 fix: Filter out bank payment entries 2022-02-14 20:38:04 +05:30
Deepesh Garg
2ff6b3560e fix: Fixes in TDS payable monthly report 2022-02-14 19:51:58 +05:30
Deepesh Garg
ae613008be fix: Error in consolidated financial statements 2022-02-12 21:54:22 +05:30
Deepesh Garg
07bcbc6c7e fix: Remove unused param 2022-02-12 19:05:03 +05:30
Deepesh Garg
2172ab2d37 fix: Update columns in new format 2022-02-11 14:48:39 +05:30
Saqib Ansari
78dd364b0b fix: cannot jump to sales invoice in gross profit report 2022-02-11 12:32:45 +05:30
Deepesh Garg
da73685f71 fix: Multiple fixes in Gross Profit report 2022-02-10 13:07:51 +05:30
Deepesh Garg
ed2c6b6637 fix: Incorrect provisional profit and loss in balance sheet 2022-02-02 22:36:45 +05:30
Nabin Hait
6099af5d00 fix: Fixed test case and sider issues 2022-01-31 17:43:37 +05:30
Nabin Hait
3dadfc9048 patch: Removed files and code related to old distributed cost center feature 2022-01-31 15:58:40 +05:30
Ankush Menat
b05287dea0
fix: drop six code (#29479) 2022-01-27 20:08:05 +05:30
Deepesh Garg
108d1045e6
Merge pull request #29360 from ruthra-kumar/test_case_deferred_report 
test: unit test for deferred item with zero months
 2022-01-24 12:41:37 +05:30
ruthra
1e0450ed17 test: unit test for deferred items with zero months 2022-01-19 15:51:40 +05:30
ruthra
ed0f9cc063 refactor: a more generalized way to clear old entries for test cases 2022-01-19 15:50:04 +05:30
Deepesh Garg
d6ee678ec9
Merge pull request #29193 from ruthra-kumar/bug_deferred_report 
fix: deferred report division by zero exception
 2022-01-11 17:19:08 +05:30
Saqib Ansari
c62083653b
fix(gl-report): group by cost center only if include_dimensions is checked (#28883) 2022-01-11 12:45:40 +05:30
Ankush Menat
2d76c05175 refactor: unnecessary joining of lists 2022-01-10 19:14:22 +05:30
Deepesh Garg
2de5122262
fix: Add iteritems back 2022-01-07 18:30:19 +05:30
Deepesh Garg
00055bb159
fix: Conflicts 2022-01-07 18:11:38 +05:30
ruthra
fe4d7f86ee fix: deferred report division by zero exception 2022-01-07 16:30:56 +05:30
Deepesh Garg
bf5930c4bb fix: Show GL balance in Accounts Receivable and payable summary 
(cherry picked from commit 1d270dca05501b5a15d19e3270188029b48eafde)

# Conflicts:
#	erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
 2022-01-07 09:35:19 +00:00
Deepesh Garg
5d6199cf35 fix: Error on viewing consolidated financial statement 2021-12-20 16:54:52 +05:30
Deepesh Garg
64f68d5e94
Merge branch 'develop' into deferred_report_revenue_and_expense 2021-12-15 14:14:34 +05:30
ruthra
9ec8841b91 refactor: rename checkbox and translations 
- rename checkbox and make it
 - added translation text for labels
 - fixes for linter error
 2021-12-14 20:59:14 +05:30
ruthra
a8a598ace7 refactor: remove unused function 'get_postings' 2021-12-14 16:34:51 +05:30
Deepesh Garg
b966c45fa8
Merge pull request #28748 from deepeshgarg007/accounts_receivable_jv_due_date 
fix: Ageing in AR/AP report for advances
 2021-12-12 17:27:21 +05:30
ruthra
c3453cd73c feat: Deferred Revenue and Expense report 
- show deferred revenue and expense with actual and expected postings
 - unit tests added
 2021-12-10 19:30:43 +05:30
Deepesh Garg
d106d59c3f fix: TDS Monthly payable report 2021-12-06 20:36:48 +05:30
Deepesh Garg
3dabac15ed fix: Ageing in AR/AP report for advances 2021-12-06 15:05:20 +05:30
Deepesh Garg
107fb43d6a fix: Paid showing in AR/AP report 
(cherry picked from commit 5e7ce5370f6af634f7674772529cf4933114f3ef)
 2021-12-02 13:44:27 +00:00
Deepesh Garg
ad8d296c08
Merge pull request #28636 from deepeshgarg007/zero_values_report 
feat: Show Zero Values filter in consolidated financial statement
 2021-11-30 18:15:50 +05:30
Raffael Meyer
e10ab1626c
feat: Grant commission on certain items only (#27467) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-11-30 17:54:18 +05:30
Deepesh Garg
9610086d0c feat: Show Zero Values filter in consolidated financial statement 2021-11-30 13:24:23 +05:30
Ganga Manoj
5ef2330022
fix: Replace 'parent' with 'invoice_or_item' (#28513) 2021-11-23 12:28:41 +05:30
Ganga Manoj
7d0558e202
fix: Add extra column to display Invoice or Item when grouped by Invoice (#28380) 2021-11-22 12:34:46 +05:30
GangaManoj
1affa12b74 fix: Replace 'Totals' with 'Total' 2021-11-16 03:36:47 +05:30
GangaManoj
508a2301ee fix: Display totals row in bold 2021-11-16 03:22:04 +05:30
GangaManoj
c7ffe3a7b4 fix: Remove unnecessary condition 2021-11-16 02:36:58 +05:30
GangaManoj
582a7ae964 fix: Add totals row when Grouped By Invoice 2021-11-16 02:33:51 +05:30
GangaManoj
3aaf7cb408 fix: Remove default Totals row 2021-11-16 02:33:12 +05:30
Saqib
ecbe4b16b8
perf(minor): general ledger report (#27987) 2021-11-11 13:55:21 +05:30
Deepesh Garg
8a253ed1f3
Merge pull request #28238 from nextchamp-saqib/perf-financial-statements 
perf: improve financial statement loading time
 2021-11-09 16:29:58 +05:30
Ankush Menat
8fe5feb6a4 chore: remove all six compat code 2021-11-05 11:16:29 +05:30
Ankush Menat
897e90ac55 chore: remove past module dependencies 2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9 chore: remove utf-8 compat code 2021-11-05 11:16:29 +05:30
Saqib Ansari
b7a44fe0a3 perf: improve financial statement loading time 2021-11-03 18:17:31 +05:30
Deepesh Garg
d0e2b52f51
Merge pull request #28122 from nemesis189/consolidated-finan-report-empty-list-error 
fix: Consolidated Financial Report throws error for empty equity data list
 2021-10-29 12:11:16 +05:30
Subin Tom
d786855d94 fix: Consolidated Financial Report throws error for empty equity data list 2021-10-28 13:19:19 +05:30
hendrik
f24ed6723e
fix(general_ledger): Order by in case Group by Account (#28093) 
* Update general_ledger.py

Fix order_by_statement if filter group by: Group by Account

* chore: whitespace

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-10-27 14:38:20 +05:30
Deepesh Garg
7f2dde7d94 fix: Check for supplier name 
(cherry picked from commit 944e3d467c5ab0a2a4a76a8b532e53bca77f8e61)
 2021-10-23 07:47:18 +00:00
Deepesh Garg
881e091b85 fix: Check for other properties 
(cherry picked from commit b7befe49dc83b938b74b7a63d31787734d7857f8)
 2021-10-23 07:47:18 +00:00
Deepesh Garg
2ea4c95f86 fix: Error in TDS computation summary 
(cherry picked from commit f12deae24b7ab164edd0868a1254bdf28bfeac09)
 2021-10-23 07:47:18 +00:00
rohitwaghchaure
871cb1157f
fix: consolidated report issue #28035 
fix: consolidated report issue
 2021-10-20 21:08:15 +05:30
Deepesh Garg
21ba9ac744 fix: Totals row incorrect value in GL Entry (#27867) 
(cherry picked from commit ebe68c1a7a47f5e711cc9fc1d40c07e140b76888)
 2021-10-19 09:38:40 +00:00
Dany Robert
7acdcc70ad
fix: v12 migrate error - unknown column ‘mandatory_depends_on’ (#27897) 
* fix: v12 doesn't have mandatory_depends_on field

* fix: move update_vehicle_no_reqd_condition to v13

* fix: move update_vehicle_no_reqd_condition to v13

* fix: file name missing .py

* refactor!: add back empty line

* fix: linters issue
 2021-10-11 15:05:55 +05:30
Rohit Waghchaure
19d14da0d4 fix: opening balance to calculate 'Unclosed Fiscal Years Profit / Loss (Credit)' 2021-10-10 14:00:25 +05:30
Rohit Waghchaure
dc4206428d fix: consolidated report not consider company currency 2021-10-08 12:10:35 +05:30
Chillar Anand
772d4753e7
refactor: Clean up mutable defaults and add CI check (#27828) 
* refactor: Clean up mutable defaults and add CI check
 2021-10-06 16:58:48 +00:00
Deepesh Garg
cc5dd5c67d
feat: TDS deduction using journal entry and other fixes (#27451) 
* fix: TDS deduction using journal entry

* fix: Multi category application against single supplier

* refactor: TDS payable monthly report

* fix: Server side handling for default tax withholding category

* fix: Supplier filter for Journal Entry

* refactor: TDS computation summary report
 2021-09-27 21:43:20 +05:30
Rucha Mahabal
866763c16a
fix(minor): Employee filter in Unpaid Expense Claims report (#27530) 2021-09-16 00:05:16 +05:30
Deepesh Garg
625626b973
fix: Values with same account and different account number in consolidated balance sheet report (#27493) 2021-09-15 10:10:54 +05:30
Anuja Pawar
3576668638
fix: added Show Remarks checkbox in AR & AP reports (#27374) 2021-09-09 11:57:29 +05:30
Dany Robert
fa819f2fb0
fix: General Ledger translation issues (#27298) 
* fix: remove translations from GL report options

Options need not be translated, their display label gets translated
client side.

* fix: make group by options translatable

* ci: semgrep rule for translated options in report

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-08 16:28:05 +05:30
Deepesh Garg
ceaa804f04
fix: Presentation currency conversion in reports (#27316) 2021-09-05 17:21:29 +05:30
Chillar Anand
915b34391c
chore: Clean up imports (#27302) 
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Clean up imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Clean up sider issues

* chore: Remove import errors from flake8 ignore list

* chore: Clean up lint issues
 2021-09-02 16:44:59 +05:30
Saqib
a158b825fc
Merge pull request #27124 from GangaManoj/gross-profit-product-bundle 
feat: Improve Product Bundle handling
 2021-09-02 11:12:56 +05:30
Ankush Menat
e46567192a
fix: invalid escape sequences in regex 2021-09-01 16:57:17 +05:30
Saqib
8008598eb2
Merge branch 'develop' into gross-profit-product-bundle 2021-08-27 14:48:54 +05:30
GangaManoj
3135d6dc6a fix: Get Bundle Items 2021-08-25 15:35:40 +05:30
GangaManoj
13ae10b3a2 fix: Remove comments 2021-08-25 15:20:27 +05:30
Afshan
8366b6322e
fix: validate party and party type only if both available (#27002) 
* fix: validate party and party type only if both available

* fix: indentation
 2021-08-25 11:57:24 +05:30
GangaManoj
bea0f7a202 fix: Get data when grouped by invoice and otherwise 2021-08-25 02:52:18 +05:30
GangaManoj
96909b6c3b fix: Display only the Invoice rows in bold 2021-08-25 02:49:14 +05:30
GangaManoj
b02effbc47 fix: Indentation 2021-08-25 01:00:40 +05:30
Ganga Manoj
3e5bbc9aa6
Merge branch 'develop' into gross-profit-product-bundle 2021-08-25 00:55:47 +05:30
GangaManoj
5f8c2b0946 fix: Remove base_rate and buying_rate for Invoice rows 2021-08-25 00:33:55 +05:30
GangaManoj
2dbf8075eb fix: Calculate total buying_amount for each invoice 2021-08-25 00:09:07 +05:30
GangaManoj
3edb1938a9 fix: Fetch bundle item details 2021-08-24 23:38:24 +05:30
GangaManoj
257215f479 fix: Fetch base_net_total for each Invoice 2021-08-24 23:32:19 +05:30
GangaManoj
1956f62ad8 fix: Remove qty from Sales Invoice rows 2021-08-24 23:30:50 +05:30
Afshan
ad06fb2179
fix: calculation of gross profit percentage in Gross Profit Report (#27045) 2021-08-24 17:35:01 +05:30
GangaManoj
46650cce0d fix: Calculate total buying_amount and gross profit for each invoice 2021-08-23 21:17:32 +05:30
Deepesh Garg
496bff5136
feat: Column for total amount due in Accounts Receivable/Payable Summary (#27069) 2021-08-22 18:10:51 +05:30
Deepesh Garg
57e326e7d0
fix: Consolidated balance sheet showing incorrect values (#26975) 2021-08-21 17:59:11 +05:30
GangaManoj
d1453c0cd0 fix: Remove Item Code and Item Name columns 2021-08-20 18:26:17 +05:30
GangaManoj
75d4fc99fc fix: Display Items in the format Item Code: Item Name 2021-08-20 18:25:36 +05:30
GangaManoj
b5fac83987 fix: Add items belonging to Product Bundles as children 2021-08-20 06:07:53 +05:30
GangaManoj
33f100d75d fix: Set initial_depth to 3 2021-08-20 06:06:47 +05:30
GangaManoj
97a1d426a3 fix: Assign indent and parent_invoice 2021-08-20 03:54:19 +05:30
GangaManoj
779a1d68a5 fix: Make Invoice row bold 2021-08-20 02:38:34 +05:30
GangaManoj
5ffaff8e48 fix: Display items as descendants of invoices 2021-08-20 02:20:18 +05:30
GangaManoj
17a154017b fix: Display data in tree form 2021-08-20 02:19:18 +05:30
GangaManoj
76921137ed fix: Return data as dict if the report is grouped by Invoice 2021-08-20 02:16:49 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes 2021-08-19 13:43:28 +05:30
Afshan
ecd6584c50
fix: assigning values to rows in sales register reports (#26546) 
* fix: assigning values to rows in sales register reports

* fix: check for is_internal_customer for unrealized_profit_loss_account
 2021-08-19 12:18:27 +05:30
Deepesh Garg
8410e4854f fix: Budget variance missing values 2021-08-16 17:14:40 +05:30
Rohit Waghchaure
343143037c fix: conflicts 2021-08-01 14:45:24 +05:30
Rohit Waghchaure
5d121c41f3 fix: removed Remarks column from AR/AP report 2021-07-27 22:22:56 +05:30
Rohit Waghchaure
f3158ea448 fix: removed Remarks column from AR/AP report 2021-07-21 19:47:41 +05:30
Rohit Waghchaure
c14aa45720 fix: incorrect valuation rate calculation in gross profit report 2021-07-20 18:19:15 +05:30
Afshan
74d7baa80a
fix: filter by accounts with group by accounts (#26438) 
* fix: filter by accounts with group by accounts

* fix: parsing json

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-07-14 19:59:11 +05:30
Saqib
ac721ae147
fix: tds computation summary shows cancelled invoices (#26485) 2021-07-14 15:20:14 +05:30
Saqib
1c76154096
fix: tds computation summary shows cancelled invoices (#26456) 2021-07-14 14:45:39 +05:30
Afshan
9168bb369a
fix: filter by accounts with group by accounts (#26439) 2021-07-14 13:57:14 +05:30
Afshan
bf03671a33
fix(report): iterate on accounts only when accounts exist (#26391) 2021-07-12 11:10:28 +05:30
Afshan
4b4ac7c051
fix(report): iterate on accounts only when accounts exist (#26390) 2021-07-12 11:10:00 +05:30
Subin Tom
d53991857c
fix: Fixed Budget Variance Graph color from all black to default (#26368) 2021-07-09 14:33:00 +05:30
Deepesh Garg
bd40669dab
Merge pull request #26289 from nemesis189/fixed-budget-variance-report-color 
fix: Fixed Budget Variance Graph color from all black to default
 2021-07-06 20:36:00 +05:30
Afshan
c8eca8a448
fix: remove cancelled entries in consolidated financial statements (#26331) 2021-07-06 14:37:57 +05:30
Afshan
53e3435770
fix: remove cancelled entries in consolidated financial statements (#26330) 2021-07-06 14:37:21 +05:30
Subin Tom
d2c86bb9d7 fix: Fixed Budget Variance Graph color from all black to default 2021-07-01 19:59:08 +05:30
Nabin Hait
fa006402b8 fix: merge conflict 2021-07-01 12:47:28 +05:30
Subin Tom
43f85a2877
fix: changed profitability analysis report width (#26165) 2021-06-25 11:38:11 +05:30
Deepesh Garg
e3ca177828 fix: Remove debug flag 2021-06-24 19:51:23 +05:30
Deepesh Garg
bdba29bab5 fix: Account filter not working with accounting dimension filter 2021-06-24 19:48:11 +05:30
Subin Tom
a446d61e10 fix: Changed profitability analysis report width 2021-06-22 16:51:15 +05:30
Deepesh Garg
913e92c29f
Merge pull request #26044 from GangaManoj/account-multiselect-gl 
feat(General Ledger): Implement multi-account selection
 2021-06-16 22:33:50 +05:30
GangaManoj
41b7c1aec0 fix(General Ledger): Improve account filter 2021-06-16 14:40:14 +05:30
GangaManoj
86f689e54a fix(General Ledger): Get account_currency accurately 2021-06-16 14:23:02 +05:30
GangaManoj
53a9ac4466 fix(General Ledger): Condense account_conditions 2021-06-16 04:10:29 +05:30
GangaManoj
79dc0f0afc fix: Remove console.log() 2021-06-16 03:37:11 +05:30
Deepesh Garg
fb9cb78980
Merge pull request #26045 from GangaManoj/filter-cc-project 
fix(General Ledger): Filter Cost Center and Project drop-down lists by Company
 2021-06-15 21:18:49 +05:30
Nabin Hait
0950481253 fix: merge conflict 2021-06-15 20:18:06 +05:30
GangaManoj
75b30efb05 fix(General Ledger): Filter Project drop-down list by Company 2021-06-14 16:42:27 +05:30
GangaManoj
27ec51f021 fix(General Ledger): Filter Cost Center drop-down list by Company 2021-06-14 16:41:56 +05:30
GangaManoj
0511ffcf30 fix(General Ledger): Implement multi-account selection 2021-06-14 13:22:44 +05:30
Ankush Menat
9891780f5a
perf(minor): remove unnecessary comprehensions (port #25645) 2021-06-11 18:40:22 +05:30
Ankush Menat
a9c84f749a
perf(minor): remove unnecessary comprehensions (#25645) 2021-06-11 16:00:48 +05:30
Deepesh Garg
48f2839079 fix: Sort account balances by account name 2021-06-10 19:00:50 +05:30
Deepesh Garg
3b34fc4cce Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-10 18:57:31 +05:30
Deepesh Garg
a5c3427293 fix: Sort account balances by account name 2021-06-10 18:09:49 +05:30
Deepesh Garg
7dabb6be30 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-09 18:10:55 +05:30
Deepesh Garg
b57ebba3fd
fix: Validate negative allocated amount in Payment Entry (#25799) 2021-06-09 17:56:41 +05:30
Deepesh Garg
6f2dacc60c Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-06 19:31:50 +05:30
Nabin Hait
a3d1b6973a fix: merge conflict 2021-05-31 11:21:33 +05:30
Rucha Mahabal
05d5fb24f7
fix(test): tax detail report (#25884) 2021-05-29 23:18:36 +05:30
Deepesh Garg
81376ea44f
feat: Show net values in Party Accounts (#25714) 2021-05-25 20:39:17 +05:30
Afshan
4d61fa2497
fix: incorrect cr/dr shown in general ledger for multi-currency transactions (#25654) 2021-05-25 19:16:02 +05:30
Deepesh Garg
55a3fb57dd fix: Linting Issues 2021-05-25 17:40:06 +05:30
Deepesh Garg
fd380d34f9 fix: Linting errors 2021-05-25 17:35:05 +05:30
Deepesh Garg
a87e3fcb7c fix: TDS report cleanup 2021-05-25 17:34:45 +05:30
Deepesh Garg
79b422c0a9 fix: Advance TDS in TDS payable monthly report 2021-05-25 17:33:59 +05:30
Deepesh Garg
c348215f61 fix: Cashlfow mapper not showing data 2021-05-24 19:57:53 +05:30
Deepesh Garg
d15d0d8568
Merge pull request #25254 from CaseSolvedUK/taxdetail-v13 
feat: Tax Detail Report
 2021-05-18 22:45:29 +05:30
Deepesh Garg
87baa646e7
Merge pull request #25260 from AfshanKhan/dimension-wise-accounts-balance-reports 
feat: Dimension-wise Accounts Balance Report
 2021-05-16 18:04:01 +05:30
casesolved-co-uk
d5256b60d4 fix: lint 2021-05-13 12:53:11 +00:00
casesolved-co-uk
6998786055 fix: use correct fiscal year function in testing 2021-05-13 12:53:11 +00:00
casesolved-co-uk
cf5b57bfac fix: only load data for tests that need it 2021-05-13 12:53:11 +00:00
casesolved-co-uk
68a31d3d0d fix: fiscal year error 2021-05-13 12:53:11 +00:00
casesolved-co-uk
75ebfbdaf3 fix: fiscal year test case issue 2021-05-13 12:53:11 +00:00
casesolved-co-uk
89fcdf3226 fix: exclude rounding GL Entries from invoice tax lines 2021-05-13 12:53:11 +00:00
casesolved-co-uk
06e31e5d7d fix: Test data for empty db 2021-05-13 12:53:11 +00:00
casesolved-co-uk
391dc45964 chore: fix sider 2021-05-13 12:53:11 +00:00
casesolved-co-uk
7555f5f613 fix: add to workspace and fix lint 2021-05-13 12:53:11 +00:00
casesolved-co-uk
77ffa6b1f6 feat: add test case for report output 2021-05-13 12:53:11 +00:00
casesolved-co-uk
2cb0da8780 fix: rewrite to allow referring to existing sections and reduce to single amount column 2021-05-13 12:53:10 +00:00
casesolved-co-uk
1c37390899 fix: Change & simplify query to cater for zero rate tax entries 2021-05-13 12:53:10 +00:00
casesolved-co-uk
442a0de094 fix: finalise query, fix bugs, put Add Columns back 2021-05-13 12:53:10 +00:00
casesolved-co-uk
ece00287ea Refactor for Journal Entries (payroll) 2021-05-13 12:53:10 +00:00