fat_free_crm 0.11.3 → 0.11.4

data/config/locales/es_fat_free_crm.yml

@@ -634,9 +634,3 @@
   time:
     formats:
       mmddhhss: "%b %e at %l:%M%p"
-
-  calendar_date_select:
-    ok: Cancelar
-    now: Ahora
-    today: Hoy
-    clear: Limpiar

data/config/locales/fr-CA_fat_free_crm.yml

@@ -627,9 +627,3 @@ fr-CA:
   time:
     formats:
       mmddhhss: "%e %b à %l:%M%p"
-      
-  calendar_date_select:
-    ok: OK
-    now: Maintenant
-    today: "Aujourd'hui"
-    clear: Vider

data/config/locales/fr_fat_free_crm.yml

@@ -652,9 +652,9 @@ fr:
   #----------------------------------------------------------------------------
   versions: Historique
   version:
-    create: Créé par %{by} il y a %{when}.
-    update: Modifié par %{by} il y a %{when}.
-    destroy: Détruit par %{by} il y a %{when}.
+    create: Créé par %{by} il y a %{item}.
+    update: Modifié par %{by} il y a %{item}.
+    destroy: Détruit par %{by} il y a %{item}.
     set: %{attr} renseigné %{to}
     unset: %{attr} supprimé
     change: %{attr} changé de %{from} à %{to}
@@ -718,16 +718,6 @@ fr:
       mmddhhss: "%b %e à %H:%M%"
       mmddyyyy_hhmm: "%d/%m/%Y à %H:%M"
 
-  calendar_date_select:
-    ok: OK
-    now: Maintenant
-    today: "Aujourd'hui"
-    clear: Vider
-
-  # If you need custom format look at
-  # http://code.google.com/p/calendardateselect/wiki/ChangingDateFormatCustom
-  calendar_date_select_format: french
-
   # will_paginate translations copied for 'fr'
   #----------------------------------------------------------------------------
   will_paginate:
@@ -845,4 +835,3 @@ fr:
         one:   "Impossible d'enregistrer ce %{model} : 1 erreur"
         other: "Impossible d'enregistrer ce %{model} : %{count} erreurs"
       body: "Veuillez vérifier les champs suivants : "
-

data/config/locales/it_fat_free_crm.yml

@@ -652,14 +652,3 @@ it:
     formats:
       mmddhhss: "%b %e at %l:%M%p"
       mmddyyyy_hhmm: "%d/%m/%Y %H:%M"
-
-  calendar_date_select:
-    ok: OK
-    now: Ora
-    today: Oggi
-    clear: Pulisci
-
-  # If you need custom format look at
-  # http://code.google.com/p/calendardateselect/wiki/ChangingDateFormatCustom
-  calendar_date_select_format: italian
-

data/config/locales/ja_fat_free_crm.yml

@@ -624,13 +624,3 @@ ja:
     formats:
       mmddhhss: "%b %e at %l:%M%p"
       mmddyyyy_hhmm: "%m/%d/%Y %l:%M %p"
-
-  calendar_date_select:
-    ok: OK
-    now: Now
-    today: Today
-    clear: Clear
-
-  # If you need custom format look at
-  # http://code.google.com/p/calendardateselect/wiki/ChangingDateFormatCustom
-  calendar_date_select_format: american

data/config/locales/pl_fat_free_crm.yml

@@ -638,9 +638,3 @@ pl:
   time:
     formats:
       mmddhhss: "%e %b o %H:%M"
-
-  calendar_date_select:
-    ok: OK
-    now: Teraz
-    today: Dziś
-    clear: Wyczyść

data/config/locales/pt-BR_fat_free_crm.yml

@@ -631,9 +631,3 @@ pt-BR:
   time:
     formats:
       mmddhhss: "%b %e at %l:%M%p"
-
-  calendar_date_select:
-    ok: OK
-    now: Agora
-    today: Hoje
-    clear: Limpar

data/config/locales/ru_fat_free_crm.yml

