refs #5753 db export and fix fixtures #1643

Merged
carlossa merged 6 commits from 5753_232401_db_dump into dev 2023-07-03 09:49:14 +00:00
Member
No description provided.
alexm added 1 commit 2023-06-28 11:18:52 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
e43e52b561
refs #5753 db export and fix fixtures
alexm changed title from refs #5753 db export and fix fixtures to WIP: refs #5753 db export and fix fixtures 2023-06-28 11:25:28 +00:00
alexm added 1 commit 2023-06-28 12:10:28 +00:00
gitea/salix/pipeline/head This commit looks good Details
8723cf2958
refs #5753 fix legacy bugs
alexm reviewed 2023-06-28 12:11:48 +00:00
@ -411,4 +412,4 @@
},
order: 'id DESC'
}, ctx.options);
Author
Member

Lo que faig es mirar si el worker del ultim credit te isNotEditableCredit(FinancialBoss).
I mirar si el usuari te isNotEditableCredit.

Lo que faig es mirar si el worker del ultim credit te isNotEditableCredit(FinancialBoss). I mirar si el usuari te isNotEditableCredit.
alexm marked this conversation as resolved
alexm requested review from jgallego 2023-06-28 12:12:05 +00:00
alexm changed title from WIP: refs #5753 db export and fix fixtures to refs #5753 db export and fix fixtures 2023-06-28 12:12:18 +00:00
jgallego requested changes 2023-06-29 11:49:18 +00:00
@ -417,3 +416,1 @@
if (lastAmount == 0 && lastCreditIsNotEditable)
throw new UserError(`You can't change the credit set to zero from a financialBoss`);
if (lastCredit) {
Owner

lastCredit.amount == 0

lastCredit.amount == 0
alexm marked this conversation as resolved
@ -418,2 +416,2 @@
if (lastAmount == 0 && lastCreditIsNotEditable)
throw new UserError(`You can't change the credit set to zero from a financialBoss`);
if (lastCredit) {
const canEdit =
Owner

zeroCreditEditor

zeroCreditEditor
alexm marked this conversation as resolved
@ -419,1 +416,3 @@
throw new UserError(`You can't change the credit set to zero from a financialBoss`);
if (lastCredit) {
const canEdit =
await models.ACL.checkAccessAcl(accessToken, 'Client', 'isNotEditableCredit', 'WRITE');
Owner

zeroCreditEditor

zeroCreditEditor
alexm marked this conversation as resolved
alexm added 22 commits 2023-06-30 06:27:02 +00:00
gitea/salix/pipeline/head This commit looks good Details
0dbd3abd65
refs #5808 fix: corregido el condicional
gitea/salix/pipeline/head There was a failure building this commit Details
b7b6f413ba
refs #5688 feat: no mostrar datos si no tiene workerCenterFk
gitea/salix/pipeline/head There was a failure building this commit Details
55990869e2
refs #5688 ya no muestra mensaje de error
gitea/salix/pipeline/head This commit looks good Details
5f4b62f133
refs #5688 fix: test front
gitea/salix/pipeline/head There was a failure building this commit Details
d26778e94e
refs #5688 fix: e2e
gitea/salix/pipeline/head There was a failure building this commit Details
d272121258
refs 5688 fix: e2e
gitea/salix/pipeline/head There was a failure building this commit Details
d9b1f4b8a1
refs #5688 fix: test e2e
gitea/salix/pipeline/head There was a failure building this commit Details
da50ea1dd0
Merge branch 'dev' into 5688-worker.calendar_workCenter
gitea/salix/pipeline/head This commit looks good Details
6894da7e22
refs #5688 fix: front test
gitea/salix/pipeline/head This commit looks good Details
65e5c95c07
Merge pull request '5688-worker.calendar_workCenter' (!1580) from 5688-worker.calendar_workCenter into dev
Reviewed-on: #1580
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
3128601027
Merge branch 'dev' into 5808-client.credit-management
gitea/salix/pipeline/head There was a failure building this commit Details
a6fba97b7d
Merge pull request '5808-client.credit-management' (!1640) from 5808-client.credit-management into dev
Reviewed-on: #1640
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
33e1d9e3f2
Merge pull request '5774-ticket.lines_evitarCantidadNegativa' (!1597) from 5774-ticket.lines_evitarCantidadNegativa into dev
Reviewed-on: #1597
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
6fcbf69f60
refs #5753 isNotEditableCredit to zeroCreditEditor
alexm requested review from jgallego 2023-06-30 06:27:07 +00:00
jgallego approved these changes 2023-07-03 06:40:04 +00:00
alexm added 35 commits 2023-07-03 07:00:04 +00:00
gitea/salix/pipeline/head This commit looks good Details
e32a29fc09
refs #5900 Remove duplicated logs
gitea/salix/pipeline/head This commit looks good Details
630ce40ef7
Merge branch 'test' into 5900-removeDuplicatedLogs
gitea/salix/pipeline/head There was a failure building this commit Details
cc5021a75f
refs #5684 Removed xxxLog.create and dependences
gitea/salix/pipeline/head This commit looks good Details
88e845b511
change applyFilters
gitea/salix/pipeline/head This commit looks good Details
15c45bb544
Merge branch 'test' into hotfix-filterScopeDays
gitea/salix/pipeline/head This commit looks good Details
15e39b5fec
Merge pull request 'change applyFilters' (!1636) from hotfix-filterScopeDays into test
Reviewed-on: #1636
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
46ffd8d95a
refs #5554 console.log
gitea/salix/pipeline/head This commit looks good Details
1cf5ff9a62
refs #5554 new Date()
gitea/salix/pipeline/head This commit looks good Details
8e5a6dbab3
fix warn
gitea/salix/pipeline/head This commit looks good Details
7e542f93a1
Merge branch 'test' into warnFix_travel_summary_entry
gitea/salix/pipeline/head This commit looks good Details
fe53abb24f
Merge pull request 'fix warn' (!1641) from warnFix_travel_summary_entry into test
Reviewed-on: #1641
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
f8a972c2f2
refs #5094 fix translation
gitea/salix/pipeline/head This commit looks good Details
12481b5f3d
refs #5900 CSS fix
gitea/salix/pipeline/head This commit looks good Details
d200a1a695
refs #5900 CSS fixes
gitea/salix/pipeline/head This commit looks good Details
840a88bdc1
refs #5833 remove console.logs
gitea/salix/pipeline/head This commit looks good Details
1d993c74e5
refs #5590 fix total invoiceOut
gitea/salix/pipeline/head This commit looks good Details
79823605f6
refs #5554 fix: no te tira al hacer F5
gitea/salix/pipeline/head This commit looks good Details
1093d29fb6
Merge pull request 'test_hotfix_renewToken' (!1645) from test_hotfix_renewToken into test
Reviewed-on: #1645
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
273c06a210
refs #5833 deploy: test to master 232601
gitea/salix/pipeline/head This commit looks good Details
bc4058512a
Merge branch 'test' into 5900-removeDuplicatedLogs
gitea/salix/pipeline/head This commit looks good Details
82e762ac09
Merge pull request 'refs #5816 Remove duplicated logs' (!1634) from 5900-removeDuplicatedLogs into test
Reviewed-on: #1634
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
7eb8460ba0
refs #5816 remove unforeseen dev
gitea/salix/pipeline/head This commit looks good Details
fc39b8f692
refs #5816 comment e2e
gitea/salix/pipeline/head This commit looks good Details
e651ddc4a0
refs #5816 unfocus e2e
gitea/salix/pipeline/head There was a failure building this commit Details
d1fb2859be
Merge branch 'dev' into 5753_232401_db_dump
alexm requested review from carlossa 2023-07-03 07:01:57 +00:00
carlossa approved these changes 2023-07-03 07:02:45 +00:00
alexm added 1 commit 2023-07-03 08:04:15 +00:00
gitea/salix/pipeline/head This commit looks good Details
7fe8698b6f
refs #5753 fix ticketToInvoice
alexm requested review from jgallego 2023-07-03 08:38:03 +00:00
alexm requested review from carlossa 2023-07-03 08:40:42 +00:00
carlossa approved these changes 2023-07-03 08:42:18 +00:00
jgallego approved these changes 2023-07-03 09:31:50 +00:00
carlossa merged commit 3b346d673b into dev 2023-07-03 09:49:14 +00:00
carlossa deleted branch 5753_232401_db_dump 2023-07-03 09:49:14 +00:00
Sign in to join this conversation.
No reviewers
No Milestone
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#1643
No description provided.