verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

refs #6156 new field #1718

Merged
jsegarra merged 13 commits from 6156-advanceTicketsNewField into dev 2024-09-11 10:27:07 +00:00
Conversation 1 Commits 13 Files Changed 5 +71 -62
pablone commented 2023-08-24 11:44:33 +00:00
Member
Copy Link

✅verdnatura/salix-front#688

✅https://gitea.verdnatura.es/verdnatura/salix-front/pulls/688
pablone added 1 commit 2023-08-24 11:44:35 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
78eba23d12 refs #6156 new field
pablone added 1 commit 2023-08-24 11:44:50 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
147ae85a6e Merge branch 'dev' into 6156-advanceTicketsNewField
jsegarra added 2 commits 2024-09-09 10:08:19 +00:00
jsegarra changed title from WIP: refs #6156 new field to refs #6156 new field 2024-09-09 10:48:19 +00:00
jsegarra added 1 commit 2024-09-09 10:48:23 +00:00
jsegarra requested review from jgallego 2024-09-09 10:48:38 +00:00
jsegarra added 1 commit 2024-09-09 12:20:05 +00:00
jgallego requested changes 2024-09-09 12:26:05 +00:00
Dismissed
db/routines/vn/procedures/ticket_canAdvance.sql Outdated
@ -39,4 +47,0 @@
origin.agencyModeFk futureAgencyModeFk,
dest.lines,
dest.liters,
origin.futureLines - origin.hasStock AS notMovableLines,
jgallego commented 2024-09-09 12:21:18 +00:00
Owner
Copy Link

esta linea on queda?

esta linea on queda?
jsegarra commented 2024-09-09 12:52:04 +00:00
Member
Copy Link

Este código está hecho de hace 1 año, lo reviso

Este código está hecho de hace 1 año, lo reviso
jsegarra commented 2024-09-09 13:13:15 +00:00
Member
Copy Link

f9a25617f0

f9a25617f0eed7ab6e5c6e0a0eba104dd2263e47
db/routines/vn/procedures/ticket_canAdvance.sql Outdated
@ -1,2 +2,3 @@
DELIMITER $$
CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_canAdvance`(vDateFuture DATE, vDateToAdvance DATE, vWarehouseFk INT)
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_canAdvance`(vDateFuture DATE, vDateToAdvance DATE, vWarehouseFk INT)
jgallego commented 2024-09-09 12:19:49 +00:00
Owner
Copy Link

https://chat.verdnatura.es/group/vn-database?msg=XWo5rMzLLpytj9N2M açò que has posat no es distint?

https://chat.verdnatura.es/group/vn-database?msg=XWo5rMzLLpytj9N2M açò que has posat no es distint?
jsegarra commented 2024-09-09 12:52:08 +00:00
Member
Copy Link

Este código está hecho de hace 1 año, lo reviso

Este código está hecho de hace 1 año, lo reviso
jsegarra commented 2024-09-09 13:12:50 +00:00
Member
Copy Link

f70f475223

f70f475223313874abe7e9ea787a4f9e12667db8
db/routines/vn/procedures/ticket_canAdvance.sql Outdated
@ -109,3 +94,1 @@
t.companyFk,
t.landed,
t.agencyModeFk
CONCAT_WS(':',
jgallego commented 2024-09-09 12:23:31 +00:00
Owner
Copy Link

CONCAT_WS(':',
COALESCE(HOUR(t.shipped), HOUR(zc.hour), HOUR(z.hour)),
COALESCE(MINUTE(t.shipped), MINUTE(zc.hour), MINUTE(z.hour))
) AS preparation

mira a vore si açò es lo mateix es mes compacte

CONCAT_WS(':', COALESCE(HOUR(t.shipped), HOUR(zc.hour), HOUR(z.hour)), COALESCE(MINUTE(t.shipped), MINUTE(zc.hour), MINUTE(z.hour)) ) AS preparation mira a vore si açò es lo mateix es mes compacte
jsegarra commented 2024-09-09 13:13:38 +00:00
Member
Copy Link

615f57b2e6

615f57b2e6d5fd2951bee7f5cd9822f61af87ee5
jgallego marked this conversation as resolved
db/routines/vn/procedures/ticket_canAdvance.sql Outdated
@ -124,2 +117,2 @@
) dest ON dest.addressFk = origin.addressFk
WHERE origin.hasStock;
) dest ON dest.addressFk = origin.futureAddressFk
WHERE origin.hasStock != 0;
jgallego commented 2024-09-09 12:24:49 +00:00
Owner
Copy Link

