Commit Graph

31124 Commits

Author SHA1 Message Date
Saqib Ansari
940856cc16 fix: add tests for set_status 2020-05-15 14:30:24 +05:30
rohitwaghchaure
2ee400989b
Merge pull request #21273 from marination/quoted-item-report
refactor: Quoted Item Comparison Report
2020-05-15 13:47:48 +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
d75af70110
Merge pull request #21712 from Mangesh-Khairnar/fix-error-log-title
fix: error log title for failing bank transactions
2020-05-15 12:16:53 +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
Mangesh-Khairnar
f984bee5f9
fix: duplicate leave expiry creation (#21505)
* fix: validate existing ledger entries to avoid duplicates

* patch: remove duplicate ledger entries created

* fix: consider only submitted ledger entries

* fix: delete duplicate leaves from the ledger

* fix: check if duplicate ledger entry exists

* chore: formatting changes

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-15 11:55:42 +05:30
rohitwaghchaure
c649468f37
Fixed typo 2020-05-15 11:35:41 +05:30
rohitwaghchaure
b8011197d9
Merge branch 'develop' into quoted-item-report 2020-05-15 04:54:40 +05:30
rohitwaghchaure
10e24d9249
Merge pull request #21600 from anupamvs/lead-customer-issue
fix: adding Email and Phone in Contact child table
2020-05-15 04:43:38 +05:30
rohitwaghchaure
abcd40c75f
Merge pull request #21715 from anupamvs/sm-fix
fix: Twitter and LinkedIn Auth fix
2020-05-15 04:37:40 +05:30
Saqib
41b47a68b3
fix: item price not fetching when customer is unset in item price (#21488)
* fix: item price not fetching when customer is unset in item price

* fix: item price of selling type has hidden supplier value

* fix: remove test variable

* fix: test

* patch: invalid customer/supplier based on item price type

* fix: invalid query

* fix: patch

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-05-15 04:24:36 +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
Nabin Hait
200f80c3d3 fix: Added submit permission in employee other income 2020-05-14 17:18:29 +05:30
Nabin Hait
10df3d5081 fix: Get basic and hra component from db, not from cache 2020-05-14 17:15:36 +05:30
Suraj Shetty
dde39c3d1a
chore: Drop Python2 support (#21704)
* chore: Drop Python2 support

* test: Fix test redundancy by removing countries

3 countries seems ennough to test  coa template feature
2020-05-14 12:09:36 +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
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
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
Deepesh Garg
cdeb897fff fix: Account shortcut in desk page 2020-05-12 17:23:15 +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
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