lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Local Taxes: Works in Propals

Browse Source
This commit is contained in:
Juanjo Menent 2010-06-17 19:36:46 +00:00
parent ba8896be48
commit 303007ae9e
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
htdocs/core/class/commonobject.class.php
View File

@ -894,9 +894,15 @@ class CommonObject
// List lines to sum // List lines to sum
$fieldtva='total_tva'; $fieldtva='total_tva';
if ($this->element == 'facture_fourn') $fieldtva='tva'; $fieldlocaltax1='total_localtax1';
$fieldlocaltax2='total_localtax2';
$sql = 'SELECT qty, total_ht, '.$fieldtva.' as total_tva, total_localtax1, total_localtax2, total_ttc'; if ($this->element == 'facture_fourn')
{
$fieldtva='tva';
}
$sql = 'SELECT qty, total_ht, '.$fieldtva.' as total_tva, '.$fieldlocaltax1.' as total_localtax1, '.$fieldlocaltax2.' as total_localtax2, total_ttc';
$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line; $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line;
$sql.= ' WHERE '.$this->fk_element.' = '.$this->id; $sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
@ -929,18 +935,26 @@ class CommonObject
// Now update field total_ht, total_ttc and tva // Now update field total_ht, total_ttc and tva
$fieldht='total_ht'; $fieldht='total_ht';
if ($this->element == 'facture') $fieldht='total';
if ($this->element == 'facturerec') $fieldht='total';
$fieldtva='tva'; $fieldtva='tva';
if ($this->element == 'facture_fourn') $fieldtva='total_tva';
$fieldlocaltax1='total_localtax1'; $fieldlocaltax1='localtax1';
$fieldlocaltax2='total_localtax2'; $fieldlocaltax2='localtax2';
$fieldttc='total_ttc'; $fieldttc='total_ttc';
if ($this->element == 'facture' || $this->element == 'facturerec')
{
$fieldht='total';
}
if ($this->element == 'facture_fourn')
{
$fieldtva='total_tva';
}
if ($this->element == 'propal') if ($this->element == 'propal')
{ {
$fieldlocaltax1='localtax1';
$fieldlocaltax2='localtax2';
$fieldttc='total'; $fieldttc='total';
} }