Commit graph

392 commits

Author SHA1 Message Date
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
Paul van Tilburg
d3129a11c1 More Mab compability: different doctype and text escaping 2012-05-21 17:40:52 +02:00
Paul van Tilburg
3a824c2026 Fix up some hacks that generate errors when used with Mab 2012-05-21 17:40:52 +02:00
Paul van Tilburg
419d08a6eb Actively load active record 2012-05-21 17:40:20 +02:00
Paul van Tilburg
0126f5029d Solve merge conflict in README 2012-05-21 17:13:39 +02:00
Paul van Tilburg
544036f93a Replaced the dependency on Markaby by Mab 2012-05-21 17:11:29 +02:00
Paul van Tilburg
bc99fdad4d Small Mab compatibility fix 2012-05-21 17:11:06 +02:00
Paul van Tilburg
9173b74850 Small cleanup for the block override that works with recent Mab 2012-05-19 23:10:03 +02:00
Paul van Tilburg
d81480a2d0 Bumped dependency versions in the README 2012-05-19 23:10:03 +02:00
Paul van Tilburg
df07a61803 Remove the double doctype, fix indentation 2012-05-19 23:10:03 +02:00
Paul van Tilburg
474b2a22d9 Port the Markaby method override support to Mab 2012-05-19 23:10:03 +02:00
Paul van Tilburg
e100fec8e3 Updated views to use the instance vars and no longer rely on Markaby's method_missing 2012-05-19 23:10:03 +02:00
Paul van Tilburg
96197af487 Leave the form method override stuff for now 2012-05-19 23:10:03 +02:00
Paul van Tilburg
0e810f5b50 Actually load Mab instead of Markaby 2012-05-19 23:10:03 +02:00
Paul van Tilburg
395271f0b1 More Mab compability: different doctype and text escaping 2012-05-19 23:10:03 +02:00
Paul van Tilburg
0e2c9ee02e Fix up some hacks that generate errors when used with Mab 2012-05-19 23:10:03 +02:00
Paul van Tilburg
3f594d49d0 Actively load active record 2012-05-19 23:09:47 +02:00
Paul van Tilburg
53ec809f08 No longer disable billed tasks for editing in the customer form 2012-01-31 22:52:13 +01:00