again revert to fk_project instead of fk_projet

htdocs/install/mysql/migration/4.0.0-5.0.0.sql

@@ -223,4 +223,4 @@ ALTER TABLE llx_links ADD UNIQUE INDEX uk_links (objectid,label);
 
 ALTER TABLE llx_c_actioncomm MODIFY COLUMN type varchar(50) DEFAULT 'system' NOT NULL;
 
-ALTER TABLE llx_loan ADD COLUMN fk_projet integer DEFAULT NULL;
+ALTER TABLE llx_loan ADD COLUMN fk_project integer DEFAULT NULL;

htdocs/install/mysql/tables/llx_loan.sql

@@ -45,8 +45,9 @@ create table llx_loan
   accountancy_account_insurance	varchar(32),
   accountancy_account_interest	varchar(32),
   
+  fk_projet						integer DEFAULT NULL,
+  
   fk_user_author				integer DEFAULT NULL,
-  fk_user_modif					integer DEFAULT NULL,
-  active						tinyint DEFAULT 1  NOT NULL,
-  fk_projet					integer DEFAULT NULL
+  fk_user_modif					integer DEFAULT NULL
+  active						tinyint DEFAULT 1  NOT NULL
 )ENGINE=innodb;

htdocs/loan/card.php

@@ -127,7 +127,7 @@ if (empty($reshook))
 				$object->rate					= $_POST["rate"];
 				$object->note_private 			= GETPOST('note_private');
 				$object->note_public 			= GETPOST('note_public');
-					$object->fk_projet 			= GETPOST('fk_projet');
+					$object->fk_project 			= GETPOST('fk_project');
 
 				$accountancy_account_capital	= GETPOST('accountancy_account_capital');
 				$accountancy_account_insurance	= GETPOST('accountancy_account_insurance');
@@ -165,7 +165,7 @@ if (empty($reshook))
 				$object->dateend	= dol_mktime(12, 0, 0, GETPOST('endmonth','int'), GETPOST('endday','int'), GETPOST('endyear','int'));
 				$object->nbterm		= GETPOST("nbterm");
 				$object->rate		= GETPOST("rate");
-					$object->fk_projet		= GETPOST("fk_projet");
+					$object->fk_project		= GETPOST("fk_project");
 			}
 
 	        $result = $object->update($user);
@@ -264,7 +264,7 @@ if ($action == 'create')
 
 		print '<tr><td>'.$langs->trans("Project").'</td><td>';
 
-		$numproject=$formproject->select_projects(-1,GETPOST("fk_projet"),'fk_projet',16,0,1,1);
+		$numproject=$formproject->select_projects(-1,GETPOST("fk_project"),'fk_project',16,0,1,1);
 
 		print '</td></tr>';
 	}
@@ -473,11 +473,11 @@ if ($id > 0)
 			print '</td><td>';
 			if ($action == 'edit') {
 				$formproject=new FormProjets($db);
-				$numproject=$formproject->select_projects(-1,$object->fk_projet,'fk_projet',16,0,1,1);
+				$numproject=$formproject->select_projects(-1,$object->fk_project,'fk_project',16,0,1,1);
 
 			} else {
 				$project=new Project($db);
-				$project->fetch($object->fk_projet);
+				$project->fetch($object->fk_project);
 				print $project->getNomUrl(1,'',1);;
 			}
 			print '</td></tr>';

htdocs/loan/class/loan.class.php

@@ -50,7 +50,7 @@ class Loan extends CommonObject
 	var $fk_bank;
 	var $fk_user_creat;
 	var $fk_user_modif;
-	var $fk_projet;
+	var $fk_project;
 
 
     /**
@@ -73,7 +73,7 @@ class Loan extends CommonObject
     function fetch($id)
     {
         $sql = "SELECT l.rowid, l.label, l.capital, l.datestart, l.dateend, l.nbterm, l.rate, l.note_private, l.note_public,";
-		$sql.= " l.paid, l.accountancy_account_capital, l.accountancy_account_insurance, l.accountancy_account_interest,l.fk_projet";
+		$sql.= " l.paid, l.accountancy_account_capital, l.accountancy_account_insurance, l.accountancy_account_interest,l.fk_project";
         $sql.= " FROM ".MAIN_DB_PREFIX."loan as l";
         $sql.= " WHERE l.rowid = ".$id;
 
@@ -100,7 +100,7 @@ class Loan extends CommonObject
 				$this->account_capital		= $obj->accountancy_account_capital;
 				$this->account_insurance	= $obj->accountancy_account_insurance;
 				$this->account_interest		= $obj->accountancy_account_interest;
-				$this->fk_projet			= $obj->fk_projet;
+				$this->fk_project			= $obj->fk_project;
 
                 $this->db->free($resql);
 				return 1;
@@ -143,7 +143,7 @@ class Loan extends CommonObject
 		if (isset($this->fk_bank)) $this->fk_bank=trim($this->fk_bank);
 		if (isset($this->fk_user_creat)) $this->fk_user_creat=trim($this->fk_user_creat);
 		if (isset($this->fk_user_modif)) $this->fk_user_modif=trim($this->fk_user_modif);
-		if (isset($this->fk_projet)) $this->fk_projet=trim($this->fk_projet);
+		if (isset($this->fk_project)) $this->fk_project=trim($this->fk_project);
 
         // Check parameters
         if (! $newcapital > 0 || empty($this->datestart) || empty($this->dateend))
@@ -161,7 +161,7 @@ class Loan extends CommonObject
 
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."loan (label, fk_bank, capital, datestart, dateend, nbterm, rate, note_private, note_public";
 		$sql.= " ,accountancy_account_capital, accountancy_account_insurance, accountancy_account_interest, entity";
-		$sql.= " ,datec,fk_projet,fk_user_author)";
+		$sql.= " ,datec,fk_project,fk_user_author)";
 		$sql.= " VALUES ('".$this->db->escape($this->label)."',";
 		$sql.= " '".$this->db->escape($this->fk_bank)."',";
         $sql.= " '".price2num($newcapital)."',";
@@ -176,7 +176,7 @@ class Loan extends CommonObject
 		$sql.= " '".$this->db->escape($this->account_interest)."',";
         $sql.= " ".$conf->entity.",";
 		$sql.= " '".$this->db->idate($now)."',";
-		$sql.= " ".(empty($this->fk_projet)?'NULL':$this->fk_projet).",";
+		$sql.= " ".(empty($this->fk_project)?'NULL':$this->fk_project).",";
 		$sql.= " ".$user->id;
         $sql.= ")";
 
@@ -284,7 +284,7 @@ class Loan extends CommonObject
         $sql.= " SET label='".$this->db->escape($this->label)."',";
         $sql.= " datestart='".$this->db->idate($this->datestart)."',";
         $sql.= " dateend='".$this->db->idate($this->dateend)."',";
-        $sql.= " fk_projet=".(empty($this->fk_projet)?'NULL':$this->fk_projet).",";
+        $sql.= " fk_project=".(empty($this->fk_project)?'NULL':$this->fk_project).",";
 		$sql.= " fk_user_modif = ".$user->id;
         $sql.= " WHERE rowid=".$this->id;