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

525 Commits

Author SHA1 Message Date
Rushabh Mehta
df200f305b Redesigned templates. Now all templates must be inside templates/pages templates/generators 2013-12-25 15:19:22 +05:30
Rushabh Mehta
2b08985e16 Translations redesigned webnotes/wnframework#351 2013-12-19 18:27:48 +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
39bb8e2ed4 step 0: install 2013-12-11 15:32:14 +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
Rushabh Mehta
473f7d6314 removed signin.erpnext.com 2012-09-24 10:05:14 +05:30
Nabin Hait
214d62a09a Merge branch 'master' of github.com:webnotes/erpnext 2012-09-18 11:19:59 +05:30
Nabin Hait
82efcc780b reset standard transaction series in cleanup_data 2012-09-18 11:19:34 +05:30
Rushabh Mehta
4156523175 added flot for graphs in report_grid 2012-09-17 19:10:36 +05:30
Anand Doshi
0dab087be1 Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.txt
	public/js/all-app.js
 2012-09-10 11:31:18 +05:30
Rushabh Mehta
62aa086e80 todo: assignment notification fix 2012-09-07 10:05:13 +05:30
Rushabh Mehta
38cc3d6534 todo: do not send message to if assigned to self 2012-09-07 09:54:19 +05:30
Anand Doshi
8456eabed8 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-09 12:17:44 +05:30
Anand Doshi
c6cf4a2630 do not display mouse as a clickable pointer when hovering on description in todo list 2012-08-09 12:16:03 +05:30
Rushabh Mehta
899fe5d3f0 links enabled in todo 2012-08-08 15:30:19 +05:30
Rushabh Mehta
17588987a4 file upload should not be decoded 2012-08-08 10:37:02 +05:30
Rushabh Mehta
bf8cac53c7 pre, code style fix 2012-08-08 10:05:51 +05:30
Rushabh Mehta
586c6f3cbe calendar: links to ref document 2012-08-07 16:36:40 +05:30
Rushabh Mehta
c2ef064ebb todo page background bugfix 2012-08-07 16:36:10 +05:30
Anand Doshi
e81c07ff4d appended unicode literals import after merge 2012-08-07 15:08:52 +05:30
Anand Doshi
16ad50f641 Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/stock/doctype/item/item.txt
 2012-08-07 15:07:56 +05:30
Rushabh Mehta
6252c13ec8 added code style and mardown in todo 2012-08-07 12:53:49 +05:30
Rushabh Mehta
e6ecb06001 added markdown reference page 2012-08-07 12:48:41 +05:30
Rushabh Mehta
c7dbe293c3 updates to kb: unanswered questions show in desktop, questions query moved to server-side 2012-08-07 12:12:55 +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
dbe31be55c deprecated bulk rename tool 2012-07-20 18:11:41 +05:30
Anand Doshi
486f9dfcec added unicode_literals import at start of each file 2012-07-19 13:40:31 +05:30
Anand Doshi
5756630efb Merge branch 'master' of github.com:webnotes/erpnext into dev 
Conflicts:
	erpnext/stock/doctype/delivery_note/delivery_note.py
	public/js/all-app.js
 2012-07-18 20:31:37 +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
f2f5c94c41 Default Currency specification for Customer and Supplier 
This will get fetched in sales and purchase transactions respectively.
Fix in sales order list view
 2012-07-18 20:13:52 +05:30
Rushabh Mehta
91ba346354 profile cleanup start and new auth table for better security 2012-07-13 14:54:40 +05:30
Rushabh Mehta
d47efd57ac check_required fix 2012-07-13 11:15:25 +05:30
Rushabh Mehta
4feae61b62 fixes to taxes and charges master and naming_series 2012-07-12 16:01:20 +05:30
Anand Doshi
090a12d167 do not force send email using conf.py configuration 2012-07-10 15:15:46 +05:30
Nabin Hait
94a6c7e8ac changes in reset_series 2012-07-09 16:06:53 +05:30
Nabin Hait
cbd23dace7 Merge branch 'master' of git://github.com/webnotes/erpnext 2012-07-09 15:26:10 +05:30
Nabin Hait
1c9903594b utility script for cleanup test data 2012-07-09 15:25:08 +05:30
Anand Doshi
c6fce634cf added app frame to todo list 2012-07-09 12:34:02 +05:30
Anand Doshi
1b8f24b507 update in contact's permissions 2012-07-03 12:55:17 +05:30
Anand Doshi
851b9c0aad address contact permissions 2012-07-02 20:25:26 +05:30
Anand Doshi
d383e573fc contact, address list views and allow their deletion from customer / supplier form 2012-07-02 19:45:35 +05:30
Anand Doshi
cec84e1ec7 logout a disabled user 2012-07-02 11:55:29 +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
Anand Doshi
616c355d20 fix in todos and email settings 2012-06-14 16:46:48 +05:30
Anand Doshi
47afacc8e9 1. Reports List - allow read permission to All 
2. Display message when ToDo doesnt contain any item
 2012-06-13 18:02:43 +05:30
