Guillermo Bonet
|
787ce2fc48
|
feat: refs #7006 itemTypeLog added
|
2024-10-14 09:33:00 +02:00 |
Carlos Satorres
|
6a624b12a5
|
refs: #6898 hotfix accounts
|
2024-10-14 09:28:51 +02:00 |
Javier Segarra
|
b6bce0c2f3
|
Merge branch 'dev' into 7679_improve_newPostcode_form
|
2024-10-14 09:27:56 +02:00 |
Jorge Penadés
|
db5449444a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType
|
2024-10-14 08:37:44 +02:00 |
Alex Moreno
|
64c8d264af
|
warmFix(TravelList): add daysOnward in travelFilter
|
2024-10-14 07:43:29 +02:00 |
Jorge Penadés
|
50042ed45b
|
feat: refs #7874 prevent submit if empty fields
|
2024-10-10 16:49:41 +02:00 |
Jorge Penadés
|
6d674f2a2b
|
Merge branch 'dev' into 7874-addObservationType
|
2024-10-10 13:41:01 +00:00 |
Javier Segarra
|
2ff99d3faa
|
feat: define as global dense value
|
2024-10-10 13:56:14 +02:00 |
Javier Segarra
|
3dfb836f8e
|
revert: rollback compress spacestyle
|
2024-10-10 13:56:11 +02:00 |
Jorge Penadés
|
44c4c378f9
|
chore: refs #7874 add default ob type
|
2024-10-10 11:02:03 +02:00 |
Jon Elias
|
8b68c0afeb
|
fix: improve geoFk for ZoneDeliveryPanel
|
2024-10-10 08:30:56 +00:00 |
Jorge Penadés
|
830decb6db
|
Merge branch 'dev' into 7874-addObservationType
|
2024-10-10 08:16:36 +00:00 |
Jon Elias
|
e58818e891
|
fix: Use geoFk for ZoneDeliveryPanel
|
2024-10-10 08:14:24 +00:00 |
Jorge Penadés
|
cfe95df9e8
|
fix: refs #7524 use dynamic load
|
2024-10-10 09:46:07 +02:00 |
Javier Segarra
|
3d5d267345
|
revert: commit
|
2024-10-10 09:29:12 +02:00 |
Javier Segarra
|
f16707756e
|
fix: change type vnput
|
2024-10-10 09:29:04 +02:00 |
Jorge Penadés
|
00dc2c6edc
|
Merge branch 'dev' into 7207-showPbx
|
2024-10-10 07:18:00 +00:00 |
Jon Elias
|
d721083795
|
fix: filter panel
|
2024-10-10 08:43:33 +02:00 |
Jon Elias
|
2dd3e09928
|
refactor: requested changes
|
2024-10-10 08:26:16 +02:00 |
Jon Elias
|
419d3d2d45
|
fix: refs #6896 fixed module problems
|
2024-10-10 07:20:33 +02:00 |
Javier Segarra
|
801b6585e8
|
perf: refs #7679 change limit value
|
2024-10-09 00:44:54 +02:00 |
Javier Segarra
|
9edf35fba2
|
Merge branch 'dev' into 7679_improve_newPostcode_form
|
2024-10-08 20:27:04 +00:00 |
Carlos Satorres
|
855032e4a6
|
refs #7986 fix front
|
2024-10-08 15:36:57 +02:00 |
Alex Moreno
|
b6778aaf17
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-10-08 12:24:39 +02:00 |
Alex Moreno
|
d8a2cdc11c
|
Merge branch 'master' into hotFix_VnPaginate_offset
|
2024-10-08 10:16:14 +00:00 |
Carlos Satorres
|
0517b39c60
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front
|
2024-10-08 09:26:07 +02:00 |
Carlos Satorres
|
56fff55f71
|
fix: unnecessary property
|
2024-10-08 09:26:00 +02:00 |
Alex Moreno
|
bde739e7ef
|
Merge branch 'master' into hotFix_VnPaginate_offset
|
2024-10-08 06:50:16 +00:00 |
Carlos Satorres
|
73e5039ec3
|
refs #7986 create front
|
2024-10-08 08:35:24 +02:00 |
Jorge Penadés
|
1723331615
|
Merge branch 'dev' of https: refs #7207//gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx
|
2024-10-07 16:35:00 +02:00 |
Jorge Penadés
|
e6535a5dd8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8019-makeResponsiveInputs
|
2024-10-07 16:10:59 +02:00 |
Jorge Penadés
|
4344458bb0
|
feat: refs #8019 fine-tunning vnTime
|
2024-10-07 16:02:29 +02:00 |
Jorge Penadés
|
c815066953
|
feat: refs #8019 fine-tunning vnDate
|
2024-10-07 15:55:18 +02:00 |
Javier Segarra
|
43da6ea1b8
|
Merge branch 'master' into hotfix_vnImg_zoom_resolution
|
2024-10-07 12:00:12 +00:00 |
Guillermo Bonet
|
50eed83d05
|
feat: refs #7893 Requested changes
|
2024-10-07 13:50:19 +02:00 |
Jorge Penadés
|
d1b3e01d87
|
chore: refs #8019 refactor css scoped
|
2024-10-07 13:36:27 +02:00 |
Jon Elias
|
27dca7c35f
|
Merge branch 'Fix-TicketsModule' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-TicketsModule
|
2024-10-07 13:29:46 +02:00 |
Jon Elias
|
afc52f6cea
|
fix: changes in sale and summary
|
2024-10-07 13:29:43 +02:00 |
Javier Segarra
|
0ed9fdd55d
|
fix: refs VnImg zoom resolution missing property
|
2024-10-07 13:02:40 +02:00 |
Carlos Satorres
|
e396cd0cac
|
hotfix: routePrice null
|
2024-10-07 12:16:32 +02:00 |
Jorge Penadés
|
d88fadca55
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8019-makeResponsiveInputs
|
2024-10-07 11:47:39 +02:00 |
Guillermo Bonet
|
a6944561de
|
Merge branch 'dev' into 7893-wasteRecalc
|
2024-10-07 11:32:03 +02:00 |
Guillermo Bonet
|
c3eaab44ed
|
Merge branch '7893-wasteRecalc' of https://gitea.verdnatura.es/verdnatura/salix-front into 7893-wasteRecalc
|
2024-10-07 11:31:18 +02:00 |
Guillermo Bonet
|
178fa8cd21
|
feat: refs #7893 Requested changes
|
2024-10-07 11:31:16 +02:00 |
Guillermo Bonet
|
f98739f0ed
|
Merge branch 'dev' into 7893-wasteRecalc
|
2024-10-07 08:03:26 +00:00 |
Guillermo Bonet
|
4f3e7e2630
|
feat: refs #7893 Added waste recalc section
|
2024-10-07 10:03:05 +02:00 |
Carlos Satorres
|
27e6dd5bf1
|
Merge branch 'master' into 6898-hotfixSupplierAgency
|
2024-10-07 07:51:02 +00:00 |
Carlos Satorres
|
5d65d3e20c
|
refs #6898 hotfix agency
|
2024-10-07 09:48:57 +02:00 |
Jorge Penadés
|
5c5a359986
|
refactor: refs #8019 create VnTime
|
2024-10-07 09:38:39 +02:00 |
Jorge Penadés
|
947f913679
|
refactor: refs #8019 create VnDate
|
2024-10-07 09:25:06 +02:00 |
Alex Moreno
|
ef5ae0f723
|
refactor(ticketNotes): translations
|
2024-10-07 09:16:07 +02:00 |
Jon Elias
|
33d6d529c5
|
Merge branch 'dev' into Fix-TicketsModule
|
2024-10-07 07:11:52 +00:00 |
Jon Elias
|
bd3de77cbd
|
fix: changes in list and filter to fix section
|
2024-10-07 09:10:20 +02:00 |
Alex Moreno
|
b8407140f9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-10-07 09:02:01 +02:00 |
Alex Moreno
|
426b7254d6
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-10-07 09:01:57 +02:00 |
Jorge Penadés
|
355c84ad06
|
Merge branch 'dev' into 7323-fineTunningWorker
|
2024-10-07 06:39:07 +00:00 |
Alex Moreno
|
34a40dd87c
|
fix(VnPaginate): use default value
|
2024-10-07 08:24:53 +02:00 |
Javier Segarra
|
04b2a4d9ce
|
perf: clean warnings
|
2024-10-05 00:31:41 +02:00 |
Javier Segarra
|
c3c2528342
|
feat: #7356 improve NotesSummary
|
2024-10-05 00:31:32 +02:00 |
Pako Natek
|
355b1357b7
|
Merge branch 'dev' into Fix-OrderCatalog
|
2024-10-04 16:08:12 +00:00 |
Jorge Penadés
|
9383a71adb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx
|
2024-10-04 16:38:27 +02:00 |
Jorge Penadés
|
055b1b0a88
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType
|
2024-10-04 16:12:31 +02:00 |
Jon Elias
|
aee23c75e8
|
fix: order module
|
2024-10-04 14:31:39 +02:00 |
Jon Elias
|
e4e60abe0e
|
Merge branch 'master' into Hotfix-ZoneOrderFilters
|
2024-10-04 12:25:49 +00:00 |
Jon Elias
|
3a21f6aadb
|
fix: order catalog
|
2024-10-04 14:22:00 +02:00 |
Jorge Penadés
|
9c5ce6dbfd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType
|
2024-10-04 13:50:31 +02:00 |
Jorge Penadés
|
905841e0d6
|
Merge branch 'dev' into 7207-showPbx
|
2024-10-04 11:45:28 +00:00 |
Jorge Penadés
|
b735ccb3a0
|
Merge branch 'dev' of https: refs #7323//gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker
|
2024-10-04 13:37:55 +02:00 |
Pablo Natek
|
efe5208d30
|
Merge branch 'dev' into 4988-fixE2e
|
2024-10-04 11:32:40 +00:00 |
Pablo Natek
|
1869e3315a
|
fix: refs #4988 remove id
|
2024-10-04 13:14:14 +02:00 |
Pablo Natek
|
7dc019cfbb
|
fix: refs #4988 selector on e2e
|
2024-10-04 13:13:57 +02:00 |
Jon Elias
|
195747b5a0
|
feat: added click and transfer tickets and deleted useless code
|
2024-10-04 12:34:37 +02:00 |
Jorge Penadés
|
67c2e284ba
|
feat: refs #7702 ask old pass
|
2024-10-04 11:45:10 +02:00 |
Carlos Satorres
|
0d31adaa4b
|
refs #7767 check holiday
|
2024-10-04 11:29:21 +02:00 |
Jorge Penadés
|
e43ba9b58a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword
|
2024-10-04 10:11:38 +02:00 |
Jon Elias
|
7874db1647
|
fix: zone delivery postcodes filter and order catalog type filter
|
2024-10-04 09:58:23 +02:00 |
Jon Elias
|
4b9588c189
|
refactor: refs #7825 modified worker list form to fill the field when a bank entity is created
|
2024-10-04 08:55:48 +02:00 |
Pablo Natek
|
4ba52f1a56
|
Merge branch 'dev' into 7404-addSomeLogisticPreferences
|
2024-10-04 06:55:41 +00:00 |
Pablo Natek
|
4a357c5be6
|
Merge branch 'dev' into 7404-addSomeLogisticPreferences
|
2024-10-04 06:53:53 +00:00 |
Pablo Natek
|
99ba7a39fa
|
Merge branch 'dev' into 7129--fixTranslates
|
2024-10-04 06:53:17 +00:00 |
Carlos Satorres
|
530ed4b716
|
refs #7355 fix searchbar
|
2024-10-04 08:48:36 +02:00 |
Jorge Penadés
|
c64fe8c044
|
chore: refs #7207 refactor locale
|
2024-10-03 17:04:56 +02:00 |
Jorge Penadés
|
b0ba6a5e0f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx
|
2024-10-03 15:40:05 +02:00 |
Jorge Penadés
|
cd20db637c
|
fix: refs #7874 btn ui
|
2024-10-03 15:30:26 +02:00 |
Jorge Penadés
|
aca10b81af
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType
|
2024-10-03 15:14:28 +02:00 |
Pablo Natek
|
c04dad38f1
|
feat: refs #7404 change travel name and remove buyer filter
|
2024-10-03 15:02:14 +02:00 |
Jorge Penadés
|
e10088ed06
|
Merge branch 'dev' of https: refs #7702//gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword
|
2024-10-03 13:49:33 +02:00 |
Jorge Penadés
|
ad8b72660f
|
fix: refs #7353 scopeDays
|
2024-10-03 13:37:21 +02:00 |
Jorge Penadés
|
fadfafbb1d
|
Merge branch 'dev' into 7524-dynamicFetch
|
2024-10-03 10:05:22 +00:00 |
Pablo Natek
|
05a1d0e8fb
|
fix: refs #7129 translates from globals to module locals
|
2024-10-03 10:52:16 +02:00 |
Jorge Penadés
|
01dc25da8c
|
refactor: refs #7874 create element if condition
|
2024-10-03 10:23:27 +02:00 |
Jorge Penadés
|
a8c48789ca
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType
|
2024-10-03 10:03:49 +02:00 |
Jorge Penadés
|
9b8e388525
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType
|
2024-10-03 09:49:04 +02:00 |
Pablo Natek
|
06fa5b13a4
|
Merge branch 'dev' into 7404-fixStyle
|
2024-10-03 07:47:52 +00:00 |
Jorge Penadés
|
739671a6da
|
Merge branch 'dev' into 7524-dynamicFetch
|
2024-10-03 07:25:40 +00:00 |
Jon Elias
|
b93375f5a4
|
Merge branch 'dev' into 7010-AddPackingField
|
2024-10-03 06:41:50 +00:00 |
Jon Elias
|
6a1bb6d41f
|
Merge branch '7010-AddPackingField' of https://gitea.verdnatura.es/verdnatura/salix-front into 7010-AddPackingField
|
2024-10-03 08:38:58 +02:00 |
Jon Elias
|
8ee4edc5d5
|
perf: refs #7010 customer summary packaging type field
|
2024-10-03 08:38:56 +02:00 |
Javi Gallego
|
df64814c57
|
fix: hotfix refund invoice
|
2024-10-03 08:31:13 +02:00 |
Javi Gallego
|
ed5cf137b0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-10-03 08:29:29 +02:00 |
Javi Gallego
|
b08a5e63e9
|
fix: inheritWarehouse
|
2024-10-03 08:29:26 +02:00 |
Javier Segarra
|
fef875270e
|
Merge branch 'dev' into 7679_improve_newPostcode_form
|
2024-10-02 22:08:13 +00:00 |
Pablo Natek
|
5e59ecdb43
|
fix: refs #7404 with on stockBought mobile version
|
2024-10-02 17:14:51 +02:00 |
Carlos Satorres
|
55ddc8644f
|
refs #7283 fix itemMigration list filters
|
2024-10-02 12:51:33 +02:00 |
Jon Elias
|
be53b466b9
|
Merge branch 'dev' into 7010-AddPackingField
|
2024-10-02 09:53:22 +00:00 |
Jon Elias
|
0b76d0d556
|
refactor: refs #7010 added function to get item packaging type
|
2024-10-02 11:52:16 +02:00 |
Carlos Satorres
|
ba3b2198b8
|
Merge branch 'dev' into warmFix-userListFixRole
|
2024-10-02 09:31:54 +00:00 |
Jon Elias
|
0650380b7b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7010-AddPackingField
|
2024-10-02 11:29:54 +02:00 |
Jon Elias
|
375adfab76
|
Merge branch 'dev' into 7884-AddLabelerField
|
2024-10-02 08:46:08 +00:00 |
Jon Elias
|
c54189e06a
|
Merge branch '7884-AddLabelerField' of https://gitea.verdnatura.es/verdnatura/salix-front into 7884-AddLabelerField
|
2024-10-02 10:43:55 +02:00 |
Jon Elias
|
98df741f1b
|
fix: refs #7884 deleted useless translations
|
2024-10-02 10:43:54 +02:00 |
Carlos Satorres
|
49da7168ab
|
Merge branch 'dev' into 6899-fixInvoiceOutNegative
|
2024-10-02 08:41:19 +00:00 |
Jon Elias
|
12727e93eb
|
Merge branch 'dev' into 7884-AddLabelerField
|
2024-10-02 08:36:11 +00:00 |
Jon Elias
|
7db166974f
|
feat: refs #7884 use VnTable prop for chip label filters and modified translations
|
2024-10-02 10:34:50 +02:00 |
Carlos Satorres
|
c2c4acfc30
|
refs #6899 fix filters, date from to socialName
|
2024-10-02 09:42:38 +02:00 |
Javier Segarra
|
692c649b8c
|
perf: refs #7679 #7679 improve watch
|
2024-10-02 09:29:05 +02:00 |
Jon Elias
|
03a3d6bd50
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7884-AddLabelerField
|
2024-10-02 08:47:21 +02:00 |
Javier Segarra
|
2bd004f52b
|
perf: refs #7679 add sortBy & limit whe retrieve Autonomies
|
2024-10-01 21:56:12 +02:00 |
Javier Segarra
|
6b38bdf868
|
style: improve ZoneLocationTree height
|
2024-10-01 19:26:03 +00:00 |
Pablo Natek
|
c0fd5a1c21
|
fix: refs #7404 fix style
|
2024-10-01 16:12:18 +02:00 |
Javi Gallego
|
36457f704d
|
Merge branch 'dev' into 6722-showDegrees
|
2024-10-01 14:04:18 +00:00 |
Javier Segarra
|
2ca99a51ae
|
fix: refs #7356 transfer ticket method
|
2024-10-01 15:12:22 +02:00 |
Javier Segarra
|
1a697aa018
|
feat: refs #7679 #7679 add sortBy and limit
|
2024-10-01 15:02:42 +02:00 |
Carlos Satorres
|
d69336c82a
|
refs #7366 make travelFilter, travelList
|
2024-10-01 14:15:18 +02:00 |
Javi Gallego
|
4399a91e99
|
fix: misSpelling
|
2024-10-01 13:29:45 +02:00 |
Javi Gallego
|
589c672ab2
|
fix: show degrees
|
2024-10-01 13:28:49 +02:00 |
Jon Elias
|
7b63bb38f2
|
fix: deleted code
|
2024-10-01 12:34:39 +02:00 |
Javier Segarra
|
6e4677848f
|
Merge branch 'dev' into Fix-TicketSale
|
2024-10-01 09:53:34 +00:00 |
Alex Moreno
|
ddffd5b1c7
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-10-01 11:47:55 +02:00 |
Alex Moreno
|
9b90487b6a
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
|
2024-10-01 11:47:43 +02:00 |
Alex Moreno
|
2e9a8d9205
|
fix(WorkerList): add type email
|
2024-10-01 11:47:31 +02:00 |
Javier Segarra
|
696c9ca9b3
|
fix: solve conflicts with stockBought
|
2024-10-01 11:40:29 +02:00 |
Javier Segarra
|
27b2d0232c
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into fixConflicts_testToDev
|
2024-10-01 11:35:14 +02:00 |
Jon Elias
|
90ce9b2cd3
|
Merge branch '7884-AddLabelerField' of https://gitea.verdnatura.es/verdnatura/salix-front into 7884-AddLabelerField
|
2024-10-01 11:32:17 +02:00 |
Jon Elias
|
de01dda2ed
|
refactor: refs #7884 modified icon color
|
2024-10-01 11:32:15 +02:00 |
Carlos Satorres
|
e64e6eefe3
|
refs #7355 add role
|
2024-10-01 10:35:31 +02:00 |
Javier Segarra
|
8fa82c818d
|
fix: remove limit
|
2024-10-01 10:04:56 +02:00 |
Javier Segarra
|
30767b110f
|
Merge branch 'Fix-TicketSale' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-TicketSale
|
2024-10-01 10:03:42 +02:00 |
Javier Segarra
|
d6efd21db6
|
style: remove space between value and label
|
2024-10-01 10:03:39 +02:00 |
Javier Segarra
|
e9364f69d4
|
feat: #7679 show tooltips
|
2024-10-01 10:03:14 +02:00 |
Javier Segarra
|
778e6299ce
|
fix: solve conflicts from test to dev
|
2024-10-01 08:57:04 +02:00 |
Carlos Satorres
|
54015fb6bf
|
refs #7283 fix itemMigration
|
2024-10-01 08:44:08 +02:00 |
Jon Elias
|
86ab9f9540
|
Merge branch 'Fix-TicketSale' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-TicketSale
|
2024-10-01 06:52:21 +02:00 |
Jon Elias
|
10bada7463
|
fix: deleted useless button
|
2024-10-01 06:52:19 +02:00 |
Carlos Satorres
|
06a1b3b409
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration
|
2024-10-01 06:30:19 +02:00 |
Javier Segarra
|
41acf0e1e2
|
feat: #7679 show country provinces
|
2024-10-01 00:24:34 +02:00 |
Javier Segarra
|
e7a2d3aa85
|
fix: refs #7354 ZonLocation filter
|
2024-09-30 20:20:51 +02:00 |
Javier Segarra
|
03450a86fb
|
fix: SupplierFiscalData show data printing
|
2024-09-30 13:13:35 +00:00 |
Javier Segarra
|
4d4554a6ca
|
fix(lilium): #6898 SupplierFiscalData show fields
|
2024-09-30 15:11:22 +02:00 |
Alex Moreno
|
732bb0943c
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
|
2024-09-30 15:03:11 +02:00 |
Javier Segarra
|
2302e22f11
|
fix: solve conflicts from master to test
|
2024-09-30 15:00:05 +02:00 |
Jon Elias
|
3c5a5c3905
|
Merge branch 'dev' into Fix-TicketSale
|
2024-09-30 12:36:19 +00:00 |
Jon Elias
|
76a77dcee9
|
fix: duplicate call
|
2024-09-30 14:35:10 +02:00 |
Pablo Natek
|
deb608cc96
|
Merge branch 'dev' into 7404-fixSomeStyleIssues
|
2024-09-30 12:26:37 +00:00 |
Javier Segarra
|
7001a707b9
|
Merge branch 'dev' into 8031_notify_dataSaved
|
2024-09-30 11:34:38 +00:00 |
Javier Segarra
|
da78edb6d2
|
Merge branch '7404-fixSomeStyleIssues' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-fixSomeStyleIssues
|
2024-09-30 13:34:21 +02:00 |
Javier Segarra
|
2812e6f456
|
Merge branch 'master' into fix_8018
|
2024-09-30 11:13:20 +00:00 |
Javier Segarra
|
cf509d608a
|
Merge branch 'dev' into 8018_location_label
|
2024-09-30 10:53:33 +00:00 |
Javier Segarra
|
b3c36e555f
|
style: refs #7404 compress spaces
|
2024-09-30 12:50:23 +02:00 |
Javier Segarra
|
b41026806f
|
style: refs #7404 compress spaces
|
2024-09-30 12:48:05 +02:00 |
Javier Segarra
|
cf67865b0b
|
feat: refs #7404 updates
|
2024-09-30 11:53:54 +02:00 |
Pablo Natek
|
90762f1d1c
|
Merge branch '7404-fixSomeStyleIssues' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-fixSomeStyleIssues
|
2024-09-30 10:47:03 +02:00 |
Pablo Natek
|
7fa0a5b28c
|
fix: refs #7404 path name
|
2024-09-30 10:47:02 +02:00 |
Javier Segarra
|
63d2b06b70
|
Merge branch 'dev' into 8031_notify_dataSaved
|
2024-09-30 08:23:12 +00:00 |
Pablo Natek
|
37d32a7934
|
Merge branch 'dev' into 7404-fixSomeStyleIssues
|
2024-09-30 08:14:44 +00:00 |
Pablo Natek
|
c815177be9
|
fix: refs #7404 translate and width problem
|
2024-09-30 10:13:39 +02:00 |
Pablo Natek
|
868e6a312f
|
fix: refs #7404 class name
|
2024-09-30 10:04:00 +02:00 |
Pablo Natek
|
cb0d3c5bca
|
fix: refs #7404 sticky footer and transparent header for vnTable
|
2024-09-30 09:46:00 +02:00 |
Pablo Natek
|
f005674db6
|
Merge branch 'test' into 7404-remove-from-test
|
2024-09-30 05:17:08 +00:00 |
Javier Segarra
|
8356be1ec0
|
fix: onDataSaved VnTable
Habia un problema al usar this en entorno no local
|
2024-09-27 18:10:43 +00:00 |
Javier Segarra
|
12a452d774
|
Merge branch 'dev' into 8031_notify_dataSaved
|
2024-09-27 18:02:24 +00:00 |
Javier Segarra
|
bec50d6eed
|
perf: refs #7679 #7679 comments
|
2024-09-27 19:54:01 +02:00 |
Javier Segarra
|
157370ec26
|
Merge branch 'dev' into 8018_location_label
|
2024-09-27 13:18:06 +02:00 |
Pablo Natek
|
336f2ba89e
|
fix: refs #7404 remove from test
|
2024-09-27 12:41:00 +02:00 |
Pablo Natek
|
193670fdcf
|
fix: refs #7404 revert commit prevent production access
|
2024-09-27 12:39:30 +02:00 |
Javier Segarra
|
e06d567e3c
|
test: refs #7679 #7679 remove comment
|
2024-09-27 10:35:39 +02:00 |
Jorge Penadés
|
b541ce4e56
|
fix: split params
|
2024-09-27 09:59:18 +02:00 |
Javier Segarra
|
2990d32705
|
fix: grafana url
|
2024-09-27 07:56:50 +00:00 |
Jon Elias
|
2be969339e
|
Merge branch 'master' into Hotfix-ChangeTicketState
|
2024-09-27 07:26:16 +00:00 |
Jon Elias
|
6b0a0f71ce
|
fix: fixed change state function
|
2024-09-27 08:24:58 +02:00 |
Javier Segarra
|
d2067c633d
|
feat: refs #7679 #7679 use country or province to retrieve cities
|
2024-09-26 23:38:22 +02:00 |
Javier Segarra
|
807827c97c
|
Merge branch 'test' into warmfix_customerModule
|
2024-09-26 16:25:27 +00:00 |
Jorge Penadés
|
71201f1007
|
feat: refs #7874 required fields banner
|
2024-09-26 17:19:05 +02:00 |
Javi Gallego
|
a2b7e81982
|
feat: warehouse
|
2024-09-26 16:23:18 +02:00 |
Jorge Penadés
|
11c135e8c4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType
|
2024-09-26 16:01:40 +02:00 |
Jorge Penadés
|
ba9f1407ac
|
Merge branch 'dev' into 7524-dynamicFetch
|
2024-09-26 13:53:54 +00:00 |
Jorge Penadés
|
353116a7a0
|
fix: split params
|
2024-09-26 15:49:12 +02:00 |
Jorge Penadés
|
7eb951ef13
|
fix: refs #7323 use right locale
|
2024-09-26 15:28:00 +02:00 |
Jorge Penadés
|
14b7654db3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker
|
2024-09-26 15:16:32 +02:00 |
Jorge Penadés
|
18ea23adf1
|
refactor: refs #7323 pr request
|
2024-09-26 15:03:22 +02:00 |
Javier Segarra
|
428c6966f2
|
Merge branch 'dev' into 8018_location_label
|
2024-09-26 14:48:47 +02:00 |
Jorge Penadés
|
01b62adba9
|
fix: refs #7524 dynamic fetch
|
2024-09-26 14:30:19 +02:00 |
Javier Segarra
|
bbf3b6d4b7
|
fix: #6943 show nickname salesPerson
|
2024-09-26 12:29:03 +00:00 |
Javier Segarra
|
a0b3e933a8
|
Merge branch 'dev' into 8031_notify_dataSaved
|
2024-09-26 12:17:40 +00:00 |
Alex Moreno
|
f00db79d47
|
fix(VnTable): header background-color
|
2024-09-26 14:14:27 +02:00 |
Jon Elias
|
9386d648d0
|
Merge branch '7010-AddPackingField' of https://gitea.verdnatura.es/verdnatura/salix-front into 7010-AddPackingField
|
2024-09-26 14:13:00 +02:00 |
Jon Elias
|
1c99c01d1d
|
refactor: refs #7010 modified front
|
2024-09-26 14:12:59 +02:00 |
Jorge Penadés
|
c5766aa1b3
|
chore: refs #7524 remove old filter
|
2024-09-26 12:38:03 +02:00 |
Jon Elias
|
51aae0f726
|
Merge branch 'dev' into 7010-AddPackingField
|
2024-09-26 08:22:02 +00:00 |
Jon Elias
|
6d5a8cba6f
|
refactor: refs #7010 modified customer summary table
|
2024-09-26 10:20:50 +02:00 |
Jorge Penadés
|
c2b52473a1
|
fix: refs #7323 align tables
|
2024-09-26 10:04:16 +02:00 |
Jorge Penadés
|
e827d3aabf
|
fix: refs #7323 rollback
|
2024-09-26 09:47:54 +02:00 |
Jorge Penadés
|
478d4695b8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker
|
2024-09-26 09:16:59 +02:00 |
Jorge Penadés
|
0cffe0b586
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType
|
2024-09-26 09:08:53 +02:00 |
Jorge Penadés
|
709a662ceb
|
feat: refs #7874 select observation type
|
2024-09-26 09:08:12 +02:00 |
Pablo Natek
|
6e6b65771a
|
Merge branch 'dev' into 7129-fixMigrationIssues
|
2024-09-26 06:09:21 +00:00 |
Pablo Natek
|
c388d5ab2a
|
Merge branch 'dev' of https: refs #7129//gitea.verdnatura.es/verdnatura/salix-front into 7129-fixMigrationIssues
|
2024-09-26 07:57:59 +02:00 |
Javier Segarra
|
a8c96278de
|
Merge branch 'master' into hotfix_itemFixedPrice
|
2024-09-25 21:04:13 +00:00 |
Jon Elias
|
56af4d3736
|
feat: refs #7010 added packing type field in customer summary and ticket list
|
2024-09-25 14:18:34 +02:00 |
Javi Gallego
|
dcfdabde32
|
feat: tabulation
|
2024-09-25 14:17:26 +02:00 |
Javier Segarra
|
73c45b8c4a
|
Merge branch 'dev' into 8031_notify_dataSaved
|
2024-09-25 12:08:40 +00:00 |
Jorge Penadés
|
68ebda625b
|
fix: refs #7874 refs #6943 ui
|
2024-09-25 14:02:11 +02:00 |
Javi Gallego
|
eb0e18bf58
|
Merge branch 'dev' into 6722-thermograph
|
2024-09-25 13:48:12 +02:00 |
Javi Gallego
|
bd2fa37450
|
feat: maxTemperature and minTemperature
|
2024-09-25 13:34:43 +02:00 |
Alex Moreno
|
8c13ceb3fe
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-09-25 13:28:13 +02:00 |
Alex Moreno
|
bcada72f04
|
fix: refs #7155 use chip-locale
|
2024-09-25 13:24:22 +02:00 |
Alex Moreno
|
6bd2835c59
|
chore: refs #7155 typo
|
2024-09-25 13:18:26 +02:00 |
Alex Moreno
|
9a11f94922
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 7155-travel_daysOnward_2
|
2024-09-25 13:17:34 +02:00 |
Alex Moreno
|
8dd2c44832
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-09-25 12:53:12 +02:00 |
Alex Moreno
|
f04beb8f90
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
|
2024-09-25 12:52:58 +02:00 |
Jorge Penadés
|
aab428494e
|
fix: refs #6898 add role
|
2024-09-25 12:40:22 +02:00 |
Pablo Natek
|
cea5edd506
|
fix: refs #7129 translate
|
2024-09-25 12:33:19 +02:00 |
Jorge Penadés
|
d2996f0838
|
fix: refs #6943 prevent null
|
2024-09-25 12:23:41 +02:00 |
Pablo Natek
|
ca568c31ca
|
fix: refs #7129 clone post
|
2024-09-25 11:51:51 +02:00 |
Javier Segarra
|
53d5d123c2
|
feat: i18n
|
2024-09-25 11:36:44 +02:00 |
Javier Segarra
|
fb180f0198
|
fix: apply order
|
2024-09-25 11:31:05 +02:00 |
Javier Segarra
|
77ad96a58b
|
fix: itemfixedPrice inputs
|
2024-09-25 11:30:18 +02:00 |
Pablo Natek
|
27b699ebf4
|
fix: refs #7129 some component styles
|
2024-09-25 11:16:27 +02:00 |
Javier Segarra
|
72ddeaa90a
|
test: refs #8031 e2e
|
2024-09-25 10:53:38 +02:00 |
Jorge Penadés
|
b54d358617
|
fix: refs #7207 use right locale
|
2024-09-25 09:14:35 +02:00 |
Javier Segarra
|
8c7ee3024f
|
Merge branch 'dev' into 8031_notify_dataSaved
|
2024-09-25 09:12:17 +02:00 |
Jorge Penadés
|
dc6acfadb7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx
|
2024-09-25 08:51:21 +02:00 |
Pablo Natek
|
1ee3691cc0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-fixMigrationIssues
|
2024-09-25 08:26:27 +02:00 |
Jon Elias
|
a14eb53f14
|
Merge branch 'dev' into 7884-AddLabelerField
|
2024-09-25 06:02:51 +00:00 |
Javier Segarra
|
c1087614c6
|
Merge branch 'dev' into 7553_FixTicketExpedition
|
2024-09-25 05:50:22 +00:00 |
Jon Elias
|
ff3ab83727
|
Merge branch 'dev' into 7553_FixTicketExpedition
|
2024-09-25 05:25:07 +00:00 |
Javier Segarra
|
2a64d9643e
|
Merge branch 'dev' into vnInput_autoFocus
|
2024-09-24 20:16:56 +00:00 |
Jorge Penadés
|
86a82c5aad
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx
|
2024-09-24 14:39:18 +02:00 |
Alex Moreno
|
d35b40a891
|
fix: vnTable color
|
2024-09-24 14:07:04 +02:00 |
Alex Moreno
|
991ad21c77
|
fix: refs #7155 remove userParams in watcher
|
2024-09-24 13:16:34 +02:00 |
Pablo Natek
|
f0c2baa60e
|
fix: refs #7129 remove consoleLog
|
2024-09-24 12:56:14 +02:00 |
Pablo Natek
|
70d640dc37
|
fix: refs #7129 some style issues
|
2024-09-24 12:54:34 +02:00 |
Alex Moreno
|
e555bd4cde
|
Merge branch 'test' of https: refs #7155//gitea.verdnatura.es/verdnatura/salix-front into 7155-travel_daysOnward
|
2024-09-24 12:21:31 +02:00 |
Jon Elias
|
8315eb2b4c
|
Merge branch 'dev' into 7553_FixTicketExpedition
|
2024-09-24 09:37:17 +00:00 |
Alex Moreno
|
3d34d9c6bb
|
chore: refs #7155 remove console.log
|
2024-09-24 10:54:17 +02:00 |
Jon Elias
|
8ac0083b9c
|
Merge branch 'dev' into 7884-AddLabelerField
|
2024-09-24 08:44:15 +00:00 |
Jon Elias
|
21f7613f21
|
Merge branch 'dev' into 7553_FixTicketExpedition
|
2024-09-24 08:36:57 +00:00 |
Jon Elias
|
f34e81038e
|
Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition
|
2024-09-24 10:36:02 +02:00 |
Jon Elias
|
cd96003c0e
|
refactor: refs #7553 requested changes and added keyup.enter
|
2024-09-24 10:35:59 +02:00 |
Jorge Penadés
|
3eb846b70c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker
|
2024-09-24 10:15:46 +02:00 |
Alex Moreno
|
edb6e9ce61
|
feat(TravelList): add daysOnward
|
2024-09-24 09:57:05 +02:00 |
Javier Segarra
|
6e57306026
|
Merge branch 'dev' into 7671_dense_itemFixedPrices
|
2024-09-24 07:39:22 +00:00 |
Jorge Penadés
|
42e4493fb6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx
|
2024-09-24 09:27:38 +02:00 |
Pablo Natek
|
c400929c99
|
fix: refs #7129 translate page title
|
2024-09-24 08:33:16 +02:00 |
Alex Moreno
|
b7ed63afc6
|
Merge branch 'dev' into 7404-fixFront
|
2024-09-24 06:18:42 +00:00 |
Alex Moreno
|
8760781660
|
fix: merge in dev
|
2024-09-24 08:15:44 +02:00 |
Alex Moreno
|
98a3b03be7
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-09-24 07:48:58 +02:00 |
Alex Moreno
|
5fc306e11e
|
Merge branch 'dev' into 6943_fix_customer_module
|
2024-09-24 05:38:47 +00:00 |
Pablo Natek
|
8124a341a0
|
feat: refs #7129 route extended list and simplify route list
|
2024-09-24 07:25:17 +02:00 |
Javier Segarra
|
a5c6d628ca
|
feat: enable notify positive when user update self data
|
2024-09-23 18:48:58 +00:00 |
Javier Segarra
|
55e017b0cc
|
Merge branch 'dev' into 7553_FixTicketExpedition
|
2024-09-23 18:39:09 +00:00 |
Javier Segarra
|
3ede256dc5
|
feat: change label because its more natural
|
2024-09-23 18:30:14 +00:00 |
Jorge Penadés
|
2cb9899de1
|
feat: refs #7207 show queue
|
2024-09-23 15:38:54 +02:00 |
Javier Segarra
|
b4b31c0c92
|
fix: enable autofocus
|
2024-09-23 15:21:07 +02:00 |
Javier Segarra
|
e9e2caee85
|
feat: autofocus after clear
|
2024-09-23 13:18:14 +00:00 |
Javier Segarra
|
27a3e36b58
|
fix: comments
|
2024-09-23 14:56:34 +02:00 |
Javier Segarra
|
ab0c38810a
|
fix: Options VnSelect properties
|
2024-09-23 12:44:37 +00:00 |
Javier Segarra
|
caddcf45c3
|
fix: Options VnSelect properties
|
2024-09-23 12:43:52 +00:00 |
Javier Segarra
|
5803af7a74
|
Merge branch 'dev' into 6943_fix_customer_module
|
2024-09-23 12:24:01 +00:00 |
Javier Segarra
|
ac8aa6bcc1
|
fix: table order
|
2024-09-23 14:21:41 +02:00 |
Jon Elias
|
b728b7c5bd
|
Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition
|
2024-09-23 13:51:22 +02:00 |
Jon Elias
|
3716507f93
|
perf: refs #7553 removeSales function
|
2024-09-23 13:51:20 +02:00 |
Javier Segarra
|
0829b6d0d2
|
fix: i18n en preparation label
|
2024-09-23 11:42:47 +00:00 |
Pablo Natek
|
b04564d5a8
|
fix: refs #7404 style non center pop up
|
2024-09-23 13:23:25 +02:00 |
Pablo Natek
|
e700f6f4a8
|
feat: refs #7404 style dynamic text color
|
2024-09-23 13:14:25 +02:00 |
Jorge Penadés
|
f809e0fb31
|
fix: refs #7323 show prev month week color
|
2024-09-23 12:55:39 +02:00 |
Javier Segarra
|
279a100f8b
|
fix: i18n en preparation label
|
2024-09-23 10:25:44 +00:00 |
Javier Segarra
|
a52cdf8f94
|
fix: i18n en preparation label
|
2024-09-23 10:25:11 +00:00 |
Robert Ferrús
|
5ebbb1cf73
|
feat: refs #8000 fix
|
2024-09-23 12:24:19 +02:00 |
Robert Ferrús
|
1ae20202cc
|
feat: refs #8000 add column into zoneBasicData
|
2024-09-23 11:56:20 +02:00 |
Javier Segarra
|
7713e33c67
|
Merge branch 'dev' into 8018_location_label
|
2024-09-23 09:48:19 +00:00 |
Javier Segarra
|
013a76cbce
|
test: VnLocation
|
2024-09-23 11:48:00 +02:00 |
Jorge Penadés
|
7bbad14f53
|
feat: refs #7323 delete btn
|
2024-09-23 11:38:27 +02:00 |
Javier Segarra
|
66cb069109
|
perf: CustomerBalance
|
2024-09-23 11:06:08 +02:00 |
Javier Segarra
|
88fd40eae6
|
feat: minor changes
|
2024-09-23 11:05:58 +02:00 |
Jon Elias
|
0dd79ed708
|
Merge branch 'dev' into 7553_FixTicketExpedition
|
2024-09-23 08:22:21 +00:00 |
Jon Elias
|
f025b4361e
|
refactor: refs #7553 last requested changes
|
2024-09-23 10:21:30 +02:00 |
Pablo Natek
|
17bb144bce
|
fix: refs #7404 translates and some minor style fixes
|
2024-09-23 10:04:45 +02:00 |
Javier Segarra
|
8bbea9c903
|
feat: change order
|
2024-09-23 09:47:54 +02:00 |
Jorge Penadés
|
37545b4cab
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker
|
2024-09-23 09:29:26 +02:00 |
Jon Elias
|
4c071aea8b
|
Merge branch 'dev' into 7884-AddLabelerField
|
2024-09-23 06:51:07 +00:00 |
Javier Segarra
|
2a97f35dd9
|
Merge branch 'dev' into 6943_fix_customer_module
|
2024-09-21 01:32:45 +02:00 |
Javier Segarra
|
d81d562edf
|
feat: goToSupplier
|
2024-09-21 01:30:37 +02:00 |
Javier Segarra
|
f5c50e842e
|
Merge branch '6943_fix_customer_module' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customer_module
|
2024-09-21 01:22:30 +02:00 |
Javier Segarra
|
f84444d894
|
feat: add tooltip CustomerNewCustomAgent
|
2024-09-21 01:22:25 +02:00 |
Jorge Penadés
|
6cc8ca6731
|
chore: refs #7702 add tests
|
2024-09-20 17:38:02 +02:00 |
Jorge Penadés
|
fc23f9a8dd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword
|
2024-09-20 16:22:48 +02:00 |
Jorge Penadés
|
df56eefe2f
|
fix: refs #7353 fine tunning ui
|
2024-09-20 15:46:54 +02:00 |
Jon Elias
|
edea17340d
|
refactor: refs #7553 adjust ticket notes view in summary
|
2024-09-20 14:33:59 +02:00 |
Carlos Satorres
|
716d018121
|
refs #72983 fix filters
|
2024-09-20 14:20:26 +02:00 |
Jorge Penadés
|
deff8a1cf4
|
feat: hide menus on small view
|
2024-09-20 13:58:26 +02:00 |
Javier Segarra
|
ddf42d9659
|
feat: update VnLocation instances
|
2024-09-20 13:46:07 +02:00 |
Javier Segarra
|
b822c7722b
|
feat: formatLocation when field is null
|
2024-09-20 13:45:43 +02:00 |
Jorge Penadés
|
6216eedd88
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-hotfix-fixUI
|
2024-09-20 13:22:30 +02:00 |
Jorge Penadés
|
7a253d314c
|
chore: refs #7353 drop useless code
|
2024-09-20 13:22:15 +02:00 |
Jorge Penadés
|
3e101242f6
|
chore: refs #7353 drop useless code
|
2024-09-20 13:20:40 +02:00 |
Jorge Penadés
|
87efc2f355
|
fix: refs #7353 responsive filters
|
2024-09-20 13:00:34 +02:00 |
Jorge Penadés
|
e1f3589110
|
fix: refs #7353 horizontal scroll
|
2024-09-20 12:17:10 +02:00 |
Javier Segarra
|
271e33a999
|
feat: formatLocation when field is null
|
2024-09-20 11:57:15 +02:00 |
Jorge Penadés
|
ac6d98cd36
|
fix: refs #7353 horizontal scroll
|
2024-09-20 11:22:51 +02:00 |
Jorge Penadés
|
b2cc74d890
|
fix: refs #7524 use id
|
2024-09-20 10:27:24 +02:00 |
Jon Elias
|
d7fb8bdaf5
|
Merge branch 'dev' into 7884-AddLabelerField
|
2024-09-20 08:24:39 +00:00 |
Jorge Penadés
|
075c129036
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7524-hotfix-tooManyRecords
|
2024-09-20 10:05:44 +02:00 |
Jorge Penadés
|
3b709c20cf
|
fix: refs #7524 use id
|
2024-09-20 10:05:28 +02:00 |
Jorge Penadés
|
2537e58ff3
|
fix: refs #7524 dynamic fetch
|
2024-09-20 09:56:04 +02:00 |
Carlos Satorres
|
681c72a3d0
|
Merge branch 'master' into 6898-fixSupplier2
|
2024-09-20 07:31:21 +00:00 |
Carlos Satorres
|
45b5433206
|
refs #6898 fix filter
|
2024-09-20 09:14:11 +02:00 |
Jon Elias
|
2c15f79a2d
|
Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition
|
2024-09-20 09:08:13 +02:00 |
Jon Elias
|
44d98865fe
|
fix: refs #7553 requested changes
|
2024-09-20 09:04:31 +02:00 |
Javier Segarra
|
650e801433
|
Merge branch 'dev' into 6943_fix_customer_module
|
2024-09-19 11:10:28 +00:00 |
Alex Moreno
|
1150739de7
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-09-19 12:59:51 +02:00 |
Alex Moreno
|
4f442a1f5a
|
Merge branch 'dev' into fix_global_handler
|
2024-09-19 10:54:45 +00:00 |
Javier Segarra
|
8e96265106
|
fix: CustomerFilter
|
2024-09-19 12:51:49 +02:00 |
Jon Elias
|
c0dab66a24
|
Merge branch 'dev' into FixWagonRedirect
|
2024-09-19 10:08:18 +00:00 |
Javier Segarra
|
88e2ea48c2
|
Merge branch 'dev' into 6943_fix_customer_module
|
2024-09-19 10:07:46 +00:00 |
Javier Segarra
|
8b379faa52
|
perf: imrpove exprBuilder
|
2024-09-19 12:06:00 +02:00 |
Jon Elias
|
8fa11263e8
|
fix: fix wagon list reload
|
2024-09-19 12:05:08 +02:00 |
Javier Segarra
|
35e89591ff
|
Merge branch 'dev' into fix_VnTable_infiniteScroll
|
2024-09-19 08:25:49 +00:00 |
Javier Segarra
|
46dbab4757
|
Merge branch 'dev' into 6943_fix_customer_module
|
2024-09-19 09:35:34 +02:00 |
Javier Segarra
|
1425ec268c
|
Merge branch 'dev' into highlight_today_qDate
|
2024-09-19 07:31:37 +00:00 |
Jorge Penadés
|
2e8397a34b
|
feat: refs #7323 use scopes
|
2024-09-19 09:26:54 +02:00 |
Javier Segarra
|
c21133ebd4
|
Merge branch 'dev' into 6943_fix_customer_module
|
2024-09-19 01:10:23 +02:00 |
Javier Segarra
|
ccfe61d777
|
feat: vnSelect exprBuilder
|
2024-09-19 01:10:14 +02:00 |
Javier Segarra
|
1550d79160
|
feat: add shortcut more buttons
|
2024-09-19 00:10:28 +02:00 |
Javier Segarra
|
08bec59a37
|
add_circle
|
2024-09-19 00:04:58 +02:00 |
Javier Segarra
|
1cb2981f97
|
feat: apply color when today
|
2024-09-18 16:26:56 +00:00 |
Javi Gallego
|
b3f27d9a84
|
feat: translations fixed
|
2024-09-18 17:51:49 +02:00 |
Javier Segarra
|
3de08826ac
|
Merge branch 'dev' into fix_VnTable_infiniteScroll
|
2024-09-18 15:41:35 +00:00 |
Alex Moreno
|
5ca38ca825
|
feat: global handler
|
2024-09-18 14:48:15 +02:00 |
Javier Segarra
|
b59e7174df
|
Merge branch 'fix_VnTable_infiniteScroll' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_VnTable_infiniteScroll
|
2024-09-18 14:30:53 +02:00 |
Alex Moreno
|
7b70734eb8
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-09-18 14:29:29 +02:00 |
Javier Segarra
|
d76250f56f
|
fix: reset VnTable scroll properties
|
2024-09-18 12:27:48 +00:00 |
Javier Segarra
|
98411d3c29
|
Merge branch 'dev' into add_shortcut_add_subSections
|
2024-09-18 12:25:23 +00:00 |
Carlos Satorres
|
364ce63545
|
Merge branch 'dev' into 7155-scopeDays
|
2024-09-18 12:01:43 +00:00 |
Jon Elias
|
9db12a8dee
|
fix: wagon reload
|
2024-09-18 13:46:37 +02:00 |
Carlos Satorres
|
fc26fa12be
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration
|
2024-09-18 13:34:14 +02:00 |
Javier Segarra
|
37329a7391
|
feat: add shortcut add event in some subSections
|
2024-09-18 13:30:51 +02:00 |
Alex Moreno
|
f86525e31d
|
fix: not null variable
|
2024-09-18 13:24:21 +02:00 |
Alex Moreno
|
3906fc386f
|
hotFix: supplierDescriptor not use same data-key
|
2024-09-18 12:49:45 +02:00 |
Jon Elias
|
34f70d026e
|
feat: refs #7553 added new field in list and translations
|
2024-09-18 11:50:00 +02:00 |
Alex Moreno
|
8abd375985
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7792-accountBasicData_twoFactorFk
|
2024-09-18 10:14:54 +02:00 |
Alex Moreno
|
21a7fafba5
|
feat: create VnSelectEnum and add in AccountBasicData and ClaimBasicData
|
2024-09-18 09:57:21 +02:00 |
Jorge Penadés
|
5625ef4ce1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker
|
2024-09-18 09:41:26 +02:00 |
Javier Segarra
|
aa6dac3944
|
fix: SupplierFiscalData VnLocation
|
2024-09-18 07:28:10 +00:00 |
Jon Elias
|
07cd9d5aae
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition
|
2024-09-18 08:42:59 +02:00 |
Jon Elias
|
98faf22e73
|
Merge branch 'dev' into 7884-AddLabelerField
|
2024-09-18 06:24:07 +00:00 |
Alex Moreno
|
f1759eca04
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7792-accountBasicData_twoFactorFk
|
2024-09-18 08:23:25 +02:00 |
Jon Elias
|
3a95cf123e
|
Merge branch '7884-AddLabelerField' of https://gitea.verdnatura.es/verdnatura/salix-front into 7884-AddLabelerField
|
2024-09-18 08:23:18 +02:00 |
Jon Elias
|
566d657f70
|
feat: refs #7884 added default params and chip translations
|
2024-09-18 08:23:15 +02:00 |
Alex Moreno
|
fb1a94604b
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-09-18 08:20:45 +02:00 |
Jorge Penadés
|
41c43fde76
|
feat: refs #7323 hide log section
|
2024-09-17 16:08:48 +02:00 |
Jorge Penadés
|
84cf3bea95
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker
|
2024-09-17 16:02:15 +02:00 |
Carlos Satorres
|
4f662375cd
|
fix(VnTable): sanitizer value is defined
|
2024-09-17 15:04:58 +02:00 |
Carlos Satorres
|
db783e1538
|
refs #7283 item Descriptor
|
2024-09-17 15:03:30 +02:00 |
Carlos Satorres
|
ae97e32826
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration
|
2024-09-17 14:55:48 +02:00 |
Javier Segarra
|
c7bef79c0a
|
perf: improve
|
2024-09-17 13:48:17 +02:00 |
Pablo Natek
|
cead2c2b5e
|
Merge branch 'dev' into 7404-stockBought
|
2024-09-17 11:40:42 +00:00 |
Pablo Natek
|
e559ab43d7
|
fix: refs #7404 remove some style
|
2024-09-17 13:40:27 +02:00 |
Jorge Penadés
|
47de2caed7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker
|
2024-09-17 13:26:48 +02:00 |
Jorge Penadés
|
eb6f12ae3b
|
fix: refs #7353 rollback
|
2024-09-17 12:58:06 +02:00 |
Jorge Penadés
|
ed4a4e1e59
|
fix: refs #7353 rollback
|
2024-09-17 12:57:43 +02:00 |
Jorge Penadés
|
2cb2ce16ef
|
fix: refs #7353 locale
|
2024-09-17 12:56:50 +02:00 |
Jorge Penadés
|
3f03f0d4e9
|
fix: refs #7353 show unremovable params
|
2024-09-17 12:41:57 +02:00 |
Javier Segarra
|
29e4c723c9
|
Merge branch 'dev' into 6943_fix_customer_module
|
2024-09-17 12:12:41 +02:00 |
Jorge Penadés
|
4edcff41f1
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-hotfix-fixFilter
|
2024-09-17 11:39:07 +02:00 |
Jorge Penadés
|
56f8cbe615
|
fix: refs #7353 sales person filter and locale
|
2024-09-17 11:37:44 +02:00 |
Carlos Satorres
|
8c91cb42f6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration
|
2024-09-17 11:11:57 +02:00 |
Jon Elias
|
58cd0b54cf
|
Merge branch 'dev' into 6346-WagonTypeToCard
|
2024-09-17 09:08:00 +00:00 |
Carlos Satorres
|
044156356c
|
hotfix searchbar
|
2024-09-17 10:37:22 +02:00 |
Alex Moreno
|
3d1bb0c67a
|
fix(itemDescriptor): fix redirection to itemDiary
|
2024-09-17 10:20:44 +02:00 |
Pablo Natek
|
7faa0c240f
|
Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought
|
2024-09-17 10:10:40 +02:00 |
Javier Segarra
|
e4adbfa9f7
|
Merge branch 'dev' into 7677_vnLocation_perf
|
2024-09-17 07:29:00 +00:00 |
Alex Moreno
|
37b6a03288
|
fix(itemDescriptor): fix redirection to itemDiary
|
2024-09-17 09:25:53 +02:00 |
Jon Elias
|
6edabd856c
|
Merge branch 'dev' into 7884-AddLabelerField
|
2024-09-17 06:32:27 +00:00 |
Jon Elias
|
479f2a8e53
|
feat: refs #7884 added new filter field
|
2024-09-17 08:31:02 +02:00 |
Jorge Penadés
|
da7d0326c0
|
fix: refs #7323 workerBalance & arrayData setUserParams
|
2024-09-16 17:12:48 +02:00 |
Jorge Penadés
|
1ff15da8ca
|
fix: refs #7323 workerList
|
2024-09-16 16:33:09 +02:00 |
Carlos Satorres
|
1916c6e4bf
|
refs #7283 itemFilters
|
2024-09-16 14:29:39 +02:00 |
Alex Moreno
|
b4cee6b02f
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-09-16 14:24:22 +02:00 |
Javier Segarra
|
603fb1de71
|
Merge branch 'dev' into 7017_formModel_validations
|
2024-09-16 11:58:15 +00:00 |
Javier Segarra
|
cf95cd7db7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customer_module
|
2024-09-16 13:33:28 +02:00 |
Javier Segarra
|
6ffd985575
|
perf: CustomerBasicData.salesPersonFk
|
2024-09-16 13:33:07 +02:00 |
Jon Elias
|
cb87f4dce1
|
Merge branch 'dev' into 6346-WagonTypeToCard
|
2024-09-16 11:04:29 +00:00 |
Jon Elias
|
ae76bd0b0e
|
refactor: refs #6346 wagons to VnTable
|
2024-09-16 12:58:06 +02:00 |
Javier Segarra
|
eb8690a422
|
fix: remove promise execution
|
2024-09-16 10:30:04 +00:00 |
Javier Segarra
|
d384894bf0
|
fix: rule
|
2024-09-16 10:29:36 +00:00 |
Jorge Penadés
|
8577f33599
|
Merge branch 'dev' into 7828-makeCorrectCalls
|
2024-09-16 10:24:45 +00:00 |
Pablo Natek
|
263dc29d7a
|
fix: refs #7404 remove console.log
|
2024-09-16 12:19:03 +02:00 |
Javier Segarra
|
27069e56b8
|
Merge branch 'dev' into 6943_fix_customer_module
|
2024-09-16 10:11:29 +00:00 |
Jorge Penadés
|
91dccd10d3
|
feat: refs #7702 drop old components
|
2024-09-16 10:39:39 +02:00 |
Jorge Penadés
|
9ec2fb4c77
|
feat: refs #7702 fine tunning
|
2024-09-16 10:36:56 +02:00 |
Alex Moreno
|
4c8238455f
|
fix(ClaimList): fix summary
|
2024-09-16 10:03:12 +02:00 |
Carlos Satorres
|
70759b8a4e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration
|
2024-09-16 09:28:51 +02:00 |
Alex Moreno
|
8c4e4a16af
|
fix(VnSectionMain): add QPage
|
2024-09-16 09:19:08 +02:00 |
Jorge Penadés
|
153c9b743f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword
|
2024-09-16 09:01:20 +02:00 |
Pablo Natek
|
c59c8127cc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought
|
2024-09-16 08:59:46 +02:00 |
Pablo Natek
|
deb30ee955
|
feat: refs #7404 travel m3 form
|
2024-09-16 08:59:36 +02:00 |
Guillermo Bonet
|
07e45f2051
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-09-16 07:17:38 +02:00 |
Guillermo Bonet
|
57b939bdd5
|
Merge branch 'test' into dev
|
2024-09-16 07:17:25 +02:00 |
Guillermo Bonet
|
b6ee1ac2bc
|
Merge branch 'master' into test
|
2024-09-16 07:17:12 +02:00 |
Javier Segarra
|
93488a5750
|
fix: styles
|
2024-09-13 23:19:16 +02:00 |
Javier Segarra
|
b6cce74449
|
fix: merge conflicts
|
2024-09-13 23:11:18 +02:00 |
Javier Segarra
|
401400bdcf
|
fix: remove FetchData
|
2024-09-13 22:52:26 +02:00 |
Javier Segarra
|
ed5ba1dd1a
|
Merge branch 'dev' into 7017_formModel_validations
|
2024-09-13 22:50:13 +02:00 |
Javier Segarra
|
9c36a113e1
|
Merge branch 'dev' into 7671_dense_itemFixedPrices
|
2024-09-13 20:17:01 +00:00 |
Jorge Penadés
|
98cdeabe9f
|
feat: refs #7702 vnChangePassword
|
2024-09-13 18:15:28 +02:00 |
Javier Segarra
|
6e6af0af80
|
perf: improve style
|
2024-09-13 15:16:40 +02:00 |
Guillermo Bonet
|
eca34e2c0f
|
feat: refs #7644 Icon
|
2024-09-13 14:57:33 +02:00 |
Carlos Satorres
|
0fcc4fe232
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration
|
2024-09-13 13:50:01 +02:00 |
Jon Elias
|
6f9e46f7a0
|
fix: refs #7553 deleted log
|
2024-09-13 13:01:07 +02:00 |
Carlos Satorres
|
842fb9de5f
|
refs #7155 scopeDays fix
|
2024-09-13 12:52:25 +02:00 |
Jorge Penadés
|
4bf8e1224d
|
chore: refs #7702 rollback
|
2024-09-13 12:28:07 +02:00 |
Jorge Penadés
|
e90b78c4c5
|
fix: refs #7702 rollback
|
2024-09-13 12:27:37 +02:00 |
Jorge Penadés
|
6983245d7d
|
Merge branch 'dev' of https: refs #7702//gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword
|
2024-09-13 12:26:15 +02:00 |
Jon Elias
|
c291ea267c
|
refactor: refs #7553 added clickable event in transfer sales like Salix
|
2024-09-13 12:07:45 +02:00 |
Jorge Penadés
|
48a5c15b9d
|
feat: refs #7828 create axios instance which no manage errors
|
2024-09-13 10:54:09 +02:00 |
Javier Segarra
|
5796bc9c0a
|
fix: emit:updateModelValue
|
2024-09-13 10:32:40 +02:00 |
Javier Segarra
|
025436b4b8
|
Merge branch 'dev' into 7677_vnLocation_perf
|
2024-09-13 09:27:38 +02:00 |
Javier Segarra
|
a5ea940dd8
|
fix: Customer module find salesPersons out of first get
|
2024-09-13 09:23:15 +02:00 |
Jorge Penadés
|
46fb7d0c73
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7828-makeCorrectCalls
|
2024-09-13 09:20:14 +02:00 |
Jorge Penadés
|
dcde6a1b9d
|
Merge branch 'test' into 7353-warmfix-fixSearchbar
|
2024-09-13 07:19:42 +00:00 |
Jon Elias
|
4a0b92eded
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition
|
2024-09-13 09:05:26 +02:00 |
Alex Moreno
|
0dbcc4be3d
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-09-13 08:57:27 +02:00 |
Alex Moreno
|
f731e4f1a6
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
|
2024-09-13 08:57:14 +02:00 |
Carlos Satorres
|
8be1833f9e
|
refs #7155 scopeDays
|
2024-09-13 08:49:36 +02:00 |
Jon Elias
|
ed5987630f
|
Merge branch 'dev' into 6346-fixWagonModule
|
2024-09-13 06:14:05 +00:00 |
Jon Elias
|
eca4b02022
|
Merge branch 'dev' into 7500_ChangeEntryDms
|
2024-09-13 06:10:34 +00:00 |
Javier Segarra
|
b36f072b24
|
Merge branch 'dev' into 6943_fix_customer_module
|
2024-09-12 21:26:43 +02:00 |
Javier Segarra
|
aca13d9119
|
fix: CustomerBillingData
|
2024-09-12 21:26:28 +02:00 |
Javier Segarra
|
fa408dc226
|
fix: CustomerAddress mobile
|
2024-09-12 21:20:30 +02:00 |
Javier Segarra
|
6e784bb290
|
fix: address-create i18n
|
2024-09-12 21:11:51 +02:00 |
Javier Segarra
|
54fc7f6394
|
fix: CustomerRecovery transalate label
|
2024-09-12 21:10:06 +02:00 |
Javier Segarra
|
39f2deafc4
|
fix: CustomerCreditOpinion workerDescriptor
|
2024-09-12 21:08:41 +02:00 |
Javier Segarra
|
70d0132710
|
fix: CustomerWebPayment
|
2024-09-12 21:03:19 +02:00 |
Javier Segarra
|
24f4af712e
|
fix: CustomerMandates
|
2024-09-12 20:59:35 +02:00 |
Javier Segarra
|
8fc7e3cfb4
|
fix: CustomerSamples
|
2024-09-12 20:43:50 +02:00 |
Javier Segarra
|
a29ee42b9e
|
fix: CustomerBasicData show id assigned
|
2024-09-12 20:41:50 +02:00 |
Jorge Penadés
|
6adcaff5d8
|
fix: refs #7524 dynamic load
|
2024-09-12 16:48:39 +02:00 |
Alex Moreno
|
dcb8c5daad
|
fix: workerDms filter workerFk
|
2024-09-12 13:27:28 +02:00 |
Jon Elias
|
bb1eb30a25
|
fix: refs #7553 changed fields in order in purchase request table
|
2024-09-12 13:22:53 +02:00 |
Javier Segarra
|
cfdfc7f531
|
fix: CustomerSamples
|
2024-09-12 13:19:37 +02:00 |
Jorge Penadés
|
44fd356d63
|
feat: refs #7828 useAcl & cherry pick mail data worker
|
2024-09-12 13:19:31 +02:00 |
Jon Elias
|
b4c46dc153
|
refactor: refs #7553 modified ticketSummary QChips, deleted useless code
|
2024-09-12 13:13:56 +02:00 |
Jorge Penadés
|
adb9cac360
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7828-makeCorrectCalls
|
2024-09-12 13:11:11 +02:00 |
Jon Elias
|
b8f6bc26ad
|
Merge branch '7500_ChangeEntryDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 7500_ChangeEntryDms
|
2024-09-12 12:34:55 +02:00 |
Jon Elias
|
d00a88a3f4
|
refactor: refs #7500 deleted useless code
|
2024-09-12 12:34:54 +02:00 |
Jon Elias
|
be389c6736
|
Merge branch 'dev' into 7500_ChangeEntryDms
|
2024-09-12 10:32:47 +00:00 |
Jon Elias
|
35247007f0
|
Merge branch '7500_ChangeEntryDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 7500_ChangeEntryDms
|
2024-09-12 12:31:03 +02:00 |
Jon Elias
|
e5056c45c0
|
fix: refs #7500 fixed showing images wrongly
|
2024-09-12 12:31:00 +02:00 |
Javier Segarra
|
058039fd61
|
Merge branch 'dev' into 5938_filterGrouped
|
2024-09-12 10:27:36 +00:00 |
Javier Segarra
|
a3afe790b9
|
fix: CustomerGreuges
|
2024-09-12 12:00:07 +02:00 |
Javier Segarra
|
c22f8f1069
|
fix: stop call back event hasMoreData
|
2024-09-12 09:57:31 +00:00 |
Javier Segarra
|
c7adb91912
|
feat: use disableInifiniteScroll property
|
2024-09-12 09:56:37 +00:00 |
Carlos Satorres
|
050d8ae208
|
refs #7283 fix items error get images
|
2024-09-12 11:43:37 +02:00 |
Carlos Satorres
|
68a2ac385f
|
refs #7283 fix items images
|
2024-09-12 11:36:02 +02:00 |
Javier Segarra
|
3892df250c
|
fix: #5938 grouped filter
|
2024-09-12 08:53:46 +00:00 |
Jon Elias
|
4a1f5e922c
|
refactor: refs #7553 align ticket sale qdrawer fields
|
2024-09-12 10:19:21 +02:00 |
Jon Elias
|
6a5f31ff1e
|
fix: refs #7553 fixed conflicts
|
2024-09-12 10:14:38 +02:00 |
Javier Segarra
|
9941975683
|
fix: infiniteScroll
|
2024-09-12 08:07:53 +00:00 |
Alex Moreno
|
368e013f54
|
Merge branch 'master' into hotFix_claimList_attenderFk
|
2024-09-12 07:59:16 +00:00 |
Jorge Penadés
|
1dffa8865e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7828-makeCorrectCalls
|
2024-09-12 09:55:30 +02:00 |
Jorge Penadés
|
59f6913a74
|
fix: refs #7323 add correct label
|
2024-09-12 09:43:08 +02:00 |
Jorge Penadés
|
d92659289b
|
fix: refs #7323 add correct label
|
2024-09-12 09:41:29 +02:00 |
Jorge Penadés
|
22bc8f2414
|
fix: refs #7323 show user name
|
2024-09-12 09:33:06 +02:00 |
Carlos Satorres
|
039a8d1d02
|
refs #7283 fix items
|
2024-09-12 09:32:41 +02:00 |
Alex Moreno
|
9d055a48c4
|
Merge branch 'dev' into 7792-accountBasicData_twoFactorFk
|
2024-09-12 07:29:47 +00:00 |
Jorge Penadés
|
6b79d70551
|
refactor: refs #7828 wip
|
2024-09-12 09:14:55 +02:00 |
Alex Moreno
|
d822bb6f20
|
fix(ClaimList): attenderFk filter
|
2024-09-12 09:12:36 +02:00 |
Pablo Natek
|
e2dbe0fd38
|
Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought
|
2024-09-12 09:09:21 +02:00 |
Alex Moreno
|
4a234dd875
|
fix: duplicate code
|
2024-09-12 08:31:57 +02:00 |
Alex Moreno
|
8bf7b729d4
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-09-12 08:26:10 +02:00 |
Alex Moreno
|
8d04d50a13
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
|
2024-09-12 08:26:01 +02:00 |
Carlos Satorres
|
b66e66eb0a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration
|
2024-09-12 07:44:35 +02:00 |
Carlos Satorres
|
04c8481b51
|
refs #7283 fix itemFixed
|
2024-09-12 07:43:12 +02:00 |
Carlos Satorres
|
04070a5a85
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration
|
2024-09-12 07:42:55 +02:00 |
Jon Elias
|
18fc5e241c
|
fix: refs #7903 fixed ticket's search bar and keybinding tooltip
|
2024-09-11 14:07:31 +02:00 |
Javier Segarra
|
8d96539b24
|
perf: solve reload CardSummary component
|
2024-09-11 13:18:54 +02:00 |
Javier Segarra
|
c3108b4335
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customerSummaryTable
|
2024-09-11 12:48:38 +02:00 |
Javier Segarra
|
f02ca7437c
|
Merge branch 'dev' into 6156-advanceTicketsNewField
|
2024-09-11 10:27:12 +00:00 |
Jorge Penadés
|
9219fa07f5
|
fix: refs #7353 hide search param
|
2024-09-11 11:23:14 +02:00 |
Jon Elias
|
422907447b
|
refactor: refs #7553 merge conflicts
|
2024-09-11 10:27:08 +02:00 |
Jon Elias
|
d1138529b2
|
Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition
|
2024-09-11 10:26:52 +02:00 |
Carlos Satorres
|
1c9e13fe15
|
refs #7962 fix claimSummary
|
2024-09-11 10:23:27 +02:00 |
Jorge Penadés
|
b559f2f18c
|
refactor: refs #7353 use global locales
|
2024-09-11 10:18:11 +02:00 |
Jon Elias
|
ff7bcfb00a
|
refactor: refs #7553 modified ticket sale to create a row in the table
|
2024-09-11 10:16:42 +02:00 |
Jorge Penadés
|
2b012d2de4
|
fix: refs #7353 use same datakey
|
2024-09-11 10:04:40 +02:00 |
Jorge Penadés
|
2d5602e784
|
Merge branch 'dev' into 7663-setWeight
|
2024-09-11 07:40:36 +00:00 |
Alex Moreno
|
e2d3154878
|
fix(ClaimLines): not reload when change quantity
|
2024-09-11 09:21:30 +02:00 |
Javier Segarra
|
2d8322c6da
|
fix: remove FIXME
|
2024-09-11 09:20:54 +02:00 |
Jorge Penadés
|
49f90801a8
|
Merge branch 'test' into 6772-warmfix-fixE2e
|
2024-09-11 07:09:46 +00:00 |