diff --git a/html/.cvsignore b/html/.cvsignore
deleted file mode 100755
index 0d3c38dd8..000000000
--- a/html/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.log
-ajax
diff --git a/include/XMLDocument/XMLInvoice.php b/include/XMLDocument/XMLInvoice.php
index 9eea0cc27..f5f66912e 100644
--- a/include/XMLDocument/XMLInvoice.php
+++ b/include/XMLDocument/XMLInvoice.php
@@ -209,8 +209,8 @@ abstract class XMLInvoice extends \DOMDocument
}
$result['operation'][$i]['vat_id']=$operation->det->array[$i]['qs_vat_code'];
// // tva code for PEPPOL
-// $x=$this->cn->get_value("select tva_peppol_code from tva_rate where tva_id=$1"
-// ,[ $result['operation'][$i]['vat_id']]);
+ $x=$this->cn->get_value("select tva_peppol_code from tva_rate where tva_id=$1"
+ ,[ $result['operation'][$i]['vat_id']]);
$result['operation'][$i]['vat_code']=($x=="")?"S":$x;
$result['operation'][$i]['vat_reversed']=$operation->det->array[$i]['qs_vat_sided'];
diff --git a/include/class/tva_rate_mtable.class.php b/include/class/tva_rate_mtable.class.php
index c722c27a5..e58e9e54b 100644
--- a/include/class/tva_rate_mtable.class.php
+++ b/include/class/tva_rate_mtable.class.php
@@ -191,13 +191,13 @@ class Tva_Rate_MTable extends Manage_Table_SQL
$text->selected=$value;
$text->transform(array(
null=>_('-')
- ,"S"=>_('Taux standard')
- ,'AE'=>_('Autoliquidate mais pas INTRACOMM.')
- ,'Z'=>_("TVA à 0%")
- ,'K'=>_('Autoliquidation INTRACOMM.')
- ,'G'=>_('TVA exempt pour export hors Europe')
- ,'O'=>_('TVA Hors périmètre application')
- ,'E'=>_('Exempté de TVA')
+ ,"S"=>_('S Taux standard')
+ ,'AE'=>_('AE Autoliquidate mais pas INTRACOMM.')
+ ,'Z'=>_("Z TVA à 0%")
+ ,'K'=>_('K Autoliquidation INTRACOMM.')
+ ,'G'=>_('G TVA exempt pour export hors Europe')
+ ,'O'=>_('O TVA Hors périmètre application')
+ ,'E'=>_('E Exempté de TVA')
));
echo $text->input();
}elseif ($key == "tva_id") {
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index 26b9339b1..aa59e4450 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -234,7 +234,7 @@ insert into parameter_extra(pe_code,pe_label) values ('COMPANY_LEGAL_ENTITY','Fo
insert into parameter_extra(pe_code,pe_label) values ('COMPANY_BANK_IBAN','Compte en banque (IBAN)') on conflict do nothing;
insert into parameter_extra(pe_code,pe_label) values ('COMPANY_BANK_BIC','BIC Bank Identification Code') on conflict do nothing;
insert into parameter_extra(pe_code,pe_label) values ('COMPANY_UBL_ID','ID PEPPOL') on conflict do nothing;
-insert into parameter_extra(pe_code,pe_label) values ('SIRENE','n° SIRENE') on conflict do nothing;
+insert into parameter_extra(pe_code,pe_label) values ('SIREN','n° SIREN') on conflict do nothing;
insert into parameter_extra(pe_code,pe_label) values ('SIRET','n° SIRET') on conflict do nothing;