Commit Graph

246 Commits

Author SHA1 Message Date
Rushabh Mehta
be0b7df27e Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-01-09 16:41:01 +05:30
Rushabh Mehta
ce1d5276ff added moduleview 2013-01-09 16:39:27 +05:30
Anand Doshi
b00ecc72c7 fixed latest updates page 2013-01-09 15:18:18 +05:30
Rushabh Mehta
523aec499a bootstrapped language and added 'hi' 2013-01-07 15:39:54 +05:30
Rushabh Mehta
607a221f41 added support analytics and some other minor updates 2013-01-04 16:42:33 +05:30
Anand Doshi
a40a381d08 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-01-02 16:47:00 +05:30
Anand Doshi
e142d9cbbe in feed show records of doctypes for which user has read permission at level 0 2013-01-02 16:46:35 +05:30
Rushabh Mehta
aea7370a67 updated latest_updates.js 2013-01-02 15:35:19 +05:30
Anand Doshi
5eaff20dd1 added comma in latest updates 2013-01-02 14:19:52 +05:30
Nabin Hait
d52e702c84 updated latest updates page 2013-01-02 11:20:32 +05:30
Nabin Hait
e606e7850a Merge branch 'master' of github.com:webnotes/erpnext 2012-12-28 16:51:55 +05:30
Rushabh Mehta
f033a1e151 integrated workflow, disable Submit, Cancel if workflow is defined 2012-12-28 16:09:38 +05:30
Rushabh Mehta
4337802cdb integrated workflow, disable Submit, Cancel if workflow is defined 2012-12-28 16:07:55 +05:30
Rushabh Mehta
056d1723e7 support ticket fix 2012-12-28 13:26:08 +05:30
Rushabh Mehta
84adf1bb7f page refresh title issue fixed 2012-12-28 10:30:46 +05:30
Rushabh Mehta
1b1517155b added about us page and settings 2012-12-27 16:50:24 +05:30
Rushabh Mehta
4ce83836b3 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-25 18:23:37 +05:30
Rushabh Mehta
7edf899706 added wesite slideshow and attributions on website 2012-12-25 18:18:17 +05:30
Nabin Hait
bfe864e11a Merge branch 'master' of github.com:webnotes/erpnext 2012-12-25 18:17:16 +05:30
Nabin Hait
8150b8a082 updated latest update page 2012-12-25 18:14:29 +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
bda54e58bf removed jqplot and updated attributions page 2012-12-24 12:52:15 +05:30
Rushabh Mehta
0cc0c98a14 fix to desktop 2012-12-24 10:35:39 +05:30
Rushabh Mehta
ff153490fe desktop items fix 2012-12-22 07:42:04 +05:30
Rushabh Mehta
7ac16faf6b fixes to new desktop 2012-12-21 22:49:10 +05:30
Rushabh Mehta
5ade7ca570 fixes to new desktop 2012-12-21 21:40:19 +05:30
Rushabh Mehta
d3c9fb6b3b changed desktop modules now using font-awesome instead of noun project fonts 2012-12-21 18:27:40 +05:30
Rushabh Mehta
380d7c6a53 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-21 15:01:08 +05:30
Rushabh Mehta
946e6d4a46 desktop icons now use font-awesome 2012-12-21 15:00:29 +05:30
Nabin Hait
079f5e0773 For Material Transfer against Production Order, fetch quantity pending to be transferred for each item. 2012-12-21 14:14:07 +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
Nabin Hait
5f175dfd00 Merge branch 'master' into production 2012-12-18 13:49:07 +05:30
Rushabh Mehta
cdcd15d9e2 added font-awesome 2012-12-17 13:30:51 +05:30
Rushabh Mehta
fd6ad19fa0 refactored blog client-side code 2012-12-17 12:52:43 +05:30
Nabin Hait
f8de5b9878 merged with master 2012-12-14 10:43:56 +05:30
Nabin Hait
df011dbfa5 deleted unwanted control doctype and pages 2012-12-14 10:42:09 +05:30
Rushabh Mehta
291449b6fb refactored javascript models 2012-12-13 12:53:21 +05:30
Rushabh Mehta
686022f777 fixes to recent patch and removed company_control, home_control, webforms, wip_monitor 2012-12-12 15:25:51 +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
Rushabh Mehta
24a69613e0 update file urls 2012-12-11 15:58:19 +05:30
Anand Doshi
c3b9a00c53 changed old type txt to new type txtt 2012-12-11 15:20:53 +05:30
Anand Doshi
c551964d5d Merge branch 'master' into production
Conflicts:
	patches/patch_list.py
	production/doctype/bom_explosion_item/bom_explosion_item.txt
