Commit graph

1299 commits

Author SHA1 Message Date
Anand Doshi
3c075dfc42 Merge branch 'master' into dev 2012-06-28 20:49:45 +05:30
Anand Doshi
ea0a8ce616 fixes in cacheitem table 2012-06-28 20:47:02 +05:30
Anand Doshi
e490ae88b4 Merge branch 'master' into dev 2012-06-28 18:41:04 +05:30
Nabin Hait
1370ce6f1e escape character error fixed in dt mapper 2012-06-28 18:13:23 +05:30
Anand Doshi
bf52d17ca9 shifted 'when' date manipulation into a seperate method, fixes in new doc logic of doclistview 2012-06-28 12:58:30 +05:30
Anand Doshi
a739807062 Merge branch 'master' into dev 2012-06-27 14:13:43 +05:30
Anand Doshi
a978515cff fix in web page routing 2012-06-27 12:06:30 +05:30
Anand Doshi
16dfa061c5 get list of system managers function 2012-06-26 12:46:58 +05:30
Anand Doshi
73e6b49f69 Merge branch 'master' into dev 2012-06-25 20:07:05 +05:30
Anand Doshi
1ce3305a7e clear locals and then sync locals when whole doclist is passed 2012-06-25 20:05:19 +05:30
Nabin Hait
c7a7413cc6 run the report only if route changes 2012-06-25 13:18:42 +05:30
Anand Doshi
68b56a8d1f Fixes in listing.js in usage of query
Allow field type "Long Text", with db definition as longtext
2012-06-22 19:58:58 +05:30
Nabin Hait
e73bedb256 Merge branch 'master' of github.com:webnotes/wnframework 2012-06-22 12:16:51 +05:30
Nabin Hait
1a079ca19c Error fixed in new report: sort by child table column 2012-06-22 12:16:03 +05:30
Anand Doshi
fb74ea94ab Merge branch 'master' into dev 2012-06-22 12:14:48 +05:30
Anand Doshi
d51774bee9 fix in dialog: if an in_dialog doctype is called using url, it will open in form with header and sidebar 2012-06-22 12:12:14 +05:30
Anand Doshi
bdc063a480 Merge branch 'master' into dev 2012-06-22 10:57:01 +05:30
Anand Doshi
fd402d03de do not allow import of more than 100 supplier/customer at a time 2012-06-21 18:40:50 +05:30
Anand Doshi
d2d310060d Merge branch 'master' into cms2
Conflicts:
	py/webnotes/__init__.py
2012-06-21 11:50:54 +05:30
Anand Doshi
64bba126fb write_cms_page deprecated 2012-06-21 11:49:21 +05:30
Anand Doshi
3cf18f9530 Merge branch 'master' into dev 2012-06-21 11:30:40 +05:30
Anand Doshi
5c0dd674e9 fix in email send error 2012-06-21 11:30:32 +05:30
Anand Doshi
379c4c86cd Merge branch 'master' into dev 2012-06-21 11:20:13 +05:30
Anand Doshi
431dc688bb fix in file_list issue due to import data 2012-06-20 13:46:40 +05:30
Anand Doshi
eadc5e6a91 encode email footer using utf-8 2012-06-20 13:11:00 +05:30
Anand Doshi
6879f68ed1 encode email footer using utf-8 2012-06-20 12:40:17 +05:30
Anand Doshi
49322a3cee encode email footer using utf-8 2012-06-20 12:34:34 +05:30
Anand Doshi
6151eff8cb add parent column in filter list 2012-06-19 17:52:32 +05:30
Anand Doshi
74801ae4ed re-added __init__.py in py folder 2012-06-19 15:59:51 +05:30
Anand Doshi
a15c3bb4a3 fixed: link field validate data on defocus, if autosuggest or search not used 2012-06-19 13:18:02 +05:30
Nabin Hait
11826ee987 reset to prev version 2012-06-19 10:30:21 +05:30
Anand Doshi
0bef23f8aa on cur_frm.clear_custom_buttons call refresh_toolbar of form header 2012-06-18 18:05:00 +05:30
Anand Doshi
3be70dd0a6 Merge pull request #68 from MiteshC/master
Change in DocType.py - While changing idx of docfields, check if the field belongs to that doctype
2012-06-18 04:52:40 -07:00
Anand Doshi
21d7a7f293 removed check of is apache user 2012-06-18 16:15:29 +05:30
Anand Doshi
8f9fe74f67 SetTimeout hack - in link fields if data is typed and not selected from autocomplete, run validations and triggers 2012-06-18 15:05:15 +05:30
Mitesh
ddb6a943de updating the idx of field within its parent doctype 2012-06-18 13:14:21 +05:30
Anand Doshi
99250bb270 DocType: Import From File - deprecated 2012-06-18 11:57:30 +05:30
Anand Doshi
27c4a0a318 Merge branch 'master' of github.com:webnotes/wnframework 2012-06-18 11:52:49 +05:30
Anand Doshi
bb83a680f8 make amendable and file list function shifted to on update part of doctype.py 2012-06-18 11:52:05 +05:30
Nabin Hait
bdd6ab7c9b reload_doc depricated for doctype 2012-06-18 11:50:56 +05:30
Rushabh Mehta
a564deb3af web pages don't render into Page and Page does not get written as HTML. Welcome Jinja2 Templates 2012-06-15 17:29:08 +05:30
Rushabh Mehta
59c80ae8ec Merge branch 'master' of github.com:webnotes/wnframework into cms2 2012-06-15 14:01:15 +05:30
Rushabh Mehta
c38d600dcb cms now powered by jinja2 2012-06-15 14:00:44 +05:30
Anand Doshi
614d8206b8 fix in receive 2012-06-14 14:54:15 +05:30
Anand Doshi
7216ddb9a4 Delete email messages from pop list if the message count is greater than
100, so that when there are more than 100 messages which are not fetched
before, it will not get received. This prevents issues when the support
ticket system is activated for the first time. At that time only top 100
messages will be fetched into the system, and others will be deleted
from the pop list. Need to mark "Keep copy in inbox" in the email server
settings of the concerned user.
2012-06-14 12:29:40 +05:30
Rushabh Mehta
a7c282f810 update to appframe - appframe is now heading 2012-06-14 11:03:40 +05:30
Rushabh Mehta
ae5688f559 Merge branch 'master' of github.com:webnotes/wnframework 2012-06-14 09:54:36 +05:30
Rushabh Mehta
95efb5644f sync: don't reload pages if not modified 2012-06-14 09:53:57 +05:30
Anand Doshi
5a74c82c85 added permission for reports manager 2012-06-13 19:36:44 +05:30
Anand Doshi
182323654d list of search criteria and reports 2012-06-13 19:04:17 +05:30