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

Minor fixes for templates

Browse Source
This commit is contained in:
Alexander Shitov 2018-11-09 12:53:20 +05:00
parent 1237858d72
commit bf2d439810
7 changed files with 179 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.idea/client_contracts.iml generated Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="TestRunnerService">
<option name="PROJECT_TEST_RUNNER" value="Unittests" />
</component>
</module>

4
.idea/misc.xml generated Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.5.3 (/usr/bin/python3.5)" project-jdk-type="Python SDK" />
</project>

8
.idea/modules.xml generated Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/client_contracts.iml" filepath="$PROJECT_DIR$/.idea/client_contracts.iml" />
</modules>
</component>
</project>

299
.idea/workspace.xml generated
View File

@ -2,6 +2,8 @@
<project version="4"> <project version="4">
<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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/models/contract_wizard.py" afterPath="$PROJECT_DIR$/models/contract_wizard.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/models/models.py" afterPath="$PROJECT_DIR$/models/models.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/models/models.py" afterPath="$PROJECT_DIR$/models/models.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/views/templates.xml" afterPath="$PROJECT_DIR$/views/templates.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/views/templates.xml" afterPath="$PROJECT_DIR$/views/templates.xml" />
</list> </list>
@ -17,8 +19,8 @@
<file leaf-file-name="models.py" pinned="false" current-in-tab="false"> <file leaf-file-name="models.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/models/models.py"> <entry file="file://$PROJECT_DIR$/models/models.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-40"> <state relative-caret-position="395">
<caret line="51" column="27" lean-forward="false" selection-start-line="51" selection-start-column="27" selection-end-line="51" selection-end-column="27" /> <caret line="92" column="49" lean-forward="false" selection-start-line="92" selection-start-column="49" selection-end-line="92" selection-end-column="49" />
<folding> <folding>
<element signature="e#25#54#0" expanded="true" /> <element signature="e#25#54#0" expanded="true" />
</folding> </folding>
@ -39,8 +41,8 @@
<file leaf-file-name="contract_wizard.py" pinned="false" current-in-tab="false"> <file leaf-file-name="contract_wizard.py" pinned="false" current-in-tab="false">
<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="405"> <state relative-caret-position="315">
<caret line="27" column="59" lean-forward="false" selection-start-line="27" selection-start-column="59" selection-end-line="27" selection-end-column="59" /> <caret line="84" column="58" lean-forward="false" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
<folding> <folding>
<element signature="e#25#36#0" expanded="true" /> <element signature="e#25#36#0" expanded="true" />
</folding> </folding>
@ -61,9 +63,10 @@
<file leaf-file-name="templates.xml" pinned="false" current-in-tab="true"> <file leaf-file-name="templates.xml" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/views/templates.xml"> <entry file="file://$PROJECT_DIR$/views/templates.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120"> <state relative-caret-position="531">
<caret line="8" column="58" lean-forward="false" selection-start-line="8" selection-start-column="58" selection-end-line="8" selection-end-column="58" /> <caret line="678" column="167" lean-forward="false" selection-start-line="678" selection-start-column="167" selection-end-line="678" selection-end-column="167" />
<folding> <folding>
<element signature="n#template#0;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#1;n#data#0;n#odoo#0;n#!!top" expanded="false" /> <element signature="n#template#1;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="e#1086#1091#0" expanded="true" /> <element signature="e#1086#1091#0" expanded="true" />
<element signature="e#1375#1380#0" expanded="true" /> <element signature="e#1375#1380#0" expanded="true" />
@ -84,34 +87,45 @@
<element signature="n#template#16;n#data#0;n#odoo#0;n#!!top" expanded="false" /> <element signature="n#template#16;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#17;n#data#0;n#odoo#0;n#!!top" expanded="false" /> <element signature="n#template#17;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#18;n#data#0;n#odoo#0;n#!!top" expanded="false" /> <element signature="n#template#18;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="e#29894#29899#0" expanded="true" /> <element signature="n#template#19;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="e#29904#29909#0" expanded="true" />
<element signature="e#29914#29919#0" expanded="true" />
<element signature="e#29924#29929#0" expanded="true" />
<element signature="e#29934#29939#0" expanded="true" />
<element signature="e#29944#29949#0" expanded="true" />
<element signature="n#template#20;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="e#33184#33189#0" expanded="true" />
<element signature="e#33194#33199#0" expanded="true" />
<element signature="e#33204#33209#0" expanded="true" />
<element signature="e#33214#33219#0" expanded="true" />
<element signature="e#33224#33229#0" expanded="true" />
<element signature="e#33234#33239#0" expanded="true" />
<element signature="n#template#21;n#data#0;n#odoo#0;n#!!top" expanded="false" /> <element signature="n#template#21;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="e#36637#36642#0" expanded="true" /> <element signature="e#30496#30501#0" expanded="true" />
<element signature="e#36647#36652#0" expanded="true" /> <element signature="e#30506#30511#0" expanded="true" />
<element signature="e#36657#36662#0" expanded="true" /> <element signature="e#30516#30521#0" expanded="true" />
<element signature="e#36667#36672#0" expanded="true" /> <element signature="e#30526#30531#0" expanded="true" />
<element signature="e#36677#36682#0" expanded="true" /> <element signature="e#30536#30541#0" expanded="true" />
<element signature="e#36687#36692#0" expanded="true" /> <element signature="e#30546#30551#0" expanded="true" />
<element signature="n#template#22;n#data#0;n#odoo#0;n#!!top" expanded="false" /> <element signature="n#template#22;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#23;n#data#0;n#odoo#0;n#!!top" expanded="false" /> <element signature="e#33786#33791#0" expanded="true" />
<element signature="e#33796#33801#0" expanded="true" />
<element signature="e#33806#33811#0" expanded="true" />
<element signature="e#33816#33821#0" expanded="true" />
<element signature="e#33826#33831#0" expanded="true" />
<element signature="e#33836#33841#0" expanded="true" />
<element signature="e#36962#36967#0" expanded="true" />
<element signature="e#36972#36977#0" expanded="true" />
<element signature="e#36982#36987#0" expanded="true" />
<element signature="e#36992#36997#0" expanded="true" />
<element signature="e#37002#37007#0" expanded="true" />
<element signature="e#37012#37017#0" expanded="true" />
<element signature="n#template#24;n#data#0;n#odoo#0;n#!!top" expanded="false" /> <element signature="n#template#24;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#25;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#26;n#data#0;n#odoo#0;n#!!top" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="controllers.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/controllers/controllers.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
@ -156,14 +170,14 @@
<option value="$PROJECT_DIR$/controllers/__init__.py" /> <option value="$PROJECT_DIR$/controllers/__init__.py" />
<option value="$PROJECT_DIR$/controllers/controllers.py" /> <option value="$PROJECT_DIR$/controllers/controllers.py" />
<option value="$PROJECT_DIR$/views/contract_wizard.xml" /> <option value="$PROJECT_DIR$/views/contract_wizard.xml" />
<option value="$PROJECT_DIR$/models/contract_wizard.py" />
<option value="$PROJECT_DIR$/__manifest__.py" /> <option value="$PROJECT_DIR$/__manifest__.py" />
<option value="$PROJECT_DIR$/models/contract_wizard.py" />
<option value="$PROJECT_DIR$/models/models.py" /> <option value="$PROJECT_DIR$/models/models.py" />
<option value="$PROJECT_DIR$/views/templates.xml" /> <option value="$PROJECT_DIR$/views/templates.xml" />
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds" extendedState="6"> <component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="6" /> <option name="x" value="6" />
<option name="y" value="55" /> <option name="y" value="55" />
<option name="width" value="1914" /> <option name="width" value="1914" />
@ -217,11 +231,6 @@
<item name="client_contracts" type="b2602c69:ProjectViewProjectNode" /> <item name="client_contracts" type="b2602c69:ProjectViewProjectNode" />
<item name="External Libraries" type="cb654da1:ExternalLibrariesNode" /> <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
</path> </path>
<path>
<item name="client_contracts" type="b2602c69:ProjectViewProjectNode" />
<item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
<item name="&lt; Python 2.7.13 (/usr/bin/python2.7) &gt;" type="70bed36:NamedLibraryElementNode" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
@ -265,13 +274,12 @@
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-1" y="0" width="1922" height="1048" extended-state="6" /> <frame x="-1" y="0" width="1922" height="1048" extended-state="7" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27588046" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27908218" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32829374" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@ -285,6 +293,7 @@
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32829374" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout> </layout>
</component> </component>
@ -302,7 +311,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding>
<element signature="e#25#54#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -331,7 +342,7 @@
<state relative-caret-position="1815"> <state relative-caret-position="1815">
<caret line="202" column="65" lean-forward="false" selection-start-line="202" selection-start-column="65" selection-end-line="202" selection-end-column="65" /> <caret line="202" column="65" lean-forward="false" selection-start-line="202" selection-start-column="65" selection-end-line="202" selection-end-column="65" />
<folding> <folding>
<element signature="e#12796#12943#0" expanded="false" /> <element signature="e#25#36#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -348,18 +359,10 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30"> <state relative-caret-position="30">
<caret line="2" column="37" lean-forward="false" selection-start-line="2" selection-start-column="37" selection-end-line="2" selection-end-column="37" /> <caret line="2" column="37" lean-forward="false" selection-start-line="2" selection-start-column="37" selection-end-line="2" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/reports_templates.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/views/reports_templates.xml" />
<entry file="file://$PROJECT_DIR$/__manifest__.py"> <entry file="file://$PROJECT_DIR$/__manifest__.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450"> <state relative-caret-position="450">
@ -372,7 +375,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525"> <state relative-caret-position="525">
<caret line="35" column="45" lean-forward="true" selection-start-line="35" selection-start-column="45" selection-end-line="35" selection-end-column="45" /> <caret line="35" column="45" lean-forward="true" selection-start-line="35" selection-start-column="45" selection-end-line="35" selection-end-column="45" />
<folding /> <folding>
<element signature="e#25#54#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -381,7 +386,7 @@
<state relative-caret-position="285"> <state relative-caret-position="285">
<caret line="24" column="54" lean-forward="true" selection-start-line="24" selection-start-column="54" selection-end-line="24" selection-end-column="54" /> <caret line="24" column="54" lean-forward="true" selection-start-line="24" selection-start-column="54" selection-end-line="24" selection-end-column="54" />
<folding> <folding>
<element signature="e#12796#12943#0" expanded="false" /> <element signature="e#25#36#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -398,18 +403,10 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30"> <state relative-caret-position="30">
<caret line="2" column="37" lean-forward="false" selection-start-line="2" selection-start-column="37" selection-end-line="2" selection-end-column="37" /> <caret line="2" column="37" lean-forward="false" selection-start-line="2" selection-start-column="37" selection-end-line="2" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/reports_templates.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/views/reports_templates.xml" />
<entry file="file://$PROJECT_DIR$/__manifest__.py"> <entry file="file://$PROJECT_DIR$/__manifest__.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450"> <state relative-caret-position="450">
@ -442,7 +439,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="390"> <state relative-caret-position="390">
<caret line="26" column="34" lean-forward="false" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" /> <caret line="26" column="34" lean-forward="false" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
<folding /> <folding>
<element signature="e#25#54#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -478,18 +477,10 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30"> <state relative-caret-position="30">
<caret line="2" column="37" lean-forward="false" selection-start-line="2" selection-start-column="37" selection-end-line="2" selection-end-column="37" /> <caret line="2" column="37" lean-forward="false" selection-start-line="2" selection-start-column="37" selection-end-line="2" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/reports_templates.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/views/reports_templates.xml" />
<entry file="file://$PROJECT_DIR$/__manifest__.py"> <entry file="file://$PROJECT_DIR$/__manifest__.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450"> <state relative-caret-position="450">
@ -503,7 +494,7 @@
<state relative-caret-position="1815"> <state relative-caret-position="1815">
<caret line="126" column="34" lean-forward="false" selection-start-line="126" selection-start-column="34" selection-end-line="126" selection-end-column="34" /> <caret line="126" column="34" lean-forward="false" selection-start-line="126" selection-start-column="34" selection-end-line="126" selection-end-column="34" />
<folding> <folding>
<element signature="e#12796#12943#0" expanded="false" /> <element signature="e#25#36#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -512,7 +503,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="720"> <state relative-caret-position="720">
<caret line="48" column="17" lean-forward="false" selection-start-line="48" selection-start-column="17" selection-end-line="48" selection-end-column="17" /> <caret line="48" column="17" lean-forward="false" selection-start-line="48" selection-start-column="17" selection-end-line="48" selection-end-column="17" />
<folding /> <folding>
<element signature="e#25#54#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -521,7 +514,7 @@
<state relative-caret-position="345"> <state relative-caret-position="345">
<caret line="26" column="28" lean-forward="false" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" /> <caret line="26" column="28" lean-forward="false" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
<folding> <folding>
<element signature="e#12796#12943#0" expanded="false" /> <element signature="e#25#36#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -550,18 +543,10 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30"> <state relative-caret-position="30">
<caret line="2" column="37" lean-forward="false" selection-start-line="2" selection-start-column="37" selection-end-line="2" selection-end-column="37" /> <caret line="2" column="37" lean-forward="false" selection-start-line="2" selection-start-column="37" selection-end-line="2" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/reports_templates.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/views/reports_templates.xml" />
<entry file="file://$PROJECT_DIR$/__manifest__.py"> <entry file="file://$PROJECT_DIR$/__manifest__.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450"> <state relative-caret-position="450">
@ -582,18 +567,13 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="675"> <state relative-caret-position="675">
<caret line="45" column="26" lean-forward="false" selection-start-line="45" selection-start-column="26" selection-end-line="45" selection-end-column="26" /> <caret line="45" column="26" lean-forward="false" selection-start-line="45" selection-start-column="26" selection-end-line="45" selection-end-column="26" />
<folding /> <folding>
</state> <element signature="e#25#54#0" expanded="true" />
</provider> </folding>
</entry>
<entry file="file://$PROJECT_DIR$/views/reports_templates.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/views/reports_templates.xml" />
<entry file="file://$PROJECT_DIR$/__manifest__.py"> <entry file="file://$PROJECT_DIR$/__manifest__.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450"> <state relative-caret-position="450">
@ -626,7 +606,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315"> <state relative-caret-position="315">
<caret line="21" column="21" lean-forward="false" selection-start-line="21" selection-start-column="4" selection-end-line="21" selection-end-column="21" /> <caret line="21" column="21" lean-forward="false" selection-start-line="21" selection-start-column="4" selection-end-line="21" selection-end-column="21" />
<folding /> <folding>
<element signature="e#25#54#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -658,61 +640,16 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/report/__init__.py"> <entry file="file://$PROJECT_DIR$/report/__init__.py" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/models/contract.py" /> <entry file="file://$PROJECT_DIR$/models/contract.py" />
<entry file="file://$PROJECT_DIR$/report/contract_full.xml"> <entry file="file://$PROJECT_DIR$/report/contract_full.xml" />
<provider selected="true" editor-type-id="text-editor"> <entry file="file://$PROJECT_DIR$/views/contract.xml" />
<state relative-caret-position="0"> <entry file="file://$PROJECT_DIR$/views/reports_templates.xml" />
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <entry file="file://$PROJECT_DIR$/views/views.xml" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/contract.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/reports_templates.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/views.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/controllers/controllers.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
<folding>
<element signature="e#25#60#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/controllers/__init__.py"> <entry file="file://$PROJECT_DIR$/controllers/__init__.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45"> <state relative-caret-position="45">
<caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" /> <caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -720,7 +657,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45"> <state relative-caret-position="45">
<caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" /> <caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -728,9 +664,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60"> <state relative-caret-position="60">
<caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" /> <caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
<folding>
<element signature="e#25#50#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -754,16 +687,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/models/contract_wizard.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405">
<caret line="27" column="59" lean-forward="false" selection-start-line="27" selection-start-column="59" selection-end-line="27" selection-end-column="59" />
<folding>
<element signature="e#25#36#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/__manifest__.py"> <entry file="file://$PROJECT_DIR$/__manifest__.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120"> <state relative-caret-position="120">
@ -780,21 +703,40 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/controllers/controllers.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/models/models.py"> <entry file="file://$PROJECT_DIR$/models/models.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-40"> <state relative-caret-position="395">
<caret line="51" column="27" lean-forward="false" selection-start-line="51" selection-start-column="27" selection-end-line="51" selection-end-column="27" /> <caret line="92" column="49" lean-forward="false" selection-start-line="92" selection-start-column="49" selection-end-line="92" selection-end-column="49" />
<folding> <folding>
<element signature="e#25#54#0" expanded="true" /> <element signature="e#25#54#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/models/contract_wizard.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<caret line="84" column="58" lean-forward="false" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
<folding>
<element signature="e#25#36#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/templates.xml"> <entry file="file://$PROJECT_DIR$/views/templates.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120"> <state relative-caret-position="531">
<caret line="8" column="58" lean-forward="false" selection-start-line="8" selection-start-column="58" selection-end-line="8" selection-end-column="58" /> <caret line="678" column="167" lean-forward="false" selection-start-line="678" selection-start-column="167" selection-end-line="678" selection-end-column="167" />
<folding> <folding>
<element signature="n#template#0;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#1;n#data#0;n#odoo#0;n#!!top" expanded="false" /> <element signature="n#template#1;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="e#1086#1091#0" expanded="true" /> <element signature="e#1086#1091#0" expanded="true" />
<element signature="e#1375#1380#0" expanded="true" /> <element signature="e#1375#1380#0" expanded="true" />
@ -815,29 +757,30 @@
<element signature="n#template#16;n#data#0;n#odoo#0;n#!!top" expanded="false" /> <element signature="n#template#16;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#17;n#data#0;n#odoo#0;n#!!top" expanded="false" /> <element signature="n#template#17;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#18;n#data#0;n#odoo#0;n#!!top" expanded="false" /> <element signature="n#template#18;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="e#29894#29899#0" expanded="true" /> <element signature="n#template#19;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="e#29904#29909#0" expanded="true" />
<element signature="e#29914#29919#0" expanded="true" />
<element signature="e#29924#29929#0" expanded="true" />
<element signature="e#29934#29939#0" expanded="true" />
<element signature="e#29944#29949#0" expanded="true" />
<element signature="n#template#20;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="e#33184#33189#0" expanded="true" />
<element signature="e#33194#33199#0" expanded="true" />
<element signature="e#33204#33209#0" expanded="true" />
<element signature="e#33214#33219#0" expanded="true" />
<element signature="e#33224#33229#0" expanded="true" />
<element signature="e#33234#33239#0" expanded="true" />
<element signature="n#template#21;n#data#0;n#odoo#0;n#!!top" expanded="false" /> <element signature="n#template#21;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="e#36637#36642#0" expanded="true" /> <element signature="e#30496#30501#0" expanded="true" />
<element signature="e#36647#36652#0" expanded="true" /> <element signature="e#30506#30511#0" expanded="true" />
<element signature="e#36657#36662#0" expanded="true" /> <element signature="e#30516#30521#0" expanded="true" />
<element signature="e#36667#36672#0" expanded="true" /> <element signature="e#30526#30531#0" expanded="true" />
<element signature="e#36677#36682#0" expanded="true" /> <element signature="e#30536#30541#0" expanded="true" />
<element signature="e#36687#36692#0" expanded="true" /> <element signature="e#30546#30551#0" expanded="true" />
<element signature="n#template#22;n#data#0;n#odoo#0;n#!!top" expanded="false" /> <element signature="n#template#22;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#23;n#data#0;n#odoo#0;n#!!top" expanded="false" /> <element signature="e#33786#33791#0" expanded="true" />
<element signature="e#33796#33801#0" expanded="true" />
<element signature="e#33806#33811#0" expanded="true" />
<element signature="e#33816#33821#0" expanded="true" />
<element signature="e#33826#33831#0" expanded="true" />
<element signature="e#33836#33841#0" expanded="true" />
<element signature="e#36962#36967#0" expanded="true" />
<element signature="e#36972#36977#0" expanded="true" />
<element signature="e#36982#36987#0" expanded="true" />
<element signature="e#36992#36997#0" expanded="true" />
<element signature="e#37002#37007#0" expanded="true" />
<element signature="e#37012#37017#0" expanded="true" />
<element signature="n#template#24;n#data#0;n#odoo#0;n#!!top" expanded="false" /> <element signature="n#template#24;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#25;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#26;n#data#0;n#odoo#0;n#!!top" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>

