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

Merge remote-tracking branch 'origin/3.4' into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2013-06-23 13:04:00 +02:00
commit 355c770f97
6 changed files with 60 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
htdocs/compta/bank/account.php
View File

@ -55,6 +55,10 @@ $result=restrictedArea($user,'banque',$fieldvalue,'bank_account','','',$fieldtyp
$paiementtype=GETPOST('paiementtype','alpha',3);
$req_nb=GETPOST("req_nb",'',3);
$thirdparty=GETPOST("thirdparty",'',3);
$req_desc=GETPOST("req_desc",'',3);
$req_debit=GETPOST("req_debit",'',3);
$req_credit=GETPOST("req_credit",'',3);
$vline=GETPOST("vline");
$page=GETPOST('page','int');
$negpage=GETPOST('negpage','int');
@ -186,22 +190,22 @@ if ($id > 0 || ! empty($ref))
$param.='&req_nb='.urlencode($req_nb);
$mode_search = 1;
}
if (GETPOST("req_desc"))
if ($req_desc)
{
$sql_rech.= " AND b.label LIKE '%".$db->escape(GETPOST("req_desc"))."%'";
$param.='&req_desc='.urlencode(GETPOST("req_desc"));
$sql_rech.= " AND b.label LIKE '%".$db->escape($req_desc)."%'";
$param.='&req_desc='.urlencode($req_desc);
$mode_search = 1;
}
if (GETPOST("req_debit"))
if ($req_debit != '')
{
$sql_rech.=" AND b.amount = -".price2num(GETPOST("req_debit"));
$param.='&req_debit='.urlencode(GETPOST("req_debit"));
$sql_rech.=" AND b.amount = -".price2num($req_debit);
$param.='&req_debit='.urlencode($req_debit);
$mode_search = 1;
}
if (GETPOST("req_credit"))
if ($req_credit != '')
{
$sql_rech.=" AND b.amount = ".price2num(GETPOST("req_credit"));
$param.='&req_credit='.urlencode(GETPOST("req_credit"));
$sql_rech.=" AND b.amount = ".price2num($req_credit);
$param.='&req_credit='.urlencode($req_credit);
$mode_search = 1;
}
if ($thirdparty)
@ -298,9 +302,9 @@ if ($id > 0 || ! empty($ref))
$navig.='<input type="text" name="negpage" size="1" class="flat" value="'.($totalPages-$page).'">';
$navig.='<input type="hidden" name="paiementtype" value="'.$paiementtype.'">';
$navig.='<input type="hidden" name="req_nb" value="'.$req_nb.'">';
$navig.='<input type="hidden" name="req_desc" value="'.GETPOST("req_desc").'">';
$navig.='<input type="hidden" name="req_debit" value="'.GETPOST("req_debit").'">';
$navig.='<input type="hidden" name="req_credit" value="'.GETPOST("req_credit").'">';
$navig.='<input type="hidden" name="req_desc" value="'.$req_desc.'">';
$navig.='<input type="hidden" name="req_debit" value="'.$req_debit.'">';
$navig.='<input type="hidden" name="req_credit" value="'.$req_credit.'">';
$navig.='<input type="hidden" name="thirdparty" value="'.$thirdparty.'">';
$navig.='<input type="hidden" name="nbpage" value="'.$totalPages.'">';
$navig.='<input type="hidden" name="id" value="'.$object->id.'">';
@ -325,7 +329,7 @@ if ($id > 0 || ! empty($ref))
// Show title
if ($action != 'addline' && $action != 'delete')
{
print '<tr><td colspan="9" align="right">'.$navig.'</td></tr>';
print '<tr><td colspan="10" align="right">'.$navig.'</td></tr>';
}
// Form to add a transaction with no invoice
@ -375,7 +379,7 @@ if ($id > 0 || ! empty($ref))
print '</td></tr>';
print "</form>";
print '<tr class="noborder"><td colspan="8">&nbsp;</td></tr>'."\n";
print '<tr class="noborder"><td colspan="10">&nbsp;</td></tr>'."\n";
}
/*
@ -412,10 +416,10 @@ if ($id > 0 || ! empty($ref))
print $form->select_types_paiements($paiementtype,'paiementtype',$filtertype,2,1,1,8);
print '</td>';
print '<td><input type="text" class="flat" name="req_nb" value="'.$req_nb.'" size="2"></td>';
print '<td><input type="text" class="flat" name="req_desc" value="'.GETPOST("req_desc").'" size="24"></td>';
print '<td><input type="text" class="flat" name="req_desc" value="'.$req_desc.'" size="24"></td>';
print '<td><input type="text" class="flat" name="thirdparty" value="'.$thirdparty.'" size="14"></td>';
print '<td align="right"><input type="text" class="flat" name="req_debit" value="'.GETPOST("req_debit").'" size="4"></td>';
print '<td align="right"><input type="text" class="flat" name="req_credit" value="'.GETPOST("req_credit").'" size="4"></td>';
print '<td align="right"><input type="text" class="flat" name="req_debit" value="'.$req_debit.'" size="4"></td>';
print '<td align="right"><input type="text" class="flat" name="req_credit" value="'.$req_credit.'" size="4"></td>';
print '<td align="center">&nbsp;</td>';
print '<td align="center" width="40"><input type="image" class="liste_titre" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'"></td>';
print "</tr>\n";
@ -674,7 +678,7 @@ if ($id > 0 || ! empty($ref))
}
// Balance
if ($action != 'search')
if (! $mode_search)
{
if ($total >= 0)
{

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

@ -251,6 +251,11 @@ input:disabled {background:#b6b6b6;}
input[type=checkbox] { background-color: transparent; border: none; box-shadow: none; }
input[type=image] { background-color: transparent; border: none; box-shadow: none; }
input:-webkit-autofill {
background-color: <?php echo empty($dol_use_jmobile)?'#FBFFEA':'#FFFFFF' ?> !important;
background-image:none !important;
-webkit-box-shadow: 0 0 0 50px <?php echo empty($dol_use_jmobile)?'#FBFFEA':'#FFFFFF' ?> inset;
}
<?php if (! empty($dol_use_jmobile)) { ?>
legend { margin-bottom: 8px; }

25
htdocs/theme/auguria/style.css.php
View File

@ -143,6 +143,12 @@ textarea:disabled {
}
input[type=checkbox] { background-color: transparent; border: none; box-shadow: none; }
input[type=image] { background-color: transparent; border: none; box-shadow: none; }
input:-webkit-autofill {
background-color: <?php echo empty($dol_use_jmobile)?'#FBFFEA':'#FFFFFF' ?> !important;
background-image:none !important;
-webkit-box-shadow: 0 0 0 50px <?php echo empty($dol_use_jmobile)?'#FBFFEA':'#FFFFFF' ?> inset;
}
<?php if (! empty($dol_use_jmobile)) { ?>
legend { margin-bottom: 8px; }
<?php } ?>
@ -1357,19 +1363,20 @@ th.liste_titre_sel, td.liste_titre_sel
/* border-bottom: 1px solid #FDFFFF; */
white-space: nowrap;
}
input.liste_titre {
background: transparent;
background-repeat: repeat-x;
border: 0px;
background: transparent;
background-repeat: repeat-x;
border: 0px;
}
tr.liste_total td {
border-top: 1px solid #DDDDDD;
background: #F0F0F0;
background-repeat: repeat-x;
color: #332266;
font-weight: normal;
white-space: nowrap;
border-top: 1px solid #DDDDDD;
background: #F0F0F0;
background-repeat: repeat-x;
color: #332266;
font-weight: normal;
white-space: nowrap;
}

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

