Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,500 Commits 3 Branches 0 Tags 1 GiB
83f1fbdc4e
Commit Graph

676 Commits

Author SHA1 Message Date
Anand Doshi
8e332ffd16 Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 
Conflicts:
	erpnext/accounts/page/accounts_browser/accounts_browser.css
	erpnext/controllers/buying_controller.py
	erpnext/manufacturing/doctype/production_order/production_order.py
	erpnext/patches/patch_list.py
	erpnext/selling/doctype/customer/customer.txt
	erpnext/selling/doctype/sales_order/sales_order.py
	erpnext/selling/doctype/sales_order/test_sales_order.py
	erpnext/setup/doctype/features_setup/features_setup.txt
	erpnext/stock/doctype/stock_entry/test_stock_entry.py
	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
	startup/query_handlers.py
 2013-12-26 19:12:51 +05:30
Rushabh Mehta
6de403f2be added manifest, hooks and fixed requires webnotes/wnframework#351 2013-12-13 14:10:14 +05:30
Rushabh Mehta
1f84799f2d install, web serving, session booting webnotes/wnframework#351 2013-12-12 19:12:19 +05:30
Rushabh Mehta
afea58b7a1 moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30
Rushabh Mehta
2fa2f7178d moved directory structure 2012-09-24 19:13:42 +05:30
Anand Doshi
6b52d77c76 Merge branch 'unicode' of github.com:webnotes/erpnext into unicode 2012-09-17 21:24:39 +05:30
Rushabh Mehta
4156523175 added flot for graphs in report_grid 2012-09-17 19:10:36 +05:30
Anand Doshi
6450b12881 fix in permissions of role 'All'. Fix in Credit Days and Credit Limit permissions in Customer form 2012-09-17 11:34:24 +05:30
Nabin Hait
22aa31ead2 updated profile permission 2012-08-13 13:15:36 +05:30
Rushabh Mehta
0f0d8850d0 merged with master (project cleanup) 2012-08-08 14:28:24 +05:30
Rushabh Mehta
a8733daf80 fix to project_list 2012-08-08 14:26:53 +05:30
Rushabh Mehta
aff1599fe5 cleanup to projects and tasks and now embedding gantt chart inside project 2012-08-08 14:19:33 +05:30
Rushabh Mehta
2937e7e842 task cleanup: moved allocated_to -> assigned_to, autoname is now task (istead of tic) 2012-08-08 12:54:47 +05:30
Rushabh Mehta
17588987a4 file upload should not be decoded 2012-08-08 10:37:02 +05:30
Rushabh Mehta
bc26218889 added jQuery.Gantt 2012-08-08 10:02:55 +05:30
Rushabh Mehta
df196c12a9 projects: milestones have events, tasks have events with better description 2012-08-07 16:35:27 +05:30
Rushabh Mehta
49dc5da0dc refactor unicode changes and merge with master with refactored email 2012-08-03 16:02:24 +05:30
Rushabh Mehta
f0018b5e05 added unsubscribed fields in Lead and Contact and cleaned up sendmail function 2012-08-02 18:03:12 +05:30
Anand Doshi
486f9dfcec added unicode_literals import at start of each file 2012-07-19 13:40:31 +05:30
Anand Doshi
249659d673 Changed file names from listview.js to doctype_name_list.js 2012-07-18 20:25:58 +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
Rushabh Mehta
4c56275d26 appframe is now heading 2012-06-14 11:05:09 +05:30
Rushabh Mehta
983c551796 gantt chart fixes 2012-06-04 13:20:42 +05:30
Rushabh Mehta
07c94ce9c0 update in Task, notification and layout 2012-06-04 12:57:23 +05:30
Anand Doshi
cb909d518c Merge branch 'shf_rename' 2012-05-21 18:44:19 +05:30
Anand Doshi
2c4cd08844 more listviews 2012-05-21 18:40:53 +05:30
Rushabh Mehta
0eb790a0ae cleaned up imports, doc 2012-05-11 15:53:37 +05:30
Nabin Hait
f7c506d69e fixed conflict while merging with master branch 2012-04-20 13:58:43 +05:30
Nabin Hait
e72ae2a19b fixed conflict 2012-04-20 13:41:09 +05:30
Anand Doshi
7c135ed2fc projects date_format to be fetched from wn.boot.sysdefaults 2012-04-19 17:58:56 +05:30
Anand Doshi
24e18569d9 fixes in install docs for roles 2012-04-17 11:45:35 +05:30
Nabin Hait
8c0dcd383b some more fixes in support 2012-04-16 18:47:20 +05:30
Rushabh Mehta
f1264a7f76 listing, module pages in appframe 2012-04-13 11:41:43 +05:30
Anand Doshi
09e8c4cd2d further fixes 2012-04-12 17:51:53 +05:30
Anand Doshi
2424387651 fixes after sync testing 2012-04-10 19:14:37 +05:30
Anand Doshi
7e0479bc4c cleanup of search criteria 2012-04-05 18:27:56 +05:30
Anand Doshi
fa0cd89a7c change from labels to fieldname in cur_frm.cscript 2012-04-05 13:03:35 +05:30
Anand Doshi
c88ae2be4d rename dt second cut 2012-03-30 18:18:36 +05:30
Anand Doshi
fedfd89e4a rename dt first cut 2012-03-30 12:29:06 +05:30
Anand Doshi
a30fbd004e merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
Anand Doshi
5f9501d4d8 Merge branch 'sync_file_db' into shf_merge 
Conflicts:
	erpnext/projects/doctype/project/project.txt
 2012-03-23 14:51:35 +05:30
