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

feat: refs #7821 isBooked with grants #3150

Merged
jgallego merged 12 commits from 7821-entryIsBooked into dev 2024-11-21 15:39:53 +00:00
Conversation 0 Commits 12 Files Changed 15 +205 -66
jgallego commented 2024-10-25 14:27:16 +00:00
Owner
Copy Link
No description provided.
jgallego added 1 commit 2024-10-25 14:27:17 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
fa9451ea38 feat: refs #7821 isBooked with grants
jgallego requested review from carlosap 2024-10-25 14:27:23 +00:00
jgallego requested review from alexm 2024-10-25 14:27:24 +00:00
alexm requested changes 2024-10-28 06:13:20 +00:00
Dismissed
loopback/locale/es.json Outdated
@ -388,1 +388,3 @@
"There is no company associated with that warehouse": "No hay ninguna empresa asociada a ese almacén"
"There is no company associated with that warehouse": "No hay ninguna empresa asociada a ese almacén",
"You do not have permission to modify the booked field": "No tienes permisos para modificar el campo contabilizada",
"Entry 99 is not editable": "Entry 99 is not editable",
alexm commented 2024-10-28 06:13:16 +00:00
Member
Copy Link

Estes se ficaren asoles no?

Estes se ficaren asoles no?
jgallego marked this conversation as resolved
jgallego added 2 commits 2024-10-29 08:26:29 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
cd3dd854ef feat: refs #7821 eslint newDate
jgallego requested review from alexm 2024-10-29 10:37:29 +00:00
alexm approved these changes 2024-10-29 11:45:55 +00:00
jgallego added 1 commit 2024-11-12 08:35:40 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
ea45d1da0a Merge branch 'dev' into 7821-entryIsBooked
jgallego added 1 commit 2024-11-18 13:06:48 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
72415a4348 Merge branch 'dev' into 7821-entryIsBooked
jgallego added 1 commit 2024-11-18 13:27:47 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
a40a5a22ab fix: refs #7821 fixtures without raid
carlosap reviewed 2024-11-18 15:43:34 +00:00
carlosap requested changes 2024-11-18 15:57:42 +00:00
Dismissed
db/routines/vn/procedures/entry_isEditable.sql Outdated
@ -10,3 +10,3 @@
* @param vSelf Id de entrada
*/
DECLARE vIsEditable BOOL;
DECLARE vIsNotEditable BOOL;
carlosap commented 2024-11-18 15:56:42 +00:00
Member
Copy Link
DECLARE vIsNotEditable BOOL DEFAULT TRUE; 

 SELECT FALSE vIsNotEditable
		FROM entry e
			JOIN entryType et ON et.code = e.typeFk
		WHERE e.id = vSelf 
			AND e.isBooked 
			AND et.isInformal

Si heu fem a la inversa es simplifica

``` DECLARE vIsNotEditable BOOL DEFAULT TRUE; SELECT FALSE vIsNotEditable FROM entry e JOIN entryType et ON et.code = e.typeFk WHERE e.id = vSelf AND e.isBooked AND et.isInformal ``` Si heu fem a la inversa es simplifica
jgallego marked this conversation as resolved
jgallego added 1 commit 2024-11-21 08:12:15 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
b3ce3a0cc2 feat: refs #7821 with test
jgallego requested review from carlosap 2024-11-21 08:12:38 +00:00
carlosap requested changes 2024-11-21 11:51:36 +00:00
Dismissed
modules/entry/back/models/specs/entry.spec.js
@ -0,0 +69,4 @@
expect(error).toBeUndefined();
});
it('should not throw an error when entry is not booked', async() => {
carlosap commented 2024-11-21 11:51:16 +00:00
Member
Copy Link

Faltarien 2 tests: 'is not booked and is informal' y 'is not booked and is not informal'

Faltarien 2 tests: 'is not booked and is informal' y 'is not booked and is not informal'
jgallego marked this conversation as resolved
carlosap approved these changes 2024-11-21 12:08:28 +00:00
jgallego added 1 commit 2024-11-21 12:09:34 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
510fffb61a Merge branch 'dev' into 7821-entryIsBooked
jgallego added 1 commit 2024-11-21 12:29:03 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
80851e094d Merge branch 'dev' into 7821-entryIsBooked
jgallego added 2 commits 2024-11-21 15:28:41 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
53673f43b8 Merge branch 'dev' into 7821-entryIsBooked
jgallego added 1 commit 2024-11-21 15:38:24 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
41b3f34158 fix: refs #7821 alias
jgallego merged commit 78d3d01649 into dev 2024-11-21 15:39:53 +00:00
jgallego deleted branch 7821-entryIsBooked 2024-11-21 15:39:53 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
alexm
carlosap
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#3150
No description provided.
Delete Branch "7821-entryIsBooked"

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?