michel/GOLEM
2
0
Fork 0
forked from Yaltik/golem
Code Issues Pull Requests Releases Wiki Activity

[IMP]GOLEM Activity Session Registration : usage of existing related is_current instead of reocmputed default_season + fixes on registrations from activities

Browse Source
This commit is contained in:
Fabien Bourgeois 2016-09-22 10:24:28 +02:00
parent 5b233e19ee
commit 65898e80b7
5 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
golem_activity_session_registration/i18n/fr.po
View File

@ -6,8 +6,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Odoo Server 8.0\n" "Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-09-22 08:13+0000\n" "POT-Creation-Date: 2016-09-22 08:22+0000\n"
"PO-Revision-Date: 2016-09-22 08:13+0000\n" "PO-Revision-Date: 2016-09-22 08:22+0000\n"
"Last-Translator: <>\n" "Last-Translator: <>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -44,7 +44,6 @@ msgstr "Saison par défaut?"
#. module: golem_activity_session_registration #. module: golem_activity_session_registration
#: view:golem.activity.session.registration:golem_activity_session_registration.searches #: view:golem.activity.session.registration:golem_activity_session_registration.searches
#: field:golem.activity.session.registration,season_default_id:0
msgid "Default season" msgid "Default season"
msgstr "Saison par défaut" msgstr "Saison par défaut"

5
golem_activity_session_registration/i18n/golem_activity_session_registration.pot
View File

@ -6,8 +6,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Odoo Server 8.0\n" "Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-09-22 08:13+0000\n" "POT-Creation-Date: 2016-09-22 08:22+0000\n"
"PO-Revision-Date: 2016-09-22 08:13+0000\n" "PO-Revision-Date: 2016-09-22 08:22+0000\n"
"Last-Translator: <>\n" "Last-Translator: <>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -43,7 +43,6 @@ msgstr ""
#. module: golem_activity_session_registration #. module: golem_activity_session_registration
#: view:golem.activity.session.registration:golem_activity_session_registration.searches #: view:golem.activity.session.registration:golem_activity_session_registration.searches
#: field:golem.activity.session.registration,season_default_id:0
msgid "Default season" msgid "Default season"
msgstr "" msgstr ""

10
golem_activity_session_registration/models/golem_activity_session_registration.py
View File

@ -74,15 +74,5 @@ class GolemActivitySessionRegistration(models.Model):
ondelete='set null') ondelete='set null')
season_id = fields.Many2one(string='Season', season_id = fields.Many2one(string='Season',
related='session_id.season_id') related='session_id.season_id')
season_default_id = fields.Many2one('golem.season', 'Default season',
compute='_compute_season_default')
is_current = fields.Boolean('Current season?', is_current = fields.Boolean('Current season?',
related='session_id.is_current') related='session_id.is_current')
@api.one
@api.depends('session_id')
def _compute_season_default(self):
""" Compute default season """
domain = [('is_default', '=', True)]
self.season_default_id = self.env['golem.season'].search(domain).id

3
golem_activity_session_registration/views/golem_activity_view.xml
View File

@ -34,9 +34,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<field name="activity_session_registration_ids" <field name="activity_session_registration_ids"
context="{'default_session_id': active_id}"> context="{'default_session_id': active_id}">
<tree editable="top"> <tree editable="top">
<field name="season_default_id" invisible="1" />
<field name="member_id" <field name="member_id"
domain="[('season_ids', '=', season_default_id)]" /> domain="[('season_ids', '=', season_id)]" />
<field name="session_id" readonly="1" /> <field name="session_id" readonly="1" />
<field name="season_id" readonly="1" /> <field name="season_id" readonly="1" />
<field name="invoice_id" readonly="1" /> <field name="invoice_id" readonly="1" />

3
golem_activity_session_registration/views/golem_member_view.xml
View File

@ -30,9 +30,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<field name="activity_session_registration_ids" <field name="activity_session_registration_ids"
context="{'default_member_id': active_id}"> context="{'default_member_id': active_id}">
<tree editable="top"> <tree editable="top">
<field name="season_default_id" invisible="1" />
<field name="session_id" <field name="session_id"
domain="[('season_id', '=', season_default_id)]" /> domain="[('is_current', '=', True)]" />
<field name="season_id" readonly="1" /> <field name="season_id" readonly="1" />
<field name="member_id" readonly="1" /> <field name="member_id" readonly="1" />
<field name="invoice_id" readonly="1" /> <field name="invoice_id" readonly="1" />