Merge branch 'dev' for release 6.3.13

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## Next release
 
+## v6.3.13 2024 February 19
+
+- Fix a bug: missing payment transfer journal code in accouting line
+- Fix a bug: unable to sync iCalendar correctly
+- improvement: add settlement by transfer/check to invoice paiement info
+- improvement: hide machines/themes/components filter in project list if machines module is disable or themes/components is empty
+- updates translations
+- [TODO DEPLOY] `rails fablab:setup:build_accounting_lines`
+
 ## v6.3.12 2024 February 12
 
 - improvement: Allow the admin to update payment method only the overdue subscription item without cancel PayZen subscription

app/frontend/templates/projects/index.html

@@ -53,19 +53,19 @@ <h3 translate>{{ 'app.public.projects_list.filter' }}</h3>
         <option value="collaboration" translate>{{ 'app.public.projects_list.projects_to_whom_i_take_part_in' }}</option>
       </select>
 
-      <select ng-model="search.machine_id" ng-change="setUrlQueryParams(search) && triggerSearch()" class="form-control" ng-options="m.id as m.name for m in machines">
+      <select ng-show="$root.modules.machines" ng-model="search.machine_id" ng-change="setUrlQueryParams(search) && triggerSearch()" class="form-control" ng-options="m.id as m.name for m in machines">
         <option value="" translate>{{ 'app.public.projects_list.all_machines' }}</option>
       </select>
 
-      <select ng-model="search.theme_id" ng-change="setUrlQueryParams(search) && triggerSearch()" class="form-control" ng-options="t.id as t.name for t in themes">
+      <select ng-show="themes.length" ng-model="search.theme_id" ng-change="setUrlQueryParams(search) && triggerSearch()" class="form-control" ng-options="t.id as t.name for t in themes">
         <option value="" translate>{{ 'app.public.projects_list.all_themes' }}</option>
       </select>
 
       <select ng-show="projectCategories.length" ng-model="search.project_category_id" ng-change="setUrlQueryParams(search) && triggerSearch()" class="form-control" ng-options="pc.id as pc.name for pc in projectCategories">
         <option value="" translate>{{ projectCategoriesFilterPlaceholder }}</option>
       </select>
 
-      <select ng-model="search.component_id" ng-change="setUrlQueryParams(search) && triggerSearch()" class="form-control" ng-options="t.id as t.name for t in components">
+      <select ng-show="components.length" ng-model="search.component_id" ng-change="setUrlQueryParams(search) && triggerSearch()" class="form-control" ng-options="t.id as t.name for t in components">
         <option value="" translate>{{ 'app.public.projects_list.all_materials' }}</option>
       </select>
 

app/services/accounting/accounting_journal_service.rb

@@ -13,6 +13,8 @@ def initialize
       payment: {
         card: Setting.get('accounting_payment_card_journal_code') || '',
         wallet: Setting.get('accounting_payment_wallet_journal_code') || '',
+        transfer: Setting.get('accounting_payment_transfer_journal_code') || '',
+        check: Setting.get('accounting_payment_check_journal_code') || '',
         other: Setting.get('accounting_payment_other_journal_code') || ''
       }
     }

app/services/i_calendar_import_service.rb

