';
diff --git a/htdocs/core/modules/modStockTransfer.class.php b/htdocs/core/modules/modStockTransfer.class.php
index e8d2a452d56..2bbfc99555f 100644
--- a/htdocs/core/modules/modStockTransfer.class.php
+++ b/htdocs/core/modules/modStockTransfer.class.php
@@ -468,7 +468,7 @@ class modStockTransfer extends DolibarrModules
{
// Get free id for insert
$newid = 0;
- $sql = "SELECT max(rowid) newid from ".MAIN_DB_PREFIX."c_type_contact";
+ $sql = "SELECT MAX(rowid) newid from ".MAIN_DB_PREFIX."c_type_contact";
$result = $this->db->query($sql);
if ($result) {
$obj = $this->db->fetch_object($result);
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index 319a2dfe603..5f824c86658 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -197,7 +197,7 @@ class PaiementFourn extends Paiement
// Add controls of input validity
if ($value_converted === false) {
// We failed to find the conversion for one invoice
- $this->error = 'FailedToFoundTheConversionRateForInvoice';
+ $this->error = $langs->trans('FailedToFoundTheConversionRateForInvoice');
return -1;
}
if (empty($currencyofpayment)) {
diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index d41b7311075..1ce92de287f 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -316,9 +316,9 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 2
-- SWITZERLAND (id country=6)
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 61, 6, '0','0','VAT rate 0', 1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 62, 6, '3.7','0','VAT rate - reduced',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 63, 6, '2.5','0','VAT rate - super-reduced',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 64, 6, '7.7','0','VAT rate - standard',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 62, 6, '3.8','0','VAT rate - reduced',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 63, 6, '2.6','0','VAT rate - super-reduced',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 64, 6, '8.1','0','VAT rate - standard',1);
-- SRI LANKA (id country=207)
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2071, 207, '0','0','VAT 0', 1);
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 5d7596889fc..05a35144b7d 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -1150,13 +1150,13 @@ if ($ok && GETPOST('force_disable_of_modules_not_found', 'alpha')) {
}
if ($key == 'js') {
$value = $obj->value;
- $valuearray = json_decode($value);
+ $valuearray = (array) json_decode($value); // Force cast into array because sometimes it is a stdClass
$reloffile = $valuearray[0];
$reloffile = preg_replace('/^\//', '', $valuearray[0]);
}
if ($key == 'css') {
$value = $obj->value;
- $valuearray = json_decode($value);
+ $valuearray = (array) json_decode($value); // Force cast into array because sometimes it is a stdClass
if ($value && (!is_array($valuearray) || count($valuearray) == 0)) {
$valuearray = array();
$valuearray[0] = $value; // If value was not a json array but a string
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index d69159bd758..d3ec7e33148 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -403,3 +403,8 @@ BadSetupOfFieldClassNotFoundForValidation = Error bad setup of field : Class not
BadSetupOfFieldFileNotFound = Error bad setup of field : File not found for inclusion
BadSetupOfFieldFetchNotCallable = Error bad setup of field : Fetch not callable on class
ErrorTooManyAttempts= Too many attempts, please try again later
+
+TotalAmountEmpty=Total Amount Empty
+FailedToFoundTheConversionRateForInvoice=Failed to found the conversion rate for invoice
+ThisIdNotDefined=$this->id not defined
+OperNotDefined=Oper not defined
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 1fc37c855d8..34148bf11e2 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -243,3 +243,4 @@ MemberLastname=Member lastname
MemberCodeDesc=Member Code, unique for all members
MemberSubscriptionStartFirstDayOf=The start date of a membership corresponds to the first day of a
MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a subscription except renewals (example +3m = +3 months, -5d = -5 days, +1Y = +1 year)
+SubscriptionLinkedToConciliatedTransaction=Membership is linked to a conciliated transaction so this modification is not allowed.
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 16ae3ca6a9d..0bf23a56545 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -352,6 +352,7 @@ HelpAbandonOther=Ce montant a été abandonné car il s'agissait d'une erreur de
IdSocialContribution=Id de paiement charge fiscale ou sociale
PaymentId=Id paiement
PaymentRef=Ref paiement
+SourceInvoiceId=Id facture source
InvoiceId=Id facture
InvoiceRef=Réf. facture
InvoiceDateCreation=Date création facture
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index ba5cab1e5b8..7c0edb9f450 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1154,7 +1154,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
print '