Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Debug v20

Browse Source
This commit is contained in:
Laurent Destailleur 2024-06-18 09:54:11 +02:00
parent 9adb439c03
commit a618bf2ae6
6 changed files with 678 additions and 638 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/mailing/card.php
View File

@ -852,8 +852,8 @@ if ($action == 'create') {
$formmail = new FormMail($db);
$formmail->withfckeditor = 1;
$formmail->withaiprompt = 'html';
$formmail->withlayout = 1;
$formmail->withaiprompt = 'html';
print '<tr class="fieldsforemail"><td></td><td class="tdtop">';

2
htdocs/core/class/html.formmail.class.php
View File

@ -1008,7 +1008,7 @@ class FormMail extends Form
$out .= '<td class="tdtop">';
$formmail = $this;
$showlinktolayout = $formmail->withlayout && $formmail->withfckeditor;
$showlinktolayout = $formmail->withlayout && $formmail->withfckeditor && getDolGlobalInt('MAIN_EMAIL_USE_LAYOUT');
$showlinktolayoutlabel = $langs->trans("FillMessageWithALayout");
$showlinktoai = ($formmail->withaiprompt && isModEnabled('ai')) ? 'textgenerationemail' : '';
$showlinktoailabel = $langs->trans("FillMessageWithAIContent");

2
htdocs/core/tpl/card_presend.tpl.php
View File

@ -189,7 +189,7 @@ if ($action == 'presend') {
$formmail->trackid = empty($trackid) ? '' : $trackid;
$formmail->inreplyto = empty($inreplyto) ? '' : $inreplyto;
$formmail->withfrom = 1;
$formmail->withlayout = getDolGlobalInt('MAIN_EMAIL_USE_LAYOUT');
$formmail->withlayout = 1;
$formmail->withaiprompt = 'html';
// Define $liste, a list of recipients with email inside <>.

1307
htdocs/expensereport/list.php
View File

File diff suppressed because it is too large Load Diff

1
htdocs/modulebuilder/template/myobject_list.php
View File

@ -776,6 +776,7 @@ while ($i < $imaxinloop) {
$totalarray['nbfield']++;
}
}
// Ref
foreach ($object->fields as $key => $val) {
$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {

2
htdocs/webhook/class/target.class.php
View File

@ -96,7 +96,7 @@ class Target extends CommonObject
'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'position' => 20, 'notnull' => 1, 'visible' => 4, 'noteditable' => 1, 'index' => 1, 'searchall' => 1, 'validate' => 1, 'comment' => "Reference of object"),
'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'position' => 30, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'csslist'=>'tdoverflowmax150', 'showoncombobox' => 2, 'validate' => 1,),
'trigger_codes' => array('type' => 'text', 'label' => 'TriggerCodes', 'enabled' => 1, 'position' => 50, 'notnull' => 1, 'visible' => 1, 'help' => "TriggerCodeInfo", 'tdcss'=>'titlefieldmiddle', 'css' => 'minwidth400', 'arrayofkeyval' => array('defined_in_constructor' => 'defined_from_c_action_trigger'), 'multiinput' => 1,),
'trigger_codes' => array('type' => 'text', 'label' => 'TriggerCodes', 'enabled' => 1, 'position' => 50, 'notnull' => 1, 'visible' => 1, 'help' => "TriggerCodeInfo", 'tdcss'=>'titlefieldmiddle', 'csslist'=>'tdoverflowmax200', 'css' => 'minwidth400', 'arrayofkeyval' => array('defined_in_constructor' => 'defined_from_c_action_trigger'), 'multiinput' => 1,),
'url' => array('type' => 'varchar(255)', 'label' => 'Url', 'enabled' => 1, 'position' => 55, 'notnull' => 1, 'visible' => 1,),
'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'position' => 60, 'notnull' => 0, 'visible' => 3, 'validate' => 1,),
'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'position' => 61, 'notnull' => 0, 'visible' => 0, 'cssview' => 'wordbreak', 'validate' => 1,),