Merge pull request #483 from frePPLe/18.0

Syncing from upstream frePPLe/odoo (18.0)
brain-tec · Oct 11, 2024 · 3ac6e21 · 3ac6e21
2 parents 3d38901 + f04fc89
commit 3ac6e21
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 19 deletions.
diff --git a/autologin/__manifest__.py b/autologin/__manifest__.py
@@ -16,7 +16,7 @@
     "author": "frePPLe",
     "license": "Other OSI approved licence",
     "category": "Uncategorized",
-    "version": "18.0.0",
+    "version": "18.0.0.0",
     "depends": ["base", "web"],
     "data": [],
     "demo": [],

diff --git a/autologin/controllers/controllers.py b/autologin/controllers/controllers.py
@@ -20,7 +20,8 @@ def web_login(self, redirect=None, **kw):
             # Force a login
             main.ensure_db()
             uid = request.session.authenticate(
-                request.session.db, ADMIN_USERID, ADMIN_PASSWORD
+                request.session.db,
+                {"login": ADMIN_USERID, "password": ADMIN_PASSWORD, "type": "password"},
             )
             request.params["login_success"] = True
             request.params["password"] = ADMIN_PASSWORD

diff --git a/frepple/views/mrp_secondary_workcenter.xml b/frepple/views/mrp_secondary_workcenter.xml
@@ -4,14 +4,14 @@
         <field name="name">mrp.secondary.workcenter.tree</field>
         <field name="model">mrp.secondary.workcenter</field>
         <field name="arch" type="xml">
-            <tree string="Secondary Work Centers">
+            <form string="Secondary Work Centers">
                 <field name="routing_workcenter_id" invisible="1"/>
                 <field name="workcenter_id"/>
                 <field name="skill"/>
                 <field name="search_mode" optional="show"/>
                 <field name="priority" optional="show"/>
                 <field name="duration"/>
-            </tree>
+            </form>
         </field>
     </record>
     <record id="mrp_secondary_workcenter_form_view" model="ir.ui.view">

diff --git a/frepple/views/mrp_skill.xml b/frepple/views/mrp_skill.xml
@@ -26,10 +26,10 @@
         <field name="name">MRP Skill List</field>
         <field name="model">mrp.skill</field>
         <field name="arch" type="xml">
-            <tree>
+            <form>
                 <field name="name" />
                 <field name="description" />
-            </tree>
+            </form>
         </field>
     </record>
 </odoo>
diff --git a/frepple/views/mrp_workcenter_skill.xml b/frepple/views/mrp_workcenter_skill.xml
@@ -26,11 +26,11 @@
         <field name="name">MRP Work Center Skill List</field>
         <field name="model">mrp.workcenter.skill</field>
         <field name="arch" type="xml">
-            <tree>
+            <form>
                 <field name="workcenter" invisible="context.get('workcenter_invisible', False)"/>
                 <field name="skill" />
                 <field name="priority" />
-            </tree>
+            </form>
         </field>
     </record>
 </odoo>
diff --git a/frepple/views/mrp_workorder_secondary_workcenter.xml b/frepple/views/mrp_workorder_secondary_workcenter.xml
@@ -5,11 +5,11 @@
         <field name="name">mrp.workorder.secondary.workcenter.tree</field>
         <field name="model">mrp.workorder.secondary.workcenter</field>
         <field name="arch" type="xml">
-            <tree>
+            <form>
                 <field name="workorder_id" invisible="1"/>
                 <field name="workcenter_id"/>
                 <field name="duration"/>
-            </tree>
+            </form>
         </field>
     </record>
     <record id="mrp_workorder_secondary_workcenter_form_view" model="ir.ui.view">

diff --git a/frepple/views/quote_views.xml b/frepple/views/quote_views.xml
@@ -89,13 +89,13 @@
         <field name="name">frepple_quote.post.view.tree</field>
         <field name="model">frepple.quote</field>
         <field name="arch" type="xml">
-            <tree string="">
+            <form string="">
                 <field name="product_id"/>
                 <field name="warehouse_id"/>
                 <field name="quantity"/>
                 <field name="promised_delivery_date"/>
                 <field name="last_quoted"/>
-            </tree>
+            </form>
         </field>
     </record>
 

diff --git a/freppledata/__manifest__.py b/freppledata/__manifest__.py
@@ -6,7 +6,7 @@
     "author": "frePPLe",
     "license": "Other OSI approved licence",
     "category": "Uncategorized",
-    "version": "18.0.0",
+    "version": "18.0.0.0",
     "depends": ["mrp_subcontracting"],
     "data": [
         "data/product.template.csv",

diff --git a/freppledata/data/product.template.csv b/freppledata/data/product.template.csv
@@ -1,7 +1,7 @@
 id,sequence,name,default_code,list_price,standard_price,product_variant_ids/id,type
-__export__.product_template_47_6a3d5615,1,chair,,25,0,__export__.product_product_54_eb19f380,Storable Product
-__export__.product_template_44_67fbc973,1,chair leg,,1,0,__export__.product_product_55_ac47c67d,Storable Product
-__export__.product_template_46_a06bf0d6,1,cushion,,1,0,__export__.product_product_56_ea472d4f,Storable Product
-__export__.product_template_48_019c3042,1,varnish,,1,0,__export__.product_product_57_9ea5498d,Storable Product
-__export__.product_template_43_c7599540,1,varnished chair,,90,45,__export__.product_product_57_5aef267e,Storable Product
-__export__.product_template_45_403ca5bc,1,wooden beam - 木头,,1,0,__export__.product_product_58_8eba4d11,Storable Product
+__export__.product_template_47_6a3d5615,1,chair,,25,0,__export__.product_product_54_eb19f380,consu
+__export__.product_template_44_67fbc973,1,chair leg,,1,0,__export__.product_product_55_ac47c67d,consu
+__export__.product_template_46_a06bf0d6,1,cushion,,1,0,__export__.product_product_56_ea472d4f,consu
+__export__.product_template_48_019c3042,1,varnish,,1,0,__export__.product_product_57_9ea5498d,consu
+__export__.product_template_43_c7599540,1,varnished chair,,90,45,__export__.product_product_57_5aef267e,consu
+__export__.product_template_45_403ca5bc,1,wooden beam - 木头,,1,0,__export__.product_product_58_8eba4d11,consu