Merge PR #79 into 12.0

Signed-off-by huguesdk
coopiteasy · Sep 23, 2022 · d861527 · d861527
2 parents 6af614f + 5b75155
commit d861527
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/provelo_custom_timesheet_ui/views/hr_timesheet_sheet_views.xml b/provelo_custom_timesheet_ui/views/hr_timesheet_sheet_views.xml
@@ -14,14 +14,15 @@
     <record id="hr_timesheet_sheet_tree" model="ir.ui.view">
         <field name="name">provelo_custom_timesheet_ui.timesheet.sheet.tree</field>
         <field name="model">hr_timesheet.sheet</field>
-        <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_tree" />
+        <!--
+            Inheriting from hr_timesheet_overtime because it introduces the
+            timesheet_overtime field.
+        -->
+        <field name="inherit_id" ref="hr_timesheet_overtime.hr_timesheet_sheet_tree" />
         <field name="arch" type="xml">
             <field name="reviewer_id" position="attributes">
                 <attribute name="invisible">1</attribute>
             </field>
-            <xpath expr="//tree" position="inside">
-                <field name="timesheet_overtime" invisible="1" />
-            </xpath>
             <xpath expr="//tree" position="attributes">
                 <attribute
                     name="decoration-warning"

diff --git a/test-requirements.txt b/test-requirements.txt
@@ -1,12 +1,16 @@
 freezegun
 
 git+https://github.com/beescoop/[email protected]#subdirectory=setup/beesdoo_base
+git+https://github.com/beescoop/[email protected]#subdirectory=setup/member_card
+git+https://github.com/beescoop/[email protected]#subdirectory=setup/eater
+git+https://github.com/beescoop/[email protected]#subdirectory=setup/eater_member_card
 git+https://github.com/beescoop/[email protected]#subdirectory=setup/beesdoo_product
 git+https://github.com/beescoop/[email protected]#subdirectory=setup/beesdoo_account
 git+https://github.com/beescoop/[email protected]#subdirectory=setup/beesdoo_product_info_screen
 git+https://github.com/beescoop/[email protected]#subdirectory=setup/beesdoo_worker_status
 git+https://github.com/beescoop/[email protected]#subdirectory=setup/beesdoo_shift
 git+https://github.com/coopiteasy/[email protected]#subdirectory=setup/sale_order_volume
+git+https://github.com/coopiteasy/[email protected]#subdirectory=setup/company_supplier_context
 # git+https://github.com/coopiteasy/[email protected]#subdirectory=setup/csv_export_base
 # git+https://github.com/coopiteasy/[email protected]#subdirectory=setup/sftp_backend
 # git+https://github.com/coopiteasy/[email protected]#subdirectory=setup/csv_export_invoice