@@ -650,12 +650,3 @@ ru:
   time:
     formats:
       mmddhhss: "%d %B в %H:%M"
-
-  calendar_date_select:
-    ok: OK
-    now: Сейчас
-    today: Сегодня
-    clear: Очистить
-
-  # Default is Finnish (31.12.2009 17:00)
-  calendar_date_select_format: finnish

data/config/locales/sv-SE_fat_free_crm.yml

@@ -626,13 +626,3 @@ sv-SE:
     formats:
       mmddhhss: "%b %e, kl %H:%M"
       mmddyyyy_hhmm: "%m/%d/%Y %l:%M %p"
-
-  calendar_date_select:
-    ok: OK
-    now: Nu
-    today: Idag
-    clear: Rensa
-
-  # If you need custom format look at
-  # http://code.google.com/p/calendardateselect/wiki/ChangingDateFormatCustom
-  calendar_date_select_format: american

data/config/locales/th_fat_free_crm.yml

@@ -635,9 +635,3 @@ th:
   time:
     formats:
       mmddhhss: "%b %e at %l:%M%p"
-      
-  calendar_date_select:
-    ok: OK
-    now: Now
-    today: Today
-    clear: Clear

data/config/locales/zh-CN.yml

@@ -208,3 +208,7 @@ zh-CN:
       create: "新增%{model}"
       update: "更新%{model}"
       submit: "储存%{model}"
+      
+  will_paginate:
+    previous_label: 前页
+    next_label: 后页

data/config/locales/zh-CN_fat_free_crm.yml

@@ -17,21 +17,25 @@ zh-CN:
   #----------------------------------------------------------------------------
   tab_dashboard: 摘要
   tab_tasks: 任务
-  tab_campaigns: 战役
+  tab_campaigns: 促销
   tab_leads: 线索 
   tab_accounts: 账号
   tab_contacts: 联系人
-  tab_opportunities: 机会
+  tab_opportunities: 商机
 
   admin_tab_users: 用户
   admin_tab_settings: 设置
   admin_tab_plugins: 插件
+  admin_tab_groups: 分组
+  admin_tab_fields: 区域
+  admin_tab_tags: 标记
 
   planned: 计划
   started: 已开始
   on_hold: 搁置
   completed: 完成
   called_off: 取消
+  groups: 分组
 
   new: 新建
   contacted: 已联系
@@ -109,11 +113,11 @@ zh-CN:
         campaign:
           attributes:
             name:
-              missing_campaign_name: "^请指定战役名称"
+              missing_campaign_name: "^请指定促销活动名称"
             ends_on:
-              dates_not_in_sequence: "^请确认战役开始日期在结束日期之前"
+              dates_not_in_sequence: "^请确认促销活动开始日期在结束日期之前"
             access:
-              share_campaign: "^请指定可以共享战役的用户"
+              share_campaign: "^请指定可以共享促销活动的用户"
         contact:
           attributes:
             first_name:
@@ -133,9 +137,9 @@ zh-CN:
         opportunity:
           attributes:
             name:
-              missing_opportunity_name: "^请指定机会名称"
+              missing_opportunity_name: "^请指定商机名称"
             access:
-              share_opportunity: "^请指定可以共享机会的用户"
+              share_opportunity: "^请指定可以共享商机的用户"
         task:
           attributes:
             name:
@@ -295,43 +299,46 @@ zh-CN:
   share_with: 与他人分享
   shipping_address: 送货地址
   website: 网站
+  account_summary: 账号摘要
+  pipeline: 渠道
+  select_an_account: 选择账号
 
   # Views -> Campaigns.
   #----------------------------------------------------------------------------
   actual: 实际 
   actual_performance: 实际效益
   budget: 预算
