Commit graph

448 commits

Author SHA1 Message Date
Rushabh Mehta
719c01546a [minor] fix message for unique (via support) 2015-08-26 10:27:16 +05:30
Anand Doshi
65bc63f031 [fix] document refresh notification for same user in different tabs/sessions 2015-08-21 12:56:48 +05:30
Anand Doshi
c87befc876 [fix] realtime comments 2015-08-20 12:57:28 +05:30
Anand Doshi
fe72e05c6f Merge pull request #1263 from rmehta/editor-fix
[fixes] added template and small toolbar if in grid
2015-08-19 16:14:13 +05:30
Rushabh Mehta
c89d595906 [fixes] added template and small toolbar if in grid 2015-08-19 12:58:27 +05:30
Anand Doshi
b75dd31220 [fix] ignore permissions when deleting linked ToDos and Comments, and unlink Communication instead of deleting them 2015-08-19 12:51:18 +05:30
Rushabh Mehta
4ca2d16a98 [minor] don't notify if table 2015-08-19 10:32:04 +05:30
Rushabh Mehta
7713e191a9 [enhancement] list autorefresh 2015-08-18 17:34:34 +05:30
Rushabh Mehta
a15af7882b [realtime] clear doc locally if updated 2015-08-18 16:52:23 +05:30
Anand Doshi
c9782e23e4 Merge remote-tracking branch 'frappe/develop' into v6-wip
Conflicts:
	frappe/__version__.py
	frappe/core/doctype/communication/communication.json
	frappe/hooks.py
	frappe/model/document.py
	frappe/public/css/form.css
	frappe/public/less/form.less
	requirements.txt
	setup.py
2015-08-17 12:22:02 +05:30
Anand Doshi
ac2312e9ab [fix] dynamic link checking during cancel 2015-08-14 12:48:55 +05:30
Anand Doshi
f525520788 [fix] Add/Drop unique based on property setter 2015-08-12 14:48:50 +05:30
Rushabh Mehta
78b390eb47 [fix] check dynamic links before cancel 2015-08-11 15:10:55 +05:30
Rushabh Mehta
0e2f85357f [fix] check dynamic links before cancel 2015-08-11 15:10:29 +05:30
Anand Doshi
c079e27d3f Moved Backup Manager and Social Login keys to the new Integrations Module, prepared frappe for Mandrill Integration 2015-08-11 12:03:13 +05:30
Rushabh Mehta
a7bd640b24 [merge] 5.3.1 2015-08-11 10:38:03 +05:30
Rushabh Mehta
e41bfe3003 [minor] [ux] refresh button primary in reportview 2015-08-03 17:25:06 +05:30
Nabin Hait
a272c1b25d [fix] Unique constraint check in db_insert and bypassed for blank values (not null) 2015-08-03 17:21:51 +05:30
Anand Doshi
7e1f08d64c [hotfix] docstatus should be 0 if None 2015-08-03 16:04:19 +05:30
Rushabh Mehta
1d07a36d75 [merge] develop 2015-08-03 11:20:31 +05:30
Anand Doshi
d85cc02b03 [minor] moved docstatus=0 to init child 2015-07-30 16:36:30 +05:30
Anand Doshi
815252153f [hotfix] set docstatus=0 in append 2015-07-30 16:36:30 +05:30
Rushabh Mehta
3a117b5656 [merge] develop 2015-07-30 16:06:06 +05:30
Rushabh Mehta
e54b0d487b [minor] fixes 2015-07-30 13:38:49 +05:30
Anand Doshi
c119a6396a Merge pull request #1222 from anandpdoshi/check-not-null
Change Check fields to have default as 0 (if not specified) and not null
2015-07-30 12:04:02 +05:30
Anand Doshi
baec4f855f Change Check fields to have default as 0 (if not specified) and not null 2015-07-30 11:54:27 +05:30
Nabin Hait
cfef3183ca [fix] Adding Unique Constraint 2015-07-29 19:10:38 +05:30
Anand Doshi
1e774001b7 Merge pull request #1214 from anandpdoshi/if-owner-permission
"If Owner" based permissions
2015-07-24 12:31:43 +05:30
Anand Doshi
f2d3a6ef9b Implemented 'If Owner' in Role Permissions 2015-07-24 12:17:30 +05:30
Nabin Hait
eeb4d2b7f0 Get formatted absolute value 2015-07-24 11:14:26 +05:30
Anand Doshi
8d8531d233 [hotfix] share permissions should only be applied if no role permissions or user permissions exist 2015-07-20 19:14:10 +05:30
Rushabh Mehta
efeedfa30a Merge pull request #1206 from anandpdoshi/share-all
Share with Everyone
2015-07-20 12:55:30 +05:30
Anand Doshi
d4e9e87af6 [fix] Share query is always ORed after the AND combination of User Permissions and DocType permission conditions 2015-07-17 19:42:48 +05:30
Nabin Hait
bd3e2f469d [fix] Imported no_value_feilds 2015-07-17 16:24:55 +05:30
Nabin Hait
a6450168de Delete utils.py 2015-07-17 15:28:22 +05:30
Anand Doshi
6aae191158 [fix] Use frappe.DuplicateEntryError in base_document and email_account 2015-07-17 12:17:14 +05:30
Rushabh Mehta
f2a72aa39c [fix] imports 2015-07-13 13:04:25 +05:30
Rushabh Mehta
56b2317ea0 [fix] property setter for idx 2015-07-10 20:32:54 +05:30
Rushabh Mehta
dc7b13ceef [hot] [fix] target doctype 2015-07-06 16:59:38 +05:30
Rushabh Mehta
172f3fe6ae Merge pull request #1177 from jnix3/map-child-table-if-same
Map child table if not mentioned in table_map but have the same field…
2015-07-06 12:27:29 +05:30
James T. Nixon III
f46092198f Map child table if not mentioned in table_map but have the same fieldname and same table and both hhave no_copy unchecked 2015-07-02 12:53:38 -07:00
Nabin Hait
a962318f6e [fix] Match conditions for shared docs 2015-07-02 17:49:14 +05:30
Nabin Hait
a67f36d3d6 Merge pull request #1171 from rmehta/share-permission-fix
[fix] share permissions with user permissions
2015-07-02 14:21:00 +05:30
Rushabh Mehta
b05a6ef9b0 [fixes] [minor] email and doctype message 2015-07-01 16:48:42 +05:30
Rushabh Mehta
6395469a38 [fix] share permissions with user permissions 2015-07-01 13:00:36 +05:30
Nabin Hait
3313acf58c minor fix 2015-06-18 15:38:02 +05:30
Rushabh Mehta
562b1b2c50 [fixes] cleanup of web from, portal, login page 2015-06-01 17:14:53 +05:30
Rushabh Mehta
6840e894ec [fix] [minor] print permission error 2015-05-29 15:55:00 +05:30
Anand Doshi
4a214ed22b [fix] db_schema check for change in decimal's default value. Fixes frappe/erpnext#3379. 2015-05-28 15:39:14 -04:00
Rushabh Mehta
a05aed9e16 Merge pull request #1121 from rmehta/verify-password
[enhancement] added verify password and ability to ignore submit comments
2015-05-28 10:58:00 +05:30