lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix notification (pb static var unknown)

Browse Source
This commit is contained in:
Laurent Destailleur 2021-12-02 11:19:44 +01:00
parent 10e126eb69
commit ca6f222662
4 changed files with 47 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/class/notify.class.php
View File

@ -83,7 +83,6 @@ class Notify
'ACTION_CREATE' 'ACTION_CREATE'
); );
/** /**
* Constructor * Constructor
* *
@ -92,6 +91,7 @@ class Notify
public function __construct($db) public function __construct($db)
{ {
$this->db = $db; $this->db = $db;
$this->arrayofnotifsupported = self::$arrayofnotifsupported;
} }
@ -437,10 +437,10 @@ class Notify
$notifcodedefid = $obj->adid; $notifcodedefid = $obj->adid;
$trackid = ''; $trackid = '';
if ($obj->type_target == 'tocontactid') { if ($obj->type_target == 'tocontactid') {
$trackid = 'con'.$obj->id; $trackid = 'con'.$obj->cid;
} }
if ($obj->type_target == 'touserid') { if ($obj->type_target == 'touserid') {
$trackid = 'use'.$obj->id; $trackid = 'use'.$obj->cid;
} }
if (dol_strlen($obj->email)) { if (dol_strlen($obj->email)) {

22
htdocs/theme/eldy/global.inc.php
View File

@ -4688,8 +4688,28 @@ div.ui-tooltip.mytooltip {
background: var(--tooltipbgcolor) !important; background: var(--tooltipbgcolor) !important;
color : var(--tooltipfontcolor); color : var(--tooltipfontcolor);
line-height: 1.6em; line-height: 1.6em;
min-width: 200px; min-width: 550px;
} }
@media only screen and (max-width: 768px)
{
div.ui-tooltip.mytooltip {
max-width: 400px;
}
}
@media only screen and (max-width: 480px)
{
div.ui-tooltip.mytooltip {
max-width: 300px;
}
}
@media only screen and (max-width: 320px)
{
div.ui-tooltip.mytooltip {
max-width: 230px;
}
}

19
htdocs/theme/md/style.css.php
View File

@ -4642,6 +4642,25 @@ div.ui-tooltip.mytooltip {
/*background: var(--tooltipbgcolor) !important; /*background: var(--tooltipbgcolor) !important;
color : var(--tooltipfontcolor);*/ color : var(--tooltipfontcolor);*/
line-height: 1.6em; line-height: 1.6em;
min-width: 550px;
}
@media only screen and (max-width: 768px)
{
div.ui-tooltip.mytooltip {
max-width: 400px;
}
}
@media only screen and (max-width: 480px)
{
div.ui-tooltip.mytooltip {
max-width: 300px;
}
}
@media only screen and (max-width: 320px)
{
div.ui-tooltip.mytooltip {
max-width: 230px;
}
} }

6
test/phpunit/NumberingModulesTest.php
View File

@ -144,13 +144,15 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
// First we try with a simple mask, with no reset // First we try with a simple mask, with no reset
// and we test counter is still increase second year. // and we test counter is still increase second year.
$conf->global->FACTURE_ADDON='mercure'; $conf->global->FACTURE_ADDON='mercure';
$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000}';
$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}-{0000}'; $conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}-{0000}';
$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000}';
$conf->global->FACTURE_MERCURE_MASK_DEPOSIT='{yyyy}-{0000}';
$conf->global->FACTURE_MERCURE_MASK_REPLACEMENT='{yyyy}-{0000}';
$conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED=0; $conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED=0;
$localobject=new Facture($this->savdb); $localobject=new Facture($this->savdb);
$localobject->initAsSpecimen(); $localobject->initAsSpecimen();
$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1915); // we use year 1915 to be sure to not have existing invoice for this year $localobject->date=dol_mktime(12, 0, 0, 1, 1, 1915); // we use year 1915 to be sure to not have existing invoice for this year (usefull only if numbering is {0000@1}
$numbering=new mod_facture_mercure(); $numbering=new mod_facture_mercure();
$result=$numbering->getNextValue($mysoc, $localobject); $result=$numbering->getNextValue($mysoc, $localobject);
print __METHOD__." result=".$result."\n"; print __METHOD__." result=".$result."\n";