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
Anupam K
1aaedd68b9
Twitter and LinkedIn Auth fix
2020-05-13 17:55:18 +05:30
Mangesh-Khairnar
4a9fd9ef6d
fix: error log title for failing bank transactions
2020-05-13 16:11:22 +05:30
Deepesh Garg
12a9328a63
Merge pull request #21668 from abhishekbalam/develop
...
feat(Selling): Territory Wise Treeview In 'Customer Acquisition and Loyalty' Report
2020-05-13 14:26:40 +05:30
Saqib
7adfc34a26
Merge branch 'develop' into pur-inv-status-fix
2020-05-13 14:02:19 +05:30
Anurag Mishra
36aea71fd7
fix: new dashboard and report
2020-05-13 10:47:36 +05:30
Deepesh Garg
e9cc9f99d2
Merge pull request #21702 from abhishekbalam/error_msg_typo
...
fix: typo in error message in loan_security_pledge.py
2020-05-12 19:11:42 +05:30
Abhishek Balam
673e704bb5
typo in error message in loan_security_pledge.py
2020-05-12 19:09:27 +05:30
marination
e4fc5ba83c
fix: Report conditional query simplification.
2020-05-12 18:58:54 +05:30
marination
7adca986fb
chore: Onboarding v2
2020-05-12 18:40:35 +05:30
marination
354b01617e
chore: Dashboard Fixtures
2020-05-12 17:35:17 +05:30
Deepesh Garg
cdeb897fff
fix: Account shortcut in desk page
2020-05-12 17:23:15 +05:30
Shivam Mishra
846ca09950
Merge branch 'develop' of https://github.com/frappe/erpnext into project-refresh
2020-05-12 17:13:59 +05:30
Abhishek Balam
411b125906
new parent updating logic, made requested changes
2020-05-12 15:25:35 +05:30
Saqib Ansari
734bfcdfc2
fix: purchase inv shows overdue for fraction of outstanding
2020-05-12 14:11:33 +05:30
marination
94ba286fd2
Merge branch 'develop' of https://github.com/frappe/erpnext into purchase-dashboard
2020-05-12 13:17:34 +05:30
marination
d99f85bf3c
chore: Fixtures using new sync api
2020-05-12 13:16:05 +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
Shivam Mishra
498f658321
refactor: rename getting started to home ( #21674 )
...
* feat: rename getting started to home
* feat: added patch for renaming
2020-05-11 20:47:08 +05:30
Marica
97715f2877
fix: Message for missing valuation rate ( #21686 )
2020-05-11 20:45:37 +05:30
Deepesh Garg
b52e40037a
fix: Remove domain restriction from Location doctype ( #21659 )
2020-05-11 20:01:57 +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
sahil28297
28c9468dad
fix(patch): use translated string while setting notification template ( #21679 )
2020-05-11 19:28:10 +05:30
Nabin Hait
85a89812a4
fix: Run income-tax-slab patch only if slab already exists in payroll period ( #21684 )
2020-05-11 19:23:18 +05:30
Marica
8a85b9428b
Merge branch 'develop' into quoted-item-report
2020-05-11 17:56:11 +05:30
Deepesh Garg
e684727923
Merge pull request #21519 from nextchamp-saqib/sales-report-total-row
...
chore: add total row in sales analytics report
2020-05-11 17:07:59 +05:30
Nabin Hait
6e5952fa69
fix: Changed label for payroll working days based on field
2020-05-11 16:11:43 +05:30
Abhishek Balam
87776c335b
code improvements
2020-05-11 15:18:40 +05:30
Deepesh Garg
ece1b4bc5a
Merge pull request #21676 from rohitwaghchaure/fixed-qty-validation-in-stock-entry
...
fix: '<' not supported between instances of 'str' and 'int'
2020-05-11 12:27:20 +05:30
Deepesh Garg
0defefda92
feat: Standard accounts dashboard
2020-05-11 12:14:46 +05:30
Rohit Waghchaure
3a914a7cd7
fix: '<' not supported between instances of 'str' and 'int'
2020-05-11 11:44:45 +05:30
rohitwaghchaure
f6c7461eb8
Merge pull request #21661 from marination/barcode-update
...
fix: Item Barcode stays the same after updating.
2020-05-11 11:01:01 +05:30
rohitwaghchaure
6a61636c58
Merge pull request #21665 from anupamvs/assessment-issue
...
fix: Assessment Plan not getting created
2020-05-11 07:17:46 +05:30
rohitwaghchaure
5abccc1a61
Merge pull request #21601 from rohitwaghchaure/fix-completed-qty-in-work-order
...
fix: work order operation completed qty
2020-05-11 07:07:28 +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
Abhishek Balam
500dff63e7
fix: adjusted width of colums to see full column names, also fixes #21556
2020-05-10 14:53:59 +05:30
Abhishek Balam
5ec5584319
In treeview, bold only for root territory, looks cleaner
2020-05-10 00:24:43 +05:30
Abhishek Balam
7cbc902d90
removed validation for root node in territory, codacy recommended changed
2020-05-09 22:35:28 +05:30
Abhishek Balam
b59f2780eb
fix: renamed view types, added default
2020-05-09 22:09:02 +05:30
Abhishek Balam
d543830a59
feat(Selling): Added Territory wise treeview to 'Customer Acquistion and Loyalty' report
2020-05-09 21:56:53 +05:30
Shivam Mishra
8b31b3ba00
Merge pull request #21667 from surajshetty3416/fix-dashboard
...
fix: Add accidentally removed function
2020-05-09 17:53:46 +05:30
Suraj Shetty
65d3ac814d
fix: Add accidentally removed function
2020-05-09 17:39:59 +05:30
Anupam K
aadf264b49
Assessment Plan not getting created
2020-05-09 16:15:51 +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
