diff --git a/packages/apps/purchase/src/api/supplier-api.js b/packages/apps/purchase/src/api/supplier-api.js index 725fcfb0cc..de8b7308f3 100644 --- a/packages/apps/purchase/src/api/supplier-api.js +++ b/packages/apps/purchase/src/api/supplier-api.js @@ -44,6 +44,7 @@ export async function searchSupplier({page = 0, searchValue}) { model: 'com.axelor.apps.base.db.Partner', criteria: createSupplierCriteria(searchValue), fieldKey: 'purchase_supplier', + sortKey: 'purchase_supplier', page, }); } diff --git a/packages/apps/purchase/src/i18n/fr.json b/packages/apps/purchase/src/i18n/fr.json index b71c754aab..befa869d86 100644 --- a/packages/apps/purchase/src/i18n/fr.json +++ b/packages/apps/purchase/src/i18n/fr.json @@ -2,11 +2,11 @@ "Purchase_Purchase": "Achats", "Purchase_InternalRequests": "Demandes internes", "Purchase_Status_Draft": "Brouillon", - "Purchase_Status_Requested": "Demandé", - "Purchase_Status_Accepted": "Accepté", - "Purchase_Status_Purchased": "Acheté", - "Purchase_Status_Refused": "Refusé", - "Purchase_Status_Canceled": "Annulé", + "Purchase_Status_Requested": "Demandée", + "Purchase_Status_Accepted": "Acceptée", + "Purchase_Status_Purchased": "Achetée", + "Purchase_Status_Refused": "Refusée", + "Purchase_Status_Canceled": "Annulée", "Purchase_Supplier": "Fournisseur", "Purchase_SliceAction_SearchPurchaseRequest": "recherche sur les demandes d'achat", "Purchase_SliceAction_SearchSupplier": "recherche sur les fournisseurs" diff --git a/packages/apps/purchase/src/models/sortFields.ts b/packages/apps/purchase/src/models/sortFields.ts index 9d0651ad93..1f58a5201d 100644 --- a/packages/apps/purchase/src/models/sortFields.ts +++ b/packages/apps/purchase/src/models/sortFields.ts @@ -19,5 +19,5 @@ import {SortFields} from '@axelor/aos-mobile-core'; export const purchase_sortFields: SortFields = { - purchase_purchaseRequest: ['statusSelect'], + purchase_purchaseRequest: ['statusSelect', 'purchaseRequestSeq'], }; diff --git a/packages/apps/purchase/src/models/typeObjects.ts b/packages/apps/purchase/src/models/typeObjects.ts index af5456a81f..01d06fb033 100644 --- a/packages/apps/purchase/src/models/typeObjects.ts +++ b/packages/apps/purchase/src/models/typeObjects.ts @@ -52,13 +52,13 @@ export const purchase_typeObjects: ModuleSelections = [ key: 'Refused', value: 5, title: 'Purchase_Status_Refused', - color: 'cautionColor', + color: 'errorColor', }, { key: 'Canceled', value: 6, title: 'Purchase_Status_Canceled', - color: 'errorColor', + color: 'cautionColor', }, ], },