diff --git a/htdocs/includes/modules/modAdherent.class.php b/htdocs/includes/modules/modAdherent.class.php index 6649f071d72..f2506e8de74 100644 --- a/htdocs/includes/modules/modAdherent.class.php +++ b/htdocs/includes/modules/modAdherent.class.php @@ -192,7 +192,7 @@ class modAdherent extends DolibarrModules $r++; $this->export_code[$r]=$this->rights_class.'_'.$r; - $this->export_label[$r]='Adherents et adhesions'; + $this->export_label[$r]='MembersAndSubscriptions'; $this->export_permission[$r]=array(array("adherent","export")); $this->export_fields_array[$r]=array('a.rowid'=>'Id','a.nom'=>"Lastname",'a.prenom'=>"Firstname",'a.login'=>"Login",'a.morphy'=>'MorPhy','a.adresse'=>"Address",'a.cp'=>"Zip",'a.ville'=>"Town",'a.pays'=>"Country",'a.phone'=>"PhonePro",'a.phone_perso'=>"PhonePerso",'a.phone_mobile'=>"PhoneMobile",'a.email'=>"Email",'a.naiss'=>"Birthday",'a.statut'=>"Status",'a.photo'=>"Photo",'a.note'=>"Note",'a.datec'=>'DateCreation','a.datevalid'=>'DateValidation','a.tms'=>'DateLastModification','a.datefin'=>'DateEndSubscription','ta.rowid'=>'MemberTypeId','ta.libelle'=>'MemberTypeLabel','c.dateadh'=>'DateSubscription','c.cotisation'=>'Amount'); $this->export_entities_array[$r]=array('a.rowid'=>'member','a.nom'=>"member",'a.prenom'=>"member",'a.login'=>"member",'a.morphy'=>'member','a.adresse'=>"member",'a.cp'=>"member",'a.ville'=>"member",'a.pays'=>"member",'a.phone'=>"member",'a.phone_perso'=>"member",'a.phone_mobile'=>"member",'a.email'=>"member",'a.naiss'=>"member",'a.statut'=>"member",'a.photo'=>"member",'a.note'=>"member",'a.datec'=>'member','a.datevalid'=>'member','a.tms'=>'member','a.datefin'=>'member','ta.rowid'=>'member_type','ta.libelle'=>'member_type','c.dateadh'=>'subscription','c.cotisation'=>'subscription'); diff --git a/htdocs/includes/modules/modCategorie.class.php b/htdocs/includes/modules/modCategorie.class.php index 5e83c7308e9..2c23100dc0e 100644 --- a/htdocs/includes/modules/modCategorie.class.php +++ b/htdocs/includes/modules/modCategorie.class.php @@ -114,7 +114,7 @@ class modCategorie extends DolibarrModules $r++; $this->export_code[$r]='category_'.$r; - $this->export_label[$r]='List of supplier categories'; + $this->export_label[$r]='CatSupList'; $this->export_permission[$r]=array(array("categorie","lire")); $this->export_fields_array[$r]=array('u.rowid'=>"CategId",'u.label'=>"Label",'u.description'=>"Description",'s.rowid'=>'CompanyId','s.nom'=>'Name','s.prefix_comm'=>"Prefix",'s.client'=>"Customer",'s.datec'=>"DateCreation",'s.tms'=>"DateLastModification",'s.code_client'=>"CustomerCode",'s.address'=>"Address",'s.cp'=>"Zip",'s.ville'=>"Town",'p.libelle'=>"Country",'p.code'=>"CountryCode",'s.tel'=>"Phone",'s.fax'=>"Fax",'s.url'=>"Url",'s.email'=>"Email",'s.siret'=>"IdProf1",'s.siren'=>"IdProf2",'s.ape'=>"IdProf3",'s.idprof4'=>"IdProf4",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",'s.note'=>"Note"); $this->export_entities_array[$r]=array('u.rowid'=>"category",'u.label'=>"category",'u.description'=>"category",'s.rowid'=>'company','s.nom'=>'company','s.prefix_comm'=>"company",'s.client'=>"company",'s.datec'=>"company",'s.tms'=>"company",'s.code_client'=>"company",'s.address'=>"company",'s.cp'=>"company",'s.ville'=>"company",'p.libelle'=>"company",'p.code'=>"company",'s.tel'=>"company",'s.fax'=>"company",'s.url'=>"company",'s.email'=>"company",'s.siret'=>"company",'s.siren'=>"company",'s.ape'=>"company",'s.idprof4'=>"company",'s.tva_intra'=>"company",'s.capital'=>"company",'s.note'=>"company"); @@ -126,7 +126,7 @@ class modCategorie extends DolibarrModules $r++; $this->export_code[$r]='category_'.$r; - $this->export_label[$r]='List of customer/prospect categories'; + $this->export_label[$r]='CatCusList'; $this->export_permission[$r]=array(array("categorie","lire")); $this->export_fields_array[$r]=array('u.rowid'=>"CategId",'u.label'=>"Label",'u.description'=>"Description",'s.rowid'=>'CompanyId','s.nom'=>'Name','s.prefix_comm'=>"Prefix",'s.client'=>"Customer",'s.datec'=>"DateCreation",'s.tms'=>"DateLastModification",'s.code_client'=>"CustomerCode",'s.address'=>"Address",'s.cp'=>"Zip",'s.ville'=>"Town",'p.libelle'=>"Country",'p.code'=>"CountryCode",'s.tel'=>"Phone",'s.fax'=>"Fax",'s.url'=>"Url",'s.email'=>"Email",'s.siret'=>"IdProf1",'s.siren'=>"IdProf2",'s.ape'=>"IdProf3",'s.idprof4'=>"IdProf4",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",'s.note'=>"Note",'s.fk_prospectlevel'=>'ProspectLevel','fk_stcomm'=>'ProspectStatus'); $this->export_entities_array[$r]=array('u.rowid'=>"category",'u.label'=>"category",'u.description'=>"category",'s.rowid'=>'company','s.nom'=>'company','s.prefix_comm'=>"company",'s.client'=>"company",'s.datec'=>"company",'s.tms'=>"company",'s.code_client'=>"company",'s.address'=>"company",'s.cp'=>"company",'s.ville'=>"company",'p.libelle'=>"company",'p.code'=>"company",'s.tel'=>"company",'s.fax'=>"company",'s.url'=>"company",'s.email'=>"company",'s.siret'=>"company",'s.siren'=>"company",'s.ape'=>"company",'s.idprof4'=>"company",'s.tva_intra'=>"company",'s.capital'=>"company",'s.note'=>"company",'s.fk_prospectlevel'=>'company','fk_stcomm'=>'company'); @@ -138,7 +138,7 @@ class modCategorie extends DolibarrModules $r++; $this->export_code[$r]='category_'.$r; - $this->export_label[$r]='List of products categories'; + $this->export_label[$r]='CatProdList'; $this->export_permission[$r]=array(array("categorie","lire")); $this->export_fields_array[$r]=array('u.rowid'=>"CategId",'u.label'=>"Label",'u.description'=>"Description",'p.rowid'=>'ProductId','p.ref'=>'Ref'); $this->export_entities_array[$r]=array('u.rowid'=>"category",'u.label'=>"category",'u.description'=>"category",'p.rowid'=>'product','p.ref'=>'product'); diff --git a/htdocs/includes/modules/modDeplacement.class.php b/htdocs/includes/modules/modDeplacement.class.php index 38454e83be3..d0c2f1f248e 100644 --- a/htdocs/includes/modules/modDeplacement.class.php +++ b/htdocs/includes/modules/modDeplacement.class.php @@ -110,7 +110,7 @@ class modDeplacement extends DolibarrModules $r++; $this->export_code[$r]='trips_'.$r; - $this->export_label[$r]='List of trips and expenses'; + $this->export_label[$r]='ListTripsAndExpenses'; $this->export_permission[$r]=array(array("deplacement","export")); $this->export_fields_array[$r]=array('d.rowid'=>"TripId",'d.type'=>"Type",'d.km'=>"FeesKilometersOrAmout",'d.note'=>'Note','s.nom'=>'ThirdParty'); $this->export_entities_array[$r]=array('d.rowid'=>"Trip",'d.type'=>"Trip",'d.km'=>"Trip",'d.note'=>'Trip','s.nom'=>'company'); diff --git a/htdocs/langs/ca_ES/categories.lang b/htdocs/langs/ca_ES/categories.lang index 1eaf60108a5..405df9c7da4 100644 --- a/htdocs/langs/ca_ES/categories.lang +++ b/htdocs/langs/ca_ES/categories.lang @@ -81,3 +81,6 @@ AssignedToTheCustomer = Assignat a un client InternalCategory = Categoria interna CategoryContents = Contingut de la categoria CategId = Id categoria +CatSupList=Llista de categories proveïdors +CatCusList=Llista de categories clients/potencials +CatProdList=Llista de categories productes diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang index d134c3bfd56..3b33139bcc2 100644 --- a/htdocs/langs/ca_ES/members.lang +++ b/htdocs/langs/ca_ES/members.lang @@ -136,3 +136,4 @@ ShowTypeCard = Veure tipus '%s' HTPasswordExport = Generació fitxer htpassword NoThirdPartyAssociatedToMember = Cap tercer associat a aquest membre ThirdPartyDolibarr = Tercers Dolibarr +MembersAndSubscriptions = Membres y afiliacions diff --git a/htdocs/langs/ca_ES/trips.lang b/htdocs/langs/ca_ES/trips.lang index 4415e9481c5..a7a952a840d 100644 --- a/htdocs/langs/ca_ES/trips.lang +++ b/htdocs/langs/ca_ES/trips.lang @@ -17,3 +17,4 @@ ConfirmDeleteTrip=Esteu segur de voler eliminar aquest desplaçament? TF_OTHER=Altre TF_LUNCH=Dieta TF_TRIP=Viatge +ListTripsAndExpenses=Llista de desplaçaments i despeses diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang index e75e4c0a842..ae338db7e84 100644 --- a/htdocs/langs/en_US/categories.lang +++ b/htdocs/langs/en_US/categories.lang @@ -80,4 +80,7 @@ AssignedToCustomer=Assigned to a customer AssignedToTheCustomer=Assigned to the customer InternalCategory=Inernal category CategoryContents=Category contents -CategId=Category id \ No newline at end of file +CategId=Category id +CatSupList=List of supplier categories +CatCusList=List of customer/prospect categories +CatProdList=List of products categories \ No newline at end of file diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang index 610c03fd42b..30b67fd567e 100644 --- a/htdocs/langs/en_US/members.lang +++ b/htdocs/langs/en_US/members.lang @@ -136,4 +136,5 @@ DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards ShowTypeCard=Show type '%s' HTPasswordExport=htpassword file generation NoThirdPartyAssociatedToMember=No third party associated to this member -ThirdPartyDolibarr=Dolibarr third party \ No newline at end of file +ThirdPartyDolibarr=Dolibarr third party +MembersAndSubscriptions = Members and Suscriptions diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang index 1351e7e3ab5..c6d288327aa 100644 --- a/htdocs/langs/en_US/trips.lang +++ b/htdocs/langs/en_US/trips.lang @@ -15,4 +15,5 @@ DeleteTrip=Delete trip ConfirmDeleteTrip=Are you sure you want to delete this trip ? TF_OTHER=Other TF_LUNCH=Lunch -TF_TRIP=Trip \ No newline at end of file +TF_TRIP=Trip +ListTripsAndExpenses=List of trips and expenses \ No newline at end of file diff --git a/htdocs/langs/es_ES/categories.lang b/htdocs/langs/es_ES/categories.lang index a4a6e98f920..3b729b20c64 100644 --- a/htdocs/langs/es_ES/categories.lang +++ b/htdocs/langs/es_ES/categories.lang @@ -81,3 +81,6 @@ AssignedToTheCustomer = Asigado a un cliente InternalCategory = Categoría interna CategoryContents = Contenido de la categoría CategId = Id categoría +CatSupList=Lista de categorías proveedores +CatCusList=Lista de categorías clientes/potenciales +CatProdList=Lista de categorías productos diff --git a/htdocs/langs/es_ES/members.lang b/htdocs/langs/es_ES/members.lang index 7d28c7b45ad..7864998dca5 100644 --- a/htdocs/langs/es_ES/members.lang +++ b/htdocs/langs/es_ES/members.lang @@ -136,3 +136,4 @@ ShowTypeCard = Ver tipo '%s' HTPasswordExport = Generación archivo htpassword NoThirdPartyAssociatedToMember = Ningún tercero asociado a este miembro ThirdPartyDolibarr = Terceros Dolibarr +MembersAndSubscriptions = Miembros y afiliaciones diff --git a/htdocs/langs/es_ES/trips.lang b/htdocs/langs/es_ES/trips.lang index 17b0b9d2a32..2965a570b60 100644 --- a/htdocs/langs/es_ES/trips.lang +++ b/htdocs/langs/es_ES/trips.lang @@ -17,3 +17,4 @@ ConfirmDeleteTrip=¿Está seguro de querer eliminar este desplazamiento? TF_OTHER=Otro TF_LUNCH=Dieta TF_TRIP=Viaje +ListTripsAndExpenses=Lista de desplazamientos y gastos diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang index f4ea5033283..e0248448248 100644 --- a/htdocs/langs/fr_FR/categories.lang +++ b/htdocs/langs/fr_FR/categories.lang @@ -80,4 +80,7 @@ AssignedToCustomer=Attribuer à un client AssignedToTheCustomer=Attribué au client InternalCategory=Catégorie interne CategoryContents=Contenu de la catégorie -CategId=Id categorie \ No newline at end of file +CategId=Id categorie +CatSupList=Liste des catégories fournisseurs +CatCusList=Liste des catégories clients/prospets +CatProdList=Liste des catégories produits diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang index 4cca02c19d8..b0a29ba77ab 100644 --- a/htdocs/langs/fr_FR/members.lang +++ b/htdocs/langs/fr_FR/members.lang @@ -136,4 +136,5 @@ DescADHERENT_CARD_FOOTER_TEXT=Texte imprimé sur le bas des cartes adhérents ShowTypeCard=Voir type '%s' HTPasswordExport=Generation fichier htpassword NoThirdPartyAssociatedToMember=Pas de tiers associé à cet adhérent -ThirdPartyDolibarr=Tiers Dolibarr \ No newline at end of file +ThirdPartyDolibarr=Tiers Dolibarr +MembersAndSubscriptions = Adhérents et Adhésions \ No newline at end of file diff --git a/htdocs/langs/fr_FR/trips.lang b/htdocs/langs/fr_FR/trips.lang index a2882ac11b4..8a3bb42db6d 100644 --- a/htdocs/langs/fr_FR/trips.lang +++ b/htdocs/langs/fr_FR/trips.lang @@ -16,4 +16,5 @@ DeleteTrip=Supprimer déplacement ConfirmDeleteTrip=Êtes vous sur de vouloir supprimer ce déplacement/note de frais ? TF_OTHER=Autre TF_LUNCH=Repas -TF_TRIP=Déplacement \ No newline at end of file +TF_TRIP=Déplacement +ListTripsAndExpenses=Liste des déplacements et frais