Merge branch 'Upstream/develop'

2014-06-15 22:14:34 +02:00 · 2014-06-15 22:14:34 +02:00 · b9c1da7d27
commit b9c1da7d27
parent 8490a415c3 e6d407d418
23 changed files with 141 additions and 36 deletions
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@ -473,7 +473,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
 					$result = $interface->run_triggers('PROPAL_SENTBYMAIL', $object, $user, $langs, $conf);
 					if ($result < 0) {
 						$error ++;
-						$this->errors = $interface->errors;
+						$object->errors = $interface->errors;
 					}
 					// Fin appel triggers

--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@ -784,8 +784,8 @@ if ($id > 0 || ! empty($ref))
 			print '<tr class="liste_total"><td align="left" colspan="8">';
 			if ($sep > 0) print '&nbsp;';	// If we had at least one line in future
 			else print $langs->trans("CurrentBalance");
-			print '</td>';
-			print '<td align="right" nowrap><b>'.price($total).'</b></td>';
+			print ' '.$object->currency_code.'</td>';
+			print '<td align="right" nowrap><b>'.price($total, 0, $langs, 0, 0, -1, $object->currency_code).'</b></td>';
 			print '<td>&nbsp;</td>';
 			print '</tr>';
 		}
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@ -90,7 +90,7 @@ print '<td align="center" width="70">'.$langs->trans("Status").'</td>';
 print '<td align="right" width="100">'.$langs->trans("BankBalance").'</td>';
 print "</tr>\n";

-$total = 0; $found = 0;
+$total = array(); $found = 0;
 $var=true;
 foreach ($accounts as $key=>$type)
 {
@ -119,17 +119,19 @@ foreach ($accounts as $key=>$type)
 		print '</td>';
 		print '<td align="center">'.$acc->getLibStatut(2).'</td>';
 		print '<td align="right">';
-		print '<a href="account.php?account='.$acc->id.'">'.price($solde).'</a>';
+		print '<a href="account.php?account='.$acc->id.'">'.price($solde, 0, $langs, 0, 0, -1, $acc->currency_code).'</a>';
 		print '</td>';
 		print '</tr>';

-		$total += $solde;
+		$total[$acc->currency_code] += $solde;
 	}
 }
 if (! $found) print '<tr '.$bc[$var].'><td colspan="6">'.$langs->trans("None").'</td></tr>';
 // Total
-print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total").'</td><td align="right" class="liste_total">'.price($total).'</td></tr>';
-
+foreach ($total as $key=>$solde)
+{
+	print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total ").$key.'</td><td align="right" class="liste_total">'.price($solde, 0, $langs, 0, 0, -1, $key).'</td></tr>';
+}

 //print '<tr><td colspan="5">&nbsp;</td></tr>';

@ -144,7 +146,7 @@ print '<td align="center" width="70">'.$langs->trans("Status").'</td>';
 print '<td align="right" width="100">'.$langs->trans("BankBalance").'</td>';
 print "</tr>\n";

-$total = 0; $found = 0;
+$total = array(); $found = 0;
 $var=true;
 foreach ($accounts as $key=>$type)
 {
@ -165,16 +167,19 @@ foreach ($accounts as $key=>$type)
 		print '<td>&nbsp;</td>';
 		print '<td align="center">'.$acc->getLibStatut(2).'</td>';
 		print '<td align="right">';
-		print '<a href="account.php?account='.$acc->id.'">'.price($solde).'</a>';
+		print '<a href="account.php?account='.$acc->id.'">'.price($solde, 0, $langs, 0, 0, -1, $acc->currency_code).'</a>';
 		print '</td>';
 		print '</tr>';

-		$total += $solde;
+		$total[$acc->currency_code] += $solde;
 	}
 }
 if (! $found) print '<tr '.$bc[$var].'><td colspan="6">'.$langs->trans("None").'</td></tr>';
 // Total
-print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total").'</td><td align="right" class="liste_total">'.price($total).'</td></tr>';
+foreach ($total as $key=>$solde)
+{
+	print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total ").$key.'</td><td align="right" class="liste_total">'.price($solde, 0, $langs, 0, 0, -1, $key).'</td></tr>';
+}



@ -193,7 +198,7 @@ print '<td align="center" width="70">'.$langs->trans("Status").'</td>';
 print '<td align="right" width="100">'.$langs->trans("BankBalance").'</td>';
 print "</tr>\n";

