Look: Modif esthétiques mineures
This commit is contained in:
parent
1b6d7d5de4
commit
5dbf26a344
@ -849,6 +849,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status)
|
|||||||
|
|
||||||
// Liste de "Mes propals"
|
// Liste de "Mes propals"
|
||||||
print '<tr><td width="50%" valign="top">';
|
print '<tr><td width="50%" valign="top">';
|
||||||
|
|
||||||
$sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.ref,".$db->pdate("p.datep")." as dp";
|
$sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.ref,".$db->pdate("p.datep")." as dp";
|
||||||
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
|
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
|
||||||
$sql .=" WHERE p.fk_soc = s.idp AND p.fk_statut = 0 AND p.fk_user_author = ".$user->id;
|
$sql .=" WHERE p.fk_soc = s.idp AND p.fk_statut = 0 AND p.fk_user_author = ".$user->id;
|
||||||
@ -902,12 +903,14 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status)
|
|||||||
// Liste de "Other propals"
|
// Liste de "Other propals"
|
||||||
print '<td width="50%" valign="top">';
|
print '<td width="50%" valign="top">';
|
||||||
|
|
||||||
|
$var=true;
|
||||||
$otherprop = $propal->liste_array(1, ' <> '.$user->id);
|
$otherprop = $propal->liste_array(1, ' <> '.$user->id);
|
||||||
|
print '<table class="noborder" width="100%">';
|
||||||
|
|
||||||
if (is_array($otherprop) && sizeof($otherprop))
|
if (is_array($otherprop) && sizeof($otherprop))
|
||||||
{
|
{
|
||||||
$var=false;
|
$var=!$var;
|
||||||
print '<form method="POST" action="fiche.php?id='.$product->id.'">';
|
print '<form method="POST" action="fiche.php?id='.$product->id.'">';
|
||||||
print '<table class="noborder" width="100%">';
|
|
||||||
print '<tr '.$bc[$var].'><td colspan="3">';
|
print '<tr '.$bc[$var].'><td colspan="3">';
|
||||||
print '<input type="hidden" name="action" value="addinpropal">';
|
print '<input type="hidden" name="action" value="addinpropal">';
|
||||||
print $langs->trans("OtherPropals").'</td><td>';
|
print $langs->trans("OtherPropals").'</td><td>';
|
||||||
@ -919,13 +922,15 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status)
|
|||||||
print '</td><td align="right">';
|
print '</td><td align="right">';
|
||||||
print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
|
print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
print '</table>';
|
|
||||||
print '</form>';
|
print '</form>';
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
print "<tr ".$bc[!$var]."><td>";
|
||||||
print $langs->trans("NoOtherOpenedPropals");
|
print $langs->trans("NoOtherOpenedPropals");
|
||||||
|
print '</td></tr>';
|
||||||
}
|
}
|
||||||
|
print '</table>';
|
||||||
|
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
@ -969,7 +974,8 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status)
|
|||||||
$num = $db->num_rows($result);
|
$num = $db->num_rows($result);
|
||||||
$var=true;
|
$var=true;
|
||||||
print '<table class="noborder" width="100%">';
|
print '<table class="noborder" width="100%">';
|
||||||
if ($num) {
|
if ($num)
|
||||||
|
{
|
||||||
$i = 0;
|
$i = 0;
|
||||||
while ($i < $num)
|
while ($i < $num)
|
||||||
{
|
{
|
||||||
@ -994,10 +1000,11 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status)
|
|||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else
|
||||||
print "<tr $bc[$var]><td>";
|
{
|
||||||
|
print "<tr ".$bc[!$var]."><td>";
|
||||||
print $langs->trans("NoOpenedOrders");
|
print $langs->trans("NoOpenedOrders");
|
||||||
print "</td></tr>";
|
print '</td></tr>';
|
||||||
}
|
}
|
||||||
print "</table>";
|
print "</table>";
|
||||||
$db->free($result);
|
$db->free($result);
|
||||||
@ -1010,12 +1017,13 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status)
|
|||||||
// Liste de "Other orders"
|
// Liste de "Other orders"
|
||||||
print '<td width="50%" valign="top">';
|
print '<td width="50%" valign="top">';
|
||||||
|
|
||||||
|
$var=true;
|
||||||
$othercom = $commande->liste_array(1, ' <> '.$user->id);
|
$othercom = $commande->liste_array(1, ' <> '.$user->id);
|
||||||
|
print '<table class="noborder" width="100%">';
|
||||||
if (is_array($othercom) && sizeof($othercom))
|
if (is_array($othercom) && sizeof($othercom))
|
||||||
{
|
{
|
||||||
$var=false;
|
$var=!$var;
|
||||||
print '<form method="POST" action="fiche.php?id='.$product->id.'">';
|
print '<form method="POST" action="fiche.php?id='.$product->id.'">';
|
||||||
print '<table class="noborder" width="100%">';
|
|
||||||
print '<tr '.$bc[$var].'><td colspan="3">';
|
print '<tr '.$bc[$var].'><td colspan="3">';
|
||||||
print '<input type="hidden" name="action" value="addincommande">';
|
print '<input type="hidden" name="action" value="addincommande">';
|
||||||
print $langs->trans("OtherOrders").'</td><td>';
|
print $langs->trans("OtherOrders").'</td><td>';
|
||||||
@ -1027,12 +1035,15 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status)
|
|||||||
print '</td><td align="right">';
|
print '</td><td align="right">';
|
||||||
print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
|
print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
print '</table>';
|
|
||||||
print '</form>';
|
print '</form>';
|
||||||
}
|
}
|
||||||
else {
|
else
|
||||||
|
{
|
||||||
|
print "<tr ".$bc[!$var]."><td>";
|
||||||
print $langs->trans("NoOtherOpenedOrders");
|
print $langs->trans("NoOtherOpenedOrders");
|
||||||
|
print '</td></tr>';
|
||||||
}
|
}
|
||||||
|
print '</table>';
|
||||||
}
|
}
|
||||||
print '</td>';
|
print '</td>';
|
||||||
|
|
||||||
@ -1098,7 +1109,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
print "<tr $bc[$var]><td>";
|
print "<tr ".$bc[!$var]."><td>";
|
||||||
print $langs->trans("NoDraftBills");
|
print $langs->trans("NoDraftBills");
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
}
|
}
|
||||||
@ -1156,7 +1167,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
print "<tr $bc[$var]><td>";
|
print "<tr ".$bc[!$var]."><td>";
|
||||||
print $langs->trans("NoOtherDraftBills");
|
print $langs->trans("NoOtherDraftBills");
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
}
|
}
|
||||||
@ -1173,6 +1184,8 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status)
|
|||||||
}
|
}
|
||||||
|
|
||||||
print '</table>';
|
print '</table>';
|
||||||
|
|
||||||
|
print '<br>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user