1121 Commits

Author SHA1 Message Date
Hillel Coren
a3cb3a0cfb Working on discounts 2016-12-15 13:16:19 +02:00
Hillel Coren
bbb0e07eca Working on discounts 2016-12-15 12:52:10 +02:00
Hillel Coren
16dba695b1 Support bulk mark paid 2016-12-14 21:47:22 +02:00
Hillel Coren
cc8959626f Support pro plan discounts 2016-12-14 16:19:16 +02:00
Hillel Coren
2ccb54bf42 Added rbits data 2016-12-12 20:42:51 +02:00
Hillel Coren
e11a04f30f CRUD 2016-12-09 00:34:24 +02:00
Hillel Coren
ce4571a187 Working on CRUD 2016-12-08 22:39:15 +02:00
Hillel Coren
2d0effda63 Support exporting expenses 2016-12-05 20:35:01 +02:00
Hillel Coren
78a2a66729 Hide draft invoices from the client portal 2016-12-05 10:11:33 +02:00
Hillel Coren
a0481310a3 Hide draft invoices from the client portal 2016-12-04 23:51:18 +02:00
Hillel Coren
8d8156f580 Hide draft invoices from the client portal 2016-12-04 23:26:38 +02:00
Hillel Coren
9398c45b56 Prevent changing credit's client 2016-12-04 12:24:48 +02:00
Hillel Coren
55340b8d13 Support editing credits 2016-11-30 20:21:50 +02:00
Hillel Coren
243f345e85 Merge fix for expense categories in API 2016-11-29 19:54:40 +02:00
Hillel Coren
bbbf1237c5 Added task projects 2016-11-29 19:47:26 +02:00
Hillel Coren
1819f72847 Merge fix to show archived payments to clients 2016-11-27 17:04:47 +02:00
Hillel Coren
682ce02995 Merge dashboard fix 2016-11-27 17:00:29 +02:00
Hillel Coren
a99079da95 Improve error if email fails to send 2016-11-27 16:58:32 +02:00
Hillel Coren
e9a5d60d7f Working on bulk lists 2016-11-27 14:20:58 +02:00
Hillel Coren
ae28c3c5c3 Working on bulk list changes 2016-11-27 11:46:32 +02:00
Hillel Coren
1323f21867 Working on datatables on client page 2016-11-25 12:53:35 +02:00
Hillel Coren
eb710348bf Refactor datatable sort columns 2016-11-24 11:46:57 +02:00
Hillel Coren
5c6c9e399b Working on datatables 2016-11-24 11:41:11 +02:00
Hillel Coren
8bac6b6c27 Working on adding bulk actions to client page 2016-11-24 11:22:37 +02:00
Hillel Coren
1cc5795aa8 Show archived payments in client portal 2016-11-22 21:17:32 +02:00
Hillel Coren
ccecb65f58 Working on status selector 2016-11-20 16:08:36 +02:00
Hillel Coren
23c098014a Improved status selection 2016-11-18 15:31:43 +02:00
Hillel Coren
de2825750d Add eager loading to API tasks 2016-11-16 13:12:10 +02:00
Hillel Coren
966d3cedba Fix for PayFast 2016-11-16 12:41:59 +02:00
Hillel Coren
2cd574d349 Fix for PayFast 2016-11-16 12:41:47 +02:00
Hillel Coren
e1a84a29e1 Tweaks to BlueVine 2016-11-16 12:41:32 +02:00
Joshua Dwire
c04a92b836 Exclude deleted payments from 12-month revenue 2016-11-14 13:42:27 -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
Joshua Dwire
82167de1d2 Merge remote-tracking branch 'upstream/develop' into 2016-11-bluevine-integration 2016-11-10 18:29:13 -05:00
Hillel Coren
b620356db1 Merge branch 'release-2.8.0' 2016-11-06 19:29:19 +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
ef44a95902 Working on signature feature 2016-11-06 13:44:58 +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
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
eca4d7ce6a Add financial year start setting for dashboard 2016-10-31 11:11:30 +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
7465eb1631 Include taxes in expense amount 2016-10-27 17:26:42 +03:00