NEW: Add project and Hook to Loan

BUG: Correct discard_closed parametters management in project
Dolibarr · Nov 14, 2016 · 081be37 · 081be37
1 parent bfd1ce0
commit 081be37
Show file tree

Hide file tree

Showing 6 changed files with 198 additions and 141 deletions.
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
@@ -79,7 +79,7 @@ function select_projects($socid=-1, $selected='', $htmlname='projectid', $maxlen
 				$project->fetch($selected);
 				$selected_input_value=$project->ref;
 			}
-			$urloption='socid='.$socid.'&htmlname='.$htmlname;
+			$urloption='socid='.$socid.'&htmlname='.$htmlname.'&discardclosed='.$discard_closed;
 			$out.=ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/projet/ajax/projects.php', $urloption, $conf->global->PROJECT_USE_SEARCH_TO_SELECT, 0, array(
 //				'update' => array(
 //					'projectid' => 'id'

diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
@@ -221,4 +221,4 @@ drop table tmp_links_double;
 
 ALTER TABLE llx_links ADD UNIQUE INDEX uk_links (objectid,label);
 
-
+ALTER TABLE llx_loan ADD COLUMN fk_project integer DEFAULT NULL;
diff --git a/htdocs/install/mysql/tables/llx_loan.sql b/htdocs/install/mysql/tables/llx_loan.sql
@@ -47,5 +47,6 @@ create table llx_loan
 
   fk_user_author				integer DEFAULT NULL,
   fk_user_modif					integer DEFAULT NULL,
-  active						tinyint DEFAULT 1  NOT NULL
+  active						tinyint DEFAULT 1  NOT NULL,
+  fk_project					integer DEFAULT NULL
 )ENGINE=innodb;