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

Qual: Derived missing variable from a known one

Browse Source
This commit is contained in:
Raphaël Doursenaud 2014-04-23 18:16:22 +02:00
parent ae11a151d7
commit 7cdabb7d6c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/expedition/class/expedition.class.php
View File

@ -101,6 +101,7 @@ class Expedition extends CommonObject
$this->products = array(); $this->products = array();
// List of long language codes for status // List of long language codes for status
$this->statuts = array();
$this->statuts[-1] = 'StatusSendingCanceled'; $this->statuts[-1] = 'StatusSendingCanceled';
$this->statuts[0] = 'StatusSendingDraft'; $this->statuts[0] = 'StatusSendingDraft';
$this->statuts[1] = 'StatusSendingValidated'; $this->statuts[1] = 'StatusSendingValidated';
@ -1087,7 +1088,7 @@ class Expedition extends CommonObject
$line->volume_units = $obj->volume_units; $line->volume_units = $obj->volume_units;
// For invoicing // For invoicing
$tabprice = calcul_price_total($obj->qty_shipped, $obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $info_bits, $obj->fk_product_type); // We force type to 0 $tabprice = calcul_price_total($obj->qty_shipped, $obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->fk_product_type); // We force type to 0
$line->desc = $obj->description; // We need ->desc because some code into CommonObject use desc (property defined for other elements) $line->desc = $obj->description; // We need ->desc because some code into CommonObject use desc (property defined for other elements)
$line->qty = $obj->qty_shipped; $line->qty = $obj->qty_shipped;
$line->total_ht = $tabprice[0]; $line->total_ht = $tabprice[0];