Commit Graph

375 Commits

Author SHA1 Message Date
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
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
Paul van Tilburg
b44b6ca77a Add VAT rate specific summaries to the template and invoice_form view 2012-09-28 16:21:39 +02:00
Paul van Tilburg
8b9aa51bde Modify Invoice#total_amount to take different VAT rates into account 2012-09-28 16:21:38 +02:00
Paul van Tilburg
058b80f721 Add Invoice#vat_summary to return a VAT summary grouped by VAT rate 2012-09-28 16:21:38 +02:00
Paul van Tilburg
f3a81d53a1 Extend Task#summary to also return the VAT 2012-09-28 16:21:38 +02:00
Paul van Tilburg
3a0a471a2d Add vat_rate field to the Task model 2012-09-28 16:21:38 +02:00
Paul van Tilburg
8b943d788c 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).
2012-09-28 16:19:35 +02:00
Paul van Tilburg
b45bb356ef Add VAT rate specific summaries to the template and invoice_form view 2012-09-28 12:00:42 +02:00
Paul van Tilburg
537b0d47ea Modify Invoice#total_amount to take different VAT rates into account 2012-09-28 11:59:59 +02:00
Paul van Tilburg
cd29a51680 Add Invoice#vat_summary to return a VAT summary grouped by VAT rate 2012-09-28 11:59:59 +02:00
Paul van Tilburg
b7f74e23ec Extend Task#summary to also return the VAT 2012-09-28 11:59:59 +02:00
Paul van Tilburg
808b09f91f Add vat_rate field to the Task model 2012-09-28 11:59:49 +02:00
Paul van Tilburg
52e23a927a Merge branch 'support/ruby1.9' into development 2012-06-06 11:43:21 +02:00
Paul van Tilburg
02d00ea60e Merge branch 'support/isodoc-0.10' into development (closes: #26e4aa) 2012-06-06 11:43:03 +02:00
Paul van Tilburg
c6a19ec15a Merge branch 'support/camping-2.2' into development (closes: #804d96) 2012-06-06 11:41:00 +02:00
Paul van Tilburg
3b54b93504 Added support for Ruby 1.9 2012-06-06 11:28:59 +02:00
Paul van Tilburg
33581f8bb0 Update the invoice template for isodoc >= 0.9 (was 0.6) 2012-05-21 19:51:46 +02:00