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 v21

Browse Source
This commit is contained in:
Laurent Destailleur (aka Eldy) 2025-02-06 16:12:04 +01:00
parent d8bf72700b
commit 13ac8170c2
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/compta/facture/card-rec.php
View File

@ -268,7 +268,7 @@ if (empty($reshook)) {
$error++;
}
// Get first contract linked to invoice used to generate template (facid is id of source invoice)
// Get first contract linked to invoice (or order or proposal) used to generate template (facid is id of source invoice)
if (GETPOSTINT('facid') > 0) {
$srcObject = new Facture($db);
$srcObject->fetch(GETPOSTINT('facid'));
@ -278,9 +278,17 @@ if (empty($reshook)) {
if (!empty($srcObject->linkedObjectsIds['contrat'])) {
$contractidid = reset($srcObject->linkedObjectsIds['contrat']);
$object->origin = 'contrat';
$object->origin_type = 'contrat';
$object->origin_id = $contractidid;
$object->linked_objects[$object->origin] = $object->origin_id;
$object->linked_objects[$object->origin_type] = $object->origin_id;
} elseif (!empty($srcObject->linkedObjectsIds['commande'])) {
$orderid = reset($srcObject->linkedObjectsIds['commande']);
$object->linked_objects['commande'] = $orderid;
} elseif (!empty($srcObject->linkedObjectsIds['propal'])) {
$proposalid = reset($srcObject->linkedObjectsIds['propal']);
$object->linked_objects['commande'] = $proposalid;
}
}
@ -1289,6 +1297,8 @@ if ($action == 'create') {
}
print "</table>\n";
print '<br>';
print $form->buttonsSaveCancel("Create");
print "</form>\n";

3
htdocs/compta/facture/card.php
View File

@ -3692,7 +3692,8 @@ if ($action == 'create') {
print $form->selectarray('typedeposit', $arraylist, $typedeposit, 0, 0, 0, '', 1);
print '</td>';
print '<td class="nowrap" style="padding-left: 5px">';
print '<span class="opacitymedium paddingleft">'.$langs->trans("AmountOrPercent").'</span><input type="text" id="valuedeposit" name="valuedeposit" class="width75 right" value="'.$valuedeposit.'"/>';
print '<span class="opacitymedium paddingleft">'.$langs->trans("AmountOrPercent").'</span>';
print '<input type="text" id="valuedeposit" name="valuedeposit" class="width75 right" value="'.($valuedeposit ? $valuedeposit : '').'"/>';
print '</td>';
}
print '</tr></table>';

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

@ -573,9 +573,11 @@ select.vmenusearchselectcombo {
textarea:focus {
/* v6 box-shadow: 0 0 4px #8091BF; */
border: 1px solid #aaa !important;
/*
padding-left: 3px;
padding-right: 3px;
padding-top: 3px;
*/
}
input:focus, textarea:focus,
button:focus:not(.button_search_x):not(.button_search):not(.button_removefilter), select:focus,
@ -609,10 +611,12 @@ select#date_startday, select#date_startmonth, select#date_endday, select#date_en
margin-right: 4px;
}
input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
color: var(--colortext);
input, input.flat, form.flat select, select, select.flat, .dataTables_length label select {
border: none;
}
input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
border<?php echo !getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT') ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
color: var(--colortext);
font-family: <?php print $fontlist ?>;
outline: none;
margin: 0px 0px 0px 0px;
@ -4499,7 +4503,7 @@ tr.liste_titre_filter td.liste_titre {
padding-top: 4px;
padding-bottom: 3px;
}
.liste_titre_create td:not(.linecoldescription), .liste_titre_create th, .liste_titre_create .tagtd
.liste_titre_create td, .liste_titre_create th, .liste_titre_create .tagtd
{
border-top-width: 1px;
border-top-color: var(--colortopbordertitle1);