Browse Source

Hierarchie sur les lignes de factures, présentation plus légère, icone différente des factures ; pas de logo pour les lignes de facture non plus.

master
marcimat@rezo.net 10 years ago
parent
commit
d5db02afc5
  1. 4
      .gitattributes
  2. 4
      lang/factures_ligne_fr.php
  3. 2
      paquet.xml
  4. 16
      prive/objets/contenu/factures_ligne.html
  5. 10
      prive/objets/contenu/lignes_facture.html
  6. 8
      prive/objets/liste/factures.html
  7. 2
      prive/squelettes/contenu/factures.html
  8. 4
      prive/squelettes/contenu/factures_ligne.html
  9. 10
      prive/squelettes/hierarchie/factures_ligne.html
  10. 10
      prive/squelettes/navigation/factures_ligne.html
  11. 1
      prive/squelettes/navigation/factures_ligne_edit.html
  12. 2
      prive/style_prive_plugin_factures.html
  13. BIN
      prive/themes/spip/images/factures_ligne-12.png
  14. BIN
      prive/themes/spip/images/factures_ligne-16.png
  15. BIN
      prive/themes/spip/images/factures_ligne-24.png
  16. BIN
      prive/themes/spip/images/factures_ligne-32.png
  17. BIN
      prive/themes/spip/images/factures_ligne-add-16.png
  18. BIN
      prive/themes/spip/images/factures_ligne-add-24.png
  19. BIN
      prive/themes/spip/images/factures_ligne-add-32.png
  20. BIN
      prive/themes/spip/images/factures_ligne-del-16.png
  21. BIN
      prive/themes/spip/images/factures_ligne-del-24.png
  22. BIN
      prive/themes/spip/images/factures_ligne-del-32.png
  23. BIN
      prive/themes/spip/images/factures_ligne-edit-16.png
  24. BIN
      prive/themes/spip/images/factures_ligne-edit-24.png
  25. BIN
      prive/themes/spip/images/factures_ligne-edit-32.png
  26. BIN
      prive/themes/spip/images/factures_ligne-new-16.png
  27. BIN
      prive/themes/spip/images/factures_ligne-new-24.png
  28. BIN
      prive/themes/spip/images/factures_ligne-new-32.png

4
.gitattributes vendored

@ -16,7 +16,6 @@ lang/paquet-factures_fr.php -text
/paquet.xml -text
prive/objets/contenu/facture.html -text
prive/objets/contenu/factures_ligne.html -text
prive/objets/contenu/lignes_facture.html -text
prive/objets/infos/facture.html -text
prive/objets/infos/factures_ligne.html -text
prive/objets/liste/factures.html -text
@ -36,8 +35,11 @@ prive/squelettes/contenu/factures.html -text
prive/squelettes/contenu/factures_ligne.html -text
prive/squelettes/contenu/factures_ligne_edit.html -text
prive/squelettes/contenu/factures_lignes.html -text
prive/squelettes/hierarchie/factures_ligne.html -text
prive/squelettes/navigation/facture.html -text
prive/squelettes/navigation/facture_edit.html -text
prive/squelettes/navigation/factures_ligne.html -text
prive/squelettes/navigation/factures_ligne_edit.html -text
prive/style_prive_plugin_factures.html -text
prive/themes/spip/images/facture-12.png -text svneol=unset#image/png
prive/themes/spip/images/facture-16.png -text svneol=unset#image/png

4
lang/factures_ligne_fr.php

