Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cgscop_riga_import
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Le Filament
Confédération Générale des SCOP
cgscop_riga_import
Commits
9ab7cc3e
Commit
9ab7cc3e
authored
4 years ago
by
Benjamin - Le Filament
Browse files
Options
Downloads
Patches
Plain Diff
[fix] error filename on resync
parent
e4a6e299
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
models/riga_odoo_import.py
+8
-10
8 additions, 10 deletions
models/riga_odoo_import.py
views/riga_odoo_import.xml
+2
-2
2 additions, 2 deletions
views/riga_odoo_import.xml
with
10 additions
and
12 deletions
models/riga_odoo_import.py
+
8
−
10
View file @
9ab7cc3e
...
@@ -72,7 +72,7 @@ class CgscopRigaOdooImport(models.Model):
...
@@ -72,7 +72,7 @@ class CgscopRigaOdooImport(models.Model):
raise
exceptions
.
Warning
(
e
)
raise
exceptions
.
Warning
(
e
)
def
_read_file
(
self
,
model
,
file
,
table
,
primary_key
,
header_key
,
def
_read_file
(
self
,
model
,
file
,
table
,
primary_key
,
header_key
,
resync
=
False
,
log_id
=
None
):
filename
,
resync
=
False
,
log_id
=
None
):
"""
"""
Cette fonction prend en paramètre un fichier CSV et lit
Cette fonction prend en paramètre un fichier CSV et lit
chaque ligne pour mettre à jour la ligne de la table correspondante
chaque ligne pour mettre à jour la ligne de la table correspondante
...
@@ -85,6 +85,7 @@ class CgscopRigaOdooImport(models.Model):
...
@@ -85,6 +85,7 @@ class CgscopRigaOdooImport(models.Model):
:param primary_key (string): header du fichier CSV correspondant à la clé
:param primary_key (string): header du fichier CSV correspondant à la clé
:param parent_id (string): header du fichier CSV pour lequel on va
:param parent_id (string): header du fichier CSV pour lequel on va
rechercher l
'
ID RIGA de l
'
organisme
rechercher l
'
ID RIGA de l
'
organisme
:param filename (string): nom du fichier
:param resync (bool): le fichier a été synchronisé manuellement
:param resync (bool): le fichier a été synchronisé manuellement
:param log_id (obj): ojjet à mettre à jour si pas de création
:param log_id (obj): ojjet à mettre à jour si pas de création
"""
"""
...
@@ -134,17 +135,12 @@ class CgscopRigaOdooImport(models.Model):
...
@@ -134,17 +135,12 @@ class CgscopRigaOdooImport(models.Model):
row
[
primary_key
]
+
"
avec l
'
id riga
"
+
row
[
primary_key
]
+
"
avec l
'
id riga
"
+
row
[
header_key
]
+
"
\n
"
)
row
[
header_key
]
+
"
\n
"
)
data
=
self
.
env
[
'
riga.files.matching
'
].
sudo
().
search
([
[
'
model_id
'
,
'
=
'
,
model
.
id
]])
date_value
=
fields
.
Datetime
.
now
()
+
datetime
.
timedelta
(
days
=
data
.
day
)
# Création du log
# Création du log
vals
=
{
vals
=
{
'
model_id
'
:
model
.
id
,
'
model_id
'
:
model
.
id
,
'
is_sync
'
:
True
,
'
is_sync
'
:
True
,
'
filename
'
:
(
data
.
riga_filename
+
'
filename
'
:
filename
,
date_value
.
strftime
(
data
.
suffix
)
+
'
.
'
+
'
log
'
:
(
"
Import du fichier
"
+
filename
+
data
.
riga_extension
),
'
log
'
:
(
"
Import du fichier
"
+
data
.
riga_filename
+
date_value
.
strftime
(
data
.
suffix
)
+
'
.
'
+
date_value
.
strftime
(
data
.
suffix
)
+
'
.
'
+
data
.
riga_extension
+
"
:
\n
"
+
data
.
riga_extension
+
"
:
\n
"
+
"
- Création de
"
+
str
(
crea_nb
)
+
"
lignes
\n
"
+
"
- Création de
"
+
str
(
crea_nb
)
+
"
lignes
\n
"
+
...
@@ -250,7 +246,8 @@ class CgscopRigaOdooImport(models.Model):
...
@@ -250,7 +246,8 @@ class CgscopRigaOdooImport(models.Model):
file
=
self
.
_get_ftp_file
(
filename
,
model
.
ftp_channel_id
),
file
=
self
.
_get_ftp_file
(
filename
,
model
.
ftp_channel_id
),
table
=
table
,
table
=
table
,
primary_key
=
model
.
primary_key
,
primary_key
=
model
.
primary_key
,
header_key
=
model
.
header_key
)
header_key
=
model
.
header_key
,
filename
=
filename
)
def
resync_file
(
self
):
def
resync_file
(
self
):
"""
"""
...
@@ -269,4 +266,5 @@ class CgscopRigaOdooImport(models.Model):
...
@@ -269,4 +266,5 @@ class CgscopRigaOdooImport(models.Model):
primary_key
=
model
.
primary_key
,
primary_key
=
model
.
primary_key
,
header_key
=
model
.
header_key
,
header_key
=
model
.
header_key
,
resync
=
True
,
resync
=
True
,
log_id
=
self
)
log_id
=
self
,
filename
=
self
.
filename
)
This diff is collapsed.
Click to expand it.
views/riga_odoo_import.xml
+
2
−
2
View file @
9ab7cc3e
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
<group>
<group>
<field
name=
"create_date"
readonly=
"1"
/>
<field
name=
"create_date"
readonly=
"1"
/>
<field
name=
"model_id"
readonly=
"1"
/>
<field
name=
"model_id"
readonly=
"1"
/>
<field
name=
"filename"
readonly=
"1"
/>
<field
name=
"filename"
/>
</group>
</group>
<group>
<group>
<field
name=
"is_sync"
/>
<field
name=
"is_sync"
/>
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
</group>
</group>
</group>
</group>
<group>
<group>
<field
name=
"log"
readonly=
"1"
/>
<field
name=
"log"
/>
</group>
</group>
</sheet>
</sheet>
</form>
</form>
...
...
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