Commit Graph

230 Commits

Author SHA1 Message Date
Anand Doshi
aa0ccf8223 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-17 13:46:55 +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
64c2764b56 [translations/build] deleted translation files (to be built on demand) 2013-06-17 11:56:41 +05:30
Rushabh Mehta
37982a6a1f [contact/address] fixed auto setting closes #475 (erpnext) 2013-06-14 13:29:20 +05:30
Anand Doshi
060d9248d3 [fixes] buying/selling price lists, communication and website settings 2013-06-12 17:40:36 +05:30
Anand Doshi
27e6f13b5d [cleanup] deprecated search criteria, amendment_date, cancel_reason 2013-06-11 16:23:18 +05:30
Rushabh Mehta
aa069565de [docs] added for support module 2013-06-11 10:53:03 +05:30
Rushabh Mehta
c2e20dcf7c [docs] added README.md files for website, utilities 2013-06-11 10:43:20 +05:30
Rushabh Mehta
a40c60ea3e [cleanup] removed Trash Control, SMS Receiver, Profile Control, GL Mapper, GL Mapper Detail 2013-06-11 10:43:00 +05:30
Anand Doshi
097ac352d6 Merge branch 'master' of github.com:webnotes/erpnext into responsive 2013-06-10 15:38:31 +05:30
Anand Doshi
670199b9c6 [patch] [fix] event for project, oppty, lead 2013-06-10 15:38:01 +05:30
Anand Doshi
7e2010a649 Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
	patches/patch_list.py
	projects/doctype/project/project.py
	utilities/transaction_base.py
2013-06-10 15:25:07 +05:30
Anand Doshi
e53a81dcea [event] [lead, opportunity, project] [fix] create events 2013-06-10 15:15:40 +05:30
Nabin Hait
c6548b64c2 [fixes][merge conflict] 2013-06-05 12:53:53 +05:30
Nabin Hait
0feebc1a67 [status updater] managed by controllers and commonified for sales and purchase 2013-06-03 16:45:38 +05:30
Anand Doshi
e961af40fc [transaction] [fix] fix in purchase transactions 2013-05-31 14:30:46 +05:30
Anand Doshi
5d74c82c06 Merge branch 'webshop' of github.com:webnotes/erpnext into responsive
Conflicts:
	selling/doctype/quotation/quotation.js
2013-05-28 17:46:50 +05:30
Anand Doshi
923d41dfd2 [selling/buying] [fixes] fixes in client side code, server side code, print formats 2013-05-28 17:23:36 +05:30
Anand Doshi
fc77718a3d [selling/buying] [fixes] updated js files of various doctypes related to selling/g/buying 2013-05-27 19:29:07 +05:30
Anand Doshi
5dfba486a6 [note] [fix] strip invalid characters from title and set it as the name of the note 2013-05-27 12:25:28 +05:30
Rushabh Mehta
43c51b63c4 [form] added print email buttons, fixes to editor, note 2013-05-24 16:52:21 +05:30
Rushabh Mehta
9c5f4fe165 [knowledge base] removed and added patch to move to notes 2013-05-24 16:33:10 +05:30
Rushabh Mehta
126f2c62f2 [merge] merge with master 2013-05-24 16:09:13 +05:30
Rushabh Mehta
9b10e362f7 [form/list] ui fixes, [note] new table to merge question + answer 2013-05-24 16:00:56 +05:30
Rushabh Mehta
4a2f0f8c36 [js-libs] upgraded to latest bootstrap and font-awesome 2013-05-22 11:57:05 +05:30
Anand Doshi
f309613a7d [selling] [calculations] client side calculations, cleanup, patch fixes 2013-05-21 19:35:06 +05:30
Anand Doshi
1dde46aff0 [buying, selling] [refactor] get item details 2013-05-15 21:15:57 +05:30
Anand Doshi
ef06a4b349 [autoname] [cleanup] strip blank spaces and remove autoname where naming_series: can be set in doctype 2013-05-09 15:13:47 +05:30
Rushabh Mehta
f514998011 merge 2013-05-09 11:42:35 +05:30
Rushabh Mehta
d3e00995db [conflicts] [merged] 2013-05-02 16:02:59 +05:30
Anand Doshi
2aa9724c6a Merge branch 'master' into pos_fetch 2013-05-01 13:07:42 +05:30
Anand Doshi
ce3296fc87 [rename tool] [fix] condition to validate that content exists in a row of the uploaded file 2013-04-29 12:28:19 +05:30
Anand Doshi
edc5f2edd0 [sales invoice] [fetching] fetch pos values and customer address contact values 2013-04-26 17:21:49 +05:30
Rushabh Mehta
cc32b65b66 [toolbars] [design] commonified into common toolbar 2013-04-19 13:01:32 +05:30
Rushabh Mehta
d6c8235fb5 [style] [upgrade] moved to bootstrap 3 2013-04-18 17:43:21 +05:30
Rushabh Mehta
f61b680576 [style] moving to 100% bootstrap css, started form / appframe headers 2013-04-16 15:45:05 +05:30
Rushabh Mehta
ac118c8822 [cleanup] started responsive layouts and removed tinymce 2013-04-15 17:02:20 +05:30
Rushabh Mehta
33075e1f69 [files] [patch] dropped file_list property and moved links to 2013-04-10 11:08:50 +05:30
Nabin Hait
6de5eb466c role added in some pages 2013-04-09 11:52:18 +05:30
Nabin Hait
8022a439a8 role added in some pages 2013-04-09 11:49:42 +05:30
Rushabh Mehta
4b9a3ed8a0 [knowledge base] added all permissions 2013-04-09 10:27:06 +05:30
Rushabh Mehta
cfa663e337 [message] [fix] rewire to core 2013-04-04 10:02:08 +05:30
Rushabh Mehta
27c4079ff9 [framework] [cleanup] desktop, todo, messages, modules setup moved to framework 2013-04-03 15:21:44 +05:30
Nabin Hait
1e3fc88940 [quotation][improvement] when made from lead 2013-04-02 18:13:20 +05:30
Rushabh Mehta
06e3ef055b Merge branch 'master' of github.com:webnotes/erpnext 2013-03-26 12:47:51 +05:30
Rushabh Mehta
4731fb999c [feature] [fix] utilities/rename tool upgraded to upload multiple items 2013-03-26 12:47:19 +05:30
Anand Doshi
acec0227c5 fixes in stock entry 2013-03-26 12:33:43 +05:30
Anand Doshi
ee3d5cc621 added validate posting time method 2013-03-13 12:58:54 +05:30
Nabin Hait
bffbc18b2d fixes in cleanup data 2013-03-12 10:41:21 +05:30