steenrabol
|
6133c6ff07
|
Merge branch 'master' of https://github.com/invoiceninja/invoiceninja
# Conflicts:
# app/Http/Controllers/InvoiceController.php
# resources/lang/en/texts.php
# resources/views/invoices/edit.blade.php
|
2016-01-11 20:39:18 +01:00 |
|
steenrabol
|
eed8ee55a1
|
Vendor
|
2016-01-07 16:21:13 +01:00 |
|
steenrabol
|
dba3a39559
|
Vendor management
|
2016-01-06 15:23:58 +01:00 |
|
Hillel Coren
|
18155a9482
|
Working on data import tranformers
|
2016-01-06 09:52:26 +02:00 |
|
Hillel Coren
|
2144870b96
|
Removed getInvoiceId from non-Wave transformers
|
2015-12-31 16:14:30 +02:00 |
|
Hillel Coren
|
e5ca3973d8
|
Revert "Revert "Re-revert "Improve Import Support""""
|
2015-12-31 16:11:44 +02:00 |
|
Hillel Coren
|
f5530a30b2
|
Revert "Re-revert "Improve Import Support"""
|
2015-12-31 15:36:53 +02:00 |
|
Hillel Coren
|
e60c52e93c
|
Revert "Revert "Improve Import Support""
|
2015-12-31 15:06:30 +02:00 |
|
Hillel Coren
|
fc0313bade
|
Revert "Improve Import Support"
|
2015-12-31 13:46:56 +02:00 |
|
Joshua Dwire
|
5932a837dd
|
Improve Import Support
* Add support for payment imports
* Add support for Wave Invoice import
* Add ability to merge invoice line items into a single invoice
|
2015-12-30 00:14:14 -05:00 |
|
Hillel Coren
|
9341ea0c87
|
Bug fixes
|
2015-12-22 14:06:53 +02:00 |
|
Hillel Coren
|
1783cb5129
|
Working on data import
|
2015-12-10 15:35:40 +02:00 |
|
Hillel Coren
|
6fc8f76ea8
|
Working on data import
|
2015-12-08 12:10:20 +02:00 |
|
Hillel Coren
|
5c6b2fe906
|
Working on import
|
2015-11-18 16:40:50 +02:00 |
|
Hillel Coren
|
24bcb0e2e5
|
Merging import changes
|
2015-11-17 15:53:14 +02:00 |
|