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

Merge branch '4.0' of https://github.com/Dolibarr/dolibarr.git into 4.0

Browse Source
This commit is contained in:
florian HENRY 2016-08-25 09:06:39 +02:00
commit 848d046b46
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/payment_sc/card.php
View File

@ -168,7 +168,7 @@ print $form->showrefnav($paiement,'id','',1,'rowid','id');
print '</td></tr>'; print '</td></tr>';
// Date // Date
print '<tr><td width="120">'.$langs->trans('Date').'</td><td colspan="3">'.dol_print_date($paiement->datep,'day').'</td></tr>'; print '<tr><td>'.$langs->trans('Date').'</td><td colspan="3">'.dol_print_date($paiement->datep,'day').'</td></tr>';
// Mode // Mode
print '<tr><td>'.$langs->trans('Mode').'</td><td colspan="3">'.$langs->trans("PaymentType".$paiement->type_code).'</td></tr>'; print '<tr><td>'.$langs->trans('Mode').'</td><td colspan="3">'.$langs->trans("PaymentType".$paiement->type_code).'</td></tr>';

2
htdocs/public/test/test_arrays.php
View File

@ -82,7 +82,7 @@ else
<h1> <h1>
This page is a sample of page using tables. It is designed to make test with<br> This page is a sample of page using tables. It is designed to make test with<br>
- css (add parameter &amp;theme=newtheme to test another theme or edit css of current theme)<br> - css (add parameter &amp;theme=newtheme to test another theme or edit css of current theme)<br>
- jmobile (add parameter <a href="<?php echo $_SERVER["PHP_SELF"].'?dol_use_jmobile=1&dol_optimize_smallscreen=1'; ?>">dol_use_jmobile=1&amp;dol_optimize_smallscreen=1</a> to enable view with jmobile)<br> - jmobile (add parameter <a href="<?php echo $_SERVER["PHP_SELF"].'?dol_use_jmobile=1&dol_optimize_smallscreen=1'; ?>">dol_use_jmobile=1&amp;dol_optimize_smallscreen=1</a> and switch to small screen < 960 to enable view with jmobile)<br>
- no javascript / usage for bind people (add parameter <a href="<?php echo $_SERVER["PHP_SELF"].'?nojs=1'; ?>">nojs=1</a> to force disable javascript)<br> - no javascript / usage for bind people (add parameter <a href="<?php echo $_SERVER["PHP_SELF"].'?nojs=1'; ?>">nojs=1</a> to force disable javascript)<br>
- dataTables<br> - dataTables<br>
- tablednd<br> - tablednd<br>

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

@ -635,6 +635,7 @@ div.myavailability {
@media only screen and (max-width: 960px) @media only screen and (max-width: 960px)
{ {
.maxwidthonsmartphone { max-width: 100px; }
.minwidth50imp { min-width: 50px !important; } .minwidth50imp { min-width: 50px !important; }
.minwidth100imp { min-width: 50px !important; } .minwidth100imp { min-width: 50px !important; }
.minwidth200imp { min-width: 100px !important; } .minwidth200imp { min-width: 100px !important; }

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

@ -633,6 +633,7 @@ div.myavailability {
@media only screen and (max-width: 960px) @media only screen and (max-width: 960px)
{ {
.maxwidthonsmartphone { max-width: 100px; }
.minwidth50imp { min-width: 50px !important; } .minwidth50imp { min-width: 50px !important; }
.minwidth100imp { min-width: 50px !important; } .minwidth100imp { min-width: 50px !important; }
.minwidth200imp { min-width: 100px !important; } .minwidth200imp { min-width: 100px !important; }