Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6

2014-09-23 12:05:45 +02:00
parent 860253759b 3b53ccbe44
commit fa79f280ea
1 changed files with 1 additions and 1 deletions
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -528,7 +528,7 @@ function createInvoice($authentication,$invoice)
        {
            // $key can be 'line' or '0','1',...
            $newline=new FactureLigne($db);
-            $newline->type=$line['type'];
+            $newline->product_type=$line['type'];
            $newline->desc=$line['desc'];
            $newline->fk_product=$line['fk_product'];
            $newline->tva_tx=$line['vat_rate'];