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

Convert " " to \t to match custom coding conventions

Browse Source
This commit is contained in:
Yannick Warnier 2015-06-28 23:28:04 -05:00
parent 486a1547df
commit 3a8c93522f
4 changed files with 1170 additions and 1181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/admin/company.php
View File

@ -360,8 +360,7 @@ if ($action == 'edit' || $action == 'updateedit')
print '</td></tr>'."\n"; print '</td></tr>'."\n";
// Barcode // Barcode
if (! empty($conf->barcode->enabled)) if (! empty($conf->barcode->enabled)) {
{
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td><label for="barcode">'.$langs->trans("Gencod").'</label></td><td>'; print '<tr '.$bc[$var].'><td><label for="barcode">'.$langs->trans("Gencod").'</label></td><td>';
print '<input name="barcode" id="barcode" size="40" value="'. $conf->global->MAIN_INFO_SOCIETE_GENCOD . '"></td></tr>'; print '<input name="barcode" id="barcode" size="40" value="'. $conf->global->MAIN_INFO_SOCIETE_GENCOD . '"></td></tr>';
@ -374,17 +373,13 @@ if ($action == 'edit' || $action == 'updateedit')
print '<table width="100%" class="nobordernopadding"><tr class="nocellnopadd"><td valign="middle" class="nocellnopadd">'; print '<table width="100%" class="nobordernopadding"><tr class="nocellnopadd"><td valign="middle" class="nocellnopadd">';
print '<input type="file" class="flat" name="logo" id="logo" size="50">'; print '<input type="file" class="flat" name="logo" id="logo" size="50">';
print '</td><td class="nocellnopadd" valign="middle" align="right">'; print '</td><td class="nocellnopadd" valign="middle" align="right">';
if (! empty($mysoc->logo_mini)) if (! empty($mysoc->logo_mini)) {
{
print '<a href="'.$_SERVER["PHP_SELF"].'?action=removelogo">'.img_delete($langs->trans("Delete")).'</a>'; print '<a href="'.$_SERVER["PHP_SELF"].'?action=removelogo">'.img_delete($langs->trans("Delete")).'</a>';
if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) {
{
print ' &nbsp; '; print ' &nbsp; ';
print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode('/thumbs/'.$mysoc->logo_mini).'">'; print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode('/thumbs/'.$mysoc->logo_mini).'">';
} }
} } else {
else
{
print '<img height="30" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.jpg">'; print '<img height="30" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.jpg">';
} }
print '</td></tr></table>'; print '</td></tr></table>';
@ -420,12 +415,9 @@ if ($action == 'edit' || $action == 'updateedit')
// Forme juridique // Forme juridique
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td><label for="legal_form">'.$langs->trans("JuridicalStatus").'</label></td><td>'; print '<tr '.$bc[$var].'><td><label for="legal_form">'.$langs->trans("JuridicalStatus").'</label></td><td>';
if ($mysoc->country_code) if ($mysoc->country_code) {
{
print $formcompany->select_juridicalstatus($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE, $mysoc->country_code, '', 'legal_form'); print $formcompany->select_juridicalstatus($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE, $mysoc->country_code, '', 'legal_form');
} } else {
else
{
print $countrynotdefined; print $countrynotdefined;
} }
print '</td></tr>'; print '</td></tr>';

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

@ -399,8 +399,7 @@ if ($special_report) {
// This matches tax requirements to list all same-country customers (only) // This matches tax requirements to list all same-country customers (only)
print '<h3>'.$langs->trans('OtherCountriesCustomersReport').'</h3>'; print '<h3>'.$langs->trans('OtherCountriesCustomersReport').'</h3>';
print $langs->trans('BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry'); print $langs->trans('BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry');
$coll_list = vat_by_thirdparty($db, 0, $date_start, $date_end, $modetax, $coll_list = vat_by_thirdparty($db, 0, $date_start, $date_end, $modetax, 'sell');
'sell');
print "<table class=\"noborder\" width=\"100%\">"; print "<table class=\"noborder\" width=\"100%\">";
print "<tr class=\"liste_titre\">"; print "<tr class=\"liste_titre\">";
@ -474,8 +473,7 @@ if ($special_report) {
// This matches tax requirements to list all same-country customers (only) // This matches tax requirements to list all same-country customers (only)
print '<h3>'.$langs->trans('SameCountryCustomersWithVAT').'</h3>'; print '<h3>'.$langs->trans('SameCountryCustomersWithVAT').'</h3>';
print $langs->trans('BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry'); print $langs->trans('BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry');
$coll_list = vat_by_thirdparty($db, 0, $date_start, $date_end, $modetax, $coll_list = vat_by_thirdparty($db, 0, $date_start, $date_end, $modetax, 'sell');
'sell');
print "<table class=\"noborder\" width=\"100%\">"; print "<table class=\"noborder\" width=\"100%\">";
print "<tr class=\"liste_titre\">"; print "<tr class=\"liste_titre\">";
@ -512,8 +510,7 @@ if ($special_report) {
$company_static->id = $coll->socid; $company_static->id = $coll->socid;
$company_static->name = $coll->name; $company_static->name = $coll->name;
$company_static->client = 1; $company_static->client = 1;
print '<td class="nowrap">' . $company_static->getNomUrl(1, print '<td class="nowrap">' . $company_static->getNomUrl(1, 'customer') . '</td>';
'customer') . '</td>';
$find = array(' ', '.'); $find = array(' ', '.');
$replace = array('', ''); $replace = array('', '');
print '<td class="nowrap">' . $intra . "</td>"; print '<td class="nowrap">' . $intra . "</td>";