Commit Graph

3924 Commits

Author SHA1 Message Date
Alex Moreno a8f8248c41 feat(diary): Add column claim
gitea/salix/pipeline/head This commit looks good Details
2021-10-13 12:33:48 +02:00
Joan Sanchez e641a947b3 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-10-08 09:51:42 +02:00
Joan Sanchez e6b60d73f1 Added unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-10-07 13:36:23 +02:00
Joan Sanchez 4610ed83d9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3094-invoice_csv
gitea/salix/pipeline/head There was a failure building this commit Details
2021-10-07 10:28:06 +02:00
Joan Sanchez 82a14088d0 Added options to invoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2021-10-07 10:04:50 +02:00
Carlos Jimenez Ruiz 8e05301792 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-10-07 09:58:32 +02:00
Carlos Jimenez Ruiz cb7d1b24e8 refactor(ticket): all ticket endpoints are using transactions now
gitea/salix/pipeline/head This commit looks good Details
2021-10-07 09:57:07 +02:00
Joan Sanchez 3d57e9a618 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-10-05 08:13:13 +02:00
Joan Sanchez 1ff3e1f429 Increased date range from +10 to +60 days
gitea/salix/pipeline/head This commit looks good Details
2021-10-05 08:12:25 +02:00
Joan Sanchez b299efa63e Changed zone_getShippedWarehouse() to zone_getShipped()
gitea/salix/pipeline/head This commit looks good Details
2021-10-04 14:58:38 +02:00
Joan Sanchez bb4a32293d Changed zone_getShippedWarehouse() to zone_getShipped()
gitea/salix/pipeline/head This commit looks good Details
2021-10-04 14:45:39 +02:00
Carlos Jimenez Ruiz 0b46e9ce35 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-10-04 10:21:09 +02:00
Joan Sanchez 6b59bdd01c fix(descriptorMenu): show PDF regeneration option
gitea/salix/pipeline/head This commit looks good Details
2021-10-04 10:19:53 +02:00
Carlos Jimenez Ruiz a61a7f7d49 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions 2021-10-04 09:37:27 +02:00
Joan Sanchez 495b06b932 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-10-04 09:37:15 +02:00
Joan Sanchez b3a34489b0 fix(calendar): Event colors were not showing properly
gitea/salix/pipeline/head This commit looks good Details
Refs: 3166
2021-10-04 09:30:55 +02:00
Carlos Jimenez Ruiz 16b27c2074 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions 2021-10-04 09:23:28 +02:00
Joan Sanchez 580231d30b Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-10-01 14:59:12 +02:00
Joan Sanchez 313db4960e refactor(invoice): Show generate PDF option if it was never generated before
Refs: 3162
2021-10-01 14:59:08 +02:00
Joan Sanchez 68178bdb1f Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-10-01 14:48:25 +02:00
Joan Sanchez f60c754c59 refactor(invoice): Show generate PDF option if it was never generated before
gitea/salix/pipeline/head There was a failure building this commit Details
Refs: 3162
2021-10-01 14:31:42 +02:00
Joan Sanchez 1ec20e250c feat(invoice): Send invoice and delivery-note on CSV format
gitea/salix/pipeline/head There was a failure building this commit Details
2021-10-01 12:41:31 +02:00
Joan Sanchez 1c8bb35eae Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-10-01 11:41:55 +02:00
Joan Sanchez 3df03b31a3 fix(invoice): invalid date for PDF storage
gitea/salix/pipeline/head This commit looks good Details
2021-10-01 10:56:40 +02:00
Joan Sanchez c80457142f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-10-01 08:18:56 +02:00
Joan Sanchez a41ae85226 Removed PDF creation on download
gitea/salix/pipeline/head This commit looks good Details
2021-10-01 08:11:26 +02:00
Joan Sanchez 26df12a70a fix(invoice): fixed pdf generation condition race
gitea/salix/pipeline/head This commit looks good Details
2021-09-30 15:28:34 +02:00
Joan Sanchez 54fa419255 fix(invoice): was storing invoices on incorrect path folder
gitea/salix/pipeline/head This commit looks good Details
2021-09-30 14:43:37 +02:00
Joan Sanchez 479d4892ce Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2021-09-29 12:23:55 +02:00
Joan Sanchez a7c75fcbd4 fix(invoicePdf): Create PDF document on invoice download
Refs: 3109, 3110
2021-09-29 12:23:47 +02:00
Joan Sanchez 458d2670b3 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2021-09-29 12:17:21 +02:00
Joan Sanchez 197ed2009f fix(invoicePdf): Create PDF document on invoice download
gitea/salix/pipeline/head There was a failure building this commit Details
Refs: 3109, 3110
2021-09-29 12:15:42 +02:00
Carlos Jimenez Ruiz 156ecb32ec Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-09-29 08:27:53 +02:00
Carlos Jimenez Ruiz 392c4dcba3 refactor(sale): ticket.sale endpoints now use transactions 2021-09-29 08:27:18 +02:00
Carlos Jimenez Ruiz e690febc7f refactor(updateAll): usage of documented methods as update alias is not documented in loopback 2021-09-29 08:26:10 +02:00
Carlos Jimenez Ruiz 6cf1737c0d refactor(thermograph): temperature column now displays the correct data 2021-09-28 11:59:04 +02:00
Joan Sanchez 06b49f36b6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-09-28 10:03:00 +02:00
Joan Sanchez 19d3b19e5a Updated translation
gitea/salix/pipeline/head This commit looks good Details
2021-09-28 09:59:00 +02:00
Joan Sanchez ee0e1e122b Removed crudModel default params
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 13:02:20 +02:00
Joan Sanchez 4ea0f92c35 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 12:54:22 +02:00
Joan Sanchez 4545a5c8fa fix(filter): single search results don't use scopeDates
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 12:51:20 +02:00
Carlos Jimenez Ruiz 8c446edc9e Merge branch 'dev' into 3098-item_tag_productor
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 08:02:19 +00:00
Carlos Jimenez Ruiz c6692ca951 Merge branch 'dev' into 3059-ticket_index_filter
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 07:54:50 +00:00
Carlos Jimenez Ruiz 5f0e2825b8 Merge branch 'dev' into 3059-ticket_index_filter
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 07:46:09 +00:00
Carlos Jimenez Ruiz 7369f4aa54 Merge branch 'dev' into 3010-send_invoice
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 07:44:24 +00:00
Carlos Jimenez Ruiz 14b92e530a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 09:37:37 +02:00
Carlos Jimenez Ruiz 8fc17f05c6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3098-item_tag_productor
gitea/salix/pipeline/head This commit looks good Details
2021-09-23 17:35:07 +02:00
Carlos Jimenez Ruiz 368f54b872 refactor(tags): unified the style rules for tags under fetched-tags component and all display subName if present
gitea/salix/pipeline/head This commit looks good Details
2021-09-23 17:19:47 +02:00
Carlos Jimenez Ruiz f74d2cc302 test(tags): moved code used on a single test to the correct place
gitea/salix/pipeline/head This commit looks good Details
2021-09-22 15:16:45 +02:00
Carlos Jimenez Ruiz 95ff46db09 refactor(buys): entry buys now show item.subName 2021-09-22 15:15:52 +02:00
Carlos Jimenez Ruiz 23ba5657c5 refactor(sales): ticket sales now shows item.subName 2021-09-22 15:14:29 +02:00
Carlos Jimenez Ruiz c971d3ee01 refactor(consumption): client consuption now shows item.subName 2021-09-22 15:13:29 +02:00
Javi Gallego 40e589203e test fixed
gitea/salix/pipeline/head This commit looks good Details
2021-09-22 07:42:58 +02:00
Carlos Jimenez Ruiz aae54b5707 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-09-21 18:49:35 +02:00
Carlos Jimenez Ruiz cc90a08f03 refactor(ticket): ticket endpoins now can receive transactions 2021-09-21 18:48:59 +02:00
Joan Sanchez 08cba0a9c8 fix(filter): search limit by date range was not being applied
gitea/salix/pipeline/head This commit looks good Details
Refs: 3059
2021-09-21 15:49:59 +02:00
Javi Gallego 3365eadf5e Merge branch 'dev' into 2995-supplierAccount-modificaciones 2021-09-21 14:02:07 +02:00
Joan Sanchez 6e89fa1b5e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2021-09-21 12:56:49 +02:00
Joan Sanchez 689662f9bb fix code duplication
gitea/salix/pipeline/head This commit looks good Details
2021-09-21 12:48:51 +02:00
Carlos Jimenez Ruiz 95b4d23599 added agency and route columns to client.summary tickets
gitea/salix/pipeline/head This commit looks good Details
2021-09-21 12:39:54 +02:00
Joan Sanchez 786589f214 fix(tickets): fixed ticket duplications on ticket summary and ticket index caused by pagination
gitea/salix/pipeline/head This commit looks good Details
Refs: 3093
2021-09-21 12:25:22 +02:00
Joan Sanchez cd478a9f7b Removed line break 2021-09-20 14:02:04 +02:00
Joan Sanchez 369b79c6af refactor(invoice): removed unnecessary class
gitea/salix/pipeline/head Build queued... Details
2021-09-20 14:01:40 +02:00
Joan Sanchez a0ac55bc3e refactor(invoice): send invoice to specific email address from descriptor option
gitea/salix/pipeline/head This commit looks good Details
Refs: 3010
2021-09-20 13:59:57 +02:00
Joan Sanchez e07e8ec658 Merge branch 'dev' into 2389-calendar_weeks
gitea/salix/pipeline/head This commit looks good Details
2021-09-20 08:11:21 +00:00
Joan Sanchez 7223344aa0 Merge pull request 'fix(tickets): fixed ticket duplications on ticket summary and ticket index caused by pagination' (#736) from 3093-fix_dup_tickets into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #736
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-09-17 09:59:29 +00:00
Joan Sanchez 01db0f6ece Merge branch 'dev' into 3081-newbankentity_component_refactor
gitea/salix/pipeline/head This commit looks good Details
2021-09-17 07:47:25 +00:00
Carlos Jimenez Ruiz b3c70de6e0 Merge branch 'dev' into 3093-fix_dup_tickets
gitea/salix/pipeline/head This commit looks good Details
2021-09-17 07:38:12 +00:00
Carlos Jimenez Ruiz 183fe85e07 Merge branch 'dev' into 3086-monitor_index_hours
gitea/salix/pipeline/head This commit looks good Details
2021-09-17 07:22:12 +00:00
Joan Sanchez 079f99ca0d fix(tickets): fixed ticket duplications on ticket summary and ticket index caused by pagination
gitea/salix/pipeline/head This commit looks good Details
Refs: 3093
2021-09-17 08:50:22 +02:00
Joan Sanchez 4494522ad1 feat(calendar): component shows now the year week numbers
gitea/salix/pipeline/head This commit looks good Details
Refs: 2389
2021-09-16 12:13:20 +02:00
Carlos Jimenez Ruiz 34038b885c refactor(newBankEntity): client.billingData and supplier.account refactor to use newBankEntity Dialog
gitea/salix/pipeline/head This commit looks good Details
2021-09-15 17:58:58 +02:00
Carlos Jimenez Ruiz d8a2302b18 refactor(newbankentity): both client.billingdata and supplier.account now use newbankentity component 2021-09-15 13:25:26 +02:00
Carlos Jimenez Ruiz 6e67dd408e prevented an error if resultant length is 0
gitea/salix/pipeline/head This commit looks good Details
2021-09-13 10:29:35 +02:00
Joan Sanchez b0d291e49c Fixed error for clients without a previous credit
gitea/salix/pipeline/head This commit looks good Details
2021-09-09 16:44:15 +02:00
Carlos Jimenez Ruiz f7e2dd25e4 refactor(monitors): added column practicalHour to tickets monitor and renamed two columns
gitea/salix/pipeline/head This commit looks good Details
2021-09-09 16:07:46 +02:00
Carlos Jimenez Ruiz 46b59473a3 refactor(lastbuyrefresh): moved last buy refresh calls to fixtures + some more fixtures 2021-09-09 16:06:44 +02:00
Joan Sanchez e8792d5686 refactor(client): added restriction to change the credit amount from zero set by a manager
gitea/salix/pipeline/head This commit looks good Details
Refs: 3087
2021-09-09 14:43:18 +02:00
Carlos Jimenez Ruiz 76c55cb551 Merge branch 'dev' into 3049-item_index_show_lastbuy_landed
gitea/salix/pipeline/head This commit looks good Details
2021-09-08 09:27:23 +00:00
Carlos Jimenez Ruiz 8370b5dc1d refactor(fiscaldata): isTaxDataChecked checkbox no longer disabled by businessType presence 2021-09-08 11:03:58 +02:00
Javi Gallego 8160912fe7 Merge branch 'dev' into 2995-supplierAccount-modificaciones
gitea/salix/pipeline/head This commit looks good Details
2021-09-08 10:41:26 +02:00
Carlos Jimenez Ruiz 0472deb9b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3049-item_index_show_lastbuy_landed
gitea/salix/pipeline/head This commit looks good Details
2021-09-08 10:40:07 +02:00
Carlos Jimenez Ruiz 538805828e refactor(item): item index now shows last buy landing 2021-09-08 10:39:54 +02:00
Carlos Jimenez Ruiz 398e79c069 Merge branch 'dev' into 3065-client_businessTypeFk_required
gitea/salix/pipeline/head This commit looks good Details
2021-09-08 07:55:55 +00:00
Javi Gallego 2fe4fad28a test front ok
gitea/salix/pipeline/head This commit looks good Details
2021-09-08 09:44:46 +02:00
Joan Sanchez 903caef155 fix(path): Was not showing the old inactive client
gitea/salix/pipeline/head This commit looks good Details
2021-09-08 08:39:37 +02:00
Joan Sanchez db538a3f6f Merge branch 'dev' into 3041-monitor_sort_problems
gitea/salix/pipeline/head This commit looks good Details
2021-09-08 06:11:39 +00:00
Joan Sanchez 29bc0c04fb test(monitor): Updated back unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-09-08 08:08:10 +02:00
Carlos Jimenez Ruiz 99f4a2ed7d refactor(isTaxDataChecked): client fiscal data now needs business type to change isTaxDataChecked
gitea/salix/pipeline/head This commit looks good Details
2021-09-07 16:07:46 +02:00
Carlos Jimenez Ruiz 2ce79a8d49 Merge branch 'dev' into 3061-send_thermograph
gitea/salix/pipeline/head This commit looks good Details
2021-09-07 10:10:09 +00:00
Carlos Jimenez Ruiz 471da0f4da fix(clone): invoiceIn clone now adds (2) to the ref
gitea/salix/pipeline/head This commit looks good Details
2021-09-07 11:55:26 +02:00
Carlos Jimenez Ruiz c7558dfb0b refactor(temperatures): added crudmodel autoload for temperatures 2021-09-07 11:54:53 +02:00
Carlos Jimenez Ruiz 8bdb02c0fc refactor(createThermograph): endpoint rollsback only if transaction was created in it
gitea/salix/pipeline/head This commit looks good Details
2021-09-07 10:30:53 +02:00
Joan Sanchez 6ca7ced067 refactor(monitor): removed unused code
gitea/salix/pipeline/head This commit looks good Details
2021-09-07 10:27:19 +02:00
Joan Sanchez 04a817c4f9 fix(problems): problems filter was not working properly on sales monitor
gitea/salix/pipeline/head This commit looks good Details
Refs: 3040
2021-09-07 07:41:57 +02:00
Carlos Jimenez Ruiz c4e51146fd refactor(thermograph): temperatures source updated on frontend
gitea/salix/pipeline/head This commit looks good Details
2021-09-06 16:39:44 +02:00
Carlos Jimenez Ruiz 56276783db test(thermograph): e2e and unit tests for the backend of thermograph 2021-09-06 16:39:04 +02:00
Carlos Jimenez Ruiz 1f0bcb63f1 refactor(thermograph): added temperature model + updated thermographs models and endpoints 2021-09-06 16:38:27 +02:00
Joan Sanchez 4db25bf722 refactor(risk): the risk icon now is colored red when the client has a risk greater than the risk tolerance
gitea/salix/pipeline/head This commit looks good Details
Refs: 3045
2021-09-03 16:30:25 +02:00
Joan Sanchez 13f78359d5 fix(bank): the search by bank was not differentiating between numerical values and string values
gitea/salix/pipeline/head This commit looks good Details
Refs: 3084
2021-09-03 14:00:47 +02:00
Joan Sanchez 273086472a test(salesfilter): updated unit test for sales filter
gitea/salix/pipeline/head This commit looks good Details
2021-09-03 12:27:19 +02:00
Joan Sanchez 8623f914c7 feat(monitor): Sort by amount of problems on a ticket list
gitea/salix/pipeline/head This commit looks good Details
2021-09-03 12:09:37 +02:00
Joan Sanchez 559ff95fd7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-09-03 07:36:42 +02:00
Joan Sanchez 681b8afb15 fix(invoice): missing UserError import
gitea/salix/pipeline/head This commit looks good Details
2021-09-03 07:23:26 +02:00
Javi Gallego bc34be85ef fix
gitea/salix/pipeline/head This commit looks good Details
2021-09-02 17:49:25 +02:00
Carlos Jimenez Ruiz 6b465f9150 Merge branch 'dev' into 3068-ticket_colletion
gitea/salix/pipeline/head This commit looks good Details
2021-09-02 13:07:57 +00:00
Carlos Jimenez Ruiz 0337a1d6db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3079-export_production
gitea/salix/pipeline/head This commit looks good Details
2021-09-02 14:17:50 +02:00
Carlos Jimenez Ruiz f2f81442d9 fix(cloneWithEntries): endpoint was broken due to production changes 2021-09-02 14:17:35 +02:00
Carlos Jimenez Ruiz 85844973d6 refactor(geolocation): create province now uses autonomy instead of country
gitea/salix/pipeline/head There was a failure building this commit Details
2021-09-02 11:56:59 +02:00
Joan Sanchez 0b704db353 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-09-02 08:56:19 +02:00
Joan Sanchez b68e99b412 fix(invoice): invoicing was throwing a transaction error
gitea/salix/pipeline/head This commit looks good Details
Refs: 3077
2021-09-02 08:55:41 +02:00
Carlos Jimenez Ruiz f5548a82a3 test(clone): invoiceIn clone production trigger broke the test
gitea/salix/pipeline/head This commit looks good Details
2021-09-01 15:02:27 +02:00
Carlos Jimenez Ruiz 158c15afa1 fix(filter): removed fixtures that no longer work due to structure changes 2021-09-01 13:12:32 +02:00
Carlos Jimenez Ruiz ec9c061051 fix(getUpcomingDeliveries) fixtures were broken due to db structure changes
gitea/salix/pipeline/head This commit looks good Details
2021-09-01 12:37:46 +02:00
Joan Sanchez 7a98613ef8 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-09-01 11:48:21 +02:00
Joan Sanchez 0370cbf207 feat(Searchbar): You can now filter by a ticket collection
gitea/salix/pipeline/head This commit looks good Details
Refs: 3068
2021-09-01 11:27:24 +02:00
Javi Gallego d4fc64484a fix
gitea/salix/pipeline/head This commit looks good Details
2021-08-31 16:37:09 +02:00
Carlos Jimenez Ruiz 74a3b5cf89 refactor(basicdata): order basicdata requires address and landed to show agencies
gitea/salix/pipeline/head This commit looks good Details
2021-08-31 14:10:37 +02:00
Carlos Jimenez Ruiz 9cdf34642f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3047-order_basicdata_valid_agencies
gitea/salix/pipeline/head This commit looks good Details
2021-08-31 13:15:37 +02:00
Carlos Jimenez Ruiz 88aada2895 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3047-order_basicdata_valid_agencies 2021-08-31 13:02:24 +02:00
Carlos Jimenez Ruiz 614c23fd77 refactor(basicdata): order basicdata now shows only available agencies 2021-08-31 13:02:14 +02:00
Joan Sanchez 0de6af5633 fix(searchbar): wasn't applying a search by postcode on page refresh
gitea/salix/pipeline/head This commit looks good Details
Refs: #3072
2021-08-31 11:41:42 +02:00
Carlos Jimenez Ruiz c00201b236 corrected a typo 2021-08-31 11:01:14 +02:00
Joan Sanchez a0efe5f896 Merge branch 'dev' into 2407-eliminar-trigger-ticketAfterUpdate
gitea/salix/pipeline/head This commit looks good Details
2021-08-31 06:27:23 +00:00
Joan Sanchez 17a732e811 Merge branch 'dev' into 3070_deprecate_item_niches
gitea/salix/pipeline/head This commit looks good Details
2021-08-30 13:00:02 +00:00
Joan Sanchez 4dc107bc58 Removed console.log()
gitea/salix/pipeline/head This commit looks good Details
2021-08-30 14:51:02 +02:00
Joan Sanchez 3247f35b90 3075 - Show closure hour from an event
gitea/salix/pipeline/head This commit looks good Details
2021-08-30 14:14:21 +02:00
Carlos Jimenez Ruiz 3e0f2b5c26 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3070_deprecate_item_niches
gitea/salix/pipeline/head This commit looks good Details
2021-08-30 13:31:57 +02:00
Carlos Jimenez Ruiz 52e1df2af5 removed the usage of niches from item index and summary 2021-08-30 13:31:24 +02:00
Carlos Jimenez Ruiz 8a6da66916 removed niche section 2021-08-30 13:31:07 +02:00
Carlos Jimenez Ruiz e6bc856b35 removed niches model, relations and its usages 2021-08-30 13:29:16 +02:00
Joan Sanchez 74dfa9f757 3063 - Get item from card without a name
gitea/salix/pipeline/head This commit looks good Details
2021-08-30 11:23:46 +02:00
Javi Gallego 488ef17559 insert mail
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-27 09:01:21 +02:00
Javi Gallego 072f88d1a5 refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-23 14:47:26 +02:00
Javi Gallego cffe25d41f Merge branch 'dev' into 2995-supplierAccount-modificaciones
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-18 12:38:41 +02:00
Javi Gallego bb764e206a test
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-18 12:36:18 +02:00
Javi Gallego d0f0b52b66 minor changes
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-18 08:24:07 +02:00
Javi Gallego 78a98cd6b7 shrink-datetime
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-15 08:35:14 +02:00
Joan Sanchez 23b73aaa41 Merge branch 'dev' into 3038-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-08-13 15:28:58 +00:00
Carlos Jimenez Ruiz 7a7bbe2ba8 more module transactions
gitea/salix/pipeline/head This commit looks good Details
2021-08-13 16:46:44 +02:00
Carlos Jimenez Ruiz cd334bf967 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3038-module_transactions 2021-08-13 16:29:15 +02:00
Carlos Jimenez Ruiz 1a045442d4 added acl to goToUser button on client and worker descriptors 2021-08-13 14:53:39 +02:00
Carlos Jimenez Ruiz e1fe2aa5b5 added the claim icon to the ticket summary lines
gitea/salix/pipeline/head Build started... Details
2021-08-13 12:30:22 +02:00
Carlos Jimenez Ruiz d5e40320ae removed unwanted console.log 2021-08-13 12:29:48 +02:00
Javi Gallego 249ea918dd Merge branch 'dev' into 2407-eliminar-trigger-ticketAfterUpdate
gitea/salix/pipeline/head This commit looks good Details
2021-08-13 08:18:34 +02:00
Joan Sanchez 48e6079527 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2940-invoiceInTax-section
gitea/salix/pipeline/head This commit looks good Details
2021-08-13 08:04:42 +02:00
Joan Sanchez 4aad4ee2e0 3044 - FIX: Load correct tickets on different situations
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-12 13:55:10 +02:00
Carlos Jimenez Ruiz 2b4afdd04d ticket module transactions + tests 2021-08-12 11:21:59 +02:00
Carlos Jimenez Ruiz 708c0035c0 deprecated changeWorker as it is no longer in use 2021-08-12 11:06:49 +02:00
Carlos Jimenez Ruiz 2c3f46f394 added throw to catch in many tests 2021-08-12 10:55:04 +02:00
Javi Gallego 87fe3c529a Merge branch 'dev' into 2940-invoiceInTax-section 2021-08-12 09:39:35 +02:00
Javi Gallego 92c3a24b1b dash
gitea/salix/pipeline/head This commit looks good Details
2021-08-12 09:24:42 +02:00
Javi Gallego 3b9bdc18bf funciona
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-12 09:23:19 +02:00
Javi Gallego 54634ed22d test okl
gitea/salix/pipeline/head This commit looks good Details
2021-08-12 07:39:26 +02:00
Carlos Jimenez Ruiz da7bda2d0e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3038-module_transactions 2021-08-11 16:06:52 +02:00
Joan Sanchez de2bda5284 Removed PDF generation from transaction
gitea/salix/pipeline/head This commit looks good Details
2021-08-11 08:47:05 +02:00
Joan Sanchez 6ed0dcc4c5 Removed exclusion
gitea/salix/pipeline/head This commit looks good Details
2021-08-10 14:28:37 +02:00
Joan Sanchez b3db1cda13 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-08-10 13:57:03 +02:00
Joan Sanchez e65e90d00f Global invoicing improvements
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-10 11:48:29 +02:00
Carlos Jimenez Ruiz d4c5d54fa8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3038-module_transactions 2021-08-10 08:29:11 +02:00
Javi Gallego d49242751e Merge branch 'dev' into 2940-invoiceInTax-section
gitea/salix/pipeline/head This commit looks good Details
2021-08-10 08:23:13 +02:00
Javi Gallego 3424fabd5b test fixed
gitea/salix/pipeline/head This commit looks good Details
2021-08-10 08:18:52 +02:00
Joan Sanchez cbaba8a075 Ammends
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-09 14:06:23 +02:00
Joan Sanchez 3a45c99594 Merge branch '2985-invoiceOut_manual' of https://gitea.verdnatura.es/verdnatura/salix into 2984-invoiceOut_global
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-09 13:00:41 +02:00
Joan Sanchez 8e84f98629 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2984-invoiceOut_global 2021-08-09 12:59:00 +02:00
Carlos Jimenez Ruiz a9b2e45683 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2985-invoiceOut_manual 2021-08-06 13:30:14 +02:00
Carlos Jimenez Ruiz ec6d4b29c1 Merge branch 'dev' into 2954-order_catalog_types
gitea/salix/pipeline/head This commit looks good Details
2021-08-06 10:48:51 +00:00
Joan Sanchez 9048ce238e Added translation
gitea/salix/pipeline/head This commit looks good Details
2021-08-06 12:47:46 +02:00
Carlos Jimenez Ruiz 7d442c40ec Merge branch 'dev' into 2985-invoiceOut_manual
gitea/salix/pipeline/head This commit looks good Details
2021-08-06 10:39:15 +00:00
Joan Sanchez 9911a6d6a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2985-invoiceOut_manual
gitea/salix/pipeline/head This commit looks good Details
2021-08-06 12:37:25 +02:00
Joan Sanchez 9dc1168ad2 Transaction refactor
gitea/salix/pipeline/head This commit looks good Details
2021-08-06 12:24:36 +02:00
Carlos Jimenez Ruiz 3432fab6af now shows only the itemType of available items
gitea/salix/pipeline/head This commit looks good Details
2021-08-06 11:53:38 +02:00
Joan Sanchez 886d38ad8a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2879-import_buys 2021-08-05 14:33:28 +02:00
Joan Sanchez eba39cc706 Ammends
gitea/salix/pipeline/head This commit looks good Details
2021-08-05 13:44:31 +02:00
Joan Sanchez 1b9ca13391 Ammends
gitea/salix/pipeline/head This commit looks good Details
2021-08-05 13:42:19 +02:00
Joan Sanchez d4b1105cda Ammends
gitea/salix/pipeline/head This commit looks good Details
2021-08-05 13:39:11 +02:00
Carlos Jimenez Ruiz 870314277f add sale and canbeInvoice refactor + tests 2021-08-05 13:32:35 +02:00
Carlos Jimenez Ruiz 82259eee16 added catalog calculate join to show only available item types
gitea/salix/pipeline/head This commit looks good Details
2021-08-04 11:48:21 +02:00
Carlos Jimenez Ruiz 51a8077f4d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3033-price_and_discount_ticket_sale_popover
gitea/salix/pipeline/head This commit looks good Details
2021-08-03 11:17:07 +02:00
Carlos Jimenez Ruiz 3d2de99129 vn-popover containing non-descriptor components now relocates correctly for ticket.sale
gitea/salix/pipeline/head This commit looks good Details
2021-08-03 11:16:43 +02:00
Joan Sanchez 41a1b3d909 2984 - Global invoicing endpoint
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-02 13:35:38 +02:00
Carlos Jimenez Ruiz a771fd584f minor refactors + missing transaction on discount
gitea/salix/pipeline/head This commit looks good Details
2021-07-30 10:29:57 +02:00
Carlos Jimenez Ruiz 9578895f95 backend unit tests adapted
gitea/salix/pipeline/head This commit looks good Details
2021-07-29 17:40:45 +02:00
Carlos Jimenez Ruiz 8d682f4e03 chat notifications for many sales modifications 2021-07-29 17:20:57 +02:00
Joan Sanchez c9f235df97 Merge branch 'dev' into 3032-ticket_card_components_volume_error
gitea/salix/pipeline/head This commit looks good Details
2021-07-28 07:35:28 +00:00
Carlos Jimenez Ruiz 6e3a18a923 removed test for deprecated function
gitea/salix/pipeline/head This commit looks good Details
2021-07-27 18:18:32 +02:00
Carlos Jimenez Ruiz 88ecaff1d2 prevented an error if resultant length is 0
gitea/salix/pipeline/head This commit looks good Details
2021-07-27 16:17:47 +02:00
Carlos Jimenez Ruiz 6d4b97443e autoload refreshes the model when url is set
gitea/salix/pipeline/head There was a failure building this commit Details
2021-07-27 15:59:59 +02:00
Joan Sanchez 8b005ae012 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-07-27 12:24:45 +02:00
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
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
Carlos Jimenez Ruiz abbce74100 clone invoiceIn from descriptor 2021-07-23 14:06:48 +02: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 0676eb5f30 web access inputs can't be modified together anymore 2021-07-21 10:06:50 +02: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
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 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