Commit graph

210 commits

Author SHA1 Message Date
Anand Doshi
d1e63eb192 Merge branch 'master' of github.com:webnotes/wnframework into unicode 2012-08-16 16:06:16 +05:30
Anand Doshi
6cade9a5b7 fixes due to changes in filter logic 2012-08-16 16:05:50 +05:30
Anand Doshi
1ae67e513b Merge branch 'master' of github.com:webnotes/wnframework into unicode 2012-08-16 15:47:51 +05:30
Anand Doshi
18de6634d5 fixed selection of field names in filters, such that if two tables have the same fieldnames, it doesn't cause conflict 2012-08-16 15:45:23 +05:30
Rushabh Mehta
598981b2e1 msgprint as json and python 2.7 updates to __import__ 2012-08-06 11:15:04 +05:30
Rushabh Mehta
5105d8af8e refactor unicode changes and merge with master with refactored email 2012-08-03 16:02:34 +05:30
Rushabh Mehta
39e38a0c8a dialog.js: if fieldname is not given it taken from label 2012-08-03 14:07:51 +05:30
Rushabh Mehta
05ed57d190 Merge branch 'master' of github.com:webnotes/wnframework into unicode 2012-07-26 15:42:40 +02:00
Nabin Hait
b8417ef1d6 fixes in new report: same fieldname in multiple table 2012-07-23 15:03:51 +05:30
Anand Doshi
9e0cea5803 Merge branch 'master' of github.com:webnotes/wnframework into dev
Conflicts:
	js/legacy/widgets/form/form.js
2012-07-18 20:31:32 +05:30
Anand Doshi
a0f7317b5c fix in doclistview group by logic 2012-07-18 15:43:48 +05:30
Rushabh Mehta
aac53b37ec report breadcrumbs issue 2012-07-16 16:27:42 +05:30
Rushabh Mehta
aacdae2903 Merge branch 'dev' of github.com:webnotes/wnframework into dev 2012-07-16 14:17:32 +05:30
Rushabh Mehta
45c7c169ad profile cleanup wip, mandatory view bugs fixed, get_field > wn.meta.get_docfield 2012-07-16 14:16:30 +05:30
Anand Doshi
5617414de3 Merge branch 'master' into dev 2012-07-16 12:18:48 +05:30
Anand Doshi
06593f397d show assign to only after save 2012-07-16 12:17:30 +05:30
Anand Doshi
a0b6c13390 Merge branch 'dev' of github.com:webnotes/wnframework into dev 2012-07-13 16:47:47 +05:30
Anand Doshi
09fd274753 Merge branch 'master' into dev 2012-07-13 16:47:21 +05:30
Anand Doshi
13baefe699 functions for rendering bar graph and icons 2012-07-13 16:46:39 +05:30
Rushabh Mehta
f0fa3b936f check_required fix 2012-07-13 11:15:40 +05:30
Anand Doshi
b3f0e4f076 Merge branch 'master' into dev 2012-07-12 22:12:26 +05:30
Rushabh Mehta
10655951e8 added a base class for nested set type items DocTypeNestedSet 2012-07-12 11:33:30 +05:30
Rushabh Mehta
ebea2c1d4c focus on first element when dialog opens and enter on text triggers submit 2012-07-12 10:12:53 +05:30
Rushabh Mehta
c0708f4ac1 price list cleanup 2012-07-11 17:30:08 +05:30
Rushabh Mehta
3339e51577 cleaned up fiscal_year, currency and added select-all + help in doclistview 2012-07-11 16:35:55 +05:30
Rushabh Mehta
916b1c91fd budget distribution cleanup and formatting of markdown 2012-07-11 14:39:53 +05:30
Rushabh Mehta
b8b79cb2f6 added patch for account and cleanups to breadcrumbs and msgprint 2012-07-11 13:19:10 +05:30
Rushabh Mehta
acb2d88b4c cost center cleanup 2012-07-10 18:16:25 +05:30
Anand Doshi
b8e4d337d5 Merge branch 'master' of github.com:webnotes/wnframework into cms2 2012-07-03 15:51:28 +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
a978515cff fix in web page routing 2012-06-27 12:06:30 +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
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
d2d310060d Merge branch 'master' into cms2
Conflicts:
	py/webnotes/__init__.py
2012-06-21 11:50:54 +05:30
Anand Doshi
6151eff8cb add parent column in filter list 2012-06-19 17:52:32 +05:30
Rushabh Mehta
c38d600dcb cms now powered by jinja2 2012-06-15 14:00:44 +05:30
Rushabh Mehta
a7c282f810 update to appframe - appframe is now heading 2012-06-14 11:03:40 +05:30
Anand Doshi
a9d8547e66 removed error console 2012-06-12 16:44:31 +05:30
Anand Doshi
ff9f833c18 fix in back button after save/submit 2012-06-12 15:45:52 +05:30
Rushabh Mehta
50bc443e63 not in search, should be allowed in reports and loading place holder for reports 2012-06-11 10:39:00 +05:30
Anand Doshi
30218fbec2 fix in doclistview's order 2012-06-05 20:10:41 +05:30
Anand Doshi
4872c65beb fixes in communication doctype 2012-05-31 18:23:21 +05:30
Anand Doshi
a8ce3129b9 changes in doclistview 2012-05-31 15:15:26 +05:30
Anand Doshi
76861b834f new doctype: communication 2012-05-31 14:54:00 +05:30
Rushabh Mehta
cb2e0d7d39 doclistview: sidebar refresh bugfix 2012-05-29 14:06:05 +05:30