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

250 Commits

Author SHA1 Message Date
Rushabh Mehta
f61b680576 [style] moving to 100% bootstrap css, started form / appframe headers 2013-04-16 15:45:05 +05:30
Anand Doshi
13760a1d74 [employee leave approvers] updated latest_updates.js 2013-04-12 21:59:22 +05:30
Rushabh Mehta
44323693f4 [files] [cleanup/redesign] removed the old file_list structure and also added file listing in setup 2013-04-10 13:54:44 +05:30
Nabin Hait
8022a439a8 role added in some pages 2013-04-09 11:49:42 +05:30
Rushabh Mehta
27c4079ff9 [framework] [cleanup] desktop, todo, messages, modules setup moved to framework 2013-04-03 15:21:44 +05:30
Rushabh Mehta
b596bcbccf [desktop] [cleanup] moved to framework 2013-04-03 11:41:01 +05:30
Rushabh Mehta
81aec56531 [form] [usability] added min width on link fields in grid 2013-03-28 10:34:46 +05:30
Rushabh Mehta
b6c117957f [fields, project] [fix] NaN bug, project gantt refresh bug 2013-03-26 13:02:22 +05:30
Anand Doshi
080f9098c0 deprecated sales and purchase return tool 2013-03-18 17:57:59 +05:30
Rushabh Mehta
11b1fb811f fixes to about us 2013-03-12 14:28:29 +05:30
Rushabh Mehta
f47d53adbc Merge branch 'master' of github.com:webnotes/erpnext 2013-03-12 11:09:12 +05:30
Rushabh Mehta
758131b853 fixed slideshow 2013-03-12 11:07:45 +05:30
Nabin Hait
8c7234f270 aii: gl_entries for sales invoice 2013-03-11 16:32:33 +05:30
Rushabh Mehta
07287e8b93 removed colour fields from txt files 2013-03-05 14:19:48 +05:30
Rushabh Mehta
213b180060 merge, update bean validations 2013-03-01 19:09:06 +05:30
Rushabh Mehta
f559a437a1 completed Time Log / Time Log Batch 2013-03-01 18:25:55 +05:30
Anand Doshi
a6acdda094 fixes in calendar event display on desktop 2013-03-01 14:41:32 +05:30
Rushabh Mehta
b21eb9ac09 added time log batch 2013-02-28 18:42:46 +05:30
billyfordson
9b352309c6 Adding German translation 2013-02-27 17:36:23 +01:00
Rushabh Mehta
03fead184e added time log 2013-02-27 15:44:12 +05:30
Nabin Hait
adebebfccf updated latest_updates page 2013-02-26 11:00:44 +05:30
Rushabh Mehta
e4eb89b02a added new language and filters in query reports 2013-02-25 13:00:16 +05:30
Rushabh Mehta
f41dd39286 added language 2013-02-21 16:57:54 +05:30
Anand Doshi
c64da278ca fixed auto material request email 2013-02-21 12:04:42 +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
Nabin Hait
bd03b899b3 updated latest_updates page 2013-02-20 17:03:51 +05:30
Rushabh Mehta
2fe861fa71 defaults cleanup 2013-02-19 15:54:15 +05:30
Rushabh Mehta
c53231a841 model_wrapper is now bean, refactoring defaults 2013-02-18 18:24:28 +05:30
Rushabh Mehta
9249f354cd added view selector and calendar view for leave application 2013-02-15 19:28:05 +05:30
Rushabh Mehta
1a9f0848b3 added calendar view 2013-02-15 12:09:05 +05:30
Rushabh Mehta
5eb37647cf added new calendar and renamed holiday block list 2013-02-14 17:34:51 +05:30
Anand Doshi
5070224079 select leave approver by fullname in leave application 2013-02-13 19:49:42 +05:30
Rushabh Mehta
4b9827a5fc upgraded test_runner, now can run multiple tests 2013-02-12 19:20:39 +05:30
Rushabh Mehta
60135df6fd updated language 2013-02-11 11:44:12 +05:30
Rushabh Mehta
0c2c521d38 cleanp: bookmarks 2013-02-06 14:20:07 +05:30
Rushabh Mehta
0dbe898d82 added warehouse user to retrict entry and also introduced query handlers 2013-02-04 13:56:50 +05:30
Rushabh Mehta
d4ae9861f4 added tabsessions_to_myisam 2013-01-28 16:56:32 +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
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
6c8cef71a0 fixes to desktop 2013-01-24 16:30:50 +05:30
Rushabh Mehta
908d09d058 added spanish 2013-01-24 15:55:30 +05:30
Rushabh Mehta
a1e8e07fde added number format to global defaults 2013-01-21 16:39:24 +05:30
Rushabh Mehta
bb9968491b added report permissions to txt files 2013-01-21 14:22:07 +05:30
Anand Doshi
a81370f2a3 added description to Price List field. added in latest updates 2013-01-18 13:26:54 +05:30
Rushabh Mehta
6f9915cd17 install from txt files, part 1 2013-01-16 17:48:17 +05:30
Rushabh Mehta
23ac436933 add job applicant, sales and jobs email settings to module help 2013-01-16 12:54:24 +05:30
Rushabh Mehta
2e5db35856 added automatic lead creation for sales email id 2013-01-16 11:34:26 +05:30
Rushabh Mehta
f0b7972102 consolidated permission checking and added patch 2013-01-14 17:02:13 +05:30
Anand Doshi
4c3217b11c updated latest updates page 2013-01-14 14:54:12 +05:30
Rushabh Mehta
b416166959 added 'report' permission 2013-01-10 17:14:09 +05:30
Rushabh Mehta
9dbb761f19 latest_upates 2013-01-10 12:37:28 +05:30
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