Merge pull request #1321 from FHenry/3.4

Fix [ bug #1145 ] Agenda button list type do not display

ChangeLog

@@ -9,6 +9,8 @@ Fix: Option drop table into backup was broken.
 Fix: [ bug #1105 ] Searching Boxes other search option
 Fix: wrong buy price update
 Fix: [ bug #1142 ] Set paiement on invoice (PGSql)
+Fix: [ bug #1145 ] Agenda button list type do not display
+Fix: [ bug #1148 ] Product consomation : supplier order bad status
 
 ***** ChangeLog for 3.4.1 compared to 3.4.0 *****
 Fix: Display buying price on line edit when no supplier price is defined

htdocs/core/lib/agenda.lib.php

@@ -43,13 +43,11 @@
  * @param	string	$actioncode		Preselected value of actioncode for filter on type
  * @return	void
  */
-function print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirthday,$filtera,$filtert,$filterd,$pid,$socid,$showextcals=array(),$actioncode='')
+function print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, $filtera, $filtert, $filterd, $pid, $socid, $showextcals = array(), $actioncode = '') {
-{
+
 	global $conf, $user, $langs, $db;
 	
 	// Filters
-	if ($canedit || ! empty($conf->projet->enabled))
-	{
 	print '<form name="listactionsfilter" class="listactionsfilter" action="' . $_SERVER ["PHP_SELF"] . '" method="POST">';
 	print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
 	print '<input type="hidden" name="status" value="' . $status . '">';
@@ -58,14 +56,12 @@ function print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirt
 	print '<input type="hidden" name="day" value="' . $day . '">';
 	print '<input type="hidden" name="showbirthday" value="' . $showbirthday . '">';
 	print '<table class="nobordernopadding" width="100%">';
-		if ($canedit || ! empty($conf->projet->enabled))
+	
-		{
 	print '<tr><td class="nowrap">';
 	
 	print '<table class="nobordernopadding">';
 	
-			if ($canedit)
+	if ($canedit) {
-			{
 		print '<tr>';
 		print '<td class="nowrap">';
 		print $langs->trans ( "ActionsAskedBy" );
@@ -100,8 +96,7 @@ function print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirt
 		print '</td></tr>';
 	}
 	
-			if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
+	if (! empty ( $conf->projet->enabled ) && $user->rights->projet->lire) {
-			{
 		print '<tr>';
 		print '<td class="nowrap">';
 		print $langs->trans ( "Project" ) . ' &nbsp; ';
@@ -125,8 +120,7 @@ function print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirt
 	print '</td>';
 	
 	// Legend
-			if ($conf->use_javascript_ajax && is_array($showextcals))
+	if ($conf->use_javascript_ajax && is_array ( $showextcals )) {
-			{
 		print '<td align="center" valign="middle" class="nowrap">';
 		print '<script type="text/javascript">' . "\n";
 		print 'jQuery(document).ready(function () {' . "\n";
@@ -136,13 +130,10 @@ function print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirt
 		print '});' . "\n";
 		print '</script>' . "\n";
 		print '<table>';
-                if (! empty($conf->global->MAIN_JS_SWITCH_AGENDA))
+		if (! empty ( $conf->global->MAIN_JS_SWITCH_AGENDA )) {
-                {
+			if (count ( $showextcals ) > 0) {
-                    if (count($showextcals) > 0)
-                    {
 				print '<tr><td><input type="checkbox" id="check_mytasks" name="check_mytasks" checked="true" disabled="disabled"> ' . $langs->trans ( "LocalAgenda" ) . '</td></tr>';
-                        foreach($showextcals as $val)
+				foreach ( $showextcals as $val ) {
-                        {
 					$htmlname = dol_string_nospecial ( $val ['name'] );
 					print '<script type="text/javascript">' . "\n";
 					print 'jQuery(document).ready(function () {' . "\n";
@@ -159,11 +150,10 @@ function print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirt
 	}
 	
 	print '</tr>';
-		}
+	
 	print '</table>';
 	print '</form>';
 }
-}
 
 
 /**

htdocs/product/stats/commande_fournisseur.php

@@ -25,7 +25,7 @@
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
 $langs->load("orders");
@@ -136,7 +136,7 @@ if ($id > 0 || ! empty($ref))
 			print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"c.fk_statut","","&id=".$product->id,'align="right"',$sortfield,$sortorder);
 			print "</tr>\n";
 
-			$commandestatic=new Commande($db);
+			$commandestatic=new CommandeFournisseur($db);
 			
 			if ($num > 0)
 			{
@@ -146,16 +146,18 @@ if ($id > 0 || ! empty($ref))
 					$objp = $db->fetch_object($result);
 					$var=!$var;
 					
+					$commandestatic->id=$objp->commandeid;
+					$commandestatic->ref=$objp->ref;
+					$commandestatic->statut=$objp->statut;
+
 					print "<tr $bc[$var]>";
-					print '<td><a href="'.DOL_URL_ROOT.'/fourn/commande/fiche.php?id='.$objp->commandeid.'">'.img_object($langs->trans("ShowOrder"),"order").' ';
+					print '<td>'.$commandestatic->getNomUrl(1)."</td>\n";
-					print $objp->ref;
-					print "</a></td>\n";
 					print '<td><a href="'.DOL_URL_ROOT.'/fourn/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
 					print "<td>".$objp->code_client."</td>\n";
 					print "<td align=\"center\">";
 					print dol_print_date($db->jdate($objp->date_commande))."</td>";
 					print "<td align=\"right\">".price($objp->total_ht)."</td>\n";
-					print '<td align="right">'.$commandestatic->LibStatut($objp->statut,$objp->facture,5).'</td>';
+					print '<td align="right">'.$commandestatic->getLibStatut(4).'</td>';
 					print "</tr>\n";
 					$i++;
 				}