25360 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	9e691ee2be	Merge pull request 'fix: refs #8222 fix prDeleteZone' (!3269) from 8222-refactorDeleteZone2 into master ... Reviewed-on: #3269 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-03 07:24:07 +00:00
Carlos Satorres	32d3b2939a	Merge branch 'master' into 8222-refactorDeleteZone2	2024-12-03 07:19:05 +00:00
Jorge Penadés	14f9d3d22f	Merge pull request '#6818 hotfix-addInternationalChannel' (!3268) from 6818-hotfix-addInternationalChannel into master ... Reviewed-on: #3268 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-02 15:07:57 +00:00
Jorge Penadés	9573090318	chore: refs #6818 rollback	2024-12-02 14:49:35 +01:00
Jorge Penadés	13387beed9	feat: refs #6818 add PbxConfig model	2024-12-02 14:31:06 +01:00
Alex Moreno	bf9f7d45bf	Merge branch 'master' into 8222-refactorDeleteZone2	2024-12-02 12:53:00 +00:00
Carlos Satorres	fd05ce0915	fix: refs #8222 fix prDeleteZone	2024-12-02 13:45:04 +01:00
Jorge Penadés	33f8ee5e9d	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6818-hotfix-addInternationalChannel	2024-12-02 13:34:38 +01:00
Jorge Penadés	66a87f1997	feat: refs #6818 add current country prefix	2024-12-02 13:33:39 +01:00
Guillermo Bonet	ef5522b2b3	Merge pull request 'fix: refs #7266 Created buy_getLastWihoutInventory proc' (!3267) from 7266-buyGetLastWihoutInventory into master ... Reviewed-on: #3267 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>	2024-12-02 12:06:18 +00:00
Guillermo Bonet	508908bf85	fix: refs #7266 Minor changes	2024-12-02 13:01:12 +01:00
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
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
Guillermo Bonet	a17e434df1	fix: refs #7266 Buy label barcode, minor barcode width	2024-12-02 06:59:01 +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	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	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	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
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
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	9c495ada13	fix: refs #7266 Minor changes x2	2024-11-27 12:59:27 +01:00
Guillermo Bonet	2231add129	fix: refs #7266 Minor changes	2024-11-27 12:58:32 +01:00
Jorge Penadés	8fd133c5e8	feat: refs #6818 define prefix model	2024-11-27 12:51:09 +01:00
Guillermo Bonet	0afae5c2d6	fix: refs #7266 Minor changes	2024-11-27 10:40:47 +01:00
Carlos Andrés	c550f711c6	Actualizar db/routines/vn/triggers/travel_beforeUpdate.sql	2024-11-26 17:55:36 +00:00
Carlos Andrés	ee2b5471e4	Merge pull request 'fix: hotfix entry_splitByShelving' (!3252) from HotfixEntry_splitByShelving into master ... Reviewed-on: #3252 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-11-26 17:04:06 +00:00
Ivan Mas	10d2d4c9c4	fix: hotfix entry_splitByShelving	2024-11-26 18:01:49 +01:00
Alex Moreno	3c70dd77c9	Merge pull request 'build: dump db' (!3250) from 8231_dump into master ... Reviewed-on: #3250 Reviewed-by: Jon Elias <jon@verdnatura.es>	2024-11-26 13:17:51 +00:00
Alex Moreno	c66ae728d6	build: dump db	2024-11-26 14:12:10 +01:00
Sergio De la torre	f4f5ab2651	Merge branch 'master' into 8213-itemShelvingSalePicker	2024-11-26 11:46:54 +00:00
Alex Moreno	45f7b60f1b	Merge pull request 'fix: refs #7641 display buy.comment' (!3247) from 7641-hotfix-dropComment into master ... Reviewed-on: #3247 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-26 11:26:48 +00:00
Jorge Penadés	00288e5a7f	fix: refs #7641 display buy.comment	2024-11-26 12:22:35 +01:00