-$total = 0; $found = 0;
+$total = array(); $found = 0;
 $var=true;
 foreach ($accounts as $key=>$type)
 {
@ -222,16 +227,19 @@ foreach ($accounts as $key=>$type)
 		print '</td>';
 		print '<td align="center">'.$acc->getLibStatut(2).'</td>';
 		print '<td align="right">';
-		print '<a href="account.php?account='.$acc->id.'">'.price($solde).'</a>';
+		print '<a href="account.php?account='.$acc->id.'">'.price($solde, 0, $langs, 0, 0, -1, $acc->currency_code).'</a>';
 		print '</td>';
 		print '</tr>';

-		$total += $solde;
+		$total[$acc->currency_code] += $solde;
 	}
 }
 if (! $found) print '<tr '.$bc[$var].'><td colspan="6">'.$langs->trans("None").'</td></tr>';
 // Total
-print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total").'</td><td align="right" class="liste_total">'.price($total).'</td></tr>';
+foreach ($total as $key=>$solde)
+{
+	print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total ").$key.'</td><td align="right" class="liste_total">'.price($solde, 0, $langs, 0, 0, -1, $key).'</td></tr>';
+}

 print "</table>";

--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@ -1607,7 +1607,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 					$result = $interface->run_triggers('BILL_SENTBYMAIL', $object, $user, $langs, $conf);
 					if ($result < 0) {
 						$error ++;
-						$this->errors = $interface->errors;
+						$object->errors = $interface->errors;
 					}
 					// Fin appel triggers

--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@ -1128,6 +1128,10 @@ class Expedition extends CommonObject

 				// Eat-by date
 				if (! empty($conf->productbatch->enabled)) {
+                    /* test on conf at begining of file sometimes doesn't include expeditionbatch
+                     * May be conf is not well initialized for dark reason 
+                     */
+                    require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
 					$line->detail_batch=ExpeditionLigneBatch::FetchAll($this->db,$obj->line_id);
 				}
 				$this->lines[$i] = $line;
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@ -500,7 +500,7 @@ if ($action == 'send' && ! GETPOST('addfile','alpha') && ! GETPOST('removedfile'
                        $interface=new Interfaces($db);
                        $result=$interface->run_triggers('SHIPPING_SENTBYMAIL',$object,$user,$langs,$conf);
                        if ($result < 0) {
-                            $error++; $this->errors=$interface->errors;
+                            $error++; $object->errors=$interface->errors;
                        }
                        // Fin appel triggers

@ -863,7 +863,7 @@ if ($action == 'create')
                    if (($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES)) || $defaultqty < 0) $defaultqty=0;
                }

-				if (empty($conf->productbatch->enabled) ||  ! ($product->hasbatch() and is_array($product->stock_warehouse[GETPOST('entrepot_id','int')]))) 
+                if (empty($conf->productbatch->enabled) ||  ! ($product->hasbatch() and is_object($product->stock_warehouse[GETPOST('entrepot_id','int')]))) 
 				{
 	                // Quantity to send
 	                print '<td align="center">';
--- a/htdocs/fichinter/fiche.php
+++ b/htdocs/fichinter/fiche.php
@ -730,7 +730,7 @@ if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MA
 				$interface=new Interfaces($db);
 				$result=$interface->run_triggers('FICHINTER_SENTBYMAIL',$object,$user,$langs,$conf);
 				if ($result < 0) {
-					$error++; $this->errors=$interface->errors;
+					$error++; $object->errors=$interface->errors;
 				}
 				// Fin appel triggers

--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@ -911,7 +911,7 @@ if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_P
                        $interface=new Interfaces($db);
                        $result=$interface->run_triggers('BILL_SUPPLIER_SENTBYMAIL',$object,$user,$langs,$conf);
                        if ($result < 0) {
-                            $error++; $this->errors=$interface->errors;
+                            $error++; $object->errors=$interface->errors;
                        }
                        // Fin appel triggers

--- a/htdocs/fourn/paiement/fiche.php
+++ b/htdocs/fourn/paiement/fiche.php
@ -103,7 +103,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->fournisse
 	}
 }

