5836-clientDefaulterisWorker #1639

Merged
carlossa merged 9 commits from 5836-clientDefaulterisWorker into dev 2023-07-03 10:53:08 +00:00
Member
No description provided.
carlossa added 2 commits 2023-06-27 06:11:01 +00:00
gitea/salix/pipeline/head This commit looks good Details
7f9d8da7a7
refs #5836 defaulter
gitea/salix/pipeline/head This commit looks good Details
24ea18aeb0
refs #5836 isworker back
carlossa added 1 commit 2023-06-27 08:27:47 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
5216f12001
refs #5836 check fix
carlossa added 1 commit 2023-06-27 10:32:07 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
f0b238b62a
refs #5836 fix e2e
carlossa added 1 commit 2023-06-29 11:22:58 +00:00
gitea/salix/pipeline/head This commit looks good Details
af91630852
refs #5836 e2e fix
carlossa changed title from WIP: 5836-clientDefaulterisWorker to 5836-clientDefaulterisWorker 2023-06-29 12:02:18 +00:00
carlossa requested review from jgallego 2023-06-29 12:02:29 +00:00
carlossa added the
CR / Tests passed
label 2023-06-29 12:02:33 +00:00
jgallego requested changes 2023-06-29 13:02:47 +00:00
@ -60,6 +60,7 @@ module.exports = Self => {
DISTINCT c.id clientFk,
c.name clientName,
c.salesPersonFk,
c.businessTypeFk businessType,
Owner

perque no es businessTypeFk?

perque no es businessTypeFk?
Author
Member

Vaig vore que en molts llocs se li fica un "alias" per a facilitat la utilització del camp, per aixo ho vaig ficar, pero es pot llevar el alias i que es quede com a businessTypeFk altra vegada i canviar-ho a la funció, pero ho vaig ficar per a que despues es més facilitat per a mirar

Vaig vore que en molts llocs se li fica un "alias" per a facilitat la utilització del camp, per aixo ho vaig ficar, pero es pot llevar el alias i que es quede com a businessTypeFk altra vegada i canviar-ho a la funció, pero ho vaig ficar per a que despues es més facilitat per a mirar
Owner

que ho confirme @alexm

que ho confirme @alexm
Member

Mes que per facilitat de us ho fem quan es confus.
Per exemple ahi tens el cas de c.name clientName. Posem clientName per sabe que es de el name de client i no de user o worker.

En este cas dixaria businessTypeFk

Mes que per facilitat de us ho fem quan es confus. Per exemple ahi tens el cas de `c.name clientName`. Posem clientName per sabe que es de el name de client i no de user o worker. En este cas dixaria businessTypeFk
carlossa marked this conversation as resolved
jgallego requested review from alexm 2023-06-29 13:02:56 +00:00
carlossa added 1 commit 2023-06-30 08:07:38 +00:00
gitea/salix/pipeline/head This commit looks good Details
e6ed834bf0
refs #5836 remove case
jgallego approved these changes 2023-07-03 07:14:54 +00:00
alexm requested changes 2023-07-03 08:53:07 +00:00
@ -72,0 +73,4 @@
set defaulters(value) {
if (!value || !value.length) return;
for (let defaulter of value)
defaulter.isWorker = defaulter.businessType === 'worker';
Member

BusinessTypeFk

BusinessTypeFk
carlossa marked this conversation as resolved
carlossa added 1 commit 2023-07-03 09:45:17 +00:00
gitea/salix/pipeline/head This commit looks good Details
c3ef642017
refs #5836 fix fk
carlossa requested review from alexm 2023-07-03 09:47:30 +00:00
carlossa added 118 commits 2023-07-03 09:48:07 +00:00
gitea/salix/pipeline/head This commit looks good Details
0dbd3abd65
refs #5808 fix: corregido el condicional
gitea/salix/pipeline/head This commit looks good Details
0afc26e20c
refs #5728 remove add, quit e2e
gitea/salix/pipeline/head This commit looks good Details
9cdaf2e519
refs #5728 fix e2e buy
gitea/salix/pipeline/head This commit looks good Details
65108943ab
refs #5528 feat: back test
gitea/salix/pipeline/head This commit looks good Details
98b270b885
refs #5528 feat: add back test
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 There was a failure building this commit Details
b6c8ca20ee
refs #5339 data
gitea/salix/pipeline/head There was a failure building this commit Details
8a2cab0e62
Merge branch 'dev' into 5528-entry.latest-buys_fixEditBuys
gitea/salix/pipeline/head This commit looks good Details
a7d9bbc582
refs #5537 change cl c
gitea/salix/pipeline/head This commit looks good Details
cea6fae649
fix: eliminada variable que no estaba definida
gitea/salix/pipeline/head This commit looks good Details
e99627c0b2
codigo innecesario
gitea/salix/pipeline/head This commit looks good Details
a4d3e8efd0
Merge pull request 'hotfix_errorEliminarTicket' (!1626) from hotfix_errorEliminarTicket into master
Reviewed-on: #1626
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
2649db852f
refs #5772 Invoice PDF size reduced
gitea/salix/pipeline/head This commit looks good Details
38de19f044
Merge branch 'dev' into 5728-bugEntry/buy
gitea/salix/pipeline/head This commit looks good Details
6f9fd9bb72
refs #5772 mensajes de error
gitea/salix/pipeline/head This commit looks good Details
9ef12d129b
Merge branch 'dev' into 5537-refactorFootnotes
gitea/salix/pipeline/head This commit looks good Details
bb10b831ef
Merge pull request 'refs #5537 change cl c' (!1627) from 5537-refactorFootnotes into dev
Reviewed-on: #1627
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
d9afdccd9c
fix: acl renewToken
gitea/salix/pipeline/head This commit looks good Details
ddaed3318d
Merge pull request 'fix: acl renewToken' (!1631) from fix_aclRenewToken into dev
Reviewed-on: #1631
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
aea32492e3
Merge branch 'master' into 5339_instance_vs_data
gitea/salix/pipeline/head There was a failure building this commit Details
10a25ff590
refs #5772
gitea/salix/pipeline/head This commit looks good Details
a173cb47f0
Merge branch 'dev' into 5728-bugEntry/buy
gitea/salix/pipeline/head This commit looks good Details
807596f735
refs #5772
gitea/salix/pipeline/head This commit looks good Details
18a8106461
refs #5339 fix after save
gitea/salix/pipeline/head This commit looks good Details
5f4b62f133
refs #5688 fix: test front
gitea/salix/pipeline/head This commit looks good Details
207dcacf0f
Merge pull request 'refs #5339 data' (!1623) from 5339_instance_vs_data into master
Reviewed-on: #1623
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
591fc14ffa
refs #5772 refactor: movido codigo para enviar rocket al back
gitea/salix/pipeline/head This commit looks good Details
2d21da1faa
Merge pull request '5528-entry.latest-buys_fixEditBuys' (!1611) from 5528-entry.latest-buys_fixEditBuys into dev
Reviewed-on: #1611
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
b7cd32f4ce
refs #5772 eliminar tags en report invoice
gitea/salix/pipeline/head There was a failure building this commit Details
12aa9c6b4b
Merge branch 'dev'
gitea/salix/pipeline/head There was a failure building this commit Details
d26778e94e
refs #5688 fix: e2e
gitea/salix/pipeline/head This commit looks good Details
389b53ceff
refs #5772 fix: back test
gitea/salix/pipeline/head This commit looks good Details
d4dceac74c
Merge pull request '5772-reduceInvoicePdfSize' (!1632) from 5772-reduceInvoicePdfSize into dev
Reviewed-on: #1632
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
344ba298f8
refs #5832 232801 init
gitea/salix/pipeline/head This commit looks good Details
757360f3d1
Merge branch 'dev' into 5728-bugEntry/buy
gitea/salix/pipeline/head There was a failure building this commit Details
d272121258
refs 5688 fix: e2e
gitea/salix/pipeline/head This commit looks good Details
cce837686d
Merge pull request 'refs #5728 remove add, quit e2e' (!1598) from 5728-bugEntry/buy into dev
Reviewed-on: #1598
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
d9b1f4b8a1
refs #5688 fix: test e2e
gitea/salix/pipeline/head This commit looks good Details
47a4a9950f
refs #5772 Parallelism added to PDF generation
gitea/salix/pipeline/head This commit looks good Details
8c0e8e9e12
refs #5772 Fixes fetching parallelism from front
gitea/salix/pipeline/head This commit looks good Details
2fec5bf2aa
Merge pull request 'refs #5772 test into dev' (!1633) from test into dev
Reviewed-on: #1633
gitea/salix/pipeline/head This commit looks good Details
c9f11830a2
refs #5772 smtp.send() error throw flow fix
gitea/salix/pipeline/head This commit looks good Details
665339c8d2
refs #5772 Fix for unhandled ENOENT error
gitea/salix/pipeline/head This commit looks good Details
7660d76850
refs #5772 Test environment fix
gitea/salix/pipeline/head This commit looks good Details
98301f8e70
refs #5900 Small fixes & code clean
gitea/salix/pipeline/head This commit looks good Details
21988fba8c
refs #5900 Hide PIT button on insert actions
gitea/salix/pipeline/head This commit looks good Details
df049201f1
refs #5900 Optimization: remove unnecessary watcher
gitea/salix/pipeline/head This commit looks good Details
d31d1e5a13
refs #5900 User avatar margin fix
gitea/salix/pipeline/head This commit looks good Details
fd69d69ff0
refs #5900 Style: margin adjustments
gitea/salix/pipeline/head This commit looks good Details
631c0e3121
refs #5900 Log grouping fix
gitea/salix/pipeline/head This commit looks good Details
c15d9a4753
refs #5900 Log order fix
gitea/salix/pipeline/head This commit looks good Details
e32a29fc09
refs #5900 Remove duplicated logs
gitea/salix/pipeline/head This commit looks good Details
d69cbe0ad4
refs #5900 Origin separator style fix
gitea/salix/pipeline/head This commit looks good Details
544445c4ae
refs #5800 Origin separator style more clear
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
c42b38c5cc
refs #5900 Code clean, refactor & accurated
gitea/salix/pipeline/head This commit looks good Details
88e845b511
change applyFilters
gitea/salix/pipeline/head There was a failure building this commit Details
e980717d14
refs #5900, #5772 Changelog updated
gitea/salix/pipeline/head This commit looks good Details
ef8e1c4169
refs #5531 refs #5753 fix travelConfig sql
gitea/salix/pipeline/head This commit looks good Details
7d2076ff90
Merge pull request '232402_test_to_dev' (!1637) from 232402_test_to_dev into dev
Reviewed-on: #1637
Reviewed-by: Carlos Satorres Adam <carlossa@verdnatura.es>
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 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
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
alexm added 8 commits 2023-07-03 09:51:55 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
e43e52b561
refs #5753 db export and fix fixtures
gitea/salix/pipeline/head This commit looks good Details
8723cf2958
refs #5753 fix legacy bugs
gitea/salix/pipeline/head This commit looks good Details
6fcbf69f60
refs #5753 isNotEditableCredit to zeroCreditEditor
gitea/salix/pipeline/head There was a failure building this commit Details
d1fb2859be
Merge branch 'dev' into 5753_232401_db_dump
gitea/salix/pipeline/head This commit looks good Details
7fe8698b6f
refs #5753 fix ticketToInvoice
gitea/salix/pipeline/head This commit looks good Details
3b346d673b
Merge pull request 'refs #5753 db export and fix fixtures' (!1643) from 5753_232401_db_dump into dev
Reviewed-on: #1643
Reviewed-by: Carlos Satorres Adam <carlossa@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
2d1420e3f8
Merge branch 'dev' into 5836-clientDefaulterisWorker
alexm approved these changes 2023-07-03 09:52:09 +00:00
carlossa merged commit 5612c56aed into dev 2023-07-03 10:53:07 +00:00
carlossa deleted branch 5836-clientDefaulterisWorker 2023-07-03 10:53:09 +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#1639
No description provided.