automatic update repo with commit - 'Update .gitlab-ci.yml' from project L10n_ru

l10n_ru_contract/views/contract_customer_view.xml

@@ -332,26 +332,26 @@
 
             </field>
         </record>
-        <menuitem name="Договоры" id="contract.main" parent="sale.sale_menu_root"/>
-        <menuitem name="Договоры" id="contract.contracts" parent="contract.main"
-                  action="contract.contract_customer_action2"/>
+        <menuitem name="Договоры" id="l10n_ru_contract.main" parent="sale.sale_menu_root"/>
+        <menuitem name="Договоры" id="l10n_ru_contract.contracts" parent="l10n_ru_contract.main"
+                  action="l10n_ru_contract.contract_customer_action2"/>
 
-        <menuitem name="Договоры" id="contract.main1" parent="purchase.menu_purchase_root"/>
-        <menuitem name="Договоры" id="contract.contracts1" parent="contract.main1"
-                  action="contract.contract_customer_action1"/>
+        <menuitem name="Договоры" id="l10n_ru_contract.main1" parent="purchase.menu_purchase_root"/>
+        <menuitem name="Договоры" id="l10n_ru_contract.contracts1" parent="l10n_ru_contract.main1"
+                  action="l10n_ru_contract.contract_customer_action1"/>
 
-        <menuitem name="Настройка" id="separator" parent="contract.main"/>
+        <menuitem name="Настройка" id="separator" parent="l10n_ru_contract.main"/>
         <menuitem name="Виды договоров" id="contract_profiles" parent="separator"
-                  action="contract.contract_profile_action"/>
+                  action="l10n_ru_contract.contract_profile_action"/>
         <menuitem name="Включенные договора" id="contract_profile_setting" parent="separator"
-                  action="contract.contract_allowed_profiles_action"/>
+                  action="l10n_ru_contract.contract_allowed_profiles_action"/>
 
 
-        <menuitem name="Настройка" id="separator1" parent="contract.main1"/>
+        <menuitem name="Настройка" id="separator1" parent="l10n_ru_contract.main1"/>
         <menuitem name="Виды договоров" id="contract_profiles1" parent="separator1"
-                  action="contract.contract_profile_action"/>
+                  action="l10n_ru_contract.contract_profile_action"/>
         <menuitem name="Включенные договора" id="contract_profile_setting1" parent="separator1"
-                  action="contract.contract_allowed_profiles_action"/>
+                  action="l10n_ru_contract.contract_allowed_profiles_action"/>
 
 
     </data>

l10n_ru_doc/demo/l10n_ru_doc_demo.xml

@@ -17,7 +17,7 @@
         </record>
 
         <record id="base.main_partner" model="res.partner">
-            <field name="image">iVBORw0KGgoAAAANSUhEUgAAALQAAABACAYAAACzzl09AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2lpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDE0IDc5LjE1MTQ4MSwgMjAxMy8wMy8xMy0xMjowOToxNSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDoxMGE3N2JhNy01MThlLTMwNGEtODcxOC0wMmQ5MWYzYTdiNTUiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MjQ2QTI3QjdCQ0JCMTFFMzgwRTQ4NjcwRjlEM0QyMTAiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MjQ2QTI3QjZCQ0JCMTFFMzgwRTQ4NjcwRjlEM0QyMTAiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChXaW5kb3dzKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkYzOTcwMjU2QkNCOTExRTM5OEZFRDU5OUQxQUU3MUUzIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkYzOTcwMjU3QkNCOTExRTM5OEZFRDU5OUQxQUU3MUUzIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+LLXcsQAAAjFJREFUeNrs3TFKM0EUB3BXv+QAgqViYWflBQLbWNhZKwE7QQSPkCMIItgJQW+gtjmCBxLZr34zsMPDiCK/X6c7swPxz/B4zJhuGIYN+Cs2fQQINAg0fL9/5S+6o6NUUT28v3dh/s1NnP/5OT7/7i7Ov7qK83d24vjFoht7X/f4GOfv78f5fd/5s9uhQaBBoGGdNXSzRs7W2GWNfH09On+4v4/jF4vcehcXcf5qpdFuhwaBBoEGgQaBRqBBoOHnNPvQ2b7zxtZWnF+e7SieV+uVZzkOD0efV33r8ixH38f5RV/a2Q47NAg0CDQkde4UYocGgQaBhpT6TuF8Hovq7e3w43B7O36nr+9z55dXq9hHXi7j/N3dOL7RN+6Oj8fXn07j+15e9KHt0CDQINDwpRp6WC5TdwDTNXKjxh7m8zB+mr0TOJnE972+xvVPTzXe7dAg0CDQsNYa+rf58DfCDo1Ag0DDL6+hu7Oz2Kc9OIjPi7MeZd+6/H/Q3WyW6vtWZzlms/j86Smuf34e1/+IVXd1tqM4y4EdGgQaBBqS3CnEDg0CDQINOXUf+u0tdyfw5CSeN354iPP39kbHV+snz19X3+FS9tHLO5HFeOzQINAg0PDVGrpZIzdq7OHyMjU+XSO3vufw+XmtdyKxQ4NAg0BDq4aeNCZMfGbYoUGgQaBRQ4+aJvvI1VmO8k5g8bzsW1fvS/aRm3cii/c522GHBoEGgYYkdwqxQ4NAg0BDzn8BBgBlrqW6k1gn5wAAAABJRU5ErkJggg==</field>
+            <field name="image_1920">iVBORw0KGgoAAAANSUhEUgAAALQAAABACAYAAACzzl09AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2lpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDE0IDc5LjE1MTQ4MSwgMjAxMy8wMy8xMy0xMjowOToxNSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDoxMGE3N2JhNy01MThlLTMwNGEtODcxOC0wMmQ5MWYzYTdiNTUiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MjQ2QTI3QjdCQ0JCMTFFMzgwRTQ4NjcwRjlEM0QyMTAiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MjQ2QTI3QjZCQ0JCMTFFMzgwRTQ4NjcwRjlEM0QyMTAiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChXaW5kb3dzKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkYzOTcwMjU2QkNCOTExRTM5OEZFRDU5OUQxQUU3MUUzIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkYzOTcwMjU3QkNCOTExRTM5OEZFRDU5OUQxQUU3MUUzIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+LLXcsQAAAjFJREFUeNrs3TFKM0EUB3BXv+QAgqViYWflBQLbWNhZKwE7QQSPkCMIItgJQW+gtjmCBxLZr34zsMPDiCK/X6c7swPxz/B4zJhuGIYN+Cs2fQQINAg0fL9/5S+6o6NUUT28v3dh/s1NnP/5OT7/7i7Ov7qK83d24vjFoht7X/f4GOfv78f5fd/5s9uhQaBBoGGdNXSzRs7W2GWNfH09On+4v4/jF4vcehcXcf5qpdFuhwaBBoEGgQaBRqBBoOHnNPvQ2b7zxtZWnF+e7SieV+uVZzkOD0efV33r8ixH38f5RV/a2Q47NAg0CDQkde4UYocGgQaBhpT6TuF8Hovq7e3w43B7O36nr+9z55dXq9hHXi7j/N3dOL7RN+6Oj8fXn07j+15e9KHt0CDQINDwpRp6WC5TdwDTNXKjxh7m8zB+mr0TOJnE972+xvVPTzXe7dAg0CDQsNYa+rf58DfCDo1Ag0DDL6+hu7Oz2Kc9OIjPi7MeZd+6/H/Q3WyW6vtWZzlms/j86Smuf34e1/+IVXd1tqM4y4EdGgQaBBqS3CnEDg0CDQINOXUf+u0tdyfw5CSeN354iPP39kbHV+snz19X3+FS9tHLO5HFeOzQINAg0PDVGrpZIzdq7OHyMjU+XSO3vufw+XmtdyKxQ4NAg0BDq4aeNCZMfGbYoUGgQaBRQ4+aJvvI1VmO8k5g8bzsW1fvS/aRm3cii/c522GHBoEGgYYkdwqxQ4NAg0BDzn8BBgBlrqW6k1gn5wAAAABJRU5ErkJggg==</field>
             <field name="email">codup-test@mail.ru</field>
             <field name="website">www.codup.com</field>
             <field name="inn">0000000000</field>
