Commit Graph

1029 Commits

Author SHA1 Message Date
rohitwaghchaure
54a6c64b0f
fix: against voucher no not all records showing in case of Group By Voucher (consolidated) (#21592) 2020-05-05 16:17:15 +05:30
Saqib
39805918d4
fix: accounts payable shows advance amount of other company (#21548) 2020-05-01 18:15:13 +05:30
Saqib
090e6093f2
fix: list index out of range error (#21467)
* fix: list index out of range error

* fix: condititon
2020-04-30 11:04:44 +05:30
Deepesh Garg
2a9c5badc6
feat: Immutable ledger (#18740)
* fix: Reverse GL entry on cancellation of document

* fix: Removed set posting time field for multiple docs

* fix: Stop future reposting and reverse entry for purchase receipt and delivery note

* fix: Change is_cancelled field from select to check

* Revert "fix: Removed set posting time field for multiple docs"

This reverts commit 81fb808db7da69ab1e58ba226c0cd0b77e5b90c8.

* fix: Multiple fixes in GL Entry

* fix: Remove future reporting from doctypes

* fix: Canceled entry filters in Stock Ledger and General Ledger Report

* fix: Remove print statement

* fix: Validation for back dated entries

* fix: Codacy fixes

* fix: Add ignore links to multiple doctypes

* fix: Codacy Fixes

* fix: Ignore GL Entry and Stock Ledger entry while cancel

* fix: Test case fixes

* fix: Patch

* fix: Codacy

* fix: Budget Test Cases

* fix: Patch

* fix: Patch

* fix: Multiple test cases

* fix: changes in make_reverse_entry function

* fix: Update patch

* fix: Test Cases

* fix: Test Case fixes

* fix: Move patch upward in patches.txt

* fix: Budget Test Cases

* fix: Test Case and codacy

* fix: Patch

* fix: Minor label and UX fixes

* fix: Move freezing date check

* fix: Test Cases

* fix: Test cases

* fix: Test Cases

* fix: Test Case

* fix: Remove update_gl_entries_after function

* fix: Remove update_gl_entries_after function

* fix: Test Cases

* fix: Fiscal Year wise backdated entry

* fix: Update entries only for current SLE

* fix: Remove is_cancelled

* fix: Test Cases

* fix: Test cases

* fix: Test Cases

* fix: Uncomment account and stock balance sync logic

* fix: Stock balance and Account balance out of sync fixes

* fix: Test Cases

* fix: Test cases for POS, Stock Reco and Purchase Receipt

* fix: Stock Reco tests

* fix: Test stock reco precision

* fix: Test stock reco for fifo precision

* fix: Test stock reco for fifo precision

* fix: Stock Entry test case

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-30 10:38:58 +05:30
Deepesh Garg
0d8f66dafa
Merge pull request #21493 from deepeshgarg007/item_wise_sale_purchase
fix: Group by filter fix in item wise sales and purchase register
2020-04-29 12:36:08 +05:30
Deepesh Garg
3d8dadaab6 fix: Group by filter fix in item wise sales and purchase register 2020-04-29 12:05:56 +05:30
Deepesh Garg
428978762b
Merge pull request #21461 from deepeshgarg007/consolidate_statement_fix
fix: Report summary fix in consolidated financial statement for report type Profit and Loss
2020-04-28 13:30:12 +05:30
Deepesh Garg
fa2eecc5fc fix: Report summary fix in consolidated financial statement for report type Profit and Loss 2020-04-28 13:12:22 +05:30
Deepesh Garg
558f6aa4cb
Merge pull request #21456 from deepeshgarg007/gross_profit_width
fix: Default column width in Gross profit report
2020-04-28 12:35:50 +05:30
Deepesh Garg
142af4b58a fix: Default column width in Gross profit report 2020-04-28 11:17:45 +05:30
Deepesh Garg
d78cf97250
feat: Allow tax withholding category selection at invoice level (#20870)
* feat: Allow tax withholding category selection at invoice level

* fix: Linitng fixes

* feat: TDS calculation using common PAN

* fix: Add provision to deduct Lower TDS in purchase invoice

* fix: Consider only ref docs company while computing TDS

* fix: Default permission fixes

* fix: Add validation for dates in fiscal year

* fix: Undefined variable
2020-04-26 20:08:52 +05:30
Nabin Hait
ad16e61bc2
fix: Valid warehouse in woocommerce syncing and other small fixes (#21407)
* fix: Valid warehouse in woocommerce syncing

* fix: dmall fixes in gross & net profit report

* fix: company is required for getting party details

* fix: None issue while getting raw material rate based on last purchase rate
2020-04-25 14:52:05 +05:30
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