-if ($action == 'setnum' && ! empty($_POST['num_paiement']))
+if ($action == 'setnum_paiement' && ! empty($_POST['num_paiement']))
 {
 	$object->fetch($id);
    $res = $object->update_num($_POST['num_paiement']);
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@ -83,6 +83,8 @@ class Project extends CommonObject
        $error = 0;
        $ret = 0;

+        $now=dol_now();
+
        // Check parameters
        if (!trim($this->ref))
        {
@ -113,9 +115,9 @@ class Project extends CommonObject
        $sql.= ", " . $user->id;
        $sql.= ", 0";
        $sql.= ", " . ($this->public ? 1 : 0);
-        $sql.= ", " . $this->db->idate(dol_now());
-        $sql.= ", " . ($this->date_start != '' ? $this->db->idate($this->date_start) : 'null');
-        $sql.= ", " . ($this->date_end != '' ? $this->db->idate($this->date_end) : 'null');
+        $sql.= ", '".$this->db->idate($now)."'";
+        $sql.= ", " . ($this->date_start != '' ? "'".$this->db->idate($this->date_start)."'" : 'null');
+        $sql.= ", " . ($this->date_end != '' ? "'".$this->db->idate($this->date_end)."'" : 'null');
        $sql.= ", ".$conf->entity;
        $sql.= ")";

--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@ -192,6 +192,16 @@ if ($id > 0 || ! empty($ref))
 		// Statut
 		print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';

+	   	// Date start
+		print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
+		print dol_print_date($object->date_start,'day');
+		print '</td></tr>';
+
+		// Date end
+		print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
+		print dol_print_date($object->date_end,'day');
+		print '</td></tr>';
+
 		print "</table>";

 		print '</div>';
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@ -128,6 +128,16 @@ print '</td></tr>';
 // Statut
 print '<tr><td>'.$langs->trans("Status").'</td><td>'.$project->getLibStatut(4).'</td></tr>';

+// Date start
+print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
+print dol_print_date($object->date_start,'day');
+print '</td></tr>';
+
+// Date end
+print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
+print dol_print_date($object->date_end,'day');
+print '</td></tr>';
+
 print '</table>';

 print '</div>';
--- a/htdocs/projet/ganttchart.inc.php
+++ b/htdocs/projet/ganttchart.inc.php
@ -16,7 +16,7 @@
 */

 /**
- *	\file       htdocs/projet/ganttchart.php
+ *	\file       htdocs/projet/ganttchart.inc.php
 *	\ingroup    projet
 *	\brief      Gantt diagram of a project
 */
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@ -137,6 +137,17 @@ if ($id > 0 || ! empty($ref))
    // Statut
    print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';

+   	// Date start
+	print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
+	print dol_print_date($object->date_start,'day');
+	print '</td></tr>';
+
+	// Date end
+	print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
+	print dol_print_date($object->date_end,'day');
+	print '</td></tr>';
+
+
    print '</table>';

    print '</div>';
@ -184,8 +195,8 @@ if (count($tasksarray)>0)

 	// Show Gant diagram from $taskarray using JSGantt

-	$dateformat=$langs->trans("FormatDateShort");				// Used by include ganttchart.php later
-	$dateformat=$langs->trans("FormatDateShortJQuery");			// Used by include ganttchart.php later
+	$dateformat=$langs->trans("FormatDateShort");				// Used by include ganttchart.inc.php later
+	$dateformat=$langs->trans("FormatDateShortJQuery");			// Used by include ganttchart.inc.php later
 	$array_contacts=array();
 	$tasks=array();
 	$project_dependencies=array();
@ -244,7 +255,7 @@ if (count($tasksarray)>0)
 	{
 	    //var_dump($_SESSION);
 		print '<div id="tabs" class="ganttcontainer" style="border: 1px solid #ACACAC;">'."\n";
-		include_once DOL_DOCUMENT_ROOT.'/projet/ganttchart.php';
+		include_once DOL_DOCUMENT_ROOT.'/projet/ganttchart.inc.php';
 		print '</div>'."\n";
 	}
 	else
--- a/htdocs/projet/note.php
+++ b/htdocs/projet/note.php
@ -118,6 +118,16 @@ if ($id > 0 || ! empty($ref))
 		// Statut
 		print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';

+	   	// Date start
+		print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
+		print dol_print_date($object->date_start,'day');
+		print '</td></tr>';
+
+		// Date end
+		print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
+		print dol_print_date($object->date_end,'day');
+		print '</td></tr>';
+
 		print "</table>";

 		print '<br>';
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@ -232,12 +232,12 @@ if ($id > 0 || ! empty($ref))

 	// Date start
 	print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
-	print dol_print_date($object->date_start,'dayhour');
+	print dol_print_date($object->date_start,'day');
 	print '</td></tr>';

 	// Date end
 	print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
-	print dol_print_date($object->date_end,'dayhour');
+	print dol_print_date($object->date_end,'day');
 	print '</td></tr>';

 	// Other options
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@ -202,6 +202,16 @@ if ($id > 0 || ! empty($ref))
    		// Statut
    		print '<tr><td>'.$langs->trans("Status").'</td><td>'.$projectstatic->getLibStatut(4).'</td></tr>';

+		   	// Date start
+			print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
+			print dol_print_date($projectstatic->date_start,'day');
+			print '</td></tr>';
+
+			// Date end
+			print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
+			print dol_print_date($projectstatic->date_end,'day');
+			print '</td></tr>';
+
    		print '</table>';

    		dol_fiche_end();
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@ -166,6 +166,16 @@ if ($object->id > 0)
 		// Statut
 		print '<tr><td>'.$langs->trans("Status").'</td><td>'.$projectstatic->getLibStatut(4).'</td></tr>';

+	   	// Date start
+		print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
+		print dol_print_date($projectstatic->date_start,'day');
+		print '</td></tr>';
+
+		// Date end
+		print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
+		print dol_print_date($projectstatic->date_end,'day');
+		print '</td></tr>';
+
 		print '</table>';

 		dol_fiche_end();
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@ -148,6 +148,16 @@ if ($object->id > 0)
 		// Statut
 		print '<tr><td>'.$langs->trans("Status").'</td><td>'.$projectstatic->getLibStatut(4).'</td></tr>';

+	   	// Date start
+		print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
+		print dol_print_date($projectstatic->date_start,'day');
+		print '</td></tr>';
+
+		// Date end
+		print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
+		print dol_print_date($projectstatic->date_end,'day');
+		print '</td></tr>';
+
 		print '</table>';

 		dol_fiche_end();
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@ -243,6 +243,16 @@ if ($id > 0 || ! empty($ref))
 			// Statut
 			print '<tr><td>'.$langs->trans("Status").'</td><td>'.$projectstatic->getLibStatut(4).'</td></tr>';

+		   	// Date start
+			print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
+			print dol_print_date($projectstatic->date_start,'day');
+			print '</td></tr>';
+
+			// Date end
+			print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
+			print dol_print_date($projectstatic->date_end,'day');
+			print '</td></tr>';
+
 			print '</table>';

 			dol_fiche_end();
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@ -234,6 +234,16 @@ if ($id > 0 || ! empty($ref))
 			// Statut
 			print '<tr><td>'.$langs->trans("Status").'</td><td>'.$projectstatic->getLibStatut(4).'</td></tr>';

+			// Date start
+			print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
+			print dol_print_date($projectstatic->date_start,'day');
+			print '</td></tr>';
+
+			// Date end
+			print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
+			print dol_print_date($projectstatic->date_end,'day');
+			print '</td></tr>';
+
 			print '</table>';

 			dol_fiche_end();
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@ -432,12 +432,12 @@ if (empty($reshook))

                	$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
                	$sql.= " SET fk_soc = NULL WHERE fk_soc = " . $id;
-                	dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
-                	if (! $this->db->query($sql))
+                	dol_syslog(get_class($object)."::delete sql=".$sql, LOG_DEBUG);
+                	if (! $object->db->query($sql))
                	{
                		$error++;
-                		$this->error .= $this->db->lasterror();
-                		dol_syslog(get_class($this)."::delete erreur -1 ".$this->error, LOG_ERR);
+                		$object->error .= $object->db->lasterror();
+                		dol_syslog(get_class($object)."::delete erreur -1 ".$object->error, LOG_ERR);
                	}
                }

--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@ -385,7 +385,7 @@ class UserGroup extends CommonObject

 			// Pour compatibilite, si lowid = 0, on est en mode suppression de tout
 			// TODO A virer quand sera gere par l'appelant
-			if (substr($rid,-1,1) == 0) $wherefordel="module='$module'";
+			//if (substr($rid,-1,1) == 0) $wherefordel="module='$module'";
 		}
 		else {
 			// Where pour la liste des droits a supprimer