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

5428 Commits

Author SHA1 Message Date
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
Rohan
200af04657
format: better error messages for invalid coupon codes (develop) (#21599) 
* format: better error messages for invalid coupon codes

* fix: remove unnecessary docstatus check
 2020-05-15 12:10:34 +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
Shivam Mishra
0fbc96cc8c
Merge pull request #21731 from prssanna/custom-chart-fix 
fix: add heatmap_year parameter to get
 2020-05-14 18:27:07 +05:30
prssanna
39cb749f95 fix: add heatmap_year parameter to get 2020-05-14 18:25:58 +05:30
Saqib Ansari
13096cdbfe fix: invalid conditional statement 2020-05-13 22:02:56 +05:30
Saqib
2b8f307ffe
Merge branch 'develop' into pur-inv-status-fix 2020-05-13 21:56:45 +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
Saqib
7adfc34a26
Merge branch 'develop' into pur-inv-status-fix 2020-05-13 14:02:19 +05:30
Deepesh Garg
cdeb897fff fix: Account shortcut in desk page 2020-05-12 17:23:15 +05:30
Saqib Ansari
734bfcdfc2 fix: purchase inv shows overdue for fraction of outstanding 2020-05-12 14:11:33 +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
Chinmay Pai
30f26b4457
fix: do not setup charts if not setup_complete or no company found (#21670) 
* fix: do not setup charts if not setup_complete or no company found

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* chore: remove check for setup_complete

moved the check for setup_complete to frappe

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* chore: return an empty dict from get_data if company not set

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-05-11 19:54:46 +05:30
Deepesh Garg
0defefda92 feat: Standard accounts dashboard 2020-05-11 12:14:46 +05:30
rohitwaghchaure
76dd10f48a
Merge pull request #21652 from rohitwaghchaure/fixed-branch-code-and-swift-number 
fix: wrong fieldname branch_code in add_fetch
 2020-05-11 07:06:42 +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
Suraj Shetty
65d3ac814d fix: Add accidentally removed function 2020-05-09 17:39:59 +05:30
Suraj Shetty
d53822f012
Merge pull request #21618 from scmmishra/sync-dashboards 2020-05-09 14:15:20 +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
9b70a0ac18
Merge pull request #21663 from deepeshgarg007/gross_net_profit 
fix: Gross and net profit report fix
 2020-05-08 19:56:58 +05:30
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
9d81f97fe6 fix: Tax Withholding Category Description default 
This commit fixes a bug that happens when a Purchase Invoice uses a
Tax Withholding Category without a category_name. The category_name is
used as the tax description which is a required field. The bug was
fixed by using the Tax Withholding Category's name as the description
if the category_name is empty.
 2020-05-08 18:01:18 +08:00
Kevin Chan
e29283630b fix: Zero threshold in Tax Withholding Category 
This fixes a bug in Tax Withholding Category where if it has a threshold
of 0, it doesn't apply to Purchase Invoices. The bug was fixed by
updating the condition.
 2020-05-08 17:45:08 +08:00
Rohit Waghchaure
7d4ccdf240 fix: wrong fieldname branch_code in add_fetch 2020-05-08 13:27:25 +05:30
rohitwaghchaure
b310d6f372
Merge pull request #21649 from anupamvs/payment-order-fix 
fix: Payment Order not allowing to create Payment Entry
 2020-05-08 10:26:42 +05:30
Anupam K
8b52697723 Payment Order not allowing to create Payment Entry 2020-05-08 02:23:28 +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
Deepesh Garg
9513171d3f
Merge pull request #21624 from deepeshgarg007/reversse_gl_fix 
fix(minor): Reverse GL fix
 2020-05-06 18:19:19 +05:30
Deepesh Garg
b821f22b7c fix(minor): Reverse GL fix 2020-05-06 18:12:23 +05:30
Shivam Mishra
28436d2bc1 feat: added dashboard fixtures for accounts 2020-05-06 15:19:10 +05:30