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

[IMP]Activity registration : add base price, not invoice on default tree

Browse Source
This commit is contained in:
Fabien Bourgeois 2017-06-14 22:36:38 +02:00
parent 7dfb07b48c
commit 415fcbf64c
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
golem_activity_registration/models/golem_activity_registration.py
View File

@ -79,6 +79,7 @@ class GolemActivityRegistration(models.Model):
ondelete='cascade', index=True) ondelete='cascade', index=True)
activity_id = fields.Many2one('golem.activity', required=True, index=True, activity_id = fields.Many2one('golem.activity', required=True, index=True,
string='Activity', ondelete='cascade') string='Activity', ondelete='cascade')
activity_price = fields.Float(related='activity_id.list_price')
season_id = fields.Many2one(string='Season', season_id = fields.Many2one(string='Season',
related='activity_id.season_id', store=True) related='activity_id.season_id', store=True)
is_current = fields.Boolean('Current season?', is_current = fields.Boolean('Current season?',

1
golem_activity_registration/views/golem_member_views.xml
View File

@ -37,6 +37,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
domain="[('is_current', '=', True)]" /> domain="[('is_current', '=', True)]" />
<field name="season_id" readonly="1" /> <field name="season_id" readonly="1" />
<field name="member_id" readonly="1" invisible="1" /> <field name="member_id" readonly="1" invisible="1" />
<field name="activity_price" string="Base price" />
</tree> </tree>
</field> </field>
<field name="activity_registration_all_ids" readonly="1"> <field name="activity_registration_all_ids" readonly="1">