Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,697 Commits 3 Branches 0 Tags 1 GiB
80c0d0db21
Commit Graph

1334 Commits

Author SHA1 Message Date
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