23354 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	a178c285c0	fix(salix): #7867 avoid deactivate user when is supplier	2024-08-13 10:44:54 +00:00
Sergio De la torre	3340ddeccd	Merge pull request 'fix: refs #6861 refs#6861 bySectorCollection' (!2856) from 6861_bySectorCollection into master ... Reviewed-on: #2856 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-13 09:39:31 +00:00
Sergio De la torre	32d5ca0d5c	fix: refs #6861 refs#6861 bySectorCollection	2024-08-13 11:37:08 +02:00
Alex Moreno	f28631c376	Merge pull request 'fix(defaulter_filter): recovery subquery' (!2849) from hotFix_defaulterFilter_recovery into master ... Reviewed-on: #2849 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-13 06:54:59 +00:00
Alex Moreno	46abf2f57b	fix(defaulter_filter): recovery subquery	2024-08-12 10:27:26 +02:00
Guillermo Bonet	38dbe6e966	fix: #7126 waste_addSales	2024-08-09 13:53:28 +02:00
Guillermo Bonet	cf13aa917e	feat: refs #7126 saleQuantity to saleWasteQuantity	2024-08-09 08:18:30 +02:00
Pablo Natek	e028bc1ddb	Merge pull request 'feat: refs #6403 packingSite to productionConfig' (!2793) from 6403-from-packingSite-to-productionConfig into master ... Reviewed-on: #2793 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-08-09 05:11:34 +00:00
Alex Moreno	c8f1b7c5ff	hotFix(validateCode): username comparation	2024-08-08 11:51:46 +02:00
Alex Moreno	8580fa0849	hotFix(sendTwoFactor): fix code digits	2024-08-08 10:07:03 +02:00
Robert Ferrús	2429d213da	Merge pull request 'feat: refs #7818 entry_splitByShelving' (!2840) from 7818-entry_splitByShelvingFix into master ... Reviewed-on: #2840 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>	2024-08-07 10:03:03 +00:00
Robert Ferrús	03cc32a525	Merge branch 'master' into 7818-entry_splitByShelvingFix	2024-08-07 10:01:32 +00:00
Robert Ferrús	4c6e3ca49a	Merge pull request 'fix: refs #7685 hotFixAddress_updateCoordinates' (!2841) from 7685-address_updateCoordinatesFix into master ... Reviewed-on: #2841 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>	2024-08-07 08:15:46 +00:00
Robert Ferrús	41e44b747a	fix: refs #7685 hotFixAddress_updateCoordinates	2024-08-07 10:12:39 +02:00
Robert Ferrús	f385b9a8a3	feat: refs #7818 entry_splitByShelving	2024-08-07 07:12:29 +02:00
Pablo Natek	eaf7730394	Merge branch 'master' into 6403-from-packingSite-to-productionConfig	2024-08-06 14:58:54 +00:00
Guillermo Bonet	03358170d3	fix: refs #7740 ticket route throw	2024-08-06 14:10:16 +02:00
Guillermo Bonet	ffa775a8a5	Merge pull request 'fix: refs #7834 expeditionScan_Put' (!2832) from 7834-fixExpeditionScanPut into master ... Reviewed-on: #2832 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>	2024-08-06 10:56:10 +00:00
Guillermo Bonet	d1bb77d6ed	fix: refs #7834 expeditionScan_Put	2024-08-06 12:51:55 +02:00
Guillermo Bonet	c7c711ac1a	fix: refs #7728 duaInvoiceInBooking	2024-08-06 12:43:51 +02:00
Alex Moreno	0152fb8a98	hotFix getTIckets	2024-08-06 09:51:15 +02:00
Alex Moreno	69c676d44b	hotFix(route): fix getTicket use skip	2024-08-06 09:38:27 +02:00
Alex Moreno	fb15225078	Merge pull request 'build: dump 2432' (!2838) from 7837-dump_2432 into master ... Reviewed-on: #2838 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-08-06 07:16:43 +00:00
Alex Moreno	6fb78e1599	test: hotFix saveSign	2024-08-06 08:59:20 +02:00
Alex Moreno	70a91da0ff	build: dump 2432	2024-08-06 08:27:40 +02:00
Alex Moreno	36dee872d6	Merge pull request '7837-testToMaster_2432' (!2834) from 7837-testToMaster_2432 into master ... Reviewed-on: #2834 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-06 05:52:04 +00:00
Guillermo Bonet	54e6c63b8b	fix: refs #7834 SELECT	2024-08-06 07:29:32 +02:00
Guillermo Bonet	e03a1914d9	fix: refs #7834 Throw	2024-08-06 07:27:36 +02:00
Alex Moreno	e95d722a7c	add changelog	2024-08-05 14:52:09 +02:00
Guillermo Bonet	d6e09fcfc9	Merge branch 'master' into test	2024-08-05 12:59:37 +02:00
Guillermo Bonet	91253cc807	fix: refs #7835 transferSales	2024-08-05 12:57:38 +02:00
Guillermo Bonet	967443b427	fix: refs #7834 expeditionScan_Put	2024-08-05 12:26:16 +02:00
Guillermo Bonet	d5a8e32b52	Merge branch 'master' into test	2024-08-05 11:59:46 +02:00
Guillermo Bonet	df672a22eb	Merge pull request 'feat: refs #7644 Optimized entry labels report' (!2831) from 7644-buyLabelChunk into master ... Reviewed-on: #2831 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-05 09:53:33 +00:00
Guillermo Bonet	32b48a7bb6	feat: refs #7644 Fix	2024-08-05 11:48:02 +02:00
Guillermo Bonet	760a1debca	feat: refs #7644 Requested changes	2024-08-05 11:44:20 +02:00
Guillermo Bonet	ab446b54ed	feat: refs #7644 Optimized entry labels report	2024-08-05 11:29:35 +02:00
Carlos Andrés	e1dc7a3cb9	Merge pull request 'Hotfix changes whit conficts merged incorrectly' (!2829) from Hotfix-changes-whit-conficts-merged-incorrectly into master ... Reviewed-on: #2829 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-02 12:16:03 +00:00
Carlos Andrés	f431d6c37f	Hotfix changes whit conficts merged incorrectly	2024-08-02 13:45:58 +02:00
Guillermo Bonet	f6db62945d	Merge branch 'master' into test	2024-08-02 12:08:22 +02:00
Guillermo Bonet	dead585a1b	Merge pull request 'fix: refs #7812 Added orders in item_getMinacum' (!2810) from 7812-radarOrder into master ... Reviewed-on: #2810 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-08-02 10:01:55 +00:00
Guillermo Bonet	4c67daedec	Merge branch 'master' into test	2024-08-02 11:50:16 +02:00
Carlos Andrés	69d4c8bd6e	Merge pull request 'fix: refs #7829 Error al calcular problemas de componentes' (!2828) from 7829-Error-calcular-problemas-componentes into master ... Reviewed-on: #2828 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-02 09:45:06 +00:00
Carlos Andrés	29a50caaca	fix: refs #7829 Error al calcular problemas de componentes	2024-08-02 11:43:30 +02:00
Carlos Andrés	ddd5e4ffa4	fix: refs #7829 Error al calcular problemas de componentes	2024-08-02 10:28:50 +02:00
Guillermo Bonet	01df29b47c	Merge branch 'master' into test	2024-08-02 10:00:12 +02:00
Guillermo Bonet	97c1f8b321	Merge pull request 'feat: refs #7382 Changes' (!2826) from 7382-invoiceInBooking into master ... Reviewed-on: #2826 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-08-02 07:54:48 +00:00
Guillermo Bonet	d852d16ae4	feat: refs #7382 Changes	2024-08-02 08:11:38 +02:00
Robert Ferrús	619dd2fbe8	Merge pull request 'master' (!2823) from master into test ... Reviewed-on: #2823 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-08-01 05:05:14 +00:00
Sergio De la torre	b75e54120d	Merge pull request 'hotFix itemShelving refs #6861' (!2821) from 6861_triggerItemShelving into master ... Reviewed-on: #2821 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-08-01 04:52:40 +00:00