Merge branch 'master' of github.com:easysoft/zentaopms

.gitignore

@@ -1,19 +0,0 @@
-config/my.php
-www/data/
-www/install.php
-www/upgrade.php
-www/ok.txt
-tools/*
-release/*
-tmp/*
-tmp/extensions/*
-tmp/log/*
-tmp/model/*
-tmp/cache/*
-tmp/extension/*
-.gitkeep
-.bak
-.idea
-.gitignore
-_log
-framework/

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

db/update9.5.1.sql

@@ -27,3 +27,15 @@ CREATE TABLE IF NOT EXISTS `zt_webhook` (
   `editedDate` datetime NOT NULL,
   PRIMARY KEY `id` (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+ALTER TABLE `zt_task` ADD `parent` INT(11)  NULL  DEFAULT '0'  AFTER `deleted`;
+ALTER TABLE `zt_team` ADD `task` INT(11)  NULL  DEFAULT '0'  AFTER `project`;
+ALTER TABLE `zt_team` ADD `estimate` DECIMAL(12,2)  UNSIGNED  NOT NULL  DEFAULT '0';
+ALTER TABLE `zt_team` ADD `consumed` DECIMAL(12,2)  UNSIGNED  NOT NULL  DEFAULT '0'  AFTER `estimate`;
+ALTER TABLE `zt_team` ADD `left` DECIMAL(12,2)  UNSIGNED  NOT NULL  DEFAULT '0'  AFTER `consumed`;
+ALTER TABLE `zt_team` ADD `order` TINYINT(3)  NOT NULL  DEFAULT '0' AFTER `left`;
+ALTER TABLE `zt_team` CHANGE `days` `days` SMALLINT(5)  UNSIGNED  NOT NULL  DEFAULT '0';
+
+
+ALTER TABLE `zt_team` DROP PRIMARY KEY;
+ALTER TABLE `zt_team` ADD PRIMARY KEY (`project`, `task`, `account`);

framework/helper.class.php

@@ -140,12 +140,4 @@ function formatTime($time, $format = '')
     if(trim($time) == '') return ;
     if($format) return date($format, strtotime($time));
     return trim($time);
-}
-
-function b($val)
-{
-    echo '<pre>';
-    print_r($val);
-    echo '</pre>';
-    exit;
 }