26085 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	798d8a514e	Merge pull request 'fix: hotfix delivery-note' (!3437) from hotfix-producerPdf into master ... Reviewed-on: #3437 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-11 15:13:27 +00:00
Carlos Satorres	b49df364bf	Merge branch 'master' into hotfix-producerPdf	2025-02-11 14:58:16 +00:00
Carlos Satorres	92232b34ce	fix: hotfix delivery-note	2025-02-11 15:55:08 +01:00
Guillermo Bonet	a387e3ae92	feat: refs #7162 Add packages and packagesList to ticket_doCmr procedure	2025-02-11 13:25:30 +01:00
Guillermo Bonet	50a295d495	fix: refs #7162 Update JOIN condition for agencyMode in ticket_doCmr	2025-02-10 07:25:39 +01:00
Guillermo Bonet	b56468d3aa	fix: refs #7024 Test	2025-02-07 15:05:04 +01:00
Guillermo Bonet	95d2823666	fix: refs #7024 Deleted dated check	2025-02-07 14:27:27 +01:00
Carlos Andrés	f851a0b73b	Merge pull request 'HOTFIX: before save checkAccessAcl' (!3426) from hotfix_client_beforeSave_ACL into master ... Reviewed-on: #3426 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-07 10:18:43 +00:00
Javier Segarra	23134deab5	fix: before save checkAccessAcl	2025-02-07 11:11:22 +01:00
Jon Elias	18fe468623	Merge pull request 'Hotfix[InvoiceOutList]: Fixed company filter' (!3424) from Hotfix-InvoiceOutCompanyFilter into master ... Reviewed-on: #3424 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-07 07:12:33 +00:00
Jon Elias	a6de493271	Merge branch 'master' into Hotfix-InvoiceOutCompanyFilter	2025-02-07 06:56:49 +00:00
Jon Elias	200f159c6b	fix: style	2025-02-07 07:55:08 +01:00
Jon Elias	ec01c6b0c2	fix: fixed company filter	2025-02-07 07:51:18 +01:00
Jorge Penadés	fa098661b6	Merge pull request 'fix: add await' (!3422) from hotfix-addAwait into master ... Reviewed-on: #3422 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-02-06 16:53:52 +00:00
Jorge Penadés	6a83cec33f	fix: add await	2025-02-06 17:43:58 +01:00
Carlos Andrés	2e8e2329ec	fix: refs #8535 deploy	2025-02-06 13:44:22 +01:00
Guillermo Bonet	beed658f61	fix: refs #8535 deploy	2025-02-06 13:21:32 +01:00
Guillermo Bonet	e9e3a5f128	Merge pull request 'feat: refs #8535 sistema de warnings' (!3418) from 8535-log-mandate into master ... Reviewed-on: #3418 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-02-06 11:18:57 +00:00
Carlos Andrés	fa5888f931	Merge branch 'master' of https: refs #8535//gitea.verdnatura.es/verdnatura/salix into 8535-log-mandate	2025-02-06 11:53:57 +01:00
Carlos Andrés	9b2c0f1c48	feat: refs #8535 log table mandate	2025-02-06 11:46:39 +01:00
Juanjo Breso	b0dd1d4fff	Merge pull request 'feat: refs #269518 isFragile item and itemType' (!3419) from 269518-ticket_getWarnings_isFragile into master ... Reviewed-on: #3419 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-06 08:18:27 +00:00
Juanjo Breso	8df36f296a	feat: refs #269518 isFragile item and itemType	2025-02-06 09:11:48 +01:00
Carlos Andrés	37b735b988	feat: refs #8535 sistema de warnings	2025-02-05 17:21:36 +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	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