Commit graph

469 commits

Author SHA1 Message Date
Paul van Tilburg ab3213503a Merge branch 'release/1.10' 2014-11-01 22:15:48 +01:00
Paul van Tilburg 5b1a0ffc1d Update the changelog for the new release 2014-11-01 22:15:33 +01:00
Paul van Tilburg 730736a84a Bump version to 1.10 2014-11-01 22:10:45 +01:00
Paul van Tilburg ca533ad158 Merge branch 'feature/ff83ce-preselect-time-entries-invoice-form' into development (closes: #ff83ce) 2014-11-01 22:09:48 +01:00
Paul van Tilburg 38c8d7dd17 Only select time entries that are not in the current month 2014-11-01 22:09:44 +01:00
Paul van Tilburg d613a095e1 Add in_current_month? method to the TimeEntry model 2014-11-01 22:09:21 +01:00
Paul van Tilburg 68c6a337a1 Show only active tasks in the invoice select form
If there are tasks with an hourly rate that have no time entries,
then it's not worth showing them.
2014-11-01 22:08:16 +01:00
Paul van Tilburg 46aca92887 Remove the TODO file
All TODO entries were either already fixed or are present as ticgit
2014-11-01 21:52:44 +01:00
Paul van Tilburg a7807a8da6 Add a Rakefile for the 'yard' documentation task 2014-11-01 21:50:24 +01:00
Paul van Tilburg a98c2a63dc Remove a very old mockup 2014-11-01 21:38:54 +01:00
Paul van Tilburg 80a77922c3 Merge branch 'feature/e1ac56-yard-documentation' into development (closes: #e1ac56) 2014-11-01 21:37:53 +01:00
Paul van Tilburg 58f5e4bbe6 Rework all documentation in YARD format 2014-11-01 21:37:41 +01:00
Paul van Tilburg db3dca4923 Ignore generated YARD documentation and cache 2014-11-01 21:37:30 +01:00
Paul van Tilburg 8314996c09 Merge branch 'feature/02ad0e-improve-main-overview' into development (closes: #02ad0e) 2014-11-01 18:10:09 +01:00
Paul van Tilburg 59ef003c0f Ignore generated by Sass 2014-11-01 17:48:46 +01:00
Paul van Tilburg 49eb58ff51 Build a span per customer so that they flow and use two columns in the overview 2014-11-01 17:47:52 +01:00
Paul van Tilburg 35462ed0dd Show a total of unbilled time and earned money (excl. VAT) per customer 2014-11-01 17:47:13 +01:00
Paul van Tilburg d1ac6ff979 Show only active tasks in the overview view
Active tasks are unbilled tasks that are tasks that are either fixed cost
or that have time entries that should be billed.
2014-11-01 17:45:16 +01:00
Paul van Tilburg 1f8b7b2d2b Merge tag 'v1.8' into development
Release 1.8
2014-10-31 22:25:52 +01:00
Paul van Tilburg 32d0e48b1d Merge branch 'release/1.8' 2014-10-31 22:25:05 +01:00
Paul van Tilburg 1a4bd12a23 Update the changelog for the new release 2014-10-31 22:25:00 +01:00
Paul van Tilburg 03ca8b6d47 Bump version to 1.8 2014-10-31 22:06:41 +01:00
Paul van Tilburg 46409502fb Merge branch 'feature/4235ef-force-invoice-regeneration' into development (closes: #4235ef) 2014-10-31 21:59:34 +01:00
Paul van Tilburg 371ec2c81a Handle delete requests for invoices 2014-10-31 21:59:17 +01:00
Paul van Tilburg 3e412ef16e Add some bottom margin to button groups 2014-10-31 21:58:39 +01:00
Paul van Tilburg 236729be6c Check and show a delete button if an invoice file is present 2014-10-31 21:55:04 +01:00
Paul van Tilburg b94d5ccff2 Fix invoice period calculation
Currently, the end time of the period was always the creation time of
the invoice (due to the initialisation), as it is generally by definition
later than any of the task periods.
2014-10-28 10:02:13 +01:00
Paul van Tilburg 8d8eba1e18 Documentation fix 2014-10-25 22:33:05 +02:00
Paul van Tilburg 60230c5854 Fixed bug preventing updates tasks 2014-10-25 22:32:57 +02:00
Paul van Tilburg f831580c3d Add some changelog entries for already finished features 2014-10-25 22:00:04 +02:00
Paul van Tilburg 52b65ea6e0 Merge branch 'feature/9f7883-rounding-to-time-resolution' into development (closes: #9f7883) 2014-10-25 21:56:20 +02:00
Paul van Tilburg b12d78bdb2 Round start and end time before validation (and thus saving)
I've chosen to connect the callback to before_validation because
at a later point we want to check for overlap between time entries
and this should be done using the corrected versions.
2014-10-25 21:55:23 +02:00
Paul van Tilburg 26862ed2ef Add private method for the TimeEntry model to round time
The method uses the configuration to determine the resolution and is
inspired by the following StackOverflow answer:
2014-10-25 21:53:33 +02:00
Paul van Tilburg b182711f39 Add configuration for time resolution rounding 2014-10-25 21:35:53 +02:00
Paul van Tilburg 423916232f Show time specification of projects/task the invoice_form
They are inserted in the titles of the time entry links so they are
shown when hovering over them.

Also fixed "None" not being displayed when there was no time entry
2014-10-25 18:31:50 +02:00
Paul van Tilburg 6cfdd4c7e1 Spacing and label fixes 2014-10-25 18:31:08 +02:00
Paul van Tilburg 4bb47f7504 Add jump buttons for customer and project/task in time_entry view 2014-10-25 18:30:50 +02:00
Paul van Tilburg 88660d9e56 Merge branch 'feature/50f182-new-invoice-buttons-in-invoices-tab' into development (closes: #50f182) 2014-10-25 18:04:28 +02:00
Paul van Tilburg a50c4e330f Add a "Create a new invoice" button per customer
This is done similarly as in the customer_form view.
2014-10-25 18:04:18 +02:00
Paul van Tilburg da8db07e94 Make key of customer/invoice mapping a customer
The key was the customer name before, but then it's not possible
to use any other information of the customer model anymore.
2014-10-25 18:02:37 +02:00
Paul van Tilburg fccfcc0ee8 Just ignore everything under public/invoices/ 2014-10-19 22:00:40 +02:00
Paul van Tilburg bfedf42247 Merge tag 'v1.6' into development
Release 1.6
2014-10-19 21:38:44 +02:00
Paul van Tilburg 5ab26718b3 Merge branch 'release/1.6' 2014-10-19 21:38:29 +02:00
Paul van Tilburg 72e6ba9d69 Add change log with all important changes from releases 1.0 until 1.6 2014-10-19 21:38:08 +02:00
Paul van Tilburg f32c6da1d4 Add a VERSION constant and print it on start 2014-10-19 21:37:20 +02:00
Paul van Tilburg 1cd9ba68c3 Update the feature list in README.rdoc 2014-10-19 21:36:56 +02:00
Paul van Tilburg b2b547ebcf Mention that Ruby 1.8 is no longer supported; Ruby 2.x is supported 2014-10-18 21:31:14 +02:00
Paul van Tilburg 52e49f1752 Add Dockerfile for deployment on Debian Wheezy 2014-10-18 21:29:40 +02:00
Paul van Tilburg e5e879df03 Style the no customer/invoices/projects alerts the same way 2014-10-18 21:28:18 +02:00
Paul van Tilburg 70588df53f Fix missing doctype in main layout 2014-10-18 21:27:46 +02:00