Anand Doshi
d104f4bc32 fix in todo 2012-06-13 17:01:52 +05:30
Anand Doshi
3c3f996ade todo list with assigned to others list 2012-06-13 12:01:41 +05:30
Anand Doshi
64ddb9f069 show assigned to others list in todo 2012-06-12 19:24:12 +05:30
Anand Doshi
6971f577da Merge branch 'master' of github.com:webnotes/erpnext 2012-05-29 15:47:47 +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
Anand Doshi
4792f51e2a remove euro currency patch, address / contact supplier/customer can now contain slashes in their name 2012-05-28 13:26:17 +05:30
Anand Doshi
002191f166 fix in rename tool 2012-05-25 12:20:27 +05:30
Nabin Hait
86df78aabc fixed conflict 2012-05-23 11:33:28 +05:30
Nabin Hait
53dab4ac40 validation in customer 2012-05-23 11:29:13 +05:30
Nabin Hait
611157447f sms fix 2012-05-22 17:25:39 +05:30
Rushabh Mehta
0eb790a0ae cleaned up imports, doc 2012-05-11 15:53:37 +05:30
Anand Doshi
951d8ec342 fix in issues arising due to wn.require 2012-05-10 14:19:11 +05:30
Rushabh Mehta
a920943e43 new cms with public folder 2012-05-07 18:00:57 +05:30
Anand Doshi
f36aee2c6b fix in contact address saving issue 2012-05-05 20:05:58 +05:30
Anand Doshi
f09bd67e53 fix in security settings 2012-05-03 16:44:54 +05:30
Rushabh Mehta
39489278ec update messages fix 2012-05-03 10:44:44 +05:30
Rushabh Mehta
acd0769098 list in listview and sales order fix 2012-05-03 10:20:38 +05:30
Nabin Hait
5af62d0857 fixed conflict using theirs 2012-05-01 16:29:40 +05:30
Anand Doshi
3f6eed2dc2 fix in account subscription info box creation 2012-05-01 12:23:28 +05:30
Nabin Hait
926f46f04a Fixed conflict while merging with master 2012-05-01 11:51:08 +05:30
Nabin Hait
d58da50f50 Merge branch 'master' of github.com:webnotes/erpnext 2012-05-01 11:37:45 +05:30
Anand Doshi
5c2a792d03 if max_users = 0, consider unlimited users 2012-04-30 20:03:23 +05:30
Anand Doshi
4b2b159d12 if max_users = 0, consider unlimited users 2012-04-30 20:00:19 +05:30
Nabin Hait
41cc32790f Fixed issie in auto notification 2012-04-30 14:36:18 +05:30
Rushabh Mehta
a4be4d3390 website, product and grid bugfix 2012-04-30 14:22:02 +05:30
Anand Doshi
1ed4ef1946 fixes in setup 2012-04-27 15:30:23 +05:30
Nabin Hait
51834a45a7 purchase invoice with write off feature 2012-04-23 12:47:12 +05:30
Rushabh Mehta
f4a8c87db5 kb bug fix 2012-04-23 10:31:29 +05:30
Anand Doshi
3d9f436ce9 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-20 13:43:05 +05:30
Anand Doshi
0f8e491bdd removed Knowledge Base module, fixed questions page name 2012-04-20 13:42:43 +05:30
Rushabh Mehta
5bce61d58e merge 2012-04-20 13:40:48 +05:30
Anand Doshi
37df8abfc7 knowledge base module removed 2012-04-20 11:17:10 +05:30
Nabin Hait
239e79038f Customer/customer group wise price list 2012-04-20 10:25:03 +05:30
Rushabh Mehta
c8abe5b2ad style cleanups and new builds 2012-04-15 22:31:32 +05:30
Rushabh Mehta
cabfc65fe0 lib/py/webnotes/defs.py -> conf.py (see sample in lib/conf/conf.py) 2012-04-14 16:08:45 +05:30
Anand Doshi
82042f1cff fixes after sync 2012-04-06 17:54:17 +05:30
Anand Doshi
fa0cd89a7c change from labels to fieldname in cur_frm.cscript 2012-04-05 13:03:35 +05:30
Anand Doshi
130dfaee8c fix in todo 2012-04-03 12:18:35 +05:30
Anand Doshi
5112b5b6b8 rerun of rename_dt 2012-04-02 19:12:29 +05:30
Anand Doshi
fedfd89e4a rename dt first cut 2012-03-30 12:29:06 +05:30
Anand Doshi
2513e50dc4 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_merge 
Conflicts:
	erpnext/website/doctype/style_settings/style_settings.txt
	version.num
 2012-03-27 19:37:10 +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
