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

Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	htdocs/product/list.php
	htdocs/projet/list.php
This commit is contained in:
Laurent Destailleur 2019-04-04 17:45:02 +02:00
commit 5891d0a056
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/fourn/class/fournisseur.facture.class.php
View File

@ -155,7 +155,7 @@ class FactureFournisseur extends CommonInvoice
/** /**
* @deprecated * @deprecated
* @see note_private, note_public * @see $note_private, $note_public
*/ */
public $note; public $note;
@ -1573,8 +1573,8 @@ class FactureFournisseur extends CommonInvoice
* @param double $qty Quantite * @param double $qty Quantite
* @param int $fk_product Product/Service ID predefined * @param int $fk_product Product/Service ID predefined
* @param double $remise_percent Percentage discount of the line * @param double $remise_percent Percentage discount of the line
* @param date $date_start Date de debut de validite du service * @param integer $date_start Date de debut de validite du service
* @param date $date_end Date de fin de validite du service * @param integer $date_end Date de fin de validite du service
* @param string $ventil Code de ventilation comptable * @param string $ventil Code de ventilation comptable
* @param int $info_bits Bits de type de lines * @param int $info_bits Bits de type de lines
* @param string $price_base_type HT ou TTC * @param string $price_base_type HT ou TTC
@ -1833,8 +1833,8 @@ class FactureFournisseur extends CommonInvoice
* @param int $type Type of line (0=product, 1=service) * @param int $type Type of line (0=product, 1=service)
* @param double $remise_percent Percentage discount of the line * @param double $remise_percent Percentage discount of the line
* @param int $notrigger Disable triggers * @param int $notrigger Disable triggers
* @param timestamp $date_start Date start of service * @param integer $date_start Date start of service
* @param timestamp $date_end Date end of service * @param integer $date_end Date end of service
* @param array $array_options extrafields array * @param array $array_options extrafields array
* @param string $fk_unit Code of the unit to use. Null to use the default one * @param string $fk_unit Code of the unit to use. Null to use the default one
* @param double $pu_ht_devise Amount in currency * @param double $pu_ht_devise Amount in currency
@ -2707,7 +2707,7 @@ class SupplierInvoiceLine extends CommonObjectLine
/** /**
* @deprecated * @deprecated
* @see product_ref * @see $product_ref
*/ */
public $ref; public $ref;
@ -2726,7 +2726,7 @@ class SupplierInvoiceLine extends CommonObjectLine
/** /**
* @deprecated * @deprecated
* @see label * @see $label
*/ */
public $libelle; public $libelle;
@ -2740,7 +2740,7 @@ class SupplierInvoiceLine extends CommonObjectLine
* Unit price before taxes * Unit price before taxes
* @var float * @var float
* @deprecated Use $subprice * @deprecated Use $subprice
* @see subprice * @see $subprice
*/ */
public $pu_ht; public $pu_ht;
@ -2756,7 +2756,7 @@ class SupplierInvoiceLine extends CommonObjectLine
* Total VAT amount * Total VAT amount
* @var float * @var float
* @deprecated Use $total_tva instead * @deprecated Use $total_tva instead
* @see total_tva * @see $total_tva
*/ */
public $tva; public $tva;

4
htdocs/fourn/class/fournisseur.product.class.php
View File

@ -57,7 +57,7 @@ class ProductFournisseur extends Product
/** /**
* @deprecated * @deprecated
* @see ref_supplier * @see $ref_supplier
*/ */
public $fourn_ref; public $fourn_ref;
public $delivery_time_days; public $delivery_time_days;
@ -1078,7 +1078,7 @@ class ProductFournisseur extends Product
* Private function to log price history * Private function to log price history
* *
* @param User $user Object user who adds/changes price * @param User $user Object user who adds/changes price
* @param date $datec date create * @param integer $datec date create
* @param float $buyprice price for qty * @param float $buyprice price for qty
* @param float $qty qty for price * @param float $qty qty for price
* @param float $multicurrency_buyprice Purchase price for the quantity min in currency * @param float $multicurrency_buyprice Purchase price for the quantity min in currency

2
htdocs/product/list.php
View File

@ -831,7 +831,7 @@ if ($resql)
// Label // Label
if (! empty($arrayfields['p.label']['checked'])) if (! empty($arrayfields['p.label']['checked']))
{ {
print '<td class="tdoverflowmax200">'.dol_trunc($obj->label, 70).'</td>'; print '<td class="tdoverflowmax200">'.dol_trunc($obj->label, 80).'</td>';
if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['nbfield']++;
} }

2
htdocs/projet/list.php
View File

@ -722,7 +722,7 @@ while ($i < min($num, $limit))
// Title // Title
if (! empty($arrayfields['p.title']['checked'])) if (! empty($arrayfields['p.title']['checked']))
{ {
print '<td class="tdoverflowmax100">'; print '<td class="tdoverflowmax200">';
print dol_trunc($obj->title, 80); print dol_trunc($obj->title, 80);
print '</td>'; print '</td>';
if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['nbfield']++;