From 1154e530a717b7fccd487e9004bd97dfd64fa452 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 22 Sep 2011 09:12:42 +0000
Subject: [PATCH 1/3] Fix: doublon

---
 htdocs/comm/action/class/actioncomm.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 73f5325a470..a6672adfa93 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -233,7 +233,7 @@ class ActionComm extends CommonObject
 		$sql.= " a.datec,";
         $sql.= " a.durationp,";
 		$sql.= " a.tms as datem,";
-		$sql.= " a.note, a.label, a.fk_action as type_id,";
+		$sql.= " a.note, a.label,";
 		$sql.= " a.fk_soc,";
 		$sql.= " a.fk_project,";
 		$sql.= " a.fk_user_author, a.fk_user_mod,";

From a45211fd36b0354f2184f84f25c6618fe8e90182 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 22 Sep 2011 10:29:37 +0000
Subject: [PATCH 2/3] Fix: synchro cvs/git problem

---
 dev/phpcheckstyle/phpstandard.dtd | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 dev/phpcheckstyle/phpstandard.dtd

diff --git a/dev/phpcheckstyle/phpstandard.dtd b/dev/phpcheckstyle/phpstandard.dtd
new file mode 100644
index 00000000000..bde6e6b2b52
--- /dev/null
+++ b/dev/phpcheckstyle/phpstandard.dtd
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!ELEMENT phpcheckstyle-configuration (test+)>
+<!ELEMENT test (property*,item*,exception*)>
+<!ATTLIST test name CDATA "">
+<!ATTLIST test regexp CDATA "">
+<!ATTLIST test level CDATA "">
+<!ELEMENT property (#PCDATA)>
+<!ATTLIST property value CDATA "">
+<!ATTLIST property name CDATA "">
+<!ELEMENT item (#PCDATA)>
+<!ATTLIST item value CDATA "">
+<!ELEMENT exception (#PCDATA)>
+<!ATTLIST exception value CDATA "">

From 68fdfa374d1d61b76af7583355e22fec29aa91c3 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 22 Sep 2011 10:38:54 +0000
Subject: [PATCH 3/3] Fix: synchro cvs/git problem !!! fuck fuck fuck

---
 dev/phpcheckstyle/phpstandard.cfg.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev/phpcheckstyle/phpstandard.cfg.xml b/dev/phpcheckstyle/phpstandard.cfg.xml
index 15967aafcb2..3dd3b314660 100644
--- a/dev/phpcheckstyle/phpstandard.cfg.xml
+++ b/dev/phpcheckstyle/phpstandard.cfg.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE phpstandard SYSTEM "phpstandard.dtd">
 <!-- somewhat inspired by java checkstyle -->
 <phpcheckstyle-configuration>