Merge pull request #3 from legalsylvain/16-sql-export-fix-variable-management-IMP
16 sql export fix variable management imppull/718/head
commit
3476c06894
|
@ -4,7 +4,8 @@
|
||||||
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
from odoo import fields, models
|
from odoo import _, fields, models
|
||||||
|
from odoo.exceptions import UserError
|
||||||
from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT
|
from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT
|
||||||
|
|
||||||
|
|
||||||
|
@ -23,6 +24,15 @@ class SqlFileWizard(models.TransientModel):
|
||||||
|
|
||||||
def export_sql(self):
|
def export_sql(self):
|
||||||
self.ensure_one()
|
self.ensure_one()
|
||||||
|
|
||||||
|
# Check properties
|
||||||
|
bad_props = [x for x in self.query_properties if not x["value"]]
|
||||||
|
if bad_props:
|
||||||
|
raise UserError(
|
||||||
|
_("Please enter a values for the following properties : %s")
|
||||||
|
% (",".join([x["string"] for x in bad_props]))
|
||||||
|
)
|
||||||
|
|
||||||
sql_export = self.sql_export_id
|
sql_export = self.sql_export_id
|
||||||
|
|
||||||
# Manage Params
|
# Manage Params
|
||||||
|
@ -30,7 +40,7 @@ class SqlFileWizard(models.TransientModel):
|
||||||
now_tz = fields.Datetime.context_timestamp(sql_export, datetime.now())
|
now_tz = fields.Datetime.context_timestamp(sql_export, datetime.now())
|
||||||
date = now_tz.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
|
date = now_tz.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
|
||||||
for prop in self.query_properties:
|
for prop in self.query_properties:
|
||||||
if prop["type"] == "many2many" and prop["value"]:
|
if prop["type"] == "many2many":
|
||||||
variable_dict[prop["string"]] = tuple(prop["value"])
|
variable_dict[prop["string"]] = tuple(prop["value"])
|
||||||
else:
|
else:
|
||||||
variable_dict[prop["string"]] = prop["value"]
|
variable_dict[prop["string"]] = prop["value"]
|
||||||
|
@ -60,5 +70,4 @@ class SqlFileWizard(models.TransientModel):
|
||||||
"type": "ir.actions.act_window",
|
"type": "ir.actions.act_window",
|
||||||
"target": "new",
|
"target": "new",
|
||||||
"context": self.env.context,
|
"context": self.env.context,
|
||||||
"nodestroy": True,
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
nolabel="1"
|
nolabel="1"
|
||||||
columns="1"
|
columns="1"
|
||||||
hideKanbanOption="1"
|
hideKanbanOption="1"
|
||||||
|
required="1"
|
||||||
/>
|
/>
|
||||||
<separator
|
<separator
|
||||||
string="Export file"
|
string="Export file"
|
||||||
|
|
Loading…
Reference in New Issue