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

Merge remote-tracking branch 'origin/3.9' into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2016-03-19 19:26:57 +01:00
commit ba4f5c8648
6 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2877,9 +2877,11 @@ class Propal extends CommonObject
$this->lines[$i]->id = $obj->rowid; // for backward compatibility $this->lines[$i]->id = $obj->rowid; // for backward compatibility
$this->lines[$i]->rowid = $obj->rowid; $this->lines[$i]->rowid = $obj->rowid;
$this->lines[$i]->label = $obj->custom_label; $this->lines[$i]->label = $obj->custom_label;
$this->lines[$i]->desc = $obj->description;
$this->lines[$i]->description = $obj->description; $this->lines[$i]->description = $obj->description;
$this->lines[$i]->fk_product = $obj->fk_product; $this->lines[$i]->fk_product = $obj->fk_product;
$this->lines[$i]->ref = $obj->ref; $this->lines[$i]->ref = $obj->ref;
$this->lines[$i]->product_ref = $obj->ref;
$this->lines[$i]->entity = $obj->entity; // Product entity $this->lines[$i]->entity = $obj->entity; // Product entity
$this->lines[$i]->product_label = $obj->product_label; $this->lines[$i]->product_label = $obj->product_label;
$this->lines[$i]->product_desc = $obj->product_desc; $this->lines[$i]->product_desc = $obj->product_desc;

1
htdocs/commande/class/commande.class.php
View File

@ -1740,6 +1740,7 @@ class Commande extends CommonOrder
$line->commande_id = $objp->fk_commande; $line->commande_id = $objp->fk_commande;
$line->label = $objp->custom_label; $line->label = $objp->custom_label;
$line->desc = $objp->description; $line->desc = $objp->description;
$line->description = $objp->description; // Description line
$line->product_type = $objp->product_type; $line->product_type = $objp->product_type;
$line->qty = $objp->qty; $line->qty = $objp->qty;
$line->tva_tx = $objp->tva_tx; $line->tva_tx = $objp->tva_tx;

2
htdocs/compta/facture/class/facture.class.php
View File

@ -1182,7 +1182,9 @@ class Facture extends CommonInvoice
$line->rowid = $objp->rowid; // deprecated $line->rowid = $objp->rowid; // deprecated
$line->label = $objp->custom_label; // deprecated $line->label = $objp->custom_label; // deprecated
$line->desc = $objp->description; // Description line $line->desc = $objp->description; // Description line
$line->description = $objp->description; // Description line
$line->product_type = $objp->product_type; // Type of line $line->product_type = $objp->product_type; // Type of line
$line->ref = $objp->product_ref; // Ref product
$line->product_ref = $objp->product_ref; // Ref product $line->product_ref = $objp->product_ref; // Ref product
$line->libelle = $objp->product_label; // TODO deprecated $line->libelle = $objp->product_label; // TODO deprecated
$line->product_label = $objp->product_label; // Label product $line->product_label = $objp->product_label; // Label product

2
htdocs/compta/tva/card.php
View File

@ -71,7 +71,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
$tva->datev=$datev; $tva->datev=$datev;
$tva->datep=$datep; $tva->datep=$datep;
$amount = GETPOST("amount"); $amount = price2num(GETPOST("amount"));
if ($refund == 1) { if ($refund == 1) {
$amount= -$amount; $amount= -$amount;
} }

2
htdocs/contact/list.php
View File

@ -126,7 +126,7 @@ $fieldstosearchall = array(
// Definition of fields for list // Definition of fields for list
$arrayfields=array( $arrayfields=array(
'p.lastname'=>array('label'=>$langs->trans("Lastname"), 'checked'=>1), 'p.lastname'=>array('label'=>$langs->trans("Lastname"), 'checked'=>1),
'p.firstname'=>array('label'=>$langs->trans("Firsname"), 'checked'=>1), 'p.firstname'=>array('label'=>$langs->trans("Firstname"), 'checked'=>1),
'p.poste'=>array('label'=>$langs->trans("Post"), 'checked'=>1), 'p.poste'=>array('label'=>$langs->trans("Post"), 'checked'=>1),
'p.town'=>array('label'=>$langs->trans("Town"), 'checked'=>0), 'p.town'=>array('label'=>$langs->trans("Town"), 'checked'=>0),
'p.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>0), 'p.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>0),

2
htdocs/projet/admin/project.php
View File

@ -508,7 +508,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
$file = $reg[1]; $file = $reg[1];
$classname = substr($file,4); $classname = substr($file,4);
require_once DOL_DOCUMENT_ROOT ."/core/modules/project/task/".$file.'.php'; require_once $dir.$file.'.php';
$module = new $file; $module = new $file;