Merge pull request #2626 from marcosgdf/bug-2598
Fix bug #2598 Untranslated "Supplier" tab name and some tax inputs in /fourn/card.php
This commit is contained in:
commit
5203d5ead0
@ -5,6 +5,7 @@
|
||||
* Copyright (C) 2005-2010 Regis Houssin <regis.houssin@capnetworks.com>
|
||||
* Copyright (C) 2010-2014 Juanjo Menent <jmenent@2byte.es>
|
||||
* Copyright (C) 2014 Jean Heimburger <jean@tiaris.info>
|
||||
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -33,11 +34,11 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
|
||||
if (! empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
|
||||
|
||||
$langs->load('companies');
|
||||
$langs->load('suppliers');
|
||||
$langs->load('products');
|
||||
$langs->load('bills');
|
||||
$langs->load('orders');
|
||||
$langs->load('companies');
|
||||
$langs->load('commercial');
|
||||
|
||||
$action = GETPOST('action');
|
||||
@ -184,13 +185,13 @@ if ($object->fetch($id))
|
||||
// Local Taxes
|
||||
if ($mysoc->useLocalTax(1))
|
||||
{
|
||||
print '<tr><td class="nowrap">'.$langs->trans("LocalTax1IsUsed").'</td><td colspan="3">';
|
||||
print '<tr><td class="nowrap">'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td colspan="3">';
|
||||
print yn($object->localtax1_assuj);
|
||||
print '</td></tr>';
|
||||
}
|
||||
if ($mysoc->useLocalTax(2))
|
||||
{
|
||||
print '<tr><td class="nowrap">'.$langs->trans("LocalTax2IsUsed").'</td><td colspan="3">';
|
||||
print '<tr><td class="nowrap">'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td colspan="3">';
|
||||
print yn($object->localtax2_assuj);
|
||||
print '</td></tr>';
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user