diff --git a/html/index.php b/html/index.php index 48e7739e7..e78a49ca8 100644 --- a/html/index.php +++ b/html/index.php @@ -81,13 +81,12 @@ * * \section convention_code Coding convention *

- * Some coding conventions to have a homogene code + * Some coding conventions to have a homogeneous code *

    *
  1. Reuse the existing code ,
  2. - *
  3. Improve and check that the function is still working
  4. + *
  5. Improve and test that the function is still working
  6. *
  7. Make documentation thanks doxygen tag
  8. *
  9. In the folder include: filenames ending by *.inc.php will be executer after being included
  10. - *
  11. Dans le répertoire include: Les noms de fichiers sont *.php pour les fichiers contenant des fonctions uniquement
  12. *
  13. In the folder include: filenames end by *.php if they contains only function
  14. *
  15. In the folder include: filenames starting with * class_*.php if it is related to a class.
  16. @@ -203,7 +202,7 @@ if ( strlen(domaine) > 0 ) echo ' -version 6.8.0.1 - '.$my_domain.' +version 6.8.0.2 - '.$my_domain.'

    diff --git a/include/class_acc_ledger_purchase.php b/include/class_acc_ledger_purchase.php index ebc6565e7..0381b7499 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