lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.6' into develop

Browse Source 
Conflicts:
	htdocs/societe/consumption.php
This commit is contained in:
Laurent Destailleur 2014-09-19 11:09:51 +02:00
commit 2a9275d0de
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/debian/control
View File

@ -68,4 +68,4 @@ Description: Web based software to manage a company or foundation
PDF exports, PDF exports,
And a lot more modules... And a lot more modules...
. .
You can also add third parties external modules or develop yours. You can also add external modules from third parties or develop yours.

2
htdocs/core/lib/functions2.lib.php
View File

@ -1221,7 +1221,7 @@ function dol_print_reduction($reduction,$langs)
$string = ''; $string = '';
if ($reduction == 100) if ($reduction == 100)
{ {
$string = $langs->trans("Offered"); $string = $langs->transnoentities("Offered");
} }
else else
{ {

2
htdocs/webservices/server_invoice.php
View File

@ -541,6 +541,8 @@ function createInvoice($authentication,$invoice)
$newline->total_ht=$line['total_net']; $newline->total_ht=$line['total_net'];
$newline->total_tva=$line['total_vat']; $newline->total_tva=$line['total_vat'];
$newline->total_ttc=$line['total']; $newline->total_ttc=$line['total'];
$newline->date_start=dol_stringtotime($line['date_start']);
$newline->date_end=dol_stringtotime($line['date_end']);
$newline->fk_product=$line['product_id']; $newline->fk_product=$line['product_id'];
$newobject->lines[]=$newline; $newobject->lines[]=$newline;
} }