From 15e50ecdb39fb389efc26f41c212cd702bb100fe Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Wed, 9 Sep 2015 21:35:41 +0200
Subject: [PATCH] Update work

---
 htdocs/compta/tva/card.php            | 28 +++++++++++++--------------
 htdocs/compta/tva/class/tva.class.php |  8 ++++++--
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index 33c795ed10b..78883afbc30 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -167,8 +167,8 @@ if ($action == 'delete')
 
 
 /*
-*	View
-*/
+ *	View
+ */
 
 llxHeader();
 
@@ -194,16 +194,16 @@ if ($action == 'create')
     {
         print "\n".'<script type="text/javascript" language="javascript">';
         print '$(document).ready(function () {
-				$("#radiopayment").click(function() {
-                    $("#Label").html(document.formvat.Label.value);
-                    document.formvat.refund.value=0;
-				});
-				$("#radiorefund").click(function() {
-					$("#Label").html(document.formvat.Label.value);
-                    document.formsoc.refund.value=1;
-				});
-		});';
-        print '</script>'."\n";
+                $("#radiopayment").click(function() {
+                    $("#label").val($(this).data("label"));
+                    
+                });
+                $("#radiorefund").click(function() {
+                    $("#label").val($(this).data("label"));
+                    
+                });
+        });';
+		print '</script>'."\n";
 	}
 
     print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" name="formvat" method="post">';
@@ -215,13 +215,13 @@ if ($action == 'create')
     print $langs->trans("Type").':&nbsp;&nbsp;&nbsp;';
     print '</div>';
     print '<label for="radiopayment">';
-    print '<input type="radio" id="radiopayment" class="flat" name="refund" value="0"'.($refund?'':' checked').'>';
+    print '<input type="radio" id="radiopayment" data-label="'.$langs->trans('VATPayment').'" class="flat" name="refund" value="0"'.($refund?'':' checked="checked"').'>';
     print '&nbsp;';
     print $langs->trans("Payment");
     print '</label>';
     print '&nbsp;&nbsp;&nbsp;';
     print '<label for="radiorefund">';
-    print '<input type="radio" id="radiorefund" class="flat" name="refund" value="1"'.($refund?' checked':'').'>';
+    print '<input type="radio" id="radiorefund" data-label="'.$langs->trans('VATRefund').'" class="flat" name="refund" value="1"'.($refund?' checked="checked"':'').'>';
     print '&nbsp;';
     print $langs->trans("Refund");
     print '</label>';
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index 74f77a9f8ea..68aeeebc2c8 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -577,8 +577,12 @@ class Tva extends CommonObject
 					$result=$acc->fetch($this->accountid);
 					if ($result <= 0) dol_print_error($this->db);
 
-                    $bank_line_id = $acc->addline($this->datep, $this->type_payment, $this->label, -abs($this->amount), '', '', $user);
-
+					if ($this->amount > 0) {
+						$bank_line_id = $acc->addline($this->datep, $this->type_payment, $this->label, -abs($this->amount), '', '', $user);
+					} else {
+						$bank_line_id = $acc->addline($this->datep, $this->type_payment, $this->label, abs($this->amount), '', '', $user);
+					}
+						
                     // Update fk_bank into llx_tva. So we know vat line used to generate bank transaction
                     if ($bank_line_id > 0)
 					{