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

Merge pull request #10367 from grandoc/new_branch_18_01_2019

Browse Source 
update with html5 compliant code
This commit is contained in:
Laurent Destailleur 2019-01-19 11:14:59 +01:00 committed by GitHub
commit 6651407a05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 96 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/compta/bank/bankentries_list.php
View File

@ -1520,8 +1520,8 @@ if ($resql)
$i++; $i++;
if ($i == 1) if ($i == 1)
{ {
if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>'; if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>'; else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
} }
elseif ($totalarray['totaldebfield'] == $i) print '<td align="right">'.price(-1 * $totalarray['totaldeb']).'</td>'; elseif ($totalarray['totaldebfield'] == $i) print '<td align="right">'.price(-1 * $totalarray['totaldeb']).'</td>';
elseif ($totalarray['totalcredfield'] == $i) print '<td align="right">'.price($totalarray['totalcred']).'</td>'; elseif ($totalarray['totalcredfield'] == $i) print '<td align="right">'.price($totalarray['totalcred']).'</td>';

4
htdocs/compta/bank/list.php
View File

@ -588,8 +588,8 @@ if (isset($totalarray['totalbalancefield']) && $lastcurrencycode != 'various') /
$i++; $i++;
if ($i == 1) if ($i == 1)
{ {
if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>'; if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>'; else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
} }
elseif ($totalarray['totalbalancefield'] == $i) print '<td align="right">'.price($totalarray['totalbalance'], 0, $langs, 0, 0, -1, $lastcurrencycode).'</td>'; elseif ($totalarray['totalbalancefield'] == $i) print '<td align="right">'.price($totalarray['totalbalance'], 0, $langs, 0, 0, -1, $lastcurrencycode).'</td>';
else print '<td></td>'; else print '<td></td>';

4
htdocs/compta/cashcontrol/cashcontrol_list.php
View File

@ -521,8 +521,8 @@ if (isset($totalarray['pos']))
{ {
if ($i == 1) if ($i == 1)
{ {
if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>'; if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';
else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>'; else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
} }
else print '<td></td>'; else print '<td></td>';
} }

4
htdocs/compta/cashcontrol/report.php
View File

@ -240,8 +240,8 @@ if ($resql)
$i++; $i++;
if ($i == 1) if ($i == 1)
{ {
if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>'; if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>'; else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
} }
elseif ($totalarray['totaldebfield'] == $i) print '<td align="right">'.price(-1 * $totalarray['totaldeb']).'</td>'; elseif ($totalarray['totaldebfield'] == $i) print '<td align="right">'.price(-1 * $totalarray['totaldeb']).'</td>';
elseif ($totalarray['totalcredfield'] == $i) print '<td align="right">'.price($totalarray['totalcred']).'</td>'; elseif ($totalarray['totalcredfield'] == $i) print '<td align="right">'.price($totalarray['totalcred']).'</td>';

12
htdocs/compta/charges/index.php
View File

@ -294,7 +294,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td align="left">'.dol_print_date($db->jdate($obj->dm),'day').'</td>'."\n"; print '<td class="left">'.dol_print_date($db->jdate($obj->dm),'day').'</td>'."\n";
print "<td>".$obj->label."</td>\n"; print "<td>".$obj->label."</td>\n";
@ -303,7 +303,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
// Ref payment // Ref payment
$tva_static->id=$obj->rowid; $tva_static->id=$obj->rowid;
$tva_static->ref=$obj->rowid; $tva_static->ref=$obj->rowid;
print '<td align="left">'.$tva_static->getNomUrl(1)."</td>\n"; print '<td class="left">'.$tva_static->getNomUrl(1)."</td>\n";
// Date // Date
print '<td align="center">'.dol_print_date($db->jdate($obj->dm),'day')."</td>\n"; print '<td align="center">'.dol_print_date($db->jdate($obj->dm),'day')."</td>\n";
@ -423,14 +423,14 @@ while($j<$numlt)
$total = $total + $obj->amount; $total = $total + $obj->amount;
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td align="left">'.dol_print_date($db->jdate($obj->dm),'day').'</td>'."\n"; print '<td class="left">'.dol_print_date($db->jdate($obj->dm),'day').'</td>'."\n";
print "<td>".$obj->label."</td>\n"; print "<td>".$obj->label."</td>\n";
// Ref payment // Ref payment
$tva_static->id=$obj->rowid; $tva_static->id=$obj->rowid;
$tva_static->ref=$obj->rowid; $tva_static->ref=$obj->rowid;
print '<td align="left">'.$tva_static->getNomUrl(1)."</td>\n"; print '<td class="left">'.$tva_static->getNomUrl(1)."</td>\n";
print '<td align="center">'.dol_print_date($db->jdate($obj->dp),'day')."</td>\n"; print '<td align="center">'.dol_print_date($db->jdate($obj->dp),'day')."</td>\n";
print '<td align="right">'.price($obj->amount)."</td>"; print '<td align="right">'.price($obj->amount)."</td>";
@ -508,14 +508,14 @@ if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td align="left">'.dol_print_date($db->jdate($obj->dateep),'day').'</td>'."\n"; print '<td class="left">'.dol_print_date($db->jdate($obj->dateep),'day').'</td>'."\n";
print "<td>".$obj->label."</td>\n"; print "<td>".$obj->label."</td>\n";
// Ref payment // Ref payment
$sal_static->id=$obj->rowid; $sal_static->id=$obj->rowid;
$sal_static->ref=$obj->rowid; $sal_static->ref=$obj->rowid;
print '<td align="left">'.$sal_static->getNomUrl(1)."</td>\n"; print '<td class="left">'.$sal_static->getNomUrl(1)."</td>\n";
// Date // Date
print '<td align="center">'.dol_print_date($db->jdate($obj->datep),'day')."</td>\n"; print '<td align="center">'.dol_print_date($db->jdate($obj->datep),'day')."</td>\n";

