Commit Graph

3410 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 1a053942a1 Merge branch 'dev' into 2963-creditInsurance_acl
gitea/salix/pipeline/head This commit looks good Details
2021-06-15 14:41:52 +00:00
Joan Sanchez 9591f04853 Merge branch 'dev' into 2938-entry_buy_style
gitea/salix/pipeline/head This commit looks good Details
2021-06-15 12:18:59 +00:00
Joan Sanchez 92e8f528e8 2963 - Show section to all employee
gitea/salix/pipeline/head This commit looks good Details
2021-06-15 14:16:12 +02:00
Carlos Jimenez Ruiz db3d5ca4d8 added missing html closing tag
gitea/salix/pipeline/head This commit looks good Details
2021-06-15 13:14:21 +02:00
Carlos Jimenez Ruiz 9c0cff2f3a removed unused code
gitea/salix/pipeline/head This commit looks good Details
2021-06-14 16:09:28 +02:00
Carlos Jimenez Ruiz 88a5443d64 table style changes
gitea/salix/pipeline/head This commit looks good Details
2021-06-14 15:52:46 +02:00
Carlos Jimenez Ruiz e85b7b9817 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2931-entry_summary_pagination 2021-06-14 12:07:54 +02:00
Carlos Jimenez Ruiz cdbab4d7bf Merge branch 'dev' into 2567-calendar_rework
gitea/salix/pipeline/head This commit looks good Details
2021-06-14 10:00:47 +00:00
Carlos Jimenez Ruiz c09d25ba48 Merge branch 'dev' into 2567-calendar_rework
gitea/salix/pipeline/head This commit looks good Details
2021-06-14 09:59:13 +00:00
Joan Sanchez 59e90c2c10 Removed commented block
gitea/salix/pipeline/head This commit looks good Details
2021-06-14 11:58:39 +02:00
Joan Sanchez 722c9ad4d4 Merge branch 'dev' into 2957-ticket_summary_postcode
gitea/salix/pipeline/head This commit looks good Details
2021-06-14 09:42:40 +00:00
Carlos Jimenez Ruiz 7f69909bbd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2931-entry_summary_pagination
gitea/salix/pipeline/head This commit looks good Details
2021-06-14 11:39:04 +02:00
Carlos Jimenez Ruiz f36b54f97b invoiceOut summary tickets pagination + refactor 2021-06-14 11:38:57 +02:00
Joan Sanchez a303b98093 Merge branch 'dev' into 2933-route_tickets_new_ticket_to_route
gitea/salix/pipeline/head This commit looks good Details
2021-06-14 09:37:23 +00:00
Joan Sanchez de30a2d978 Total holidays fix
gitea/salix/pipeline/head This commit looks good Details
2021-06-14 08:09:53 +02:00
Carlos Jimenez Ruiz 5d8a9938d6 formattedAddress tests amended for postcode 2021-06-13 19:16:35 +02:00
Carlos Jimenez Ruiz 48f80fad8f added postcode to summary + basic data translation 2021-06-13 19:11:05 +02:00
Carlos Jimenez Ruiz 7bf832079d route.tickets suggested tickets now shows both descriptors
gitea/salix/pipeline/head This commit looks good Details
2021-06-11 13:02:18 +02:00
Joan Sanchez 17a6dfc81b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2567-calendar_rework
gitea/salix/pipeline/head This commit looks good Details
2021-06-11 10:58:40 +02:00
Joan Sanchez a72010554c Fixes and E2E updated
gitea/salix/pipeline/head This commit looks good Details
2021-06-11 10:58:00 +02:00
Carlos Jimenez Ruiz c776d34cdf invoiceIn basic data and summary added some fields
gitea/salix/pipeline/head This commit looks good Details
2021-06-10 17:08:21 +02:00
Joan Sanchez e8fd1c9c9c Merge branch 'dev' into 2951-fix_unit_test
gitea/salix/pipeline/head This commit looks good Details
2021-06-10 14:24:17 +00:00
Joan Sanchez be791d1f00 2951 - Added transaction to updateVolume() method
gitea/salix/pipeline/head This commit looks good Details
2021-06-10 16:08:44 +02:00
Joan Sanchez 3f3e5c2735 Unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-06-10 16:05:10 +02:00
Joan Sanchez 1b62233ea7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2567-calendar_rework 2021-06-10 14:22:13 +02:00
Joan Sanchez 8284702603 2567 - Working calendar refactor
gitea/salix/pipeline/head This commit looks good Details
2021-06-10 11:24:32 +02:00
Carlos Jimenez Ruiz fc3af7b6a6 ticket expedition now shows scan worker and scanned date
gitea/salix/pipeline/head This commit looks good Details
2021-06-09 14:25:50 +02:00
Carlos Jimenez Ruiz f969323a86 ticket create now takes clientFk from params
gitea/salix/pipeline/head This commit looks good Details
2021-06-08 17:30:00 +02:00
Joan Sanchez 3c8629b3f3 Added entilementRate effects
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-08 16:36:16 +02:00
Carlos Jimenez Ruiz 76e723cc34 Merge branch 'dev' into 2943-timecontrol_now_showing_hours
gitea/salix/pipeline/head This commit looks good Details
2021-06-08 07:47:42 +00:00
Carlos Jimenez Ruiz 238975644f Merge branch 'dev' into 2943-timecontrol_now_showing_hours
gitea/salix/pipeline/head This commit looks good Details
2021-06-07 13:02:27 +00:00
Carlos Jimenez Ruiz 3894fe94ec Merge branch 'dev' into 2937-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-06-07 13:02:20 +00:00
Joan Sanchez 8fa64122f8 Ammends
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-07 14:58:24 +02:00
Carlos Jimenez Ruiz a46fef5295 endpoint minor refactor
gitea/salix/pipeline/head This commit looks good Details
2021-06-07 14:26:34 +02:00
Javi Gallego c90fa41fae accountingType.isAutoConciliated == true
gitea/salix/pipeline/head This commit looks good Details
2021-06-07 07:57:46 +02:00
Carlos Jimenez Ruiz 647b7a93cd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2937-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-06-04 17:16:10 +02:00
Carlos Jimenez Ruiz b38605442e transactions for entry module endpoints 2021-06-04 17:16:02 +02:00
Joan Sanchez c853cfc86f Refactor 2021-06-04 15:49:48 +02:00
Joan Sanchez 2c0fc7e45e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-06-04 11:46:37 +02:00
Joan Sanchez 6b65aa87d8 HOTFIX: Max width for client name field
gitea/salix/pipeline/head This commit looks good Details
2021-06-04 11:46:09 +02:00
Joan Sanchez b77ecc2c06 changes2 2021-06-04 11:45:35 +02:00
Joan Sanchez f8df3f1f3d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2567-calendar_rework 2021-06-04 11:10:43 +02:00
Joan Sanchez 651a9356f3 Merge branch 'dev' into 2932-invoiceIn_log
gitea/salix/pipeline/head This commit looks good Details
2021-06-04 07:54:18 +00:00
Joan Sanchez e1c1bb8425 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-06-04 08:00:08 +02:00
Joan Sanchez 8bb254e93f HOTFIX: Ticket monitor clientGetDebt
gitea/salix/pipeline/head This commit looks good Details
2021-06-03 16:29:45 +02:00
Joan Sanchez edf18938a6 HOTFIX: clientGetDebt
gitea/salix/pipeline/head This commit looks good Details
2021-06-03 16:21:43 +02:00
Carlos Jimenez Ruiz b0bed3c1c4 invoiceInLog section, model and table
gitea/salix/pipeline/head This commit looks good Details
2021-06-03 16:14:52 +02:00
Joan Sanchez d1daed3540 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-06-03 13:39:51 +02:00
Joan Sanchez 5962a68d15 HOTFIX: Sort by zone hour
gitea/salix/pipeline/head This commit looks good Details
2021-06-03 12:40:27 +02:00
Joan Sanchez 3fcd78e1f3 Changes 2021-06-03 11:00:40 +02:00