diff --git a/golem_resource_report/reports/golem_reservation_report.py b/golem_resource_report/reports/golem_reservation_report.py
index 042a10d..d482e8a 100644
--- a/golem_resource_report/reports/golem_reservation_report.py
+++ b/golem_resource_report/reports/golem_reservation_report.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see .
-
+""" Golem Reservation Report """
import time
from random import randint
@@ -24,18 +24,18 @@ from odoo import models, api
class GolemResevationReport(models.AbstractModel):
+ "Golem Reservation Report"
_name = 'report.golem_resource_report.golem_reservation_report'
def get_total_reservation(self, data):
+ "Get Reservation Count"
domain = [('date_start', '>', data['date_start']),
('date_stop', '<', data['date_stop']),
('resource_id', 'in', data['resource_ids'])]
return self.env['golem.resource.reservation'].search_count(domain)
-
-
-
def get_resource(self, data):
+ "Get Resource List"
lst = []
domain = [('date_start', '>', data['date_start']),
('date_stop', '<', data['date_stop']),
@@ -45,6 +45,7 @@ class GolemResevationReport(models.AbstractModel):
return lst
def get_client_color(self, partner_number):
+ "Get Client Color"
colors = ['#FFFF5B', '#81EC54', '#47C8C8', '#FB5A66', '#E8E750',
'#CF4ACF', '#9655D2', '#FFA15B', '#5F68D5', '#60E652']
color = "#000000"
@@ -58,6 +59,7 @@ class GolemResevationReport(models.AbstractModel):
return color
def get_data(self, data):
+ "Get Resevation Data"
lst = []
domain = [('date_start', '>', data['date_start']),
('date_stop', '<', data['date_stop']),
@@ -68,7 +70,7 @@ class GolemResevationReport(models.AbstractModel):
partner_number = 0
for partner_id in partner_ids:
partner_colors[str(partner_id)] = self.get_client_color(partner_number)
- partner_number +=1
+ partner_number += 1
res = {}
for reservation in reservations:
@@ -86,6 +88,7 @@ class GolemResevationReport(models.AbstractModel):
@api.model
def render_html(self, docids, data=None):
+ "Render HTML"
model = self.env.context.get('active_model')
docs = self.env[model].browse(self.env.context.get('active_id'))
docargs = {
diff --git a/golem_resource_report/reports/golem_reservation_report.xml b/golem_resource_report/reports/golem_reservation_report.xml
index b545aff..0df78a7 100644
--- a/golem_resource_report/reports/golem_reservation_report.xml
+++ b/golem_resource_report/reports/golem_reservation_report.xml
@@ -40,7 +40,6 @@ along with this program. If not, see .
-
|
@@ -48,7 +47,6 @@ along with this program. If not, see .
Date :
On behalf of :
- client_id :
|
diff --git a/golem_resource_report/wizard/golem_resource_report_wizard.py b/golem_resource_report/wizard/golem_resource_report_wizard.py
index fc38925..684c41d 100644
--- a/golem_resource_report/wizard/golem_resource_report_wizard.py
+++ b/golem_resource_report/wizard/golem_resource_report_wizard.py
@@ -16,13 +16,13 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see .
-""" GOLEM Resources management """
+""" GOLEM Resources Report Wizard """
from odoo import models, fields, api, _
from odoo.exceptions import ValidationError
class GolemResourceReportWizard(models.TransientModel):
- """GOLEM Resource wizard : refusal reason for a reservation """
+ """GOLEM Report Wizard : Choose report parameters """
_name = "golem.resource.report.wizard"
resource_ids = fields.Many2many('golem.resource')
@@ -31,6 +31,7 @@ class GolemResourceReportWizard(models.TransientModel):
@api.multi
def print_report(self):
+ """ Print Report """
for record in self:
start_date = fields.Datetime.from_string(record.date_start)
stop_date = fields.Datetime.from_string(record.date_stop)
@@ -40,16 +41,6 @@ class GolemResourceReportWizard(models.TransientModel):
else:
data = self.read(
['resource_ids', 'date_start', 'date_stop'])[0]
-
- lst = []
- domain = [('date_start', '>', data['date_start']),
- ('date_stop', '<', data['date_stop']),
- ('resource_id', 'in', data['resource_ids'])]
- reservations = self.env['golem.resource.reservation'].search(domain, order='date_start')
- lst = reservations.mapped('resource_id.name')
- print '____________________________________'
- print lst
-
return self.env['report'].get_action(
self, 'golem_resource_report.golem_reservation_report',
data=data)