Merge branch 'initial_branch' into 'master'

Minor fixes for templates

See merge request tabulasense/client_contracts!2
This commit is contained in:
Andrey Khozov 2018-11-09 14:52:11 +05:00
commit 4594994a79
6 changed files with 143 additions and 900 deletions

6
.idea/vcs.xml generated
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

846
.idea/workspace.xml generated
View File

@ -1,846 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="f04ec5ee-004e-4a46-8928-714efbc22225" name="Default" comment="">
<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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="models.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/models/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-40">
<caret line="51" column="27" lean-forward="false" selection-start-line="51" selection-start-column="27" selection-end-line="51" selection-end-column="27" />
<folding>
<element signature="e#25#54#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="contract_wizard.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/views/contract_wizard.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1095">
<caret line="73" column="25" lean-forward="false" selection-start-line="73" selection-start-column="25" selection-end-line="73" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="contract_wizard.py" pinned="false" current-in-tab="false">
<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>
</file>
<file leaf-file-name="__manifest__.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/__manifest__.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="8" column="78" lean-forward="false" selection-start-line="8" selection-start-column="78" selection-end-line="8" selection-end-column="78" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="templates.xml" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/views/templates.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="8" column="58" lean-forward="false" selection-start-line="8" selection-start-column="58" selection-end-line="8" selection-end-column="58" />
<folding>
<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#1375#1380#0" expanded="true" />
<element signature="n#template#2;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#3;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#4;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#5;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#6;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#7;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#8;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#9;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#10;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#11;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#12;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#13;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#14;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#15;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#18;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="e#29894#29899#0" expanded="true" />
<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="e#36637#36642#0" expanded="true" />
<element signature="e#36647#36652#0" expanded="true" />
<element signature="e#36657#36662#0" expanded="true" />
<element signature="e#36667#36672#0" expanded="true" />
<element signature="e#36677#36682#0" expanded="true" />
<element signature="e#36687#36692#0" expanded="true" />
<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="n#template#24;n#data#0;n#odoo#0;n#!!top" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Python Script" />
</list>
</option>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>data</find>
<find>o.</find>
<find>valign=top</find>
<find>&lt;br&gt;</find>
</findStrings>
<replaceStrings>
<replace>docs[0].</replace>
<replace>valign=&quot;top&quot;</replace>
<replace>width=&quot;49%&quot;</replace>
<replace>&lt;br/&gt;</replace>
<replace>align=&quot;left&quot;</replace>
<replace>&lt;br /&gt;</replace>
</replaceStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/views/reports_templates.xml" />
<option value="$PROJECT_DIR$/report/contract.xml" />
<option value="$PROJECT_DIR$/report/__init__.py" />
<option value="$PROJECT_DIR$/report/contract.py" />
<option value="$PROJECT_DIR$/models/contract.py" />
<option value="$PROJECT_DIR$/report/contract_full.xml" />
<option value="$PROJECT_DIR$/views/contract.xml" />
<option value="$PROJECT_DIR$/views/res_partner.xml" />
<option value="$PROJECT_DIR$/models/__init__.py" />
<option value="$PROJECT_DIR$/__init__.py" />
<option value="$PROJECT_DIR$/controllers/__init__.py" />
<option value="$PROJECT_DIR$/controllers/controllers.py" />
<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$/models/models.py" />
<option value="$PROJECT_DIR$/views/templates.xml" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="6" />
<option name="y" value="55" />
<option name="width" value="1914" />
<option name="height" value="1076" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
<flattenPackages />
<showMembers />
<showModules />
<showLibraryContents />
<hideEmptyPackages />
<abbreviatePackageNames />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
<manualOrder />
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="client_contracts" type="b2602c69:ProjectViewProjectNode" />
<item name="client_contracts" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="client_contracts" type="b2602c69:ProjectViewProjectNode" />
<item name="client_contracts" type="462c0819:PsiDirectoryNode" />
<item name="controllers" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="client_contracts" type="b2602c69:ProjectViewProjectNode" />
<item name="client_contracts" type="462c0819:PsiDirectoryNode" />
<item name="models" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="client_contracts" type="b2602c69:ProjectViewProjectNode" />
<item name="client_contracts" type="462c0819:PsiDirectoryNode" />
<item name="security" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="client_contracts" type="b2602c69:ProjectViewProjectNode" />
<item name="client_contracts" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="client_contracts" type="b2602c69:ProjectViewProjectNode" />
<item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
</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>
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
<property name="last_opened_file_path" value="$USER_HOME$/odoo/addons/hr_eyekraft_control" />
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/views" />
<recent name="$PROJECT_DIR$/models" />
</key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="ShelveChangesManager" show_recycled="false">
<option name="remove_strategy" value="false" />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="f04ec5ee-004e-4a46-8928-714efbc22225" name="Default" comment="" />
<created>1540457007119</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1540457007119</updated>
</task>
<servers />
</component>
<component name="ToolWindowManager">
<frame x="-1" y="0" width="1922" height="1048" extended-state="6" />
<editor active="true" />
<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="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="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="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="Structure" active="false" anchor="left" 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="Terminal" 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="Debug" 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="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" 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="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="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="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>
</component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<option name="time" value="2" />
</breakpoint-manager>
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/models/models.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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/res_partner.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<caret line="21" column="31" lean-forward="false" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
<folding>
<element signature="n#record#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#1;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#2;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#3;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#4;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#5;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#6;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#7;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#8;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#9;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#10;n#odoo#0;n#!!top" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/models/contract_wizard.py">
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding>
<element signature="e#12796#12943#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/contract_wizard.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="22" column="54" lean-forward="false" selection-start-line="22" selection-start-column="54" selection-end-line="22" selection-end-column="54" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/models/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<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" />
<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$/__manifest__.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="30" column="8" lean-forward="false" selection-start-line="30" selection-start-column="8" selection-end-line="30" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/models/models.py">
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/models/contract_wizard.py">
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding>
<element signature="e#12796#12943#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/contract_wizard.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="22" column="49" lean-forward="false" selection-start-line="22" selection-start-column="49" selection-end-line="22" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/models/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<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" />
<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$/__manifest__.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="30" column="8" lean-forward="false" selection-start-line="30" selection-start-column="8" selection-end-line="30" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/res_partner.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1170">
<caret line="89" column="39" lean-forward="false" selection-start-line="89" selection-start-column="39" selection-end-line="89" selection-end-column="39" />
<folding>
<element signature="n#record#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#1;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#2;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#3;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#4;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#5;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#6;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#7;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#8;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#9;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#10;n#odoo#0;n#!!top" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/models/models.py">
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/res_partner.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
<caret line="45" column="50" lean-forward="false" selection-start-line="45" selection-start-column="50" selection-end-line="45" selection-end-column="50" />
<folding>
<element signature="n#record#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#1;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#2;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#3;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#4;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#5;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#6;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#7;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#8;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#9;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#10;n#odoo#0;n#!!top" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/contract_wizard.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="690">
<caret line="46" column="7" lean-forward="true" selection-start-line="46" selection-start-column="7" selection-end-line="46" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/models/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<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" />
<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$/__manifest__.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="30" column="8" lean-forward="false" selection-start-line="30" selection-start-column="8" selection-end-line="30" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/models/contract_wizard.py">
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding>
<element signature="e#12796#12943#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/models/models.py">
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/models/contract_wizard.py">
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding>
<element signature="e#12796#12943#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/res_partner.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="19" column="47" lean-forward="false" selection-start-line="19" selection-start-column="47" selection-end-line="19" selection-end-column="47" />
<folding>
<element signature="n#record#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#1;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#2;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#3;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#4;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#5;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#6;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#7;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#8;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#9;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#10;n#odoo#0;n#!!top" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/models/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<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" />
<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$/__manifest__.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="30" column="8" lean-forward="false" selection-start-line="30" selection-start-column="8" selection-end-line="30" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/contract_wizard.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="10" column="37" lean-forward="false" selection-start-line="10" selection-start-column="37" selection-end-line="10" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/models/models.py">
<provider selected="true" editor-type-id="text-editor">
<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" />
<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$/__manifest__.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="30" column="9" lean-forward="false" selection-start-line="30" selection-start-column="9" selection-end-line="30" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/res_partner.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1110">
<caret line="74" column="31" lean-forward="false" selection-start-line="74" selection-start-column="31" selection-end-line="74" selection-end-column="31" />
<folding>
<element signature="n#record#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#1;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#2;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#3;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#4;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#5;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#6;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#7;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#8;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#9;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#10;n#odoo#0;n#!!top" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/models/models.py">
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/__manifest__.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="435">
<caret line="29" column="32" lean-forward="false" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/res_partner.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="17" column="13" lean-forward="false" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
<folding>
<element signature="n#record#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#1;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#2;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#3;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#4;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#5;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#6;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#7;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#8;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#9;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#10;n#odoo#0;n#!!top" expanded="false" />
</folding>
</state>
</provider>
</entry>
<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$/report/contract_full.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/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">
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/models/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding>
<element signature="e#25#50#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/res_partner.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="145" column="0" lean-forward="true" selection-start-line="145" selection-start-column="0" selection-end-line="145" selection-end-column="0" />
<folding>
<element signature="n#record#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#1;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#2;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#3;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#4;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#5;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#6;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#7;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#8;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#9;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#record#10;n#odoo#0;n#!!top" expanded="false" />
</folding>
</state>
</provider>
</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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="8" column="78" lean-forward="false" selection-start-line="8" selection-start-column="78" selection-end-line="8" selection-end-column="78" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/contract_wizard.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1095">
<caret line="73" column="25" lean-forward="false" selection-start-line="73" selection-start-column="25" selection-end-line="73" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/models/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-40">
<caret line="51" column="27" lean-forward="false" selection-start-line="51" selection-start-column="27" selection-end-line="51" selection-end-column="27" />
<folding>
<element signature="e#25#54#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/templates.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="8" column="58" lean-forward="false" selection-start-line="8" selection-start-column="58" selection-end-line="8" selection-end-column="58" />
<folding>
<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#1375#1380#0" expanded="true" />
<element signature="n#template#2;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#3;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#4;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#5;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#6;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#7;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#8;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#9;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#10;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#11;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#12;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#13;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#14;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="n#template#15;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#18;n#data#0;n#odoo#0;n#!!top" expanded="false" />
<element signature="e#29894#29899#0" expanded="true" />
<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="e#36637#36642#0" expanded="true" />
<element signature="e#36647#36652#0" expanded="true" />
<element signature="e#36657#36662#0" expanded="true" />
<element signature="e#36667#36672#0" expanded="true" />
<element signature="e#36677#36682#0" expanded="true" />
<element signature="e#36687#36692#0" expanded="true" />
<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="n#template#24;n#data#0;n#odoo#0;n#!!top" expanded="false" />
</folding>
</state>
</provider>
</entry>
</component>
</project>

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):
@ -236,42 +236,77 @@ class ContractWizard(models.TransientModel):
def _compute_context_payment_term_word(self): def _compute_context_payment_term_word(self):
self._context_payment_term_word = numeral.in_words(self.payment_terms) self._context_payment_term_word = numeral.in_words(self.payment_terms)
_context_name = fields.Char(compute='_compute_context_name', readonly=True) _context_name = fields.Char(string='Contract number', compute='_compute_context_name', readonly=True)
_context_date = fields.Char(compute='_compute_context_date', readonly=True) _context_date = fields.Char(string='Contract date', compute='_compute_context_date', readonly=True)
_context_partner_contract_name = fields.Char(compute='_compute_context_partner_contract_name', readonly=True) _context_partner_contract_name = fields.Char(string='Partner contract name',
compute='_compute_context_partner_contract_name', readonly=True)
_context_partner_adress = fields.Char(compute='_compute_context_partner_adress', readonly=True) _context_partner_adress = fields.Char(compute='_compute_context_partner_adress', readonly=True)
_context_partner_representer_contract_name = fields.Char( _context_partner_representer_contract_name = fields.Char(string='partner representer contract name',
compute='_compute_context_partner_representer_contract_name', readonly=True) compute='_compute_context_partner_representer_contract_name', readonly=True)
_context_partner_inn = fields.Char(compute='_compute_context_partner_inn', readonly=True) _context_partner_inn = fields.Char(string='Partner inn', compute='_compute_context_partner_inn', readonly=True)
_context_partner_kpp = fields.Char(compute='_compute_context_partner_kpp', readonly=True) _context_partner_kpp = fields.Char(string='Partner kpp', compute='_compute_context_partner_kpp', readonly=True)
_context_partner_rs = fields.Char(compute='_compute_context_partner_rs', readonly=True) _context_partner_rs = fields.Char(string='Partner corresponding account',
_context_partner_bik = fields.Char(compute='_compute_context_partner_bik', readonly=True) compute='_compute_context_partner_rs',
_context_partner_bank = fields.Char(compute='_compute_context_partner_bank', readonly=True) readonly=True)
_context_partner_phone = fields.Char(compute='_compute_context_partner_phone', readonly=True) _context_partner_bik = fields.Char(string='Partner bank bik',
_context_partner_representer_name = fields.Char(compute='_compute_context_partner_representer_name', readonly=True) compute='_compute_context_partner_bik',
_context_seller_contract_name = fields.Char(compute='_compute_context_seller_contract_name', readonly=True) readonly=True)
_context_seller_adress = fields.Char(compute='_compute_context_seller_adress', readonly=True) _context_partner_bank = fields.Char(string='Partner bank name',
_context_seller_representer_contract_job_name = fields.Char( compute='_compute_context_partner_bank',
readonly=True)
_context_partner_phone = fields.Char(string='Partner phone',
compute='_compute_context_partner_phone',
readonly=True)
_context_partner_representer_name = fields.Char(string='Partner representer name',
compute='_compute_context_partner_representer_name',
readonly=True)
_context_seller_contract_name = fields.Char(string='Seller contract name',
compute='_compute_context_seller_contract_name',
readonly=True)
_context_seller_adress = fields.Char(string='Seller full adress',
compute='_compute_context_seller_adress',
readonly=True)
_context_seller_representer_contract_job_name = fields.Char(string='Seller representer contract job name',
compute='_compute_context_seller_representer_contract_job_name', readonly=True) compute='_compute_context_seller_representer_contract_job_name', readonly=True)
_context_seller_representer_contract_name = fields.Char(compute='_compute_context_seller_representer_contract_name', _context_seller_representer_contract_name = fields.Char(string='Seller representer contract name',
compute='_compute_context_seller_representer_contract_name',
readonly=True) readonly=True)
_context_seller_inn = fields.Char(compute='_compute_context_seller_inn', readonly=True) _context_seller_inn = fields.Char(string='Seller inn', compute='_compute_context_seller_inn', readonly=True)
_context_seller_kpp = fields.Char(compute='_compute_context_seller_kpp', readonly=True) _context_seller_kpp = fields.Char(string='Seller kpp', compute='_compute_context_seller_kpp', readonly=True)
_context_seller_rs = fields.Char(compute='_compute_context_seller_rs', readonly=True) _context_seller_rs = fields.Char(string='Seller corresponding account',
_context_seller_bik = fields.Char(compute='_compute_context_seller_bik', readonly=True) compute='_compute_context_seller_rs',
_context_seller_bank = fields.Char(compute='_compute_context_seller_bank', readonly=True) readonly=True)
_context_seller_phone = fields.Char(compute='_compute_context_seller_phone', readonly=True) _context_seller_bik = fields.Char(string='Seller bank bik', compute='_compute_context_seller_bik', readonly=True)
_context_seller_representer_job_name = fields.Char(compute='_compute_context_seller_representer_job_name', _context_seller_bank = fields.Char(string='Seller bank name', compute='_compute_context_seller_bank', readonly=True)
_context_seller_phone = fields.Char(string='Seller phone', compute='_compute_context_seller_phone', readonly=True)
_context_seller_representer_job_name = fields.Char(string='Seller representer job name',
compute='_compute_context_seller_representer_job_name',
readonly=True) readonly=True)
_context_seller_representer_name = fields.Char(compute='_compute_context_seller_representer_name', readonly=True) _context_seller_representer_name = fields.Char(string='Seller representer name',
_context_summ_rub = fields.Char(compute='_compute_context_summ_rub', readonly=True) compute='_compute_context_seller_representer_name', readonly=True)
_context_summ_rub_word = fields.Char(compute='_compute_context_summ_rub_word', readonly=True) _context_summ_rub = fields.Char(string='Contract summ(rub)', compute='_compute_context_summ_rub', readonly=True)
_context_summ_kop = fields.Char(compute='_compute_context_summ_kop', readonly=True) _context_summ_rub_word = fields.Char(string='Contract summ(rub), word',
_context_summ_word = fields.Char(compute='_compute_context_summ_word', readonly=True) compute='_compute_context_summ_rub_word',
_context_delivery_term = fields.Char(compute='_compute_context_delivery_term', readonly=True) readonly=True)
_context_delivery_term_word = fields.Char(compute='_compute_context_delivery_term_word', readonly=True) _context_summ_kop = fields.Char(string='Contract summ(kop)', compute='_compute_context_summ_kop', readonly=True)
_context_payment_term = fields.Char(compute='_compute_context_payment_term', readonly=True) _context_summ_word = fields.Char(string='Contract summ word', compute='_compute_context_summ_word', readonly=True)
_context_payment_term_word = fields.Char(compute='_compute_context_payment_term_word', readonly=True) _context_delivery_term = fields.Char(string='Contract delivery term',
compute='_compute_context_delivery_term',
readonly=True)
_context_delivery_term_word = fields.Char(string='Contract delivery term word',
compute='_compute_context_delivery_term_word',
readonly=True)
_context_payment_term = fields.Char(string='Contract payment term',
compute='_compute_context_payment_term', readonly=True)
_context_payment_term_word = fields.Char(string='Contract payment term word',
compute='_compute_context_payment_term_word', readonly=True)
_context_partner_passport_data = fields.Char(string='Partner passport data',
compute='_compute_partner_passport_data',
readonly=True)
@api.onchange('partner_id')
def _compute_partner_passport_data(self):
return self.partner_id.passport_data
@api.onchange('partner_id') @api.onchange('partner_id')
def _set_order_domain(self): def _set_order_domain(self):
@ -326,6 +361,7 @@ class ContractWizard(models.TransientModel):
'partner_rs': self.partner_id.bank_account.acc_number, 'partner_rs': self.partner_id.bank_account.acc_number,
'partner_bik': self.partner_id.bank_account.bank_id.bic, 'partner_bik': self.partner_id.bank_account.bank_id.bic,
'partner_bank': self.partner_id.bank_account.bank_id.name, 'partner_bank': self.partner_id.bank_account.bank_id.name,
'partner_passport_data': self.partner_id.passport_data,
'partner_phone': self.partner_id.phone, 'partner_phone': self.partner_id.phone,
'partner_representer_name': self.partner_id.representative_id.name, 'partner_representer_name': self.partner_id.representative_id.name,
'seller_contract_name': self.company_id.contract_name, 'seller_contract_name': self.company_id.contract_name,
@ -354,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()

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

