diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php index ed0b7e11752..fe7f17b4cd9 100644 --- a/htdocs/compta/localtax/clients.php +++ b/htdocs/compta/localtax/clients.php @@ -98,7 +98,7 @@ llxHeader('','','','',0,0,'','',$morequerystring); $fsearch.='
'; $fsearch.=' '; $fsearch.=' '; -$fsearch.=' '.$langs->trans("SalesTurnover").' '.$langs->trans("Minimum").': '; +$fsearch.=' '.$langs->trans("SalesTurnoverMinimum").': '; $fsearch.=' '; // Affiche en-tete du rapport diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index 68bfe41d968..4f91cac2895 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -103,7 +103,7 @@ llxHeader('','','','',0,0,'','',$morequerystring); $fsearch.='
'; $fsearch.=' '; $fsearch.=' '; -$fsearch.=' '.$langs->trans("SalesTurnover").' '.$langs->trans("Minimum").': '; +$fsearch.=' '.$langs->trans("SalesTurnoverMinimum").': '; $fsearch.=' '; // Affiche en-tete du rapport diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index e323117091d..bb39ede5b4e 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -118,7 +118,7 @@ $paymentfourn_static=new PaiementFourn($db); //$fsearch.='
'; $fsearch.=' '; $fsearch.=' '; -//$fsearch.=' '.$langs->trans("SalesTurnover").' '.$langs->trans("Minimum").': '; +//$fsearch.=' '.$langs->trans("SalesTurnoverMinimum").': '; //$fsearch.=' '; // Affiche en-tete du rapport diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php index a60c3c63946..ed01fb5d713 100644 --- a/htdocs/core/lib/admin.lib.php +++ b/htdocs/core/lib/admin.lib.php @@ -1134,33 +1134,33 @@ function form_constantes($tableau) } -/** - * Show array with constants to edit - * - * @param array $modules Array of all modules - * @return string HTML string with warning - */ -function showModulesExludedForExternal($modules) -{ +/** + * Show array with constants to edit + * + * @param array $modules Array of all modules + * @return string HTML string with warning + */ +function showModulesExludedForExternal($modules) +{ global $conf,$langs; - $text=$langs->trans("OnlyFollowingModulesAreOpenedToExternalUsers"); - $listofmodules=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL); - $i=0; - foreach($modules as $module) - { - $moduleconst=$module->const_name; - $modulename=strtolower($module->name); - //print 'modulename='.$modulename; - - //if (empty($conf->global->$moduleconst)) continue; - if (! in_array($modulename,$listofmodules)) continue; - - if ($i > 0) $text.=', '; - else $text.=' '; - $i++; - $text.=$langs->trans($module->name); - } + $text=$langs->trans("OnlyFollowingModulesAreOpenedToExternalUsers"); + $listofmodules=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL); + $i=0; + foreach($modules as $module) + { + $moduleconst=$module->const_name; + $modulename=strtolower($module->name); + //print 'modulename='.$modulename; + + //if (empty($conf->global->$moduleconst)) continue; + if (! in_array($modulename,$listofmodules)) continue; + + if ($i > 0) $text.=', '; + else $text.=' '; + $i++; + $text .= $langs->trans('Module'.$module->numero.'Name'); + } return img_picto($langs->trans('InfoAdmin'), 'star').' '.$text; } diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 826d4f66b81..c8f076c58d9 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -236,7 +236,7 @@ elseif ($action == 'add' && $user->rights->fournisseur->facture->creer) $action='create'; $error++; } - + if ($datefacture == '') { $mesg='
'.$langs->trans('ErrorFieldRequired',$langs->transnoentities('DateInvoice')).'
'; @@ -291,7 +291,7 @@ elseif ($action == 'add' && $user->rights->fournisseur->facture->creer) if ($element == 'project') { $element = 'projet'; - } + } $object->origin = $_POST['origin']; $object->origin_id = $_POST['originid']; @@ -613,6 +613,8 @@ elseif ($action == 'edit' && $user->rights->fournisseur->facture->creer) $outputlangs->setDefaultLang($_REQUEST['lang_id']); } //if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_invoice_pdf_create($db, $object->id, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); + + $action=''; } } @@ -959,7 +961,7 @@ if ($action == 'create') if ($element == 'project') { $projectid=GETPOST('originid'); - $element = 'projet'; + $element = 'projet'; } else if (in_array($element,array('order_supplier'))) { @@ -1382,7 +1384,7 @@ else // Local taxes // TODO I use here $societe->localtax1_assuj. Before it was $mysoc->localtax1_assuj, but this is a supplier invoice, so made by supplier, so depends on supplier properties - + if ($mysoc->country_code=='ES') { if($mysoc->localtax1_assuj=="1") $nbrows++; @@ -1517,7 +1519,7 @@ else print ''.$langs->trans("Currency".$conf->currency).''; } } - else + else { if ($societe->localtax1_assuj=="1") //Localtax1 RE { @@ -1858,7 +1860,7 @@ else print ''; print ''; print ''; - + print ''; - + $var=! $var; print ''; print ''; @@ -1908,14 +1910,19 @@ else if ($action != 'presend') { - /* * Boutons actions - */ + */ print '
'; - // Reopen a standard paid invoice + // Modify a validated invoice with no payments + if ($object->statut == 1 && $action != 'edit' && $object->getSommePaiement() == 0 && $user->rights->fournisseur->facture->creer) + { + print ''.$langs->trans('Modify').''; + } + + // Reopen a standard paid invoice if (($object->type == 0 || $object->type == 1) && ($object->statut == 2 || $object->statut == 3)) // A paid invoice (partially or completely) { if (! $facidnext && $object->close_code != 'replaced') // Not replaced by another invoice diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php index ef2a454d22d..ce289d69721 100644 --- a/htdocs/fourn/fiche.php +++ b/htdocs/fourn/fiche.php @@ -3,7 +3,7 @@ * Copyright (C) 2003 Eric Seigne * Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2005-2010 Regis Houssin - * Copyright (C) 2010 Juanjo Menent + * Copyright (C) 2010-2013 Juanjo Menent * * 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 @@ -153,6 +153,7 @@ if ($object->fetch($id)) print ''; // Local Taxes + //TODO: Place into a function to control showing by country or study better option if($mysoc->country_code=='ES') { if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") @@ -176,6 +177,14 @@ if ($object->fetch($id)) print yn($object->localtax2_assuj); print ''; } + + if ($mysoc->localtax2_assuj!="1") + { + print ''.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).''; + print yn($object->localtax2_assuj); + print ''; + } + } // TVA Intra diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql index adc2cec906f..e4680985dec 100644 --- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql @@ -9,6 +9,7 @@ -- Copyright (C) 2012 Sebastian Neuwert -- Copyright (C) 2012 Tommaso Basilici -- Copyright (C) 2012 Ricardo Schluter +-- Copyright (C) 2013 Cedric GROSS -- -- 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 @@ -80,8 +81,9 @@ insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'53','Soci insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'54','Société à responsabilité limitée (SARL)'); insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'55','Société anonyme à conseil d administration'); insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'56','Société anonyme à directoire'); -insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'57','Société par actions simplifiée'); +insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'57','Société par actions simplifiée (SAS)'); insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'58','Entreprise Unipersonnelle à Responsabilité Limitée (EURL)'); +insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'59','Société par actions simplifiée unipersonnelle (SASU)'); insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'61','Caisse d''épargne et de prévoyance'); insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'62','Groupement d''intérêt économique (GIE)'); @@ -131,15 +133,15 @@ insert into llx_c_forme_juridique (fk_pays, code, libelle) values (5, '507', 'Lt insert into llx_c_forme_juridique (fk_pays, code, libelle) values (5, '508', 'OHG - Offene Handelsgesellschaft'); -- Greece -INSERT INTO `llx_c_forme_juridique` (code,fk_pays,libelle,isvatexempted,active) VALUES ('10201',102,'Ατομική επιχείρηση',0,1); -INSERT INTO `llx_c_forme_juridique` (code,fk_pays,libelle,isvatexempted,active) VALUES ('10202',102,'Εταιρική επιχείρηση',0,1); -INSERT INTO `llx_c_forme_juridique` (code,fk_pays,libelle,isvatexempted,active) VALUES ('10203',102,'Ομόρρυθμη Εταιρεία Ο.Ε',0,1); -INSERT INTO `llx_c_forme_juridique` (code,fk_pays,libelle,isvatexempted,active) VALUES ('10204',102,'Ετερόρρυθμη Εταιρεία Ε.Ε',0,1); -INSERT INTO `llx_c_forme_juridique` (code,fk_pays,libelle,isvatexempted,active) VALUES ('10205',102,'Εταιρεία Περιορισμένης Ευθύνης Ε.Π.Ε',0,1); -INSERT INTO `llx_c_forme_juridique` (code,fk_pays,libelle,isvatexempted,active) VALUES ('10206',102,'Ανώνυμη Εταιρεία Α.Ε',0,1); -INSERT INTO `llx_c_forme_juridique` (code,fk_pays,libelle,isvatexempted,active) VALUES ('10207',102,'Ανώνυμη ναυτιλιακή εταιρεία Α.Ν.Ε',0,1); -INSERT INTO `llx_c_forme_juridique` (code,fk_pays,libelle,isvatexempted,active) VALUES ('10208',102,'Συνεταιρισμός',0,1); -INSERT INTO `llx_c_forme_juridique` (code,fk_pays,libelle,isvatexempted,active) VALUES ('10209',102,'Συμπλοιοκτησία',0,1); +INSERT INTO llx_c_forme_juridique (code,fk_pays,libelle,isvatexempted,active) VALUES ('10201',102,'Ατομική επιχείρηση',0,1); +INSERT INTO llx_c_forme_juridique (code,fk_pays,libelle,isvatexempted,active) VALUES ('10202',102,'Εταιρική επιχείρηση',0,1); +INSERT INTO llx_c_forme_juridique (code,fk_pays,libelle,isvatexempted,active) VALUES ('10203',102,'Ομόρρυθμη Εταιρεία Ο.Ε',0,1); +INSERT INTO llx_c_forme_juridique (code,fk_pays,libelle,isvatexempted,active) VALUES ('10204',102,'Ετερόρρυθμη Εταιρεία Ε.Ε',0,1); +INSERT INTO llx_c_forme_juridique (code,fk_pays,libelle,isvatexempted,active) VALUES ('10205',102,'Εταιρεία Περιορισμένης Ευθύνης Ε.Π.Ε',0,1); +INSERT INTO llx_c_forme_juridique (code,fk_pays,libelle,isvatexempted,active) VALUES ('10206',102,'Ανώνυμη Εταιρεία Α.Ε',0,1); +INSERT INTO llx_c_forme_juridique (code,fk_pays,libelle,isvatexempted,active) VALUES ('10207',102,'Ανώνυμη ναυτιλιακή εταιρεία Α.Ν.Ε',0,1); +INSERT INTO llx_c_forme_juridique (code,fk_pays,libelle,isvatexempted,active) VALUES ('10208',102,'Συνεταιρισμός',0,1); +INSERT INTO llx_c_forme_juridique (code,fk_pays,libelle,isvatexempted,active) VALUES ('10209',102,'Συμπλοιοκτησία',0,1); -- Italy INSERT INTO llx_c_forme_juridique (code,fk_pays,libelle,isvatexempted,active) VALUES ('301',3,'Società semplice',0,1); diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index 7a8dbe38f72..c38ccd07d68 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -84,7 +84,8 @@ AccountNumberShort=Account number AccountNumber=Account number NewAccount=New account SalesTurnover=Sales turnover -ByThirdParties=Bu third parties +SalesTurnoverMinimum=Minimum sales turnover +ByThirdParties=By third parties ByUserAuthorOfInvoice=By invoice author AccountancyExport=Accountancy export ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang index 77127fa1a8b..fedfabfbc2c 100644 --- a/htdocs/langs/es_ES/companies.lang +++ b/htdocs/langs/es_ES/companies.lang @@ -153,9 +153,9 @@ ProfId4DE=- ProfId5DE=- ProfId6DE=- ProfId1ES=CIF/NIF -ProfId2ES=Núm seguridad social +ProfId2ES=Núm. seguridad social ProfId3ES=CNAE -ProfId4ES=Núm colegiado +ProfId4ES=Núm. colegiado ProfId5ES=- ProfId6ES=- ProfId1FR=SIREN diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang index a2138f91855..2f72861a920 100644 --- a/htdocs/langs/es_ES/compta.lang +++ b/htdocs/langs/es_ES/compta.lang @@ -85,6 +85,7 @@ AccountNumberShort=Nº de cuenta AccountNumber=Número de cuenta NewAccount=Nueva cuenta SalesTurnover=Volumen de ventas +SalesTurnoverMinimum=Volumen de ventas mínimo ByThirdParties=Por tercero ByUserAuthorOfInvoice=Por autor de la factura AccountancyExport=Exportación contabilidad diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 97cd37205e1..02b93219a8e 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -5,7 +5,7 @@ * Copyright (C) 2005 Eric Seigne * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2008 Patrick Raguin - * Copyright (C) 2010-2012 Juanjo Menent + * Copyright (C) 2010-2013 Juanjo Menent * * 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 @@ -931,7 +931,8 @@ else // Capital print ''.$langs->trans('Capital').' '.$langs->trans("Currency".$conf->currency).''; - // Local Taxes + // Local Taxes + //TODO: Place into a function to control showing by country or study better option if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") { print ''.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).''; @@ -953,7 +954,13 @@ else print $form->selectyesno('localtax2assuj_value',0,1); print ''; } - + + if ($mysoc->country_code=='ES' && $mysoc->localtax2_assuj!="1" && ! empty($conf->fournisseur->enabled) && (GETPOST("type")=='f' || GETPOST("type")=='') ) + { + print ''.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).''; + print $form->selectyesno('localtax2assuj_value',0,1); + print ''; + } if (! empty($conf->global->MAIN_MULTILANGS)) { print ''.$langs->trans("DefaultLang").''."\n"; @@ -1349,6 +1356,7 @@ else print ''; // Local Taxes + //TODO: Place into a function to control showing by country or study better option if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") { print ''.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).''; @@ -1371,6 +1379,13 @@ else print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1); print ''; } + + if ($mysoc->country_code=='ES' && $mysoc->localtax2_assuj!="1" && ! empty($conf->fournisseur->enabled) && $object->fournisseur==1) + { + print ''.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).''; + print $form->selectyesno('localtax2assuj_value',0,1); + print ''; + } // Type - Size print ''.$langs->trans("ThirdPartyType").''; @@ -1665,6 +1680,7 @@ else print ''; // Local Taxes + //TODO: Place into a function to control showing by country or study better option if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") { print ''.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).''; @@ -1686,6 +1702,13 @@ else print yn($object->localtax2_assuj); print ''; } + + if ($mysoc->country_code=='ES' && $mysoc->localtax2_assuj!="1" && ! empty($conf->fournisseur->enabled) && $object->fournisseur==1) + { + print ''.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).''; + print yn($object->localtax2_assuj); + print ''; + } // Type + Staff $arr = $formcompany->typent_array(1);