21433 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	84e90bb91b	hotfix: rollback tmp item_getSimilar	2024-05-08 12:43:46 +02:00
Carlos Satorres	f64e899061	Merge pull request 'refs #6882 absence' (!2271) from 6682-notHolidays into dev ... Reviewed-on: #2271 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-08 10:27:20 +00:00
Robert Ferrús	cc89100d08	Merge branch 'dev' into 182001-packaging	2024-05-08 10:26:53 +00:00
Carlos Satorres	7b298c1baf	refs #6882 fix tback	2024-05-08 12:24:05 +02:00
Carlos Satorres	fa2c4de562	Merge pull request 'refs #6842 worker' (!2404) from 6842-errorCalendar into dev ... Reviewed-on: #2404 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-08 10:21:19 +00:00
Carlos Satorres	8a7d124066	refs #6882 fix traductions	2024-05-08 12:17:44 +02:00
Carlos Satorres	0709a64dca	refs #6882 fix back	2024-05-08 12:05:47 +02:00
Carlos Satorres	269c42e5c9	Merge branch '6682-notHolidays' of https://gitea.verdnatura.es/verdnatura/salix into 6682-notHolidays	2024-05-08 11:47:06 +02:00
Carlos Satorres	c355595384	refs #6882 fix back, tback te2e	2024-05-08 11:47:04 +02:00
Javi Gallego	393d57f078	fix: #7344 getSupplierDebt agrupa por pago	2024-05-08 10:51:35 +02:00
Robert Ferrús	2866f231b8	Merge branch 'dev' into 182001-packaging	2024-05-08 08:41:38 +00:00
Guillermo Bonet	16e7fb9662	Merge branch 'dev' into 7335-modifyCmr	2024-05-08 08:29:00 +00:00
Carlos Satorres	c0b4a931a6	Merge branch 'dev' into 6682-notHolidays	2024-05-08 07:55:26 +00:00
Guillermo Bonet	71f66085f6	Merge branch 'test' into dev	2024-05-08 09:50:52 +02:00
Guillermo Bonet	854604368a	Merge branch 'master' into test	2024-05-08 09:50:37 +02:00
Sergio De la torre	9a235838d8	refs #7161 feat:setVisibleDiscard by itemTrash	2024-05-08 09:04:08 +02:00
Carlos Satorres	8637488fc1	refs #6882 fix pr	2024-05-08 08:48:19 +02:00
Guillermo Bonet	6cde2e8170	fix: refs #6585 Requested changes	2024-05-08 08:48:08 +02:00
Robert Ferrús	f66942ba08	Merge pull request 'hotfix: refs #6777 manaCustomerUpdate' (!2423) from 6777-hotfixManaCustomerUpdate into master ... Reviewed-on: #2423 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-05-08 06:35:00 +00:00
Guillermo Bonet	e070906ea6	hotfix: refs #6777 manaCustomerUpdate	2024-05-08 07:49:32 +02:00
Javier Segarra	cf259ad0ce	feat(samba): refs #5770 #5770 Mayor updates	2024-05-08 07:35:05 +02:00
Javier Segarra	ba1a29ac88	feat(samba): refs #5770 #5770 Add new front field GroupDn in sambaConfig	2024-05-08 07:14:11 +02:00
Javier Segarra	e2e4e550d7	feat(samba): refs #5770 #5770 Add new field GroupDn in sambaConfig	2024-05-08 07:13:56 +02:00
Javier Segarra	91f73b916f	feat(samba): refs #5770 #5770 Create samba connection	2024-05-07 15:44:04 +02:00
Javier Segarra	84603bf000	Merge branch 'dev' into 5770_sambaGroups	2024-05-07 15:14:56 +02:00
Carlos Satorres	371df19194	Merge branch '6682-notHolidays' of https://gitea.verdnatura.es/verdnatura/salix into 6682-notHolidays	2024-05-07 14:59:25 +02:00
Carlos Satorres	3eba4a1f69	refs #6882 fix sql	2024-05-07 14:59:23 +02:00
Robert Ferrús	e5ba6a8673	Merge pull request 'feat: refs #179881' (!2421) from 179881-deleteProcedureFv_pca into dev ... Reviewed-on: #2421 Reviewed-by: Juanjo Breso <jbreso@verdnatura.es>	2024-05-07 12:39:51 +00:00
Robert Ferrús	43c742938c	feat: refs #179881	2024-05-07 14:37:24 +02:00
Robert Ferrús	f70f2949ec	feat: refs #182001	2024-05-07 14:30:38 +02:00
Robert Ferrús	f529a7f5b4	feat : refs #182001	2024-05-07 14:25:26 +02:00
Robert Ferrús	6c6ae412bd	feat: refs #182001 packaging	2024-05-07 14:19:11 +02:00
Carlos Satorres	5e8e09cbae	refs #6877 add attenderFk	2024-05-07 13:42:58 +02:00
Guillermo Bonet	0e8d2af741	Merge branch 'test' into dev	2024-05-07 13:19:18 +02:00
Guillermo Bonet	6e9ea9665d	Merge branch 'master' into test	2024-05-07 13:18:46 +02:00
Guillermo Bonet	0d7d4917a7	Merge branch 'master' into test	2024-05-07 13:18:28 +02:00
Guillermo Bonet	20414c70ad	Merge pull request 'hotfix: #7173 Rollback' (!2418) from 7173-rollbackInvoiceInRestriction into master ... Reviewed-on: #2418 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-07 11:12:55 +00:00
Guillermo Bonet	cc8873f48a	hotfix: #7173 Rollback	2024-05-07 13:08:44 +02:00
Guillermo Bonet	832db8901e	Merge branch '7335-modifyCmr' of https://gitea.verdnatura.es/verdnatura/salix into 7335-modifyCmr	2024-05-07 13:03:51 +02:00
Guillermo Bonet	2adf96cb37	refactor: #6585 Deleted transaction ticket_doCmr	2024-05-07 13:03:50 +02:00
Jorge Penadés	4fb8a19936	Merge pull request '#6938 rollback phone' (!2417) from 6938-hotfix-rollbackHidePhone into master ... Reviewed-on: #2417 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-07 10:44:34 +00:00
Jorge Penadés	dce754a64b	Merge branch 'master' into 6938-hotfix-rollbackHidePhone	2024-05-07 10:41:50 +00:00
Guillermo Bonet	45f7412b35	Merge branch 'dev' into 7335-modifyCmr	2024-05-07 10:36:28 +00:00
Guillermo Bonet	da8378d422	hotfix: refs #7173 Deleted restriction invoiceInDueDay_beforeUpdate	2024-05-07 12:15:28 +02:00
Jorge Penadés	1d9b6e489c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6938-hotfix-rollbackHidePhone	2024-05-07 11:49:31 +02:00
Jorge Penadés	0f5e2dcc54	fix: refs #6938 rollback	2024-05-07 11:47:22 +02:00
Jon Elias	5e96049e65	Merge branch 'dev' into 6739-transferInvoiceOut	2024-05-07 09:36:26 +00:00
Guillermo Bonet	3ed1c8f6fd	hotfix: ticket #181890 duaInvoiceInBooking	2024-05-07 11:35:07 +02:00
Jon Elias	d4f734455d	refactor: refs #6739 transferInvoice() refactor	2024-05-07 11:35:05 +02:00
Guillermo Bonet	ef567bb167	fix: ticket #181920 catalog_componentCalculate	2024-05-07 10:03:33 +02:00