[ADD] commodity_trading: PR review changes

odoo · Mar 5, 2024 · c6d92cc · c6d92cc
1 parent 51650ea
commit c6d92cc
Show file tree

Hide file tree

Showing 17 changed files with 83 additions and 215 deletions.
diff --git a/commodity_trading/__manifest__.py b/commodity_trading/__manifest__.py
@@ -12,19 +12,13 @@
         'knowledge',
         'mrp_account',
         'product_expiry',
-        # 'product_images',
         'purchase_mrp',
         'quality_control_worksheet',
-        'quality_mrp',
         'quality_mrp_workorder',
         'sale_mrp',
-        # 'sale_planning',
         'sale_project',
         'stock_dropshipping',
         'stock_picking_batch',
-        # 'website_appointment',
-        # 'website_crm',
-        # 'website_crm_partner_assign',
     ],
     'data': [
         'data/res_config_settings.xml',
@@ -65,4 +59,5 @@
     ],
     'license': 'OPL-1',
     'images': ['images/main.png'],
+    'maintenance_loc': 157,
 }
diff --git a/commodity_trading/data/ir_actions_act_window.xml b/commodity_trading/data/ir_actions_act_window.xml
@@ -9,38 +9,10 @@
     <record id="action_weighing_scale_grn_details" model="ir.actions.act_window">
         <field name="name">Weighing Scale/GRN Details</field>
         <field name="res_model">x_weighing_scale_grn_d</field>
-        <field name="help">
-            <![CDATA[
-                <p class="o_view_nocontent_smiling_face">
-                    This is your new action.
-                </p>
-                <p>By default, it contains a list and a form view and possibly
-                    other view types depending on the options you chose for your model.
-                </p>
-                <p>
-                    You can start customizing these screens by clicking on the Studio
-                    icon on the top right corner (you can also customize this help message there).
-                </p>
-            ]]>
-        </field>
     </record>
     <record id="action_weighing_scale_master" model="ir.actions.act_window">
         <field name="name">Weighing Scale Master</field>
         <field name="res_model">x_weighing_scale_maste</field>
-        <field name="help">
-            <![CDATA[
-                <p class="o_view_nocontent_smiling_face">
-                    This is your new action.
-                </p>
-                <p>By default, it contains a list and a form view and possibly
-                    other view types depending on the options you chose for your model.
-                </p>
-                <p>
-                    You can start customizing these screens by clicking on the Studio
-                    icon on the top right corner (you can also customize this help message there).
-                </p>
-            ]]>
-        </field>
     </record>
     <record id="action_x_quality_check_worksheet_template_1" model="ir.actions.act_window">
         <field name="name">Worksheets</field>

diff --git a/commodity_trading/data/ir_model.xml b/commodity_trading/data/ir_model.xml
@@ -13,7 +13,7 @@
         <field name="is_mail_activity" eval="True"/>
     </record>
     <record id="model_worksheet_template_1" model="ir.model">
-        <field name="name">Inward checking</field>
+        <field name="name">Inward Checking</field>
         <field name="model">x_quality_check_worksheet_template_2</field>
     </record>
 </odoo>
diff --git a/commodity_trading/data/ir_model_access.xml b/commodity_trading/data/ir_model_access.xml
@@ -34,15 +34,6 @@
         <field name="perm_write" eval="True"/>
         <field name="perm_unlink" eval="True"/>
     </record>
-    <record id="ir_model_access_1211" model="ir.model.access">
-        <field name="name">x_quality_check_worksheet_template_1_manager_access</field>
-        <field name="model_id" ref="model_worksheet_template_1"/>
-        <field name="group_id" ref="quality.group_quality_manager"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
-    </record>
     <record id="ir_model_access_1212" model="ir.model.access">
         <field name="name">x_quality_check_worksheet_template_1_user_access</field>
         <field name="model_id" ref="model_worksheet_template_1"/>

diff --git a/commodity_trading/data/ir_model_fields.xml b/commodity_trading/data/ir_model_fields.xml
@@ -57,7 +57,6 @@
         <field name="ttype">float</field>
         <field name="compute"><![CDATA[for record in self:record['x_net_weight'] = record.x_gross_weight-record.x_weight]]></field>
         <field name="depends">x_gross_weight,x_weight</field>
-        <field name="readonly" eval="True"/>
     </record>
     <record id="new_decimal_inward_x_admixture" model="ir.model.fields">
         <field name="name">x_admixture</field>
@@ -71,12 +70,6 @@
         <field name="field_description">Split Broken(%)</field>
         <field name="ttype">float</field>
     </record>
-<!--    <record id="new_decimal_inward_x_moisture_" model="ir.model.fields">-->
-<!--        <field name="name">x_moisture_</field>-->
-<!--        <field name="model_id" ref="model_worksheet_template_1"/>-->
-<!--        <field name="field_description">Moisture (%)</field>-->
-<!--        <field name="ttype">float</field>-->
-<!--    </record>-->
     <record id="new_decimal_inward_c_x_moisture" model="ir.model.fields">
         <field name="name">x_moisture</field>
         <field name="model_id" ref="model_worksheet_template_1"/>
