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

feat: refs #7266 First commit #3129

Merged
guillermo merged 9 commits from 7266-itemLabels into dev 2024-10-24 09:42:51 +00:00
Conversation 1 Commits 9 Files Changed 32 +713 -221
guillermo commented 2024-10-18 11:00:00 +00:00
Member
Copy Link
No description provided.
guillermo added 1 commit 2024-10-18 11:00:01 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
34deba406b feat: refs #7266 First commit
guillermo added 1 commit 2024-10-21 12:57:59 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
bf2d7541a5 feat: refs #7266 Item label QR
guillermo added 1 commit 2024-10-22 10:02:14 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
0af58b20be feat: refs #7266 Item label QR finished
guillermo added 1 commit 2024-10-22 11:43:59 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
c3f8da52c6 feat: refs #7266 Item label barcode
guillermo requested review from jgallego 2024-10-23 07:27:13 +00:00
guillermo commented 2024-10-23 07:27:29 +00:00
Author
Member
Copy Link

@jgallego Tens info de com han quedat les etiquetes en el propi redmine

@jgallego Tens info de com han quedat les etiquetes en el propi redmine
guillermo added 1 commit 2024-10-23 07:46:12 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
b1a295dca4 feat: refs #7266 Print corrections
jgallego requested changes 2024-10-23 13:13:48 +00:00
Dismissed
db/routines/vn/functions/buy_getUltimate.sql Outdated
@ -0,0 +1,31 @@
DELIMITER $$
CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`buy_getUltimate`(
vItemFk INT,
vWarehouseFk SMALLINT,
jgallego commented 2024-10-23 10:37:09 +00:00
Owner
Copy Link

en estos casos sempre posem INT perque a este nivell costa mes temps mirar el camp de la taula que el benefici que portaria d'optimizacio que fos small

en estos casos sempre posem INT perque a este nivell costa mes temps mirar el camp de la taula que el benefici que portaria d'optimizacio que fos small
guillermo commented 2024-10-24 05:06:58 +00:00
Author
Member
Copy Link

Ho he ficat mes que res per a respetar el tipo de dato del proc buy_getUltimate, que es smallint, pero ho canvie en els 2 puestos.

Ho he ficat mes que res per a respetar el tipo de dato del proc buy_getUltimate, que es smallint, pero ho canvie en els 2 puestos.
guillermo marked this conversation as resolved
print/templates/reports/item-label-barcode/sql/company.sql Outdated
@ -0,0 +1,6 @@
SELECT co.code
FROM warehouse w
JOIN address a ON a.id = w.addressFk
JOIN client c ON c.id = a.clientFk
jgallego commented 2024-10-23 10:42:58 +00:00
Owner
Copy Link

no cal client, directament de address a company

no cal client, directament de address a company
guillermo marked this conversation as resolved
print/templates/reports/item-label-barcode/sql/item.sql Outdated
@ -0,0 +14,4 @@
b.entryFk,
e.sub,
o.code origin,
COALESCE(p.`name`, p.id, '') producer,
jgallego commented 2024-10-23 10:43:59 +00:00
Owner
Copy Link

no es elegant tornar '', lo correcte seria un IFNULL i despues tu en el report, si et tornen null fas el que cregues

no es elegant tornar '', lo correcte seria un IFNULL i despues tu en el report, si et tornen null fas el que cregues
guillermo commented 2024-10-24 05:09:03 +00:00
Author
Member
Copy Link

Veritat, com he agarrat la consulta directament de access no me fijat

Veritat, com he agarrat la consulta directament de access no me fijat
guillermo marked this conversation as resolved
print/templates/reports/item-label-barcode/sql/item.sql Outdated
@ -0,0 +20,4 @@
i.category,
i.stems,
i.inkFk,
IFNULL(CONCAT(ig.longName, ' ', ig.`size`, ' ', ig.subName), i.comment) comment,
jgallego commented 2024-10-23 10:44:38 +00:00
Owner
Copy Link

açò si no et costa molt lo mateix, back deuria tornar els camps, i front juntarlos (opcional)

açò si no et costa molt lo mateix, back deuria tornar els camps, i front juntarlos (opcional)
guillermo marked this conversation as resolved
print/templates/reports/item-label-qr/sql/company.sql Outdated
@ -0,0 +1,6 @@
SELECT co.code
FROM warehouse w
JOIN address a ON a.id = w.addressFk
JOIN client c ON c.id = a.clientFk
jgallego commented 2024-10-23 13:13:45 +00:00
Owner
Copy Link

esta en varios llocs, ací lleva el client

esta en varios llocs, ací lleva el client
guillermo marked this conversation as resolved
guillermo added 1 commit 2024-10-24 05:16:18 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
4c9682e107 Merge branch 'dev' into 7266-itemLabels
guillermo added 2 commits 2024-10-24 05:31:34 +00:00
guillermo requested review from jgallego 2024-10-24 05:31:43 +00:00
jgallego approved these changes 2024-10-24 06:09:09 +00:00
guillermo added 1 commit 2024-10-24 09:31:16 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
f97f1c2b9a Merge branch 'dev' into 7266-itemLabels
guillermo merged commit f6d818f58e into dev 2024-10-24 09:42:51 +00:00
guillermo deleted branch 7266-itemLabels 2024-10-24 09:42:51 +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
2 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#3129
No description provided.
Delete Branch "7266-itemLabels"

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?