verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 71 Releases Wiki Activity
22,493 Commits 289 Branches 0 Tags 125 MiB
Commit Graph

5277 Commits

Author SHA1 Message Date
Alex Moreno 42b483e27e feat: refs #7555 remove account.password__ 2024-06-21 08:35:35 +02:00
Pako Natek 7347c50f8e Merge branch 'dev' into 7420-supplierPackaging_reportSource_update 2024-06-21 06:33:15 +00:00
Pako Natek fe154b9ee8 sref 2024-06-21 08:32:22 +02:00
Sergio De la torre da40b705c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7357_dipole_review 2024-06-21 07:20:00 +02:00
Guillermo Bonet 6874474207 Merge pull request 'refactor: refs #7519 Refactor claim_ratio_routine' (!2394) from 6701-claimRatioRoutine into dev 
Reviewed-on: #2394
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
 2024-06-21 05:05:20 +00:00
Guillermo Bonet a899ecaab7 Merge pull request 'refactor: refs #7490 Deleted update duaInvoiceInBooking' (!2561) from 7490-duaInvoiceInBooking into dev 
Reviewed-on: #2561
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
 2024-06-21 05:04:32 +00:00
Carlos Andrés f7b8bd2df6 Merge branch '6861-Pasar-modo-trabajo-de-previa-a-reservas' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas 2024-06-20 18:18:05 +02:00
Carlos Andrés ed49c98c1c fnpmeat: previas con sitema de reservas refs #6861 2024-06-20 18:18:03 +02:00
Carlos Andrés 68f48de6f0 feat: sincro client supplier sage refs #7595 2024-06-20 17:14:38 +02:00
Sergio De la torre 9b0913e439 Merge branch 'dev' into 7023_itemShelving_filterBuyer 2024-06-20 14:36:25 +00:00
Carlos Andrés b5cd57e660 Merge pull request 'test' (!2621) from test into dev 
Reviewed-on: #2621
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
 2024-06-20 13:47:11 +00:00
Carlos Andrés 691413a854 Merge pull request 'master' (!2620) from master into test 
Reviewed-on: #2620
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
 2024-06-20 13:44:37 +00:00
