diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 4e810320467..e3ad4ef3eb7 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -4,7 +4,7 @@ * Copyright (C) 2007 Patrick Raguin * Copyright (C) 2010-2012 Regis Houssin * Copyright (C) 2013-2014 Florian Henry - * Copyright (C) 2013 Juanjo Menent + * Copyright (C) 2013-2014 Juanjo Menent * Copyright (C) 2013 Christophe Battarel * Copyright (C) 2013 Alexandre Spangaro * @@ -72,14 +72,6 @@ function societe_prepare_head($object) $h++; } - if (($object->localtax1_assuj || $object->localtax2_assuj) && (isset($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL > 0) ) - { - $head[$h][0] = DOL_URL_ROOT.'/societe/localtaxes.php?socid='.$object->id; - $head[$h][1] = $langs->trans("LocalTaxes"); - $head[$h][2] = 'localtaxes'; - $h++; - } - if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) )) { $head[$h][0] = DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id; diff --git a/htdocs/societe/localtaxes.php b/htdocs/societe/localtaxes.php deleted file mode 100644 index 95c02122d25..00000000000 --- a/htdocs/societe/localtaxes.php +++ /dev/null @@ -1,267 +0,0 @@ - - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/societe/localtaxes.php - * \ingroup societe - * \brief Page of third party localtaxes rates - */ - -require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; - -$langs->load("companies"); - -// Security check -$socid = GETPOST('socid','int'); -$vatid = GETPOST('vatid','int'); -$action = GETPOST('action','alpha'); - -if ($user->societe_id) $socid=$user->societe_id; -$result = restrictedArea($user, 'societe', $socid, '&societe'); - -// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('localtaxesthirdparty')); - - -/* - * Actions - */ - -$parameters=array('id'=>$socid); -$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks -$error=$hookmanager->error; $errors=array_merge($errors, (array) $hookmanager->errors); - - -/* - * View - */ - -$contactstatic = new Contact($db); -$form = new Form($db); - -if ($socid) -{ - require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; - require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; - - $langs->load("companies"); - - - $soc = new Societe($db); - $result = $soc->fetch($socid); - llxHeader("",$langs->trans("LocalTaxes"),''); - - if (! empty($conf->notification->enabled)) $langs->load("mails"); - $head = societe_prepare_head($soc); - - dol_fiche_head($head, 'localtaxes', $langs->trans("ThirdParty"),0,'company'); - - print ''; - - print ''; - - if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field - { - print ''; - } - - if ($soc->client) - { - print ''; - } - - if ($soc->fournisseur) - { - print ''; - } - - if (! empty($conf->barcode->enabled)) - { - print ''; - } - - print ""; - - // Zip / Town - print '"; - print '"; - - // Country - if ($soc->country) { - print ''; - } - - // EMail - print ''; - - // Web - print ''; - - // Phone / Fax - print ''; - print ''; - - - if ($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") - { - print ''; - print ''; - } - elseif($mysoc->localtax1_assuj=="1") - { - print ''; - } - elseif($mysoc->localtax2_assuj=="1") - { - print ''; - } - - print '
'.$langs->trans("ThirdPartyName").''; - print $form->showrefnav($soc,'socid','',0,'rowid','nom'); - print '
'.$langs->trans('Prefix').''.$soc->prefix_comm.'
'; - print $langs->trans('CustomerCode').''; - print $soc->code_client; - if ($soc->check_codeclient() <> 0) print ' ('.$langs->trans("WrongCustomerCode").')'; - print '
'; - print $langs->trans('SupplierCode').''; - print $soc->code_fournisseur; - if ($soc->check_codefournisseur() <> 0) print ' ('.$langs->trans("WrongSupplierCode").')'; - print '
'.$langs->trans('Gencod').''.$soc->barcode.'
".$langs->trans('Address').""; - dol_print_address($soc->address, 'gmap', 'thirdparty', $soc->id); - print "
'.$langs->trans('Zip').''.$soc->zip."'.$langs->trans('Town').''.$soc->town."
'.$langs->trans('Country').''; - $img=picto_from_langcode($soc->country_code); - print ($img?$img.' ':''); - print $soc->country; - print '
'.$langs->trans('EMail').''; - print dol_print_email($soc->email,0,$soc->id,'AC_EMAIL'); - print '
'.$langs->trans('Web').''; - print dol_print_url($soc->url); - print '
'.$langs->trans('Phone').''.dol_print_phone($soc->phone,$soc->country_code,0,$soc->id,'AC_TEL').''.$langs->trans('Fax').''.dol_print_phone($soc->fax,$soc->country_code,0,$soc->id,'AC_FAX').'
'.$langs->transcountry('LocalTax1IsUsed',$mysoc->country_code).''; - print yn($soc->localtax1_assuj); - print '
'.$langs->transcountry('LocalTax2IsUsed',$mysoc->country_code).''; - print yn($soc->localtax2_assuj); - print '
'.$langs->transcountry('LocalTax1IsUsed',$mysoc->country_code).''; - print yn($soc->localtax1_assuj); - print '
'.$langs->transcountry('LocalTax2IsUsed',$mysoc->country_code).''; - print yn($soc->localtax2_assuj); - print '
'; - - dol_fiche_end(); - - - print '
'; - print ''; - print ''; - print ''; - - // Localtaxes - - print ''; - - print ''; - - // Description - print ''; - - // VAT - print ''; - - // Localtax 1 - if ($mysoc->localtax1_assuj=="1" && $soc->localtax1_assuj) - print ''; - - if ($mysoc->localtax2_assuj=="1" && $soc->localtax2_assuj) - print ''; - - //print ''; - if ($user->rights->societe->creer) - print ''; // No width to allow autodim - - print "\n"; - - - $sql = "SELECT DISTINCT t.rowid, t.note, t.taux, t.localtax1, t.localtax2, t.recuperableonly"; - $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c"; - $sql.= " WHERE t.fk_pays = c.rowid"; - $sql.= " AND t.active = 1"; - $sql.= " AND c.code IN ('".$mysoc->country_code."')"; - $sql.= " ORDER BY t.taux ASC, t.recuperableonly ASC"; - - $resql=$db->query($sql); - if ($resql) - { - $num = $db->num_rows($resql); - if ($num) - { - $var=True; - for ($i = 0; $i < $num; $i++) - { - $var=!$var; - - - $obj = $db->fetch_object($resql); - - if ($action == 'edit' && $obj->rowid==$vatid && $user->rights->societe->creer) - { - print ''; - - print ''; - print ''; - - if ($mysoc->localtax1_assuj=="1" && $soc->localtax1_assuj) - print ''; - if ($mysoc->localtax2_assuj=="1" && $soc->localtax2_assuj) - print ''; - - print ''; - print ''; - } - else - { - print ''; - - print ''; - print ''; - if ($mysoc->localtax1_assuj=="1" && $soc->localtax1_assuj) - print ''; - if ($mysoc->localtax2_assuj=="1" && $soc->localtax2_assuj) - print ''; - print ''; - print "\n"; - } - } - } - } - - print '
'.$langs->trans('Description').''.$langs->trans('VAT').' (%)'.$langs->transcountry('LocalTax1',$mysoc->country_code).' (%)'.$langs->transcountry('LocalTax2',$mysoc->country_code).' (%)
'.$obj->note.''.$obj->taux.''; - print '
'.$obj->note.''.$obj->taux.''.$obj->localtax1.''.$obj->localtax2.''; - if ($user->rights->societe->creer) - { - // TODO Comment this because the action to save is not supported - //print 'id.'&vatid='.$obj->rowid.'">'.img_edit().''; - } - print '
'; - - print '
'; -} - - -llxFooter(); - -$db->close();