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 2020-01-22 13:53:31 +01:00
commit d141d9516b
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/class/commonobject.class.php
View File

@ -5932,7 +5932,8 @@ abstract class CommonObject
{ {
$param_list=array_keys($param['options']); // $param_list='ObjectName:classPath' $param_list=array_keys($param['options']); // $param_list='ObjectName:classPath'
$showempty=(($required && $default != '')?0:1); $showempty=(($required && $default != '')?0:1);
$out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty); $out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss, $moreparam);
if ($conf->global->MAIN_FEATURES_LEVEL >= 2) if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
{ {
list($class,$classfile)=explode(':', $param_list[0]); list($class,$classfile)=explode(':', $param_list[0]);

4
htdocs/core/class/html.form.class.php
View File

@ -5044,11 +5044,11 @@ class Form
{ {
if ($societe_vendeuse->id == $mysoc->id) if ($societe_vendeuse->id == $mysoc->id)
{ {
$return.= '<font class="error">'.$langs->trans("ErrorYourCountryIsNotDefined").'</div>'; $return.= '<span class="error">'.$langs->trans("ErrorYourCountryIsNotDefined").'</span>';
} }
else else
{ {
$return.= '<font class="error">'.$langs->trans("ErrorSupplierCountryIsNotDefined").'</div>'; $return.= '<span class="error">'.$langs->trans("ErrorSupplierCountryIsNotDefined").'</span>';
} }
return $return; return $return;
} }

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

@ -819,9 +819,9 @@ class Product extends CommonObject
$this->height = price2num($this->height); $this->height = price2num($this->height);
$this->height_units = trim($this->height_units); $this->height_units = trim($this->height_units);
// set unit not defined // set unit not defined
if ($this->length_units) { $this->width_units = $this->length_units; // Not used yet if (is_numeric($this->length_units)) { $this->width_units = $this->length_units; // Not used yet
} }
if ($this->length_units) { $this->height_units = $this->length_units; // Not used yet if (is_numeric($this->length_units)) { $this->height_units = $this->length_units; // Not used yet
} }
// Automated compute surface and volume if not filled // Automated compute surface and volume if not filled
if (empty($this->surface) && !empty($this->length) && !empty($this->width) && $this->length_units == $this->width_units) { if (empty($this->surface) && !empty($this->length) && !empty($this->width) && $this->length_units == $this->width_units) {

6
htdocs/stripe/charge.php
View File

@ -142,7 +142,11 @@ if (!$rowid)
} }
if (! empty($charge->payment_intent)) { if (! empty($charge->payment_intent)) {
$charge = \Stripe\PaymentIntent::retrieve($charge->payment_intent); if (empty($stripeacc)) { // If the Stripe connect account not set, we use common API usage
$charge = \Stripe\PaymentIntent::retrieve($charge->payment_intent);
} else {
$charge = \Stripe\PaymentIntent::retrieve($charge->payment_intent, array("stripe_account" => $stripeacc));
}
} }
// The metadata FULLTAG is defined by the online payment page // The metadata FULLTAG is defined by the online payment page