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
7244e2be64
Transform all views to use Bootstrap
2013-06-16 20:27:11 +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
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
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
3b54b93504
Added support for Ruby 1.9
2012-06-06 11:28:59 +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
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
53ec809f08
No longer disable billed tasks for editing in the customer form
2012-01-31 22:52:13 +01:00
Paul van Tilburg
bf1d0c633d
Add the bill number to billed tasks in the time entry form (closes: #b1b255)
2012-01-31 22:51:31 +01:00
Paul van Tilburg
ff503f89d5
Mab is not supported yet in master
2012-01-31 22:49:15 +01:00
Paul van Tilburg
5b1953ee40
Really fix the form method override stuff
2012-01-25 12:26:13 +01:00
Paul van Tilburg
15b9b84cc4
Fix form method override for PUT/DELETE support
2012-01-25 11:31:58 +01:00
Paul van Tilburg
9879bb3a47
Fixed syntax error in input arguments
2012-01-24 17:11:49 +01:00
Paul van Tilburg
f731ddee4e
Determine and set the request format before calling the controllers
2012-01-20 00:36:19 +01:00
Paul van Tilburg
45da051bf0
Prepare for PUT/DELETE support in forms and controllers
2012-01-20 00:35:44 +01:00
Paul van Tilburg
69bf1bd735
Tweaked the registered time colum layout (treat it as an exception)
2012-01-09 17:38:30 +01:00
Paul van Tilburg
22299c2d6e
Show the total amount in invoices list
2012-01-09 17:38:06 +01:00
Paul van Tilburg
606b3a4d88
Tweaked style and layout of the invoice form view
2012-01-09 17:14:54 +01:00
Paul van Tilburg
7cd58f019e
Tweaked table layout (mainly customers and timeline view)
2012-01-09 17:14:30 +01:00
Paul van Tilburg
ea9cb0e39c
Fixed firefox rendering issue in the overview (repeated columns)
2012-01-09 17:13:16 +01:00
Paul van Tilburg
18451546c0
Support editing of company info revisions (refs: #ba1a26)
2012-01-09 15:56:40 +01:00
Paul van Tilburg
fb20d2825f
Create a revision of the company info when it has related invoices (refs: #ba1a26)
2012-01-09 15:52:09 +01:00
Paul van Tilburg
016cb0b21d
Added company info revisioning in the models (refs: #ba1a26)
...
* Extended CompanyInfo with an "original" association with the previous
revision (in case revisions can be removed in the future).
* Created a belongs_to relation of Invoice with CompanyInfo and an
has_many reverse relation.
2012-01-09 15:48:20 +01:00
Paul van Tilburg
f85ca3f34f
Order the tasks in the customer_form view by name and invoice ID
2012-01-06 16:32:19 +01:00
ea5884f97a
Show bill information for billed time entries (and link the invoice)
2012-01-03 17:38:54 +01:00
8e3ebc709a
Set the invoices billed flags in the CustomersNInvoices controller
2012-01-03 17:38:14 +01:00
2dc1e964e4
Improved handling of template errors
2012-01-03 16:56:51 +01:00
00e5aa2902
Adapted forms and the invoice template to accommodate more financial info
...
* Allow for setting and updating the financial contact of a customer
and show in invoices when set (closes: #9d4c2e).
* Allow for setting and updating bank information (IBAN, BIC, name)
and use it in the template (closes: #a11265).
2012-01-03 16:51:07 +01:00
feb0dc71c1
Add financial info to the CompanyInfo and Customer models and database
2012-01-03 16:49:14 +01:00
80cead274b
Handle empty time entry comments in the invoice form view
2012-01-02 16:15:35 +01:00
f11ddbbd53
Simplified the configuration code base
...
* Merged the Config mix-in module with the main StopTime module.
* Renamed Models::Config#load to initialize, remove the old initialize.
2012-01-02 15:59:06 +01:00
99370625ec
Actually give access to the global configuration
2012-01-02 15:13:33 +01:00
32de91327f
Fixed missing default configuration problem
2012-01-02 15:13:18 +01:00
4d2e2bb217
The task form should also list billed tasks
2012-01-02 14:58:36 +01:00
768d2d55f6
Allow for modification of the invoice comment (refs: #69f890)
2012-01-02 14:05:03 +01:00
0abad65328
Show the list of contained time entries for tasks with an hourly rate
2012-01-02 14:04:43 +01:00
57943f913e
Added links to billed tasks from an invoice (refs: #69f890)
2012-01-02 14:04:09 +01:00
0ba447524d
Adjust the task form for showing invoice information for billed task (refs: #69f890)
2012-01-02 14:00:56 +01:00
cc0bb4a371
Adjust the title time_entries view based on whether the task is billed
2012-01-02 13:59:43 +01:00
91cb9d42b2
Only treat fixed cost tasks of the selected tasks (closes: #21f52e)
2012-01-02 13:58:47 +01:00
d488c5f3be
Really fixed config file location; added some type checking
2012-01-02 13:03:45 +01:00
217985afc8
Fixed default config file location
2012-01-02 12:52:28 +01:00
643520e577
Merge branch 'master' of git.luon.net:users/paul/stoptime
2012-01-02 12:47:42 +01:00
6b05536d91
Show the spent time for fixed cost tasks in the invoice
2012-01-02 12:46:47 +01:00
c8ced1777c
Use the new configuration throughout the views, controllers and templates (closes #21e3ae)
2011-12-23 21:17:44 +01:00
71ee97c34c
Added the Stoptime::Config module and Config model to hold the configuration
2011-12-23 21:17:02 +01:00
c62a7f36d0
Also show the customer in the timeline (reverting earlier removal)
2011-12-22 16:34:37 +01:00
1ed1cef49a
Compact controller code using the new Customer#shortest_name method
2011-12-22 16:33:57 +01:00
48490991cc
Added Customer#shortest_name
2011-12-22 16:32:47 +01:00
4860aec9ca
Use the time_entries partial view to show time entries for a task (closes #e966ae)
2011-12-12 17:10:18 +01:00
d6af1a7319
Modified time_entries to view to be (ab)used as partial view
2011-12-12 17:09:35 +01:00
d38f5dc5fd
Added missing documentation for Controllers::Index#get
2011-12-10 21:13:26 +01:00
3570cbb3f4
Rename Views#invoice to invoice_form for consistency
2011-12-10 21:08:48 +01:00
cb0b014640
Mark partial views as private
2011-12-10 21:05:58 +01:00
32cea1211d
Fixed regression problem of entries not being marked for billing anymore
2011-12-10 17:07:10 +01:00
79e9190956
Small fixes for the invoice dir changes
2011-12-10 16:58:38 +01:00
a32cb00846
Merge branch 'master' of git.luon.net:users/paul/stoptime
2011-12-10 16:57:21 +01:00
8ff07620b6
Show paid status of invoices (closes: #c937b1)
2011-12-10 16:54:43 +01:00
9ab76555f6
Use the newly introduced _form_input_checkbox partial form view
2011-12-10 16:50:01 +01:00
07cb9dd6fe
Extend partial form views with optional options
2011-12-10 16:49:28 +01:00
2b0fb9631d
Adapted the code for the invoice subdir changes
2011-12-06 14:34:31 +01:00
2f36d30873
Merge branch 'master' of git.luon.net:users/paul/stoptime
2011-12-06 14:31:35 +01:00
f3d8426a4f
Fixed crash in the overview, don't try to get the task comment there
2011-12-02 22:58:58 +01:00
2539750c76
Merge branch 'feature/invoice_comments' (closes #7ede70)
2011-12-02 22:25:17 +01:00
f40b429d10
Adapted the invoice view to show the task invoice comment
2011-12-02 22:20:21 +01:00
194b0033d1
Changed invoice_select_form and CustomersNInvoicesX to actually set task invoice comments
2011-12-02 22:18:55 +01:00
e53374a713
Changed Invoice#summary to use the task as the key, not just its name
2011-12-02 22:17:27 +01:00
e4202b8048
Added Task#comment_or_name to return the comment if set and the task is billed
2011-12-02 22:16:27 +01:00
c7d32e8611
Added an invoice comment field to the task to store what the comment was
2011-12-02 22:15:58 +01:00
afd1ab7730
Fixed LaTeX spelling
2011-12-02 14:09:02 +01:00
8cbbb1c434
Fixed invoice view issue given the new fixed cost task summary
2011-12-02 14:08:50 +01:00
6ee025f3c5
Also show the customers in the project/task selector of the timeline
...
* Added partial view Views#_form_select_nested.
* Updated the Timeline controller to build the nested list.
* Set the last used task as the default task.
2011-11-29 17:21:51 +01:00
f593996f89
Some link decoration/tweaks
2011-11-29 16:47:32 +01:00
f9a0ee323e
Also show total of hours for fixed cost tasks
2011-11-29 16:47:16 +01:00
347da9e0e3
Properly sort customers and tasks in the overview
2011-11-29 16:46:44 +01:00
aa35d43986
Fix value class issue in task form preseeding
2011-11-29 16:21:09 +01:00
bd45416675
Improved link embedding
2011-11-29 12:16:27 +01:00
4b69bb02ec
Sort tasks by name in the overview
2011-11-29 12:12:53 +01:00
218b3e45a4
Fixed crash in CustomersNTasksNew#get
...
The @customer_list was not set (closes: #ae0311).
Also made Views#_form_select more robust by also catching undefined lists
and treating them as empty lists.
2011-11-29 11:46:41 +01:00
9409686ddd
Fixed tab detection, making the hack even dirtier
2011-11-28 14:07:04 +01:00
d8538ec1d2
Allow for changing the customer of a task; fixed form preseeding here and there
2011-11-28 13:56:46 +01:00
ed90dad0c2
Improved styling of the tables.
2011-11-28 13:31:26 +01:00
1850ae49ad
Mark billed entries in the timeline (closes: #239c27)
2011-11-28 13:26:12 +01:00
fc377460b4
Fixed the 'payed' typo.
2011-11-28 12:55:13 +01:00
b6b81308bb
Documented the model attributes.
2011-11-28 12:46:48 +01:00
45550c9d51
Merge branch 'master' of git.luon.net:users/paul/stoptime
2011-11-16 11:00:23 +01:00
cfcd7ef31d
Tweaked the layout of the invoice selection form.
2011-11-16 11:00:17 +01:00
dcd6f553b7
Fixed routing conflict between CustomersNInvoicesNew and CustomersNInvoicesX.
2011-11-16 10:59:18 +01:00
ad86acd40a
Fixed bug in updated start/end time of time entries.
2011-11-16 09:47:40 +01:00
aec92710b8
Application description fix.
2011-11-15 17:54:09 +01:00
52c5b858f5
Drop ruby-mime-types support in favour of Rack::MIME.
2011-11-15 17:22:57 +01:00
08a7ef3c01
Small fix concerning static serving with Passenger; updated gitignore.
2011-11-15 17:01:52 +01:00
e0dd602c4e
Improved labeling for the account info.
2011-11-11 17:17:26 +01:00
73de5b6222
Fixes for the separate time entry date support.
2011-11-11 15:18:51 +01:00
8ddd31f662
Added seperate date support for time entries.
2011-11-11 14:55:17 +01:00
edc86f8913
Fixed handling of customers without a short name.
2011-11-11 13:53:49 +01:00
18d34c11e1
Fixed syntax error.
2011-11-10 18:26:15 +01:00
161084868f
Documented the source code; translated the ToDo list.
2011-11-10 18:24:11 +01:00
ab59365849
Fixed bug for creating links to invoices.
2011-11-10 15:23:24 +01:00
7119c2872c
When a customer is created, proceed to CustomersN.
2011-11-10 15:23:09 +01:00
75e9d3b235
Improved VAT addition: only apply when VAT number is set.
2011-11-10 15:22:13 +01:00
6079d90b7a
Ensure titlecasing for h2.
2011-11-10 13:09:56 +01:00
11627e85fc
Corrected detection of an empty list of invoices.
2011-11-10 13:08:17 +01:00
b2ce309d5f
Implemented showing of which tab is selected.
2011-11-10 13:07:55 +01:00
aa3e53b925
Removed some solved FIXMEs; cleaned up the code a bit.
2011-11-10 13:07:30 +01:00
a628b83129
Beautified the pages a bit.
...
* Mention when a list is empty.
* Add a link to where to create new items when the list is emtpy.
* Add form reset buttons.
* Synced and added the page headers.
2011-11-10 12:51:12 +01:00
5f64874252
Fixed a problem where a cancel button was not handled.
2011-11-10 12:50:02 +01:00
c67589f452
Fixed an error in the InvoiceSupport migration.
2011-11-10 12:49:31 +01:00
9fc843db2d
Tweaked the layout a bit.
2011-11-09 23:00:13 +01:00
347691c4b1
Add some style to the application, use SASS for this.
2011-11-09 22:55:59 +01:00
c792cb70a8
Added missing I18n module.
2011-11-09 19:44:59 +01:00
4ca48511ba
Added dutch i18n for invoice generation (controller, template).
2011-11-09 18:31:23 +01:00
a2de4fa6fd
Added TimelineNew router; synced CustomerNew stuff.
2011-11-09 17:01:13 +01:00
06a4cafe02
Handle billed tasks differently (no timereg, but visable in overview).
2011-11-09 16:23:48 +01:00
9e238780df
Added separate LaTeX generation, added links to the invoices.
2011-11-09 16:11:51 +01:00
4c5a3ddfcd
Added invoice listings (also per customer).
2011-11-09 16:03:02 +01:00
f420cb58dd
Added a main task overview for the index.
2011-11-09 16:02:43 +01:00
c4e3161b87
Fiddled a bit with created_at/updated_at for invoices.
2011-11-09 16:02:04 +01:00
6aa19d1e08
Removed trailing whitespace.
2011-11-09 15:14:48 +01:00
e4e709bd72
Changed period logic, use update_at attribute if there are no time entries.
2011-11-09 15:14:09 +01:00
f0c7f59529
Added invoices subview for customers, improved invoice forms.
2011-11-09 15:13:39 +01:00
