From 5bf4b9bda586958f6d50441858873fc41ab14aca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Marques?= <joao.marques@tecnativa.com>
Date: Mon, 17 May 2021 08:51:23 +0100
Subject: [PATCH] [FIX] account_payment_order: Change security group category +
 Make post move field invisible in payment modes + fix account move views

- Change security group category
  Before this change, the group was creating a new section in each user's settings called "Other" with a field called "Other Extra Rights" that could select "Accounting / Payments" as an option
  This places it in the correct location
  TT29182
- Make post move field invisible in payment modes
  When the generate_moves option is not selected, the post_move option should not be available
  TT29182
- fix account move views
  Current spec was causing weird display in account move view, both for customer invoices and vendor bills
  Changing the placement and adding back the label fixes the issue
  TT29027
---
 account_payment_order/__manifest__.py                | 2 +-
 account_payment_order/security/payment_security.xml  | 2 +-
 account_payment_order/views/account_invoice_view.xml | 3 +--
 account_payment_order/views/account_payment_mode.xml | 5 ++++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/account_payment_order/__manifest__.py b/account_payment_order/__manifest__.py
index 61088d2c7..bebcc280e 100644
--- a/account_payment_order/__manifest__.py
+++ b/account_payment_order/__manifest__.py
@@ -8,7 +8,7 @@
 
 {
     "name": "Account Payment Order",
-    "version": "14.0.1.0.5",
+    "version": "14.0.1.2.0",
     "license": "AGPL-3",
     "author": "ACSONE SA/NV, "
     "Therp BV, "
diff --git a/account_payment_order/security/payment_security.xml b/account_payment_order/security/payment_security.xml
index 3513f33d7..38a7336eb 100644
--- a/account_payment_order/security/payment_security.xml
+++ b/account_payment_order/security/payment_security.xml
@@ -7,7 +7,7 @@
                 name="users"
                 eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"
             />
-            <field name="category_id" ref="base.module_category_extra" />
+            <field name="category_id" ref="base.module_category_usability" />
         </record>
     </data>
     <data noupdate="1">
diff --git a/account_payment_order/views/account_invoice_view.xml b/account_payment_order/views/account_invoice_view.xml
index 7e04be0b1..62d7331e5 100644
--- a/account_payment_order/views/account_invoice_view.xml
+++ b/account_payment_order/views/account_invoice_view.xml
@@ -42,11 +42,10 @@
             <field name="payment_mode_id" position="after">
                 <field name="payment_order_ok" invisible="1" />
             </field>
-            <field name="ref" position="before">
+            <field name="ref" position="after">
                 <field
                     name="reference_type"
                     required="1"
-                    nolabel="1"
                     attrs="{'readonly':[('state','!=','draft')],
                                'invisible': [('move_type', 'not in', ('out_invoice', 'out_refund'))]}"
                 />
diff --git a/account_payment_order/views/account_payment_mode.xml b/account_payment_order/views/account_payment_mode.xml
index 136629183..a5cf26d98 100644
--- a/account_payment_order/views/account_payment_mode.xml
+++ b/account_payment_order/views/account_payment_mode.xml
@@ -57,7 +57,10 @@
                         name="move_option"
                         attrs="{'invisible': [('generate_move', '=', False)], 'required': [('generate_move', '=', True)]}"
                     />
-                    <field name="post_move" />
+                    <field
+                        name="post_move"
+                        attrs="{'invisible': [('generate_move', '=', False)]}"
+                    />
                 </group>
             </group>
         </field>