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

refs #5837 fix filter existingClient France #1668

Merged
alexm merged 6 commits from 5837-quitRestrictionFrance into dev 2023-07-20 06:49:48 +00:00
Conversation 0 Commits 6 Files Changed 4 +28 -3
carlossa commented 2023-07-14 07:40:59 +00:00
Member
Copy Link
No description provided.
carlossa added the
CR / Tests passed
 label 2023-07-14 07:40:59 +00:00
carlossa added 1 commit 2023-07-14 07:41:01 +00:00
gitea/salix/pipeline/head This commit looks good Details
6d8b3e346d refs #5837 fix filter existingClient France
carlossa requested review from alexm 2023-07-14 07:41:10 +00:00
carlossa added 1 commit 2023-07-14 09:30:26 +00:00
gitea/salix/pipeline/head This commit looks good Details
765c22df96 refs #5837 new table
carlossa added 1 commit 2023-07-14 11:07:50 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
93387cae62 refs #5837 if isSocialNameUnique
carlossa added 31 commits 2023-07-19 10:46:33 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
b45b0ff826 refs #5066 copy project from the other
gitea/salix/pipeline/head There was a failure building this commit Details
16fdfa00fd refs #5066 e2e solve
gitea/salix/pipeline/head This commit looks good Details
237c83c6f5 refs #5066 getVehicleSorted small mod
gitea/salix/pipeline/head This commit looks good Details
91edc09057 refs #5066 move sql
gitea/salix/pipeline/head This commit looks good Details
d8e7c2700a refs #5066 fix autocomplete
gitea/salix/pipeline/head This commit looks good Details
3423ce612c refs #5066 e2e fixs, change name sorted
gitea/salix/pipeline/head This commit looks good Details
8fff3989e7 Merge branch 'dev' into 5066-vehicleSorted
gitea/salix/pipeline/head This commit looks good Details
813c4ede00 Merge branch 'dev' into 5066-vehicleSorted
gitea/salix/pipeline/head This commit looks good Details
d18137bce0 refs #5066 not dense
gitea/salix/pipeline/head There was a failure building this commit Details
cc27d1fa97 refs #5066 fix vehicle res.data
gitea/salix/pipeline/head This commit looks good Details
dcbe8c5f7a refs #5066 quit if
gitea/salix/pipeline/head This commit looks good Details
eff46c1cec refs #5066 e2e fix, vnConfig
gitea/salix/pipeline/head There was a failure building this commit Details
765a84e2eb refs #5819 Added param to call zone_getLeaves
gitea/salix/pipeline/head There was a failure building this commit Details
b2b335326e Merge branch 'dev' into 5066-vehicleSorted
gitea/salix/pipeline/head This commit looks good Details
3c013110d3 refs #5819 Changed structure sql
gitea/salix/pipeline/head This commit looks good Details
b285c3e37a Merge pull request 'refs #5819 Added param to call zone_getLeaves' (!1667) from 5819-zone_getLeaves into dev 
Reviewed-on: #1667
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
bd723bb7ba refs #5824 mod ng
gitea/salix/pipeline/head This commit looks good Details
36db2ee883 Merge branch 'dev' into 5066-vehicleSorted
gitea/salix/pipeline/head This commit looks good Details
9c746dd6c2 Merge pull request '5066-vehicleSorted' (!1467) from 5066-vehicleSorted into dev 
Reviewed-on: #1467
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
25ce685116 Merge branch 'dev' into 5824-fixUpsertFixedPrice
gitea/salix/pipeline/head This commit looks good Details
4150bdc6c8 Merge pull request 'refs #5824 mod ng' (!1678) from 5824-fixUpsertFixedPrice into dev 
Reviewed-on: #1678
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
579d6d53d8 Merge branch 'dev' into 5837-quitRestrictionFrance
alexm added 1 commit 2023-07-20 06:30:27 +00:00
gitea/salix/pipeline/head This commit looks good Details
60e75d7825 refs #5837 fix client condition
alexm added 50 commits 2023-07-20 06:40:41 +00:00
gitea/salix/pipeline/head This commit looks good Details
510b78c703 refs #6006 mod dias anteriores
gitea/salix/pipeline/head This commit looks good Details
78108b2ca5 Merge branch 'master' into hotfix-travel
gitea/salix/pipeline/head There was a failure building this commit Details
c0d329edca a
gitea/salix/pipeline/head There was a failure building this commit Details
ef6a2ae578 refs #5887 fix: delete requires
gitea/salix/pipeline/head There was a failure building this commit Details
7aaaf5492c refs #5887 refacotr: move code to hook
gitea/salix/pipeline/head This commit looks good Details
12685e045c tedst
gitea/salix/pipeline/head This commit looks good Details
b228b693cc Merge pull request 'refs #6006 mod dias anteriores' (!1662) from hotfix-travel into master 
Reviewed-on: #1662
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
978224c21c Merge branch 'master' into hotfix_mailAlias
gitea/salix/pipeline/head There was a failure building this commit Details
3a61bc6052 refs #5887 move changes sql
gitea/salix/pipeline/head This commit looks good Details
337ce56a60 refs #5887 test exlcuido
gitea/salix/pipeline/head This commit looks good Details
988ff96016 Merge pull request 'hotfix_mailAlias' (!1664) from hotfix_mailAlias into master 
Reviewed-on: #1664
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
660612cb84 refs #5999 url
gitea/salix/pipeline/head This commit looks good Details
2627cafc22 refs #5999 defaulter country autocomplete
gitea/salix/pipeline/head This commit looks good Details
4632ed298d Merge branch 'master' into 5999-defaultCountry
gitea/salix/pipeline/head There was a failure building this commit Details
173ed251c3 refs #5964 fix supply
gitea/salix/pipeline/head This commit looks good Details
29a4c51518 Merge branch 'master' into 5964-supplyFixValidation
gitea/salix/pipeline/head This commit looks good Details
575d7710a6 Merge pull request 'refs #5964 fix supply' (!1666) from 5964-supplyFixValidation into master 
Reviewed-on: #1666
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
190db79019 Merge branch 'master' into 5999-defaultCountry
gitea/salix/pipeline/head There was a failure building this commit Details
5ffa8b8910 Merge pull request '5999-defaultCountry' (!1665) from 5999-defaultCountry into master 
Reviewed-on: #1665
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
4a7cfe9122 fix: workCenter
gitea/salix/pipeline/head There was a failure building this commit Details
4f183d1c6a fix: worker.basic-data el boton guardar estava activo al hacer F5
gitea/salix/pipeline/head This commit looks good Details
5716acaa3c fix: test
gitea/salix/pipeline/head This commit looks good Details
6980392ba1 fix: tabulacion
gitea/salix/pipeline/head This commit looks good Details
06690ca71e Merge pull request 'hotfix_workCenter2' (!1669) from hotfix_workCenter2 into master 
Reviewed-on: #1669
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
f24aa2c801 pop vehicle error
gitea/salix/pipeline/head This commit looks good Details
10e726c486 move vehicleInvoice
gitea/salix/pipeline/head This commit looks good Details
a5d1c68511 change err and traduction
gitea/salix/pipeline/head This commit looks good Details
52f58a92c8 refs err.sqlMessage
gitea/salix/pipeline/head This commit looks good Details
47e8fab8d9 refs remove
gitea/salix/pipeline/head This commit looks good Details
93da129239 refs #5983 feat(itemShelving): add getInventory
gitea/salix/pipeline/head This commit looks good Details
9076553070 refs #5983 test(itemShelving): add getInventory
gitea/salix/pipeline/head This commit looks good Details
49c656928e refs #5983 feat(itemShelving): add visible
gitea/salix/pipeline/head This commit looks good Details
2f6c988005 Merge branch 'dev' into 5983_inventory_parking
gitea/salix/pipeline/head This commit looks good Details
85c017431c refs #5983 fix(itemShelving): fixtures
gitea/salix/pipeline/head This commit looks good Details
e2f50d63f6 Merge branch 'dev' into 5983_inventory_parking
gitea/salix/pipeline/head This commit looks good Details
3d83b7b46d Merge pull request 'pop vehicle error' (!1672) from hotfix-vehicleError into master 
Reviewed-on: #1672
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
b17de86fb1 refs #6043 add ACL
gitea/salix/pipeline/head This commit looks good Details
dbebd80a68 Merge branch 'dev' into 6043-fixe2eError
gitea/salix/pipeline/head This commit looks good Details
1f7f903ec6 Merge pull request 'refs #6043 add ACL' (!1680) from 6043-fixe2eError into dev 
Reviewed-on: #1680
Reviewed-by: Carlos Satorres Adam <carlossa@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
7cff014988 refs #5983 fix(itemShelving): vn
gitea/salix/pipeline/head This commit looks good Details
6344c11d1e Merge branch 'dev' into 5983_inventory_parking
gitea/salix/pipeline/head This commit looks good Details
b23dfaeeb1 Merge pull request '5983_inventory_parking' (!1677) from 5983_inventory_parking into dev 
Reviewed-on: #1677
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
aefcb8c49a Merge branch 'dev' into 5837-quitRestrictionFrance
alexm approved these changes 2023-07-20 06:40:44 +00:00
modules/client/back/models/client.js Outdated
@ -56,0 +54,4 @@
const existingClient = await Self.app.models.Client.findOne(filter);
if (existingClient) {
if (this.countryFk !== 19 && this.socialName === existingClient.socialName)
alexm commented 2023-07-14 07:43:01 +00:00
Member
Copy Link

No hi ha que posar ids per el codi. traulo finde un findOne de la taula per el code

No hi ha que posar ids per el codi. traulo finde un findOne de la taula per el code
alexm merged commit c1e578a456 into dev 2023-07-20 06:49:48 +00:00
alexm deleted branch 5837-quitRestrictionFrance 2023-07-20 06:49:49 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
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
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#1668
No description provided.
Delete Branch "5837-quitRestrictionFrance"

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?