25541 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	fc4f5b55f7	fix: refs #6818 update country & channel	2024-12-02 12:59:37 +01:00
Guillermo Bonet	4a74015fc5	fix: refs #7266 Minor changes	2024-12-02 12:57:34 +01:00
Ivan Mas	bf0daf90db	Merge branch 'dev' into 7146-route.createdToDated	2024-12-02 11:56:58 +00:00
Guillermo Bonet	fb58ab5bd2	fix: refs #7266 Created buy_getLastWihoutInventory proc	2024-12-02 12:54:36 +01:00
Javier Segarra	ecd86b2b5a	Merge pull request 'fix: refs #244936 sale redirect catalog to lilium' (!3266) from 244936-hotFixRedirectToCatalog into master ... Reviewed-on: #3266 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-12-02 11:26:44 +00:00
Robert Ferrús	d355b320b4	test: refs #244936 remove window.open called	2024-12-02 12:25:27 +01:00
Robert Ferrús	30da83a88c	fix: refs #244936 sale redirect catalog to lilium	2024-12-02 11:52:05 +01:00
Carlos Satorres	f50c20fb28	Merge branch 'master' into hotfix-7323workerHoliday	2024-12-02 09:49:55 +00:00
Carlos Satorres	fb40e25c7c	fix: remove ctx	2024-12-02 10:47:44 +01:00
Carlos Satorres	4e6b83809b	fix: workerHoliday hr	2024-12-02 10:29:12 +01:00
Carlos Satorres	cf862202ff	fix: hotfix 7323 createAbsence	2024-12-02 10:12:56 +01:00
Guillermo Bonet	10fd00df80	Merge branch 'test' into dev	2024-12-02 06:59:40 +01:00
Guillermo Bonet	a8d378a4be	Merge branch 'master' into test	2024-12-02 06:59:22 +01:00
Guillermo Bonet	a17e434df1	fix: refs #7266 Buy label barcode, minor barcode width	2024-12-02 06:59:01 +01:00
Guillermo Bonet	3453aa0f8c	Merge branch 'test' into dev	2024-11-29 11:40:22 +01:00
Guillermo Bonet	3b73ffbd8a	Merge branch 'master' into test	2024-11-29 11:40:05 +01:00
Sergio De la torre	76b12e73b9	Merge pull request 'fix: refs #7920 refs#7920 itemShelvingLogs' (!3263) from 7920-itemShelvingsLog into master ... Reviewed-on: #3263 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-11-29 10:38:30 +00:00
Sergio De la torre	009b4ab7b9	fix: refs #7920 refs#7920 itemShelvingLogs	2024-11-29 11:31:31 +01:00
Alex Moreno	20b68b4b41	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-11-29 07:28:55 +01:00
Alex Moreno	b48beaf4b3	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-11-29 07:28:24 +01:00
Carlos Andrés	97cdadac78	Merge pull request 'fix: refs #8221 duaInvoiceIn unique' (!3256) from 8221-duaInvoiceInUnique into dev ... Reviewed-on: #3256 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-28 17:58:39 +00:00
Ivan Mas	df51b93e5b	Merge branch 'dev' into 7146-route.createdToDated	2024-11-28 16:32:03 +00:00
Ivan Mas	6d315bf84d	refactor: refs #7146 route.created to route.dated	2024-11-28 17:29:39 +01:00
Alex Moreno	d6a849727e	fix: fix result test	2024-11-28 13:11:43 +01:00
Alex Moreno	838296e744	fix: add expected message result	2024-11-28 13:02:58 +01:00
Alex Moreno	6785779fe5	fix: add console log	2024-11-28 12:26:03 +01:00
Alex Moreno	e730b5d4a1	fix: add debugAdd response axios	2024-11-28 11:53:42 +01:00
Alex Moreno	5923916cda	fix: change debugAdd to console.error	2024-11-28 11:31:38 +01:00
Pablo Natek	c8b0874e95	Merge pull request 'fix: refs #7404 add debug logging for cancelShipment and deleteExpeditions methods' (!3258) from 7404-add-debug into master ... Reviewed-on: #3258 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-28 10:24:57 +00:00
Alex Moreno	8ef78818db	Merge branch 'master' into 7404-add-debug	2024-11-28 10:19:32 +00:00
Pablo Natek	00e5f86020	fix: refs #7404 add debug logging for cancelShipment and deleteExpeditions methods	2024-11-28 11:18:09 +01:00
Guillermo Bonet	699c6553a0	Merge branch 'test' into dev	2024-11-28 11:17:19 +01:00
Guillermo Bonet	46bd033336	Merge branch 'master' into test	2024-11-28 11:16:58 +01:00
Guillermo Bonet	51d96a89c5	fix: refs #7266 Increased size item id buy-label	2024-11-28 11:15:58 +01:00
Jorge Penadés	eb97f6ef5f	Merge pull request 'feat: refs #6818 define prefix model' (!3254) from 6818-hotfix-definePrefix into master ... Reviewed-on: #3254 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-28 08:50:01 +00:00
Jorge Penadés	5ee4563ee7	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6818-hotfix-definePrefix	2024-11-28 09:38:28 +01:00
Guillermo Bonet	71bc1adcba	Merge branch 'test' into dev	2024-11-28 09:00:38 +01:00
Guillermo Bonet	ca4244527b	Merge branch 'master' into test	2024-11-28 09:00:24 +01:00
Guillermo Bonet	847692f103	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2024-11-28 08:59:11 +01:00
Guillermo Bonet	93388461d1	fix: refs #7266 Changed method name and corrections	2024-11-28 08:59:08 +01:00
Sergio De la torre	cf237a1dd7	Merge pull request '8213-itemShelvingSalePicker' (!3248) from 8213-itemShelvingSalePicker into master ... Reviewed-on: #3248 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-28 07:51:35 +00:00
Sergio De la torre	6f1bfd6787	Merge branch 'master' into 8213-itemShelvingSalePicker	2024-11-28 07:50:06 +00:00
Alex Moreno	65c994e9d6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-11-28 08:42:36 +01:00
Alex Moreno	34348f50e8	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-11-28 08:42:24 +01:00
Carlos Andrés	30cc7a49a0	Actualizar modules/entry/back/methods/entry/print.js	2024-11-27 15:38:50 +00:00
Carlos Andrés	d872f164fd	Actualizar modules/entry/back/models/entry.js	2024-11-27 14:55:30 +00:00
Carlos Andrés	15c755087c	fix: refs #8221 duaInvoiceIn unique	2024-11-27 14:28:50 +01:00
Jorge Penadés	bab5a4fadb	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6818-hotfix-definePrefix	2024-11-27 13:09:29 +01:00
Guillermo Bonet	c3aeba16c1	Merge branch 'test' into dev	2024-11-27 13:00:02 +01:00
Guillermo Bonet	751314347a	Merge branch 'master' into test	2024-11-27 12:59:41 +01:00