@@ -108,7 +101,6 @@
         <field name="ttype">float</field>
         <field name="compute">for record in self:record['x_net_weight_1'] = record.x_gross_weight-record.x_weight</field>
         <field name="depends">x_gross_weight,x_weight</field>
-        <field name="readonly" eval="True"/>
     </record>
     <record id="new_integer_lot_seri_x_number_of_bags" model="ir.model.fields">
         <field name="name">x_number_of_bags</field>
@@ -156,38 +148,16 @@
         <field name="ttype">many2one</field>
         <field name="relation">x_weighing_scale_maste</field>
     </record>
-
-<!--    Remove if not used-->
-<!--    <record id="new_related_field_pu_x_broker_1" model="ir.model.fields">-->
-<!--        <field name="name">x_broker_1</field>-->
-<!--        <field name="model_id" ref="purchase.model_purchase_order"/>-->
-<!--        <field name="field_description">Broker </field>-->
-<!--        <field name="ttype">many2one</field>-->
-<!--        <field name="relation">res.partner</field>-->
-<!--        <field name="related">x_broker</field>-->
-<!--    </record>-->
-<!--    <record id="new_signature_weighi_x_binary_field_9bh_1h7fon2cr" model="ir.model.fields">-->
-<!--        <field name="name">x_binary_field_9bh_1h7fon2cr</field>-->
-<!--        <field name="model_id" ref="model_weighing_scale_grn_details"/>-->
-<!--        <field name="field_description">New Signature</field>-->
-<!--        <field name="ttype">binary</field>-->
-<!--    </record>-->
-<!--    <record id="new_signature_weighi_x_binary_field_2v9_1h7fqn99b" model="ir.model.fields">-->
-<!--        <field name="name">x_binary_field_2v9_1h7fqn99b</field>-->
-<!--        <field name="model_id" ref="model_weighing_scale_grn_details"/>-->
-<!--        <field name="field_description">New Signature </field>-->
-<!--        <field name="ttype">binary</field>-->
-<!--    </record>-->
     <record id="new_text_batch_trans_x_weighing_receipt_number" model="ir.model.fields">
         <field name="name">x_weighing_receipt_number</field>
         <field name="model_id" ref="stock_picking_batch.model_stock_picking_batch"/>
-        <field name="field_description">Weighing Receipt Number.</field>
+        <field name="field_description">Weighing Receipt Number</field>
         <field name="ttype">char</field>
     </record>
     <record id="new_text_batch_trans_x_driver_name" model="ir.model.fields">
         <field name="name">x_driver_name</field>
         <field name="model_id" ref="stock_picking_batch.model_stock_picking_batch"/>
-        <field name="field_description">Driver Name.</field>
+        <field name="field_description">Driver Name</field>
         <field name="ttype">char</field>
     </record>
     <record id="new_text_batch_trans_x_truck_no" model="ir.model.fields">
@@ -196,44 +166,18 @@
         <field name="field_description">Truck No.</field>
         <field name="ttype">char</field>
     </record>
-<!--    <record id="new_text_weighing_x_char_field_957_1h7fp35mg" model="ir.model.fields">-->
-<!--        <field name="name">x_char_field_957_1h7fp35mg</field>-->
-<!--        <field name="model_id" ref="model_weighing_scale_grn_details"/>-->
-<!--        <field name="field_description">Truck No:</field>-->
-<!--        <field name="ttype">char</field>-->
-<!--    </record>-->
     <record id="new_text_weighing_x_truck_no" model="ir.model.fields">
         <field name="name">x_truck_no</field>
         <field name="model_id" ref="model_weighing_scale_grn_details"/>
         <field name="field_description">Truck No.</field>
         <field name="ttype">char</field>
     </record>
-<!--    <record id="new_text_weighing_sc_x_char_field_7sa_1h7fp4aoe" model="ir.model.fields">-->
-<!--        <field name="name">x_char_field_7sa_1h7fp4aoe</field>-->
-<!--        <field name="model_id" ref="model_weighing_scale_grn_details"/>-->
-<!--        <field name="field_description">New Text</field>-->
-<!--        <field name="ttype">char</field>-->
-<!--    </record>-->
     <record id="new_text_weighing_sc_x_driver_name" model="ir.model.fields">
         <field name="name">x_driver_name</field>
         <field name="model_id" ref="model_weighing_scale_grn_details"/>
         <field name="field_description">Driver Name</field>
         <field name="ttype">char</field>
     </record>
