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

css

Browse Source
This commit is contained in:
Laurent Destailleur 2022-04-07 14:03:14 +02:00
parent 0ed7c643f8
commit 4cac6b7e29
5 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3522,7 +3522,7 @@ if ($action == 'create') {
if ($socid > 0) {
// Discounts for third party
print '<tr><td>'.$langs->trans('Discounts').'</td><td colspan="2">';
print '<tr><td>'.$langs->trans('DiscountStillRemaining').'</td><td colspan="2">';
$thirdparty = $soc;
$discount_type = 0;
@ -4355,8 +4355,8 @@ if ($action == 'create') {
// Relative and absolute discounts
print '<!-- Discounts -->'."\n";
print '<tr><td>'.$langs->trans('Discounts');
print '</td><td>';
print '<tr><td>'.$langs->trans('DiscountStillRemaining').'</td>';
print '<td>';
$thirdparty = $soc;
$discount_type = 0;
$backtopage = urlencode($_SERVER["PHP_SELF"].'?facid='.$object->id);
@ -5222,7 +5222,7 @@ if ($action == 'create') {
print '</div>';
print '</div>';
print '<div class="clearboth"></div><br>';
print '<div class="clearboth"></div><br><br>';
if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
$blocname = 'contacts';

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

@ -259,7 +259,7 @@ $arrayfields = array(
'rowid' => array('label'=>$langs->trans("Id"), 'checked'=>1),
'nature' => array('label'=>$langs->trans("NatureOfContact"), 'checked'=>1),
'thirdparty' => array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
'contact' => array('label'=>$langs->trans("Users").'/'.$langs->trans("Contacts"), 'checked'=>1),
'contact' => array('label'=>$langs->trans("Users").' | '.$langs->trans("Contacts"), 'checked'=>1),
'type' => array('label'=>$langs->trans("ContactType"), 'checked'=>1),
'status' => array('label'=>$langs->trans("Status"), 'checked'=>1),
'link' => array('label'=>$langs->trans("Link"), 'checked'=>1),

2
htdocs/langs/en_US/companies.lang
View File

@ -361,7 +361,7 @@ ListOfThirdParties=List of Third Parties
ShowCompany=Third Party
ShowContact=Contact-Address
ContactsAllShort=All (No filter)
ContactType=Contact type
ContactType=Contact role
ContactForOrders=Order's contact
ContactForOrdersOrShipments=Order's or shipment's contact
ContactForProposals=Proposal's contact

12
htdocs/theme/eldy/global.inc.php
View File

@ -3612,6 +3612,13 @@ td.border, div.tagtable div div.border {
.fichehalfright table.noborder {
margin: 0px 0px 0px 0px;
}
table.liste, table.noborder:not(.paymenttable):not(.margintable):not(.tableforcontact), table.formdoc, div.noborder:not(.paymenttable):not(.margintable):not(.tableforcontact) {
<?php
if ($userborderontable) { ?>
border-left: 1px solid var(--colortopbordertitle1);
border-right: 1px solid var(--colortopbordertitle1);
<?php } ?>
}
table.liste, table.noborder, table.formdoc, div.noborder {
width: 100%;
border-collapse: separate !important;
@ -3621,11 +3628,6 @@ table.liste, table.noborder, table.formdoc, div.noborder {
border-top-style: solid;
margin: 0px 0px 20px 0px;
<?php
if ($userborderontable) { ?>
border-left: 1px solid var(--colortopbordertitle1);
border-right: 1px solid var(--colortopbordertitle1);
<?php } ?>
/*width: calc(100% - 7px);
border-collapse: separate !important;
border-spacing: 0px;

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

@ -3681,6 +3681,17 @@ div.colorback
border-left: 1px solid #ccc;
<?php } ?>
}
table.liste, table.noborder:not(.paymenttable):not(.margintable):not(.tableforcontact), table.formdoc, div.noborder:not(.paymenttable):not(.margintable):not(.tableforcontact) {
<?php
if ($userborderontable) { ?>
border-left: 1px solid #BBB;
border-right: 1px solid #BBB;
<?php } ?>
}
table.liste, table.noborder.paymenttable, table.noborder.margintable, table.noborder.tableforcontact, table.formdoc, div.noborder.paymenttable, div.noborder.margintable, div.noborder.tableforcontact {
border-left: 1px solid #f0f0f0;
border-right: 1px solid #f0f0f0;
}
table.liste, table.noborder, table.formdoc, div.noborder {
width: calc(100% - 2px); /* -2 to fix a bug. Without, a scroll appears due to overflow-x: auto; of div-table-responsive */
@ -3695,12 +3706,6 @@ table.liste, table.noborder, table.formdoc, div.noborder {
border-bottom-color: #BBB;
border-bottom-style: solid;
<?php
if ($userborderontable) { ?>
border-right: 1px solid #ccc;
border-left: 1px solid #ccc;
<?php } ?>
margin: 0px 0px 20px 0px;
-webkit-border-radius: 0.1em;