Commit Graph

117 Commits

Author SHA1 Message Date
Anand Doshi
47530db4d9 Merge branch 'master' of github.com:webnotes/erpnext into responsive 2013-06-10 15:58:34 +05:30
Anand Doshi
f09a9f68e4 [project] [event] fix in creation of event 2013-06-10 15:57:52 +05:30
Anand Doshi
bb39fc85dd Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-10 15:40:38 +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
Rushabh Mehta
cbb176cdf1 [form] [status] fix #172 2013-06-07 14:57:30 +05:30
Rushabh Mehta
cdd265d3bf [project] added patch 2013-06-07 14:52:53 +05:30
Rushabh Mehta
f79e3451dd [projects] added ganttview, removed old timesheet 2013-06-07 12:58:29 +05:30
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
90202aec2b [merge conflict] 2013-06-05 12:37:10 +05:30
Saurabh
4bf08fa1cd [Reports][Supplier Account Head -> Account] and [Project wise Stock Tracking -> Project] 2013-06-04 15:51:16 +05:30
Anand Doshi
52adc34e04 shifted tasks above milestone in Project 2013-06-03 17:04:01 +05:30
Rushabh Mehta
126f2c62f2 [merge] merge with master 2013-05-24 16:09:13 +05:30
Anand Doshi
0d504491dd [task] [query] added match conditions to task query 2013-05-13 15:15:20 +05:30
Anand Doshi
9e1d120186 [time log] [query] search task based on subject 2013-05-09 19:34:34 +05:30
Rushabh Mehta
d2923fe2b2 [form] [controls] finished controls and script manager - 1st cut 2013-05-03 14:27:32 +05:30
Anand Doshi
4120ffefa1 [project] [query] removed debug 2013-05-01 12:14:57 +05:30
Anand Doshi
ded4848a5e Merge branch 'master' into edge 2013-04-24 15:35:38 +05:30
Nabin Hait
627a08b7db [report] total added in daily time log summary report 2013-04-23 17:49:24 +05:30
Anand Doshi
a63b9e7762 Merge branch 'master' into edge 2013-04-23 16:29:33 +05:30
Nabin Hait
cb9c480967 [report] total added in daily time log summary report 2013-04-23 16:08:13 +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
2b61f6142a fixed conflict 2013-04-08 12:44:57 +05:30
Nabin Hait
86a8d01ce9 [column addition][daily time log summary] time log id, activity type and task subject column added 2013-04-05 12:12:39 +05:30
Nabin Hait
1a738f72f4 match condition added in daily time log summary report 2013-04-04 16:34:51 +05:30
Rushabh Mehta
cc86ec8642 merge 2013-04-03 16:38:20 +05:30
Nabin Hait
9274f2772c [New Script Report] added report daily time log summary 2013-04-03 16:09:50 +05:30
Nabin Hait
dd8e964a17 [New Script Report] added report daily time log summary 2013-04-03 15:51:55 +05:30
Nabin Hait
7dfa1d935c [New Script Report] added report daily time log summary 2013-04-03 15:48:57 +05:30
Nabin Hait
5c1d3c5a8b [New Script Report] added report daily time log summary 2013-04-03 15:44:19 +05:30
Rushabh Mehta
b596bcbccf [desktop] [cleanup] moved to framework 2013-04-03 11:41:01 +05:30
Anand Doshi
9d601d593d removed in dialog from activity type 2013-03-28 11:49:00 +05:30
Anand Doshi
96b189c118 fixes in test cases and buying amount function 2013-03-26 18:43:10 +05:30
Rushabh Mehta
b6c117957f [fields, project] [fix] NaN bug, project gantt refresh bug 2013-03-26 13:02:22 +05:30
Anand Doshi
73ea15d2d3 for checking timelog conflicts, also check if tasks are the same 2013-03-25 12:09:24 +05:30
Anand Doshi
df6ff1385f fixes in warehouse validation 2013-03-11 19:44:52 +05:30
Anand Doshi
88ac485541 minor fixes in utils, purchase common and task 2013-03-11 14:57:45 +05:30
Anand Doshi
80f7637ae6 added print width in txts of istable type doctypes 2013-03-07 11:37:33 +05:30
Rushabh Mehta
07287e8b93 removed colour fields from txt files 2013-03-05 14:19:48 +05:30
Rushabh Mehta
5640a69e78 updated sync 2013-03-05 14:12:34 +05:30
Rushabh Mehta
3e712f212a timesheet patch update 2013-03-04 16:21:54 +05:30
Rushabh Mehta
213b180060 merge, update bean validations 2013-03-01 19:09:06 +05:30
Rushabh Mehta
fee642d547 completed Time Log / Time Log Batch 2013-03-01 18:24:52 +05:30
Rushabh Mehta
b21eb9ac09 added time log batch 2013-02-28 18:42:46 +05:30
billyfordson
9b352309c6 Adding German translation 2013-02-27 17:36:23 +01:00
Rushabh Mehta
ed19666e1b added Time Log 2013-02-26 16:36:41 +05:30
Rushabh Mehta
29786e38df added get_value, fixed appframe from Single 2013-02-26 14:27:03 +05:30
Rushabh Mehta
e4eb89b02a added new language and filters in query reports 2013-02-25 13:00:16 +05:30