@ -28,7 +28,7 @@ $GLOBALS[$GLOBALS['idx_lang']] = array(
// L
'label_commentaire' => 'Commentaire',
'label_designation' => 'Désignation',
'label_id_facture' => 'Id facture',
'label_id_facture' => 'Facture',
'label_position' => 'Position',
'label_prix_unitaire_ht' => 'Prix unitaire hors taxes',
'label_quantite' => 'Quantité',
@ -49,4 +49,4 @@ $GLOBALS[$GLOBALS['idx_lang']] = array(
'titre_logo_factures_ligne' => 'Logo de cette ligne de facture',
);
?>
?>

2
paquet.xml

@ -1,7 +1,7 @@
<paquet
prefix="factures"
categorie="divers"
version="1.0.10"
version="1.0.11"
etat="experimental"
compatibilite="[3.0.7;3.0.*]"
logo=""

16
prive/objets/contenu/factures_ligne.html

@ -1,9 +1,17 @@
<BOUCLE_factures_ligne(FACTURES_LIGNES){id_factures_ligne}>
[<div class="champ contenu_id_facture[ (#ID_FACTURE*|strlen|?{'',vide})]">
<div class="champ contenu_id_facture[ (#ID_FACTURE*|strlen|?{'',vide})]">
<label><:factures_ligne:label_id_facture:> : </label>
<span dir='#LANG_DIR' class='#EDIT{id_facture} id_facture'>(#ID_FACTURE)</span>
</div>]
<BOUCLE_facture(FACTURES){id_facture}>
<span dir='#LANG_DIR' class='#EDIT{id_facture} id_facture'>
<a href="[(#ID_FACTURE|generer_url_entite{facture})]">
<:info_numero_abbreviation:>#ID_FACTURE[,
<:facture:label_reference_abbr:> (#NUM_FACTURE)][ :
(#LIBELLE_FACTURE|couper{100})]
</a>
</span>
</BOUCLE_facture>
</div>
[<div class="champ contenu_position[ (#POSITION*|strlen|?{'',vide})]">
<label><:factures_ligne:label_position:> : </label>
@ -35,4 +43,4 @@
<span dir='#LANG_DIR' class='#EDIT{commentaire} commentaire'>(#COMMENTAIRE)</span>
</div>]
</BOUCLE_factures_ligne>
</BOUCLE_factures_ligne>

10
prive/objets/contenu/lignes_facture.html

@ -1,10 +0,0 @@
[(#INCLURE{fond=prive/objets/liste/lignes_factures,titre=<:factures:info_detail_lignes_facture:>,id_parent=#ID_FACTURE,par=position,ajax,env})]
[(#AUTORISER{creerlignefacturedans,facture,#ID_FACTURE}|oui)
[(#ID_FACTURE|?{
[(#URL_ECRIRE{ligne_edit,new=oui&id_parent=#ID_FACTURE}|icone_verticale{<:factures:icone_creer_ligne:>,facture,new,right clearright})]
,
[(#URL_ECRIRE{ligne_edit,new=oui}|icone_verticale{<:factures:icone_creer_ligne:>,secteur,new,right clearright})]
})]
]
<div class="nettoyeur"></div>

8
prive/objets/liste/factures.html

@ -1,4 +1,5 @@
[(#SET{defaut_tri,#ARRAY{
date_facture,-1,
libelle_facture,1,
id_facture,1,
points,-1
@ -11,14 +12,17 @@
<tr class='first_row'>
<th class='picto' scope='col'></th>
<th class='libelle_facture' scope='col'>[(#TRI{libelle_facture,<:facture:label_libelle_facture:>,ajax})]</th>
<th class='date_facture' scope='col'>[(#TRI{date_facture,<:facture:label_date_facture:>,ajax})]</th>
<th class='id' scope='col'>[(#TRI{id_facture,<:info_numero_abbreviation:>,ajax})]</th>
</tr>
</thead>
<tbody>
<BOUCLE_liste_factures(FACTURES){id_organisation_emettrice?}{id_organisation?}{id_mot?}{id_auteur?}{where?}{recherche?}{tri #ENV{par,num libelle_facture},#GET{defaut_tri}}{par libelle_facture}{pagination #ENV{nb,10}}>
<BOUCLE_liste_factures(FACTURES){id_organisation_emettrice?}{id_organisation?}{id_mot?}{id_auteur?}{where?}{recherche?}
{tri #ENV{par,date_facture},#GET{defaut_tri}}{!par date_facture}{pagination #ENV{nb,10}}>
<tr class='[(#COMPTEUR_BOUCLE|alterner{row_odd,row_even})]'>
<td class='picto'>[(#CHEMIN_IMAGE{facture-16.png}|balise_img)]</td>
<td class='libelle_facture principale'>[(#LOGO_FACTURE|image_reduire{20,26})]<a href="[(#ID_FACTURE|generer_url_entite{facture})]" title="<:info_numero_abbreviation|attribut_html:> #ID_FACTURE">[(#RANG). ]#LIBELLE_FACTURE</a></td>
<td class='date_facture'>#DATE_FACTURE</td>
<td class='id'>[(#AUTORISER{modifier,facture,#ID_FACTURE}|?{
<a href="[(#URL_ECRIRE{facture_edit,id_facture=#ID_FACTURE})]">#ID_FACTURE</a>,
#ID_FACTURE
@ -31,4 +35,4 @@
</div>
</B_liste_factures>[
<div class="liste-objets factures caption-wrap"><strong class="caption">(#ENV*{sinon,''})</strong></div>
]<//B_liste_factures>
]<//B_liste_factures>

2
prive/squelettes/contenu/factures.html

@ -3,7 +3,7 @@
#FORMULAIRE_RECHERCHE_ECRIRE{#SELF,ajax}
<div class="nettoyeur"></div>
<INCLURE{fond=prive/objets/liste/factures, par=libelle_facture, env, ajax, sinon=<:facture:info_aucun_facture:>}>
<INCLURE{fond=prive/objets/liste/factures, par=date_facture, env, ajax, sinon=<:facture:info_aucun_facture:>}>
[(#AUTORISER{creer,facture})
[(#URL_ECRIRE{facture_edit,new=oui}|icone_verticale{<:facture:icone_creer_facture:>,facture,new,right})]

4
prive/squelettes/contenu/factures_ligne.html

@ -10,7 +10,7 @@
]
]
<h1>[(#RANG). ](#DESIGNATION|sinon{<:info_sans_titre:>})[(#CHEMIN_IMAGE{factures_ligne-24.png}|balise_img{factures_ligne,cadre-icone})]</h1>
<h1>[(#RANG). ](#DESIGNATION|couper{100}|sinon{<:info_sans_titre:>})[(#CHEMIN_IMAGE{factures_ligne-24.png}|balise_img{factures_ligne,cadre-icone})]</h1>
],simple fiche_objet})]
@ -43,4 +43,4 @@
]
</BOUCLE_factures_ligne>
[(#ENV**{exec}|=={factures_ligne_edit}|?{#INCLURE{fond=prive/squelettes/contenu/factures_ligne_edit,redirect='',env,retourajax=oui},#REM|sinon_interdire_acces})]
<//B_factures_ligne>
<//B_factures_ligne>

10
prive/squelettes/hierarchie/factures_ligne.html

@ -0,0 +1,10 @@
<BOUCLE_ariane(FACTURES_LIGNES){id_factures_ligne}>
<a href="#URL_ECRIRE{factures}"><:facture:titre_factures:></a>
<BOUCLE_facture(FACTURES){id_facture}>
&gt; <a href="[(#ID_FACTURE|generer_url_entite{facture})]">#NUM_FACTURE : [(#LIBELLE_FACTURE|couper{80})]</a>
</BOUCLE_facture>
&gt; <strong>[(#DESIGNATION|couper{80})]</strong>
</BOUCLE_ariane>
<a href="#URL_ECRIRE{factures}"><:facture:titre_factures:></a> &gt;
<strong>Ligne de facture inconnue…</strong>
<//B_ariane>

10
prive/squelettes/navigation/factures_ligne.html

@ -0,0 +1,10 @@
<BOUCLE_nav(FACTURES_LIGNES){id_factures_ligne}{si #ENV{exec}|=={factures_ligne}}>
#BOITE_OUVRIR{'','info'}
#PIPELINE{boite_infos,#ARRAY{data,'',args,#ARRAY{type,factures_ligne,id,#ENV{id_factures_ligne}}}}
#BOITE_FERMER
#PIPELINE{afficher_config_objet,#ARRAY{args,#ARRAY{type,factures_ligne,id,#ID_FACTURES_LIGNE},data,''}}
</BOUCLE_nav>
[(#ENV{exec}|=={factures_ligne_edit}|oui)<INCLURE{fond=prive/squelettes/navigation/factures_ligne_edit,env}>]
<//B_nav>

1
prive/squelettes/navigation/factures_ligne_edit.html

@ -0,0 +1 @@

2
prive/style_prive_plugin_factures.html

@ -1,7 +1,7 @@
#wysiwyg #organisations_adresses { display:block; clear:both; overflow:auto;}
#wysiwyg .cadre_organisation {
width:50%; float:left;
width:50%; float:left; margin:1em 0;
}
#wysiwyg .cadre_organisation > div {
background:#f0f0f0; margin:0; padding: .5em;

BIN
prive/themes/spip/images/factures_ligne-12.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 475 B

After

Width:  |  Height:  |  Size: 464 B

BIN
prive/themes/spip/images/factures_ligne-16.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 581 B

After

Width:  |  Height:  |  Size: 572 B

BIN
prive/themes/spip/images/factures_ligne-24.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
prive/themes/spip/images/factures_ligne-32.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
prive/themes/spip/images/factures_ligne-add-16.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 679 B

After

Width:  |  Height:  |  Size: 691 B

BIN
prive/themes/spip/images/factures_ligne-add-24.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
prive/themes/spip/images/factures_ligne-add-32.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
prive/themes/spip/images/factures_ligne-del-16.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 668 B

After

Width:  |  Height:  |  Size: 684 B

BIN
prive/themes/spip/images/factures_ligne-del-24.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
prive/themes/spip/images/factures_ligne-del-32.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
prive/themes/spip/images/factures_ligne-edit-16.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 726 B

After

Width:  |  Height:  |  Size: 728 B

BIN
prive/themes/spip/images/factures_ligne-edit-24.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
prive/themes/spip/images/factures_ligne-edit-32.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
prive/themes/spip/images/factures_ligne-new-16.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 651 B

After

Width:  |  Height:  |  Size: 663 B

BIN
prive/themes/spip/images/factures_ligne-new-24.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
prive/themes/spip/images/factures_ligne-new-32.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Loading…
Cancel
Save