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

feat: refs #7784 Changes in entry-order-pdf #2872

Merged
guillermo merged 4 commits from 7784-entryOrderPdf into dev 2024-08-21 12:36:17 +00:00
Conversation 0 Commits 4 Files Changed 8 +97 -72
guillermo commented 2024-08-20 13:03:52 +00:00
Member
Copy Link
No description provided.
guillermo added 1 commit 2024-08-20 13:03:53 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
2d4acd0f00 feat: refs #7784 Changes in entry-order-pdf
guillermo requested review from jgallego 2024-08-20 13:04:49 +00:00
jgallego requested changes 2024-08-20 13:37:21 +00:00
Dismissed
print/templates/reports/entry-order/entry-order.html Outdated
@ -22,2 +22,2 @@
<td class="font gray uppercase">{{$t('ref')}}</td>
<th>{{entry.invoiceNumber}}</th>
<td class="font gray uppercase padding nowrap">{{$t('ref')}}</td>
<th>{{entry.invoiceNumber || '---'}}</th>
jgallego commented 2024-08-20 13:30:03 +00:00
Owner
Copy Link

dashIfEmpty es una funcio que gastem en salix, y en els reports Pablo se la creà si tu tb la necesites seria tindrela els dos de forma global

dashIfEmpty es una funcio que gastem en salix, y en els reports Pablo se la creà si tu tb la necesites seria tindrela els dos de forma global
jgallego commented 2024-08-21 11:21:17 +00:00
Owner
Copy Link

imagine que has confirmat que la tenies disponible en este context i et mostra --- quan no tens valor

imagine que has confirmat que la tenies disponible en este context i et mostra --- quan no tens valor
guillermo marked this conversation as resolved
print/templates/reports/entry-order/sql/buys.sql Outdated
@ -17,0 +4,4 @@
b.stickers,
b.packing,
i.name itemName,
IF(i2.id, i2.comment, i.comment) comment,
jgallego commented 2024-08-20 13:37:00 +00:00
Owner
Copy Link

ja que has de canviar alguna cosa açò es correcte, pero mes concís IFNULL(i2.comment, i.comment)

ja que has de canviar alguna cosa açò es correcte, pero mes concís IFNULL(i2.comment, i.comment)
guillermo marked this conversation as resolved
guillermo added 1 commit 2024-08-21 06:05:50 +00:00
gitea/salix/pipeline/pr-dev Build queued... Details
cf7ee3d990 feat: refs #7784 Requested changes
guillermo added 1 commit 2024-08-21 06:05:57 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
04235e85e6 Merge branch 'dev' into 7784-entryOrderPdf
guillermo requested review from jgallego 2024-08-21 06:06:00 +00:00
jgallego approved these changes 2024-08-21 11:21:20 +00:00
guillermo added 1 commit 2024-08-21 12:34:39 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
32ae8282f1 Merge branch 'dev' into 7784-entryOrderPdf
guillermo merged commit 16039b0ccc into dev 2024-08-21 12:36:17 +00:00
guillermo deleted branch 7784-entryOrderPdf 2024-08-21 12:36:17 +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#2872
No description provided.
Delete Branch "7784-entryOrderPdf"

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?