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

293 Commits

Author SHA1 Message Date
Rushabh Mehta
685be2fbea added validation for save conflict in single types too 2013-03-06 12:06:34 +05:30
Nabin Hait
cd629793cd Merge branch 'master' into edge 2013-03-06 11:34:48 +05:30
Rushabh Mehta
8ff938a377 backup manager (wip) 2013-03-06 11:20:56 +05:30
Rushabh Mehta
07287e8b93 removed colour fields from txt files 2013-03-05 14:19:48 +05:30
Rushabh Mehta
b21eb9ac09 added time log batch 2013-02-28 18:42:46 +05:30
Anand Doshi
3d2a9ca738 Merge branch 'master' into edge 2013-02-28 17:46:21 +05:30
billyfordson
9b352309c6 Adding German translation 2013-02-27 17:36:23 +01:00
Anand Doshi
215fc02395 Merge branch 'master' into edge 2013-02-27 19:14:16 +05:30
Rushabh Mehta
891ff09ac1 website: fixed social icons and don't take lang from session for demo 2013-02-27 10:51:26 +05:30
Anand Doshi
dec6540039 Merge branch 'master' into edge 2013-02-25 13:17:47 +05:30
Rushabh Mehta
e4eb89b02a added new language and filters in query reports 2013-02-25 13:00:16 +05:30
Rushabh Mehta
9e02949821 updated language and separated slickgrid files 2013-02-25 11:05:27 +05:30
Anand Doshi
2beca173e0 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-02-22 12:01:16 +05:30
Rushabh Mehta
0ad995460c fixed tags in kb 2013-02-22 10:34:22 +05:30
Anand Doshi
fe78e912a2 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-02-21 20:07:53 +05:30
Anand Doshi
5acd08205e fix in website pages - should be of _type POST 2013-02-21 20:06:57 +05:30
Anand Doshi
c7cfe61229 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-02-21 16:59:41 +05:30
Rushabh Mehta
f41dd39286 added language 2013-02-21 16:57:54 +05:30
Rushabh Mehta
2be3a115c6 max height in product_in_list 2013-02-21 15:25:54 +05:30
Rushabh Mehta
fb3158571f max height in product_in_list 2013-02-21 15:23:36 +05:30
Rushabh Mehta
6f27d024aa added html5 header 2013-02-21 15:01:55 +05:30
Rushabh Mehta
d0db70507c added html5 header 2013-02-21 14:58:48 +05:30
Rushabh Mehta
90762fcb2d added html5 header 2013-02-21 14:56:44 +05:30
Rushabh Mehta
f210f1f359 added html5 header 2013-02-21 14:47:51 +05:30
Rushabh Mehta
83833ce423 website.css, extended margin 2013-02-21 14:40:14 +05:30
Rushabh Mehta
b0a0a59404 website.css, extended margin 2013-02-21 14:32:54 +05:30
Rushabh Mehta
93313cfb93 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-21 14:26:34 +05:30
Rushabh Mehta
78db3ec2dd added responsive layout with groups 2013-02-21 14:25:30 +05:30
Anand Doshi
51fc7c0683 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-02-21 12:23:58 +05:30
Rushabh Mehta
1e037fbe29 urllib quote encoding fix 2013-02-21 11:11:21 +05:30
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
1c36697556 updates to website footer 2013-02-21 10:54:04 +05:30
Rushabh Mehta
f2b17d91a1 updates to website footer 2013-02-21 10:49:37 +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
Rushabh Mehta
9c880da381 removed old doctypes 2013-02-18 14:28:34 +05:30
Rushabh Mehta
c06ce25470 updated translations 2013-02-18 14:24:05 +05:30
Anand Doshi
9b051db7d6 show page name in web page list view 2013-02-12 13:04:25 +05:30
Anand Doshi
c9629a481d fetch favicon from website settings 2013-02-12 12:54:58 +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
Rushabh Mehta
60135df6fd updated language 2013-02-11 11:44:12 +05:30
Anand Doshi
18a0c58cee fix in blog comment 2013-02-10 13:10:53 +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
Rushabh Mehta
92455dc7ae blog textarea 2013-01-31 11:24:22 +05:30
Rushabh Mehta
cda5d42a65 updated languages 2013-01-28 14:21:40 +05:30
Rushabh Mehta
8e3affbf70 added nl 2013-01-25 11:58:18 +05:30
Rushabh Mehta
4e01011669 added language to pages 2013-01-24 19:31:55 +05:30
Rushabh Mehta
317177afd2 updated languages 2013-01-24 18:18:39 +05:30
Rushabh Mehta
ad14943c3f added arabic 2013-01-24 17:37:43 +05:30
Rushabh Mehta
4c17718b4c added portuguese 2013-01-24 16:31:23 +05:30
Rushabh Mehta
908d09d058 added spanish 2013-01-24 15:55:30 +05:30
Rushabh Mehta
cd4a854a28 converted currency to float and removed level 1 permissions 2013-01-22 15:10:25 +05:30
Rushabh Mehta
28b0b1cba4 removed key_list in memcache 2013-01-22 11:04:55 +05:30
Anand Doshi
5a6bd199b8 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-21 19:03:26 +05:30
Anand Doshi
fc36e57233 fixes in setup control and website contact helper 2013-01-21 19:02:58 +05:30
Rushabh Mehta
f6f8ddac30 contact us cache refresh issue 2013-01-21 18:50:03 +05:30
Rushabh Mehta
bb9968491b added report permissions to txt files 2013-01-21 14:22:07 +05:30
Rushabh Mehta
3ab6c5fca9 appraisal, don't validate points for self-appraisal 2013-01-19 10:54:03 +05:30
Rushabh Mehta
80721518e3 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-17 18:23:07 +05:30
Nabin Hait
80c681294c fixes in website page naming 2013-01-17 13:24:51 +05:30
Nabin Hait
feee252093 fixes in website page_name for item 2013-01-17 13:03:30 +05:30
Rushabh Mehta
6f9915cd17 install from txt files, part 1 2013-01-16 17:48:17 +05:30
Rushabh Mehta
2e5db35856 added automatic lead creation for sales email id 2013-01-16 11:34:26 +05:30
Rushabh Mehta
29b8093ec4 tinymce fixes 2013-01-14 18:47:01 +05:30
Rushabh Mehta
ce1d5276ff added moduleview 2013-01-09 16:39:27 +05:30
Rushabh Mehta
523aec499a bootstrapped language and added 'hi' 2013-01-07 15:39:54 +05:30
Rushabh Mehta
cd7a02c489 added workflow help, fixed button primary action in form and refactored permissions 2013-01-04 14:03:36 +05:30
Nabin Hait
d68fa3b953 fixes in website utils 2013-01-01 12:05:13 +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
Anand Doshi
a5e4fec00d Merge branch 'master' of github.com:webnotes/erpnext 2012-12-30 19:59:01 +05:30
Anand Doshi
65cef74168 before delete page cache, check if page name exists 2012-12-30 19:58:24 +05:30
Nabin Hait
833d7a65d5 small fixes in product caching 2012-12-30 19:56:57 +05:30
Rushabh Mehta
84adf1bb7f page refresh title issue fixed 2012-12-28 10:30:46 +05:30
Rushabh Mehta
0357f1409c clear cache in website 2012-12-27 18:57:03 +05:30
Rushabh Mehta
d616413caa added contact us 2012-12-27 18:40:42 +05:30
Rushabh Mehta
1b1517155b added about us page and settings 2012-12-27 16:50:24 +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
f50c012808 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-25 15:09:58 +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
Anand Doshi
e47ceae4b0 added option to add status in Support Ticket created through website 2012-12-24 19:50:15 +05:30
Rushabh Mehta
bda54e58bf removed jqplot and updated attributions page 2012-12-24 12:52:15 +05:30
Rushabh Mehta
5b3d83fdf3 updates to website css & better help for doctype 2012-12-24 11:47:24 +05:30
Nabin Hait
ab573ce0c7 fixes in website 2012-12-21 11:01:31 +05:30
Rushabh Mehta
60cc0cc173 top bar fix 2012-12-21 10:52:26 +05:30
Rushabh Mehta
88a4c44cfa Merge branch 'master' of github.com:webnotes/erpnext 2012-12-20 17:12:59 +05:30
Rushabh Mehta
fc19f25c88 updates to item, item_group and website 2012-12-20 17:11:51 +05:30
Anand Doshi
ab5cf08c14 Merge branch 'master' of github.com:webnotes/erpnext into production 2012-12-20 12:42:53 +05:30
Rushabh Mehta
be7fe472b6 import merge, remove Core 2012-12-20 11:01:09 +05:30
Rushabh Mehta
5569321d15 fixed z-index and renamed all-app.js to all-app.min.js 2012-12-20 10:37:37 +05:30
Nabin Hait
4ecc785aab fixed conflict 2012-12-19 12:18:15 +05:30
Rushabh Mehta
60ec6ba975 web: navbar-inverse 2012-12-19 10:16:58 +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
Nabin Hait
5f175dfd00 Merge branch 'master' into production 2012-12-18 13:49:07 +05:30
Rushabh Mehta
ee472b0926 upgraded to bootstrap 2.2 2012-12-18 11:47:13 +05:30
Rushabh Mehta
0e9e848cfc added item specification, bugfix for form grid 2012-12-17 16:00:34 +05:30
Rushabh Mehta
fd6ad19fa0 refactored blog client-side code 2012-12-17 12:52:43 +05:30
Rushabh Mehta
173a0fd4b7 refactored web / all-app now linked in app. no wnframework in website 2012-12-14 16:39:27 +05:30
Nabin Hait
be356b8692 Merge branch 'master' of github.com:webnotes/erpnext into production 2012-12-12 12:58:22 +05:30
Rushabh Mehta
74aebf0965 added Communication to Selling and refactored module pages a bit 2012-12-12 11:03:51 +05:30
Anand Doshi
c3b9a00c53 changed old type txt to new type txtt 2012-12-11 15:20:53 +05:30
Rushabh Mehta
c50f088a22 website updates changes 2012-12-10 18:25:30 +05:30
Rushabh Mehta
1c8ab8ad7a c 2012-12-10 14:56:45 +05:30
Rushabh Mehta
29be18947e p 2012-12-10 11:15:59 +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
7c24a42076 website: home_page fix 2012-12-07 13:29:32 +05:30
Rushabh Mehta
98b99bd396 website: home_page fix 2012-12-07 12:55:06 +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
Rushabh Mehta
571377a313 added html to tinymce + moved website/web_cache.py > website/utils.py 2012-12-07 11:00:26 +05:30
Anand Doshi
67327a3df1 fix in number of comments 2012-12-06 20:13:57 +05:30
Anand Doshi
ddd8bddffd website fixes 2012-12-06 20:08:36 +05:30
Anand Doshi
41c0a321e5 fix in blog comments and load_from_cache 2012-12-06 19:57:18 +05:30
Anand Doshi
711f98654d fix in blog list 2012-12-06 19:49:00 +05:30
Anand Doshi
a367bfe059 fixes after website refactor 2012-12-06 18:26:09 +05:30
Rushabh Mehta
a2e4cb0235 item, leave_balance: hotfix 2012-12-06 17:09:38 +05:30
Rushabh Mehta
76432721d9 patch fix 2012-12-06 16:52:17 +05:30
Rushabh Mehta
87192da372 website updates and leave balance bugfix 2012-12-06 16:45:00 +05:30
Rushabh Mehta
df0b00a981 refactored website 2012-12-06 16:15:38 +05:30
Rushabh Mehta
89c7b41fee account_browser: remove can_create check 2012-12-06 14:58:44 +05:30
Anand Doshi
39652843bb added Email List to Newsletter 2012-12-06 13:13:05 +05:30
Anand Doshi
0fd99e7536 removed unnecessary imports 2012-11-30 16:38:04 +05:30
Anand Doshi
e4b157e787 fix in deletion of web cache 2012-11-20 13:52:40 +05:30
Anand Doshi
7aedaec6b6 added get_site_address method to website's init 2012-10-16 10:47:18 +05:30
Anand Doshi
1aace542c9 removed import error bypass and added missing py files for each doctype 2012-10-10 14:26:23 +05:30
Rushabh Mehta
eff64629de blog_subscribe.html: rss icon fix 2012-10-03 16:31:13 +05:30
Rushabh Mehta
3009c46ba5 moved to bootstrap 2.1 and some ui fixes in todo and messages 2012-10-03 11:56:38 +05:30
Rushabh Mehta
079df382f9 login css 2012-10-02 16:54:42 +05:30
Rushabh Mehta
9d1faea10c separated query-report and added module marker to appframe 2012-10-02 14:56:41 +05:30
Rushabh Mehta
2d700dd90d added query report and cleaned up wn.ui.Dialog 2012-10-01 14:46:37 +05:30
Rushabh Mehta
cebb02753c added shortcuts 2012-09-28 12:18:43 +05:30
Rushabh Mehta
55fd5f3ed6 added voucher import tool 2012-09-26 19:00:02 +05:30
Rushabh Mehta
0152b12e75 __session_cache removed and introducted memcache for caching 2012-09-25 14:22:23 +05:30
Rushabh Mehta
2fa2f7178d moved directory structure 2012-09-24 19:13:42 +05:30