Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
fb0a558f
Commit
fb0a558f
authored
15 years ago
by
Regis Houssin
Browse files
Options
Downloads
Patches
Plain Diff
Fix: add state in export
parent
329c9307
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
htdocs/includes/modules/modSociete.class.php
+4
-3
4 additions, 3 deletions
htdocs/includes/modules/modSociete.class.php
with
4 additions
and
3 deletions
htdocs/includes/modules/modSociete.class.php
+
4
−
3
View file @
fb0a558f
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2005-200
9
Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2005-20
1
0 Regis Houssin <regis@dolibarr.fr>
*
*
* This program is free software; you can redistribute it and/or modify
* 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
* it under the terms of the GNU General Public License as published by
...
@@ -195,9 +195,9 @@ class modSociete extends DolibarrModules
...
@@ -195,9 +195,9 @@ class modSociete extends DolibarrModules
$this
->
export_label
[
$r
]
=
'ExportDataset_company_1'
;
$this
->
export_label
[
$r
]
=
'ExportDataset_company_1'
;
$this
->
export_icon
[
$r
]
=
'company'
;
$this
->
export_icon
[
$r
]
=
'company'
;
$this
->
export_permission
[
$r
]
=
array
(
array
(
"societe"
,
"export"
));
$this
->
export_permission
[
$r
]
=
array
(
array
(
"societe"
,
"export"
));
$this
->
export_fields_array
[
$r
]
=
array
(
's.rowid'
=>
"Id"
,
's.nom'
=>
"Name"
,
's.prefix_comm'
=>
"Prefix"
,
's.client'
=>
"Customer"
,
's.fournisseur'
=>
"Supplier"
,
's.datec'
=>
"DateCreation"
,
's.tms'
=>
"DateLastModification"
,
's.code_client'
=>
"CustomerCode"
,
's.code_fournisseur'
=>
"SupplierCode"
,
'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"
,
't.libelle'
=>
"ThirdPartyType"
,
'ce.code'
=>
"Effectif"
,
"cfj.libelle"
=>
"JuridicalStatus"
,
's.fk_prospectlevel'
=>
'ProspectLevel'
,
'fk_stcomm'
=>
'ProspectStatus'
);
$this
->
export_fields_array
[
$r
]
=
array
(
's.rowid'
=>
"Id"
,
's.nom'
=>
"Name"
,
's.prefix_comm'
=>
"Prefix"
,
's.client'
=>
"Customer"
,
's.fournisseur'
=>
"Supplier"
,
's.datec'
=>
"DateCreation"
,
's.tms'
=>
"DateLastModification"
,
's.code_client'
=>
"CustomerCode"
,
's.code_fournisseur'
=>
"SupplierCode"
,
'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"
,
't.libelle'
=>
"ThirdPartyType"
,
'ce.code'
=>
"Effectif"
,
"cfj.libelle"
=>
"JuridicalStatus"
,
's.fk_prospectlevel'
=>
'ProspectLevel'
,
'
s.
fk_stcomm'
=>
'ProspectStatus'
,
'd.nom'
=>
'State'
);
$this
->
export_entities_array
[
$r
]
=
array
();
// We define here only fields that use another picto
$this
->
export_entities_array
[
$r
]
=
array
();
// We define here only fields that use another picto
$this
->
export_alias_array
[
$r
]
=
array
(
's.rowid'
=>
"socid"
,
's.nom'
=>
"name"
,
's.prefix_comm'
=>
"prefix"
,
's.client'
=>
"iscustomer"
,
's.fournisseur'
=>
"issupplier"
,
's.datec'
=>
"datecreation"
,
's.tms'
=>
"datelastmodification"
,
's.code_client'
=>
"customercode"
,
's.code_fournisseur'
=>
"suppliercode"
,
'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'
=>
"vatintra"
,
's.capital'
=>
"capital"
,
's.note'
=>
"note"
,
't.libelle'
=>
"thirdpartytype"
,
'ce.code'
=>
"effectif"
,
"cfj.libelle"
=>
"juridicalstatus"
,
's.fk_prospectlevel'
=>
'prospectlevel'
,
'fk_stcomm'
=>
'prospectstatus'
);
$this
->
export_alias_array
[
$r
]
=
array
(
's.rowid'
=>
"socid"
,
's.nom'
=>
"name"
,
's.prefix_comm'
=>
"prefix"
,
's.client'
=>
"iscustomer"
,
's.fournisseur'
=>
"issupplier"
,
's.datec'
=>
"datecreation"
,
's.tms'
=>
"datelastmodification"
,
's.code_client'
=>
"customercode"
,
's.code_fournisseur'
=>
"suppliercode"
,
'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'
=>
"vatintra"
,
's.capital'
=>
"capital"
,
's.note'
=>
"note"
,
't.libelle'
=>
"thirdpartytype"
,
'ce.code'
=>
"effectif"
,
"cfj.libelle"
=>
"juridicalstatus"
,
's.fk_prospectlevel'
=>
'prospectlevel'
,
'
s.
fk_stcomm'
=>
'prospectstatus'
,
'd.nom'
=>
'state'
);
$this
->
export_sql_start
[
$r
]
=
'SELECT DISTINCT '
;
$this
->
export_sql_start
[
$r
]
=
'SELECT DISTINCT '
;
$this
->
export_sql_end
[
$r
]
=
' FROM '
.
MAIN_DB_PREFIX
.
'societe as s'
;
$this
->
export_sql_end
[
$r
]
=
' FROM '
.
MAIN_DB_PREFIX
.
'societe as s'
;
...
@@ -205,6 +205,7 @@ class modSociete extends DolibarrModules
...
@@ -205,6 +205,7 @@ class modSociete extends DolibarrModules
$this
->
export_sql_end
[
$r
]
.
=
' LEFT JOIN '
.
MAIN_DB_PREFIX
.
'c_pays as p ON s.fk_pays = p.rowid'
;
$this
->
export_sql_end
[
$r
]
.
=
' LEFT JOIN '
.
MAIN_DB_PREFIX
.
'c_pays as p ON s.fk_pays = p.rowid'
;
$this
->
export_sql_end
[
$r
]
.
=
' LEFT JOIN '
.
MAIN_DB_PREFIX
.
'c_effectif as ce ON s.fk_effectif = ce.id'
;
$this
->
export_sql_end
[
$r
]
.
=
' LEFT JOIN '
.
MAIN_DB_PREFIX
.
'c_effectif as ce ON s.fk_effectif = ce.id'
;
$this
->
export_sql_end
[
$r
]
.
=
' LEFT JOIN '
.
MAIN_DB_PREFIX
.
'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code'
;
$this
->
export_sql_end
[
$r
]
.
=
' LEFT JOIN '
.
MAIN_DB_PREFIX
.
'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code'
;
$this
->
export_sql_end
[
$r
]
.
=
' LEFT JOIN '
.
MAIN_DB_PREFIX
.
'c_departements as d ON s.fk_departement = d.rowid'
;
$this
->
export_sql_end
[
$r
]
.
=
' WHERE s.entity = '
.
$conf
->
entity
;
$this
->
export_sql_end
[
$r
]
.
=
' WHERE s.entity = '
.
$conf
->
entity
;
// Export list of contacts and attributes
// Export list of contacts and attributes
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment