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

413 Commits

Author SHA1 Message Date
Anand Doshi
34736c8d87 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 
Conflicts:
	accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py
 2013-07-11 18:29:32 +05:30
Anand Doshi
946e0de0cf [minor] [fix] 2013-07-11 18:26:00 +05:30
Nabin Hait
cfecd2bc16 [fix] [cleanup] fixes while testing and code cleanup 2013-07-11 17:49:18 +05:30
Rushabh Mehta
e464105c8e [style] Style Fixes for Home Page 2013-07-11 15:28:05 +05:30
Rushabh Mehta
80d83f5ae3 [style] Style Fixes for Home Page 2013-07-11 15:19:13 +05:30
Rushabh Mehta
df92a553cb [style] Added Icons to Pages 2013-07-11 14:50:43 +05:30
Rushabh Mehta
7571ff36b4 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-10 20:43:15 +05:30
Rushabh Mehta
e41bceb3df [feature] [website] Create Default Home Page 2013-07-10 20:42:44 +05:30
Nabin Hait
d96bfaf6af [fix] get_query where options not mentioned 2013-07-10 20:30:00 +05:30
Nabin Hait
eddd4a1674 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-10 19:12:14 +05:30
Nabin Hait
a4f0240bfc [conflict] merged for get_query 2013-07-10 19:05:57 +05:30
Rushabh Mehta
ad71473f35 [cleanup] Default Warehouses created on Company creation. Warehouse names have Company abbreviation as suffix 2013-07-10 18:59:55 +05:30
Rushabh Mehta
982ad35fd2 [cleanup] Removed Warehouse Type 2013-07-10 18:39:06 +05:30
Nabin Hait
6e68e0e5d8 [fix] validate with prev doc 2013-07-10 15:33:29 +05:30
Rushabh Mehta
3429b609a7 [feature] [grid] Allow Grid viewable columns to be selected via 'In List View' 2013-07-10 15:03:37 +05:30
Rushabh Mehta
919b9fcccf [cleanup] Maintenance Schedule, Maintenance Visit 2013-07-10 13:06:14 +05:30
Saurabh
2e3c06e66d [get_query]to server side 2013-07-09 18:20:49 +05:30
Saurabh
38683718e1 [get_query] to server side 2013-07-09 16:34:50 +05:30
Saurabh
ab462d2000 [get_query]to server side 2013-07-09 16:18:52 +05:30
Anand Doshi
1357c0b2df [cleanup] #402 changed fieldname company_name to company in Cost Center 2013-07-09 15:45:38 +05:30
Rushabh Mehta
44c1447b60 [setup] added icons, links, fixed single 2013-07-09 10:42:10 +05:30
Rushabh Mehta
56b66e22ab [email] force use of loginid as the sender 2013-07-09 10:29:01 +05:30
Anand Doshi
3c6d440f09 [bean] [mandatory] fixes in test cases 2013-07-08 19:47:37 +05:30
Anand Doshi
615701d3ae Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 
Conflicts:
	stock/doctype/material_request/material_request.txt
 2013-07-08 18:54:00 +05:30
Anand Doshi
4ee647e84c [bean] [mandatory] fixes in test cases 2013-07-08 18:50:45 +05:30
Rushabh Mehta
d9e7070f2d [mapper-pull] for sales / purchae 2013-07-08 18:01:46 +05:30
Rushabh Mehta
1439854b27 [icons] added icons to forms, toolbars, moduleview, doclistview, reportview 2013-07-05 16:28:00 +05:30
Rushabh Mehta
3a3c2710d1 [icon] added in doctype 2013-07-05 15:13:31 +05:30
Nabin Hait
44935e4608 [fixed conflict] 2013-07-05 10:26:29 +05:30
Anand Doshi
f4d8d23241 [setup] [fix] creation of fiscal year if start date is 1st Jan 2013-07-04 18:29:55 +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
Nabin Hait
71c3f95098 Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive 2013-07-01 18:28:26 +05:30
Rushabh Mehta
d420401ba3 [moduleview] added top bar 2013-07-01 17:15:23 +05:30
Nabin Hait
fdbfe1c274 Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive 2013-07-01 12:20:19 +05:30
Rushabh Mehta
1bcc19e019 [item] default warehouse is selected with item 2013-07-01 11:46:07 +05:30
Rushabh Mehta
b3f947aca6 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-01 09:36:39 +05:30
Rushabh Mehta
8706ca9445 [journal voucher] [added opening entry] [cleanups] 2013-07-01 09:36:03 +05:30
Anand Doshi
971f30a12b Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-28 19:19:04 +05:30
Anand Doshi
8f9f8a43c7 [lead] [address] store lead address in Address doctype, with link field=lead 2013-06-28 19:18:33 +05:30
Nabin Hait
869913c96b [fixes] setup control 2013-06-28 15:00:24 +05:30
Rushabh Mehta
03e9a4ea11 [company] [setup] added on_doctype_update to add indexes, renamed make_obj to make_controller 2013-06-28 12:49:28 +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
5381bdd730 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-26 17:21:03 +05:30
Rushabh Mehta
2f7e1abd0f [setup] new page + minor fixes 2013-06-26 17:20:12 +05:30
Anand Doshi
8bef70cceb Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-26 13:53:17 +05:30
Anand Doshi
bd7218979e [shipping rule] added doctypes shipping rule and shipping rule conditions 2013-06-26 13:53:01 +05:30
Rushabh Mehta
f49f82083f [chart of accounts] added from openerp (remove empty children) 2013-06-26 10:10:05 +05:30