Anand Doshi
1f3cd8759d
Merge pull request #1289 from nabinhait/develop
...
[fix] Hour format in format_datetime function
2015-09-02 14:48:37 +05:30
Anand Doshi
7076295638
Merge pull request #1288 from anandpdoshi/permission-fixes
...
permissions.get_role_permissions: resolving conflict between Apply User Permissions and If Owner
2015-09-02 14:48:22 +05:30
Nabin Hait
45a2666d44
[fix] Hour format in format_datetime function
2015-09-02 14:08:58 +05:30
Anand Doshi
d3fe6e57fb
Merge pull request #1287 from rmehta/tree-fix
...
[mobile] css for tree views
2015-09-02 13:40:28 +05:30
Anand Doshi
b09a398143
Merge pull request #1286 from rmehta/progress-in-import
...
[enhancement] Added progress bar in data import tool
2015-09-02 13:40:10 +05:30
Anand Doshi
ef961a091f
permissions.get_role_permissions: resolving conflict between Apply User Permissions and If Owner
...
Case 1:
If atleast one record having both Apply User Permission and If Owner unchecked is found, don't match for those rights
Case 2:
If one row has only "Apply User Permissions" checked and another has only "If Owner" checked,
set Apply User Permissions as checked
2015-09-02 13:31:37 +05:30
Rushabh Mehta
537c0de1e4
[mobile] css for tree views
2015-09-02 12:17:15 +05:30
Rushabh Mehta
c600a302bb
[enhancement] Added progress bar in data import tool
...
async.py: in `publish_realtime`, `event` is now optional, if called from within task
importer.py: send record count being updated using `frappe.publish_realtime`
ui/messages.js: added new tool `frappe.get_progress(title, count, total)` that will show progress bar realtime
2015-09-02 11:51:41 +05:30
Anand Doshi
8db2f79db4
Merge pull request #1285 from hernad/develop
...
Bosnia and Herzegovina Currency, Time zone
2015-09-01 23:06:04 +05:30
Ernad Husremovic
5365c4398d
Bosnia and Herzegovina Currency, time zone
2015-09-01 14:23:19 +00:00
Rushabh Mehta
5d5c308a4e
[minor] fix cess for set_intro
2015-08-31 18:24:36 +05:30
Rushabh Mehta
6d248948e1
[minor] fix cess for set_intro
2015-08-31 18:20:24 +05:30
Rushabh Mehta
daaa3ff587
[minor] fix cess for set_intro
2015-08-31 18:19:48 +05:30
Anand Doshi
e248b627a2
Merge pull request #1281 from rmehta/mobile-style-fix
...
[style] use thin fonts for mobile, tablets and other cleanups
2015-08-31 12:30:12 +05:30
Anand Doshi
4faa10a23b
[fix] reportview column picker
2015-08-31 12:09:20 +05:30
Anand Doshi
b370c4631a
[fix] restore async stdout and stderr on task completion
2015-08-31 10:55:41 +05:30
Rushabh Mehta
875ef3bfec
[style] use thin fonts for mobile, tablets and other cleanups
2015-08-28 18:31:23 +05:30
Anand Doshi
216adb4e36
[fix] load_lang
2015-08-27 20:14:25 +05:30
Anand Doshi
a33eb2df49
Merge pull request #1280 from rmehta/communication-notify
...
[minor] notify realtime for parent in communication (that may come via email)
2015-08-27 16:59:01 +05:30
Anand Doshi
dce31d8e5c
[css] added border-bottom to each section for better separation
2015-08-27 16:54:19 +05:30
Anand Doshi
ad9c500863
Exported all doctypes
2015-08-27 16:45:45 +05:30
Rushabh Mehta
ad27d219bc
[minor] notify realtime for parent in communication (that may come via email)
2015-08-27 16:31:48 +05:30
Anand Doshi
e07b5df451
Merge pull request #1279 from rmehta/custom-field-example
...
[help] fixed custom field examples showing frappe.ui.form.on
2015-08-27 16:12:23 +05:30
Rushabh Mehta
647d632b9a
[help] fixed custom field examples showing frappe.ui.form.on
2015-08-27 16:07:19 +05:30
Anand Doshi
141e7d9057
[fix] use print format file html if found
2015-08-27 15:51:53 +05:30
Anand Doshi
c1ac1428e5
[minor] Website Settings - changed Misc to More Information
2015-08-27 15:51:10 +05:30
Rushabh Mehta
77101716b5
[change-log] added for collapsible sections, title, bold-field
2015-08-27 11:45:22 +05:30
Rushabh Mehta
d334a39e79
[fix] set default title field only if 'title'
2015-08-27 11:39:36 +05:30
Anand Doshi
ad09ce6dbe
[hotfix] show head html as blank if None
2015-08-27 11:10:08 +05:30
Rushabh Mehta
c59aaf01e4
Merge branch 'bold-field' into develop
...
Conflicts:
frappe/model/base_document.py
2015-08-27 10:59:38 +05:30
Rushabh Mehta
33c097b97c
[enhancement] editable title field
2015-08-26 20:56:28 +05:30
Anand Doshi
4c97d0c01b
Merge branch 'develop'
2015-08-26 16:54:30 +05:30
Anand Doshi
b39ac01a97
bumped to version 6.0.8
2015-08-26 17:24:30 +06:00
Anand Doshi
7994e5732b
[change-log]
2015-08-26 14:59:20 +05:30
Anand Doshi
840e46efd4
[fix] frappe.datetime.now_time() gives time using the timezone defined in System Settings
2015-08-26 14:53:10 +05:30
Anand Doshi
44f5cbb66c
Merge pull request #1276 from anandpdoshi/head_html
...
[enhancement] head_html in Website Settings to add HTML tags in the head section of each web page
2015-08-26 12:36:50 +05:30
Anand Doshi
26586e245a
Merge branch 'rmehta-unique-fix' into develop
2015-08-26 12:36:16 +05:30
Anand Doshi
34037345b3
[minor] added comment in show_unique_validation_message
2015-08-26 12:36:04 +05:30
Anand Doshi
b8e5619885
[fix] filters using route options
2015-08-26 12:33:14 +05:30
Anand Doshi
bf9ce00aea
[enhancement] head_html in Website Settings to add HTML tags in the head section of each web page
2015-08-26 12:20:36 +05:30
Rushabh Mehta
c2ae663e3f
[minor] fix message for unique (via support)
2015-08-26 10:28:35 +05:30
Rushabh Mehta
719c01546a
[minor] fix message for unique (via support)
2015-08-26 10:27:16 +05:30
Anand Doshi
fbf1674987
[fix] filters using route options
2015-08-25 19:14:46 +05:30
Rushabh Mehta
1134c552dd
[cleanup] form section UI
2015-08-25 18:02:46 +05:30
Rushabh Mehta
9deec6af5a
[form] refactor layout and added collapsible sections
2015-08-25 16:13:30 +05:30
Anand Doshi
8714ab6c97
Merge branch 'develop'
2015-08-24 16:52:46 +05:30
Anand Doshi
6419b715ab
bumped to version 6.0.7
2015-08-24 17:22:46 +06:00
Anand Doshi
63d798cbc3
Merge pull request #1272 from rmehta/customize-fix
...
[minor] fix document_type in DocType and add 'name' and 'modified' to customize form sort options
2015-08-24 14:34:29 +05:30
Anand Doshi
8eccf13722
Merge pull request #1271 from anandpdoshi/bulk-flush-fix
...
catch specific smtp exceptions in bulk flush for future retry
2015-08-24 14:29:25 +05:30
Anand Doshi
12550a5729
Merge pull request #1270 from anandpdoshi/async_fix
...
Use from_async
2015-08-24 14:29:15 +05:30