Paul van Tilburg
c51686fd7f
Added the .warn class in the CSS
2012-01-03 17:39:21 +01:00
Paul van Tilburg
ea5884f97a
Show bill information for billed time entries (and link the invoice)
2012-01-03 17:38:54 +01:00
Paul van Tilburg
8e3ebc709a
Set the invoices billed flags in the CustomersNInvoices controller
2012-01-03 17:38:14 +01:00
Paul van Tilburg
2dc1e964e4
Improved handling of template errors
2012-01-03 16:56:51 +01:00
Paul van Tilburg
00e5aa2902
Adapted forms and the invoice template to accommodate more financial info
...
* Allow for setting and updating the financial contact of a customer
and show in invoices when set (closes: #9d4c2e).
* Allow for setting and updating bank information (IBAN, BIC, name)
and use it in the template (closes: #a11265).
2012-01-03 16:51:07 +01:00
Paul van Tilburg
feb0dc71c1
Add financial info to the CompanyInfo and Customer models and database
2012-01-03 16:49:14 +01:00
Paul van Tilburg
80cead274b
Handle empty time entry comments in the invoice form view
2012-01-02 16:15:35 +01:00
Paul van Tilburg
f11ddbbd53
Simplified the configuration code base
...
* Merged the Config mix-in module with the main StopTime module.
* Renamed Models::Config#load to initialize, remove the old initialize.
2012-01-02 15:59:06 +01:00
Paul van Tilburg
1f350950ec
Small invoice template tweaks
2012-01-02 15:16:54 +01:00
Paul van Tilburg
99370625ec
Actually give access to the global configuration
2012-01-02 15:13:33 +01:00
Paul van Tilburg
32de91327f
Fixed missing default configuration problem
2012-01-02 15:13:18 +01:00
Paul van Tilburg
4d2e2bb217
The task form should also list billed tasks
2012-01-02 14:58:36 +01:00
Paul van Tilburg
768d2d55f6
Allow for modification of the invoice comment (refs: #69f890)
2012-01-02 14:05:03 +01:00
Paul van Tilburg
0abad65328
Show the list of contained time entries for tasks with an hourly rate
2012-01-02 14:04:43 +01:00
Paul van Tilburg
57943f913e
Added links to billed tasks from an invoice (refs: #69f890)
2012-01-02 14:04:09 +01:00
Paul van Tilburg
0ba447524d
Adjust the task form for showing invoice information for billed task (refs: #69f890)
2012-01-02 14:00:56 +01:00
Paul van Tilburg
cc0bb4a371
Adjust the title time_entries view based on whether the task is billed
2012-01-02 13:59:43 +01:00
Paul van Tilburg
91cb9d42b2
Only treat fixed cost tasks of the selected tasks (closes: #21f52e)
2012-01-02 13:58:47 +01:00
Paul van Tilburg
d488c5f3be
Really fixed config file location; added some type checking
2012-01-02 13:03:45 +01:00
Paul van Tilburg
217985afc8
Fixed default config file location
2012-01-02 12:52:28 +01:00
Paul van Tilburg
643520e577
Merge branch 'master' of git.luon.net:users/paul/stoptime
2012-01-02 12:47:42 +01:00
Paul van Tilburg
9cc034aeb3
Fixed fixed cost task detection; also print time spent
2012-01-02 12:47:36 +01:00
Paul van Tilburg
6b05536d91
Show the spent time for fixed cost tasks in the invoice
2012-01-02 12:46:47 +01:00
Paul van Tilburg
c8ced1777c
Use the new configuration throughout the views, controllers and templates (closes #21e3ae)
2011-12-23 21:17:44 +01:00
Paul van Tilburg
71ee97c34c
Added the Stoptime::Config module and Config model to hold the configuration
2011-12-23 21:17:02 +01:00
Paul van Tilburg
c0c3d9773a
Tweaked timeline table layout (set width of customer column)
2011-12-22 16:35:03 +01:00
Paul van Tilburg
c62a7f36d0
Also show the customer in the timeline (reverting earlier removal)
2011-12-22 16:34:37 +01:00
Paul van Tilburg
1ed1cef49a
Compact controller code using the new Customer#shortest_name method
2011-12-22 16:33:57 +01:00
Paul van Tilburg
48490991cc
Added Customer#shortest_name
2011-12-22 16:32:47 +01:00
Paul van Tilburg
f59cb4eb3c
Added remark about installing Haml instead of Sass
2011-12-16 14:08:18 +01:00
Paul van Tilburg
146c08921d
Updated the ToDo list a bit
2011-12-13 17:09:15 +01:00
Paul van Tilburg
4860aec9ca
Use the time_entries partial view to show time entries for a task (closes #e966ae)
2011-12-12 17:10:18 +01:00
Paul van Tilburg
d6af1a7319
Modified time_entries to view to be (ab)used as partial view
2011-12-12 17:09:35 +01:00
Paul van Tilburg
d38f5dc5fd
Added missing documentation for Controllers::Index#get
2011-12-10 21:13:26 +01:00
Paul van Tilburg
3570cbb3f4
Rename Views#invoice to invoice_form for consistency
2011-12-10 21:08:48 +01:00
Paul van Tilburg
cb0b014640
Mark partial views as private
2011-12-10 21:05:58 +01:00
Paul van Tilburg
32cea1211d
Fixed regression problem of entries not being marked for billing anymore
2011-12-10 17:07:10 +01:00
Paul van Tilburg
79e9190956
Small fixes for the invoice dir changes
2011-12-10 16:58:38 +01:00
Paul van Tilburg
a32cb00846
Merge branch 'master' of git.luon.net:users/paul/stoptime
2011-12-10 16:57:21 +01:00
Paul van Tilburg
8ff07620b6
Show paid status of invoices (closes: #c937b1)
2011-12-10 16:54:43 +01:00
Paul van Tilburg
9ab76555f6
Use the newly introduced _form_input_checkbox partial form view
2011-12-10 16:50:01 +01:00
Paul van Tilburg
07cb9dd6fe
Extend partial form views with optional options
2011-12-10 16:49:28 +01:00
Paul van Tilburg
2b0fb9631d
Adapted the code for the invoice subdir changes
2011-12-06 14:34:31 +01:00
Paul van Tilburg
2f36d30873
Merge branch 'master' of git.luon.net:users/paul/stoptime
2011-12-06 14:31:35 +01:00
Paul van Tilburg
a7cf2cb7c1
Use a subdirectory under public/ for the generated invoices
2011-12-06 14:31:04 +01:00
Paul van Tilburg
f3d8426a4f
Fixed crash in the overview, don't try to get the task comment there
2011-12-02 22:58:58 +01:00
Paul van Tilburg
2539750c76
Merge branch 'feature/invoice_comments' (closes #7ede70)
2011-12-02 22:25:17 +01:00
Paul van Tilburg
351753b422
Adapt the invoice (PDF) template to show the task invoice comments
2011-12-02 22:21:53 +01:00
Paul van Tilburg
f40b429d10
Adapted the invoice view to show the task invoice comment
2011-12-02 22:20:21 +01:00
Paul van Tilburg
194b0033d1
Changed invoice_select_form and CustomersNInvoicesX to actually set task invoice comments
2011-12-02 22:18:55 +01:00
Paul van Tilburg