agriculture: PR review changes

agriculture/__manifest__.py

@@ -6,7 +6,7 @@
 Tailored setup for agricultural retail businesses engaged in B2B and B2C sales of farming products.
 Point of Sale (POS) stores & website offer categorised items such as seeds, pesticides, plant nutrition, and farming equipment.
 
-They utilize a suite of modules including Point of Sale, Inventory, Sales, Purchase, Survey,Accounting, Contact, Dashboard, Barcode, and Documents.
+They utilize a suite of modules including Point of Sale, Inventory, Sales, Purchase, Survey, Accounting, Contact and Dashboard.
 Expanding into the online realm, a website and E-commerce applications can significantly aid their growth in the agricultural retail sector.
 """,
     'depends': [

agriculture/data/ir_actions_server.xml

@@ -5,11 +5,6 @@
         <field name="model_id" ref = "crm.model_crm_lead"/>
         <field name="state">code</field>
         <field name="code"><![CDATA[
-if records.x_answer:
-    raise UserError("Survey alrady done, You can create new Lead/Opportunity and take new survey.")
-if not records.x_survey:
-    raise UserError("Survey not selected.")
-
 user_input = records.x_survey._create_answer(user=env.user)
 records.write({'x_answer': user_input.id})
 action = {

agriculture/data/ir_ui_view.xml

@@ -22,7 +22,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='stage_id']" position="after">
-                <button name="%(action_lead_survey_start)d" string="Survey Start" class="btn btn-primary" type="action" invisible="x_answer != False"/>
+                <button name="%(action_lead_survey_start)d" string="Survey Start" class="btn btn-primary" type="action" invisible="(x_answer != False) or (x_survey == False)"/>
             </xpath>
             <xpath expr="//field[@name='tag_ids']" position="after">
                 <field name="x_survey"/>
@@ -39,7 +39,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='uom_po_id']" position="after">
-                <field name="x_binary_field_product_template" widget="image"/>
+                <field name="x_binary_field_product_template" />
             </xpath>
         </field>
     </record>

agriculture/data/knowledge_article.xml

@@ -19,7 +19,7 @@
                 </p>
                 <p>
                     <span style="color: rgb(52, 53, 65); font-style: normal; font-weight: 400;">
-                        They utilize a suite of modules including Point of Sale, Inventory, Sales, Purchase, Survey, Accounting, Contact, Dashboard, Barcode, and Documents. Expanding into the online realm, a website and E-commerce applications can significantly aid their growth in the agricultural retail sector.
+                        They utilize a suite of modules including Point of Sale, Inventory, Sales, Purchase, Survey, Accounting, Contact and Dashboard. Expanding into the online realm, a website and E-commerce applications can significantly aid their growth in the agricultural retail sector.
                     </span>
                 </p>
                 <div data-oe-protected="true" class="o_knowledge_behavior_anchor o_knowledge_behavior_type_toc">

agriculture/demo/sale_order_post.xml

@@ -4,16 +4,13 @@
     <function name="action_confirm" model="sale.order" eval="[[ref('sale_order_1'), ref('sale_order_2')]]"/>
 
     <function name="button_validate" model="stock.picking" context="{'skip_sms': True}">
-        <value model="stock.picking" eval="obj().env.ref('agriculture.sale_order_1').procurement_group_id.stock_move_ids.picking_id.ids"/>
+        <value model="stock.picking" eval="obj().env.ref('agriculture.sale_order_1').picking_ids.ids"/>
     </function>
 
     <!-- Create Invoice -->
-    <record id="sale_advance_payment_inv_2" model="sale.advance.payment.inv">
-        <field name="advance_payment_method">delivered</field>
-        <field name="sale_order_ids" eval="[Command.set([ref('sale_order_2')])]"/>
-    </record>
-
-    <function model="sale.advance.payment.inv" name="create_invoices" eval="[ref('sale_advance_payment_inv_2')]"/>
+    <function name="_create_invoices" model="sale.order">
+        <value eval="[ref('sale_order_2')]"/>
+    </function>
 
     <!-- Confirm invoice -->
     <function model="account.move" name="action_post">

agriculture/demo/website_views.xml

@@ -365,8 +365,8 @@
                                 <div class="row s_nb_column_fixed">
                                     <div class="col-lg-10 offset-lg-1 o_colored_level pb0" style="text-align: center;">
                                         <figure class="figure">
-                                            <img src="/web/image/ir_attachment_663" alt="pile of red tomatoes" class="figure-img img-thumbnail padding-large img img-fluid o_we_custom_image" data-original-id="652" data-original-src="/web/image/ir_attachment_663" data-mimetype="image/webp" data-resize-width="690" loading="lazy"/>
-                                            <figcaption class="figure-caption text-muted py-3 o_default_snippet_text">&amp; ;
+                                            <img src="/web/image/agriculture.ir_attachment_663" alt="pile of red tomatoes" class="figure-img img-thumbnail padding-large img img-fluid o_we_custom_image" data-original-id="652" data-original-src="/web/image/agriculture.ir_attachment_663" data-mimetype="image/webp" data-resize-width="690" loading="lazy"/>
+                                            <figcaption class="figure-caption text-muted py-3 o_default_snippet_text">
                                                 <br/>
                                             </figcaption>
                                         </figure>
@@ -397,22 +397,22 @@
                                 <div id="slideshow_1691666581660" class="carousel slide" data-bs-ride="carousel" data-bs-interval="0" style="margin: 0 12px;">
                                     <div class="carousel-inner" style="padding: 0;">
                                         <div class="carousel-item">
-                                            <img src="/web/image/configurator_1_library_image_08" alt="green plants" class="img img-fluid d-block o_we_custom_image" data-original-id="653" data-original-src="/web/image/configurator_1_library_image_08" data-mimetype="image/webp" data-resize-width="962" loading="lazy"/>
+                                            <img src="/web/image/agriculture.configurator_1_library_image_08" alt="green plants" class="img img-fluid d-block o_we_custom_image" data-original-id="653" data-original-src="/web/image/agriculture.configurator_1_library_image_08" data-mimetype="image/webp" data-resize-width="962" loading="lazy"/>
                                         </div>
                                         <div class="carousel-item">
-                                            <img src="/web/image/configurator_1_library_image_03" alt="selective focus photography of pathway between tomato plants" class="img img-fluid d-block o_we_custom_image" data-original-id="654" data-original-src="/web/image/configurator_1_library_image_03" data-mimetype="image/webp" data-resize-width="962" loading="lazy"/>
+                                            <img src="/web/image/agriculture.configurator_1_library_image_03" alt="selective focus photography of pathway between tomato plants" class="img img-fluid d-block o_we_custom_image" data-original-id="654" data-original-src="/web/image/agriculture.configurator_1_library_image_03" data-mimetype="image/webp" data-resize-width="962" loading="lazy"/>
                                         </div>
                                         <div class="carousel-item active">
-                                            <img src="/web/image/ir_attachment_688" alt="close view of three red tomatoes" class="img img-fluid d-block o_we_custom_image" data-original-id="655" data-original-src="/web/image/ir_attachment_688" data-mimetype="image/webp" data-resize-width="962" loading="lazy"/>
+                                            <img src="/web/image/agriculture.ir_attachment_688" alt="close view of three red tomatoes" class="img img-fluid d-block o_we_custom_image" data-original-id="655" data-original-src="/web/image/agriculture.ir_attachment_688" data-mimetype="image/webp" data-resize-width="962" loading="lazy"/>
                                         </div>
                                     </div>
                                     <ul class="carousel-indicators">
                                         <li class="o_indicators_left text-center d-none" aria-label="Previous" title="Previous">
                                             <i class="oi oi-chevron-left"/>
                                         </li>
-                                        <li data-bs-target="#slideshow_1691666581660" data-bs-slide-to="0" style="background-image: url(/web/image/configurator_1_library_image_08)"/>
-                                        <li data-bs-target="#slideshow_1691666581660" data-bs-slide-to="1" style="background-image: url(/web/image/configurator_1_library_image_03)"/>
-                                        <li data-bs-target="#slideshow_1691666581660" data-bs-slide-to="2" style="background-image: url(/web/image/ir_attachment_688);" class="active" aria-current="true"/>
+                                        <li data-bs-target="#slideshow_1691666581660" data-bs-slide-to="0" style="background-image: url(/web/image/agriculture.configurator_1_library_image_08)"/>
+                                        <li data-bs-target="#slideshow_1691666581660" data-bs-slide-to="1" style="background-image: url(/web/image/agriculture.configurator_1_library_image_03)"/>
+                                        <li data-bs-target="#slideshow_1691666581660" data-bs-slide-to="2" style="background-image: url(/web/image/agriculture.ir_attachment_688);" class="active" aria-current="true"/>
                                         <li class="o_indicators_right text-center d-none" aria-label="Next" title="Next">
                                             <i class="oi oi-chevron-right"/>
                                         </li>
@@ -467,7 +467,7 @@
                                 <div id="slideshow_1691667559828" class="carousel slide" data-bs-ride="carousel" data-bs-interval="0" style="margin: 0 12px;">
                                     <div class="carousel-inner" style="padding: 0;">
                                         <div class="carousel-item">
-                                            <img src="web/image/configurator_1_library_image_08" alt="2 sliced tomato on white surface" class="img img-fluid d-block o_we_custom_image" data-original-id="692" data-original-src="web/image/configurator_1_library_image_08" data-mimetype="image/webp" data-resize-width="962" loading="lazy"/>
+                                            <img src="web/image/agriculture.configurator_1_library_image_08" alt="2 sliced tomato on white surface" class="img img-fluid d-block o_we_custom_image" data-original-id="692" data-original-src="web/image/agriculture.configurator_1_library_image_08" data-mimetype="image/webp" data-resize-width="962" loading="lazy"/>
                                         </div>
                                         <div class="carousel-item">
                                             <img src="/web/image/ir_attachment_710" class="img img-fluid d-block o_we_custom_image" data-original-id="693" data-original-src="/web/image/ir_attachment_710" data-mimetype="image/webp" data-resize-width="612" loading="lazy"/>
@@ -480,7 +480,7 @@
                                         <li class="o_indicators_left text-center d-none" aria-label="Previous" title="Previous">
                                             <i class="oi oi-chevron-left"/>
                                         </li>
-                                        <li data-bs-target="#slideshow_1691667559828" data-bs-slide-to="0" style="background-image: url(web/image/configurator_1_library_image_08)"/>
+                                        <li data-bs-target="#slideshow_1691667559828" data-bs-slide-to="0" style="background-image: url(web/image/agriculture.configurator_1_library_image_08)"/>
                                         <li data-bs-target="#slideshow_1691667559828" data-bs-slide-to="1" style="background-image: url(/web/image/ir_attachment_710);"/>
                                         <li data-bs-target="#slideshow_1691667559828" data-bs-slide-to="2" style="background-image: url(/web/image/ir_attachment_718);" class="active" aria-current="true"/>
                                         <li class="o_indicators_right text-center d-none" aria-label="Next" title="Next">
@@ -521,7 +521,7 @@
                                 <div class="row s_nb_column_fixed">
                                     <div class="col-lg-10 offset-lg-1 o_colored_level pb0" style="text-align: center;">
                                         <figure class="figure">
-                                            <img src="/web/image/vermi_compost_powder" alt="person holding brown soil in tilt shift lens" class="figure-img img-thumbnail padding-large img img-fluid o_we_custom_image" data-bs-original-title="" aria-describedby="tooltip369674"/>
+                                            <img src="/web/image/agriculture.vermi_compost_powder" alt="person holding brown soil in tilt shift lens" class="figure-img img-thumbnail padding-large img img-fluid o_we_custom_image" data-bs-original-title="" aria-describedby="tooltip369674"/>
                                             <figcaption class="figure-caption text-muted py-3">
                                                 <br/>
                                             </figcaption>