Browse Source

remise en banque

master
root 3 years ago
parent
commit
483deba7ae
6 changed files with 28 additions and 11 deletions
  1. +19
    -0
      controllers/controllers.py
  2. +4
    -2
      models/donation.py
  3. +1
    -0
      models/payment_batch.py
  4. +3
    -2
      views/donation.xml
  5. +1
    -0
      wizard/create_accounting_deposit_wizard.py
  6. +0
    -7
      wizard/create_bank_deposit_wizard.py

+ 19
- 0
controllers/controllers.py View File

@ -8,6 +8,25 @@ import json
class opendons(http.Controller): class opendons(http.Controller):
@http.route(['/opendons/object'], type='http', auth='public', website=True, sitemap=False,csrf=False)
def object(self,model,id,*args,**kw):
field_list=request.env[model].sudo().fields_get()
objet=request.env[model].search([('id','=',int(id))])
# result=[]
# for key in field_list:
# result.append((key,str(objet[key])))
# result.sort()
# return json.dumps(result)
result=""
for key in field_list:
result=result+str(key)+':'+str(objet[key])+'<br>'
return result
@http.route(['/opendons/cp'],type='json', methods=['GET','POST'],auth="public",csrf=False) @http.route(['/opendons/cp'],type='json', methods=['GET','POST'],auth="public",csrf=False)
def index(self, **post): def index(self, **post):
name = post.get('name', False) name = post.get('name', False)


+ 4
- 2
models/donation.py View File

@ -85,8 +85,10 @@ class DonationDonation(models.Model):
ondelete='set null' ondelete='set null'
) )
bank_deposit_date=fields.Datetime('Bank deposit date', related='payment_batch_id.bank_deposit_date')
accounting_deposit_date=fields.Datetime('Accounting deposit date' , related='payment_batch_id.accountingdeposit_date')
#bank_deposit_date=fields.Datetime(related='payment_batch_id.bank_deposit_date')
payment_state=fields.Selection(related='payment_batch_id.state')
#accounting_deposit_date=fields.Datetime(related='payment_batch_id.accounting_deposit_date')
year_donation_date=fields.Integer('Year donation date',compute='_compute_year_donation_date',store=True) year_donation_date=fields.Integer('Year donation date',compute='_compute_year_donation_date',store=True)
print_email_history_ids=fields.One2many( print_email_history_ids=fields.One2many(


+ 1
- 0
models/payment_batch.py View File

@ -151,6 +151,7 @@ class opendons_payment_batch(models.Model):
currency_field='currency_id',compute="_compute_total" currency_field='currency_id',compute="_compute_total"
) )
deposited_in_bank=fields.Boolean('deposited in bank')
@api.onchange('operation_id') @api.onchange('operation_id')


+ 3
- 2
views/donation.xml View File

@ -8,8 +8,9 @@
<xpath expr="//field[@name='donation_date']" position="after"> <xpath expr="//field[@name='donation_date']" position="after">
<field name="bank_deposit_date"/>
<field name="accounting_deposit_date"/>
<field string="Payment state" name="payment_state"/>
</xpath> </xpath>
</field> </field>
</record> </record>

+ 1
- 0
wizard/create_accounting_deposit_wizard.py View File

@ -23,6 +23,7 @@ class CreateaccountingDeposit(models.TransientModel):
#add accounting deposit to payment #add accounting deposit to payment
p.accountingdeposit_id=bd.id p.accountingdeposit_id=bd.id
p.accounting_deposit_date=bd.create_date
p.state='deposited_in_accounting' p.state='deposited_in_accounting'


+ 0
- 7
wizard/create_bank_deposit_wizard.py View File

@ -30,10 +30,3 @@ class CreateBankDeposit(models.TransientModel):
p.bank_deposit_date=bd.create_date p.bank_deposit_date=bd.create_date
# #creation de l'opération sans les segments
# vals={}
# vals['name']='copy of ' + record.name
# vals['chanel']=record.chanel
# vals['user_id']=self._uid
# vals['state']='draft'
# dup_operation=super(opendons_operation, self).create(vals)

Loading…
Cancel
Save