diff --git a/frontend/mgramseva/lib/screeens/add_expense/expense_details.dart b/frontend/mgramseva/lib/screeens/add_expense/expense_details.dart index ae4a8085d..a30be7781 100644 --- a/frontend/mgramseva/lib/screeens/add_expense/expense_details.dart +++ b/frontend/mgramseva/lib/screeens/add_expense/expense_details.dart @@ -579,7 +579,7 @@ class _ExpenseDetailsState extends State { onChanged: expensesDetailsProvider .expenditureDetails .allowEdit == - true + true && expensesDetailsProvider.expenditureDetails.isBillPaid == false ? expensesDetailsProvider .onChangeOfCheckBox : null), @@ -594,7 +594,7 @@ class _ExpenseDetailsState extends State { color: expensesDetailsProvider .expenditureDetails .allowEdit == - true + true && expensesDetailsProvider.expenditureDetails.isBillPaid == false ? Colors.black : Colors.grey, fontWeight: diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/textfields.scss b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/textfields.scss index 6d73f74e6..a17a34578 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/textfields.scss +++ b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/textfields.scss @@ -11,10 +11,10 @@ } .employee-card-input-only { - @apply mb-lg pl-sm outline-none block border w-full h-12 border-input-border border-solid bg-white leading-10 text-form-field text-text-primary; } .employee-card-input-only .employee-card-input { border: none; + @apply mb-lg pl-sm outline-none block border w-full h-12 border-input-border border-solid bg-white leading-10 text-form-field text-text-primary; } diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/index.js index 50c5a0c62..5e93c376a 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/index.js @@ -42,10 +42,7 @@ const EmployeeApp = ({ path, url, userType }) => { {" "} / {location.pathname === `/${window?.contextPath}/employee/hrms/inbox` ? t("HR_COMMON_HEADER") : t("HR_COMMON_HEADER")}

- +
history.goBack()}>

Back