diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 983f2222677..6417c5df86d 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -644,12 +644,11 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente) if($user->rights->propale->creer) { print "".''; - print_titre("Ajouter à ma proposition") . ''; - + print_titre("AddToMyProposals") . ''; print ''; - print_titre("Ajouter aux autres propositions") . ''; - + print_titre("AddToOtherProposals") . ''; print ''; + print "".''; $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"; @@ -668,15 +667,15 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente) $var=!$var; print ""; print "propalid\">$objp->ref\n"; - print "idp\">$objp->nom\n"; + print "idp\">$objp->nom\n"; print "". strftime("%d %b",$objp->dp)."\n"; print '
'; print ''; print ''; - print ' Rem.'; - print ' %'; + print 'Rem.'; + print '%'; print " ".$product->stock_proposition; - print ''; + print ''; print ''; print ""; print '
'; @@ -687,9 +686,6 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente) } print ''; - - if($user->rights->propale->creer) - { print ''; $otherprop = $propal->liste_array(1, '<>'.$user->id); @@ -701,15 +697,15 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente) print "".'Autres Propositions'; $htmls->select_array("propalid", $otherprop); print ''; - print ' Rem.'; - print ' %'; - print ''; + print 'Rem.'; + print '%'; + print ''; print ''; print ''; print ''; } print ''; - } + print ''; } @@ -718,10 +714,11 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente) $langs->load("bills"); print "".''; - print_titre("Ajouter à ma facture"); + print_titre("AddToMyBills"); print ''; - print_titre("Ajouter aux autres factures"); + print_titre("AddToOtherBills"); print ''; + print "".''; $sql = "SELECT s.nom, s.idp, f.rowid as factureid, f.facnumber,".$db->pdate("f.datef")." as df"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f"; @@ -741,14 +738,14 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente) $var=!$var; print ""; print "factureid\">$objp->facnumber\n"; - print "idp\">$objp->nom\n"; + print "idp\">$objp->nom\n"; print "". strftime("%d %b",$objp->df)."\n"; print '
'; print ''; print ''; - print ' Rem.'; - print ' %'; - print ''; + print 'Rem.'; + print '%'; + print ''; print ''; print ""; print '
'; @@ -762,6 +759,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente) dolibarr_print_error($db); } print ''; + // \todo Ajouter liste des factures autres print ''; } }