| '.$langs->trans('Type').' | '; + print ' |
| '.$langs->trans('Type').' | ';
print $object->getLibType();
if ($object->module_source) {
- print ' ('.$langs->trans("POS").' '.$object->module_source.' - '.$langs->trans("Terminal").' '.$object->pos_source.')';
+ print ' ('.$langs->trans("POS").' '.$object->module_source.' - '.$langs->trans("Terminal").' '.$object->pos_source.')';
}
if ($object->type == Facture::TYPE_REPLACEMENT) {
$facreplaced = new Facture($db);
$facreplaced->fetch($object->fk_facture_source);
- print ' ('.$langs->transnoentities("ReplaceInvoice", $facreplaced->getNomUrl(1)).')';
+ print ' ('.$langs->transnoentities("ReplaceInvoice", $facreplaced->getNomUrl(1)).')';
}
if ($object->type == Facture::TYPE_CREDIT_NOTE && !empty($object->fk_facture_source)) {
$facusing = new Facture($db);
$facusing->fetch($object->fk_facture_source);
- print ' ('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')';
+ print ' ('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')';
}
$facidavoir = $object->getListIdAvoirFromInvoice();
if (count($facidavoir) > 0) {
- print ' ('.$langs->transnoentities("InvoiceHasAvoir");
+ print ' ('.$langs->transnoentities("InvoiceHasAvoir");
$i = 0;
foreach ($facidavoir as $id) {
if ($i == 0)
@@ -3914,14 +3914,14 @@ elseif ($id > 0 || !empty($ref))
if ($objectidnext > 0) {
$facthatreplace = new Facture($db);
$facthatreplace->fetch($objectidnext);
- print ' ('.$langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1)).')';
+ print ' ('.$langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1)).')';
}
if ($object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT) {
$discount = new DiscountAbsolute($db);
$result = $discount->fetch(0, $object->id);
if ($result > 0) {
- print '. '.$langs->trans("CreditNoteConvertedIntoDiscount", $object->getLibType(1), $discount->getNomUrl(1, 'discount')).' '; + print '. '.$langs->trans("CreditNoteConvertedIntoDiscount", $object->getLibType(1), $discount->getNomUrl(1, 'discount')).' '; } } @@ -3930,7 +3930,7 @@ elseif ($id > 0 || !empty($ref)) $tmptemplate = new FactureRec($db); $result = $tmptemplate->fetch($object->fk_fac_rec_source); if ($result > 0) { - print '. '.$langs->trans( + print '. '.$langs->trans( "GeneratedFromTemplate", ''.$tmptemplate->ref.'' ).''; @@ -3939,7 +3939,8 @@ elseif ($id > 0 || !empty($ref)) print ' |
| '.$langs->trans('Discounts'); + print ''."\n"; + print ' | |
| '.$langs->trans('Discounts'); print ' | '; $thirdparty = $soc; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 7744e1ffd16..a4751f98e51 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -2346,6 +2346,7 @@ function getHelpParamFor($helppagename, $langs) else { // If WIKI URL + $reg = array(); if (preg_match('/^es/i', $langs->defaultlang)) { $helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s'; diff --git a/htdocs/stripe/lib/stripe.lib.php b/htdocs/stripe/lib/stripe.lib.php index 69a353a4733..23771b28c63 100644 --- a/htdocs/stripe/lib/stripe.lib.php +++ b/htdocs/stripe/lib/stripe.lib.php @@ -155,6 +155,9 @@ function html_print_stripe_footer($fromcompany, $langs) { $line1 .= ($line1 ? " - " : "").$langs->transnoentities("CapitalOf", $fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency); } + + $reg = array(); + // Prof Id 1 if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || !$fromcompany->idprof2)) { diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php index 5889cf6d91a..b8f607cfc20 100644 --- a/htdocs/supplier_proposal/card.php +++ b/htdocs/supplier_proposal/card.php @@ -605,6 +605,7 @@ if (empty($reshook)) $idprod = 0; if (GETPOST('idprodfournprice', 'alpha') == -1 || GETPOST('idprodfournprice', 'alpha') == '') $idprod = -99; // Same behaviour than with combolist. When not select idprodfournprice is now -99 (to avoid conflict with next action that may return -1, -2, ...) + $reg = array(); if (preg_match('/^idprod_([0-9]+)$/', GETPOST('idprodfournprice', 'alpha'), $reg)) { $idprod = $reg[1]; @@ -842,6 +843,7 @@ if (empty($reshook)) } else { + $reg = array(); $vatratecleaned = $vat_rate; if (preg_match('/^(.*)\s*\((.*)\)$/', $vat_rate, $reg)) // If vat is "xx (yy)" { diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index d18c3806363..cfcbb7bd502 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -241,6 +241,9 @@ select.flat, form.flat select { .optiongrey, .opacitymedium { opacity: 0.4; } +.opacitymediumbycolor { + color: rgba(0, 0, 0, 0.4); +} .opacityhigh { opacity: 0.2; } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 625b69e9228..17433b71323 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -459,6 +459,9 @@ select.flat, form.flat select { .optiongrey, .opacitymedium { opacity: 0.5; } +.opacitymediumbycolor { + color: rgba(0, 0, 0, 0.4); +} .opacityhigh { opacity: 0.2; } diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 3a4f6aee138..9bfe66d9dec 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -525,6 +525,7 @@ class User extends CommonObject // $obj->param is key or param $pagewithoutquerystring = $obj->page; $pagequeries = ''; + $reg = array(); if (preg_match('/^([^\?]+)\?(.*)$/', $pagewithoutquerystring, $reg)) // There is query param { $pagewithoutquerystring = $reg[1]; |