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

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE

Browse Source
This commit is contained in:
Rui Strecht 2017-09-20 14:32:53 +01:00
commit 9f7ef7404c
4 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/public/payment/newpayment.php
View File

@ -602,7 +602,7 @@ print $text;
// Output payment summary form
print '<tr><td align="center">';
print '<table with="100%" id="tablepublicpayment">';
print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("ThisIsInformationOnPayment").' :</td></tr>'."\n";
print '<tr><td align="left" colspan="2" class="opacitymedium">'.$langs->trans("ThisIsInformationOnPayment").' :</td></tr>'."\n";
$found=false;
$error=0;

BIN
htdocs/theme/common/cheque.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

26
htdocs/theme/eldy/style.css.php
View File

@ -344,48 +344,40 @@ input.buttongen {
vertical-align: middle;
}
input.buttonpayment {
width: 300px;
min-width: 280px;
margin-bottom: 15px;
background-image: none;
line-height: 24px;
padding: 8px;
background: none;
border: 2px solid #666666;
}
input.buttonpaymentcb {
background-image: url(<?php echo dol_buildpath($path.'/theme/common/credit_card.png',1) ?>);
background-size: 26px;
background-repeat: no-repeat;
background-position: 5px 5px;
background-position: 2px 11px;
}
input.buttonpaymentcheque {
background-image: url(<?php echo dol_buildpath($path.'/theme/common/cheque.png',1) ?>);
background-repeat: no-repeat;
background-position: 8px 7px;
}
input.buttonpaymentcb {
background-image: url(<?php echo dol_buildpath($path.'/theme/common/credit_card.png',1) ?>);
background-size: 24px;
background-repeat: no-repeat;
background-position: 5px 4px;
}
input.buttonpaymentcheque {
background-image: url(<?php echo dol_buildpath($path.'/paypal/img/object_paypal.png',1) ?>);
background-repeat: no-repeat;
background-position: 5px 4px;
background-position: 2px 8px;
}
input.buttonpaymentpaypal {
background-image: url(<?php echo dol_buildpath($path.'/paypal/img/object_paypal.png',1) ?>);
background-repeat: no-repeat;
background-position: 8px 7px;
background-position: 8px 11px;
}
input.buttonpaymentpaybox {
background-image: url(<?php echo dol_buildpath($path.'/paybox/img/object_paybox.png',1) ?>);
background-repeat: no-repeat;
background-position: 8px 7px;
background-position: 8px 11px;
}
input.buttonpaymentstripe {
background-image: url(<?php echo dol_buildpath($path.'/stripe/img/object_stripe.png',1) ?>);
background-repeat: no-repeat;
background-position: 8px 7px;
background-position: 8px 11px;
}
/* Used by timesheets */
span.timesheetalreadyrecorded input {
@ -3147,7 +3139,7 @@ div.titre {
/* text-shadow: 1px 1px 2px #FFFFFF; */
}
#dolpaymenttable { width: 600px; font-size: 13px; }
#dolpaymenttable { max-width: 600px; font-size: 16px; }
#tablepublicpayment { border: 1px solid #CCCCCC !important; width: 100%; padding: 20px; }
#tablepublicpayment .CTableRow1 { background-color: #F0F0F0 !important; }
#tablepublicpayment tr.liste_total { border-bottom: 1px solid #CCCCCC !important; }

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

@ -341,11 +341,13 @@ input.buttongen {
vertical-align: middle;
}
input.buttonpayment {
width: 300px;
min-width: 280px;
margin-bottom: 15px;
background-image: none;
line-height: 24px;
padding: 8px;
background: none;
border: 2px solid #666666;
}
input.buttonpaymentcb {
background-image: url(<?php echo dol_buildpath($path.'/theme/common/credit_card.png',1) ?>);
@ -3237,7 +3239,7 @@ div.titre {
<?php print (empty($conf->dol_optimize_smallscreen)?'':'margin-top: 4px;'); ?>
}
#dolpaymenttable { width: 600px; font-size: 13px; }
#dolpaymenttable { max-width: 600px; font-size: 16px; }
#tablepublicpayment { border: 1px solid #CCCCCC !important; width: 100%; padding: 20px; }
#tablepublicpayment .CTableRow1 { background-color: #F0F0F0 !important; }
#tablepublicpayment tr.liste_total { border-bottom: 1px solid #CCCCCC !important; }