From cac9c8b79f8fdc3d81da9efdcb9d5f073bf3fcbb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 20 Oct 2006 21:20:42 +0000 Subject: [PATCH] =?UTF-8?q?Picto=20l=E9g=E8rement=20diff=E9rent=20pour=20f?= =?UTF-8?q?acture=20remplacement,=20avoir=20ou=20standard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/compta/index.php | 9 ++++++--- htdocs/facture.class.php | 10 +++++++++- htdocs/langs/en_US/bills.lang | 2 ++ htdocs/langs/fr_FR/bills.lang | 2 ++ htdocs/theme/dev/img/object_billa.png | Bin 0 -> 1024 bytes htdocs/theme/dev/img/object_billr.png | Bin 0 -> 1026 bytes htdocs/theme/dolibarr/img/object_billa.png | Bin 0 -> 1024 bytes htdocs/theme/dolibarr/img/object_billr.png | Bin 0 -> 1026 bytes htdocs/theme/eldy/img/object_billa.png | Bin 0 -> 1024 bytes htdocs/theme/eldy/img/object_billr.png | Bin 0 -> 1026 bytes htdocs/theme/freelug/img/object_billa.png | Bin 0 -> 1024 bytes htdocs/theme/freelug/img/object_billr.png | Bin 0 -> 1026 bytes htdocs/theme/yellow/img/object_billa.png | Bin 0 -> 1024 bytes htdocs/theme/yellow/img/object_billr.png | Bin 0 -> 1026 bytes 14 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 htdocs/theme/dev/img/object_billa.png create mode 100644 htdocs/theme/dev/img/object_billr.png create mode 100644 htdocs/theme/dolibarr/img/object_billa.png create mode 100644 htdocs/theme/dolibarr/img/object_billr.png create mode 100644 htdocs/theme/eldy/img/object_billa.png create mode 100644 htdocs/theme/eldy/img/object_billr.png create mode 100644 htdocs/theme/freelug/img/object_billa.png create mode 100644 htdocs/theme/freelug/img/object_billr.png create mode 100644 htdocs/theme/yellow/img/object_billa.png create mode 100644 htdocs/theme/yellow/img/object_billr.png diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 7a1a768a197..861bdbdb765 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -120,7 +120,7 @@ if ($conf->facture->enabled) */ if ($conf->facture->enabled && $user->rights->facture->lire) { - $sql = "SELECT f.facnumber, f.rowid, f.total_ttc, s.nom, s.idp"; + $sql = "SELECT f.facnumber, f.rowid, f.total_ttc, f.type, s.nom, s.idp"; if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user "; $sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -151,7 +151,8 @@ if ($conf->facture->enabled && $user->rights->facture->lire) $var=!$var; print ''; $facturestatic->ref=$obj->facnumber; - $facturestatic->id=$obj->idp; + $facturestatic->id=$obj->rowid; + $facturestatic->type=$obj->type; print $facturestatic->getNomUrl(1,''); print ''; print ''.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($obj->nom,16).''; @@ -359,7 +360,8 @@ if ($conf->facture->enabled && $user->rights->facture->lire) { $facstatic=new Facture($db); - $sql = "SELECT f.rowid, f.facnumber, f.fk_statut, f.total, f.total_ttc, ".$db->pdate("f.date_lim_reglement")." as datelimite,"; + $sql = "SELECT f.rowid, f.facnumber, f.fk_statut, f.type, f.total, f.total_ttc, "; + $sql.= $db->pdate("f.date_lim_reglement")." as datelimite,"; $sql.= " sum(pf.amount) as am,"; $sql.= " s.nom, s.idp"; if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user "; @@ -400,6 +402,7 @@ if ($conf->facture->enabled && $user->rights->facture->lire) print ''; $facturestatic->ref=$obj->facnumber; $facturestatic->id=$obj->rowid; + $facturestatic->type=$obj->type; print $facturestatic->getNomUrl(1,''); if ($obj->datelimite < (time() - $conf->facture->client->warning_delay)) print img_warning($langs->trans("Late")); print ''; diff --git a/htdocs/facture.class.php b/htdocs/facture.class.php index 29e37fa3fdc..dc435366088 100644 --- a/htdocs/facture.class.php +++ b/htdocs/facture.class.php @@ -361,8 +361,16 @@ class Facture extends CommonObject $lien = ''; $lienfin=''; + + $picto='bill'; + if ($this->type == 1) $picto.='r'; + if ($this->type == 2) $picto.='a'; - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowInvoice"),'bill').$lienfin.' '); + $label=$langs->trans("ShowInvoice"); + if ($this->type == 1) $label=$langs->trans("ShowInvoiceReplace"); + if ($this->type == 2) $label=$langs->trans("ShowInvoiceAvoir"); + + if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin.' '); $result.=$lien.$this->ref.$lienfin; return $result; } diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 022821bd295..f1b3ee2218d 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -120,6 +120,8 @@ NumberOfBills=Nb of invoices NumberOfBillsByMonth=Nb of invoices by month ShowBill=Show invoice ShowInvoice=Show invoice +ShowInvoiceReplace=Show replacing invoice +ShowInvoiceAvoir=Show avoir invoice ShowPayment=Show payment File=File AlreadyPayed=Already payed diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index c15630c822c..20f3b9183e7 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -120,6 +120,8 @@ NumberOfBills=Nb de factures NumberOfBillsByMonth=Nb de factures par mois ShowBill=Afficher facture ShowInvoice=Afficher facture +ShowInvoiceReplace=Afficher facture de remplacement +ShowInvoiceAvoir=Afficher facture avoir ShowPayment=Afficher paiement File=Fichier AlreadyPayed=Déjà réglé diff --git a/htdocs/theme/dev/img/object_billa.png b/htdocs/theme/dev/img/object_billa.png new file mode 100644 index 0000000000000000000000000000000000000000..3635f753a312322c56c3d603117249abe4bbdf92 GIT binary patch literal 1024 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD>a32@4CTe`Mzm1PXB$ zctjR6FmQbUVMeDlCNqG7Ea{HEjtmSN`?>!lvNA9*GX(gAxJE@q1qB6NJ9qBdxxL4> zE?qjOXX%udy>nWQ&1t!J@80+K@6R3EI;E$2&XnpYJ;i&M_MBVV^8DVlo|fXZb9%Ne zo$~zH+H-4r_HJGK{@UJiYo{FByY>COW9PQcdH??X(m7M^o!fhE>(c-K|IeAzb8YX| zIa6A`fB*g*sQ=ozo}QMTo}S|3;_U2fCnu+K=g!TUGY9C%Q7{?;^bCP%C(}0q?PDwn z@(X5gcy=QV$SL!5aSW-r<$LBeUy}h(+e4$f1?#jjrz~0#;r~G3-TzMtjlTEm{r4?n zNH{K0HDj|bP0l+XkK DEaJdK literal 0 HcmV?d00001 diff --git a/htdocs/theme/dev/img/object_billr.png b/htdocs/theme/dev/img/object_billr.png new file mode 100644 index 0000000000000000000000000000000000000000..3c7443cba3e2bbe9c56d15e922fe340a7f817e1b GIT binary patch literal 1026 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD>a32@4BYO=3*$019yy zctjR6FmQbUVMeDlCNqG7Ea{HEjtmSN`?>!lvNA9*GX(gAxJE@q1qB6NJ9qBdxxL4> zE?qjOXX%udy>nWQ&1t!J@80+K@6R3EI;E$2&XnpYJ;i&M_MBVV^8DVlo|fXZb9%Ne zo$~zH+H-4r_HJGK{@UJiYo{FByY>COW9PQcdH??X(m7M^o!fhE>(c-K|IeAzb8YX| zIa6A`fB*g*sQ=ozo}QMTo}S|3;_U2fCnu+K=g!TUGY9C%Q7{?;^bCP%C(}0q?PDwn z@(X5gcy=QV$f@vjaSW-r<$ETQ?~nlxOMv-=hR(C=hZjdG)g+XIB2q2!9e5@B7l literal 0 HcmV?d00001 diff --git a/htdocs/theme/dolibarr/img/object_billa.png b/htdocs/theme/dolibarr/img/object_billa.png new file mode 100644 index 0000000000000000000000000000000000000000..3635f753a312322c56c3d603117249abe4bbdf92 GIT binary patch literal 1024 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD>a32@4CTe`Mzm1PXB$ zctjR6FmQbUVMeDlCNqG7Ea{HEjtmSN`?>!lvNA9*GX(gAxJE@q1qB6NJ9qBdxxL4> zE?qjOXX%udy>nWQ&1t!J@80+K@6R3EI;E$2&XnpYJ;i&M_MBVV^8DVlo|fXZb9%Ne zo$~zH+H-4r_HJGK{@UJiYo{FByY>COW9PQcdH??X(m7M^o!fhE>(c-K|IeAzb8YX| zIa6A`fB*g*sQ=ozo}QMTo}S|3;_U2fCnu+K=g!TUGY9C%Q7{?;^bCP%C(}0q?PDwn z@(X5gcy=QV$SL!5aSW-r<$LBeUy}h(+e4$f1?#jjrz~0#;r~G3-TzMtjlTEm{r4?n zNH{K0HDj|bP0l+XkK DEaJdK literal 0 HcmV?d00001 diff --git a/htdocs/theme/dolibarr/img/object_billr.png b/htdocs/theme/dolibarr/img/object_billr.png new file mode 100644 index 0000000000000000000000000000000000000000..3c7443cba3e2bbe9c56d15e922fe340a7f817e1b GIT binary patch literal 1026 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD>a32@4BYO=3*$019yy zctjR6FmQbUVMeDlCNqG7Ea{HEjtmSN`?>!lvNA9*GX(gAxJE@q1qB6NJ9qBdxxL4> zE?qjOXX%udy>nWQ&1t!J@80+K@6R3EI;E$2&XnpYJ;i&M_MBVV^8DVlo|fXZb9%Ne zo$~zH+H-4r_HJGK{@UJiYo{FByY>COW9PQcdH??X(m7M^o!fhE>(c-K|IeAzb8YX| zIa6A`fB*g*sQ=ozo}QMTo}S|3;_U2fCnu+K=g!TUGY9C%Q7{?;^bCP%C(}0q?PDwn z@(X5gcy=QV$f@vjaSW-r<$ETQ?~nlxOMv-=hR(C=hZjdG)g+XIB2q2!9e5@B7l literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/object_billa.png b/htdocs/theme/eldy/img/object_billa.png new file mode 100644 index 0000000000000000000000000000000000000000..3635f753a312322c56c3d603117249abe4bbdf92 GIT binary patch literal 1024 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD>a32@4CTe`Mzm1PXB$ zctjR6FmQbUVMeDlCNqG7Ea{HEjtmSN`?>!lvNA9*GX(gAxJE@q1qB6NJ9qBdxxL4> zE?qjOXX%udy>nWQ&1t!J@80+K@6R3EI;E$2&XnpYJ;i&M_MBVV^8DVlo|fXZb9%Ne zo$~zH+H-4r_HJGK{@UJiYo{FByY>COW9PQcdH??X(m7M^o!fhE>(c-K|IeAzb8YX| zIa6A`fB*g*sQ=ozo}QMTo}S|3;_U2fCnu+K=g!TUGY9C%Q7{?;^bCP%C(}0q?PDwn z@(X5gcy=QV$SL!5aSW-r<$LBeUy}h(+e4$f1?#jjrz~0#;r~G3-TzMtjlTEm{r4?n zNH{K0HDj|bP0l+XkK DEaJdK literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/object_billr.png b/htdocs/theme/eldy/img/object_billr.png new file mode 100644 index 0000000000000000000000000000000000000000..3c7443cba3e2bbe9c56d15e922fe340a7f817e1b GIT binary patch literal 1026 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD>a32@4BYO=3*$019yy zctjR6FmQbUVMeDlCNqG7Ea{HEjtmSN`?>!lvNA9*GX(gAxJE@q1qB6NJ9qBdxxL4> zE?qjOXX%udy>nWQ&1t!J@80+K@6R3EI;E$2&XnpYJ;i&M_MBVV^8DVlo|fXZb9%Ne zo$~zH+H-4r_HJGK{@UJiYo{FByY>COW9PQcdH??X(m7M^o!fhE>(c-K|IeAzb8YX| zIa6A`fB*g*sQ=ozo}QMTo}S|3;_U2fCnu+K=g!TUGY9C%Q7{?;^bCP%C(}0q?PDwn z@(X5gcy=QV$f@vjaSW-r<$ETQ?~nlxOMv-=hR(C=hZjdG)g+XIB2q2!9e5@B7l literal 0 HcmV?d00001 diff --git a/htdocs/theme/freelug/img/object_billa.png b/htdocs/theme/freelug/img/object_billa.png new file mode 100644 index 0000000000000000000000000000000000000000..3635f753a312322c56c3d603117249abe4bbdf92 GIT binary patch literal 1024 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD>a32@4CTe`Mzm1PXB$ zctjR6FmQbUVMeDlCNqG7Ea{HEjtmSN`?>!lvNA9*GX(gAxJE@q1qB6NJ9qBdxxL4> zE?qjOXX%udy>nWQ&1t!J@80+K@6R3EI;E$2&XnpYJ;i&M_MBVV^8DVlo|fXZb9%Ne zo$~zH+H-4r_HJGK{@UJiYo{FByY>COW9PQcdH??X(m7M^o!fhE>(c-K|IeAzb8YX| zIa6A`fB*g*sQ=ozo}QMTo}S|3;_U2fCnu+K=g!TUGY9C%Q7{?;^bCP%C(}0q?PDwn z@(X5gcy=QV$SL!5aSW-r<$LBeUy}h(+e4$f1?#jjrz~0#;r~G3-TzMtjlTEm{r4?n zNH{K0HDj|bP0l+XkK DEaJdK literal 0 HcmV?d00001 diff --git a/htdocs/theme/freelug/img/object_billr.png b/htdocs/theme/freelug/img/object_billr.png new file mode 100644 index 0000000000000000000000000000000000000000..3c7443cba3e2bbe9c56d15e922fe340a7f817e1b GIT binary patch literal 1026 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD>a32@4BYO=3*$019yy zctjR6FmQbUVMeDlCNqG7Ea{HEjtmSN`?>!lvNA9*GX(gAxJE@q1qB6NJ9qBdxxL4> zE?qjOXX%udy>nWQ&1t!J@80+K@6R3EI;E$2&XnpYJ;i&M_MBVV^8DVlo|fXZb9%Ne zo$~zH+H-4r_HJGK{@UJiYo{FByY>COW9PQcdH??X(m7M^o!fhE>(c-K|IeAzb8YX| zIa6A`fB*g*sQ=ozo}QMTo}S|3;_U2fCnu+K=g!TUGY9C%Q7{?;^bCP%C(}0q?PDwn z@(X5gcy=QV$f@vjaSW-r<$ETQ?~nlxOMv-=hR(C=hZjdG)g+XIB2q2!9e5@B7l literal 0 HcmV?d00001 diff --git a/htdocs/theme/yellow/img/object_billa.png b/htdocs/theme/yellow/img/object_billa.png new file mode 100644 index 0000000000000000000000000000000000000000..3635f753a312322c56c3d603117249abe4bbdf92 GIT binary patch literal 1024 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD>a32@4CTe`Mzm1PXB$ zctjR6FmQbUVMeDlCNqG7Ea{HEjtmSN`?>!lvNA9*GX(gAxJE@q1qB6NJ9qBdxxL4> zE?qjOXX%udy>nWQ&1t!J@80+K@6R3EI;E$2&XnpYJ;i&M_MBVV^8DVlo|fXZb9%Ne zo$~zH+H-4r_HJGK{@UJiYo{FByY>COW9PQcdH??X(m7M^o!fhE>(c-K|IeAzb8YX| zIa6A`fB*g*sQ=ozo}QMTo}S|3;_U2fCnu+K=g!TUGY9C%Q7{?;^bCP%C(}0q?PDwn z@(X5gcy=QV$SL!5aSW-r<$LBeUy}h(+e4$f1?#jjrz~0#;r~G3-TzMtjlTEm{r4?n zNH{K0HDj|bP0l+XkK DEaJdK literal 0 HcmV?d00001 diff --git a/htdocs/theme/yellow/img/object_billr.png b/htdocs/theme/yellow/img/object_billr.png new file mode 100644 index 0000000000000000000000000000000000000000..3c7443cba3e2bbe9c56d15e922fe340a7f817e1b GIT binary patch literal 1026 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD>a32@4BYO=3*$019yy zctjR6FmQbUVMeDlCNqG7Ea{HEjtmSN`?>!lvNA9*GX(gAxJE@q1qB6NJ9qBdxxL4> zE?qjOXX%udy>nWQ&1t!J@80+K@6R3EI;E$2&XnpYJ;i&M_MBVV^8DVlo|fXZb9%Ne zo$~zH+H-4r_HJGK{@UJiYo{FByY>COW9PQcdH??X(m7M^o!fhE>(c-K|IeAzb8YX| zIa6A`fB*g*sQ=ozo}QMTo}S|3;_U2fCnu+K=g!TUGY9C%Q7{?;^bCP%C(}0q?PDwn z@(X5gcy=QV$f@vjaSW-r<$ETQ?~nlxOMv-=hR(C=hZjdG)g+XIB2q2!9e5@B7l literal 0 HcmV?d00001