Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

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

Browse Source 
Conflicts:
	htdocs/compta/tva/clients.php
This commit is contained in:
Laurent Destailleur
2019-03-23 22:44:14 +01:00
parent 77843ddeba 79ed4bc80b
commit 20f3af066c
4 changed files with 534 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/commande/list.php
View File

@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2016 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-2019 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>

1063
htdocs/compta/tva/clients.php
View File

File diff suppressed because it is too large Load Diff

6
htdocs/core/actions_massactions.inc.php
View File

@@ -616,6 +616,12 @@ if ($massaction == 'confirm_createbills') // Create bills from orders
for ($i=0;$i<$num;$i++)
{
$desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle);
// If we build one invoice for several order, we must put the invoice of order on the line
if (! empty($createbills_onebythird))
{
$desc=dol_concatdesc($desc, $langs->trans("Order").' '.$cmd->ref.' - '.dol_print_date($cmd->date, 'day', $langs));
}
if ($lines[$i]->subprice < 0)
{
// Negative line, we create a discount line

2
htdocs/core/class/extrafields.class.php
View File

@@ -1653,7 +1653,7 @@ class ExtraFields
}
elseif ($type == 'phone')
{
$value=dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
$value=dol_print_phone($value, '', 0, 0, '', '&nbsp;', 'phone');
}
elseif ($type == 'price')
{