Joshua Dwire
c04a92b836
Exclude deleted payments from 12-month revenue
2016-11-14 13:42:27 -05:00
Joshua Dwire
3d84e408bb
Only do annual income calculations if we're going to show the BlueVinePromo.
2016-11-14 13:42:09 -05:00
Joshua Dwire
179713711f
Merge remote-tracking branch 'upstream/develop' into 2016-11-bluevine-integration
2016-11-14 13:34:27 -05:00
Hillel Coren
a70380dd88
Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop
2016-11-14 15:13:58 +02:00
David Bomba
b7a5ae6059
Handle null invoice object in task ( #1153 )
2016-11-14 21:25:16 +11:00
David Bomba
fa39434ac9
Tasks via API ( #1152 )
...
* revert error reporting
* Add Task attributes
2016-11-14 20:43:10 +11:00
Hillel Coren
94890af980
Updated readme
2016-11-13 23:47:51 +02:00
Hillel Coren
d53d7739b4
Fix for expense documents
2016-11-13 09:14:25 +02:00
Hillel Coren
8c2e5ebdbf
Simplify logo URL code
2016-11-11 12:57:12 +02:00
Joshua Dwire
82167de1d2
Merge remote-tracking branch 'upstream/develop' into 2016-11-bluevine-integration
2016-11-10 18:29:13 -05:00
Joshua Dwire
5bee41789f
Show BlueVine quote and redirect to BlueVine
2016-11-10 18:24:54 -05:00
Hillel Coren
bc8c24a67c
Update checkdata script
2016-11-09 16:08:22 +02:00
Hillel Coren
7155524575
Update version
2016-11-06 15:58:00 +02:00
Hillel Coren
905593b525
Prevent emailing recurring invoice through API
2016-11-06 15:57:33 +02:00
Hillel Coren
a76e9ae437
Log email error for self host installs
2016-11-06 15:21:09 +02:00
Hillel Coren
26f4a84897
Track campaign fields with company
2016-11-06 14:16:18 +02:00
Hillel Coren
31d5e28b69
Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop
2016-11-06 13:45:09 +02:00
Hillel Coren
ef44a95902
Working on signature feature
2016-11-06 13:44:58 +02:00
David Bomba
c905e781c0
revert error reporting ( #1142 )
2016-11-05 12:32:06 +11:00
David Bomba
0a4d55e0aa
Generic message
...
Change error text to generic Entity not found.
2016-11-05 06:36:49 +11:00
David Bomba
f5e18f3355
API Error handling improvements ( #1141 )
...
* generic catch all HTTP error handler for API
* generic catch all HTTP error handler for API
* generic catch all HTTP error handler for API
* generic catch all HTTP error handler for API
* generic catch all HTTP error handler for API
* generic catch all HTTP error handler for API
* generic catch all HTTP error handler for API
* generic catch all HTTP error handler for API
* generic catch all HTTP error handler for API
* generic catch all HTTP error handler for API
* generic catch all HTTP error handler for API
* generic catch all HTTP error handler for API
* generic catch all HTTP error handler for API
* generic catch all HTTP error handler for API
* Client not found error handling via API
* Client not found error handling via API
2016-11-05 06:20:33 +11:00
Hillel Coren
3ccb33ec21
Support signing for invoice
2016-11-04 15:34:15 +02:00
Hillel Coren
fbf618a226
Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop
2016-11-04 11:48:37 +02:00
Hillel Coren
5c9b435b97
Fix for contact sorting when saving
2016-11-04 11:48:27 +02:00
Joshua Dwire
5713561261
Add UI for BlueVine signup
2016-11-03 16:54:33 -04:00
David Bomba
9d4a121662
Merge pull request #1139 from turbo124/develop
...
Dashboard bug fix
2016-11-03 22:41:48 +11:00
David Bomba
d466a1bf5a
bug fixes
2016-11-03 22:39:29 +11:00
David Bomba
88f9cea3bb
Add show() resource route for ClientApiController ( #1138 )
...
* Expense categories
* add dependencies
* expense categories
* expense categories
* expense categories
* Change expense categories into a resource route
* add expenses, contacts, tasks and is_system to activity transformer
* add show() Client
2016-11-03 21:39:33 +11:00
David Bomba
06150ce30a
add show() Client
2016-11-03 21:36:05 +11:00
Hillel Coren
9769f206f2
Fix for outstanding amount on dashboard
2016-11-02 09:43:57 +02:00
Hillel Coren
e677569351
Support importing VAT number with client CSV
2016-11-01 13:19:35 +02:00
Hillel Coren
6353ad05ff
Remove 'unamed client' label
2016-10-31 16:08:00 +02:00
Hillel Coren
bf6fd23aea
Show 'Pro' label when on trial
2016-10-31 12:59:48 +02:00
Hillel Coren
eca4d7ce6a
Add financial year start setting for dashboard
2016-10-31 11:11:30 +02:00
Hillel Coren
b39f2f4ba5
Ensure invoice always has an invitation
2016-10-31 09:06:55 +02:00
Hillel Coren
16940fd690
Fix translations in client portal
2016-10-30 20:12:02 +02:00
Hillel Coren
752e674a34
Remove branding if white labeled
2016-10-30 18:09:22 +02:00
Hillel Coren
02c300e9f9
Prevent session history from showing as blank
2016-10-30 11:23:36 +02:00
Hillel Coren
2a97fc5456
Prevent deleted invoice from being paid
2016-10-30 11:04:08 +02:00
Hillel Coren
7b5cd9e4c1
Eager load contact with activities
2016-10-30 08:50:58 +02:00
David Bomba
147a1b1a94
Add in additional fields for activities transformer ( #1129 )
...
* Expense categories
* add dependencies
* expense categories
* expense categories
* expense categories
* Change expense categories into a resource route
* add expenses, contacts, tasks and is_system to activity transformer
2016-10-29 18:48:58 +11:00
Hillel Coren
346dde8e97
Fix for parseCSV constructor error
2016-10-28 14:35:32 +03:00
Hillel Coren
bd624710a8
Minor fixes
2016-10-28 12:01:35 +03:00
David Bomba
8f1a9a2e5d
Expense Categories route ( #1125 )
...
* Expense categories
* add dependencies
* expense categories
* expense categories
* expense categories
* Change expense categories into a resource route
2016-10-28 19:37:28 +11:00
Hillel Coren
bb0ce2da38
Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop
2016-10-28 09:43:07 +03:00
Hillel Coren
522cabe0a1
Fix for permissions change
2016-10-28 09:42:49 +03:00
David Bomba
dedb85c8d6
Add / Update expense categories from API ( #1124 )
...
* Expense categories
* add dependencies
* expense categories
* expense categories
* expense categories
2016-10-28 12:59:57 +11:00
Hillel Coren
7465eb1631
Include taxes in expense amount
2016-10-27 17:26:42 +03:00
Hillel Coren
c3c0ece14a
Round qty in product report
2016-10-27 16:45:06 +03:00
Hillel Coren
a4b919f188
Fix for tests
2016-10-27 12:56:21 +03:00
