Merge branch 'feature/payroll' into feature/america

client/src/pages/shop/shop.page.component.jsx

@@ -54,9 +54,12 @@ export function ShopPage({ bodyshop, setSelectedHeader, setBreadcrumbs }) {
         <Tabs.TabPane tab={t("bodyshop.labels.employees")} key="employees">
           <ShopEmployeesContainer />
         </Tabs.TabPane>
-        <Tabs.TabPane tab={t("bodyshop.labels.employee_teams")} key="teams">
-          <ShopTeamsContainer />
-        </Tabs.TabPane>
+        {
+          bodyshop.md_tasks_presets.enable_tasks && 
+          <Tabs.TabPane tab={t("bodyshop.labels.employee_teams")} key="teams">
+            <ShopTeamsContainer />
+          </Tabs.TabPane>
+        }
         <Tabs.TabPane tab={t("bodyshop.labels.licensing")} key="licensing">
           <ShopInfoUsersComponent />
         </Tabs.TabPane>

client/src/pages/time-tickets/time-tickets.container.jsx

@@ -19,6 +19,7 @@ import {
   setBreadcrumbs,
   setSelectedHeader,
 } from "../../redux/application/application.actions";
+import TimeTicketsCommit from "../../components/time-tickets-commit/time-tickets-commit.component";
 
 const mapStateToProps = createStructuredSelector({});
 
@@ -74,6 +75,7 @@ export function TimeTicketsContainer({
               <Space wrap>
                 <TimeTicketsAttendanceTable />
                 <TimeTicketsPayrollTable />
+                <TimeTicketsCommit timetickets={data ? data.timetickets : []} />
                 <TimeTicketsDatesSelector />
               </Space>
             }