From ef4db705bccd319016a2faa91d734a5a09a1be52 Mon Sep 17 00:00:00 2001
From: "marcimat@rezo.net" <>
Date: Wed, 10 Apr 2013 11:50:55 +0000
Subject: [PATCH] =?UTF-8?q?Pouvoir=20configurer=20l'organisation=20=C3=A9m?=
 =?UTF-8?q?ettrice=20par=20d=C3=A9faut.=20Pr=C3=A9-remplir=20une=20facture?=
 =?UTF-8?q?=20de=20cette=20organisation=20=C3=A9mettrice.=20Pr=C3=A9-rempl?=
 =?UTF-8?q?ir=20aussi=20la=20date=20du=20jour.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 formulaires/configurer_factures.html |  6 +++++-
 formulaires/editer_facture.html      |  4 ++--
 formulaires/editer_facture.php       | 14 ++++++++++++--
 paquet.xml                           |  2 +-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/formulaires/configurer_factures.html b/formulaires/configurer_factures.html
index c4d5a17..6889d64 100644
--- a/formulaires/configurer_factures.html
+++ b/formulaires/configurer_factures.html
@@ -9,8 +9,12 @@
 	<div>
 		#ACTION_FORMULAIRE{#ENV{action}}
 
+		[(#SAISIE{organisations,id_organisation_emettrice,
+			label=<:facture:label_id_organisation_emettrice:>,
+			explication=<:facture:explication_id_organisation_emettrice:>})]
+
 		<input type="hidden" name="_meta_casier" value="factures" />
 		<p class="boutons"><span class="image_loading">&nbsp;</span><input type="submit" class="submit" value="<:bouton_enregistrer:>" /></p>
 	</div>
 	</form>
-</div>
\ No newline at end of file
+</div>
diff --git a/formulaires/editer_facture.html b/formulaires/editer_facture.html
index 8e94285..4d1b602 100644
--- a/formulaires/editer_facture.html
+++ b/formulaires/editer_facture.html
@@ -12,7 +12,7 @@
 				label=<:facture:label_num_facture:>,
 				explication=<:facture:explication_num_facture:> })]
 
-			[(#SAISIE{input, id_organisation_emettrice, obligatoire=oui,
+			[(#SAISIE{organisations, id_organisation_emettrice, obligatoire=oui,
 				label=<:facture:label_id_organisation_emettrice:>,
 				explication=<:facture:explication_id_organisation_emettrice:> })]
 
@@ -72,4 +72,4 @@
 		<p class="boutons"><input type='submit' class='submit' value='<:bouton_enregistrer:>' /></p>
 	</div></form>
 	]
-</div>
\ No newline at end of file
+</div>
diff --git a/formulaires/editer_facture.php b/formulaires/editer_facture.php
index 72581bd..51f8118 100644
--- a/formulaires/editer_facture.php
+++ b/formulaires/editer_facture.php
@@ -13,6 +13,7 @@ if (!defined('_ECRIRE_INC_VERSION')) return;
 
 include_spip('inc/actions');
 include_spip('inc/editer');
+include_spip('inc/config');
 
 /**
  * Identifier le formulaire en faisant abstraction des paramètres qui ne représentent pas l'objet edité
@@ -66,9 +67,16 @@ function formulaires_editer_facture_identifier_dist($id_facture='new', $retour='
  */
 function formulaires_editer_facture_charger_dist($id_facture='new', $retour='', $associer_objet='', $lier_trad=0, $config_fonc='', $row=array(), $hidden=''){
 	$valeurs = formulaires_editer_objet_charger('facture',$id_facture,'',$lier_trad,$retour,$config_fonc,$row,$hidden);
-	if ($id_organisation = _request('id_organisation') and !intval($id_facture)) {
-		$valeurs['id_organisation'] = $id_organisation;
+
+	// sur une nouvelle facture, préremplir ce que l'on connait.
+	if (!intval($id_facture)) {
+		if ($id_organisation = _request('id_organisation')) {
+			$valeurs['id_organisation'] = $id_organisation;
+		}
+		$valeurs['id_organisation_emettrice'] = lire_config('factures/id_organisation_emettrice', 0);
+		$valeurs['date_facture'] = date("Y-m-d H:i:00", time());
 	}
+
 	return $valeurs;
 }
 
@@ -110,6 +118,8 @@ function formulaires_editer_facture_verifier_dist($id_facture='new', $retour='',
 			// si une valeur de normalisation a ete transmis, la prendre.
 		} elseif (!is_null($normaliser)) {
 			set_request($champ, $normaliser);
+		} elseif (!_request($champ)) {
+			set_request($champ, null);
 		}
 	}
 
diff --git a/paquet.xml b/paquet.xml
index 060421a..470c039 100644
--- a/paquet.xml
+++ b/paquet.xml
@@ -1,7 +1,7 @@
 <paquet
 	prefix="factures"
 	categorie="divers"
-	version="1.0.13"
+	version="1.0.14"
 	etat="experimental"
 	compatibilite="[3.0.7;3.0.*]"
 	logo=""