Merge branch 'develop' of github.com:Dolibarr/dolibarr into 14.0_fix_show_prospecting_level_on_contact_list_by_normalize_the_field_name
This commit is contained in:
kkhelifa
commit
5c67c37636
11
.github/CONTRIBUTING.md
vendored
11
.github/CONTRIBUTING.md
vendored
@ -26,8 +26,9 @@ Default **language here is english**. So please prepare your contributions in en
|
|||||||
1. [Fork](https://help.github.com/articles/fork-a-repo) the [GitHub repository](https://github.com/Dolibarr/dolibarr).
|
1. [Fork](https://help.github.com/articles/fork-a-repo) the [GitHub repository](https://github.com/Dolibarr/dolibarr).
|
||||||
2. Clone your fork.
|
2. Clone your fork.
|
||||||
3. Choose a branch(See the [Branches](#branches) section below).
|
3. Choose a branch(See the [Branches](#branches) section below).
|
||||||
4. Commit and push your changes.
|
4. Read our developer documentation on the [Dolibarr Wiki](https://wiki.dolibarr.org/index.php?title=Developer_documentation).
|
||||||
5. [Make a pull request](https://help.github.com/articles/creating-a-pull-request).
|
5. Commit and push your changes.
|
||||||
|
6. [Make a pull request](https://help.github.com/articles/creating-a-pull-request).
|
||||||
|
|
||||||
<span id="branches" name="branches"></span>
|
<span id="branches" name="branches"></span>
|
||||||
### Branches
|
### Branches
|
||||||
@ -116,13 +117,13 @@ a process to follow to optimize the chance to have PRs merged efficiently...
|
|||||||
|
|
||||||
Also, some code changes need a prior approbation:
|
Also, some code changes need a prior approbation:
|
||||||
|
|
||||||
* if you want to include a new external library (into htdocs/includes directory), please ask before to the core project manager (mention @dolibarr-yoda in your issue) to see if such a library can be accepted.
|
* if you want to include a new external library (into htdocs/includes directory), please ask before to the core project manager (mention @dolibarr-jedi in your issue) to see if such a library can be accepted.
|
||||||
|
|
||||||
* if you add a new table, you must first create a page on https://wiki.dolibarr.org/index.php/Category:Table_SQL (copy an existing page changing its name to see it into this index page). Then ask the project manager (@dolibarr-yoda) if the new data model you plan to add is compatible with curent and future works in progress and can be accepted as you suggest.
|
* if you add a new tables or fields, you MUST first submit a standalone PR with the data structure changes you plan to add/modify (and only data structure changes). Start development only once this data structure has been accepted.
|
||||||
|
|
||||||
Once a PR has been submitted, you may need to wait for its integration. It is common that the project leader let the PR open for a long delay to allow every developer discuss about the PR (A label is added in such a case).
|
Once a PR has been submitted, you may need to wait for its integration. It is common that the project leader let the PR open for a long delay to allow every developer discuss about the PR (A label is added in such a case).
|
||||||
|
|
||||||
If the label of PR start with "Draft" or "WIP" (Work In Progress), it will not be analyzed for merging until you change the label of PR (but it can be analyzed for discussion).
|
If the label of PR start with "Draft" or "WIP" (Work In Progress), it will not be analyzed for merging until you change the label of the PR (but it can be analyzed for discussion).
|
||||||
|
|
||||||
If your PR has errors reported by the Continuous Integration Platform, it means your PR is not valid and nothing will be done with it. It will be kept open to allow developers to fix this, or it may be closed several month later. Don't expect anything on your PR if you have such errors, you MUST first fix the Continuous Integration error to have it taken into consideration.
|
If your PR has errors reported by the Continuous Integration Platform, it means your PR is not valid and nothing will be done with it. It will be kept open to allow developers to fix this, or it may be closed several month later. Don't expect anything on your PR if you have such errors, you MUST first fix the Continuous Integration error to have it taken into consideration.
|
||||||
|
|
||||||
|
|||||||
2
.github/FUNDING.yml
vendored
2
.github/FUNDING.yml
vendored
@ -2,4 +2,4 @@
|
|||||||
|
|
||||||
open_collective: dolibarr
|
open_collective: dolibarr
|
||||||
custom: https://wiki.dolibarr.org/index.php/Subscribe
|
custom: https://wiki.dolibarr.org/index.php/Subscribe
|
||||||
# github: [eldy]
|
github: [eldy]
|
||||||
35
.github/ISSUE_TEMPLATE/bug_report.md
vendored
35
.github/ISSUE_TEMPLATE/bug_report.md
vendored
@ -1,35 +0,0 @@
|
|||||||
---
|
|
||||||
name: Bug report
|
|
||||||
about: Create a report to help us fix something that is broken
|
|
||||||
title: ''
|
|
||||||
labels: Bug
|
|
||||||
assignees: ''
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
# Instructions
|
|
||||||
*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
|
|
||||||
*Please:*
|
|
||||||
- *replace the bracket enclosed texts with meaningful information*
|
|
||||||
- *remove any unused sub-section*
|
|
||||||
|
|
||||||
|
|
||||||
# Bug
|
|
||||||
[*Short description*]
|
|
||||||
|
|
||||||
## Environment
|
|
||||||
- **Version**: [*Affected Dolibarr version(s)*]
|
|
||||||
- **OS**: [*Server OS type and version*]
|
|
||||||
- **Web server**: [*Webserver type and version*]
|
|
||||||
- **PHP**: [*PHP version*]
|
|
||||||
- **Database**: [*Database type and version*]
|
|
||||||
- **URL(s)**: [*Affected URL(s)*]
|
|
||||||
|
|
||||||
## Expected and actual behavior
|
|
||||||
[*Verbose description*]
|
|
||||||
|
|
||||||
## Steps to reproduce the behavior
|
|
||||||
[*Verbose description*]
|
|
||||||
|
|
||||||
## [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging informations…)
|
|
||||||
[*Files*]
|
|
||||||
71
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
Normal file
71
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
name: Bug report
|
||||||
|
description: Create a report to help us fix something that is broken
|
||||||
|
labels: ["Bug"]
|
||||||
|
|
||||||
|
body:
|
||||||
|
- type: markdown
|
||||||
|
attributes:
|
||||||
|
value: |
|
||||||
|
This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.
|
||||||
|
|
||||||
|
- type: textarea
|
||||||
|
id: bug
|
||||||
|
attributes:
|
||||||
|
label: Bug
|
||||||
|
description: Please give a short description of the bug
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
|
||||||
|
- type: input
|
||||||
|
id: environment-version
|
||||||
|
attributes:
|
||||||
|
label: Environment Version
|
||||||
|
description: Affected Dolibarr version(s)
|
||||||
|
|
||||||
|
- type: input
|
||||||
|
id: environment-os
|
||||||
|
attributes:
|
||||||
|
label: Environment OS
|
||||||
|
description: Server OS type and version
|
||||||
|
|
||||||
|
- type: input
|
||||||
|
id: environment-webserver
|
||||||
|
attributes:
|
||||||
|
label: Environment Web server
|
||||||
|
description: Webserver type and version
|
||||||
|
|
||||||
|
- type: input
|
||||||
|
id: environment-php
|
||||||
|
attributes:
|
||||||
|
label: Environment PHP
|
||||||
|
description: PHP version
|
||||||
|
|
||||||
|
- type: input
|
||||||
|
id: environment-database
|
||||||
|
attributes:
|
||||||
|
label: Environment Database
|
||||||
|
description: Database type and version
|
||||||
|
|
||||||
|
- type: input
|
||||||
|
id: environment-urls
|
||||||
|
attributes:
|
||||||
|
label: Environment URL(s)
|
||||||
|
description: Affected URL(s)
|
||||||
|
|
||||||
|
- type: textarea
|
||||||
|
id: expected-behaviour
|
||||||
|
attributes:
|
||||||
|
label: Expected and actual behavior
|
||||||
|
description: Verbose description
|
||||||
|
|
||||||
|
- type: textarea
|
||||||
|
id: reproduce
|
||||||
|
attributes:
|
||||||
|
label: Steps to reproduce the behavior
|
||||||
|
description: Verbose description
|
||||||
|
|
||||||
|
- type: textarea
|
||||||
|
id: files
|
||||||
|
attributes:
|
||||||
|
label: Attached files
|
||||||
|
description: Screenshots, screencasts, dolibarr.log, debugging informations
|
||||||
27
.github/ISSUE_TEMPLATE/feature_request.md
vendored
27
.github/ISSUE_TEMPLATE/feature_request.md
vendored
@ -1,27 +0,0 @@
|
|||||||
---
|
|
||||||
name: Feature request
|
|
||||||
about: Suggest a new idea for this project
|
|
||||||
title: ''
|
|
||||||
labels: Feature request
|
|
||||||
assignees: ''
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
# Instructions
|
|
||||||
*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
|
|
||||||
*Please:*
|
|
||||||
- *replace the bracket enclosed texts with meaningful information*
|
|
||||||
- *remove any unused sub-section*
|
|
||||||
|
|
||||||
|
|
||||||
# Feature Request
|
|
||||||
[*Short description*]
|
|
||||||
|
|
||||||
## Use case
|
|
||||||
[*Verbose description*]
|
|
||||||
|
|
||||||
## Suggested implementation
|
|
||||||
[*Verbose description*]
|
|
||||||
|
|
||||||
## Suggested steps
|
|
||||||
[*List of tasks to achieve goal*]
|
|
||||||
35
.github/ISSUE_TEMPLATE/feature_request.yml
vendored
Normal file
35
.github/ISSUE_TEMPLATE/feature_request.yml
vendored
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
name: Feature request
|
||||||
|
description: Suggest a new idea for this project
|
||||||
|
labels: ["Feature request"]
|
||||||
|
|
||||||
|
body:
|
||||||
|
- type: markdown
|
||||||
|
attributes:
|
||||||
|
value: |
|
||||||
|
This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.
|
||||||
|
|
||||||
|
- type: textarea
|
||||||
|
id: feature-request
|
||||||
|
attributes:
|
||||||
|
label: Feature Request
|
||||||
|
description: Short description
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
|
||||||
|
- type: textarea
|
||||||
|
id: use-case
|
||||||
|
attributes:
|
||||||
|
label: Use case
|
||||||
|
description: Verbose description
|
||||||
|
|
||||||
|
- type: textarea
|
||||||
|
id: suggested-implementation
|
||||||
|
attributes:
|
||||||
|
label: Suggested implementation
|
||||||
|
description: Verbose description
|
||||||
|
|
||||||
|
- type: textarea
|
||||||
|
id: suggested-steps
|
||||||
|
attributes:
|
||||||
|
label: Suggested steps
|
||||||
|
description: List of tasks to achieve goal
|
||||||
10
.github/PULL_REQUEST_TEMPLATE.md
vendored
10
.github/PULL_REQUEST_TEMPLATE.md
vendored
@ -1,18 +1,18 @@
|
|||||||
# Instructions
|
# Instructions
|
||||||
*This is a template to help you make good pull requests. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
|
*This is a template to help you make good pull requests. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
|
||||||
*Please:*
|
*Please:*
|
||||||
- *only keep the "Fix", "Close" or "New" section*
|
- *only keep the "FIX", "CLOSE" or "NEW" section* (use uppercase to have the PR appears into the ChangeLog, lowercase will not appears)
|
||||||
- *follow the project [contributing guidelines](/.github/CONTRIBUTING.md)*
|
- *follow the project [contributing guidelines](/.github/CONTRIBUTING.md)*
|
||||||
- *replace the bracket enclosed textswith meaningful informations*
|
- *replace the bracket enclosed texts with meaningful information*
|
||||||
|
|
||||||
|
|
||||||
# Fix #[*issue_number Short description*]
|
# FIX|Fix #[*issue_number Short description*]
|
||||||
[*Long description*]
|
[*Long description*]
|
||||||
|
|
||||||
|
|
||||||
# Close #[*issue_number Short description*]
|
# CLOSE|Close #[*issue_number Short description*]
|
||||||
[*Long description*]
|
[*Long description*]
|
||||||
|
|
||||||
|
|
||||||
# New [*Short description*]
|
# NEW|New [*Short description*]
|
||||||
[*Long description*]
|
[*Long description*]
|
||||||
|
|||||||
6
.github/dependabot.yml
vendored
Normal file
6
.github/dependabot.yml
vendored
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
version: 2
|
||||||
|
updates:
|
||||||
|
- package-ecosystem: "github-actions"
|
||||||
|
directory: "/"
|
||||||
|
schedule:
|
||||||
|
interval: "weekly"
|
||||||
5
.github/workflows/exakat.yml
vendored
5
.github/workflows/exakat.yml
vendored
@ -5,11 +5,14 @@ on:
|
|||||||
schedule:
|
schedule:
|
||||||
- cron: "0 20 * * *"
|
- cron: "0 20 * * *"
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
exakat:
|
exakat:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
- name: Exakat
|
- name: Exakat
|
||||||
uses: docker://exakat/exakat-ga
|
uses: docker://exakat/exakat-ga
|
||||||
with:
|
with:
|
||||||
|
|||||||
4
.github/workflows/stale-issues-safe.yml
vendored
4
.github/workflows/stale-issues-safe.yml
vendored
@ -7,8 +7,12 @@ on:
|
|||||||
issue_comment:
|
issue_comment:
|
||||||
types: [created]
|
types: [created]
|
||||||
|
|
||||||
|
permissions: {} # none
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
stale:
|
stale:
|
||||||
|
permissions:
|
||||||
|
issues: write
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: Dolibarr/stale@staleunstale
|
- uses: Dolibarr/stale@staleunstale
|
||||||
|
|||||||
3
.gitignore
vendored
3
.gitignore
vendored
@ -42,6 +42,8 @@ htdocs/includes/sebastian/
|
|||||||
htdocs/includes/squizlabs/
|
htdocs/includes/squizlabs/
|
||||||
htdocs/includes/webmozart/
|
htdocs/includes/webmozart/
|
||||||
htdocs/.well-known/apple-developer-merchantid-domain-association
|
htdocs/.well-known/apple-developer-merchantid-domain-association
|
||||||
|
/factory/
|
||||||
|
/output/
|
||||||
|
|
||||||
# Node Modules
|
# Node Modules
|
||||||
build/yarn-error.log
|
build/yarn-error.log
|
||||||
@ -55,4 +57,3 @@ yarn.lock
|
|||||||
package-lock.json
|
package-lock.json
|
||||||
|
|
||||||
doc/install.lock
|
doc/install.lock
|
||||||
/factory/
|
|
||||||
|
|||||||
@ -6,7 +6,8 @@ build:
|
|||||||
analysis:
|
analysis:
|
||||||
tests:
|
tests:
|
||||||
override:
|
override:
|
||||||
- php-scrutinizer-run
|
- command: php-scrutinizer-run
|
||||||
|
idle_timeout: 8000
|
||||||
|
|
||||||
imports:
|
imports:
|
||||||
- javascript
|
- javascript
|
||||||
@ -18,9 +19,10 @@ filter:
|
|||||||
- dev/*
|
- dev/*
|
||||||
- doc/*
|
- doc/*
|
||||||
- documents/*
|
- documents/*
|
||||||
- htdocs/includes/*
|
|
||||||
- node_modules/*
|
- node_modules/*
|
||||||
- test/*
|
- test/*
|
||||||
|
dependency_paths:
|
||||||
|
- htdocs/includes/*
|
||||||
paths:
|
paths:
|
||||||
- htdocs/*
|
- htdocs/*
|
||||||
- scripts/*
|
- scripts/*
|
||||||
@ -38,9 +40,11 @@ tools:
|
|||||||
- build/*
|
- build/*
|
||||||
- dev/*
|
- dev/*
|
||||||
- doc/*
|
- doc/*
|
||||||
- test/*
|
- documents/*
|
||||||
- htdocs/includes/*
|
- htdocs/includes/*
|
||||||
- htdocs/core/class/lessc.class.php
|
- htdocs/core/class/lessc.class.php
|
||||||
|
- node_modules/*
|
||||||
|
- test/*
|
||||||
paths:
|
paths:
|
||||||
- htdocs/
|
- htdocs/
|
||||||
- scripts/
|
- scripts/
|
||||||
@ -180,8 +184,10 @@ tools:
|
|||||||
- 'build/*'
|
- 'build/*'
|
||||||
- 'dev/*'
|
- 'dev/*'
|
||||||
- 'doc/*'
|
- 'doc/*'
|
||||||
- 'test/*'
|
- 'documents/*'
|
||||||
- 'htdocs/includes/*'
|
- 'htdocs/includes/*'
|
||||||
|
- 'node_modules/*'
|
||||||
|
- 'test/*'
|
||||||
paths: { }
|
paths: { }
|
||||||
|
|
||||||
# Similar code detection
|
# Similar code detection
|
||||||
@ -193,8 +199,10 @@ tools:
|
|||||||
- 'build/*'
|
- 'build/*'
|
||||||
- 'dev/*'
|
- 'dev/*'
|
||||||
- 'doc/*'
|
- 'doc/*'
|
||||||
- 'test/*'
|
- 'documents/*'
|
||||||
- 'htdocs/includes/*'
|
- 'htdocs/includes/*'
|
||||||
|
- 'node_modules/*'
|
||||||
|
- 'test/*'
|
||||||
paths: { }
|
paths: { }
|
||||||
|
|
||||||
# Coding-Style / Bug Detection
|
# Coding-Style / Bug Detection
|
||||||
@ -208,8 +216,10 @@ tools:
|
|||||||
- 'build/*'
|
- 'build/*'
|
||||||
- 'dev/*'
|
- 'dev/*'
|
||||||
- 'doc/*'
|
- 'doc/*'
|
||||||
- 'test/*'
|
- 'documents/*'
|
||||||
- 'htdocs/includes/*'
|
- 'htdocs/includes/*'
|
||||||
|
- 'node_modules/*'
|
||||||
|
- 'test/*'
|
||||||
paths: { }
|
paths: { }
|
||||||
config: { }
|
config: { }
|
||||||
path_configs: { }
|
path_configs: { }
|
||||||
|
|||||||
124
.travis.yml
124
.travis.yml
@ -2,10 +2,9 @@
|
|||||||
# from Dolibarr GitHub repository.
|
# from Dolibarr GitHub repository.
|
||||||
# For syntax, see https://docs.travis-ci.com/user/languages/php/
|
# For syntax, see https://docs.travis-ci.com/user/languages/php/
|
||||||
|
|
||||||
# We use dist: xenial to have php 5.6+ available
|
# We use dist: bionic = 18.04
|
||||||
os: linux
|
os: linux
|
||||||
dist: xenial
|
dist: bionic
|
||||||
#dist: bionic
|
|
||||||
|
|
||||||
language: php
|
language: php
|
||||||
|
|
||||||
@ -18,21 +17,42 @@ services:
|
|||||||
- mysql
|
- mysql
|
||||||
- postgresql
|
- postgresql
|
||||||
|
|
||||||
|
|
||||||
|
before_install:
|
||||||
|
- |
|
||||||
|
echo "Add ondrej PPA"
|
||||||
|
sudo add-apt-repository -y ppa:ondrej/php
|
||||||
|
sudo apt-get update
|
||||||
|
echo "Disabling Xdebug for composer"
|
||||||
|
export PHP_VERSION_NAME=$(phpenv version-name)
|
||||||
|
echo $PHP_VERSION_NAME
|
||||||
|
ls ~/.phpenv/versions/$PHP_VERSION_NAME/etc/conf.d/
|
||||||
|
cp ~/.phpenv/versions/$PHP_VERSION_NAME/etc/conf.d/xdebug.ini /tmp/xdebug.ini
|
||||||
|
phpenv config-rm xdebug.ini
|
||||||
|
phpenv rehash
|
||||||
|
echo
|
||||||
|
|
||||||
addons:
|
addons:
|
||||||
# Force postgresql to 9.4 (the oldest availablable on xenial)
|
# Force postgresql version
|
||||||
postgresql: '9.4'
|
postgresql: '10'
|
||||||
apt:
|
apt:
|
||||||
sources:
|
sources:
|
||||||
# To use the last version of pgloader, we add repo of postgresql with a name available in http://apt.postgresql.org/pub/repos/apt/
|
- sourceline: 'ppa:ondrej/php'
|
||||||
- pgdg-xenial
|
|
||||||
packages:
|
packages:
|
||||||
# We need a webserver to test the webservices
|
# We need a webserver to test the webservices
|
||||||
# Let's install Apache with.
|
# Let's install Apache with.
|
||||||
- apache2
|
- apache2
|
||||||
# mod_php is not supported by Travis. Add fcgi. We install FPM later on.
|
|
||||||
- libapache2-mod-fastcgi
|
|
||||||
# We need pgloader for import mysql database into pgsql
|
# We need pgloader for import mysql database into pgsql
|
||||||
- pgloader
|
- pgloader
|
||||||
|
- php
|
||||||
|
- php7.1-pgsql
|
||||||
|
- php7.1-mysqli
|
||||||
|
- php7.1-xml
|
||||||
|
- php7.1-intl
|
||||||
|
- php8.1-pgsql
|
||||||
|
- php8.1-mysqli
|
||||||
|
- php8.1-xml
|
||||||
|
- php8.1-intl
|
||||||
|
|
||||||
env:
|
env:
|
||||||
global:
|
global:
|
||||||
@ -44,20 +64,20 @@ jobs:
|
|||||||
#allow_failures:
|
#allow_failures:
|
||||||
#- php: nightly
|
#- php: nightly
|
||||||
include:
|
include:
|
||||||
- stage: PHP 5.6-7.4
|
- stage: PHP 7.0-8.1
|
||||||
if: type = push
|
if: type = push
|
||||||
php: '5.6'
|
php: '7.1'
|
||||||
env: DB=postgresql
|
env: DB=postgresql
|
||||||
- stage: PHP 5.6-7.4
|
- stage: PHP 7.0-8.1
|
||||||
if: type = pull_request OR type = push
|
if: type = pull_request OR type = push
|
||||||
php: '7.4.22'
|
php: '8.1'
|
||||||
env: DB=mysql
|
env: DB=mysql
|
||||||
- stage: PHP Dev
|
- stage: PHP Dev
|
||||||
if: type = push AND branch = develop
|
if: type = push AND branch = develop
|
||||||
php: nightly
|
php: nightly
|
||||||
env: DB=mysql
|
env: DB=mysql
|
||||||
- stage: PHP Dev
|
- stage: PHP Dev
|
||||||
if: type = push AND branch = 14.0
|
if: type = push AND branch = 17.0
|
||||||
php: nightly
|
php: nightly
|
||||||
env: DB=mysql
|
env: DB=mysql
|
||||||
|
|
||||||
@ -72,13 +92,6 @@ notifications:
|
|||||||
on_failure: always
|
on_failure: always
|
||||||
use_notice: true
|
use_notice: true
|
||||||
|
|
||||||
before_install:
|
|
||||||
- |
|
|
||||||
echo "Disabling Xdebug for composer"
|
|
||||||
export PHP_VERSION_NAME=$(phpenv version-name)
|
|
||||||
cp ~/.phpenv/versions/$PHP_VERSION_NAME/etc/conf.d/xdebug.ini /tmp/xdebug.ini
|
|
||||||
phpenv config-rm xdebug.ini
|
|
||||||
echo
|
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- |
|
- |
|
||||||
@ -93,30 +106,27 @@ install:
|
|||||||
echo
|
echo
|
||||||
|
|
||||||
- |
|
- |
|
||||||
echo "Installing Composer dependencies - PHP Unit, Parallel Lint, PHP CodeSniffer - for $TRAVIS_PHP_VERSION"
|
echo "Installing Composer dependencies - PHP Unit, Parallel Lint, PHP CodeSniffer, PHP Vardump check - for $TRAVIS_PHP_VERSION"
|
||||||
if [ "$TRAVIS_PHP_VERSION" = '5.6' ]; then
|
|
||||||
composer -n require phpunit/phpunit ^5 \
|
|
||||||
php-parallel-lint/php-parallel-lint ^1 \
|
|
||||||
php-parallel-lint/php-console-highlighter ^0 \
|
|
||||||
squizlabs/php_codesniffer ^3
|
|
||||||
fi
|
|
||||||
if [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = '7.2' ]; then
|
if [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = '7.2' ]; then
|
||||||
composer -n require phpunit/phpunit ^6 \
|
composer -n require phpunit/phpunit ^6 \
|
||||||
php-parallel-lint/php-parallel-lint ^1 \
|
php-parallel-lint/php-parallel-lint ^1 \
|
||||||
php-parallel-lint/php-console-highlighter ^0 \
|
php-parallel-lint/php-console-highlighter ^0 \
|
||||||
|
php-parallel-lint/php-var-dump-check ~0.4 \
|
||||||
squizlabs/php_codesniffer ^3
|
squizlabs/php_codesniffer ^3
|
||||||
fi
|
fi
|
||||||
if [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = '7.4' ] || [ "$TRAVIS_PHP_VERSION" = '7.4.22' ]; then
|
if [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = '7.4' ]; then
|
||||||
composer -n require phpunit/phpunit ^7 \
|
composer -n require phpunit/phpunit ^7 \
|
||||||
php-parallel-lint/php-parallel-lint ^1.2 \
|
php-parallel-lint/php-parallel-lint ^1.2 \
|
||||||
php-parallel-lint/php-console-highlighter ^0 \
|
php-parallel-lint/php-console-highlighter ^0 \
|
||||||
|
php-parallel-lint/php-var-dump-check ~0.4 \
|
||||||
squizlabs/php_codesniffer ^3
|
squizlabs/php_codesniffer ^3
|
||||||
fi
|
fi
|
||||||
# phpunit 9 is required for php 8
|
# phpunit 9 is required for php 8
|
||||||
if [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
|
if [ "$TRAVIS_PHP_VERSION" = '8.0' ] || [ "$TRAVIS_PHP_VERSION" = '8.1' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
|
||||||
composer -n require --ignore-platform-reqs phpunit/phpunit ^7 \
|
composer -n require --ignore-platform-reqs phpunit/phpunit ^8 \
|
||||||
php-parallel-lint/php-parallel-lint ^1.2 \
|
php-parallel-lint/php-parallel-lint ^1.2 \
|
||||||
php-parallel-lint/php-console-highlighter ^0 \
|
php-parallel-lint/php-console-highlighter ^0 \
|
||||||
|
php-parallel-lint/php-var-dump-check ~0.4 \
|
||||||
squizlabs/php_codesniffer ^3
|
squizlabs/php_codesniffer ^3
|
||||||
fi
|
fi
|
||||||
echo
|
echo
|
||||||
@ -166,6 +176,10 @@ before_script:
|
|||||||
which phpcs
|
which phpcs
|
||||||
phpcs --version | head -
|
phpcs --version | head -
|
||||||
phpcs -i | head -
|
phpcs -i | head -
|
||||||
|
# Check PHP Vardump check version
|
||||||
|
echo "PHP Vardump check version"
|
||||||
|
which var_dump_check
|
||||||
|
var_dump_check --version
|
||||||
# Check PHPUnit version
|
# Check PHPUnit version
|
||||||
echo "PHPUnit version"
|
echo "PHPUnit version"
|
||||||
which phpunit
|
which phpunit
|
||||||
@ -238,17 +252,22 @@ before_script:
|
|||||||
|
|
||||||
|
|
||||||
- echo "Setting up Apache + FPM"
|
- echo "Setting up Apache + FPM"
|
||||||
|
# setup link for php legacy
|
||||||
|
- sudo ln -s ~/.phpenv/versions/$(phpenv version-name)/bin/php /bin/php
|
||||||
|
# install apache web server
|
||||||
|
- sudo apt-get install apache2 php-fpm php-mysql php-pgsql php-gd php-ldap php-xml php-mbstring libapache2-mod-php
|
||||||
# enable php-fpm
|
# enable php-fpm
|
||||||
- sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf
|
- sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf
|
||||||
- |
|
- |
|
||||||
if [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = '7.2' ] || [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = '7.4' ] || [ "$TRAVIS_PHP_VERSION" = '7.4.22' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
|
if [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = '7.2' ] || [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = '7.4' ] || [ "$TRAVIS_PHP_VERSION" = '8.0' ] || [ "$TRAVIS_PHP_VERSION" = '8.1' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
|
||||||
# Copy the included pool
|
# Copy the included pool
|
||||||
sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf
|
sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf
|
||||||
fi
|
fi
|
||||||
- sudo a2enmod rewrite actions fastcgi alias
|
- sudo a2enmod proxy_fcgi rewrite setenvif cgi alias
|
||||||
- echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
|
- echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
|
||||||
- sudo sed -i -e "s,www-data,travis,g" /etc/apache2/envvars
|
- sudo sed -i -e "s,www-data,travis,g" /etc/apache2/envvars
|
||||||
- sudo chown -R travis:travis /var/lib/apache2/fastcgi
|
#- sudo chown -R travis:travis /var/lib/apache2/fastcgi
|
||||||
|
# start php-fpm
|
||||||
- ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
|
- ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
|
||||||
# configure apache virtual hosts
|
# configure apache virtual hosts
|
||||||
- sudo cp -f build/travis-ci/apache.conf /etc/apache2/sites-available/000-default.conf
|
- sudo cp -f build/travis-ci/apache.conf /etc/apache2/sites-available/000-default.conf
|
||||||
@ -276,12 +295,12 @@ script:
|
|||||||
set -e
|
set -e
|
||||||
#parallel-lint --exclude htdocs/includes --blame .
|
#parallel-lint --exclude htdocs/includes --blame .
|
||||||
# Exclusions are defined in the ruleset.xml file
|
# Exclusions are defined in the ruleset.xml file
|
||||||
if [ "$TRAVIS_PHP_VERSION" = "7.4.22" ]; then
|
if [ "$TRAVIS_PHP_VERSION" = "8.1" ]; then
|
||||||
parallel-lint -e php --exclude dev/tools/test/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \
|
parallel-lint -e php --exclude dev/tools/test/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \
|
||||||
--exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian \
|
--exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian \
|
||||||
--exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/php-parallel-lint --exclude htdocs/includes/symfony \
|
--exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/php-parallel-lint --exclude htdocs/includes/symfony \
|
||||||
--exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/maximebf \
|
--exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/maximebf \
|
||||||
--exclude htdocs/includes/phpunit/ --exclude htdocs/includes/tecnickcom/tcpdf/include/barcodes --exclude htdocs/includes/webmozart --blame .
|
--exclude htdocs/includes/phpunit/ --exclude htdocs/includes/tecnickcom/tcpdf/include/barcodes --exclude htdocs/includes/webmozart --exclude htdocs/includes/webklex --blame .
|
||||||
fi
|
fi
|
||||||
set +e
|
set +e
|
||||||
echo
|
echo
|
||||||
@ -291,12 +310,23 @@ script:
|
|||||||
# Ensure we catch errors
|
# Ensure we catch errors
|
||||||
set -e
|
set -e
|
||||||
# Exclusions are defined in the ruleset.xml file
|
# Exclusions are defined in the ruleset.xml file
|
||||||
if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_PHP_VERSION" = "7.4.22" ]; then
|
if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_PHP_VERSION" = "8.1" ]; then
|
||||||
phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .;
|
phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .;
|
||||||
fi
|
fi
|
||||||
set +e
|
set +e
|
||||||
echo
|
echo
|
||||||
|
|
||||||
|
- |
|
||||||
|
echo "Checking missing debug"
|
||||||
|
# Ensure we catch errors
|
||||||
|
set -e
|
||||||
|
# Exclusions are defined in the ruleset.xml file
|
||||||
|
if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_PHP_VERSION" = "8.1" ]; then
|
||||||
|
var-dump-check --extensions php --tracy --exclude htdocs/includes --exclude test/ --exclude htdocs/public/test/ --exclude htdocs/core/lib/functions.lib.php .
|
||||||
|
fi
|
||||||
|
set +e
|
||||||
|
echo
|
||||||
|
|
||||||
- |
|
- |
|
||||||
export INSTALL_FORCED_FILE=htdocs/install/install.forced.php
|
export INSTALL_FORCED_FILE=htdocs/install/install.forced.php
|
||||||
echo "Setting up Dolibarr $INSTALL_FORCED_FILE to test installation"
|
echo "Setting up Dolibarr $INSTALL_FORCED_FILE to test installation"
|
||||||
@ -411,6 +441,15 @@ script:
|
|||||||
php upgrade.php 13.0.0 14.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade13001400.log
|
php upgrade.php 13.0.0 14.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade13001400.log
|
||||||
php upgrade2.php 13.0.0 14.0.0 > $TRAVIS_BUILD_DIR/upgrade13001400-2.log
|
php upgrade2.php 13.0.0 14.0.0 > $TRAVIS_BUILD_DIR/upgrade13001400-2.log
|
||||||
php step5.php 13.0.0 14.0.0 > $TRAVIS_BUILD_DIR/upgrade13001400-3.log
|
php step5.php 13.0.0 14.0.0 > $TRAVIS_BUILD_DIR/upgrade13001400-3.log
|
||||||
|
php upgrade.php 14.0.0 15.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade14001500.log
|
||||||
|
php upgrade2.php 14.0.0 15.0.0 > $TRAVIS_BUILD_DIR/upgrade14001500-2.log
|
||||||
|
php step5.php 14.0.0 15.0.0 > $TRAVIS_BUILD_DIR/upgrade14001500-3.log
|
||||||
|
php upgrade.php 15.0.0 16.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade15001600.log
|
||||||
|
php upgrade2.php 15.0.0 16.0.0 > $TRAVIS_BUILD_DIR/upgrade15001600-2.log
|
||||||
|
php step5.php 15.0.0 16.0.0 > $TRAVIS_BUILD_DIR/upgrade15001600-3.log
|
||||||
|
php upgrade.php 16.0.0 17.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade16001700.log
|
||||||
|
php upgrade2.php 16.0.0 17.0.0 > $TRAVIS_BUILD_DIR/upgrade16001700-2.log
|
||||||
|
php step5.php 16.0.0 17.0.0 > $TRAVIS_BUILD_DIR/upgrade16001700-3.log
|
||||||
ls -alrt $TRAVIS_BUILD_DIR/
|
ls -alrt $TRAVIS_BUILD_DIR/
|
||||||
|
|
||||||
- |
|
- |
|
||||||
@ -443,6 +482,9 @@ after_script:
|
|||||||
ls $TRAVIS_BUILD_DIR/documents
|
ls $TRAVIS_BUILD_DIR/documents
|
||||||
#cat $TRAVIS_BUILD_DIR/documents/dolibarr.log
|
#cat $TRAVIS_BUILD_DIR/documents/dolibarr.log
|
||||||
sudo tail -n 50 $TRAVIS_BUILD_DIR/documents/dolibarr.log
|
sudo tail -n 50 $TRAVIS_BUILD_DIR/documents/dolibarr.log
|
||||||
|
echo "After script - Output last lines of apache error.log"
|
||||||
|
sudo ls /var/log/apache2
|
||||||
|
sudo tail -n 50 /var/log/apache2/travis_error_log
|
||||||
|
|
||||||
after_success:
|
after_success:
|
||||||
- |
|
- |
|
||||||
@ -451,16 +493,16 @@ after_success:
|
|||||||
after_failure:
|
after_failure:
|
||||||
- |
|
- |
|
||||||
echo Failure detected, so we show samples of log to help diagnose
|
echo Failure detected, so we show samples of log to help diagnose
|
||||||
# This part of code is executed only if previous command that fails are enclosed with set +e
|
# This part of code is executed only if the command that fails are enclosed with set +e
|
||||||
# Upgrade log files
|
# Show upgrade log files
|
||||||
for ficlog in `ls $TRAVIS_BUILD_DIR/*.log`
|
for ficlog in `ls $TRAVIS_BUILD_DIR/*.log`
|
||||||
do
|
do
|
||||||
echo "Debugging informations for file $ficlog"
|
echo "Debugging informations for file $ficlog"
|
||||||
#cat $ficlog
|
#cat $ficlog
|
||||||
done
|
done
|
||||||
# Apache log file
|
# Show Apache log file
|
||||||
echo "Debugging informations for file apache error.log"
|
echo "Debugging informations for file apache error.log"
|
||||||
sudo cat /var/log/apache2/travis_error_log
|
sudo tail -n 50 /var/log/apache2/travis_error_log
|
||||||
if [ "$DEBUG" = true ]; then
|
if [ "$DEBUG" = true ]; then
|
||||||
# Dolibarr log file
|
# Dolibarr log file
|
||||||
echo "Debugging informations for file dolibarr.log (latest 50 lines)"
|
echo "Debugging informations for file dolibarr.log (latest 50 lines)"
|
||||||
|
|||||||
42
.tx/config
42
.tx/config
@ -98,6 +98,12 @@ source_file = htdocs/langs/en_US/cron.lang
|
|||||||
source_lang = en_US
|
source_lang = en_US
|
||||||
type = MOZILLAPROPERTIES
|
type = MOZILLAPROPERTIES
|
||||||
|
|
||||||
|
[dolibarr.datapolicy]
|
||||||
|
file_filter = htdocs/langs/<lang>/datapolicy.lang
|
||||||
|
source_file = htdocs/langs/en_US/datapolicy.lang
|
||||||
|
source_lang = en_US
|
||||||
|
type = MOZILLAPROPERTIES
|
||||||
|
|
||||||
[dolibarr.deliveries]
|
[dolibarr.deliveries]
|
||||||
file_filter = htdocs/langs/<lang>/deliveries.lang
|
file_filter = htdocs/langs/<lang>/deliveries.lang
|
||||||
source_file = htdocs/langs/en_US/deliveries.lang
|
source_file = htdocs/langs/en_US/deliveries.lang
|
||||||
@ -140,18 +146,6 @@ source_file = htdocs/langs/en_US/exports.lang
|
|||||||
source_lang = en_US
|
source_lang = en_US
|
||||||
type = MOZILLAPROPERTIES
|
type = MOZILLAPROPERTIES
|
||||||
|
|
||||||
[dolibarr.externalsite]
|
|
||||||
file_filter = htdocs/langs/<lang>/externalsite.lang
|
|
||||||
source_file = htdocs/langs/en_US/externalsite.lang
|
|
||||||
source_lang = en_US
|
|
||||||
type = MOZILLAPROPERTIES
|
|
||||||
|
|
||||||
[dolibarr.ftp]
|
|
||||||
file_filter = htdocs/langs/<lang>/ftp.lang
|
|
||||||
source_file = htdocs/langs/en_US/ftp.lang
|
|
||||||
source_lang = en_US
|
|
||||||
type = MOZILLAPROPERTIES
|
|
||||||
|
|
||||||
[dolibarr.help]
|
[dolibarr.help]
|
||||||
file_filter = htdocs/langs/<lang>/help.lang
|
file_filter = htdocs/langs/<lang>/help.lang
|
||||||
source_file = htdocs/langs/en_US/help.lang
|
source_file = htdocs/langs/en_US/help.lang
|
||||||
@ -170,12 +164,6 @@ source_file = htdocs/langs/en_US/hrm.lang
|
|||||||
source_lang = en_US
|
source_lang = en_US
|
||||||
type = MOZILLAPROPERTIES
|
type = MOZILLAPROPERTIES
|
||||||
|
|
||||||
[dolibarr.intracommreport]
|
|
||||||
file_filter = htdocs/langs/<lang>/intracommreport.lang
|
|
||||||
source_file = htdocs/langs/en_US/intracommreport.lang
|
|
||||||
source_lang = en_US
|
|
||||||
type = MOZILLAPROPERTIES
|
|
||||||
|
|
||||||
[dolibarr.install]
|
[dolibarr.install]
|
||||||
file_filter = htdocs/langs/<lang>/install.lang
|
file_filter = htdocs/langs/<lang>/install.lang
|
||||||
source_file = htdocs/langs/en_US/install.lang
|
source_file = htdocs/langs/en_US/install.lang
|
||||||
@ -188,6 +176,12 @@ source_file = htdocs/langs/en_US/interventions.lang
|
|||||||
source_lang = en_US
|
source_lang = en_US
|
||||||
type = MOZILLAPROPERTIES
|
type = MOZILLAPROPERTIES
|
||||||
|
|
||||||
|
[dolibarr.intracommreport]
|
||||||
|
file_filter = htdocs/langs/<lang>/intracommreport.lang
|
||||||
|
source_file = htdocs/langs/en_US/intracommreport.lang
|
||||||
|
source_lang = en_US
|
||||||
|
type = MOZILLAPROPERTIES
|
||||||
|
|
||||||
[dolibarr.knowledgemanagement]
|
[dolibarr.knowledgemanagement]
|
||||||
file_filter = htdocs/langs/<lang>/knowledgemanagement.lang
|
file_filter = htdocs/langs/<lang>/knowledgemanagement.lang
|
||||||
source_file = htdocs/langs/en_US/knowledgemanagement.lang
|
source_file = htdocs/langs/en_US/knowledgemanagement.lang
|
||||||
@ -392,18 +386,18 @@ source_file = htdocs/langs/en_US/stripe.lang
|
|||||||
source_lang = en_US
|
source_lang = en_US
|
||||||
type = MOZILLAPROPERTIES
|
type = MOZILLAPROPERTIES
|
||||||
|
|
||||||
[dolibarr.suppliers]
|
|
||||||
file_filter = htdocs/langs/<lang>/suppliers.lang
|
|
||||||
source_file = htdocs/langs/en_US/suppliers.lang
|
|
||||||
source_lang = en_US
|
|
||||||
type = MOZILLAPROPERTIES
|
|
||||||
|
|
||||||
[dolibarr.supplier_proposal]
|
[dolibarr.supplier_proposal]
|
||||||
file_filter = htdocs/langs/<lang>/supplier_proposal.lang
|
file_filter = htdocs/langs/<lang>/supplier_proposal.lang
|
||||||
source_file = htdocs/langs/en_US/supplier_proposal.lang
|
source_file = htdocs/langs/en_US/supplier_proposal.lang
|
||||||
source_lang = en_US
|
source_lang = en_US
|
||||||
type = MOZILLAPROPERTIES
|
type = MOZILLAPROPERTIES
|
||||||
|
|
||||||
|
[dolibarr.suppliers]
|
||||||
|
file_filter = htdocs/langs/<lang>/suppliers.lang
|
||||||
|
source_file = htdocs/langs/en_US/suppliers.lang
|
||||||
|
source_lang = en_US
|
||||||
|
type = MOZILLAPROPERTIES
|
||||||
|
|
||||||
[dolibarr.ticket]
|
[dolibarr.ticket]
|
||||||
file_filter = htdocs/langs/<lang>/ticket.lang
|
file_filter = htdocs/langs/<lang>/ticket.lang
|
||||||
source_file = htdocs/langs/en_US/ticket.lang
|
source_file = htdocs/langs/en_US/ticket.lang
|
||||||
|
|||||||
19
COPYRIGHT
19
COPYRIGHT
@ -23,35 +23,36 @@ Licence of dependencies of third-party components used by Dolibarr (all compatib
|
|||||||
Component Version License GPL Compatible Usage
|
Component Version License GPL Compatible Usage
|
||||||
-------------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------------
|
||||||
PHP libraries:
|
PHP libraries:
|
||||||
ADOdb-Date 0.36 Modified BSD License Yes Date convertion (not into rpm package)
|
|
||||||
CKEditor 4.12.1 LGPL-2.1+ Yes Editor WYSIWYG
|
|
||||||
EvalMath 1.0 BSD Yes Safe math expressions evaluation
|
EvalMath 1.0 BSD Yes Safe math expressions evaluation
|
||||||
Escpos-php 2.2 MIT License Yes Thermal receipt printer library, for use with ESC/POS compatible printers
|
Escpos-php 2.2 MIT License Yes Thermal receipt printer library, for use with ESC/POS compatible printers
|
||||||
GeoIP2 0.2.0 Apache License 2.0 Yes Lib to make geoip convert
|
GeoIP2 0.2.0 Apache License 2.0 Yes Lib to make geoip convert
|
||||||
Mobiledetect 2.8.34 MIT License Yes Detect mobile devices browsers
|
Mobiledetect 2.8.39 MIT License Yes Detect mobile devices browsers
|
||||||
NuSoap 0.9.5 LGPL 2.1+ Yes Library to develop SOAP Web services (not into rpm and deb package)
|
NuSoap 0.9.5 LGPL 2.1+ Yes Library to develop SOAP Web services (not into rpm and deb package)
|
||||||
PEAR Mail_MIME 1.8.9 BSD Yes NuSoap dependency
|
PEAR Mail_MIME 1.8.9 BSD Yes NuSoap dependency
|
||||||
ParseDown 1.6 MIT License Yes Markdown parser
|
ParseDown 1.6 MIT License Yes Markdown parser
|
||||||
PCLZip 2.8.4 LGPL-3+ Yes Library to zip/unzip files
|
PCLZip 2.8.4 LGPL-3+ Yes Library to zip/unzip files
|
||||||
PHPDebugBar 1.15.1 MIT License Yes Used only by the module "debugbar" for developers
|
PHPDebugBar 1.15.1 MIT License Yes Used only by the module "debugbar" for developers
|
||||||
|
PHP-Imap 2.7.2 MIT License Yes Library to use IMAP with OAuth
|
||||||
PHPSpreadSheet 1.8.2 LGPL-2.1+ Yes Read/Write XLS files, read ODS files
|
PHPSpreadSheet 1.8.2 LGPL-2.1+ Yes Read/Write XLS files, read ODS files
|
||||||
php-iban 1.4.7 LGPL-3+ Yes Parse and validate IBAN (and IIBAN) bank account information in PHP
|
php-iban 4.1.1 LGPL-3+ Yes Parse and validate IBAN (and IIBAN) bank account information in PHP
|
||||||
PHPoAuthLib 0.8.2 MIT License Yes Library to provide oauth1 and oauth2 to different service
|
PHPoAuthLib 0.8.2 MIT License Yes Library to provide oauth1 and oauth2 to different service
|
||||||
PHPPrintIPP 1.3 GPL-2+ Yes Library to send print IPP requests
|
PHPPrintIPP 1.3 GPL-2+ Yes Library to send print IPP requests
|
||||||
PSR/Logs 1.0 Library for logs (used by DebugBar)
|
PSR/Logs 1.0 MIT License Yes Library for logs (used by DebugBar)
|
||||||
PSR/simple-cache ? MIT License Yes Library for cache (used by PHPSpreadSheet)
|
PSR/simple-cache ? MIT License Yes Library for cache (used by PHPSpreadSheet)
|
||||||
Restler 3.1.1 LGPL-3+ Yes Library to develop REST Web services (+ swagger-ui js lib into dir explorer)
|
Restler 3.1.1 LGPL-3+ Yes Library to develop REST Web services (+ swagger-ui js lib into dir explorer)
|
||||||
Sabre 3.2.2 BSD Yes DAV support
|
Sabre 3.2.2 BSD Yes DAV support
|
||||||
Swift Mailer 5.4.2-DEV MIT License Yes Comprehensive mailing tools for PHP
|
Swift Mailer 5.4.2-DEV MIT License Yes Comprehensive mailing tools for PHP
|
||||||
|
Symfony/var-dumper ??? MIT License Yes Library to make var dump (used by DebugBar)
|
||||||
Stripe 7.67.0 MIT Licence Yes Library for Stripe module
|
Stripe 7.67.0 MIT Licence Yes Library for Stripe module
|
||||||
TCPDF 6.3.2 LGPL-3+ Yes PDF generation
|
TCPDF 6.3.2 LGPL-3+ Yes PDF generation
|
||||||
TCPDI 1.0.0 LGPL-3+ / Apache 2.0 Yes FPDI replacement
|
TCPDI 1.0.0 LGPL-3+ / Apache 2.0 Yes FPDI replacement
|
||||||
|
|
||||||
JS libraries:
|
JS libraries:
|
||||||
Ace 1.4.8 BSD Yes JS library to get code syntaxique coloration in a textarea.
|
Ace 1.4.14 BSD Yes JS library to get code syntaxique coloration in a textarea.
|
||||||
ChartJS 2.9.4 MIT License Yes JS library for graph
|
ChartJS 3.7.1 MIT License Yes JS library for graph
|
||||||
jQuery 3.5.1 MIT License Yes JS library
|
CKEditor 4.18 LGPL-2.1+ Yes Editor WYSIWYG
|
||||||
jQuery UI 1.12.1 GPL and MIT License Yes JS library plugin UI
|
jQuery 3.6.0 MIT License Yes JS library
|
||||||
|
jQuery UI 1.13.2 GPL and MIT License Yes JS library plugin UI
|
||||||
jQuery select2 4.0.13 GPL and Apache License Yes JS library plugin for sexier multiselect. Warning: 4.0.6+ create troubles without patching css
|
jQuery select2 4.0.13 GPL and Apache License Yes JS library plugin for sexier multiselect. Warning: 4.0.6+ create troubles without patching css
|
||||||
jQuery blockUI 2.70.0 GPL and MIT License Yes JS library plugin blockUI (to use ajax popups)
|
jQuery blockUI 2.70.0 GPL and MIT License Yes JS library plugin blockUI (to use ajax popups)
|
||||||
jQuery Colorpicker 1.1 MIT License Yes JS library for color picker for a defined list of colors
|
jQuery Colorpicker 1.1 MIT License Yes JS library for color picker for a defined list of colors
|
||||||
|
|||||||
917
ChangeLog
917
ChangeLog
@ -3,6 +3,912 @@ English Dolibarr ChangeLog
|
|||||||
--------------------------------------------------------------
|
--------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
***** ChangeLog for 17.0.0 compared to 16.0.0 *****
|
||||||
|
|
||||||
|
For users:
|
||||||
|
---------------
|
||||||
|
|
||||||
|
NEW: Minimal PHP version is now PHP 7.0 instead of PHP 5.6
|
||||||
|
NEW: #21750 Added "Get lines and Post lines from BOM" at the REST Service
|
||||||
|
NEW: #21780 Add pid field to Cronjob class and store PID on job execution
|
||||||
|
NEW: #19680 Add option PRODUCT_ALLOW_EXTERNAL_DOWNLOAD
|
||||||
|
NEW: #20650 can move the checkbox column on left (experimental option)
|
||||||
|
NEW: #21000 Added columns 'alias_name' on poject, supplier invoice, supplier order, supplier proposals and taks list
|
||||||
|
NEW: #21395 Added option for dark theme mode in display - color and theme
|
||||||
|
NEW: #21397 added option to auto define barcode numbers for third-parties in barcode module setup
|
||||||
|
NEW: #21399
|
||||||
|
NEW: #21442 Enhancement of module builder init
|
||||||
|
NEW: #21654 add bank account number used on invoices for debit
|
||||||
|
NEW: #21775 Template 03 manages send mails
|
||||||
|
NEW: #22048 Added notes to productlot module
|
||||||
|
NEW: #22298 Bank - Add salaries & vat in tab planned entries
|
||||||
|
NEW: #22328
|
||||||
|
NEW: #22370 Modulebuilder supports 'alwayseditable' (like extrafields)
|
||||||
|
NEW: #22424
|
||||||
|
NEW: #22500 member module set up made easier
|
||||||
|
NEW: #22527 projects and thirdparties can be viewed as conversation ("Message" view), like events/agenda.
|
||||||
|
NEW: #22546 can now set user supervisors using mass action in htdocs/user
|
||||||
|
NEW: #22594 can chose if VAT ID is unique or not for third parties
|
||||||
|
NEW: #22622 all partneships displayed on tab partnership of a thirdparty and member
|
||||||
|
NEW: #22676 massaction for updating product prices
|
||||||
|
NEW: #22735 Massaction to affect users on projects
|
||||||
|
NEW: #25594 can chose if VAT ID is unique or not for third parties
|
||||||
|
NEW: #4482 adding js to hide/show advanced option on the export data page
|
||||||
|
NEW: Accountancy - Add a graphic option to enable lettering function - FPC21
|
||||||
|
NEW: Accountancy - Add a way to clean some words when you generate thirdparty accounting account
|
||||||
|
NEW: Accountancy - Added an option during export to export or not the lettering FPC21
|
||||||
|
NEW: Accountancy - Manage supplier deposit with specific account
|
||||||
|
NEW: Accountancy - Model Digitaria - Add a way to clean some words when you generate thirdparty accounting account FPC22
|
||||||
|
NEW: Add a button "Test collect" in email collector
|
||||||
|
NEW: Add a constant to disallow modification of the product reference.
|
||||||
|
NEW: Add a method doAutoRenewContracts that can be used as a cron task.
|
||||||
|
NEW: Add " as enclosure by default for CSV export. Keep removing CR/LF.
|
||||||
|
NEW: add attached file in presend email form of thirdparty card
|
||||||
|
NEW: Add a way to enter LICENSE file content in property of website
|
||||||
|
NEW: Add badge in admin extrafields setup
|
||||||
|
NEW: add constant PROPAL_BYPASS_VALIDATED_STATUS
|
||||||
|
NEW: Add date event (!= date project) and location on event organization
|
||||||
|
NEW: Add employment anniversary in birthday box
|
||||||
|
NEW: Add extrafield type "IP" to store IP addresses
|
||||||
|
NEW: Add fail2ban rules examples to limit access to /public pages
|
||||||
|
NEW: Add filter "Product subject to lot/Serial" in stock per lot/serial
|
||||||
|
NEW: Add free membership amounts at the membership type level
|
||||||
|
NEW: Add hidden option MAIN_EMAIL_SUPPORT_ACK to restore Email ack checkbox (feature abandonned by mailers)
|
||||||
|
NEW: Add IMAP port setting on email collector module
|
||||||
|
NEW: Adding JAPAN Chart-of-Account and regions/departments
|
||||||
|
NEW: Adding NIF verification for Algeria
|
||||||
|
NEW: Add 4 other templates in website module
|
||||||
|
NEW: Add link to create an element from the category page
|
||||||
|
NEW: add margin infos to takepos invoice lines
|
||||||
|
NEW: Add max size send for "backup and link to mail" option
|
||||||
|
NEW: Add method httponly_accessforbidden()
|
||||||
|
NEW: Add more advices into the Setup security page
|
||||||
|
NEW: Add new global variable for keeping the previous signature information on proposale (case of reopen a proposale)
|
||||||
|
NEW: Add objectLink on expedition
|
||||||
|
NEW: Add oldcopy to Ticket so triggers intercepting TICKET_MODIFY have access to old values of the updated properties
|
||||||
|
NEW: Add option FICHINTER_ALLOW_EXTERNAL_DOWNLOAD
|
||||||
|
NEW: Add option --force on CLI cron_run_jobs.php
|
||||||
|
NEW: Add option "Show price on the generated documents for receptions"
|
||||||
|
NEW: Add performance index (name for company and contact) and llx_bank_url(url_id)
|
||||||
|
NEW: Add picto property on sub-module for paswword generation
|
||||||
|
NEW: Add price to product box in TakePOS
|
||||||
|
NEW: add redirect on action confirm addconsumedline and addproduceline
|
||||||
|
NEW: Add a new advanced permission "read price"
|
||||||
|
NEW: Add substitution key __SENDEREMAIL_SIGNATURE__
|
||||||
|
NEW: Add the referrer-policy to "same-origin" by default on all public pages.
|
||||||
|
NEW: Add the SMTP header References on ticket email created by email
|
||||||
|
NEW: Add the thirdparty column to the time list (projet/tasks/time.php)
|
||||||
|
NEW: Add trigger to record the event of sending an email from a project #20912
|
||||||
|
NEW: Allow download link option in module configuration (propal,invoice,supplier proposal, order)
|
||||||
|
NEW: Bank - Add salaries & vat in tab planned entries
|
||||||
|
NEW: Bulk action to remove a category in list/search website pages
|
||||||
|
NEW: Can copy/paste images into emails sent.
|
||||||
|
NEW: Can edit label of an emailing even once sent
|
||||||
|
NEW: Can edit property css, cssview, csslist on extrafields
|
||||||
|
NEW: Can enter the unit price including the vat
|
||||||
|
NEW: Can invoice task time per different services
|
||||||
|
NEW: Can join several files by default on email form
|
||||||
|
NEW: Can send an email on scheduled job error
|
||||||
|
NEW: Can set a commercial discount by entereing amount including VAT
|
||||||
|
NEW: Can set a monthly frequency (or multiple) in cron tasks.
|
||||||
|
NEW: Can set start and end dates and comment on button "Activate all services"
|
||||||
|
NEW: can sort and preselected best supplier price
|
||||||
|
NEW: Website Can delete a whole website if disabled
|
||||||
|
NEW: Website Can remove a website template
|
||||||
|
NEW: Website can set header "Strict-Transport-Security" in web sites.
|
||||||
|
NEW: Website Can switch status of website and page from the website toolbar
|
||||||
|
NEW: Website Templates of websites are now directories and not zip into core repo
|
||||||
|
NEW: Can use products categories to make inventory
|
||||||
|
NEW: Change filter type on tickets list into a multiselect combo
|
||||||
|
NEW: conf TIMESPENT_ALWAYS_UPDATE_THM, when it's on we always check current thm of user to update it in task time line
|
||||||
|
NEW: constant PROPAL_NEW_AS_SIGNED
|
||||||
|
NEW: show date delivery planned on orders linked to company and product
|
||||||
|
NEW: default_lang for members
|
||||||
|
NEW: Default template of contract is not mandatory
|
||||||
|
NEW: Default values in extrafields are not more limited to 255 char.
|
||||||
|
NEW: display currency in takepos menu
|
||||||
|
NEW: Enable online signature for interventions
|
||||||
|
NEW: Encrypt all sensitive constants in llx_const
|
||||||
|
NEW: extrafield price with currency
|
||||||
|
NEW: filter on reception dates (from / to) in cheque paiement card
|
||||||
|
NEW: TakePOS Header Scroll in TakePOS
|
||||||
|
NEW: TakePOS Add setup parameters, can setup terminal name
|
||||||
|
NEW: TakePOS support of Stripe Terminal with Takepos
|
||||||
|
NEW: TakePOS Receipt preview in TakePOS setup
|
||||||
|
NEW: TakePOS different product list on smartphone
|
||||||
|
NEW: If we select another view list mode, we keep it
|
||||||
|
NEW: Init module bookcal
|
||||||
|
NEW: Introduce dolEncrypt and dolDecrypt to be able to encrypt data in db
|
||||||
|
NEW: Invoice - Add french mention on pdf when vat debit option is on
|
||||||
|
NEW: invoice export : add accounting affectation
|
||||||
|
NEW: label on products categories filter
|
||||||
|
NEW: The link "add to bookmark" is always on top in the bookmark popup
|
||||||
|
NEW: MAIN_SEARCH_CATEGORY_PRODUCT_ON_LISTS const to show category customer filter
|
||||||
|
NEW: Make module WebservicesClient deprecated. Use module WebHook instead
|
||||||
|
NEW: manage no email with thirdparties (better for GDPR)
|
||||||
|
NEW: Manage Position (Rank) on Contract Lines
|
||||||
|
NEW: Manage VAT on all lines on purchases cycle
|
||||||
|
NEW: manage virtual stock at a future date
|
||||||
|
NEW: ModuleBuilder can generate code of class from an existing SQL table
|
||||||
|
NEW: On a bank reconciled line, we can modify the bank receipt
|
||||||
|
NEW: On a form to send an email, we show all emails of all contacts of object
|
||||||
|
NEW: Option PRODUCTBATCH_SHOW_WAREHOUSE_ON_SHIPMENT showing wh on PDF
|
||||||
|
NEW: Option PRODUIT_DESC_IN_FORM accept (desktop only or +smartphone)
|
||||||
|
NEW: Page for mass stock transfer can be used with no source stock
|
||||||
|
NEW: parent company column and filter in invoice and order list
|
||||||
|
NEW: Add show "Sales rep" option for PDF
|
||||||
|
NEW: Picto for shared link is clicable
|
||||||
|
NEW: possibility to select scopes with checkbox for Oauth tokens
|
||||||
|
NEW: private and public note on user, thirdparty and contact list
|
||||||
|
NEW: product categories filter on inventory list
|
||||||
|
NEW: Product supplier price: autofill default supplier VAT
|
||||||
|
NEW: Project - Add author on list
|
||||||
|
NEW: Public counters feature
|
||||||
|
NEW: Reception - Add a from/to on search on date field
|
||||||
|
NEW: Start a simple support of recurrent events on agenda
|
||||||
|
NEW: Resize parent company column in order list
|
||||||
|
NEW: Saved token of OAUTH module are now encrypted into llx_oauth_token
|
||||||
|
NEW: Save one click to select on delivery ack, on emails.
|
||||||
|
NEW: scheduled job to send unpaid invoice reminder can now use the cc and bcc from email template
|
||||||
|
NEW: set thirdparty type with company modify trigger
|
||||||
|
NEW: Show also shceduled task never finished in scheduled task widget
|
||||||
|
NEW: show badge with number of extrafields in setup
|
||||||
|
NEW: show category tree in sellist and chkbxlst for common object
|
||||||
|
NEW: Show picto and color into combo for selection of tags
|
||||||
|
NEW: show product label on inventory
|
||||||
|
NEW: show sell-by and eat-by dates only if not empty
|
||||||
|
NEW: show SellBy/EatBy dates for each batch product in shipment card
|
||||||
|
NEW: skip accept/refuse process for proposals (option PROPAL_SKIP_ACCEPT_REFUSE)
|
||||||
|
NEW: SMTP using oauth2 authentication
|
||||||
|
NEW: can substitue project title in mail template
|
||||||
|
NEW: Supplier order list - Add column private and public note
|
||||||
|
NEW: Support IP type in extrafields
|
||||||
|
NEW: support multilang in Civilities API
|
||||||
|
NEW: Table of membership types
|
||||||
|
NEW: The purge of files can purge only if older than a number of seconds
|
||||||
|
NEW: Update ActionComm type_code on email message ticket
|
||||||
|
NEW: VAT - Admin - Add information on deadline day for submission of VAT declaration
|
||||||
|
NEW: expand/collapse permissions on user permission page
|
||||||
|
|
||||||
|
|
||||||
|
For developers or integrators:
|
||||||
|
------------------------------
|
||||||
|
|
||||||
|
NEW: #20912 Add trigger to record the event of sending an email from a project
|
||||||
|
NEW: Removed completely the need for library adodbtime
|
||||||
|
NEW: hook on agenda pages
|
||||||
|
NEW: hook to complete payment in TakePOS
|
||||||
|
NEW: hook "changeHelpURL" to modify target of the help button
|
||||||
|
NEW: hook formConfirm on action comm card
|
||||||
|
NEW: hook to modify supplier product html select
|
||||||
|
NEW: Add new hook for show virtual stock details on product stock card
|
||||||
|
NEW: Add new hooks for actioncomm
|
||||||
|
NEW: conf->global->SYSLOG_FILE_ONEPERSESSION accept a string
|
||||||
|
NEW: translate for contact type API, setup/ticket API, shipping method API
|
||||||
|
NEW: All ajax pages have now a top_httphead()
|
||||||
|
NEW: Add API for the partnership module
|
||||||
|
NEW: Add "Get lines and Post lines from BOM" in the API
|
||||||
|
NEW: Replace fk_categories_product with categories_product in inventory
|
||||||
|
NEW: Rewrite of SQL request. Removed the join on category (for filter on categ), replaced with a EXISTS/NOT
|
||||||
|
|
||||||
|
|
||||||
|
WARNING:
|
||||||
|
|
||||||
|
Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
|
||||||
|
* Minimal PHP version is now PHP 7.0 instead of PHP 5.6
|
||||||
|
* The signature of method getNomUrl() of class ProductFournisseur has been modified to match the signature of method Product
|
||||||
|
* Trigger ORDER_SUPPLIER_DISPATCH is removed, use ORDER_SUPPLIER_RECEIVE and/or LINEORDER_SUPPLIER_DISPATCH instead.
|
||||||
|
* All functions fetch_all() have been set to deprecated for naming consitency, use fetchAll() instead.
|
||||||
|
* Code standardization: '$user->rights->propale' is now '$user->rights->propal' everywhere.
|
||||||
|
* Deprecated method set_billed() on shipment and reception class has been removed. Use setBilled() instead.
|
||||||
|
* Tables llx_prelevement_facture and llx_prelevement_facture_demande have been renamed into llx_prelevement and llx_prelevement_demande.
|
||||||
|
* Rename MAIN_LIST_ALLOW_NOTES into MAIN_LIST_HIDE_NOTES and rename MAIN_LIST_ALLOW_PRIVATE_NOTES into MAIN_LIST_HIDE_PRIVATE_NOTES
|
||||||
|
* Rename the substitution for project label instead of project title in substitution variables
|
||||||
|
|
||||||
|
|
||||||
|
***** ChangeLog for 16.0.2 compared to 16.0.1 *****
|
||||||
|
|
||||||
|
FIX: 16.0 - computed extrafields are not displayed if the object has no other extrafields
|
||||||
|
FIX: #22538
|
||||||
|
FIX: Accountancy - Review of Winfic - eWinfic - Winsis compta export format
|
||||||
|
FIX: add loadRoleMode on getlinearray
|
||||||
|
FIX: Autosearch on takepos was broken
|
||||||
|
FIX: avoid access forbidden with numeric ref
|
||||||
|
FIX: avoid error, check of product fetch is already check before
|
||||||
|
FIX: avoid error, fetch of product is mandatory (by id or by ref)
|
||||||
|
FIX: avoid unnecessary multiple calculation (#22637)
|
||||||
|
FIX: bug on selected value for select_bom() function
|
||||||
|
FIX: can not set prospect status "Do not contact"
|
||||||
|
FIX: change in the communication status of the prospect
|
||||||
|
FIX: check $id, already checked before
|
||||||
|
FIX: closed warehouse for shipping
|
||||||
|
FIX: extrafields_add tpl for stock movement
|
||||||
|
FIX: the request SQL for transversal user, the join on usergroup table must be with getEntity('usergroup')
|
||||||
|
FIX: Import of contact when there is duplicate thirdparties
|
||||||
|
FIX: Import of socialnetwork field
|
||||||
|
FIX: input selector is wrong with PRODUCT_LOAD_EXTRAFIELD_INTO_OBJECTLINES usage
|
||||||
|
FIX: install wizard error management
|
||||||
|
FIX: just add integer
|
||||||
|
FIX: Missing $object for online signature link build
|
||||||
|
FIX: missing quote
|
||||||
|
FIX: only modify hidden checkbox/multislected extrafields on update if they are provided in request
|
||||||
|
FIX: php doc
|
||||||
|
FIX: private message ticket become public if edit action
|
||||||
|
FIX: remove > 0 and -1
|
||||||
|
FIX: remove db object to avoid error with postgresql
|
||||||
|
FIX: Search ambigous field on MO list
|
||||||
|
FIX: Search on social networks
|
||||||
|
FIX: Subscription must be stopped when max of attendees reached.
|
||||||
|
FIX: supplier price update: missing error reporting
|
||||||
|
FIX: travis & stickler feedbacks
|
||||||
|
FIX: we must be able to select only bom of a specific product + several fixes on select_bom() function
|
||||||
|
FIX: wrong perm check
|
||||||
|
FIX: wrong typo, remove quote
|
||||||
|
FIX: wrong var typo
|
||||||
|
|
||||||
|
|
||||||
|
***** ChangeLog for 16.0.1 compared to 16.0.0 *****
|
||||||
|
|
||||||
|
FIX: #16476 on massaction the pdf generation is not using the t…
|
||||||
|
FIX: #21416 Filter tag no-categorie in members
|
||||||
|
FIX: #21543
|
||||||
|
FIX: #21799 inactive companies shall not be selectable for new proposals, orders and invoices
|
||||||
|
FIX: #21859 Don't show html balise on list for private/public note
|
||||||
|
FIX: #22164
|
||||||
|
FIX: #22241
|
||||||
|
FIX: #22263 Accountancy - Account number expected in place of a rowid on parent account on export
|
||||||
|
FIX: #22264 Accountancy - Translation on chart of accounts export
|
||||||
|
FIX: #22265 Accountancy - Account number expected in place of a rowid on export
|
||||||
|
FIX: #22334
|
||||||
|
FIX: #22360
|
||||||
|
FIX: #22379 creating events on supplier order
|
||||||
|
FIX: #22382 Error on length of supplier reference
|
||||||
|
FIX: #22386 IBAN not mandatory for International Export Countries
|
||||||
|
FIX: #22440 Lang Key "UserAccountNotDefined" is missing
|
||||||
|
FIX: #22482
|
||||||
|
FIX: #22507
|
||||||
|
FIX: Accountancy - Some manuals operations are displayed in subledger
|
||||||
|
FIX: API reception return error 500
|
||||||
|
FIX: avoid override initial message ($this instead $object)
|
||||||
|
FIX: avoid some warnings (php8+)
|
||||||
|
FIX: Bad backtopage and CSRF on link for ticket message
|
||||||
|
FIX: bad closing select
|
||||||
|
FIX: broken feature, wrong fk_parent_line after cloning object
|
||||||
|
FIX: Column label
|
||||||
|
FIX: compatibility if javascript not actived
|
||||||
|
FIX: compatibility with Mysql <= 5.7
|
||||||
|
FIX: contact deletion: execute trigger before really deleting
|
||||||
|
FIX: CronJob sendBackup
|
||||||
|
FIX: CSRF + lost value of constant after use save button
|
||||||
|
FIX: CSS
|
||||||
|
FIX: data integrity for llx_delivery table
|
||||||
|
FIX: default value for partnership status
|
||||||
|
FIX: deletion of the MO_CHILD link
|
||||||
|
FIX: Dictionary - Display error on cache_vatrates
|
||||||
|
FIX: Dolibarr#16476 version 2a
|
||||||
|
FIX: Duplicate creation of invoice when closing shipment linked to order
|
||||||
|
FIX: Duplicate in list when filtering on categories
|
||||||
|
FIX: extrafields with value '0' was ''
|
||||||
|
FIX: filters lost when sorting on productMargin and customerMargins
|
||||||
|
FIX: fk_expedition in $line can be usefull for triggers
|
||||||
|
FIX: Import in upgrade when using a socialnetwork field.
|
||||||
|
FIX: input hidden with fk_product of line on mo production can be usefull
|
||||||
|
FIX: inventory code must be different at each transation
|
||||||
|
FIX: inventory total columns
|
||||||
|
FIX: Issue #16476 on massaction the pdf generation is not using the thirdparty language settings
|
||||||
|
FIX: Linked object agenda card
|
||||||
|
FIX: missing check if category module is enabled
|
||||||
|
FIX: missing check if incoice as a payment (wrong status)
|
||||||
|
FIX: missing class "societe" when create another object with workflow
|
||||||
|
FIX: missing error message if image size too large
|
||||||
|
FIX: Missing reposition
|
||||||
|
FIX: missing the management of a constant in the Ticket config
|
||||||
|
FIX: Missing token in different URLs links
|
||||||
|
FIX: @ must be allowed into dol_eval to allow rules including external module string 'abc@def'
|
||||||
|
FIX: - php V8 get number doc saphir
|
||||||
|
FIX: - php V8 propal index last draft
|
||||||
|
FIX: Preview button position on documents list (case when the file is too long)
|
||||||
|
FIX: Project - on global view, missing display of ref customer
|
||||||
|
FIX: Protection against bad value into accurancy setup
|
||||||
|
FIX: reading of trackid in emailcollector (when on recipient suffix)
|
||||||
|
FIX: recruitment linked files
|
||||||
|
FIX: Remove use of code we should not have
|
||||||
|
FIX: Restore the option MAIN_OPTIMIZEFORTEXTBROWSER
|
||||||
|
FIX: Rich text is not diplayed
|
||||||
|
FIX: same thing in deleteline
|
||||||
|
FIX: Supplier Reference is lost when page breaks
|
||||||
|
FIX: support of array parameters in "add to bookmark" feature.
|
||||||
|
FIX: Test that web dir is correct in install
|
||||||
|
FIX: the shipment PDF was using the full size logo instead of small
|
||||||
|
FIX: Token Error : delete stock transfer
|
||||||
|
FIX: ToOfferALinkForOnlinePayment not translated
|
||||||
|
FIX: tooltip of technical tables added of a module
|
||||||
|
FIX: wrong result check when update expensereport line
|
||||||
|
|
||||||
|
|
||||||
|
***** ChangeLog for 16.0.0 compared to 15.0.0 *****
|
||||||
|
|
||||||
|
For users:
|
||||||
|
---------------
|
||||||
|
|
||||||
|
NEW: PHP 8.0 and 8.1 compatibility:
|
||||||
|
Warning!! Application works correctly with PHP 8.0 and 8.1 but you will experience a lot of PHP warnings into the PHP server
|
||||||
|
log files (depending on your PHP setup). Removal of all PHP warnings on server side is planned for v17.
|
||||||
|
NEW: Support for recurring purchase invoices.
|
||||||
|
NEW: #20292 Include German public holidays
|
||||||
|
NEW: Can show ZATCA QR-Code on PDFs
|
||||||
|
NEW: Can show Swiss QR-Code on PDFs
|
||||||
|
NEW: #17123 added ExtraFields for Stock Mouvement
|
||||||
|
NEW: #20609 new massaction to assign a sale representatives on a selection of thirdparties
|
||||||
|
NEW: #20653 edit discount pourcentage for all lines in one shot
|
||||||
|
NEW: Accept 'auto' for ref of object on import of purchase order/proposal
|
||||||
|
NEW: Accountancy - Add more filters and info on page to bind accounting accounts
|
||||||
|
NEW: Accountancy - Add subledger account when generate a transaction with a deposit invoice
|
||||||
|
NEW: Accountancy - Add a massaction to preselect an account (customer and supplier list)
|
||||||
|
NEW: Accountancy - Add hidden feature for accounting reconciliation
|
||||||
|
NEW: ACE Editor is restored at same cursor position after a save.
|
||||||
|
NEW: Add "addMoreActionsButtons" hook to subscription form
|
||||||
|
NEW: Add an option in GUI to show a Quick add button into top menu bar
|
||||||
|
NEW: Add a workflow to auto link contract on a ticket
|
||||||
|
NEW: Add column template invoice in invoice list
|
||||||
|
NEW: Add column "Total HT" to products array on document creation card
|
||||||
|
NEW: Add configuration for text color of button action
|
||||||
|
NEW: Show the event block on recurring invoices #20870
|
||||||
|
NEW: Add firstname, lastname and max number of attendees for module "Event Organization"
|
||||||
|
NEW: Add margin info in proposal and order list
|
||||||
|
NEW: Add more fields to detect duplicate during import of thirdparties
|
||||||
|
NEW: Add option to foce delivery on email for purchase order receipt to yes
|
||||||
|
NEW: Add possibility to create contract from invoice
|
||||||
|
NEW: Add possibility with constant MAIN_LOGIN_BADCHARUNAUTHORIZED to define bad character unauthorized into login name
|
||||||
|
NEW: Add private and public notes on tax files
|
||||||
|
NEW: Add substitutions "user numbers"
|
||||||
|
NEW: allow cut&paste as real numeric value to excel
|
||||||
|
NEW: A public form to send a message and create a lead is available
|
||||||
|
NEW: automatically set totally received status in reception
|
||||||
|
NEW: Auto set invoice paid when adding credit not and remain to pay is 0
|
||||||
|
NEW: Backup tool has an "lowmemory" option for mysqldump on large database
|
||||||
|
NEW: Can enter price with tax for predefined products on purchase objects
|
||||||
|
NEW: Can removed doc templates from setup page of thirdparty
|
||||||
|
NEW: Can use ! to make a search that exclude a string
|
||||||
|
NEW: clean values and amount in FEC import
|
||||||
|
NEW: const MAIL_MASS_ACTION_ADD_LAST_IF_MAIN_DOC_NOT_FOUND for mailing mass action
|
||||||
|
NEW: Contact filter project list
|
||||||
|
NEW: Create contract from invoice
|
||||||
|
NEW: Database: Can store the session into database (instead of beeing managed by PHP)
|
||||||
|
NEW: Database: Some core tables are created only at module activation
|
||||||
|
NEW: Default value for MAIN_SECURITY_CSRF_WITH_TOKEN is now 2 (GET are also protected agains CSRF attacks)
|
||||||
|
NEW: deposit payment terms: add field into dictionary admin page to define default percentage of deposit.
|
||||||
|
NEW: Dictionaries - add possibility to manage countries in EEC
|
||||||
|
NEW: Dictionaries - Availibility dictionnary has a new column unit and number
|
||||||
|
NEW: Display errors in a message box after generating documents
|
||||||
|
NEW: Enhance the import. Can use 'auto' for the ref (import of orders)
|
||||||
|
NEW: Events on Proposal to Return to Draft
|
||||||
|
NEW: Exports - add entity filter in exports
|
||||||
|
NEW: Page to list expense report payments
|
||||||
|
NEW: JS inventory autocalc input
|
||||||
|
NEW: language support for more emailing target selectors
|
||||||
|
NEW: leave requests: add field into type dictionary to block request if balance is negative
|
||||||
|
NEW: Mass action "Close shipments"
|
||||||
|
NEW: Module BOM - add tabs for nets BOM
|
||||||
|
NEW: Module BOM - add the possibility to add sub-BOMs to BOM
|
||||||
|
NEW: Module Recruitment - Add a public page with list of all open job positions.
|
||||||
|
NEW: Module Recruitment - Add a tab with list of application on the jobposition file.
|
||||||
|
NEW: Add option to move checkbox column as first column on Thirdparty list (only few screens)
|
||||||
|
NEW: payment conditions enabling semi-automatic deposit creation (Issue #18439)
|
||||||
|
NEW: possibility to consume multiple batch
|
||||||
|
NEW: Reverse movement product consumption
|
||||||
|
NEW: Send email to the supplier order contact
|
||||||
|
NEW: add permission to report time on timesheet
|
||||||
|
NEW: Knowledge Management - add status "Obsolete" to KM articles
|
||||||
|
NEW: MRP - split consumption line on MO
|
||||||
|
NEW: MRP - display physical and virtual stock of the products when creating OF from a BOM
|
||||||
|
NEW: MRP - display product ref in "Object link" product tab for BOM
|
||||||
|
NEW: Orders - support user_modif in order
|
||||||
|
NEW: Products - add massaction "Edit Extrafield" for Product
|
||||||
|
NEW: Products - List - add thumbnail field in product list
|
||||||
|
NEW: Products - Statistics - can filter on a thirdparty
|
||||||
|
NEW: Projects - add filter "opportunity status" on statistics of projects.
|
||||||
|
NEW: Proposals - option update prices on proposal cloning
|
||||||
|
NEW: Proposals - List - add column date of Signature on proposal list
|
||||||
|
NEW: SEPA XML - option to place payment Type Info at Credit transfer Transaction level
|
||||||
|
NEW: Stocks - stock filter in reassort lists
|
||||||
|
NEW: Stocks - stock limit in stock export CSV
|
||||||
|
NEW: Stocks - Inventory - can change value of AWP during the inventory
|
||||||
|
NEW: Supplier order - Show ref supplier of reception in linked object block
|
||||||
|
NEW: Surveys - Show number of votes into the label of tab "Results" of a survey
|
||||||
|
NEW: TakePOS - barcode rule to insert product in TakePOS
|
||||||
|
NEW: TakePOS - pagination on search results
|
||||||
|
NEW: TakePOS - show product reference
|
||||||
|
NEW: TakePOS - add constant to hide categories
|
||||||
|
NEW: TakePOS - add constant to show category description
|
||||||
|
NEW: TakePOS - add constant to show only the products in stock
|
||||||
|
NEW: Themes - add param color button action
|
||||||
|
NEW: Themes - Change in theme colors does not need to use the refresh button
|
||||||
|
NEW: Themes - more modes for THEME_TOPMENU_DISABLE_IMAGE (2, 3, ...)
|
||||||
|
NEW: Themes - MD - add param border table for md theme
|
||||||
|
NEW: Third-Parties - add rules "customer accountancy code" is mandatory to validate invoice
|
||||||
|
NEW: Third-Parties - can set the parent company during the creation of thirdparty (action=add of societe/card.php)
|
||||||
|
NEW: Tickets - allow a Ticket to be automatically marked as read when created from backend
|
||||||
|
NEW: Tickets - create Third-party with contact if not found on public ticket
|
||||||
|
NEW: Tickets - option to default check "notify tier at creation"
|
||||||
|
NEW: Tickets - Trigger: allow to automatically send messages on new tickets
|
||||||
|
NEW: Tickets - optional display warning icons on ticket list
|
||||||
|
NEW: Websites Module - supports now the multicompany module
|
||||||
|
NEW: Websites Module - on redirect of page in website module, GET parameters are kept.
|
||||||
|
NEW: The 'reposition' class works on ajax constantonoff that make redirects
|
||||||
|
NEW: total mark rate in list
|
||||||
|
NEW: uncheck "send message" by default on a ticket when private messages has been checked
|
||||||
|
NEW: VAT Report by month - Show detail by rate and also by code
|
||||||
|
NEW: Added MMK currency (Myanmar Kyat)
|
||||||
|
NEW: On a form to send an email, we show all emails of contacts of object
|
||||||
|
|
||||||
|
Modules state
|
||||||
|
NEW: Module Partnership Management - stable
|
||||||
|
NEW: Module Event Organization Management - stable
|
||||||
|
|
||||||
|
|
||||||
|
For developers or integrators:
|
||||||
|
------------------------------
|
||||||
|
NEW: dol_uncompress() supports more extensions (.gz, .bz2, .zstd). Only .zip was supported before.
|
||||||
|
NEW: Implement a generic method for Kaban views
|
||||||
|
NEW: Upgrade chartjs library to 3.7.1
|
||||||
|
NEW: stripe element with more gateways
|
||||||
|
NEW: solde() function evolution to be able to get solde until a chosen date
|
||||||
|
NEW: Suggest a way to run upgrade per entities.
|
||||||
|
NEW: Support html content for multiselect component.
|
||||||
|
NEW: ModuleBuilder - Add tabs view in module builder
|
||||||
|
NEW: ModuleBuilder - More feature that can be modifed after module generation
|
||||||
|
NEW: Identification of tr is possible with by attribute data-id on some pages
|
||||||
|
NEW: Import with select boxes V2
|
||||||
|
NEW: Can use current entity filter on 'chkbxlst'
|
||||||
|
NEW: Creation of the function select_bom() used to display bom select list
|
||||||
|
NEW: Add trigger and event on completely received status change
|
||||||
|
NEW: Add utility function send backup by mail
|
||||||
|
NEW: add WordPress OAuth to save a token (not SSO)
|
||||||
|
NEW: A module can embed a SQL script run at each Dolibarr upgrade
|
||||||
|
NEW: Add param to keep the robot=index meta tag on public pages
|
||||||
|
NEW: Add method hintindex() in database handlers.
|
||||||
|
NEW: add modifications for new function "$db->prefix()"
|
||||||
|
NEW: addMoreActionsButtonsList hook for button in list
|
||||||
|
NEW: Standardize a lot of code.
|
||||||
|
NEW: Add a protection into PHPunit to avoid to forget a var_dump
|
||||||
|
|
||||||
|
|
||||||
|
API:
|
||||||
|
NEW: API Proposals - Add POST lines
|
||||||
|
NEW: API REST filter states by country
|
||||||
|
NEW: Add API to get a template invoice
|
||||||
|
NEW: Add datem and type parameters to API to create movements
|
||||||
|
NEW: #19294 implement detailed timespent in task of project API
|
||||||
|
NEW: #20736 Allow extrafields SQL filters on REST API product lookup
|
||||||
|
NEW: Can update rank of invoice, proposal and order lines with API update
|
||||||
|
NEW: update rank line is possible on API for customer invoices, sales orders and supplier invoice
|
||||||
|
NEW: Add option MAIN_API_DEBUG to save API logs into a file
|
||||||
|
|
||||||
|
Hooks:
|
||||||
|
NEW: Hook getNomUrl available everywhere in tooltip of ref links
|
||||||
|
NEW: Add hooks: selectContactListWhere hook, selectThirdpartyListWhere hook
|
||||||
|
NEW: Add hook before the public ticket list
|
||||||
|
NEW: Add hook for Notif
|
||||||
|
NEW: Add hook for more buttons
|
||||||
|
NEW: add hook printFieldListWhere in product ressort card
|
||||||
|
NEW: Add hook printFieldListWhere in "show_contacts" function
|
||||||
|
NEW: Add hook printFieldWhere in load_state_board function
|
||||||
|
NEW: Add hooks contact tab badge and hooks parameter for avoid conflicts
|
||||||
|
NEW: Add hook selectProductsListWhere in select_produits_list function
|
||||||
|
NEW: Add hooks in commercial index
|
||||||
|
NEW: Add hooks in customers and products boxes
|
||||||
|
NEW: Add hooks in thirdparty index page
|
||||||
|
NEW: Add hooks on project task time page
|
||||||
|
NEW: Add hooks on salaries and sociales card
|
||||||
|
NEW: Add hooks select product list and select thirdparty list function
|
||||||
|
NEW: Add hook to getSellPrice function
|
||||||
|
NEW: TakePos - add hooks complete product display
|
||||||
|
NEW: TakePos - add hooks for cart display
|
||||||
|
NEW: TakePos - add hooks to complete ajax return array
|
||||||
|
NEW: TakePOS - add hook doaction in TakePOS invoice
|
||||||
|
|
||||||
|
Config Options:
|
||||||
|
NEW: Add hidden option on contract PDF line to hide qty and price
|
||||||
|
NEW: Option MAIL_MASS_ACTION_ADD_LAST_IF_MAIN_DOC_NOT_FOUND to send last document in mass mailing action
|
||||||
|
NEW: Option MAIN_API_DEBUG to save API logs into a file
|
||||||
|
NEW: Option MAIN_MAIL_AUTOCOPY_TO can accept several email and special keys
|
||||||
|
NEW: Option MAIN_SEARCH_CAT_OR_BY_DEFAULT const for search by category
|
||||||
|
NEW: Option INVOICEREC_SET_AUTOFILL_DATE_START/END
|
||||||
|
|
||||||
|
WARNING:
|
||||||
|
|
||||||
|
Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
|
||||||
|
* There is a new specific permission to be allowed to enter timesheets. If you use timesheet, don't forget to give the new permission (disable and
|
||||||
|
enable the module project if it is not visible).
|
||||||
|
* The default value for MAIN_SECURITY_CSRF_WITH_TOKEN has been set to 2. It means any POST and any GET request that contains the "action" or "massaction"
|
||||||
|
with a value of a sensitive action must also a valid token parameter (With previous value 1, only POST was concerned). Note: With value 3, any URL
|
||||||
|
with parameter "action" or "massaction" need the token, whatever is the value of the action.
|
||||||
|
* verifCond('stringtoevaluate') now return false when string contains a bad syntax content instead of true.
|
||||||
|
* The deprecated method thirdparty_doc_create() has been removed. You can use the generateDocument() instead.
|
||||||
|
* All triggers with a name XXX_UPDATE have been renamed with name XXX_MODIFY for code consistency purpose.
|
||||||
|
* Rename build_path_from_id_categ() into buildPathFromId() and set method to private.
|
||||||
|
* Move massaction 'confirm_createbills' from actions_massactions.inc.php to commande/list.php
|
||||||
|
* Method fetch_all_resources(), fetch_all_used(), fetch_all_available() of DolResource has been removed (they were not used by core code).
|
||||||
|
* Method fetch_all of DolResource has been renamed into fetchAll() to match naming conventions.
|
||||||
|
* The hook 'upgrade' and 'doUpgrade2" has been renamed 'doUpgradeBefore' and 'doUpgradeAfterDB'. A new trigger 'doUpgradeAfterFiles' has been introduced.
|
||||||
|
* The context hook 'suppliercard' when on the supplier tab of a thirdparty has been renamed into 'thirdpartysupplier'
|
||||||
|
* Because the module Resources highly linked to the Agenda module, the menu for Resources module has been moved into top menu Agenda.
|
||||||
|
|
||||||
|
|
||||||
|
***** ChangeLog for 15.0.3 compared to 15.0.2 *****
|
||||||
|
|
||||||
|
FIX: 15.0: modules cannot declare more than 1 cron job using the same method with different parameters
|
||||||
|
FIX: 15 fix graph ficheinter status
|
||||||
|
FIX: #18704
|
||||||
|
FIX: #20444
|
||||||
|
FIX: #20448 missing preg_replace for vat rate when adding a free line
|
||||||
|
FIX: #20476 migration postgresql 13.0.x to 14.0.x packaging type
|
||||||
|
FIX: #20487 missing letter D in constant THIRDPARTIES_DISABLE_RELATED_OBJECT_TAB
|
||||||
|
FIX: #20527 Accountancy - Unbalanced entry proposed when an employee are declared on a social contribution
|
||||||
|
FIX: #20621 signature online with proposal with n page.
|
||||||
|
FIX: #20696
|
||||||
|
FIX: #20828
|
||||||
|
FIX: #20886 : manage durations in list_print_total.tpl.php
|
||||||
|
FIX: #20902
|
||||||
|
FIX: #21051
|
||||||
|
FIX: #21093
|
||||||
|
FIX: #21138
|
||||||
|
FIX: #21140
|
||||||
|
FIX: #21174
|
||||||
|
FIX: #21323
|
||||||
|
FIX: #21472 On the bank transfer lists, a change of page switches to the lists of the direct debit module
|
||||||
|
FIX: #21495
|
||||||
|
FIX: #21518
|
||||||
|
FIX: Accountancy - Label of VAT account is empty
|
||||||
|
FIX: Accountancy - Model account list - Problem of CSRF
|
||||||
|
FIX: Accountancy - Partitioning of the entity on an automatic binding
|
||||||
|
FIX: add missing thead, th and id on table
|
||||||
|
FIX: backport commit 5b3fcc5e43979b1b0789bf81fb8f1b2b59c93056, chkbxlst cannot be emptied
|
||||||
|
FIX: Bank account not set when creating invoice from order
|
||||||
|
FIX: Bank transfer - Link on code supplier invoice was bad
|
||||||
|
FIX: Can convert a partially closed down payment when close for
|
||||||
|
FIX: class center linkedObjectblock order date
|
||||||
|
FIX: count elements in invoice list (Issue #21444)
|
||||||
|
FIX: Customer price non numeric warning when 0 vat.
|
||||||
|
FIX: errors in getLinesArray()
|
||||||
|
FIX: False alert of WAF when there is "set" into some URL action=update.
|
||||||
|
FIX: Intervention graph by status on ficheinter Index page
|
||||||
|
FIX: Intervention url link into Commerce index
|
||||||
|
FIX: Fix get origin from other than supplier proposal when add a new supplier proposal
|
||||||
|
FIX: Fix show errors in card
|
||||||
|
FIX: fourn/commande/card.php Added "$object" parameter to $formfile->showdocuments call
|
||||||
|
FIX: french traductions for payment methods
|
||||||
|
FIX: hook for dol_format_address
|
||||||
|
FIX: Index page for "Sales" give wrong URL link to Intervention
|
||||||
|
FIX: issue Dolibarr #21495 for v15
|
||||||
|
FIX: label and get_substitutionarray_each_var_object on ODT generation
|
||||||
|
FIX: load product stock in inventory lines
|
||||||
|
FIX: missing morecss for multiselectarray
|
||||||
|
FIX: missins time spent list menu
|
||||||
|
FIX: new member subscription: bank account and payment mode might be hidden
|
||||||
|
FIX: ODT generation of BOM document
|
||||||
|
FIX: ODT tags for subobjects {object_subobject_yyy} was not working.
|
||||||
|
FIX: qty received label in Squille PDF model
|
||||||
|
FIX: rank duplicate on mass action invoice from multiple orders
|
||||||
|
FIX: regression + add $forceentity parameter
|
||||||
|
FIX: regression PR #20713
|
||||||
|
FIX: security breach if we have same ref number in multiple entities
|
||||||
|
FIX: selection of type of invoice
|
||||||
|
FIX: Send remind to pay invoice only on validated invoices
|
||||||
|
FIX: Show sellist type of extrafield when none category selected
|
||||||
|
FIX: signature online with proposal with n page.
|
||||||
|
FIX: sql error when PRODUCT_USE_SUPPLIER_PACKAGING enabled.
|
||||||
|
FIX: sql order
|
||||||
|
FIX: trash icon on crontask list to do not work
|
||||||
|
FIX: v15 linked object block center order date
|
||||||
|
FIX: Warning on attribut
|
||||||
|
FIX: We must remove empty values of $features array in fetchByProductCombination2ValuePairs() because some products can use only several attributes in their variations and not necessarily all. In this case, fetch doesn't work without my correction
|
||||||
|
FIX: with callback function
|
||||||
|
FIX: xml file for company with special chars in name
|
||||||
|
FIX: Zatca QR code must use company name/vat
|
||||||
|
|
||||||
|
|
||||||
|
***** ChangeLog for 15.0.2 compared to 15.0.1 *****
|
||||||
|
|
||||||
|
FIX: #19777 #20281
|
||||||
|
FIX: #20140 #20301
|
||||||
|
FIX: #20279 Accountancy - PostGreSQL - Error on mass update lines already binded
|
||||||
|
FIX: #20476 migration postgresql 14.0.x to 15.0.x packaging type
|
||||||
|
FIX: #20733 Inventory: Do not use batch qty even if present if batch module is disabled.
|
||||||
|
FIX: action comm list: holiday last day not included + handle duration with halfdays
|
||||||
|
FIX: Add missing entity on salary's payment
|
||||||
|
FIX: Add 'recruitment' into check array
|
||||||
|
FIX: add tools to fix bad bank amount in accounting with multicurrency
|
||||||
|
FIX: assign member cateogry to a member
|
||||||
|
FIX: backport
|
||||||
|
FIX: bad bank amount in accounting with multicurrency
|
||||||
|
FIX: Bad condition on remx
|
||||||
|
FIX: Bad filter on date on salary list
|
||||||
|
FIX: bad link to add a customer price (token duplicated)
|
||||||
|
FIX: bad status of member on widget by type and status
|
||||||
|
FIX: better error management at product selling price update
|
||||||
|
FIX: Can't edit bank record
|
||||||
|
FIX: check mandatory thirdparty fields for mass action
|
||||||
|
FIX: check thirdparty object loaded and properties exist
|
||||||
|
FIX: comment
|
||||||
|
FIX: compatibility for ticket number sharing
|
||||||
|
FIX: compatibility with multicompany sharings
|
||||||
|
FIX: contact card: single extrafield update failed
|
||||||
|
FIX: country not visible into list of states
|
||||||
|
FIX: Delete an extrafield where type is double
|
||||||
|
FIX: deprecated module are not more viewed as external modules
|
||||||
|
FIX: Disable customer type by default if type prospect/customer is disabled
|
||||||
|
FIX: each time we create a supplier order, we need to give it a ref_supplier
|
||||||
|
FIX: Error management
|
||||||
|
FIX: fatal error for $db usage in tpl
|
||||||
|
FIX: filter into the list of product lots
|
||||||
|
FIX: Filter on Object Referent page give CRSF page
|
||||||
|
FIX: Fix default options ($hidedetails, $hidedesc, $hideref) with globales when generate PDF in mass actions
|
||||||
|
FIX: Fix search by filters
|
||||||
|
FIX: Fix the adding of lines in the create invoice functions
|
||||||
|
FIX: forgotten form confirm before various payment delete
|
||||||
|
FIX: holiday/leave requests: write status change emails in HTML
|
||||||
|
FIX: include discount price for PMP after a reception (Issue #20029)
|
||||||
|
FIX: incrementation
|
||||||
|
FIX: in salary stats and payment list, we must check right perms as well as salary list
|
||||||
|
FIX: intervention entity missing
|
||||||
|
FIX: label tax cat trad
|
||||||
|
FIX: Mass action ship orders
|
||||||
|
FIX: missing advanced perms
|
||||||
|
FIX: missing call to executeHooks()
|
||||||
|
FIX: Missing entity on adding new VAT
|
||||||
|
FIX: missing hook for row ordering
|
||||||
|
FIX: missing hook parameter ($possiblelinks)
|
||||||
|
FIX: missing parenthesis
|
||||||
|
FIX: missing picto in combo of mass actions of thirdparties.
|
||||||
|
FIX: missing signature library when ODT model is used
|
||||||
|
FIX: Missing unset fields after updateline expensereport
|
||||||
|
FIX: ModuileBuilder - Fix getLinesArray() error reporting
|
||||||
|
FIX: Move delete task time trigger position
|
||||||
|
FIX: Navigation between invoices
|
||||||
|
FIX: No empty line inserted into accounting_bookkeeping
|
||||||
|
FIX: Numbering of sepa files
|
||||||
|
FIX: object cloning: set unique extrafield values to null to prevent duplicates
|
||||||
|
FIX: on update with action reminder in future there is user key error
|
||||||
|
FIX: originproductline array td identification data-id
|
||||||
|
FIX: out of memory when more than 100 000 invoices.
|
||||||
|
FIX: permit access to medias when logged in a different entity
|
||||||
|
FIX: phpcs
|
||||||
|
FIX: project creation prevented if PROJECTLEADER contact role renamed, de-activated or deleted
|
||||||
|
FIX: project timesheet by week: cleanup unused code
|
||||||
|
FIX: project timesheet: public holidays offset by 1 day
|
||||||
|
FIX: project timesheets: assume Saturday and Sunday as default weekend days when working days conf is empty or badly formed
|
||||||
|
FIX: propal list: bad error management when setting "not signed" mass action
|
||||||
|
FIX: propal list mass action translations and error management (v14 edition)
|
||||||
|
FIX: propal list: missing not signed massaction translation keys for transifex
|
||||||
|
FIX: PR returns
|
||||||
|
FIX: ref_client doesn't exists on supplier invoice, then ref_fourn needs to have a default value when we want to bill several supplier orders
|
||||||
|
FIX: replenish and manage product stock by warhouse
|
||||||
|
FIX: sending email on payment of registration of event
|
||||||
|
FIX: SEPA ICS is not mandatory for bank transfer
|
||||||
|
FIX: Set datec when add time spent on a project task
|
||||||
|
FIX: status filter on supplierOrder stats doesn't work
|
||||||
|
FIX: stickler-ci
|
||||||
|
FIX: still prevent project creation if PROJECTLEADER role unavailable, but with a specific error message
|
||||||
|
FIX: Supplier order stats
|
||||||
|
FIX: Tabulation must be allowed for HTML content
|
||||||
|
FIX: tool to fix bank account not in main currency for vendor invoice
|
||||||
|
FIX: translations
|
||||||
|
FIX: Travis + Update dev
|
||||||
|
FIX: truncate Customer Reference too long on PDF header (PR #20718)
|
||||||
|
FIX: uniformize code
|
||||||
|
FIX: Update of sale price (log not correctly updated)
|
||||||
|
FIX: user actions rights when mulit-company transverse mode is enabled
|
||||||
|
FIX: user employee tab: offset in open days messes up holiday length calculation
|
||||||
|
FIX: We need to have a different default_ref_supplier for each new fourn invoice
|
||||||
|
FIX: "WHERE" clause missing on resource export
|
||||||
|
FIX: #yogosha9754
|
||||||
|
|
||||||
|
|
||||||
|
***** ChangeLog for 15.0.1 compared to 15.0.0 *****
|
||||||
|
FIX: #19777 #20281
|
||||||
|
FIX: bad position of extrafields for interventions
|
||||||
|
FIX: Blocking situation when a payment was deleted in bank.
|
||||||
|
FIX: creation of the shipment if order contains services
|
||||||
|
FIX: Drag and drop line of files on join files tab
|
||||||
|
FIX: Error management on mass action "Approve holiday"
|
||||||
|
FIX: error with php8
|
||||||
|
FIX: in case of VAT refund, negative amount must be allowed
|
||||||
|
FIX: invoice pdf: lines originating from deposits were not detailed anymore
|
||||||
|
FIX: Invoice - When you create an invoice for a given thirdparty, fk_account is not retrieved from company card
|
||||||
|
FIX: list of visible type of event was not correctly filtered
|
||||||
|
FIX: Missing or bad permissions
|
||||||
|
FIX: Missing the field date start/end in export supplier invoice/order
|
||||||
|
FIX: On large proposal or invoice, fix n(n+1) sql into a n sql.
|
||||||
|
FIX: options should not exists on invoices
|
||||||
|
FIX: payment not completed when using Paypal.
|
||||||
|
FIX: permission to download files of expense report with readall.
|
||||||
|
FIX- Preview icon in documents list PDF in the admin page third-party
|
||||||
|
FIX: shipping list, e.shipping_method_id should be e.fk_shipping_method.
|
||||||
|
FIX: Show product photo on Supplier order Cornas model.
|
||||||
|
FIX: User name in ManufacturingOrder
|
||||||
|
FIX: viewimage.php blocks requests with multicompany from other enties
|
||||||
|
FIX: #yogosha9048
|
||||||
|
FIX: #yogosha9054
|
||||||
|
FIX: #yogosha9095
|
||||||
|
|
||||||
|
|
||||||
|
***** ChangeLog for 15.0.0 compared to 14.0.0 *****
|
||||||
|
|
||||||
|
For users:
|
||||||
|
---------------
|
||||||
|
|
||||||
|
NEW: Online proposal signature
|
||||||
|
NEW: Can define some max limit on expense report (per period, per type or expense, ...)
|
||||||
|
NEW: Provide a special pages for bookmarks and multicompany for a better use of some mobile applications (like DoliDroid)
|
||||||
|
NEW: Allow the use of __NEWREF__ to get for example the new reference a draft order will get after validation.
|
||||||
|
NEW: Add option to disable globaly some notifications emails.
|
||||||
|
NEW: #18401 Add __NEWREF__ subtitute to get new object reference.
|
||||||
|
NEW: #18403 Add __URL_SHIPMENT__ substitute to get the URL of a shipment
|
||||||
|
NEW: #18689 REST API module: add api key generate / modify permission.
|
||||||
|
NEW: #18663 Make "L'Annuaire des Entreprises" the default provider for SIREN verification for French thirdparties.
|
||||||
|
NEW: #18046 Add tags on ticket/categories
|
||||||
|
NEW: #18326 Workflow: Close order on shipment closing.
|
||||||
|
NEW: #18770 Can enter the buying price (for Weighted Average Price update) on lines during the reception step
|
||||||
|
NEW: #18814 Add legal form for Sweden
|
||||||
|
NEW: #18820 Accountancy - Add product account in import/export of thirdparty (level 3)
|
||||||
|
NEW: Accountancy - Format FEC/FEC2 - Add column NumFacture
|
||||||
|
NEW: Add $dolibarr_main_db_readonly in conf.php for readonly access.
|
||||||
|
NEW: add auto creation of agenda event on supplier_order cancellation
|
||||||
|
NEW: Add a PDF document template for Manufacturing Orders
|
||||||
|
NEW: Add budget field into task #18986
|
||||||
|
NEW: add cancel button to `classify reception` form on supplier_orders
|
||||||
|
NEW: Added address field into contacts list
|
||||||
|
NEW: Added documents page and send mail possibility in payments
|
||||||
|
NEW: Add edit option in propal
|
||||||
|
NEW: Added linked files page and send mail possibility in payments
|
||||||
|
NEW: Add field date from/to in customer and supplier payment list
|
||||||
|
NEW: Add filter from date to date into action/evt list
|
||||||
|
NEW: Add import / export of MO and BOMLines - Close #18499
|
||||||
|
NEW: Adding accounting export model for iSuite Expert
|
||||||
|
NEW: add link to an element by ref
|
||||||
|
NEW: add missing printFieldListFrom hook call on several lists
|
||||||
|
NEW: add MRP into Object Linked Box
|
||||||
|
NEW: Add option to hide customer code on PDF documents
|
||||||
|
NEW: Add param $nolog to avoid logging into dol_delete_recursive_dir()
|
||||||
|
NEW: Add sale representative in order and invoice list
|
||||||
|
NEW: add a setting to create PDF in PDF/A - 1b format #18990
|
||||||
|
NEW: Add `SOCIETE_SHOW_VAT_IN_LIST` to display VAT number in combo list of thirdparties
|
||||||
|
NEW: Add sortorder on units list
|
||||||
|
NEW: Adds PDF_HIDE_PRODUCT_LABEL_IN_SUPPLIER_LINES to hide product label in supplier order lines
|
||||||
|
NEW: Add STOCK_MOVEMENT_LIST_HIDE_UNIT_PRICE to hide unit price on some pages
|
||||||
|
NEW: add support for zstd compression
|
||||||
|
NEW: Allow drag and drop on kits
|
||||||
|
NEW: Allow exporting supplier order validation date + validation user
|
||||||
|
NEW: Allows product ref generation after the form is validated with PRODUCT_GENERATE_REF_AFTER_FORM
|
||||||
|
NEW: autocomplete account group when editing an account card
|
||||||
|
NEW: Auto create invoice for payment done on an order with online payment link of order
|
||||||
|
NEW: Can edit fields of proposal when proposal is not yet signed
|
||||||
|
NEW: Can edit the translation key of an overwrote translation key.
|
||||||
|
NEW: can enable/disable external calendar by default
|
||||||
|
NEW: Can hide sender name on PDF documents
|
||||||
|
NEW: Can select lot from a combo list of existing batch numbers (in MRP consumtion)
|
||||||
|
NEW: Can set the default BOM on a product
|
||||||
|
NEW: Can set/unset the usual working day of the week (friday, saturday, sunday)
|
||||||
|
NEW: Can show progression of task into combo list of tasks
|
||||||
|
NEW: can upload the odt file for the product doc template
|
||||||
|
NEW: Contract - Add From/to input on search date
|
||||||
|
NEW: Customer Display with TakePOS
|
||||||
|
NEW: Split Sale in TakePOS
|
||||||
|
NEW: Customer invoice template list - Add input date from/to
|
||||||
|
NEW: date filter on project list and task list From->To
|
||||||
|
NEW: display shipping method and tracking url on shipment list
|
||||||
|
NEW: expense reports: conf to force amounts to be entered only including taxes
|
||||||
|
NEW: expense reports: conf to pre-fill start/end dates with bounds of current month
|
||||||
|
NEW: expense reports: show link to already existing overlapping expense report
|
||||||
|
NEW: expense reports: can make project field mandatory on lines
|
||||||
|
NEW: Expose bank account holder, label and number
|
||||||
|
NEW: feature #18986
|
||||||
|
NEW: field and behavior in product object
|
||||||
|
NEW: generate intervention from time spent
|
||||||
|
NEW: holiday: handle monthly balance updates with cronjob
|
||||||
|
NEW: HRM integration, source code
|
||||||
|
NEW: HRM admin - Add tabs
|
||||||
|
NEW: HRM - Include more options to manage/custom dashboard
|
||||||
|
NEW: Increase size of params of actions for emailcollector
|
||||||
|
NEW: Invoice list - Use complete country select field with EEC or not
|
||||||
|
NEW: mass action delete, no more break if at least one object has child
|
||||||
|
NEW: mass action paid on customer invoice list
|
||||||
|
NEW: mass action validate on supplier orders list
|
||||||
|
NEW: mass action send email to all attendees of an event
|
||||||
|
NEW: mass action to switch status on sale / on purchase of a product
|
||||||
|
NEW: expense reports: conf to pre-fill start/end dates with bounds of current month
|
||||||
|
NEW: Option "Add a link on the PDF to make the online payment"
|
||||||
|
NEW: More options to generate PDF (show Frame option, width of picture option)
|
||||||
|
NEW: Preview of pdf files of expense report lines
|
||||||
|
NEW: print without details
|
||||||
|
NEW: project time spent: conf to prevent recording time after X months
|
||||||
|
NEW: rewrite bind accountancy code finding on customer and sales invoice
|
||||||
|
NEW: Societe - Add perentity functionality on customer/supplier accountancy auxiliary account
|
||||||
|
NEW: Survey - Add a clickable link in email send
|
||||||
|
NEW: Social Contributions - Add from/to filter on list
|
||||||
|
NEW: Supplier order and proposal - Add From/to input on search date
|
||||||
|
NEW: Task - Add From/to input on search date
|
||||||
|
NEW: Add theme option THEME_ELDY_USEBORDERONTABLE
|
||||||
|
NEW: The Anti-CSRF protection MAIN_SECURITY_CSRF_WITH_TOKEN is on to value 1 by default
|
||||||
|
NEW: Update SQL : install and migration
|
||||||
|
NEW: Use an ajax call for the clicktodial feature instead of href link.
|
||||||
|
NEW: when multiple order linked to facture, show list into note.
|
||||||
|
NEW: when we delete several objects with massaction, if somes object has child we must see which objects are concerned and nevertheless delete objects which can be deleted
|
||||||
|
NEW: Editing a page in website module keep old page with name .back
|
||||||
|
NEW: External backups can be downloaded from the "About info page".
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Modules
|
||||||
|
NEW: Stable module Knowledge Management
|
||||||
|
NEW: Experimental module Event Organization Management
|
||||||
|
NEW: Experimental module Workstations Management
|
||||||
|
NEW: Development of module Partnership Management
|
||||||
|
OLD: module SimplePOS has been completely removed -> use TakePOS
|
||||||
|
|
||||||
|
|
||||||
|
For developers:
|
||||||
|
---------------
|
||||||
|
|
||||||
|
API:
|
||||||
|
NEW: #18319 REST API - Shipment: Add 'close' action / endpoint / POST method.
|
||||||
|
NEW: add API /approve and /makeOrder for purchase orders
|
||||||
|
NEW: API for knowledgemanagement
|
||||||
|
NEW: API get list of legal form of business
|
||||||
|
NEW: API list of staff units
|
||||||
|
NEW: Hidden option API_DISABLE_COMPRESSION is now visible in API setup page.
|
||||||
|
|
||||||
|
Hook:
|
||||||
|
NEW: add hook 'beforeBodyClose'
|
||||||
|
NEW: add hook 'hookGetEntity'
|
||||||
|
NEW: add hook 'menuLeftMenuItems' to filter the leftmenu items
|
||||||
|
NEW: add hook 'printUnderHeaderPDFline' on invoice PDF templates (can be used for example to add a barcode or more information on header of invoices).
|
||||||
|
NEW: add hookmanager on note pages
|
||||||
|
NEW: hook after rank update
|
||||||
|
NEW: 'printFieldListFrom' hook call on several lists
|
||||||
|
|
||||||
|
ModuleBuilder:
|
||||||
|
NEW: add the property "copytoclipboard" in modulebuilder
|
||||||
|
NEW: Use lang selector when using a field key 'lang' in modulebuilder
|
||||||
|
|
||||||
|
Options:
|
||||||
|
NEW: add options MAIN_IBAN_IS_NEVER_MANDATORY, MAIN_IBAN_NOT_MANDATORY, PROPAL_NOT_BILLABLE, PROPAL_REOPEN_UNSIGNED_ONLY, PROPOSAL_ARE_NOT_BILLABLE, TICKETS_MESSAGE_FORCE_MAIL
|
||||||
|
|
||||||
|
Trigger:
|
||||||
|
NEW: add action trigger for member excluded
|
||||||
|
|
||||||
|
|
||||||
|
NEW: Introduce method hasRight
|
||||||
|
NEW: Can use textarea field into a confirm popup.
|
||||||
|
NEW: Can use the result_mode of mysqli driver. Save memory for list count
|
||||||
|
NEW: add code codebar column on serial/lot structure
|
||||||
|
NEW: add date_valid and date_approve columns in the list of supplier orders
|
||||||
|
NEW: we need to be able to put more filters on deleteByParentField() function
|
||||||
|
NEW: make it easier to set the `keyword`, `keywords` and `description` attributes of an ecm file object
|
||||||
|
NEW: Experimental feature to manage user sessions in database
|
||||||
|
|
||||||
|
|
||||||
|
WARNING:
|
||||||
|
|
||||||
|
Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
|
||||||
|
* ALL EXTERNAL MODULES THAT WERE NOT CORRECTLY DEVELOPPED WILL NOT WORK ON V15 (All modules that forgot to manage the security token field
|
||||||
|
into forms will be broken. The security token field is expected since Dolibarr v9 but a lot of external modules did not implement it).
|
||||||
|
* Update hook 'printOriginObjectLine', removed check on product type and special code. Need now reshook.
|
||||||
|
* Old deprecated module "SimplePOS" has been completely removed. Use module "TakePOS" is you need a Point Of Sale.
|
||||||
|
* The method static ActionComm::getActions($db, ...) is no more static. Use $actioncomm->getActions(...) instead (without $db param).
|
||||||
|
* The 'action=delete&file=...' has been replaced with 'action=deletefile&file=...' to avoid confusion with deletion of object lines.
|
||||||
|
* Method getDictvalue has been renamed into getDictionaryValue to match camel case rule.
|
||||||
|
* To execute shell or command line command, your code must never use method like exec, shell_exec, popen, .. but must use the built-in
|
||||||
|
method executeCLI() available into core/class/utils.class.php
|
||||||
|
* Class file expeditionbatch.class.php renamed to expeditionlinebatch.class.php
|
||||||
|
* ExpeditionLineBatch::fetchAll is not static anymore and first parameter $db is removed
|
||||||
|
* ExtraFields->showOutputField parameter 4 'extrafieldsobjectkey' is now required
|
||||||
|
* CommonObject method add_object_linked now sets targettype to 'mymodule_myobject' instead of 'myobject',
|
||||||
|
you can use hook 'setLinkedObjectSourceTargetType' to set your usual targettype
|
||||||
|
|
||||||
|
|
||||||
***** ChangeLog for 14.0.5 compared to 14.0.4 *****
|
***** ChangeLog for 14.0.5 compared to 14.0.4 *****
|
||||||
|
|
||||||
FIX: 13.0: printFieldListWhere called twice on same query
|
FIX: 13.0: printFieldListWhere called twice on same query
|
||||||
@ -502,7 +1408,7 @@ Following changes may create regressions for some external modules, but were nec
|
|||||||
* The ICS value for direct debit or credit transfer is now stored on each bank account instead of into the global setup.
|
* The ICS value for direct debit or credit transfer is now stored on each bank account instead of into the global setup.
|
||||||
* API /setup/shipment_methods has been replaced with API /setup/shipping_methods
|
* API /setup/shipment_methods has been replaced with API /setup/shipping_methods
|
||||||
* Field "total" renamed into "total_ht" for table llx_facture, llx_facture_rec for better field name consistency
|
* Field "total" renamed into "total_ht" for table llx_facture, llx_facture_rec for better field name consistency
|
||||||
* Field "tva" renamed into "total_tva" for table llx_propal, llx_supplier_proposal, llx_commande, llx_commande_fournisseur for better field name consistency
|
* Field "tva" renamed into "total_tva" for llx_facture, table llx_propal, llx_supplier_proposal, llx_commande, llx_commande_fournisseur for better field name consistency
|
||||||
* Field "total" renamed into "total_ttc" for table llx_propal, llx_supplier_proposal for better field name consistency
|
* Field "total" renamed into "total_ttc" for table llx_propal, llx_supplier_proposal for better field name consistency
|
||||||
* If your database is PostgreSQL, you must use version 9.1.0 or more (Dolibarr need the SQL function CONCAT)
|
* If your database is PostgreSQL, you must use version 9.1.0 or more (Dolibarr need the SQL function CONCAT)
|
||||||
* If your database is MySQL or MariaDB, you need at least version 5.1
|
* If your database is MySQL or MariaDB, you need at least version 5.1
|
||||||
@ -547,11 +1453,11 @@ FIX: wrong users count in multicompany transverse mode
|
|||||||
***** ChangeLog for 13.0.4 compared to 13.0.3 *****
|
***** ChangeLog for 13.0.4 compared to 13.0.3 *****
|
||||||
|
|
||||||
FIX: Allow disabling of a module (not a dangerous action) even if there is problem with token (due to bugged modules).
|
FIX: Allow disabling of a module (not a dangerous action) even if there is problem with token (due to bugged modules).
|
||||||
FIX: 13.0 - fatal - missing inclusion of ajax.lib.php for calling `ajax_autocompleter()`
|
FIX: 13.0 - fatal - missing inclusion of ajax.lib.php for calling 'ajax_autocompleter()'
|
||||||
FIX: #17919 pictures in docs.
|
FIX: #17919 pictures in docs
|
||||||
FIX: #18006
|
FIX: #18006
|
||||||
FIX: Accountancy - if we define a date start, automatic binding try to continue to solve old binding
|
FIX: Accountancy - if we define a date start, automatic binding try to continue to solve old binding
|
||||||
FIX: Accoutancy Limit date payment not registered on purchases operations
|
FIX: Accountancy - Limit date payment not registered on purchases operations
|
||||||
FIX: Can't edit replacement invoice
|
FIX: Can't edit replacement invoice
|
||||||
FIX: deposit can create credit note in payment conf
|
FIX: deposit can create credit note in payment conf
|
||||||
FIX: division by zero on create
|
FIX: division by zero on create
|
||||||
@ -655,7 +1561,7 @@ FIX: File attachment on lots/batches
|
|||||||
FIX: handling $heightforinfotot when he's superior to a page height on Supplier Invoice
|
FIX: handling $heightforinfotot when he's superior to a page height on Supplier Invoice
|
||||||
FIX: hourglass and hide button to pay
|
FIX: hourglass and hide button to pay
|
||||||
FIX: massaction validate invoice do not regenerate PDF
|
FIX: massaction validate invoice do not regenerate PDF
|
||||||
FIX: missing mp4 video mime
|
FIX: #16627 fix missing mp4 video mime
|
||||||
FIX: picto on shipment to reset qty to 0. Some quantities were not reset.
|
FIX: picto on shipment to reset qty to 0. Some quantities were not reset.
|
||||||
FIX: Protection to avoid #16504
|
FIX: Protection to avoid #16504
|
||||||
FIX: rounding amount on card updating
|
FIX: rounding amount on card updating
|
||||||
@ -841,7 +1747,6 @@ NEW: introduce constant FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM
|
|||||||
NEW: introducing new modal boxes in TakePOS
|
NEW: introducing new modal boxes in TakePOS
|
||||||
NEW: keep TakePOS terminal when login/logout
|
NEW: keep TakePOS terminal when login/logout
|
||||||
NEW: link on balance to the ledger
|
NEW: link on balance to the ledger
|
||||||
NEW: MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER const in email collector
|
|
||||||
NEW: manage errors on update extra fields in ticket card
|
NEW: manage errors on update extra fields in ticket card
|
||||||
NEW: mass-actions for the event list view
|
NEW: mass-actions for the event list view
|
||||||
NEW: more filter for "View change logs"
|
NEW: more filter for "View change logs"
|
||||||
|
|||||||
20
README-FR.md
20
README-FR.md
@ -8,12 +8,10 @@ Il est simple d'utilisation et modulaire, vous permettant de n'activez que les f
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## LICENCE
|
## LICENCE
|
||||||
|
|
||||||
Dolibarr est distribué sous les termes de la licence GNU General Public License v3+ ou supérieure.
|
Dolibarr est distribué sous les termes de la licence GNU General Public License v3+ ou supérieure.
|
||||||
|
|
||||||
|
|
||||||
## INSTALLER DOLIBARR
|
## INSTALLER DOLIBARR
|
||||||
|
|
||||||
### Configuration simple
|
### Configuration simple
|
||||||
@ -54,25 +52,26 @@ Vous pouvez aussi utiliser un serveur Web et une base de données prise en charg
|
|||||||
|
|
||||||
- Suivez les instructions de l'installateur
|
- Suivez les instructions de l'installateur
|
||||||
|
|
||||||
|
|
||||||
## METTRE A JOUR DOLIBARR
|
## METTRE A JOUR DOLIBARR
|
||||||
|
|
||||||
Pour mettre à jour Dolibarr depuis une vieille version vers celle ci:
|
Pour mettre à jour Dolibarr depuis une vieille version vers celle ci:
|
||||||
|
|
||||||
|
- Faites une sauvegarde de votre instance [voir ce tutorial](https://wiki.dolibarr.org/index.php/Installation_-_Upgrade#Upgrade_Dolibarr)
|
||||||
|
|
||||||
|
- Vérifiez que la nouvelle version est compatible avec la version PHP de votre serveur [voir PHP support](https://wiki.dolibarr.org/index.php/Releases).
|
||||||
|
|
||||||
- Ecrasez les vieux fichiers dans le vieux répertoire 'dolibarr' par les fichiers
|
- Ecrasez les vieux fichiers dans le vieux répertoire 'dolibarr' par les fichiers
|
||||||
fournis dans ce nouveau package.
|
fournis dans ce nouveau package.
|
||||||
|
|
||||||
- Au prochain accès, Dolibarr proposera la page de "mise à jour" des données (si nécessaire).
|
- Au prochain accès, Dolibarr proposera la page de "mise à jour" des données (si nécessaire).
|
||||||
Si un fichier install.lock existe pour verrouiller le processus de mise à jour, il sera demandé de le supprimer manuellement (vous devriez trouver le fichier install.lock dans le répertoire utilisé pour stocker les documents générés ou transférés sur le serveur. Dans la plupart des cas, c'est le répertoire appelé "documents")
|
Si un fichier install.lock existe pour verrouiller le processus de mise à jour, il sera demandé de le supprimer manuellement (vous devriez trouver le fichier install.lock dans le répertoire utilisé pour stocker les documents générés ou transférés sur le serveur. Dans la plupart des cas, c'est le répertoire appelé "documents")
|
||||||
|
|
||||||
*Note: Le processus de migration peut être lancé manuellement et plusieurs fois, sans risque, en appelant la page /install/*
|
Note: *Le processus de migration peut être lancé manuellement et plusieurs fois, sans risque, en appelant la page /install/*
|
||||||
|
|
||||||
|
|
||||||
## CE QUI EST NOUVEAU
|
## CE QUI EST NOUVEAU
|
||||||
|
|
||||||
See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) file.
|
See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) file.
|
||||||
|
|
||||||
|
|
||||||
## CE QUE DOLIBARR PEUT FAIRE
|
## CE QUE DOLIBARR PEUT FAIRE
|
||||||
|
|
||||||
### Modules principaux (tous optionnels)
|
### Modules principaux (tous optionnels)
|
||||||
@ -122,7 +121,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
|
|||||||
- Peux être multi-société par ajout du module externe multi-société.
|
- Peux être multi-société par ajout du module externe multi-société.
|
||||||
- Plusieurs thèmes visuels.
|
- Plusieurs thèmes visuels.
|
||||||
- Application simple à utiliser.
|
- Application simple à utiliser.
|
||||||
- Requiert PHP et MariaDb, Mysql ou Postgresql (Voir versions exactes sur https://wiki.dolibarr.org/index.php/Prérequis).
|
- Requiert PHP et MariaDb, Mysql ou Postgresql (Voir versions exactes sur [https://wiki.dolibarr.org/index.php/Prérequis](https://wiki.dolibarr.org/index.php/Prérequis)).
|
||||||
- Compatible avec toutes les offres Cloud du marché respectant les prérequis de base de données et PHP.
|
- Compatible avec toutes les offres Cloud du marché respectant les prérequis de base de données et PHP.
|
||||||
- APIs.
|
- APIs.
|
||||||
- Génération PDF et ODT des éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
|
- Génération PDF et ODT des éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
|
||||||
@ -142,7 +141,6 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
|
|||||||
|
|
||||||
Dolibarr peut aussi être étendu à volonté avec l'ajout de module/applications externes développées par des développeus tiers, disponible sur [DoliStore](https://www.dolistore.com).
|
Dolibarr peut aussi être étendu à volonté avec l'ajout de module/applications externes développées par des développeus tiers, disponible sur [DoliStore](https://www.dolistore.com).
|
||||||
|
|
||||||
|
|
||||||
## CE QUE DOLIBARR NE PEUT PAS (ENCORE) FAIRE
|
## CE QUE DOLIBARR NE PEUT PAS (ENCORE) FAIRE
|
||||||
|
|
||||||
Voici un liste de fonctionnalités pas encore gérées par Dolibarr:
|
Voici un liste de fonctionnalités pas encore gérées par Dolibarr:
|
||||||
@ -152,18 +150,15 @@ Voici un liste de fonctionnalités pas encore gérées par Dolibarr:
|
|||||||
- Dolibarr n'embarque pas de Webmail intégré nativement.
|
- Dolibarr n'embarque pas de Webmail intégré nativement.
|
||||||
- Dolibarr ne fait pas le café (pas encore).
|
- Dolibarr ne fait pas le café (pas encore).
|
||||||
|
|
||||||
|
|
||||||
## DOCUMENTATION
|
## DOCUMENTATION
|
||||||
|
|
||||||
La documentation utilisateur, développeur et traducteur est disponible sous forme de ressources de la communauté via le site [Wiki](https://wiki.dolibarr.org).
|
La documentation utilisateur, développeur et traducteur est disponible sous forme de ressources de la communauté via le site [Wiki](https://wiki.dolibarr.org).
|
||||||
|
|
||||||
|
|
||||||
## CONTRIBUER
|
## CONTRIBUER
|
||||||
|
|
||||||
Ce projet existe grâce à ses nombreux contributeurs [[Contribuer](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)].
|
Ce projet existe grâce à ses nombreux contributeurs [[Contribuer](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)].
|
||||||
|
|
||||||
<a href="https://github.com/Dolibarr/dolibarr/graphs/contributors"><img src="https://opencollective.com/dolibarr/contributors.svg?width=890&button=false" /></a>
|
[](https://github.com/Dolibarr/dolibarr/graphs/contributors)
|
||||||
|
|
||||||
|
|
||||||
## CREDITS
|
## CREDITS
|
||||||
|
|
||||||
@ -171,7 +166,6 @@ Dolibarr est le résultat du travail de nombreux contributeurs depuis des année
|
|||||||
|
|
||||||
Voir le fichier [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT)
|
Voir le fichier [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT)
|
||||||
|
|
||||||
|
|
||||||
## ACTUALITES ET RESEAUX SOCIAUX
|
## ACTUALITES ET RESEAUX SOCIAUX
|
||||||
|
|
||||||
Suivez le projet Dolibarr project sur les réseaux francophones
|
Suivez le projet Dolibarr project sur les réseaux francophones
|
||||||
|
|||||||
63
README.md
63
README.md
@ -4,6 +4,7 @@
|
|||||||
|
|
||||||
[](https://php.net/)
|
[](https://php.net/)
|
||||||
[](https://github.com/Dolibarr/dolibarr)
|
[](https://github.com/Dolibarr/dolibarr)
|
||||||
|
[](https://bestpractices.coreinfrastructure.org/projects/5521)
|
||||||
|
|
||||||
Dolibarr ERP & CRM is a modern software package that helps manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda…).
|
Dolibarr ERP & CRM is a modern software package that helps manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda…).
|
||||||
|
|
||||||
@ -31,7 +32,7 @@ Other licenses apply for some included dependencies. See [COPYRIGHT](https://git
|
|||||||
|
|
||||||
If you have low technical skills and you're looking to install Dolibarr ERP/CRM in just a few clicks, you can use one of the packaged versions:
|
If you have low technical skills and you're looking to install Dolibarr ERP/CRM in just a few clicks, you can use one of the packaged versions:
|
||||||
|
|
||||||
- [DoliWamp for Windows](https://wiki.dolibarr.org/index.php/Dolibarr_for_Windows_DoliWamp)
|
- [DoliWamp for Windows](https://wiki.dolibarr.org/index.php/Dolibarr_for_Windows_(DoliWamp))
|
||||||
- [DoliDeb for Debian](https://wiki.dolibarr.org/index.php/Dolibarr_for_Ubuntu_or_Debian)
|
- [DoliDeb for Debian](https://wiki.dolibarr.org/index.php/Dolibarr_for_Ubuntu_or_Debian)
|
||||||
- DoliRpm for Redhat, Fedora, OpenSuse, Mandriva or Mageia
|
- DoliRpm for Redhat, Fedora, OpenSuse, Mandriva or Mageia
|
||||||
|
|
||||||
@ -43,7 +44,7 @@ You can use a web server and a supported database (MariaDB, MySQL or PostgreSQL)
|
|||||||
|
|
||||||
On GNU/Linux, first check if your distribution has already packaged Dolibarr.
|
On GNU/Linux, first check if your distribution has already packaged Dolibarr.
|
||||||
|
|
||||||
#### Generic install steps:
|
#### Generic install steps
|
||||||
|
|
||||||
- Check that your installed PHP version is supported [see PHP support](https://wiki.dolibarr.org/index.php/Releases).
|
- Check that your installed PHP version is supported [see PHP support](https://wiki.dolibarr.org/index.php/Releases).
|
||||||
|
|
||||||
@ -71,28 +72,24 @@ On GNU/Linux, first check if your distribution has already packaged Dolibarr.
|
|||||||
|
|
||||||
- Follow the installer instructions
|
- Follow the installer instructions
|
||||||
|
|
||||||
|
|
||||||
### Saas/Cloud setup
|
### Saas/Cloud setup
|
||||||
|
|
||||||
If you don't have time to install it yourself, you can try some commercial 'ready to use' Cloud offers (See https://saas.dolibarr.org). However, this third solution is not free.
|
If you don't have time to install it yourself, you can try some commercial 'ready to use' Cloud offers (See [https://saas.dolibarr.org](https://saas.dolibarr.org)). However, this third solution is not free.
|
||||||
|
|
||||||
|
|
||||||
## UPGRADING
|
## UPGRADING
|
||||||
|
|
||||||
Dolibarr supports upgrading usually wihtout the need for any (commercial) support (depending on if you use any commercial extensions) and supports upgrading all the way from any version after 2.8 without breakage. This is unique in the ERP ecosystem and a benefit our users highly appreciate!
|
Dolibarr supports upgrading, usually without the need for any (commercial) support (depending on if you use any commercial extensions). It supports upgrading all the way from any version after 2.8 without breakage. This is unique in the ERP ecosystem and a benefit our users highly appreciate!
|
||||||
|
|
||||||
- At first make a backup of your Dolibarr files & than [see](https://wiki.dolibarr.org/index.php/Installation_-_Upgrade#Upgrade_Dolibarr)
|
- At first make a backup of your Dolibarr files & then [see](https://wiki.dolibarr.org/index.php/Installation_-_Upgrade#Upgrade_Dolibarr)
|
||||||
- Check that your installed PHP version is supported by the new version [see PHP support](./doc/phpmatrix.md).
|
- Check that your installed PHP version is supported by the new version [see PHP support](https://wiki.dolibarr.org/index.php/Releases).
|
||||||
- Overwrite all old files from 'dolibarr' directory with files provided into the new version's package.
|
- Overwrite all old files from 'dolibarr' directory with files provided into the new version's package.
|
||||||
- At first next access, Dolibarr will redirect you to the "install/" page to follow the upgrade process.
|
- At first next access, Dolibarr will redirect you to the "install/" page to follow the upgrade process.
|
||||||
If an `install.lock` file exists to lock any other upgrade process, the application will ask you to remove the file manually (you should find the `install.lock` file in the directory used to store generated and uploaded documents, in most cases, it is the directory called "*documents*").
|
If an `install.lock` file exists to lock any other upgrade process, the application will ask you to remove the file manually (you should find the `install.lock` file in the directory used to store generated and uploaded documents, in most cases, it is the directory called "*documents*").
|
||||||
|
|
||||||
|
|
||||||
## WHAT'S NEW
|
## WHAT'S NEW
|
||||||
|
|
||||||
See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) file.
|
See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) file.
|
||||||
|
|
||||||
|
|
||||||
## FEATURES
|
## FEATURES
|
||||||
|
|
||||||
### Main application/modules (all optional)
|
### Main application/modules (all optional)
|
||||||
@ -101,6 +98,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
|
|||||||
- Members/Membership/Foundation management
|
- Members/Membership/Foundation management
|
||||||
|
|
||||||
Product Management
|
Product Management
|
||||||
|
|
||||||
- Products and/or Services catalog
|
- Products and/or Services catalog
|
||||||
- Stock / Warehouse management + Inventory
|
- Stock / Warehouse management + Inventory
|
||||||
- Barcodes
|
- Barcodes
|
||||||
@ -110,9 +108,10 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
|
|||||||
- Manufacturing Orders
|
- Manufacturing Orders
|
||||||
|
|
||||||
Customer/Sales Management
|
Customer/Sales Management
|
||||||
|
|
||||||
- Customers/Prospects + Contacts management
|
- Customers/Prospects + Contacts management
|
||||||
- Opportunities or Leads management
|
- Opportunities or Leads management
|
||||||
- Commercial proposals management
|
- Commercial proposals management (online signing)
|
||||||
- Customer Orders management
|
- Customer Orders management
|
||||||
- Contracts/Subscription management
|
- Contracts/Subscription management
|
||||||
- Interventions management
|
- Interventions management
|
||||||
@ -122,6 +121,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
|
|||||||
- Point of Sale (POS)
|
- Point of Sale (POS)
|
||||||
|
|
||||||
Supplier/Purchase Management
|
Supplier/Purchase Management
|
||||||
|
|
||||||
- Suppliers/Vendors + Contacts
|
- Suppliers/Vendors + Contacts
|
||||||
- Supplier (price) requests
|
- Supplier (price) requests
|
||||||
- Purchase Orders management
|
- Purchase Orders management
|
||||||
@ -129,10 +129,11 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
|
|||||||
- Supplier Invoices/credit notes and payment management
|
- Supplier Invoices/credit notes and payment management
|
||||||
- INCOTERMS
|
- INCOTERMS
|
||||||
|
|
||||||
Finance / Accounting
|
Finance/Accounting
|
||||||
- Invoices / Payments
|
|
||||||
|
- Invoices/Payments
|
||||||
- Bank accounts management
|
- Bank accounts management
|
||||||
- Direct debit orders management (European SEPA)
|
- Direct debit and Credit transfer management (European SEPA)
|
||||||
- Accounting management
|
- Accounting management
|
||||||
- Donations management
|
- Donations management
|
||||||
- Loan management
|
- Loan management
|
||||||
@ -140,47 +141,44 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
|
|||||||
- Reports
|
- Reports
|
||||||
|
|
||||||
Collaboration
|
Collaboration
|
||||||
- Shared calendar/agenda (with ical and vcal export for third party tools integration)
|
|
||||||
|
- Shared calendar/agenda (with ical and vcal import/export for third party tools integration)
|
||||||
- Projects & Tasks management
|
- Projects & Tasks management
|
||||||
- Ticket System
|
- Ticket System
|
||||||
- Surveys
|
- Surveys
|
||||||
|
|
||||||
HR
|
HR
|
||||||
- Employee's leave requests management
|
|
||||||
|
- Employee's leaves management
|
||||||
- Expense reports
|
- Expense reports
|
||||||
- Recruitment management
|
- Recruitment management
|
||||||
- Timesheets
|
- Timesheets
|
||||||
|
|
||||||
|
|
||||||
### Other application/modules
|
### Other application/modules
|
||||||
|
|
||||||
- Electronic Document Management (EDM)
|
- Electronic Document Management (EDM)
|
||||||
- Bookmarks management
|
- Bookmarks
|
||||||
- Reporting
|
- Reporting
|
||||||
- Data export/import
|
- Data export/import
|
||||||
- Barcodes
|
- Barcodes
|
||||||
- Margin calculations
|
|
||||||
- LDAP connectivity
|
- LDAP connectivity
|
||||||
- ClickToDial integration
|
- ClickToDial integration
|
||||||
- Mass emailing
|
- Mass emailing
|
||||||
- RSS integration
|
- RSS integration
|
||||||
- Skype integration
|
|
||||||
- Social platforms linking
|
- Social platforms linking
|
||||||
- Payment platforms integration (PayPal, Stripe, Paybox...)
|
- Payment platforms integration (PayPal, Stripe, Paybox...)
|
||||||
- Email-Collector
|
- Email-Collector
|
||||||
|
|
||||||
(around 100 modules available by default, 1000+ on the addon market place)
|
(around 100 modules available by default, 1000+ on the addon market place)
|
||||||
|
|
||||||
|
|
||||||
### Other general features
|
### Other general features
|
||||||
|
|
||||||
- Localization in most major languages
|
- Multi-Language Support (Localization in most major languages)
|
||||||
- Multi-Language Support
|
|
||||||
- Multi-Users and groups with finely grained rights
|
- Multi-Users and groups with finely grained rights
|
||||||
- Multi-Currency
|
- Multi-Currency
|
||||||
- Multi-Company (by adding of an external module)
|
- Multi-Company (by adding of an external module)
|
||||||
- Very user friendly and easy to use
|
- Very user friendly and easy to use
|
||||||
- customizable Dashboard
|
- Customizable dashboards
|
||||||
- Highly customizable: enable only the modules you need, add user personalized fields, choose your skin, several menu managers (can be used by internal users as a back-office with a particular menu, or by external users as a front-office with another one)
|
- Highly customizable: enable only the modules you need, add user personalized fields, choose your skin, several menu managers (can be used by internal users as a back-office with a particular menu, or by external users as a front-office with another one)
|
||||||
- APIs (REST, SOAP)
|
- APIs (REST, SOAP)
|
||||||
- Code that is easy to understand, maintain and develop (PHP with no heavy framework; trigger and hook architecture)
|
- Code that is easy to understand, maintain and develop (PHP with no heavy framework; trigger and hook architecture)
|
||||||
@ -190,13 +188,13 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
|
|||||||
- Canadian double taxes (federal/province) and other countries using cumulative VAT
|
- Canadian double taxes (federal/province) and other countries using cumulative VAT
|
||||||
- Tunisian tax stamp
|
- Tunisian tax stamp
|
||||||
- Argentina invoice numbering using A,B,C...
|
- Argentina invoice numbering using A,B,C...
|
||||||
- Compatible with [European directives] (https://europa.eu/legislation_summaries/taxation/l31057_en.htm) (2006/112/CE ... 2010/45/UE)
|
- ZATCA e-invoicing QR-Code
|
||||||
- Compatible with European GDPR rules
|
- Compatible with [European directives](https://europa.eu/legislation_summaries/taxation/l31057_en.htm) (2006/112/CE ... 2010/45/UE)
|
||||||
|
- Compatible with data privacy rules (europe GDPR, ...)
|
||||||
- ...
|
- ...
|
||||||
- Flexible PDF & ODT generation for invoices, proposals, orders...
|
- Flexible PDF & ODT generation for invoices, proposals, orders...
|
||||||
- ...
|
- ...
|
||||||
|
|
||||||
|
|
||||||
### System Environment / Requirements
|
### System Environment / Requirements
|
||||||
|
|
||||||
- PHP
|
- PHP
|
||||||
@ -205,12 +203,10 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
|
|||||||
|
|
||||||
See exact requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite)
|
See exact requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite)
|
||||||
|
|
||||||
|
|
||||||
### Extending
|
### Extending
|
||||||
|
|
||||||
Dolibarr can be extended with a lot of other external application or modules from third party developers available at the [DoliStore](https://www.dolistore.com).
|
Dolibarr can be extended with a lot of other external application or modules from third party developers available at the [DoliStore](https://www.dolistore.com).
|
||||||
|
|
||||||
|
|
||||||
## WHAT DOLIBARR CAN'T DO YET
|
## WHAT DOLIBARR CAN'T DO YET
|
||||||
|
|
||||||
These are features that Dolibarr does **not** yet fully support:
|
These are features that Dolibarr does **not** yet fully support:
|
||||||
@ -220,12 +216,10 @@ These are features that Dolibarr does **not** yet fully support:
|
|||||||
- No native embedded Webmail, but you can send email to contacts in Dolibarr with e.g. offers, invoices, etc.
|
- No native embedded Webmail, but you can send email to contacts in Dolibarr with e.g. offers, invoices, etc.
|
||||||
- Dolibarr can't do coffee (yet)
|
- Dolibarr can't do coffee (yet)
|
||||||
|
|
||||||
|
|
||||||
## DOCUMENTATION
|
## DOCUMENTATION
|
||||||
|
|
||||||
Administrator, user, developer and translator's documentations are available along with other community resources in the [Wiki](https://wiki.dolibarr.org).
|
Administrator, user, developer and translator's documentations are available along with other community resources in the [Wiki](https://wiki.dolibarr.org).
|
||||||
|
|
||||||
|
|
||||||
## CONTRIBUTING
|
## CONTRIBUTING
|
||||||
|
|
||||||
This project exists thanks to all the people who contribute.
|
This project exists thanks to all the people who contribute.
|
||||||
@ -233,8 +227,7 @@ Please read the instructions how to contribute (report a bug/error, a feature re
|
|||||||
|
|
||||||
A view on Contributors:
|
A view on Contributors:
|
||||||
|
|
||||||
<a href="https://github.com/Dolibarr/dolibarr/graphs/contributors"><img src="https://opencollective.com/dolibarr/contributors.svg?width=890&button=false" /></a>
|
[](https://github.com/Dolibarr/dolibarr/graphs/contributors)
|
||||||
|
|
||||||
|
|
||||||
## CREDITS
|
## CREDITS
|
||||||
|
|
||||||
@ -242,7 +235,6 @@ Dolibarr is the work of many contributors over the years and uses some fine PHP
|
|||||||
|
|
||||||
See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) file.
|
See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) file.
|
||||||
|
|
||||||
|
|
||||||
## NEWS AND SOCIAL NETWORKS
|
## NEWS AND SOCIAL NETWORKS
|
||||||
|
|
||||||
Follow Dolibarr project on:
|
Follow Dolibarr project on:
|
||||||
@ -250,11 +242,10 @@ Follow Dolibarr project on:
|
|||||||
- [Facebook](https://www.facebook.com/dolibarr)
|
- [Facebook](https://www.facebook.com/dolibarr)
|
||||||
- [Twitter](https://www.twitter.com/dolibarr)
|
- [Twitter](https://www.twitter.com/dolibarr)
|
||||||
- [LinkedIn](https://www.linkedin.com/company/association-dolibarr)
|
- [LinkedIn](https://www.linkedin.com/company/association-dolibarr)
|
||||||
|
- [Reddit](https://www.reddit.com/r/Dolibarr_ERP_CRM/)
|
||||||
- [YouTube](https://www.youtube.com/user/DolibarrERPCRM)
|
- [YouTube](https://www.youtube.com/user/DolibarrERPCRM)
|
||||||
- [GitHub](https://github.com/Dolibarr/dolibarr)
|
- [GitHub](https://github.com/Dolibarr/dolibarr)
|
||||||
|
|
||||||
|
|
||||||
### Sponsors
|
### Sponsors
|
||||||
|
|
||||||
Support this project by becoming a sponsor. Your logo will show up here. 🙏 [[Become a sponsor/backer](https://opencollective.com/dolibarr#backer)]
|
Support this project by becoming a sponsor. Your logo will show up here. 🙏 [[Become a sponsor/backer](https://opencollective.com/dolibarr#backer)]
|
||||||
|
|
||||||
|
|||||||
41
SECURITY.md
41
SECURITY.md
@ -4,26 +4,27 @@ This file contains some policies about the security reports on Dolibarr ERP CRM
|
|||||||
|
|
||||||
## Supported Versions for security reports
|
## Supported Versions for security reports
|
||||||
|
|
||||||
| Version | Supported |
|
| Version | Supported |
|
||||||
| --------- | ------------------ |
|
| ---------- | ---------------------- |
|
||||||
| <= 12.* | :x: |
|
| <= 15.0.0 | :x: |
|
||||||
| >= 13.* | :white_check_mark: |
|
| >= 15.0.1+ | :white_check_mark: except CSRF attacks|
|
||||||
|
| >= 16.0.0 | :white_check_mark: |
|
||||||
|
| >= develop | :white_check_mark: |
|
||||||
|
|
||||||
## Reporting a Vulnerability
|
## Reporting a Vulnerability
|
||||||
|
|
||||||
To report a vulnerability, please use GitHub security advisory at https://github.com/Dolibarr/dolibarr/security/advisories/new (if you have permissions) or alternatively send an email to security@dolibarr.org (for everybody)
|
To report a vulnerability, for a private report, please use GitHub security advisory at [https://github.com/Dolibarr/dolibarr/security/advisories/new](https://github.com/Dolibarr/dolibarr/security/advisories/new) (if you have permissions).
|
||||||
|
Alternatively send an email to security@dolibarr.org (for everybody)
|
||||||
|
|
||||||
## Hunting vulnerabilities on Dolibarr
|
## Hunting vulnerabilities on Dolibarr
|
||||||
|
|
||||||
We believe that future of software is online SaaS. This means software are more and more critical and no technology is perfect. Working with skilled security researchers is crucial in identifying weaknesses in our technology.
|
We believe that the future of software is online SaaS. This means software are more and more critical and no technology is perfect. Working with skilled security researchers is crucial in identifying weaknesses in our technology.
|
||||||
|
|
||||||
If you believe you've found a security bug in our service, we are happy to work with you to resolve the issue promptly and ensure you are fairly rewarded for your discovery.
|
If you believe you've found a security bug in our service, we are happy to work with you to resolve the issue promptly and ensure you are fairly rewarded for your discovery.
|
||||||
|
|
||||||
Any type of denial of service attacks is strictly forbidden, as well as any interference with network equipment and Dolibarr infrastructure.
|
Any type of denial of service attacks is strictly forbidden, as well as any interference with network equipment and Dolibarr infrastructure.
|
||||||
|
|
||||||
We recommand to install Dolibarr ERP CRM on your own server (as most Open Source software, download and use is free: https://www.dolibarr.org/download) to get access on every side of application.
|
We recommand to install Dolibarr ERP CRM on your own server (as most Open Source software, download and use is free: [https://www.dolibarr.org/download](https://www.dolibarr.org/download)) to get access on every side of application.
|
||||||
|
|
||||||
### User Agent
|
### User Agent
|
||||||
|
|
||||||
@ -31,22 +32,20 @@ If you try to find bug on Dolibarr, we recommend to append to your user-agent he
|
|||||||
|
|
||||||
### Account access
|
### Account access
|
||||||
|
|
||||||
You can install the web application yourself on your own platform/server so you get full access to application and sources. Download the zip of the files to put into your own web server virtual host from https://www.dolibarr.org/download
|
You can install the web application yourself on your own platform/server so you get full access to application and sources. Download the zip of the files to put into your own web server virtual host from [https://www.dolibarr.org/download](https://www.dolibarr.org/download)
|
||||||
|
|
||||||
|
|
||||||
## Eligibility and Responsible Disclosure
|
## Eligibility and Responsible Disclosure
|
||||||
|
|
||||||
We are happy to thank everyone who submits valid reports which help us improve the security of Dolibarr however, only those that meet the following eligibility requirements will be "validated reports" (if not, we may close the report without any answer):
|
We are happy to thank everyone who submits valid reports which help us improve the security of Dolibarr, however only those that meet the following eligibility requirements will be "validated reports" (if not, we may close the report without any answer):
|
||||||
|
|
||||||
You must be the first reporter of the vulnerability (duplicate reports are closed).
|
You must be the first reporter of the vulnerability (duplicate reports are closed).
|
||||||
|
|
||||||
You must send a clear textual description of the report along with steps to reproduce the issue, include attachments such as screenshots or proof of concept code as necessary.
|
You must send a clear textual description of the report along with steps to reproduce the issue, include attachments such as screenshots or proof of concept code as necessary.
|
||||||
|
|
||||||
You must avoid tests that could cause degradation or interruption of our service (refrain from using automated tools, and limit yourself about requests per second), that's why we recommand to install softwate on your own platform.
|
You must avoid tests that could cause degradation or interruption of our service (refrain from using automated tools, and limit yourself about requests per second), that's why we recommand to install software on your own platform.
|
||||||
|
|
||||||
You must not leak, manipulate, or destroy any user data of third parties to find your vulnerability.
|
You must not leak, manipulate, or destroy any user data of third parties to find your vulnerability.
|
||||||
|
|
||||||
|
|
||||||
## Scope for qualified vulnerabilities
|
## Scope for qualified vulnerabilities
|
||||||
|
|
||||||
ONLY vulnerabilities discovered, when the following setup on test platform is used, are "valid":
|
ONLY vulnerabilities discovered, when the following setup on test platform is used, are "valid":
|
||||||
@ -54,23 +53,22 @@ ONLY vulnerabilities discovered, when the following setup on test platform is us
|
|||||||
* $dolibarr_main_prod must be set to 1 into conf.php
|
* $dolibarr_main_prod must be set to 1 into conf.php
|
||||||
* $dolibarr_nocsrfcheck must be kept to the value 0 into conf.php (this is the default value)
|
* $dolibarr_nocsrfcheck must be kept to the value 0 into conf.php (this is the default value)
|
||||||
* $dolibarr_main_force_https must be set to something else than 0.
|
* $dolibarr_main_force_https must be set to something else than 0.
|
||||||
* The constant MAIN_SECURITY_CSRF_WITH_TOKEN must be set to 1 into backoffice menu Home - Setup - Other (this protection should be set to 1 soon by default)
|
* The constant MAIN_SECURITY_CSRF_WITH_TOKEN must be set to 3 into backoffice menu Home - Setup - Other (this protection should be set to 3 soon by default)
|
||||||
* The module DebugBar and ModuleBuilder must NOT be enabled (by default, these modules are not enabled. They are developer tools)
|
* The module DebugBar and ModuleBuilder must NOT be enabled (by default, these modules are not enabled. They are developer tools)
|
||||||
* ONLY security reports on modules provided by default and with the "stable" status are valid (troubles into "experimental", "developement" or external modules are not valid vulnerabilities).
|
* ONLY security reports on modules provided by default and with the "stable" status are valid (troubles into "experimental", "developement" or external modules are not valid vulnerabilities).
|
||||||
* The root of web server must link to htdocs and the documents directory must be outside of the web server root (this is the default when using the default installer but may differs with external installer).
|
* The root of web server must link to htdocs and the documents directory must be outside of the web server root (this is the default when using the default installer but may differs with external installer).
|
||||||
* The web server setup must be done so only the documents directory is in write mode. The root directory called htdocs must be readonly.
|
* The web server setup must be done so that only the documents directory is in write mode. The root directory called htdocs must be read-only.
|
||||||
* CSRF attacks are accepted when using a POST URL, but when using GET URL, they are validated only for creating, updating or deleting data resctricted from pages restricted to admin users.
|
* CSRF attacks are accepted but double check that you have set MAIN_SECURITY_CSRF_WITH_TOKEN to value 3.
|
||||||
* Ability for a high level user to edit web site pages into the CMS by including HTML or Javascript is an expected feature. Vulnerabilities into the website module are validated only if HTML or Javascript injection can be done by a non allowed user.
|
* Ability for a high level user to edit web site pages into the CMS by including HTML or Javascript is an expected feature. Vulnerabilities into the website module are validated only if HTML or Javascript injection can be done by a non allowed user.
|
||||||
|
|
||||||
Scope is the web application (back office) and the APIs.
|
Scope is the web application (back office) and the APIs.
|
||||||
|
|
||||||
|
|
||||||
## Qualifying vulnerabilities for reporting
|
## Qualifying vulnerabilities for reporting
|
||||||
|
|
||||||
* Remote code execution (RCE)
|
* Remote code execution (RCE)
|
||||||
* Local files access and manipulation (LFI, RFI, XXE, SSRF, XSPA)
|
* Local files access and manipulation (LFI, RFI, XXE, SSRF, XSPA)
|
||||||
* Code injections (HTML, JS, SQL, PHP, ...)
|
* Code injections (HTML, JS, SQL, PHP, ...)
|
||||||
* Cross-Site Scripting (XSS), except from setup page of module "External web site" (allowing any content here, editable by admin user only, is accepted on purpose or into module "Web site" when permission to edit website content is allowed).
|
* Cross-Site Scripting (XSS), except from setup page of module "External web site" (allowing any content here, editable by admin user only, is accepted on purpose) and except into module "Web site" when permission to edit website content is allowed (injecting any data in this case is allowed too).
|
||||||
* Cross-Site Requests Forgery (CSRF) with real security impact (when using GET URLs, CSRF are qualified only for creating, updating or deleting data from pages restricted to admin users)
|
* Cross-Site Requests Forgery (CSRF) with real security impact (when using GET URLs, CSRF are qualified only for creating, updating or deleting data from pages restricted to admin users)
|
||||||
* Open redirect
|
* Open redirect
|
||||||
* Broken authentication & session management
|
* Broken authentication & session management
|
||||||
@ -81,7 +79,6 @@ Scope is the web application (back office) and the APIs.
|
|||||||
* Software version disclosure (for non admin users only)
|
* Software version disclosure (for non admin users only)
|
||||||
* Stack traces or path disclosure (for non admin users only)
|
* Stack traces or path disclosure (for non admin users only)
|
||||||
|
|
||||||
|
|
||||||
## Non-qualifying vulnerabilities for reporting
|
## Non-qualifying vulnerabilities for reporting
|
||||||
|
|
||||||
* "Self" XSS
|
* "Self" XSS
|
||||||
@ -90,9 +87,8 @@ Scope is the web application (back office) and the APIs.
|
|||||||
* Clickjacking/UI redressing
|
* Clickjacking/UI redressing
|
||||||
* Physical or social engineering attempts or issues that require physical access to a victim’s computer/device
|
* Physical or social engineering attempts or issues that require physical access to a victim’s computer/device
|
||||||
* Presence of autocomplete attribute on web forms
|
* Presence of autocomplete attribute on web forms
|
||||||
* Vulnerabilities affecting outdated browsers or platforms
|
* Vulnerabilities affecting outdated browsers or platforms, or vulnerabilities inside browsers themself.
|
||||||
* Logout and other instances of low-severity Cross-Site Request Forgery
|
* Logout and other instances of low-severity Cross-Site Request Forgery
|
||||||
* Missing cookie flags
|
|
||||||
* Missing security-related HTTP headers which do not lead directly to a vulnerability
|
* Missing security-related HTTP headers which do not lead directly to a vulnerability
|
||||||
* Reports from automated web vulnerability scanners (Acunetix, Vega, etc.) that have not been validated
|
* Reports from automated web vulnerability scanners (Acunetix, Vega, etc.) that have not been validated
|
||||||
* Invalid or missing SPF (Sender Policy Framework) records (Incomplete or missing SPF/DKIM/DMARC)
|
* Invalid or missing SPF (Sender Policy Framework) records (Incomplete or missing SPF/DKIM/DMARC)
|
||||||
@ -100,4 +96,3 @@ Scope is the web application (back office) and the APIs.
|
|||||||
* Software version or private IP disclosure when logged user is admin
|
* Software version or private IP disclosure when logged user is admin
|
||||||
* Stack traces or path disclosure when logged user is admin
|
* Stack traces or path disclosure when logged user is admin
|
||||||
* Any vulnerabilities due to a configuration different than the one defined into chapter "Scope for qualified vulnerabilities".
|
* Any vulnerabilities due to a configuration different than the one defined into chapter "Scope for qualified vulnerabilities".
|
||||||
|
|
||||||
|
|||||||
24
build/README
24
build/README
@ -13,32 +13,12 @@ It is here only to build Dolibarr packages, and those generated packages will no
|
|||||||
|
|
||||||
There are several tools:
|
There are several tools:
|
||||||
|
|
||||||
|
--------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
- To build full Dolibarr packages, launch the script
|
- To build full Dolibarr packages, launch the script
|
||||||
> Launch command perl makepack-dolibarr.pl
|
> Launch command perl makepack-dolibarr.pl
|
||||||
|
|
||||||
--------------------------------------------------------------------------------------------------
|
See makepack-howto.txt for prerequisites.
|
||||||
|
|
||||||
|
|
||||||
Prerequisites to build tgz, debian and rpm packages:
|
|
||||||
> apt-get install tar dpkg dpatch p7zip-full rpm zip
|
|
||||||
|
|
||||||
|
|
||||||
--------------------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
Prerequisites to build autoexe DoliWamp package:
|
|
||||||
> apt-get install wine q4wine
|
|
||||||
> Launch "wine cmd" to check a drive Z: pointing to / exists.
|
|
||||||
> Install InnoSetup
|
|
||||||
For example by running isetup-5.5.8.exe (https://www.jrsoftware.org) https://files.jrsoftware.org/is/5/
|
|
||||||
> Install WampServer into "C:\wamp64" to have Apache, PHP and MariaDB
|
|
||||||
For example by running wampserver3.2.0_x64.exe (https://www.wampserver.com).
|
|
||||||
See file build/exe/doliwamp.iss to know the doliwamp version currently setup.
|
|
||||||
> Add path to ISCC into PATH windows var:
|
|
||||||
Launch wine cmd, then regedit and add entry int HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment\PATH
|
|
||||||
> To build manually the .exe from Windows (running from makepack-dolibarr.pl script is however recommanded),
|
|
||||||
open file build/exe/doliwamp.iss and click on button "Compile".
|
|
||||||
The .exe file will be build into directory build.
|
|
||||||
|
|
||||||
--------------------------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
@ -19,7 +19,6 @@ Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm |
|
|||||||
php-pear, php-mail-mime,
|
php-pear, php-mail-mime,
|
||||||
# php-tcpdf,
|
# php-tcpdf,
|
||||||
# libfpdf-tpl-php, php-fpdf,
|
# libfpdf-tpl-php, php-fpdf,
|
||||||
# libphp-adodb,
|
|
||||||
# libnusoap-php,
|
# libnusoap-php,
|
||||||
# libphp-pclzip,
|
# libphp-pclzip,
|
||||||
# Required javascript libraries
|
# Required javascript libraries
|
||||||
|
|||||||
@ -61,31 +61,6 @@ License: GPL-3+
|
|||||||
|
|
||||||
------------------------------------------------------------
|
------------------------------------------------------------
|
||||||
|
|
||||||
Files: htdocs/includes/adodbtime/*
|
|
||||||
Copyright: 2003-2005, John Lim
|
|
||||||
unknown, jackbbs
|
|
||||||
License: BSD-3-Clause
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
|
||||||
modification, are permitted provided that the following conditions
|
|
||||||
are met:
|
|
||||||
.
|
|
||||||
Redistributions of source code must retain the above copyright notice,
|
|
||||||
this list of conditions and the following disclaimer.
|
|
||||||
.
|
|
||||||
Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
this list of conditions and the following disclaimer in the documentation
|
|
||||||
and/or other materials provided with the distribution.
|
|
||||||
.
|
|
||||||
Neither the name of the John Lim nor the names of its contributors may be
|
|
||||||
used to endorse or promote products derived from this software without
|
|
||||||
specific prior written permission.
|
|
||||||
Comment:
|
|
||||||
Those files are not shipped in the binary package since we use
|
|
||||||
the library as packaged in "libphp-adodb".
|
|
||||||
|
|
||||||
|
|
||||||
------------------------------------------------------------
|
|
||||||
|
|
||||||
Files: htdocs/includes/ckeditor/*
|
Files: htdocs/includes/ckeditor/*
|
||||||
Copyright: 2003-2012 CKSource - Frederico Knabben
|
Copyright: 2003-2012 CKSource - Frederico Knabben
|
||||||
License: GPL-2+
|
License: GPL-2+
|
||||||
|
|||||||
@ -146,7 +146,6 @@ case "$1" in
|
|||||||
#else
|
#else
|
||||||
# File already exist. We add params not found.
|
# File already exist. We add params not found.
|
||||||
#echo Add new params to overwrite path to use shared libraries/fonts
|
#echo Add new params to overwrite path to use shared libraries/fonts
|
||||||
#grep -q -c "dolibarr_lib_ADODB_PATH" $config || [ ! -d "/usr/share/php/adodb" ] || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config
|
|
||||||
##grep -q -c "dolibarr_lib_GEOIP_PATH" $config || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
|
##grep -q -c "dolibarr_lib_GEOIP_PATH" $config || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
|
||||||
#grep -q -c "dolibarr_lib_NUSOAP_PATH" $config || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
|
#grep -q -c "dolibarr_lib_NUSOAP_PATH" $config || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
|
||||||
#grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ] || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
|
#grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ] || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
|
||||||
|
|||||||
@ -31,7 +31,6 @@ $force_install_distrib='debian';
|
|||||||
// - not removed from package (see rm in rules file),
|
// - not removed from package (see rm in rules file),
|
||||||
// - declared into dependencies (see Depends in control file)
|
// - declared into dependencies (see Depends in control file)
|
||||||
//$force_dolibarr_lib_TCPDF_PATH='';
|
//$force_dolibarr_lib_TCPDF_PATH='';
|
||||||
//$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
|
|
||||||
//$force_dolibarr_lib_GEOIP_PATH='';
|
//$force_dolibarr_lib_GEOIP_PATH='';
|
||||||
//$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
|
//$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
|
||||||
//$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
|
//$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
|
||||||
|
|||||||
@ -89,7 +89,6 @@ override_dh_install:
|
|||||||
rm -fr build/zip
|
rm -fr build/zip
|
||||||
|
|
||||||
# clean from all PHP embedded libraries (we use package dependencies instead)
|
# clean from all PHP embedded libraries (we use package dependencies instead)
|
||||||
# rm -fr htdocs/includes/adodbtime
|
|
||||||
# rm -fr htdocs/includes/geoip
|
# rm -fr htdocs/includes/geoip
|
||||||
# rm -fr htdocs/includes/nusoap
|
# rm -fr htdocs/includes/nusoap
|
||||||
# rm -fr htdocs/includes/odtphp/zip/pclzip
|
# rm -fr htdocs/includes/odtphp/zip/pclzip
|
||||||
|
|||||||
@ -55,7 +55,6 @@ RUN echo "host mail" >> /etc/msmtprc
|
|||||||
RUN echo "from local@localdomain.com" >> /etc/msmtprc
|
RUN echo "from local@localdomain.com" >> /etc/msmtprc
|
||||||
RUN echo "domain localhost.localdomain" >> /etc/msmtprc
|
RUN echo "domain localhost.localdomain" >> /etc/msmtprc
|
||||||
RUN echo "sendmail_path=/usr/bin/msmtp -t" >> /usr/local/etc/php/conf.d/php-sendmail.ini
|
RUN echo "sendmail_path=/usr/bin/msmtp -t" >> /usr/local/etc/php/conf.d/php-sendmail.ini
|
||||||
RUN echo "localhost localhost.localdomain" >> /etc/hosts
|
|
||||||
|
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
# Script used by the Dockerfile.
|
||||||
|
# See README.md to know how to create a Dolibarr env with docker
|
||||||
|
|
||||||
usermod -u ${HOST_USER_ID} www-data
|
usermod -u ${HOST_USER_ID} www-data
|
||||||
groupmod -g ${HOST_USER_ID} www-data
|
groupmod -g ${HOST_USER_ID} www-data
|
||||||
|
|||||||
2
build/exe/doliwamp/.gitignore
vendored
2
build/exe/doliwamp/.gitignore
vendored
@ -1 +1 @@
|
|||||||
/doliwamp.tmp.iss
|
/doliwamp.tmp.iss*
|
||||||
|
|||||||
@ -9,3 +9,5 @@ The build of .exe files need to have some windows executable files already insta
|
|||||||
|
|
||||||
If you have technical knowledge in web administration and plan to share your server instance (Apache, Mysql or PHP) with other projects than Dolibarr or want to use Dolibarr other components (PostgreSQL), you should not use this assistant and make a manual installation of Dolibarr on your existing server by downloading the standard package (.tgz or .zip file).
|
If you have technical knowledge in web administration and plan to share your server instance (Apache, Mysql or PHP) with other projects than Dolibarr or want to use Dolibarr other components (PostgreSQL), you should not use this assistant and make a manual installation of Dolibarr on your existing server by downloading the standard package (.tgz or .zip file).
|
||||||
|
|
||||||
|
|
||||||
|
!!! See file ../makepack-howto.txt
|
||||||
|
|||||||
@ -1,5 +1,4 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
/* !!! DO NOT EDIT THIS FILE, EDIT config.inc.php INSTEAD !!! */
|
/* !!! DO NOT EDIT THIS FILE, EDIT config.inc.php INSTEAD !!! */
|
||||||
|
|
||||||
// vim: expandtab sw=4 ts=4 sts=4:
|
// vim: expandtab sw=4 ts=4 sts=4:
|
||||||
|
|||||||
@ -24,15 +24,14 @@ OutputBaseFilename=__FILENAMEEXEDOLIWAMP__
|
|||||||
;OutputManifestFile=build\doliwampbuild.log
|
;OutputManifestFile=build\doliwampbuild.log
|
||||||
; Define full path from which all relative path are defined
|
; Define full path from which all relative path are defined
|
||||||
; You must modify this to put here your dolibarr root directory
|
; You must modify this to put here your dolibarr root directory
|
||||||
;SourceDir=Z:\home\ldestailleur\git\dolibarrxxx
|
|
||||||
SourceDir=..\..\..
|
SourceDir=..\..\..
|
||||||
AppId=doliwamp
|
AppId=doliwamp
|
||||||
AppPublisher=NLTechno
|
AppPublisher=DoliCloud
|
||||||
AppPublisherURL=https://www.nltechno.com
|
AppPublisherURL=https://www.dolicloud.com
|
||||||
AppSupportURL=https://www.dolibarr.org
|
AppSupportURL=https://www.dolibarr.org
|
||||||
AppUpdatesURL=https://www.dolibarr.org
|
AppUpdatesURL=https://www.dolibarr.org
|
||||||
AppComments=DoliWamp includes Dolibarr, Apache, PHP and Mysql software.
|
AppComments=DoliWamp includes Dolibarr, Apache, PHP and Mysql software.
|
||||||
AppCopyright=Copyright (C) 2008-2020 Laurent Destailleur (NLTechno), Fabian Rodriguez (Le Goût du Libre)
|
AppCopyright=Copyright (C) 2008-2022 Laurent Destailleur (DoliCloud), Fabian Rodriguez (Le Goût du Libre)
|
||||||
DefaultDirName=c:\dolibarr
|
DefaultDirName=c:\dolibarr
|
||||||
DefaultGroupName=Dolibarr
|
DefaultGroupName=Dolibarr
|
||||||
;LicenseFile=COPYING
|
;LicenseFile=COPYING
|
||||||
@ -81,7 +80,7 @@ Name: "desktopicon"; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:
|
|||||||
Name: "{app}\logs"
|
Name: "{app}\logs"
|
||||||
Name: "{app}\tmp"
|
Name: "{app}\tmp"
|
||||||
Name: "{app}\dolibarr_documents"
|
Name: "{app}\dolibarr_documents"
|
||||||
Name: "{app}\bin\apache\apache2.4.41\logs"
|
Name: "{app}\bin\apache\apache2.4.51\logs"
|
||||||
|
|
||||||
[Files]
|
[Files]
|
||||||
; Stop/start
|
; Stop/start
|
||||||
@ -99,19 +98,12 @@ Source: "build\exe\doliwamp\startdoliwamp_manual_donotuse.bat.install"; DestDir:
|
|||||||
Source: "build\exe\doliwamp\builddemosslfiles.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
|
Source: "build\exe\doliwamp\builddemosslfiles.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
|
||||||
Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversion;
|
Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversion;
|
||||||
|
|
||||||
; PhpMyAdmin, Apache, Php, Mysql
|
; Apache, Php, Mysql
|
||||||
; Put here path of Wampserver applications
|
; Put here path of Wampserver applications
|
||||||
; Value OK: apache 2.2.6, php 5.2.5 (5.2.11, 5.3.0 and 5.3.1 fails if php_exif, php_pgsql, php_zip is on), mysql 5.0.45
|
; Value OK: apache 2.4.51, php 7.3.33, mariadb10.6.5 (wampserver3.2.6_x64.exe)
|
||||||
; Value OK: apache 2.2.11, php 5.3.0 (if no php_exif, php_pgsql, php_zip), mysql 5.0.45
|
Source: "C:\wamp64\bin\apache\apache2.4.51\*.*"; DestDir: "{app}\bin\apache\apache2.4.51"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
|
||||||
; Value OK: apache 2.4.9, php 5.5.12, mysql 5.0.45 instead of 5.6.17 (wampserver2.5-Apache-2.4.9-Mysql-5.6.17-php5.5.12-32b.exe)
|
Source: "C:\wamp64\bin\php\php7.3.33\*.*"; DestDir: "{app}\bin\php\php7.3.33"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
|
||||||
; Value OK: apache 2.4.41, php 7.3.12, mariadb10.4.10 (wampserver3.2.0_x64.exe)
|
Source: "C:\wamp64\bin\mariadb\mariadb10.6.5\*.*"; DestDir: "{app}\bin\mariadb\mariadb10.6.5"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
|
||||||
Source: "C:\wamp64\apps\phpmyadmin4.9.2\*.*"; DestDir: "{app}\apps\phpmyadmin4.9.2"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log,darkblue_orange"
|
|
||||||
;Source: "C:\Program Files\Wamp\bin\apache\apache2.4.9\*.*"; DestDir: "{app}\bin\apache\apache2.4.9"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
|
|
||||||
Source: "C:\wamp64\bin\apache\apache2.4.41\*.*"; DestDir: "{app}\bin\apache\apache2.4.41"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
|
|
||||||
;Source: "C:\Program Files\Wamp\bin\php\php5.5.12\*.*"; DestDir: "{app}\bin\php\php5.5.12"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
|
|
||||||
Source: "C:\wamp64\bin\php\php7.3.12\*.*"; DestDir: "{app}\bin\php\php7.3.12"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
|
|
||||||
;Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
|
|
||||||
Source: "C:\wamp64\bin\mariadb\mariadb10.4.10\*.*"; DestDir: "{app}\bin\mariadb\mariadb10.4.10"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
|
|
||||||
|
|
||||||
; Mysql data files (does not overwrite if exists)
|
; Mysql data files (does not overwrite if exists)
|
||||||
; We must copy them because the tool mysql_install_db.exe to generate them at first install does not return to prompt so make install hang
|
; We must copy them because the tool mysql_install_db.exe to generate them at first install does not return to prompt so make install hang
|
||||||
@ -125,15 +117,11 @@ Source: "scripts\*.*"; DestDir: "{app}\www\dolibarr\scripts"; Flags: ignoreversi
|
|||||||
Source: "*.*"; DestDir: "{app}\www\dolibarr"; Flags: ignoreversion; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,default.properties,install.lock"
|
Source: "*.*"; DestDir: "{app}\www\dolibarr"; Flags: ignoreversion; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,default.properties,install.lock"
|
||||||
|
|
||||||
; Config files
|
; Config files
|
||||||
Source: "build\exe\doliwamp\phpmyadmin.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion;
|
|
||||||
Source: "build\exe\doliwamp\dolibarr.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion;
|
Source: "build\exe\doliwamp\dolibarr.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion;
|
||||||
Source: "build\exe\doliwamp\config.inc.php.install"; DestDir: "{app}\apps\phpmyadmin4.1.14"; Flags: ignoreversion;
|
Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.4.51\conf"; Flags: ignoreversion;
|
||||||
;Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.4.9\conf"; Flags: ignoreversion;
|
|
||||||
Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.4.41\conf"; Flags: ignoreversion;
|
|
||||||
Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion;
|
Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion;
|
||||||
Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mariadb\mariadb10.4.10"; Flags: ignoreversion;
|
Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mariadb\mariadb10.6.5"; Flags: ignoreversion;
|
||||||
;Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php5.5.12"; Flags: ignoreversion;
|
Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php7.3.33"; Flags: ignoreversion;
|
||||||
Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php7.3.12"; Flags: ignoreversion;
|
|
||||||
Source: "build\exe\doliwamp\index.php.install"; DestDir: "{app}\www"; Flags: ignoreversion;
|
Source: "build\exe\doliwamp\index.php.install"; DestDir: "{app}\www"; Flags: ignoreversion;
|
||||||
Source: "build\exe\doliwamp\install.forced.php.install"; DestDir: "{app}\www\dolibarr\htdocs\install"; Flags: ignoreversion;
|
Source: "build\exe\doliwamp\install.forced.php.install"; DestDir: "{app}\www\dolibarr\htdocs\install"; Flags: ignoreversion;
|
||||||
Source: "build\exe\doliwamp\openssl.conf"; DestDir: "{app}"; Flags: ignoreversion;
|
Source: "build\exe\doliwamp\openssl.conf"; DestDir: "{app}"; Flags: ignoreversion;
|
||||||
@ -196,7 +184,6 @@ var destFileA: String;
|
|||||||
var srcContents: String;
|
var srcContents: String;
|
||||||
var browser: String;
|
var browser: String;
|
||||||
var mysqlVersion: String;
|
var mysqlVersion: String;
|
||||||
var phpmyadminVersion: String;
|
|
||||||
var phpDllCopy: String;
|
var phpDllCopy: String;
|
||||||
var batFile: String;
|
var batFile: String;
|
||||||
|
|
||||||
@ -240,13 +227,9 @@ procedure InitializeWizard();
|
|||||||
begin
|
begin
|
||||||
|
|
||||||
//version des applis, a modifier pour chaque version de WampServer 2
|
//version des applis, a modifier pour chaque version de WampServer 2
|
||||||
//apacheVersion := '2.4.9';
|
apacheVersion := '2.4.51';
|
||||||
//phpVersion := '5.5.12' ;
|
phpVersion := '7.3.33' ;
|
||||||
apacheVersion := '2.4.41';
|
mysqlVersion := '10.6.5';
|
||||||
phpVersion := '7.3.12' ;
|
|
||||||
//mysqlVersion := '5.0.45';
|
|
||||||
mysqlVersion := '10.4.10';
|
|
||||||
phpmyadminVersion := '4.1.14';
|
|
||||||
|
|
||||||
smtpServer := 'localhost';
|
smtpServer := 'localhost';
|
||||||
apachePort := '80';
|
apachePort := '80';
|
||||||
@ -380,9 +363,9 @@ begin
|
|||||||
|
|
||||||
|
|
||||||
// Migration of database
|
// Migration of database
|
||||||
// datadir := pathWithSlashes+'/bin/mariadb/marradb10.4.10/data';
|
// datadir := pathWithSlashes+'/bin/mariadb/mariadb10.6.5/data';
|
||||||
// exedirold := pathWithSlashes+'/bin/mariadb/marradb10.4.10/';
|
// exedirold := pathWithSlashes+'/bin/mariadb/mariadb10.6.5/';
|
||||||
// exedirnew := pathWithSlashes+'/bin/mariadb/marradb10.4.10/';
|
// exedirnew := pathWithSlashes+'/bin/mariadb/mariadb10.6.5/';
|
||||||
|
|
||||||
// If we have a new database version, we should only copy old my.ini file into new directory
|
// If we have a new database version, we should only copy old my.ini file into new directory
|
||||||
// and change only all basedir= strings to use new version. Like this, data dir is still correct.
|
// and change only all basedir= strings to use new version. Like this, data dir is still correct.
|
||||||
@ -599,6 +582,17 @@ begin
|
|||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
if browser = 'iexplore.exe' then
|
||||||
|
begin
|
||||||
|
if FileExists (pfPath+'/Microsoft/Edge/Application/msedge.exe') then
|
||||||
|
begin
|
||||||
|
if MsgBox(CustomMessage('MicrosoftEdgeDetected'),mbConfirmation,MB_YESNO) = IDYES then
|
||||||
|
begin
|
||||||
|
browser := pfPath+'/Microsoft/Edge/Application/msedge.exe';
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
|
||||||
if browser = 'iexplore.exe' then
|
if browser = 'iexplore.exe' then
|
||||||
begin
|
begin
|
||||||
if FileExists (pfPath+'/Internet Explorer/iexplore.exe') then
|
if FileExists (pfPath+'/Internet Explorer/iexplore.exe') then
|
||||||
@ -635,27 +629,6 @@ begin
|
|||||||
begin
|
begin
|
||||||
|
|
||||||
|
|
||||||
//----------------------------------------------
|
|
||||||
// Create file alias phpmyadmin (always)
|
|
||||||
//----------------------------------------------
|
|
||||||
|
|
||||||
destFile := pathWithSlashes+'/alias/phpmyadmin.conf';
|
|
||||||
srcFile := pathWithSlashes+'/alias/phpmyadmin.conf.install';
|
|
||||||
|
|
||||||
if FileExists(srcFile) then
|
|
||||||
begin
|
|
||||||
LoadStringFromFile (srcFile, srcContents);
|
|
||||||
|
|
||||||
//installDir et version de phpmyadmin
|
|
||||||
StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
|
|
||||||
StringChangeEx (srcContents, 'WAMPPHPMYADMINVERSION', phpmyadminVersion, True);
|
|
||||||
|
|
||||||
SaveStringToFile(destFile,srcContents, False);
|
|
||||||
end;
|
|
||||||
DeleteFile(srcFile);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//----------------------------------------------
|
//----------------------------------------------
|
||||||
// Create file alias dolibarr (if not exists)
|
// Create file alias dolibarr (if not exists)
|
||||||
//----------------------------------------------
|
//----------------------------------------------
|
||||||
@ -691,35 +664,6 @@ begin
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
//----------------------------------------------
|
|
||||||
// Create file configuration for phpmyadmin (if not exists)
|
|
||||||
//----------------------------------------------
|
|
||||||
|
|
||||||
destFile := pathWithSlashes+'/apps/phpmyadmin'+phpmyadminVersion+'/config.inc.php';
|
|
||||||
srcFile := pathWithSlashes+'/apps/phpmyadmin'+phpmyadminVersion+'/config.inc.php.install';
|
|
||||||
|
|
||||||
if FileExists(srcFile) then
|
|
||||||
begin
|
|
||||||
if not FileExists (destFile) then
|
|
||||||
begin
|
|
||||||
LoadStringFromFile (srcFile, srcContents);
|
|
||||||
StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
|
|
||||||
StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
|
|
||||||
SaveStringToFile(destFile,srcContents, False);
|
|
||||||
end
|
|
||||||
else
|
|
||||||
begin
|
|
||||||
// We must replace to use format 2.4 of apache
|
|
||||||
DeleteFile(destFile);
|
|
||||||
LoadStringFromFile (srcFile, srcContents);
|
|
||||||
StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
|
|
||||||
StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
|
|
||||||
SaveStringToFile(destFile,srcContents, False);
|
|
||||||
end;
|
|
||||||
end;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//----------------------------------------------
|
//----------------------------------------------
|
||||||
// Create file httpd.conf (if not exists)
|
// Create file httpd.conf (if not exists)
|
||||||
//----------------------------------------------
|
//----------------------------------------------
|
||||||
@ -1082,7 +1026,7 @@ Filename: "{app}\rundoliwamp.bat"; Description: {cm:LaunchNow}; Flags: shellexec
|
|||||||
|
|
||||||
[UninstallDelete]
|
[UninstallDelete]
|
||||||
Type: files; Name: "{app}\*.*"
|
Type: files; Name: "{app}\*.*"
|
||||||
Type: files; Name: "{app}\bin\mariadb\mariadb10.4.10\*.*"
|
Type: files; Name: "{app}\bin\mariadb\mariadb10.6.5\*.*"
|
||||||
Type: filesandordirs; Name: "{app}\alias"
|
Type: filesandordirs; Name: "{app}\alias"
|
||||||
Type: filesandordirs; Name: "{app}\apps"
|
Type: filesandordirs; Name: "{app}\apps"
|
||||||
Type: filesandordirs; Name: "{app}\bin\apache"
|
Type: filesandordirs; Name: "{app}\bin\apache"
|
||||||
|
|||||||
@ -56,7 +56,7 @@ if (empty($argv[1])) {
|
|||||||
|
|
||||||
$i=0;
|
$i=0;
|
||||||
while ($i < $argc) {
|
while ($i < $argc) {
|
||||||
if (! empty($argv[$i])) {
|
if (!empty($argv[$i])) {
|
||||||
parse_str($argv[$i]); // set all params $release, $includecustom, $includeconstant, $buildzip ...
|
parse_str($argv[$i]); // set all params $release, $includecustom, $includeconstant, $buildzip ...
|
||||||
}
|
}
|
||||||
if (preg_match('/includeconstant=/', $argv[$i])) {
|
if (preg_match('/includeconstant=/', $argv[$i])) {
|
||||||
|
|||||||
@ -65,7 +65,7 @@ $DIR||='.'; $DIR =~ s/([^\/\\])[\\\/]+$/$1/;
|
|||||||
|
|
||||||
$SOURCE="$DIR/..";
|
$SOURCE="$DIR/..";
|
||||||
$DESTI="$SOURCE/build";
|
$DESTI="$SOURCE/build";
|
||||||
if ($SOURCE !~ /^\//)
|
if ($SOURCE !~ /^\// && $SOURCE !~ /^[a-z]:/i)
|
||||||
{
|
{
|
||||||
print "Error: Launch the script $PROG.$Extension with its full path from /.\n";
|
print "Error: Launch the script $PROG.$Extension with its full path from /.\n";
|
||||||
print "$PROG.$Extension aborted.\n";
|
print "$PROG.$Extension aborted.\n";
|
||||||
@ -76,15 +76,23 @@ if (! $ENV{"DESTIBETARC"} || ! $ENV{"DESTISTABLE"})
|
|||||||
{
|
{
|
||||||
print "Error: Missing environment variables.\n";
|
print "Error: Missing environment variables.\n";
|
||||||
print "You must define the environment variable DESTIBETARC and DESTISTABLE to point to the\ndirectories where you want to save the generated packages.\n";
|
print "You must define the environment variable DESTIBETARC and DESTISTABLE to point to the\ndirectories where you want to save the generated packages.\n";
|
||||||
|
print "$PROG.$Extension aborted.\n";
|
||||||
|
print "\n";
|
||||||
|
print "You can set them with\n";
|
||||||
|
print "On Linux:\n";
|
||||||
|
print "export DESTIBETARC='/tmp'; export DESTISTABLE='/tmp';\n";
|
||||||
|
print "On Windows:\n";
|
||||||
|
print "set DESTIBETARC=c:/tmp\n";
|
||||||
|
print "set DESTISTABLE=c:/tmp\n";
|
||||||
|
print "\n";
|
||||||
print "Example: DESTIBETARC='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/lastbuild'\n";
|
print "Example: DESTIBETARC='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/lastbuild'\n";
|
||||||
print "Example: DESTISTABLE='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/stable'\n";
|
print "Example: DESTISTABLE='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/stable'\n";
|
||||||
print "$PROG.$Extension aborted.\n";
|
|
||||||
sleep 2;
|
sleep 2;
|
||||||
exit 1;
|
exit 1;
|
||||||
}
|
}
|
||||||
if (! -d $ENV{"DESTIBETARC"} || ! -d $ENV{"DESTISTABLE"})
|
if (! -d $ENV{"DESTIBETARC"} || ! -d $ENV{"DESTISTABLE"})
|
||||||
{
|
{
|
||||||
print "Error: Directory of environment variable DESTIBETARC or DESTISTABLE does not exist.\n";
|
print "Error: Directory of environment variable DESTIBETARC ($ENV{'DESTIBETARC'}) or DESTISTABLE ($ENV{'DESTISTABLE'}) does not exist.\n";
|
||||||
print "$PROG.$Extension aborted.\n";
|
print "$PROG.$Extension aborted.\n";
|
||||||
sleep 2;
|
sleep 2;
|
||||||
exit 1;
|
exit 1;
|
||||||
@ -94,7 +102,7 @@ if (! -d $ENV{"DESTIBETARC"} || ! -d $ENV{"DESTISTABLE"})
|
|||||||
# --------------
|
# --------------
|
||||||
if ("$^O" =~ /linux/i || (-d "/etc" && -d "/var" && "$^O" !~ /cygwin/i)) { $OS='linux'; $CR=''; }
|
if ("$^O" =~ /linux/i || (-d "/etc" && -d "/var" && "$^O" !~ /cygwin/i)) { $OS='linux'; $CR=''; }
|
||||||
elsif (-d "/etc" && -d "/Users") { $OS='macosx'; $CR=''; }
|
elsif (-d "/etc" && -d "/Users") { $OS='macosx'; $CR=''; }
|
||||||
elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i) { $OS='windows'; $CR="\r"; }
|
elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i || "$^O" =~ /msys/i) { $OS='windows'; $CR="\r"; }
|
||||||
if (! $OS) {
|
if (! $OS) {
|
||||||
print "Error: Can't detect your OS.\n";
|
print "Error: Can't detect your OS.\n";
|
||||||
print "Can't continue.\n";
|
print "Can't continue.\n";
|
||||||
@ -390,7 +398,7 @@ if ($nboftargetok) {
|
|||||||
$olddir=getcwd();
|
$olddir=getcwd();
|
||||||
chdir("$SOURCE");
|
chdir("$SOURCE");
|
||||||
|
|
||||||
print "Clean $SOURCE/htdocs\n";
|
print "Clean $SOURCE/htdocs/includes/autoload.php\n";
|
||||||
$ret=`rm -f $SOURCE/htdocs/includes/autoload.php`;
|
$ret=`rm -f $SOURCE/htdocs/includes/autoload.php`;
|
||||||
|
|
||||||
$ret=`git ls-files . --exclude-standard --others`;
|
$ret=`git ls-files . --exclude-standard --others`;
|
||||||
@ -499,8 +507,9 @@ if ($nboftargetok) {
|
|||||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/cache.manifest`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/cache.manifest`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
|
||||||
|
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.nova*`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.pgsql`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
|
||||||
|
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mssql/README`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mssql/README`;
|
||||||
@ -582,9 +591,7 @@ if ($nboftargetok) {
|
|||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/timesheet*`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/timesheet*`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/webmail*`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/webmail*`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/oblyon*`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/common/fontawesome-5/svgs`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/allscreen*`;
|
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/theme/common/octicons/LICENSE`;
|
|
||||||
|
|
||||||
# Removed other test files
|
# Removed other test files
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`;
|
||||||
@ -614,7 +621,6 @@ if ($nboftargetok) {
|
|||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/scripts`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/scripts`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/src`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/src`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/test`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/test`;
|
||||||
$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/nusoap/samples`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/php-iban/docs`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/php-iban/docs`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/sabre/sabre/*/tests`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/sabre/sabre/*/tests`;
|
||||||
@ -625,7 +631,7 @@ if ($nboftargetok) {
|
|||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-*`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-*`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_*`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_*`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/utils`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/utils`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/vendor`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/vendor`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/webmozart`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/webmozart`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/autoload.php`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/autoload.php`;
|
||||||
@ -1075,28 +1081,52 @@ if ($nboftargetok) {
|
|||||||
print "Remove target $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe...\n";
|
print "Remove target $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe...\n";
|
||||||
unlink "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe";
|
unlink "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe";
|
||||||
|
|
||||||
print "Check that in your Wine setup, you have created a Z: drive that point to your / directory.\n";
|
if ($OS eq 'windows') {
|
||||||
|
print "Check that ISCC.exe is in your PATH.\n";
|
||||||
|
} else {
|
||||||
|
print "Check that in your Wine setup, you have created a Z: drive that point to your / directory.\n";
|
||||||
|
}
|
||||||
|
|
||||||
$SOURCEBACK=$SOURCE;
|
$SOURCEBACK=$SOURCE;
|
||||||
$SOURCEBACK =~ s/\//\\/g;
|
$SOURCEBACK =~ s/\//\\/g;
|
||||||
|
|
||||||
print "Prepare file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss from \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"\n";
|
print "Prepare file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\" from \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"\n";
|
||||||
$ret=`cat "$SOURCE/build/exe/doliwamp/doliwamp.iss" | sed -e 's/__FILENAMEEXEDOLIWAMP__/$FILENAMEEXEDOLIWAMP/g' > "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`;
|
|
||||||
|
|
||||||
print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\"\n";
|
#$ret=`cat "$SOURCE/build/exe/doliwamp/doliwamp.iss" | sed -e 's/__FILENAMEEXEDOLIWAMP__/$FILENAMEEXEDOLIWAMP/g' > "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`;
|
||||||
$cmd= "wine ISCC.exe \"Z:$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\"";
|
open(IN, '<' . $SOURCE."/build/exe/doliwamp/doliwamp.iss") or die $!;
|
||||||
|
open(OUT, '>' . "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss") or die $!;
|
||||||
|
while(<IN>)
|
||||||
|
{
|
||||||
|
$_ =~ s/__FILENAMEEXEDOLIWAMP__/$FILENAMEEXEDOLIWAMP/g;
|
||||||
|
print OUT $_;
|
||||||
|
}
|
||||||
|
close(IN);
|
||||||
|
close(OUT);
|
||||||
|
|
||||||
|
print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\" on OS $OS\n";
|
||||||
|
|
||||||
|
if ($OS eq 'windows') {
|
||||||
|
$cmd= "ISCC.exe \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\"";
|
||||||
|
} else {
|
||||||
|
#$cmd= "wine ISCC.exe \"Z:$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\"";
|
||||||
|
}
|
||||||
print "$cmd\n";
|
print "$cmd\n";
|
||||||
$ret= `$cmd`;
|
$ret= `$cmd`;
|
||||||
#print "$ret\n";
|
print "ret=$ret\n";
|
||||||
|
|
||||||
# Move to final dir
|
# Move to final dir
|
||||||
print "Move \"$SOURCE\\build\\$FILENAMEEXEDOLIWAMP.exe\" to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n";
|
print "Move \"$SOURCE\\build\\$FILENAMEEXEDOLIWAMP.exe\" to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n";
|
||||||
rename("$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe","$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe");
|
rename("$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe","$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe");
|
||||||
print "Move $SOURCE/build/$FILENAMEEXEDOLIWAMP.exe to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n";
|
print "Move $SOURCE/build/$FILENAMEEXEDOLIWAMP.exe to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n";
|
||||||
$ret=`mv "$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe" "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"`;
|
|
||||||
|
use File::Copy;
|
||||||
|
|
||||||
|
#$ret=`mv "$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe" "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"`;
|
||||||
|
$ret=move("$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe", "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe");
|
||||||
|
|
||||||
print "Remove tmp file $SOURCE/build/exe/doliwamp/doliwamp.tmp.iss\n";
|
print "Remove tmp file $SOURCE/build/exe/doliwamp/doliwamp.tmp.iss\n";
|
||||||
$ret=`rm "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`;
|
#$ret=`rm "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`;
|
||||||
|
$ret=unlink("$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss");
|
||||||
|
|
||||||
next;
|
next;
|
||||||
}
|
}
|
||||||
@ -1243,7 +1273,7 @@ if ($nboftargetok) {
|
|||||||
|
|
||||||
print "\n----- Summary -----\n";
|
print "\n----- Summary -----\n";
|
||||||
foreach my $target (sort keys %CHOOSEDTARGET) {
|
foreach my $target (sort keys %CHOOSEDTARGET) {
|
||||||
if ($target eq '-CHKSUM') { print "Checksum was generated"; next; }
|
if ($target eq '-CHKSUM') { print "Checksum was generated\n"; next; }
|
||||||
if ($CHOOSEDTARGET{$target} < 0) {
|
if ($CHOOSEDTARGET{$target} < 0) {
|
||||||
print "Package $target not built (bad requirement).\n";
|
print "Package $target not built (bad requirement).\n";
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -293,6 +293,7 @@ foreach my $PROJECT (@PROJECTLIST) {
|
|||||||
}
|
}
|
||||||
print "Clean $BUILDROOT\n";
|
print "Clean $BUILDROOT\n";
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECTLC/.cache`;
|
$ret=`rm -fr $BUILDROOT/$PROJECTLC/.cache`;
|
||||||
|
$ret=`rm -fr $BUILDROOT/$PROJECTLC/.git`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECTLC/.project`;
|
$ret=`rm -fr $BUILDROOT/$PROJECTLC/.project`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECTLC/.settings`;
|
$ret=`rm -fr $BUILDROOT/$PROJECTLC/.settings`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECTLC/index.php`;
|
$ret=`rm -fr $BUILDROOT/$PROJECTLC/index.php`;
|
||||||
|
|||||||
@ -1,19 +1,59 @@
|
|||||||
----- Dolibarr Makepack How To -----
|
----- Dolibarr Makepack How To -----
|
||||||
This documentation describe steps to build a BETA or RELEASE versions
|
This documentation describe steps to build a BETA or RELEASE versions
|
||||||
of Dolibarr. There is a chapter for BETA version and a chapter for
|
of Dolibarr. There is a chapter for BETA version and a chapter for RELEASE version.
|
||||||
RELEASE version.
|
|
||||||
|
|
||||||
|
***** Prerequisites For Linux *****
|
||||||
|
|
||||||
|
Prerequisites to build tgz, debian and rpm packages:
|
||||||
|
> apt-get install perl tar dpkg dpatch p7zip-full rpm zip php-cli
|
||||||
|
|
||||||
|
Prerequisites to build autoexe DoliWamp package from Linux (solution seems broken since Ubuntu 20.04):
|
||||||
|
> apt-get install wine q4wine
|
||||||
|
> Launch "wine cmd" to check a drive Z: pointing to / exists.
|
||||||
|
> Install InnoSetup
|
||||||
|
For example by running isetup-5.5.8.exe (https://www.jrsoftware.org) https://files.jrsoftware.org/is/5/
|
||||||
|
> Install WampServer into "C:\wamp64" to have Apache, PHP and MariaDB
|
||||||
|
For example by running wampserver3.2.6_x64.exe (https://www.wampserver.com).
|
||||||
|
See file build/exe/doliwamp.iss to know the doliwamp version currently setup.
|
||||||
|
> Add path to ISCC into PATH windows var:
|
||||||
|
Launch wine cmd, then regedit and add entry int HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment\PATH
|
||||||
|
> To build manually the .exe from Windows (running from makepack-dolibarr.pl script is however recommanded),
|
||||||
|
open file build/exe/doliwamp.iss and click on button "Compile".
|
||||||
|
The .exe file will be build into directory build.
|
||||||
|
|
||||||
|
|
||||||
|
***** Prerequisites For Windows *****
|
||||||
|
|
||||||
|
Prerequisites to build autoexe DoliWamp package from Windows:
|
||||||
|
|
||||||
|
> Install Perl for Windwos (https://strawberryperl.com/)
|
||||||
|
> Install isetup-5.5.8.exe (https://www.jrsoftware.org)
|
||||||
|
> Install WampServer-3.2.*-64.exe (Apache 2.4.51, PHP 7.3.33, MariaDB 10.6.5 for example. Version must match the values found into doliwamp.iss)
|
||||||
|
> Install GIT for Windows (https://git-scm.com/ => You must choose option "Add Git bash profile", "Git commit as-is")
|
||||||
|
> Install Dolibarr verions:
|
||||||
|
git clone https://github.com/dolibarr/dolibarr
|
||||||
|
|
||||||
|
> Add the path of PHP (C:\wamp64\bin\php\php7.3.33) and InnoSetup (C:\Program Files (x86)\Inno Setup 5) into the %PATH% of Windows.
|
||||||
|
|
||||||
|
> Create a config file c:\dolibarr\dolibarr\htdocs\conf\conf.php with content
|
||||||
|
<?php
|
||||||
|
$dolibarr_main_document_root="c:\dolibarr\dolibarr\htdocs";
|
||||||
|
$dolibarr_main_url_root='http://localhost';
|
||||||
|
|
||||||
|
|
||||||
***** Actions to do a BETA *****
|
***** Actions to do a BETA *****
|
||||||
This files describe steps made by Dolibarr packaging team to make a
|
This files describe steps made by Dolibarr packaging team to make a
|
||||||
beta version of Dolibarr, step by step.
|
beta version of Dolibarr, step by step.
|
||||||
|
|
||||||
- Check all files are commited.
|
- Check all files are commited.
|
||||||
- Update version/info in ChangeLog.
|
- Update version/info in ChangeLog, for this you can:
|
||||||
To generate a changelog of a major new version x.y.0 (from develop repo), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0) <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
|
To generate a changelog of a major new version x.y.0 (from a repo on branch develop), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0) <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
|
||||||
To generate a changelog of a major new version x.y.0 (from x.y repo), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0) <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
|
To generate a changelog of a major new version x.y.0 (from a repo on branch x.y repo), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0) <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
|
||||||
To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-1.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
|
To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-1.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
|
||||||
- To know number of lines changes: git diff --shortstat A B
|
Recopy the content of the output file into the file ChangeLog.
|
||||||
- Update version number with x.y.z-w in htdocs/filefunc.inc.php
|
- Note: To know number of lines changes: git diff --shortstat A B
|
||||||
|
- Update version number with x.y.z-w in file htdocs/filefunc.inc.php
|
||||||
- Commit all changes.
|
- Commit all changes.
|
||||||
|
|
||||||
- Run makepack-dolibarr.pl to generate all packages.
|
- Run makepack-dolibarr.pl to generate all packages.
|
||||||
@ -24,7 +64,6 @@ To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dol
|
|||||||
(/home/dolibarr/wwwroot/files/lastbuild).
|
(/home/dolibarr/wwwroot/files/lastbuild).
|
||||||
|
|
||||||
- Post a news on dolibarr.org/dolibarr.fr + social networks
|
- Post a news on dolibarr.org/dolibarr.fr + social networks
|
||||||
- Send mail on mailings-list
|
|
||||||
|
|
||||||
|
|
||||||
***** Actions to do a RELEASE *****
|
***** Actions to do a RELEASE *****
|
||||||
@ -32,12 +71,13 @@ This files describe steps made by Dolibarr packaging team to make a
|
|||||||
complete release of Dolibarr, step by step.
|
complete release of Dolibarr, step by step.
|
||||||
|
|
||||||
- Check all files are commited.
|
- Check all files are commited.
|
||||||
- Update version/info in ChangeLog.
|
- Update version/info in ChangeLog, for this you can:
|
||||||
To generate a changelog of a major new version x.y.0 (from develop repo), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0) <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
|
To generate a changelog of a major new version x.y.0 (from a repo on branch develop), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0) <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
|
||||||
To generate a changelog of a major new version x.y.0 (from x.y repo), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0) <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
|
To generate a changelog of a major new version x.y.0 (from a repo pn branch x.y), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0) <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
|
||||||
To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-1.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
|
To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-1.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
|
||||||
- To know number of lines changes: git diff --shortstat A B
|
Recopy the content of the output file into the file ChangeLog.
|
||||||
- Update version number with x.y.z in htdocs/filefunc.inc.php
|
- Note: To know the number of lines changes: git diff --shortstat A B
|
||||||
|
- Update version number with x.y.z in file htdocs/filefunc.inc.php
|
||||||
- Commit all changes.
|
- Commit all changes.
|
||||||
|
|
||||||
- Run makepack-dolibarr.pl to generate all packages.
|
- Run makepack-dolibarr.pl to generate all packages.
|
||||||
@ -52,4 +92,3 @@ To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dol
|
|||||||
on server to point to new files (used by some web sites).
|
on server to point to new files (used by some web sites).
|
||||||
|
|
||||||
- Post a news on dolibarr.org/dolibarr.fr + social networks
|
- Post a news on dolibarr.org/dolibarr.fr + social networks
|
||||||
- Send mail on mailings-list
|
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
README (English)
|
README (English)
|
||||||
##################################################
|
##################################################
|
||||||
Building PAD files
|
Building PAD files
|
||||||
|
http://pad.asp-software.org/padgen.php
|
||||||
##################################################
|
##################################################
|
||||||
|
|
||||||
This directory contains files and docs used to build
|
This directory contains files and docs used to build
|
||||||
|
|||||||
@ -30,7 +30,7 @@ return "Regis Houssin";
|
|||||||
# script_dolibarr_versions()
|
# script_dolibarr_versions()
|
||||||
sub script_dolibarr_versions
|
sub script_dolibarr_versions
|
||||||
{
|
{
|
||||||
return ( "12.0.3", "11.0.5", "10.0.7", "9.0.4", "8.0.6", "7.0.5" );
|
return ( "14.0.5", "13.0.5", "12.0.5", "11.0.5", "10.0.7", "9.0.4", "8.0.6", "7.0.5" );
|
||||||
}
|
}
|
||||||
|
|
||||||
sub script_dolibarr_release
|
sub script_dolibarr_release
|
||||||
@ -400,6 +400,8 @@ sub script_dolibarr_check_latest
|
|||||||
{
|
{
|
||||||
local ($ver) = @_;
|
local ($ver) = @_;
|
||||||
local @vers = &osdn_package_versions("dolibarr",
|
local @vers = &osdn_package_versions("dolibarr",
|
||||||
|
$ver >= 14.0 ? "dolibarr\\-(12\\.0\\.[0-9\\.]+)\\.tgz" :
|
||||||
|
$ver >= 13.0 ? "dolibarr\\-(12\\.0\\.[0-9\\.]+)\\.tgz" :
|
||||||
$ver >= 12.0 ? "dolibarr\\-(12\\.0\\.[0-9\\.]+)\\.tgz" :
|
$ver >= 12.0 ? "dolibarr\\-(12\\.0\\.[0-9\\.]+)\\.tgz" :
|
||||||
$ver >= 11.0 ? "dolibarr\\-(11\\.0\\.[0-9\\.]+)\\.tgz" :
|
$ver >= 11.0 ? "dolibarr\\-(11\\.0\\.[0-9\\.]+)\\.tgz" :
|
||||||
$ver >= 10.0 ? "dolibarr\\-(10\\.0\\.[0-9\\.]+)\\.tgz" :
|
$ver >= 10.0 ? "dolibarr\\-(10\\.0\\.[0-9\\.]+)\\.tgz" :
|
||||||
|
|||||||
@ -25,7 +25,7 @@ BuildArch: noarch
|
|||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
Group: Applications/Productivity
|
Group: Applications/Productivity
|
||||||
Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap, php-mysqli, php-adodb, php-nusoap, dejavu-sans-fonts
|
Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap, php-mysqli, php-nusoap, dejavu-sans-fonts
|
||||||
Requires: mysql-server, mysql
|
Requires: mysql-server, mysql
|
||||||
#BuildRequires: desktop-file-utils
|
#BuildRequires: desktop-file-utils
|
||||||
|
|
||||||
@ -104,7 +104,6 @@ cui hai bisogno ed essere facile da usare.
|
|||||||
%{__cp} -pr htdocs $RPM_BUILD_ROOT%{_datadir}/%{name}
|
%{__cp} -pr htdocs $RPM_BUILD_ROOT%{_datadir}/%{name}
|
||||||
%{__cp} -pr scripts $RPM_BUILD_ROOT%{_datadir}/%{name}
|
%{__cp} -pr scripts $RPM_BUILD_ROOT%{_datadir}/%{name}
|
||||||
%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/ckeditor/_source
|
%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/ckeditor/_source
|
||||||
%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/adodbtime
|
|
||||||
%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/nusoap
|
%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/nusoap
|
||||||
%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/fonts
|
%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/fonts
|
||||||
|
|
||||||
@ -165,8 +164,8 @@ done >>%{name}.lang
|
|||||||
%_datadir/dolibarr/htdocs/barcode
|
%_datadir/dolibarr/htdocs/barcode
|
||||||
%_datadir/dolibarr/htdocs/blockedlog
|
%_datadir/dolibarr/htdocs/blockedlog
|
||||||
%_datadir/dolibarr/htdocs/bookmarks
|
%_datadir/dolibarr/htdocs/bookmarks
|
||||||
|
%_datadir/dolibarr/htdocs/bookcal
|
||||||
%_datadir/dolibarr/htdocs/bom
|
%_datadir/dolibarr/htdocs/bom
|
||||||
%_datadir/dolibarr/htdocs/cashdesk
|
|
||||||
%_datadir/dolibarr/htdocs/categories
|
%_datadir/dolibarr/htdocs/categories
|
||||||
%_datadir/dolibarr/htdocs/collab
|
%_datadir/dolibarr/htdocs/collab
|
||||||
%_datadir/dolibarr/htdocs/comm
|
%_datadir/dolibarr/htdocs/comm
|
||||||
@ -228,6 +227,7 @@ done >>%{name}.lang
|
|||||||
%_datadir/dolibarr/htdocs/ticket
|
%_datadir/dolibarr/htdocs/ticket
|
||||||
%_datadir/dolibarr/htdocs/user
|
%_datadir/dolibarr/htdocs/user
|
||||||
%_datadir/dolibarr/htdocs/variants
|
%_datadir/dolibarr/htdocs/variants
|
||||||
|
%_datadir/dolibarr/htdocs/webhook
|
||||||
%_datadir/dolibarr/htdocs/webservices
|
%_datadir/dolibarr/htdocs/webservices
|
||||||
%_datadir/dolibarr/htdocs/website
|
%_datadir/dolibarr/htdocs/website
|
||||||
%_datadir/dolibarr/htdocs/workstation
|
%_datadir/dolibarr/htdocs/workstation
|
||||||
@ -274,7 +274,6 @@ if [ -s $config ] && grep -q "File generated by" $config
|
|||||||
then
|
then
|
||||||
# File already exist. We add params not found.
|
# File already exist. We add params not found.
|
||||||
echo Add new params to overwrite path to use shared libraries/fonts
|
echo Add new params to overwrite path to use shared libraries/fonts
|
||||||
grep -q -c "dolibarr_lib_ADODB_PATH" $config || [ ! -d "/usr/share/php/adodb" ] || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config
|
|
||||||
grep -q -c "dolibarr_lib_FPDI_PATH" $config || [ ! -d "/usr/share/php/fpdi" ] || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
|
grep -q -c "dolibarr_lib_FPDI_PATH" $config || [ ! -d "/usr/share/php/fpdi" ] || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
|
||||||
#grep -q -c "dolibarr_lib_GEOIP_PATH" $config || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
|
#grep -q -c "dolibarr_lib_GEOIP_PATH" $config || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
|
||||||
grep -q -c "dolibarr_lib_NUSOAP_PATH" $config || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
|
grep -q -c "dolibarr_lib_NUSOAP_PATH" $config || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
|
||||||
|
|||||||
@ -46,7 +46,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|||||||
|
|
||||||
%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
|
%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
|
||||||
Group: Applications/Productivity
|
Group: Applications/Productivity
|
||||||
Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap, php-mysqli, php-adodb, php-nusoap, dejavu-sans-fonts, php-mbstring, php-xml
|
Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap, php-mysqli, php-nusoap, dejavu-sans-fonts, php-mbstring, php-xml
|
||||||
Requires: mysql-server, mysql
|
Requires: mysql-server, mysql
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
%else
|
%else
|
||||||
@ -54,11 +54,11 @@ BuildRequires: desktop-file-utils
|
|||||||
Group: Applications/Productivity
|
Group: Applications/Productivity
|
||||||
Requires: apache-base, apache-mod_php, php-cgi, php-cli, php-bz2, php-gd, php-ldap, php-imap, php-mysqli, php-openssl, fonts-ttf-dejavu
|
Requires: apache-base, apache-mod_php, php-cgi, php-cli, php-bz2, php-gd, php-ldap, php-imap, php-mysqli, php-openssl, fonts-ttf-dejavu
|
||||||
Requires: mysql, mysql-client
|
Requires: mysql, mysql-client
|
||||||
%else%_datadir/dolibarr/htdocs/datapolicy
|
%else
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
# Voir http://en.opensuse.org/openSUSE:Packaging_Conventions_RPM_Macros
|
# Voir http://en.opensuse.org/openSUSE:Packaging_Conventions_RPM_Macros
|
||||||
Group: Productivity/Office/Management
|
Group: Productivity/Office/Management
|
||||||
Requires: apache2, apache2-mod_php5, php5 >= 5.3.0, php5-gd, php5-ldap, php5-imap, php5-mysql, php5-openssl, dejavu
|
Requires: apache2, apache2-mod_php, php >= 5.3.0, php-gd, php-ldap, php-imap, php-mysql, php-openssl, dejavu
|
||||||
Requires: mysql-community-server, mysql-community-server-client
|
Requires: mysql-community-server, mysql-community-server-client
|
||||||
BuildRequires: update-desktop-files fdupes
|
BuildRequires: update-desktop-files fdupes
|
||||||
%else
|
%else
|
||||||
@ -67,7 +67,7 @@ Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap, php-mbstring
|
|||||||
Requires: mysql-server, mysql
|
Requires: mysql-server, mysql
|
||||||
Requires: php-mysqli >= 4.1.0
|
Requires: php-mysqli >= 4.1.0
|
||||||
%endif
|
%endif
|
||||||
%endif%_datadir/dolibarr/htdocs/eventorganization
|
%endif
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -125,7 +125,7 @@ cui hai bisogno ed essere facile da usare.
|
|||||||
|
|
||||||
%if 0%{?sles_version}
|
%if 0%{?sles_version}
|
||||||
%{__rm} -rf $RPM_BUILD_ROOT
|
%{__rm} -rf $RPM_BUILD_ROOT
|
||||||
%{__mkdir} $RPM_BUILD_ROOT%_datadir/dolibarr/htdocs/datapolicy
|
%{__mkdir} $RPM_BUILD_ROOT%
|
||||||
%{__mkdir} $RPM_BUILD_ROOT%{_sysconfdir}
|
%{__mkdir} $RPM_BUILD_ROOT%{_sysconfdir}
|
||||||
%{__mkdir} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
|
%{__mkdir} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
|
||||||
%else
|
%else
|
||||||
@ -169,7 +169,6 @@ cui hai bisogno ed essere facile da usare.
|
|||||||
%{__cp} -pr scripts $RPM_BUILD_ROOT%{_datadir}/%{name}
|
%{__cp} -pr scripts $RPM_BUILD_ROOT%{_datadir}/%{name}
|
||||||
%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/ckeditor/_source
|
%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/ckeditor/_source
|
||||||
%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
|
%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
|
||||||
%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/adodbtime
|
|
||||||
%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/nusoap
|
%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/nusoap
|
||||||
%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/fonts
|
%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/fonts
|
||||||
%else
|
%else
|
||||||
@ -246,8 +245,8 @@ done >>%{name}.lang
|
|||||||
%_datadir/dolibarr/htdocs/barcode
|
%_datadir/dolibarr/htdocs/barcode
|
||||||
%_datadir/dolibarr/htdocs/blockedlog
|
%_datadir/dolibarr/htdocs/blockedlog
|
||||||
%_datadir/dolibarr/htdocs/bookmarks
|
%_datadir/dolibarr/htdocs/bookmarks
|
||||||
|
%_datadir/dolibarr/htdocs/bookcal
|
||||||
%_datadir/dolibarr/htdocs/bom
|
%_datadir/dolibarr/htdocs/bom
|
||||||
%_datadir/dolibarr/htdocs/cashdesk
|
|
||||||
%_datadir/dolibarr/htdocs/categories
|
%_datadir/dolibarr/htdocs/categories
|
||||||
%_datadir/dolibarr/htdocs/collab
|
%_datadir/dolibarr/htdocs/collab
|
||||||
%_datadir/dolibarr/htdocs/comm
|
%_datadir/dolibarr/htdocs/comm
|
||||||
@ -309,6 +308,7 @@ done >>%{name}.lang
|
|||||||
%_datadir/dolibarr/htdocs/ticket
|
%_datadir/dolibarr/htdocs/ticket
|
||||||
%_datadir/dolibarr/htdocs/user
|
%_datadir/dolibarr/htdocs/user
|
||||||
%_datadir/dolibarr/htdocs/variants
|
%_datadir/dolibarr/htdocs/variants
|
||||||
|
%_datadir/dolibarr/htdocs/webhook
|
||||||
%_datadir/dolibarr/htdocs/webservices
|
%_datadir/dolibarr/htdocs/webservices
|
||||||
%_datadir/dolibarr/htdocs/website
|
%_datadir/dolibarr/htdocs/website
|
||||||
%_datadir/dolibarr/htdocs/workstation
|
%_datadir/dolibarr/htdocs/workstation
|
||||||
@ -425,7 +425,6 @@ if [ -s $config ] && grep -q "File generated by" $config
|
|||||||
then
|
then
|
||||||
# File already exist. We add params not found.
|
# File already exist. We add params not found.
|
||||||
echo Add new params to overwrite path to use shared libraries/fonts
|
echo Add new params to overwrite path to use shared libraries/fonts
|
||||||
grep -q -c "dolibarr_lib_ADODB_PATH" $config || [ ! -d "/usr/share/php/adodb" ] || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config
|
|
||||||
grep -q -c "dolibarr_lib_FPDI_PATH" $config || [ ! -d "/usr/share/php/fpdi" ] || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
|
grep -q -c "dolibarr_lib_FPDI_PATH" $config || [ ! -d "/usr/share/php/fpdi" ] || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
|
||||||
#grep -q -c "dolibarr_lib_GEOIP_PATH" $config || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
|
#grep -q -c "dolibarr_lib_GEOIP_PATH" $config || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
|
||||||
grep -q -c "dolibarr_lib_NUSOAP_PATH" $config || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
|
grep -q -c "dolibarr_lib_NUSOAP_PATH" $config || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
|
||||||
|
|||||||
@ -162,8 +162,8 @@ done >>%{name}.lang
|
|||||||
%_datadir/dolibarr/htdocs/barcode
|
%_datadir/dolibarr/htdocs/barcode
|
||||||
%_datadir/dolibarr/htdocs/blockedlog
|
%_datadir/dolibarr/htdocs/blockedlog
|
||||||
%_datadir/dolibarr/htdocs/bookmarks
|
%_datadir/dolibarr/htdocs/bookmarks
|
||||||
|
%_datadir/dolibarr/htdocs/bookcal
|
||||||
%_datadir/dolibarr/htdocs/bom
|
%_datadir/dolibarr/htdocs/bom
|
||||||
%_datadir/dolibarr/htdocs/cashdesk
|
|
||||||
%_datadir/dolibarr/htdocs/categories
|
%_datadir/dolibarr/htdocs/categories
|
||||||
%_datadir/dolibarr/htdocs/collab
|
%_datadir/dolibarr/htdocs/collab
|
||||||
%_datadir/dolibarr/htdocs/comm
|
%_datadir/dolibarr/htdocs/comm
|
||||||
@ -225,6 +225,7 @@ done >>%{name}.lang
|
|||||||
%_datadir/dolibarr/htdocs/ticket
|
%_datadir/dolibarr/htdocs/ticket
|
||||||
%_datadir/dolibarr/htdocs/user
|
%_datadir/dolibarr/htdocs/user
|
||||||
%_datadir/dolibarr/htdocs/variants
|
%_datadir/dolibarr/htdocs/variants
|
||||||
|
%_datadir/dolibarr/htdocs/webhook
|
||||||
%_datadir/dolibarr/htdocs/webservices
|
%_datadir/dolibarr/htdocs/webservices
|
||||||
%_datadir/dolibarr/htdocs/website
|
%_datadir/dolibarr/htdocs/website
|
||||||
%_datadir/dolibarr/htdocs/workstation
|
%_datadir/dolibarr/htdocs/workstation
|
||||||
@ -271,7 +272,6 @@ if [ -s $config ] && grep -q "File generated by" $config
|
|||||||
then
|
then
|
||||||
# File already exist. We add params not found.
|
# File already exist. We add params not found.
|
||||||
echo Add new params to overwrite path to use shared libraries/fonts
|
echo Add new params to overwrite path to use shared libraries/fonts
|
||||||
grep -q -c "dolibarr_lib_ADODB_PATH" $config || [ ! -d "/usr/share/php/adodb" ] || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config
|
|
||||||
grep -q -c "dolibarr_lib_FPDI_PATH" $config || [ ! -d "/usr/share/php/fpdi" ] || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
|
grep -q -c "dolibarr_lib_FPDI_PATH" $config || [ ! -d "/usr/share/php/fpdi" ] || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
|
||||||
#grep -q -c "dolibarr_lib_GEOIP_PATH" $config || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
|
#grep -q -c "dolibarr_lib_GEOIP_PATH" $config || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
|
||||||
grep -q -c "dolibarr_lib_NUSOAP_PATH" $config || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
|
grep -q -c "dolibarr_lib_NUSOAP_PATH" $config || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
|
||||||
|
|||||||
@ -25,7 +25,7 @@ BuildArch: noarch
|
|||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
Group: Productivity/Office/Management
|
Group: Productivity/Office/Management
|
||||||
Requires: apache2, apache2-mod_php5, php5 >= 5.3.0, php5-gd, php5-ldap, php5-imap, php5-mysql, php5-openssl, dejavu
|
Requires: apache2, apache2-mod_php, php >= 5.3.0, php-gd, php-ldap, php-imap, php-mysql, php-openssl, dejavu
|
||||||
Requires: mysql-community-server, mysql-community-server-client
|
Requires: mysql-community-server, mysql-community-server-client
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
BuildRequires: update-desktop-files fdupes
|
BuildRequires: update-desktop-files fdupes
|
||||||
@ -67,8 +67,7 @@ Programmo web, progettato per poter fornire solo ciò di
|
|||||||
cui hai bisogno ed essere facile da usare.
|
cui hai bisogno ed essere facile da usare.
|
||||||
|
|
||||||
|
|
||||||
|
#---- prepo
|
||||||
#---- prep
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p0 -b .patch
|
%patch0 -p0 -b .patch
|
||||||
@ -173,8 +172,8 @@ done >>%{name}.lang
|
|||||||
%_datadir/dolibarr/htdocs/barcode
|
%_datadir/dolibarr/htdocs/barcode
|
||||||
%_datadir/dolibarr/htdocs/blockedlog
|
%_datadir/dolibarr/htdocs/blockedlog
|
||||||
%_datadir/dolibarr/htdocs/bookmarks
|
%_datadir/dolibarr/htdocs/bookmarks
|
||||||
|
%_datadir/dolibarr/htdocs/bookcal
|
||||||
%_datadir/dolibarr/htdocs/bom
|
%_datadir/dolibarr/htdocs/bom
|
||||||
%_datadir/dolibarr/htdocs/cashdesk
|
|
||||||
%_datadir/dolibarr/htdocs/categories
|
%_datadir/dolibarr/htdocs/categories
|
||||||
%_datadir/dolibarr/htdocs/collab
|
%_datadir/dolibarr/htdocs/collab
|
||||||
%_datadir/dolibarr/htdocs/comm
|
%_datadir/dolibarr/htdocs/comm
|
||||||
@ -236,6 +235,7 @@ done >>%{name}.lang
|
|||||||
%_datadir/dolibarr/htdocs/ticket
|
%_datadir/dolibarr/htdocs/ticket
|
||||||
%_datadir/dolibarr/htdocs/user
|
%_datadir/dolibarr/htdocs/user
|
||||||
%_datadir/dolibarr/htdocs/variants
|
%_datadir/dolibarr/htdocs/variants
|
||||||
|
%_datadir/dolibarr/htdocs/webhook
|
||||||
%_datadir/dolibarr/htdocs/webservices
|
%_datadir/dolibarr/htdocs/webservices
|
||||||
%_datadir/dolibarr/htdocs/website
|
%_datadir/dolibarr/htdocs/website
|
||||||
%_datadir/dolibarr/htdocs/workstation
|
%_datadir/dolibarr/htdocs/workstation
|
||||||
@ -282,7 +282,6 @@ if [ -s $config ] && grep -q "File generated by" $config
|
|||||||
then
|
then
|
||||||
# File already exist. We add params not found.
|
# File already exist. We add params not found.
|
||||||
echo Add new params to overwrite path to use shared libraries/fonts
|
echo Add new params to overwrite path to use shared libraries/fonts
|
||||||
grep -q -c "dolibarr_lib_ADODB_PATH" $config || [ ! -d "/usr/share/php/adodb" ] || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config
|
|
||||||
grep -q -c "dolibarr_lib_FPDI_PATH" $config || [ ! -d "/usr/share/php/fpdi" ] || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
|
grep -q -c "dolibarr_lib_FPDI_PATH" $config || [ ! -d "/usr/share/php/fpdi" ] || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
|
||||||
#grep -q -c "dolibarr_lib_GEOIP_PATH" $config || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
|
#grep -q -c "dolibarr_lib_GEOIP_PATH" $config || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
|
||||||
grep -q -c "dolibarr_lib_NUSOAP_PATH" $config || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
|
grep -q -c "dolibarr_lib_NUSOAP_PATH" $config || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
|
||||||
|
|||||||
@ -20,7 +20,6 @@ $force_install_lockinstall='444';
|
|||||||
$force_install_distrib='rpmfedora';
|
$force_install_distrib='rpmfedora';
|
||||||
|
|
||||||
// Value to overwrite path to use shared libraries/fonts instead of embedded one
|
// Value to overwrite path to use shared libraries/fonts instead of embedded one
|
||||||
$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
|
|
||||||
//$force_dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi';
|
//$force_dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi';
|
||||||
//$force_dolibarr_lib_GEOIP_PATH='';
|
//$force_dolibarr_lib_GEOIP_PATH='';
|
||||||
$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
|
$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
|
||||||
|
|||||||
@ -20,7 +20,6 @@ $force_install_lockinstall='444';
|
|||||||
$force_install_distrib='rpmmandriva';
|
$force_install_distrib='rpmmandriva';
|
||||||
|
|
||||||
// Value to overwrite path to use shared libraries/fonts instead of embedded one
|
// Value to overwrite path to use shared libraries/fonts instead of embedded one
|
||||||
$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
|
|
||||||
//$force_dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi';
|
//$force_dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi';
|
||||||
//$force_dolibarr_lib_GEOIP_PATH='';
|
//$force_dolibarr_lib_GEOIP_PATH='';
|
||||||
$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
|
$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
|
||||||
|
|||||||
@ -20,7 +20,6 @@ $force_install_lockinstall='444';
|
|||||||
$force_install_distrib='rpmopensuse';
|
$force_install_distrib='rpmopensuse';
|
||||||
|
|
||||||
// Value to overwrite path to use shared libraries/fonts instead of embedded one
|
// Value to overwrite path to use shared libraries/fonts instead of embedded one
|
||||||
//$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
|
|
||||||
//$force_dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi';
|
//$force_dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi';
|
||||||
//$force_dolibarr_lib_GEOIP_PATH='';
|
//$force_dolibarr_lib_GEOIP_PATH='';
|
||||||
//$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
|
//$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
|
||||||
|
|||||||
@ -1,62 +0,0 @@
|
|||||||
{
|
|
||||||
"name" : "dolibarr/dolibarr",
|
|
||||||
"type" : "project",
|
|
||||||
"description" : "Dolibarr ERP & CRM is a modern and easy to use web software to manage your business",
|
|
||||||
"keywords" : [
|
|
||||||
"erp",
|
|
||||||
"crm",
|
|
||||||
"invoice",
|
|
||||||
"sme",
|
|
||||||
"proposal",
|
|
||||||
"order",
|
|
||||||
"stock",
|
|
||||||
"agenda"
|
|
||||||
],
|
|
||||||
"homepage" : "https://www.dolibarr.org",
|
|
||||||
"license" : "GPL-3.0-or-later",
|
|
||||||
"support" : {
|
|
||||||
"issues" : "https://github.com/Dolibarr/dolibarr/issues",
|
|
||||||
"forum" : "https://www.dolibarr.org/forum",
|
|
||||||
"wiki" : "https://wiki.dolibarr.org",
|
|
||||||
"source" : "https://github.com/Dolibarr/dolibarr"
|
|
||||||
},
|
|
||||||
"config" : {
|
|
||||||
"vendor-dir" : "htdocs/includes"
|
|
||||||
},
|
|
||||||
"require" : {
|
|
||||||
"php" : ">=5.6.0",
|
|
||||||
"ext-curl" : "*",
|
|
||||||
"ckeditor/ckeditor" : "4.12.1",
|
|
||||||
"mike42/escpos-php" : "2.2",
|
|
||||||
"mobiledetect/mobiledetectlib" : "2.8.34",
|
|
||||||
"phpoffice/phpexcel" : "1.8.2",
|
|
||||||
"restler/framework" : "3.0.0-RC6",
|
|
||||||
"tecnickcom/tcpdf" : "6.3.2",
|
|
||||||
"nnnick/chartjs" : "^2.9",
|
|
||||||
"stripe/stripe-php" : "6.43.1",
|
|
||||||
"maximebf/debugbar" : "1.15.1",
|
|
||||||
"symfony/var-dumper" : "3"
|
|
||||||
},
|
|
||||||
"require-dev" : {
|
|
||||||
"php-parallel-lint/php-parallel-lint" : "^0",
|
|
||||||
"php-parallel-lint/php-console-highlighter" : "^0",
|
|
||||||
"phpunit/phpunit" : "^4",
|
|
||||||
"squizlabs/php_codesniffer" : "^2",
|
|
||||||
"phpunit/phpunit-selenium" : "^2"
|
|
||||||
},
|
|
||||||
"suggest" : {
|
|
||||||
"ext-mysqlnd" : "To use with MySQL or MariaDB",
|
|
||||||
"ext-mysqli" : "To use with MySQL or MariaDB",
|
|
||||||
"ext-pgsql" : "To use with PostgreSQL",
|
|
||||||
"ext-mssql" : "To use with MSSQL (experimental)",
|
|
||||||
"ext-pdo_sqlite" : "To use with SQLite (experimental)",
|
|
||||||
"ext-gd" : "Image manipulation (Required but maybe built-in PHP)",
|
|
||||||
"ext-imagick" : "Generation of thumbs from PDF",
|
|
||||||
"ext-mcrypt" : "(Required but maybe built-in PHP)",
|
|
||||||
"ext-openssl" : "Secure connections (Emails, SOAP\u2026)",
|
|
||||||
"ext-mbstring" : "Handle non UTF-8 characters",
|
|
||||||
"ext-soap" : "Native SOAP",
|
|
||||||
"ext-zip" : "ODT, Excel and file compression support",
|
|
||||||
"ext-xml" : "Excel support"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
62
composer.json.disabled
Normal file
62
composer.json.disabled
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
{
|
||||||
|
"name" : "dolibarr/dolibarr",
|
||||||
|
"type" : "project",
|
||||||
|
"description" : "Dolibarr ERP & CRM is a modern and easy to use web software to manage your business",
|
||||||
|
"keywords" : [
|
||||||
|
"erp",
|
||||||
|
"crm",
|
||||||
|
"invoice",
|
||||||
|
"sme",
|
||||||
|
"proposal",
|
||||||
|
"order",
|
||||||
|
"stock",
|
||||||
|
"agenda"
|
||||||
|
],
|
||||||
|
"homepage" : "https://www.dolibarr.org",
|
||||||
|
"license" : "GPL-3.0-or-later",
|
||||||
|
"support" : {
|
||||||
|
"issues" : "https://github.com/Dolibarr/dolibarr/issues",
|
||||||
|
"forum" : "https://www.dolibarr.org/forum",
|
||||||
|
"wiki" : "https://wiki.dolibarr.org",
|
||||||
|
"source" : "https://github.com/Dolibarr/dolibarr"
|
||||||
|
},
|
||||||
|
"config" : {
|
||||||
|
"vendor-dir" : "htdocs/includes"
|
||||||
|
},
|
||||||
|
"require" : {
|
||||||
|
"php" : ">=5.6.0",
|
||||||
|
"ext-curl" : "*",
|
||||||
|
"ckeditor/ckeditor" : "4.12.1",
|
||||||
|
"mike42/escpos-php" : "2.2",
|
||||||
|
"mobiledetect/mobiledetectlib" : "2.8.39",
|
||||||
|
"phpoffice/phpexcel" : "1.8.2",
|
||||||
|
"restler/framework" : "3.0.0-RC6",
|
||||||
|
"tecnickcom/tcpdf" : "6.3.2",
|
||||||
|
"nnnick/chartjs" : "^2.9",
|
||||||
|
"stripe/stripe-php" : "6.43.1",
|
||||||
|
"maximebf/debugbar" : "1.15.1",
|
||||||
|
"symfony/var-dumper" : "3.2"
|
||||||
|
},
|
||||||
|
"require-dev" : {
|
||||||
|
"php-parallel-lint/php-parallel-lint" : "^0",
|
||||||
|
"php-parallel-lint/php-console-highlighter" : "^0",
|
||||||
|
"phpunit/phpunit" : "^4",
|
||||||
|
"squizlabs/php_codesniffer" : "^2",
|
||||||
|
"phpunit/phpunit-selenium" : "^2"
|
||||||
|
},
|
||||||
|
"suggest" : {
|
||||||
|
"ext-mysqlnd" : "To use with MySQL or MariaDB",
|
||||||
|
"ext-mysqli" : "To use with MySQL or MariaDB",
|
||||||
|
"ext-pgsql" : "To use with PostgreSQL",
|
||||||
|
"ext-mssql" : "To use with MSSQL (experimental)",
|
||||||
|
"ext-pdo_sqlite" : "To use with SQLite (experimental)",
|
||||||
|
"ext-gd" : "Image manipulation (Required but maybe built-in PHP)",
|
||||||
|
"ext-imagick" : "Generation of thumbs from PDF",
|
||||||
|
"ext-mcrypt" : "(Required but maybe built-in PHP)",
|
||||||
|
"ext-openssl" : "Secure connections (Emails, SOAP\u2026)",
|
||||||
|
"ext-mbstring" : "Handle non UTF-8 characters",
|
||||||
|
"ext-soap" : "Native SOAP",
|
||||||
|
"ext-zip" : "ODT, Excel and file compression support",
|
||||||
|
"ext-xml" : "Excel support"
|
||||||
|
}
|
||||||
|
}
|
||||||
2349
composer.lock
generated
2349
composer.lock
generated
File diff suppressed because it is too large
Load Diff
@ -111,6 +111,10 @@ with
|
|||||||
// DOL CHANGE If we keep this, the image is not visible on pages after the first one.
|
// DOL CHANGE If we keep this, the image is not visible on pages after the first one.
|
||||||
//var_dump($file.' '.(!@TCPDF_STATIC::file_exists($file)));
|
//var_dump($file.' '.(!@TCPDF_STATIC::file_exists($file)));
|
||||||
//return false;
|
//return false;
|
||||||
|
$tfile = str_replace(' ', '%20', $file);
|
||||||
|
if (@TCPDF_STATIC::file_exists($tfile)) {
|
||||||
|
$file = $tfile;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
* Replace in tcpdf.php
|
* Replace in tcpdf.php
|
||||||
@ -200,6 +204,11 @@ with:
|
|||||||
with
|
with
|
||||||
} elseif (($key == '/Index') AND ($v[0] == PDF_TYPE_ARRAY AND count($v[1]) >= 2)) {
|
} elseif (($key == '/Index') AND ($v[0] == PDF_TYPE_ARRAY AND count($v[1]) >= 2)) {
|
||||||
|
|
||||||
|
* Fix php fatal error on php 8.0 on tcpdi.php
|
||||||
|
while (list($k, $v) = each($value[1])) {
|
||||||
|
with
|
||||||
|
foreach ($value[1] as $k => $v) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
JSGANTT:
|
JSGANTT:
|
||||||
@ -230,11 +239,13 @@ JCROP:
|
|||||||
* Remove analytics tag into file index.html
|
* Remove analytics tag into file index.html
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
JQUERYFILETREE:
|
JQUERYFILETREE:
|
||||||
---------------
|
---------------
|
||||||
* Remove directory htdocs/includes/jquery/plugins/jqueryFileTree/connectors
|
* Remove directory htdocs/includes/jquery/plugins/jqueryFileTree/connectors
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
RESTLER:
|
RESTLER:
|
||||||
--------
|
--------
|
||||||
|
|
||||||
@ -265,6 +276,13 @@ RESTLER:
|
|||||||
|
|
||||||
$loaders = array_unique(static::$rogueLoaders, SORT_REGULAR);
|
$loaders = array_unique(static::$rogueLoaders, SORT_REGULAR);
|
||||||
|
|
||||||
|
* Replace CommentParser.php line 423
|
||||||
|
elseif (count($value) && is_numeric($value[0]))
|
||||||
|
|
||||||
|
with
|
||||||
|
|
||||||
|
elseif (count($value) && isset($value[0]) && is_numeric($value[0]))
|
||||||
|
|
||||||
|
|
||||||
+With swagger 2 provided into /explorer:
|
+With swagger 2 provided into /explorer:
|
||||||
----------------------------------------
|
----------------------------------------
|
||||||
|
|||||||
@ -5,4 +5,4 @@ This directory contains samples of code to use Dolibarr business classes to buil
|
|||||||
external interfaces that need to read/update data from/into Dolibarr.
|
external interfaces that need to read/update data from/into Dolibarr.
|
||||||
|
|
||||||
You can also have a look at the Dolibarr doxygen doc that describes all files and classes:
|
You can also have a look at the Dolibarr doxygen doc that describes all files and classes:
|
||||||
http://www.dolibarr.org/html_doxygen/index.html
|
https://doxygen.dolibarr.org/
|
||||||
|
|||||||
@ -1,28 +1,29 @@
|
|||||||
# ldapsearch_sample1.txt
|
# ldapsearch_sample1.txt
|
||||||
# ldapsearch is into package ldap-utils on debian.
|
# ldapsearch is into package ldap-utils on debian.
|
||||||
#
|
#
|
||||||
# Use this sample to search into a ldap
|
# Use this samples to test a ldap_bind or to make a search into a ldap
|
||||||
#
|
#
|
||||||
|
|
||||||
# Anonymous access
|
# Anonymous access
|
||||||
# ldapsearch -h hostname -p 389
|
# ldapsearch -h hostname -p 389
|
||||||
#
|
#
|
||||||
# Login access (using a Bind DN)
|
# Login access (using a Bind DN)
|
||||||
# ldapsearch -h hostname -p 389 -z 0 -D "uid=root,cn=users,dc=ldap,dc=test,dc=local" -w password
|
# Such access must succeed to use LDAP as login module.
|
||||||
# ldapsearch -H ldap://hostname:389 -z 0 -D "uid=root,cn=users,dc=ldap,dc=test,dc=local" -w password
|
# ldapsearch -h hostname -p 389 -z 0 -D "uid=root,cn=users,dc=ldap,dc=test,dc=local" -w password
|
||||||
# ldapsearch -d1 -H ldap://hostname:389 -x -z 0 -D "uid=root,cn=users,dc=ldap,dc=test,dc=local" -w password
|
# ldapsearch -H ldap://hostname:389 -z 0 -D "uid=root,cn=users,dc=ldap,dc=test,dc=local" -w password
|
||||||
# ldapsearch -H ldap://hostname:389 -z 0 -D "uid=root,cn=users,dc=ldap,dc=test,dc=local" -w password
|
# ldapsearch -d1 -H ldap://hostname:389 -x -z 0 -D "uid=root,cn=users,dc=ldap,dc=test,dc=local" -w password
|
||||||
|
# ldapsearch -H ldap://hostname:389 -z 0 -D "uid=root,cn=users,dc=ldap,dc=test,dc=local" -w password
|
||||||
#
|
#
|
||||||
# Login access in SSL (using a Bind DN)
|
# Login access in SSL (using a Bind DN)
|
||||||
# ldapsearch -H ldaps://hostnamme:636 -z 0 -D "uid=root,cn=users,dc=ldap,dc=test,dc=local" -w password -b "cn=users,dc=ldap,dc=test,dc=local
|
# ldapsearch -H ldaps://hostnamme:636 -z 0 -D "uid=root,cn=users,dc=ldap,dc=test,dc=local" -w password -b "cn=users,dc=ldap,dc=test,dc=local"
|
||||||
# If it fails, you may try to use "hostname" that is real name of certificate.
|
# If it fails, you may try to use "hostname" that is real name of certificate.
|
||||||
# You must also check that /etc/ldap/ldap.conf contains the line TLS_CACERT /etc/ssl/certs/ca-certificates.crt
|
# You must also check that /etc/ldap/ldap.conf contains the line TLS_CACERT /etc/ssl/certs/ca-certificates.crt
|
||||||
|
|
||||||
# What to search
|
# What to search
|
||||||
# ldapsearch -h hostname -p 389 -x -D "uid=root,cn=users,dc=ldap,dc=test,dc=local" -w password -b "cn=users,dc=ldap,dc=test,dc=local"
|
# ldapsearch -h hostname -p 389 -x -D "uid=root,cn=users,dc=ldap,dc=test,dc=local" -w password -b "cn=users,dc=ldap,dc=test,dc=local"
|
||||||
# ldapsearch -h hostname -p 389 -x -D "cn=manager,o=somecompany.com" -w password -b "ou=people,dc=teclib,dc=infra"
|
# ldapsearch -h hostname -p 389 -x -D "cn=manager,o=somecompany.com" -w password -b "ou=people,dc=teclib,dc=infra"
|
||||||
# ldapsearch -h hostname -p 389 -x -D "cn=manager,o=somecompany.com" -w password -b "o=somecompany.com" "(objectclass=*)"
|
# ldapsearch -h hostname -p 389 -x -D "cn=manager,o=somecompany.com" -w password -b "o=somecompany.com" "(objectclass=*)"
|
||||||
#
|
#
|
||||||
# Example to test a ldap search:
|
# Example to test a ldap search:
|
||||||
# ldapsearch -h hostname -p 389 -x -z 5 -b 'OU=Collaborateurs,OU=Utilisateurs,OU=MyCompany,DC=bocal,DC=lan' -D 'CN=UserAdmin,OU=Informatique,OU=Utilisateurs,OU=MyCompany,DC=bocal,DC=lan' -w password
|
# ldapsearch -h hostname -p 389 -x -z 5 -b 'OU=Collaborateurs,OU=Utilisateurs,OU=MyCompany,DC=bocal,DC=lan' -D 'CN=UserAdmin,OU=Informatique,OU=Utilisateurs,OU=MyCompany,DC=bocal,DC=lan' -w password
|
||||||
|
|
||||||
|
|||||||
@ -15,7 +15,7 @@
|
|||||||
"npm": ">=5.6.0"
|
"npm": ">=5.6.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"zapier-platform-core": "11.0.1"
|
"zapier-platform-core": "11.3.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"mocha": "^5.2.0",
|
"mocha": "^5.2.0",
|
||||||
|
|||||||
@ -10,7 +10,7 @@ const subscribeHook = (z, bundle) => {
|
|||||||
action: bundle.inputData.action
|
action: bundle.inputData.action
|
||||||
};
|
};
|
||||||
|
|
||||||
const url = bundle.authData.url + '/api/index.php/zapierapi/hook';
|
const url = bundle.authData.url + '/api/index.php/zapier/hook';
|
||||||
|
|
||||||
// You can build requests and our client will helpfully inject all the variables
|
// You can build requests and our client will helpfully inject all the variables
|
||||||
// you need to complete. You can also register middleware to control this.
|
// you need to complete. You can also register middleware to control this.
|
||||||
@ -32,7 +32,7 @@ const unsubscribeHook = (z, bundle) => {
|
|||||||
// You can build requests and our client will helpfully inject all the variables
|
// You can build requests and our client will helpfully inject all the variables
|
||||||
// you need to complete. You can also register middleware to control this.
|
// you need to complete. You can also register middleware to control this.
|
||||||
const options = {
|
const options = {
|
||||||
url: bundle.authData.url + '/api/index.php/zapierapi/hook/' + bundle.subscribeData.id,
|
url: bundle.authData.url + '/api/index.php/zapier/hook/' + bundle.subscribeData.id,
|
||||||
method: 'DELETE',
|
method: 'DELETE',
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -84,7 +84,7 @@ const getFallbackRealAction = (z, bundle) => {
|
|||||||
// // For the test poll, you should get some real data, to aid the setup process.
|
// // For the test poll, you should get some real data, to aid the setup process.
|
||||||
// const module = bundle.inputData.module;
|
// const module = bundle.inputData.module;
|
||||||
// const options = {
|
// const options = {
|
||||||
// url: bundle.authData.url + '/api/index.php/zapierapi/getactionschoices/actions',
|
// url: bundle.authData.url + '/api/index.php/zapier/getactionschoices/actions',
|
||||||
// };
|
// };
|
||||||
|
|
||||||
// return z.request(options).then((response) => JSON.parse(response.content));
|
// return z.request(options).then((response) => JSON.parse(response.content));
|
||||||
|
|||||||
@ -10,7 +10,7 @@ const subscribeHook = (z, bundle) => {
|
|||||||
action: bundle.inputData.action
|
action: bundle.inputData.action
|
||||||
};
|
};
|
||||||
|
|
||||||
const url = bundle.authData.url + '/api/index.php/zapierapi/hook';
|
const url = bundle.authData.url + '/api/index.php/zapier/hook';
|
||||||
|
|
||||||
// You can build requests and our client will helpfully inject all the variables
|
// You can build requests and our client will helpfully inject all the variables
|
||||||
// you need to complete. You can also register middleware to control this.
|
// you need to complete. You can also register middleware to control this.
|
||||||
@ -32,7 +32,7 @@ const unsubscribeHook = (z, bundle) => {
|
|||||||
// You can build requests and our client will helpfully inject all the variables
|
// You can build requests and our client will helpfully inject all the variables
|
||||||
// you need to complete. You can also register middleware to control this.
|
// you need to complete. You can also register middleware to control this.
|
||||||
const options = {
|
const options = {
|
||||||
url: bundle.authData.url + '/api/index.php/zapierapi/hook/' + bundle.subscribeData.id,
|
url: bundle.authData.url + '/api/index.php/zapier/hook/' + bundle.subscribeData.id,
|
||||||
method: 'DELETE',
|
method: 'DELETE',
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -76,7 +76,7 @@ const getFallbackRealContact = (z, bundle) => {
|
|||||||
// const getModulesChoices = (z/*, bundle*/) => {
|
// const getModulesChoices = (z/*, bundle*/) => {
|
||||||
// // For the test poll, you should get some real data, to aid the setup process.
|
// // For the test poll, you should get some real data, to aid the setup process.
|
||||||
// const options = {
|
// const options = {
|
||||||
// url: bundle.authData.url + '/api/index.php/zapierapi/getmoduleschoices',
|
// url: bundle.authData.url + '/api/index.php/zapier/getmoduleschoices',
|
||||||
// };
|
// };
|
||||||
|
|
||||||
// return z.request(options).then((response) => JSON.parse(response.content));
|
// return z.request(options).then((response) => JSON.parse(response.content));
|
||||||
@ -94,7 +94,7 @@ const getFallbackRealContact = (z, bundle) => {
|
|||||||
// // For the test poll, you should get some real data, to aid the setup process.
|
// // For the test poll, you should get some real data, to aid the setup process.
|
||||||
// const module = bundle.inputData.module;
|
// const module = bundle.inputData.module;
|
||||||
// const options = {
|
// const options = {
|
||||||
// url: url: bundle.authData.url + '/api/index.php/zapierapi/getactionschoices/thirparty`,
|
// url: url: bundle.authData.url + '/api/index.php/zapier/getactionschoices/thirparty`,
|
||||||
// };
|
// };
|
||||||
|
|
||||||
// return z.request(options).then((response) => JSON.parse(response.content));
|
// return z.request(options).then((response) => JSON.parse(response.content));
|
||||||
|
|||||||
@ -10,7 +10,7 @@ const subscribeHook = (z, bundle) => {
|
|||||||
action: bundle.inputData.action
|
action: bundle.inputData.action
|
||||||
};
|
};
|
||||||
|
|
||||||
const url = bundle.authData.url + '/api/index.php/zapierapi/hook';
|
const url = bundle.authData.url + '/api/index.php/zapier/hook';
|
||||||
|
|
||||||
// You can build requests and our client will helpfully inject all the variables
|
// You can build requests and our client will helpfully inject all the variables
|
||||||
// you need to complete. You can also register middleware to control this.
|
// you need to complete. You can also register middleware to control this.
|
||||||
@ -32,7 +32,7 @@ const unsubscribeHook = (z, bundle) => {
|
|||||||
// You can build requests and our client will helpfully inject all the variables
|
// You can build requests and our client will helpfully inject all the variables
|
||||||
// you need to complete. You can also register middleware to control this.
|
// you need to complete. You can also register middleware to control this.
|
||||||
const options = {
|
const options = {
|
||||||
url: bundle.authData.url + '/api/index.php/zapierapi/hook/' + bundle.subscribeData.id,
|
url: bundle.authData.url + '/api/index.php/zapier/hook/' + bundle.subscribeData.id,
|
||||||
method: 'DELETE',
|
method: 'DELETE',
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -76,7 +76,7 @@ const getFallbackRealMember = (z, bundle) => {
|
|||||||
// const getModulesChoices = (z/*, bundle*/) => {
|
// const getModulesChoices = (z/*, bundle*/) => {
|
||||||
// // For the test poll, you should get some real data, to aid the setup process.
|
// // For the test poll, you should get some real data, to aid the setup process.
|
||||||
// const options = {
|
// const options = {
|
||||||
// url: bundle.authData.url + '/api/index.php/zapierapi/getmoduleschoices',
|
// url: bundle.authData.url + '/api/index.php/zapier/getmoduleschoices',
|
||||||
// };
|
// };
|
||||||
|
|
||||||
// return z.request(options).then((response) => JSON.parse(response.content));
|
// return z.request(options).then((response) => JSON.parse(response.content));
|
||||||
@ -94,7 +94,7 @@ const getFallbackRealMember = (z, bundle) => {
|
|||||||
// // For the test poll, you should get some real data, to aid the setup process.
|
// // For the test poll, you should get some real data, to aid the setup process.
|
||||||
// const module = bundle.inputData.module;
|
// const module = bundle.inputData.module;
|
||||||
// const options = {
|
// const options = {
|
||||||
// url: url: bundle.authData.url + '/api/index.php/zapierapi/getactionschoices/thirparty`,
|
// url: url: bundle.authData.url + '/api/index.php/zapier/getactionschoices/thirparty`,
|
||||||
// };
|
// };
|
||||||
|
|
||||||
// return z.request(options).then((response) => JSON.parse(response.content));
|
// return z.request(options).then((response) => JSON.parse(response.content));
|
||||||
|
|||||||
@ -10,7 +10,7 @@ const subscribeHook = (z, bundle) => {
|
|||||||
action: bundle.inputData.action
|
action: bundle.inputData.action
|
||||||
};
|
};
|
||||||
|
|
||||||
const url = bundle.authData.url + '/api/index.php/zapierapi/hook';
|
const url = bundle.authData.url + '/api/index.php/zapier/hook';
|
||||||
|
|
||||||
// You can build requests and our client will helpfully inject all the variables
|
// You can build requests and our client will helpfully inject all the variables
|
||||||
// you need to complete. You can also register middleware to control this.
|
// you need to complete. You can also register middleware to control this.
|
||||||
@ -32,7 +32,7 @@ const unsubscribeHook = (z, bundle) => {
|
|||||||
// You can build requests and our client will helpfully inject all the variables
|
// You can build requests and our client will helpfully inject all the variables
|
||||||
// you need to complete. You can also register middleware to control this.
|
// you need to complete. You can also register middleware to control this.
|
||||||
const options = {
|
const options = {
|
||||||
url: bundle.authData.url + '/api/index.php/zapierapi/hook/' + bundle.subscribeData.id,
|
url: bundle.authData.url + '/api/index.php/zapier/hook/' + bundle.subscribeData.id,
|
||||||
method: 'DELETE',
|
method: 'DELETE',
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -74,7 +74,7 @@ const getFallbackRealOrder = (z, bundle) => {
|
|||||||
// // For the test poll, you should get some real data, to aid the setup process.
|
// // For the test poll, you should get some real data, to aid the setup process.
|
||||||
// const module = bundle.inputData.module;
|
// const module = bundle.inputData.module;
|
||||||
// const options = {
|
// const options = {
|
||||||
// url: bundle.authData.url + '/api/index.php/zapierapi/getactionschoices/orders',
|
// url: bundle.authData.url + '/api/index.php/zapier/getactionschoices/orders',
|
||||||
// };
|
// };
|
||||||
|
|
||||||
// return z.request(options).then((response) => JSON.parse(response.content));
|
// return z.request(options).then((response) => JSON.parse(response.content));
|
||||||
|
|||||||
@ -10,7 +10,7 @@ const subscribeHook = (z, bundle) => {
|
|||||||
action: bundle.inputData.action
|
action: bundle.inputData.action
|
||||||
};
|
};
|
||||||
|
|
||||||
const url = bundle.authData.url + '/api/index.php/zapierapi/hook';
|
const url = bundle.authData.url + '/api/index.php/zapier/hook';
|
||||||
|
|
||||||
// You can build requests and our client will helpfully inject all the variables
|
// You can build requests and our client will helpfully inject all the variables
|
||||||
// you need to complete. You can also register middleware to control this.
|
// you need to complete. You can also register middleware to control this.
|
||||||
@ -32,7 +32,7 @@ const unsubscribeHook = (z, bundle) => {
|
|||||||
// You can build requests and our client will helpfully inject all the variables
|
// You can build requests and our client will helpfully inject all the variables
|
||||||
// you need to complete. You can also register middleware to control this.
|
// you need to complete. You can also register middleware to control this.
|
||||||
const options = {
|
const options = {
|
||||||
url: bundle.authData.url + '/api/index.php/zapierapi/hook/' + bundle.subscribeData.id,
|
url: bundle.authData.url + '/api/index.php/zapier/hook/' + bundle.subscribeData.id,
|
||||||
method: 'DELETE',
|
method: 'DELETE',
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -83,7 +83,7 @@ const getFallbackRealThirdparty = (z, bundle) => {
|
|||||||
// const getModulesChoices = (z/*, bundle*/) => {
|
// const getModulesChoices = (z/*, bundle*/) => {
|
||||||
// // For the test poll, you should get some real data, to aid the setup process.
|
// // For the test poll, you should get some real data, to aid the setup process.
|
||||||
// const options = {
|
// const options = {
|
||||||
// url: bundle.authData.url + '/api/index.php/zapierapi/getmoduleschoices',
|
// url: bundle.authData.url + '/api/index.php/zapier/getmoduleschoices',
|
||||||
// };
|
// };
|
||||||
|
|
||||||
// return z.request(options).then((response) => JSON.parse(response.content));
|
// return z.request(options).then((response) => JSON.parse(response.content));
|
||||||
@ -102,7 +102,7 @@ const getFallbackRealThirdparty = (z, bundle) => {
|
|||||||
// // For the test poll, you should get some real data, to aid the setup process.
|
// // For the test poll, you should get some real data, to aid the setup process.
|
||||||
// const module = bundle.inputData.module;
|
// const module = bundle.inputData.module;
|
||||||
// const options = {
|
// const options = {
|
||||||
// url: url: bundle.authData.url + '/api/index.php/zapierapi/getactionschoices/thirparty`,
|
// url: url: bundle.authData.url + '/api/index.php/zapier/getactionschoices/thirparty`,
|
||||||
// };
|
// };
|
||||||
|
|
||||||
// return z.request(options).then((response) => JSON.parse(response.content));
|
// return z.request(options).then((response) => JSON.parse(response.content));
|
||||||
|
|||||||
@ -10,7 +10,7 @@ const subscribeHook = (z, bundle) => {
|
|||||||
action: bundle.inputData.action
|
action: bundle.inputData.action
|
||||||
};
|
};
|
||||||
|
|
||||||
const url = bundle.authData.url + '/api/index.php/zapierapi/hook';
|
const url = bundle.authData.url + '/api/index.php/zapier/hook';
|
||||||
|
|
||||||
// You can build requests and our client will helpfully inject all the variables
|
// You can build requests and our client will helpfully inject all the variables
|
||||||
// you need to complete. You can also register middleware to control this.
|
// you need to complete. You can also register middleware to control this.
|
||||||
@ -32,7 +32,7 @@ const unsubscribeHook = (z, bundle) => {
|
|||||||
// You can build requests and our client will helpfully inject all the variables
|
// You can build requests and our client will helpfully inject all the variables
|
||||||
// you need to complete. You can also register middleware to control this.
|
// you need to complete. You can also register middleware to control this.
|
||||||
const options = {
|
const options = {
|
||||||
url: bundle.authData.url + '/api/index.php/zapierapi/hook/' + bundle.subscribeData.id,
|
url: bundle.authData.url + '/api/index.php/zapier/hook/' + bundle.subscribeData.id,
|
||||||
method: 'DELETE',
|
method: 'DELETE',
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -76,7 +76,7 @@ const getFallbackRealTicket = (z, bundle) => {
|
|||||||
// const getModulesChoices = (z/*, bundle*/) => {
|
// const getModulesChoices = (z/*, bundle*/) => {
|
||||||
// // For the test poll, you should get some real data, to aid the setup process.
|
// // For the test poll, you should get some real data, to aid the setup process.
|
||||||
// const options = {
|
// const options = {
|
||||||
// url: bundle.authData.url + '/api/index.php/zapierapi/getmoduleschoices',
|
// url: bundle.authData.url + '/api/index.php/zapier/getmoduleschoices',
|
||||||
// };
|
// };
|
||||||
|
|
||||||
// return z.request(options).then((response) => JSON.parse(response.content));
|
// return z.request(options).then((response) => JSON.parse(response.content));
|
||||||
@ -97,7 +97,7 @@ const getFallbackRealTicket = (z, bundle) => {
|
|||||||
// // For the test poll, you should get some real data, to aid the setup process.
|
// // For the test poll, you should get some real data, to aid the setup process.
|
||||||
// const module = bundle.inputData.module;
|
// const module = bundle.inputData.module;
|
||||||
// const options = {
|
// const options = {
|
||||||
// url: url: bundle.authData.url + '/api/index.php/zapierapi/getactionschoices/thirparty`,
|
// url: url: bundle.authData.url + '/api/index.php/zapier/getactionschoices/thirparty`,
|
||||||
// };
|
// };
|
||||||
|
|
||||||
// return z.request(options).then((response) => JSON.parse(response.content));
|
// return z.request(options).then((response) => JSON.parse(response.content));
|
||||||
|
|||||||
@ -10,7 +10,7 @@ const subscribeHook = (z, bundle) => {
|
|||||||
action: bundle.inputData.action
|
action: bundle.inputData.action
|
||||||
};
|
};
|
||||||
|
|
||||||
const url = bundle.authData.url + '/api/index.php/zapierapi/hook';
|
const url = bundle.authData.url + '/api/index.php/zapier/hook';
|
||||||
|
|
||||||
// You can build requests and our client will helpfully inject all the variables
|
// You can build requests and our client will helpfully inject all the variables
|
||||||
// you need to complete. You can also register middleware to control this.
|
// you need to complete. You can also register middleware to control this.
|
||||||
@ -32,7 +32,7 @@ const unsubscribeHook = (z, bundle) => {
|
|||||||
// You can build requests and our client will helpfully inject all the variables
|
// You can build requests and our client will helpfully inject all the variables
|
||||||
// you need to complete. You can also register middleware to control this.
|
// you need to complete. You can also register middleware to control this.
|
||||||
const options = {
|
const options = {
|
||||||
url: bundle.authData.url + '/api/index.php/zapierapi/hook/' + bundle.subscribeData.id,
|
url: bundle.authData.url + '/api/index.php/zapier/hook/' + bundle.subscribeData.id,
|
||||||
method: 'DELETE',
|
method: 'DELETE',
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -73,7 +73,7 @@ const getFallbackRealUser = (z, bundle) => {
|
|||||||
// const getModulesChoices = (z/*, bundle*/) => {
|
// const getModulesChoices = (z/*, bundle*/) => {
|
||||||
// // For the test poll, you should get some real data, to aid the setup process.
|
// // For the test poll, you should get some real data, to aid the setup process.
|
||||||
// const options = {
|
// const options = {
|
||||||
// url: bundle.authData.url + '/api/index.php/zapierapi/getmoduleschoices',
|
// url: bundle.authData.url + '/api/index.php/zapier/getmoduleschoices',
|
||||||
// };
|
// };
|
||||||
|
|
||||||
// return z.request(options).then((response) => JSON.parse(response.content));
|
// return z.request(options).then((response) => JSON.parse(response.content));
|
||||||
@ -93,7 +93,7 @@ const getFallbackRealUser = (z, bundle) => {
|
|||||||
// // For the test poll, you should get some real data, to aid the setup process.
|
// // For the test poll, you should get some real data, to aid the setup process.
|
||||||
// const module = bundle.inputData.module;
|
// const module = bundle.inputData.module;
|
||||||
// const options = {
|
// const options = {
|
||||||
// url: url: bundle.authData.url + '/api/index.php/zapierapi/getactionschoices/thirparty`,
|
// url: url: bundle.authData.url + '/api/index.php/zapier/getactionschoices/thirparty`,
|
||||||
// };
|
// };
|
||||||
|
|
||||||
// return z.request(options).then((response) => JSON.parse(response.content));
|
// return z.request(options).then((response) => JSON.parse(response.content));
|
||||||
|
|||||||
@ -152,7 +152,7 @@ $user->rights->propal->creer=1;
|
|||||||
$user->rights->propal->propal_advance->validate=1;
|
$user->rights->propal->propal_advance->validate=1;
|
||||||
|
|
||||||
|
|
||||||
if (! empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php")) {
|
if (!empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php")) {
|
||||||
require_once DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php";
|
require_once DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -218,7 +218,7 @@ if ($date == 'all') {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Replace database handler
|
// Replace database handler
|
||||||
if (! empty($argv[4])) {
|
if (!empty($argv[4])) {
|
||||||
$db->close();
|
$db->close();
|
||||||
unset($db);
|
unset($db);
|
||||||
$db=getDoliDBInstance($argv[4], $argv[5], $argv[6], $argv[7], $argv[8], $argv[9]);
|
$db=getDoliDBInstance($argv[4], $argv[5], $argv[6], $argv[7], $argv[8], $argv[9]);
|
||||||
|
|||||||
@ -132,7 +132,7 @@ then
|
|||||||
fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
|
fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
|
||||||
trap "rm -f $fichtemp" 0 1 2 5 15
|
trap "rm -f $fichtemp" 0 1 2 5 15
|
||||||
$DIALOG --title "Init Dolibarr with demo values" --clear \
|
$DIALOG --title "Init Dolibarr with demo values" --clear \
|
||||||
--inputbox "Password for Mysql user login :" 16 55 2> $fichtemp
|
--passwordbox "Password for Mysql user login :" 16 55 2> $fichtemp
|
||||||
|
|
||||||
valret=$?
|
valret=$?
|
||||||
|
|
||||||
@ -153,7 +153,7 @@ then
|
|||||||
# ---------------------------- confirmation
|
# ---------------------------- confirmation
|
||||||
DIALOG=${DIALOG=dialog}
|
DIALOG=${DIALOG=dialog}
|
||||||
$DIALOG --title "Init Dolibarr with demo values" --clear \
|
$DIALOG --title "Init Dolibarr with demo values" --clear \
|
||||||
--yesno "Do you confirm ? \n Dump file : '$dumpfile' \n Dump dir : '$mydir' \n Document dir : '$documentdir' \n Mysql database : '$base' \n Mysql port : '$port' \n Mysql login: '$admin' \n Mysql password : '$passwd'" 15 55
|
--yesno "Do you confirm ? \n Dump file : '$dumpfile' \n Dump dir : '$mydir' \n Document dir : '$documentdir' \n Mysql database : '$base' \n Mysql port : '$port' \n Mysql login: '$admin' \n Mysql password : --hidden--" 15 55
|
||||||
|
|
||||||
case $? in
|
case $? in
|
||||||
0) echo "Ok, start process...";;
|
0) echo "Ok, start process...";;
|
||||||
|
|||||||
@ -171,7 +171,10 @@ if [ $res -ne 0 ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -s "$mydir/initdemopostsql.sql" ]; then
|
if [ -s "$mydir/initdemopostsql.sql" ]; then
|
||||||
|
echo A file initdemopostsql.sql was found, we execute it.
|
||||||
mysql -P$port $base < "$mydir/initdemopostsql.sql"
|
mysql -P$port $base < "$mydir/initdemopostsql.sql"
|
||||||
|
else
|
||||||
|
echo No file initdemopostsql.sql found, so no extra sql action done.
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
13969
dev/initdemo/mysqldump_dolibarr_16.0.0.sql
Normal file
13969
dev/initdemo/mysqldump_dolibarr_16.0.0.sql
Normal file
File diff suppressed because one or more lines are too long
@ -116,7 +116,7 @@ then
|
|||||||
fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
|
fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
|
||||||
trap "rm -f $fichtemp" 0 1 2 5 15
|
trap "rm -f $fichtemp" 0 1 2 5 15
|
||||||
$DIALOG --title "Save Dolibarr with demo values" --clear \
|
$DIALOG --title "Save Dolibarr with demo values" --clear \
|
||||||
--inputbox "Password for Mysql root login :" 16 55 2> $fichtemp
|
--passwordbox "Password for Mysql root login :" 16 55 2> $fichtemp
|
||||||
|
|
||||||
valret=$?
|
valret=$?
|
||||||
|
|
||||||
@ -150,7 +150,7 @@ then
|
|||||||
# ---------------------------- confirmation
|
# ---------------------------- confirmation
|
||||||
DIALOG=${DIALOG=dialog}
|
DIALOG=${DIALOG=dialog}
|
||||||
$DIALOG --title "Save Dolibarr with demo values" --clear \
|
$DIALOG --title "Save Dolibarr with demo values" --clear \
|
||||||
--yesno "Do you confirm ? \n Dump file : '$dumpfile' \n Dump dir : '$mydir' \n Mysql database : '$base' \n Mysql port : '$port' \n Mysql login: '$admin' \n Mysql password : '$passwd'" 15 55
|
--yesno "Do you confirm ? \n Dump file : '$dumpfile' \n Dump dir : '$mydir' \n Mysql database : '$base' \n Mysql port : '$port' \n Mysql login: '$admin' \n Mysql password : --hidden--" 15 55
|
||||||
|
|
||||||
case $? in
|
case $? in
|
||||||
0) echo "Ok, start process...";;
|
0) echo "Ok, start process...";;
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation; either version 2 of the License, or
|
* the Free Software Foundation; either version 3 of the License, or
|
||||||
* (at your option) any later version.
|
* (at your option) any later version.
|
||||||
*
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation; either version 2 of the License, or
|
* the Free Software Foundation; either version 3 of the License, or
|
||||||
* (at your option) any later version.
|
* (at your option) any later version.
|
||||||
*
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
|||||||
Binary file not shown.
22
dev/resources/iso-normes/accountancy/accountancy_rules.txt
Normal file
22
dev/resources/iso-normes/accountancy/accountancy_rules.txt
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
|
||||||
|
Gestion escompte:
|
||||||
|
|
||||||
|
Sur une facture de 120 € TTC :
|
||||||
|
707xxx 100 € HT
|
||||||
|
44571x 20 € TVA
|
||||||
|
411xxx 120 € TTC
|
||||||
|
|
||||||
|
Le client règle rapidement et on lui accorde un escompte de 3% (120 € * 3% = 3.6 € TTC), on aura donc :
|
||||||
|
665000 3,00 € HT
|
||||||
|
44571x 0,60 € TVA
|
||||||
|
411xxx 3,60 € TTC
|
||||||
|
|
||||||
|
Et ça marche à l’inverse avec un fournisseur sauf que l’on est en 775000 au lieu de 665000 pour escompte obtenus.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Un compte comptable de Tiers vente = Acount Receivable
|
||||||
|
Un compte comptable de Tiers achat = Acount Payable
|
||||||
|
|
||||||
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
|
|
||||||
Gestion escompte:
|
|
||||||
|
|
||||||
Sur une facture de 120 € TTC :
|
|
||||||
707xxx 100 € HT
|
|
||||||
44571x 20 € TVA
|
|
||||||
411xxx 120 € TTC
|
|
||||||
|
|
||||||
Le client règle rapidement et on lui accorde un escompte de 3% (120 € * 3% = 3.6 € TTC), on aura donc :
|
|
||||||
665000 3,00 € HT
|
|
||||||
44571x 0,60 € TVA
|
|
||||||
411xxx 3.60 € TVA
|
|
||||||
|
|
||||||
Et ça marche à l’inverse avec un fournisseur sauf que l’on est en 775000 au lieu de 665000 pour escompte obtenus.
|
|
||||||
@ -1,3 +1,5 @@
|
|||||||
|
Address format
|
||||||
|
|
||||||
https://bitboost.com/ref/international-address-formats.html#Formats
|
https://bitboost.com/ref/international-address-formats.html#Formats
|
||||||
|
|
||||||
https://www.upu.int/en/Postal-Solutions/Programmes-Services/Addressing-Solutions
|
https://www.upu.int/en/Postal-Solutions/Programmes-Services/Addressing-Solutions
|
||||||
|
|||||||
BIN
dev/resources/iso-normes/banking/iban_registry_0.pdf
Normal file
BIN
dev/resources/iso-normes/banking/iban_registry_0.pdf
Normal file
Binary file not shown.
@ -1,129 +0,0 @@
|
|||||||
Barcode EAN 13
|
|
||||||
|
|
||||||
FR
|
|
||||||
==
|
|
||||||
Signification des chiffres.
|
|
||||||
|
|
||||||
- 2 chiffres pour le code pays ou code systeme
|
|
||||||
- 5 chiffres pour l'identificateur de societe
|
|
||||||
- 5 chiffres pour l'identificateur d'article
|
|
||||||
- 1 chiffre pour la somme de controle
|
|
||||||
|
|
||||||
Cette regle subit de nombreuses entorses pour ameliorer l'usage des chiffres disponibles.
|
|
||||||
Voici la liste des codes pays ou systeme :
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
EN
|
|
||||||
==
|
|
||||||
Meaning of the numbers.
|
|
||||||
|
|
||||||
- 2 digits for the country code or system code
|
|
||||||
- 5 digits for the company identifier
|
|
||||||
- 5 digits for item identifier
|
|
||||||
- 1 digit for checksum
|
|
||||||
|
|
||||||
This rule has been twisted many times to improve the use of the available numbers.
|
|
||||||
Here is the list of country codes or system:
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
List
|
|
||||||
====
|
|
||||||
|
|
||||||
00 <20> 13 UCC (Etats-Unis et Canada)
|
|
||||||
20 <20> 29 Codification interne en magasin
|
|
||||||
30 <20> 37 GENCOD-EAN France
|
|
||||||
380 BCCI (Bulgarie)
|
|
||||||
383 SANA (Slovenie)
|
|
||||||
385 CRO-EAN (Croatie)
|
|
||||||
387 EAN-BIH (Bosnie-Herzegovine)
|
|
||||||
400 <20> 440 CCG (Allemagne)
|
|
||||||
45 + 49 Distribution Code Center <20> DCC (Japon)
|
|
||||||
460 <20> 469 UNISCAN - EAN Russie (Federation de Russie)
|
|
||||||
471 CAN (Taiwan)
|
|
||||||
474 EAN Estonie
|
|
||||||
475 EAN Lettonie
|
|
||||||
476 EAN Azerba<62> djan
|
|
||||||
477 EAN Lituanie
|
|
||||||
478 EAN Ouzbekistan
|
|
||||||
479 EAN Sri Lanka
|
|
||||||
480 PANC (Philippines)
|
|
||||||
481 EAN Bielorussie
|
|
||||||
482 EAN Ukraine
|
|
||||||
484 EAN Moldavie
|
|
||||||
485 EAN Armenie
|
|
||||||
486 EAN Georgie
|
|
||||||
487 EAN Kazakhstan
|
|
||||||
489 HKANA (Hong Kong)
|
|
||||||
50 E Centre UK
|
|
||||||
520 HELLCAN-EAN HELLAS (Grece)
|
|
||||||
528 EAN Liban
|
|
||||||
529 EAN Chypre
|
|
||||||
531 EAN-MAC (FYR Mac<61>donie)
|
|
||||||
535 EAN Malte
|
|
||||||
539 EAN Irlande
|
|
||||||
54 ICODIF/EAN Belgique. Luxembourg
|
|
||||||
560 CODIPOR (Portugal)
|
|
||||||
569 EAN Islande
|
|
||||||
57 EAN Danemark
|
|
||||||
590 EAN Pologne
|
|
||||||
594 EAN Roumanie
|
|
||||||
599 H.A.P.M.H. (Hongrie)
|
|
||||||
600 - 601 EAN Afrique du Sud
|
|
||||||
609 EAN Ile Maurice
|
|
||||||
611 EAN Maroc
|
|
||||||
613 EAN Algerie
|
|
||||||
619 Tunicode (Tunisie)
|
|
||||||
621 EAN Syrie
|
|
||||||
622 EAN Egypte
|
|
||||||
625 EAN Jordanie
|
|
||||||
626 EAN Iran
|
|
||||||
628 EAN Arabie Saoudite
|
|
||||||
64 EAN Finlande
|
|
||||||
690 - 693 Article Numbering Centre of China - ANCC (Chine)
|
|
||||||
70 EAN Norge (Norvege)
|
|
||||||
729 Israeli Bar Code Association <20> EAN Israel
|
|
||||||
73 EAN Suede
|
|
||||||
740 EAN Guatemala
|
|
||||||
741 EAN El Salvador
|
|
||||||
742 ICCC (Honduras)
|
|
||||||
743 EAN Nicaragua
|
|
||||||
744 EAN Costa Rica Panama
|
|
||||||
746 746 EAN Republique Dominicaine
|
|
||||||
750 AMECE (Mexique)
|
|
||||||
759 EAN Venezuela
|
|
||||||
76 EAN (Schweiz, Suisse, Svizzera)
|
|
||||||
770 IAC (Colombie)
|
|
||||||
773 EAN Uruguay
|
|
||||||
775 APC - EAN Peru (Perou)
|
|
||||||
777 EAN Bolivie
|
|
||||||
779 CODIGO - EAN Argentine
|
|
||||||
780 EAN Chili
|
|
||||||
784 EAN Paraguay
|
|
||||||
786 ECOP (Equateur)
|
|
||||||
789 EAN Bresil
|
|
||||||
80 <20> 83 INDICOD (Italie)
|
|
||||||
84 AECOC (Espagne)
|
|
||||||
850 Camera de Comercio de la Republica de Cuba (Cuba)
|
|
||||||
858 EAN Slovaquie
|
|
||||||
859 EAN Republique Tcheque
|
|
||||||
860 EAN YU (Yougoslavie)
|
|
||||||
867 EAN DPR Korea (Coree du Nord)
|
|
||||||
869 Union of Chambers of Commerce of Turkey (Turquie)
|
|
||||||
87 EAN Nederland (Hollande)
|
|
||||||
880 EAN Korea (Coree du Sud)
|
|
||||||
885 EAN Thailande
|
|
||||||
888 SANC (Singapour)
|
|
||||||
890 EAN Inde
|
|
||||||
893 EAN Vietnam
|
|
||||||
899 EAN Indonesie
|
|
||||||
90 - 91 EAN Autriche
|
|
||||||
93 EAN Australie
|
|
||||||
94 EAN Nouvelle Zelande
|
|
||||||
955 Malaysian Article Numbering Council (MANC) - Malaisie
|
|
||||||
977 Publications sirielles (ISSN)
|
|
||||||
978 - 979 Livres (ISBN)
|
|
||||||
980 Refus de remboursement
|
|
||||||
981 - 982 Coupons (monnaie courante)
|
|
||||||
99 Coupons
|
|
||||||
@ -1,8 +1,12 @@
|
|||||||
# File of all ISO-4217 currencies codes
|
# File of all ISO-4217 currencies codes
|
||||||
# http://en.wikipedia.org/wiki/ISO_4217
|
|
||||||
# http://fx.sauder.ubc.ca/currency_table.html for symbols for 2 letter code
|
|
||||||
#
|
#
|
||||||
# Code,Name,Nb decimals
|
# https://en.wikipedia.org/wiki/ISO_4217
|
||||||
|
# https://en.wikipedia.org/wiki/Currency_symbol for symbols for 2 letter code
|
||||||
|
#
|
||||||
|
|
||||||
|
|
||||||
|
# Code, Currency Name, Nb decimals
|
||||||
|
|
||||||
AED,UAE Dirham,2
|
AED,UAE Dirham,2
|
||||||
AFN,Afghanistan Afghani,2
|
AFN,Afghanistan Afghani,2
|
||||||
ALL,Albanian Lek,2
|
ALL,Albanian Lek,2
|
||||||
|
|||||||
BIN
dev/resources/iso-normes/format PDF - PDF A.pdf
Normal file
BIN
dev/resources/iso-normes/format PDF - PDF A.pdf
Normal file
Binary file not shown.
@ -1,3 +1,5 @@
|
|||||||
|
Date and number format
|
||||||
|
----------------------
|
||||||
|
|
||||||
For languages:
|
For languages:
|
||||||
https://icu4c-demos.unicode.org/icu-bin/icudemos - Locale Explorer -> Error 404
|
https://icu4c-demos.unicode.org/icu-bin/icudemos - Locale Explorer -> Error 404
|
||||||
|
|||||||
@ -0,0 +1,29 @@
|
|||||||
|
QR-Code = Quick Response Code - is a two-dimensional / 2D- / Matrix-Barcode
|
||||||
|
|
||||||
|
ISO/IEC 18004
|
||||||
|
|
||||||
|
|
||||||
|
List of QR Code format we found on some invoices
|
||||||
|
------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
* For SEPA QR payment Code format (Europe)
|
||||||
|
------------------------------------------
|
||||||
|
https://en.wikipedia.org/wiki/EPC_QR_code#Generators
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
* For ZATCA QR Code format (Saudi Arabia). Used when INVOICE_ADD_ZATCA_QR_CODE is set
|
||||||
|
-------------------------------------------------------------------------------------
|
||||||
|
https://www.pwc.com/m1/en/services/tax/me-tax-legal-news/2021/saudi-arabia-guide-to-develop-compliant-qr-code-for-simplified-einvoices.html
|
||||||
|
|
||||||
|
https://www.tecklenborgh.com/post/ksa-zatca-publishes-guide-on-how-to-develop-a-fatoora-compliant-qr-code
|
||||||
|
|
||||||
|
Method to encode/decode ZATCA string is available in test/phpunit/BarcodeTest.php
|
||||||
|
|
||||||
|
|
||||||
|
* FOR QR-Bill in switzerland
|
||||||
|
----------------------------
|
||||||
|
Syntax of QR Code https://www.swiss-qr-invoice.org/fr/
|
||||||
|
Syntax of complentary field named "structured information of invoice S1": https://www.swiss-qr-invoice.org/downloads/qr-bill-s1-syntax-fr.pdf
|
||||||
|
To test/validate: https://www.swiss-qr-invoice.org/validator/
|
||||||
129
dev/resources/iso-normes/qr-bar-codes/barcode_EAN13.txt
Normal file
129
dev/resources/iso-normes/qr-bar-codes/barcode_EAN13.txt
Normal file
@ -0,0 +1,129 @@
|
|||||||
|
Barcode EAN 13
|
||||||
|
|
||||||
|
FR
|
||||||
|
==
|
||||||
|
Signification des chiffres.
|
||||||
|
|
||||||
|
- 2 chiffres pour le code pays ou code systeme
|
||||||
|
- 5 chiffres pour l'identificateur de societe
|
||||||
|
- 5 chiffres pour l'identificateur d'article
|
||||||
|
- 1 chiffre pour la somme de controle
|
||||||
|
|
||||||
|
Cette regle subit de nombreuses entorses pour ameliorer l'usage des chiffres disponibles.
|
||||||
|
Voici la liste des codes pays ou systeme :
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
EN
|
||||||
|
==
|
||||||
|
Meaning of the numbers:
|
||||||
|
|
||||||
|
- first 2-3 digits for the country code or system code
|
||||||
|
- 5 digits for the company identifier
|
||||||
|
- 5 digits for item identifier
|
||||||
|
- 1 digit for checksum
|
||||||
|
|
||||||
|
This rule has been twisted many times to improve the use of the available numbers.
|
||||||
|
|
||||||
|
Here is the list of country codes or system:
|
||||||
|
|
||||||
|
|
||||||
|
List
|
||||||
|
====
|
||||||
|
|
||||||
|
00 - 13 UCC (U.S.A / États-Unis & Canada)
|
||||||
|
20 - 29 Flag for internal numbering / Codification interne en magasin
|
||||||
|
30 - 37 GENCOD-EAN France
|
||||||
|
380 BCCI (Bulgaria)
|
||||||
|
383 SANA (Slovenia)
|
||||||
|
385 CRO-EAN (Croatia)
|
||||||
|
387 EAN-BIH (Bosnia-Herzegovina)
|
||||||
|
400-440 CCG (DE/Germany/Allemagne)
|
||||||
|
45 + 49 Distribution Code Center - DCC (Japan)
|
||||||
|
460-469 UNISCAN - EAN Russia (Federation de Russie)
|
||||||
|
471 CAN Taiwan
|
||||||
|
474 EAN Estonia
|
||||||
|
475 EAN Latvia
|
||||||
|
476 EAN Azerbaijan
|
||||||
|
477 EAN Lithuania
|
||||||
|
478 EAN Uzbekistan
|
||||||
|
479 EAN Sri Lanka
|
||||||
|
480 PANC Philippines
|
||||||
|
481 EAN Belarus
|
||||||
|
482 EAN Ukraine
|
||||||
|
484 EAN Moldova
|
||||||
|
485 EAN Armenia
|
||||||
|
486 EAN Georgia
|
||||||
|
487 EAN Kazakhstan
|
||||||
|
489 HKANA Hong Kong
|
||||||
|
50 E Centre UK - United Kingdom
|
||||||
|
520 HELLCAN-EAN HELLAS - Greece
|
||||||
|
528 EAN Lebanon
|
||||||
|
529 EAN Cyprus
|
||||||
|
531 EAN-MAC (FYR Macedonia)
|
||||||
|
535 EAN Malta
|
||||||
|
539 EAN Ireland
|
||||||
|
54 ICODIF/EAN Belgium & Luxembourg
|
||||||
|
560 CODIPOR (Portugal)
|
||||||
|
569 EAN Iceland/Islande
|
||||||
|
57 EAN Denmark
|
||||||
|
590 EAN Poland
|
||||||
|
594 EAN Romania
|
||||||
|
599 H.A.P.M.H. (Hungary)
|
||||||
|
600-601 EAN South Africa
|
||||||
|
609 EAN Mauritius Island
|
||||||
|
611 EAN Morocco
|
||||||
|
613 EAN Algeria
|
||||||
|
619 Tunicode (Tunisia)
|
||||||
|
621 EAN Syria
|
||||||
|
622 EAN Egypt
|
||||||
|
625 EAN Jordan/Jordanie
|
||||||
|
626 EAN Iran
|
||||||
|
628 EAN Saudi Arabia
|
||||||
|
64 EAN Finland
|
||||||
|
690-693 ANCC - Article Numbering Centre of China
|
||||||
|
70 EAN Norge (Norvege)
|
||||||
|
729 Israeli Bar Code Association - EAN Israel
|
||||||
|
73 EAN Suede
|
||||||
|
740 EAN Guatemala
|
||||||
|
741 EAN El Salvador
|
||||||
|
742 ICCC (Honduras)
|
||||||
|
743 EAN Nicaragua
|
||||||
|
744 EAN Costa Rica Panama
|
||||||
|
746 746 EAN Republique Dominicaine
|
||||||
|
750 AMECE (Mexique)
|
||||||
|
759 EAN Venezuela
|
||||||
|
76 EAN (Schweiz, Suisse, Svizzera)
|
||||||
|
770 IAC (Colombie)
|
||||||
|
773 EAN Uruguay
|
||||||
|
775 APC - EAN Peru (Perou)
|
||||||
|
777 EAN Bolivie
|
||||||
|
779 CODIGO - EAN Argentine
|
||||||
|
780 EAN Chili
|
||||||
|
784 EAN Paraguay
|
||||||
|
786 ECOP (Equateur)
|
||||||
|
789 EAN Bresil
|
||||||
|
80 - 83 INDICOD (Italy)
|
||||||
|
84 AECOC (Espagne)
|
||||||
|
850 Camera de Comercio de la Republica de Cuba (Cuba)
|
||||||
|
858 EAN Slovaquie
|
||||||
|
859 EAN Republique Tcheque
|
||||||
|
860 EAN YU (Yougoslavie)
|
||||||
|
867 EAN DPR Korea (Coree du Nord)
|
||||||
|
869 Union of Chambers of Commerce of Turkey (Turquie)
|
||||||
|
87 EAN Nederland (Hollande)
|
||||||
|
880 EAN Korea (Coree du Sud)
|
||||||
|
885 EAN Thailande
|
||||||
|
888 SANC (Singapour)
|
||||||
|
890 EAN Inde
|
||||||
|
893 EAN Vietnam
|
||||||
|
899 EAN Indonesie
|
||||||
|
90 - 91 EAN Autriche
|
||||||
|
93 EAN Australie
|
||||||
|
94 EAN Nouvelle Zelande
|
||||||
|
955 Malaysian Article Numbering Council (MANC) - Malaisie
|
||||||
|
977 Publications sirielles (ISSN)
|
||||||
|
978 - 979 Livres (ISBN)
|
||||||
|
980 Refus de remboursement
|
||||||
|
981 - 982 Coupons (monnaie courante)
|
||||||
|
99 Coupons
|
||||||
8
dev/resources/iso-normes/tax/vat_number_names.txt
Normal file
8
dev/resources/iso-normes/tax/vat_number_names.txt
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
https://en.wikipedia.org/wiki/VAT_identification_number
|
||||||
|
|
||||||
|
terms
|
||||||
|
(en) VAT = Value Added Tax
|
||||||
|
(fr) TVA = Taxe sur la Valeur Ajouté
|
||||||
|
(es) NIF / CIF
|
||||||
|
(de) USt / MwSt = UmsatzSteuer / Mehrwertsteuer
|
||||||
|
(it) IVA
|
||||||
10
dev/resources/iso-normes/tax/world_tax_rates.txt
Normal file
10
dev/resources/iso-normes/tax/world_tax_rates.txt
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
VAT Rates
|
||||||
|
---------
|
||||||
|
|
||||||
|
https://www.taxrates.cc/index.html
|
||||||
|
https://en.wikipedia.org/wiki/List_of_countries_by_tax_rates
|
||||||
|
|
||||||
|
For India: VAT=IGST / CGST=Localtax1 / SGST=Localtax2
|
||||||
|
see:
|
||||||
|
https://cleartax.in/s/what-is-sgst-cgst-igst
|
||||||
|
https://www.mastersindia.co/blog/what-is-cgst-sgst-igst-and-ugst/
|
||||||
@ -1,7 +0,0 @@
|
|||||||
https://en.wikipedia.org/wiki/VAT_identification_number
|
|
||||||
|
|
||||||
terms
|
|
||||||
(en) VAT = Value Added Tax
|
|
||||||
(fr) TVA = Taxe sur la Valeur Ajouté
|
|
||||||
(es) NIF / CIF
|
|
||||||
(de) USt / MwSt
|
|
||||||
@ -1,5 +0,0 @@
|
|||||||
http://www.taxrates.cc/index.html
|
|
||||||
https://en.wikipedia.org/wiki/List_of_countries_by_tax_rates
|
|
||||||
|
|
||||||
For India: VAT=IGST/CGST=Localtax1/SGST=Localtax2: https://cleartax.in/s/what-is-sgst-cgst-igst
|
|
||||||
|
|
||||||
@ -1,62 +1,100 @@
|
|||||||
<VirtualHost *:80>
|
<VirtualHost *:80>
|
||||||
#php_admin_value sendmail_path "/usr/sbin/sendmail -t -i"
|
#php_admin_value sendmail_path "/usr/sbin/sendmail -t -i"
|
||||||
#php_admin_value mail.force_extra_parameters "-f postmaster@mydomain.com"
|
#php_admin_value mail.force_extra_parameters "-f postmaster@mydomain.com"
|
||||||
php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f postmaster@mydomain.com"
|
php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f postmaster@mydomain.com"
|
||||||
php_admin_value open_basedir /tmp/:/home/../htdocs
|
php_admin_value open_basedir /tmp/:/home/.../htdocs:/home/.../dolibarr_documents:
|
||||||
|
|
||||||
ServerName myvirtualalias
|
|
||||||
ServerAlias myvirtualalias
|
|
||||||
|
|
||||||
UseCanonicalName On
|
|
||||||
|
|
||||||
AddDefaultCharset UTF-8
|
|
||||||
|
|
||||||
DocumentRoot "/home/.../htdocs"
|
|
||||||
|
|
||||||
<Directory /home/.../htdocs/>
|
|
||||||
AllowOverride None
|
|
||||||
Options -Indexes -MultiViews +FollowSymLinks -ExecCGI
|
|
||||||
Require all granted
|
|
||||||
</Directory>
|
|
||||||
|
|
||||||
<Directory "/home/../htdocs/cache">
|
|
||||||
Deny from all
|
|
||||||
RemoveHandler .phtml .php .php3 .php4 .php5 .php6 .phps .cgi .exe .pl .asp .aspx .shtml .shtm .fcgi .fpl .jsp .htm .html .wml
|
|
||||||
AddType application/x-httpd-php-source .phtml .php .php3 .php4 .php5 .php6 .phps .cgi .exe .pl .asp .aspx .shtml .shtm .fcgi .fpl .jsp .htm .html .wml
|
|
||||||
</Directory>
|
|
||||||
|
|
||||||
|
|
||||||
ErrorLog /var/log/apache2/myvirtualalias_error_log
|
# Add this to use a custom apparmor profile when using apache php handler
|
||||||
TransferLog /var/log/apache2/myvirtualalias_access_log
|
<IfModule mod_apparmor.c>
|
||||||
|
AADefaultHatName sellyoursaas-instances
|
||||||
|
</IfModule>
|
||||||
|
|
||||||
# Compress returned resources of type php pages, text file export, css and javascript
|
|
||||||
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript application/x-javascript
|
|
||||||
|
|
||||||
AddType text/javascript .jgz
|
ServerName myvirtualalias
|
||||||
AddEncoding gzip .jgz
|
ServerAlias myvirtualalias
|
||||||
ExpiresActive On
|
|
||||||
ExpiresByType image/x-icon A2592000
|
|
||||||
ExpiresByType image/gif A2592000
|
|
||||||
ExpiresByType image/png A2592000
|
|
||||||
ExpiresByType image/jpeg A2592000
|
|
||||||
ExpiresByType text/css A2592000
|
|
||||||
ExpiresByType text/javascript A2592000
|
|
||||||
ExpiresByType application/x-javascript A2592000
|
|
||||||
ExpiresByType application/javascript A2592000
|
|
||||||
|
|
||||||
SSLEngine On
|
UseCanonicalName On
|
||||||
|
|
||||||
# A self-signed (snakeoil) certificate can be created by installing
|
KeepAlive On
|
||||||
# the ssl-cert package. See
|
KeepAliveTimeout 5
|
||||||
# /usr/share/doc/apache2.2-common/README.Debian.gz for more info.
|
MaxKeepAliveRequests 20
|
||||||
# If both key and certificate are stored in the same file, only the
|
|
||||||
# SSLCertificateFile directive is needed.
|
|
||||||
SSLCertificateFile /etc/letsencrypt/live/www.mydomain.com/cert.pem
|
|
||||||
SSLCertificateKeyFile /etc/letsencrypt/live/www.mydomain.com/privkey.pem
|
|
||||||
SSLCertificateChainFile /etc/letsencrypt/live/www.mydomain.com/chain.pem
|
|
||||||
|
|
||||||
#RewriteEngine on
|
AddDefaultCharset UTF-8
|
||||||
#RewriteCond %{SERVER_PORT} ^80$
|
|
||||||
#RewriteRule ^(.*)$ https://%{SERVER_NAME}$1 [L,R]
|
DocumentRoot "/home/.../htdocs"
|
||||||
|
|
||||||
|
<Directory /home/.../htdocs/>
|
||||||
|
AllowOverride None
|
||||||
|
Options -Indexes -MultiViews +FollowSymLinks -ExecCGI
|
||||||
|
Require all granted
|
||||||
|
|
||||||
|
# To restrict access by a HTTP basic auth
|
||||||
|
#AuthType Basic
|
||||||
|
#AuthName "Authenticate to backoffice"
|
||||||
|
#AuthUserFile /etc/apache2/.htpasswd
|
||||||
|
#require valid-user
|
||||||
|
</Directory>
|
||||||
|
|
||||||
|
# Leaving /public and /api, /dav, .well_known but also wrappers for document and viewimage accessible to everyone
|
||||||
|
<Directory /home/admin/wwwroot/dolibarr/htdocs/public/>
|
||||||
|
AuthType None
|
||||||
|
Require all granted
|
||||||
|
Satisfy any
|
||||||
|
</Directory>
|
||||||
|
<Directory /home/admin/wwwroot/dolibarr/htdocs/api/>
|
||||||
|
AuthType None
|
||||||
|
Require all granted
|
||||||
|
Satisfy any
|
||||||
|
</Directory>
|
||||||
|
<Directory /home/admin/wwwroot/dolibarr/htdocs/dav/>
|
||||||
|
AuthType None
|
||||||
|
Require all granted
|
||||||
|
Satisfy any
|
||||||
|
</Directory>
|
||||||
|
<Directory /home/admin/wwwroot/dolibarr/htdocs/.well-known/>
|
||||||
|
AuthType None
|
||||||
|
Require all granted
|
||||||
|
Satisfy any
|
||||||
|
</Directory>
|
||||||
|
<Files ~ "(document\.php|viewimage\.php|\.js\.php|\.json\.php|\.js|\.css\.php|\.css|\.gif|\.png|\.svg|\.woff2|favicon\.ico)$">
|
||||||
|
AuthType None
|
||||||
|
Require all granted
|
||||||
|
Satisfy any
|
||||||
|
</Files>
|
||||||
|
|
||||||
|
|
||||||
|
ErrorLog /var/log/apache2/myvirtualalias_error_log
|
||||||
|
TransferLog /var/log/apache2/myvirtualalias_access_log
|
||||||
|
|
||||||
|
# Compress returned resources of type php pages, text file export, css and javascript
|
||||||
|
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript application/x-javascript
|
||||||
|
|
||||||
|
AddType text/javascript .jgz
|
||||||
|
AddEncoding gzip .jgz
|
||||||
|
ExpiresActive On
|
||||||
|
ExpiresByType image/x-icon A2592000
|
||||||
|
ExpiresByType image/gif A2592000
|
||||||
|
ExpiresByType image/png A2592000
|
||||||
|
ExpiresByType image/jpeg A2592000
|
||||||
|
ExpiresByType text/css A2592000
|
||||||
|
ExpiresByType text/javascript A2592000
|
||||||
|
ExpiresByType application/x-javascript A2592000
|
||||||
|
ExpiresByType application/javascript A2592000
|
||||||
|
|
||||||
|
SSLEngine On
|
||||||
|
|
||||||
|
# A self-signed (snakeoil) certificate can be created by installing
|
||||||
|
# the ssl-cert package. See
|
||||||
|
# /usr/share/doc/apache2.2-common/README.Debian.gz for more info.
|
||||||
|
# If both key and certificate are stored in the same file, only the
|
||||||
|
# SSLCertificateFile directive is needed.
|
||||||
|
#SSLCertificateFile /etc/letsencrypt/live/www.mydomain.com/cert.pem
|
||||||
|
#SSLCertificateKeyFile /etc/letsencrypt/live/www.mydomain.com/privkey.pem
|
||||||
|
#SSLCertificateChainFile /etc/letsencrypt/live/www.mydomain.com/chain.pem
|
||||||
|
|
||||||
|
#RewriteEngine on
|
||||||
|
#RewriteCond %{SERVER_PORT} ^80$
|
||||||
|
#RewriteRule ^(.*)$ https://%{SERVER_NAME}$1 [L,R]
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|||||||
@ -15,9 +15,10 @@
|
|||||||
<exclude-pattern type="relative">htdocs/install/doctemplates/websites</exclude-pattern>
|
<exclude-pattern type="relative">htdocs/install/doctemplates/websites</exclude-pattern>
|
||||||
<exclude-pattern type="relative">htdocs/conf.php</exclude-pattern>
|
<exclude-pattern type="relative">htdocs/conf.php</exclude-pattern>
|
||||||
<exclude-pattern type="relative">*/nltechno*</exclude-pattern>
|
<exclude-pattern type="relative">*/nltechno*</exclude-pattern>
|
||||||
<exclude-pattern type="relative">*/htdocs/includes</exclude-pattern>
|
|
||||||
<exclude-pattern type="relative">source</exclude-pattern>
|
<exclude-pattern type="relative">source</exclude-pattern>
|
||||||
<exclude-pattern type="relative">.git</exclude-pattern>
|
<exclude-pattern type="relative">.git</exclude-pattern>
|
||||||
|
<exclude-pattern>htdocs/includes</exclude-pattern>
|
||||||
|
<exclude-pattern>htdocs/install/doctemplates/websites</exclude-pattern>
|
||||||
|
|
||||||
<!-- List of all tests -->
|
<!-- List of all tests -->
|
||||||
|
|
||||||
@ -135,7 +136,7 @@
|
|||||||
<rule ref="Generic.Metrics.CyclomaticComplexity">
|
<rule ref="Generic.Metrics.CyclomaticComplexity">
|
||||||
<properties>
|
<properties>
|
||||||
<property name="complexity" value="250" />
|
<property name="complexity" value="250" />
|
||||||
<property name="absoluteComplexity" value="300" />
|
<property name="absoluteComplexity" value="400" />
|
||||||
</properties>
|
</properties>
|
||||||
</rule>
|
</rule>
|
||||||
<rule ref="Generic.Metrics.NestingLevel">
|
<rule ref="Generic.Metrics.NestingLevel">
|
||||||
|
|||||||
19
dev/setup/fail2ban/filter.d/web-dolibarr-limitpublic.conf
Normal file
19
dev/setup/fail2ban/filter.d/web-dolibarr-limitpublic.conf
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
# Fail2Ban configuration file
|
||||||
|
#
|
||||||
|
# Regexp to detect access on public pages so we can add mitigation on IP making too much
|
||||||
|
# access to your a Dolibarr instance.
|
||||||
|
|
||||||
|
|
||||||
|
[Definition]
|
||||||
|
|
||||||
|
# To test, you can inject this example into log
|
||||||
|
# echo `date +'%Y-%m-%d %H:%M:%S'`" INFO 1.2.3.4 --- Access to GET /public/clicktodial/cidlookup.php" >> /mypath/documents/dolibarr.log
|
||||||
|
#
|
||||||
|
# then
|
||||||
|
# fail2ban-client status web-dolibarr-limitpublic
|
||||||
|
#
|
||||||
|
# To test rule file on a existing log file
|
||||||
|
# fail2ban-regex /mypath/documents/dolibarr.log /etc/fail2ban/filter.d/web-dolibarr-limitpublic.conf
|
||||||
|
|
||||||
|
failregex = ^ [A-Z\s]+ <HOST>\s+--- Access to .*/public/
|
||||||
|
ignoreregex =
|
||||||
@ -1,8 +1,7 @@
|
|||||||
# Fail2Ban configuration file
|
# Fail2Ban configuration file
|
||||||
#
|
#
|
||||||
# Regexp to catch known spambots and software alike. Please verify
|
# Regexp to detect try to check a couple login/password so we can add mitigation
|
||||||
# that it is your intent to block IPs which were driven by
|
# on IP making too much tries.
|
||||||
# above mentioned bots.
|
|
||||||
|
|
||||||
|
|
||||||
[Definition]
|
[Definition]
|
||||||
@ -11,7 +10,7 @@
|
|||||||
# echo `date +'%Y-%m-%d %H:%M:%S'`" INFO 1.2.3.4 functions_dolibarr::check_user_password_abcd Authentication KO" >> /mypath/documents/dolibarr.log
|
# echo `date +'%Y-%m-%d %H:%M:%S'`" INFO 1.2.3.4 functions_dolibarr::check_user_password_abcd Authentication KO" >> /mypath/documents/dolibarr.log
|
||||||
#
|
#
|
||||||
# then
|
# then
|
||||||
# fail2ban-client status web-dol-bruteforce
|
# fail2ban-client status web-dolibarr-rulesbruteforce
|
||||||
#
|
#
|
||||||
# To test rule file on a existing log file
|
# To test rule file on a existing log file
|
||||||
# fail2ban-regex /mypath/documents/dolibarr.log /etc/fail2ban/filter.d/web-dolibarr-rulesbruteforce.conf
|
# fail2ban-regex /mypath/documents/dolibarr.log /etc/fail2ban/filter.d/web-dolibarr-rulesbruteforce.conf
|
||||||
|
|||||||
@ -1,8 +1,7 @@
|
|||||||
# Fail2Ban configuration file
|
# Fail2Ban configuration file
|
||||||
#
|
#
|
||||||
# Regexp to catch known spambots and software alike. Please verify
|
# Regexp to detect access on passwordforgotten.php page so we can add mitigation on IP making too much
|
||||||
# that it is your intent to block IPs which were driven by
|
# access to this Dolibarr page.
|
||||||
# above mentioned bots.
|
|
||||||
|
|
||||||
|
|
||||||
[Definition]
|
[Definition]
|
||||||
@ -11,7 +10,7 @@
|
|||||||
# echo `date +'%Y-%m-%d %H:%M:%S'`" INFO 1.2.3.4 --- Access to GET /passwordforgotten.php - action=buildnewpassword, massaction=" >> /mypath/documents/dolibarr.log
|
# echo `date +'%Y-%m-%d %H:%M:%S'`" INFO 1.2.3.4 --- Access to GET /passwordforgotten.php - action=buildnewpassword, massaction=" >> /mypath/documents/dolibarr.log
|
||||||
#
|
#
|
||||||
# then
|
# then
|
||||||
# fail2ban-client status web-dol-passforgotten
|
# fail2ban-client status web-dolibarr-rulespassforgotten
|
||||||
#
|
#
|
||||||
# To test rule file on a existing log file
|
# To test rule file on a existing log file
|
||||||
# fail2ban-regex /mypath/documents/dolibarr.log /etc/fail2ban/filter.d/web-dolibarr-rulespassforgotten.conf
|
# fail2ban-regex /mypath/documents/dolibarr.log /etc/fail2ban/filter.d/web-dolibarr-rulespassforgotten.conf
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user