Nabin Hait
f88326ba3f sync ref db 2012-03-22 15:07:05 +05:30
Rushabh Mehta
052b7e4049 fixed list->new->onload hooks 2012-03-13 15:19:06 +05:30
Rushabh Mehta
b9878d01e1 style fixes 2012-03-12 16:12:09 +05:30
Rushabh Mehta
ae4d1f973c modules cleanup 2012-03-12 14:34:55 +05:30
Rushabh Mehta
a86f3e4507 cleanup of handler.js 2012-03-02 14:56:51 +05:30
Rushabh Mehta
3966f1dc5d added license files 2012-02-23 12:35:32 +05:30
Rushabh Mehta
c5471ddb8d added setup and removed multi-col layout in body 2012-02-22 12:07:42 +05:30
Rushabh Mehta
35fabf76a6 updated module pages 2012-02-21 19:03:50 +05:30
Rushabh Mehta
d025133b39 added module pages and other css updates 2012-02-21 17:26:50 +05:30
Rushabh Mehta
865c00a79a started website 2012-01-24 14:33:21 +05:30
Nabin Hait
8fb9abd47e Subject added in notification mail 2012-01-05 14:01:35 +05:30
Nijil Y
04eb52dbe3 added fields 2011-12-26 15:30:45 +05:30
Nijil Y
68de3687f4 added fields 2011-12-26 15:24:55 +05:30
Nijil Y
2a59030e05 task notification fix 2011-12-26 12:00:30 +05:30
Nabin Hait
16aacdfeeb Error fixed in ticket 2011-12-26 11:37:52 +05:30
Nabin Hait
f7e1569207 ticket.py modified 2011-12-26 11:08:55 +05:30
Nijil Y
a4e8d1e983 . 2011-12-23 18:01:40 +05:30
Nijil Y
0cfecf2920 email message fix for task 2011-12-23 17:54:07 +05:30
Nijil Y
cc64682baa fixed 2011-12-23 17:35:18 +05:30
Nijil Y
89e5624730 Update erpnext/projects/doctype/ticket/ticket.py 2011-12-23 16:21:51 +05:30
Nijil Y
9239afa222 Update erpnext/projects/doctype/ticket/ticket.py 2011-12-23 16:18:49 +05:30
Nijil Y
cc0e502d0f scheduler 2011-12-23 15:08:43 +05:30
Nijil Y
4d64379aa6 scheduler added to project control for reminder 2011-12-23 12:32:08 +05:30
Nijil Y
f1e98b9d8b Scheduler added for reminder notification - which will be sent 2 days before the task begins 2011-12-23 12:01:31 +05:30
Nijil Y
b3058a3d5a Task Notification donw, reminder left 2011-12-22 17:39:18 +05:30
Nijil Y
8acb043a8a update 2011-12-22 13:08:25 +05:30
Nijil Y
c62953579d fix 2011-12-21 16:32:42 +05:30
Nijil Y
f800dc02f1 fix 2011-12-21 16:20:39 +05:30
Nijil Y
2c19960996 account conflict 2011-12-21 13:30:09 +05:30
Nijil Y
0f9eaeaa3c updation Merge branch 'master' of git://github.com/webnotes/erpnext 
Conflicts:
	erpnext/projects/doctype/ticket/ticket.py
 2011-12-21 12:34:13 +05:30
Nijil Y
dc0461296d Email Notification for Tasks 2011-12-20 21:13:58 +05:30
Nabin Hait
a57732f71d Removed custom field from doctype 2011-12-20 18:48:19 +05:30
Nabin Hait
b93ea233ff Error fixed in task 2011-12-14 18:09:13 +05:30
Anand Doshi
3f040a8f9e Resolved bug Project creation: 
Customer details not getting autofilled on customer selection
 2011-12-05 12:17:51 +05:30
Rushabh Mehta
66ac2b018a first cut for lazy loading framework 2011-09-05 18:43:09 +05:30