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

[TYPO]GOLEM Resource : better meaning for reject/validate

Browse Source
This commit is contained in:
Fabien BOURGEOIS 2018-02-18 16:42:29 +01:00
parent 8c59738e3b
commit 3fbb3fe187
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
golem_resource/__manifest__.py
View File

@ -20,7 +20,7 @@
'name': 'GOLEM non-profit resources', 'name': 'GOLEM non-profit resources',
'summary': 'GOLEM resources management', 'summary': 'GOLEM resources management',
'description': ''' GOLEM resources management ''', 'description': ''' GOLEM resources management ''',
'version': '10.0.1.3.0', 'version': '10.0.1.4.0',
'category': 'GOLEM', 'category': 'GOLEM',
'author': 'Youssef El Ouahby, Fabien Bourgeois', 'author': 'Youssef El Ouahby, Fabien Bourgeois',
'license': 'AGPL-3', 'license': 'AGPL-3',

2
golem_resource/views/golem_resource_views.xml
View File

@ -54,7 +54,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<group> <group>
<field name="name" /> <field name="name" />
<field name="type_id" /> <field name="type_id" />
<field name="product_tmpl_id" options="{'no_create': true}" /> <field name="product_tmpl_id" options="{'no_create': True}" />
</group> </group>
<group> <group>
<field name="validation_required" /> <field name="validation_required" />

4
golem_resource/wizard/golem_reservation_rejection.py
View File

@ -28,9 +28,9 @@ class GolemReservationRejectionWizard(models.TransientModel):
reason = fields.Text(required=True) reason = fields.Text(required=True)
@api.multi @api.multi
def validate(self): def reject(self):
""" Sets reservation status to rejected and add reason """ """ Sets reservation status to rejected and add reason """
self.ensure_one() self.ensure_one()
rejection = self[0] rejection = self[0]
rejection.reservation_id.write({'status': 'rejected', rejection.reservation_id.write({'state': 'rejected',
'rejection_reason': rejection.reason}) 'rejection_reason': rejection.reason})

2
golem_resource/wizard/golem_reservation_rejection_views.xml
View File

@ -30,7 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<field name="reason" /> <field name="reason" />
</group> </group>
<footer> <footer>
<button name="validate" string="Validate" type="object" <button name="reject" string="Reject" type="object"
class="oe_highlight" /> class="oe_highlight" />
<button string="Cancel" class="oe_link" special="cancel" /> <button string="Cancel" class="oe_link" special="cancel" />
</footer> </footer>