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

Fix: javascript DOM problem

Browse Source
This commit is contained in:
Regis Houssin 2012-03-14 18:25:05 +01:00
parent 9b7afbc29b
commit 43929ab3f9
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/lib/company.lib.php
View File

@ -655,7 +655,8 @@ function show_addresses($conf,$langs,$db,$object,$backtopage='')
print '<td>'.$address->town.'</td>'; print '<td>'.$address->town.'</td>';
print '<td>'.$address->country.'</td>'; $img=picto_from_langcode($address->country_code);
print '<td>'.($img?$img.' ':'').$address->country.'</td>';
// Lien click to dial // Lien click to dial
print '<td>'; print '<td>';

2
htdocs/societe/class/address.class.php
View File

@ -296,7 +296,7 @@ class Address
$line->town = $objp->town; $line->town = $objp->town;
$line->country_id = $objp->country_id; $line->country_id = $objp->country_id;
$line->country_code = $objp->country_id?$objp->country_code:''; $line->country_code = $objp->country_id?$objp->country_code:'';
$line->country = $objp->country_id?($langs->trans('Country'.$objp->country_code)!='Country'.$objp->country_code?strtoupper($langs->trans('Country'.$objp->country_code)):$objp->country):''; $line->country = $objp->country_id?($langs->trans('Country'.$objp->country_code)!='Country'.$objp->country_code?$langs->trans('Country'.$objp->country_code):$objp->country):'';
$line->phone = $objp->tel; $line->phone = $objp->tel;
$line->fax = $objp->fax; $line->fax = $objp->fax;
$line->note = $objp->note; $line->note = $objp->note;

6
htdocs/societe/soc.php
View File

@ -1646,12 +1646,12 @@ else
print '</td>'; print '</td>';
// VAT Code // VAT Code
print '<td nowrap="nowrpa">'.$langs->trans('VATIntra').'</td><td>'; print '<td nowrap="nowrap">'.$langs->trans('VATIntra').'</td><td>';
if ($object->tva_intra) if ($object->tva_intra)
{ {
$s=''; $s='';
$s.=$object->tva_intra; $s.=$object->tva_intra;
$s.='<input type="hidden" name="tva_intra" size="12" maxlength="20" value="'.$object->tva_intra.'">'; $s.='<input type="hidden" id="tva_intra" name="tva_intra" size="12" maxlength="20" value="'.$object->tva_intra.'">';
if (empty($conf->global->MAIN_DISABLEVATCHECK)) if (empty($conf->global->MAIN_DISABLEVATCHECK))
{ {
@ -1666,7 +1666,7 @@ else
print "}\n"; print "}\n";
print '</script>'; print '</script>';
print "\n"; print "\n";
$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>'; $s.='<a href="#" onclick="javascript: CheckVAT( $(\'#tva_intra\').val() );">'.$langs->trans("VATIntraCheck").'</a>';
$s = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1); $s = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
} }
else else