Commit Graph

7357 Commits

Author SHA1 Message Date
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
83ce95932a Merge branch 'master' of github.com:webnotes/erpnext into responsive 2013-06-10 15:28:40 +05:30
Anand Doshi
dec9a165ac [patch] [fix] events for project, lead, oppty 2013-06-10 15:26:54 +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
Rushabh Mehta
c067366c98 [project] consider cancelled tasks as completed 2013-06-10 12:35:45 +05:30
Anand Doshi
b2dc1aeca9 [lead] [next contact] [fix] create event 2013-06-10 12:34:31 +05:30
Rushabh Mehta
d3d3472af5 [blog] permission fix 2013-06-09 13:32:21 +05:30
Rushabh Mehta
f0ac116d66 [blog] permission fix 2013-06-09 13:27:12 +05:30
Rushabh Mehta
b840296925 [blog] permission fix 2013-06-09 13:23:50 +05:30
Rushabh Mehta
51f688ad4a [blog] permission fix 2013-06-09 13:21:58 +05:30
Rushabh Mehta
9b6912f8c0 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-09 13:18:28 +05:30
Rushabh Mehta
2e51f8aade [blog] permission fix 2013-06-09 13:17:29 +05:30
Saurabh
66f10cd14f Quotation Trend 2013-06-07 18:05:16 +05:30
Nabin Hait
eec70e73ba Merge pull request from saurabh6790/master
[Reports] [No Sales Order From Customers] and [Item Reorder Level]
2013-06-07 05:02:58 -07:00
Nabin Hait
4bb0eee411 [fixes] outstanding for jv 2013-06-07 17:06:39 +05:30
Anand Doshi
6e6fb42906 [projects] [patch] fixed project completed patch 2013-06-07 15:55:31 +05:30
Nabin Hait
bc97cbfedb Merge branch 'master' of github.com:webnotes/erpnext 2013-06-07 15:45:49 +05:30
Rushabh Mehta
4cea6af519 [removed footer] 2013-06-07 15:39:45 +05:30
Saurabh
d9bf642447 [Report][Changes made in Customers Not Buying Since Long Time.py] 2013-06-07 15:28:43 +05:30
Saurabh
5ee811d842 [removed merge conflict] 2013-06-07 15:23:56 +05:30
Rushabh Mehta
224ad17b1d [profile] removed themes 2013-06-07 15:09:45 +05:30
Rushabh Mehta
cbb176cdf1 [form] [status] fix 2013-06-07 14:57:30 +05:30
Rushabh Mehta
cdd265d3bf [project] added patch 2013-06-07 14:52:53 +05:30
Saurabh
5b1e899250 [Reports] [Customers Not Buying Sinse Long Time] and [Itemwise Recommended Reorder level] 2013-06-07 13:34:16 +05:30
Rushabh Mehta
9dd9bb0adf Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-07 12:59:36 +05:30
Rushabh Mehta
f79e3451dd [projects] added ganttview, removed old timesheet 2013-06-07 12:58:29 +05:30
Anand Doshi
d3b41b965f [favicon] [update] 2013-06-07 12:23:16 +05:30
Nabin Hait
edf7cac4e0 Merge pull request from akhileshdarjee/master
Completed 'Item Prices' Report
2013-06-06 23:23:57 -07:00
Akhilesh Darjee
426b57e1b4 Deleted item_prices.js 2013-06-07 11:52:15 +05:30
Saurabh
1efc8b3734 [Reprots][No Sales Order From Customer] and [Item Reorder Level] 2013-06-06 19:31:14 +05:30
Anand Doshi
2c376a4968 [toolbar logo] [fix] 2013-06-06 19:10:52 +05:30
Anand Doshi
1fe3bc575b [logo] update erpnext logo in favicon and toolbar 2013-06-06 18:55:20 +05:30
Akhilesh Darjee
657f8a6677 Completed 'Item Prices' Report 2013-06-06 18:33:26 +05:30
Anand Doshi
68d0dbabe9 [splash] [monochrome] 2013-06-06 18:04:03 +05:30
Nabin Hait
7f9142812c Merge branch 'master' of github.com:webnotes/erpnext 2013-06-06 17:19:06 +05:30
Nabin Hait
6164b89e95 [report] listing on home page 2013-06-06 17:18:38 +05:30
Anand Doshi
e3e15a94c3 [system console] [security fix] removed system console 2013-06-06 11:35:49 +05:30
Anand Doshi
9d04924bc2 [selling] [cleanup] rearranged fields 2013-06-05 20:46:56 +05:30
Saurabh
7b48218b6f [Reports][Reorder Level] and [No Sales Order from Customer] 2013-06-05 18:17:28 +05:30
Anand Doshi
362178102d Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-05 17:47:01 +05:30
Anand Doshi
b392878f15 [buying] [fix] store item tax amount only if field exists 2013-06-05 17:46:20 +05:30
Nabin Hait
4ea8e71dc8 Merge pull request from akhileshdarjee/master
Completed "Warehouse-Wise Stock Balance"
2013-06-05 04:48:26 -07:00
Rushabh Mehta
0716e5ce09 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-05 17:15:39 +05:30
Rushabh Mehta
c4f08ef456 [views] cleaned up, added ganttview 2013-06-05 17:14:52 +05:30
Nabin Hait
c36e2653f9 [report] itemwise purchase register 2013-06-05 16:13:05 +05:30
Nabin Hait
196b6b8b68 [report] itemwise sales register 2013-06-05 16:12:42 +05:30
Anand Doshi
12cea9587f [terms and conditions] removed terms html and added terms and conditions to purchase invoice 2013-06-05 14:59:28 +05:30
Anand Doshi
bf3e54a45b [issues ] [fix] pulling terms and conditions 2013-06-05 14:11:32 +05:30