+
del_sousproduit($id_pere, $id_fils);
if ($result < 0) return $result;
-
+
// Check not already father of id_pere (to avoid father -> child -> father links)
$sql = 'SELECT fk_product_pere from '.MAIN_DB_PREFIX.'product_association';
$sql .= ' WHERE fk_product_pere = '.$id_fils.' AND fk_product_fils = '.$id_pere;
@@ -1852,11 +1852,11 @@ class Product extends CommonObject
{
if (! is_numeric($fk_parent)) $fk_parent=0;
if (! is_numeric($fk_child)) $fk_child=0;
-
+
$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_association";
$sql.= " WHERE fk_product_pere = ".$fk_parent;
$sql.= " AND fk_product_fils = ".$fk_child;
-
+
dol_syslog(get_class($this).'::del_sousproduit sql='.$sql);
if (! $this->db->query($sql))
{
@@ -2122,7 +2122,7 @@ class Product extends CommonObject
* Define value of this->res
*
* @param array $prod Products array
- * @param string $compl_path Directory path
+ * @param string $compl_path Directory path of parents to add before
* @param int $multiply Because each sublevel must be multiplicated by parent nb
* @param int $level Init level
* @return void
@@ -2132,65 +2132,36 @@ class Product extends CommonObject
global $conf,$langs;
$product = new Product($this->db);
- foreach($prod as $nom_pere => $desc_pere)
+ //var_dump($prod);
+ foreach($prod as $id_product => $desc_pere) // nom_pere is 0 or id of sub_product
{
if (is_array($desc_pere)) // If this parent desc is an array, this is an array of childs
{
$id=(! empty($desc_pere[0]) ? $desc_pere[0] :'');
$nb=(! empty($desc_pere[1]) ? $desc_pere[1] :'');
$type=(! empty($desc_pere[2]) ? $desc_pere[2] :'');
+ $label=(! empty($desc_pere[3]) ? $desc_pere[3] :'');
+ if ($multiply < 1) $multiply=1;
- if ($multiply)
- {
- //print "XXX ".$desc_pere[1]." multiply=".$multiply;
- $img="";
- $this->fetch($id);
- $this->load_stock();
- if ($this->stock_warehouse[1]->real < $this->seuil_stock_alerte)
- {
- $img=img_warning($langs->trans("StockTooLow"));
- }
- $this->res[]= array(
-/* "
| ->
- ".$compl_path.stripslashes($nom_pere)."
- (".$desc_pere[1].") | ".($desc_pere[1]*$multiply)." | | |
- ".$this->stock_entrepot[1]." ".$img." |
",
- $desc_pere[0], // Id product
-*/ 'id'=>$id, // Id product
- 'nb'=>$nb, // Nb of units that compose parent product
- 'nb_total'=>$nb*$multiply, // Nb of units for all nb of product
- 'stock'=>$this->stock_warehouse[1]->real, // Stock
- 'stock_alert'=>$this->seuil_stock_alerte, // Stock alert
- 'fullpath' => $compl_path.$nom_pere, // Label
- 'type'=>$type // Nb of units that compose parent product
- );
- }
- else
- {
- $this->fetch($desc_pere[0]);
- $this->load_stock();
- $this->res[]= array(
-/* $compl_path.$nom_pere." (".$desc_pere[1].")",
- $desc_pere[0], // Id product
-*/ 'id'=>$id, // Id product
+ //print "XXX We add id=".$id." - label=".$label." - nb=".$nb." - multiply=".$multiply." fullpath=".$compl_path.$label."\n";
+ $this->fetch($id);
+ $this->load_stock();
+ $this->res[]= array(
+ 'id'=>$id, // Id product
'nb'=>$nb, // Nb of units that compose parent product
- 'nb_total'=>$nb, // Nb of units for all nb of product
- 'stock'=>$this->stock_warehouse[1]->real, // Stock
+ 'nb_total'=>$nb*$multiply, // Nb of units for all nb of product
+ 'stock'=>$this->stock_warehouse[1]->real, // Stock
'stock_alert'=>$this->seuil_stock_alerte, // Stock alert
- 'fullpath' => $compl_path.$nom_pere, // Label
- 'type'=>$type // Nb of units that compose parent product
- );
- }
- }
- else if($nom_pere != "0" && $nom_pere != "1")
- {
- $this->res[]= array($compl_path.$nom_pere,$desc_pere);
+ 'fullpath' => $compl_path.$label, // Label
+ 'type'=>$type // Nb of units that compose parent product
+ );
}
// Recursive call if child is an array
- if (is_array($desc_pere[0]))
+ if (is_array($desc_pere['childs']))
{
- $this ->fetch_prod_arbo($desc_pere[0], $nom_pere." -> ", $desc_pere[1]*$multiply, $level+1);
+ //print 'YYY We go down for '.$desc_pere[3]." -> \n";
+ $this ->fetch_prod_arbo($desc_pere['childs'], $compl_path.$desc_pere[3]." -> ", $desc_pere[1]*$multiply, $level+1);
}
}
}
@@ -2227,11 +2198,12 @@ class Product extends CommonObject
$this->res = array();
if (isset($this->sousprods) && is_array($this->sousprods))
{
- foreach($this->sousprods as $nom_pere => $desc_pere)
+ foreach($this->sousprods as $prod_name => $desc_product)
{
- if (is_array($desc_pere)) $this->fetch_prod_arbo($desc_pere,"",$multiply);
+ if (is_array($desc_product)) $this->fetch_prod_arbo($desc_product,"",$multiply);
}
}
+ //var_dump($this->res);
return $this->res;
}
@@ -2292,7 +2264,7 @@ class Product extends CommonObject
/**
- * Return all parent products fo current product
+ * Return all direct parent products fo current product
*
* @return array prod
*/
@@ -2323,19 +2295,19 @@ class Product extends CommonObject
}
/**
- * Return childs of product with if fk_parent
+ * Return childs of product $id
*
- * @param int $fk_parent Id of product to search childs of
+ * @param int $id Id of product to search childs of
* @return array Prod
*/
- function getChildsArbo($fk_parent)
+ function getChildsArbo($id)
{
$sql = "SELECT p.rowid, p.label as label, pa.qty as qty, pa.fk_product_fils as id, p.fk_product_type";
$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
$sql.= ", ".MAIN_DB_PREFIX."product_association as pa";
$sql.= " WHERE p.rowid = pa.fk_product_fils";
- $sql.= " AND pa.fk_product_pere = ".$fk_parent;
- $sql.= " AND pa.fk_product_fils != ".$fk_parent; // This should not happens, it is to avoid invinite loop if it happens
+ $sql.= " AND pa.fk_product_pere = ".$id;
+ $sql.= " AND pa.fk_product_fils != ".$id; // This should not happens, it is to avoid infinite loop if it happens
dol_syslog(get_class($this).'::getChildsArbo sql='.$sql);
$res = $this->db->query($sql);
@@ -2350,7 +2322,7 @@ class Product extends CommonObject
$listofchilds=$this->getChildsArbo($rec['id']);
foreach($listofchilds as $keyChild => $valueChild)
{
- $prods[$rec['rowid']][$keyChild] = $valueChild;
+ $prods[$rec['rowid']]['childs'][$keyChild] = $valueChild;
}
}
@@ -2372,14 +2344,14 @@ class Product extends CommonObject
function get_sousproduits_arbo()
{
$parent = $this->getParent();
- foreach($parent as $key => $value)
+ foreach($parent as $key => $value) // key=label, value[0]=id
{
foreach($this->getChildsArbo($value[0]) as $keyChild => $valueChild)
{
$parent[$key][$keyChild] = $valueChild;
}
}
- foreach($parent as $key => $value)
+ foreach($parent as $key => $value) // key=label, value is array of childs
{
$this->sousprods[$key] = $value;
}
@@ -2417,7 +2389,7 @@ class Product extends CommonObject
else if ($option == 'category')
{
$lien = '
';
- }
+ }
else
{
$lien = '';
diff --git a/htdocs/product/composition/fiche.php b/htdocs/product/composition/fiche.php
index 395275a9911..71ce35c76e1 100644
--- a/htdocs/product/composition/fiche.php
+++ b/htdocs/product/composition/fiche.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2004-2011 Laurent Destailleur
+ * Copyright (C) 2004-2013 Laurent Destailleur
* Copyright (C) 2005 Eric Seigne
* Copyright (C) 2005-2012 Regis Houssin
* Copyright (C) 2006 Andre Cianfarani
@@ -198,15 +198,18 @@ if ($id || $ref)
print '';
// Number of subproducts
- $prodsfather = $product->getFather(); //Parent Products
+ $prodsfather = $product->getFather(); // Parent Products
$product->get_sousproduits_arbo();
- print '| '.$langs->trans("AssociatedProductsNumber").' | '.count($product->get_arbo_each_prod()).' | ';
+ $prods_arbo=$product->get_arbo_each_prod();
+ $nbofsubproducts=count($prods_arbo);
+ print '
| '.$langs->trans("AssociatedProductsNumber").' | ';
+ print $form->textwithpicto($nbofsubproducts, $langs->trans('IfZeroItIsNotAVirtualProduct'));
+ print ' | ';
dol_fiche_end();
- // List of subproducts
- $prods_arbo = $product->get_arbo_each_prod();
+ // List of products into this virtual product
if (count($prods_arbo) > 0)
{
print '
';
@@ -223,6 +226,7 @@ if ($id || $ref)
//print $productstatic->getNomUrl(1).'
';
//print $value[0]; // This contains a tr line.
print ' |
';
+ //print '| '.$productstatic->getNomUrl(1,'composition').' ('.$value['nb'].($value['nb_total'] > $value['nb']?'->'.$value['nb_total']:'').') | ';
print ''.$productstatic->getNomUrl(1,'composition').' ('.$value['nb'].') | ';
if (! empty($conf->stock->enabled)) print ''.$langs->trans("Stock").' : '.$productstatic->stock_reel.' | ';
print '
';
@@ -231,8 +235,10 @@ if ($id || $ref)
print '';
}
- // Number of parent products
- print '| '.$langs->trans("ParentProductsNumber").' | '.count($prodsfather).' | ';
+ // Number of parent virtual products
+ print '
| '.$langs->trans("ParentProductsNumber").' | ';
+ print $form->textwithpicto(count($prodsfather), $langs->trans('IfZeroItIsNotUsedByVirtualProduct'));
+ print ' | ';
if (count($prodsfather) > 0)
{
@@ -286,12 +292,14 @@ if ($id || $ref)
// Number of subproducts
$prodsfather = $product->getFather(); //Parent Products
$product->get_sousproduits_arbo();
- print '
| '.$langs->trans("AssociatedProductsNumber").' | '.count($product->get_arbo_each_prod()).' | ';
+ $prods_arbo=$product->get_arbo_each_prod();
+ $nbofsubproducts=count($prods_arbo);
+ print '
| '.$langs->trans("AssociatedProductsNumber").' | ';
+ print $form->textwithpicto($nbofsubproducts, $langs->trans('IfZeroItIsNotAVirtualProduct'));
+ print ' | ';
print '
';
// List of subproducts
- $prods_arbo = $product->get_arbo_each_prod();
- //var_dump($prods_arbo);
if(count($prods_arbo) > 0)
{
print '| ';
@@ -316,8 +324,10 @@ if ($id || $ref)
print ' |
';
}
- // Number of parent products
- print '| '.$langs->trans("ParentProductsNumber").' | '.count($prodsfather).' | ';
+ // Number of parent virtual products
+ print '
| '.$langs->trans("ParentProductsNumber").' | ';
+ print $form->textwithpicto(count($prodsfather), $langs->trans('IfZeroItIsNotUsedByVirtualProduct'));
+ print ' | ';
if (count($prodsfather) > 0)
{
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index ac29870106b..a177ddf838b 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -183,6 +183,7 @@ class Task extends CommonObject
$sql.= " t.label,";
$sql.= " t.description,";
$sql.= " t.duration_effective,";
+ $sql.= " t.datec,";
$sql.= " t.dateo,";
$sql.= " t.datee,";
$sql.= " t.fk_user_creat,";
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 5d42a44d54b..90adc2925c2 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -93,7 +93,11 @@ if ($id > 0 || ! empty($ref))
{
$projectstatic->fetch($object->fk_project);
- if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid);
+ if (! empty($projectstatic->socid)) {
+ $projectstatic->fetch_thirdparty();
+ }
+
+ $object->project = dol_clone($projectstatic);
$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($object->ref);
}
@@ -114,7 +118,7 @@ if ($action=='delete')
{
$langs->load("other");
$file = $upload_dir . '/' . GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
- $ret=dol_delete_file($file);
+ $ret=dol_delete_file($file,0,0,0,$object);
if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php
index c5e92cdcb1b..ef50c010fec 100755
--- a/htdocs/theme/amarok/style.css.php
+++ b/htdocs/theme/amarok/style.css.php
@@ -349,6 +349,8 @@ div.tmenu ul li a.tmenusel {/* texte du menu principal sélectionné */
/* Login */
+body.body center { color:white; margin-top: 100px; }
+
form#login {
display:block;
border:solid 1px rgba(0,0,0,.4);
@@ -493,6 +495,10 @@ img.login, img.printer, img.entity {
font-weight:bold;
}
+div.login_main_home {
+ color: #000000;
+}
+
/* ============================================================================== */
/* Menu gauche */
@@ -913,7 +919,7 @@ div.fichehalfright {
dol_optimize_smallscreen)) { print "width: 50%;\n"; } ?>
}
div.ficheaddleft {
- dol_optimize_smallscreen)) { print "padding-left: 16px;\n"; }
+ dol_optimize_smallscreen)) { print "padding-left: 16px;\n"; }
else print "margin-top: 10px;\n"; ?>
}
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 43af5fc2482..bcfb9a051bd 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1326,7 +1326,7 @@ a.tabTitle {
text-shadow:1px 1px 1px #ffffff;
font-family: ;
font-weight: normal;
- padding: 5px 6px 2px 6px;
+ padding: 4px 6px 2px 6px;
margin: 0px 6px;
text-decoration: none;
white-space: nowrap;
@@ -1334,7 +1334,7 @@ a.tabTitle {
a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
font-family: ;
- padding: 5px 6px 2px 6px;
+ padding: 4px 6px 2px 6px;
margin: 0em 0.2em;
text-decoration: none;
white-space: nowrap;