4
htdocs/compta/clients.php
View File

@ -184,8 +184,8 @@ if ($resql)
print $thirdpartystatic->getNomUrl(1,'compta'); print $thirdpartystatic->getNomUrl(1,'compta');
print '</td>'; print '</td>';
print '<td>'.$obj->town.'&nbsp;</td>'; print '<td>'.$obj->town.'&nbsp;</td>';
print '<td align="left">'.$obj->code_client.'&nbsp;</td>'; print '<td class="left">'.$obj->code_client.'&nbsp;</td>';
print '<td align="left">'.$obj->code_compta.'&nbsp;</td>'; print '<td class="left">'.$obj->code_compta.'&nbsp;</td>';
print '<td align="right">'.dol_print_date($db->jdate($obj->datec)).'</td>'; print '<td align="right">'.dol_print_date($db->jdate($obj->datec)).'</td>';
print "</tr>\n"; print "</tr>\n";
$i++; $i++;

2
htdocs/compta/facture/fiche-rec.php
View File

@ -1476,7 +1476,7 @@ else
print '<tr><td>'; print '<tr><td>';
print "<input type='text' name='frequency' value='".$object->frequency."' size='5' />&nbsp;".$form->selectarray('unit_frequency', array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), ($object->unit_frequency?$object->unit_frequency:'m')); print "<input type='text' name='frequency' value='".$object->frequency."' size='5' />&nbsp;".$form->selectarray('unit_frequency', array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), ($object->unit_frequency?$object->unit_frequency:'m'));
print '</td>'; print '</td>';
print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>'; print '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
print '</tr></table></form>'; print '</tr></table></form>';
} }
else else

4
htdocs/compta/facture/invoicetemplate_list.php
View File

@ -688,8 +688,8 @@ if ($resql)
{ {
if ($i == 1) if ($i == 1)
{ {
if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>'; if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';
else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>'; else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
} }
else print '<td></td>'; else print '<td></td>';
} }

4
htdocs/compta/facture/list.php
View File

@ -1202,8 +1202,8 @@ if ($resql)
$i++; $i++;
if ($i == 1) if ($i == 1)
{ {
if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>'; if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>'; else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
} }
elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>'; elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>';
elseif ($totalarray['totalvatfield'] == $i) print '<td align="right">'.price($totalarray['totalvat']).'</td>'; elseif ($totalarray['totalvatfield'] == $i) print '<td align="right">'.price($totalarray['totalvat']).'</td>';

6
htdocs/compta/facture/prelevement.php
View File

