merge cbarber

Author: jkalbhenn

Gemfile

@@ -1,3 +1,5 @@
 group :test do
   gem 'webrat'
 end
+
+gem 'riif'

app/controllers/timesheet_controller.rb

@@ -78,6 +78,18 @@ def report
     respond_to do |format|
       format.html { render :action => 'details', :layout => false if request.xhr? }
       format.csv  { send_data @timesheet.to_csv, :filename => 'timesheet.csv', :type => "text/csv" }
+      format.iif  {
+        render(
+          :iif => render_to_string(:locals => {
+            :total        => @total,
+            :grand_total  => @grand_total,
+            :timesheet    => @timesheet,
+            :date_from    => @timesheet.date_from.to_date,
+            :date_to      => @timesheet.date_to.to_date
+          }),
+          :filename => "timesheet-#{@timesheet.projects.collect{|p| p.id.to_s.rjust(3, '0')}.join('')}"
+        )
+      }
     end
   end
 

app/helpers/timesheet_helper.rb

@@ -39,6 +39,18 @@ def link_to_csv_export(timesheet)
       :class => 'icon icon-timesheet')
   end
 
+  def link_to_iif_export(timesheet)
+    link_to('Quickbooks',
+      {
+        :controller => 'timesheet',
+        :action => 'report',
+        :format => 'iif',
+        :timesheet => timesheet.to_param
+      },
+      :method => 'post',
+      :class => 'icon icon-timesheet')
+  end
+
   def toggle_issue_arrows(issue_id)
     js = "toggleTimeEntries('#{issue_id}'); return false;"
 
@@ -128,4 +140,19 @@ def user_options(timesheet)
       selected_users)
 
   end
+  
+  def options_for_period_select(value)
+    options_for_select([[l(:label_all_time), 'all'],
+                        [l(:label_today), 'today'],
+                        [l(:label_yesterday), 'yesterday'],
+                        [l(:label_this_week), 'current_week'],
+                        [l(:label_last_week), 'last_week'],
+                        [l(:label_last_n_weeks, 2), 'last_2_weeks'],
+                        [l(:label_last_n_days, 7), '7_days'],
+                        [l(:label_this_month), 'current_month'],
+                        [l(:label_last_month), 'last_month'],
+                        [l(:label_last_n_days, 30), '30_days'],
+                        [l(:label_this_year), 'current_year']],
+                        value)
+  end
 end

app/models/timesheet.rb

@@ -150,7 +150,7 @@ def to_param
 
   def to_csv
     out = "";
-    FCSV.generate(out, :encoding => 'u', :force_quotes => true) do |csv|
+    CSV.generate(out, :encoding => 'u', :force_quotes => true) do |csv|
       csv << csv_header
 
       # Write the CSV based on the group/sort

app/views/timesheet/report.html.erb

@@ -1,5 +1,6 @@
 <div class="contextual">
   <%= link_to_csv_export(@timesheet) %>
+  <%= link_to_iif_export(@timesheet) %>
   <%= permalink_to_timesheet(@timesheet) %>
 </div>
 

app/views/timesheet/report.iif.riif

@@ -0,0 +1,60 @@
+iif.accnt do 
+  row do
+    name 'Accounts Receivable'
+    accnttype 'AR'
+  end
+
+  row do
+    name 'Service Income'
+    accnttype 'INC'
+  end
+end
+
+iif.invitem do
+  row do
+    name 'website'
+    invitemtype 'SERV'
+    desc 'website'
+    accnt 'Services'
+    price '1'
+    cost '0'
+    taxable 'N'
+  end
+end
+
+iif.trns do |trns|
+  trns.row do
+    trnstype 'INVOICE'
+    date Time.now.strftime("%m/%d/%Y")
+    accnt 'Accounts Receivable'
+    name 'Customer'
+    amount -timesheet.time_entries.map { |project, data| data[:logs].inject(0) { |sum, time_entry| sum + time_entry.invoice_amount } }.sum
+    docnum "#{date_from.year}-#{timesheet.projects.collect{|p| p.id.to_s.rjust(3, '0') }.join('')}-#{date_from.strftime('%m%d')}-#{date_to.strftime('%m%d')}"
+    memo "Time entered for #{timesheet.time_entries.map { |project, data| project }.join(', ') } between #{date_from.strftime('%Y-%m-%d')} and #{date_to.strftime('%Y-%m-%d')}"
+    clear 'N'
+    toprint 'Y'
+    # nameistaxable 'N' # doesn't exist in gem's dsl
+  end
+
+  trns.spl do |spl|
+    timesheet.time_entries.each do |project, data|
+      data[:logs].each do |time_entry|
+        spl.row do
+          trnstype 'INVOICE'
+          date time_entry.spent_on.strftime("%m/%d/%Y")
+          accnt 'Service Income'
+          amount time_entry.invoice_amount
+          memo "#{time_entry.user.name} [#{time_entry.spent_on.strftime("%Y-%m-%d")}] ##{time_entry.issue.id} - #{time_entry.issue.subject}"
+          clear 'N'
+          qnty time_entry.invoice_quantity
+          # TODO: Hardcoded the custom_field id for now since there isn't a nice getter from name
+          price time_entry.invoice_price
+          invitem 'website'
+          taxable 'N'
+          # yeartodate '0' # doesn't exist in gem's dsl
+          # wagebase '0' # doesn't exist in gem's dsl 
+        end
+      end
+    end
+  end
+end

init.rb

@@ -13,8 +13,10 @@
   require_dependency 'project'
   require_dependency 'principal'
   require_dependency 'user'
+  require_dependency 'time_entry'
   Project.send(:include, RedmineTimesheetPlugin::Patches::ProjectPatch)
   User.send(:include, RedmineTimesheetPlugin::Patches::UserPatch)
+  TimeEntry.send(:include, RedmineTimesheetPlugin::Patches::TimeEntryPatch)
 
   # Needed for the compatibility check
   begin

lib/redmine_timesheet_plugin/patches/time_entry_patch.rb

@@ -0,0 +1,31 @@
+module RedmineTimesheetPlugin
+  module Patches
+    module TimeEntryPatch
+      def self.included(base)
+        base.extend(ClassMethods)
+
+        base.send(:include, InstanceMethods)
+        base.class_eval do
+          unloadable
+        end
+      end
+
+      module ClassMethods
+      end
+
+      module InstanceMethods
+        def invoice_amount
+          invoice_price.value.to_i * invoice_quantity
+        end
+
+        def invoice_quantity
+          -hours
+        end
+
+        def invoice_price
+          project.custom_value_for(10)
+        end
+      end
+    end
+  end
+end