Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,425 Commits 3 Branches 0 Tags
Commit Graph

339 Commits

Author SHA1 Message Date
Anand Doshi
bba4db1627 product listing and pages 2012-06-27 12:06:45 +05:30
Anand Doshi
81fa802e09 Merge branch 'master' into dev 2012-06-25 20:06:54 +05:30
Anand Doshi
8ae5ba9abf fixes related to --> clear locals and then sync locals when whole doclist is passed 2012-06-25 20:05:35 +05:30
Nabin Hait
8b14617dce run view ledger report through set_route 2012-06-25 13:15:59 +05:30
Anand Doshi
72c945b7c6 template based web page loading using web.py 2012-06-22 20:01:07 +05:30
Nabin Hait
4ce8e16ded Merge branch 'master' of github.com:webnotes/erpnext 2012-06-22 12:16:43 +05:30
Nabin Hait
59e4dcb1b0 Error fixed in new report: sort by child table column 2012-06-22 12:16:21 +05:30
Anand Doshi
815ad3fa28 Merge branch 'master' into dev 2012-06-22 12:14:43 +05:30
Anand Doshi
ab65b54c43 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:11:24 +05:30
Anand Doshi
9078f652c3 Merge branch 'master' into cms2 2012-06-21 11:50:44 +05:30
Anand Doshi
5d9fc72753 updates in web.py and template - page.html 2012-06-21 11:48:51 +05:30
Anand Doshi
05cbf96e84 Merge branch 'master' into dev 2012-06-21 11:20:10 +05:30
Anand Doshi
f1c287bdda fix in file_list issue due to import data 2012-06-20 13:46:26 +05:30
Anand Doshi
be7c426e15 add parent column in filter list 2012-06-19 17:52:37 +05:30
Rushabh Mehta
40182bada3 added patch 2012-06-19 14:15:13 +05:30
Anand Doshi
f4b552ea5d fixed: link field validate data on defocus, if autosuggest or search not used 2012-06-19 13:17:56 +05:30
Nabin Hait
90376f6ce4 reset to prev version 2012-06-19 10:31:08 +05:30
Anand Doshi
f8946b1e31 fix in buttons displayed - on change of status in lead form 2012-06-18 18:04:28 +05:30
Anand Doshi
38192029e9 SetTimeout hack - in link fields if data is typed and not selected from autocomplete, run validations and triggers 2012-06-18 15:05:20 +05:30
Rushabh Mehta
96bf0b7f53 web pages don't render into Page and Page does not get written as HTML. Welcome Jinja2 Templates 2012-06-15 17:29:03 +05:30
Rushabh Mehta
bd7f7231f2 cms now powered by jinja2 2012-06-15 14:00:06 +05:30
Rushabh Mehta
4c56275d26 appframe is now heading 2012-06-14 11:05:09 +05:30
Anand Doshi
575545d441 added link to show list of all reports 2012-06-13 19:36:55 +05:30
Anand Doshi
61ade3d486 auto populate To email field in email_doc if the current form has a value in the field contact_email 2012-06-13 12:53:03 +05:30
Anand Doshi
bd59c461bc removed error console 2012-06-12 16:44:29 +05:30
Anand Doshi
f71d63fda0 fix in back button after save/submit 2012-06-12 15:45:44 +05:30
Rushabh Mehta
031d51b53e not in search, should be allowed in reports and loading place holder for reports 2012-06-11 10:38:47 +05:30
Rushabh Mehta
be7ce4744a website color should be black 2012-06-08 14:18:21 +05:30
Anand Doshi
fa1963164c Merge branch 'master' of github.com:webnotes/erpnext 2012-06-08 12:57:28 +05:30
Anand Doshi
cddc0e68bf Fix: Standard Print Format Heading to also consider value in 'Select 
Print Heading' field.
modified build_head method, inner method of print_std method to consider
three possibilities as print heading
1. value in cur_frm.pformat
2. value in select print heading
3. doctype / doctype label
 2012-06-08 12:34:57 +05:30
Nabin Hait
d491fc7a31 Merge branch 'master' of github.com:webnotes/erpnext 2012-06-08 12:13:47 +05:30
Nabin Hait
2e3579a4eb Item Barcode implemented 2012-06-07 19:09:17 +05:30
Anand Doshi
4dbeae1eae escape double quotes in communication content, allow 0 as value in data/int field 2012-06-07 14:39:42 +05:30
Rushabh Mehta
a89f52041f communication is now created when email is sent 2012-06-07 11:30:02 +05:30
Anand Doshi
f36e15e92e fix in doclistview's order 2012-06-05 20:10:45 +05:30
Anand Doshi
dbb84a271e Merge branch 'master' of github.com:webnotes/erpnext into comm_log 
Conflicts:
	erpnext/selling/doctype/lead/lead.js
	erpnext/setup/doctype/contact_control/contact_control.js
 2012-06-05 18:37:17 +05:30
Rushabh Mehta
a660dd9d49 Merge branch 'master' of github.com:webnotes/erpnext 2012-06-04 13:21:03 +05:30
Rushabh Mehta
983c551796 gantt chart fixes 2012-06-04 13:20:42 +05:30
Anand Doshi
bfc52b99fd Merge branch 'master' of github.com:webnotes/erpnext 2012-06-04 13:07:03 +05:30
Anand Doshi
fdc20fdf69 fix in get_base_url of dom.js 2012-06-04 13:06:38 +05:30
Rushabh Mehta
07c94ce9c0 update in Task, notification and layout 2012-06-04 12:57:23 +05:30
Anand Doshi
c5d857896e fixes in communication doctype 2012-05-31 18:23:16 +05:30
Anand Doshi
a6708fb748 new doctype: communication 2012-05-31 14:53:55 +05:30
Rushabh Mehta
7c91e257e2 doclistview: sidebar refresh bugfix 2012-05-29 14:05:53 +05:30
Rushabh Mehta
f3c390aec3 refresh stats in doclist 2012-05-29 11:06:08 +05:30
Rushabh Mehta
92c2c8f1f6 Merge branch 'master' of github.com:webnotes/erpnext 2012-05-29 10:53:58 +05:30
Rushabh Mehta
16aea34a37 show new reports as well as old 2012-05-29 10:53:37 +05:30
Rushabh Mehta
3237d6af6f added font 'Marck Script' 2012-05-28 10:42:32 +02:00
Rushabh Mehta
e316795196 added font 'cookie' 2012-05-26 13:50:05 +02:00
Anand Doshi
822318fec7 removed font 'Satisfy' and added font 'Oleo Script' 2012-05-26 17:01:00 +05:30