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

TVA with one account : fix small bugs if account no given

Browse source
This commit is contained in:
Dany De Bontridder 2018-04-07 14:11:05 +02:00
parent a1f4321e98
commit f18d11aaa3
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
include/class/acc_ledger_purchase.class.php
View file

@ -189,8 +189,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger
$a_poste=explode(',',$tva_rate->tva_poste);
if (
$this->db->get_value('select count(*) from tmp_pcmn where pcm_val=$1',array($a_poste[0])) == 0 ||
$this->db->get_value('select count(*) from tmp_pcmn where pcm_val=$1',array($a_poste[1])) == 0 )
$this->db->get_value('select count(*) from tmp_pcmn where pcm_val=$1',array($a_poste[0])) == 0 )
throw new Exception(_(" La TVA ".$tva_rate->tva_label." utilise des postes comptables inexistants"));
}
@ -756,10 +755,14 @@ class Acc_Ledger_Purchase extends Acc_Ledger
if ( $value > 0 ) $tot_debit=bcadd($tot_debit,abs($value));
$acc_operation->insert_jrnx();
// if TVA is on both side, we deduce it immediately
if ( $oTva->get_parameter("both_side")==1)
if ( $oTva->get_parameter("both_side")==1 )
{
$poste_vat=$oTva->get_side('c');
if ( $poste_vat == '#')
{
$poste_vat=$oTva->get_side('d');
}
$acc_operation=new Acc_Operation($this->db);
$acc_operation->date=$e_date;
$acc_operation->poste=$poste_vat;
@ -769,7 +772,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger
$acc_operation->type='c';
$acc_operation->periode=$tperiode;
$acc_operation->insert_jrnx();
if ( $value < 0 ) $tot_debit=bcadd($tot_debit,abs($value));
if ( $value < 0 ) $tot_debit=bcadd($tot_debit,abs($value));
}
}

2
include/class/acc_ledger_sold.class.php
View file

@ -185,7 +185,7 @@ class Acc_Ledger_Sold extends Acc_Ledger {
$a_poste = explode(',', $tva_rate->tva_poste);
if (
$this->db->get_value('select count(*) from tmp_pcmn where pcm_val=$1', array($a_poste[0])) == 0 ||
$this->db->get_value('select count(*) from tmp_pcmn where pcm_val=$1', array($a_poste[1])) == 0)
throw new Exception(_(" La TVA " . $tva_rate->tva_label . " utilise des postes comptables inexistants"));
}