@ -575,7 +575,7 @@ if ($object->id > 0)
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td align="left">'.$langs->trans("DateRequest").'</td>'; print '<td class="left">'.$langs->trans("DateRequest").'</td>';
print '<td align="center">'.$langs->trans("User").'</td>'; print '<td align="center">'.$langs->trans("User").'</td>';
print '<td align="center">'.$langs->trans("Amount").'</td>'; print '<td align="center">'.$langs->trans("Amount").'</td>';
print '<td align="center">'.$langs->trans("WithdrawalReceipt").'</td>'; print '<td align="center">'.$langs->trans("WithdrawalReceipt").'</td>';
@ -607,7 +607,7 @@ if ($object->id > 0)
$obj = $db->fetch_object($result_sql); $obj = $db->fetch_object($result_sql);
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td align="left">'.dol_print_date($db->jdate($obj->date_demande),'day')."</td>\n"; print '<td class="left">'.dol_print_date($db->jdate($obj->date_demande),'day')."</td>\n";
print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>'; print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>';
print '<td align="center">'.price($obj->amount).'</td>'; print '<td align="center">'.price($obj->amount).'</td>';
print '<td align="center">-</td>'; print '<td align="center">-</td>';
@ -657,7 +657,7 @@ if ($object->id > 0)
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td align="left">'.dol_print_date($db->jdate($obj->date_demande),'day')."</td>\n"; print '<td class="left">'.dol_print_date($db->jdate($obj->date_demande),'day')."</td>\n";
print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>'; print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>';

2
htdocs/compta/facture/stats/index.php
View File

@ -255,7 +255,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
print '</td></tr>'; print '</td></tr>';
// Status // Status
print '<tr><td align="left">'.$langs->trans("Status").'</td><td align="left">'; print '<tr><td class="left">'.$langs->trans("Status").'</td><td class="left">';
if ($mode == 'customer') if ($mode == 'customer')
{ {
$liststatus=array('0'=>$langs->trans("BillStatusDraft"), '1'=>$langs->trans("BillStatusNotPaid"), '2'=>$langs->trans("BillStatusPaid"), '3'=>$langs->trans("BillStatusCanceled")); $liststatus=array('0'=>$langs->trans("BillStatusDraft"), '1'=>$langs->trans("BillStatusNotPaid"), '2'=>$langs->trans("BillStatusPaid"), '3'=>$langs->trans("BillStatusCanceled"));

10
htdocs/compta/index.php
View File

@ -206,7 +206,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
$i++; $i++;
} }
print '<tr class="liste_total"><td align="left">'.$langs->trans("Total").'</td>'; print '<tr class="liste_total"><td class="left">'.$langs->trans("Total").'</td>';
print '<td colspan="2" align="right">'.price($tot_ttc).'</td>'; print '<td colspan="2" align="right">'.price($tot_ttc).'</td>';
print '</tr>'; print '</tr>';
} }
@ -293,7 +293,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
$i++; $i++;
} }
print '<tr class="liste_total"><td align="left">'.$langs->trans("Total").'</td>'; print '<tr class="liste_total"><td class="left">'.$langs->trans("Total").'</td>';
print '<td colspan="2" align="right">'.price($tot_ttc).'</td>'; print '<td colspan="2" align="right">'.price($tot_ttc).'</td>';
print '</tr>'; print '</tr>';
} }
@ -406,7 +406,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
print '</td></tr></table>'; print '</td></tr></table>';
print '</td>'; print '</td>';
print '<td align="left">'; print '<td class="left">';
print $thirdpartystatic->getNomUrl(1,'customer',44); print $thirdpartystatic->getNomUrl(1,'customer',44);
print '</td>'; print '</td>';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td align="right">'.price($obj->total_ht).'</td>'; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td align="right">'.price($obj->total_ht).'</td>';
@ -774,7 +774,7 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us
print '</td>'; print '</td>';
print '<td align="left">'; print '<td class="left">';
print $societestatic->getNomUrl(1,'customer',44); print $societestatic->getNomUrl(1,'customer',44);
print '</td>'; print '</td>';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td align="right">'.price($obj->total_ht).'</td>'; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td align="right">'.price($obj->total_ht).'</td>';
@ -898,7 +898,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
print '</td></tr></table>'; print '</td></tr></table>';
print '</td>'; print '</td>';
print '<td align="left">' ; print '<td class="left">' ;
print $societestatic->getNomUrl(1,'customer',44); print $societestatic->getNomUrl(1,'customer',44);
print '</td>'; print '</td>';
print '<td align="right">'.dol_print_date($db->jdate($obj->datelimite),'day').'</td>'; print '<td align="right">'.dol_print_date($db->jdate($obj->datelimite),'day').'</td>';

8
htdocs/compta/localtax/clients.php
View File

