diff --git a/.gitattributes b/.gitattributes index 233d5ba..5f3167e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -36,6 +36,9 @@ 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/navigation/facture.html -text +prive/squelettes/navigation/facture_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 prive/themes/spip/images/facture-24.png -text svneol=unset#image/png diff --git a/lang/facture_fr.php b/lang/facture_fr.php index bac35ff..f262735 100644 --- a/lang/facture_fr.php +++ b/lang/facture_fr.php @@ -35,17 +35,18 @@ $GLOBALS[$GLOBALS['idx_lang']] = array( // L 'label_conditions' => 'Conditions commerciales', - 'label_date_facture' => 'Date facture', - 'label_delais_validite' => 'Delais validite', - 'label_fin_validite' => 'Fin validite', - 'label_id_organisation' => 'Id organisation', + 'label_date_facture' => 'Date de facturation', + 'label_delais_validite' => 'Delais de validité', + 'label_fin_validite' => 'Fin de validité', + 'label_id_organisation' => 'Organisation facturée', 'label_id_organisation_emettrice' => 'Organisation émettrice', - 'label_libelle_facture' => 'Libelle facture', - 'label_montant' => 'Montant global de la facture (calculé)', + 'label_libelle_facture' => 'Libellé', + 'label_montant' => 'Montant global (calculé)', 'label_nota_bene' => 'Nota bene', 'label_num_devis' => 'Numéro du devis lié', 'label_num_facture' => 'Numéro de la facture', 'label_quantite' => 'Quantité globale', + 'label_reference_abbr' => 'Réf.', 'label_reglement' => 'Mode de règlement', 'label_unite' => 'Unité vendue', @@ -64,4 +65,4 @@ $GLOBALS[$GLOBALS['idx_lang']] = array( 'titre_logo_facture' => 'Logo de cette facture', ); -?> \ No newline at end of file +?> diff --git a/lang/factures_fr.php b/lang/factures_fr.php index 52ae099..94b25ff 100644 --- a/lang/factures_fr.php +++ b/lang/factures_fr.php @@ -16,8 +16,11 @@ $GLOBALS[$GLOBALS['idx_lang']] = array( 'cfg_exemple_explication' => 'Explication de cet exemple', 'cfg_titre_parametrages' => 'Paramétrages', + // N + 'non_renseigne' => 'Non renseigné', + // T 'titre_page_configurer_factures' => 'Configurer Factures & Devis', ); -?> \ No newline at end of file +?> diff --git a/paquet.xml b/paquet.xml index 8076829..7f3f563 100644 --- a/paquet.xml +++ b/paquet.xml @@ -1,7 +1,7 @@ - \ No newline at end of file + diff --git a/prive/objets/contenu/facture.html b/prive/objets/contenu/facture.html index df37556..0ff36b9 100644 --- a/prive/objets/contenu/facture.html +++ b/prive/objets/contenu/facture.html @@ -1,26 +1,47 @@ -[
+[] -[
- - (#ID_ORGANISATION_EMETTRICE) -
] +
+
+
+ + + #NOM + + [(#VOIE), ][(#COMPLEMENT) ,][(#BOITE_POSTALE), ][(#CODE_POSTAL) ][(#VILLE)][, (#PAYS)] + + + <:factures:non_renseigne:> + +
+
+
+
+ + + #NOM + + [(#VOIE), ][(#COMPLEMENT) ,][(#BOITE_POSTALE), ][(#CODE_POSTAL) ][(#VILLE)][, (#PAYS)] + + + <:factures:non_renseigne:> + +
+
+
+ -[
- - (#ID_ORGANISATION) -
] [
(#DATE_FACTURE)
] -[
+[] @@ -70,4 +91,4 @@ (#NUM_DEVIS)
] - \ No newline at end of file + diff --git a/prive/squelettes/contenu/facture.html b/prive/squelettes/contenu/facture.html index 52fefd8..5d5b4c4 100644 --- a/prive/squelettes/contenu/facture.html +++ b/prive/squelettes/contenu/facture.html @@ -11,6 +11,7 @@ ]

[(#RANG). ](#LIBELLE_FACTURE|sinon{<:info_sans_titre:>})[(#CHEMIN_IMAGE{facture-24.png}|balise_img{facture,cadre-icone})]

+ [

<:facture:label_reference_abbr:> (#NUM_FACTURE)

] ],simple fiche_objet})] @@ -55,4 +56,4 @@ ] [(#ENV**{exec}|=={facture_edit}|?{#INCLURE{fond=prive/squelettes/contenu/facture_edit,redirect='',env,retourajax=oui},#REM|sinon_interdire_acces})] - \ No newline at end of file + diff --git a/prive/squelettes/contenu/factures.html b/prive/squelettes/contenu/factures.html index c286717..2e15784 100644 --- a/prive/squelettes/contenu/factures.html +++ b/prive/squelettes/contenu/factures.html @@ -1,3 +1,5 @@ +

<:facture:titre_factures:>

+ #FORMULAIRE_RECHERCHE_ECRIRE{#SELF,ajax}
@@ -5,4 +7,4 @@ [(#AUTORISER{creer,facture}) [(#URL_ECRIRE{facture_edit,new=oui}|icone_verticale{<:facture:icone_creer_facture:>,facture,new,right})] -] \ No newline at end of file +] diff --git a/prive/squelettes/navigation/facture.html b/prive/squelettes/navigation/facture.html new file mode 100644 index 0000000..4b3f005 --- /dev/null +++ b/prive/squelettes/navigation/facture.html @@ -0,0 +1,10 @@ + +#BOITE_OUVRIR{'','info'} +#PIPELINE{boite_infos,#ARRAY{data,'',args,#ARRAY{type,facture,id,#ENV{id_facture}}}} +#BOITE_FERMER + +#PIPELINE{afficher_config_objet,#ARRAY{args,#ARRAY{type,facture,id,#ID_FACTURE},data,''}} + + +[(#ENV{exec}|=={facture_edit}|oui)] + diff --git a/prive/squelettes/navigation/facture_edit.html b/prive/squelettes/navigation/facture_edit.html new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/prive/squelettes/navigation/facture_edit.html @@ -0,0 +1 @@ + diff --git a/prive/style_prive_plugin_factures.html b/prive/style_prive_plugin_factures.html new file mode 100644 index 0000000..c403a83 --- /dev/null +++ b/prive/style_prive_plugin_factures.html @@ -0,0 +1,17 @@ + +#wysiwyg #organisations_adresses { display:block; clear:both; overflow:auto;} +#wysiwyg .cadre_organisation { + width:50%; float:left; +} +#wysiwyg .cadre_organisation > div { + background:#f0f0f0; margin:0; padding: .5em; +} +#wysiwyg .cadre_organisation.emettrice > div { margin-right:.5em; } +#wysiwyg .cadre_organisation.receptrice > div { margin-left:.5em; } + +#wysiwyg .cadre_organisation .nom { + display:block; +} +#wysiwyg .cadre_organisation .adresse { + display:block; +}