diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index 5f07e92aaf7..b91ba5f67c0 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -281,7 +281,7 @@ if ($_socid > 0) $num = $db->num_rows(); if ($num >0 ) { - print ""; + print ''; print '
'.$langs->trans("LastPropals",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllPropals").' ('.$num.')
'; print ''; $var=!$var; @@ -329,7 +329,7 @@ if ($_socid > 0) $num = $db->num_rows(); if ($num >0 ) { - print ""; + print ''; print '
'.$langs->trans("LastOrders",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllOrders").' ('.$num.')
'; print ''; } @@ -372,7 +372,7 @@ if ($_socid > 0) $i = 0 ; $num = $db->num_rows($result); if ($num > 0) { - print ""; + print ''; print '
'.$langs->trans("LastProjects",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllProjects").' ('.$num.')
'; print ''; } diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php index e1e9cd3dcd6..fbb98def8e6 100644 --- a/htdocs/compta/fiche.php +++ b/htdocs/compta/fiche.php @@ -63,12 +63,12 @@ if ($action=='add_action') $actioncomm->date = $date; $actioncomm->type = $actionid; $actioncomm->contact = $contactid; - + $actioncomm->societe = $socid; $actioncomm->note = $note; - + $actioncomm->add($user); - + $societe = new Societe($db); $societe->fetch($socid); } @@ -89,7 +89,7 @@ if ($action == 'stcomm') $sql = "INSERT INTO socstatutlog (datel, fk_soc, fk_statut, author) "; $sql .= " VALUES ('$dateaction',$socid,$stcommid,'" . $user->login . "')"; $result = @$db->query($sql); - + if ($result) { $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=$stcommid WHERE idp=$socid"; @@ -100,12 +100,12 @@ if ($action == 'stcomm') $errmesg = "ERREUR DE DATE !"; } } - + if ($actioncommid) { $sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm (datea, fk_action, fk_soc, fk_user_author) VALUES ('$dateaction',$actioncommid,$socid,'" . $user->id . "')"; $result = @$db->query($sql); - + if (!$result) { $errmesg = "ERREUR DE DATE !"; @@ -221,15 +221,15 @@ if ($socid > 0) * */ print "\n"; - print '"; print "
'; + print '
'; print ''; print ''; print '"; - + print ''; print ''; - + print ''; print '"; @@ -239,7 +239,7 @@ if ($socid > 0) { print $societe->prefix_comm; } - + print ""; print ''; @@ -265,23 +265,23 @@ if ($socid > 0) if ($conf->facture->enabled && $user->rights->facture->lire) { print '
'.$langs->trans("Name").''.$societe->nom.'
'.$langs->trans("Address").''.nl2br($societe->adresse)."
'.$langs->trans('Zip').' / '.$langs->trans('Town').''.$societe->cp." ".$societe->ville.'
'.$langs->trans('Country').''.$societe->pays.'
'.$langs->trans("Phone").''.$societe->tel.' Fax'.$societe->fax.' 
'.$langs->trans("Web")."url\">$societe->url 
Code compta'.$societe->code_compta.'
'; - + $sql = "SELECT s.nom, s.idp, f.facnumber, f.amount, ".$db->pdate("f.datef")." as df, f.paye as paye, f.fk_statut as statut, f.rowid as facid "; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f"; $sql .= " WHERE f.fk_soc = s.idp AND s.idp = ".$societe->id; $sql .= " ORDER BY f.datef DESC"; - + if ( $db->query($sql) ) { $var=true; $num = $db->num_rows(); $i = 0; if ($num > 0) { - print ""; + print ''; print ''; print ''; } - + while ($i < $num && $i < $MAXLIST) { $objp = $db->fetch_object(); @@ -297,7 +297,7 @@ if ($socid > 0) print "\n"; } print "\n"; - + $fac = new Facture($db); print "\n"; print "\n"; @@ -311,19 +311,19 @@ if ($socid > 0) } print "
'.$langs->trans("LastBills",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllBills").' ('.$num.')
!!!".number_format($objp->amount, 2, ',', ' ')."".($fac->LibStatut($objp->paye,$objp->statut))."
"; } - + /* * Derniers projets associés */ if ($conf->projet->enabled) { print ''; - + $sql = "SELECT p.rowid,p.title,p.ref,".$db->pdate("p.dateo")." as do"; $sql .= " FROM ".MAIN_DB_PREFIX."projet as p"; $sql .= " WHERE p.fk_soc = $societe->id"; $sql .= " ORDER by p.dateo"; - + if ( $db->query($sql) ) { $var=true; @@ -331,7 +331,7 @@ if ($socid > 0) $num = $db->num_rows(); if ($num > 0) { - print ""; + print ''; print ''; print ''; } @@ -341,7 +341,7 @@ if ($socid > 0) $var = !$var; print ""; print ''; - + print ""; $i++; } @@ -353,7 +353,7 @@ if ($socid > 0) } print "
'.$langs->trans("LastProjects",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllProjects").' ('.$num.')
'.$obj->title.'".strftime("%d %b %Y", $obj->do) ."
"; } - + print "
\n"; @@ -377,7 +377,7 @@ if ($socid > 0) print "id&action=create\">".$langs->trans("AddTrip").""; } } - + print ''; print "
\n"; @@ -420,7 +420,7 @@ if ($socid > 0) $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as p"; $sql.= " WHERE p.fk_soc = ".$societe->id; $sql.= " ORDER by p.datec"; - + $result = $db->query($sql); $i = 0 ; $num = $db->num_rows($result); $var=1; @@ -448,7 +448,7 @@ if ($socid > 0) print "idp\">"; print img_edit(); print ''; - + print ''; print img_object($langs->trans("Rendez-Vous"),"action"); print ''; @@ -516,7 +516,7 @@ if ($socid > 0) print $libelle; print ''; } - + /* * Contact pour cette action *