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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2016-06-15 17:20:12 +02:00
commit b5c4bd9b82
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/compta/sociales/charges.php
View File

@ -360,9 +360,11 @@ if ($id > 0)
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
$linkback = '<a href="' . DOL_URL_ROOT . '/compta/sociales/index.php">' . $langs->trans("BackToList") . '</a>';
// Ref // Ref
print '<tr><td class="fieldtitle">'.$langs->trans("Ref").'</td><td colspan="2">'; print '<tr><td class="fieldtitle">'.$langs->trans("Ref").'</td><td colspan="2">';
print $form->showrefnav($object,'id'); print $form->showrefnav($object,'id',$linkback);
print "</td></tr>"; print "</td></tr>";
// Label // Label
@ -403,7 +405,7 @@ if ($id > 0)
{ {
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
$i = 0; $total = 0; $i = 0; $total = 0;
print '<table class="nobordernopadding" width="100%">'; print '<table class="nobordernopadding paymenttable" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("RefPayment").'</td>'; print '<td>'.$langs->trans("RefPayment").'</td>';
print '<td>'.$langs->trans("Date").'</td>'; print '<td>'.$langs->trans("Date").'</td>';

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

@ -1133,9 +1133,12 @@ $mainmenuusedarray=array_unique(explode(',',$mainmenuused));
$generic=1; $generic=1;
// Put here list of menu entries when the div.mainmenu.menuentry was previously defined // Put here list of menu entries when the div.mainmenu.menuentry was previously defined
$divalreadydefined=array('home','companies','products','commercial','externalsite','accountancy','project','tools','members','agenda','holiday','bookmark','cashdesk','ecm','geoipmaxmind','gravatar','clicktodial','paypal','webservices','websites'); $divalreadydefined=array('home','companies','products','commercial','externalsite','accountancy','project','tools','members','agenda','holiday','bookmark','cashdesk','ecm','geoipmaxmind','gravatar','clicktodial','paypal','webservices','websites');
// Put here list of menu entries we are sure we don't want
$divnotrequired=array('multicurrency','salaries','margin','opensurvey','paybox','expensereport','incoterm','prelevement','propal','workflow','notification','supplier_proposal','cron','product','productbatch','expedition');
foreach($mainmenuusedarray as $val) foreach($mainmenuusedarray as $val)
{ {
if (empty($val) || in_array($val,$divalreadydefined)) continue; if (empty($val) || in_array($val,$divalreadydefined)) continue;
if (in_array($val,$divnotrequired)) continue;
//print "XXX".$val; //print "XXX".$val;
// Search img file in module dir // Search img file in module dir
@ -1155,7 +1158,7 @@ foreach($mainmenuusedarray as $val)
$url=dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.$generic.".png",1); $url=dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.$generic.".png",1);
$found=1; $found=1;
if ($generic < 4) $generic++; if ($generic < 4) $generic++;
print "/* A mainmenu entry but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n"; print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n";
} }
if ($found) if ($found)
{ {

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

@ -1178,9 +1178,12 @@ $mainmenuusedarray=array_unique(explode(',',$mainmenuused));
$generic=1; $generic=1;
// Put here list of menu entries when the div.mainmenu.menuentry was previously defined // Put here list of menu entries when the div.mainmenu.menuentry was previously defined
$divalreadydefined=array('home','companies','products','commercial','externalsite','accountancy','project','tools','members','agenda','holiday','bookmark','cashdesk','ecm','geoipmaxmind','gravatar','clicktodial','paypal','webservices','websites'); $divalreadydefined=array('home','companies','products','commercial','externalsite','accountancy','project','tools','members','agenda','holiday','bookmark','cashdesk','ecm','geoipmaxmind','gravatar','clicktodial','paypal','webservices','websites');
// Put here list of menu entries we are sure we don't want
$divnotrequired=array('multicurrency','salaries','margin','opensurvey','paybox','expensereport','incoterm','prelevement','propal','workflow','notification','supplier_proposal','cron','product','productbatch','expedition');
foreach($mainmenuusedarray as $val) foreach($mainmenuusedarray as $val)
{ {
if (empty($val) || in_array($val,$divalreadydefined)) continue; if (empty($val) || in_array($val,$divalreadydefined)) continue;
if (in_array($val,$divnotrequired)) continue;
//print "XXX".$val; //print "XXX".$val;
// Search img file in module dir // Search img file in module dir