1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 08:21:34 +02:00
Commit Graph

3317 Commits

Author SHA1 Message Date
Hillel Coren
c254544b19 Added setting to hide second tax rate 2016-05-29 12:56:10 +03:00
Hillel Coren
607fb58c29 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop
Conflicts:
	app/Models/Account.php
2016-05-29 12:27:14 +03:00
Hillel Coren
0e75ddb5e6 Added setting to hide second tax rate 2016-05-29 12:26:02 +03:00
Hillel Coren
cca6dcfc4a Merge pull request #878 from benb969/invoices_types
add support to multiple invoice types
2016-05-29 12:21:57 +03:00
ben
dadac05532 add support to multiple invoice types 2016-05-29 12:02:44 +03:00
Joshua Dwire
1c119fe35a ACH autobill bug fixes 2016-05-26 15:22:09 -04:00
Hillel Coren
e5afb28e4b Testing travis change 2016-05-26 20:53:13 +03:00
Hillel Coren
f233582ea8 Ensure all files are deleted with the account 2016-05-26 20:48:27 +03:00
Hillel Coren
2043621ac9 Fix for deleting documents 2016-05-26 19:02:53 +03:00
Hillel Coren
0da3741b56 Fixed date formatting in document list 2016-05-26 18:28:13 +03:00
Hillel Coren
dd9c95a1a8 Trying to fix zend_mm_heap corrupted 2016-05-26 18:21:43 +03:00
Hillel Coren
c55d6510bf Show permissions if not enabled 2016-05-26 16:04:53 +03:00
Hillel Coren
5e4fab9f5b Updated PHP test version 2016-05-26 16:03:32 +03:00
Hillel Coren
29bccd650d Fix permission issue with quotes 2016-05-26 15:50:23 +03:00
Hillel Coren
84736dac9d Test PHP 5.6.21 2016-05-26 15:46:43 +03:00
Hillel Coren
a2c8a3e534 Test PHP 5.6.21 2016-05-26 15:44:11 +03:00
Joshua Dwire
acbc0e887f Support adding WePay ACH from payment page 2016-05-25 16:54:49 -04:00
Joshua Dwire
4dded687b5 Tweak payment settings page 2016-05-25 15:55:23 -04:00
Joshua Dwire
c9f00274b1 Support storing WePay bank tokens 2016-05-25 15:04:58 -04:00
Hillel Coren
44fb6682e4 Prevent saving expense before documents have uploaded 2016-05-25 22:01:15 +03:00
Hillel Coren
85184f9a5b check document completed upload before user submitted form 2016-05-25 21:42:22 +03:00
Hillel Coren
bd817a3700 Try running TaxRates test earlier 2016-05-25 21:28:41 +03:00
Joshua Dwire
6ddbbbc64d Merge remote-tracking branch 'upstream/develop' into wepay-integration 2016-05-25 11:14:14 -04:00
Joshua Dwire
7d55ab033b Merge branch 'wepay-ach' into wepay-integration 2016-05-25 11:11:47 -04:00
Joshua Dwire
d19a3715f9 Warn user when editing an ACH auto bill invoice 2016-05-25 11:07:20 -04:00
Joshua Dwire
c701c5563c Add payment settings block 2016-05-25 10:36:40 -04:00
Hillel Coren
4a4494a2f3 Fix for cancelled accounts 2016-05-25 16:16:34 +03:00
Hillel Coren
df2a652798 Change document to click to full size 2016-05-25 15:18:12 +03:00
Hillel Coren
ba561c7d0d Prevent clicking save while document is still uploading 2016-05-25 14:42:20 +03:00
Hillel Coren
1531727188 Prevent setting pdfstring when saving an invoice 2016-05-25 12:10:22 +03:00
Hillel Coren
ee2ef4608e Lazy load invoice documents 2016-05-25 11:59:46 +03:00
Joshua Dwire
9d4b42a514 Mention in the invoice notification that the invoice will be auto billed on the due date 2016-05-24 23:14:19 -04:00
Joshua Dwire
a5fdb88d79 Add support for auto bill on due date 2016-05-24 22:49:06 -04:00
Joshua Dwire
1f11d88d6b Store ip addresses for payments and payment methods 2016-05-24 18:00:59 -04:00
Joshua Dwire
29c4f16970 Fix contact authentication 2016-05-24 17:45:38 -04:00
Joshua Dwire
724f5738aa Add contact_key 2016-05-24 17:02:28 -04:00
Joshua Dwire
f8835268b4 Update DB structure 2016-05-24 14:16:42 -04:00
Joshua Dwire
5958cd2c5e Don't request update URI from WePay 2016-05-24 13:04:55 -04:00
Joshua Dwire
2aed1354e9 Update wepay driver version 2016-05-24 11:47:03 -04:00
Hillel Coren
ea2f154b1f Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-05-24 10:18:21 +03:00
Hillel Coren
7cc29de881 Bumped version 2016-05-24 10:18:10 +03:00
David Bomba
33e59a2af9 Merge pull request #893 from turbo124/develop
Stubs for DocumentAPIController
2016-05-24 14:28:05 +10:00
David Bomba
5f928ecf01 Merge remote-tracking branch 'upstream/develop' into develop 2016-05-24 14:26:19 +10:00
Hillel Coren
406df6f3d8 Fix for payment datatable list 2016-05-23 21:10:40 +03:00
Hillel Coren
b2beb8fb73 Updated vendors to new datatable class 2016-05-23 21:07:06 +03:00
Hillel Coren
541b19cd5f Updated vendor expenses to new datatable class 2016-05-23 21:03:01 +03:00
Hillel Coren
e7bf0599db Separated out entity datatable classes 2016-05-23 19:52:20 +03:00
Hillel Coren
4b1b80886d Implemented base entity presenter 2016-05-23 12:26:08 +03:00
Hillel Coren
260b9212b9 Renamed PublicClientController to ClientPortalController 2016-05-23 11:31:49 +03:00
Hillel Coren
f19058e35e Improved message after update 2016-05-23 09:18:39 +03:00