*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -163,6 +164,11 @@ if (!empty($hashp)) {
$modulepart = $moduleparttocheck;
$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
}
+ $entity = $ecmfile->entity;
+ if ($entity != $conf->entity) {
+ $conf->entity = $entity;
+ $conf->setValues($db);
+ }
} else {
$langs->load("errors");
accessforbidden($langs->trans("ErrorFileNotFoundWithSharedLink"), 0, 0, 1);
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 7a532998b1f..92fade48c87 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -426,7 +426,7 @@ class Fichinter extends CommonObject
$sql .= " f.datec, f.dateo, f.datee, f.datet, f.fk_user_author,";
$sql .= " f.date_valid as datev,";
$sql .= " f.tms as datem,";
- $sql .= " f.duree, f.fk_projet as fk_project, f.note_public, f.note_private, f.model_pdf, f.extraparams, fk_contrat";
+ $sql .= " f.duree, f.fk_projet as fk_project, f.note_public, f.note_private, f.model_pdf, f.extraparams, fk_contrat, f.entity as entity";
$sql .= " FROM ".MAIN_DB_PREFIX."fichinter as f";
if ($ref) {
$sql .= " WHERE f.entity IN (".getEntity('intervention').")";
@@ -459,6 +459,7 @@ class Fichinter extends CommonObject
$this->model_pdf = $obj->model_pdf;
$this->modelpdf = $obj->model_pdf; // deprecated
$this->fk_contrat = $obj->fk_contrat;
+ $this->entity = $obj->entity;
$this->user_creation = $obj->fk_user_author;
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index de9aa4eade9..db2a503673c 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -160,11 +160,12 @@ class PaiementFourn extends Paiement
$error = 0;
$way = $this->getWay();
+ $now = dol_now();
+
// Clean parameters
$totalamount = 0;
$totalamount_converted = 0;
-
- dol_syslog(get_class($this)."::create", LOG_DEBUG);
+ $atleastonepaymentnotnull = 0;
if ($way == 'dolibarr') {
$amounts = &$this->amounts;
@@ -174,23 +175,62 @@ class PaiementFourn extends Paiement
$amounts_to_update = &$this->amounts;
}
+ $currencyofpayment = '';
+
foreach ($amounts as $key => $value) {
+ if (empty($value)) {
+ continue;
+ }
+ // $key is id of invoice, $value is amount, $way is a 'dolibarr' if amount is in main currency, 'customer' if in foreign currency
$value_converted = Multicurrency::getAmountConversionFromInvoiceRate($key, $value ? $value : 0, $way, 'facture_fourn');
+ // Add controls of input validity
+ if ($value_converted === false) {
+ // We failed to find the conversion for one invoice
+ $this->error = 'FailedToFoundTheConversionRateForInvoice';
+ return -1;
+ }
+ if (empty($currencyofpayment)) {
+ $currencyofpayment = $this->multicurrency_code[$key];
+ }
+ if ($currencyofpayment != $this->multicurrency_code[$key]) {
+ // If we have invoices with different currencies in the payment, we stop here
+ $this->error = 'ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment';
+ return -1;
+ }
+
$totalamount_converted += $value_converted;
$amounts_to_update[$key] = price2num($value_converted, 'MT');
$newvalue = price2num($value, 'MT');
$amounts[$key] = $newvalue;
$totalamount += $newvalue;
+ if (!empty($newvalue)) {
+ $atleastonepaymentnotnull++;
+ }
}
+
+ if (!empty($currencyofpayment)) {
+ // We must check that the currency of invoices is the same than the currency of the bank
+ $bankaccount = new Account($this->db);
+ $bankaccount->fetch($this->fk_account);
+ $bankcurrencycode = empty($bankaccount->currency_code) ? $conf->currency : $bankaccount->currency_code;
+ if ($currencyofpayment != $bankcurrencycode && $currencyofpayment != $conf->currency && $bankcurrencycode != $conf->currency) {
+ $langs->load("errors");
+ $this->error = $langs->trans('ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency', $currencyofpayment, $bankcurrencycode);
+ return -1;
+ }
+ }
+
+
$totalamount = price2num($totalamount);
$totalamount_converted = price2num($totalamount_converted);
+ dol_syslog(get_class($this)."::create", LOG_DEBUG);
+
$this->db->begin();
if ($totalamount <> 0) { // On accepte les montants negatifs
$ref = $this->getNextNumRef(is_object($thirdparty) ? $thirdparty : '');
- $now = dol_now();
if ($way == 'dolibarr') {
$total = $totalamount;
@@ -346,7 +386,7 @@ class PaiementFourn extends Paiement
$this->total = $total;
$this->multicurrency_amount = $mtotal;
$this->db->commit();
- dol_syslog('PaiementFourn::Create Ok Total = '.$this->total);
+ dol_syslog('PaiementFourn::Create Ok Total = '.$this->amount.', Total currency = '.$this->multicurrency_amount);
return $this->id;
} else {
$this->db->rollback();
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 3889ab026a0..5a9b1054773 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -3014,7 +3014,7 @@ if ($action == 'create') {
}
// Show link for "recalculate"
if ($object->getVentilExportCompta() == 0) {
- $s = $langs->trans("ReCalculate").' ';
+ $s = ''.$langs->trans("ReCalculate").' ';
$s .= ''.$langs->trans("Mode1").'';
$s .= ' / ';
$s .= ''.$langs->trans("Mode2").'';
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 33c07c58e99..cb9ca7437bb 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -252,6 +252,8 @@ if (empty($reshook)) {
$datepaye = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+ $multicurrency_code = array();
+
// Clean parameters amount if payment is for a credit note
foreach ($amounts as $key => $value) { // How payment is dispatched
$tmpinvoice = new FactureFournisseur($db);
@@ -260,6 +262,7 @@ if (empty($reshook)) {
$newvalue = price2num($value, 'MT');
$amounts[$key] = - abs($newvalue);
}
+ $multicurrency_code[$key] = $tmpinvoice->multicurrency_code;
}
foreach ($multicurrency_amounts as $key => $value) { // How payment is dispatched
@@ -269,6 +272,7 @@ if (empty($reshook)) {
$newvalue = price2num($value, 'MT');
$multicurrency_amounts[$key] = - abs($newvalue);
}
+ $multicurrency_code[$key] = $tmpinvoice->multicurrency_code;
}
//var_dump($amounts);
@@ -288,12 +292,16 @@ if (empty($reshook)) {
$paiement->datepaye = $datepaye;
$paiement->amounts = $amounts; // Array of amounts
$paiement->multicurrency_amounts = $multicurrency_amounts;
+ $paiement->multicurrency_code = $multicurrency_code; // Array with all currency of payments dispatching
$paiement->paiementid = GETPOST('paiementid', 'int');
-
$paiement->num_payment = GETPOST('num_paiement', 'alphanohtml');
$paiement->note_private = GETPOST('comment', 'alpha');
+ $paiement->fk_account = GETPOST('accountid', 'int');
if (!$error) {
+ // Create payment and update this->multicurrency_amounts if this->amounts filled or
+ // this->amounts if this->multicurrency_amounts filled.
+ // This also set ->amount and ->multicurrency_amount
$paiement_id = $paiement->create($user, (GETPOST('closepaidinvoices') == 'on' ? 1 : 0), $thirdparty);
if ($paiement_id < 0) {
setEventMessages($paiement->error, $paiement->errors, 'errors');
@@ -302,7 +310,7 @@ if (empty($reshook)) {
}
if (!$error) {
- $result = $paiement->addPaymentToBank($user, 'payment_supplier', '(SupplierInvoicePayment)', $accountid, '', '');
+ $result = $paiement->addPaymentToBank($user, 'payment_supplier', '(SupplierInvoicePayment)', $accountid, GETPOST('chqemetteur'), GETPOST('chqbank'));
if ($result < 0) {
setEventMessages($paiement->error, $paiement->errors, 'errors');
$error++;
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 091b9ed95a2..ae0f605e512 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -471,10 +471,9 @@ if (empty($reshook)) {
$subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysToValidate");
// Content
- $message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
- $message .= "\n";
+ $message = "".$langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",
\n";
- $message .= $langs->transnoentities("HolidaysToValidateBody")."\n";
+ $message .= "".$langs->transnoentities("HolidaysToValidateBody")."
\n";
// option to warn the validator in case of too short delay
@@ -484,8 +483,7 @@ if (empty($reshook)) {
$nowplusdelay = dol_time_plus_duree($now, $delayForRequest, 'd');
if ($object->date_debut < $nowplusdelay) {
- $message .= "\n";
- $message .= $langs->transnoentities("HolidaysToValidateDelay", $delayForRequest)."\n";
+ $message = "".$langs->transnoentities("HolidaysToValidateDelay", $delayForRequest)."
\n";
}
}
}
@@ -495,20 +493,21 @@ if (empty($reshook)) {
$nbopenedday = num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday);
if ($nbopenedday > $object->getCPforUser($object->fk_user, $object->fk_type)) {
- $message .= "\n";
- $message .= $langs->transnoentities("HolidaysToValidateAlertSolde")."\n";
+ $message .= "".$langs->transnoentities("HolidaysToValidateAlertSolde")."
\n";
}
}
- $message .= "\n";
- $message .= "- ".$langs->transnoentitiesnoconv("Name")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
- $message .= "- ".$langs->transnoentitiesnoconv("Period")." : ".dol_print_date($object->date_debut, 'day')." ".$langs->transnoentitiesnoconv("To")." ".dol_print_date($object->date_fin, 'day')."\n";
- $message .= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
- $message .= "\n";
+ $link = dol_buildpath("/holiday/card.php", 3) . '?id='.$object->id;
+
+ $message .= "";
+ $message .= "- ".$langs->transnoentitiesnoconv("Name")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."
\n";
+ $message .= "- ".$langs->transnoentitiesnoconv("Period")." : ".dol_print_date($object->date_debut, 'day')." ".$langs->transnoentitiesnoconv("To")." ".dol_print_date($object->date_fin, 'day')."
\n";
+ $message .= "- ".$langs->transnoentitiesnoconv("Link").' : '.$link."
\n";
+ $message .= "
\n";
$trackid = 'leav'.$object->id;
- $mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
+ $mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 1, '', '', $trackid);
// Sending the email
$result = $mail->sendfile();
@@ -617,19 +616,20 @@ if (empty($reshook)) {
$subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysValidated");
// Content
- $message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
- $message .= "\n";
+ $message = "".$langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",
\n";
- $message .= $langs->transnoentities("HolidaysValidatedBody", dol_print_date($object->date_debut, 'day'), dol_print_date($object->date_fin, 'day'))."\n";
+ $message .= "".$langs->transnoentities("HolidaysValidatedBody", dol_print_date($object->date_debut, 'day'), dol_print_date($object->date_fin, 'day'))."
\n";
- $message .= "- ".$langs->transnoentitiesnoconv("ValidatedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
+ $link = dol_buildpath('/holiday/card.php', 3).'?id='.$object->id;
- $message .= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
- $message .= "\n";
+ $message .= "\n";
+ $message .= "- ".$langs->transnoentitiesnoconv("ValidatedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."
\n";
+ $message .= "- ".$langs->transnoentitiesnoconv("Link").' : '.$link."
\n";
+ $message .= "
\n";
$trackid = 'leav'.$object->id;
- $mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
+ $mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 1, '', '', $trackid);
// Sending email
$result = $mail->sendfile();
@@ -697,20 +697,21 @@ if (empty($reshook)) {
$subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysRefused");
// Content
- $message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
- $message .= "\n";
+ $message = "".$langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",
\n";
- $message .= $langs->transnoentities("HolidaysRefusedBody", dol_print_date($object->date_debut, 'day'), dol_print_date($object->date_fin, 'day'))."\n";
- $message .= GETPOST('detail_refuse', 'alpha')."\n\n";
+ $message .= "".$langs->transnoentities("HolidaysRefusedBody", dol_print_date($object->date_debut, 'day'), dol_print_date($object->date_fin, 'day'))."
\n";
+ $message .= "
".GETPOST('detail_refuse', 'alpha')."
";
- $message .= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
+ $link = dol_buildpath('/holiday/card.php', 3).'?id='.$object->id;
- $message .= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
- $message .= "\n";
+ $message .= "\n";
+ $message .= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."
\n";
+ $message .= "- ".$langs->transnoentitiesnoconv("Link").' : '.$link."
\n";
+ $message .= "
";
$trackid = 'leav'.$object->id;
- $mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
+ $mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 1, '', '', $trackid);
// sending email
$result = $mail->sendfile();
@@ -842,18 +843,20 @@ if (empty($reshook)) {
$subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysCanceled");
// Content
- $message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
- $message .= "\n";
+ $message = "".$langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",
\n";
- $message .= $langs->transnoentities("HolidaysCanceledBody", dol_print_date($object->date_debut, 'day'), dol_print_date($object->date_fin, 'day'))."\n";
- $message .= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
+ $message .= "".$langs->transnoentities("HolidaysCanceledBody", dol_print_date($object->date_debut, 'day'), dol_print_date($object->date_fin, 'day'))."
\n";
- $message .= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
- $message .= "\n";
+ $link = dol_buildpath('/holiday/card.php', 3).'?id='.$object->id;
+
+ $message .= "\n";
+ $message .= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."
\n";
+ $message .= "- ".$langs->transnoentitiesnoconv("Link").' : '.$link."
\n";
+ $message .= "
\n";
$trackid = 'leav'.$object->id;
- $mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
+ $mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 1, '', '', $trackid);
// sending email
$result = $mail->sendfile();
diff --git a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
index c0d7a328e59..4995eee0110 100644
--- a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
+++ b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
@@ -510,7 +510,8 @@ INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) value
-- VMYSQL4.3 ALTER TABLE llx_user MODIFY COLUMN fk_soc integer NULL;
-- VPGSQL8.2 ALTER TABLE llx_user ALTER COLUMN fk_soc DROP NOT NULL;
-DROP TABLE IF EXISTS llx_element_tag; -- in migration 3.2.0 to 3.3.0 there is a element_tag table creation that is notin create table
+-- In migration 3.2.0 to 3.3.0 there is a element_tag table creation that is not in create table file
+DROP TABLE IF EXISTS llx_element_tag;
CREATE TABLE llx_element_tag
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
@@ -522,3 +523,8 @@ CREATE TABLE llx_element_tag
ALTER TABLE llx_element_tag ADD UNIQUE INDEX idx_element_tag_uk (fk_categorie, fk_element);
ALTER TABLE llx_element_tag ADD CONSTRAINT fk_element_tag_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
+
+-- Add column to help to fix a very critical bug when transferring into accounting bank record of a bank account into another currency.
+-- Idea is to update this column manually in v15 with value in currency of company for bank that are not into the main currency and the transfer
+-- into accounting will use it in priority if value is not null. The script repair.sql contains the sequence to fix datas in llx_bank.
+ALTER TABLE llx_bank ADD COLUMN amount_main_currency double(24,8) NULL;
diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 4935577cbf8..070f3a2c5da 100644
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -557,3 +557,8 @@ UPDATE llx_facturedet SET situation_percent = 100 WHERE situation_percent IS NUL
DELETE FROM llx_rights_def WHERE module = 'hrm' AND perms = 'employee';
+
+-- Sequence to fix the content of llx_bank.amount_main_currency
+-- DROP TABLE tmp_bank;
+-- CREATE TABLE tmp_bank SELECT b.rowid, b.amount, p.rowid as pid, p.amount as pamount, p.multicurrency_amount as pmulticurrencyamount FROM llx_bank as b INNER JOIN llx_bank_url as bu ON bu.fk_bank=b.rowid AND bu.type = 'payment' INNER JOIN llx_paiement as p ON bu.url_id = p.rowid WHERE p.multicurrency_amount <> 0 AND p.multicurrency_amount <> p.amount;
+-- UPDATE llx_bank as b SET b.amount_main_currency = (SELECT tb.pamount FROM tmp_bank as tb WHERE tb.rowid = b.rowid) WHERE b.amount_main_currency IS NULL;
diff --git a/htdocs/install/mysql/tables/llx_bank.sql b/htdocs/install/mysql/tables/llx_bank.sql
index 0e1dbc403da..d0a8e34790b 100644
--- a/htdocs/install/mysql/tables/llx_bank.sql
+++ b/htdocs/install/mysql/tables/llx_bank.sql
@@ -24,7 +24,8 @@ create table llx_bank
tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
datev date, -- date de valeur
dateo date, -- date operation
- amount double(24,8) NOT NULL default 0,
+ amount double(24,8) NOT NULL default 0, -- amount in the currency of the bank account
+ amount_main_currency double(24,8) NULL, -- amount in the main currency of the company
label varchar(255),
fk_account integer,
fk_user_author integer,
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 872a88b28aa..12ef3d7d777 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -46,6 +46,9 @@ $action = GETPOST('action', 'aZ09');
$confirm = GETPOST('confirm', 'alpha');
$cancel = GETPOST('cancel', 'alpha');
+$sortfield = '';
+$sortorder = '';
+
$module = GETPOST('module', 'alpha');
$tab = GETPOST('tab', 'aZ09');
$tabobj = GETPOST('tabobj', 'alpha');
@@ -3250,7 +3253,7 @@ if ($module == 'initmodule') {
print '';
print '';
- print $perm[1];
+ print $langs->trans($perm[1]);
print ' | ';
print '';
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index bd3cf69c86a..8ff89d8d086 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1690,7 +1690,11 @@ class Product extends CommonObject
$testExit = array('multiprices','multiprices_ttc','multiprices_base_type','multiprices_min','multiprices_min_ttc','multiprices_tva_tx','multiprices_recuperableonly');
foreach ($testExit as $field) {
- if (!isset($this->$field[$level])) {
+ if (!isset($this->$field)) {
+ return array();
+ }
+ $tmparray = $this->$field;
+ if (!isset($tmparray[$level])) {
return array();
}
}
diff --git a/htdocs/product/stats/bom.php b/htdocs/product/stats/bom.php
index d31488812d0..8b1dd59ec9d 100644
--- a/htdocs/product/stats/bom.php
+++ b/htdocs/product/stats/bom.php
@@ -249,6 +249,7 @@ if ($id > 0 || !empty($ref)) {
}
print ' |