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

FIX #14927 Change ContratLigne property type to product_type

Browse Source 
This bug is produced because the ContratLigne class gives a property type instead of a product_type
This commit is contained in:
Alfredo Altamirano 2020-10-14 21:57:17 -05:00
parent d40dea8084
commit 4a3ffbb6d4
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/contrat/class/contrat.class.php
View File

@ -753,6 +753,7 @@ class Contrat extends CommonObject
$sql.= " d.total_localtax1,";
$sql.= " d.total_localtax2,";
$sql.= " d.total_ttc,";
$sql .= " d.product_type,";
$sql.= " d.info_bits, d.fk_product,";
$sql.= " d.date_ouverture_prevue, d.date_ouverture,";
$sql.= " d.date_fin_validite, d.date_cloture,";
@ -799,6 +800,7 @@ class Contrat extends CommonObject
$line->total_ttc = $objp->total_ttc;
$line->fk_product = (($objp->fk_product > 0)?$objp->fk_product:0);
$line->info_bits = $objp->info_bits;
$line->product_type = $objp->product_type;
$line->fk_fournprice = $objp->fk_fournprice;
$marginInfos = getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $line->fk_fournprice, $objp->pa_ht);
@ -2563,7 +2565,7 @@ class ContratLigne extends CommonObjectLine
public $fk_product;
public $statut; // 0 inactive, 4 active, 5 closed
public $type; // 0 for product, 1 for service
public $product_type; // 0 for product, 1 for service
/**
* @var string

2
htdocs/core/boxes/box_services_contracts.php
View File

@ -120,7 +120,7 @@ class box_services_contracts extends ModeleBoxes
$contratlignestatic->fk_contrat=$objp->rowid;
$contratlignestatic->label=$objp->label;
$contratlignestatic->description=$objp->description;
$contratlignestatic->type=$objp->type;
$contratlignestatic->product_type = $objp->type;
$contratlignestatic->product_id=$objp->product_id;
$contratlignestatic->product_ref=$objp->product_ref;