mozcode
/
stoptime
1
0
Fork 0
Code Issues 25 Pull Requests Releases Wiki Activity
469 Commits 7 Branches 14 Tags 1.1 MiB
Commit Graph

306 Commits

Author SHA1 Message Date
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 52c5b858f5 Drop ruby-mime-types support in favour of Rack::MIME. 2011-11-15 17:22:57 +01:00
Paul van Tilburg 08a7ef3c01 Small fix concerning static serving with Passenger; updated gitignore. 2011-11-15 17:01:52 +01:00
Paul van Tilburg e0dd602c4e Improved labeling for the account info. 2011-11-11 17:17:26 +01:00
Paul van Tilburg 73de5b6222 Fixes for the separate time entry date support. 2011-11-11 15:18:51 +01:00
Paul van Tilburg 8ddd31f662 Added seperate date support for time entries. 2011-11-11 14:55:17 +01:00
Paul van Tilburg edc86f8913 Fixed handling of customers without a short name. 2011-11-11 13:53:49 +01:00
Paul van Tilburg 18d34c11e1 Fixed syntax error. 2011-11-10 18:26:15 +01:00
Paul van Tilburg 161084868f Documented the source code; translated the ToDo list. 2011-11-10 18:24:11 +01:00
Paul van Tilburg ab59365849 Fixed bug for creating links to invoices. 2011-11-10 15:23:24 +01:00
Paul van Tilburg 7119c2872c When a customer is created, proceed to CustomersN. 2011-11-10 15:23:09 +01:00
Paul van Tilburg 75e9d3b235 Improved VAT addition: only apply when VAT number is set. 2011-11-10 15:22:13 +01:00
Paul van Tilburg 6079d90b7a Ensure titlecasing for h2. 2011-11-10 13:09:56 +01:00
Paul van Tilburg 11627e85fc Corrected detection of an empty list of invoices. 2011-11-10 13:08:17 +01:00
Paul van Tilburg b2ce309d5f Implemented showing of which tab is selected. 2011-11-10 13:07:55 +01:00
Paul van Tilburg aa3e53b925 Removed some solved FIXMEs; cleaned up the code a bit. 2011-11-10 13:07:30 +01:00
Paul van Tilburg a628b83129 Beautified the pages a bit. 
* Mention when a list is empty.
* Add a link to where to create new items when the list is emtpy.
* Add form reset buttons.
* Synced and added the page headers.
 2011-11-10 12:51:12 +01:00
Paul van Tilburg 5f64874252 Fixed a problem where a cancel button was not handled. 2011-11-10 12:50:02 +01:00
Paul van Tilburg c67589f452 Fixed an error in the InvoiceSupport migration. 2011-11-10 12:49:31 +01:00
Paul van Tilburg 9fc843db2d Tweaked the layout a bit. 2011-11-09 23:00:13 +01:00
Paul van Tilburg 347691c4b1 Add some style to the application, use SASS for this. 2011-11-09 22:55:59 +01:00
Paul van Tilburg c792cb70a8 Added missing I18n module. 2011-11-09 19:44:59 +01:00
Paul van Tilburg 4ca48511ba Added dutch i18n for invoice generation (controller, template). 2011-11-09 18:31:23 +01:00
Paul van Tilburg a2de4fa6fd Added TimelineNew router; synced CustomerNew stuff. 2011-11-09 17:01:13 +01:00
Paul van Tilburg 06a4cafe02 Handle billed tasks differently (no timereg, but visable in overview). 2011-11-09 16:23:48 +01:00
Paul van Tilburg 9e238780df Added separate LaTeX generation, added links to the invoices. 2011-11-09 16:11:51 +01:00
Paul van Tilburg 4c5a3ddfcd Added invoice listings (also per customer). 2011-11-09 16:03:02 +01:00
Paul van Tilburg f420cb58dd Added a main task overview for the index. 2011-11-09 16:02:43 +01:00
Paul van Tilburg c4e3161b87 Fiddled a bit with created_at/updated_at for invoices. 2011-11-09 16:02:04 +01:00
Paul van Tilburg 6aa19d1e08 Removed trailing whitespace. 2011-11-09 15:14:48 +01:00
Paul van Tilburg e4e709bd72 Changed period logic, use update_at attribute if there are no time entries. 2011-11-09 15:14:09 +01:00
Paul van Tilburg f0c7f59529 Added invoices subview for customers, improved invoice forms. 2011-11-09 15:13:39 +01:00
Paul van Tilburg 95de3d4dc3 Renamed TimeEntry#total to hours_total, replaced @entries with @time_entries. 2011-11-09 15:12:29 +01:00
Paul van Tilburg 6ffe7b23b0 Renamed Task#task_type to Task#type; use time_entries instead of entries. 2011-11-09 14:07:31 +01:00
Paul van Tilburg ee58b00d2c Added support for not adding VAT in views and template. 2011-11-09 14:07:03 +01:00
Paul van Tilburg 69d6424462 Make invoices task oriented; implemented correct invoicing. 
* Split a task in two when billing.  The task tied to the invoice
  contains all time entries to be billed.