2
models/contract_wizard.py
View File

@ -82,7 +82,7 @@ class ContractWizard(models.TransientModel):
@api.onchange('contract_id') @api.onchange('contract_id')
def _compute_context_date(self): def _compute_context_date(self):
contract_date = datetime.strptime(self.contract_id.date, '%Y-%m-%d') contract_date = datetime.strptime(self.contract_id.date, '%Y-%m-%d')
self._context_date = contract_date.strftime('%d %b %Y') self._context_date = contract_date.strftime('%d %B %Y')
@api.onchange('partner_id') @api.onchange('partner_id')
def _compute_context_partner_contract_name(self): def _compute_context_partner_contract_name(self):

10
models/models.py
View File

@ -50,7 +50,8 @@ class PartnerContract(models.Model):
@api.model @api.model
def create(self, vals): def create(self, vals):
vals['name'] = self._calculate_contract_name(datetime.now()) datetime_now = datetime.now().strftime("%Y-%m-%d")
vals['name'] = self._calculate_contract_name(datetime_now)
return super(PartnerContract, self).create(vals) return super(PartnerContract, self).create(vals)
@ -85,7 +86,12 @@ class ResPartner(models.Model):
@api.one @api.one
@api.depends('street', 'street2', 'city', 'state_id', 'zip', 'country_id') @api.depends('street', 'street2', 'city', 'state_id', 'zip', 'country_id')
def _compute_full_adress(self): def _compute_full_adress(self):
full_adress = '{}, {}, {}, {} {}'.format(self.zip, self.country_id.name, self.city, self.street, self.street2) if self.zip:
full_adress = '{}, {}, {}, {} {}'.format(self.zip, self.country_id.name, self.city, self.street,
self.street2)
else:
full_adress = '{}, {}, {} {}'.format(self.country_id.name, self.city, self.street,
self.street2)
self.full_adress = full_adress self.full_adress = full_adress
@api.one @api.one

