25375 Commits

All Branches

Search

Author	SHA1	Message	Date
Sergio De la torre	93feb74949	Merge branch 'dev' of https: refs #7921//gitea.verdnatura.es/verdnatura/salix into 7921-sendExpeditionLost	2024-10-28 10:22:23 +01:00
Jorge Penadés	78edda56c7	Merge pull request 'feat: refs #7524 restrict fields' (!3151) from 7524-fixE2e into dev ... Reviewed-on: #3151 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-28 08:47:45 +00:00
Jorge Penadés	b20ca1d8d7	Merge branch 'dev' into 7524-fixE2e	2024-10-28 08:43:45 +00:00
Sergio De la torre	6efc2c340c	feat: refs #7921 refs#7921 sendLostExpedition	2024-10-28 08:57:22 +01:00
Carlos Satorres	2bd3f4514b	Merge pull request 'fix: refs #6644 email and translations' (!3152) from 6644-modEmail into dev ... Reviewed-on: #3152 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-28 07:07:17 +00:00
Carlos Satorres	c8101375a2	Merge branch 'dev' into 6644-modEmail	2024-10-28 07:04:17 +00:00
Carlos Satorres	869c7ab598	fix: refs #6644 email and translations	2024-10-28 07:37:42 +01:00
Guillermo Bonet	8c4d3bac0d	Merge branch 'test' into dev	2024-10-28 07:11:38 +01:00
Guillermo Bonet	765d125219	Merge branch 'master' into test	2024-10-28 07:11:21 +01:00
Guillermo Bonet	a707f9cbff	Merge pull request 'fix: refs #235425 sale priceFixed update' (!3146) from hotfix235425-updatePrice into master ... Reviewed-on: #3146 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-28 06:06:56 +00:00
Jorge Penadés	d8e241740f	feat: refs #7524 restrict fields	2024-10-27 13:47:52 +01:00
Javi Gallego	fa9451ea38	feat: refs #7821 isBooked with grants	2024-10-25 16:15:13 +02:00
Carlos Andrés	fb0764bc1f	feat: refs #8087 Traspasar redadas a travels	2024-10-25 14:34:51 +02:00
Guillermo Bonet	76a9db29c2	Merge pull request 'feat: refs #7006 itemTypeLog created' (!3093) from 7006-itemTypeLog into dev ... Reviewed-on: #3093 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-25 12:32:20 +00:00
Guillermo Bonet	14d6eb722e	feat: refs #7006 Requested changes	2024-10-25 14:24:26 +02:00
Guillermo Bonet	80764b6495	feat: refs #7006 itemTypeLog	2024-10-25 14:17:57 +02:00
Sergio De la torre	e775e56120	feat: refs #7921 refs#7921 sendLostExpedition	2024-10-25 13:48:27 +02:00
Guillermo Bonet	956e89475e	Merge branch 'dev' into 7006-itemTypeLog	2024-10-25 11:06:55 +00:00
Jorge Penadés	ab145be1aa	Merge pull request 'feat: refs #7943 return only the required content' (!3148) from 7943-fixWorker into dev ... Reviewed-on: #3148 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-25 09:50:57 +00:00
Jorge Penadés	8f10260795	feat: refs #7943 return just the required content	2024-10-25 11:37:45 +02:00
Guillermo Bonet	69e1df2504	fix: refs #235425 Requested changes	2024-10-25 08:47:43 +02:00
Guillermo Bonet	111480f7b7	fix: refs #235425 Requested changes	2024-10-25 07:22:36 +02:00
Sergio De la torre	11e13fdb20	feat: refs #7922 refs #792 scanOrder	2024-10-25 06:40:06 +02:00
Carlos Andrés	4d3bc2c837	feat: refs #8087 Traspasar redadas a travels	2024-10-24 19:32:02 +02:00
Carlos Satorres	e498cbd060	Merge branch 'dev' into 7283-itemsMigration3	2024-10-24 12:11:31 +00:00
Carlos Andrés	1bf900f81b	feat: refs #8087 Traspasar redadas a travels	2024-10-24 12:33:47 +02:00
Guillermo Bonet	4da11c65bb	fix: refs #235425 sale priceFixed update	2024-10-24 12:26:03 +02:00
Guillermo Bonet	8569bec34a	feat: refs #7266 Minor change	2024-10-24 12:18:09 +02:00
Guillermo Bonet	f6d818f58e	Merge pull request 'feat: refs #7266 First commit' (!3129) from 7266-itemLabels into dev ... Reviewed-on: #3129 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-24 09:42:50 +00:00
Guillermo Bonet	f97f1c2b9a	Merge branch 'dev' into 7266-itemLabels	2024-10-24 09:31:14 +00:00
Javier Segarra	70b1628649	Merge pull request 'HOTFIX: RecalculatePrice not working with all ids' (!3144) from hotfix_recalculatePrice_list_ids into master ... Reviewed-on: #3144 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-24 08:36:34 +00:00
Javier Segarra	070a5640df	fix: recalculatePrice not working with all ids	2024-10-24 08:16:04 +00:00
Robert Ferrús	34df4aed54	feat: refs #8077 resolve conflict	2024-10-24 08:04:55 +02:00
Robert Ferrús	80f540a346	Merge branch 'dev' of https: refs #8077//gitea.verdnatura.es/verdnatura/salix into 8077-sumDefaulter	2024-10-24 08:02:26 +02:00
Alex Moreno	7ae99fe6a1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-10-24 07:47:54 +02:00
Alex Moreno	4660118211	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-10-24 07:47:41 +02:00
Guillermo Bonet	4d96b1df68	Merge branch '7266-itemLabels' of https://gitea.verdnatura.es/verdnatura/salix into 7266-itemLabels	2024-10-24 07:31:30 +02:00
Guillermo Bonet	4c529da620	feat: refs #7266 Requested changes and query optimization	2024-10-24 07:31:26 +02:00
Guillermo Bonet	4c9682e107	Merge branch 'dev' into 7266-itemLabels	2024-10-24 05:16:16 +00:00
Pablo Natek	838dd9e1b4	Merge branch 'dev' into 7457-orderFilter	2024-10-24 04:36:11 +00:00
Javi Gallego	ed6a062ca3	Merge pull request 'feat: refs #8083 add field' (!3143) from 8083-hotfix-insertRecord into master ... Reviewed-on: #3143 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-23 14:25:41 +00:00
Jorge Penadés	43f8b22593	feat: refs #8083 add field	2024-10-23 16:10:00 +02:00
Sergio De la torre	5a8f43d0ea	Merge pull request 'feat: refs #8020 machineWorkerDeprecated' (!3141) from 8020-mahineWorkerDeprecated into dev ... Reviewed-on: #3141 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-23 12:14:36 +00:00
Guillermo Bonet	db4b540958	Merge branch 'test' into dev	2024-10-23 12:44:55 +02:00
Guillermo Bonet	fc56dbc5fb	Merge branch 'master' into test	2024-10-23 12:44:35 +02:00
Guillermo Bonet	9341a51ed4	Merge pull request 'feat: refs #8119 itemCampaignQuantity' (!3117) from 8119-itemCampaignQuantity into master ... Reviewed-on: #3117 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-23 10:40:42 +00:00
Guillermo Bonet	9eaa5a7585	Merge branch 'master' into 8119-itemCampaignQuantity	2024-10-23 10:38:00 +00:00
Sergio De la torre	3da08e3a23	feat: refs #8020 machineWorkerDeprecated	2024-10-23 11:33:45 +02:00
Carlos Satorres	f552a3b7e1	Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3	2024-10-23 09:51:38 +02:00
Guillermo Bonet	b1a295dca4	feat: refs #7266 Print corrections	2024-10-23 09:46:06 +02:00