4943af6d6c fix in address issue - customer coming in supplied field 2012-03-26 11:42:09 +05:30
Nabin Hait
e2fe5629f0 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-26 11:07:01 +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
Anand Doshi
9b56a8ada9 Merge branch 'handlerupdate' into sync_handler_merge 
Conflicts:
	js/all-app.js
	version.num
 2012-03-23 13:55:20 +05:30
Anand Doshi
134ca41db8 Merge branch 'sync_file_db' of github.com:webnotes/erpnext into sync_file_db 2012-03-23 12:45:05 +05:30
Nabin Hait
f88326ba3f sync ref db 2012-03-22 15:07:05 +05:30
Anand Doshi
7944b4b888 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 14:34:35 +05:30
Anand Doshi
3697534f10 Merge branch 'master' into handlerupdate 2012-03-22 14:32:10 +05:30
Rushabh Mehta
0807227b92 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 09:24:11 +01:00
Rushabh Mehta
fa0e7b6933 listing/messages fix 2012-03-22 13:44:04 +05:30
Rushabh Mehta
cb11585ff1 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 07:08:34 +01:00
Rushabh Mehta
27cf13b541 merge 2012-03-22 11:37:56 +05:30
Rushabh Mehta
3f46696db2 removed slider ui 2012-03-22 11:37:08 +05:30
Rushabh Mehta
421e25c5ae Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 06:48:45 +01:00
Anand Doshi
98f847c01f fix in todo 2012-03-22 11:18:28 +05:30
Rushabh Mehta
a12a28bec6 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 
Conflicts:
	version.num
 2012-03-22 06:35:35 +01:00
Anand Doshi
06fcfdfcde assign to - allow comments 2012-03-22 11:01:38 +05:30
Nabin Hait
9066dcaba5 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-22 10:26:07 +05:30
Rushabh Mehta
d0f26026af Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 13:34:00 +01:00
Anand Doshi
29ed95ba22 simple fixes in todo 2012-03-21 18:02:17 +05:30
Rushabh Mehta
b1f77d1bde Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 12:39:54 +01:00
Nabin Hait
f676824791 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-21 17:08:35 +05:30
Nabin Hait
653536596d fax added in address display 2012-03-21 17:07:42 +05:30
Nabin Hait
0ad2ef2111 sync with respect to file 2012-03-21 15:02:39 +05:30
Rushabh Mehta
f74ef4c64b Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 07:18:41 +01:00
Rushabh Mehta
454c6ac716 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-21 05:42:31 +01:00
Nabin Hait
9ff92369ad lead organization fld added in quotation for printing 2012-03-20 16:44:15 +05:30
Rushabh Mehta
9b1afe197d cleanup of form, rename, route, added fonts 2012-03-20 14:37:44 +05:30
Rushabh Mehta
7afaa8665d major reworking of page navigation 2012-03-16 18:28:09 +05:30
Anand Doshi
96188f0310 sync with gateway moved to defs 2012-03-15 11:11:57 +05:30
Rushabh Mehta
08b670bddd listing with stats 2012-03-14 19:06:20 +05:30
Rushabh Mehta
052b7e4049 fixed list->new->onload hooks 2012-03-13 15:19:06 +05:30
Anand Doshi
20f63da794 fix in messages 2012-03-08 12:10:51 +05:30
Anand Doshi
eb55df0aa3 fix in messages 2012-03-08 12:06:27 +05:30
Anand Doshi
a6952c935c doctype refactor first commit 2012-03-07 19:37:23 +05:30
Rushabh Mehta
f81a64e57f new listing and changed wn.widgets.listing to wn.ui.listing 2012-03-07 18:19:41 +05:30
Rushabh Mehta
60871c3f54 merge, doclist2 2012-03-05 18:29:34 +05:30
Rushabh Mehta
b9004bd6d0 doclist2 2012-03-05 18:28:33 +05:30
Anand Doshi
d536f16c53 user addition fix 2012-03-02 17:05:04 +05:30
Anand Doshi
ecd8df8cfb fix in user password change by system manager 2012-03-02 12:18:47 +05:30
Anand Doshi
a7c2de6164 fix in user passwordgs 2012-03-02 11:27:50 +05:30
Anand Doshi
08c8edb87f fix in desktop and notifications 2012-03-01 14:53:05 +05:30
Rushabh Mehta
b6023a4d34 users - list condition 2012-03-01 13:47:51 +05:30
Rushabh Mehta
ffb25fc36b users button fix 2012-03-01 11:29:22 +05:30
Rushabh Mehta
204e77d125 background, user_info 2012-02-29 19:09:20 +05:30
Anand Doshi
9a63996699 fix in account setup and user addition 2012-02-29 18:59:45 +05:30
Anand Doshi
fd5a213890 fix in account setup and user addition 2012-02-29 18:58:02 +05:30
Anand Doshi
0b8ac7fc68 fix in company setup 2012-02-29 18:33:39 +05:30
Rushabh Mehta
79ae16506b minor fix 2012-02-29 15:23:25 +05:30
Rushabh Mehta
1572adf7f7 minor fix 2012-02-29 15:19:20 +05:30
Rushabh Mehta
12852e73ab added activity page 2012-02-29 15:11:06 +05:30
Rushabh Mehta
aaf86ba4ef added users 2012-02-28 17:40:13 +05:30
Rushabh Mehta
1a5c9c5926 message reply 2012-02-27 18:56:31 +05:30
Rushabh Mehta
ef29e55469 message delete 2012-02-27 18:41:11 +05:30
Rushabh Mehta
07a36a4baa messages 2012-02-27 18:17:57 +05:30
Rushabh Mehta
fdea966198 messages 2012-02-27 18:03:54 +05:30
Rushabh Mehta
aa999df088 calendar fix 2012-02-27 12:54:04 +05:30
Rushabh Mehta
b73fa49f34 cleaned up kb 2012-02-24 15:07:39 +05:30
Rushabh Mehta
2886b95da0 added todo 2012-02-24 11:26:31 +05:30
Rushabh Mehta
3966f1dc5d added license files 2012-02-23 12:35:32 +05:30
Rushabh Mehta
17773d0763 added docdiff and removed un-necessary files 2012-02-22 15:55:41 +05:30
Rushabh Mehta
d025133b39 added module pages and other css updates 2012-02-21 17:26:50 +05:30
Anand Doshi
c3023be794 notifications of todo items 2012-02-20 16:31:55 +05:30
Nabin Hait
84d73103f8 sales team mapping issue in SO-DN and SO-RV 2012-02-14 15:13:21 +05:30
Nabin Hait
7eda1cac27 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-14 09:57:57 +05:30
Nabin Hait
409612457b error fixed in trash control 2012-02-13 18:24:14 +05:30
Anand Doshi
e00e70841c Merge branch 'stable' into latest 
Conflicts:
	erpnext/accounts/doctype/journal_voucher/journal_voucher.js
	erpnext/accounts/doctype/payable_voucher/payable_voucher.js
	index.html
	version.num
 2012-02-07 10:58:45 +05:30
