Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,447 Commits 3 Branches 0 Tags 1 GiB
359e934cd2
Commit Graph

5461 Commits

Author SHA1 Message Date
rohitwaghchaure
0233f94570
Merge pull request #22081 from deepeshgarg007/jv_list_view 
fix: Add total debit in Journal Entry list view
 2020-06-10 14:17:13 +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
rohitwaghchaure
b3b5c96749
Merge pull request #22092 from marination/shippinng-address 
fix: Apply shipping rule without address too
 2020-06-08 10:36:19 +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
marination
0c72249403 fix: Apply shipping rule without address too 2020-06-03 14:32:07 +05:30
Deepesh Garg
60f3a2b8e7 fix: Add total debit in Journal Entry list view 2020-06-02 18:26:43 +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
mergify[bot]
fd351f8268
fix: set fiscal year for Profit and Loss chart (#22006) 
(cherry picked from commit 4afda76015)

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
 2020-05-28 15:18:47 +05:30
rohitwaghchaure
af91e13435
Merge pull request #22001 from nextchamp-saqib/price-rule-date-field-fix 
fix: transaction date not found in sales invoice
 2020-05-28 14:38:13 +05:30
Deepesh Garg
cfcdd52bf4
fix: Inter-company Invoice currency for multicurrency transactions (#21984) 2020-05-28 13:35:29 +05:30
Saqib Ansari
dd39ba0014 chore: tests 2020-05-28 13:11:04 +05:30
Saqib Ansari
603cc3d05e fix: transaction date not found in sales invoice 2020-05-28 12:49:33 +05:30
Deepesh Garg
6fe3a24c5d
Merge pull request #21986 from deepeshgarg007/tds_computation_summary 
fix: TDS computation summary report
 2020-05-27 22:49:42 +05:30
Deepesh Garg
33a08f1ea7 fix: TDS computation summary report 2020-05-27 22:44:50 +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
0030b95595
fix: Filtering issues in opneing invoice creation tool (#21969) 2020-05-27 20:27:33 +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
Chinmay D. Pai
0d147b011e
fix: set default posting_date value to None 
using mutable python defaults, and especially function calls, inside
function definitions causes bugs that can be really hard to debug
sometimes. please refrain from using such defaults.

instead, using None is almost always a sane default. the values can
then be manipulated inside the function instead.

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-05-24 00:54:04 +05:30
Deepesh Garg
29c748184c fix: Project filter in Trial Baalance Report 2020-05-20 22:15:12 +05:30
Marica
2b04e8eef0
fix: Validate Payment Gateway only if it exists in Payment Request. (#21805) 2020-05-20 16:13:43 +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
ddec05ee07 Merge branch 'marination-stock-dashboard' into develop 2020-05-19 19:08:58 +05:30
Nabin Hait
8b686a5721 feat: stock module dashboard and onboarding 2020-05-19 19:08:30 +05:30
rohitwaghchaure
f128b1c0c5
refactor: changed the fieldtype from data to small text (#21782) 2020-05-19 19:05:42 +05:30
Shivam Mishra
31f00b6052 refactor: rename dashboards in desk page 2020-05-19 15:56:47 +05:30
rohitwaghchaure
65c90959d1
fix: renamed manufacturing dashboards to manufacturing (#21776) 2020-05-19 15:54:24 +05:30
Nabin Hait
9aae6f4793 feat: accounting dashboard + desk 2020-05-18 18:03:11 +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
ec8c28e487
Revert "fix(accounting): Allow 0 threshold in Tax Withholding Category" 2020-05-18 11:27:38 +05:30
Rucha Mahabal
e83d1d221d
Merge branch 'develop' into multi_company 2020-05-17 20:02:12 +05:30
Deepesh Garg
bf16956d10
Merge pull request #21656 from kevingdc/bugfix/tax-withholding-category-description 
fix(accounting): Tax Withholding Category Description default
 2020-05-16 18:07:45 +05:30
Deepesh Garg
2a0e3e3515
fix: Remove strip 2020-05-16 18:07:03 +05:30
Deepesh Garg
2567815b03
Merge pull request #21655 from kevingdc/bugfix/zero-threshold-in-tax-withholding-category 
fix(accounting): Allow 0 threshold in Tax Withholding Category
 2020-05-16 17:55:51 +05:30
rohitwaghchaure
7435174300
Merge pull request #21747 from rohitwaghchaure/fix-supplier-schema-save-issue 
fix: promotional scheme not able to save
 2020-05-16 11:34:23 +05:30
Rohit Waghchaure
49dbbdc4cb fix: promotional scheme not able to savce 2020-05-16 04:59:59 +05:30
Deepesh Garg
7be71c88f2
fix: Better validation message for group accounts (#21725) 2020-05-15 19:23:41 +05:30
Deepesh Garg
1b821fec4b
Merge pull request #21742 from nextchamp-saqib/payment-remark-fix 
fix: update remark on submitting payment entry
 2020-05-15 17:48:51 +05:30
Saqib Ansari
03d165ff79 fix: update remark on submitting payment entry 2020-05-15 16:39:02 +05:30
Deepesh Garg
a812ad7555
Merge pull request #21699 from nextchamp-saqib/pur-inv-status-fix 
fix: purchase inv shows overdue for fraction of outstanding
 2020-05-15 15:46:23 +05:30
Saqib Ansari
940856cc16 fix: add tests for set_status 2020-05-15 14:30:24 +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