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

Merge pull request #10383 from grandoc/new_branch_21_01_2019

Browse Source 
update with html5 compliant code
This commit is contained in:
Laurent Destailleur 2019-01-21 18:05:40 +01:00 committed by GitHub
commit d38ed67a3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
36 changed files with 102 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/prelevement.php
View File

@ -252,7 +252,7 @@ print '</td></tr>';
//ADDDAYS
print '<tr class="pair"><td>'.$langs->trans("ADDDAYS").'</td>';
print '<td align="left">';
print '<td class="left">';
if (! $conf->global->PRELEVEMENT_ADDDAYS) $conf->global->PRELEVEMENT_ADDDAYS=0;
print '<input type="text" name="PRELEVEMENT_ADDDAYS" value="'.$conf->global->PRELEVEMENT_ADDDAYS.'" size="15" ></td>';
print '</td></tr>';

2
htdocs/core/modules/societe/mod_codecompta_aquarium.php
View File

@ -97,7 +97,7 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
//if (! empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)) $texte.=$langs->trans('COMPANY_AQUARIUM_REMOVE_ALPHA').' = '.yn($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)."<br>\n";
if (! empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX)) $texte.=$langs->trans('COMPANY_AQUARIUM_CLEAN_REGEX').' = '.$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX."<br>\n";
$texte.= '</td>';
$texte.= '<td align="left">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
$texte.= '<td class="left">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
$texte.= '</tr></table>';
$texte.= '</form>';

2
htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
View File

