Commit Graph

1068 Commits

Author SHA1 Message Date
Deepesh Garg
95a497cffb Merge branch 'develop' of https://github.com/frappe/erpnext into cost_center_fix 2020-06-20 12:33:41 +05:30
Deepesh Garg
bef80b7981 fix: Test 2020-06-20 12:32:30 +05:30
Marica
383807f72e
feat: Selling Desk, Dashboard and Onboarding (#22055)
* feat: Selling Desk, Dashboard and Onboarding

* chore: Selling Onboarding and fixes in Other onboardings

* chore: Dashboard and Number card Fixtures

* fix: Escape filters and Reposition Accounts Dashboard shortcut.

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-06-19 15:33:21 +05:30
Deepesh Garg
5f4330621c
Merge pull request #22231 from deepeshgarg007/financila_satement_immutable
fix: Handle cancelled entries in financial statements
2020-06-13 21:19:20 +05:30
Deepesh Garg
cc4943d54d fix: Distributed cost center query updation 2020-06-13 21:13:52 +05:30
Deepesh Garg
d80d442aa1 fix: Do not select cancelled entries in financial statements 2020-06-13 21:12:19 +05:30
Deepesh Garg
f3261794d9
Merge pull request #22230 from deepeshgarg007/financial_statement_to_date_v13
fix: Data not appearing properly for some fiscal_year in financial statements
2020-06-13 19:27:38 +05:30
Deepesh Garg
15231aa60d fix: Data not appearing properly for some fiscal_year in financial statemets 2020-06-13 19:26:39 +05:30
Deepesh Garg
08fee12266 fix: Item-wise sales and purchase register export 2020-06-10 18:33:24 +05:30
Karthikeyan S
e9ff6d3d52
feat(Cost Center): Distributed Cost Center (#21531)
* feat: Distributed Cost Center

Squashed commit of the following:

commit 274236eb92dfddfd015583ee1e6b5e1937366d28
Author: Vignesh <kaviya.3111999@gmail.com>
Date:   Mon Mar 23 18:32:26 2020 +0530

    Fix: Indentation

commit beae0b9849f333dd1d9f29c27192ea7de2e4e809
Author: Vignesh <kaviya.3111999@gmail.com>
Date:   Mon Mar 23 18:26:50 2020 +0530

    The validations are added to distributed cost center.

commit 3f66943adacb5797338ef3510251bf6633be3dba
Author: Vignesh <kaviya.3111999@gmail.com>
Date:   Thu Mar 19 22:17:25 2020 +0530

    The distributed cost centers are shown with the percentage allocation in the reports

commit 1ac11df522096fa187d2f5863b4c970e18b37fac
Author: Vignesh <kaviya.3111999@gmail.com>
Date:   Thu Mar 19 13:36:04 2020 +0530

    The child table distributed cost center are added to cost center doctype and then validate percentage allocation.

* fix(Distributed Cost Center): validation and filters

* fix(Distributed Cost Center): financial statement query

* fix(Distributed Cost Center): add test cases

Co-authored-by: Vignesh S <svignesh0308@gmail.com>

* fix(Distributed Cost Center): budget variance, general ledger, profitability analysis reports.

* Merge branch 'develop' into develop-distributed-cost-center

* fix(Distributed Cost Center): Added DCC reflection in actual amount column of Budget Variance Report.

* Update creation field in general ledger report

Co-authored-by: Nabin Hait <nabinhait@gmail.com>

* creation field updated in gl_entries query

Co-authored-by: Nabin Hait <nabinhait@gmail.com>

Co-authored-by: KaviyaPeriyasamy <kaviya.3111999@gmail.com>
Co-authored-by: Vignesh S <svignesh0308@gmail.com>
Co-authored-by: KaviyaPeriyasamy <kaviyaperiyasamy22@gmail.com>
Co-authored-by: Kaviya Periyasamy <36359901+KaviyaPeriyasamy@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-06-08 12:20:21 +05:30
Deepesh Garg
c01b4aa2e5
Merge pull request #22131 from deepeshgarg007/tds_monthly_cancelled
fix: Cancelled entries in tds payable monthly report
2020-06-07 00:08:17 +05:30
Deepesh Garg
57f9d43c43 fix: Cancelled entries in tds payable monthly report 2020-06-07 00:01:20 +05:30
Deepesh Garg
7135a75e5e fix: Error when no data is present in AR/AP reeport 2020-06-03 21:51:21 +05:30
Saqib
3c460364b5
fix: disposed asset creates inconsistencies in asset depr report (#22021) 2020-05-29 10:18:06 +05:30
Deepesh Garg
1f3fe59e36
fix: Default period start date and period end date for financial statements (#22011) 2020-05-28 18:36:21 +05:30
Marica
c2aabb0fbf
fix: Buying Module fixes (#21965)
* fix: Buying Module fixes

* fix: Delete Report files as well

* fix: Add Purchase Order Analysis to Stock & Accounting
2020-05-27 20:56:39 +05:30
Deepesh Garg
152377f84d
fix: Total for ageing column 121-Above (#21972) 2020-05-27 20:29:10 +05:30
Deepesh Garg
ed2c1803df
fix: Post Dated unallocated amount not considered in Advance Amount in AR/AP summary (#21837)
* fix: Post Dated unallocateed amount not considered in Advance Amount in AR/AP summary report

* fix: Add future payment filter in AR/AP summary

* fix: Show unallocated future payments only till current creation date

* fix: Remove extra query

* fix: Remove debug

* fix: Condition
2020-05-27 12:46:12 +05:30
Deepesh Garg
3a723dd815
Merge pull request #21940 from deepeshgarg007/acc_dim_report_filter
fix: Do not add filters in report on accounting dimension creation if it already exists
2020-05-26 19:30:43 +05:30
Deepesh Garg
11ea0b1289 fix: Do not add filters in report on accounting dimension creation if it already exists 2020-05-26 19:23:45 +05:30
Afshan
c0b4ec52de
fix: UX date range field separated in from and to date fields. (#21765)
* fix for issue #21419

* changing group by filter to default Group by Voucher (Consolidated)

* divided date range to seperate from and to date

* divided date range to seperate from and to date for purcase and sales register
2020-05-26 18:20:47 +05:30
Saqib
48e4abf43f
fix: fetch depreciation amount only if depr entry is made (#21893) 2020-05-25 19:21:08 +05:30
Deepesh Garg
29c748184c fix: Project filter in Trial Baalance Report 2020-05-20 22:15:12 +05:30
Rohit Waghchaure
e6147ed9bc feat: production forecasting using exponential smoothing method 2020-05-20 11:31:06 +05:30
Deepesh Garg
1b1787c61a fix: Against voucher in General Ledger 2020-05-19 20:51:30 +05:30
Nabin Hait
31b8be6c41 Merge branch 'accounts_dashboard' of https://github.com/deepeshgarg007/erpnext into deepeshgarg007-accounts_dashboard 2020-05-18 11:31:30 +05:30
Deepesh Garg
7d61c03af4
fix: Add missing dimensions in GL entries (#21689)
* fix: Add misssing dimensions in GL entries

* fix: Add project filter in trial balance report

* fix: Use current dimensions instead of dimensions from asset
2020-05-15 12:58:48 +05:30
Deepesh Garg
33f654ebfe Merge branch 'develop' of https://github.com/frappe/erpnext into accounts_dashboard 2020-05-14 22:57:27 +05:30
Deepesh Garg
8bbac6defc fix: Onboarding and Dashboard for accounts module 2020-05-14 22:57:11 +05:30
Afshan
bd7e535885
Fix: Set General Ledger 'Group By' filter as 'Group by Voucher(Consolidated)' when opened from Invoice (#21673)
* fix for issue #21419

* changing group by filter to default Group by Voucher (Consolidated)
2020-05-13 19:48:42 +05:30
Deepesh Garg
c6bd012e72 Merge branch 'develop' of https://github.com/frappe/erpnext into accounts_dashboard 2020-05-12 11:30:07 +05:30
Deepesh Garg
0defefda92 feat: Standard accounts dashboard 2020-05-11 12:14:46 +05:30
Deepesh Garg
e720882410
Merge pull request #21642 from kevingdc/bugfix/fix-budget-variance-report
fix(accounting): fix incorrect output in Budget Variance Report
2020-05-10 17:27:46 +05:30
Deepesh Garg
b81bd5f70c fix: Formatting fixes 2020-05-10 17:24:11 +05:30
Kevin Chan
bc05855805 fix: Simplify get_dimension_account_month_map
This commit updates get_dimension_account_month_map to no longer show
the actual expense when there is no budget. This also removes the other
functions and queries related to it. Spaces are also converted to tabs.
2020-05-09 16:02:11 +08:00
Deepesh Garg
3392e6b80c fix: User filters instead of hardcoded values 2020-05-08 19:53:09 +05:30
Deepesh Garg
8d9f86f781 fix: Gross and net profit report fix 2020-05-08 19:45:57 +05:30
Kevin Chan
b3ee6314f9 fix: Fix Budget Variance Report
This commit fixes a bug in Budget Variance Report where it combines the
actual expense amounts across different fiscal years. This was fixed by
updating the function and queries for computing the actual expense
amounts.
2020-05-07 18:39:47 +08:00
Kevin Chan
52189cba86 style: Improve formatting
This commit improves indentations and makes sql queries more readable.
2020-05-07 17:49:32 +08:00
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