Commit Graph

10359 Commits

Author SHA1 Message Date
Joan Sanchez 531937ebbc 2985 - Create a manual invoice from a ticket or client
gitea/salix/pipeline/head This commit looks good Details
2021-07-27 09:07:04 +02:00
Joan Sanchez faab039022 Merge pull request '3014-invoiceIn_clone_from_descriptor' (#701) from 3014-invoiceIn_clone_from_descriptor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #701
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-07-23 13:30:49 +00:00
Carlos Jimenez Ruiz caedfff34e Merge branch '3014-invoiceIn_clone_from_descriptor' of https://gitea.verdnatura.es/verdnatura/salix into 3014-invoiceIn_clone_from_descriptor
gitea/salix/pipeline/head This commit looks good Details
2021-07-23 15:18:08 +02:00
Carlos Jimenez Ruiz b837a8c328 fixed a selector for ticket sale 2021-07-23 15:17:30 +02:00
Carlos Jimenez Ruiz 72535f87e1 Merge branch 'dev' into 3014-invoiceIn_clone_from_descriptor
gitea/salix/pipeline/head This commit looks good Details
2021-07-23 12:47:36 +00:00
Joan Sanchez 98933ff53c Merge pull request '3023-client_webAccess_block_simultaneous_changes' (#700) from 3023-client_webAccess_block_simultaneous_changes into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #700
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-07-23 12:43:48 +00:00
Carlos Jimenez Ruiz 1e97447386 selectors updated according to previous changes on ticket sales
gitea/salix/pipeline/head This commit looks good Details
2021-07-23 14:36:37 +02:00
Carlos Jimenez Ruiz ed97af01f2 e2e for descriptor clone option 2021-07-23 14:07:05 +02:00
Carlos Jimenez Ruiz abbce74100 clone invoiceIn from descriptor 2021-07-23 14:06:48 +02:00
Joan Sanchez f97e2427a4 Merge branch 'dev' into 3023-client_webAccess_block_simultaneous_changes
gitea/salix/pipeline/head This commit looks good Details
2021-07-22 07:30:37 +00:00
Joan Sanchez 6143992238 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-07-22 08:39:47 +02:00
Joan Sanchez 50629804cb HOTFIX: Changed param order on insert email into queue
gitea/salix/pipeline/head This commit looks good Details
2021-07-22 08:39:15 +02:00
Carlos Jimenez Ruiz d24457b6cf Merge branch 'dev' into 3023-client_webAccess_block_simultaneous_changes
gitea/salix/pipeline/head This commit looks good Details
2021-07-21 09:22:59 +00:00
Carlos Jimenez Ruiz 8ed7fe9dca Merge pull request '3004 - Deprecated ticket_closeAll()' (#699) from 3004-closure_procedures into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #699
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-07-21 09:22:36 +00:00
Carlos Jimenez Ruiz c1162b1b8a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3023-client_webAccess_block_simultaneous_changes
gitea/salix/pipeline/head This commit looks good Details
2021-07-21 10:07:21 +02:00
Carlos Jimenez Ruiz 25411c90e3 web access e2e path adapted to lastest modificications 2021-07-21 10:07:12 +02:00
Carlos Jimenez Ruiz 0676eb5f30 web access inputs can't be modified together anymore 2021-07-21 10:06:50 +02:00
Joan Sanchez 64b3f10fc5 Removed drop temporary table
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 13:11:48 +02:00
Joan Sanchez dbe680a58c 3004 - Deprecated ticket_closeAll()
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 13:06:31 +02:00
Carlos Jimenez Ruiz 4c76ec0d01 Merge pull request '3028 - Added visible column on ticket sales' (#698) from 3028-sale_visible into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #698
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-07-20 10:48:21 +00:00
Joan Sanchez 9d855a80d5 3028 - Added visible column on ticket sales
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 12:33:27 +02:00
Carlos Jimenez Ruiz d8f92e8b12 Merge pull request '2989 - Added client debt statement sample' (#696) from 2989-client_debt_sample into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #696
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-07-20 09:15:13 +00:00
Joan Sanchez f24e7cafce Merge branch 'dev' into 2989-client_debt_sample
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 09:07:36 +00:00
Joan Sanchez 1b373503a6 Added translation & removed fields property
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 11:07:04 +02:00
Joan Sanchez ffa17b21b2 Merge pull request 'added agency and route columns to client.summary tickets' (#697) from 3025-client_summary_additions into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #697
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-07-20 08:55:56 +00:00
Joan Sanchez 3080936963 Merge branch 'dev' into 3025-client_summary_additions
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 08:10:42 +00:00
Carlos Jimenez Ruiz 7563287e58 Merge pull request '3026 - Send invoice PDF' (#694) from 3026-send_invoice into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #694
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-07-20 08:04:46 +00:00
Joan Sanchez 266ffde86b Merge branch 'dev' into 3026-send_invoice
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 07:53:56 +00:00
Joan Sanchez 6f400aa1f3 Merge pull request '3027-itemBotanical_deprecated_column' (#695) from 3027-itemBotanical_deprecated_column into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #695
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-07-20 07:53:38 +00:00
Carlos Jimenez Ruiz af321be095 Merge branch 'dev' into 3026-send_invoice
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 07:52:42 +00:00
Carlos Jimenez Ruiz 4cbaf247ed removed unused showfield in model log
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 09:33:45 +02:00
Joan Sanchez bfd6c995ad 2989 - Added client deb statement sample
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 09:09:46 +02:00
Carlos Jimenez Ruiz 0163b6c21b added agency and route columns to client.summary tickets
gitea/salix/pipeline/head This commit looks good Details
2021-07-19 15:59:39 +02:00
Carlos Jimenez Ruiz e784403fd4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3027-itemBotanical_deprecated_column
gitea/salix/pipeline/head This commit looks good Details
2021-07-19 14:46:32 +02:00
Carlos Jimenez Ruiz 29f1f7e89e itemTaxCountry and item bonanical no longer use the bonanical prop 2021-07-19 14:46:18 +02:00
Joan Sanchez 63b502b368 Updated model ACL
gitea/salix/pipeline/head This commit looks good Details
2021-07-19 13:01:06 +02:00
Joan Sanchez 97e9ac4044 Merge pull request 'last steps to preview credit request' (#692) from 1939-add_client_credit_report into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #692
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-07-19 10:33:18 +00:00
Joan Sanchez e9b6c6b63e 3026 - Send invoice PDF
gitea/salix/pipeline/head This commit looks good Details
2021-07-19 12:31:09 +02:00
Carlos Jimenez Ruiz e5b1f47478 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2940-invoiceInTax-section
gitea/salix/pipeline/head This commit looks good Details
2021-07-19 11:20:38 +02:00
Carlos Jimenez Ruiz 724da74204 removed footer unused bindings and added date
gitea/salix/pipeline/head This commit looks good Details
2021-07-19 10:57:08 +02:00
Carlos Jimenez Ruiz 4ed31f5172 added footerr to report
gitea/salix/pipeline/head This commit looks good Details
2021-07-19 10:42:12 +02:00
Carlos Jimenez Ruiz 9a2fe0260e last steps to preview credit request
gitea/salix/pipeline/head This commit looks good Details
2021-07-19 10:16:15 +02:00
Joan Sanchez 94b668c01e Filter item from a dialog
gitea/salix/pipeline/head This commit looks good Details
2021-07-15 13:41:29 +02:00
Javi Gallego ee30bc9e1e test fixed
gitea/salix/pipeline/head This commit looks good Details
2021-07-15 12:51:10 +02:00
Joan Sanchez d46c9bbfa7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-07-14 11:37:46 +02:00
Carlos Jimenez Ruiz 559eaf5853 the absences are now fetched alongside the hours
gitea/salix/pipeline/head This commit looks good Details
2021-07-14 11:22:04 +02:00
Carlos Jimenez Ruiz 9f5df91be4 workers without active contract no longer set calendar and timeControl at fault 2021-07-14 11:21:29 +02:00
Joan Sanchez a5ea19b527 Merge pull request 'the absences are now fetched alongside the hours' (#689) from 3018-time_control_info into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #689
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-07-14 09:17:42 +00:00
Joan Sanchez ff71e6f2c7 2879 - Autocomplete item field from imported buys
gitea/salix/pipeline/head This commit looks good Details
2021-07-14 11:14:53 +02:00
Joan Sanchez 675a48d8ad Merge branch 'dev' into 3018-time_control_info
gitea/salix/pipeline/head This commit looks good Details
2021-07-14 08:36:09 +00:00