@ -48,7 +48,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
<tr class="<?php echo $trclass; ?>">
<td><?php echo $langs->trans("SupplierOrder"); ?></td>
<td><a href="<?php echo DOL_URL_ROOT.'/fourn/commande/card.php?id='.$objectlink->id ?>"><?php echo img_object($langs->trans("ShowOrder"),"order").' '.$objectlink->ref; ?></a></td>
<td align="left"><?php echo $objectlink->ref_supplier; ?></td>
<td class="left"><?php echo $objectlink->ref_supplier; ?></td>
<td align="center"><?php echo dol_print_date($objectlink->date,'day'); ?></td>
<td align="right"><?php
if ($user->rights->fournisseur->commande->lire) {

2
htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
View File

@ -50,7 +50,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
<tr class="<?php echo $trclass; ?>">
<td><?php echo $langs->trans("SupplierInvoice"); ?></td>
<td><a href="<?php echo DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$objectlink->id ?>"><?php echo img_object($langs->trans("ShowBill"),"bill").' '.$objectlink->ref; ?></a></td>
<td align="left"><?php echo $objectlink->ref_supplier; ?></td>
<td class="left"><?php echo $objectlink->ref_supplier; ?></td>
<td align="center"><?php echo dol_print_date($objectlink->date,'day'); ?></td>
<td align="right"><?php
if ($user->rights->fournisseur->facture->lire) {

6
htdocs/product/class/html.formproduct.class.php
View File

@ -40,8 +40,8 @@ class FormProduct
public $error='';
// Cache arrays
var $cache_warehouses=array();
var $cache_lot=array();
public $cache_warehouses=array();
public $cache_lot=array();
/**
@ -266,7 +266,7 @@ class FormProduct
print '<tr><td>';
print $this->selectWarehouses($selected, $htmlname, '', $addempty);
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>';
} else {
if ($selected) {

4
htdocs/product/fournisseurs.php
View File

@ -796,14 +796,14 @@ SCRIPT;
print '<td>'.$productfourn->getSocNomUrl(1,'supplier').'</td>';
// Supplier ref
print '<td align="left">'.$productfourn->fourn_ref.'</td>';
print '<td class="left">'.$productfourn->fourn_ref.'</td>';
// Availability
if(!empty($conf->global->FOURN_PRODUCT_AVAILABILITY))
{
$form->load_cache_availability();
$availability= $form->cache_availability[$productfourn->fk_availability]['label'];
print '<td align="left">'.$availability.'</td>';
print '<td class="left">'.$availability.'</td>';
}
// Quantity

4
htdocs/product/inventory/list.php
View File

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

2
htdocs/product/inventory/tpl/inventory.tpl.php
View File

@ -123,7 +123,7 @@ if (empty($conf) || ! is_object($conf))
} // Fin IF principal
?>
<tr style="background-color:<?php echo ($k%2 == 0) ? '#fff':'#eee'; ?>;">
<td align="left">&nbsp;&nbsp;<?php echo $row['produit']; ?></td>
<td class="left">&nbsp;&nbsp;<?php echo $row['produit']; ?></td>
<td align="center"><?php echo $row['entrepot']; ?></td>
<?php if (! empty($conf->barcode->enabled)) { ?>
<td align="center"><?php echo $row['barcode']; ?></td>

12
htdocs/product/price.php
View File

@ -1,12 +1,12 @@
<?php
/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2017 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
* Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014-2018 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2014-2018 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2014-2019 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2014 Ion agorria <ion@agorria.com>
* Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
@ -1395,7 +1395,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
}
if ( !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
{
print '<td align="left">'.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().'</td>';
print '<td class="left">'.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().'</td>';
}
print '</td>';
@ -1710,7 +1710,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
}
if ( !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
{
print '<td align="left">'.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().'</td>';
print '<td class="left">'.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().'</td>';
}
print '</td></tr>';
@ -1801,7 +1801,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
print '</td>';
if ( !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
{
print '<td align="left">'.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().'</td>';
print '<td class="left">'.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().'</td>';
}
print '</tr>';

4
htdocs/product/stats/commande.php
View File

@ -238,8 +238,8 @@ if ($id > 0 || ! empty($ref))
}
}
print '<tr class="liste_total">';
if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';
else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
print '<td colspan="3"></td>';
print '<td align="center">'.$total_qty.'</td>';
print '<td align="right">'.price($total_ht).'</td>';

4
htdocs/product/stats/commande_fournisseur.php
View File

@ -246,8 +246,8 @@ if ($id > 0 || ! empty($ref)) {
}
}
print '<tr class="liste_total">';
if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';
else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
print '<td colspan="3"></td>';
print '<td align="center">' . $total_qty . '</td>';
print '<td align="right">' . price($total_ht) . '</td>';

4
htdocs/product/stats/facture.php
View File

@ -259,8 +259,8 @@ if ($id > 0 || ! empty($ref))
}
}
print '<tr class="liste_total">';
if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';
else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
print '<td colspan="3"></td>';
print '<td align="center">'.$total_qty.'</td>';
print '<td align="right">'.price($total_ht).'</td>';

4
htdocs/product/stats/facture_fournisseur.php
View File

@ -244,8 +244,8 @@ if ($id > 0 || ! empty($ref))
}
}
print '<tr class="liste_total">';
if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';
else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
print '<td colspan="3"></td>';
print '<td align="center">' . $total_qty . '</td>';
print '<td align="right">' . price($total_ht) . '</td>';

4
htdocs/product/stats/propal.php
View File

@ -242,8 +242,8 @@ if ($id > 0 || ! empty($ref))
}
print '<tr class="liste_total">';
if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';
else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
print '<td colspan="2"></td>';
print '<td align="center">' . $total_qty . '</td>';
print '<td align="right">' . price($total_ht) . '</td>';

4
htdocs/product/stats/supplier_proposal.php
View File

@ -241,8 +241,8 @@ if ($id > 0 || ! empty($ref))
}
print '<tr class="liste_total">';
if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';
else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
print '<td colspan="2"></td>';
print '<td align="center">' . $total_qty . '</td>';
print '<td align="right">' . price($total_ht) . '</td>';

4
htdocs/product/stock/productlot_list.php
View File

@ -511,8 +511,8 @@ if ($resql)
$i++;
if ($i == 1)
{
if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
else print '<td class="left">'.$langs->trans("Totalforthispage").'</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>';

4
htdocs/projet/element.php
View File

@ -674,7 +674,7 @@ foreach ($listofreferent as $key => $value)
print '<tr class="oddeven">';
// Module
print '<td align="left">'.$name.'</td>';
print '<td class="left">'.$name.'</td>';
// Nb
print '<td align="right">'.$i.'</td>';
// Amount HT
@ -968,7 +968,7 @@ foreach ($listofreferent as $key => $value)
print '</td>';
// Third party or user
print '<td align="left">';
print '<td class="left">';
if (is_object($element->thirdparty)) print $element->thirdparty->getNomUrl(1,'',48);
else if ($tablename == 'expensereport_det')
{

6
htdocs/projet/list.php
View File

@ -807,7 +807,7 @@ while ($i < min($num,$limit))
// Visibility
if (! empty($arrayfields['p.public']['checked']))
{
print '<td align="left">';
print '<td class="left">';
if ($obj->public) print $langs->trans('SharedProject');
else print $langs->trans('PrivateProject');
print '</td>';
@ -922,8 +922,8 @@ if (isset($totalarray['totaloppfield']) || isset($totalarray['totalbudgetfield']
$i++;
if ($i == 1)
{
if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
}
elseif ($totalarray['totaloppfield'] == $i) print '<td align="right">'.price($totalarray['totalopp'], 1, $langs, 1, -1, -1).'</td>';
elseif ($totalarray['totalbudgetfield'] == $i) print '<td align="right">'.price($totalarray['totalbudget'], 1, $langs, 1, -1, -1).'</td>';

4
htdocs/projet/tasks/contact.php
View File

@ -447,13 +447,13 @@ if ($id > 0 || ! empty($ref))
print '<tr class="oddeven" valign="top">';
// Source
print '<td align="left">';
print '<td class="left">';
if ($tab[$i]['source']=='internal') print $langs->trans("User");
if ($tab[$i]['source']=='external') print $langs->trans("ThirdPartyContact");
print '</td>';
// Societe
print '<td align="left">';
print '<td class="left">';
if ($tab[$i]['socid'] > 0)
{
$companystatic->fetch($tab[$i]['socid']);

4
htdocs/projet/tasks/list.php
View File

@ -818,8 +818,8 @@ if (isset($totalarray['totaldurationeffectivefield']) || isset($totalarray['tota
$i++;
if ($i == 1)
{
if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
}
elseif ($totalarray['totalplannedworkloadfield'] == $i) print '<td align="center">'.convertSecondToTime($totalarray['totalplannedworkload'],$plannedworkloadoutputformat).'</td>';
elseif ($totalarray['totaldurationeffectivefield'] == $i) print '<td align="center">'.convertSecondToTime($totalarray['totaldurationeffective'],$timespentoutputformat).'</td>';

10
htdocs/projet/tasks/time.php
View File

@ -1105,7 +1105,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
// Note
if (! empty($arrayfields['t.note']['checked']))
{
print '<td align="left">';
print '<td class="left">';
if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
{
print '<textarea name="timespent_note_line" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
@ -1320,7 +1320,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
// Note
if (! empty($arrayfields['t.note']['checked']))
{
print '<td align="left">';
print '<td class="left">';
if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
{
print '<textarea name="timespent_note_line" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
@ -1468,7 +1468,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
// Note
if (! empty($arrayfields['t.note']['checked']))
{
print '<td align="left">';
print '<td class="left">';
if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
{
print '<textarea name="timespent_note_line_2" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
@ -1548,8 +1548,8 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
$i++;
if ($i == 1)
{
if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
}
elseif ($totalarray['totaldurationfield'] == $i) print '<td align="right">'.convertSecondToTime($totalarray['totalduration'],'allhourmin').'</td>';
elseif ($totalarray['totalvaluefield'] == $i) print '<td align="right">'.price($totalarray['totalvalue']).'</td>';

16
htdocs/reception/card.php
View File

@ -1002,13 +1002,13 @@ if ($action == 'create')
print '</td>';
if (! empty($conf->stock->enabled))
{
print '<td align="left">'.$langs->trans("Warehouse").' ('.$langs->trans("Stock").')</td>';
print '<td class="left">'.$langs->trans("Warehouse").' ('.$langs->trans("Stock").')</td>';
}
if (!empty($conf->productbatch->enabled))
{
print '<td align="left">'.$langs->trans("batch_number").'</td>';
print '<td align="left">'.$langs->trans("EatByDate").'</td>';
print '<td align="left">'.$langs->trans("SellByDate").'</td>';
print '<td class="left">'.$langs->trans("batch_number").'</td>';
print '<td class="left">'.$langs->trans("EatByDate").'</td>';
print '<td class="left">'.$langs->trans("SellByDate").'</td>';
}
print "</tr>\n";
}
@ -1139,7 +1139,7 @@ if ($action == 'create')
// Stock
if (! empty($conf->stock->enabled))
{
print '<td align="left">';
print '<td class="left">';
if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)) // Type of product need stock change ?
{
// Show warehouse combo list
@ -1687,12 +1687,12 @@ else if ($id || $ref)
}
if (! empty($conf->stock->enabled))
{
print '<td align="left">'.$langs->trans("WarehouseSource").'</td>';
print '<td class="left">'.$langs->trans("WarehouseSource").'</td>';
}
if (! empty($conf->productbatch->enabled))
{
print '<td align="left">'.$langs->trans("Batch").'</td>';
print '<td class="left">'.$langs->trans("Batch").'</td>';
}
}
print '<td align="center">'.$langs->trans("CalculatedWeight").'</td>';
@ -1919,7 +1919,7 @@ else if ($id || $ref)
// Warehouse source
if (! empty($conf->stock->enabled))
{
print '<td align="left">';
print '<td class="left">';
if ($lines[$i]->fk_entrepot > 0)
{

6
htdocs/reception/stats/index.php
View File

@ -239,17 +239,17 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
// Company
print '<tr><td align="left">'.$langs->trans("ThirdParty").'</td><td align="left">';
print '<tr><td class="left">'.$langs->trans("ThirdParty").'</td><td class="left">';
if ($mode == 'customer') $filter='s.client in (1,2,3)';
if ($mode == 'supplier') $filter='s.fournisseur = 1';
print $form->select_company($socid,'socid',$filter,1,0,0,array(),0,'','style="width: 95%"');
print '</td></tr>';
// User
print '<tr><td align="left">'.$langs->trans("CreatedBy").'</td><td align="left">';
print '<tr><td class="left">'.$langs->trans("CreatedBy").'</td><td class="left">';
print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
print '</td></tr>';
// Year
print '<tr><td align="left">'.$langs->trans("Year").'</td><td align="left">';
print '<tr><td class="left">'.$langs->trans("Year").'</td><td class="left">';
if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year;
if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear;
arsort($arrayyears);

10
htdocs/societe/card.php
View File

@ -10,7 +10,7 @@
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
* Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseil.com>
* Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseil.com>
* Copyright (C) 2018 Ferran Marcet <fmarcet@2byte.es.com>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
*
@ -2335,7 +2335,7 @@ else
print '<tr><td>'.$langs->transcountry("TypeLocaltax1", $mysoc->country_code).' <a href="'.$_SERVER["PHP_SELF"].'?action=editRE&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</td>';
if($action == 'editRE')
{
print '<td align="left">';
print '<td class="left">';
$formcompany->select_localtax(1,$object->localtax1_value, "lt1");
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
}
@ -2352,7 +2352,7 @@ else
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<tr><td>'.$langs->transcountry("TypeLocaltax2", $mysoc->country_code).'<a href="'.$_SERVER["PHP_SELF"].'?action=editIRPF&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</td>';
if($action == 'editIRPF'){
print '<td align="left">';
print '<td class="left">';
$formcompany->select_localtax(2,$object->localtax2_value, "lt2");
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
}else{
@ -2373,7 +2373,7 @@ else
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<tr><td> '.$langs->transcountry("TypeLocaltax1", $mysoc->country_code).'<a href="'.$_SERVER["PHP_SELF"].'?action=editRE&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</td>';
if($action == 'editRE'){
print '<td align="left">';
print '<td class="left">';
$formcompany->select_localtax(1,$object->localtax1_value, "lt1");
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
}else{
@ -2395,7 +2395,7 @@ else
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<tr><td> '.$langs->transcountry("TypeLocaltax2", $mysoc->country_code).' <a href="'.$_SERVER["PHP_SELF"].'?action=editIRPF&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</td>';
if($action == 'editIRPF'){
print '<td align="left">';
print '<td class="left">';
$formcompany->select_localtax(2,$object->localtax2_value, "lt2");
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
}else{

2
htdocs/societe/consumption.php
View File

@ -594,7 +594,7 @@ if ($sql_select)
*/
print '</td>';
//print '<td align="left">'.$prodreftxt.'</td>';
//print '<td class="left">'.$prodreftxt.'</td>';
print '<td align="right">'.$objp->prod_qty.'</td>';
$total_qty+=$objp->prod_qty;

4
htdocs/societe/website.php
View File

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

8
htdocs/stripe/payment.php
View File

@ -618,10 +618,10 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print '<table class="liste" width="100%">'."\n";
// Titles with sort buttons
print '<tr class="liste_titre">';
print '<td align="left"></td>';
print '<td align="left">'.$langs->trans('Type').'</td>';
print '<td align="left">'.$langs->trans('Informations').'</td>';
print '<td align="left"></td>';
print '<td class="left"></td>';
print '<td class="left">'.$langs->trans('Type').'</td>';
print '<td class="left">'.$langs->trans('Informations').'</td>';
print '<td class="left"></td>';
print "<td></td></tr>\n";
foreach ($customerstripe->sources->data as $src) {
print '<tr>';

6
htdocs/supplier_proposal/card.php
View File

@ -6,7 +6,7 @@
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
* Copyright (C) 2010-2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2010-2011 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2010-2019 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2012-2013 Christophe Battarel <christophe.battarel@altairis.fr>
* Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014 Ferran Marcet <fmarcet@2byte.es>
@ -1736,7 +1736,7 @@ if ($action == 'create')
if (! empty($conf->global->SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL)) $form_close .= '<p class="notice">'.$langs->trans('SupplierProposalRefFournNotice').'</p>'; // TODO Suggest a permanent checkbox instead of option
$form_close .= '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
$form_close .= '<table class="border" width="100%">';
$form_close .= '<tr><td width="150" align="left">' . $langs->trans("CloseAs") . '</td><td align="left">';
$form_close .= '<tr><td width="150" align="left">' . $langs->trans("CloseAs") . '</td><td class="left">';
$form_close .= '<input type="hidden" name="action" value="setstatut">';
$form_close .= '<select id="statut" name="statut" class="flat">';
$form_close .= '<option value="0">&nbsp;</option>';
@ -1744,7 +1744,7 @@ if ($action == 'create')
$form_close .= '<option value="3">' . $langs->trans('SupplierProposalStatusNotSigned') . '</option>';
$form_close .= '</select>';
$form_close .= '</td></tr>';
$form_close .= '<tr><td width="150" align="left">' . $langs->trans('Note') . '</td><td align="left"><textarea cols="70" rows="' . ROWS_3 . '" wrap="soft" name="note">';
$form_close .= '<tr><td width="150" align="left">' . $langs->trans('Note') . '</td><td class="left"><textarea cols="70" rows="' . ROWS_3 . '" wrap="soft" name="note">';
$form_close .= $object->note;
$form_close .= '</textarea></td></tr>';
$form_close .= '<tr><td align="center" colspan="2">';

2
htdocs/supplier_proposal/index.php
View File

@ -346,7 +346,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
$companystatic->name=$obj->socname;
$companystatic->client=$obj->client;
$companystatic->canvas=$obj->canvas;
print '<td align="left">'.$companystatic->getNomUrl(1,'customer',44).'</td>'."\n";
print '<td class="left">'.$companystatic->getNomUrl(1,'customer',44).'</td>'."\n";
print '<td align="right">';
print dol_print_date($db->jdate($obj->dp),'day').'</td>'."\n";

6
htdocs/supplier_proposal/list.php
View File

@ -6,7 +6,7 @@
* Copyright (C) 2005-2013 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
* Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2010-2011 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2010-2019 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
* Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr>
* Copyright (C) 2016 Ferran Marcet <fmarcet@2byte.es>
@ -842,8 +842,8 @@ if ($resql)
$i++;
if ($i == 1)
{
if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
else print '<td class="left">'.$langs->trans("Totalforthispage").'</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>';

4
htdocs/takepos/admin/setup.php
View File

@ -270,7 +270,7 @@ print '</tr>';
print "<tr class=\"oddeven\">\n";
$url='https://www.dolistore.com/en/modules/980-TakePOS-7-mobile.html';
print '<td align="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="../img/marketplace/takeposmobile.jpg"></a></td>';
print '<td class="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="../img/marketplace/takeposmobile.jpg"></a></td>';
print '<td>TakePOS for mobile devices</td>';
print '<td><a href="'.$url.'" target="_blank" rel="external">'.$url.'</a></td>';
print '</tr>';
@ -287,7 +287,7 @@ print '</tr>';
print "<tr class=\"oddeven\">\n";
$url='http://www.takepos.com';
print '<td align="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="../img/takepos.png"></a></td>';
print '<td class="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="../img/takepos.png"></a></td>';
print '<td>TakePOS original developers</td>';
print '<td><a href="'.$url.'" target="_blank" rel="external">'.$url.'</a></td>';
print '</tr>';

2
htdocs/ticket/card.php
View File

@ -444,7 +444,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
// Progression
print '<tr><td>';
print '<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';
print $langs->trans('Progression') . '</td><td align="left">';
print $langs->trans('Progression') . '</td><td class="left">';
print '</td>';
if ($action != 'progression' && $object->fk_statut < 8 && !$user->societe_id) {
print '<td align="right"><a href="' . $url_page_current . '?action=progression&amp;track_id=' . $object->track_id . '">' . img_edit($langs->trans('Modify')) . '</a></td>';

2
htdocs/ticket/index.php
View File

@ -327,7 +327,7 @@ if ($result) {
print "</td>\n";
// Creation date
print '<td align="left">';
print '<td class="left">';
print dol_print_date($db->jdate($objp->datec), 'dayhour');
print "</td>";

4
htdocs/ticket/list.php
View File

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

2
htdocs/user/home.php
View File

@ -161,7 +161,7 @@ if ($resql)
print img_picto($langs->trans("Administrator"),'star');
}
print "</td>";
print '<td align="left">'.$obj->login.'</td>';
print '<td class="left">'.$obj->login.'</td>';
print "<td>";
if ($obj->fk_soc)
{

38
scripts/accountancy/export-thirdpartyaccount.php
View File

@ -188,16 +188,16 @@ if ($resql) {
print '</td><td valign="top" width="70%" class="notopnoleftnoright"></td>';
print '</tr><tr><td colspan=2>';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td align="left">' . $langs->trans("ThirdParties") . '</td>';
print '<td align="left">' . $langs->trans("AccountNumber") . '</td>';
print '<td align="left">' . $langs->trans("RaisonSociale") . '</td>';
print '<td align="left">' . $langs->trans("Address") . '</td>';
print '<td align="left">' . $langs->trans("Zip") . '</td>';
print '<td align="left">' . $langs->trans("Town") . '</td>';
print '<td align="left">' . $langs->trans("Country") . '</td>';
print '<td align="left">' . $langs->trans("Contact") . '</td>';
print '<td align="left">' . $langs->trans("Phone") . '</td>';
print '<td align="left">' . $langs->trans("Fax") . '</td></tr>';
print '<tr class="liste_titre"><td class="left">' . $langs->trans("ThirdParties") . '</td>';
print '<td class="left">' . $langs->trans("AccountNumber") . '</td>';
print '<td class="left">' . $langs->trans("RaisonSociale") . '</td>';
print '<td class="left">' . $langs->trans("Address") . '</td>';
print '<td class="left">' . $langs->trans("Zip") . '</td>';
print '<td class="left">' . $langs->trans("Town") . '</td>';
print '<td class="left">' . $langs->trans("Country") . '</td>';
print '<td class="left">' . $langs->trans("Contact") . '</td>';
print '<td class="left">' . $langs->trans("Phone") . '</td>';
print '<td class="left">' . $langs->trans("Fax") . '</td></tr>';
while ($obj = $db->fetch_object($resql))
{
@ -210,15 +210,15 @@ if ($resql) {
$thirdpartystatic->status = $obj->status;
print $thirdpartystatic->getNomUrl(1);
print '</td>';
print '<td align="left">' . $obj->compta . '</td>' . "\n";
print '<td align="left"></td>';
print '<td align="left">' . $obj->address . '</td>';
print '<td align="left">' . $obj->zip . '</td>';
print '<td align="left">' . $obj->town . '</td>';
print '<td align="left">' . $obj->country . '</td>';
print '<td align="left"></td>';
print '<td align="left">' . $obj->phone . '</td>';
print '<td align="left">' . $obj->fax . '</td>';
print '<td class="left">' . $obj->compta . '</td>' . "\n";
print '<td class="left"></td>';
print '<td class="left">' . $obj->address . '</td>';
print '<td class="left">' . $obj->zip . '</td>';
print '<td class="left">' . $obj->town . '</td>';
print '<td class="left">' . $obj->country . '</td>';
print '<td class="left"></td>';
print '<td class="left">' . $obj->phone . '</td>';
print '<td class="left">' . $obj->fax . '</td>';
print "</tr>\n";
$i ++;