@@ -18,7 +18,7 @@ def import(i_calendar_id)
       cal.events.each do |evt|
         uids.push(evt.uid.to_s)
         ICalendarEvent.update_or_create_by(
-          { uid: evt.uid.to_s },
+          { uid: evt.uid.to_s, i_calendar_id: i_calendar_id},
           {
             dtstart: evt.dtstart,
             dtend: evt.dtend,

app/services/invoices/payment_details_service.rb

@@ -62,6 +62,10 @@ def payment_mean(invoice, total, wallet_amount)
       # else
       if invoice.paid_by_card?
         I18n.t('invoices.settlement_by_debit_card')
+      elsif paid_by_transfer?
+        I18n.t('invoices.settlement_by_transfer')
+      elsif paid_by_check?
+        I18n.t('invoices.settlement_by_check')
       else
         I18n.t('invoices.settlement_done_at_the_reception')
       end

config/locales/app.public.sv.yml

@@ -38,10 +38,10 @@ sv:
         reduce_panel: "Minska panelen"
         #left menu (public)
         home: "Startsida"
-        reserve_a_machine: "Boka en maskin"
-        trainings_registrations: "Registrera utbildning"
-        events_registrations: "Registrera evenemang"
-        reserve_a_space: "Boka lokal"
+        reserve_a_machine: "Boka utrustning"
+        trainings_registrations: "Utbildningar"
+        events_registrations: "Evenemang"
+        reserve_a_space: "Lokaler"
         projects_gallery: "Projektgalleri"
         subscriptions: "Prenumerationer"
         public_calendar: "Kalender"
@@ -95,7 +95,7 @@ sv:
         address: "Adress"
         address_is_required: "Adress måste fyllas i"
         i_authorize_Fablab_users_registered_on_the_site_to_contact_me: "Jag samtycker till att dela min e-postadress med registrerade medlemmar på denna sida"
-        i_accept_to_receive_information_from_the_fablab: "Jag accepterar att få information från FabLab"
+        i_accept_to_receive_information_from_the_fablab: "Jag accepterar att få information"
         i_ve_read_and_i_accept_: "Jag har läst och accepterat"
         _the_fablab_policy: "användarvillkoren"
         field_required: "Obligatoriskt fält"
@@ -244,7 +244,7 @@ sv:
         all_machines: "All utrustning"
       machine_card:
         book: "Boka"
-        consult: "Fråga"
+        consult: "Detaljer"
       #details of a machine
       machines_show:
         book_this_machine: "Boka utrustning"

config/locales/app.shared.sv.yml

@@ -4,7 +4,7 @@ sv:
       #translations of common buttons
       buttons:
         confirm_changes: "Bekräfta ändringar"
-        consult: "Fråga"
+        consult: "Detaljer"
         edit: "Redigera"
         change: "Ändra"
         delete: "Ta bort"
@@ -127,7 +127,7 @@ sv:
       project:
         name: "Namn"
         name_is_required: "Namn måste fyllas i."
-        illustration: "Visuellt"
+        illustration: "Bild"
         illustration_recommendation: "Maximal skärmstorlek: 932 * 700 px (obegränsad förhållande)."
         add_an_illustration: "Lägg till en illustration"
         CAD_file: "CAD-fil"

config/locales/de.yml

@@ -126,6 +126,8 @@ de:
     by_wallet: "durch Guthaben"
     no_refund: "Keine Rückerstattung"
     settlement_by_debit_card: "Abrechnung per Debitkarte"
+    settlement_by_transfer: "Settlement by transfer"
+    settlement_by_check: "Settlement by check"
     settlement_done_at_the_reception: "Abrechnung an der Rezeption durchgeführt"
     settlement_by_wallet: "Abrechnung per Guthaben"
     on_DATE_at_TIME: "am %{DATE} um %{TIME},"

config/locales/en.yml

@@ -126,6 +126,8 @@ en:
     by_wallet: "by wallet"
     no_refund: "No refund"
     settlement_by_debit_card: "Settlement by debit card"
+    settlement_by_transfer: "Settlement by transfer"
+    settlement_by_check: "Settlement by check"
     settlement_done_at_the_reception: "Settlement done at the reception"
     settlement_by_wallet: "Settlement by wallet"
     on_DATE_at_TIME: "on %{DATE} at %{TIME},"

config/locales/es-MX.yml

@@ -126,6 +126,8 @@ es-MX:
     by_wallet: "por cartera"
     no_refund: "Sin devolución"
     settlement_by_debit_card: "Liquidación por tarjeta de débito"
+    settlement_by_transfer: "Settlement by transfer"
+    settlement_by_check: "Settlement by check"
     settlement_done_at_the_reception: "Liquidación realizada en la recepción"
     settlement_by_wallet: "Liquidación con cartera"
     on_DATE_at_TIME: "el %{DATE} a las %{TIME},"

config/locales/es.yml

@@ -126,6 +126,8 @@ es:
     by_wallet: "por cartera"
     no_refund: "Sin devolución"
     settlement_by_debit_card: "Liquidación por tarjeta de débito"
+    settlement_by_transfer: "Settlement by transfer"
+    settlement_by_check: "Settlement by check"
     settlement_done_at_the_reception: "Liquidación realizada en la recepción"
     settlement_by_wallet: "Liquidación con cartera"
     on_DATE_at_TIME: "el %{DATE} a las %{TIME},"

config/locales/fr.yml

@@ -126,6 +126,8 @@ fr:
     by_wallet: "par porte-monnaie"
     no_refund: "Pas de remboursement"
     settlement_by_debit_card: "Règlement effectué par carte bancaire"
+    settlement_by_transfer: "Règlement effectué par virement"
+    settlement_by_check: "Règlement effectué par chèque"
     settlement_done_at_the_reception: "Règlement effectué à l'accueil"
     settlement_by_wallet: "Règlement effectué par porte-monnaie"
     on_DATE_at_TIME: "le %{DATE} à %{TIME},"

config/locales/it.yml

@@ -126,6 +126,8 @@ it:
     by_wallet: "mediante il portafoglio"
     no_refund: "Nessun rimborso"
     settlement_by_debit_card: "Pagamento con carta di debito"
+    settlement_by_transfer: "Settlement by transfer"
+    settlement_by_check: "Settlement by check"
     settlement_done_at_the_reception: "Pagamento effettuato al banco"
     settlement_by_wallet: "Pagamento effettuato tramite il portafoglio"
     on_DATE_at_TIME: "il %{DATE} alle %{TIME},"

config/locales/no.yml

@@ -126,6 +126,8 @@
     by_wallet: "til lommebok"
     no_refund: "Ingen refusjon"
     settlement_by_debit_card: "Oppgjør med betalingskort"
+    settlement_by_transfer: "Settlement by transfer"
+    settlement_by_check: "Settlement by check"
     settlement_done_at_the_reception: "Oppgjør i resepsjonen"
     settlement_by_wallet: "Oppgjør via lommebok"
     on_DATE_at_TIME: "på %{DATE} kl. %{TIME},"

config/locales/pt.yml

@@ -126,6 +126,8 @@ pt:
     by_wallet: "pela carteira"
     no_refund: "Sem reembolso"
     settlement_by_debit_card: "Liquidação por cartão de débito"
+    settlement_by_transfer: "Settlement by transfer"
+    settlement_by_check: "Settlement by check"
     settlement_done_at_the_reception: "Liquidação feita na recepção"
     settlement_by_wallet: "Liquidação por carteira"
     on_DATE_at_TIME: "em %{DATE} ás %{TIME},"

config/locales/sv.yml

@@ -126,6 +126,8 @@ sv:
     by_wallet: "med plånbok"
     no_refund: "Ingen återbetalning"
     settlement_by_debit_card: "Betalning med betalkort"
+    settlement_by_transfer: "Settlement by transfer"
+    settlement_by_check: "Settlement by check"
     settlement_done_at_the_reception: "Betalning görs i receptionen"
     settlement_by_wallet: "Betalning med plånbok"
     on_DATE_at_TIME: "den %{DATE} kl %{TIME},"

config/locales/zu.yml

@@ -126,6 +126,8 @@ zu:
     by_wallet: "crwdns3353:0crwdne3353:0"
     no_refund: "crwdns3355:0crwdne3355:0"
     settlement_by_debit_card: "crwdns3357:0crwdne3357:0"
+    settlement_by_transfer: "crwdns38172:0crwdne38172:0"
+    settlement_by_check: "crwdns38174:0crwdne38174:0"
     settlement_done_at_the_reception: "crwdns3359:0crwdne3359:0"
     settlement_by_wallet: "crwdns3361:0crwdne3361:0"
     on_DATE_at_TIME: "crwdns3363:0%{DATE}crwdnd3363:0%{TIME}crwdne3363:0"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fab-manager",
-  "version": "6.3.12",
+  "version": "6.3.13",
   "description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.",
   "keywords": [
     "fablab",