From eb0ddb8ff7a5dcac3a3614a3a495e15d253042d0 Mon Sep 17 00:00:00 2001 From: Charles Duporge Date: Wed, 26 Apr 2017 10:03:10 +0200 Subject: [PATCH] Fix conflicts and minor changes --- app/views/backend/entities/show.html.haml | 2 +- config/locales/arb/action.yml | 2 +- config/locales/cmn/action.yml | 2 +- config/locales/deu/action.yml | 2 +- config/locales/eng/action.yml | 2 +- config/locales/fra/action.yml | 2 +- config/locales/ita/action.yml | 2 +- config/locales/jpn/action.yml | 2 +- config/locales/por/action.yml | 2 +- config/locales/spa/action.yml | 2 +- config/navigation.xml | 11 +---------- config/rights.yml | 11 ----------- config/routes.rb | 14 -------------- 13 files changed, 11 insertions(+), 45 deletions(-) diff --git a/app/views/backend/entities/show.html.haml b/app/views/backend/entities/show.html.haml index 434ec8393b..58277e768d 100644 --- a/app/views/backend/entities/show.html.haml +++ b/app/views/backend/entities/show.html.haml @@ -246,4 +246,4 @@ - content_for 'cobble_supplier-journal-entry-items_meta_toolbar'.to_sym do .active-list-actions - = mask_lettered_items_button('supplier_journal_entry_items-list' + = mask_lettered_items_button('supplier_journal_entry_items-list') diff --git a/config/locales/arb/action.yml b/config/locales/arb/action.yml index 27ed1f153f..9c46b75fc5 100644 --- a/config/locales/arb/action.yml +++ b/config/locales/arb/action.yml @@ -1602,7 +1602,7 @@ arb: letter_conclusion: ".أرجو أن تتقبلوا سادتي التعبير عن فائق احترامي" #? letter_function_title: "سيداتي، سادتي الاعزاء" #? letter_introduction: ".وفق حديثنا التالي، سوف نصلكم بعناصر من التقدير" #? - letter_state: "عسكري دو LETTRAGE" + # lettering_state: "عسكري دو" # letterable: "Letterable" lettered: "مكتوب بنقش" lettering_account_client: "كتابة حسابات الزبائن" #? diff --git a/config/locales/cmn/action.yml b/config/locales/cmn/action.yml index e6b0a48b3b..bae323ecc5 100644 --- a/config/locales/cmn/action.yml +++ b/config/locales/cmn/action.yml @@ -1196,7 +1196,7 @@ cmn: last_purchases: "上次购买" last_sales: "去年销售" letter: "信" - letter_state: "政变杜lettrage" + # lettering_state: "政变杜" # letterable: "Letterable" lettered: "英文字母" liabilities: "负债" diff --git a/config/locales/deu/action.yml b/config/locales/deu/action.yml index 754eaf7ba5..1d1c146d40 100644 --- a/config/locales/deu/action.yml +++ b/config/locales/deu/action.yml @@ -1195,7 +1195,7 @@ deu: last_purchases: "Letzte Einkäufe" last_sales: "Letzte Verkaufs" letter: "Brief" - # letter_state: "Etat du lettrage" + # lettering_state: "Etat du lettrage" # letterable: "Letterable" lettered: "Beschriftet" liabilities: "Verbindlichkeiten" diff --git a/config/locales/eng/action.yml b/config/locales/eng/action.yml index b7b66c0d74..aeb6959e4e 100644 --- a/config/locales/eng/action.yml +++ b/config/locales/eng/action.yml @@ -1432,7 +1432,7 @@ eng: last_purchases: "Last purchases" last_sales: "Last sales" letter: "Letter" #? - letter_state: "Etat du lettrage" + lettering_state: "Lettering state" letterable: "Letterable" lettered: "Lettered" #? liabilities: "Liabilities" #?! diff --git a/config/locales/fra/action.yml b/config/locales/fra/action.yml index 9fe12107a6..cb622a409e 100644 --- a/config/locales/fra/action.yml +++ b/config/locales/fra/action.yml @@ -1491,7 +1491,7 @@ fra: left_balance_amount: "Report du crédit antérieur non imputé et non remboursé" #? letter: "Lettrer" letter_options: "Lettre" #? - letter_state: "Etat du lettrage" + lettering_state: "État du lettrage" letterable: "Lettrable" lettered: "Lettré" lettering_account_client: "Lettrage des comptes clients" #? diff --git a/config/locales/ita/action.yml b/config/locales/ita/action.yml index 7e5f94074b..2a8ba38625 100644 --- a/config/locales/ita/action.yml +++ b/config/locales/ita/action.yml @@ -1261,7 +1261,7 @@ ita: last_purchases: "ultimi acquisti" last_sales: "ultimi vendite" letter: "Lettera" - # letter_state: "Etat du lettrage" + # lettering_state: "Etat du lettrage" # letterable: "Letterable" lettered: "Letterato" liabilities: "Passivo" diff --git a/config/locales/jpn/action.yml b/config/locales/jpn/action.yml index 5533cdb7ec..9813c11838 100644 --- a/config/locales/jpn/action.yml +++ b/config/locales/jpn/action.yml @@ -1263,7 +1263,7 @@ jpn: last_purchases: "最終購入" last_sales: "最終販売" letter: "文字" - letter_state: "クーデターデュlettrage" + # lettering_state: "クーデターデュ" # letterable: "Letterable" lettered: "文字入り" liabilities: "負債" diff --git a/config/locales/por/action.yml b/config/locales/por/action.yml index e92b437ee0..a6e841b507 100644 --- a/config/locales/por/action.yml +++ b/config/locales/por/action.yml @@ -1200,7 +1200,7 @@ por: last_purchases: "Últimas compras" last_sales: "Últimos vendas" letter: "Carta" - # letter_state: "Etat du lettrage" + # lettering_state: "Etat du lettrage" # letterable: "Letterable" lettered: "Letrado" liabilities: "Passivo" diff --git a/config/locales/spa/action.yml b/config/locales/spa/action.yml index 698b6f0966..3d4f360dd1 100644 --- a/config/locales/spa/action.yml +++ b/config/locales/spa/action.yml @@ -1334,7 +1334,7 @@ spa: last_sales: "Última oferta de venta" left_balance_amount: "Aplazamiento del credito anterior sin imputar ni reembolsar" #? letter: "Carta" - # letter_state: "Etat du lettrage" + # lettering_state: "Etat du lettrage" # letterable: "Letterable" lettered: "Letrado" lettering_account_client: "marcar con lettras los cuentos clientos" #? diff --git a/config/navigation.xml b/config/navigation.xml index 666b05a270..288e1b0fd7 100644 --- a/config/navigation.xml +++ b/config/navigation.xml @@ -1970,15 +1970,6 @@ - - - - - - - - - - + diff --git a/config/rights.yml b/config/rights.yml index ff4a59d89c..7ee1b25934 100644 --- a/config/rights.yml +++ b/config/rights.yml @@ -23,8 +23,6 @@ # - "authentication/sessions#create" # - "authentication/sessions#destroy" # - "authentication/sessions#new" -# - "backend/accounts#account_mark_mask_lettered_item_is_checked" -# - "backend/accounts#account_mask_lettered_item_is_checked" # - "backend/activities#family" # - "backend/activity_inspection_point_natures#autocomplete" # - "backend/animal_groups#list_fixed_assets" @@ -100,14 +98,6 @@ # - "backend/dashboards#stocks" # - "backend/dashboards#tools" # - "backend/dashboards#trade" -<<<<<<< HEAD -# - "backend/entities#entity_client_mask_lettered_item_is_checked" -# - "backend/entities#entity_supplier_mask_lettered_item_is_checked" -# - "backend/entities#list_client_journal_entry_items" -# - "backend/entities#list_incoming_parcels" -# - "backend/entities#list_outgoing_parcels" -# - "backend/entities#list_supplier_journal_entry_items" -======= # - "backend/debt_transfers#create" # - "backend/debt_transfers#debt_transfer_params" # - "backend/debt_transfers#destroy" @@ -117,7 +107,6 @@ # - "backend/debt_transfers#new" # - "backend/debt_transfers#show" # - "backend/debt_transfers#update" ->>>>>>> master # - "backend/equipments#list_fixed_assets" # - "backend/equipments#take" # - "backend/financial_year_exchanges#close" diff --git a/config/routes.rb b/config/routes.rb index f2cf2fc282..fb85029165 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -189,15 +189,8 @@ collection do get :reconciliation get :list_reconciliation -<<<<<<< HEAD - patch :account_mask_lettered_item_is_checked - patch :account_mark_mask_lettered_item_is_checked - - match 'load', via: %i[get post] -======= match 'load', via: %i[get post] patch :mask_lettered_items ->>>>>>> master end member do match 'mark', via: %i[get post] @@ -437,16 +430,9 @@ resources :entities, concerns: %i[autocomplete list unroll] do collection do -<<<<<<< HEAD - patch :entity_client_mask_lettered_item_is_checked - patch :entity_supplier_mask_lettered_item_is_checked - match 'import', via: %i[get post] - match 'merge', via: %i[get post] -======= match 'import', via: %i[get post] patch :mask_lettered_items match 'merge', via: %i[get post] ->>>>>>> master end member do match 'picture(/:style)', via: :get, action: :picture, as: :picture