Commit Graph

29 Commits

Author SHA1 Message Date
Anand Doshi
59d8a76e60 Merge branch 'master' of github.com:webnotes/erpnext into edge
Conflicts:
	hr/doctype/leave_application/locale/_messages_py.json
	hr/doctype/leave_block_list/locale/_messages_doc.json
	public/js/locale/_messages_js.json
	setup/doctype/email_digest/locale/_messages_doc.json
	setup/doctype/global_defaults/global_defaults.txt
2013-02-21 11:09:43 +05:30
Rushabh Mehta
87e4801946 website settings social icons 2013-02-20 15:02:21 +05:30
Rushabh Mehta
c53231a841 model_wrapper is now bean, refactoring defaults 2013-02-18 18:24:28 +05:30
Anand Doshi
c5377e2583 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-02-12 11:38:56 +05:30
Anand Doshi
e1ad443c91 re-adding description as it is distorting list 2013-02-11 20:28:56 +05:30
Anand Doshi
d8c3aa22a0 removed product param in get_product_list 2013-02-11 19:33:33 +05:30
Anand Doshi
120b92e5e6 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-02-11 15:55:58 +05:30
Anand Doshi
954f897572 in product listing, don't truncate description 2013-02-11 15:55:30 +05:30
Rushabh Mehta
0e5401ccbf sales communication fix for status 2013-02-11 15:08:24 +05:30
Rushabh Mehta
176829e53c added status to Contact and fix bug in communication pull 2013-02-11 14:54:30 +05:30
Anand Doshi
9e830ec711 show sub item group items only if show in website is checked for them 2013-02-08 20:08:46 +05:30
Rushabh Mehta
fdc629be4d get post fix 2013-01-31 22:05:39 +05:30
Anand Doshi
fc36e57233 fixes in setup control and website contact helper 2013-01-21 19:02:58 +05:30
Rushabh Mehta
3ab6c5fca9 appraisal, don't validate points for self-appraisal 2013-01-19 10:54:03 +05:30
Rushabh Mehta
2e5db35856 added automatic lead creation for sales email id 2013-01-16 11:34:26 +05:30
Rushabh Mehta
5f183982cd update webpage name to be much longer, remove .html from links and refactor newsletter layout 2013-01-01 10:55:58 +05:30
Nabin Hait
833d7a65d5 small fixes in product caching 2012-12-30 19:56:57 +05:30
Rushabh Mehta
5f1d57ecb7 address now not in dialog, added slideshows in products and groups and removed transaction history from customer / supplier / sales partner 2012-12-27 14:05:02 +05:30
Rushabh Mehta
7edf899706 added wesite slideshow and attributions on website 2012-12-25 18:18:17 +05:30
Rushabh Mehta
7837d80716 fixes to website, item (added table for cross listing), modules_setup and form_header 2012-12-25 15:09:14 +05:30
Rushabh Mehta
fc19f25c88 updates to item, item_group and website 2012-12-20 17:11:51 +05:30
Rushabh Mehta
e109fa4fb8 website updates and fix to sessions 2012-12-19 10:14:59 +05:30
Rushabh Mehta
647e0d1164 updates to product_page (search) and kb fix 2012-12-18 14:47:54 +05:30
Rushabh Mehta
ee472b0926 upgraded to bootstrap 2.2 2012-12-18 11:47:13 +05:30
Rushabh Mehta
fd6ad19fa0 refactored blog client-side code 2012-12-17 12:52:43 +05:30
Anand Doshi
f437899a5b fix in blog link 2012-12-07 19:59:25 +05:30
Anand Doshi
baf4f648a5 fixed comments - import issue 2012-12-07 19:53:18 +05:30
Rushabh Mehta
b5c3970145 website: home_page fix 2012-12-07 12:54:08 +05:30
Rushabh Mehta
a494b88ad8 updates to website: removed webnotes.cms 2012-12-07 12:44:45 +05:30