39
views/templates.xml
View File

@ -429,6 +429,14 @@
</td> </td>
</template> </template>
<template id="contract_inn_kpp_fiz_info">
<td>
<b><t t-esc="person.contract_name"/></b><br/>
<br/>
<br/>
</td>
</template>
<template id="contract_payment_template"> <template id="contract_payment_template">
<td valign="top"> <td valign="top">
<b>Расчетный счет</b>: <t t-esc="person.bank_account.acc_number"/><br/> <b>Расчетный счет</b>: <t t-esc="person.bank_account.acc_number"/><br/>
@ -440,6 +448,17 @@
</td> </td>
</template> </template>
<template id="contract_payment_fiz_template">
<td valign="top">
<b>Паспорт</b>: <t t-esc="person.passport_data"/><br/>
<br/>
<br/>
<b>Адрес</b>:<br/>
<t t-esc="person.full_adress"/><br/>
<b>Телефон</b>: <t t-esc="person.phone" /><br/>
</td>
</template>
<template id="contract_appex_template"> <template id="contract_appex_template">
<table align="left" width="100%"> <table align="left" width="100%">
<tr> <tr>
@ -622,7 +641,7 @@
</template> </template>
<template id="contract_bottom_contact_data_fiz_template"> <template id="contract_bottom_contact_data_fiz_template">
<table width="100%" border="0"> <table width="100%" border="0">
<tr valign="top"> <tr valign="top">
<td width="49%"> <td width="49%">
<br/><b>ПРОДАВЕЦ</b> <br/><b>ПРОДАВЕЦ</b>
@ -636,19 +655,14 @@
<t t-set="person" t-value="doc.company_id"/> <t t-set="person" t-value="doc.company_id"/>
<t t-call="client_contracts.contract_inn_kpp_info"/> <t t-call="client_contracts.contract_inn_kpp_info"/>
<t t-set="person" t-value="doc.partner_id"/> <t t-set="person" t-value="doc.partner_id"/>
<t t-call="client_contracts.contract_inn_kpp_info"/> <t t-call="client_contracts.contract_inn_kpp_fiz_info"/>
</tr> </tr>
<tr> <tr>
<t t-esc="doc.partner_id.name"/><br/> <t t-set="person" t-value="doc.company_id"/>
<br/> <t t-call="client_contracts.contract_payment_template"/>
<br/> <t t-set="person" t-value="doc.partner_id"/>
<b>Паспорт</b>: <t t-call="client_contracts.contract_payment_fiz_template"/>
<t t-esc="doc.partner_id.passport_data"/>
<b>Адрес:</b>
<t t-esc="doc.partner_id.full_adress"/>
<b>Телефон:</b>
<t t-esc="doc.partner_id.phone" />
</tr> </tr>
<tr> <tr>
<td> <td>
@ -663,7 +677,6 @@
<td colspan="3" align="left"> <td colspan="3" align="left">
<span id="br" style="display:none"><br/></span> <span id="br" style="display:none"><br/></span>
<div id="sign"><div t-field="doc.company_id.representative_id.signature" t-options="{'widget': 'image', 'border':'0', 'width':'100' }"/></div> <div id="sign"><div t-field="doc.company_id.representative_id.signature" t-options="{'widget': 'image', 'border':'0', 'width':'100' }"/></div>
<!--<div id="sign"><img src="pic/rog_sign.png" border="0" width="180"/></div>-->
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
@ -680,7 +693,7 @@
<div id="stamp">&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;<div t-field="doc.company_id.signature" t-options="{'widget': 'image', 'border':'0', 'width':'100' }"/></div> <div id="stamp">&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;<div t-field="doc.company_id.signature" t-options="{'widget': 'image', 'border':'0', 'width':'100' }"/></div>
</td> </td>
<td> <td>
</td> </td>
<td class="to_hide"></td> <td class="to_hide"></td>
</tr> </tr>
</table> </table>