@@ -31,7 +31,7 @@
             <field name="street2">дом № 13</field>
             <field name="zip">123456</field>
             <field name="city">г.Москва</field>
-            <field name="rml_header1">CodUP</field>
+            <!-- <field name="rml_header1">CodUP</field> -->
             <field name="chief_id" ref="base.user_root"/>
             <field name="accountant_id" ref="base.user_demo"/>
             <field name="print_facsimile">1</field>

l10n_ru_doc/models/res_partner.py

@@ -3,9 +3,36 @@ class ResPartner(models.Model):
     _inherit = 'res.partner'
 
     inn = fields.Char('INN', related='vat')
-    kpp = fields.Char('KPP', size=9)
-    okpo = fields.Char('OKPO', size=14)
-    ogrn = fields.Char('ОГРН')
+    kpp = fields.Char('KPP', size=9)  # iec
+    okpo = fields.Char('OKPO', size=14)  # okpo
+    ogrn = fields.Char('ОГРН')  # psrn
     type = fields.Selection(selection_add=[('director', 'Директор'), ('accountant', 'Бухгалтер')])
     facsimile = fields.Binary("Подпись")
     stamp = fields.Binary("Печать")
+
+    arceat = fields.Char(  # основной код по ОКВЭД
+        string="Main code ARCEAT",
+        help="All-Russian classifier of economic activity types, Main code for company"
+        "\nFormat: 00.00 or 00.00.0 or 00.00.00",
+    )
+
+    psrn_sp = fields.Char(  # огрн ип
+        string="PSRN SP",
+        help="Primary State Registration Number of Sole Proprietorship"
+        "\nContains 15 digits. First digit should be 3",
+    )
+
+    company_form = fields.Selection(
+        selection=[
+            ("sp", "Sole Proprietor"),
+            ("pshp", "Partnership"),
+            ("coop", "Cooperative"),
+            ("plc", "Private Limited Company"),
+            ("jsc", "Joint stock company"),
+            ("pc", "Public company"),
+            ("ga", "Government agency"),
+            ("сjsc", "Сlosed joint stock company"),
+        ],
+        string="Institutional-Legal Form",
+        default="plc",
+    )

l10n_ru_doc/views/res_partner_view.xml

@@ -12,6 +12,9 @@
                 <field name="kpp" invisible="is_company==False"/>
                 <field name="okpo" invisible="is_company==False"/>
                 <field name="ogrn" invisible="is_company==False"/>
+                <field name="company_form"/>
+                <field name="arceat" invisible="is_company == False or company_form == 'sp'" />
+                <field name="psrn_sp" invisible="is_company == False or company_form != 'sp'" />
             </xpath>
             <xpath expr="//field[@name='vat']" position="attributes">
                 <attribute name="string">ИНН</attribute>