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

Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0

Browse Source
This commit is contained in:
Laurent Destailleur 2022-03-17 11:49:06 +01:00
commit 3fe9b6b57c
3 changed files with 43 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/comm/action/card.php
View File

@ -1439,6 +1439,10 @@ if ($id > 0) {
$("#fullday").change(function() { $("#fullday").change(function() {
setdatefields(); setdatefields();
}); });
$("#actioncode").change(function() {
if ($("#actioncode").val() == \'AC_RDV\') $("#dateend").addClass("fieldrequired");
else $("#dateend").removeClass("fieldrequired");
});
})'; })';
print '</script>'."\n"; print '</script>'."\n";
} }
@ -1483,7 +1487,12 @@ if ($id > 0) {
print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td colspan="3"><input type="checkbox" id="fullday" name="fullday" '.($object->fulldayevent ? ' checked' : '').'></td></tr>'; print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td colspan="3"><input type="checkbox" id="fullday" name="fullday" '.($object->fulldayevent ? ' checked' : '').'></td></tr>';
// Date start - end // Date start - end
print '<tr><td class="nowrap"><span class="fieldrequired">'.$langs->trans("DateActionStart").' - '.$langs->trans("DateActionEnd").'</span></td><td colspan="3">'; print '<tr><td class="nowrap">';
print '<span class="fieldrequired">'.$langs->trans("DateActionStart").'</span>';
print ' - ';
print '<span id="dateend"'.($object->type_code == 'AC_RDV' ? ' class="fieldrequired"' : '').'>'.$langs->trans("DateActionEnd").'</span>';
print '</td><td td colspan="3">';
//print '<tr><td class="nowrap"><span class="fieldrequired">'.$langs->trans("DateActionStart").' - '.$langs->trans("DateActionEnd").'</span></td><td colspan="3">';
if (GETPOST("afaire") == 1) { if (GETPOST("afaire") == 1) {
print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 0, "action", 1, 1, 0, 'fulldaystart', '', '', '', 1, '', '', 'tzuser'); print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 0, "action", 1, 1, 0, 'fulldaystart', '', '', '', 1, '', '', 'tzuser');
} elseif (GETPOST("afaire") == 2) { } elseif (GETPOST("afaire") == 2) {

5
htdocs/comm/propal/card.php
View File

@ -231,8 +231,11 @@ if (empty($reshook)) {
// Remove line // Remove line
$result = $object->deleteline($lineid); $result = $object->deleteline($lineid);
// reorder lines // reorder lines
if ($result) { if ($result > 0) {
$object->line_order(true); $object->line_order(true);
} else {
$langs->load("errors");
setEventMessages($object->error, $object->errors, 'errors');
} }
if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {

52
htdocs/comm/propal/class/propal.class.php
View File

@ -980,6 +980,8 @@ class Propal extends CommonObject
$this->db->commit(); $this->db->commit();
return 1; return 1;
} else { } else {
$this->error = $line->error;
$this->errors = $line->errors;
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
} }
@ -4166,36 +4168,40 @@ class PropaleLigne extends CommonObjectLine
$error = 0; $error = 0;
$this->db->begin(); $this->db->begin();
$sql = "DELETE FROM ".MAIN_DB_PREFIX."propaldet WHERE rowid = ".((int) $this->rowid); if (!$notrigger) {
dol_syslog("PropaleLigne::delete", LOG_DEBUG); // Call trigger
if ($this->db->query($sql)) { $result = $this->call_trigger('LINEPROPAL_DELETE', $user);
// Remove extrafields if ($result < 0) {
if (!$error) { $error++;
$this->id = $this->rowid;
$result = $this->deleteExtraFields();
if ($result < 0) {
$error++;
dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
}
} }
}
// End call triggers
if (!$error && !$notrigger) { if (!$error) {
// Call trigger $sql = "DELETE FROM " . MAIN_DB_PREFIX . "propaldet WHERE rowid = " . ((int) $this->rowid);
$result = $this->call_trigger('LINEPROPAL_DELETE', $user); dol_syslog("PropaleLigne::delete", LOG_DEBUG);
if ($result < 0) { if ($this->db->query($sql)) {
$this->db->rollback(); // Remove extrafields
return -1; if (!$error) {
$this->id = $this->rowid;
$result = $this->deleteExtraFields();
if ($result < 0) {
$error++;
dol_syslog(get_class($this) . "::delete error -4 " . $this->error, LOG_ERR);
}
} }
} else {
$this->error = $this->db->error() . " sql=" . $sql;
$error++;
} }
// End call triggers }
$this->db->commit(); if ($error) {
return 1;
} else {
$this->error = $this->db->error()." sql=".$sql;
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
} else {
$this->db->commit();
return 1;
} }
} }