Commit graph

8569 commits

Author SHA1 Message Date
Saurabh
3ea9f02de2
Merge pull request #4656 from manassolanki/fix-12
fix the key error and add the default date-format in template
2017-12-19 20:02:07 +05:30
Saurabh
65c68f357e
Merge pull request #4655 from manassolanki/fix-import
fix the opening invoice creation tool
2017-12-19 20:01:35 +05:30
Manas Solanki
54b590653b fix the key error and add the default date-format in template 2017-12-19 16:09:43 +05:30
Manas Solanki
4fd6e14275 fix the opening invoice creation tool 2017-12-19 15:39:36 +05:30
Manas Solanki
66a179507c fix for the new docs with the child table (#4654)
* fix for the new docs with the child table

* Update data_import.py
2017-12-19 15:11:42 +05:30
Achilles Rasquinha
41d2f92cfb [MIN] Fix List Renderer (#4652)
* fixed multiple dialog render

* minor fix list renderer
2017-12-19 11:57:00 +05:30
Manas Solanki
50d7caedbb include the error data of the last row (#4649)
* include the error data of the last row

* set the attachment for each doc
2017-12-19 11:49:25 +05:30
Faris Ansari
dfbb47e391 [fix] Multiple uploaded attachments (#4653)
* [fix] Multiple uploaded attachments

* minor
2017-12-19 11:44:23 +05:30
Zarrar
dda8ca42b0 add roles to the user (#4646) 2017-12-18 17:45:21 +05:30
mist-01
e5771e508e Updated docs - add notice about needing to be logged in as Administrator to view developer options. (#4651) 2017-12-18 17:44:32 +05:30
Zarrar
1f1cd101cc remove print statements (#4650) 2017-12-18 17:44:10 +05:30
Faris Ansari
5358f3d927
[fix] Edit Comment (#4648)
fixes frappe/erpnext#12012
2017-12-18 15:02:02 +05:30
Achilles Rasquinha
c4e1ba8bbf Fixed multiple dialog render (#4642) 2017-12-18 15:01:36 +05:30
Faris Ansari
2760f049ac
Fix email_alert test (#4620)
* Test debugging

* Remove test_scheduler user after test

* Set user Administrator

* Remove debugging lines

* Set email user

* more debugging

* set_user Administrator

* minor
2017-12-18 12:55:45 +05:30
Zarrar
9cf4a3a38d correct variable name (#4647) 2017-12-18 12:28:58 +05:30
Nabin Hait
7dad1a35e9
Update add_sms_sender_name_as_parameters.py 2017-12-18 11:50:46 +05:30
Achilles Rasquinha
b31c4ed029 Remove jrumble from build.json, wiggle cleanup (#4643) 2017-12-18 11:40:21 +05:30
Faris Ansari
2724205955 Handle content_type application/json in request 2017-12-17 00:31:11 +05:30
Nabin Hait
7888805f35 Data Import: Fixes in handling errored data 2017-12-15 20:01:36 +05:30
Makarand Bauskar
ecee1825e5 [minor] mapped the __newname field value while editing doc in quick entry (#4615) 2017-12-15 16:39:28 +05:30
Faris Ansari
f307f2a36b Multicheck fixes 2017-12-15 15:54:30 +05:30
Faris Ansari
7576c01172 Various
- Data Import Status in listview
- Commit desk.css
- Remove refresh_fields from set_read_only
2017-12-15 14:50:47 +05:30
Prateeksha Singh
3030c6d212 replace rumble with simple cute wiggling (#4628) 2017-12-15 14:20:24 +05:30
Prateeksha Singh
5763766248 [tags] Remove taggle (#4631) 2017-12-15 14:18:53 +05:30
Prateeksha Singh
db687a2779
Merge pull request #4632 from achillesrasquinha/fix-hr-module-page
[FIX] HR Module Page
2017-12-15 13:48:06 +05:30
Prateeksha Singh
4fba84f93e [enhance] Add tooltips for progress and targets 2017-12-15 13:44:03 +05:30
Achilles Rasquinha
c4912135cf Fixed HR Module Page 2017-12-15 13:41:43 +05:30
Nabin Hait
2e46b1d70c Merge branch 'master' into develop 2017-12-15 12:52:55 +05:30
Nabin Hait
b41bc5c1f9 bumped to version 9.2.24 2017-12-15 13:22:54 +06:00
Manas Solanki
520bfc2ae4 New data import (#4601)
* created/moved the files

* added the model for the downloading the data

* add the file with the error data

* changes added other changes and fix codacy

* changes in the config and utils files

* fixed the test cases

* minor changes in the data keys dict

* changed the test file location

* fixed the tests

* set the route in the list view and show only erors

* minor fixes in the childtable import and log tables rendering

* Refactor Download dialog to use MultiCheck
2017-12-15 12:17:24 +05:30
Shreya Shah
e44ee0ae7f disabled user not allowed to reset password (#4630) 2017-12-15 12:15:58 +05:30
Prateeksha Singh
a4ced6e4f2 [modules-page] route if module exists, fixes #4117, fixes frappe/erpnext#11548 (#4621) 2017-12-15 11:39:56 +05:30
tundebabzy
d5dcc0b98f Issue 4616 (#4617)
* fail silently when key not found

* PEP 8: spacing, docstrings

* codacy
2017-12-14 14:57:05 +05:30
Makarand Bauskar
6f164ed975 [minor] removed the default for party type field in address and contacts report (#4614) 2017-12-14 14:53:22 +05:30
Faris Ansari
92c8050527
Checkbox height fix (#4619) 2017-12-14 11:53:15 +05:30
Achilles Rasquinha
61b2b25981 [FIX] Fix XSS (#4560)
* [FIX] login xss

* [FIX] Client Side Sanitization

* moved from frappe to frappe.utils

* added strategies

* removed console.log

* fixed codacy

* XSS sanitization at login

* moved to common js - xss_sanitize
2017-12-13 16:25:06 +05:30
Sharath-Chikkanna
009e0bdc05 Note regarding CSRF-Token added to POST request rest api docs. (#4613) 2017-12-13 16:18:46 +05:30
Nabin Hait
7506c49dc4 Fixed Merge conflict 2017-12-12 19:08:53 +05:30
Nabin Hait
f8936c724e bumped to version 9.2.23 2017-12-12 19:35:50 +06:00
Faris Ansari
49b63d7680 Add is_image util (#4605) 2017-12-12 19:04:38 +05:30
Prateeksha Singh
3565ca48b0
Merge pull request #4606 from netchampfaris/Tab-focus-checkbox
Tab focus checkbox
2017-12-12 14:51:05 +05:30
Prateeksha Singh
677872cb26
Merge pull request #4607 from pratu16x7/charts-docs
[minor] Update charts docs
2017-12-12 14:31:17 +05:30
Prateeksha Singh
1edc2b2936 update charts docs 2017-12-12 14:27:53 +05:30
Brown-Harry Boma
b9201dbdd0 Make improve page link generic in help documentation (#4586) 2017-12-12 12:53:59 +05:30
Achilles Rasquinha
c87172345f [MIN] added the Babel Object Rest Plugin (#4589)
* added rest operator for babel

* added package-lock.json to .gitignore

* removed package-lock.json
2017-12-12 12:37:54 +05:30
Faris Ansari
576e927313 Tab focus checkbox 2017-12-12 12:32:55 +05:30
Faris Ansari
8592d49c07 [fix] test for image files (#4602) 2017-12-12 11:41:08 +05:30
Achilles Rasquinha
79a8be3633 [HOTFIX] Currency Format on Print (#4584)
* [HOTFIX] fix currency issue on print

* [HOTFIX] fix currency issue on print

* added value check for format

* added value check for format

* fix codacy
2017-12-11 15:10:32 +05:30
Manas Solanki
436ce11c60 escape the email account name (#4598) 2017-12-11 14:29:48 +05:30
Manas Solanki
24cc7939c8 escape the user name in the show desktop page (#4599) 2017-12-11 14:29:27 +05:30