Merge PR #15 into 14.0

Signed-off-by andhit-r
open-synergy · Feb 3, 2024 · dfd9a5f · dfd9a5f
2 parents 7137822 + 05f6caa
commit dfd9a5f
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 3 deletions.
diff --git a/ssi_rma/views/rma_mixin_view.xml b/ssi_rma/views/rma_mixin_view.xml
@@ -252,4 +252,19 @@
             </xpath>
         </field>
     </record>
+
+    <record id="rma_mixin_view_form1" model="ir.ui.view">
+        <field name="name">rma_mixin - Form - Editable Stock Move</field>
+        <field name="model">rma_order_mixin</field>
+        <field name="inherit_id" ref="ssi_rma.rma_mixin_view_form" />
+        <field name="groups_id" eval="[(4, ref('base.group_system'))]" />
+        <field name="arch" type="xml">
+            <xpath
+                expr="//page[@name='move']/field[@name='stock_move_ids']"
+                position="attributes"
+            >
+                <attribute name="readonly">0</attribute>
+            </xpath>
+        </field>
+    </record>
 </odoo>
diff --git a/ssi_rma/views/supplier_rma_out_views.xml b/ssi_rma/views/supplier_rma_out_views.xml
@@ -10,11 +10,11 @@
     <field name="view_mode">tree,form</field>
     <field
             name="domain"
-            eval="[('picking_type_category_id','=',ref('ssi_rma.picking_category_cro'))]"
+            eval="[('picking_type_category_id','=',ref('ssi_rma.picking_category_sro'))]"
         />
     <field
             name="context"
-            eval="{'default_picking_type_category_id':ref('ssi_rma.picking_category_cro')}"
+            eval="{'default_picking_type_category_id':ref('ssi_rma.picking_category_sro')}"
         />
 </record>
 

diff --git a/ssi_rma_account/views/rma_customer_views.xml b/ssi_rma_account/views/rma_customer_views.xml
@@ -58,7 +58,7 @@
                     position="after"
                 >
                 <page name="aml" string="Journal Items">
-                    <field name="account_move_line_ids" />
+                    <field name="account_move_line_ids" readonly="1" />
                 </page>
             </xpath>
             <xpath
@@ -100,4 +100,19 @@
         </data>
     </field>
 </record>
+
+<record id="rma_customer_view_form1" model="ir.ui.view">
+    <field name="name">RMA Customers - Form - Editable Journal Items</field>
+    <field name="model">rma_customer</field>
+    <field name="inherit_id" ref="ssi_rma_account.rma_customer_view_form" />
+    <field name="groups_id" eval="[(4, ref('base.group_system'))]" />
+    <field name="arch" type="xml">
+        <xpath
+                expr="//page[@name='aml']/field[@name='account_move_line_ids']"
+                position="attributes"
+            >
+            <attribute name="readonly">0</attribute>
+        </xpath>
+    </field>
+</record>
 </odoo>
diff --git a/ssi_rma_account/views/rma_supplier_views.xml b/ssi_rma_account/views/rma_supplier_views.xml
@@ -93,4 +93,19 @@
         </data>
     </field>
 </record>
+
+<record id="rma_supplier_view_form1" model="ir.ui.view">
+    <field name="name">RMA Supplier - Form - Editable Journal Items</field>
+    <field name="model">rma_supplier</field>
+    <field name="inherit_id" ref="ssi_rma_account.rma_supplier_view_form" />
+    <field name="groups_id" eval="[(4, ref('base.group_system'))]" />
+    <field name="arch" type="xml">
+        <xpath
+                expr="//page[@name='aml']/field[@name='account_move_line_ids']"
+                position="attributes"
+            >
+            <attribute name="readonly">0</attribute>
+        </xpath>
+    </field>
+</record>
 </odoo>