26072 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	fa5c17178e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into beta	2025-02-04 13:03:25 +01:00
Sergio De la torre	04a65bc1e0	Merge pull request 'fix: refs #6964 visibleGreaterThanZero' (!3405) from 6964_itemsOLder into master ... Reviewed-on: #3405 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-01-31 11:43:41 +00:00
Carlos Andrés	0a9e3d5d54	Merge pull request 'fix: refs #8511 ref #8511 ensure entry is editable for new entryFk in buy_beforeUpdate trigger' (!3403) from 8511-Error-traslado-compras into master ... Reviewed-on: #3403 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-31 09:36:46 +00:00
Carlos Andrés	f437b3285a	Actualizar print/templates/reports/invoice-incoterms/sql/incoterms.sql	2025-01-31 09:34:44 +00:00
Carlos Andrés	672ef36501	fix: refs #8511 ref #8511 ensure entry is editable for new entryFk in buy_beforeUpdate trigger	2025-01-30 18:11:30 +01:00
Sergio De la torre	be93ea3a07	fix: refs #6964 visibleGreaterThanZero	2025-01-30 17:55:10 +01:00
Sergio De la torre	c3163df2e8	Merge pull request 'fix: refs #7920 shelvingFkByCode' (!3401) from 7920_itemShelvingCode into master ... Reviewed-on: #3401 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-01-30 08:29:38 +00:00
Sergio De la torre	c96d083467	fix: refs #7920 shelvingFkByCode	2025-01-30 09:16:54 +01:00
Juan Ferrer	51edeec9a2	Merge pull request 'fix: refs #8494 Fix ZoneIncluded logs' (!3398) from test into master ... Reviewed-on: #3398	2025-01-29 12:17:38 +00:00
Jon Elias	8f3226f7c1	Merge pull request 'Hotfix[CreateManualInvoice]: Fixed manual invoice' (!3393) from Hotfix-ManualInvoice into master ... Reviewed-on: #3393 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-29 10:59:09 +00:00
Jon Elias	f088f1776f	fix: fixed manual invoice	2025-01-29 10:45:29 +01:00
Juan Ferrer	9a6b89793c	fix: refs #8494 Fix ZoneIncluded logs	2025-01-29 10:35:06 +01:00
Sergio De la torre	8ed9e864a2	Merge pull request '7569_sendEmail' (!3387) from 7569_sendEmail into master ... Reviewed-on: #3387 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-01-28 10:26:48 +00:00
Sergio De la torre	1575c509d1	fix: refs #7569 saveSign use lastState	2025-01-28 11:19:45 +01:00
Sergio De la torre	3f0f155113	fix: refs #7569 saveSign use lastState	2025-01-28 11:15:29 +01:00
Sergio De la torre	79ea19a360	fix: refs #7569 saveSign use lastState	2025-01-28 11:14:08 +01:00
Sergio De la torre	a29de13ab3	fix: refs #7569 saveSign use smtp.send and fix link	2025-01-28 09:54:26 +01:00
Jon Elias	6833dbe846	Merge pull request 'Hotfix: Fixed shipped date when it is null' (!3382) from Hotfix-PriceDifferenceShipped into master ... Reviewed-on: #3382 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-01-28 07:21:58 +00:00
Javier Segarra	198ae9a83b	Merge branch 'master' into Hotfix-PriceDifferenceShipped	2025-01-28 07:19:37 +00:00
Alex Moreno	837719327d	Merge pull request 'build: refs #8452 dump db' (!3386) from 8452-dump into master ... Reviewed-on: #3386 Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-01-28 07:16:33 +00:00
Alex Moreno	f4b7683609	build: refs #8452 dump db	2025-01-28 08:10:23 +01:00
Alex Moreno	f122db6572	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into beta	2025-01-28 08:07:40 +01:00
Alex Moreno	7a02af9a3a	Merge pull request '8452-testToMaster' (!3385) from 8452-testToMaster into master ... Reviewed-on: #3385 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-01-28 06:42:20 +00:00
Alex Moreno	7b8ddef4c2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 8452-testToMaster	2025-01-28 07:36:10 +01:00
Alex Moreno	3bf47af774	Merge pull request 'fix: some params' (!3384) from warmfix_customer_filters into test ... Reviewed-on: #3384 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-28 06:36:00 +00:00
Alex Moreno	6e824c1b5e	Merge branch 'test' into warmfix_customer_filters	2025-01-28 06:27:44 +00:00
Jon Elias	30d3e7df68	Merge branch 'master' into Hotfix-PriceDifferenceShipped	2025-01-28 06:27:00 +00:00
Alex Moreno	5f07c159bc	build: refs #8452 add change log	2025-01-27 15:24:26 +01:00
Alex Moreno	bbebff7ea9	fix: prevent slow update	2025-01-27 14:37:39 +01:00
Javier Segarra	b003dff045	fix: new params	2025-01-27 13:30:29 +00:00
Javier Segarra	72a1c2ca57	fix: some params	2025-01-27 12:57:58 +00:00
Guillermo Bonet	aecf529976	Merge branch 'master' into test	2025-01-27 11:23:55 +01:00
Guillermo Bonet	cd8e04d648	refactor: refs #7568 ticket_doCmr ignore alertLevel	2025-01-27 11:22:21 +01:00
Javier Segarra	1890e5d541	Merge branch 'master' into Hotfix-PriceDifferenceShipped	2025-01-24 12:28:29 +00:00
Jon Elias	6da004e7cf	fix: fixed shipped date when it is null	2025-01-24 09:29:58 +01:00
Sergio De la torre	bb35cbece0	Merge pull request '6861-itemShelvingSaleWithUser' (!3381) from 6861-itemShelvingSaleWithUser into master ... Reviewed-on: #3381 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-01-24 08:23:13 +00:00
Sergio De la torre	5dd60bd912	fix: refs #6861 refs#6861 showUsername	2025-01-24 08:28:15 +01:00
Sergio De la torre	df97534882	fix: refs #6861 refs#6861 showUsername	2025-01-24 08:25:44 +01:00
Javi Gallego	e4733b5102	Merge pull request 'hotFix: address isEqualizated can be null for trigger' (!3379) from hotFix_addressIsEqualizated into master ... Reviewed-on: #3379 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-23 14:18:04 +00:00
Alex Moreno	518a91cff2	fix: address isEqualizated can be null for trigger	2025-01-23 13:56:36 +01:00
Alex Moreno	200a7cf995	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-01-23 08:33:58 +01:00
Robert Ferrús	0e0db6591e	Merge pull request 'feat: refs #8401 create triggers to itemTaxCountry' (!3370) from 8401-itemTaxCountryTrigger into master ... Reviewed-on: #3370 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-21 10:37:13 +00:00
Robert Ferrús	77606468fd	Merge branch 'master' into 8401-itemTaxCountryTrigger	2025-01-21 10:07:28 +00:00
Robert Ferrús	405e0adaec	Merge pull request 'feat: refs #8447 create tables tag' (!3375) from 8447-createTableTags2 into master ... Reviewed-on: #3375 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-21 10:02:01 +00:00
Alex Moreno	ded035285b	Merge pull request '8448-devToTest' (!3373) from 8448-devToTest into test ... Reviewed-on: #3373 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2025-01-21 10:00:49 +00:00
Alex Moreno	05b383ecb0	test: refs #8448 fix e2e	2025-01-21 10:57:40 +01:00
Robert Ferrús	785a10a26a	feat: refs #8447 create tables tag	2025-01-21 09:34:56 +01:00
Sergio De la torre	6f73758cad	Merge pull request '7569-sendEmailOrderTicket' (!3350) from 7569-sendEmailOrderTicket into dev ... Reviewed-on: #3350 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-21 06:29:28 +00:00
Sergio De la torre	c50ff6a43a	feat: refs #7569 refs#7569 sendEmailNotification	2025-01-21 07:05:42 +01:00
Sergio De la torre	eee73f001d	Merge branch 'dev' of https: refs #7569//gitea.verdnatura.es/verdnatura/salix into 7569-sendEmailOrderTicket	2025-01-21 07:00:02 +01:00