Skip to content

Commit

Permalink
Merge pull request #73 from vauxoo-dev/12.0-update-travis-luist
Browse files Browse the repository at this point in the history
Made Travis run
  • Loading branch information
moylop260 committed May 4, 2019
2 parents e882a50 + 650c1f0 commit 705cfb8
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 12 deletions.
16 changes: 7 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
language: python

sudo: false
cache:
apt: true
directories:
- $HOME/.cache/pip
cache: pip

python:
- "3.5"
Expand All @@ -21,12 +17,14 @@ addons:

env:
global:
- VERSION="12.0" TESTS="0" LINT_CHECK="0" TRANSIFEX="0"
matrix:
- VERSION="12.0" TESTS="0" LINT_CHECK="0" TRANSIFEX="0" WKHTMLTOPDF_VERSION="0.12.4"
- TRANSIFEX_USER='transbot@odoo-community.org'

matrix:
- LINT_CHECK="1"
- TRANSIFEX="1"
- TESTS="1" ODOO_REPO="OCA/OCB"
- TESTS="1" ODOO_REPO="odoo/odoo"
- TESTS="1" ODOO_REPO="OCA/OCB" LINT_CHECK="0"
- TESTS="1" ODOO_REPO="odoo/odoo" LINT_CHECK="0"


install:
Expand Down
1 change: 1 addition & 0 deletions hotel/report/hotel_report.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

class FolioReport(models.AbstractModel):
_name = 'report.hotel.report_hotel_folio'
_description = 'Auxiliar to get the report'

def _get_folio_data(self, date_start, date_end):
total_amount = 0.0
Expand Down
2 changes: 0 additions & 2 deletions hotel/security/ir.model.access.csv
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ access_hotel_order_user,hotel.order.user,sale.model_sale_order,hotel.group_hotel
access_hotel_order_line_user,hotel.order.line.user,sale.model_sale_order_line,hotel.group_hotel_user,1,1,1,0
access_hotel_invoice_user,account.invoice.user,account.model_account_invoice,hotel.group_hotel_user,1,1,1,0
access_folio_room_line_user,hotel.folio_room_line.user,model_folio_room_line,hotel.group_hotel_user,1,1,1,1
access_folio_report_wizard_user,hotel.folio.report.wizard.user,model_folio_report_wizard,hotel.group_hotel_user,1,1,1,0
access_hotel_floor_group_manager,hotel.floor.manager,model_hotel_floor,hotel.group_hotel_manager,1,1,1,1
access_product_category_manager,product.category.manager,product.model_product_category,hotel.group_hotel_manager,1,1,1,1
access_hotel_room_type_manager,hotel.room_type.manager,model_hotel_room_type,hotel.group_hotel_manager,1,1,1,1
Expand All @@ -32,4 +31,3 @@ access_hotel_order_manager_manager,hotel.order.manager,sale.model_sale_order,hot
access_hotel_order_line_manager,hotel.order.line.manager,sale.model_sale_order_line,hotel.group_hotel_manager,1,1,1,0
access_hotel_invoice_manager,account.invoice.manager,account.model_account_invoice,hotel.group_hotel_manager,1,1,1,1
access_folio_room_line_manager,hotel.folio_room_line.manager,model_folio_room_line,hotel.group_hotel_manager,1,1,1,1
access_folio_report_wizard_manager,hotel.folio.report.wizard.manager,model_folio_report_wizard,hotel.group_hotel_manager,1,1,1,1
1 change: 1 addition & 0 deletions hotel/wizard/hotel_wizard.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
class FolioReportWizard(models.TransientModel):
_name = 'folio.report.wizard'
_rec_name = 'date_start'
_description = 'Allow print folio report by date'

date_start = fields.Datetime('Start Date')
date_end = fields.Datetime('End Date')
Expand Down
2 changes: 1 addition & 1 deletion hotel_reservation/models/hotel_reservation.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ class HotelReservation(models.Model):
default=lambda *a: 'draft')
folio_id = fields.Many2many('hotel.folio', 'hotel_folio_reservation_rel',
'order_id', 'invoice_id', string='Folio')
no_of_folio = fields.Integer('Folio', compute="_compute_folio_id")
no_of_folio = fields.Integer('No. Folio', compute="_compute_folio_id")
dummy = fields.Datetime('Dummy')

@api.multi
Expand Down
4 changes: 4 additions & 0 deletions hotel_reservation/report/hotel_reservation_report.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

class ReportTestCheckin(models.AbstractModel):
_name = "report.hotel_reservation.report_checkin_qweb"
_description = 'Auxiliar to get the check in report'

def _get_room_type(self, date_start, date_end):
reservation_obj = self.env['hotel.reservation']
Expand Down Expand Up @@ -59,6 +60,7 @@ def _get_report_values(self, docids, data):

class ReportTestCheckout(models.AbstractModel):
_name = "report.hotel_reservation.report_checkout_qweb"
_description = 'Auxiliar to get the check out report'

def _get_room_type(self, date_start, date_end):
reservation_obj = self.env['hotel.reservation']
Expand Down Expand Up @@ -108,6 +110,7 @@ def _get_report_values(self, docids, data):

class ReportTestMaxroom(models.AbstractModel):
_name = "report.hotel_reservation.report_maxroom_qweb"
_description = 'Auxiliar to get the room report'

def _get_room_type(self, date_start, date_end):
reservation_obj = self.env['hotel.reservation']
Expand Down Expand Up @@ -184,6 +187,7 @@ def _get_report_values(self, docids, data):

class ReportTestRoomres(models.AbstractModel):
_name = "report.hotel_reservation.report_roomres_qweb"
_description = 'Auxiliar to get the room report'

def _get_room_type(self, date_start, date_end):
reservation_obj = self.env['hotel.reservation']
Expand Down
2 changes: 2 additions & 0 deletions hotel_reservation/wizards/hotel_reservation_wizard.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

class HotelReservationWizard(models.TransientModel):
_name = 'hotel.reservation.wizard'
_description = 'Allow to generate a reservation'

date_start = fields.Datetime('Start Date', required=True)
date_end = fields.Datetime('End Date', required=True)
Expand Down Expand Up @@ -52,6 +53,7 @@ def report_maxroom_detail(self):

class MakeFolioWizard(models.TransientModel):
_name = 'wizard.make.folio'
_description = 'Allow to generate the folio'

grouped = fields.Boolean('Group the Folios')

Expand Down

0 comments on commit 705cfb8

Please sign in to comment.