lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.4' into develop

Browse Source 
Conflicts:
	htdocs/contact/class/contact.class.php
	htdocs/product/stock/mouvement.php
This commit is contained in:
Laurent Destailleur 2013-10-10 22:59:22 +02:00
commit ef4970476a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/product/stock/mouvement.php
View File

@ -460,14 +460,14 @@ if ($resql)
print '</form>'; print '</form>';
$arrayofuniqueproduct=array(); $arrayofuniqueproduct=array();
$var=True; $var=True;
while ($i < min($num,$conf->liste_limit)) while ($i < min($num,$conf->liste_limit))
{ {
$objp = $db->fetch_object($resql); $objp = $db->fetch_object($resql);
$arrayofuniqueproduct[$objp->rowid]=$objp->produit; $arrayofuniqueproduct[$objp->rowid]=$objp->produit;
$var=!$var; $var=!$var;
print "<tr ".$bc[$var].">"; print "<tr ".$bc[$var].">";
// Id movement // Id movement
@ -517,7 +517,7 @@ if ($resql)
if (count($arrayofuniqueproduct) == 1) if (count($arrayofuniqueproduct) == 1)
{ {
$productidselected=0; $productidselected=0;
foreach ($arrayofuniqueproduct as $key => $val) foreach ($arrayofuniqueproduct as $key => $val)
{ {
$productidselected=$key; $productidselected=$key;
$productlabelselected=$val; $productlabelselected=$val;
@ -533,16 +533,16 @@ if ($resql)
//print '<td class="liste_total" colspan="6" align="right">'; //print '<td class="liste_total" colspan="6" align="right">';
print ': '.$balancebefore; print ': '.$balancebefore;
print "<br>\n"; print "<br>\n";
//print '</td></tr>'; //print '</td></tr>';
//print '<tr class="total"><td class="liste_total">'; //print '<tr class="total"><td class="liste_total">';
print $langs->trans("NbOfProductAfterPeriod", $productlabelselected, dol_print_date($dateafter,'day','gmt')); print $langs->trans("NbOfProductAfterPeriod", $productlabelselected, dol_print_date($dateafter,'day','gmt'));
//print '</td>'; //print '</td>';
//print '<td class="liste_total" colspan="6" align="right">'; //print '<td class="liste_total" colspan="6" align="right">';
print ': '.$balanceafter; print ': '.$balanceafter;
print "<br>\n"; print "<br>\n";
//print '</td></tr>'; //print '</td></tr>';
} }
} }
else else