Anand Doshi
d008964fd6 Fetch defaults in purchase common and sales common related doctypes and fix minor utf-8 issues 2012-02-07 10:48:11 +05:30
Rushabh Mehta
d6840b202a added products + cleanups 2012-01-30 14:00:46 +05:30
Anand Doshi
02c662936f Merge branch 'master' into latest 2012-01-27 12:28:21 +05:30
Anand Doshi
74d1b65105 changed sql to webnotes.conn.sql to avoid errors due to closing of connections in scheduler/push patch 2012-01-27 12:25:09 +05:30
Anand Doshi
590be7e643 Merge branch 'master' into latest 
Conflicts:
	index.html
	version.num
 2012-01-23 18:37:09 +05:30
Anand Doshi
9a7ea9285e Customer Address Contact report 2012-01-23 18:32:20 +05:30
Rushabh Mehta
0a5657809a fixes to add user 2012-01-20 10:52:53 +05:30
Rushabh Mehta
d31bf62c9a fixed patches, small bugs 2012-01-19 15:09:49 +05:30
Anand Doshi
97bd3663f2 Show full name in contact_display 2012-01-17 14:22:09 +05:30
Nabin Hait
a57732f71d Removed custom field from doctype 2011-12-20 18:48:19 +05:30
Nabin Hait
36427e577d address filter flds 2011-11-23 13:21:21 +05:30
Nabin Hait
ed6b489715 filter property changed in address 2011-11-23 13:17:54 +05:30
Nabin Hait
8fa6ad90ed sms sender name validation 2011-11-17 18:07:13 +05:30
Nabin Hait
26f74ed121 sms sender name validation 2011-11-17 18:03:10 +05:30
Rushabh Mehta
d77cb27bd2 fixes to bin for reposting future entires 2011-11-08 12:06:02 +05:30
Rushabh Mehta
cbaae20328 breakup of farmework files 2011-09-08 19:07:14 +05:30
Rushabh Mehta
66ac2b018a first cut for lazy loading framework 2011-09-05 18:43:09 +05:30