Commit Graph

459 Commits

Author SHA1 Message Date
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
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
Paul van Tilburg c438322ee9 Resolved a merge conflict in stoptime.rb 2012-05-21 17:50:54 +02:00
Paul van Tilburg 1a72b797c1 Replaced the dependency on Markaby by Mab 2012-05-21 17:45:29 +02:00
Paul van Tilburg 9df0a55e4b Small Mab compatibility fix 2012-05-21 17:45:29 +02:00
Paul van Tilburg 8ce00648f3 Remove the double doctype, fix indentation 2012-05-21 17:45:29 +02:00
Paul van Tilburg b25226ac7e Port the Markaby method override support to Mab 2012-05-21 17:45:29 +02:00
Paul van Tilburg aa9f0e9dc0 Leave the form method override stuff for now 2012-05-21 17:44:40 +02:00
Paul van Tilburg 968ec1ab99 More Mab compability: different doctype and text escaping 2012-05-21 17:42:28 +02:00
Paul van Tilburg b47f837613 Fix up some hacks that generate errors when used with Mab 2012-05-21 17:41:53 +02:00
Paul van Tilburg 482e7eabeb Actively load active record 2012-05-21 17:41:15 +02:00
Paul van Tilburg 5c364e1d10 Small cleanup for the block override that works with recent Mab 2012-05-21 17:40:52 +02:00
Paul van Tilburg 8fd7f45efc Bumped dependency versions in the README 2012-05-21 17:40:52 +02:00
Paul van Tilburg 29ad270f0f Remove the double doctype, fix indentation 2012-05-21 17:40:52 +02:00
Paul van Tilburg f1b5f5168b Port the Markaby method override support to Mab 2012-05-21 17:40:52 +02:00
Paul van Tilburg 3c62004056 Updated views to use the instance vars and no longer rely on Markaby's method_missing 2012-05-21 17:40:52 +02:00
Paul van Tilburg 51f0bdfa9c Leave the form method override stuff for now 2012-05-21 17:40:52 +02:00
Paul van Tilburg d41b70f0d8 Actually load Mab instead of Markaby 2012-05-21 17:40:52 +02:00