From 54c35ac9a9fcb9baf3147bc73e4a15cfda466198 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 14 Apr 2022 09:08:02 +0000 Subject: [PATCH 1/6] import contact --- models/partnerimport.py | 101 +++++----------------------------- report/report_donationtax.xml | 4 +- security/ir.model.access.csv | 1 - views/partner.xml | 17 +----- views/partnerimport.xml | 59 ++++---------------- 5 files changed, 27 insertions(+), 155 deletions(-) diff --git a/models/partnerimport.py b/models/partnerimport.py index 464eac8..8fc4025 100644 --- a/models/partnerimport.py +++ b/models/partnerimport.py @@ -12,94 +12,19 @@ class kalachakra_partnerdraft(models.Model): _description = 'import draft partner' external_id=fields.Char(string='external id') - source=fields.Char(String='source file',required=True) - name=fields.Char(string='name') - firstname=fields.Char(string='firstname') + name=fields.Char(string='nom') + firstname=fields.Char(string='prenom') title=fields.Char(string='civilité') - phone = fields.Char(string='phone') - mobile = fields.Char(string='mobile') - email = fields.Char(string='email') - complement_ident = fields.Char(string='N° appartment,floor') - complement_geo = fields.Char(string='entry,tower,bat') - street = fields.Char(string='street') - street2 = fields.Char(string='street2') - city = fields.Char(string='city') - zip = fields.Char(string='zip code') - country = fields.Char(string='country') - - statut=fields.Selection([('adherent', 'Adhérent'), ('bienfaiteur', 'Bienfaiteur'),('contact', 'Contact'), ('soutien','Soutien') ],'Statut') - date_contact_joomla=fields.Date(string='Date joomla de création du contact') - origine=fields.Selection([ - ('Boutique','Boutique'), - ('Visiteur','Visiteur'), - ('Vincennes','Vincennes'), - ('Bercy','Bercy'), - ('Salon Zen','Salon Zen'), - ('Autre','Autre'), - ('Internet Boutique','Internet Boutique'), - ('Conf M Ricard','Conf M Ricard'), - ('Visite lzr 09','Visite lzr 09'), - ('Retraite','Retraite'), - ('Amis','Amis'), - ('Centre FPMT','Centre FPMT'), - ('Site réservations','Site réservations'), - ('Réservations','Réservations'), - ('Voyage inde','Voyage inde'), - ('Internet','Internet'), - ('Librairie','Librairie'), - ('Site internet boutique','Site internet boutique'), - ('Portes ouvertes st cosme','Portes ouvertes st cosme'), - ('T','T'), - ('maitreya','maitreya'), - ('Zen','Zen'), - ('Lille','Lille'), - ('Alan wallace','Alan wallace'), - ('Salon Rouen','Salon Rouen'), - ('Stage','Stage'), - ('B.Actualit','B.Actualit'), - ('B. Actualit','B. Actualit'), - ('R','R'), - ('Institut vy','Institut vy'), - ('Initiation kalachakr','Initiation kalachakr'), - ('Yoga','Yoga'), - ('Samsara','Samsara'), - ('missun@gmail.com','missun@gmail.com'), - ('Reliques','Reliques'), - ('Journal m','Journal m'), - ('Nantes','Nantes'), - ('retraite vipassana','retraite vipassana'), - ('Presse bouddhiste','Presse bouddhiste'), - ('Réservtions','Réservtions'), - ('Réservation','Réservation'), - ('Site','Site'), - ('Question mail','Question mail'), - ('interreligieux','interreligieux'), - ('Refuge','Refuge'), - ('zoom','zoom')],'Origine', index=True) - - date_adhesion=fields.Date(string='Date adhesion') + street = fields.Char(string='adresse') + street2 = fields.Char(string='adresse2') + city = fields.Char(string='ville') + country = fields.Char(string='pays') + zip = fields.Char(string='code postal') + phone = fields.Char(string='tel') + email = fields.Char(string='Email') + statut_contact=fields.Char('Statut') + date_creation_contact=fields.Char(string='Date contact') + origine=fields.Char(string='Origine') + date_member=fields.Char(string='Date adhesion') doublon=fields.Boolean(string='Doublon') - def find_duplicated_partner(self): - - - - - - - #affichage des doublons - action = self.env.ref("kalachakra.kalachakra_partnerdraft_action").sudo().read([])[0] - action.update( - { - "domain": [("doublon", "=", True)], - - } - ) - - return action - -class kalachakra_doublonfield(models.Model): - _name = 'kalachakra.doublonfield' - _description = 'doublons fields' - - name=fields.Char('Doublon field name') \ No newline at end of file diff --git a/report/report_donationtax.xml b/report/report_donationtax.xml index 252c3f9..e0b31c9 100644 --- a/report/report_donationtax.xml +++ b/report/report_donationtax.xml @@ -10,9 +10,9 @@ - + - +
diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv index e8d821d..23fea00 100644 --- a/security/ir.model.access.csv +++ b/security/ir.model.access.csv @@ -1,3 +1,2 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_kalachakra_partnerdraft,kalachakra_partnerdraft,model_kalachakra_partnerdraft,donation.group_donation_manager,1,1,1,1 -access_kalachakra_doublonsfields,kalachakra_doublonsfields,model_kalachakra_doublonfield,donation.group_donation_manager,1,1,1,1 \ No newline at end of file diff --git a/views/partner.xml b/views/partner.xml index 085da3e..1518810 100644 --- a/views/partner.xml +++ b/views/partner.xml @@ -33,19 +33,6 @@ - - Doublons fields - kalachakra.doublonfield - tree,form - - - - - find_duplicated_partner - - code - action=model.find_duplicated_partner() - @@ -55,14 +42,14 @@ - + name="find duplicated partners" parent="kalachakra_partnerdraft_title_menu" sequence="3"/> --> diff --git a/views/partnerimport.xml b/views/partnerimport.xml index df4fcb6..aa2a088 100644 --- a/views/partnerimport.xml +++ b/views/partnerimport.xml @@ -1,70 +1,31 @@ - + _partner_draft list kalachakra.partnerdraft - - - - - - - + - + + + + + + + - - doublons fields list - kalachakra.doublonfield - - - - - - - - - kalachakra_partnerdraft_form - kalachakra.partnerdraft - -
-
- -
- - - - - - - - - - - - - - - - - - - -
- - + \ No newline at end of file From 917b527f98b109f6caa34a3271d76335dc6e32b6 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 14 Apr 2022 09:45:37 +0000 Subject: [PATCH 2/6] upload file --- models/partnerimport.py | 13 ++++++++++--- security/ir.model.access.csv | 1 + views/partner.xml | 12 +++++++++++- views/partnerimport.xml | 27 +++++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 4 deletions(-) diff --git a/models/partnerimport.py b/models/partnerimport.py index 8fc4025..683abb2 100644 --- a/models/partnerimport.py +++ b/models/partnerimport.py @@ -7,11 +7,19 @@ from werkzeug import utils +class kalachakra_partnerdraftfile(models.Model): + _name = 'kalachakra.partnerdraftfile' + _description = 'draft partner file' + + file= fields.Binary("Téléverser le fichier des contacts") + file_name = fields.Char("Nom du fichier") + active = fields.Boolean("actif") + class kalachakra_partnerdraft(models.Model): _name = 'kalachakra.partnerdraft' _description = 'import draft partner' - external_id=fields.Char(string='external id') + external_id=fields.Integer(string='external id') name=fields.Char(string='nom') firstname=fields.Char(string='prenom') title=fields.Char(string='civilité') @@ -23,8 +31,7 @@ class kalachakra_partnerdraft(models.Model): phone = fields.Char(string='tel') email = fields.Char(string='Email') statut_contact=fields.Char('Statut') - date_creation_contact=fields.Char(string='Date contact') + date_creation_contact=fields.Date(string='Date contact') origine=fields.Char(string='Origine') date_member=fields.Char(string='Date adhesion') doublon=fields.Boolean(string='Doublon') - diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv index 23fea00..1d5cb1f 100644 --- a/security/ir.model.access.csv +++ b/security/ir.model.access.csv @@ -1,2 +1,3 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_kalachakra_partnerdraft,kalachakra_partnerdraft,model_kalachakra_partnerdraft,donation.group_donation_manager,1,1,1,1 +access_kalachakra_partnerdraftfile,kalachakra_partnerdraftfile,model_kalachakra_partnerdraftfile,donation.group_donation_manager,1,1,1,1 diff --git a/views/partner.xml b/views/partner.xml index 1518810..d809677 100644 --- a/views/partner.xml +++ b/views/partner.xml @@ -33,15 +33,25 @@ + + Partners draft file + kalachakra.partnerdraftfile + tree,form + + + - + + + +
+

Pay with

+ + + Donate now + + + + + + + + + + + + + + +
+
+ + + \ No newline at end of file