#6321 - Negative ticket #158

Open
jsegarra wants to merge 156 commits from 6321_negative_tickets into dev
Member
https://gitea.verdnatura.es/verdnatura/salix/pulls/1945
jsegarra changed title from WIP: Negative ticket to WIP: #6321 - Negative ticket 2024-01-18 11:53:22 +00:00
jsegarra added 1 commit 2024-01-20 11:30:20 +00:00
gitea/salix-front/pipeline/head This commit looks good Details
c95b738e0c
refs #6321 feat: create new section for ticket module
alexm added 1 commit 2024-01-22 10:41:09 +00:00
gitea/salix-front/pipeline/head This commit looks good Details
d78c20d14b
Merge branch 'dev' into 6321_negative_tickets
jsegarra added 2 commits 2024-01-23 10:15:15 +00:00
jsegarra added 1 commit 2024-01-26 12:22:54 +00:00
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev Build started... Details
f44643fc61
refs #6664 perf: show dialog
jsegarra added 2 commits 2024-03-05 07:07:37 +00:00
jsegarra added 2 commits 2024-03-05 12:00:38 +00:00
jsegarra added 3 commits 2024-03-06 19:46:53 +00:00
jsegarra added 6 commits 2024-03-14 14:27:15 +00:00
jsegarra added 4 commits 2024-03-15 11:15:48 +00:00
jsegarra added 12 commits 2024-03-27 14:21:02 +00:00
jsegarra added 1 commit 2024-03-28 06:17:50 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
30a32ad17d
refs #6321 updates
jsegarra added 1 commit 2024-03-28 10:55:30 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
737ab9e99b
updates
jsegarra added 3 commits 2024-03-29 00:30:32 +00:00
jsegarra requested review from jgallego 2024-04-01 15:06:33 +00:00
jsegarra changed title from WIP: #6321 - Negative ticket to #6321 - Negative ticket 2024-04-01 15:06:35 +00:00
jgallego requested changes 2024-04-02 05:23:04 +00:00
7014.patch Outdated
@ -0,0 +1,46 @@
diff --git a/src/layouts/ViewLayout.vue b/src/layouts/ViewLayout.vue
Owner

estos ficheros deben subir al repo¿

estos ficheros deben subir al repo¿
Author
Member

Fallo mio.
Resuelto

Fallo mio. Resuelto
jsegarra marked this conversation as resolved
@ -452,0 +462,4 @@
size: 'Medida',
origen: 'Origen',
value: 'Negativo',
itemFk: 'itemFk',
Owner

articulo

articulo
jsegarra marked this conversation as resolved
@ -452,0 +463,4 @@
origen: 'Origen',
value: 'Negativo',
itemFk: 'itemFk',
warehouseFk: 'warehouseFk',
Owner

almacen

almacen
jsegarra marked this conversation as resolved
@ -452,0 +490,4 @@
agName: 'Agencia',
quantity: 'Cantidad',
alertLevel: 'Nivel de alerta',
alertLevelCode: 'Estado de Alerta',
Owner

Estado agrupado

Estado agrupado
jsegarra marked this conversation as resolved
@ -0,0 +30,4 @@
},
});
const copyOriginalRowsData = (rows) => {
// el objetivo de esto es guardar los valores iniciales de todas las rows para evitar guardar cambios si la data no cambió al disparar los eventos
Owner

quitar comentarios del archivo

quitar comentarios del archivo
Author
Member

El archivo tenia varios comentarios

Concretamente el de la linea 33 estaba en mas archivos. He quitado todas las ocurrencias

El archivo tenia varios comentarios Concretamente el de la linea 33 estaba en mas archivos. He quitado todas las ocurrencias
jsegarra marked this conversation as resolved
@ -0,0 +6,4 @@
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
import VnInput from 'src/components/common/VnInput.vue';
// import toDateString from 'filters/toDateString';
Owner

quitar comentarios

quitar comentarios
Author
Member

Resuelto

Resuelto
jsegarra marked this conversation as resolved
jsegarra added 2 commits 2024-04-02 06:14:25 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
130c98ef17
refs #6321 remove comments
jsegarra added 1 commit 2024-04-02 06:19:12 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
48f88b5871
refs #6321 remove comments
jsegarra requested review from jgallego 2024-04-02 13:03:35 +00:00
jsegarra closed this pull request 2024-04-03 06:42:44 +00:00
jsegarra reopened this pull request 2024-04-03 06:42:58 +00:00
jsegarra added 1 commit 2024-04-03 07:49:55 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
85fa394be0
refs #6321 perf: i18n
jsegarra added 1 commit 2024-04-03 08:01:20 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2951e69a6a
refs #6321 feat updateQuantity
jsegarra added 1 commit 2024-04-03 08:05:33 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
f6eaa99aeb
refs #6321 fix: warnings
jsegarra added 2 commits 2024-04-08 07:36:02 +00:00
jgallego requested changes 2024-04-08 07:39:26 +00:00
jgallego left a comment
Owner

avisa a Julia para que valide en tu pc que es lo que necesitan.

avisa a Julia para que valide en tu pc que es lo que necesitan.
@ -504,0 +512,4 @@
supplier: 'Supplier',
colour: 'Colour',
size: 'Size',
origen: 'Origen',
Owner

en ingles es Origin

en ingles es Origin
jsegarra marked this conversation as resolved
@ -504,0 +543,4 @@
quantity: 'Quantity',
alertLevelCode: 'Group state',
state: 'State',
peticionCompra: 'Buy request',
Owner

Ticket request
(asi se llama igual que la tabla)

Ticket request (asi se llama igual que la tabla)
jsegarra marked this conversation as resolved
@ -504,0 +544,4 @@
alertLevelCode: 'Group state',
state: 'State',
peticionCompra: 'Buy request',
isRookie: 'New client',
Owner

is rookie

is rookie
jsegarra marked this conversation as resolved
@ -0,0 +36,4 @@
<QCard class="q-pa-sm">
<QCardSection class="row items-center q-pb-none">
<QImg
:src="`/api/Images/catalog/50x50/${ticket.itemFk}/download?access_token=${token}`"
Owner

este bloque ya lo tenemos en 3 sitios en salix-front, crea tarea de crear nuestro vnItemImg o con la nomenclatura que se esté usando

este bloque ya lo tenemos en 3 sitios en salix-front, crea tarea de crear nuestro vnItemImg o con la nomenclatura que se esté usando
Author
Member
https://redmine.verdnatura.es/issues/6977
jsegarra marked this conversation as resolved
@ -0,0 +17,4 @@
},
});
// const from = Date.vnNew();
Owner

