Suraj Shetty
b9f346fc88
Merge branch 'develop' into call-summary-dialog
2019-06-19 19:18:52 +05:30
Suraj Shetty
16baa3b13a
fix: Move back .pylintrc to root
2019-06-19 18:35:36 +05:30
Suraj Shetty
d4420afb72
chore: Remove unwanted files
2019-06-19 18:33:56 +05:30
Deepesh Garg
2b739b304e
Merge pull request #17970 from Mangesh-Khairnar/employee-benefit-application
...
fix(employee-benefit-application): remove query from setup
2019-06-19 18:18:47 +05:30
rohitwaghchaure
d849ce7ce0
Merge pull request #17980 from adityahase/fix-buying-items-rate
...
fix: Consider discount_amount only when provided to calculate rate
2019-06-19 14:47:06 +05:30
rohitwaghchaure
40c5fcc9cc
Merge pull request #17967 from Alchez/develop-delivery-email
...
fix(delivery): Add items to context for dispatch notification email
2019-06-19 14:37:23 +05:30
Faris Ansari
2632107129
fix: User MultiSelectList control for Party filter ( #17943 )
...
* fix: User MultiSelectList control for Party filter
The comma based filter wouldn't work for values that had comma in them
* fix: Replace with MultiSelectList in reports
* fix: Parse json instead of string split
2019-06-19 12:15:37 +05:30
Aditya Hase
48585c94ff
fix: Consider discount_amount only when provided to calculate rate
...
After selecting item_code in items table and not entering rate,
Clicking elsewhere will set rate to NaN.
All DocTypes on buying side have this bug.
2019-06-18 19:11:17 +05:30
rohitwaghchaure
226ff5a797
Merge pull request #17964 from rohitwaghchaure/bank_guarantee_project_not_found_error_develop
...
fix: bank guarantee, not able to select the purchase order
2019-06-18 11:31:01 +05:30
Suraj Shetty
5b52aba8df
Merge branch 'call-summary-dialog' of github.com:surajshetty3416/erpnext into call-summary-dialog
2019-06-18 11:28:20 +05:30
Suraj Shetty
a28b96493f
fix: Make field labels translatable
2019-06-18 11:28:14 +05:30
Suraj Shetty
a367a85a78
Merge branch 'develop' into call-summary-dialog
2019-06-18 11:09:29 +05:30
Suraj Shetty
9ba9a91631
fix: Strip leading zero from phone number
2019-06-18 10:56:47 +05:30
Deepesh Garg
c38e0bb75c
Merge pull request #17959 from deepeshgarg007/dimension-fixes
...
fix: Is group filter fixes in dimensions
2019-06-18 08:37:32 +05:30
deepeshgarg007
946eefe039
fix: Codacy fixes
2019-06-17 23:10:36 +05:30
Mangesh-Khairnar
7293a98a10
fix: change formatting
2019-06-17 19:03:46 +05:30
Mangesh-Khairnar
9ee5c8a4c6
fix(employee-benefit-application): remove query from setup
2019-06-17 18:07:10 +05:30
Anurag Mishra
3d47a6dbb5
fix: Company filters in Total Stock Summary Report ( #17965 )
2019-06-17 17:49:04 +05:30
rohitwaghchaure
cfcf7ae7b6
Merge pull request #17960 from rohitwaghchaure/delayed_order_reports
...
feat: delayed order reports
2019-06-17 17:42:18 +05:30
Rohit Waghchaure
4803e817e9
fix: bank guarantee, not able to select the purchase order
2019-06-17 17:40:40 +05:30
Rushabh Mehta
803f784351
fix(minor): format date in user format for accounting dashboard
2019-06-17 17:33:24 +05:30
rohitwaghchaure
fdb79063a0
Merge pull request #17969 from rohitwaghchaure/enabled_disabled_buttons_on_change_of_pos_profile_develop
...
fix: allow edit is enabled in the pos profile still user not able to edit the rates
2019-06-17 17:24:29 +05:30
Mangesh-Khairnar
7b2a2816cd
Merge pull request #17950 from Anurag810/company_ui/ux_fix
...
fix: Make some section collapsible in company form
2019-06-17 17:00:00 +05:30
Rohit Waghchaure
7efeffa66a
fix: allow edit is enabled in the pos profile still user not able to edit the rates
2019-06-17 16:20:32 +05:30
Rohan Bansal
4babfdb987
fix(delivery): Add more context for dispatch notification email + formatting fixes
2019-06-17 16:16:51 +05:30
Mangesh-Khairnar
57f4e817f8
Merge branch 'develop' into company_ui/ux_fix
2019-06-17 15:36:45 +05:30
deepeshgarg007
dfe006be19
Merge branch 'develop' of https://github.com/frappe/erpnext into dimension-fixes
2019-06-17 15:26:05 +05:30
Suraj Shetty
04d623ab66
fix: Get employee login ids directly from child table
2019-06-17 15:20:28 +05:30
Suraj Shetty
db26191937
Merge branch 'call-summary-dialog' of github.com:surajshetty3416/erpnext into call-summary-dialog
2019-06-17 14:17:26 +05:30
Suraj Shetty
8b95b61aa0
fix: Remove unwanted code
2019-06-17 14:17:21 +05:30
Faris Ansari
2e968ece1a
Delete test_call_log.py
2019-06-17 13:03:44 +05:30
Faris Ansari
520c403a05
Delete call_log.js
2019-06-17 13:02:49 +05:30
Suraj Shetty
ec6afbbe99
Merge pull request #17953 from netchampfaris/website-theme-import
...
fix: Add erpnext website theme import
2019-06-17 12:56:24 +05:30
Rohit Waghchaure
725f56faca
feat: delayed order reports
2019-06-17 12:50:44 +05:30
deepeshgarg007
d1e0f42fea
fix: Styling fix
2019-06-17 12:47:39 +05:30
deepeshgarg007
7e3a98ba33
fix: Is group filter fixes in dimensions
2019-06-17 12:44:49 +05:30
Suraj Shetty
93fc6004ad
Merge pull request #17942 from netchampfaris/product-page-cart-disabled
...
fix: Show product page even if cart is not enabled
2019-06-17 12:36:09 +05:30
Suraj Shetty
f821b18a82
Merge pull request #17951 from netchampfaris/product-page-specification
...
fix: Remove Specifications label
2019-06-17 12:32:58 +05:30
Suraj Shetty
340ccb6c96
fix: Remove unwanted code
2019-06-17 10:16:38 +05:30
Suraj Shetty
a86a07ef37
fix: Add additional check to ensure doc_before save exists
2019-06-17 09:29:46 +05:30
Suraj Shetty
eb0ca67ced
fix: Caller name in call popup
2019-06-17 08:59:12 +05:30
Suraj Shetty
5ea6a5e33a
fix: Decouple call popup from exotel
2019-06-17 08:46:38 +05:30
Suraj Shetty
3fdeffff7a
feat: Add medium field in call log doctype
2019-06-17 08:27:00 +05:30
Suraj Shetty
be1dddd596
feat: Add call recording URL field to call log
2019-06-17 08:06:14 +05:30
rohitwaghchaure
2e98da8bfe
Merge pull request #17958 from rohitwaghchaure/revert_group_by_voucher_general_ledger_develop
...
fix: revert group by voucher general ledger changes
2019-06-17 07:43:32 +05:30
Rohit Waghchaure
b821af44b6
fix: revert group by voucher general ledger changes
2019-06-17 07:42:53 +05:30
Deepesh Garg
7793df885b
Merge pull request #17947 from deepeshgarg007/gstr-3b-pos-fixes
...
fix: GSTR-3b Report fixes
2019-06-16 20:03:48 +05:30
Faris Ansari
8e99aaf605
fix: Add erpnext website theme import
2019-06-14 20:06:54 +05:30
Faris Ansari
b2ab1031e3
fix: Show Clear filters when attribute filters are set
2019-06-14 18:16:14 +05:30
Faris Ansari
22642a5f45
fix: Homepage products styling ( #17912 )
2019-06-14 18:15:40 +05:30
