Skip to content

Commit

Permalink
Merge pull request #38 from IrluiDev/14.0
Browse files Browse the repository at this point in the history
Update Filters
  • Loading branch information
OsoTranquilo authored Dec 21, 2023
2 parents 467dff1 + f834b2c commit 3ba08c6
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
11 changes: 6 additions & 5 deletions pms_data_bi/models/data_bi.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ def export_general_data(self, default_property=False):

@api.model
def calc_hoteles(self, hotelsdata):
hotels = self.env["pms.property"].search([])
if hotelsdata != [0]:
hotels = self.env["pms.property"].search([("id", "in", hotelsdata)])
hotels = self.env["pms.property"].search([("id", "in", hotelsdata), ("status_send_property", "=", True)])
else: hotels = self.env["pms.property"].search([("status_send_property", "=", True)])
return hotels

@api.model
Expand Down Expand Up @@ -141,7 +141,7 @@ def export_data_bi(self, archivo=0, default_property=[0], fechafoto=False):
limit_ago = self.calc_date_limit(fechafoto)
hotels = self.calc_hoteles(default_property)

_logger.warning(
_logger.info(
"-- ### Init Export Data_Bi Module parameters: %s, %s, %s ### --",
archivo,
hotels.ids,
Expand All @@ -153,7 +153,7 @@ def export_data_bi(self, archivo=0, default_property=[0], fechafoto=False):
else:
dic_export = self.export_one(hotels, limit_ago, archivo)

_logger.warning("--- ### End Export Data_Bi Module to Json ### ---")
_logger.info("--- ### End Export Data_Bi Module to Json ### ---")
return json.dumps(dic_export, ensure_ascii=False)

@api.model
Expand Down Expand Up @@ -1096,7 +1096,8 @@ def data_bi_ftp(self, default_property=[0], fechafoto=False):
for all not set or default_property = [0]
"""
_logger.info("Exporting FTP data DataBI")
propertys = self.env["pms.property"].search([])
#propertys = self.env["pms.property"].search([])
propertys = self.env["pms.property"].search([("status_send_property", "=", True)])
for prop in propertys:
if (prop.id in default_property) or default_property == [0]:
self.data_bi_ftp_one(prop, fechafoto)
Expand Down
7 changes: 7 additions & 0 deletions pms_data_bi/models/inherit_pms_property.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,10 @@ class InheritResCompany(models.Model):
Expedia company, expressed with two digits. \
Example: 18 = 18% commission.",
)

status_send_property = fields.Boolean(
"Send property DataBi",
default = True,
help = "the condition of property that must be met \
for it to be shared."
)
1 change: 1 addition & 0 deletions pms_data_bi/views/inherit_pms_property.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<page string="DataBi MOP" name="property_databi">
<group>
<field name="expedia_rate" />
<field name="status_send_property" />
</group>
</page>
</xpath>
Expand Down

0 comments on commit 3ba08c6

Please sign in to comment.