tundebabzy
1bb960664e
Add New Currency - XCD ( #4660 )
...
* adds XCD currency
* add as a new patch
* clean up
2017-12-25 13:39:48 +05:30
Nabin Hait
8a09f915e9
Merge branch 'master' into develop
2017-12-25 13:30:48 +05:30
Nabin Hait
8463937acd
Enqueued communication patch if more than 1 lakh records
2017-12-20 11:48:30 +05:30
Nabin Hait
7dad1a35e9
Update add_sms_sender_name_as_parameters.py
2017-12-18 11:50:46 +05:30
Shreya Shah
e6f294b782
Activity Log Patch fix ( #4580 )
2017-12-07 15:26:53 +05:30
Nabin Hait
ec33e82ec6
Minor patch fix
2017-11-22 16:56:27 +05:30
Shreya Shah
4c79799131
added try catch block in patch ( #4522 )
2017-11-22 16:23:27 +05:30
Shreya Shah
acdbb97ba5
Moved feed from Communication to Activity Log ( #4435 )
...
* Removed comment_type 'updated'
* New doctype activity log
* Moved feed.py to activity_log
* Updated feed gets stored in activity_log
* Activity page fetches feed from activity_log
* feed match condition change
* modified
* modified hooks.py
* modified sessions.py
* patch added
* naming in patch
* moved login, logout feed to activity_log
* changes in auth.py, hooks.py
* deleted doctype authentication_log and added test cases
* added utils.py in core
* moved some methods from communication.py to utils.py
2017-11-21 15:46:51 +05:30
Rushabh Mehta
c354c54065
[hot] revert domain_settings patch
2017-11-14 13:39:53 +05:30
Rushabh Mehta
effe13925e
[hot] revert domain_settings patch
2017-11-14 13:36:35 +05:30
Faris Ansari
cd32e87b98
[fix] Domain Setting patch ( #4464 )
...
* [fix] Domain Setting patch
* minor fix
* Update domain.py
2017-11-10 19:13:54 +05:30
Saurabh
6e7bdba8a6
[fix] catch Link Validation exception ( #4446 )
2017-11-08 14:57:37 +05:30
Nabin Hait
812ea70dc8
Reload sms settings from json ( #4355 )
2017-10-21 10:45:10 +05:30
Makarand Bauskar
03ea138ca5
[hotfix] ingore_mandatory fields while saving the sms settings in add_sms_sender_name_as_paramenters patch ( #4342 )
2017-10-18 17:09:13 +05:30
Nabin Hait
aca3658f36
Removed SMS sender field from SMS Settings ( #4334 )
...
* Removed SMS sender field from SMS Settings
* patch for sms sender name
2017-10-17 15:09:13 +03:00
Makarand Bauskar
99fa65cb1a
[hotfix] fixed patch sequence and removed the update_email_queue patch ( #4330 )
2017-10-17 14:47:06 +05:30
Nabin Hait
4140bf809f
minor fix in old patch
2017-10-04 15:19:53 +05:30
Rushabh Mehta
579d907b21
Merge pull request #4101 from tundebabzy/add_new_currencies
...
Add new currencies
2017-09-18 13:00:36 +05:30
mbauskar
e462a90d20
Merge branch 'master' into develop
2017-09-14 15:24:18 +05:30
Nabin Hait
4d4e5dcc02
Fixes for align labels right
2017-09-14 12:25:21 +05:30
tunde
0650c5c951
Merge branch 'develop' into add_new_currencies
2017-09-12 14:10:56 +01:00
tunde
b19b7159b2
add BGN, XAF, XOF currencies
2017-09-12 14:07:35 +01:00
Nabin Hait
7266e673ac
Merge branch 'master' into develop
2017-09-12 16:09:19 +05:30
pratu16x7
0aaaca9b1a
[fix] ignore results with non-existent doctypes
2017-09-08 15:45:36 +05:30
Aditya Hase
99f17c651c
Use 'in' instead of 'has_key'
2017-09-04 16:05:58 +05:30
mbauskar
f8fd415eec
Merge branch 'master' into develop
2017-08-21 08:54:38 +05:30
Faris Ansari
473083ae9d
fix event color patch ( #3943 )
2017-08-17 18:38:12 +05:30
Makarand Bauskar
7bf6c19a31
[hotfix] daily_emails limit fixes ( #3942 )
2017-08-17 10:59:26 +05:30
Nabin Hait
2243fe154c
minor fix in email queue status patch
2017-08-17 10:55:54 +05:30
mbauskar
40e140d287
Merge branch 'master' into develop
2017-08-16 20:04:53 +05:30
Makarand Bauskar
965a7460ac
[hotfix] set email queue status to Not Sent ( #3941 )
2017-08-16 20:04:10 +05:30
mbauskar
bc603de8be
resolved conflicts
2017-08-16 18:24:21 +05:30
Faris Ansari
702dd1b73a
codacy fix
2017-08-16 16:02:57 +05:30
Faris Ansari
73aa0a35c4
Patch old event colors to hex
2017-08-16 15:51:15 +05:30
Aditya Hase
769338f136
Replaced all instances of basestring with six.string_types
2017-08-11 00:10:11 +05:30
Rushabh Mehta
5cebfb26b9
[minor] fix patch and module command
2017-08-03 12:02:18 +05:30
Aditya Hase
62bb03ef6e
Replaced Python 2 print syntax with Python 3 syntax ( #3838 )
...
* Replaced Python 2 print syntax with Python 3 syntax
* Update utils.py
2017-08-02 17:10:40 +05:30
Makarand Bauskar
20145b231e
[minor] check if user exists or not ( #3831 )
...
* [minor] check if user exists or not
* [minor] remove the User Permission Link from module view
2017-08-01 16:11:05 +05:30
Nabin Hait
89860d7ef3
Update user permissions only if record if present ( #3820 )
2017-08-01 11:15:14 +05:30
Makarand Bauskar
e6e16d112b
[minor] set apply_for_all_roles to 1 in update user permissions patch ( #3809 )
2017-07-31 10:53:40 +05:30
Rushabh Mehta
f609a478ae
[refactor] user permissions ( #3713 )
...
* [refactor] user permissions
* [fix] tests
* [ux] user-permissions
* [minor] cleanup system settings
* [minor] end progress
2017-07-28 14:33:31 +05:30
Manas Solanki
81133888a8
[fix] add the parsed email id for the email group member ( #3741 )
...
* add the parsed email id of the email group member
* Minor fixe in the patch
2017-07-21 11:05:54 +05:30
Rushabh Mehta
4d9d66d916
[fix] patch
2017-07-11 11:04:45 +05:30
Rushabh Mehta
06f1eeff35
[fix] patch
2017-07-11 11:01:05 +05:30
Rushabh Mehta
9e5df7aeff
[fix] patch
2017-07-11 11:00:10 +05:30
Nabin Hait
8f3eb00541
Delete custom docperm while deleting doctypes ( #3654 )
...
* Delete custom docperm while deleting doctypes
* Update delete_custom_docperm_if_doctype_not_exists.py
2017-07-11 10:32:40 +05:30
Makarand Bauskar
566dd61fb9
[hotfix] used set_value to save format instead of save ( #3634 )
2017-07-06 19:11:49 +05:30
Makarand Bauskar
f2c9fd28e8
[minor] reload auto email report doctype before settings format to xlsx ( #3613 )
2017-07-05 12:07:34 +05:30
Manas Solanki
b7e1060ea7
removed the xlwt and use the openpyxl for sending the auto email report in xlsx format ( #3590 )
2017-07-03 12:27:34 +05:30
mbauskar
a6fa154287
[minor] enabled allow error traceback ins system settings
2017-06-29 15:00:41 +05:30