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

Resolved merge conflict [2]

Browse Source
This commit is contained in:
Laurent Dinclaux 2017-05-05 10:34:38 +11:00
parent 24a2fb57ea
commit a1e9246794
1 changed files with 0 additions and 4 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

@ -3626,11 +3626,7 @@ class PropaleLigne extends CommonObjectLine
$this->qty = $objp->qty;
$this->price = $objp->price; // deprecated
$this->subprice = $objp->subprice;
<<<<<<< HEAD
$this->vat_src_code = $objp->vat_src_code;
=======
$this->vat_src_code = $objp->vat_src_code;
>>>>>>> upstream/5.0
$this->tva_tx = $objp->tva_tx;
$this->remise = $objp->remise; // deprecated
$this->remise_percent = $objp->remise_percent;