borra comentarios

borra comentarios
jsegarra marked this conversation as resolved
jsegarra added 2 commits 2024-04-16 06:05:16 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
a5350f686d
refs #6321 fix: comments
jsegarra added 3 commits 2024-04-22 12:25:17 +00:00
jsegarra added 3 commits 2024-04-29 09:56:47 +00:00
jsegarra added 6 commits 2024-04-29 13:11:11 +00:00
jsegarra added 2 commits 2024-04-30 13:24:38 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
1929545e5b
feat: itemProposal table
jsegarra added 1 commit 2024-04-30 13:26:17 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2c59e6acc3
Merge branch 'dev' into 6321_negative_tickets
jsegarra added 3 commits 2024-05-02 13:19:10 +00:00
jsegarra added 1 commit 2024-05-08 10:30:59 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
61519595a9
Merge branch 'dev' into 6321_negative_tickets
jsegarra added 5 commits 2024-05-08 13:36:02 +00:00
jsegarra added 1 commit 2024-05-13 11:18:27 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
ebdc1e9906
updates
jorgep added 1 commit 2024-05-13 11:22:48 +00:00
jsegarra added 2 commits 2024-05-13 11:51:19 +00:00
jsegarra added 6 commits 2024-05-15 06:55:52 +00:00
jsegarra added 4 commits 2024-05-15 14:26:05 +00:00
jsegarra added 4 commits 2024-05-24 11:52:55 +00:00
jsegarra added 1 commit 2024-05-28 10:50:40 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
577c21e601
Merge branch 'dev' into 6321_negative_tickets
jsegarra added 2 commits 2024-05-31 13:09:06 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
79548f5041
updates
jsegarra added 2 commits 2024-06-04 14:13:42 +00:00
jsegarra added 2 commits 2024-06-11 12:05:22 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
8d9bfd8f1d
Merge branch 'dev' into 6321_negative_tickets
jsegarra added 6 commits 2024-06-14 11:44:38 +00:00
jsegarra added 2 commits 2024-06-17 11:07:38 +00:00
jsegarra added 7 commits 2024-06-19 22:06:04 +00:00
jsegarra added 3 commits 2024-07-02 18:31:50 +00:00
jsegarra added 3 commits 2024-07-03 21:07:56 +00:00
jsegarra added 1 commit 2024-07-04 15:27:38 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
189784872f
feat: substitution icons
jsegarra added 1 commit 2024-07-04 15:28:05 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
a6cd75a210
feat: Julia icon proposal
jsegarra added 1 commit 2024-07-18 20:04:35 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
c45ff7009c
Merge branch 'dev' into 6321_negative_tickets
jsegarra added 2 commits 2024-07-19 22:37:18 +00:00
jsegarra added 4 commits 2024-09-11 06:50:43 +00:00
jsegarra added 9 commits 2024-09-16 10:15:03 +00:00
jsegarra added 3 commits 2024-09-17 09:44:52 +00:00
jsegarra added 4 commits 2024-09-17 14:42:27 +00:00
jsegarra added 1 commit 2024-09-17 14:48:16 +00:00
jsegarra added 6 commits 2024-09-24 20:14:08 +00:00
Some checks failed
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Required
Details
This pull request has changes conflicting with the target branch.
  • src/components/VnTable/VnTable.vue
  • src/components/common/VnInputDate.vue
  • src/components/ui/VnConfirm.vue
  • src/i18n/locale/en.yml
  • src/i18n/locale/es.yml
  • src/pages/Item/locale/en.yml
  • src/pages/Item/locale/es.yml
  • src/pages/Order/Card/OrderLines.vue
  • src/pages/Route/RouteList.vue
  • src/pages/Ticket/Card/TicketSale.vue
Sign in to join this conversation.
No reviewers
No Milestone
No Assignees
4 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix-front#158
No description provided.