-  budget_label: 预算(¥)
-  campaign: 战役
-  campaign_and_leads: 战役与领导
-  campaign_small: 战役
-  campaign_summary: 战役摘要
-  campaign_targets: 战役目标
-  campaigns: 战役
-  campaigns_options: 战役选项
-  campaigns_small: 战役
+  budget_label: 预算(￥)
+  campaign: 促销
+  campaign_and_leads: 促销与领导
+  campaign_small: 促销
+  campaign_summary: 促销摘要
+  campaign_targets: 促销目标
+  campaigns: 促销
+  campaigns_options: 促销选项
+  campaigns_small: 促销
   conversion: 转换
   conversion_label: 转换比率(%)
   conversion_number: "%{value} 转换" 
-  create_campaign: 创建战役
+  create_campaign: 创建促销
   end_date: 结束日期
   finished_on: 完成于 %{value}
   finishes_in: 用 %{value} 完成
   no_start_date: 未指定开始日期
   number_of_leads: 线索数
   objectives: 目标
-  objectives_help: 请指定目标线索数、机会转换率、目标收入、战役预算，这些数据帮助跟踪实际战役产出。
+  objectives_help: 请指定目标线索数、商机转换率、目标收入、战役预算，这些数据帮助跟踪实际战役产出。
   objectives_small: 战役目标
   revenue: 收入
-  revenue_label: 收入(¥)
+  revenue_label: 收入(￥)
   revenue_number: "收入%{value}"
-  save_campaign: 保存战役
+  save_campaign: 保存促销
   start_date: 开始日期
   started_ago: 开始于 %{value} 之前
   starts_in: 开始了 %{value}
   starts_today: 今天开始!
   target: 目标
-  total_campaigns: 战役总数
+  total_campaigns: 促销总数
   was_supposed_to_finish: 预计完成于 %{value}
   was_supposed_to_start: 预计开始于 %{time_ago} 之前，在 %{start_date}
     
@@ -363,6 +370,16 @@ zh-CN:
   web_presence: web
   web_presence_small: web
   works_at: "%{job_title} 在 %{company}"
+  affiliate: 下属
+  competitor: 对手
+  customer: 顾客
+  partner: 合伙人
+  reseller: 供销商
+  vendor: 工厂
+  total_accounts: 账号总计
+  select_contact: 选择账号
+  select_a_country: 选择国家
+  comment_intro: 备注或简介
 
   # Views -> Leads.
   #----------------------------------------------------------------------------
@@ -371,7 +388,7 @@ zh-CN:
   convert_lead_permissions_intro: 联系人权限将会从被转换的线索中复制。以后可修改。
   convert_lead_text: 转换线索 %{value} 将会使其变成一个与现有或新建账号关联的联系人，线索状态自动设为已转换。
   create_lead: 创建线索
-  create_opp_for_contact: 可以为 %{value} 联系人创建一个机会，需指定名称、当前阶段、预计结束日期、销售可能性、线索数量、折扣。
+  create_opp_for_contact: 可以为 %{value} 联系人创建一个商机，需指定名称、当前阶段、预计结束日期、销售可能性、线索数量、折扣。
   lead: 线索
   lead_info_small: 线索联系人
   lead_permissions_intro_private: 默认从战役复制权限或设为私有。以后可修改。
@@ -399,8 +416,8 @@ zh-CN:
   closed_ago_on: 结束于 %{time_ago} 之前，在 %{date}
   closes_today: 预计今天结束!
   closing_date: 结束日期是 %{value}
-  create_opportunity: 创建机会
-  currency: (¥)
+  create_opportunity: 创建商机
+  currency: (￥)
   days_late: 晚了
   days_left: 天剩余
   discount: 折扣
@@ -409,26 +426,29 @@ zh-CN:
   from: 从
   no_closing_date: 没有预计结束日期
   no_discount: 没有折扣
-  opportunities: 机会
-  opportunities_options: 机会选项
-  opportunities_small: 机会
-  opportunity: 机会
-  opportunity_small: 机会
-  opportunity_summary: 机会摘要
+  opportunities: 商机
+  opportunities_options: 商机选项
+  opportunities_small: 商机
+  opportunity: 商机
+  opportunity_small: 商机
+  opportunity_summary: 商机摘要
   opportunity_summary_text: "%{amount} 有 %{discount} 折扣和 %{probability} 可能性" 
   past_due: 超过预计, 预计结束于 %{value} 之前
   probability: 可能性
   probability_number: 有 %{value} 可能性
