Himanshu Warekar
a03aa0014e
feat: update sla using custom script
2019-06-20 11:32:49 +05:30
Himanshu
d82175da36
Merge branch 'develop' into sla_fix
2019-06-20 10:54:01 +05:30
Himanshu Warekar
bbe84ac0ef
feat: change apply_to to entity
2019-06-20 10:53:34 +05:30
Himanshu Warekar
ed50452800
Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix
2019-06-20 10:01:05 +05:30
Himanshu Warekar
41bf0c6855
feat: filter sla based on customer in issue
2019-06-20 10:00:11 +05:30
Aditya Hase
b96956f35c
Merge branch 'develop' into fix-timesheet-tests
2019-06-20 09:40:23 +05:30
Deepesh Garg
12f2096846
Merge pull request #17995 from deepeshgarg007/hsn_summary_develop
...
fix: From date and to date filters in HSN wise summary of out ward supplies
2019-06-19 21:48:15 +05:30
deepeshgarg007
ecc670047e
fix: From date and to date filters in HSN wise summary of out ward supplies
2019-06-19 18:36:24 +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
Himanshu
3caf7b80e5
Merge branch 'develop' into sla_fix
2019-06-19 16:08:35 +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
Himanshu Warekar
24cef8e26e
Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix
2019-06-19 14:43:59 +05:30
Himanshu Warekar
36d6e570c4
patch: try catch to handle TableMissingError
2019-06-19 14:43:21 +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
Himanshu
7bb1402a37
Merge branch 'develop' into sla_fix
2019-06-19 13:42:49 +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
Himanshu Warekar
f4f7e781c5
debug: travis
2019-06-19 12:01:59 +05:30
Aditya Hase
be8a46a92a
fix(tests): Timesheet tests
2019-06-18 21:50:05 +05:30
Himanshu Warekar
2724de9320
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
2019-06-18 20:02:26 +05:30
Himanshu Warekar
e48ca44bf5
patch: fix typo
2019-06-18 20:02:00 +05:30
Himanshu Warekar
7881e838c6
patch: refactor patch for travis test
2019-06-18 19:35:50 +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
Himanshu Warekar
befd393dcb
fix: patch
2019-06-18 12:51:12 +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
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
Himanshu Warekar
7c18f69727
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
2019-06-17 23:53:01 +05:30
Himanshu Warekar
0ad3887d51
patch: fixes
2019-06-17 23:52:53 +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
Himanshu Warekar
bdf9737d73
patch: reload service level priority
2019-06-17 18:00:57 +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
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
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
Himanshu Warekar
67f9b63793
patch: get priority before reload_doc
2019-06-17 11:49:02 +05:30
Himanshu Warekar
199b43dbbb
fix: patch fixes for sla
2019-06-17 09:35:34 +05:30
Himanshu Warekar
c58d0317a4
Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix
2019-06-17 08:43:36 +05:30
Rohit Waghchaure
b821af44b6
fix: revert group by voucher general ledger changes
2019-06-17 07:42:53 +05:30
