Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 09:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	htdocs/core/modules/modCategorie.class.php
This commit is contained in:
Laurent Destailleur
2020-12-04 21:55:57 +01:00
parent 0536ed87a2 3770eef8dc
commit c31cf08431
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev/examples/zapier/package.json
View File

@@ -15,7 +15,7 @@
"npm": ">=5.6.0" "npm": ">=5.6.0"
}, },
"dependencies": { "dependencies": {
"zapier-platform-core": "10.1.1" "zapier-platform-core": "10.1.2"
}, },
"devDependencies": { "devDependencies": {
"mocha": "^5.2.0", "mocha": "^5.2.0",

2
htdocs/core/modules/modCategorie.class.php
View File

@@ -374,7 +374,7 @@ class modCategorie extends DolibarrModules
'ca.label'=>"Label*", 'ca.type'=>"Type*", 'ca.description'=>"Description", 'ca.label'=>"Label*", 'ca.type'=>"Type*", 'ca.description'=>"Description",
'ca.fk_parent' => 'Parent' 'ca.fk_parent' => 'Parent'
); );
$this->import_regex_array[$r] = array('ca.type'=>'^[0|1|2|3]'); $this->import_regex_array[$r] = array('ca.type'=>'^\d+$');
$this->import_convertvalue_array[$r] = array( $this->import_convertvalue_array[$r] = array(
'ca.fk_parent' => array( 'ca.fk_parent' => array(
'rule' => 'fetchidfromcodeandlabel', 'rule' => 'fetchidfromcodeandlabel',