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 11.0

Browse Source 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/product/class/product.class.php
	htdocs/stripe/charge.php
This commit is contained in:
Laurent Destailleur 2020-01-22 14:10:46 +01:00
commit 4686be34d2
6 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/compta/facture/card.php
View File

@ -5150,6 +5150,7 @@ elseif ($id > 0 || !empty($ref))
// For situation invoice with excess received // For situation invoice with excess received
if ($object->statut > Facture::STATUS_DRAFT if ($object->statut > Facture::STATUS_DRAFT
&& $object->type == Facture::TYPE_SITUATION
&& ($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits) > 0 && ($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits) > 0
&& $usercancreate && $usercancreate
&& !$objectidnext && !$objectidnext

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

@ -6125,7 +6125,7 @@ abstract class CommonObject
$param_list_array = explode(':', $param_list[0]); $param_list_array = explode(':', $param_list[0]);
$showempty = (($required && $default != '') ? 0 : 1); $showempty = (($required && $default != '') ? 0 : 1);
$out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss, '', 0, empty($val['disabled']) ? 0 : 1); $out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss, $moreparam, 0, empty($val['disabled']) ? 0 : 1);
if (!empty($param_list_array[2])) // If we set to add a create button if (!empty($param_list_array[2])) // If we set to add a create button
{ {

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

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

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

@ -840,9 +840,11 @@ 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) {

2
htdocs/public/payment/newpayment.php
View File

@ -645,7 +645,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
\Stripe\Stripe::setApiKey($stripearrayofkeysbyenv[$servicestatus]['secret_key']); \Stripe\Stripe::setApiKey($stripearrayofkeysbyenv[$servicestatus]['secret_key']);
try { try {
if (empty($key)) { // If the Stripe connect account not set, we use common API usage if (empty($stripeacc)) { // If the Stripe connect account not set, we use common API usage
$paymentintent = \Stripe\PaymentIntent::retrieve($paymentintent_id); $paymentintent = \Stripe\PaymentIntent::retrieve($paymentintent_id);
} else { } else {
$paymentintent = \Stripe\PaymentIntent::retrieve($paymentintent_id, array("stripe_account" => $stripeacc)); $paymentintent = \Stripe\PaymentIntent::retrieve($paymentintent_id, array("stripe_account" => $stripeacc));

4
htdocs/stripe/charge.php
View File

@ -142,7 +142,11 @@ if (!$rowid)
} }
if (! empty($charge->payment_intent)) { if (! empty($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); $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