Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 16:41:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	htdocs/holiday/document.php
This commit is contained in:
Laurent Destailleur
2017-10-04 13:32:53 +02:00
parent 10142522e0 fef6440ff2
commit 8e0da9bfeb
13 changed files with 68 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/api/class/api.class.php
View File

@@ -136,6 +136,9 @@ class DolibarrApi
unset($object->table_element_line);
unset($object->picto);
unset($object->skip_update_total);
unset($object->context);
// Remove the $oldcopy property because it is not supported by the JSON
// encoder. The following error is generated when trying to serialize
// it: "Error encoding/decoding JSON: Type is not supported"