Merge pull request #467 from frePPLe/17.0

Syncing from upstream frePPLe/odoo (17.0)
brain-tec · Aug 16, 2024 · 522ea9e · 522ea9e
2 parents 31d3952 + 3e4e1f0
commit 522ea9e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/frepple/controllers/outbound.py b/frepple/controllers/outbound.py
@@ -1497,7 +1497,7 @@ def export_boms(self):
                         )
                         if not producedQty:
                             producedQty = 1
-                        if producedQty != 1:
+                        if producedQty != 1 and not subcontractor:
                             yield "<size_minimum>%s</size_minimum>\n" % producedQty
                         yield "<flows>\n"
 

diff --git a/frepple/views/sale_views.xml b/frepple/views/sale_views.xml
@@ -6,7 +6,7 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//div[@name='commitment_date_div']" position="after">
+            <xpath expr="//group[@name='sale_shipping']" position="inside">
                 <field name="_without_quote" invisible="True"/>
                 <button string="Quote" name="action_frepple_quote" type="object" class="oe_highlight" invisible="_without_quote" confirm="This will send a quote request to frepple"/>
             </xpath>