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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2019-09-07 09:50:08 +02:00
commit c9a62b09c1
8 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/contrat/card.php
View File

@ -433,7 +433,7 @@ if (empty($reshook))
} }
$qty = GETPOST('qty'.$predef); $qty = GETPOST('qty'.$predef);
$remise_percent = GETPOST('remise_percent'.$predef); $remise_percent = ((GETPOST('remise_percent'.$predef) != '') ? GETPOST('remise_percent'.$predef) : 0);
if ($qty == '') if ($qty == '')
{ {
@ -566,7 +566,8 @@ if (empty($reshook))
$info_bits=0; $info_bits=0;
if ($tva_npr) $info_bits |= 0x01; if ($tva_npr) $info_bits |= 0x01;
if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS) )&& ($price_min && (price2num($pu_ht)*(1-price2num($remise_percent)/100) < price2num($price_min)))) if (((! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance))
|| empty($conf->global->MAIN_USE_ADVANCED_PERMS) ) && ($price_min && (price2num($pu_ht)*(1-price2num($remise_percent)/100) < price2num($price_min))))
{ {
$object->error = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, -1, $conf->currency)); $object->error = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
$result = -1 ; $result = -1 ;

6
htdocs/core/boxes/box_activity.php
View File

@ -173,7 +173,7 @@ class box_activity extends ModeleBoxes
$totalnb += $data[$j]->nb; $totalnb += $data[$j]->nb;
$this->info_box_contents[$line][3] = array( $this->info_box_contents[$line][3] = array(
'td' => 'class="right"', 'td' => 'class="nowrap right"',
'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency), 'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
); );
$this->info_box_contents[$line][4] = array( $this->info_box_contents[$line][4] = array(
@ -256,7 +256,7 @@ class box_activity extends ModeleBoxes
$totalnb += $data[$j]->nb; $totalnb += $data[$j]->nb;
$this->info_box_contents[$line][3] = array( $this->info_box_contents[$line][3] = array(
'td' => 'class="right"', 'td' => 'class="nowrap right"',
'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency), 'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
); );
$this->info_box_contents[$line][4] = array( $this->info_box_contents[$line][4] = array(
@ -340,7 +340,7 @@ class box_activity extends ModeleBoxes
); );
$this->info_box_contents[$line][3] = array( $this->info_box_contents[$line][3] = array(
'td' => 'class="right"', 'td' => 'class="nowrap right"',
'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency) 'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency)
); );

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

@ -134,7 +134,7 @@ class box_comptes extends ModeleBoxes
); );
$this->info_box_contents[$line][] = array( $this->info_box_contents[$line][] = array(
'td' => 'class="right"', 'td' => 'class="right nowraponall"',
'text' => price($solde, 0, $langs, 0, -1, -1, $objp->currency_code) 'text' => price($solde, 0, $langs, 0, -1, -1, $objp->currency_code)
); );

4
htdocs/core/boxes/box_produits_alerte_stock.php
View File

@ -179,12 +179,12 @@ class box_produits_alerte_stock extends ModeleBoxes
} }
$this->info_box_contents[$line][] = array( $this->info_box_contents[$line][] = array(
'td' => 'class="right"', 'td' => 'class="right nowraponall"',
'text' => $price, 'text' => $price,
); );
$this->info_box_contents[$line][] = array( $this->info_box_contents[$line][] = array(
'td' => 'class="nowrap"', 'td' => 'class="right"',
'text' => $price_base_type, 'text' => $price_base_type,
); );

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

@ -135,7 +135,7 @@ class box_supplier_orders extends ModeleBoxes
); );
$this->info_box_contents[$line][] = array( $this->info_box_contents[$line][] = array(
'td' => 'class="right"', 'td' => 'class="right nowrap"',
'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency), 'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
); );

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

@ -383,6 +383,7 @@ class Stripe extends CommonObject
{ {
$metadata['dol_type'] = $object->element; $metadata['dol_type'] = $object->element;
$metadata['dol_id'] = $object->id; $metadata['dol_id'] = $object->id;
if (is_object($object->thirdparty) && $object->thirdparty->id > 0) $metadata['dol_thirdparty_id'] = $object->thirdparty->id;
} }
$dataforintent = array( $dataforintent = array(

BIN
htdocs/theme/md/img/title_ticket.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 234 B

BIN
htdocs/theme/md/img/title_ticketsup.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 KiB