From b701586edc312496f9e4bc5b56496ecc75c7773a Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis.delattre@akretion.com>
Date: Wed, 25 Oct 2023 21:38:06 +0200
Subject: [PATCH] base_usability: form view of partner: zip/city/state (instead
 of state/city/zip)

---
 base_usability/__manifest__.py                |  1 +
 base_usability/static/src/scss/form_view.scss | 10 ++++++++++
 base_usability/views/assets.xml               | 15 +++++++++++++++
 base_usability/views/res_partner.xml          |  4 ++++
 4 files changed, 30 insertions(+)
 create mode 100644 base_usability/static/src/scss/form_view.scss
 create mode 100644 base_usability/views/assets.xml

diff --git a/base_usability/__manifest__.py b/base_usability/__manifest__.py
index 8d611d9..5312382 100644
--- a/base_usability/__manifest__.py
+++ b/base_usability/__manifest__.py
@@ -21,6 +21,7 @@
         'views/ir_module.xml',
         'views/ir_sequence.xml',
         'views/ir_property.xml',
+        'views/assets.xml',
         ],
     'installable': True,
 }
diff --git a/base_usability/static/src/scss/form_view.scss b/base_usability/static/src/scss/form_view.scss
new file mode 100644
index 0000000..8634c5b
--- /dev/null
+++ b/base_usability/static/src/scss/form_view.scss
@@ -0,0 +1,10 @@
+.o_form_view {
+    .o_address_format {
+        .o_address_state {
+            margin-right: 0;
+        }
+        .o_address_zip {
+            margin-right: 2%;
+        }
+    }
+}
diff --git a/base_usability/views/assets.xml b/base_usability/views/assets.xml
new file mode 100644
index 0000000..f8c1f63
--- /dev/null
+++ b/base_usability/views/assets.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <template
+        id="assets_backend"
+        name="web_sheet_full_width"
+        inherit_id="web.assets_backend"
+    >
+        <xpath expr="." position="inside">
+            <link
+                rel="stylesheet"
+                href="/base_usability/static/src/scss/form_view.scss"
+            />
+        </xpath>
+    </template>
+</odoo>
diff --git a/base_usability/views/res_partner.xml b/base_usability/views/res_partner.xml
index 829560b..13c985f 100644
--- a/base_usability/views/res_partner.xml
+++ b/base_usability/views/res_partner.xml
@@ -20,6 +20,10 @@
         <div attrs="{'invisible': [('same_vat_partner_id', '=', False)]}" position="attributes">
             <attribute name="class">alert alert-warning</attribute>
         </div>
+        <!-- Native order: city / state_id / zip. New order: zip / city / state_id -->
+        <xpath expr="//div[hasclass('o_address_format')]/field[@name='city']" position="before">
+            <field name="zip" position="move"/>
+        </xpath>
     </field>
 </record>