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

Merge pull request #8934 from grandoc/new_branch_08_06_2018

Browse Source 
New branch 08 06 2018
This commit is contained in:
Laurent Destailleur 2018-06-13 21:38:46 +02:00 committed by GitHub
commit 6881fda744
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/stripe/payment.php
View File

@ -718,7 +718,7 @@ print '</tr>';
//}
if (($account->type=='custom' or $account->type=='express') && $entity==1) {
print '<tr '.$bc[0].'>';
print '<tr class="oddeven">';
print '<td align="center" width="20" ';
if ($action == 'add_paiement' && $stripe->getStripeCustomerAccount($facture->socid)!=$source) { print'class="opacitymedium"';}
@ -831,7 +831,6 @@ print '</tr>';
print '<td align="right">&nbsp;</td>';
print "</tr>\n";
$var=true;
$total=0;
$totalrecu=0;
$totalrecucreditnote=0;
@ -840,7 +839,6 @@ print '</tr>';
while ($i < $num)
{
$objp = $db->fetch_object($resql);
$var=!$var;
$soc = new Societe($db);
$soc->fetch($objp->socid);
@ -863,7 +861,7 @@ print '</tr>';
$multicurrency_remaintopay=price2num($invoice->multicurrency_total_ttc - $multicurrency_payment - $multicurrency_creditnotes - $multicurrency_deposits,'MT');
}
print '<tr '.$bc[$var].'>';
print '<tr class="oddeven">';
print '<td>';
print $invoice->getNomUrl(1,'');
@ -1086,7 +1084,6 @@ if (! GETPOST('action'))
{
$num = $db->num_rows($resql);
$i = 0;
$var=true;
print_barre_liste($langs->trans('Payments'), $page, $_SERVER["PHP_SELF"],'',$sortfield,$sortorder,'',$num);
print '<table class="noborder" width="100%">';
@ -1101,8 +1098,7 @@ if (! GETPOST('action'))
while ($i < min($num,$limit))
{
$objp = $db->fetch_object($resql);
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<tr class="oddeven">';
print '<td><a href="'.DOL_URL_ROOT.'compta/facture/card.php?facid='.$objp->facid.'">'.$objp->facnumber."</a></td>\n";
print '<td>'.dol_print_date($db->jdate($objp->dp))."</td>\n";
print '<td>'.$objp->paiement_type.' '.$objp->num_paiement."</td>\n";

6
htdocs/supplier_proposal/index.php
View File

@ -63,7 +63,6 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is useless due to the global search combo
{
$var=false;
print '<form method="post" action="'.DOL_URL_ROOT.'/supplier_proposal/list.php">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<table class="noborder nohover" width="100%">';
@ -118,14 +117,12 @@ if ($resql)
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("CommRequests").'</th></tr>'."\n";
$var=true;
$listofstatus=array(0,1,2,3,4);
foreach ($listofstatus as $status)
{
$dataseries[]=array($supplier_proposalstatic->LibStatut($status,1), (isset($vals[$status])?(int) $vals[$status]:0));
if (! $conf->use_javascript_ajax)
{
print '<tr class="oddeven">';
print '<td>'.$supplier_proposalstatic->LibStatut($status,0).'</td>';
print '<td align="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status])?$vals[$status]:0).'</a></td>';
@ -189,7 +186,6 @@ if (! empty($conf->supplier_proposal->enabled))
$obj = $db->fetch_object($resql);
print '<tr class="oddeven">';
$supplier_proposalstatic->id=$obj->rowid;
$supplier_proposalstatic->ref=$obj->ref;
print '<td class="nowrap">'.$supplier_proposalstatic->getNomUrl(1).'</td>';
@ -314,8 +310,6 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
$i = 0;
if ($num > 0)
{
$var=true;
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><th colspan="5">'.$langs->trans("RequestsOpened").' <a href="'.DOL_URL_ROOT.'/supplier_proposal/list.php?viewstatut=1"><span class="badge">'.$num.'</span></a></th></tr>';