20723 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	9ec51e534d	fix: jenkins puppeteer	2024-04-18 15:39:25 +02:00
Alex Moreno	87e23b49e7	hotFix: change require to import	2024-04-18 15:19:19 +02:00
Robert Ferrús	f269d41596	Merge branch 'master' into 174903-item_getSimilar	2024-04-18 12:52:52 +00:00
Guillermo Bonet	5c5d0ec9dc	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2024-04-18 13:52:31 +02:00
Guillermo Bonet	d5dc057c36	hotfix: changes	2024-04-18 13:52:30 +02:00
Robert Ferrús	9295bddaa8	feat: refs #174903 item_getSimilar	2024-04-18 13:06:45 +02:00
Carlos Andrés	0ebdd032e5	Merge pull request 'testToMaster fix' (!2325) from test into master ... Reviewed-on: #2325 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-18 10:39:19 +00:00
Guillermo Bonet	d6ec84e1fe	hotfix	2024-04-18 12:07:00 +02:00
Alex Moreno	51d09b4f2a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-04-18 09:27:15 +02:00
Alex Moreno	1ea4aa9d05	Merge pull request 'deploy: refs #7226 dump' (!2324) from 7226-dump into master ... Reviewed-on: #2324 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-04-18 07:25:49 +00:00
Alex Moreno	659adfd87d	deploy: refs #7226 dump	2024-04-18 09:20:47 +02:00
Alex Moreno	7a021c9ac6	fix(payrollCenter): refs #6738	2024-04-18 09:13:15 +02:00
Alex Moreno	af06ef30d4	hotFix(workerDms): document.isDocuware	2024-04-18 08:50:17 +02:00
Alex Moreno	e53f1092f4	fix: enable debug	2024-04-18 08:39:10 +02:00
Alex Moreno	6580c5bd6a	Merge pull request '7226-testToMaster_2416' (!2320) from 7226-testToMaster_2416 into master ... Reviewed-on: #2320 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-18 05:39:35 +00:00
Jorge Penadés	d16a3e3b78	Merge pull request '#6492 warmfix-fixCalculatedCode' (!2321) from 6492-warmfix-fixCalculatedCode into test ... Reviewed-on: #2321 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-17 15:09:51 +00:00
Jorge Penadés	b83e0a4ae2	fix: refs #6492 castToInt	2024-04-17 16:43:17 +02:00
Pablo Natek	07f95f3f6c	Merge pull request 'master' (!2318) from master into test ... Reviewed-on: #2318 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-17 13:25:56 +00:00
Pablo Natek	bed85cfe92	Merge pull request 'fix(view): refs #6372 fix' (!2317) from 6372-fixTable into master ... Reviewed-on: #2317 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-17 10:35:18 +00:00
Pablo Natek	d93dc28728	fix(view): refs #6372 fix	2024-04-17 12:32:33 +02:00
Guillermo Bonet	0d50f5b405	Merge pull request 'master' (!2315) from master into test ... Reviewed-on: #2315 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-17 10:20:20 +00:00
Robert Ferrús	062bda548f	Merge pull request 'feat: refs #7219' (!2307) from 7219-sale_replaceItem into test ... Reviewed-on: #2307 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-17 10:10:42 +00:00
Robert Ferrús	90c002294e	Merge pull request 'feat: company_getSuppliersDebtHotFix' (!2314) from company_getSuppliersDebtHotFix into master ... Reviewed-on: #2314 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-17 10:08:00 +00:00
Robert Ferrús	0a4cd4d4d0	feat: company_getSuppliersDebtHotFix	2024-04-17 09:58:27 +02:00
Robert Ferrús	a0f3c6183b	Merge branch 'test' into 7219-sale_replaceItem	2024-04-17 06:42:18 +00:00
Guillermo Bonet	7d50907676	Merge branch 'master' into test	2024-04-17 08:41:10 +02:00
Guillermo Bonet	786a5a68b9	hotfix: EKT	2024-04-17 08:40:25 +02:00
Guillermo Bonet	62596de1dd	Merge branch 'master' into test	2024-04-16 17:25:28 +02:00
Guillermo Bonet	db5b0d7967	hotfix: ticket#174761 Greatest fix null possibility	2024-04-16 17:19:25 +02:00
Robert Ferrús	01d959f6f4	feat: refs #7219	2024-04-16 12:46:50 +02:00
Guillermo Bonet	9ea1ac2a56	Merge branch 'master' into test	2024-04-16 12:32:27 +02:00
Guillermo Bonet	7fda58d4a4	hotfix: ticket#174308 Ekt load packing	2024-04-16 12:29:44 +02:00
Juan Ferrer	63ec12cba0	Merge pull request 'feat(binlog): refs #4409 Disable order recalc from triggers' (!2302) from 4409-disableOrderRecalc into master ... Reviewed-on: #2302 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-15 10:16:29 +00:00
Juan Ferrer	42fe7fb1e2	feat(binlog): refs #4409 Disable order recalc from triggers	2024-04-15 11:32:44 +02:00
Alex Moreno	476b82cf87	Merge pull request 'hotFix(claimBegginingModel): enable claimIsEditable' (!2296) from hotFix_claimBeginningRestrictions into master ... Reviewed-on: #2296 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-04-12 09:38:59 +00:00
Alex Moreno	85c4778aa9	Merge branch 'master' into hotFix_claimBeginningRestrictions	2024-04-12 09:36:04 +00:00
Alex Moreno	b4862a8ce9	hotFix(claimBegginingModel): enable claimIsEditable and &&	2024-04-12 11:35:21 +02:00
Juan Ferrer	98ed2d0d37	Merge pull request 'fix(util): refs #7205 fix util.slowLog_prune' (!2293) from 7205-fixSlowLogPrune into master ... Reviewed-on: #2293 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-12 07:26:42 +00:00
Juan Ferrer	ccf77ed356	fix(util): refs #7205 util.slowLog_prune code clean	2024-04-12 09:24:48 +02:00
Juan Ferrer	622075a9aa	fix(util): refs #7205 fix util.slowLog_prune	2024-04-12 09:21:34 +02:00
Guillermo Bonet	d503018d5c	Fixtures Jorge	2024-04-12 08:56:38 +02:00
Guillermo Bonet	69280c63b4	Merge branch 'master' into test	2024-04-12 08:03:12 +02:00
Juan Ferrer	cb1bb4ebc4	Merge pull request 'feat(pbx): refs #7198 country prefix, schedule' (!2284) from 7198-pbxPrefixSchedule into master ... Reviewed-on: #2284 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-11 14:58:54 +00:00
Juan Ferrer	3f1941293e	Merge branch 'master' into 7198-pbxPrefixSchedule	2024-04-11 14:56:31 +00:00
Guillermo Bonet	2226922366	Merge branch 'master' into test	2024-04-11 14:52:16 +02:00
Guillermo Bonet	4449441cbf	Merge pull request 'hotfix: ticket168996 Now ticket_doCmr ignore deliveryMethod' (!2279) from ticket168996-hotfix into master ... Reviewed-on: #2279 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-11 12:42:44 +00:00
Alex Moreno	ec095161c8	Merge pull request 'hotFix(closeAll): continue loop' (!2290) from hotFix_closeAll_continueLoop into master ... Reviewed-on: #2290 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-11 11:57:09 +00:00
Alex Moreno	99d80d4d30	hotFix(closeAll): continue loop	2024-04-11 13:51:33 +02:00
Guillermo Bonet	c190d2bef1	Merge branch 'master' into ticket168996-hotfix	2024-04-11 07:31:31 +00:00
Alex Moreno	01425bd95e	Merge pull request '7199-devToTest_2316' (!2287) from 7199-devToTest_2316 into test ... Reviewed-on: #2287 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-11 06:25:22 +00:00