Commit Graph

23519 Commits

Author SHA1 Message Date
Javi Gallego d4b4c0fafe feat: refs #7348 campos a modificar 2024-07-05 09:04:38 +02:00
Robert Ferrús 923efadf6a fix: refs #6371 restore table Series 2024-07-05 09:00:40 +02:00
Javi Gallego e3db143b44 feat: refs #7348 campo en json 2024-07-05 08:55:24 +02:00
Sergio De la torre 159f2f5f1c hotFix itemNewer refs #6964 2024-07-05 08:44:09 +02:00
Sergio De la torre 859f610f43 hotFix itemNewer refs #6964 2024-07-05 08:43:45 +02:00
Guillermo Bonet 50c9ded103 refs #6769 Fix 2024-07-05 08:38:40 +02:00
Carlos Satorres 69b30b1d42 Merge pull request 'hotfix-sepaCore' (!2678) from hotfix-sepaCore into master
Reviewed-on: #2678
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-05 05:52:15 +00:00
Robert Ferrús 1e109a493d Merge branch 'dev' into 7116-agencyIncoming 2024-07-05 05:40:14 +00:00
Guillermo Bonet 6f0196d656 refs #6769 Changes 2024-07-05 07:06:40 +02:00
Carlos Satorres 64f5ad0e19 refs #5525 remove AS 2024-07-04 16:54:57 +02:00
Carlos Satorres f3dcc7dd99 Merge branch 'hotfix-sepaCore' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-sepaCore 2024-07-04 16:50:57 +02:00
Carlos Satorres cf621071d0 refs #5525 fixear sql, fixtures, js 2024-07-04 16:50:54 +02:00
Jorge Penadés 7cbda176ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn 2024-07-04 13:57:58 +02:00
Carlos Andrés d6f6df48f2 Merge pull request 'feat: Avisar cuando no hay posibilidad de fichar refs #7669' (!2676) from 7669-Avisor-cuando-no-se-puede-fichar into dev
Reviewed-on: #2676
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-04 11:30:11 +00:00
Jorge Penadés dce62245e9 chore: refs #7197 add supplierActivityFk filter 2024-07-04 13:10:32 +02:00
Alex Moreno 776fd05648 fix: send rocket after commit cau 199307 2024-07-04 12:45:52 +02:00
Robert Ferrús 1fff3aa681 feat: refs #7670 addSale 2024-07-04 12:34:56 +02:00
Jorge Penadés c99042c831 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn 2024-07-04 12:26:50 +02:00
Guillermo Bonet cf7de14de6 refs #6769 Changes, with error no database selected 2024-07-04 11:34:55 +02:00
Robert Ferrús 87e4a78092 Merge pull request 'feat: refs #7654 entry_splitByShelving' (!2673) from 7654-entry_splitByShelvingCreateColumn into dev
Reviewed-on: #2673
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-04 09:20:14 +00:00
Carlos Satorres 9ae8938b72 Merge branch 'master' into hotfix-sepaCore 2024-07-04 07:56:25 +00:00
Carlos Satorres fcec3bc0ae refs #5525 fix sql accountDetail 2024-07-04 09:54:09 +02:00
Robert Ferrús 9819744caf Merge branch 'dev' into 7654-entry_splitByShelvingCreateColumn 2024-07-04 07:34:31 +00:00
Guillermo Bonet c2d899cd6a Merge branch 'test' into dev 2024-07-04 09:33:08 +02:00
Guillermo Bonet 108a62f738 refs #7486 Fix tests 2024-07-04 09:32:56 +02:00
Robert Ferrús 58fab284f4 Merge branch 'dev' into 7654-entry_splitByShelvingCreateColumn 2024-07-04 07:29:35 +00:00
Guillermo Bonet 58ba6d0f4c Merge branch 'test' into dev 2024-07-04 09:26:49 +02:00
Guillermo Bonet 5a9850939e Merge branch 'master' into test 2024-07-04 09:26:00 +02:00
Guillermo Bonet 009dcd8fc7 refs #7486 Fix tests 2024-07-04 09:23:57 +02:00
Carlos Satorres f4e1934354 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix 2024-07-04 09:19:45 +02:00
Jorge Penadés 43c95c86fe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn 2024-07-04 09:19:25 +02:00
Guillermo Bonet a7895ab0a4 refs #6769 First commit 2024-07-04 09:17:22 +02:00
Robert Ferrús 897da1e48a feat: refs #7654 2024-07-04 08:59:22 +02:00
Robert Ferrús c696be4dda Merge branch '7654-entry_splitByShelvingCreateColumn' of https://gitea.verdnatura.es/verdnatura/salix into 7654-entry_splitByShelvingCreateColumn 2024-07-04 08:57:10 +02:00
Robert Ferrús e897cdc35b Merge branch 'dev' into 7654-entry_splitByShelvingCreateColumn 2024-07-04 06:48:29 +00:00
Robert Ferrús 68871e6345 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7654-entry_splitByShelvingCreateColumn 2024-07-04 08:21:11 +02:00
Guillermo Bonet 5f7c7ae5dd Merge branch 'test' into dev 2024-07-04 07:44:11 +02:00
Guillermo Bonet af6422cf05 Merge branch 'master' into test 2024-07-04 07:43:58 +02:00
Guillermo Bonet a7b653c42a refs #7486 Fix collection_new 2024-07-04 07:34:41 +02:00
Robert Ferrús ac01543b00 Merge branch 'dev' into 7654-entry_splitByShelvingCreateColumn 2024-07-04 05:24:27 +00:00
Javier Segarra 17e7dc8c7e feat(salix): refs #7380 #7380 new typeObservation 2024-07-03 23:02:47 +02:00
Javier Segarra d59cab13d8 feat(salix): refs #7380 #7380 client.substitutionAllowed new field 2024-07-03 23:02:28 +02:00
Carlos Andrés 989fa5ac5a feat: Avisar cuando no hay posibilidad de fichar refs #7669 2024-07-03 18:10:02 +02:00
Carlos Andrés d65af6aaaa feat: Avisar cuando no hay posibilidad de fichar refs #7669 2024-07-03 18:00:28 +02:00
Carlos Andrés e202bea92f Merge pull request 'hotfix-sale_getProblems-líneas-redondeo' (!2674) from hotfix-sale_getProblems-líneas-redondeo into master
Reviewed-on: #2674
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-03 15:26:12 +00:00
Ivan Mas 4bef3e9107 refs #7531 Modify zone_getAddresses 2024-07-03 17:09:10 +02:00
Carlos Andrés 097350adb6 Hotfix sale_getProblems 2024-07-03 17:07:25 +02:00
Carlos Andrés 1ec7cd9540 Hotfix sale_getProblems 2024-07-03 16:59:01 +02:00
Carlos Satorres 5500a6f085 Merge pull request 'refs #6952 subName' (!2636) from 6952-productorItemPDF into dev
Reviewed-on: #2636
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-07-03 12:43:46 +00:00
Guillermo Bonet 0c27ac6e71 Merge branch 'dev' into 7382-triggerInvoiceInTax 2024-07-03 12:24:47 +00:00