24966 Commits

All Branches

Search

Author	SHA1	Message	Date
Ivan Mas	77fd3e7f46	feat: refs #7898 Add column "floor" in vn.parking	2024-09-03 14:42:07 +02:00
Jon Elias	26876fd0a6	Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule	2024-09-03 14:35:59 +02:00
Jon Elias	29b0851741	refactor: refs #6346 hook added in wagon-type-tray model	2024-09-03 14:35:05 +02:00
Guillermo Bonet	bd06bed570	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2024-09-03 13:29:03 +02:00
Guillermo Bonet	790a44c62a	fix: refs #7844 salesFilter and tmp.ticket_problems.totalProblems	2024-09-03 13:29:01 +02:00
Jorge Penadés	623794c3dd	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6900-hotfix-fineTunning	2024-09-03 12:52:13 +02:00
Ivan Mas	690898630c	Merge branch 'dev' into 7819-Delete_obsolete_objects	2024-09-03 10:35:47 +00:00
Ivan Mas	d330529bf2	feat: refs #7819 Delete obsolete objects	2024-09-03 12:33:26 +02:00
Jorge Penadés	d781a8ab8c	Merge pull request 'feat: rollback limit' (!2910) from hotfix-rollbackLimit into master ... Reviewed-on: #2910 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-03 10:16:12 +00:00
Jorge Penadés	90b8187a4f	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-rollbackLimit	2024-09-03 12:08:14 +02:00
Guillermo Bonet	0c3349dc03	fix: refs #7844 salesFilter and tmp.ticket_problems.totalProblems	2024-09-03 12:06:31 +02:00
Jorge Penadés	04c8f87c00	feat: rollback limit	2024-09-03 12:02:55 +02:00
Guillermo Bonet	6f97d1b83a	fix: refs #7844 salesFilter and isTooLittle condition	2024-09-03 09:57:18 +02:00
Guillermo Bonet	32fa4155dd	Merge pull request 'feat: refs #6650 new itemShelvingLog' (!2847) from 6650-shelvingLog into dev ... Reviewed-on: #2847 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-03 07:27:51 +00:00
Guillermo Bonet	7632f33322	fix: refs #7712 sizeLimit	2024-09-03 09:22:55 +02:00
Jorge Penadés	30c7475fcb	Merge branch 'dev' into 7353-takeoutMonitor	2024-09-03 07:11:05 +00:00
Jorge Penadés	a0ac2be203	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-09-03 09:08:56 +02:00
Javier Segarra	adf6708682	Merge pull request '#7897 - masterTest_24_36' (!2909) from 7897_masterTest_24_36 into master ... Reviewed-on: #2909 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-09-03 06:37:52 +00:00
Guillermo Bonet	6b53c24f20	feat: refs #6650 Added saleGroupLog	2024-09-03 08:17:27 +02:00
Javier Segarra	e0a0b987b2	feat(salix): refs #7897 #7897 update changelog.md	2024-09-03 08:05:02 +02:00
Guillermo Bonet	5468049b26	Merge branch 'dev' into 6650-shelvingLog	2024-09-03 07:59:22 +02:00
Javier Segarra	7d5cb45b3a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 7897_masterTest_24_36	2024-09-03 07:57:43 +02:00
Guillermo Bonet	8e34e78964	Merge branch 'test' into dev	2024-09-03 07:52:05 +02:00
Pablo Natek	e20ef7c699	Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed	2024-09-03 07:50:41 +02:00
Guillermo Bonet	b436ac0518	fix: refs #7916 itemShelving_transfer	2024-09-03 07:45:25 +02:00
Javier Segarra	5e26eccd53	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 7897_masterTest_24_36	2024-09-02 19:29:23 +02:00
Carlos Andrés	08c7bd2c42	feat: ref#7902 Triggers vn.ticketRefund to control deleted tickets	2024-09-02 17:59:31 +02:00
Carlos Andrés	0ca1db7633	feat: ref#7902 Triggers vn.ticketRefund to control deleted tickets	2024-09-02 17:57:39 +02:00
Carlos Andrés	41f0c8dc7f	Merge pull request 'fix: refs #7213 problem rounding' (!2903) from 7213-Sale_setProblemRoundingByBuy into master ... Reviewed-on: #2903 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-09-02 15:48:25 +00:00
Jorge Penadés	4c5f5c8324	fix: refs #7663 conflicts	2024-09-02 17:08:23 +02:00
Jorge Penadés	b83e548feb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-09-02 17:02:00 +02:00
Pablo Natek	f30c0fb94d	Merge branch 'master' into 7781-fixPalletMerge	2024-09-02 12:52:46 +00:00
Guillermo Bonet	6fc8b9b821	feat: ticket 215005 Changed acl show transferClient	2024-09-02 14:41:02 +02:00
Guillermo Bonet	7ab1eea7e9	Merge branch 'test' into dev	2024-09-02 14:30:32 +02:00
Guillermo Bonet	89f8e987dc	feat: refs #7562 Requested changes	2024-09-02 14:27:04 +02:00
Carlos Satorres	28a34fa5af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical	2024-09-02 14:07:01 +02:00
Jorge Penadés	4ea1177d38	chore: refs #6900 fix test	2024-09-02 13:55:44 +02:00
Jon Elias	0e849086a0	Merge branch 'dev' into 7354_ZoneMigration_End	2024-09-02 11:07:42 +00:00
Jon Elias	4c29ef862f	refactor: refs #7354 deleted test	2024-09-02 13:05:46 +02:00
Jon Elias	943c27142f	feat: refs #7354 deleted code and redirect to Lilium	2024-09-02 13:00:22 +02:00
Guillermo Bonet	6f022bc232	Merge pull request 'feat: refs #7650 Added no transfer lines to inventory entry and fixtures' (!2803) from 7650-triggerInv into dev ... Reviewed-on: #2803 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-02 10:17:58 +00:00
Guillermo Bonet	9485434dc2	Merge pull request 'feat: refs #7811 Added new params in datasources.json' (!2898) from 7811-datasourcesAddParams into dev ... Reviewed-on: #2898 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-09-02 10:02:13 +00:00
Guillermo Bonet	b40ecf9e19	feat: refs #7882 Improved sendOrders and added more config params	2024-09-02 11:48:32 +02:00
Javier Segarra	355714fec8	test: refs #7277 fix test proposal	2024-09-02 11:43:35 +02:00
Robert Ferrús	48bf5004a6	Merge branch 'dev' into 7615-ticketRefundSetDeleted	2024-09-02 08:09:43 +00:00
Javier Segarra	48c7d1d783	Merge branch 'dev' into 7277-RefundInvoices	2024-09-02 09:35:08 +02:00
Pablo Natek	225060ff74	fix: refs #7781 varible asign value	2024-09-02 09:24:08 +02:00
Jorge Penadés	cdaf8a7a67	fix: refs #6900 fine tunning	2024-09-02 08:43:53 +02:00
Guillermo Bonet	f15fd66e48	Merge branch 'dev' into 7562-deleteDeprecatedObjects	2024-09-02 07:57:10 +02:00
Guillermo Bonet	2ba391fc85	feat: refs #7562 Deleted deleteDeprecatedObjects objects	2024-09-02 07:57:00 +02:00