@ -159,8 +159,8 @@ if($calc ==0 || $calc == 2)
{ {
print "<table class=\"noborder\" width=\"100%\">"; print "<table class=\"noborder\" width=\"100%\">";
print "<tr class=\"liste_titre\">"; print "<tr class=\"liste_titre\">";
print '<td align="left">'.$langs->trans("Num")."</td>"; print '<td class="left">'.$langs->trans("Num")."</td>";
print '<td align="left">'.$langs->trans("Customer")."</td>"; print '<td class="left">'.$langs->trans("Customer")."</td>";
print "<td>".$langs->transcountry("ProfId1",$mysoc->country_code)."</td>"; print "<td>".$langs->transcountry("ProfId1",$mysoc->country_code)."</td>";
print "<td align=\"right\">".$langs->trans("TotalHT")."</td>"; print "<td align=\"right\">".$langs->trans("TotalHT")."</td>";
print "<td align=\"right\">".$vatcust."</td>"; print "<td align=\"right\">".$vatcust."</td>";
@ -240,8 +240,8 @@ if($calc ==0 || $calc == 2)
if($calc ==0 || $calc == 1){ if($calc ==0 || $calc == 1){
print "<table class=\"noborder\" width=\"100%\">"; print "<table class=\"noborder\" width=\"100%\">";
print "<tr class=\"liste_titre\">"; print "<tr class=\"liste_titre\">";
print '<td align="left">'.$langs->trans("Num")."</td>"; print '<td class="left">'.$langs->trans("Num")."</td>";
print '<td align="left">'.$langs->trans("Supplier")."</td>"; print '<td class="left">'.$langs->trans("Supplier")."</td>";
print "<td>".$langs->transcountry("ProfId1",$mysoc->country_code)."</td>"; print "<td>".$langs->transcountry("ProfId1",$mysoc->country_code)."</td>";
print "<td align=\"right\">".$langs->trans("TotalHT")."</td>"; print "<td align=\"right\">".$langs->trans("TotalHT")."</td>";
print "<td align=\"right\">".$vatsup."</td>"; print "<td align=\"right\">".$vatsup."</td>";

4
htdocs/compta/localtax/list.php
View File

@ -83,8 +83,8 @@ if ($result)
$localtax_static->ref=$obj->rowid; $localtax_static->ref=$obj->rowid;
print "<td>".$localtax_static->getNomUrl(1)."</td>\n"; print "<td>".$localtax_static->getNomUrl(1)."</td>\n";
print "<td>".dol_trunc($obj->label,40)."</td>\n"; print "<td>".dol_trunc($obj->label,40)."</td>\n";
print '<td align="left">'.dol_print_date($db->jdate($obj->datev),'day')."</td>\n"; print '<td class="left">'.dol_print_date($db->jdate($obj->datev),'day')."</td>\n";
print '<td align="left">'.dol_print_date($db->jdate($obj->datep),'day')."</td>\n"; print '<td class="left">'.dol_print_date($db->jdate($obj->datep),'day')."</td>\n";
$total = $total + $obj->amount; $total = $total + $obj->amount;
print "<td align=\"right\">".price($obj->amount)."</td>"; print "<td align=\"right\">".price($obj->amount)."</td>";

12
htdocs/compta/localtax/quadri_detail.php
View File

@ -318,8 +318,8 @@ else
//{ //{
// Customers invoices // Customers invoices
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td align="left">'.$elementcust.'</td>'; print '<td class="left">'.$elementcust.'</td>';
print '<td align="left">'.$productcust.'</td>'; print '<td class="left">'.$productcust.'</td>';
if ($modetax != 2) print '<td align="right">'.$amountcust.'</td>'; if ($modetax != 2) print '<td align="right">'.$amountcust.'</td>';
if ($modetax != 1) print '<td align="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>'; if ($modetax != 1) print '<td align="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
print '<td align="right">'.$langs->trans("BI").'</td>'; print '<td align="right">'.$langs->trans("BI").'</td>';
@ -360,7 +360,7 @@ else
print '<td class="nowrap" align="left">'.$fields['link'].'</td>'; print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
// Description // Description
print '<td align="left">'; print '<td class="left">';
if ($fields['pid']) if ($fields['pid'])
{ {
$product_static->id=$fields['pid']; $product_static->id=$fields['pid'];
@ -481,8 +481,8 @@ else
echo '<table class="noborder" width="100%">'; echo '<table class="noborder" width="100%">';
//print table headers for this quadri - expenses now //print table headers for this quadri - expenses now
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td align="left">'.$elementsup.'</td>'; print '<td class="left">'.$elementsup.'</td>';
print '<td align="left">'.$productsup.'</td>'; print '<td class="left">'.$productsup.'</td>';
if ($modetax != 1) if ($modetax != 1)
{ {
print '<td align="right">'.$amountsup.'</td>'; print '<td align="right">'.$amountsup.'</td>';
@ -522,7 +522,7 @@ else
print '<td class="nowrap" align="left">'.$fields['link'].'</td>'; print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
// Description // Description
print '<td align="left">'; print '<td class="left">';
if ($fields['pid']) if ($fields['pid'])
{ {
$product_static->id=$fields['pid']; $product_static->id=$fields['pid'];

2
htdocs/compta/paiement_charge.php
View File

@ -264,7 +264,7 @@ if ($action == 'create')
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
//print '<td>'.$langs->trans("SocialContribution").'</td>'; //print '<td>'.$langs->trans("SocialContribution").'</td>';
print '<td align="left">'.$langs->trans("DateDue").'</td>'; print '<td class="left">'.$langs->trans("DateDue").'</td>';
print '<td align="right">'.$langs->trans("Amount").'</td>'; print '<td align="right">'.$langs->trans("Amount").'</td>';
print '<td align="right">'.$langs->trans("AlreadyPaid").'</td>'; print '<td align="right">'.$langs->trans("AlreadyPaid").'</td>';
print '<td align="right">'.$langs->trans("RemainderToPay").'</td>'; print '<td align="right">'.$langs->trans("RemainderToPay").'</td>';

4
htdocs/compta/sociales/list.php
View File

@ -287,8 +287,8 @@ if ($resql)
if (isset($totalarray['totalttcfield'])) if (isset($totalarray['totalttcfield']))
{ {
print '<tr class="liste_total">'; print '<tr class="liste_total">';
if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>'; if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>'; else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
print '<td></td>'; print '<td></td>';
print '<td></td>'; print '<td></td>';
print '<td></td>'; print '<td></td>';

12
htdocs/compta/sociales/payments.php
View File

@ -259,7 +259,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
$total = $total + $obj->amount; $total = $total + $obj->amount;
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td align="left">'.dol_print_date($db->jdate($obj->dm),'day').'</td>'."\n"; print '<td class="left">'.dol_print_date($db->jdate($obj->dm),'day').'</td>'."\n";
print "<td>".$obj->label."</td>\n"; print "<td>".$obj->label."</td>\n";
@ -268,7 +268,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
// Ref payment // Ref payment
$tva_static->id=$obj->rowid; $tva_static->id=$obj->rowid;
$tva_static->ref=$obj->rowid; $tva_static->ref=$obj->rowid;
print '<td align="left">'.$tva_static->getNomUrl(1)."</td>\n"; print '<td class="left">'.$tva_static->getNomUrl(1)."</td>\n";
print '<td align="center">'.dol_print_date($db->jdate($obj->dm),'day')."</td>\n"; print '<td align="center">'.dol_print_date($db->jdate($obj->dm),'day')."</td>\n";
print '<td align="right">'.price($obj->amount)."</td>"; print '<td align="right">'.price($obj->amount)."</td>";
@ -360,7 +360,7 @@ while($j<$numlt)
$total = $total + $obj->amount; $total = $total + $obj->amount;
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td align="left">'.dol_print_date($db->jdate($obj->dm),'day').'</td>'."\n"; print '<td class="left">'.dol_print_date($db->jdate($obj->dm),'day').'</td>'."\n";
print "<td>".$obj->label."</td>\n"; print "<td>".$obj->label."</td>\n";
@ -369,7 +369,7 @@ while($j<$numlt)
// Ref payment // Ref payment
$tva_static->id=$obj->rowid; $tva_static->id=$obj->rowid;
$tva_static->ref=$obj->rowid; $tva_static->ref=$obj->rowid;
print '<td align="left">'.$tva_static->getNomUrl(1)."</td>\n"; print '<td class="left">'.$tva_static->getNomUrl(1)."</td>\n";
print '<td align="center">'.dol_print_date($db->jdate($obj->dp),'day')."</td>\n"; print '<td align="center">'.dol_print_date($db->jdate($obj->dp),'day')."</td>\n";
print '<td align="right">'.price($obj->amount)."</td>"; print '<td align="right">'.price($obj->amount)."</td>";
@ -442,7 +442,7 @@ if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td align="left">'.dol_print_date($db->jdate($obj->dateep),'day').'</td>'."\n"; print '<td class="left">'.dol_print_date($db->jdate($obj->dateep),'day').'</td>'."\n";
print "<td>".$obj->label."</td>\n"; print "<td>".$obj->label."</td>\n";
@ -451,7 +451,7 @@ if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
// Ref payment // Ref payment
$sal_static->id=$obj->rowid; $sal_static->id=$obj->rowid;
$sal_static->ref=$obj->rowid; $sal_static->ref=$obj->rowid;
print '<td align="left">'.$sal_static->getNomUrl(1)."</td>\n"; print '<td class="left">'.$sal_static->getNomUrl(1)."</td>\n";
print '<td align="center">'.dol_print_date($db->jdate($obj->datep),'day')."</td>\n"; print '<td align="center">'.dol_print_date($db->jdate($obj->datep),'day')."</td>\n";
print '<td align="right">'.price($obj->amount)."</td>"; print '<td align="right">'.price($obj->amount)."</td>";

20
htdocs/compta/stats/byratecountry.php
View File

@ -250,8 +250,8 @@ if ($modecompta == 'CREANCES-DETTES')
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td width="6%" class="right">' . $langs->trans("TurnoverbyVatrate") . '</td>'; print '<tr class="liste_titre"><td width="6%" class="right">' . $langs->trans("TurnoverbyVatrate") . '</td>';
print '<td align="left">' . $langs->trans("ProductOrService") . '</td>'; print '<td class="left">' . $langs->trans("ProductOrService") . '</td>';
print '<td align="left">' . $langs->trans("Country") . '</td>'; print '<td class="left">' . $langs->trans("Country") . '</td>';
$i=0; $i=0;
while($i < 12) while($i < 12)
{ {
@ -292,9 +292,9 @@ if ($resql) {
while ( $obj = $db->fetch_object($resql)) { while ( $obj = $db->fetch_object($resql)) {
print '<tr class="oddeven"><td class="right">' . vatrate($obj->vatrate) . '</td>'; print '<tr class="oddeven"><td class="right">' . vatrate($obj->vatrate) . '</td>';
if ($obj->product_type == 0) { if ($obj->product_type == 0) {
print '<td align="left">'. $langs->trans("Product") . '</td>'; print '<td class="left">'. $langs->trans("Product") . '</td>';
} else { } else {
print '<td align="left">'. $langs->trans("Service") . '</td>'; print '<td class="left">'. $langs->trans("Service") . '</td>';
} }
print '<td>' .$obj->country . '</td>'; print '<td>' .$obj->country . '</td>';
for($i = 0; $i < 12; $i++) { for($i = 0; $i < 12; $i++) {
@ -312,7 +312,7 @@ if ($resql) {
// Total // Total
print '<tr class="liste_total"><td class="right"></td>'; print '<tr class="liste_total"><td class="right"></td>';
print '<td align="left"></td>'; print '<td class="left"></td>';
print '<td></td>'; print '<td></td>';
for($i = 0; $i < 12; $i++) { for($i = 0; $i < 12; $i++) {
$j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START)?1:$conf->global->SOCIETE_FISCAL_MONTH_START); $j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START)?1:$conf->global->SOCIETE_FISCAL_MONTH_START);
@ -328,8 +328,8 @@ if ($resql) {
print '<tr class="liste_titre"><td width="6%" class="right">' . $langs->trans("PurchasebyVatrate") . '</td>'; print '<tr class="liste_titre"><td width="6%" class="right">' . $langs->trans("PurchasebyVatrate") . '</td>';
print '<td align="left">' . $langs->trans("ProductOrService") . '</td>'; print '<td class="left">' . $langs->trans("ProductOrService") . '</td>';
print '<td align="left">' . $langs->trans("Country") . '</td>'; print '<td class="left">' . $langs->trans("Country") . '</td>';
$i=0; $i=0;
while($i < 12) while($i < 12)
{ {
@ -371,9 +371,9 @@ if ($resql2) {
while ( $obj = $db->fetch_object($resql2)) { while ( $obj = $db->fetch_object($resql2)) {
print '<tr class="oddeven"><td class="right">' . vatrate($obj->vatrate) . '</td>'; print '<tr class="oddeven"><td class="right">' . vatrate($obj->vatrate) . '</td>';
if ($obj->product_type == 0) { if ($obj->product_type == 0) {
print '<td align="left">'. $langs->trans("Product") . '</td>'; print '<td class="left">'. $langs->trans("Product") . '</td>';
} else { } else {
print '<td align="left">'. $langs->trans("Service") . '</td>'; print '<td class="left">'. $langs->trans("Service") . '</td>';
} }
print '<td>' . $obj->country . '</td>'; print '<td>' . $obj->country . '</td>';
for($i = 0; $i < 12; $i++) { for($i = 0; $i < 12; $i++) {
@ -391,7 +391,7 @@ if ($resql2) {
// Total // Total
print '<tr class="liste_total"><td class="right"></td>'; print '<tr class="liste_total"><td class="right"></td>';
print '<td align="left"></td>'; print '<td class="left"></td>';
print '<td></td>'; print '<td></td>';
for($i = 0; $i < 12; $i++) { for($i = 0; $i < 12; $i++) {
$j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START)?1:$conf->global->SOCIETE_FISCAL_MONTH_START); $j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START)?1:$conf->global->SOCIETE_FISCAL_MONTH_START);

32
htdocs/compta/tva/clients.php
View File

@ -347,12 +347,12 @@ if (! is_array($x_coll) || ! is_array($x_paye))
// Customers invoices // Customers invoices
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td align="left">'.$elementcust.'</td>'; print '<td class="left">'.$elementcust.'</td>';
print '<td align="left">'.$langs->trans("DateInvoice").'</td>'; print '<td class="left">'.$langs->trans("DateInvoice").'</td>';
if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td align="left">'.$langs->trans("DatePayment").'</td>'; if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td class="left">'.$langs->trans("DatePayment").'</td>';
else print '<td></td>'; else print '<td></td>';
print '<td align="right">'.$namerate.'</td>'; print '<td align="right">'.$namerate.'</td>';
print '<td align="left">'.$productcust.'</td>'; print '<td class="left">'.$productcust.'</td>';
if ($modetax != 1) if ($modetax != 1)
{ {
print '<td align="right">'.$amountcust.'</td>'; print '<td align="right">'.$amountcust.'</td>';
@ -417,17 +417,17 @@ if (! is_array($x_coll) || ! is_array($x_paye))
print '<td class="nowrap" align="left">'.$fields['link'].'</td>'; print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
// Invoice date // Invoice date
print '<td align="left">' . dol_print_date($fields['datef'], 'day') . '</td>'; print '<td class="left">' . dol_print_date($fields['datef'], 'day') . '</td>';
// Payment date // Payment date
if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td align="left">' . dol_print_date($fields['datep'], 'day') . '</td>'; if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td class="left">' . dol_print_date($fields['datep'], 'day') . '</td>';
else print '<td></td>'; else print '<td></td>';
// Rate // Rate
print '<td align="right">' . $fields['drate'] . '</td>'; print '<td align="right">' . $fields['drate'] . '</td>';
// Description // Description
print '<td align="left">'; print '<td class="left">';
if ($fields['pid']) if ($fields['pid'])
{ {
$product_static->id=$fields['pid']; $product_static->id=$fields['pid'];
@ -553,12 +553,12 @@ if (! is_array($x_coll) || ! is_array($x_paye))
// Print table headers for this quadri - expenses now // Print table headers for this quadri - expenses now
print '<tr class="liste_titre liste_titre_topborder">'; print '<tr class="liste_titre liste_titre_topborder">';
print '<td align="left">'.$elementsup.'</td>'; print '<td class="left">'.$elementsup.'</td>';
print '<td align="left">'.$langs->trans("DateInvoice").'</td>'; print '<td class="left">'.$langs->trans("DateInvoice").'</td>';
if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '<td align="left">'.$langs->trans("DatePayment").'</td>'; if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '<td class="left">'.$langs->trans("DatePayment").'</td>';
else print '<td></td>'; else print '<td></td>';
print '<td align="left">'.$namesup.'</td>'; print '<td class="left">'.$namesup.'</td>';
print '<td align="left">'.$productsup.'</td>'; print '<td class="left">'.$productsup.'</td>';
if ($modetax != 1) { if ($modetax != 1) {
print '<td align="right">'.$amountsup.'</td>'; print '<td align="right">'.$amountsup.'</td>';
print '<td align="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>'; print '<td align="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
@ -610,17 +610,17 @@ if (! is_array($x_coll) || ! is_array($x_paye))
print '<td class="nowrap" align="left">'.$fields['link'].'</td>'; print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
// Invoice date // Invoice date
print '<td align="left">' . dol_print_date($fields['datef'], 'day') . '</td>'; print '<td class="left">' . dol_print_date($fields['datef'], 'day') . '</td>';
// Payment date // Payment date
if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '<td align="left">' . dol_print_date($fields['datep'], 'day') . '</td>'; if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '<td class="left">' . dol_print_date($fields['datep'], 'day') . '</td>';
else print '<td></td>'; else print '<td></td>';
// Company name // Company name
print '<td align="left">' . $fields['company_link'] . '</td>'; print '<td class="left">' . $fields['company_link'] . '</td>';
// Description // Description
print '<td align="left">'; print '<td class="left">';
if ($fields['pid']) if ($fields['pid'])
{ {
$product_static->id=$fields['pid']; $product_static->id=$fields['pid'];

36
htdocs/compta/tva/quadri_detail.php
View File

@ -336,12 +336,12 @@ if (! is_array($x_coll) || ! is_array($x_paye))
// Customers invoices // Customers invoices
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td align="left">'.$elementcust.'</td>'; print '<td class="left">'.$elementcust.'</td>';
print '<td align="left">'.$langs->trans("DateInvoice").'</td>'; print '<td class="left">'.$langs->trans("DateInvoice").'</td>';
if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td align="left">'.$langs->trans("DatePayment").'</td>'; if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td class="left">'.$langs->trans("DatePayment").'</td>';
else print '<td></td>'; else print '<td></td>';
print '<td align="left">'.$namecust.'</td>'; print '<td class="left">'.$namecust.'</td>';
print '<td align="left">'.$productcust.'</td>'; print '<td class="left">'.$productcust.'</td>';
if ($modetax != 1) if ($modetax != 1)
{ {
print '<td align="right">'.$amountcust.'</td>'; print '<td align="right">'.$amountcust.'</td>';
@ -393,17 +393,17 @@ if (! is_array($x_coll) || ! is_array($x_paye))
print '<td class="nowrap" align="left">'.$fields['link'].'</td>'; print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
// Invoice date // Invoice date
print '<td align="left">' . dol_print_date($fields['datef'], 'day') . '</td>'; print '<td class="left">' . dol_print_date($fields['datef'], 'day') . '</td>';
// Payment date // Payment date
if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td align="left">' . dol_print_date($fields['datep'], 'day') . '</td>'; if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td class="left">' . dol_print_date($fields['datep'], 'day') . '</td>';
else print '<td></td>'; else print '<td></td>';
// Company name // Company name
print '<td align="left">' . $fields['company_link'] . '</td>'; print '<td class="left">' . $fields['company_link'] . '</td>';
// Description // Description
print '<td align="left">'; print '<td class="left">';
if ($fields['pid']) if ($fields['pid'])
{ {
$product_static->id=$fields['pid']; $product_static->id=$fields['pid'];
@ -529,12 +529,12 @@ if (! is_array($x_coll) || ! is_array($x_paye))
// Print table headers for this quadri - expenses now // Print table headers for this quadri - expenses now
print '<tr class="liste_titre liste_titre_topborder">'; print '<tr class="liste_titre liste_titre_topborder">';
print '<td align="left">'.$elementsup.'</td>'; print '<td class="left">'.$elementsup.'</td>';
print '<td align="left">'.$langs->trans("DateInvoice").'</td>'; print '<td class="left">'.$langs->trans("DateInvoice").'</td>';
if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '<td align="left">'.$langs->trans("DatePayment").'</td>'; if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '<td class="left">'.$langs->trans("DatePayment").'</td>';
else print '<td></td>'; else print '<td></td>';
print '<td align="left">'.$namesup.'</td>'; print '<td class="left">'.$namesup.'</td>';
print '<td align="left">'.$productsup.'</td>'; print '<td class="left">'.$productsup.'</td>';
if ($modetax != 1) { if ($modetax != 1) {
print '<td align="right">'.$amountsup.'</td>'; print '<td align="right">'.$amountsup.'</td>';
print '<td align="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>'; print '<td align="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
@ -574,17 +574,17 @@ if (! is_array($x_coll) || ! is_array($x_paye))
print '<td class="nowrap" align="left">'.$fields['link'].'</td>'; print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
// Invoice date // Invoice date
print '<td align="left">' . dol_print_date($fields['datef'], 'day') . '</td>'; print '<td class="left">' . dol_print_date($fields['datef'], 'day') . '</td>';
// Payment date // Payment date
if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '<td align="left">' . dol_print_date($fields['datep'], 'day') . '</td>'; if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '<td class="left">' . dol_print_date($fields['datep'], 'day') . '</td>';
else print '<td></td>'; else print '<td></td>';
// Company name // Company name
print '<td align="left">' . $fields['company_link'] . '</td>'; print '<td class="left">' . $fields['company_link'] . '</td>';
// Description // Description
print '<td align="left">'; print '<td class="left">';
if ($fields['pid']) if ($fields['pid'])
{ {
$product_static->id=$fields['pid']; $product_static->id=$fields['pid'];

1
htdocs/langs/en_US/companies.lang
View File

@ -28,6 +28,7 @@ AliasNames=Alias name (commercial, trademark, ...)
AliasNameShort=Alias Name AliasNameShort=Alias Name
Companies=Companies Companies=Companies
CountryIsInEEC=Country is inside the European Economic Community CountryIsInEEC=Country is inside the European Economic Community
PriceFormatInCurrentLanguage=Price format in current language
ThirdPartyName=Third-Party Name ThirdPartyName=Third-Party Name
ThirdPartyEmail=Third-party Email ThirdPartyEmail=Third-party Email
ThirdParty=Third Party ThirdParty=Third Party