2012-12-11 14:59:19 +05:30
Anand Doshi
36bf910563 removed Standard from default print format 2012-12-11 14:01:59 +05:30
Anand Doshi
89e2dd8dbb rename Production --> Manufacturing and delete old patches 2012-12-10 19:01:31 +05:30
Rushabh Mehta
0db74a7ebd cleaned up item, fixed bug in dependency, removed legacy Listing, re-layed out DocField, refactored build.json for web, added featured_item and item_website_specification 2012-12-07 15:47:32 +05:30
Anand Doshi
c162ccbcb6 updated latest updates 2012-12-06 16:32:35 +05:30
Rushabh Mehta
b536d36771 more refactoring to renaming 2012-12-06 12:19:05 +05:30
Rushabh Mehta
ba9e034069 added patch for expense and leave 2012-12-05 15:51:17 +05:30
Nabin Hait
ff4d616133 latest update 2012-12-05 11:11:22 +05:30
Nabin Hait
247a8f2693 latest updates page 2012-12-05 11:06:19 +05:30
Rushabh Mehta
af423a25ce added client side functions and mode_of_payment defaults 2012-12-04 16:35:27 +05:30
Rushabh Mehta
0bb2d2b467 report builder updates 2012-12-04 12:36:36 +05:30
Rushabh Mehta
41f189d961 added linked with 2012-12-03 17:56:33 +05:30
Rushabh Mehta
346c832475 remove rename_tool 2012-12-03 14:15:53 +05:30
Anand Doshi
eaed03d010 replaced convert_to_lists 2012-11-30 17:24:54 +05:30
Anand Doshi
0fd99e7536 removed unnecessary imports 2012-11-30 16:38:04 +05:30
Rushabh Mehta
71d6a0ce1d cleaned up leave application 2012-11-30 12:41:46 +05:30
Rushabh Mehta
86adcaa113 fixed employee permissions, fixed bug in import_merge of timestamps 2012-11-30 12:02:00 +05:30
Rushabh Mehta
e1e4aafd9b communication: check send with attach if from sidebar 2012-11-29 17:00:53 +05:30
Anand Doshi
624334aed1 updated latest updates 2012-11-28 17:31:35 +05:30
Rushabh Mehta
bd919caa9b profile: form is now my settings page, removed (Page, profile-settings) 2012-11-28 15:19:51 +05:30
Anand Doshi
51b0785529 updated latest updates page 2012-11-27 19:07:35 +05:30
Rushabh Mehta
36b586cdfe cleaned up profile settings 2012-11-26 16:51:51 +05:30
Rushabh Mehta
be919b3855 profile: added email signature to outgoing mail and profile settings 2012-11-26 13:54:47 +05:30
Rushabh Mehta
bf09c672cd support ticket response deprecated, moved to communication 2012-11-24 15:26:48 +05:30
Anand Doshi
d4b0373b92 removed controller 2012-11-23 18:05:08 +05:30
Rushabh Mehta
78d4b49e62 introducing model 3.0, refactored import module 2012-11-23 17:53:43 +05:30
Anand Doshi
f1da8b4886 latest updates page updated 2012-11-23 14:18:47 +05:30
Anand Doshi
510281c582 updates latest updates 2012-11-22 17:41:09 +05:30
Anand Doshi
d7f1bcbde6 changes to make select field compatible to chosen 2012-11-22 16:34:09 +05:30
Anand Doshi
b3cb970eef compose support ticket reply using markdown 2012-11-22 12:23:50 +05:30
Anand Doshi
009d3e1952 updated latest_updates page 2012-11-21 18:00:51 +05:30
Anand Doshi
fdfa60546a always open links embedded in knowledge base answers in new tab 2012-11-19 18:48:25 +05:30
Anand Doshi
fee73cf273 updated latest updates page 2012-11-19 18:17:50 +05:30
Rushabh Mehta
90ae802563 send original mail in autoreply 2012-11-16 17:56:28 +05:30
Rushabh Mehta
ce4ed265d2 fixes to rename_tool, added serial no for rename 2012-11-16 14:25:03 +05:30
Rushabh Mehta
601199db6e upgraded jquery and jquery.gantt 2012-11-16 11:46:43 +05:30
Rushabh Mehta
04b9579b24 appraisal cleanup, removed un-necessary logic 2012-11-16 10:37:14 +05:30
Rushabh Mehta
86945fe178 fix to customer issue, desktop 2012-11-15 16:58:27 +05:30
Rushabh Mehta
f281a0cf2f hot:module fix for desktop 2012-11-15 16:35:39 +05:30
Rushabh Mehta
2a44bf8245 customer_issue: moved allocated to assigned 2012-11-15 15:11:15 +05:30
Rushabh Mehta
aec1931911 updates to letterhead, dont cut avatar in doclistview 2012-11-15 10:35:57 +05:30
Rushabh Mehta
cf53f8ced9 employee: set user_id and defaults 2012-11-14 16:23:24 +05:30
Rushabh Mehta
e1625e3d44 backup files: path fix 2012-11-14 14:05:14 +05:30
Rushabh Mehta
40f5b15e8c doctype field validation commonified and added to customize form view and custom fields and property setter save 2012-11-13 15:41:12 +05:30
Rushabh Mehta
c68fc3f3d7 trial balance, export ledgers only and groups only 2012-11-13 13:28:26 +05:30
Rushabh Mehta
724bb471ee added latest updates page 2012-11-13 12:32:11 +05:30
Nabin Hait
8bbc5a2b11 bypass demo@erpnext.com from session deletion 2012-11-05 18:58:15 +05:30
Anand Doshi
b38e34d203 removed __SessionCache and replaced with webnotes.clear_cache 2012-10-24 17:39:50 +05:30
Anand Doshi
aea8204997 build report for feed 2012-10-15 15:30:56 +05:30
Nabin Hait
5417f5666c deprecated dashboard 2012-10-05 12:11:23 +05:30
Rushabh Mehta
b62bbc6dc7 update to messages, added avatar-large 2012-10-03 18:32:10 +05:30
Rushabh Mehta
9a56fe4871 bugfix in profile_settings, removed files from conf (always public/files) and changed default avatar to defunct brightkite avatar 2012-10-03 12:54:35 +05:30
Rushabh Mehta
9d1faea10c separated query-report and added module marker to appframe 2012-10-02 14:56:41 +05:30
Rushabh Mehta
beb3a872ce Merge branch '1209' of github.com:webnotes/erpnext into 1209 2012-10-01 14:47:06 +05:30
Rushabh Mehta
2d700dd90d added query report and cleaned up wn.ui.Dialog 2012-10-01 14:46:37 +05:30
Anand Doshi
fdbc730821 merged deprecate account balance 2012-10-01 11:30:00 +05:30
Rushabh Mehta
3c04193afb form, appframe ui fixes 2012-09-28 18:47:47 +05:30
Rushabh Mehta
b0d32b7a25 form toolbar ui fixes and added themes 2012-09-28 16:11:57 +05:30
Rushabh Mehta
7c454b3039 dont save duplicate files 2012-09-25 18:20:36 +05:30
Rushabh Mehta
0152b12e75 __session_cache removed and introducted memcache for caching 2012-09-25 14:22:23 +05:30
Rushabh Mehta
707932da0c updated paths 2012-09-25 10:42:00 +05:30
Rushabh Mehta
2fa2f7178d moved directory structure 2012-09-24 19:13:42 +05:30
Rushabh Mehta
66ac2b018a first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
Rushabh Mehta
2a9afbf4f6 synced timestamps 2011-09-05 13:17:22 +05:30
Rushabh Mehta
962e92ee00 timestamps, comments 2011-09-05 13:14:18 +05:30
Rushabh Mehta
e3393bead9 fix to kb, delete question, ans 2011-08-30 15:37:46 +05:30
Rushabh Mehta
385a3792e1 fixes to comment in my company 2011-08-30 14:17:33 +05:30
Rushabh Mehta
0b230d1165 fixes to dashboard 2011-08-30 13:55:55 +05:30
Rushabh Mehta
c7fbbbaeb0 fixes to dashboard 2011-08-30 13:45:57 +05:30
Rushabh Mehta
ae5cdeb472 fixes to dashboard and setup wizard 2011-08-30 13:24:49 +05:30
Rushabh Mehta
c91f88c5c5 dashboard fixes 2011-08-25 19:28:56 +05:30
Rushabh Mehta
0a187bece6 dashboard fixes 2011-08-25 19:28:02 +05:30
Rushabh Mehta
ac3aff5d29 dashboard fixes 2011-08-25 19:24:34 +05:30
Rushabh Mehta
29a75c4d7a added dashboard 2011-08-25 19:17:44 +05:30
Rushabh Mehta
33bce67234 fixes to my_company, added secrity settings to restrict by ip, timings 2011-08-25 15:15:25 +05:30
Rushabh Mehta
496a65a45d check if banner is not default 2011-08-17 12:23:53 +05:30
Rushabh Mehta
8eb1ec27ba check if banner is not default 2011-08-17 12:21:18 +05:30
Rushabh Mehta
c3ef493171 added setup wizard 0.1 2011-08-12 14:51:33 +05:30
Rushabh Mehta
deb8eb99ed fixed server_tools.server_tools 2011-07-18 13:41:35 +05:30
Rushabh Mehta
3599b6ef97 my_company updates 2011-07-14 14:24:16 +05:30
Rushabh Mehta
09c134408d my_company.py: check validation before adding user 2011-07-13 17:14:38 +05:30
Rushabh Mehta
af596344ba merged conflict in gl_control.py 2011-07-13 14:37:17 +05:30
Ravi Dey
ffecc715fe update_feed fix 2011-07-07 13:51:46 +05:30
Rushabh Mehta
0f191d6df1 feed fix 2011-07-06 14:51:23 +05:30
Rushabh Mehta
3a50b342ef feed fix 2011-07-06 14:50:30 +05:30
nabinhait
68f86c8ad7 double feed bug 2011-07-06 12:41:07 +05:30
nabinhait
8aee9acfce project subject bug 2011-07-06 12:34:15 +05:30
Rushabh Mehta
486ec28b85 Merge branch 'master' of github.com:webnotes/erpnext 2011-07-06 10:47:50 +05:30
Rushabh Mehta
cac4473fec fixes to gateway path 2011-07-06 10:42:02 +05:30
Rushabh Mehta
ab49e027a1 changed path to gateway utils 2011-07-06 10:38:03 +05:30
nabinhait
5deab24401 fixed conflict while merging with webnotes repo 2011-07-06 09:23:02 +05:30
Ravi Dey
913d7b51ae home feeds 2011-07-04 17:18:01 +05:30
Ravi Dey
9514ee9eb8 support feed revert 2011-07-04 16:49:25 +05:30
Ravi Dey
e2ddb24cd1 support feed revert 2011-07-04 16:47:24 +05:30
Ravi Dey
3333ca1721 support ticket updates 2011-07-04 16:23:19 +05:30
nabinhait
963f36b969 all txt files updated due to module renaming/merging 2011-07-01 15:47:42 +05:30
nabinhait
ec097975d0 restructured erpnext and deleted unwanted 2011-07-01 13:34:41 +05:30
nabinhait
5ce963013a deleted .pyc file 2011-06-20 17:03:24 +05:30
nabinhait
601c1965df modifieded __init__ file in home 2011-06-14 17:52:03 +05:30
root
b2e8f0c132 changed module link of event_updates and my_company to home 2011-06-13 18:34:38 +05:30
root
5c520b6090 changed module link of event_updates and my_company to home 2011-06-13 17:55:15 +05:30
Rushabh Mehta
1c59fba480 added home files 2011-06-13 13:23:49 +05:30
Rushabh Mehta
13f61552dc patch to remove my_company and event_updates 2011-06-09 17:32:32 +05:30