Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 09:01:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

First work on a new module for expense report matching dolibarr

Browse Source 
standard to replace current one.
This commit is contained in:
Laurent Destailleur
2015-02-14 18:39:45 +01:00
parent bd4b401281
commit 448655ea45
24 changed files with 6595 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1656,6 +1656,10 @@ abstract class CommonObject
$fieldtva='tva';
$fieldup='pu_ht';
}
if ($this->element == 'expensereport')
{
$fieldup='value_unit';
}
$sql = 'SELECT rowid, qty, '.$fieldup.' as up, remise_percent, total_ht, '.$fieldtva.' as total_tva, total_ttc, '.$fieldlocaltax1.' as total_localtax1, '.$fieldlocaltax2.' as total_localtax2,';
$sql.= ' tva_tx as vatrate, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, info_bits, product_type';
@@ -1770,6 +1774,7 @@ abstract class CommonObject
if ($this->element == 'facture' || $this->element == 'facturerec') $fieldht='total';
if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') $fieldtva='total_tva';
if ($this->element == 'propal') $fieldttc='total';
if ($this->element == 'expensereport') $fieldtva='total_tva';
if (empty($nodatabaseupdate))
{