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

Merge branch 'master' into family_subscription

Browse Source
This commit is contained in:
Fabien BOURGEOIS 2018-08-20 11:03:37 +02:00
commit 3676634790
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
golem_activity_registration_custom_price/__manifest__.py
View File

@ -24,7 +24,7 @@
- allow set price per area and slice ;
- computes automatically applicable price ;
- anticipate ruleset to be implemented for computing.''',
'version': '10.0.0.1.1',
'version': '10.0.0.1.2',
'category': 'GOLEM',
'author': 'Fabien Bourgeois',
'license': 'AGPL-3',

3
golem_activity_registration_custom_price/models/golem_activity.py
View File

@ -24,7 +24,8 @@ class GolemActivity(models.Model):
_inherit = 'golem.activity'
price_line_ids = fields.One2many('golem.activity.price.line',
'activity_id', string='Price lines')
'activity_id', string='Price lines',
copy=True)
@api.multi
def reset_price_combinations(self):