Look and feel v18

This commit is contained in:
Laurent Destailleur 2023-03-29 18:42:32 +02:00
parent 93125e7841
commit f0b94f8869
3 changed files with 7 additions and 3 deletions

View File

@ -4133,7 +4133,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
'accountancy', 'accounting_account', 'account', 'accountline', 'action', 'add', 'address', 'angle-double-down', 'angle-double-up', 'asset',
'bank_account', 'barcode', 'bank', 'bell', 'bill', 'billa', 'billr', 'billd', 'birthday-cake', 'bookmark', 'bom', 'briefcase-medical', 'bug', 'building',
'card', 'calendarlist', 'calendar', 'calendarmonth', 'calendarweek', 'calendarday', 'calendarperuser', 'calendarpertype',
'cash-register', 'category', 'chart', 'check', 'clock', 'close_title', 'cog', 'collab', 'company', 'contact', 'country', 'contract', 'conversation', 'cron', 'cubes',
'cash-register', 'category', 'chart', 'check', 'clock', 'close_title', 'cog', 'collab', 'company', 'contact', 'country', 'contract', 'conversation', 'cron', 'cross', 'cubes',
'currency', 'multicurrency',
'delete', 'dolly', 'dollyrevert', 'donation', 'download', 'dynamicprice',
'edit', 'ellipsis-h', 'email', 'entity', 'envelope', 'eraser', 'establishment', 'expensereport', 'external-link-alt', 'external-link-square-alt', 'eye',
@ -4179,7 +4179,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
'bill'=>'file-invoice-dollar', 'billa'=>'file-excel', 'billr'=>'file-invoice-dollar', 'billd'=>'file-medical',
'supplier_invoice'=>'file-invoice-dollar', 'supplier_invoicea'=>'file-excel', 'supplier_invoicer'=>'file-invoice-dollar', 'supplier_invoiced'=>'file-medical',
'bom'=>'shapes',
'card'=>'address-card', 'chart'=>'chart-line', 'company'=>'building', 'contact'=>'address-book', 'contract'=>'suitcase', 'collab'=>'people-arrows', 'conversation'=>'comments', 'country'=>'globe-americas', 'cron'=>'business-time',
'card'=>'address-card', 'chart'=>'chart-line', 'company'=>'building', 'contact'=>'address-book', 'contract'=>'suitcase', 'collab'=>'people-arrows', 'conversation'=>'comments', 'country'=>'globe-americas', 'cron'=>'business-time', 'cross'=>'times',
'donation'=>'file-alt', 'dynamicprice'=>'hand-holding-usd',
'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins',
'accounting'=>'search-dollar', 'category'=>'tag', 'dollyrevert'=>'dolly',

View File

@ -487,7 +487,7 @@ function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage = 0,
print '<!-- htmlPrintOnlinePaymentFooter -->'."\n";
print '<footer class="center paddingleft paddingright centpercent">'."\n";
print '<footer class="center paddingleft paddingright">'."\n";
print '<br>';
if ($addformmessage) {
print '<!-- object = '.(empty($object) ? 'undefined' : $object->element).' -->';

View File

@ -610,15 +610,19 @@ if ($action == "dosign" && empty($cancel)) {
if ($object->status == $object::STATUS_SIGNED) {
print '<br>';
if ($message == 'signed') {
print img_picto('', 'check', '', false, 0, 0, '', 'size2x').'<br>';
print '<span class="ok">'.$langs->trans("PropalSigned").'</span>';
} else {
print img_picto('', 'check', '', false, 0, 0, '', 'size2x').'<br>';
print '<span class="ok">'.$langs->trans("PropalAlreadySigned").'</span>';
}
} elseif ($object->status == $object::STATUS_NOTSIGNED) {
print '<br>';
if ($message == 'refused') {
print img_picto('', 'cross', '', false, 0, 0, '', 'size2x').'<br>';
print '<span class="ok">'.$langs->trans("PropalRefused").'</span>';
} else {
print img_picto('', 'cross', '', false, 0, 0, '', 'size2x').'<br>';
print '<span class="warning">'.$langs->trans("PropalAlreadyRefused").'</span>';
}
} else {