';
- // 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
@@ -2107,4 +2114,4 @@ else
// End of page
llxFooter();
$db->close();
-?>
\ No newline at end of file
+?>
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 '
';
+ }
+
}
// TVA Intra
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 '
';
+ }
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 '
';
// 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 '