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

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

Browse Source 
Conflicts:
	htdocs/product/price.php
This commit is contained in:
Laurent Destailleur 2016-09-02 22:37:01 +02:00
commit acdce83f9c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/product/price.php
View File

@ -96,7 +96,7 @@ if (empty($reshook))
if (($action == 'update_vat') && !$cancel && ($user->rights->produit->creer || $user->rights->service->creer))
{
$tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5' or '8.5*' or '8.5 (XXX)' or '8.5* (XXX)'
// We must define tva_tx, npr and local taxes
$vatratecode = '';
$tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt); // keep remove all after the numbers and dot

2
htdocs/webservices/server_contact.php
View File

@ -660,7 +660,7 @@ function updateContact($authentication,$contact)
$object->civility_id=$contact['civility_id'];
$object->poste=$contact['poste'];
$object->statut=$contact['statut'];
$object->statut=$contact['status'];
//Retreive all extrafield for contact

2
htdocs/webservices/server_order.php
View File

@ -935,7 +935,7 @@ function updateOrder($authentication,$order)
if (isset($order['billed']))
{
if ($order['billed']) $result=$object->classifyBilled($fuser);
if (! $order['billed']) $result=$object->classifyBilled($fuser);
if (! $order['billed']) $result=$object->classifyUnBilled($fuser);
}
//Retreive all extrafield for object