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

Local Taxes: Works in Propals

Browse Source
This commit is contained in:
Juanjo Menent 2010-06-17 18:36:30 +00:00
parent 92a2be3ef3
commit ba8896be48
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/propal/class/propal.class.php
View File

@ -832,7 +832,7 @@ class Propal extends CommonObject
global $conf; global $conf;
$sql = "SELECT p.rowid,ref,remise,remise_percent,remise_absolue,fk_soc"; $sql = "SELECT p.rowid,ref,remise,remise_percent,remise_absolue,fk_soc";
$sql.= ", total, tva, total_ht"; $sql.= ", total, tva, localtax1, localtax2, total_ht";
$sql.= ", datec"; $sql.= ", datec";
$sql.= ", date_valid as datev"; $sql.= ", date_valid as datev";
$sql.= ", datep as dp"; $sql.= ", datep as dp";
@ -873,6 +873,8 @@ class Propal extends CommonObject
$this->total = $obj->total; // TODO obsolete $this->total = $obj->total; // TODO obsolete
$this->total_ht = $obj->total_ht; $this->total_ht = $obj->total_ht;
$this->total_tva = $obj->tva; $this->total_tva = $obj->tva;
$this->total_localtax1 = $obj->localtax1;
$this->total_localtax2 = $obj->localtax2;
$this->total_ttc = $obj->total; $this->total_ttc = $obj->total;
$this->socid = $obj->fk_soc; $this->socid = $obj->fk_soc;
$this->fk_project = $obj->fk_projet; $this->fk_project = $obj->fk_projet;