Browse Source

fls

master
root 3 years ago
parent
commit
a17d1aaf9f
9 changed files with 82 additions and 5 deletions
  1. +2
    -1
      __manifest__.py
  2. +2
    -0
      models/__init__.py
  3. +6
    -0
      models/accounting_deposit.py
  4. +45
    -0
      models/fls.py
  5. +3
    -2
      models/payment_batch.py
  6. +3
    -1
      security/ir.model.access.csv
  7. BIN
      static/description/recurring_donation.png
  8. +20
    -0
      views/fls.xml
  9. +1
    -1
      views/partner.xml

+ 2
- 1
__manifest__.py View File

@ -59,7 +59,8 @@
'views/partner_import.xml',
'views/portal.xml',
'data/donation_recurring_mail_template.xml',
'views/partner.xml'
'views/partner.xml',
'views/fls.xml'


+ 2
- 0
models/__init__.py View File

@ -25,3 +25,5 @@ from . import partner_import
from .import donation_print_email_history
from .import bank_deposit
from .import accounting_deposit
from .import fls

+ 6
- 0
models/accounting_deposit.py View File

@ -21,4 +21,10 @@ class opendons_accounting_deposit(models.Model):
string='Payment batchs',
readonly=True
)
payment_batch_ids = fields.One2many(
'opendons_payment_batch',
'accountingdeposit_id',
string='Payment batchs',
readonly=True
)

+ 45
- 0
models/fls.py View File

@ -0,0 +1,45 @@
from odoo import models, fields, api
import logging
import psycopg2
from contextlib import contextmanager
import json
class fls(models.TransientModel):
_name = 'fls'
_description = 'fls data'
name = fields.Char()
description = fields.Char()
def get_data(self):
db = self.env['base.external.dbsource'].search([('name', '=', 'fls')], limit=1)
conn = db.connection_open_postgresql()
query = 'select nom from public.contact'
params=None
metadata=None
cursor = db.execute_postgresql(query,params,metadata)
self.env['fls'].search([]).unlink()
vals={}
#raise Warning(json.dumps(cursor[0][0]))
i=1
for row in cursor[0] or []:
if i==100:break
vals['name'] = row
self.create(vals)
i=i+1
db.connection_close_postgresql(conn)
action_vals = {'name': 'Transient Model from external datasource',
'type': 'ir.actions.act_window',
'view_mode': 'tree',
'res_model': 'fls',
}
return action_vals

+ 3
- 2
models/payment_batch.py View File

@ -67,8 +67,7 @@ class opendons_payment_batch(models.Model):
track_visibility='onchange')
bank_deposit_date=fields.Datetime(related='bankdeposit_id.create_date')
accounting_deposit_date=fields.Datetime(related='accountingdeposit_id.create_date')
bankdeposit_id = fields.Many2one(
'opendons.bankdeposit',
@ -86,6 +85,8 @@ class opendons_payment_batch(models.Model):
track_visibility='onchange',
)
bank_deposit_date=fields.Datetime(related='bankdeposit_id.create_date')
accounting_deposit_date=fields.Datetime(related='accountingdeposit_id.create_date')
state = fields.Selection([
('draft', 'Draft'),
('validated', 'Validated'),


+ 3
- 1
security/ir.model.access.csv View File

@ -59,4 +59,6 @@ access_opendons_create_accounting_deposit_wizard,opendons_create_accounting_depo
access_opendons_bank_deposit,opendons_bank_deposit,model_opendons_bankdeposit,donation.group_donation_manager,1,1,1,1
access_opendons_bank_deposit_template,opendons_bank_deposit_template,model_opendons_bankdeposit_template,donation.group_donation_manager,1,1,1,1
access_opendons_accounting_deposit,opendons_accounting_deposit,model_opendons_accountingdeposit,donation.group_donation_manager,1,1,1,1
access_opendons_accounting_deposit,opendons_accounting_deposit,model_opendons_accountingdeposit,donation.group_donation_manager,1,1,1,1
access_fls,fls access,model_fls,base.group_system,1,1,1,1

BIN
static/description/recurring_donation.png View File

Before After
Width: 512  |  Height: 512  |  Size: 15 KiB Width: 300  |  Height: 300  |  Size: 30 KiB

+ 20
- 0
views/fls.xml View File

@ -0,0 +1,20 @@
<odoo>
<data>
<record id="fls_action" model="ir.actions.act_window">
<field name="name">fls action</field>
<field name="res_model">fls</field>
<field name="view_mode">tree,form</field>
<field name="context"></field>
</record>
<menuitem id="fls_title_menu" name ="fls"
parent="contacts.menu_contacts" sequence="4"/>
<menuitem id="flst_menu" action="fls_action" name ="fls data"
parent="fls_title_menu" sequence="1"/>
</data>
</odoo>

+ 1
- 1
views/partner.xml View File

@ -98,7 +98,7 @@
<field name="firstname" string="Firstname"/>
<field name="phone" class="o_force_ltr" optional="show"/>
<field name="email" optional="show"/>
<field name="zip" optional="show"/>
<field name="zip" class="od_zip" optional="show"/>
<field name="city" optional="show"/>
</tree>
</xpath>


Loading…
Cancel
Save