Merge PR #3632 into 16.0

Signed-off-by antoniospneto
OCA · Feb 20, 2025 · 80d6ae4 · 80d6ae4
2 parents ddabb6e + 3c21e61
commit 80d6ae4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 19 deletions.
diff --git a/l10n_br_fiscal/data/operation_data.xml b/l10n_br_fiscal/data/operation_data.xml
@@ -12,7 +12,7 @@
 
     <!-- l10n_br_fiscal.operation -->
     <record id="fo_venda" model="l10n_br_fiscal.operation">
-        <field name="code">Venda</field>
+        <field name="code">VD</field>
         <field name="name">Venda</field>
         <field name="fiscal_operation_type">out</field>
         <field name="fiscal_type">sale</field>
@@ -110,7 +110,7 @@
     </record>
 
     <record id="fo_bonificacao" model="l10n_br_fiscal.operation">
-        <field name="code">Bonificação</field>
+        <field name="code">BNF</field>
         <field name="name">Bonificação</field>
         <field name="fiscal_operation_type">out</field>
         <field name="fiscal_type">other</field>
@@ -127,7 +127,7 @@
     </record>
 
     <record id="fo_devolucao_venda" model="l10n_br_fiscal.operation">
-        <field name="code">Devolução de Venda</field>
+        <field name="code">DVV</field>
         <field name="name">Devolução de Venda</field>
         <field name="fiscal_operation_type">in</field>
         <field name="fiscal_type">sale_refund</field>
@@ -163,7 +163,7 @@
     </record>
 
     <record id="fo_compras" model="l10n_br_fiscal.operation">
-        <field name="code">Compras</field>
+        <field name="code">CP</field>
         <field name="name">Compras</field>
         <field name="fiscal_operation_type">in</field>
         <field name="fiscal_type">purchase</field>
@@ -236,7 +236,7 @@
     </record>
 
     <record id="fo_devolucao_compras" model="l10n_br_fiscal.operation">
-        <field name="code">Devolução de Compras</field>
+        <field name="code">DVC</field>
         <field name="name">Devolução de Compras</field>
         <field name="fiscal_operation_type">out</field>
         <field name="fiscal_type">purchase_refund</field>
@@ -294,7 +294,7 @@
     </record>
 
     <record id="fo_entrada_remessa" model="l10n_br_fiscal.operation">
-        <field name="code">Entrada de Remessa</field>
+        <field name="code">ER</field>
         <field name="name">Entrada de Remessa</field>
         <field name="fiscal_operation_type">in</field>
         <field name="fiscal_type">other</field>
@@ -315,7 +315,7 @@
     </record>
 
     <record id="fo_simples_remessa" model="l10n_br_fiscal.operation">
-        <field name="code">Simples Remessa</field>
+        <field name="code">SR</field>
         <field name="name">Simples Remessa</field>
         <field name="fiscal_operation_type">out</field>
         <field name="fiscal_type">other</field>
@@ -336,7 +336,7 @@
     </record>
 
     <record id="fo_simples_faturamento" model="l10n_br_fiscal.operation">
-        <field name="code">Simples Faturamento</field>
+        <field name="code">SF</field>
         <field name="name">Simples Faturamento</field>
         <field name="fiscal_operation_type">out</field>
         <field name="fiscal_type">other</field>
@@ -356,7 +356,7 @@
     </record>
 
     <record id="fo_entrega_futura" model="l10n_br_fiscal.operation">
-        <field name="code">Venda - Entrega Futura</field>
+        <field name="code">VEF</field>
         <field name="name">Venda - Entrega Futura</field>
         <field name="fiscal_operation_type">out</field>
         <field name="fiscal_type">sale</field>
@@ -373,7 +373,7 @@
     </record>
 
     <record id="fo_remessa_industrializacao" model="l10n_br_fiscal.operation">
-        <field name="code">Remessa - Industrialização</field>
+        <field name="code">RI</field>
         <field name="name">Remessa para industrialização por encomenda</field>
         <field name="fiscal_operation_type">out</field>
         <field name="fiscal_type">return_out</field>
@@ -396,7 +396,7 @@
     </record>
 
     <record id="fo_entrada_industrializacao" model="l10n_br_fiscal.operation">
-        <field name="code">Entrada - Industrialização</field>
+        <field name="code">EI</field>
         <field name="name">Entrada para industrialização por encomenda</field>
         <field name="fiscal_operation_type">in</field>
         <field name="fiscal_type">other</field>
@@ -419,7 +419,7 @@
     </record>
 
     <record id="fo_retorno_reparo" model="l10n_br_fiscal.operation">
-        <field name="code">Retorno - Reparo</field>
+        <field name="code">RR</field>
         <field
             name="name"
         >Retorno de mercadoria ou bem remetido para conserto ou reparo</field>
@@ -440,7 +440,7 @@
     </record>
 
     <record id="fo_entrada_reparo" model="l10n_br_fiscal.operation">
-        <field name="code">Entrada - Reparo</field>
+        <field name="code">EMR</field>
         <field
             name="name"
         >Entrada de mercadoria ou bem remetido para conserto ou reparo</field>

diff --git a/l10n_br_fiscal/views/operation_view.xml b/l10n_br_fiscal/views/operation_view.xml
@@ -70,12 +70,6 @@
                 </header>
                 <sheet>
                     <h1 class="o_row row no-gutters d-flex">
-                        <div class="col-2">
-                            <label for="code" class="oe_edit_only" />
-                            <div class="o_row">
-                                <field name="code" class="oe_inline" />
-                            </div>
-                        </div>
                         <div class="col-10">
                             <label for="name" class="oe_edit_only" />
                             <div class="o_row d-flex">
@@ -87,6 +81,7 @@
                         <group>
                             <field name="fiscal_operation_type" />
                             <field name="fiscal_type" />
+                            <field name="code" />
                             <field name="company_id" />
                             <field name="edoc_purpose" />
                             <field