Yaltik/docx_report_generation
2
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

Fix db_name

Browse Source
This commit is contained in:
Alexander Shitov 2018-11-09 14:42:47 +05:00
parent 5c6e7c12eb
commit 6ae4ad4d73
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.idea/workspace.xml generated
View File

@ -3,7 +3,6 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="f04ec5ee-004e-4a46-8928-714efbc22225" name="Default" comment=""> <list default="true" id="f04ec5ee-004e-4a46-8928-714efbc22225" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/models/contract_wizard.py" afterPath="$PROJECT_DIR$/models/contract_wizard.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/models/contract_wizard.py" afterPath="$PROJECT_DIR$/models/contract_wizard.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/views/contract_wizard.xml" afterPath="$PROJECT_DIR$/views/contract_wizard.xml" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" /> <option name="TRACKING_ENABLED" value="true" />
@ -39,8 +38,8 @@
<file leaf-file-name="contract_wizard.py" pinned="false" current-in-tab="true"> <file leaf-file-name="contract_wizard.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/models/contract_wizard.py"> <entry file="file://$PROJECT_DIR$/models/contract_wizard.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="635"> <state relative-caret-position="785">
<caret line="308" column="44" lean-forward="false" selection-start-line="308" selection-start-column="44" selection-end-line="308" selection-end-column="44" /> <caret line="408" column="0" lean-forward="true" selection-start-line="408" selection-start-column="0" selection-end-line="408" selection-end-column="0" />
<folding> <folding>
<element signature="e#25#36#0" expanded="true" /> <element signature="e#25#36#0" expanded="true" />
</folding> </folding>
@ -775,8 +774,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/models/contract_wizard.py"> <entry file="file://$PROJECT_DIR$/models/contract_wizard.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="635"> <state relative-caret-position="785">
<caret line="308" column="44" lean-forward="false" selection-start-line="308" selection-start-column="44" selection-end-line="308" selection-end-column="44" /> <caret line="408" column="0" lean-forward="true" selection-start-line="408" selection-start-column="0" selection-end-line="408" selection-end-column="0" />
<folding> <folding>
<element signature="e#25#36#0" expanded="true" /> <element signature="e#25#36#0" expanded="true" />
</folding> </folding>

2
models/contract_wizard.py
View File

@ -390,7 +390,7 @@ class ContractWizard(models.TransientModel):
def get_docx_contract_1(self): def get_docx_contract_1(self):
odoo_data_dir = config.get("data_dir") odoo_data_dir = config.get("data_dir")
odoo_bd = config.get("dbfilter") odoo_bd = config.get("db_name")
filename = self.template.store_fname filename = self.template.store_fname
full_path = '{}/filestore/{}/{}'.format(odoo_data_dir, odoo_bd, filename) full_path = '{}/filestore/{}/{}'.format(odoo_data_dir, odoo_bd, filename)
context = self._generate_context() context = self._generate_context()