Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,671 Commits 3 Branches 0 Tags 1 GiB
92b933f4ac
Commit Graph

1017 Commits

Author SHA1 Message Date
Deepesh Garg
525204bc50
feat: Payment allocation based on payment terms (#20945) 
* feat: Payment allocation based on payment terms

* fix: Add desccription for checkbox

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-23 16:07:36 +05:30
Deepesh Garg
6298bbb1eb
Merge pull request #21328 from rohitwaghchaure/fixed-account-name-in-gl_print 
fix: account name not showing in the gl print
 2020-04-18 20:40:50 +05:30
Rohit Waghchaure
9793500154 fix: account name not showing in the gl print 2020-04-18 19:02:07 +05:30
Mangesh-Khairnar
bd14a64bfb fix: add label to gl entry 2020-04-17 19:52:47 +05:30
Deepesh Garg
470679f227 fix: SQL ssyntax error 2020-04-10 20:22:42 +05:30
Deepesh Garg
9b312bfbd0 Merge branch 'develop' of https://github.com/frappe/erpnext into purchase-register-filters 2020-04-10 20:19:30 +05:30
Deepesh Garg
6c36cddbd3
Merge pull request #21188 from deepeshgarg007/dimension_filter_fix 
fix: Use separate condition for tree and normal doctype
 2020-04-07 15:23:36 +05:30
Deepesh Garg
62e9f83aab fix: Use separate condition for tree and normal doctype 2020-04-07 15:17:06 +05:30
Deepesh Garg
24a2c9b978
feat: Date range in financial statements (#21020) 
* feat: Date range in financial statements

* feat: Add date range filter in consolidated financial statement

* fix: Handle API changes in query_report

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2020-04-07 12:16:25 +05:30
Saqib Ansari
ca3967d52f feat: (minor) purchase register filters 2020-04-06 18:25:23 +05:30
Deepesh Garg
433e58d131
feat: Add report summary in financial statements (#20876) 
* feat: Add report summary API for Balance Sheet  and PL report

* fix: Add summary cards in Cash flow report

* feat: Add report summary in consolidated financial statements

* fix: Remove accumulated values filter from P&L and cashflow report

* fix: set company default currency in profit and loss statement if no data

Co-authored-by: Prssanna Desai <prssud@gmail.com>
 2020-04-06 14:07:20 +05:30
Deepesh Garg
e86f6d0738
Merge branch 'develop' into print-format-fix 2020-03-27 21:39:16 +05:30
Shivam Mishra
cf6a814328 fix: total currency formatting 2020-03-27 19:15:59 +05:30
Deepesh Garg
d74bcad7af
fix: Added hidden GL column in general ledger (#21021) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-03-26 13:37:40 +05:30
Deepesh Garg
ff7bbd2d38
fix: Party Name not visible in statement of accounts (#20913) 
* fix: Party name in Statement Of Accounts

* Update general_ledger.html

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-03-17 17:00:06 +05:30
Deepesh Garg
ed0965a572
feat: Nested set filtering for accounting dimension (#20860) 
* feat: Nested set filtering for accounting dimension

* fix: Remove print statement
 2020-03-17 10:53:24 +05:30
Deepesh Garg
07116c7922 fix: Mode of payment not fetcched in Item wise purchase register 2020-03-16 22:36:32 +05:30
Deepesh Garg
5e58666091 fix: HSN code not visible in GST Itemised Purchase register 2020-03-09 22:38:41 +05:30
Deepesh Garg
6dc335d898
Merge pull request #20824 from scmmishra/report-options 
feat: update profit and loss for new report summary API
 2020-03-04 16:07:31 +05:30
Deepesh Garg
12aa35aa43
fix: Label and UX fixes in AP/AP reports (#20803) 2020-03-02 19:10:29 +05:30
Deepesh Garg
5707c9a731
fix: Item Wise report query fix (#20760) 2020-02-28 12:28:54 +05:30
Saqib
8cf841ce60
fix: wrong calculation of depreciation eliminated for a period (#20502) 2020-02-27 19:09:34 +05:30
Deepesh Garg
0ce9e0cc1f
feat: Group by AR/AP report (#20573) 
* feat: Group by AR/AP report

* fix: Do not consider total row in charts

* fix: Subtotal row for last party
 2020-02-18 16:07:34 +05:30
Deepesh Garg
9462ba6559
feat: Group by item wise sales register (#20251) 
* fix: Group by sales register report

* fix: Remove group-by item

* fix: Grand total query fix

* fix: Remove debug param

* fix: Code cleanup and commonification

* fix: Add group by functionality to purchase register

* fix: Changes in total row display

* fix: Minor fixes

* fix: Add total row

* fix: Do not calculate total for rate
 2020-02-10 17:59:17 +05:30
Deepesh Garg
30e766b228 fix: SQL query in financial statements 2020-02-05 12:12:47 +05:30
Deepesh Garg
589f2cd16c
fix: Get only specified company accounts in financial statements (#20486) 2020-02-03 15:49:24 +05:30
rohitwaghchaure
ffa74ad5c1
Merge pull request #20478 from deepeshgarg007/finance-book-filter-new 
fix: Do not show any finance book record if no finance book filter is applied
 2020-01-31 13:19:16 +05:30
Deepesh Garg
34c33baa82 fix: Cash flow filter fix 2020-01-31 11:16:30 +05:30
Deepesh Garg
ba44f28202 fix: Filtering fixes in financial statement 2020-01-31 09:08:29 +05:30
Deepesh Garg
ce04526db8 fix: Do not show any finance book record if no finance book filter is applied 2020-01-30 15:33:51 +05:30
Suraj Shetty
2f67647f7b Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations 2020-01-29 15:06:50 +05:30
Suraj Shetty
48e9bc3fc9 fix: Incorrect translation syntax 2020-01-29 15:06:18 +05:30
Deepesh Garg
ef41a0eda5 fix: Finance book filtering in financial statements (#20410) 
* fix: Finance book filtering in financial statements

* fix: Use IS NULL instead of ifnull
 2020-01-27 15:18:51 +05:30
deepeshgarg007
fdba26d476 fix: Order GL entries by creation time in General ledger 2020-01-23 17:42:57 +05:30
Shivam Mishra
a59c2ce17a fix: profit and loss indicator bug 2020-01-14 17:55:49 +05:30
Shivam Mishra
748c3d9e8b feat: update profit and loss for new report summary API 2020-01-14 17:31:19 +05:30
Marica
287f491f7b fix: Employee name in Report trial balance for party (#20223) 
* fix: Employee name in Report trial balance for party

* fix: Add account filter in trial balance for party report

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-01-09 13:35:06 +05:30
deepeshgarg007
473b478883 fix: Show closing row in general ledger print 2020-01-02 12:22:04 +05:30
Don-Leopardo
ec258a43d9 perf: Asset Depreciations and Balances report (#18022) 2019-12-24 17:35:53 +05:30
Saqib
977489697d
Merge pull request #19973 from deepeshgarg007/budget_variance_dimension 
feat: Dynamic filters for dimensions in budget variance report
 2019-12-24 12:57:50 +05:30
Saqib
4f18d2548d fix: none type object updates AR report row (#19958) 2019-12-23 16:01:38 +05:30
Deepesh Garg
c408628ef2
Merge pull request #19979 from deepeshgarg007/sales_register_upgrade 
fix: Update sales register report
 2019-12-19 13:53:15 +05:30
deepeshgarg007
be8c406808 fix: Update sales register report 2019-12-17 22:27:23 +05:30
deepeshgarg007
e65ada2807 feat: Dynamic filters for dimensions in budget variance report 2019-12-17 17:54:34 +05:30
rohitwaghchaure
86babbe3ac
Merge pull request #19970 from rohitwaghchaure/fixed_incorrect_outstanding_amount_showing_in_the_ap_ar_report_v13 
fix: incorrect outstanding amount showing in the AP/AR report
 2019-12-17 17:15:45 +05:30
Rohit Waghchaure
0f583b8c5a fix: incorrect outstanding amount shwoing in the AP/AR report 2019-12-17 12:48:02 +05:30
Suraj Shetty
586390db81
Merge branch 'develop' into fix-profit-and-loss-statement 2019-12-14 22:49:53 +05:30
Suraj Shetty
f95267041d fix: Financial statement report 
- Hidden column should note be considered in the report
- Remove hardcoded currency formatting
- Remove duplicate letterhead in the report
(print_template already adds one)
- Remove extra quotes from Total Amount text
 2019-12-12 13:06:17 +05:30
Nabin Hait
d285e9b7bd
optimize: Optimization of Receivable report filtered based on sales person (#19796) 2019-12-04 15:30:58 +05:30
Deepesh Garg
dfd82d22c8
Merge pull request #19792 from nabinhait/ar-summary-based-on-terms 
feat: Receivable / payable summary based on payment terms
 2019-12-04 11:25:28 +05:30