[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 01/01: Bug : Pour TVA avec autoliquidation,
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 01/01: Bug : Pour TVA avec autoliquidation, les postes de contrepartie ne sont pas utilisés |
Date: |
Mon, 30 Mar 2015 17:11:04 +0000 |
sparkyx pushed a commit to branch master
in repository noalyss.
commit f366769873626c2bc18bb064ef83b0b4f3f0de6a
Author: Dany De Bontridder <address@hidden>
Date: Mon Mar 30 19:06:18 2015 +0200
Bug : Pour TVA avec autoliquidation, les postes de contrepartie ne sont pas
utilisés
---
html/index.php | 7 +++----
include/class_acc_ledger_purchase.php | 4 ++--
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/html/index.php b/html/index.php
index 48e7739..e78a49c 100644
--- a/html/index.php
+++ b/html/index.php
@@ -81,13 +81,12 @@
*
* \section convention_code Coding convention
* <p>
- * Some coding conventions to have a homogene code
+ * Some coding conventions to have a homogeneous code
* <ol>
* <li>Reuse the existing code , </li>
- * <li>Improve and check that the function is still working</li>
+ * <li>Improve and test that the function is still working</li>
* <li>Make documentation thanks doxygen tag</li>
* <li>In the folder include: filenames ending by *.inc.php will be executer
after being included</li>
- * <li>Dans le répertoire include: Les noms de fichiers sont *.php pour les
fichiers contenant des fonctions uniquement</li>
* <li>In the folder include: filenames end by *.php if they contains only
function</li>
* <li>In the folder include: filenames starting with
* class_*.php if it is related to a class.</li>
@@ -203,7 +202,7 @@ if ( strlen(domaine) > 0 )
echo '
<span
style="background-color:#879ed4;color:white;padding-left:4px;padding-right:4px;">
-version 6.8.0.1 - '.$my_domain.'
+version 6.8.0.2 - '.$my_domain.'
</span>
<BR>
<BR>
diff --git a/include/class_acc_ledger_purchase.php
b/include/class_acc_ledger_purchase.php
index ebc6565..0381b74 100644
--- a/include/class_acc_ledger_purchase.php
+++ b/include/class_acc_ledger_purchase.php
@@ -379,7 +379,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger
/* save op. */
$p_acc_operation->type = 'd';
$p_acc_operation->qcode = '';
- if (!$p_fiche->empty_attribute(ATTR_DEF_ACCOUNT_ND_TVA_ND) &&
$p_tva_both == 0)
+ if (!$p_fiche->empty_attribute(ATTR_DEF_ACCOUNT_ND_TVA_ND) )
{
$dna = $p_fiche->strAttribut(ATTR_DEF_ACCOUNT_ND_TVA_ND);
} else
@@ -412,7 +412,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger
{
$dna_default = new Acc_Parm_Code($this->db, 'TVA_DED_IMPOT');
/* save op. */
- if (!$p_fiche->empty_attribute(ATTR_DEF_ACCOUNT_ND_TVA) &&
$p_tva_both == 0)
+ if (!$p_fiche->empty_attribute(ATTR_DEF_ACCOUNT_ND_TVA) )
{
$dna = $p_fiche->strAttribut(ATTR_DEF_ACCOUNT_ND_TVA);
} else