-  save_opportunity: 保存机会
+  save_opportunity: 保存商机
   stage: 阶段
-  total_opportunities: 机会总计
+  total_opportunities: 商机总计
   weighted_amount: 权重数量
+  select_opportunity: 选择商机
+  Discard: 放弃
 
   # Views -> Tasks.
   #----------------------------------------------------------------------------
   assign_to: 分配给
   assigned_tab: 已分配
   assigned_tasks: 已分配任务
+  unassigned: 未分配
   category: 类别
   completed_tab: 已完成
   completed_tasks: 已完成任务
@@ -463,6 +483,14 @@ zh-CN:
   total_tasks: 总计 %{value}
   view_assigned_tasks: 查看已分配任务
   view_pending_tasks: 查看进行中任务
+  my_tasks: 我的任务
+  no_task_records: 暂无任务
+  my_opportunities: 我的商机
+  no_opportunity_records: 暂无商机
+  my_accounts: 我的账号
+  no_account_records: 暂无账号
+  select_task: 选择任务
+  
 
   # Views -> Home.
   #----------------------------------------------------------------------------
@@ -480,10 +508,10 @@ zh-CN:
   recent_activity: 最近行为
   recent_activity_options: 最近行为选项
   subject_account: 账号
-  subject_campaign: 战役
+  subject_campaign: 促销
   subject_contact: 联系人
   subject_lead: 线索
-  subject_opportunity: 机会
+  subject_opportunity: 商机
   subject_task: 任务
 
   # Views -> Common.
@@ -526,7 +554,19 @@ zh-CN:
   zipcode: 邮编
   state: 省
   country: 国家
-
+  comment: 备注
+  create: 创建
+  view: 查看
+  update: 更新
+  destroy: 删除
+  expand_all: 展开
+  collapse_all: 收起
+  
+  # Views -> Tag.
+  #----------------------------------------------------------------------------
+  select_or_create_tags: 选择标签
+  tags: 标签
+  
   # Views -> Layout.
   #----------------------------------------------------------------------------
   about: 关于
@@ -596,8 +636,8 @@ zh-CN:
       one: '1 个联系人'
       other: '%{count} 个联系人'
     opportunity:
-      one: '1 个机会'
-      other: '%{count} 个机会'
+      one: '1 个商机'
+      other: '%{count} 个商机'
     lead:
       one: '1 个线索'
       other: '%{count} 个线索'
@@ -619,13 +659,4 @@ zh-CN:
   time:
     formats:
       mmddhhss: "%b %e at %l:%M%p"
-      
-  calendar_date_select:
-    ok: OK
-    now: 现在
-    today: 今天
-    clear: 清除
-
-  # If you need custom format look at 
-  # http://code.google.com/p/calendardateselect/wiki/ChangingDateFormatCustom
-  calendar_date_select_format: hyphen_ampm
+

data/config/routes.rb

@@ -99,6 +99,8 @@ Rails.application.routes.draw do
       put  :promote
       put  :reject
     end
+
+    get :autocomplete_account_name, :on => :collection
   end
 
   resources :opportunities, :id => /\d+/ do
@@ -136,10 +138,20 @@ Rails.application.routes.draw do
       get :password
       put :upload_avatar
       put :change_password
+      post :redraw
+    end
+
+    collection do
+      match :auto_complete
+    end
+    collection do
+      get :opportunities_overview
     end
   end
 
   namespace :admin do
+    resources :groups
+
     resources :users do
       collection do
         post :auto_complete
@@ -166,6 +178,7 @@ Rails.application.routes.draw do
         get :options
         post :redraw
         post :sort
+        get :subform
       end
     end