Commit graph

14795 commits

Author SHA1 Message Date
Nabin Hait
4e5d6df2dc bumped to version 10.1.1 2018-02-23 17:26:42 +06:00
Nabin Hait
f07a9cf17f
Delete duplicate custom fields (#5070)
* Delete duplicate custom fields

* Delete duplicate custom fields
2018-02-23 16:16:49 +05:30
Rushabh Mehta
f20da41bf6 [fix] rename custom fields before sync if name conflicts (#5062)
* [fix] rename custom fields before sync if name conflicts

* [minor] re-add text_type

* Update doctype.py
2018-02-23 11:10:21 +05:30
Nabin Hait
c06dfafd99 Merge branch 'hotfix' 2018-02-22 14:37:33 +05:30
Nabin Hait
5849e9f268 bumped to version 10.1.0 2018-02-22 15:07:33 +06:00
Nabin Hait
4d96472969
Updated develop version 2018-02-22 14:36:58 +05:30
Shreya Shah
c8d13c07ba refresh only if timeline (#5050) 2018-02-22 11:01:54 +05:30
Zarrar
a1b46cdfac make expand_all button configurable (#5042) 2018-02-21 14:46:33 +05:30
Saurabh
6a23461b42 [fix] Send email with no letterhead if print letterhead is unchecked on print preview (#4816)
* [fix] send email with no letterhead if print letterhead is unchecked on print priview

* [fix] if not on print preview page, pull with_letterhead from print settings

* remove redundant if condition

* minor
2018-02-19 11:25:14 +05:30
rohitwaghchaure
2171a3acc2 Allow dynamic link in route options (#5027) 2018-02-19 11:21:59 +05:30
rohitwaghchaure
3857c27962 Added promise for savesubmit method (#5028) 2018-02-19 11:18:33 +05:30
Zarrar
974d49dd09 fix keys not defined error (#5023) 2018-02-16 15:15:18 +05:30
Saurabh
7b9c87444b Merge branch 'hotfix' 2018-02-15 23:20:57 +05:30
Saurabh
fae73e9cda bumped to version 10.0.25 2018-02-15 23:50:57 +06:00
Saurabh
37d81a1fe7
Merge pull request #5020 from saurabh6790/fix_get_max_email_uid
[fix] remove ifnull from get_max_email_uid fields
2018-02-15 23:19:00 +05:30
Saurabh
e540fd26da [fix] remove ifnull from get_max_email_uid fields 2018-02-15 22:38:06 +05:30
rohitwaghchaure
67e589a792 [Fix] Not able to pull items from opportunity in RFQ (#5006) 2018-02-15 15:29:11 +05:30
Harsh Patel
eae66bdb22 Remove tags with spaces (#5015) 2018-02-15 15:24:31 +05:30
Saurabh
d244dd8ef6 Merge branch 'hotfix' 2018-02-15 15:18:12 +05:30
Saurabh
24972722be bumped to version 10.0.24 2018-02-15 15:48:12 +06:00
Saurabh
a5aa257265
Merge pull request #5012 from Zlash65/fix-dl
[Fix] Dynamic Link not working in report
2018-02-15 14:04:51 +05:30
Zlash65
31e3454372 fix dl for reports 2018-02-15 12:42:30 +05:30
Saurabh
ada9936d60 Merge branch 'hotfix' 2018-02-14 11:42:59 +05:30
Saurabh
396366c1e2 bumped to version 10.0.23 2018-02-14 12:12:59 +06:00
Faris Ansari
3e15c148bd [hotfix] Deadlock fix rename doc (#5001)
* [deadlock fix] rename_version before delete_doc

* Move delete_doc to end of rename_doc
2018-02-13 16:01:58 +05:30
Saurabh
40d818af90 [hotfix] sanitize fields to avoid mysql injection (#4994)
* [fix] sanitize fields to avoid mysql injection

* sanitize sql statements to avoid subqueries

* Added test cases

* Raise exception if mysql injection found in fields and related test-cases

* [fix] riase exception if blacklistes function or keyworkds found in fields
2018-02-13 14:45:51 +05:30
rohitwaghchaure
8f2935a0e3 [Fix] Formatter issue (#4993) 2018-02-09 17:34:55 +05:30
Faris Ansari
99b4278f84 [report] Handle rows which can be list of dict (#4987) 2018-02-09 14:28:07 +05:30
Achilles Rasquinha
753fa56b7a
Merge pull request #4990 from achillesrasquinha/hf-ascii-doc
Fixed Unicode to ASCII doc
2018-02-09 11:36:58 +05:30
Achilles Rasquinha
9743e5091c fixed import 2018-02-09 11:25:09 +05:30
Achilles Rasquinha
9790a8067a PY2-PY3 compat 2018-02-09 11:22:18 +05:30
Achilles Rasquinha
8f0e0fc647 Fixed Unicode to ASCII doc 2018-02-09 11:03:22 +05:30
Faris Ansari
0d9b3680b7
[hotfix] Disallow Single DocType for Dynamic Link (#4986) 2018-02-08 16:57:27 +05:30
Saurabh
bc40ed5a87 Merge branch 'hotfix' 2018-02-08 15:28:44 +05:30
Saurabh
3c59f8f422 bumped to version 10.0.22 2018-02-08 15:58:44 +06:00
Faris Ansari
ebbc28ce4d
[hotfix] Fallback for indicator_formatter doc (#4985) 2018-02-08 13:09:54 +05:30
Nabin Hait
408c2f8c61 Merge branch 'hotfix' 2018-02-07 16:03:28 +05:30
Nabin Hait
b2a7b3f614 bumped to version 10.0.21 2018-02-07 16:33:28 +06:00
Faris Ansari
1c24dae099
[hotfix] Docname as int (#4976)
* [hotfix] Docname passed as number

* typo
2018-02-07 12:29:10 +05:30
rohitwaghchaure
2625cefe89 [Fix] Link formatter, Indicator not showing in the item link field for stock entry (#4966)
* [Fix] Link formatter, Indicator not showing in the item link field for stock entry

* Handle empty df
2018-02-06 15:25:53 +05:30
Shreya Shah
5f6477ae7a [Fix] Visibility of close icon (#4969)
* fix visibility of close button

* add margin to close icon
2018-02-06 10:41:50 +05:30
nick9822
6e6c48e01b Set Is Private as per file attribute (#4964) 2018-02-05 11:59:45 +05:30
Nabin Hait
9ce93b6a8e Merge branch 'hotfix' 2018-02-03 09:02:54 +05:30
Nabin Hait
5321db785c bumped to version 10.0.20 2018-02-03 09:32:54 +06:00
Zarrar
bd88965e20 class added wrongly (#4961) 2018-02-03 09:00:21 +05:30
Manas Solanki
76262c4657 don't show import button if import is in progress (#4960) 2018-02-02 17:06:18 +05:30
Nabin Hait
119f284225
Validation for file header (#4959) 2018-02-02 15:34:05 +05:30
Nabin Hait
04cb1d0833 Don't hide checkboxes in grid row after submission (#4951) 2018-02-02 11:30:07 +05:30
Nabin Hait
ed717cc86b Fixed timeline message (#4953) 2018-02-02 11:29:47 +05:30
Nabin Hait
565ca00795 Merge branch 'hotfix' 2018-01-31 17:23:43 +05:30