From f19f69b0cb1df847f357256707edafa404bfe033 Mon Sep 17 00:00:00 2001
From: Stepan Savelyev <stepan.savelyev@rydlab.ru>
Date: Wed, 25 Dec 2019 15:52:25 +0500
Subject: [PATCH] Revert "Revert "[IMP] l10n to russian_requisites""

This reverts commit 77b88b9316e0434dd02493f4325c2259d4959b3e.
---
 __manifest__.py       |  2 +-
 models/res_partner.py |  9 ---------
 views/res_partner.xml | 29 +++++++++++++----------------
 3 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/__manifest__.py b/__manifest__.py
index df21843..accd7ce 100644
--- a/__manifest__.py
+++ b/__manifest__.py
@@ -10,7 +10,7 @@
     "website": "http://rydlab.ru",
     "category": "Invoicing & Payments",
     "version": "0.1.1",
-    "depends": ["base", "contacts", "l10n_ru_doc", "sale",],
+    "depends": ["base", "contacts", "russian_requisites", "sale",],
     "data": [
         "data/fields_default.xml",
         "data/payment_terms.xml",
diff --git a/models/res_partner.py b/models/res_partner.py
index 6a8e573..8170d81 100644
--- a/models/res_partner.py
+++ b/models/res_partner.py
@@ -17,15 +17,6 @@ class ResPartner(models.Model):
         compute="_compute_full_address"
     )  # Check for res.partner.contact_address in base/res
     street_actual = fields.Many2one("res.partner", string="Actual Address",)
-    passport_authority = fields.Char(
-        string="Passport Authority", help="What Department issued the passport",
-    )
-    passport_date = fields.Date(
-        string="Passport Issue Date", help="Date when receive a passport",
-    )
-    passport_number = fields.Char(string="Passport Number",)
-    passport_series = fields.Char(string="Passport Series",)
-    psrn = fields.Char(string="PSRN", help="Primary State Registration Number",)
     representative_id = fields.Many2one(
         "res.partner", string="Representative", help="Person, who represents company"
     )
diff --git a/views/res_partner.xml b/views/res_partner.xml
index 7c4cd34..f6f45a1 100644
--- a/views/res_partner.xml
+++ b/views/res_partner.xml
@@ -44,33 +44,30 @@
             <xpath expr="//field[@name='category_id']" position="after">
 
                 <field name="representative_id" domain="[('company_type', '=', 'person')]" attrs="{'invisible': [('company_type', '!=', 'company')]}"/>
-
-                <field name="passport_series" attrs="{'invisible': [('company_type', '=', 'company')]}"/>
-                <field name="passport_number" attrs="{'invisible': [('company_type', '=', 'company')]}"/>
-                <field name="passport_date" attrs="{'invisible': [('company_type', '=', 'company')]}"/>
-                <field name="passport_authority" attrs="{'invisible': [('company_type', '=', 'company')]}"/>
-
                 <field name="signature" widget="image"/>
 
             </xpath>
 
-            <xpath expr="//field[@name='okpo']" position="after">
+            <xpath expr="//page[@name='internal_notes']" position="before">
 
-                <field name="psrn" attrs="{'invisible': [('company_type', '=', 'person')]}"/>
-                <field name="bank_ids" attrs="{'invisible': [('company_type', '=', 'person')]}">
-                    <tree>
-                        <field name="acc_number"/>
-                        <field name="bank_id"/>
-                    </tree>
-                </field>
+                <page string="Banks" name="banks">
+                    <group>
+                        <field name="bank_ids" attrs="{'invisible': [('company_type', '=', 'person')]}">
+                            <tree>
+                                <field name="acc_number"/>
+                                <field name="bank_id"/>
+                            </tree>
+                        </field>
+                    </group>
+                </page>
 
             </xpath>
 
-            <xpath expr="//field[@name='vat']" position="before">
+            <!-- <xpath expr="//field[@name='vat']" position="before">
 
                 <field name="street_actual"/>
 
-            </xpath>
+            </xpath> -->
 
             <xpath expr="//field[@name='function']" position="after">
                 <field name="function_parent_case" attrs="{'invisible': [('is_company','=', True)]}"/>