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
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
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
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
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
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
e53374a713
Changed Invoice#summary to use the task as the key, not just its name
2011-12-02 22:17:27 +01:00
Paul van Tilburg
e4202b8048
Added Task#comment_or_name to return the comment if set and the task is billed
2011-12-02 22:16:27 +01:00
Paul van Tilburg
c7d32e8611
Added an invoice comment field to the task to store what the comment was
2011-12-02 22:15:58 +01:00
Paul van Tilburg
afd1ab7730
Fixed LaTeX spelling
2011-12-02 14:09:02 +01:00
Paul van Tilburg
8cbbb1c434
Fixed invoice view issue given the new fixed cost task summary
2011-12-02 14:08:50 +01:00
Paul van Tilburg
6ee025f3c5
Also show the customers in the project/task selector of the timeline
...
* Added partial view Views#_form_select_nested.
* Updated the Timeline controller to build the nested list.
* Set the last used task as the default task.
2011-11-29 17:21:51 +01:00
Paul van Tilburg
f593996f89
Some link decoration/tweaks
2011-11-29 16:47:32 +01:00
Paul van Tilburg
f9a0ee323e
Also show total of hours for fixed cost tasks
2011-11-29 16:47:16 +01:00
Paul van Tilburg
347da9e0e3
Properly sort customers and tasks in the overview
2011-11-29 16:46:44 +01:00
Paul van Tilburg
aa35d43986
Fix value class issue in task form preseeding
2011-11-29 16:21:09 +01:00
Paul van Tilburg
bd45416675
Improved link embedding
2011-11-29 12:16:27 +01:00
Paul van Tilburg
4b69bb02ec
Sort tasks by name in the overview
2011-11-29 12:12:53 +01:00
Paul van Tilburg
218b3e45a4
Fixed crash in CustomersNTasksNew#get
...
The @customer_list was not set (closes: #ae0311).
Also made Views#_form_select more robust by also catching undefined lists
and treating them as empty lists.
2011-11-29 11:46:41 +01:00
Paul van Tilburg
9409686ddd
Fixed tab detection, making the hack even dirtier
2011-11-28 14:07:04 +01:00
Paul van Tilburg
d8538ec1d2
Allow for changing the customer of a task; fixed form preseeding here and there
2011-11-28 13:56:46 +01:00
Paul van Tilburg
ed90dad0c2
Improved styling of the tables.
2011-11-28 13:31:26 +01:00
Paul van Tilburg
1850ae49ad
Mark billed entries in the timeline (closes: #239c27)
2011-11-28 13:26:12 +01:00
Paul van Tilburg
fc377460b4
Fixed the 'payed' typo.
2011-11-28 12:55:13 +01:00
Paul van Tilburg
b6b81308bb
Documented the model attributes.
2011-11-28 12:46:48 +01:00
Paul van Tilburg
45550c9d51
Merge branch 'master' of git.luon.net:users/paul/stoptime
2011-11-16 11:00:23 +01:00
Paul van Tilburg
cfcd7ef31d
Tweaked the layout of the invoice selection form.
2011-11-16 11:00:17 +01:00
Paul van Tilburg
dcd6f553b7
Fixed routing conflict between CustomersNInvoicesNew and CustomersNInvoicesX.
2011-11-16 10:59:18 +01:00
Paul van Tilburg
ad86acd40a
Fixed bug in updated start/end time of time entries.
2011-11-16 09:47:40 +01:00
Paul van Tilburg
aec92710b8
Application description fix.
2011-11-15 17:54:09 +01:00
Paul van Tilburg