admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bug : Pour TVA avec autoliquidation, les postes de contrepartie ne sont pas utilisés

Browse source
This commit is contained in:
Dany De Bontridder 2015-03-30 19:06:18 +02:00
parent 8ec361597c
commit f366769873
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
html/index.php
View file

@ -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>

4
include/class_acc_ledger_purchase.php
View file

@ -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