db/migrate/005_add_project_id_to_invoices.rb @@ -1,5 +1,6 @@ class Invoice < ActiveRecord::Base belongs_to :customer + belongs_to :project has_many :payments before_save :textilize app/models/invoice.rb @@ -11,6 +11,10 @@ </p> <p> + <%= form.select :project_id, Project.find(:all, :order => 'name ASC').collect { |p| [h(p.name), p.id]}, { :include_blank => true} %> +</p> + +<p> <%= form.text_field :invoiced_on, :size => 10 %><%= calendar_for('invoice_invoiced_on') %> </p> app/views/invoice/_form.rhtml @@ -9,6 +9,9 @@ <%= h row.customer.company %> - <%= h row.customer.name %> </td> <td> + <%= h row.project.name unless row.project.nil? %> + </td> + <td> <%= h number_to_currency(row.amount, :unit => @settings['invoice_currency_symbol']) %> </td> </tr> app/views/invoice/_row.rhtml @@ -3,6 +3,7 @@ <th>Invoice Number</th> <th>Date Issued</th> <th>Customer</th> + <th>Project</th> <th>Amount</th> </tr> <%= render :partial => 'row', :collection => invoices %> app/views/invoice/_table.rhtml @@ -1,4 +1,5 @@ page['invoice_amount'].value = @total +page['invoice_project_id'].value = @p.id # Invoice description description = '' app/views/invoice/autofill.js.rjs ed9ec842ce3f83c73a96a2d968da4decd019a442 Eric Davis edavis@littlestreamsoftware.com http://github.com/edavis10/redmine-invoice-plugin/commit/b9b41b964b1d78c0180a247a5f23b74c44c0a2d7 b9b41b964b1d78c0180a247a5f23b74c44c0a2d7 2008-11-25T16:05:33-08:00 2008-11-25T16:05:33-08:00 Invoices can now be assigned to a project * Added association Invoice belongs to Project * Added form fields to store the association * Modified the autofill to select the project in the Invoice form 2d329faeb569c0ef79920f9de38af5408da398fb Eric Davis edavis@littlestreamsoftware.com