';
}
diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php
index de5379f46ec..0b9f3a3b246 100644
--- a/htdocs/core/lib/price.lib.php
+++ b/htdocs/core/lib/price.lib.php
@@ -163,6 +163,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
return array();
}
}
+ if ($pu === '') $pu=0;
// pu_devise calculation from pu
if (empty($pu_devise) && !empty($multicurrency_tx)) {
if (is_numeric($pu) && is_numeric($multicurrency_tx)) $pu_devise = $pu * $multicurrency_tx;
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 2d2d203530a..a5fcfe076e4 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2428,7 +2428,7 @@ else
$discount = new DiscountAbsolute($db);
$result = $discount->fetch(0, 0, $object->id);
if ($result > 0){
- print '. '.$langs->trans("CreditNoteConvertedIntoDiscount", $object->getLibType(), $discount->getNomUrl(1, 'discount')).' ';
+ print '. '.$langs->trans("CreditNoteConvertedIntoDiscount", $object->getLibType(1), $discount->getNomUrl(1, 'discount')).' ';
}
}
print '';
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index b4638ad73f0..d9197b04383 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -188,6 +188,7 @@ NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
EMailTextInterventionAddedContact=A new intervention %s has been assigned to you.
EMailTextInterventionValidated=The intervention %s has been validated.
EMailTextInvoiceValidated=The invoice %s has been validated.
+EMailTextInvoicePayed=The invoice %s has been payed.
EMailTextProposalValidated=The proposal %s has been validated.
EMailTextProposalClosedSigned=The proposal %s has been closed signed.
EMailTextOrderValidated=The order %s has been validated.
diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index d7cf51a35a8..75de962b7ce 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -189,11 +189,11 @@ TicketGoIntoContactTab=Please go into "Contacts" tab to select them
TicketMessageMailIntro=Introduction
TicketMessageMailIntroHelp=This text is added only at the beginning of the email and will not be saved.
TicketMessageMailIntroLabelAdmin=Introduction to the message when sending email
-TicketMessageMailIntroText=
Hello A new response was sent on a ticket that you contact. Here is the message:
+TicketMessageMailIntroText=Hello, A new response was sent on a ticket that you contact. Here is the message:
TicketMessageMailIntroHelpAdmin=This text will be inserted before the text of the response to a ticket.
TicketMessageMailSignature=Signature
TicketMessageMailSignatureHelp=This text is added only at the end of the email and will not be saved.
-TicketMessageMailSignatureText=
Cordialement,
--
+TicketMessageMailSignatureText=
Sincerely,
--
TicketMessageMailSignatureLabelAdmin=Signature of response email
TicketMessageMailSignatureHelpAdmin=This text will be inserted after the response message.
TicketMessageHelp=Only this text will be saved in the message list on ticket card.
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index 4894e6c80d0..f64e93b7188 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -35,7 +35,7 @@ AgendaAutoActionDesc= Définissez ici les événements pour lesquels Dolibarr cr
AgendaSetupOtherDesc= Cette page permet de configurer quelques options permettant d'exporter une vue de votre agenda Dolibarr vers un calendrier externe (Thunderbird, Google calendar, …)
AgendaExtSitesDesc=Cette page permet d'ajouter des sources de calendriers externes pour les visualiser au sein de l'agenda Dolibarr.
ActionsEvents=Événements pour lesquels Dolibarr doit insérer un évènement dans l'agenda en automatique.
-EventRemindersByEmailNotEnabled=Les rappels d'événements par email n'ont pas été activés dans la configuration du module Agenda.
+EventRemindersByEmailNotEnabled=Les rappels d'événements par email n'ont pas été activés dans la configuration du module %s.
##### Agenda event labels #####
NewCompanyToDolibarr=Tiers %s créé
ContractValidatedInDolibarr=Contrat %s validé
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index e0a6b7b82dd..78076213a15 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -188,6 +188,7 @@ NumberOfUnitsSupplierInvoices=Quantités présentes dans les factures fournisseu
EMailTextInterventionAddedContact=Une nouvelle intervention %s vous a été assignée
EMailTextInterventionValidated=La fiche intervention %s vous concernant a été validée.
EMailTextInvoiceValidated=La facture %s vous concernant a été validée.
+EMailTextInvoicePayed=La facture %s a été payée.
EMailTextProposalValidated=La proposition commerciale %s vous concernant a été validée.
EMailTextProposalClosedSigned=La proposition %s a été clôturée signée.
EMailTextOrderValidated=La commande %s vous concernant a été validée.
diff --git a/htdocs/opensurvey/fonctions.php b/htdocs/opensurvey/fonctions.php
index 6cd05444445..553237059d3 100644
--- a/htdocs/opensurvey/fonctions.php
+++ b/htdocs/opensurvey/fonctions.php
@@ -71,6 +71,8 @@ function opensurvey_prepare_head(Opensurveysondage $object)
*/
function llxHeaderSurvey($title, $head="", $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='')
{
+ global $conf, $mysoc;
+
top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
print '';
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 62fb0b8c29f..7ad740eab0a 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -249,14 +249,20 @@ if (empty($reshook))
if (isset($_POST['ref_fourn_price_id']))
$object->fetch_product_fournisseur_price($_POST['ref_fourn_price_id']);
- if ($conf->multicurrency->enabled) {
- $ret = $object->update_buyprice($quantity, $_POST["price"], $user, $_POST["price_base_type"], $supplier, $_POST["oselDispo"], $ref_fourn, $tva_tx, $_POST["charges"], $remise_percent, 0, $npr, $delivery_time_days, $supplier_reputation, array(), '', $_POST["multicurrency_price"], $_POST["multicurrency_price_base_type"], $_POST["multicurrency_tx"], $_POST["multicurrency_code"], $supplier_description);
+ $newprice = price2num(GETPOST("price","alpha"));
+
+ if ($conf->multicurrency->enabled)
+ {
+ $multicurrency_tx = price2num(GETPOST("multicurrency_tx",'alpha'));
+ $multicurrency_price = price2num(GETPOST("multicurrency_price",'alpha'));
+ $multicurrency_code = GETPOST("multicurrency_code",'alpha');
+
+ $ret = $object->update_buyprice($quantity, $newprice, $user, $_POST["price_base_type"], $supplier, $_POST["oselDispo"], $ref_fourn, $tva_tx, $_POST["charges"], $remise_percent, 0, $npr, $delivery_time_days, $supplier_reputation, array(), '', $multicurrency_price, $_POST["multicurrency_price_base_type"], $multicurrency_tx, $multicurrency_code, $supplier_description);
} else {
- $ret = $object->update_buyprice($quantity, $_POST["price"], $user, $_POST["price_base_type"], $supplier, $_POST["oselDispo"], $ref_fourn, $tva_tx, $_POST["charges"], $remise_percent, 0, $npr, $delivery_time_days, $supplier_reputation, array(), '', 0, 'HT', 1, '', $supplier_description);
+ $ret = $object->update_buyprice($quantity, $newprice, $user, $_POST["price_base_type"], $supplier, $_POST["oselDispo"], $ref_fourn, $tva_tx, $_POST["charges"], $remise_percent, 0, $npr, $delivery_time_days, $supplier_reputation, array(), '', 0, 'HT', 1, '', $supplier_description);
}
if ($ret < 0)
{
-
$error++;
setEventMessages($object->error, $object->errors, 'errors');
}
@@ -566,7 +572,7 @@ if ($id > 0 || $ref)
// Currency price qty min
print '
';
}
-
+
if (is_object($hookmanager))
{
$parameters=array('id_fourn'=>$id_fourn,'prod_id'=>$object->id);
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 1a393861b46..c1833e97d59 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -38,27 +38,27 @@ class Ticket extends CommonObject
* @var string ID to identify managed object
*/
public $element = 'ticket';
-
+
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element = 'ticket';
-
+
/**
* @var string Name of field for link to tickets
*/
public $fk_element='fk_ticket';
-
+
/**
* @var int Does ticketcore support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
*/
- public $ismultientitymanaged = 0;
-
+ public $ismultientitymanaged = 1;
+
/**
* @var int Does ticketcore support extrafields ? 0=No, 1=Yes
*/
public $isextrafieldmanaged = 1;
-
+
/**
* @var string String with name of icon for ticketcore. Must be the part after the 'object_' into object_ticketcore.png
*/
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 6b22a303f96..3088320e50c 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -88,9 +88,9 @@ if ($id > 0 || ! empty($ref))
{
$result = $object->fetch($id, $ref, '', 1);
$object->getrights();
- $entitytouseforuserdir = $object->entity;
- if (empty($entitytouseforuserdir)) $entitytouseforuserdir=1;
- $upload_dir = $conf->user->multidir_output[$entitytouseforuserdir] . "/" . $object->id ;
+ //$upload_dir = $conf->user->multidir_output[$object->entity] . "/" . $object->id ;
+ // For users, the upload_dir is always $conf->user->entity for the moment
+ $upload_dir = $conf->user->dir_output. "/" . $object->id ;
}
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index c051680ac3c..45cbcd1c6a5 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -228,7 +228,7 @@ if (preg_match('/\.\./',$fullpath_original_file) || preg_match('/[<>|]/',$fullpa
if ($modulepart == 'barcode')
{
$generator=GETPOST("generator","alpha");
- $code=GETPOST("code",'alpha');
+ $code=GETPOST("code",'none'); // This can be rich content (qrcode, datamatrix, ...)
$encoding=GETPOST("encoding","alpha");
$readable=GETPOST("readable",'alpha')?GETPOST("readable","alpha"):"Y";