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

fix: refs #7611 & ticket195937 incoterms #2613

Merged
robert merged 9 commits from 195937-icoterms into master 2024-06-25 05:58:31 +00:00
Conversation 0 Commits 9 Files Changed 2 +32 -53
robert commented 2024-06-20 07:35:09 +00:00
Member
Copy Link
No description provided.
robert added 1 commit 2024-06-20 07:35:10 +00:00
gitea/salix/pipeline/pr-master This commit looks good Details
5a40952547 fix: refs #195937 icoterms
robert requested review from alexm 2024-06-20 07:35:18 +00:00
robert requested review from guillermo 2024-06-20 07:35:21 +00:00
alexm approved these changes 2024-06-20 07:54:13 +00:00
Dismissed
guillermo requested changes 2024-06-20 08:17:10 +00:00
Dismissed
print/templates/reports/invoice-incoterms/sql/incoterms.sql Outdated
@ -48,5 +48,10 @@ SELECT pack.packages,
FROM ticket
WHERE refFk = ?
) pack
JOIN (
guillermo commented 2024-06-20 08:17:07 +00:00
Member
Copy Link

Por que creas otro JOIN si lo puedes añadir en:

        JOIN (
            SELECT SUM(packages) packages
                FROM ticket
                WHERE refFk = ?
        ) pack

Cambiale el nombre al alias

Por que creas otro JOIN si lo puedes añadir en: ``` JOIN ( SELECT SUM(packages) packages FROM ticket WHERE refFk = ? ) pack ``` Cambiale el nombre al alias
robert marked this conversation as resolved
robert added 1 commit 2024-06-20 09:04:46 +00:00
gitea/salix/pipeline/pr-master This commit looks good Details
46792ba30e fix: refs #195937 changes requerid
robert requested review from guillermo 2024-06-20 09:09:24 +00:00
guillermo approved these changes 2024-06-20 09:39:47 +00:00
Dismissed
robert added 1 commit 2024-06-20 11:45:43 +00:00
gitea/salix/pipeline/pr-master This commit looks good Details
852785b4c1 fix: refs #195937 refactor incoterms
robert added 1 commit 2024-06-20 11:49:12 +00:00
gitea/salix/pipeline/pr-master This commit looks good Details
72fd806750 Merge branch 'master' into 195937-icoterms
robert requested review from guillermo 2024-06-20 11:50:57 +00:00
robert requested review from alexm 2024-06-20 11:50:58 +00:00
robert changed title from fix: refs #195937 icoterms to WIP: fix: refs #195937 icoterms 2024-06-20 11:51:02 +00:00
robert changed title from WIP: fix: refs #195937 icoterms to fix: refs #195937 icoterms 2024-06-20 11:51:08 +00:00
robert requested review from jgallego 2024-06-20 11:51:16 +00:00
guillermo requested changes 2024-06-20 12:02:52 +00:00
Dismissed
print/templates/reports/invoice-incoterms/sql/incoterms.sql Outdated
@ -53,0 +1,4 @@
WITH tickets AS(
SELECT id, packages, addressFk, weight
FROM ticket
WHERE refFk='E12400228'
guillermo commented 2024-06-20 12:02:48 +00:00
Member
Copy Link

refFk a pel??

refFk a pel??
robert marked this conversation as resolved
guillermo requested changes 2024-06-20 12:03:35 +00:00
Dismissed
print/templates/reports/invoice-incoterms/sql/incoterms.sql Outdated
@ -53,0 +34,4 @@
LEFT JOIN vn.customsAgent ca ON ca.id = a.customsAgentFk
JOIN volume v
JOIN intrastat i
LEFT JOIN weight w ON TRUE
guillermo commented 2024-06-20 12:03:31 +00:00
Member
Copy Link

Per que no gastes JOIN?
Aixina no tens que ficar ON true

Per que no gastes JOIN? Aixina no tens que ficar ON true
robert marked this conversation as resolved
robert added 2 commits 2024-06-20 12:03:37 +00:00
jgallego requested changes 2024-06-20 12:28:32 +00:00
Dismissed
print/templates/reports/invoice-incoterms/sql/incoterms.sql Outdated
@ -53,0 +32,4 @@
JOIN vn.address a ON a.id = t.addressFk
JOIN vn.incoterms ic ON ic.code = a.incotermsFk
LEFT JOIN vn.customsAgent ca ON ca.id = a.customsAgentFk
JOIN volume v
jgallego commented 2024-06-20 12:27:38 +00:00
Owner
Copy Link

ací no hi ha un ON? ara esta agafant tots els registres de la taula ticket

ací no hi ha un ON? ara esta agafant tots els registres de la taula ticket
robert commented 2024-06-21 08:03:20 +00:00
Author
Member
Copy Link

Las tablas volume y instrastat no son tablas reales son del WITH

Las tablas volume y instrastat no son tablas reales son del WITH
robert marked this conversation as resolved
print/templates/reports/invoice-incoterms/sql/incoterms.sql Outdated
@ -53,0 +33,4 @@
JOIN vn.incoterms ic ON ic.code = a.incotermsFk
LEFT JOIN vn.customsAgent ca ON ca.id = a.customsAgentFk
JOIN volume v
JOIN intrastat i
jgallego commented 2024-06-20 12:28:20 +00:00
Owner
Copy Link

ací no hi ha un ON? ara esta agafant tots els registres de la taula ticket

ací no hi ha un ON? ara esta agafant tots els registres de la taula ticket
robert commented 2024-06-21 11:35:04 +00:00
Author
Member
Copy Link

Las tablas volume y instrastat no son tablas reales son del WITH

Las tablas volume y instrastat no son tablas reales son del WITH
robert marked this conversation as resolved
guillermo changed title from fix: refs #195937 icoterms to fix: refs #7611 & ticket195937 icoterms 2024-06-21 08:05:20 +00:00
guillermo changed title from fix: refs #7611 & ticket195937 icoterms to fix: refs #7611 & ticket195937 incoterms 2024-06-21 08:05:35 +00:00
robert added 1 commit 2024-06-21 08:52:16 +00:00
gitea/salix/pipeline/pr-master This commit looks good Details
fb58e8226d Merge branch 'master' into 195937-icoterms
robert added 1 commit 2024-06-21 09:47:40 +00:00
gitea/salix/pipeline/pr-master This commit looks good Details
c42a21bc6f fix: refs #19537 changes required
robert requested review from guillermo 2024-06-21 09:54:25 +00:00
guillermo approved these changes 2024-06-21 11:22:20 +00:00
robert requested review from jgallego 2024-06-21 11:35:23 +00:00
jgallego approved these changes 2024-06-21 12:08:14 +00:00
alexm approved these changes 2024-06-25 05:28:21 +00:00
robert added 1 commit 2024-06-25 05:55:29 +00:00
gitea/salix/pipeline/pr-master This commit looks good Details
f2caa4bec9 Merge branch 'master' into 195937-icoterms
robert merged commit dfd53f73e5 into master 2024-06-25 05:58:31 +00:00
robert deleted branch 195937-icoterms 2024-06-25 05:58:31 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
guillermo
jgallego
alexm
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
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#2613
No description provided.
Delete Branch "195937-icoterms"

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?