* For a fixed cost task all time entries are billed automatically,
  no selection is allowed.
* Updated the models with helper methods (billing, period, summaries).
* Prepare for improved templating.
* Improved invoice numbering.
* Improved support for fixed cost tasks.
 2011-11-09 14:02:33 +01:00
Paul van Tilburg 0f59b9ceae Rename Timereg/time registration to Timeline/timeline. 2011-11-08 13:08:51 +01:00
Paul van Tilburg f543ac554a Moved the CustomersNInvoicesNew lower to fix routing order. 2011-11-08 13:08:22 +01:00
Paul van Tilburg 69497e93d4 Removed useless header. 2011-11-07 17:45:34 +01:00
Paul van Tilburg 9d1c3283dd Added time entry editing. 2011-11-07 17:44:58 +01:00
Paul van Tilburg a940972b8b Added experimental invoice generation (and fixing). 2011-11-07 17:44:34 +01:00
Paul van Tilburg a75aa40389 Use a hash with attributes to mimick not-yet-existing objects. 2011-11-07 17:43:10 +01:00
Paul van Tilburg 6fa7334919 Tweaked the model a bit, moved and added helper methods. 2011-11-07 17:41:46 +01:00
Paul van Tilburg 056b6d511b Fixed task editing bug due to erroneous task type retrieval. 2011-11-07 15:10:48 +01:00
Paul van Tilburg c73efb5bde Added support for company info; adjusted the template accordingly. 2011-11-07 14:54:11 +01:00
Paul van Tilburg 7e6637aace Added/modified stuff for adding, deleting and editing tasks. 2011-11-07 13:41:09 +01:00
Paul van Tilburg 89a3464e6f Changed the forms to use the new form element generators. 2011-11-07 13:40:24 +01:00
Paul van Tilburg d91b65c2f5 Added form element generators for radio buttons and checkboxes. 2011-11-07 13:39:24 +01:00
Paul van Tilburg 5f0ae36745 Tweaked the model a bit (forgotten the hourly_rate attribute). 2011-11-07 13:38:07 +01:00
Paul van Tilburg adb1896506 Changed save into update, following more RESTful methods. 2011-11-07 11:12:12 +01:00
Paul van Tilburg 41ba9ba162 Moved some stuff that didn't belong in the views. 2011-11-07 10:44:35 +01:00
Paul van Tilburg c5d28419de Updated the tasks model for fixed cost tasks and added invoices. 2011-11-07 10:40:54 +01:00
Paul van Tilburg e5d9d97028 Added (default) hourly rates per customer instead of a global constant. 2011-11-03 23:44:06 +01:00
Paul van Tilburg b5609956b8 Added support for marking time entries as 'to bill'. 2011-11-03 23:07:42 +01:00
Paul van Tilburg 8f2eff9410 Added comments to time entries. 2011-11-03 22:23:50 +01:00
Paul van Tilburg 0489d7e3cd Calculate and add VAT (fixed rate for now). 2011-11-03 22:17:18 +01:00
Paul van Tilburg ea78905fec Added (not so clean) invoice PDF generation. 2011-11-03 11:40:58 +01:00
Paul van Tilburg 55b40bf0b6 Seperate static dir from template dir. 2011-11-03 11:39:58 +01:00
Paul van Tilburg 4819a50a6e Added (dummy) invoice numbering for now. 2011-11-03 11:00:52 +01:00
Paul van Tilburg 9b8f2368fd Added static file serving from public/. 2011-11-03 11:00:35 +01:00
Paul van Tilburg 614e73bad1 Moved task summary calculation to the Customer model. 2011-11-03 10:30:02 +01:00
Paul van Tilburg c7cc4312b3 Implemented generating/viewing individual invoices and an overview. 2011-11-02 22:52:47 +01:00
Paul van Tilburg 28fa689a52 Implemented adding/deleting time registrations. 2011-11-01 15:29:55 +01:00
Paul van Tilburg d9da9568c8 Implemented customer adding/editing/removing. 2011-11-01 15:29:24 +01:00
Paul van Tilburg 268870689d Switch to a more suitable date/time format. 2011-11-01 15:27:16 +01:00
Paul van Tilburg 7719124655 Some initial views and controllers. 2011-10-31 16:14:54 +01:00
Paul van Tilburg 853814e429 Initial skeleton/start of the Camping application. 2011-10-31 14:36:01 +01:00