!= 0 es redundant, a mes en tot cas seria FALSE, jo el deixaria com estava

!= 0 es redundant, a mes en tot cas seria FALSE, jo el deixaria com estava
jsegarra commented 2024-09-09 13:14:07 +00:00
Member
Copy Link

c407dde7a0

c407dde7a021c3defe5ca8003758dbf163995159
jgallego marked this conversation as resolved
db/versions/11221-chocolateSalal/00-firstScript.sql Outdated
@ -0,0 +1,12 @@
-- Place your SQL code here
CREATE TABLE IF NOT EXISTS `vn`.`ticketCanAdvanceConfig` (
`id` INT auto_increment NULL,
jgallego commented 2024-09-09 12:25:36 +00:00
Owner
Copy Link

copia l'estructura d eles taules config. no deu ser autoincrement i crec que tenen triggers o algo

copia l'estructura d eles taules config. no deu ser autoincrement i crec que tenen triggers o algo
jsegarra commented 2024-09-09 12:52:14 +00:00
Member
Copy Link

Este código está hecho de hace 1 año, lo reviso

Este código está hecho de hace 1 año, lo reviso
jsegarra commented 2024-09-09 12:56:51 +00:00
Member
Copy Link

Tienen diferente configuración:
db/versions/11175-pinkChico/00-firstScript.sql
db/versions/11194-orangeOrchid/00-firstScript.sql

Cual aplico?

Tienen diferente configuración: db/versions/11175-pinkChico/00-firstScript.sql db/versions/11194-orangeOrchid/00-firstScript.sql Cual aplico?
jsegarra commented 2024-09-09 13:12:16 +00:00
Member
Copy Link

773933ca3c

773933ca3c32bec8745457afd9e23fb80d96c0fe
jgallego marked this conversation as resolved
jsegarra added 5 commits 2024-09-09 13:14:14 +00:00
jsegarra requested review from jgallego 2024-09-09 13:14:15 +00:00
jgallego requested changes 2024-09-09 13:51:49 +00:00
Dismissed
db/routines/vn/procedures/ticket_canAdvance.sql Outdated
@ -19,0 +19,4 @@
ENGINE = MEMORY;
INSERT INTO tStock(itemFk, amount)
SELECT itemFk, SUM(quantity) amount FROM
jgallego commented 2024-09-09 13:49:47 +00:00
Owner
Copy Link

esto no me gusta porque esta como repetido de otros procs, o de las vistas entryIn, que lo revise @pablone

esto no me gusta porque esta como repetido de otros procs, o de las vistas entryIn, que lo revise @pablone
pablone commented 2024-09-11 08:22:17 +00:00
Author
Member
Copy Link

commit con las correcciones 92f305b9fd

commit con las correcciones 92f305b9fd5458f13291e8f8ff5b86bdb6e864f5
pablone added 1 commit 2024-09-11 08:20:04 +00:00
pablone added 1 commit 2024-09-11 08:22:27 +00:00
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
842c98edfc Merge branch 'dev' into 6156-advanceTicketsNewField
jsegarra requested review from jgallego 2024-09-11 08:23:51 +00:00
jgallego approved these changes 2024-09-11 08:54:00 +00:00
jsegarra closed this pull request 2024-09-11 09:06:39 +00:00
jsegarra reopened this pull request 2024-09-11 09:06:43 +00:00
jsegarra closed this pull request 2024-09-11 10:00:42 +00:00
jsegarra commented 2024-09-11 10:00:50 +00:00
Member
Copy Link

#2948

https://gitea.verdnatura.es/verdnatura/salix/pulls/2948
jsegarra reopened this pull request 2024-09-11 10:26:50 +00:00
jsegarra merged commit ace4e6975d into dev 2024-09-11 10:27:07 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
jgallego
Labels
Clear labels   
CR / Tests passed

Unit tests and e2e passed

  
e2e

Implement e2e

  
Missing tests

Missing tests

  
Needs refactor

   
Simple

Simple check / No CR needed

No Label
CR / Tests passed
e2e
Missing tests
Needs refactor
Simple
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
3 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#1718
No description provided.
Delete Branch "6156-advanceTicketsNewField"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?