diff --git a/e2e/paths/order-module/02_edit_basic_data.spec.js b/e2e/paths/order-module/02_edit_basic_data.spec.js
new file mode 100644
index 000000000..834503ab7
--- /dev/null
+++ b/e2e/paths/order-module/02_edit_basic_data.spec.js
@@ -0,0 +1,92 @@
+import selectors from '../../helpers/selectors.js';
+import createNightmare from '../../helpers/nightmare';
+
+fdescribe('Order Edit basicData path', () => {
+ const nightmare = createNightmare();
+ describe('when confirmed order', () => {
+ beforeAll(() => {
+ nightmare
+ .loginAndModule('employee', 'order')
+ .accessToSearchResult('1')
+ .accessToSection('order.card.basicData');
+ });
+
+ it('should not be able to change the client', async() => {
+ const result = await nightmare
+ .autocompleteSearch(selectors.orderBasicData.clientAutocomplete, 'Tony Stark')
+ .click(selectors.orderBasicData.saveButton)
+ .waitForLastSnackbar();
+
+ expect(result).toEqual(`You can't make changes on the basic data of an confirmed order or with rows`);
+ });
+ });
+
+ describe('when order with rows', () => {
+ it('should now navigate to order index', async() => {
+ const url = await nightmare
+ .waitToClick(selectors.globalItems.returnToModuleIndexButton)
+ .waitToClick(selectors.globalItems.acceptVnConfirm)
+ .wait(selectors.ordersIndex.createOrderButton)
+ .accessToSearchResult('16')
+ .accessToSection('order.card.basicData')
+ .wait(selectors.orderBasicData.companyAutocomplete)
+ .parsedUrl();
+
+ expect(url.hash).toEqual('#!/order/16/basic-data');
+ });
+
+ it('should not be able to change the company', async() => {
+ const result = await nightmare
+ .autocompleteSearch(selectors.orderBasicData.companyAutocomplete, 'CCs')
+ .click(selectors.orderBasicData.saveButton)
+ .waitForLastSnackbar();
+
+ expect(result).toEqual(`You can't make changes on the basic data of an confirmed order or with rows`);
+ });
+ });
+
+ describe('when new order', () => {
+ beforeAll(() => {
+ nightmare
+ .loginAndModule('employee', 'order')
+ .accessToSearchResult('18')
+ .accessToSection('order.card.basicData');
+ });
+
+ it('should be able to modify all the properties', async() => {
+ const result = await nightmare
+ .autocompleteSearch(selectors.orderBasicData.clientAutocomplete, 'Tony Stark')
+ .autocompleteSearch(selectors.orderBasicData.companyAutocomplete, 'CCs')
+ .clearInput(selectors.orderBasicData.observationInput)
+ .type(selectors.orderBasicData.observationInput, 'Observation modified')
+ .click(selectors.orderBasicData.saveButton)
+ .waitForLastSnackbar();
+
+ expect(result).toEqual('Data saved!');
+ });
+
+ it('should now confirm the client have been edited', async() => {
+ const result = await nightmare
+ .click(selectors.orderCatalog.catalogButton)
+ .wait(selectors.orderCatalog.orderByAutocomplete)
+ .click(selectors.orderBasicData.basicDataButton)
+ .waitToGetProperty(`${selectors.orderBasicData.clientAutocomplete} input`, 'value');
+
+ expect(result).toEqual('104: Tony Stark');
+ });
+
+ it('should now confirm the comany have been edited', async() => {
+ const result = await nightmare
+ .waitToGetProperty(`${selectors.orderBasicData.companyAutocomplete} input`, 'value');
+
+ expect(result).toEqual('CCs');
+ });
+
+ it('should now confirm the observations have been edited', async() => {
+ const result = await nightmare
+ .waitToGetProperty(selectors.orderBasicData.observationInput, 'value');
+
+ expect(result).toEqual('Observation modified');
+ });
+ });
+});
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index f33e4b692..a244b5ae6 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -60,5 +60,7 @@
"You must delete the claim id %d first": "Antes debes borrar la reclamacion %d",
"You don't have enough privileges": "You don't have enough privileges",
"Cannot check VIES and Equalization Tax": "No puedes marcar VIES y RE al mismo",
- "Cannot check Equalization Tax in this NIF/CIF": "No se puede marcar RE en este NIF/CIF"
+ "Cannot check Equalization Tax in this NIF/CIF": "No se puede marcar RE en este NIF/CIF",
+ "You can't make changes on the basic data of an confirmed order or with rows": "No puedes cambiar los datos basicos de una orden con artículos",
+ "INVALID_USER_NAME": "El nombre de usuario solo debe contener letras minúsculas o, a partir del segundo carácter, números o subguiones, no esta permitido el uso de la letra ñ"
}
\ No newline at end of file
diff --git a/modules/order/front/basic-data/index.html b/modules/order/front/basic-data/index.html
index d4c4fe123..6e191f454 100644
--- a/modules/order/front/basic-data/index.html
+++ b/modules/order/front/basic-data/index.html
@@ -10,7 +10,6 @@
Basic data
@@ -40,16 +37,12 @@
-
- This form has been disabled because there are lines in this order or it's confirmed
-
-
+