From 9e067eef2c320f9145a2916cfff6d21e098126b4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 11 Jun 2004 00:54:19 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20La=20date=20de=20valeur=20etait=20mal=20?=
 =?UTF-8?q?initialis=E9=20lors=20d'un=20virement.=20New:=20Am=E9lioration?=
 =?UTF-8?q?=20de=20l'interface=20des=20virements,=20un=20message=20s'affic?=
 =?UTF-8?q?he=20pour=20signaler=20que=20le=20virement=20a=20=E9t=E9=20enre?=
 =?UTF-8?q?gistr=E9.=20Le=20libell=E9=20et=20montant=20non=20nul=20ont=20?=
 =?UTF-8?q?=E9t=E9=20mis=20obligatoire?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/compta/bank/config.php   |  7 ++--
 htdocs/compta/bank/index.php    | 14 ++++++++
 htdocs/compta/bank/virement.php | 63 +++++++++++++++++++++------------
 htdocs/theme/eldy/eldy.css      |  1 +
 4 files changed, 61 insertions(+), 24 deletions(-)

diff --git a/htdocs/compta/bank/config.php b/htdocs/compta/bank/config.php
index 1216c8fd886..b93467df448 100644
--- a/htdocs/compta/bank/config.php
+++ b/htdocs/compta/bank/config.php
@@ -23,13 +23,14 @@ require("./pre.inc.php");
 require("./bank.lib.php");
 
 $user->getrights('compta');
+$user->getrights('banque');
 
 if (!$user->admin && !$user->rights->compta->bank)
   accessforbidden();
 
 llxHeader();
 
-print_titre("Configuration");
+print_titre("Configuration des comptes");
 print '<br>';
 
 print '<table class="noborder" width="100%" cellspacing="0" cellpadding="2">';
@@ -63,8 +64,10 @@ if ($result)
 print "</table>";
 
 
+/*
+ * Boutons d'actions
+ */
 print "<br><div class=\"tabsAction\">\n";
-
 if ($user->rights->banque->configurer) {
 	print '<a class="tabAction" href="fiche.php?action=create">Nouveau compte</a>';
 	print '<a class="tabAction" href="categ.php">Catégories</a>';
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 71b1295e594..469d2e22fb8 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -25,6 +25,9 @@ require("./bank.lib.php");
 require("../../tva.class.php");
 require("../../chargesociales.class.php");
 
+$user->getrights('compta');
+$user->getrights('banque');
+
 if (!$user->rights->banque->lire)
   accessforbidden();
 
@@ -148,6 +151,17 @@ for ($i = 0 ; $i < sizeof($accounts) ; $i++) {
 print "</table>";
 
 
+/*
+ * Boutons d'actions
+ */
+print "<br><div class=\"tabsAction\">\n";
+if ($user->rights->banque->configurer) {
+	print '<a class="tabAction" href="fiche.php?action=create">Nouveau compte</a>';
+	print '<a class="tabAction" href="categ.php">Catégories</a>';
+}
+print "</div>";
+
+
 $db->close();
 
 llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php
index 419472b6b07..d594f8d1119 100644
--- a/htdocs/compta/bank/virement.php
+++ b/htdocs/compta/bank/virement.php
@@ -23,6 +23,8 @@
 require("./pre.inc.php");
 require("./bank.lib.php");
 
+$user->getrights('banque');
+
 if (!$user->rights->banque->modifier)
   accessforbidden();
 
@@ -30,33 +32,50 @@ llxHeader();
 
 if ($action == 'add')
 {
-  $dateo = $reyear."-".$remonth."-".$reday;
+    /*
+     * Ajout d'un virement
+     */
+  $mesg='';
+  $dateo = $_POST["$reyear"]."-".$_POST["$remonth"]."-".$_POST["$reday"];
+  $label = $_POST["label"];
+  $amount= $_POST["amount"];
+  
+  if ($label && $amount) {
 
-  $sql = "INSERT INTO ".MAIN_DB_PREFIX."bank (datec, dateo, label, amount, fk_user_author,fk_account, fk_type)";
-  $sql .= " VALUES (now(), '$dateo', '$label', (0 - $amount),$user->id,$account_from, 'VIR')";
-
-  $result = $db->query($sql);
-  if (!$result)
-    {
-      print $db->error();
-      print "<p>$sql";
-    }
-
-  $sql = "INSERT INTO ".MAIN_DB_PREFIX."bank (datec, dateo, label, amount, fk_user_author,fk_account, fk_type)";
-  $sql .= " VALUES (now(), '$dateo', '$label', $amount,$user->id, $account_to, 'VIR')";
-
-
-  $result = $db->query($sql);
-  if (!$result)
-    {
-      print $db->error();
-      print "<p>$sql";
-    } 
+      $sql = "INSERT INTO ".MAIN_DB_PREFIX."bank (datec, datev, dateo, label, amount, fk_user_author,fk_account, fk_type)";
+      $sql .= " VALUES (now(), now(), '$dateo', '$label', (0 - $amount),$user->id,$account_from, 'VIR')";
+    
+      $result = $db->query($sql);
+      if (!$result)
+        {
+          print "Erreur: $sql :".$db->error();
+        }
+    
+      $sql = "INSERT INTO ".MAIN_DB_PREFIX."bank (datec, datev, dateo, label, amount, fk_user_author,fk_account, fk_type)";
+      $sql .= " VALUES (now(), now(), '$dateo', '$label', $amount,$user->id, $account_to, 'VIR')";
+    
+      $result = $db->query($sql);
+      if ($result)
+        {
+            $mesg.="<div class=\"ok\"><b>Votre virement de $amount ".MAIN_MONNAIE." a été crée.</b></div>";
+        }
+      else {
+          print "Erreur: $sql :".$db->error();
+        } 
+  } else {
+      $mesg.="<div class=\"error\"><b>Un libellé de virement et un montant non nul est obligatoire.</b></div>";
+  }
 }
 
-print_titre("Virement");
+print_titre("Virement inter-compte");
 print '<br>';
 
+if ($mesg) {
+    print "$mesg</div><br>";
+}
+
+print "En saisissant un virement d'un de vos comptes bancaire vers un autre, Dolibarr crée deux écritures comptables (une de débit dans un compte et l'autre de crédit, du même montant, dans l'autre compte. Le même libellé de transaction, et la même date, sont utilisés pour les 2 écritures)<br><br>";
+
 print "<form method=\"post\" action=\"$PHP_SELF\">";
 
 print '<input type="hidden" name="action" value="add">';
diff --git a/htdocs/theme/eldy/eldy.css b/htdocs/theme/eldy/eldy.css
index c6e9c886d00..6094f5535aa 100644
--- a/htdocs/theme/eldy/eldy.css
+++ b/htdocs/theme/eldy/eldy.css
@@ -297,6 +297,7 @@ div.menus {
 /*
  *   Normal, warning, erreurs
  */
+.ok      { color: #114466; }
 .warning { color: #777711; }
 .error   { color: #550000; }