-<!--    <record id="pipeline_status_bar_x_selection_field_22u_1h7fovskt" model="ir.model.fields">-->
-<!--        <field name="name">x_selection_field_22u_1h7fovskt</field>-->
-<!--        <field name="model_id" ref="model_weighing_scale_grn_details"/>-->
-<!--        <field name="field_description">Pipeline status bar</field>-->
-<!--        <field name="ttype">selection</field>-->
-<!--        <field name="selection">[('status1', 'First Status')]</field>-->
-<!--    </record>-->
-<!--    <record id="pipeline_status_bar_x_selection_field_9ns_1h7foveaj" model="ir.model.fields">-->
-<!--        <field name="name">x_selection_field_9ns_1h7foveaj</field>-->
-<!--        <field name="model_id" ref="model_weighing_scale_grn_details"/>-->
-<!--        <field name="field_description">Pipeline status bar</field>-->
-<!--        <field name="ttype">selection</field>-->
-<!--        <field name="selection">[('status1', 'First Status'), ('status2', 'Second Status')]</field>-->
-<!--    </record>-->
     <record id="sequence_weighing_x_sequence" model="ir.model.fields">
         <field name="name">x_sequence</field>
         <field name="model_id" ref="model_weighing_scale_grn_details"/>

diff --git a/commodity_trading/data/ir_ui_view.xml b/commodity_trading/data/ir_ui_view.xml
@@ -2,7 +2,6 @@
 <odoo>
     <record id="report_custom_x_quality_check_worksheet_template_1" model="ir.ui.view">
         <field name="name">x_quality_check_worksheet_template_2</field>
-        <field name="key">gen_key.500ba5</field>
         <field name="type">qweb</field>
         <field name="arch" type="xml">
             <t t-name="x_quality_check_worksheet_template_2">
@@ -48,6 +47,18 @@
                         </h1>
                     </div>
                     <group name="group_weighing_scale"/>
+                    <xpath expr="//group[@name='group_weighing_scale']" position="replace">
+                        <group>
+                            <group>
+                                <field name="x_warehouse" options="{'no_create': True}"/>
+                                <xpath expr="//field[@name='x_name']" position="move"/>
+                            </group>
+                        </group>
+                    </xpath>
+                    <xpath expr="//field[@name='x_name']" position="attributes">
+                        <attribute name="placeholder"/>
+                        <attribute name="required"/>
+                    </xpath>
                 </sheet>
                 <div class="oe_chatter" name="oe_chatter">
                     <field name="message_follower_ids"/>
@@ -57,30 +68,6 @@
             </form>
         </field>
     </record>
-    <record id="x_weighing_scale_maste_form_view_inherit" model="ir.ui.view">
-        <field name="name">Default form view for x_weighing_scale_maste customization</field>
-        <field name="mode">extension</field>
-        <field name="model">x_weighing_scale_maste</field>
-        <field name="inherit_id" ref="x_weighing_scale_maste_form_view"/>
-        <field name="priority">99</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <data>
-                <xpath expr="//group[@name='group_weighing_scale']" position="replace">
-                    <group>
-                        <group>
-                            <field name="x_warehouse" options="{'no_create': True}"/>
-                            <xpath expr="//field[@name='x_name']" position="move"/>
-                        </group>
-                    </group>
-                </xpath>
-                <xpath expr="//field[@name='x_name']" position="attributes">
-                    <attribute name="placeholder"/>
-                    <attribute name="required"/>
-                </xpath>
-            </data>
-        </field>
-    </record>
     <record id="x_weighing_scale_grn_details_form_view" model="ir.ui.view">
         <field name="name">Default form view for x_weighing_scale_grn_d</field>
         <field name="model">x_weighing_scale_grn_d</field>
@@ -102,18 +89,6 @@
                     <field name="message_ids"/>
                     <field name="activity_ids"/>
                 </div>
-            </form>
-        </field>
-    </record>
-    <record id="x_weighing_scale_grn_details_form_view_inherit" model="ir.ui.view">
-        <field name="name">Default form view for x_weighing_scale_grn_d customization</field>
-        <field name="mode">extension</field>
-        <field name="model">x_weighing_scale_grn_d</field>
-        <field name="inherit_id" ref="x_weighing_scale_grn_details_form_view"/>
-        <field name="priority">99</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <data>
                 <xpath expr="//group[@name='group_weighing_scale_grn']" position="replace">
                     <group>
                         <group>
@@ -130,10 +105,9 @@
                     </group>
                 </xpath>
                 <xpath expr="//field[@name='x_name']" position="replace"/>
-            </data>
+            </form>
         </field>
     </record>
-
     <record id="x_weighing_scale_grn_details_list_view" model="ir.ui.view">
         <field name="name">Default list view for x_weighing_scale_grn_d</field>
         <field name="model">x_weighing_scale_grn_d</field>
@@ -193,7 +167,6 @@
         <field name="arch" type="xml">
             <data>
                 <xpath expr="//page[@name='inventory']/group[2]/field" position="inside">
-<!--                <xpath expr="/form[1]/sheet[1]/notebook[1]/page[5]/group[2]/field[1]" position="inside">-->
                     <tree string="Product Packagings" name="packaging" editable="bottom">
                         <field name="sequence" widget="handle"/>
                         <field name="name"/>
@@ -377,7 +350,6 @@
             </data>
         </field>
     </record>
-
     <record id="view_production_lot_form_inherit_commodity_trading" model="ir.ui.view">
         <field name="name">stock.production.lot.form.customization.commodity.trading</field>
         <field name="mode">extension</field>