Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts: ChangeLog
This commit is contained in:
commit
5df4912324
@ -5,6 +5,7 @@ English Dolibarr ChangeLog
|
||||
|
||||
|
||||
***** ChangeLog for 7.0.0 compared to 6.0.* *****
|
||||
For users:
|
||||
|
||||
For developers:
|
||||
NEW: Add hook addAdminLdapOptions and doAction in ldap admin page
|
||||
@ -42,8 +43,7 @@ FIX: API to get object does not return data of linked objects
|
||||
FIX: Bad localtax apply
|
||||
FIX: Bad ressource list in popup in gantt view
|
||||
FIX: bankentries search conciliated if val 0
|
||||
FIX: hook formObjectOptions() must use $expe and not $object which i…
|
||||
FIX: hook formObjectOptions() must use $expe and not $object which is an order here
|
||||
FIX: hook formObjectOptions() must use $expe and not $object
|
||||
FIX: make of link to other object during creation
|
||||
FIX: Missing function getLinesArray
|
||||
FIX: old batch not shown in multi shipping
|
||||
|
||||
@ -571,6 +571,7 @@ if ($nboftargetok) {
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mobiledetect/mobiledetectlib/.gitmodules`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/samples`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/parsedown/LICENSE.txt`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/php-iban/docs`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/.gitattributes`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Classes/license.md`;
|
||||
@ -579,6 +580,7 @@ if ($nboftargetok) {
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Examples`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/unitTests`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/license.md`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/stripe/LICENSE`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-*`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-*`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/ae_fonts_*`;
|
||||
@ -590,6 +592,8 @@ if ($nboftargetok) {
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/utils`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/LICENSE.TXT`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/theme/common/octicons/LICENSE`;
|
||||
|
||||
|
||||
print "Remove subdir of custom dir\n";
|
||||
print "find $BUILDROOT/$PROJECT/htdocs/custom/* -type d -exec rm -fr {} \\;\n";
|
||||
|
||||
@ -128,7 +128,7 @@ if (! empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/resources.json' |
|
||||
foreach ($modulesdir as $dir)
|
||||
{
|
||||
// Search available module
|
||||
dol_syslog("Scan directory ".$dir." for module descriptor to after search for API files");
|
||||
dol_syslog("Scan directory ".$dir." for module descriptor files, then search for API files");
|
||||
|
||||
$handle=@opendir(dol_osencode($dir));
|
||||
if (is_resource($handle))
|
||||
@ -140,13 +140,13 @@ if (! empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/resources.json' |
|
||||
$module = strtolower($regmod[1]);
|
||||
$moduledirforclass = getModuleDirForApiClass($module);
|
||||
$modulenameforenabled = $module;
|
||||
if ($module == 'propale') { $moduleforenabled='propal'; }
|
||||
if ($module == 'propale') { $modulenameforenabled='propal'; }
|
||||
|
||||
//dol_syslog("Found module file ".$file." - module=".$module." - moduledirforclass=".$moduledirforclass);
|
||||
dol_syslog("Found module file ".$file." - module=".$module." - moduledirforclass=".$moduledirforclass);
|
||||
|
||||
// Defined if module is enabled
|
||||
$enabled=true;
|
||||
if (empty($conf->$moduleforenabled->enabled)) $enabled=false;
|
||||
if (empty($conf->$modulenameforenabled->enabled)) $enabled=false;
|
||||
|
||||
if ($enabled)
|
||||
{
|
||||
@ -235,7 +235,13 @@ if (! empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/resources.json'
|
||||
if ($module == 'order') { $classname='Commande'; }
|
||||
//var_dump($classfile);var_dump($classname);exit;
|
||||
|
||||
require_once $dir_part_file;
|
||||
$res = include_once $dir_part_file;
|
||||
if (! $res)
|
||||
{
|
||||
print 'API not found (failed to include API file)';
|
||||
header('HTTP/1.1 501 API not found (failed to include API file)');
|
||||
exit(0);
|
||||
}
|
||||
if (class_exists($classname.'Api')) $api->r->addAPIClass($classname.'Api', '/');
|
||||
}
|
||||
else
|
||||
@ -247,7 +253,14 @@ if (! empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/resources.json'
|
||||
$dir_part_file = dol_buildpath('/'.$moduledirforclass.'/class/api_'.$classfile.'.class.php');
|
||||
$classname=ucwords($module);
|
||||
|
||||
require_once $dir_part_file;
|
||||
$res = include_once $dir_part_file;
|
||||
if (! $res)
|
||||
{
|
||||
print 'API not found (failed to include API file)';
|
||||
header('HTTP/1.1 501 API not found (failed to include API file)');
|
||||
exit(0);
|
||||
}
|
||||
|
||||
if (class_exists($classname)) $api->r->addAPIClass($classname);
|
||||
}
|
||||
}
|
||||
|
||||
0
htdocs/includes/stripe/build.php
Normal file → Executable file
0
htdocs/includes/stripe/build.php
Normal file → Executable file
2
htdocs/modulebuilder/template/.gitattributes
vendored
2
htdocs/modulebuilder/template/.gitattributes
vendored
@ -13,7 +13,7 @@
|
||||
*.lang text eol=lf
|
||||
*.txt text eol=lf
|
||||
*.md text eol=lf
|
||||
*.bat text eol=crlf
|
||||
*.bat text eol=lf
|
||||
|
||||
# Denote all files that are truly binary and should not be modified.
|
||||
*.ico binary
|
||||
|
||||
@ -1,87 +0,0 @@
|
||||
Dolistore
|
||||
=========
|
||||
|
||||
[Dolistore](https://dolistore.com) is the marketplace for Dolibarr modules.
|
||||
|
||||
This directory contains templates assets that may be useful for publication.
|
||||
|
||||
Images
|
||||
------
|
||||
|
||||
### Logo
|
||||
|
||||
See [img folder README](../img/README.md).
|
||||
|
||||
### Screenshots
|
||||
|
||||
Texts
|
||||
-----
|
||||
|
||||
All texts needs 5 languages versions for:
|
||||
- en (English)
|
||||
- fr (Français)
|
||||
- es (Español)
|
||||
- it (Italiano)
|
||||
- de (Deutsch)
|
||||
|
||||
### Name
|
||||
|
||||
The module's marketed name.
|
||||
|
||||
### Price
|
||||
|
||||
Expressed in Euro (€).
|
||||
Keep in mind that Dolistore will keep a 20% markup.
|
||||
|
||||
### Categories
|
||||
|
||||
- [x] Modules/Plugins
|
||||
- [ ] Skins and Templates
|
||||
- [ ] Tools and documentation
|
||||
- [ ] Skins
|
||||
- [ ] Document templates
|
||||
- [ ] System tools
|
||||
- [ ] CRM
|
||||
- [ ] ECM
|
||||
- [ ] Human Relationship
|
||||
- [ ] Products, Services or Stock
|
||||
- [ ] Project or collaborative
|
||||
- [ ] Interfaces
|
||||
- [ ] Other
|
||||
- [ ] Reporting or search
|
||||
- [ ] User's interface
|
||||
- [ ] 2Report sub-modules
|
||||
- [ ] Accountancy
|
||||
|
||||
*The list may change. Check [Dolistore](https://dolistore.com) for up-to-date information.*
|
||||
|
||||
### Short description
|
||||
|
||||
A short description of the modules main features.
|
||||
400 characters max.
|
||||
|
||||
### Keywords
|
||||
|
||||
Comma separated lists.
|
||||
eg: ```template,dev,module```
|
||||
|
||||
### Long description
|
||||
|
||||
The long description of your module.
|
||||
|
||||
Suggested technical data:
|
||||
|
||||
Version: 1.0.0
|
||||
Publisher: MyCompany
|
||||
Licence: GPLv3+
|
||||
User interface language(s): English
|
||||
Help/Support: None / Forum www.dolibarr.org / Mail at contact@example.com
|
||||
Prerequisites:
|
||||
- Dolibarr min version: 3.8
|
||||
- Dolibarr max version: 3.9.*
|
||||
- PHP: ≥5.3
|
||||
Install:
|
||||
- Download the module's archive file (.zip file) from DoliStore.com.
|
||||
- Put the file into the custom directory of Dolibarr.
|
||||
- Uncompress the zip file, for example with ```unzip modulefile_version.zip``` command.
|
||||
- Module is then available and can be activated.
|
||||
@ -1 +0,0 @@
|
||||
Mein modul
|
||||
@ -1 +0,0 @@
|
||||
My module
|
||||
@ -1 +0,0 @@
|
||||
My módulo
|
||||
@ -1 +0,0 @@
|
||||
Mon module
|
||||
@ -1 +0,0 @@
|
||||
Il mio modulo
|
||||
0
htdocs/modulebuilder/template/dev/git-hooks/post-commit
Normal file → Executable file
0
htdocs/modulebuilder/template/dev/git-hooks/post-commit
Normal file → Executable file
0
htdocs/modulebuilder/template/dev/git-hooks/pre-commit
Normal file → Executable file
0
htdocs/modulebuilder/template/dev/git-hooks/pre-commit
Normal file → Executable file
0
htdocs/modulebuilder/template/dev/git-hooks/pre-push
Normal file → Executable file
0
htdocs/modulebuilder/template/dev/git-hooks/pre-push
Normal file → Executable file
@ -1,68 +0,0 @@
|
||||
#!/bin/sh
|
||||
# Copyright (C) 2014 Raphaël Doursenaud
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
VERSION=0.0.1
|
||||
USAGE="Usage: newmodule.sh NewName"
|
||||
|
||||
# TODO: check depedencies presence (find, sed and rename)
|
||||
# TODO: allow execution from build directory
|
||||
# TODO: validate parameter
|
||||
# TODO: use multiple word parameter, for example "My module is awesome" which should lead to "MyModuleIsAwesome" and "mymoduleisawesome" so we can also fix language strings
|
||||
# TODO: add module ID management (language files…)
|
||||
# TODO: add oneliner description management
|
||||
# TODO: add copyright management
|
||||
|
||||
if [ $# == 0 ] ; then
|
||||
echo ${USAGE}
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
ToLower () {
|
||||
echo $(echo $1 | tr '[:upper:]' '[:lower:]')
|
||||
}
|
||||
ToUpper () {
|
||||
echo $(echo $1 | tr '[:lower:]' '[:upper:]')
|
||||
}
|
||||
|
||||
CAMELORIG="MyModule"
|
||||
LOWERORIG=$(ToLower ${CAMELORIG})
|
||||
UPPERORIG=$(ToUpper ${CAMELORIG})
|
||||
cameltarget=$(echo $1)
|
||||
lowertarget=$(ToLower $1)
|
||||
uppertarget=$(ToUpper $1)
|
||||
thisscript=`basename $0`
|
||||
|
||||
# Rewrite occurences
|
||||
find . -not -iwholename '*.git*' -not -name "${thisscript}" -type f -print0 | xargs -0 sed -i'' -e"s/${CAMELORIG}/${cameltarget}/g"
|
||||
find . -not -iwholename '*.git*' -not -name "${thisscript}" -type f -print0 | xargs -0 sed -i'' -e"s/${LOWERORIG}/${lowertarget}/g"
|
||||
find . -not -iwholename '*.git*' -not -name "${thisscript}" -type f -print0 | xargs -0 sed -i'' -e"s/${UPPERORIG}/${uppertarget}/g"
|
||||
|
||||
# Rename files
|
||||
for file in $(find . -not -iwholename '*.git*' -name "*${CAMELORIG}*" -type f)
|
||||
do
|
||||
rename ${CAMELORIG} ${cameltarget} ${file}
|
||||
done
|
||||
for file in $(find . -not -iwholename '*.git*' -name "*${LOWERORIG}*" -type f)
|
||||
do
|
||||
rename ${LOWERORIG} ${lowertarget} ${file}
|
||||
done
|
||||
for file in $(find . -not -iwholename '*.git*' -name "*${UPPERORIG}*" -type f)
|
||||
do
|
||||
rename ${UPPERORIG} ${uppertarget} ${file}
|
||||
done
|
||||
|
||||
# TODO: add instructions about renaming vars (ack --php -i my)
|
||||
# TODO: add instructions about renaming files (ls -R|grep -i my)
|
||||
0
htdocs/modulebuilder/template/scripts/myobject.php
Normal file → Executable file
0
htdocs/modulebuilder/template/scripts/myobject.php
Normal file → Executable file
Loading…
Reference in New Issue
Block a user