Commit Graph

350 Commits

Author SHA1 Message Date
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:
https://stackoverflow.com/a/4182700.
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
comment.
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
Paul van Tilburg d5b5e0e4e0 Fix column cache being out-of-sync after migration 2014-10-18 21:27:26 +02:00
Paul van Tilburg 507010172f Fix payed→payed column rename migration 2014-10-18 21:26:55 +02:00
Paul van Tilburg b7de738866 Fix broken migration that cannot access config 2014-10-18 21:26:14 +02:00
Paul van Tilburg 21091e914e Fix broken period calculation initialisation 2014-10-18 21:25:51 +02:00
Paul van Tilburg 3e1ed8af58 Make ActiveRecord query calls compatible with AR4 2014-10-18 21:25:26 +02:00
Paul van Tilburg 97b6098bcd Round total time of tasks to two decimals
This fixes misrepresentation errors.  This occus for example when a task
has a length that would be represented using a floating point number that
has more than 2 decimals.

For example:  a task of length 59 minutes (i.e. 0.9833333333333333... hour)
is shown on the invoice as having a length of 0.98 hours while in
calculations still the unrounded task length is used.  When a hourly rate
of €100 pe rhour is defined, the invoice will show:

  0.98h x €100/h = €98.33.

which is confusing and although correct given maximal accurancy, it will
obviously not be accepted by book keeping programs.
2014-10-12 17:04:18 +02:00
Paul van Tilburg e61fa8e3cc Merge branch 'development'
This add soms tweaks concerning invoices (use descending order, better
place for the Create a New Invoice button ).
2014-02-11 23:31:47 +01:00
Paul van Tilburg acd2ab46e4 Reorder the invoices when retrieving the last invoice 2014-02-09 14:40:28 +01:00
Paul van Tilburg fd6b853154 Move the 'Create a new invoice' button to a more consistent location 2014-02-07 21:36:09 +01:00
Paul van Tilburg cb14b99f89 Sort invoices in descending order by number by default 2014-02-07 21:22:20 +01:00
Paul van Tilburg 9b17398885 Merge branch 'development' 2014-02-07 21:15:43 +01:00
Paul van Tilburg 407126d9a6 No longer include the BBAN number in the invoice template
As per February, BBAN numbers are no longer supported.
Leave the information in the Customer/CompanyInfo for now.
2014-02-07 21:12:48 +01:00
Paul van Tilburg 3dd4730afe Ignore custom templates 2014-02-07 21:05:16 +01:00
Paul van Tilburg 25b052e864 Support alternative invoice template configuration 2014-02-07 21:04:08 +01:00
Paul van Tilburg 70c0ad4a54 Fix fixed cost tasks being grouped under random projects in customer view 2014-02-07 20:30:38 +01:00
Paul van Tilburg 0f7c731124 Isodoc >= 1.00 is needed to have IBAN/BIC in the invoices 2013-10-12 11:15:29 +02:00
Paul van Tilburg c1c96a2af0 Fix the invoice template to show IBAN/BIC (closes: #688d33)
If IBAN/BIC is set, it is shown instead of the normal account number.
SEPA solves the problem that needs IBAN/BIC is conditionally shown (which
is not possible).
2013-10-04 21:40:33 +02:00
Paul van Tilburg 7fcce37903 Fix the invoice template to show IBAN/BIC (closes: #688d33)
If IBAN/BIC is set, it is shown instead of the normal account number.
SEPA solves the problem that needs IBAN/BIC is conditionally shown (which
is not possible).
2013-10-04 21:38:42 +02:00
Paul van Tilburg 30fd5ec599 Show a billed fixed-task under itself in the customer_form view
As billed fixed-cost tasks cannot have an active task, the task itself
still is the one that is billed.  Show the task under itself to expose
the fact that it is billed and in which invoice.
2013-07-14 14:37:40 +02:00