Debug v20

YannisHoareau · May 28, 2024 · e2e96d4 · e2e96d4
1 parent 354f59a
commit e2e96d4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
@@ -683,7 +683,8 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				$taskstatic->label = (!empty($taskrole[$lines[$i]->id]) ? $langs->trans("YourRole").': '.$taskrole[$lines[$i]->id] : '');
 				$taskstatic->projectstatus = $lines[$i]->projectstatus;
 				$taskstatic->progress = $lines[$i]->progress;
-				$taskstatic->fk_statut = $lines[$i]->status;
+				$taskstatic->fk_statut = $lines[$i]->status;	// deprecated
+				$taskstatic->status = $lines[$i]->status;
 				$taskstatic->date_start = $lines[$i]->date_start;
 				$taskstatic->date_end = $lines[$i]->date_end;
 				$taskstatic->datee = $lines[$i]->date_end; // deprecated

diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql
@@ -90,11 +90,13 @@ create table llx_product
   volume                        float        DEFAULT NULL,
   volume_units                  tinyint      DEFAULT NULL,
   stockable_product             integer      DEFAULT 1 NOT NULL,
-  stock                         real,                               -- Current physical stock (denormalized field)
+  stock                         real,                               -- Current physical stock (DENORMALIZED FIELD)
   pmp                           double(24,8) DEFAULT 0 NOT NULL,    -- To store valuation of stock calculated using average price method, for this product
   fifo                          double(24,8),                       -- To store valuation of stock calculated using fifo method, for this product. TODO Not used, should be replaced by stock value stored into movement table.
   lifo                          double(24,8),                       -- To store valuation of stock calculated using lifo method, for this product. TODO Not used, should be replaced by stock value stored into movement table.
   fk_default_warehouse          integer      DEFAULT NULL,
+  fk_default_bom                integer      DEFAULT NULL,
+  fk_default_workstation        integer      DEFAULT NULL,
   canvas                        varchar(32)  DEFAULT NULL,
   finished                      tinyint      DEFAULT NULL,          -- see dictionary c_product_nature
   lifetime                      integer      DEFAULT NULL,
@@ -108,7 +110,5 @@ create table llx_product
   price_autogen                 tinyint      DEFAULT 0,
   fk_project                    integer      DEFAULT NULL,           -- Used when product was generated by a project or is specific to a project
   mandatory_period              tinyint      DEFAULT 0,              -- is used to signal to the user that the start and end dates are mandatory for this type of product the fk_product_type == 1 (service) (non-blocking action)
-  last_main_doc                 varchar(255),
-  fk_default_bom                integer      DEFAULT NULL,
-  fk_default_workstation        integer      DEFAULT NULL
+  last_main_doc                 varchar(255)
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql
@@ -31,7 +31,7 @@ create table llx_projet_task
   datev					datetime,						-- date validation
   label					varchar(255) NOT NULL,
   description			text,
-  duration_effective	real DEFAULT 0,					-- total of time spent on the task. A denormalized value of total of lines into llx_element_time
+  duration_effective	real DEFAULT 0,					-- total of time spent on the task. DENORMALIZED FIELD of total of lines into llx_element_time
   planned_workload		real DEFAULT 0,
   progress				integer DEFAULT 0,				-- percentage increase
   priority				integer DEFAULT 0,				-- priority

diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
@@ -524,11 +524,11 @@
 				// Statut
 				print '<td class="center">';
 				// Activation desativation du contact
-				if ($object->statut >= 0) {
+				if ($object->status >= 0) {
 					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=swapstatut&ligne='.$tab[$i]['rowid'].($withproject ? '&withproject=1' : '').'">';
 				}
 				print $contactstatic->LibStatut($tab[$i]['status'], 3);
-				if ($object->statut >= 0) {
+				if ($object->status >= 0) {
 					print '</a>';
 				}
 				print '</td>';