Carlos Andrés 11675c2e35 Merge pull request 'feat: sincro client supplier sage refs #7595' (!2618) from 7595---Sincronizar-cambios-clientes-y-proveedores-con-Sage into master 
Reviewed-on: #2618
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-06-20 13:34:55 +00:00
Carlos Andrés 414bf9eb03 feat: sincro client supplier sage refs #7595 2024-06-20 14:48:32 +02:00
Carlos Andrés e0d105313d feat: sincro client supplier sage refs #7595 2024-06-20 14:27:11 +02:00
Sergio De la torre 182cd3fa8e feat boxPicking refs #7357 2024-06-20 11:34:51 +02:00
Alex Moreno f99b1beb86 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-06-20 09:48:57 +02:00
Alex Moreno f84e85e443 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2024-06-20 09:48:34 +02:00
Sergio De la torre c1c01df3c3 feat itemShelving_filterBuyer refs #7023 2024-06-20 09:37:22 +02:00
Sergio De la torre c87f060d51 feat boxPicking refs #7357 2024-06-20 09:21:27 +02:00
Javi Gallego 018972b948 Merge pull request 'feat: refs #7216 logUnpaid' (!2609) from 7216-clientUnpaid into dev 
Reviewed-on: #2609
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-06-20 05:50:14 +00:00
Javi Gallego 1a8df4d87c feat: refs #7216 triggers 2024-06-19 13:41:37 +02:00
Jorge Penadés 6967aa9811 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls 2024-06-19 13:40:09 +02:00
Pako Natek b117352e1a Merge branch 'dev' into 7420-supplierPackaging_reportSource_update 2024-06-19 10:31:36 +00:00
Guillermo Bonet 738dcc7060 Merge pull request 'feat: refs #7545 Deleted hasIncoterms client column' (!2582) from 7545-hasIncoterms into dev 
Reviewed-on: #2582
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-19 09:31:18 +00:00
Pako Natek 49e01218e9 Warehouse name 2024-06-19 10:45:37 +02:00
Pako Natek 1fa0a841da TP previous 2024-06-19 07:26:30 +02:00
Pako Natek bf62f40c87 actualizada la rama 2024-06-19 07:17:25 +02:00
Pako Natek 841f8e9cac Merge branch 'dev' into 7420-supplierPackaging_ReportSource 2024-06-18 18:38:48 +00:00
Sergio De la torre ae01fb6440 hotFix delete unique refs #6281 2024-06-18 17:00:15 +02:00
Sergio De la torre 5694d9a9fe Merge branch 'test' into 6964-hasItemOlder 2024-06-18 14:20:57 +00:00
Jorge Penadés 6cf7c58671 fix: refs #6238 use scheme 2024-06-18 12:59:55 +02:00
Ivan Mas 49943e4f25 Merge branch 'dev' into 7313-Delete_vn.ticketPackaging.workerFk 2024-06-18 10:09:04 +00:00
Pako Natek 66ed958c72 Merge branch 'dev' into 7420-supplierPackaging_ReportSource 2024-06-18 09:07:24 +00:00
Guillermo Bonet a61c12a06d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-06-18 11:04:01 +02:00
Guillermo Bonet b7fadddbb1 Merge branch 'master' into dev 2024-06-18 11:03:56 +02:00
Guillermo Bonet 4d5f3e43ed Merge branch 'master' into test 2024-06-18 11:03:49 +02:00
Guillermo Bonet 2b1de271a9 refs #7552 Added force vShowType true 2024-06-18 11:03:30 +02:00
Sergio De la torre 239814e6b4 feat hasItemOlder refs#6964 2024-06-18 10:08:40 +02:00
Jorge Penadés 87feddaedb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6238-addPercentage 2024-06-18 09:55:22 +02:00
Carlos Satorres 52a34c8f2d refs #7409 fix acls 2024-06-18 09:18:09 +02:00
Pako Natek 3711f26b5f Merge branch 'dev' into 7420-supplierPackaging_ReportSource 2024-06-18 06:24:59 +00:00
Pako Natek 9fc027a3c6 tickets deleted excluded 2024-06-18 08:24:06 +02:00
Sergio De la torre eedcdb54fa feat hasItemOlder refs#6964 2024-06-17 19:50:51 +02:00
Sergio De la torre dc777b2d7a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964-hasItemOlder 2024-06-17 19:12:00 +02:00
Ivan Mas 671290b9a0 refs #7313 delete vn.itemPackaging.workerFk 2024-06-17 16:45:51 +02:00
Carlos Satorres 3e25fff90f refs #7409 acl 2024-06-17 15:50:58 +02:00
Guillermo Bonet a84badff87 Merge branch 'test' into dev 2024-06-17 14:52:55 +02:00
Guillermo Bonet 9b3f67ff62 Merge branch 'master' into test 2024-06-17 14:52:40 +02:00
Guillermo Bonet ce709798b4 hotfix: refs #7486 collection_new debug error 2024-06-17 14:51:04 +02:00
Carlos Satorres fa8c1b3879 acls, fixtures, models 2024-06-17 13:50:07 +02:00
Guillermo Bonet 664f4299b3 Merge branch 'test' into dev 2024-06-17 13:42:51 +02:00
Guillermo Bonet 9df3e914bd Merge branch 'master' into test 2024-06-17 13:42:33 +02:00
Guillermo Bonet 131b44305d hotfix: refs #7552 item_getSimilar 2024-06-17 13:38:40 +02:00
Guillermo Bonet b4377e36e2 Merge branch 'test' into dev 2024-06-17 11:45:19 +02:00
Guillermo Bonet e7eaecdf6f Merge branch 'master' into test 2024-06-17 11:45:00 +02:00
Guillermo Bonet 4c345ffa93 hotfix: refs #7552 item_getSimilar 2024-06-17 10:57:23 +02:00
Guillermo Bonet 43df0ef55d Merge branch 'dev' into 6701-claimRatioRoutine 2024-06-17 07:42:33 +00:00
Guillermo Bonet 1d0b89ed52 refs #7519 Requested changes 2024-06-17 09:42:16 +02:00
Carlos Andrés 51078c804b Ticket #194195 Recupero vn.item_getAtp 2024-06-14 16:32:13 +02:00
Carlos Andrés 5473f7a308 Hotfix Ticket #194195 Error radar negativos 2024-06-14 16:01:27 +02:00
Robert Ferrús df6de7e74c fix: refs #194195 item_getAtp 2024-06-14 14:55:03 +02:00
Jorge Penadés 202884fdce feat: refs #6238 add travelKgPercentage table and model 2024-06-14 14:25:15 +02:00
Robert Ferrús 8dea9598e8 fix: refs #194195 item_getAtp 2024-06-14 13:54:43 +02:00
Guillermo Bonet 9b80ef73a8 Merge branch 'test' into dev 2024-06-14 12:48:00 +02:00
Guillermo Bonet 6c2fd2580d Merge branch 'master' into test 2024-06-14 12:47:51 +02:00
Guillermo Bonet 798bf6d028 hotfix: refs #6281 itemShelving_add buy is required 2024-06-14 12:41:46 +02:00
Carlos Satorres e3e9706fb8 fix fixtures 2024-06-14 09:53:50 +02:00
Carlos Satorres 189c67bd2d warmFix change if 2024-06-14 09:43:10 +02:00
Ivan Mas 615fd3e97b refs #7530 delete trigger deviceProductionConfig_afterUpdate 2024-06-13 15:10:04 +02:00
Sergio De la torre c2e4e187d6 feat itemShelvingSale refs #6861 2024-06-13 14:21:59 +02:00
Jorge Penadés 784bd91e04 fix: refs #6286 update WorkerTimeControl permissions 2024-06-13 13:43:28 +02:00
Guillermo Bonet cfc5e32715 feat: refs #6701 Fix error 2024-06-13 13:11:50 +02:00
Guillermo Bonet cb056ff789 Merge branch 'dev' into 6701-claimRatioRoutine 2024-06-13 11:14:00 +02:00
Sergio De la torre 5340729ead Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas 2024-06-13 11:07:57 +02:00
Guillermo Bonet 53c732bcb9 Merge branch 'test' into dev 2024-06-13 07:12:10 +02:00
Guillermo Bonet d7317e4067 hotfix: refs #7024 Modify booked entries 2024-06-13 07:09:48 +02:00
Carlos Andrés 30caf79490 feat: previas con sitema de reservas refs #6861 2024-06-12 16:12:06 +02:00
Guillermo Bonet d0b926b2c5 feat: refs #7490 Changes 2024-06-12 14:26:26 +02:00
Alex Moreno 671978ec02 Merge branch 'dev' into 6861-Pasar-modo-trabajo-de-previa-a-reservas 2024-06-12 10:21:36 +00:00
Javi Gallego 446e180cf0 hotfix claim 2024-06-12 11:58:07 +02:00
Guillermo Bonet dcb9d54105 feat: refs #7545 Deleted hasIncoterms client column 2024-06-12 11:48:01 +02:00
Alex Moreno 60d4372996 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation 2024-06-12 07:51:01 +02:00
Alex Moreno 1eee1d0e9b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-06-12 07:47:56 +02:00
Guillermo Bonet 17fa1e10f6 feat: refs #6701 Added claimRatio_afterInsert 2024-06-12 07:33:10 +02:00
Carlos Andrés b9d1c3228b feat: previas con sitema de reservas refs #6861 2024-06-11 18:43:26 +02:00
Alex Moreno 3b44bdd2bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation 2024-06-11 12:56:56 +02:00
Carlos Andrés d75e008a23 feat: previas con sitema de reservas refs #6861 2024-06-11 12:49:33 +02:00
Carlos Andrés ed7218c133 feat: previas con sitema de reservas refs #6861 2024-06-11 12:44:25 +02:00
Jorge Penadés 1cefe817f5 feat: add editZone ACL for buyer 2024-06-11 12:06:44 +02:00
Guillermo Bonet 76f76b8304 feat: refs #7568 Added freelancer exception 2024-06-11 10:48:24 +02:00
Alex Moreno 9c2ccc5df4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-06-11 09:59:09 +02:00
Alex Moreno 2dec51804c build: dump 2024-06-11 08:38:26 +02:00
Guillermo Bonet bd13ecd464 refactor: refs #7486 engine memory and primary key sales_merge 2024-06-11 07:59:53 +02:00
Sergio De la torre 62f4561279 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7168-itemShelvingLog_get 2024-06-11 07:34:42 +02:00
Jorge Penadés 562e8689e1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection 2024-06-10 15:36:34 +02:00
Alex Moreno c241189508 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-06-10 14:22:12 +02:00
Guillermo Bonet 75a529830c Merge pull request 'refactor: refs #7486 Optimized procs' (!2564) from 7486-productionControl into test 
Reviewed-on: #2564
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-06-10 11:33:10 +00:00
Guillermo Bonet 9d82f0ff7c Merge branch 'test' into dev 2024-06-10 12:48:53 +02:00
Guillermo Bonet 37fa92aca8 Merge branch 'master' into test 2024-06-10 12:48:38 +02:00