View File

@ -65,6 +65,46 @@
<field name="description"/> <field name="description"/>
</tree> </tree>
</field> </field>
<group string="Contract values">
<group string="Contract">
<field name="_context_name"/>
<field name="_context_date"/>
<field name="_context_summ_rub"/>
<field name="_context_summ_rub_word"/>
<field name="_context_summ_kop"/>
<field name="_context_summ_word"/>
<field name="_context_delivery_term"/>
<field name="_context_delivery_term_word"/>
<field name="_context_payment_term"/>
<field name="_context_payment_term_word"/>
</group>
<group string="Company values">
<field name="_context_seller_contract_name"/>
<field name="_context_seller_adress"/>
<field name="_context_seller_representer_contract_job_name"/>
<field name="_context_seller_representer_contract_name"/>
<field name="_context_seller_inn"/>
<field name="_context_seller_kpp"/>
<field name="_context_seller_rs"/>
<field name="_context_seller_bik"/>
<field name="_context_seller_bank"/>
<field name="_context_seller_phone"/>
<field name="_context_seller_representer_job_name"/>
<field name="_context_seller_representer_name"/>
</group>
<group string="Partner values">
<field name="_context_partner_contract_name"/>
<field name="_context_partner_adress"/>
<field name="_context_partner_representer_contract_name"/>
<field name="_context_partner_inn"/>
<field name="_context_partner_kpp"/>
<field name="_context_partner_rs"/>
<field name="_context_partner_bik"/>
<field name="_context_partner_bank"/>
<field name="_context_partner_phone"/>
<field name="_context_partner_representer_name"/>
</group>
</group>
</group> </group>
<button string="Form DOCX from template" type="object" name="get_docx_contract" /> <button string="Form DOCX from template" type="object" name="get_docx_contract" />
<button string="Form contract with company" type="action" name="%(contract_company_template)d" /> <button string="Form contract with company" type="action" name="%(contract_company_template)d" />

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>