Commit Graph

441 Commits

Author SHA1 Message Date
Paul van Tilburg 6fc2cb87b3 Remove 12pt default for the invoice template 2013-07-13 22:37:50 +02:00
Paul van Tilburg afd037b95e Add the time specification to the invoice_form view; update it
Generation of a time specification appendix can be enabled for each invoice
indepently on whether it is or is not enabled for the customer.  However,
whether it is enabled by default when an invoice is created, that does
follow the setting for the customer.
2013-07-13 22:36:38 +02:00
Paul van Tilburg 7a58ae9331 Add the time specification to the customer_form view; update it
If time specifications are enabled for a customer this is considered to be
a global setting for invoices related to this customer.

Note that it will note change any of the existing voices, it will only
affect newly created ones!
2013-07-13 22:35:25 +02:00
Paul van Tilburg 17278fac98 Add specification related attributes to the Customer and Invoice model 2013-07-13 22:31:41 +02:00
Paul van Tilburg 33e5d047a0 Make the time_entry_form view also use a nested customer/task selector 2013-06-26 20:47:09 +02:00
Paul van Tilburg 62dfd04776 Replace the label hack in grouped select forms by a decent optgroup 2013-06-26 20:46:27 +02:00
Paul van Tilburg 43e862d5de Tweak the width of the task list table in the customer_form view 2013-06-26 20:45:46 +02:00
Paul van Tilburg 073bf11bef Rework the project/task list in the customer_form view (closes: #9a33e4) 2013-06-26 20:23:56 +02:00
Paul van Tilburg 06c25d66c9 Move add customer button to the header 2013-06-26 20:23:03 +02:00
Paul van Tilburg 5aefde7d44 Merge branch 'development'
Conflicts:
	stoptime.rb
2013-06-26 19:09:38 +02:00
Paul van Tilburg 2e86eb8b27 Show "None" for absent time entry comments in the time_entries view
There needs to be some kind of placeholder the comment is the thing
to click on when clicking through to the time_entry view.
2013-06-23 22:34:57 +02:00
Paul van Tilburg 2b8d4c9111 Include jQuery 1.10.0 directly from public/
This solves all kinds of issues when deploying via HTTPS and jQuery
being retrieved via HTTP.
2013-06-23 22:34:57 +02:00
Paul van Tilburg 60e1889072 Fix missing root prefix calls for views
Because we override mab_done in StopTime::Mab, we override the functionality
in Camping::Mab that applies 'self /' on :href, :src and :action attributes
of tags.  Thus, all kinds of links don't get a root/mount prefix.
2013-06-23 22:30:05 +02:00
Paul van Tilburg 167c8d1b99 Also order unbilled tasks descending by date in the time_entries view 2013-06-22 12:58:23 +02:00
Paul van Tilburg dc9aaca602 Add .rdoc extension to README to indicate format 2013-06-20 23:17:11 +02:00
Paul van Tilburg abc35b774d Show unbilled items in timeline by default; add dropdown
This reduces the need for pagination in the timeline (refs: #a9faa0).
2013-06-20 23:07:24 +02:00
Paul van Tilburg 2278b41d97 Redirect back to referer after creating/updating time entries (closes: #f08f36) 2013-06-20 22:39:00 +02:00
Paul van Tilburg b6d3c628a1 Change default VAT rate to 21% (still overridable in the config) 2013-06-20 22:12:39 +02:00
Paul van Tilburg c982ba5925 Move task information link from date to comment in the time_entries view 2013-06-20 22:08:01 +02:00
Paul van Tilburg 7a7a4471e1 Also bill new entries by default in the task_form view 2013-06-20 22:07:20 +02:00
Paul van Tilburg 07b655c8db Set default content type to include charset=utf-8 2013-06-20 22:06:52 +02:00
Paul van Tilburg 6634eeae55 Change view headers; add useful contextual information 2013-06-20 22:06:28 +02:00
Paul van Tilburg 2dca39e38d Move container divs to the a single container div in the layout view 2013-06-20 21:15:52 +02:00
Paul van Tilburg b19a0dfee3 Enable responsive Bootstrap CSS 2013-06-20 21:15:06 +02:00
Paul van Tilburg 42b771ba16 Use a condensed form in the company_form view 2013-06-16 23:42:54 +02:00
Paul van Tilburg b5cfa7606a Remove already solved FIXME 2013-06-16 23:38:35 +02:00
Paul van Tilburg ba5fd086b5 Also color customer names based on invoice status in the overview view 2013-06-16 23:38:22 +02:00
Paul van Tilburg d359b76209 Color invoice list rows based on due status (refs: #b4b365)
What remains is to remove the hardcoding of 30 days.  This should be moved
to the config and Customer model (and then also be used in the template).
2013-06-16 23:29:33 +02:00
Paul van Tilburg dfd189d341 Add past_due methods to the Invoice model 2013-06-16 23:29:01 +02:00
Paul van Tilburg f7c0ffff15 Add a day if the end time is before the start time (closes: #d96685) 2013-06-16 22:58:15 +02:00
Paul van Tilburg 10218e6fe5 Check task and time entry checkboxes by default in #invoice_select_form (closes: #4fdf84) 2013-06-16 22:48:38 +02:00
Paul van Tilburg 05b2fff118 Change #clone into #dup, needed for AR >= 3.1! 2013-06-16 22:48:38 +02:00
Paul van Tilburg f034196469 Show OK icon for billing status in time_entries view 2013-06-16 22:48:38 +02:00
Paul van Tilburg 1d8842ad36 Small Ruby1.8-compatibility fix 2013-06-16 21:30:24 +02:00
Paul van Tilburg 86b8b04608 Merge branch 'support/bootstrap' into development 2013-06-16 21:27:27 +02:00
Paul van Tilburg 6503265e5b Update the CSS to suit Bootstrap; add some overrides for the icons location 2013-06-16 20:27:59 +02:00
Paul van Tilburg 7244e2be64 Transform all views to use Bootstrap 2013-06-16 20:27:11 +02:00
Paul van Tilburg f54685acd1 Only ignore the generated style.css 2013-06-16 20:26:36 +02:00
Paul van Tilburg 6db3e52148 Add Bootstrap files (version 2.3.2) 2013-06-16 20:26:23 +02:00
Paul van Tilburg b7b660ffc5 Modify StopTime#Mab#mab_done to transform underscores to dashes in classes 2013-06-16 20:25:12 +02:00
Paul van Tilburg 2c4fb79c23 Set the default VAT rate to 21% in the example config 2013-06-16 15:42:35 +02:00
Paul van Tilburg de71183c26 Update the README for the 3.2 versions of Rails module depends 2013-06-16 15:34:46 +02:00
Paul van Tilburg de0ddffea1 Merge branch 'support/camping-2.2' into development 2013-06-16 15:26:17 +02:00
Paul van Tilburg 2746e2e9bd Update the requirements in the README for Camping 2.2/Mab 0.0.3 2013-06-16 15:19:53 +02:00
Paul van Tilburg 800dd3106f Adapt StopTime::Mab#mab_done to follow Mab 0.0.3 API changes 2013-06-16 15:17:13 +02:00
Paul van Tilburg aa79757af4 Tweak column definitions so that they work with HTML5 and Mab 0.0.3 2013-06-16 15:11:25 +02:00
Paul van Tilburg 5301819105 Fix the way the DATE_FORMATS are set to suit AR3.2 (closes: #9dfc93) 2013-06-16 15:00:05 +02:00
Paul van Tilburg cb482f3297 Move config.yaml to config.yaml.example and ignore it to improve deployment 2012-09-30 13:52:57 +02:00
Paul van Tilburg dc89386278 Move config.yaml to config.yaml.example and ignore it to improve deployment 2012-09-30 13:52:27 +02:00
Paul van Tilburg cd05971976 Make the VAT rate of a task editable via the form, default to global VAT rate
This is the last commit needed to support VAT rates per tasks (closes: #e7b5a7).

Conflicts:
	stoptime.rb
2012-09-28 16:22:17 +02:00