@ -155,6 +155,12 @@ textarea:disabled {
input[type=checkbox] { background-color: transparent; border: none; box-shadow: none; }
input[type=image] { background-color: transparent; border: none; box-shadow: none; }
input:-webkit-autofill {
background-color: <?php echo empty($dol_use_jmobile)?'#FBFFEA':'#FFFFFF' ?> !important;
background-image:none !important;
-webkit-box-shadow: 0 0 0 50px <?php echo empty($dol_use_jmobile)?'#FBFFEA':'#FFFFFF' ?> inset;
}
input.button[type=submit] {
background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_btnGreen.jpg',1); ?>);
display: block;

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

@ -126,6 +126,12 @@ textarea:disabled {
input[type=checkbox] { background-color: transparent; border: none; box-shadow: none; }
input[type=image] { background-color: transparent; border: none; box-shadow: none; }
input:-webkit-autofill {
background-color: <?php echo empty($dol_use_jmobile)?'#FBFFEA':'#FFFFFF' ?> !important;
background-image:none !important;
-webkit-box-shadow: 0 0 0 50px <?php echo empty($dol_use_jmobile)?'#FBFFEA':'#FFFFFF' ?> inset;
}
input.button[type=submit] {
background: #A51B00;
-moz-border-radius:8px;

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

@ -268,9 +268,6 @@ input:disabled {
background:#ddd;
}
input:-webkit-autofill {
background-color: #FCFEFA !important; background-image:none !important;
}
input.liste_titre {
box-shadow: none !important;
}
@ -283,6 +280,11 @@ textarea:disabled {
}
input[type=checkbox] { background-color: transparent; border: none; box-shadow: none; }
input[type=image] { background-color: transparent; border: none; box-shadow: none; }
input:-webkit-autofill {
background-color: <?php echo empty($dol_use_jmobile)?'#FBFFEA':'#FFFFFF' ?> !important;
background-image:none !important;
-webkit-box-shadow: 0 0 0 50px <?php echo empty($dol_use_jmobile)?'#FBFFEA':'#FFFFFF' ?> inset;
}
<?php if (! empty($dol_use_jmobile)) { ?>
legend { margin-bottom: 8px; }