Commit Graph

5979 Commits

Author SHA1 Message Date
Rushabh Mehta
68b9b1f11d Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-18 15:47:24 +05:30
Rushabh Mehta
4736c35662 [commit] unified notifications 2013-06-18 15:46:32 +05:30
Anand Doshi
e81321219e [webshop] [cart] add to cart, remove_from_cart, update qty, checkout methods 2013-06-17 15:42:38 +05:30
Anand Doshi
aa0ccf8223 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-17 13:46:55 +05:30
Rushabh Mehta
dd790a57ba [keyboard shortcuts] keyboard shortcuts using jquery hotkeys instead of mousetrap 2013-06-17 12:55:54 +05:30
Anand Doshi
b5fd788131 Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
	projects/doctype/project/project.py
	utilities/transaction_base.py
2013-06-17 12:55:05 +05:30
Anand Doshi
11d311376e [event] [fix] commonified delete_events method, which is executed before auto-creation of events. Fixed delete issue 2013-06-17 12:51:36 +05:30
Rushabh Mehta
8155ff23ad [build/translate] now translate will work on demand 2013-06-17 12:09:53 +05:30
Anand Doshi
1e820f352e Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
	buying/doctype/purchase_common/purchase_common.py
2013-06-17 12:02:04 +05:30
Anand Doshi
ad6180ef6d [material request on re-order level] [fixes] if error occurs, send email to the System Manager 2013-06-17 11:57:04 +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
a7ffd0c81d Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-14 17:45:01 +05:30
Anand Doshi
abc100302c [cart] create quotation on checkout 2013-06-14 17:44:03 +05:30
Rushabh Mehta
466298b6e7 [fix] fixes in purchase common 2013-06-14 14:27:53 +05:30
Rushabh Mehta
37982a6a1f [contact/address] fixed auto setting closes #475 (erpnext) 2013-06-14 13:29:20 +05:30
Rushabh Mehta
1475e4d295 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-14 11:33:44 +05:30
Rushabh Mehta
798262d09b [docs] [fixes] fixes to link selection, attachment exception, pageview 2013-06-14 11:33:01 +05:30
Anand Doshi
32f9f366e5 [progress bar] [fix] 2013-06-13 16:11:03 +05:30
Anand Doshi
3c5b1a5460 [partner listing] clear partners page on save 2013-06-13 15:38:16 +05:30
Anand Doshi
1e92aeddb4 [website] set max width to 728px and show email icon in partner's email 2013-06-13 15:25:38 +05:30
Anand Doshi
8e2ea5fed6 [website] [partners listing] first cut 2013-06-13 14:40:57 +05:30
Anand Doshi
48519ef8ae Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-13 11:22:19 +05:30
Anand Doshi
ab69029d4e [shopping cart] [start] 2013-06-13 11:21:35 +05:30
Rushabh Mehta
3403805684 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-12 18:20:44 +05:30
Rushabh Mehta
9c2159e19c [docs] updates 2013-06-12 18:20:08 +05:30
Anand Doshi
a2e2d4bd19 [price list] [fix] fix in buying selling price list patch 2013-06-12 17:44:10 +05:30
Anand Doshi
060d9248d3 [fixes] buying/selling price lists, communication and website settings 2013-06-12 17:40:36 +05:30
Anand Doshi
9c901e75cd [sales invoice] [cleanup] removed basic info section 2013-06-12 15:28:45 +05:30
Anand Doshi
d826b08b7e [stock entry] [test] fixes 2013-06-11 18:17:52 +05:30
Anand Doshi
b893b4c081 Merge branch 'master' of github.com:webnotes/erpnext into responsive 2013-06-11 17:56:55 +05:30
Anand Doshi
0865f60673 [chart of accounts/cost center] [fix] check permission before enabling add child 2013-06-11 17:48:59 +05:30
Anand Doshi
390499cb99 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-11 17:40:16 +05:30
Anand Doshi
3daf45fcd8 Merge branch 'master' of github.com:webnotes/erpnext into responsive 2013-06-11 17:34:18 +05:30
Anand Doshi
2e0cc41fc6 [chart of accounts/cost center] [add account/cost center] fix in permission issue 2013-06-11 17:33:37 +05:30
Rushabh Mehta
1e9c827ea3 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-11 17:33:11 +05:30
Rushabh Mehta
a642d59cfd [patch] [cleanup] drop unused tables 2013-06-11 17:32:48 +05:30
Anand Doshi
3b867f7377 [cleanup] [fix] removed amendment_date 2013-06-11 17:21:11 +05:30
Rushabh Mehta
1894709aa3 [patch] [cleanup] remove unused doctypes 2013-06-11 17:08:16 +05:30
Anand Doshi
101bb2bf5a [support ticket] enable close and re-open ticket buttons if status field is editable 2013-06-11 16:41:42 +05:30
Anand Doshi
b53b9dcff4 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-11 16:23:45 +05:30
Anand Doshi
27e6f13b5d [cleanup] deprecated search criteria, amendment_date, cancel_reason 2013-06-11 16:23:18 +05:30
Rushabh Mehta
f85368ec5e Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-11 16:07:44 +05:30
Rushabh Mehta
94acdca8d1 [docs] added docs for accounts 2013-06-11 16:06:37 +05:30
Rushabh Mehta
7a22616d71 [cleanup] GL Control, Multi Ledger Report Detail, Trend Analyzer Control 2013-06-11 16:05:56 +05:30
Rushabh Mehta
95e46bc930 [docs] for home, buying modules 2013-06-11 15:12:51 +05:30
Rushabh Mehta
1e5488fabf [cleanup] Home Control, Company Control 2013-06-11 15:12:35 +05:30
Anand Doshi
618edee8b7 [search criteria] [cleanup] removed search criteria folders and files 2013-06-11 15:04:37 +05:30
Rushabh Mehta
d9dfbae718 [docs] added readme for hr module 2013-06-11 15:03:41 +05:30
Rushabh Mehta
e93a2f6e8e [cleanup] removed Employee Training, Other Income 2013-06-11 15:03:25 +05:30
Rushabh Mehta
f6426d4949 [docs] added for manufacturing module 2013-06-11 14:36:48 +05:30