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

84 Commits

Author SHA1 Message Date
Anand Doshi
b03f870441 Merge branch '1310' of github.com:webnotes/erpnext 2013-11-04 15:22:50 +05:30
Anand Doshi
daaa14c079 Merge branch '1310' of github.com:webnotes/erpnext 
Conflicts:
	setup/doctype/setup_control/setup_control.py
	stock/doctype/stock_entry/stock_entry.py
	utilities/demo/demo_docs/Price_List.csv
 2013-11-04 13:14:39 +05:30
Anand Doshi
7fa2ec40e1 Removed Update Manager 2013-10-24 20:47:35 +05:30
Nabin Hait
ca8ad210d2 Merge branch 'i18n' of git://github.com/bperretti/erpnext into bperretti-i18n 2013-10-24 11:40:32 +05:30
Nabin Hait
3eb901f47d [merge] merged with master 2013-10-24 11:21:11 +05:30
Akhilesh Darjee
f295692937 [fix] [minor] item price added in setup page and stock 2013-10-18 16:21:32 +05:30
Anand Doshi
0bc5ae55d8 [minor] fixes in data import, serial no and setup wizard 2013-10-18 16:07:47 +05:30
Bárbara Perretti
4b41e5f7f7 Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n 
Conflicts:
	accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js
	accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
	public/js/complete_setup.js
	selling/doctype/opportunity/opportunity.js
	selling/doctype/quotation/quotation.js
 2013-10-16 15:09:18 -03:00
Bárbara Perretti
b7a6b850cf Fix translate setup.js 2013-10-15 18:20:32 -03:00
Anand Doshi
b604eddbfd [minor] [fixes] view in website and other fixes 2013-10-10 15:43:32 +05:30
Rushabh Mehta
ddca90ef7b [communication] [setup wizard] [minor] [fixes] 2013-10-09 16:08:54 +05:30
Rushabh Mehta
5d45557729 [wsgi] [minor] fixed flags 2013-10-08 18:23:05 +05:30
Rushabh Mehta
8c5a5f1ed5 New Setup Wizard 2013-10-08 17:59:11 +05:30
Rushabh Mehta
8941841a9c [setup wizard] added more steps [minor] [wip] 2013-10-07 18:22:29 +05:30
Rushabh Mehta
ae307e8bf8 [setup wizard] Started - WIP 2013-10-04 17:48:05 +05:30
Rushabh Mehta
cce21d11fa [major] upgrade to bootstrap 3 2013-08-21 17:48:08 +05:30
Rushabh Mehta
e67d1fbcdf [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
Anand Doshi
a648f46d4e [fix] [minor] show stock ledger, general ledger, fixes post changes in script manager trigger [issue] webnotes/wnframework#228 2013-07-30 14:43:29 +05:30
Anand Doshi
1fac2a98cf [fix] [client script] call cur_frm.cscript.custom_ type functions in the callback of standard functions 2013-07-29 19:30:39 +05:30
Rushabh Mehta
8f81a6f6c6 [feature] [setup] Added Refresh 2013-07-25 15:01:44 +05:30
Anand Doshi
946e0de0cf [minor] [fix] 2013-07-11 18:26:00 +05:30
Rushabh Mehta
df92a553cb [style] Added Icons to Pages 2013-07-11 14:50:43 +05:30
Rushabh Mehta
44c1447b60 [setup] added icons, links, fixed single 2013-07-09 10:42:10 +05:30
Anand Doshi
99100a4135 [webshop] shopping cart settings, update price list, taxes and shipping rule on change of address, apply defaults on creation of fresh quotation 2013-07-04 17:13:53 +05:30
Rushabh Mehta
d420401ba3 [moduleview] added top bar 2013-07-01 17:15:23 +05:30
Rushabh Mehta
e6d986adea [import] fixes 2013-06-27 10:54:49 +05:30
Rushabh Mehta
dd548eeac3 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-27 09:50:04 +05:30
Rushabh Mehta
65d12926fd [setup] bug fixes 2013-06-26 22:31:22 +05:30
Anand Doshi
f7c4d1e807 [setup home] moved SMS Settings link to Tools section 2013-06-26 17:33:59 +05:30
Rushabh Mehta
2f7e1abd0f [setup] new page + minor fixes 2013-06-26 17:20:12 +05:30
Rushabh Mehta
64c2764b56 [translations/build] deleted translation files (to be built on demand) 2013-06-17 11:56:41 +05:30
Anand Doshi
a3773396f3 [naming series] [fix] added Date in make autoname 2013-05-29 11:41:13 +05:30
Anand Doshi
bfc18ea6c4 [setup home] combined Update Application, Backup Manager and Scheduler Error Log under Setup > Administration 2013-05-15 12:24:50 +05:30
Rushabh Mehta
0c1611219e [files] [cleanup/redesign] removed the old file_list structure and also added file listing in setup 2013-04-10 13:54:13 +05:30
Rushabh Mehta
27c4079ff9 [framework] [cleanup] desktop, todo, messages, modules setup moved to framework 2013-04-03 15:21:44 +05:30
Anand Doshi
bdedd555ca [setup] [update manager] renamed update-this-app page to update-manager 2013-04-01 16:51:33 +05:30
Anand Doshi
72b28807d2 [setup] [feature] Update Manager for self hosted applications based on wnframework 2013-04-01 16:40:19 +05:30
Rushabh Mehta
4731fb999c [feature] [fix] utilities/rename tool upgraded to upload multiple items 2013-03-26 12:47:19 +05:30
Rushabh Mehta
6a4c468219 fix in about 2013-03-12 14:59:46 +05:30
Rushabh Mehta
11b1fb811f fixes to about us 2013-03-12 14:28:29 +05:30
Rushabh Mehta
202508410c completed dropbox backup in backup manager 2013-03-07 12:25:21 +05:30
Rushabh Mehta
8ff938a377 backup manager (wip) 2013-03-06 11:20:56 +05:30
billyfordson
9b352309c6 Adding German translation 2013-02-27 17:36:23 +01:00
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
Rushabh Mehta
60135df6fd updated language 2013-02-11 11:44:12 +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
6382a42dbe more fixes to perms, floats and default enabled / disabled in search 2013-01-23 10:09:28 +05:30