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

New: Amlioration ergonomiques

Browse Source 
Dbut ajout Aperu client et Aperu fournisseur
This commit is contained in:
Laurent Destailleur 2006-03-18 22:46:29 +00:00
parent e617b7b9b4
commit 58b9e2d4fd
8 changed files with 353 additions and 269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
htdocs/comm/fiche.php
View File

@ -279,23 +279,7 @@ if ($socidp > 0)
if ($objsoc->check_codeclient() <> 0) print ' '.$langs->trans("WrongCustomerCode");
print '</td></tr>';
}
if ($conf->compta->enabled || $conf->comptaexpert->enabled)
{
print '<tr>';
print '<td nowrap>'.$langs->trans("CustomerAccountancyCode").'</td><td colspan="3">'.$objsoc->code_compta.'</td>';
print '</tr>';
}
/*
if ($objsoc->fournisseur) {
print '<tr><td>';
print $langs->trans('SupplierCode').'</td><td colspan="3">';
print $objsoc->code_fournisseur;
if ($objsoc->check_codefournisseur() <> 0) print ' '.$langs->trans("WrongSupplierCode");
print '</td></tr>';
}
*/
print "<tr><td valign=\"top\">".$langs->trans('Address')."</td><td colspan=\"3\">".nl2br($objsoc->adresse)."</td></tr>";
print '<tr><td>'.$langs->trans('Zip').'</td><td>'.$objsoc->cp."</td>";
@ -316,31 +300,8 @@ if ($socidp > 0)
print '<tr><td>'.$langs->transcountry('ProfId3',$objsoc->pays_code).'</td><td>'.$objsoc->ape.'</td><td colspan="2">&nbsp;</td></tr>';
}
// Type + Staff
$arr = $objsoc->typent_array($objsoc->typent_id);
$objsoc->typent= $arr[$objsoc->typent_id];
if ($objsoc->typent || $objsoc->effectif) {
print '<tr><td>'.$langs->trans("Type").'</td><td>'.$objsoc->typent.'</td><td>'.$langs->trans("Staff").'</td><td nowrap>'.$objsoc->effectif.'</td></tr>';
}
// Assujeti à TVA ou pas
print '<tr>';
/* print '<table width="100%" class="nobordernopadding"><tr><td nowrap>';
print $langs->trans('VATIsUsed');
print '<td>';
if ($_GET['action'] != 'editassujtva') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editassujtva&amp;socid='.$objsoc->id.'">'.img_edit($langs->trans('SetMode'),1).'</a></td>';
print '</tr></table>';
print '</td><td colspan="3">';
if ($_GET['action'] == 'editassujtva')
{
$html->form_assujetti_tva($_SERVER['PHP_SELF'].'?socid='.$objsoc->id,$objsoc->tva_assuj,'assujtva_value');
}
else
{
$html->form_assujetti_tva($_SERVER['PHP_SELF'].'?socid='.$objsoc->id,$objsoc->tva_assuj,'none');
}
print "</td>";
*/
print '<td nowrap="nowrap">'.$langs->trans('VATIsUsed').'</td><td colspan="3">';
print yn($objsoc->tva_assuj);
print '</td>';
@ -443,6 +404,15 @@ if ($socidp > 0)
// Nbre max d'éléments des petites listes
$MAXLIST=4;
// Lien recap
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="4"><table width="100%" class="noborder"><tr><td>'.$langs->trans("Summary").'</td>';
print '<td align="right"><a href="'.DOL_URL_ROOT.'/comm/recap-client.php?socid='.$societe->id.'">'.$langs->trans("ShowCustomerPreview").'</a></td></tr></table></td>';
print '</tr>';
print '</table>';
print '<br>';
/*
* Dernieres propales
@ -483,7 +453,7 @@ if ($socidp > 0)
}
print '</td><td align="right" width="80">'.dolibarr_print_date($objp->dp)."</td>\n";
print '<td align="right" width="120">'.price($objp->price).'</td>';
print '<td align="center" width="100">'.$propal_static->labelstatut_short[$objp->fk_statut].'</td></tr>';
print '<td align="center" width="100">'.$propal_static->LibStatut($objp->fk_statut,2).'</td></tr>';
$var=!$var;
$i++;
}
@ -710,8 +680,11 @@ if ($socidp > 0)
print '<a class="butAction" href="action/fiche.php?action=create&socid='.$objsoc->id.'">'.$langs->trans("AddAction").'</a>';
print '<a class="butAction" href="'.DOL_URL_ROOT.'/contact/fiche.php?socid='.$objsoc->id.'&amp;action=create">'.$langs->trans("AddContact").'</a>';
if ($user->rights->societe->contact->creer)
{
print '<a class="butAction" href="'.DOL_URL_ROOT.'/contact/fiche.php?socid='.$objsoc->id.'&amp;action=create">'.$langs->trans("AddContact").'</a>';
}
print '</div>';
print '<br>';

81
htdocs/compta/fiche.php
View File

@ -251,21 +251,18 @@ if ($socid > 0)
print '<tr><td>'.$langs->trans("Phone").'</td><td>'.dolibarr_print_phone($societe->tel,$societe->pays_code).'&nbsp;</td><td>'.$langs->trans("Fax").'</td><td>'.dolibarr_print_phone($societe->fax,$societe->pays_code).'&nbsp;</td></tr>';
print '<tr><td>'.$langs->trans("Web")."</td><td colspan=\"3\"><a href=\"http://$societe->url\" target=\"_blank\">$societe->url</a>&nbsp;</td></tr>";
// TVA
// Assujeti à TVA ou pas
print '<tr>';
print '<td nowrap="nowrap">'.$langs->trans('VATIsUsed').'</td><td colspan="3">';
print yn($objsoc->tva_assuj);
print '</td>';
print '</tr>';
// TVA Intra
print '<tr><td nowrap>'.$langs->trans('VATIntraVeryShort').'</td><td colspan="3">';
print $societe->tva_intra;
print '</td></tr>';
print '<tr><td>'.$langs->trans('Capital').'</td><td colspan="3">';
if ($societe->capital) print $societe->capital.' '.$langs->trans("Currency".$conf->monnaie);
else print '&nbsp;';
print '</td></tr>';
// Type + Staff
$arr = $societe->typent_array($societe->typent_id);
$societe->typent= $arr[$societe->typent_id];
print '<tr><td>'.$langs->trans("Type").'</td><td>'.$societe->typent.'</td><td>'.$langs->trans("Staff").'</td><td>'.$societe->effectif.'</td></tr>';
if ($societe->client == 1)
{
// Remise permanente
@ -312,13 +309,24 @@ if ($socid > 0)
// Nbre max d'éléments des petites listes
$MAXLIST=5;
$tableaushown=0;
$tableaushown=1;
// Lien recap
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="4"><table width="100%" class="noborder"><tr><td>'.$langs->trans("Summary").'</td>';
print '<td align="right"><a href="'.DOL_URL_ROOT.'/compta/recap-client.php?socid='.$societe->id.'">'.$langs->trans("ShowAccountancyPreview").'</a></td></tr></table></td>';
print '</tr>';
print '</table>';
print '<br>';
/**
* Dernieres factures
*/
if ($conf->facture->enabled && $user->rights->facture->lire)
{
$facturestatic = new Facture($db);
print '<table class="noborder" width="100%">';
$sql = "SELECT s.nom, s.idp, f.facnumber, f.amount, f.total, f.total_ttc, ".$db->pdate("f.datef")." as df, f.paye as paye, f.fk_statut as statut, f.rowid as facid ";
@ -336,7 +344,7 @@ if ($socid > 0)
{
$tableaushown=1;
print '<tr class="liste_titre">';
print '<td colspan="4"><table width="100%" class="noborder"><tr><td>'.$langs->trans("LastBills",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/compta/facture.php?socidp='.$societe->id.'">'.$langs->trans("AllBills").' ('.$num.')</a></td></tr></table></td>';
print '<td colspan="4"><table width="100%" class="noborder"><tr><td>'.$langs->trans("LastCustomersBills",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/compta/facture.php?socidp='.$societe->id.'">'.$langs->trans("AllBills").' ('.$num.')</a></td></tr></table></td>';
print '</tr>';
}
@ -356,8 +364,7 @@ if ($socid > 0)
}
print "<td align=\"right\">".price($objp->total_ttc)."</td>\n";
$fac = new Facture($db);
print "<td align=\"center\">".($fac->LibStatut($objp->paye,$objp->statut,1))."</td>\n";
print '<td align="left">'.($facturestatic->LibStatut($objp->paye,$objp->statut,2))."</td>\n";
print "</tr>\n";
$i++;
}
@ -413,14 +420,6 @@ if ($socid > 0)
print "</table>";
}
// Lien recap
if ($tableaushown) print '<br>';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="4"><table width="100%" class="noborder"><tr><td>'.$langs->trans("Summary").'</td><td align="right"><a href="'.DOL_URL_ROOT.'/compta/recap-client.php?socid='.$societe->id.'">'.$langs->trans("ShowLog").'</a></td></tr></table></td>';
print '</tr>';
print '</table>';
print "</td></tr>";
print "</table></div>\n";
@ -431,24 +430,26 @@ if ($socid > 0)
*/
print '<div class="tabsAction">';
if ($user->societe_id == 0)
{
// Si société cliente ou prospect, on affiche bouton "Créer facture client"
if ($societe->client != 0 && $conf->facture->enabled && $user->rights->facture->creer) {
$langs->load("bills");
print "<a class=\"tabAction\" href=\"facture.php?action=create&socidp=$societe->id\">".$langs->trans("AddBill")."</a>";
}
if ($user->societe_id == 0)
{
// Si société cliente ou prospect, on affiche bouton "Créer facture client"
if ($societe->client != 0 && $conf->facture->enabled && $user->rights->facture->creer) {
$langs->load("bills");
print "<a class=\"tabAction\" href=\"facture.php?action=create&socidp=$societe->id\">".$langs->trans("AddBill")."</a>";
}
if ($conf->deplacement->enabled) {
$langs->load("trips");
print "<a class=\"tabAction\" href=\"deplacement/fiche.php?socid=$societe->id&amp;action=create\">".$langs->trans("AddTrip")."</a>";
}
}
print '<a class="butAction" href="action/fiche.php?action=create&socid='.$objsoc->id.'">'.$langs->trans("AddAction").'</a>';
if ($conf->deplacement->enabled) {
$langs->load("trips");
print "<a class=\"tabAction\" href=\"deplacement/fiche.php?socid=$societe->id&amp;action=create\">".$langs->trans("AddTrip")."</a>";
}
}
if ($user->rights->societe->contact->creer)
{
print "<a class=\"tabAction\" href=\"".DOL_URL_ROOT.'/contact/fiche.php?socid='.$socid."&amp;action=create\">".$langs->trans("AddContact")."</a>";
}
if ($user->rights->societe->contact->creer)
{
print "<a class=\"tabAction\" href=\"".DOL_URL_ROOT.'/contact/fiche.php?socid='.$socid."&amp;action=create\">".$langs->trans("AddContact")."</a>";
}
print '</div>';
print "<br>\n";

