Browse Source

divers

master
root 3 years ago
parent
commit
7f2addbb08
3 changed files with 10 additions and 9 deletions
  1. +3
    -3
      __manifest__.py
  2. +4
    -4
      controllers/portal.py
  3. +3
    -2
      views/bank_deposit.xml

+ 3
- 3
__manifest__.py View File

@ -31,7 +31,6 @@
'views/address.xml', 'views/address.xml',
'views/email.xml', 'views/email.xml',
'views/phone.xml', 'views/phone.xml',
'views/partner.xml',
'views/donation.xml', 'views/donation.xml',
'views/recurring_donation.xml', 'views/recurring_donation.xml',
'data/recurring_donation_configuration.xml', 'data/recurring_donation_configuration.xml',
@ -41,9 +40,9 @@
'views/templates.xml', 'views/templates.xml',
#'views/mail_mail.xml', #'views/mail_mail.xml',
'views/returnmail.xml', 'views/returnmail.xml',
'views/payment_batch.xml',
'views/bank_deposit.xml', 'views/bank_deposit.xml',
'views/accounting_deposit.xml', 'views/accounting_deposit.xml',
'views/payment_batch.xml',
'views/website_sale.xml', 'views/website_sale.xml',
'views/aggregate.xml', 'views/aggregate.xml',
'views/duplicate.xml', 'views/duplicate.xml',
@ -63,7 +62,8 @@
'views/laposte_ref.xml', 'views/laposte_ref.xml',
'views/partner_import.xml', 'views/partner_import.xml',
'views/portal.xml', 'views/portal.xml',
'data/donation_recurring_mail_template.xml'
'data/donation_recurring_mail_template.xml',
'views/partner.xml'
#'views/website_donation.xml' #'views/website_donation.xml'


+ 4
- 4
controllers/portal.py View File

@ -10,12 +10,12 @@ class PortalOpendons(CustomerPortal):
values = super()._prepare_home_portal_values(counters) values = super()._prepare_home_portal_values(counters)
partner = request.env.user.partner_id partner = request.env.user.partner_id
if 'taxreceipt_count' in counters: if 'taxreceipt_count' in counters:
taxreceipt_count=request.env['donation.tax.receipt'].search_count([('partner_id','=',int(partner.id))])
taxreceipt_count=request.env['donation.tax.receipt'].sudo().search_count([('partner_id','=',int(partner.id))])
values['taxreceipt_count'] = taxreceipt_count values['taxreceipt_count'] = taxreceipt_count
if 'donation_count' in counters: if 'donation_count' in counters:
donation_count=request.env['donation.donation'].search_count(['&',('partner_id','=',int(partner.id)),('state','=','done')])
donation_count=request.env['donation.donation'].sudo().search_count(['&',('partner_id','=',int(partner.id)),('state','=','done')])
values['donation_count'] = donation_count values['donation_count'] = donation_count
@ -25,7 +25,7 @@ class PortalOpendons(CustomerPortal):
def portal_my_taxreceipts(self, page=1, date_begin=None, date_end=None, sortby=None, **kw): def portal_my_taxreceipts(self, page=1, date_begin=None, date_end=None, sortby=None, **kw):
values = self._prepare_portal_layout_values() values = self._prepare_portal_layout_values()
partner = request.env.user.partner_id partner = request.env.user.partner_id
taxreceipt = request.env['donation.tax.receipt']
taxreceipt = request.env['donation.tax.receipt'].sudo().search([])
domain = [ domain = [
('partner_id', '=',int(partner.id) ) ('partner_id', '=',int(partner.id) )
@ -55,7 +55,7 @@ class PortalOpendons(CustomerPortal):
step=self._items_per_page step=self._items_per_page
) )
# search the count to display, according to the pager data # search the count to display, according to the pager data
taxreceipts = taxreceipt.search(domain, order=sort_taxreceipt, limit=self._items_per_page, offset=pager['offset'])
taxreceipts = taxreceipt.sudo().search(domain, order=sort_taxreceipt, limit=self._items_per_page, offset=pager['offset'])
request.session['my_taxreceipt_history'] = taxreceipts.ids[:100] request.session['my_taxreceipt_history'] = taxreceipts.ids[:100]
values.update({ values.update({


+ 3
- 2
views/bank_deposit.xml View File

@ -1,5 +1,5 @@
<odoo> <odoo>
<data>
@ -20,6 +20,7 @@
<field name="name">opendons_payment_batch_bank Form</field> <field name="name">opendons_payment_batch_bank Form</field>
<field name="model">opendons.bankdeposit</field> <field name="model">opendons.bankdeposit</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<header> <header>
<button name="action_print_bankdeposit" type="object" string="Print bank deposit"/> <button name="action_print_bankdeposit" type="object" string="Print bank deposit"/>
</header> </header>
@ -118,5 +119,5 @@
sequence="30" sequence="30"
/> />
</data>
</odoo> </odoo>

Loading…
Cancel
Save