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

Fix responsive

Browse Source
This commit is contained in:
Laurent Destailleur 2023-01-22 14:09:19 +01:00
parent 70509d105c
commit 1beb0ad398
1 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
htdocs/compta/prelevement/create.php
View File

@ -234,7 +234,7 @@ print '</td></tr>';
print '<tr><td>'.$langs->trans("AmountTotal").'</td>'; print '<tr><td>'.$langs->trans("AmountTotal").'</td>';
print '<td class="amount nowraponall">'; print '<td class="amount nowraponall">';
print price($pricetowithdraw); print price($pricetowithdraw, 0, $langs, 1,-1, -1, $conf->currency);
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
@ -256,20 +256,20 @@ if ($nb) {
if ($type == 'bank-transfer') { if ($type == 'bank-transfer') {
$title = $langs->trans('BankToPayCreditTransfer').': '; $title = $langs->trans('BankToPayCreditTransfer').': ';
} }
print $title; print '<span class="hideonsmartphone">'.$title.'</span>';
print img_picto('', 'bank_account'); print img_picto('', 'bank_account');
$default_account = ($type == 'bank-transfer' ? 'PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT' : 'PRELEVEMENT_ID_BANKACCOUNT'); $default_account = ($type == 'bank-transfer' ? 'PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT' : 'PRELEVEMENT_ID_BANKACCOUNT');
print $form->select_comptes($conf->global->$default_account, 'id_bankaccount', 0, "courant=1", 0, '', 0, '', 1); print $form->select_comptes(getDolGlobalInt($default_account), 'id_bankaccount', 0, "courant=1", 0, '', 0, 'widthcentpercentminusx maxwidth300', 1);
print ' - '; print ' &nbsp; &nbsp; ';
if (empty($executiondate)) { if (empty($executiondate)) {
$delayindays = 0; $delayindays = 0;
if ($type != 'bank-transfer') { if ($type != 'bank-transfer') {
$delayindays = $conf->global->PRELEVEMENT_ADDDAYS; $delayindays = getDolGlobalInt('PRELEVEMENT_ADDDAYS');
} else { } else {
$delayindays = $conf->global->PAYMENTBYBANKTRANSFER_ADDDAYS; $delayindays = getDolGlobalInt('PAYMENTBYBANKTRANSFER_ADDDAYS');
} }
$executiondate = dol_time_plus_duree(dol_now(), $delayindays, 'd'); $executiondate = dol_time_plus_duree(dol_now(), $delayindays, 'd');
@ -292,14 +292,14 @@ if ($nb) {
print '<option value="RCUR"'.($format == 'RCUR' ? ' selected="selected"' : '').'>'.$langs->trans('SEPARCUR').'</option>'; print '<option value="RCUR"'.($format == 'RCUR' ? ' selected="selected"' : '').'>'.$langs->trans('SEPARCUR').'</option>';
print '</select>'; print '</select>';
} }
print '<input type="submit" class="butAction" value="'.$title.'"/>'; print '<input type="submit" class="butAction margintoponly maringbottomonly" value="'.$title.'"/>';
} else { } else {
$title = $langs->trans("CreateAll"); $title = $langs->trans("CreateAll");
if ($type == 'bank-transfer') { if ($type == 'bank-transfer') {
$title = $langs->trans("CreateFileForPaymentByBankTransfer"); $title = $langs->trans("CreateFileForPaymentByBankTransfer");
} }
print '<input type="hidden" name="format" value="ALL">'."\n"; print '<input type="hidden" name="format" value="ALL">'."\n";
print '<input type="submit" class="butAction" value="'.$title.'">'."\n"; print '<input type="submit" class="butAction margintoponly maringbottomonly" value="'.$title.'">'."\n";
} }
} else { } else {
if ($mysoc->isInEEC()) { if ($mysoc->isInEEC()) {
@ -307,18 +307,18 @@ if ($nb) {
if ($type == 'bank-transfer') { if ($type == 'bank-transfer') {
$title = $langs->trans("CreateSepaFileForPaymentByBankTransfer"); $title = $langs->trans("CreateSepaFileForPaymentByBankTransfer");
} }
print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("AmountMustBePositive").'">'.$title."</a>\n"; print '<a class="butActionRefused classfortooltip margintoponly maringbottomonly" href="#" title="'.$langs->trans("AmountMustBePositive").'">'.$title."</a>\n";
if ($type != 'bank-transfer') { if ($type != 'bank-transfer') {
$title = $langs->trans("CreateForSepaRCUR"); $title = $langs->trans("CreateForSepaRCUR");
print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("AmountMustBePositive").'">'.$title."</a>\n"; print '<a class="butActionRefused classfortooltip margintoponly maringbottomonly" href="#" title="'.$langs->trans("AmountMustBePositive").'">'.$title."</a>\n";
} }
} else { } else {
$title = $langs->trans("CreateAll"); $title = $langs->trans("CreateAll");
if ($type == 'bank-transfer') { if ($type == 'bank-transfer') {
$title = $langs->trans("CreateFileForPaymentByBankTransfer"); $title = $langs->trans("CreateFileForPaymentByBankTransfer");
} }
print '<a class="butActionRefused classfortooltip" href="#">'.$title."</a>\n"; print '<a class="butActionRefused classfortooltip margintoponly maringbottomonly" href="#">'.$title."</a>\n";
} }
} }
} else { } else {
@ -328,7 +328,9 @@ if ($nb) {
$titlefortab = $langs->transnoentitiesnoconv("PaymentByBankTransfers"); $titlefortab = $langs->transnoentitiesnoconv("PaymentByBankTransfers");
$title = $langs->trans("CreateFileForPaymentByBankTransfer"); $title = $langs->trans("CreateFileForPaymentByBankTransfer");
} }
print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NoInvoiceToWithdraw", $titlefortab, $titlefortab)).'">'.$title."</a>\n"; print '<a class="butActionRefused classfortooltip margintoponly maringbottomonly" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NoInvoiceToWithdraw", $titlefortab, $titlefortab)).'">';
print $title;
print "</a>\n";
} }
print "</form>\n"; print "</form>\n";
@ -343,6 +345,9 @@ print '<br>';
*/ */
$sql = "SELECT f.ref, f.rowid, f.total_ttc, s.nom as name, s.rowid as socid,"; $sql = "SELECT f.ref, f.rowid, f.total_ttc, s.nom as name, s.rowid as socid,";
if ($type == 'bank-transfer') {
$sql .= " f.ref_supplier,";
}
$sql .= " pfd.rowid as request_row_id, pfd.date_demande, pfd.amount"; $sql .= " pfd.rowid as request_row_id, pfd.date_demande, pfd.amount";
if ($type == 'bank-transfer') { if ($type == 'bank-transfer') {
$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f,"; $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f,";
@ -423,6 +428,9 @@ if ($resql) {
print '<table class="noborder centpercent">'; print '<table class="noborder centpercent">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans($tradinvoice).'</td>'; print '<td>'.$langs->trans($tradinvoice).'</td>';
if ($type == 'bank-transfer') {
print '<td>'.$langs->trans("RefSupplier").'</td>';
}
print '<td>'.$langs->trans("ThirdParty").'</td>'; print '<td>'.$langs->trans("ThirdParty").'</td>';
print '<td>'.$langs->trans("RIB").'</td>'; print '<td>'.$langs->trans("RIB").'</td>';
print '<td>'.$langs->trans("RUM").'</td>'; print '<td>'.$langs->trans("RUM").'</td>';
@ -442,17 +450,25 @@ if ($resql) {
$bac->fetch(0, $obj->socid); $bac->fetch(0, $obj->socid);
$invoicestatic->id = $obj->rowid;
$invoicestatic->ref = $obj->ref;
$invoicestatic->ref_supplier = $obj->ref_supplier;
print '<tr class="oddeven">'; print '<tr class="oddeven">';
// Ref invoice // Ref invoice
print '<td>'; print '<td class="tdoverflowmax150">';
$invoicestatic->id = $obj->rowid;
$invoicestatic->ref = $obj->ref;
print $invoicestatic->getNomUrl(1, 'withdraw'); print $invoicestatic->getNomUrl(1, 'withdraw');
print '</td>'; print '</td>';
if ($type == 'bank-transfer') {
print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($invoicestatic->ref_supplier).'">';
print dol_escape_htmltag($invoicestatic->ref_supplier);
print '</td>';
}
// Thirdparty // Thirdparty
print '<td>'; print '<td class="tdoverflowmax100">';
$thirdpartystatic->fetch($obj->socid); $thirdpartystatic->fetch($obj->socid);
print $thirdpartystatic->getNomUrl(1, 'ban'); print $thirdpartystatic->getNomUrl(1, 'ban');
print '</td>'; print '</td>';