From 614a8e48a2b83b40d19becd0bf49d4270d2f2548 Mon Sep 17 00:00:00 2001 From: simnandez Date: Wed, 12 Dec 2012 12:40:30 +0100 Subject: [PATCH] Fix: Use transcountry instead trans for localtaxes label --- htdocs/societe/soc.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 3ecd0a8c29c..c5219586008 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -934,22 +934,22 @@ else // Local Taxes if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") { - print ''.$langs->trans("LocalTax1IsUsed",$mysoc->country_code).''; + print ''.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).''; print $form->selectyesno('localtax1assuj_value',0,1); - print ''.$langs->trans("LocalTax2IsUsed",$mysoc->country_code).''; + print ''.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).''; print $form->selectyesno('localtax2assuj_value',0,1); print ''; } elseif($mysoc->localtax1_assuj=="1") { - print ''.$langs->trans("LocalTax1IsUsed",$mysoc->country_code).''; + print ''.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).''; print $form->selectyesno('localtax1assuj_value',0,1); print ''; } elseif($mysoc->localtax2_assuj=="1") { - print ''.$langs->trans("LocalTax2IsUsed",$mysoc->country_code).''; + print ''.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).''; print $form->selectyesno('localtax2assuj_value',0,1); print ''; } @@ -1351,23 +1351,23 @@ else // Local Taxes if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") { - print ''.$langs->trans("LocalTax1IsUsed",$mysoc->country_code).''; + print ''.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).''; print $form->selectyesno('localtax1assuj_value',$object->localtax1_assuj,1); - print ''.$langs->trans("LocalTax2IsUsed",$mysoc->country_code).''; + print ''.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).''; print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1); print ''; } elseif($mysoc->localtax1_assuj=="1") { - print ''.$langs->trans("LocalTax1IsUsed",$mysoc->country_code).''; + print ''.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).''; print $form->selectyesno('localtax1assuj_value',$object->localtax1_assuj,1); print ''; } elseif($mysoc->localtax2_assuj=="1") { - print ''.$langs->trans("LocalTax2IsUsed",$mysoc->country_code).''; + print ''.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).''; print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1); print ''; } @@ -1667,22 +1667,22 @@ else // Local Taxes if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") { - print ''.$langs->trans("LocalTax1IsUsed",$mysoc->country_code).''; + print ''.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).''; print yn($object->localtax1_assuj); - print ''.$langs->trans("LocalTax2IsUsed",$mysoc->country_code).''; + print ''.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).''; print yn($object->localtax2_assuj); print ''; } elseif($mysoc->localtax1_assuj=="1") { - print ''.$langs->trans("LocalTax1IsUsed",$mysoc->country_code).''; + print ''.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).''; print yn($object->localtax1_assuj); print ''; } elseif($mysoc->localtax2_assuj=="1") { - print ''.$langs->trans("LocalTax2IsUsed",$mysoc->country_code).''; + print ''.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).''; print yn($object->localtax2_assuj); print ''; }