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

Look: Ajout du picto des paiements

Browse Source
This commit is contained in:
Laurent Destailleur 2005-05-08 15:36:58 +00:00
parent 95a8912c94
commit 52a7156ac7
17 changed files with 91 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/compta/facture.php
View File

@ -79,7 +79,7 @@ if ($_POST["action"] == 'classin')
/*
*
*/
if ($_POST["action"] == 'add')
if ($_POST["action"] == 'add')
{
$datefacture = mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
@ -915,16 +915,16 @@ else
*/
print $langs->trans("Payments").' :<br>';
$sql = "SELECT ".$db->pdate("datep")." as dp, pf.amount,";
$sql .= "c.libelle as paiement_type, p.num_paiement, p.rowid";
$sql .= " FROM ".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."c_paiement as c, ".MAIN_DB_PREFIX."paiement_facture as pf";
$sql .= " WHERE pf.fk_facture = ".$fac->id." AND p.fk_paiement = c.id AND pf.fk_paiement = p.rowid";
$sql .= " ORDER BY dp DESC";
$sql.= " c.libelle as paiement_type, p.num_paiement, p.rowid";
$sql.= " FROM ".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."c_paiement as c, ".MAIN_DB_PREFIX."paiement_facture as pf";
$sql.= " WHERE pf.fk_facture = ".$fac->id." AND p.fk_paiement = c.id AND pf.fk_paiement = p.rowid";
$sql.= " ORDER BY dp DESC";
$result = $db->query($sql);
if ($result)
{
$num = $db->num_rows();
$num = $db->num_rows($result);
$i = 0; $total = 0;
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("Date").'</td><td>'.$langs->trans("Type").'</td>';
@ -933,10 +933,10 @@ else
$var=True;
while ($i < $num)
{
$objp = $db->fetch_object();
$objp = $db->fetch_object($result);
$var=!$var;
print "<tr $bc[$var]><td>";
print '<a href="'.DOL_URL_ROOT.'/compta/paiement/fiche.php?id='.$objp->rowid.'">'.img_file().'</a>';
print '<a href="'.DOL_URL_ROOT.'/compta/paiement/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowPayment"),"payment").'</a>';
print "&nbsp;".strftime("%d %B %Y",$objp->dp)."</td>\n";
print "<td>$objp->paiement_type $objp->num_paiement</td>\n";
print '<td align="right">'.price($objp->amount)."</td><td>".$conf->monnaie."</td>\n";

2
htdocs/compta/paiement/avalider.php
View File

@ -89,7 +89,7 @@ if ($result)
$objp = $db->fetch_object($result);
$var=!$var;
print "<tr $bc[$var]>";
print '<td><a href="fiche.php?id='.$objp->rowid.'">'.img_file().' '.$objp->rowid.'</td>';
print '<td>'.'<a href="'.DOL_URL_ROOT.'/compta/paiement/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowPayment"),"payment").' '.$objp->rowid.'</a></td>';
print '<td>'.dolibarr_print_date($objp->dp)."</td>\n";
print "<td>$objp->paiement_type $objp->num_paiement</td>\n";
print '<td align="right">'.price($objp->amount).'</td>';

15
htdocs/compta/paiement/fiche.php
View File

@ -106,21 +106,20 @@ if ($_GET["action"] == 'valide')
print '<br>';
print '<table class="noborder" width="100%">';
print '<table class="border" width="100%">';
print '<tr><td valign="top">';
if ($paiement->bank_account) {
// Si compte renseigné, on affiche libelle
print '<tr><td valign="top" width="140">';
$bank=new Account($db);
$bank->fetch($paiement->bank_account);
print $langs->trans("BankAccount").' : '.$bank->label.'<br>';
print $langs->trans("BankAccount").'</td><td><a href="'.DOL_URL_ROOT.'/compta/bank/account.php?account='.$bank->id.'">'.$bank->label.'</a></td></tr>';
}
print $langs->trans("Date").' : '.dolibarr_print_date($paiement->date)."<br>";
print $langs->trans("Type").' : '.$paiement->type_libelle."<br>";
if ($paiement->numero) { print $langs->trans("Numero").' : '.$paiement->numero."<br>"; }
print $langs->trans("Amount").' : '.$paiement->montant."&nbsp;".$conf->monnaie."<br>";
print '</td></tr>';
print '<tr><td valign="top" width="140">'.$langs->trans("Date").'</td><td>'.dolibarr_print_date($paiement->date).'</td></tr>';
print '<tr><td valign="top">'.$langs->trans("Type").'</td><td>'.$paiement->type_libelle.'</td></tr>';
if ($paiement->numero) { print '<tr><td valign="top">'.$langs->trans("Numero").'</td><td>'.$paiement->numero.'</td></tr>'; }
print '<tr><td valign="top">'.$langs->trans("Amount").'</td><td>'.$paiement->montant."&nbsp;".$conf->monnaie.'</td></tr>';
print "</table>";
print nl2br($paiement->note);

4
htdocs/compta/paiement/liste.php
View File

@ -99,7 +99,7 @@ if ($resql)
$objp = $db->fetch_object($resql);
$var=!$var;
print "<tr $bc[$var]>";
print '<td><a href="fiche.php?id='.$objp->rowid.'">'.img_file().' '.$objp->rowid.'</td>';
print '<td>'.'<a href="'.DOL_URL_ROOT.'/compta/paiement/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowPayment"),"payment").' '.$objp->rowid.'</a></td>';
print '<td>'.dolibarr_print_date($objp->dp)."</td>\n";
print "<td>$objp->paiement_type $objp->num_paiement</td>\n";
print '<td align="right">'.price($objp->amount).'</td>';
@ -125,5 +125,5 @@ else {
$db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
llxFooter('$Date$ - $Revision$');
?>

7
htdocs/compta/paiement/pre.inc.php
View File

@ -26,19 +26,20 @@ $langs->load("compta");
function llxHeader($head = "", $title="") {
global $user, $langs;
$langs->load("bills");
top_menu($head, $title);
$menu = new Menu();
$menu->add("liste.php",$langs->trans("List"));
$menu->add("rapport.php","Rapports");
$menu->add("rapport.php",$langs->trans("Reportins"));
$menu->add(DOL_URL_ROOT."/compta/facture.php",$langs->trans("Bills"));
$menu->add_submenu("liste.php",$langs->trans("Payments"));
$menu->add_submenu("avalider.php",$langs->trans("A valider"));
$menu->add_submenu("avalider.php",$langs->trans("MenuToValid"));
left_menu($menu->liste);
}

53
htdocs/fourn/facture/fiche.php
View File

@ -314,7 +314,7 @@ if ($_GET["action"] == 'create' or $_GET["action"] == 'copy')
else
{
/*
* Fiche facture en mode edition
* Fiche facture en mode visu ou edition
*
*/
if ($_GET["facid"] > 0)
@ -457,24 +457,28 @@ else
*/
if ($_GET["action"] == 'valid')
{
$html->form_confirm("fiche.php?facid=$fac->id","Valider la facture","Etes-vous sûr de vouloir valider cette facture ?","confirm_valid");
$html->form_confirm("fiche.php?facid=$fac->id",$langs->trans("ValidateBill"),"Etes-vous sûr de vouloir valider cette facture ?","confirm_valid");
print '<br />';
}
print "<table border=\"0\" width=\"100%\">";
print '<tr><td width="50%" valign="top">';
/*
* Facture
*/
print '<table class="border" width="100%">';
print "<tr><td>".$langs->trans("Company")."</td><td colspan=\"2\"><b><a href=\"../fiche.php?socid=$fac->socidp\">$fac->socnom</a></b></td>";
print "<td align=\"right\"><a href=\"index.php?socid=$fac->socidp\">".$langs->trans("OtherBills")."</a></td>\n";
print "<td align=\"right\"><a href=\"index.php?socid=$fac->socidp\">".$langs->trans("OtherBills")."</a></td>\n";
print "</tr>";
print '<tr><td>'.$langs->trans("Date")."</td><td colspan=\"3\">".dolibarr_print_date($fac->datep,"%A %e %B %Y")."</td></tr>\n";
print '<tr><td>'.$langs->trans("Date")."</td><td colspan=\"3\">";
print dolibarr_print_date($fac->datep,"%A %e %B %Y")."</td></tr>\n";
print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">';
print $fac->libelle;
print "</td>";
print '</td>';
print '</tr>';
$authorfullname="&nbsp;";
if ($fac->author)
{
@ -485,9 +489,9 @@ else
print "<tr><td>".$langs->trans("Author")."</td><td colspan=\"3\">$authorfullname</td>";
print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">'.$fac->LibStatut($fac->paye,$fac->statut)."</td></tr>";
print "<tr>".'<td>'.$langs->trans("TotalHT").'</td><td align="center"><b>'.price($fac->total_ht)."</b></td>";
print '<tr><td>'.$langs->trans("TotalHT").'</td><td align="center"><b>'.price($fac->total_ht)."</b></td>";
print '<td align="right">'.$langs->trans("VAT").'</td><td align="center">'.price($fac->total_tva)."</td></tr>";
print "<tr>".'<td>'.$langs->trans("TotalTTC").'</td><td colspan="3" align="center">'.price($fac->total_ttc)."</td></tr>";
print '<tr><td>'.$langs->trans("TotalTTC").'</td><td colspan="3" align="center">'.price($fac->total_ttc)."</td></tr>";
if (strlen($fac->note))
{
print '<tr><td>'.$langs->trans("Comments").'</td><td colspan="3">';
@ -498,22 +502,26 @@ else
print "</td><td valign=\"top\">";
/*
* Paiements
*/
print '<table class="border" width="100%">';
print '<tr><td>';
$sql = "SELECT ".$db->pdate("datep")." as dp, p.amount, c.libelle as paiement_type, p.num_paiement, p.rowid";
$sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p, ".MAIN_DB_PREFIX."c_paiement as c ";
$sql .= " WHERE p.fk_facture_fourn = ".$fac->id." AND p.fk_paiement = c.id";
$result = $db->query($sql);
if ($result)
{
$num = $db->num_rows();
$num = $db->num_rows($result);
$i = 0; $total = 0;
echo '<table class="noborder" width="100%">';
print '<tr><td colspan="2">'.$langs->trans("Payments").'</td></tr>';
print '<table class="noborder" width="100%">';
print '<tr><td colspan="2">'.$langs->trans("Payments").' :</td></tr>';
print "<tr class=\"liste_titre\">";
print '<td>'.$langs->trans("Date").'</td>';
print '<td>'.$langs->trans("Type").'</td>';
@ -528,10 +536,10 @@ else
$var=True;
while ($i < $num)
{
$objp = $db->fetch_object();
$objp = $db->fetch_object($result);
$var=!$var;
print "<tr $bc[$var]>";
print "<td>".strftime("%e %B %Y",$objp->dp)."</td>\n";
print "<td>".img_object($langs->trans("Payment"),"payment").' '.dolibarr_print_date($objp->dp)."</td>\n";
print "<td>$objp->paiement_type $objp->num_paiement</td>\n";
print "<td align=\"right\">".price($objp->amount)."</td><td>".$conf->monnaie."</td>\n";
@ -563,11 +571,17 @@ else
}
else
{
print $db->error();
dolibarr_print_error($db);
}
print "</td></tr>";
print "</table>";
print "</td></tr>";
print "</table>";
/*
* Lignes
*
@ -599,10 +613,9 @@ else
print "</div>\n";
}
/*
* Barre de commande
*
*
* Boutons actions
*/
print "<div class=\"tabsAction\">\n";
@ -653,5 +666,5 @@ else
$db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
llxFooter('$Date$ - $Revision$');
?>

15
htdocs/fourn/facture/paiement.php
View File

@ -23,7 +23,8 @@
*
*/
/** \file htdocs/fourn/facture/paiement.php
/**
\file htdocs/fourn/facture/paiement.php
\ingroup fournisseur,facture
\brief Paiements des factures fournisseurs
\version $Revision$
@ -197,6 +198,9 @@ if ($action == 'create')
}
}
/*
* Affichage liste
*/
if ($action == '') {
if ($page == -1)
@ -206,7 +210,7 @@ if ($action == '') {
$limit = $conf->liste_limit;
$offset = $limit * $page ;
$sql = "SELECT ".$db->pdate("p.datep")." as dp, p.amount, f.amount as fa_amount, f.facnumber, s.nom";
$sql = "SELECT p.rowid, ".$db->pdate("p.datep")." as dp, p.amount, f.amount as fa_amount, f.facnumber, s.nom";
$sql .=", f.rowid as facid, c.libelle as paiement_type, p.num_paiement";
$sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p, ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."c_paiement as c, ".MAIN_DB_PREFIX."societe as s";
$sql .= " WHERE p.fk_facture_fourn = f.rowid AND p.fk_paiement = c.id AND s.idp = f.fk_soc";
@ -230,6 +234,7 @@ if ($action == '') {
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Ref").'</td>';
print '<td>'.$langs->trans("Bill").'</td>';
print '<td>'.$langs->trans("Company").'</td>';
print '<td>'.$langs->trans("Date").'</td>';
@ -242,8 +247,8 @@ if ($action == '') {
$objp = $db->fetch_object($result);
$var=!$var;
print "<tr $bc[$var]>";
print "<td><a href=\"fiche.php?facid=$objp->facid\">".img_object($langs->trans("ShowBill"),"bill")."</a> ";
print "<a href=\"fiche.php?facid=$objp->facid\">$objp->facnumber</a></td>\n";
print "<td><a href=\"".DOL_URL_ROOT."/fourn/facture/paiement/fiche.php?facid=$objp->facid\">".img_object($langs->trans("ShowPayment"),"payment").' '.$objp->rowid.'</a></td>';
print "<td><a href=\"".DOL_URL_ROOT."/fourn/facture/fiche.php?facid=$objp->facid\">".img_object($langs->trans("ShowBill"),"bill").' '.$objp->facnumber.'</a></td>';
print '<td>'.$objp->nom.'</td>';
print "<td>".dolibarr_print_date($objp->dp)."</td>\n";
print "<td>$objp->paiement_type $objp->num_paiement</td>\n";
@ -262,5 +267,5 @@ if ($action == '') {
$db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
llxFooter('$Date$ - $Revision$');
?>

27
htdocs/includes/menus/barre_left/eldy.php
View File

@ -173,7 +173,7 @@ class MenuLeft {
// Actions
$newmenu->add(DOL_URL_ROOT."/comm/action/index.php?leftmenu=actions", $langs->trans("Actions"), 0);
if ($leftmenu=="actions") $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/index.php?time=today", $langs->trans("Today"), 1);
if ($leftmenu=="actions") $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/rapport/index.php", $langs->trans("Reporting"), 1);
if ($leftmenu=="actions") $newmenu->add_submenu(DOL_URL_ROOT."/comm/action/rapport/index.php", $langs->trans("Reportings"), 1);
// Propal
if ($conf->propal->enabled)
@ -271,19 +271,24 @@ class MenuLeft {
if ($conf->facture->enabled)
{
$langs->load("customers_bills");
$langs->load("bills");
$newmenu->add(DOL_URL_ROOT."/compta/facture.php?leftmenu=customers_bills",$langs->trans("BillsCustomers"),1,$user->rights->facture->lire);
if ($user->societe_id == 0)
{
if ($leftmenu=="customers_bills") $newmenu->add_submenu(DOL_URL_ROOT."/compta/clients.php?action=facturer",$langs->trans("NewBill"),2,$user->rights->facture->creer);
if (eregi("customers_bills",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/clients.php?action=facturer",$langs->trans("NewBill"),2,$user->rights->facture->creer);
}
if ($leftmenu=="customers_bills") $newmenu->add_submenu(DOL_URL_ROOT."/compta/facture/impayees.php",$langs->trans("Unpayed"),2,$user->rights->facture->lire);
if (eregi("customers_bills",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/facture/impayees.php",$langs->trans("Unpayed"),2,$user->rights->facture->lire);
if (! defined("FACTURE_DISABLE_RECUR") || ! FACTURE_DISABLE_RECUR)
{
if ($leftmenu=="customers_bills") $newmenu->add_submenu(DOL_URL_ROOT."/compta/facture/fiche-rec.php","Récurrentes",2,$user->rights->facture->lire);
if (eregi("customers_bills",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/facture/fiche-rec.php","Récurrentes",2,$user->rights->facture->lire);
}
if ($leftmenu=="customers_bills") $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/liste.php",$langs->trans("Payments"),2,$user->rights->facture->lire);
if ($leftmenu=="customers_bills") $newmenu->add_submenu(DOL_URL_ROOT."/compta/facture/stats/", $langs->trans("Statistics"),2,$user->rights->facture->lire);
if (eregi("customers_bills",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/liste.php?leftmenu=customers_bills_payments",$langs->trans("Payments"),2,$user->rights->facture->lire);
if (eregi("customers_bills_payments",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/avalider.php",$langs->trans("MenuToValid"),3,$user->rights->facture->lire);
if (eregi("customers_bills_payments",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/paiement/rapport.php",$langs->trans("Reportings"),3,$user->rights->facture->lire);
if (eregi("customers_bills",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/facture/stats/", $langs->trans("Statistics"),2,$user->rights->facture->lire);
}
// Commandes
@ -352,7 +357,7 @@ class MenuLeft {
// Rapports
if ($conf->compta->enabled) {
// Bilan, résultats
$newmenu->add(DOL_URL_ROOT."/compta/resultat/index.php?leftmenu=ca&mainmenu=accountancy",$langs->trans("Reporting"),0,$user->rights->compta->resultat->lire);
$newmenu->add(DOL_URL_ROOT."/compta/resultat/index.php?leftmenu=ca&mainmenu=accountancy",$langs->trans("Reportings"),0,$user->rights->compta->resultat->lire);
if ($leftmenu=="ca") $newmenu->add(DOL_URL_ROOT."/compta/resultat/index.php?leftmenu=ca","Résultat / Exercice",1,$user->rights->compta->resultat->lire);
if ($leftmenu=="ca") $newmenu->add_submenu(DOL_URL_ROOT."/compta/resultat/clientfourn.php?leftmenu=ca",$langs->trans("ByCompanies"),2,$user->rights->compta->resultat->lire);
@ -571,6 +576,12 @@ class MenuLeft {
else
print '&nbsp; &nbsp; <font class="vsmenudisabled">'.$this->menu_array[$i]['titre'].'</font><br>';
}
if ($this->menu_array[$i]['level']==3) {
if ($this->menu_array[$i]['enabled'])
print '&nbsp; &nbsp; &nbsp; &nbsp; <a class="vsmenu" href="'.$this->menu_array[$i]['url'].'">'.$this->menu_array[$i]['titre'].'</a><br>';
else
print '&nbsp; &nbsp; &nbsp; &nbsp; <font class="vsmenudisabled">'.$this->menu_array[$i]['titre'].'</font><br>';
}
if ($i == (sizeof($this->menu_array)-1) || $this->menu_array[$i+1]['level']==0) {
print '</div>';

2
htdocs/langs/en_US/bills.lang
View File

@ -63,6 +63,7 @@ GlobalDiscount=Global discount
NumberOfBills=Nb of bills
NumberOfBillsByMonth=Nb of bills by month
ShowBill=Show bill
ShowPayment=Show payment
AlreadyPayed=Already payed
RemainderToPay=Remainder to pay
RemainderToTake=Remainder to take
@ -77,3 +78,4 @@ RemainderToBill=Remainder to bill
SendBillByMail=Send bill by email
SendReminderBillByMail=Send reminder by email
RelatedCommercialProposals=Related commercial proposals
MenuToValid=To valid

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

@ -180,6 +180,7 @@ ReCalculate=Rebuild
ResultOk=Success
ResultKo=Failure
Reporting=Reporting
Reportings=Reportings
Drafts=Drafts
Opened=Opened
New=New

2
htdocs/langs/fr_FR/bills.lang
View File

@ -70,6 +70,7 @@ CreateDraft=Cr
SendBillRef=Envoi facture %s
SendReminderBillRef=Relance facture %s
ShowBill=Afficher facture
ShowPayment=Afficher paiement
StandingOrders=Prélèvements
StandingOrder=Prélèvement
NoDraftBills=Pas de facture brouillon
@ -80,3 +81,4 @@ RemainderToBill=Reste
SendBillByMail=Envoyer la facture par mail
SendReminderBillByMail=Envoyer une relance par mail
RelatedCommercialProposals=Propositions commercials associées
MenuToValid=A valider

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

@ -179,7 +179,8 @@ ChangedBy=Modifi
ReCalculate=Re-calculer
ResultOk=Succès
ResultKo=Échec
Reporting=Rapports
Reporting=Rapport
Reportings=Rapports
Drafts=Brouillons
Opened=Ouverts
New=Nouveau

BIN
htdocs/theme/dev/img/object_payment.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 455 B

BIN
htdocs/theme/dolibarr/img/object_payment.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 455 B

BIN
htdocs/theme/eldy/img/object_payment.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 455 B

BIN
htdocs/theme/freelug/img/object_payment.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 455 B

BIN
htdocs/theme/yellow/img/object_payment.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 455 B