Feature RM#84194:Expense: Re-add ‘Complete my...’ menu entries

axelor-human-resource/src/main/java/com/axelor/apps/hr/web/expense/ExpenseController.java

@@ -150,16 +150,18 @@ public void editExpense(ActionRequest request, ActionResponse response) {
       response.setView(
           ActionView.define(I18n.get("Expense"))
               .model(Expense.class.getName())
-              .add("form", "expense-form")
+              .add("form", "complete-my-expense-form")
               .context("_payCompany", Beans.get(UserHrService.class).getPayCompany(user))
+              .context("_isEmployeeReadOnly", true)
               .map());
     } else if (expenseList.size() == 1) {
       response.setView(
           ActionView.define(I18n.get("Expense"))
               .model(Expense.class.getName())
-              .add("form", "expense-form")
+              .add("form", "complete-my-expense-form")
               .param("forceEdit", "true")
               .context("_showRecord", String.valueOf(expenseList.get(0).getId()))
+              .context("_isEmployeeReadOnly", true)
               .map());
     } else {
       response.setView(
@@ -190,10 +192,11 @@ public void editExpenseSelected(ActionRequest request, ActionResponse response)
     response.setView(
         ActionView.define(I18n.get("Expense"))
             .model(Expense.class.getName())
-            .add("form", "expense-form")
+            .add("form", "complete-my-expense-form")
             .param("forceEdit", "true")
             .domain("self.id = " + expenseId)
             .context("_showRecord", expenseId)
+            .context("_isEmployeeReadOnly", true)
             .map());
   }
 

axelor-human-resource/src/main/resources/apps/roles/expense_metaMenu.csv

@@ -10,3 +10,4 @@
 "conf-expense-type";"Expense Manager"
 "kilometric-allow-param-all";"Employee Manager"
 "top-menu-hr-my-expense";"Expense Manager|Expense User|Expense Read"
+"edit-expense";"Expense Manager|Expense User|Expense Read"

axelor-human-resource/src/main/resources/data-init/input/meta_metaMenu.csv

@@ -73,6 +73,7 @@
 "top-menu-hr-my-expense";"Admin"
 "top-menu-hr-my-leave-request";"Admin"
 "top-menu-hr-my-extra-hours";"Admin"
+"edit-expense";"Admin"
 "edit-timesheet";"Admin"
 "edit-leave-request";"Admin"
 "edit-extra-hours";"Admin"

axelor-human-resource/src/main/resources/i18n/messages.csv

@@ -172,6 +172,7 @@
 "Company fixed phone",,,
 "Company's credit card",,,
 "Complete",,,
+"Complete my expense",,,
 "Complete my leave request",,,
 "Complete my timesheet",,,
 "Completed",,,

axelor-human-resource/src/main/resources/i18n/messages_en.csv

@@ -172,6 +172,7 @@
 "Company fixed phone",,,
 "Company's credit card",,,
 "Complete",,,
+"Complete my expense",,,
 "Complete my leave request",,,
 "Complete my timesheet",,,
 "Completed",,,

axelor-human-resource/src/main/resources/i18n/messages_fr.csv

@@ -172,6 +172,7 @@
 "Company fixed phone","N° de téléphone de la société",,
 "Company's credit card","CB de la société",,
 "Complete",,,
+"Complete my expense","Compléter ma note de frais",,
 "Complete my leave request","Compléter ma demande de congés",,
 "Complete my timesheet","Compléter ma feuille de temps",,
 "Completed",,,

axelor-human-resource/src/main/resources/views/Expense.xml

@@ -247,6 +247,13 @@
     </panel>
   </form>
 
+  <form name="complete-my-expense-form" title="Expense" model="com.axelor.apps.hr.db.Expense"
+    width="large" onNew="action-expense-group-form-onNew" onLoad="action-expense-group-form-onLoad"
+    onSave="action-expense-method-validate-and-compute" canDelete="ventilated == false"
+    canNew="false">
+    <panel-include view="expense-form"/>
+  </form>
+
   <action-group name="action-expense-group-form-onNew">
     <action name="action-expense-record-default"/>
     <action name="action-expense-attrs-hide-button-readonly-field"/>
@@ -396,7 +403,7 @@
     <attribute name="readonly" for="company" expr="eval: statusSelect &gt; 2"
       if="__user__.employee?.hrManager"/>
     <attribute name="readonly" for="employee"
-      expr="eval: statusSelect &gt; 2 || (!__user__.employee?.hrManager &amp;&amp; __repo__(Employee).all().filter('self.managerUser.id = ?', __user__.id).count() == 0)"/>
+      expr="eval: statusSelect &gt; 2 || (!__user__.employee?.hrManager &amp;&amp; __repo__(Employee).all().filter('self.managerUser.id = ?', __user__.id).count() == 0) || _isEmployeeReadOnly"/>
   </action-attrs>
 
   <action-attrs name="action-expense-attrs-expense-company-cb">

axelor-human-resource/src/main/resources/views/Menu.xml

@@ -36,10 +36,13 @@
     <context name="to_justify_leave_reason" expr="eval: false"/>
   </action-view>
 
-  <menuitem name="all-expense" parent="my-hr-root" title="Expenses" action="expense.all"
-    order="300" if="__config__.app.isApp('expense')" icon="credit-card-fill"
+  <menuitem name="edit-expense" parent="my-hr-root" title="Complete my expense"
+    action="edit.expense" order="300" if="__config__.app.isApp('expense')" icon="credit-card-fill"
     icon-background="#84429f"/>
 
+  <menuitem name="all-expense" parent="my-hr-root" title="Expenses" action="expense.all"
+    order="310" if="__config__.app.isApp('expense')" icon="list-task" icon-background="#84429f"/>
+
   <action-view name="expense.all" model="com.axelor.apps.hr.db.Expense"
     title="My Expenses">
     <view name="expense-grid" type="grid"/>
@@ -53,7 +56,7 @@
   </action-view>
 
   <menuitem name="my-hr-root-expense-declaration" parent="my-hr-root"
-    title="Expenses declaration" action="my.hr.root.expense.declaration" order="310"
+    title="Expenses declaration" action="my.hr.root.expense.declaration" order="320"
     if="__config__.app.isApp('expense') &amp;&amp; __config__.app.getApp('expense')?.enableExpenseDeclaration"
     icon="credit-card-fill" icon-background="#84429f"/>