68
htdocs/compta/recap-client.php
View File

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -18,7 +18,6 @@
*
* $Id$
* $Source$
*
*/
/**
@ -34,9 +33,7 @@ include_once(DOL_DOCUMENT_ROOT."/facture.class.php");
$langs->load("companies");
if ($conf->facture->enabled) $langs->load("bills");
/*
* Sécurité accés client
*/
// Sécurité accés client
$socid = $_GET["socid"];
if ($user->societe_id > 0)
{
@ -46,7 +43,6 @@ if ($user->societe_id > 0)
$user->getrights('facture');
llxHeader();
/*
@ -54,14 +50,14 @@ llxHeader();
* Mode fiche
*
*/
llxHeader();
if ($socid > 0)
{
$societe = new Societe($db);
$societe->fetch($socid, $to); // si $to='next' ajouter " AND s.idp > $socid ORDER BY idp ASC LIMIT 1";
/*
* Affichage onglets
*/
/*
* Affichage onglets
*/
@ -137,22 +133,24 @@ if ($socid > 0)
print ($societe->prefix_comm?$societe->prefix_comm:'&nbsp;');
print '</td>';
if ($societe->client) {
print '<tr>';
print '<td nowrap width="100">'.$langs->trans("CustomerCode"). '</td><td colspan="3">'. $societe->code_client . '</td>';
print '</tr>';
print '<tr>';
print '<td nowrap>'.$langs->trans("CustomerAccountancyCode").'</td><td colspan="3">'.$societe->code_compta.'</td>';
print '</tr>';
if ($societe->client)
{
print '<tr>';
print '<td nowrap width="100">'.$langs->trans("CustomerCode"). '</td><td colspan="3">'. $societe->code_client . '</td>';
print '</tr>';
print '<tr>';
print '<td nowrap>'.$langs->trans("CustomerAccountancyCode").'</td><td colspan="3">'.$societe->code_compta.'</td>';
print '</tr>';
}
if ($societe->fournisseur) {
print '<tr>';
print '<td nowrap>'.$langs->trans("SupplierCode"). '</td><td colspan="3">'. $societe->code_fournisseur . '</td>';
print '</tr>';
print '<tr>';
print '<td nowrap>'.$langs->trans("SupplierAccountancyCode").'</td><td colspan="3">'.$societe->code_compta_fournisseur.'</td>';
print '</tr>';
if ($societe->fournisseur)
{
print '<tr>';
print '<td nowrap>'.$langs->trans("SupplierCode"). '</td><td colspan="3">'. $societe->code_fournisseur . '</td>';
print '</tr>';
print '<tr>';
print '<td nowrap>'.$langs->trans("SupplierAccountancyCode").'</td><td colspan="3">'.$societe->code_compta_fournisseur.'</td>';
print '</tr>';
}
print '<tr><td valign="top">'.$langs->trans("Address").'</td><td colspan="3">'.nl2br($societe->adresse)."</td></tr>";
@ -164,10 +162,19 @@ if ($socid > 0)
print '<tr><td>'.$langs->trans("Phone").'</td><td>'.dolibarr_print_phone($societe->tel,$societe->pays_code).'&nbsp;</td><td>'.$langs->trans("Fax").'</td><td>'.dolibarr_print_phone($societe->fax,$societe->pays_code).'&nbsp;</td></tr>';
print "<tr><td nowrap>".$langs->transcountry("ProfId1",$societe->pays_code)."</td><td><a href=\"http://www.societe.com/cgi-bin/recherche?rncs=".$societe->siren."\">".$societe->siren."</a>&nbsp;</td>";
print '<td>'.$langs->transcountry('ProfId2',$societe->pays_code).'</td><td>'.$societe->siret.'</td></tr>';
print '<tr><td>'.$langs->trans("Web")."</td><td colspan=\"3\"><a href=\"http://$societe->url\" target=\"_blank\">$societe->url</a>&nbsp;</td></tr>";
print '<tr><td>'.$langs->transcountry('ProfId3',$societe->pays_code).'</td><td>'.$societe->ape.'</td><td colspan="2">&nbsp;</td></tr>';
// Assujeti à TVA ou pas
print '<tr>';
print '<td nowrap="nowrap">'.$langs->trans('VATIsUsed').'</td><td colspan="3">';
print yn($objsoc->tva_assuj);
print '</td>';
print '</tr>';
// TVA Intra
print '<tr><td nowrap>'.$langs->trans('VATIntraVeryShort').'</td><td colspan="3">';
print $societe->tva_intra;
print '</td></tr>';
print "</table>";
@ -182,9 +189,9 @@ if ($socid > 0)
if ($conf->facture->enabled && $user->rights->facture->lire)
{
// Factures
print_fiche_titre($langs->trans("Bills"));
print_fiche_titre($langs->trans("AccountancyPreview"));
print '<table class="border" width="100%">';
print '<table class="noborder" width="100%">';
$sql = "SELECT s.nom, s.idp, f.facnumber, f.amount, ".$db->pdate("f.datef")." as df";
$sql .= " , f.paye as paye, f.fk_statut as statut, f.rowid as facid ";
@ -200,7 +207,9 @@ if ($socid > 0)
if ($num > 0)
{
print '<tr class="liste_titre">';
print '<td width="100" align="center">'.$langs->trans("Date").'</td><td>&nbsp;</td>';
print '<td width="100" align="center">'.$langs->trans("Date").'</td>';
print '<td>&nbsp;</td>';
print '<td>&nbsp;</td>';
print '<td align="right">'.$langs->trans("Debit").'</td>';
print '<td align="right">'.$langs->trans("Credit").'</td>';
print '<td align="right">'.$langs->trans("Balance").'</td>';
@ -240,6 +249,7 @@ if ($socid > 0)
print "<td align=\"center\">".dolibarr_print_date($fac->date)."</td>\n";
print "<td><a href=\"../compta/facture.php?facid=$fac->id\">".img_object($langs->trans("ShowBill"),"bill")." ".$fac->ref."</a></td>\n";
print '<td aling="left">'.$fac->getLibStatut(2).'</td>';
print '<td align="right">'.price($fac->total_ttc)."</td>\n";
$solde = $solde + $fac->total_ttc;

80
htdocs/facture.class.php
View File

@ -1364,7 +1364,7 @@ class Facture
/**
* \brief Retourne le libellé du statut d'une facture (brouillon, validée, abandonnée, payée)
* \param mode 0=libellé long, 1=libellé court
* \param mode 0=libellé long, 1=libellé court, 2=Picto + Libellé court, 3=Picto, 4=Picto + Libellé long
* \return string Libelle
*/
function getLibStatut($mode=0)
@ -1373,10 +1373,10 @@ class Facture
}
/**
* \brief Renvoi le libellé d'un statut donn
* \brief Renvoi le libellé d'un statut donné
* \param paye Etat paye
* \param statut Id statut
* \param mode 0=libellé long, 1=libellé court
* \param mode 0=libellé long, 1=libellé court, 2=Picto + Libellé court, 3=Picto, 4=Picto + Libellé long
* \return string Libellé du statut
*/
function LibStatut($paye,$statut,$mode=0)
@ -1384,19 +1384,77 @@ class Facture
global $langs;
$langs->load('bills');
$prefix='';
if ($mode == 0)
{
$prefix='';
if (! $paye)
{
if ($statut == 0) return $langs->trans('Bill'.$prefix.'StatusDraft');
if ($statut == 3) return $langs->trans('Bill'.$prefix.'StatusCanceled');
return $langs->trans('Bill'.$prefix.'StatusValidated');
}
else
{
return $langs->trans('Bill'.$prefix.'StatusPayed');
}
}
if ($mode == 1)
{
$prefix='Short';
if (! $paye)
{
if ($statut == 0) return $langs->trans('Bill'.$prefix.'StatusDraft');
if ($statut == 3) return $langs->trans('Bill'.$prefix.'StatusCanceled');
return $langs->trans('Bill'.$prefix.'StatusValidated');
if (! $paye)
{
if ($statut == 0) return $langs->trans('Bill'.$prefix.'StatusDraft');
if ($statut == 3) return $langs->trans('Bill'.$prefix.'StatusCanceled');
return $langs->trans('Bill'.$prefix.'StatusValidated');
}
else
{
return $langs->trans('Bill'.$prefix.'StatusPayed');
}
}
else
if ($mode == 2)
{
return $langs->trans('Bill'.$prefix.'StatusPayed');
$prefix='Short';
if (! $paye)
{
if ($statut == 0) return img_picto($langs->trans('Bill'.$prefix.'StatusDraft'),'statut0').' '.$langs->trans('Bill'.$prefix.'StatusDraft');
if ($statut == 3) return img_picto($langs->trans('Bill'.$prefix.'StatusCanceled'),'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
return img_picto($langs->trans('Bill'.$prefix.'StatusValidated'),'statut4').' '.$langs->trans('Bill'.$prefix.'StatusValidated');
}
else
{
return img_picto($langs->trans('Bill'.$prefix.'StatusPayed'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPayed');
}
}
if ($mode == 3)
{
$prefix='Short';
if (! $paye)
{
if ($statut == 0) return img_picto($langs->trans('Bill'.$prefix.'StatusDraft'),'statut0');
if ($statut == 3) return img_picto($langs->trans('Bill'.$prefix.'StatusCanceled'),'statut5');
return img_picto($langs->trans('Bill'.$prefix.'StatusValidated'),'statut4');
}
else
{
return img_picto($langs->trans('Bill'.$prefix.'StatusPayed'),'statut6');
}
}
if ($mode == 4)
{
$prefix='Short';
if (! $paye)
{
if ($statut == 0) return img_picto($langs->trans('Bill'.$prefix.'StatusDraft'),'statut0');
if ($statut == 3) return img_picto($langs->trans('Bill'.$prefix.'StatusCanceled'),'statut5');
return img_picto($langs->trans('Bill'.$prefix.'StatusValidated'),'statut4');
}
else
{
return img_picto($langs->trans('Bill'.$prefix.'StatusPayed'),'statut6');
}
}
}
/**

219
htdocs/fourn/fiche.php
View File

@ -133,96 +133,64 @@ if ( $societe->fetch($socid) )
dolibarr_fiche_head($head, $hselected, $societe->nom);
/*
*
*
*/
print '<table width="100%">';
print '<tr><td valign="top" width="50%">';
print '<table class="border" width="100%">';
print '<tr><td width="20%">'.$langs->trans("Name").'</td><td width="80%" colspan="3">'.$societe->nom.'</td></tr>';
print '<table width="100%">';
print '<tr><td valign="top" width="50%">';
print '<table class="border" width="100%">';
print '<tr><td width="20%">'.$langs->trans("Name").'</td><td width="80%" colspan="3">'.$societe->nom.'</td></tr>';
print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$societe->prefix_comm.'</td></tr>';
/*
if ($societe->client) {
print '<tr><td>';
print $langs->trans('CustomerCode').'</td><td colspan="3">';
print $societe->code_client;
if ($societe->check_codeclient() <> 0) print ' '.$langs->trans("WrongCustomerCode");
print '</td></tr>';
}
*/
if ($societe->fournisseur) {
print '<tr><td>';
if ($societe->fournisseur)
{
print '<tr><td nowrap="nowrap">';
print $langs->trans('SupplierCode').'</td><td colspan="3">';
print $societe->code_fournisseur;
if ($societe->check_codefournisseur() <> 0) print ' '.$langs->trans("WrongSupplierCode");
print '</td></tr>';
print '<tr>';
print '<td nowrap>'.$langs->trans("SupplierAccountancyCode").'</td><td colspan="3">'.$societe->code_compta_fournisseur.'</td>';
print '</tr>';
}
print '<tr><td valign="top">'.$langs->trans("Address").'</td><td colspan="3">'.nl2br($societe->adresse).'</td></tr>';
print '<tr><td>'.$langs->trans("Zip").'</td><td>'.$societe->cp.'</td>';
print '<td>'.$langs->trans("Town").'</td><td>'.$societe->ville.'</td></tr>';
print '<tr><td>'.$langs->trans("Country").'</td><td colspan="3">'.$societe->pays.'</td></tr>';
print '<tr><td>'.$langs->trans("Phone").'</td><td>'.dolibarr_print_phone($societe->tel).'&nbsp;</td><td>'.$langs->trans("Fax").'</td><td>'.dolibarr_print_phone($societe->fax).'&nbsp;</td></tr>';
print '<tr><td>'.$langs->trans("Web")."</td><td colspan=\"3\"><a href=\"http://$societe->url\">$societe->url</a>&nbsp;</td></tr>";
print '<tr><td valign="top">'.$langs->trans("Address").'</td><td colspan="3">'.nl2br($societe->adresse).'</td></tr>';
print '<tr><td>'.$langs->trans("Zip").'</td><td>'.$societe->cp.'</td>';
print '<td>'.$langs->trans("Town").'</td><td>'.$societe->ville.'</td></tr>';
print '<tr><td>'.$langs->trans("Country").'</td><td colspan="3">'.$societe->pays.'</td></tr>';
print '<tr><td>'.$langs->trans("Phone").'</td><td>'.dolibarr_print_phone($societe->tel).'&nbsp;</td><td>'.$langs->trans("Fax").'</td><td>'.dolibarr_print_phone($societe->fax).'&nbsp;</td></tr>';
print '<tr><td>'.$langs->trans("Web")."</td><td colspan=\"3\"><a href=\"http://$societe->url\">$societe->url</a>&nbsp;</td></tr>";
print "<tr><td nowrap>".$langs->transcountry("ProfId1",$societe->pays_code)."</td><td><a href=\"http://www.societe.com/cgi-bin/recherche?rncs=".$societe->siren."\">".$societe->siren."</a>&nbsp;</td>";
print '<td>'.$langs->transcountry('ProfId2',$societe->pays_code).'</td><td>'.$societe->siret.'</td></tr>';
// Assujeti à TVA ou pas
print '<tr>';
print '<td nowrap="nowrap">'.$langs->trans('VATIsUsed').'</td><td colspan="3">';
print yn($objsoc->tva_assuj);
print '</td>';
print '</tr>';
print '<tr><td>'.$langs->transcountry('ProfId3',$societe->pays_code).'</td><td>'.$societe->ape.'</td><td colspan="2">&nbsp;</td></tr>';
// Statut juridique
print '<tr><td>'.$langs->trans('JuridicalStatus').'</td><td colspan="3">'.$societe->forme_juridique.'</td></tr>';
// Type + Staff
$arr = $societe->typent_array($societe->typent_id);
$societe->typent= $arr[$societe->typent_id];
print '<tr><td>'.$langs->trans("Type").'</td><td>'.$societe->typent.'</td><td>'.$langs->trans("Staff").'</td><td>'.$societe->effectif.'</td></tr>';
print '</table>';
print '</table>';
/*
*
*/
print '</td><td valign="top" width="50%">';
$var=true;
print '</td><td valign="top" width="50%">';
$var=true;
/*
* Liste des produits
*/
if ($conf->produit->enabled || $conf->service->enabled)
{
$langs->load("products");
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("ProductsAndServices").'</td><td align="right">';
print '<a href="'.DOL_URL_ROOT.'/fourn/product/liste.php?fourn_id='.$societe->id.'">'.$langs->trans("All").' ('.$societe->NbProduct().')';
print '</a></td></tr></table><br>';
}
$MAXLIST=4;
// Lien recap
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="4"><table width="100%" class="noborder"><tr><td>'.$langs->trans("Summary").'</td>';
print '<td align="right"><a href="'.DOL_URL_ROOT.'/fourn/recap-fourn.php?socid='.$societe->id.'">'.$langs->trans("ShowSupplierPreview").'</a></td></tr></table></td>';
print '</tr>';
print '</table>';
print '<br>';
/*
* Liste des commandes associées
*/
$max=4;
$sql = "SELECT p.rowid,p.ref,".$db->pdate("p.date_commande")." as dc, p.fk_statut";
$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as p ";
$sql.= " WHERE p.fk_soc =".$societe->id;
$sql.= " ORDER BY p.rowid";
$sql.= " ".$db->plimit($max);
$sql.= " ".$db->plimit($MAXLIST);
$resql=$db->query($sql);
if ($resql)
{
@ -233,11 +201,11 @@ if ( $societe->fetch($socid) )
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="3">';
print '<table class="noborder" width="100%"><tr><td>'.$langs->trans("LastOrders",min($num,$max)).'</td>';
print '<table class="noborder" width="100%"><tr><td>'.$langs->trans("LastOrders",($num<=$MAXLIST?"":$MAXLIST)).'</td>';
print '<td align="right"><a href="commande/liste.php?socid='.$societe->id.'">'.$langs->trans("AllOrders").' ('.$num.')</td></tr></table>';
print '</td></tr>';
}
while ($i < $num && $i <= $max)
while ($i < $num && $i <= $MAXLIST)
{
$obj = $db->fetch_object($resql);
$var=!$var;
@ -273,8 +241,11 @@ if ( $societe->fetch($socid) )
/*
* Liste des factures associées
*/
$MAXLIST=5;
$langs->load('bills');
$max=5;
$facturestatic = new FactureFournisseur($db);
$sql = 'SELECT p.rowid,p.libelle,p.facnumber,p.fk_statut,'.$db->pdate('p.datef').' as df, total_ttc as amount, paye';
$sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as p';
$sql.= ' WHERE p.fk_soc = '.$societe->id;
@ -289,11 +260,10 @@ if ( $societe->fetch($socid) )
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="4">';
print '<table class="noborder" width="100%"><tr><td>'.$langs->trans('LastSuppliersBills',min($num,$max)).'</td><td align="right"><a href="facture/index.php?socid='.$societe->id.'">'.$langs->trans('AllBills').' ('.$num.')</td></tr></table>';
print '<table class="noborder" width="100%"><tr><td>'.$langs->trans('LastSuppliersBills',($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="facture/index.php?socid='.$societe->id.'">'.$langs->trans('AllBills').' ('.$num.')</td></tr></table>';
print '</td></tr>';
}
$facturestatic = new FactureFournisseur($db);
while ($i < min($num,$max))
while ($i < min($num,$MAXLIST))
{
$obj = $db->fetch_object($resql);
$var=!$var;
@ -301,9 +271,9 @@ if ( $societe->fetch($socid) )
print '<td>';
print '<a href="facture/fiche.php?facid='.$obj->rowid.'">';
print img_object($langs->trans('ShowBill'),'bill').' '.$obj->facnumber.'</a> '.dolibarr_trunc($obj->libelle,14).'</td>';
print '<td align="center" width="80">'.dolibarr_print_date($obj->df).'</td>';
print '<td align="center">'.dolibarr_print_date($obj->df).'</td>';
print '<td align="right">'.price($obj->amount).'</td>';
print '<td align="center">'.$facturestatic->LibStatutShort($obj->paye,$obj->fk_statut).'</td>';
print '<td align="left">'.$facturestatic->LibStatut($obj->paye,$obj->fk_statut,2).'</td>';
print '</tr>';
$i++;
}
@ -318,54 +288,69 @@ if ( $societe->fetch($socid) )
dolibarr_print_error($db);
}
/*
*
*
*/
print '</td></tr>';
print '</table>' . "\n";
print '</div>';
/*
* Liste des produits
*/
if ($conf->produit->enabled || $conf->service->enabled)
{
$langs->load("products");
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("ProductsAndServices").'</td><td align="right">';
print '<a href="'.DOL_URL_ROOT.'/fourn/product/liste.php?fourn_id='.$societe->id.'">'.$langs->trans("All").' ('.$societe->NbProduct().')';
print '</a></td></tr></table><br>';
}
/*
*
* Barre d'actions
*
*/
print '</td></tr>';
print '</table>' . "\n";
print '</div>';
/*
*
* Barre d'actions
*
*/
print '<div class="tabsAction">';
print '<div class="tabsAction">';
if ($user->rights->fournisseur->commande->creer)
{
$langs->load("orders");
print '<a class="tabAction" href="'.DOL_URL_ROOT.'/fourn/commande/fiche.php?action=create&socid='.$societe->id.'">'.$langs->trans("AddOrder").'</a>';
}
if ($user->rights->fournisseur->facture->creer)
{
$langs->load("bills");
print '<a class="tabAction" href="'.DOL_URL_ROOT.'/fourn/facture/fiche.php?action=create&socid='.$societe->id.'">'.$langs->trans("AddBill").'</a>';
}
print '<a class="butAction" href="action/fiche.php?action=create&socid='.$objsoc->id.'">'.$langs->trans("AddAction").'</a>';
if ($user->rights->fournisseur->commande->creer)
{
$langs->load("orders");
print '<a class="tabAction" href="'.DOL_URL_ROOT.'/fourn/commande/fiche.php?action=create&socid='.$societe->id.'">'.$langs->trans("AddOrder").'</a>';
}
if ($user->rights->societe->contact->creer)
{
print "<a class=\"tabAction\" href=\"".DOL_URL_ROOT.'/contact/fiche.php?socid='.$socid."&amp;action=create\">".$langs->trans("AddContact")."</a>";
}
print '</div>';
if ($user->rights->fournisseur->facture->creer)
{
$langs->load("bills");
print '<a class="tabAction" href="'.DOL_URL_ROOT.'/fourn/facture/fiche.php?action=create&socid='.$societe->id.'">'.$langs->trans("AddBill").'</a>';
}
print '</div>';
/*
*
* Liste des contacts
*
*/
$langs->load("companies");
print '<br><table class="noborder" width="100%">';
print '<tr class="liste_titre"><td><b>'.$langs->trans("Contact").'</b></td>';
print '<td><b>Poste</b></td><td><b>'.$langs->trans("Tel").'</b></td>';
print "<td><b>".$langs->trans("Fax")."</b></td><td><b>".$langs->trans("EMail")."</b></td>";
if ($user->rights->societe->contact->creer)
{
print "<td align=\"center\"><a href=\"".DOL_URL_ROOT.'/contact/fiche.php?socid='.$socid."&amp;action=create\">".$langs->trans("AddContact")."</a></td>";
}
print "</tr>";
$langs->load("companies");
print '<br><table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("Firstname").' '.$langs->trans("Lastname").'</td>';
print '<td>'.$langs->trans("Poste").'</td><td>'.$langs->trans("Tel").'</td>';
print "<td>".$langs->trans("Fax")."</td><td>".$langs->trans("EMail")."</td>";
print "<td align=\"center\">&nbsp;</td>";
print '<td>&nbsp;</td>';
print "</tr>";
$sql = "SELECT p.idp, p.name, p.firstname, p.poste, p.phone, p.fax, p.email, p.note";
$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as p";
@ -405,6 +390,10 @@ if ( $societe->fetch($socid) )
print "<td align=\"center\"><a href=\"../contact/fiche.php?action=edit&amp;id=$obj->idp\">".img_edit()."</a></td>";
}
print '<td align="center"><a href="../comm/action/fiche.php?action=create&actionid=5&contactid='.$obj->idp.'&socid='.$societe->id.'">';
print img_object($langs->trans("Rendez-Vous"),"action");
print '</a></td>';
print "</tr>\n";
$i++;
}

103
htdocs/fourn/fournisseur.facture.class.php
View File

@ -507,54 +507,93 @@ class FactureFournisseur
/**
* \brief Retourne le libellé du statut d'une facture (brouillon, validée, abandonnée, payée)
* \return string Libellé
* \param mode 0=libellé long, 1=libellé court, 2=Picto + Libellé court, 3=Picto, 4=Picto + Libellé long
* \return string Libelle
*/
function getLibStatut()
function getLibStatut($mode=0)
{
return $this->LibStatut($this->paye,$this->statut);
return $this->LibStatut($this->paye,$this->statut,$mode);
}
/**
* \brief Renvoi le libellé court d'un statut donné
* \param paye etat paye
* \param statut id statut
* \return string Libellé long du statut
* \brief Renvoi le libellé d'un statut donné
* \param paye Etat paye
* \param statut Id statut
* \param mode 0=libellé long, 1=libellé court, 2=Picto + Libellé court, 3=Picto, 4=Picto + Libellé long
* \return string Libellé du statut
*/
function LibStatutShort($paye,$statut)
function LibStatut($paye,$statut,$mode)
{
global $langs;
$langs->load('bills');
if (! $paye)
if ($mode==0)
{
if ($statut == 0) return $langs->trans('BillShortStatusDraft');
if ($statut == 3) return $langs->trans('BillShortStatusCanceled');
return $langs->trans('BillShortStatusValidated');
if (! $paye)
{
if ($statut == 0) return $langs->trans('BillStatusDraft');
if ($statut == 3) return $langs->trans('BillStatusCanceled');
return $langs->trans('BillStatusValidated');
}
else
{
return $langs->trans('BillStatusPayed');
}
}
else
if ($mode==1)
{
return $langs->trans('BillShortStatusPayed');
if (! $paye)
{
if ($statut == 0) return $langs->trans('BillShortStatusDraft');
if ($statut == 3) return $langs->trans('BillShortStatusCanceled');
return $langs->trans('BillShortStatusValidated');
}
else
{
return $langs->trans('BillShortStatusPayed');
}
}
}
/**
* \brief Renvoi le libellé long d'un statut donné
* \param paye etat paye
* \param statut id statut
* \return string Libellé long du statut
*/
function LibStatut($paye,$statut)
{
global $langs;
$langs->load('bills');
if (! $paye)
if ($mode == 2)
{
if ($statut == 0) return $langs->trans('BillStatusDraft');
if ($statut == 3) return $langs->trans('BillStatusCanceled');
return $langs->trans('BillStatusValidated');
$prefix='Short';
if (! $paye)
{
if ($statut == 0) return img_picto($langs->trans('Bill'.$prefix.'StatusDraft'),'statut0').' '.$langs->trans('Bill'.$prefix.'StatusDraft');
if ($statut == 3) return img_picto($langs->trans('Bill'.$prefix.'StatusCanceled'),'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
return img_picto($langs->trans('Bill'.$prefix.'StatusValidated'),'statut4').' '.$langs->trans('Bill'.$prefix.'StatusValidated');
}
else
{
return img_picto($langs->trans('Bill'.$prefix.'StatusPayed'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPayed');
}
}
else
if ($mode == 3)
{
return $langs->trans('BillStatusPayed');
$prefix='Short';
if (! $paye)
{
if ($statut == 0) return img_picto($langs->trans('Bill'.$prefix.'StatusDraft'),'statut0');
if ($statut == 3) return img_picto($langs->trans('Bill'.$prefix.'StatusCanceled'),'statut5');
return img_picto($langs->trans('Bill'.$prefix.'StatusValidated'),'statut4');
}
else
{
return img_picto($langs->trans('Bill'.$prefix.'StatusPayed'),'statut6');
}
}
if ($mode == 4)
{
$prefix='Short';
if (! $paye)
{
if ($statut == 0) return img_picto($langs->trans('Bill'.$prefix.'StatusDraft'),'statut0');
if ($statut == 3) return img_picto($langs->trans('Bill'.$prefix.'StatusCanceled'),'statut5');
return img_picto($langs->trans('Bill'.$prefix.'StatusValidated'),'statut4');
}
else
{
return img_picto($langs->trans('Bill'.$prefix.'StatusPayed'),'statut6');
}
}
}

7
htdocs/langs/en_US/main.lang
View File

@ -297,6 +297,13 @@ BuildDoc=Build Doc
RebuildDoc=Rebuild Doc
Entity=Entity
Entities=Entities
EventLogs=Logs
CustomerPreview=Customer preview
SupplierPreview=Supplier preview
AccountancyPreview=Accountancy preview
ShowCustomerPreview=Show customer preview
ShowSupplierPreview=Show supplier preview
ShowAccountancyPreview=Show accountancy preview
# Countries
CountryFR=France
CountryBE=Belgium

7
htdocs/langs/fr_FR/main.lang
View File

@ -297,6 +297,13 @@ BuildDoc=G
RebuildDoc=Regénérer le doc
Entity=Entité
Entities=Entités
EventLogs=Suivi
CustomerPreview=Aperçu client
SupplierPreview=Aperçu fournisseur
AccountancyPreview=Aperçu compta
ShowCustomerPreview=Afficher aperçu client
ShowSupplierPreview=Afficher aperçu fournisseur
ShowAccountancyPreview=Afficher aperçu compta
# Countries
CountryFR=France
CountryBE=Belgique