Merge branch 'develop' into new-propal-tooltip-note
23
.gitignore
vendored
@ -1,5 +1,7 @@
|
|||||||
htdocs/conf/conf.php
|
htdocs/conf/conf.php
|
||||||
htdocs/conf/conf.php.old
|
htdocs/conf/conf.php.old
|
||||||
|
htdocs/conf/conf.php.sav
|
||||||
|
htdocs/conf/conf.php.back
|
||||||
documents/
|
documents/
|
||||||
custom2/
|
custom2/
|
||||||
test/report/
|
test/report/
|
||||||
@ -8,22 +10,33 @@ default.properties
|
|||||||
.settings/
|
.settings/
|
||||||
.buildpath
|
.buildpath
|
||||||
.gitmodules
|
.gitmodules
|
||||||
dolibarr_install.log
|
|
||||||
upgrade.log
|
|
||||||
doxygen_warnings.log
|
|
||||||
/.project
|
/.project
|
||||||
|
/.pydevproject
|
||||||
/.vscode
|
/.vscode
|
||||||
.DS_Store
|
.DS_Store
|
||||||
.idea
|
.idea
|
||||||
*.iml
|
*.iml
|
||||||
Thumbs.db
|
Thumbs.db
|
||||||
|
/dolibarr_genesis.mp4
|
||||||
|
# Log files
|
||||||
|
dolibarr_install.log
|
||||||
|
upgrade.log
|
||||||
|
doxygen_warnings.log
|
||||||
# Vagrant generated files
|
# Vagrant generated files
|
||||||
.vagrant
|
.vagrant
|
||||||
# Composer installed repositories
|
# Composer installed repositories
|
||||||
/htdocs/includes/**/.git
|
/htdocs/includes/**/.git
|
||||||
# Composer autoloader and unwanted files
|
# Composer autoloader and unwanted files
|
||||||
|
composer.phar
|
||||||
htdocs/includes/autoload.php
|
htdocs/includes/autoload.php
|
||||||
htdocs/includes/bin/
|
htdocs/includes/bin/
|
||||||
htdocs/includes/composer/
|
htdocs/includes/composer/
|
||||||
/.pydevproject
|
htdocs/includes/doctrine/
|
||||||
/dolibarr_genesis.mp4
|
htdocs/includes/jakub-onderka/
|
||||||
|
htdocs/includes/phpdocumentor/
|
||||||
|
htdocs/includes/phpspec/
|
||||||
|
htdocs/includes/phpunit/
|
||||||
|
htdocs/includes/sebastian/
|
||||||
|
htdocs/includes/squizlabs/
|
||||||
|
htdocs/includes/symfony/
|
||||||
|
htdocs/includes/webmozart/
|
||||||
|
|||||||
@ -8,3 +8,7 @@ linters:
|
|||||||
|
|
||||||
fixers:
|
fixers:
|
||||||
enable: true
|
enable: true
|
||||||
|
|
||||||
|
files:
|
||||||
|
ignore:
|
||||||
|
- 'htdocs/includes/*'
|
||||||
|
|||||||
25
.travis.yml
@ -29,12 +29,12 @@ addons:
|
|||||||
- pgloader
|
- pgloader
|
||||||
|
|
||||||
php:
|
php:
|
||||||
- '5.5'
|
|
||||||
- '5.6'
|
- '5.6'
|
||||||
- '7.0'
|
- '7.0'
|
||||||
- '7.1'
|
- '7.1'
|
||||||
- '7.2'
|
- '7.2'
|
||||||
- '7.3'
|
- '7.3'
|
||||||
|
- '7.4'
|
||||||
- nightly
|
- nightly
|
||||||
|
|
||||||
env:
|
env:
|
||||||
@ -59,22 +59,22 @@ matrix:
|
|||||||
- php: nightly
|
- php: nightly
|
||||||
# We exclude some combinations not usefull to save Travis CPU
|
# We exclude some combinations not usefull to save Travis CPU
|
||||||
exclude:
|
exclude:
|
||||||
- php: '5.6'
|
|
||||||
env: DB=mariadb
|
|
||||||
- php: '7.0'
|
- php: '7.0'
|
||||||
env: DB=mariadb
|
env: DB=mariadb
|
||||||
- php: '7.1'
|
- php: '7.1'
|
||||||
env: DB=mariadb
|
env: DB=mariadb
|
||||||
- php: '7.2'
|
- php: '7.2'
|
||||||
env: DB=mariadb
|
env: DB=mariadb
|
||||||
- php: '5.6'
|
- php: '7.3'
|
||||||
env: DB=postgresql
|
env: DB=mariadb
|
||||||
- php: '7.0'
|
- php: '7.0'
|
||||||
env: DB=postgresql
|
env: DB=postgresql
|
||||||
- php: '7.1'
|
- php: '7.1'
|
||||||
env: DB=postgresql
|
env: DB=postgresql
|
||||||
- php: '7.2'
|
- php: '7.2'
|
||||||
env: DB=postgresql
|
env: DB=postgresql
|
||||||
|
- php: '7.3'
|
||||||
|
env: DB=postgresql
|
||||||
- php: nightly
|
- php: nightly
|
||||||
env: DB=postgresql
|
env: DB=postgresql
|
||||||
|
|
||||||
@ -125,7 +125,7 @@ install:
|
|||||||
squizlabs/php_codesniffer ^3
|
squizlabs/php_codesniffer ^3
|
||||||
fi
|
fi
|
||||||
if [ "$TRAVIS_PHP_VERSION" = '5.6' ] || [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] \
|
if [ "$TRAVIS_PHP_VERSION" = '5.6' ] || [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] \
|
||||||
[ "$TRAVIS_PHP_VERSION" = '7.2' ] || [ "$TRAVIS_PHP_VERSION" = '7.3' ]; then
|
[ "$TRAVIS_PHP_VERSION" = '7.2' ] || [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = '7.4' ]; then
|
||||||
composer -n require phpunit/phpunit ^5 \
|
composer -n require phpunit/phpunit ^5 \
|
||||||
jakub-onderka/php-parallel-lint ^0 \
|
jakub-onderka/php-parallel-lint ^0 \
|
||||||
jakub-onderka/php-console-highlighter ^0 \
|
jakub-onderka/php-console-highlighter ^0 \
|
||||||
@ -248,7 +248,7 @@ before_script:
|
|||||||
# 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" = '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" = '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
|
||||||
@ -285,7 +285,7 @@ script:
|
|||||||
# Ensure we catch errors
|
# Ensure we catch errors
|
||||||
set -e
|
set -e
|
||||||
#parallel-lint --exclude htdocs/includes --blame .
|
#parallel-lint --exclude htdocs/includes --blame .
|
||||||
parallel-lint --exclude dev/namespacemig --exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian --exclude htdocs/includes/squizlabs/php_codesniffer/tests --exclude htdocs/includes/jakub-onderka/php-parallel-lint/tests --exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/phpunit/php-token-stream/tests --exclude htdocs/includes/composer/autoload_static.php --blame .
|
parallel-lint --exclude dev/namespacemig --exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian --exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/phpunit/ --exclude htdocs/includes/composer/autoload_static.php --blame .
|
||||||
set +e
|
set +e
|
||||||
echo
|
echo
|
||||||
|
|
||||||
@ -401,9 +401,12 @@ script:
|
|||||||
php upgrade.php 9.0.0 10.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade9001000.log
|
php upgrade.php 9.0.0 10.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade9001000.log
|
||||||
php upgrade2.php 9.0.0 10.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-2.log
|
php upgrade2.php 9.0.0 10.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-2.log
|
||||||
php step5.php 9.0.0 10.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-3.log
|
php step5.php 9.0.0 10.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-3.log
|
||||||
php upgrade.php 10.0.0 11.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade9001000.log
|
php upgrade.php 10.0.0 11.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade10001100.log
|
||||||
php upgrade2.php 10.0.0 11.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-2.log
|
php upgrade2.php 10.0.0 11.0.0 > $TRAVIS_BUILD_DIR/upgrade10001100-2.log
|
||||||
php step5.php 10.0.0 11.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-3.log
|
php step5.php 10.0.0 11.0.0 > $TRAVIS_BUILD_DIR/upgrade10001100-3.log
|
||||||
|
php upgrade.php 11.0.0 12.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade11001200.log
|
||||||
|
php upgrade2.php 11.0.0 12.0.0 > $TRAVIS_BUILD_DIR/upgrade11001200-2.log
|
||||||
|
php step5.php 11.0.0 12.0.0 > $TRAVIS_BUILD_DIR/upgrade11001200-3.log
|
||||||
# Enable modules not enabled into original dump
|
# Enable modules not enabled into original dump
|
||||||
php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKETSUP,MAIN_MODULE_ACCOUNTING > $TRAVIS_BUILD_DIR/enablemodule.log
|
php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKETSUP,MAIN_MODULE_ACCOUNTING > $TRAVIS_BUILD_DIR/enablemodule.log
|
||||||
echo $?
|
echo $?
|
||||||
|
|||||||
@ -15,13 +15,13 @@ PHP libraries:
|
|||||||
AdoDb-Date 0.36 Modified BSD License Yes Date convertion (not into rpm package)
|
AdoDb-Date 0.36 Modified BSD License Yes Date convertion (not into rpm package)
|
||||||
CKEditor 4.12.1 LGPL-2.1+ Yes Editor WYSIWYG
|
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 ? 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
|
||||||
GeoIP 1.4 LGPL-2.1+ Yes Sample code to make geoip convert (not into deb package)
|
GeoIP 1.4 LGPL-2.1+ Yes Sample code to make geoip convert (not into deb package)
|
||||||
Mobiledetect 2.8.33 MIT License Yes Detect mobile devices browsers
|
Mobiledetect 2.8.33 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
|
||||||
PHPDebugBar 1.15.0 MIT License Yes Used only by the module "debugbar" for developers
|
PHPDebugBar 1.15.0 MIT License Yes Used only by the module "debugbar" for developers
|
||||||
PHPExcel 1.8.1 LGPL-2.1+ Yes Read/Write XLS files, read ODS files
|
PHPExcel 1.8.1 LGPL-2.1+ Yes Read/Write XLS files, read ODS files
|
||||||
PHPSpreadSheet ? LGPL-2.1+ Yes Read/Write XLS files, read ODS files
|
PHPSpreadSheet ? 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 1.4.7 LGPL-3+ Yes Parse and validate IBAN (and IIBAN) bank account information in PHP
|
||||||
|
|||||||
226
ChangeLog
@ -3,13 +3,207 @@ English Dolibarr ChangeLog
|
|||||||
--------------------------------------------------------------
|
--------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
***** ChangeLog for 11.0.0 compared to 10.0.0 *****
|
***** ChangeLog for 12.0.0 compared to 11.0.0 *****
|
||||||
For Users:
|
For Users:
|
||||||
|
|
||||||
|
|
||||||
For Developers:
|
For Developers or integrators:
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
WARNING:
|
||||||
|
|
||||||
|
Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
|
||||||
|
* PHP 5.5 is no more supported. Minimum PHP is now 5.6+.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
***** ChangeLog for 11.0.0 compared to 10.0.0 *****
|
||||||
|
For Users:
|
||||||
|
|
||||||
|
NEW: Module BOM is now stable (Module MO - Manufacturing Order is still in development).
|
||||||
|
NEW: Can set the Address/Contact by default on third parties.
|
||||||
|
NEW: Add a dictionary for list of Social networks
|
||||||
|
NEW: A nicer dashboard for open elements on Home page.
|
||||||
|
NEW: Add task widget and add task progress bar
|
||||||
|
NEW: Support of deployment of metapackages
|
||||||
|
NEW: Menu "Export accounting document" to generate a zip with all documents requested by a bookkeeper is now stable.
|
||||||
|
NEW: Add button "Save and Stay" in website editor of pages.
|
||||||
|
NEW: Accountancy - Can add specific widget in this accountancy area.
|
||||||
|
NEW: Accountancy - Add export model LDCompta V9 & higher
|
||||||
|
NEW: Accountancy - Add permission on export, delete operations in ledger
|
||||||
|
NEW: add ability to edit price without tax before adding a line of a predefined product.
|
||||||
|
NEW: Add a tab to setup "Opening hours" of company (information only).
|
||||||
|
NEW: Add attendee to ical export + cleanup.
|
||||||
|
NEW: Add bank data of users into the expense report exports.
|
||||||
|
NEW: add clone customers prices in clone product or service.
|
||||||
|
NEW: Add column of module source and POS terminal in the invoice list.
|
||||||
|
NEW: Add column last modification date into the table of targets for emailing.
|
||||||
|
NEW: Add column VAT rate in product list
|
||||||
|
NEW: add constant DISPATCH_FORCE_QTY_INPUT
|
||||||
|
NEW: Add constant MAIN_DISABLE_GLOBAL_WORKBOARD to disable workboard in home page
|
||||||
|
NEW: add country code in import product model
|
||||||
|
NEW: Add 'Direct Cash Payment' button in TakePOS
|
||||||
|
NEW: Add odt support to supplier orders
|
||||||
|
NEW: Add feature to search a string into website containers
|
||||||
|
NEW: Add GET and POST /supplierinvoices/payments REST API endpoints.
|
||||||
|
NEW: Show progress bar for declared progression of tasks.
|
||||||
|
NEW: Add last change date in page "Other setup". Can sort page on name/date.
|
||||||
|
NEW: Add link to export targets of an emailings into a CSV file.
|
||||||
|
NEW: Add link to the public interface on the ticket card.
|
||||||
|
NEW: Add location into event tooltip. Use full day for fullday events
|
||||||
|
NEW: add MAIN_LANGUAGES_ALLOWED constant to limit languages displayed.
|
||||||
|
NEW: add MAIN_SHOW_COMPANY_NAME_IN_BANNER_ADDRESS constant.
|
||||||
|
NEW: add mass actions in shipment list.
|
||||||
|
NEW: add minimum stock filter in load warehoues for product form.
|
||||||
|
NEW: add name_alias in fields used for quick search.
|
||||||
|
NEW: add new rule fetchidfromcodeandlabel for categories import.
|
||||||
|
NEW: add office phone for salespresentatives
|
||||||
|
NEW: add office phone & job on user tooltips
|
||||||
|
NEW: Add option MAIN_PDF_FORCE_FONT_SIZE
|
||||||
|
NEW: Add option MEMBER_CAN_CONVERT_CUSTOMERS_TO_MEMBERS
|
||||||
|
NEW: Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_PROPOSAL
|
||||||
|
NEW: Add pagination on list of object of a category
|
||||||
|
NEW: add parent category id or label in import category module
|
||||||
|
NEW: add parent id or ref column in warehouse import
|
||||||
|
NEW: Add search into template
|
||||||
|
NEW: Add shipment widget
|
||||||
|
NEW: Add statistics on product into contracts
|
||||||
|
NEW: Add status of warehouse in the tooltip of a warehouse.
|
||||||
|
NEW: add supplier's product list
|
||||||
|
NEW: add units fields in buying price tab of product card
|
||||||
|
NEW: Add units in select products lines
|
||||||
|
NEW: Add upload document on account statement
|
||||||
|
NEW: Add widgets for BOMs and MOs.
|
||||||
|
NEW: Amount invoiced column in proposal list
|
||||||
|
NEW: Ask the new label and new dates in confirm popup when cloning tax
|
||||||
|
NEW: auto set closing date and user on invoice
|
||||||
|
NEW: Avoid wrap between picto and text on getNomUrl
|
||||||
|
NEW: Balance Stripe connect account for supplier
|
||||||
|
NEW: Bank Add an option for colorize background color of debit or credit movement
|
||||||
|
NEW: Beautify the select box of warehouses
|
||||||
|
NEW: Add birthday widget for members
|
||||||
|
NEW: Widgets uses fiscal year.
|
||||||
|
NEW: Can change supplier when cloning a Purchase Order.
|
||||||
|
NEW: can choose lines to keep while creating order from origin
|
||||||
|
NEW: Can crop/resize image attached on a bank record
|
||||||
|
NEW: Can edit date or RUM mandate.
|
||||||
|
NEW: Can edit link to the translation page in website module
|
||||||
|
NEW: Can edit the price of predefined product during adding in documents
|
||||||
|
NEW: Can enter price tax incl on vendor proposal and purchase orders
|
||||||
|
NEW: Can filter on description on bank account transaction lists.
|
||||||
|
NEW: Can filter on label on invoice in accounting vendor binding pages
|
||||||
|
NEW: Can load multilang translation in same step than fetch_lines
|
||||||
|
NEW: Can restrict access using DAV module to some host IPs only
|
||||||
|
NEW: Can restrict API usage to some IP only
|
||||||
|
NEW: Can select website templates from available default templates with a preview.
|
||||||
|
NEW: Can set a squarred icon on your company setup
|
||||||
|
NEW: can specify hour start end for selectDate and step for minutes
|
||||||
|
NEW: Categories/Tags are also available on warehouses
|
||||||
|
NEW: Check if a resource is in use in an event
|
||||||
|
NEW: Compute column value from others columns in import module
|
||||||
|
NEW: Copy linked categories on product clone process.
|
||||||
|
NEW: Default mode for Stripe is STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION
|
||||||
|
NEW: Digitaria model for numbering accountancy thirdparty
|
||||||
|
NEW: Display membership in takepos if member linked to the thirdparty
|
||||||
|
NEW: Display supplier in objectline if defined
|
||||||
|
NEW: Add default duration of subscriptions on members type
|
||||||
|
NEW: Email template for Takepos (to send invoice)
|
||||||
|
NEW: Expense request and holiday validator fields
|
||||||
|
NEW: Export ledger table in Charlemagne format
|
||||||
|
NEW: Extend option ORDER_ADD_ORDERS_WITH_PARENT_PROD_IF_INCDEC for all virtual product stats (renamed into PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC)
|
||||||
|
NEW: Value "None" to unbind an invoice line and its accounting account is more visible
|
||||||
|
NEW: FCKeditor setup for tickets
|
||||||
|
NEW: The default theme of TakePOS work better on smartphones.
|
||||||
|
NEW: GeoIP v2 support is natively provided -> So IPv6 is supported
|
||||||
|
NEW: List by closing date on order list and proposal list
|
||||||
|
NEW: Look and feel v11: Some setup pages are by default direclty in edit mode.
|
||||||
|
NEW: Management of retained warranty on situation invoices
|
||||||
|
NEW: Mass email action on invoice list use billing contact if exists
|
||||||
|
NEW: more living colors for charts and option for "color bind" people
|
||||||
|
NEW: Supports multiple payments in a TakePOS sale
|
||||||
|
NEW: multiselect with checkbox in categories/tags search for product list
|
||||||
|
NEW: Option to allow to create members from third-party
|
||||||
|
NEW: Platform compliance with Stripe Connect
|
||||||
|
NEW: print / send email form in TakePOS
|
||||||
|
NEW: Public holidays are now in a dictionary table (no more hard coded per country)
|
||||||
|
NEW: Better performance by reducing the $companystatic calls on some pages.
|
||||||
|
NEW: Replace the "info" tab on contract with the more complete "agenda" tab.
|
||||||
|
NEW: Save user of last modification in donation record.
|
||||||
|
NEW: Show html combo list instead input text for extrafields typed as list.
|
||||||
|
NEW: Show POS application and the terminal used on invoice card.
|
||||||
|
NEW: Add categories/tags for stocks.
|
||||||
|
NEW: Support Net Measure in product's card.php
|
||||||
|
NEW: Extrafields separator can be collapsed or not
|
||||||
|
NEW: Extrafields support on Leave requests.
|
||||||
|
NEW: Extrafields support on Salaries.
|
||||||
|
NEW: Extrafields support in Product supplier prices.
|
||||||
|
NEW: Add extrafields for warehouses
|
||||||
|
NEW: Add extrafields in export of expense report (and holiday)
|
||||||
|
NEW: The integrity checker now show also the expected size of files.
|
||||||
|
NEW: The order method in purchase order is now mandatory when recording an order.
|
||||||
|
NEW: update / delete stripe account for supplier
|
||||||
|
NEW: Use the gender of member for picto in member lists.
|
||||||
|
NEW: Use the squarre logo as favicon of pages
|
||||||
|
NEW: VAT list - Add date start & date end in filters
|
||||||
|
NEW: widget box for supplier orders awaiting reception
|
||||||
|
NEW: Update translations
|
||||||
|
NEW: #4301
|
||||||
|
|
||||||
|
For Developers or integrators:
|
||||||
|
|
||||||
|
NEW: Code for extrafields uses the new array $extrafields->attributes
|
||||||
|
NEW: Can set a filter on object linked in modulebuilder.
|
||||||
|
NEW: Can defined a position of numbering submodules for thirdparties
|
||||||
|
NEW: Add option multiselect for developers on the selector of language.
|
||||||
|
NEW: Add a manifest.json.php file for web app.
|
||||||
|
NEW: Support of deployement of metapackages
|
||||||
|
NEW: Removed deprecated code that create linked object from ->origin
|
||||||
|
NEW: experimental zapier for dolibarr
|
||||||
|
NEW: Accountancy - Add hook bookkeepinglist on general ledger
|
||||||
|
NEW: Can update product type with the update method.
|
||||||
|
NEW: add API shipment mode dictionnary
|
||||||
|
NEW: Add API to get Country by code and iso
|
||||||
|
NEW: Add API to get objects by ref, ref_ext, ...
|
||||||
|
NEW: Add anonymous telemetry
|
||||||
|
NEW: Add a category to a contact in API
|
||||||
|
NEW: Add fk projet on stock movement
|
||||||
|
NEW: Add hidden option to set fields for the quick search on products.
|
||||||
|
NEW: add hook on commongeneratedocument
|
||||||
|
NEW: Add hook on fileupload.class.php to enable modules to override…
|
||||||
|
NEW: Add hooks on index pages
|
||||||
|
NEW: adding 'formObjectOptions' hooks loading at card.php of adherents module
|
||||||
|
NEW: Add method getStructuredData for website
|
||||||
|
NEW: Add payments GET and POST REST API endpoints for supplierinvoices.
|
||||||
|
NEW: Add POST /bankaccounts/transfer REST API endpoint.
|
||||||
|
NEW: add "printBucktrackInfo" hook, an external module can add info
|
||||||
|
NEW: Add trigger DIRECT_DEBIT_ORDER_CREATE on widthdraw is missing
|
||||||
|
NEW: API to post documents for "product" and Delete document
|
||||||
|
NEW: add new function "setEntity()" and better compatibility with Multicompany
|
||||||
|
NEW: Can add a button "Create" after combo of object with modulebuilder.
|
||||||
|
NEW: contacts type dictionnary in api_setup.class.php
|
||||||
|
NEW: Look and feel v11: Introduce CSS "trforbreak"
|
||||||
|
NEW: list of measuring units API
|
||||||
|
NEW: get social networks dictionary by API
|
||||||
|
NEW: Get thirdparty's salesrepresentatives by API
|
||||||
|
NEW: get user connected informations in REST API
|
||||||
|
NEW: mode for list thirdparty API (add easy filter for supplier only)
|
||||||
|
NEW: purchase_prices API
|
||||||
|
NEW: Provides more complete demo data
|
||||||
|
NEW: Module builder can generate CSS of JS file.
|
||||||
|
NEW: Use a dedicated css for the pencil to edit a field.
|
||||||
|
NEW: multilangs in fetch_lines
|
||||||
|
NEW: Add more complete info for triggers actioncom
|
||||||
|
NEW: add multicurrency rate at currency list API
|
||||||
|
NEW: Add 2 hidden options to set the default sorting (sort and order) on document page.
|
||||||
|
NEW: Add hidden option to update supplier buying price during receptions.
|
||||||
|
NEW: Add hidden option PROPOSAL_SHOW_INVOICED_AMOUNT (not reliable if one invoice is done on several order or several proposal)
|
||||||
|
NEW: Add hidden option SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT for add possibility to update supplier buying price in the reception on a supplier order
|
||||||
|
NEW: Add hidden option THIRDPARTY_PROPAGATE_EXTRAFIELDS_TO_ORDER to copy extrafields from third party to order.
|
||||||
|
NEW: Add hidden options to send by email even for object with draft status.
|
||||||
|
NEW: Update jquery library to 3.4.1
|
||||||
|
NEW: Upgrade ACE editor to v1.4.6
|
||||||
|
|
||||||
WARNING:
|
WARNING:
|
||||||
|
|
||||||
Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
|
Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
|
||||||
@ -24,11 +218,37 @@ Following changes may create regressions for some external modules, but were nec
|
|||||||
* Removed function dol_micro_time. Use native PHP microtime instead.
|
* Removed function dol_micro_time. Use native PHP microtime instead.
|
||||||
* The trigger BON_PRELEVEMENT_CREATE has been renamed into DIRECT_DEBIT_ORDER_CREATE.
|
* The trigger BON_PRELEVEMENT_CREATE has been renamed into DIRECT_DEBIT_ORDER_CREATE.
|
||||||
* The constant INVOICE_SHOW_POS_IN_EXPORT has been renamed into INVOICE_SHOW_POS.
|
* The constant INVOICE_SHOW_POS_IN_EXPORT has been renamed into INVOICE_SHOW_POS.
|
||||||
* If your logo was visible on the menu bar, you must upload a new logo into 'Home-Setup-Company/Organization' to have it visible agin in menu.
|
* If your logo is no more visible on the menu bar, you must upload a new logo into 'Home-Setup-Company/Organization' to have it visible again.
|
||||||
* All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed into 'labelStatus'.
|
* All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed into 'labelStatus'.
|
||||||
* All properties 'labelstatusshort' and 'labelstatut_short' were renamed into 'labelStatusShort'.
|
* All properties 'labelstatusshort' and 'labelstatut_short' were renamed into 'labelStatusShort'.
|
||||||
* All properties 'type_libelle' were renamed into 'type_label'.
|
* All properties 'type_libelle' were renamed into 'type_label'.
|
||||||
* Renamed property of thirdparty "statut_commercial" into "status_prospect_label"
|
* Renamed property of thirdparty "statut_commercial" into "status_prospect_label"
|
||||||
|
* The jquery plugin/dependency multiselect has been removed. It was not used by Dolibarr core.
|
||||||
|
|
||||||
|
|
||||||
|
***** ChangeLog for 10.0.4 compared to 10.0.3 *****
|
||||||
|
FIX: The pdf templates were using the large logo making PDF too large (and edition of proposal, order, invoice VERY slow)
|
||||||
|
FIX: #12258
|
||||||
|
FIX: #12319 Restore feature ACCOUNTANCY_AUTOFILL_ACCOUNT_WITH_GENERIC.
|
||||||
|
FIX: #12356
|
||||||
|
FIX: #12372
|
||||||
|
FIX: #12385
|
||||||
|
FIX: Advisory ID: usd20190053
|
||||||
|
FIX: Advisory ID: usd20190067
|
||||||
|
FIX: Avoid fatal error when creating thumb from PDF
|
||||||
|
FIX: compatibility with Multicompany
|
||||||
|
FIX: display job of contact list
|
||||||
|
FIX: Extrafields missing in export of expense report
|
||||||
|
FIX: Hook getAccessForbiddenMessage was missing parameters
|
||||||
|
FIX: limit 20 prevent to see all products/services
|
||||||
|
FIX: Search on leave request ref
|
||||||
|
FIX: security check. A user can see holiday with link without permissions
|
||||||
|
FIX: Set unpaid of expense report
|
||||||
|
FIX: shipping extrafields line
|
||||||
|
FIX: the SELECT examine more than MAX_JOIN_SIZE rows #12305
|
||||||
|
FIX: triggers: directories read with opendir() never closed
|
||||||
|
FIX: we need to be able to recalculate tva only if invoice not in accountancy
|
||||||
|
FIX: wrong invoice id for fetchObjetctLinked
|
||||||
|
|
||||||
***** ChangeLog for 10.0.3 compared to 10.0.2 *****
|
***** ChangeLog for 10.0.3 compared to 10.0.2 *****
|
||||||
IMPORTANT : This version fixes a serious bug in saving the units of weight, size, surface and volume on product card.
|
IMPORTANT : This version fixes a serious bug in saving the units of weight, size, surface and volume on product card.
|
||||||
|
|||||||
71
README-FR.md
@ -5,14 +5,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
|
||||||
@ -23,7 +19,7 @@ Si vous avez peu de compétences techniques et que vous souhaitez installer Doli
|
|||||||
- DoliDeb pour Debian ou Ubuntu
|
- DoliDeb pour Debian ou Ubuntu
|
||||||
- DoliRpm pour Redhat, Fedora, OpenSuse, Mandriva ou Mageia
|
- DoliRpm pour Redhat, Fedora, OpenSuse, Mandriva ou Mageia
|
||||||
|
|
||||||
Les packages peuvent être téléchargés à partir de [site web officiel] (https://www.dolibarr.org/).
|
Les packages peuvent être téléchargés à partir de [site web officiel](https://www.dolibarr.org/).
|
||||||
|
|
||||||
### Configuration avancée
|
### Configuration avancée
|
||||||
|
|
||||||
@ -31,32 +27,32 @@ Vous pouvez aussi utiliser un serveur Web et une base de données prise en charg
|
|||||||
|
|
||||||
- Décompressez l'archive .zip téléchargée pour copier le répertoire "dolibarr/htdocs" et tous ses fichiers à la racine du serveur Web ou récupérez-les directement à partir de GitHub (recommandé si vous connaissez git):
|
- Décompressez l'archive .zip téléchargée pour copier le répertoire "dolibarr/htdocs" et tous ses fichiers à la racine du serveur Web ou récupérez-les directement à partir de GitHub (recommandé si vous connaissez git):
|
||||||
|
|
||||||
git clone https://github.com/dolibarr/dolibarr -b x.y (où x.y est la version principale comme 3.6, 9.0, ...)
|
`git clone https://github.com/dolibarr/dolibarr -b x.y` (où x.y est la version principale comme 3.6, 9.0, ...)
|
||||||
|
|
||||||
- Configurez votre serveur Web pour qu'il utilise "*dolibarr/htdocs*" en tant que racine si votre serveur Web ne possède pas déjà de répertoire défini vers lequel pointer.
|
- Configurez votre serveur Web pour qu'il utilise "*dolibarr/htdocs*" en tant que racine si votre serveur Web ne possède pas déjà de répertoire défini vers lequel pointer.
|
||||||
|
|
||||||
- Créez un fichier `htdocs/conf/conf.php` vide et définissez les autorisations d'*écrire* pour l'utilisateur de votre serveur Web (l'autorisation *écrire* sera supprimée une fois l'installation terminée)
|
- Créez un fichier `htdocs/conf/conf.php` vide et définissez les autorisations d'*écrire* pour l'utilisateur de votre serveur Web (l'autorisation *écrire* sera supprimée une fois l'installation terminée)
|
||||||
|
|
||||||
- Depuis votre navigateur, allez à la page "install/" de dolibarr
|
- Depuis votre navigateur, allez à la page "install/" de dolibarr
|
||||||
|
|
||||||
L’URL dépendra de la façon dont votre configuration Web a été configurée pour pointer vers votre installation de dolibarr. Cela peut ressembler à:
|
L’URL dépendra de la façon dont votre configuration Web a été configurée pour pointer vers votre installation de dolibarr. Cela peut ressembler à:
|
||||||
|
|
||||||
|
`http://localhost/dolibarr/htdocs/install/`
|
||||||
|
|
||||||
|
ou
|
||||||
|
|
||||||
|
`http://localhost/dolibarr/install/`
|
||||||
|
|
||||||
|
ou
|
||||||
|
|
||||||
|
`http://yourdolibarrvirtualhost/install/`
|
||||||
|
|
||||||
http://localhost/dolibarr/htdocs/install/
|
|
||||||
|
|
||||||
ou
|
|
||||||
|
|
||||||
http://localhost/dolibarr/install/
|
|
||||||
|
|
||||||
ou
|
|
||||||
|
|
||||||
http://yourdolibarrvirtualhost/install/
|
|
||||||
|
|
||||||
- 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:
|
||||||
|
|
||||||
- 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.
|
||||||
|
|
||||||
@ -65,16 +61,13 @@ Pour mettre à jour Dolibarr depuis une vieille version vers celle ci:
|
|||||||
|
|
||||||
*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
|
||||||
|
|
||||||
Voir fichier ChangeLog.
|
Voir fichier ChangeLog.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## CE QUE DOLIBARR PEUT FAIRE
|
## CE QUE DOLIBARR PEUT FAIRE
|
||||||
|
|
||||||
### Modules principaux (tous optionnels):
|
### Modules principaux (tous optionnels)
|
||||||
|
|
||||||
- Annuaires des prospects et/ou client et/ou fournisseurs
|
- Annuaires des prospects et/ou client et/ou fournisseurs
|
||||||
- Gestion de catalogue de produits et services
|
- Gestion de catalogue de produits et services
|
||||||
@ -96,7 +89,7 @@ Voir fichier ChangeLog.
|
|||||||
- Point de vente/Caisse enregistreuse
|
- Point de vente/Caisse enregistreuse
|
||||||
- …
|
- …
|
||||||
|
|
||||||
### Autres modules:
|
### Autres modules
|
||||||
|
|
||||||
- Gestion de marque-pages
|
- Gestion de marque-pages
|
||||||
- Gestion des promesses de dons
|
- Gestion des promesses de dons
|
||||||
@ -111,7 +104,7 @@ Voir fichier ChangeLog.
|
|||||||
- Intégration de système de paiements (Paypal, Stripe, Paybox...)
|
- Intégration de système de paiements (Paypal, Stripe, Paybox...)
|
||||||
- …
|
- …
|
||||||
|
|
||||||
### Divers:
|
### Divers
|
||||||
|
|
||||||
- Multi-langue.
|
- Multi-langue.
|
||||||
- Multi-utilisateurs avec différents niveaux de permissions par module.
|
- Multi-utilisateurs avec différents niveaux de permissions par module.
|
||||||
@ -125,60 +118,54 @@ Voir fichier ChangeLog.
|
|||||||
- 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...)
|
||||||
- Code simple et facilement personnalisable (pas de framework lourd; mécanisme de hook et triggers).
|
- Code simple et facilement personnalisable (pas de framework lourd; mécanisme de hook et triggers).
|
||||||
- Support natif de nombreuses fonctions spécifiques aux pays comme:
|
- Support natif de nombreuses fonctions spécifiques aux pays comme:
|
||||||
- La tax espagnole TE et ISPF
|
- La tax espagnole TE et ISPF
|
||||||
- Gestion de la TVA NPR (non perçue récupérable - pour les utilisateurs français des DOM-TOM)
|
- Gestion de la TVA NPR (non perçue récupérable - pour les utilisateurs français des DOM-TOM)
|
||||||
- La loi française Finance 2016 et logiciels de caisse
|
- La loi française Finance 2016 et logiciels de caisse
|
||||||
- La double taxe canadienne
|
- La double taxe canadienne
|
||||||
- Le timbre fiscal tunisien
|
- Le timbre fiscal tunisien
|
||||||
- Numérotation de facture de l'argentines (avec type A,B,C...)
|
- Numérotation de facture de l'argentines (avec type A,B,C...)
|
||||||
- Compatible avec vos processus RGPD
|
- Compatible avec vos processus RGPD
|
||||||
- ...
|
- ...
|
||||||
- …
|
- …
|
||||||
|
|
||||||
### Extension
|
### Extension
|
||||||
|
|
||||||
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:
|
||||||
|
|
||||||
- Dolibarr ne contient pas de module de Gestion de la paie.
|
- Dolibarr ne contient pas de module de Gestion de la paie.
|
||||||
- Les tâches du module de gestion de projets n'ont pas de dépendances entre elle.
|
- Les tâches du module de gestion de projets n'ont pas de dépendances entre elle.
|
||||||
- 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>
|
<a href="https://github.com/Dolibarr/dolibarr/graphs/contributors"><img src="https://opencollective.com/dolibarr/contributors.svg?width=890&button=false" /></a>
|
||||||
|
|
||||||
|
|
||||||
## CREDITS
|
## CREDITS
|
||||||
|
|
||||||
Dolibarr est le résultat du travail de nombreux contributeurs depuis des années et utilise des librairies d'autres contributeurs.
|
Dolibarr est le résultat du travail de nombreux contributeurs depuis des années et utilise des librairies d'autres contributeurs.
|
||||||
|
|
||||||
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
|
||||||
|
|
||||||
- Facebook: <https://www.facebook.com/dolibarr.fr>
|
- [Facebook](https://www.facebook.com/dolibarr.fr)
|
||||||
- Google+: <https://plus.google.com/+DolibarrFrance>
|
- [Twitter](https://www.twitter.com/dolibarr_france)
|
||||||
- Twitter: <https://www.twitter.com/dolibarr_france>
|
|
||||||
|
|
||||||
ou sur les réseaux anglophones
|
ou sur les réseaux anglophones
|
||||||
|
|
||||||
- [Facebook](https://www.facebook.com/dolibarr)
|
- [Facebook](https://www.facebook.com/dolibarr)
|
||||||
- [Google+](https://plus.google.com/+DolibarrOrg)
|
|
||||||
- [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)
|
||||||
- [YouTube](https://www.youtube.com/user/DolibarrERPCRM)
|
- [YouTube](https://www.youtube.com/user/DolibarrERPCRM)
|
||||||
|
|||||||
44
README.md
@ -16,7 +16,6 @@ You can use it as a standalone application or as a web application to be able to
|
|||||||
|
|
||||||

|

|
||||||
|
|
||||||
|
|
||||||
## LICENSE
|
## LICENSE
|
||||||
|
|
||||||
Dolibarr is released under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version (GPL-3+).
|
Dolibarr is released under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version (GPL-3+).
|
||||||
@ -25,7 +24,6 @@ See the [COPYING](https://github.com/Dolibarr/dolibarr/blob/develop/COPYING) fil
|
|||||||
|
|
||||||
Other licenses apply for some included dependencies. See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) for a full list.
|
Other licenses apply for some included dependencies. See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) for a full list.
|
||||||
|
|
||||||
|
|
||||||
## INSTALLING
|
## INSTALLING
|
||||||
|
|
||||||
### Simple setup
|
### Simple setup
|
||||||
@ -44,7 +42,7 @@ You can use a Web server and a supported database (MariaDB, MySQL or PostgreSQL)
|
|||||||
|
|
||||||
- Uncompress the downloaded .zip archive to copy the "dolibarr/htdocs" directory and all its files inside your web server root or get the files directly from GitHub (recommanded if you known git):
|
- Uncompress the downloaded .zip archive to copy the "dolibarr/htdocs" directory and all its files inside your web server root or get the files directly from GitHub (recommanded if you known git):
|
||||||
|
|
||||||
git clone https://github.com/dolibarr/dolibarr -b x.y (where x.y is main version like 3.6, 9.0, ...)
|
`git clone https://github.com/dolibarr/dolibarr -b x.y` (where x.y is main version like 3.6, 9.0, ...)
|
||||||
|
|
||||||
- Set up your web server to use "*dolibarr/htdocs*" as root if your web server does not have an already defined directory to point to.
|
- Set up your web server to use "*dolibarr/htdocs*" as root if your web server does not have an already defined directory to point to.
|
||||||
|
|
||||||
@ -52,17 +50,17 @@ You can use a Web server and a supported database (MariaDB, MySQL or PostgreSQL)
|
|||||||
|
|
||||||
- From your browser, go to the dolibarr "install/" page
|
- From your browser, go to the dolibarr "install/" page
|
||||||
|
|
||||||
The URL will depends on how you web setup was setup to point to your dolibarr installation. It may looks like:
|
The URL will depends on how you web setup was setup to point to your dolibarr installation. It may looks like:
|
||||||
|
|
||||||
http://localhost/dolibarr/htdocs/install/
|
`http://localhost/dolibarr/htdocs/install/`
|
||||||
|
|
||||||
or
|
or
|
||||||
|
|
||||||
http://localhost/dolibarr/install/
|
`http://localhost/dolibarr/install/`
|
||||||
|
|
||||||
or
|
or
|
||||||
|
|
||||||
http://yourdolibarrvirtualhost/install/
|
`http://yourdolibarrvirtualhost/install/`
|
||||||
|
|
||||||
- Follow the installer instructions
|
- Follow the installer instructions
|
||||||
|
|
||||||
@ -70,8 +68,6 @@ You can use a Web server and a supported database (MariaDB, MySQL or PostgreSQL)
|
|||||||
|
|
||||||
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). However, this third solution is not free.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## UPGRADING
|
## UPGRADING
|
||||||
|
|
||||||
- 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 & than see https://wiki.dolibarr.org/index.php/Installation_-_Upgrade#Upgrade_Dolibarr
|
||||||
@ -81,12 +77,10 @@ If you don't have time to install it yourself, you can try some commercial 'read
|
|||||||
|
|
||||||
*Note: migration process can be safely done multiple times by calling the `/install/index.php` page*
|
*Note: migration process can be safely done multiple times by calling the `/install/index.php` page*
|
||||||
|
|
||||||
|
|
||||||
## 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)
|
||||||
@ -144,14 +138,14 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
|
|||||||
- APIs
|
- APIs
|
||||||
- An easy to understand, maintain and develop code (PHP with no heavy framework; trigger and hook architecture)
|
- An easy to understand, maintain and develop code (PHP with no heavy framework; trigger and hook architecture)
|
||||||
- Support a lot of country specific features:
|
- Support a lot of country specific features:
|
||||||
- Spanish Tax RE and ISPF
|
- Spanish Tax RE and ISPF
|
||||||
- French NPR VAT rate (VAT called "Non Perçue Récupérable" for DOM-TOM)
|
- French NPR VAT rate (VAT called "Non Perçue Récupérable" for DOM-TOM)
|
||||||
- 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](http://europa.eu/legislation_summaries/taxation/l31057_en.htm) (2006/112/CE ... 2010/45/UE)
|
- Compatible with [European directives](http://europa.eu/legislation_summaries/taxation/l31057_en.htm) (2006/112/CE ... 2010/45/UE)
|
||||||
- Compatible with European GDPR rules
|
- Compatible with European GDPR rules
|
||||||
- ...
|
- ...
|
||||||
- PDF or ODT generation for invoice, proposals, orders...
|
- PDF or ODT generation for invoice, proposals, orders...
|
||||||
- …
|
- …
|
||||||
|
|
||||||
@ -160,12 +154,10 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
|
|||||||
- Works with PHP 5.5+ and MariaDB 5.0.3+, MySQL 5.0.3+ or PostgreSQL 8.1.4+ (See requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite))
|
- Works with PHP 5.5+ and MariaDB 5.0.3+, MySQL 5.0.3+ or PostgreSQL 8.1.4+ (See requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite))
|
||||||
- Compatible with all Cloud solutions that match MySQL, PHP or PostgreSQL prerequisites.
|
- Compatible with all Cloud solutions that match MySQL, PHP or PostgreSQL prerequisites.
|
||||||
|
|
||||||
|
|
||||||
### 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:
|
||||||
@ -175,37 +167,31 @@ These are features that Dolibarr does **not** yet fully support:
|
|||||||
- No native embedded Webmail
|
- No native embedded Webmail
|
||||||
- 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 on the [Wiki](https://wiki.dolibarr.org).
|
Administrator, user, developer and translator's documentations are available along with other community resources on the [Wiki](https://wiki.dolibarr.org).
|
||||||
|
|
||||||
|
|
||||||
## CONTRIBUTING
|
## CONTRIBUTING
|
||||||
|
|
||||||
This project exists thanks to all the people who contribute. [[Contribute](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)].
|
This project exists thanks to all the people who contribute. [[Contribute](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>
|
<a href="https://github.com/Dolibarr/dolibarr/graphs/contributors"><img src="https://opencollective.com/dolibarr/contributors.svg?width=890&button=false" /></a>
|
||||||
|
|
||||||
|
|
||||||
## CREDITS
|
## CREDITS
|
||||||
|
|
||||||
Dolibarr is the work of many contributors over the years and uses some fine libraries.
|
Dolibarr is the work of many contributors over the years and uses some fine libraries.
|
||||||
|
|
||||||
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:
|
||||||
|
|
||||||
- [Facebook](https://www.facebook.com/dolibarr)
|
- [Facebook](https://www.facebook.com/dolibarr)
|
||||||
- [Google+](https://plus.google.com/+DolibarrOrg)
|
|
||||||
- [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)
|
||||||
- [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)]
|
||||||
|
|||||||
1
build/.gitignore
vendored
@ -5,6 +5,5 @@
|
|||||||
/dolibarr-*.tgz
|
/dolibarr-*.tgz
|
||||||
/dolibarr-*.rpm
|
/dolibarr-*.rpm
|
||||||
/dolibarr-*.zip
|
/dolibarr-*.zip
|
||||||
/dolibarr-*.tgz
|
|
||||||
/*.exe
|
/*.exe
|
||||||
/html
|
/html
|
||||||
|
|||||||
@ -36,7 +36,7 @@ Note: Prerequisites to build autoexe DoliWamp package:
|
|||||||
> perl makepack-dolibarrmodule.pl
|
> perl makepack-dolibarrmodule.pl
|
||||||
|
|
||||||
- To build developper documentation, launch the script
|
- To build developper documentation, launch the script
|
||||||
> perl dolybarr-doxygen-build.pl
|
> perl dolibarr-doxygen-build.pl
|
||||||
|
|
||||||
|
|
||||||
Note:
|
Note:
|
||||||
|
|||||||
@ -1,31 +1,37 @@
|
|||||||
FROM php:7.0-apache
|
FROM php:7.2-apache
|
||||||
|
|
||||||
ENV HOST_USER_ID 33
|
ENV HOST_USER_ID 33
|
||||||
ENV PHP_INI_DATE_TIMEZONE 'UTC'
|
ENV PHP_INI_DATE_TIMEZONE 'UTC'
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libldap2-dev \
|
RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libldap2-dev zlib1g-dev libicu-dev g++\
|
||||||
&& rm -rf /var/lib/apt/lists/* \
|
&& rm -rf /var/lib/apt/lists/* \
|
||||||
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
|
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
|
||||||
&& docker-php-ext-install gd \
|
&& docker-php-ext-install gd \
|
||||||
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
|
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
|
||||||
&& docker-php-ext-install ldap \
|
&& docker-php-ext-install ldap \
|
||||||
&& docker-php-ext-install mysqli \
|
&& docker-php-ext-install mysqli \
|
||||||
&& apt-get purge -y libjpeg-dev libldap2-dev
|
&& docker-php-ext-install calendar \
|
||||||
|
&& docker-php-ext-configure intl \
|
||||||
|
&& docker-php-ext-install intl \
|
||||||
|
&& apt-get autoremove --purge -y libjpeg-dev libldap2-dev zlib1g-dev libicu-dev g++
|
||||||
|
|
||||||
|
RUN mkdir /var/documents
|
||||||
|
RUN chown www-data /var/documents
|
||||||
|
|
||||||
COPY docker-run.sh /usr/local/bin/
|
COPY docker-run.sh /usr/local/bin/
|
||||||
RUN chmod +x /usr/local/bin/docker-run.sh
|
RUN chmod +x /usr/local/bin/docker-run.sh
|
||||||
|
|
||||||
RUN pecl install xdebug-2.5.5 && docker-php-ext-enable xdebug
|
RUN pecl install xdebug && docker-php-ext-enable xdebug
|
||||||
RUN echo 'zend_extension="/usr/local/lib/php/extensions/no-debug-non-zts-20151012/xdebug.so"' >> /usr/local/etc/php/php.ini
|
RUN echo 'zend_extension="/usr/local/lib/php/extensions/no-debug-non-zts-20151012/xdebug.so"' >> /usr/local/etc/php/php.ini
|
||||||
RUN echo 'xdebug.remote_autostart=0' >> /usr/local/etc/php/php.ini
|
RUN echo 'xdebug.remote_autostart=0' >> /usr/local/etc/php/php.ini
|
||||||
RUN echo 'xdebug.remote_enable=1' >> /usr/local/etc/php/php.ini
|
RUN echo 'xdebug.remote_enable=1' >> /usr/local/etc/php/php.ini
|
||||||
RUN echo 'xdebug.default_enable=0' >> /usr/local/etc/php/php.ini
|
RUN echo 'xdebug.default_enable=0' >> /usr/local/etc/php/php.ini
|
||||||
RUN echo 'xdebug.remote_host=docker.for.mac.host.internal' >> /usr/local/etc/php/php.ini
|
RUN echo 'xdebug.remote_host=docker.host' >> /usr/local/etc/php/php.ini
|
||||||
RUN echo 'xdebug.remote_port=9000' >> /usr/local/etc/php/php.ini
|
RUN echo 'xdebug.remote_port=9000' >> /usr/local/etc/php/php.ini
|
||||||
RUN echo 'xdebug.remote_connect_back=0' >> /usr/local/etc/php/php.ini
|
RUN echo 'xdebug.remote_connect_back=0' >> /usr/local/etc/php/php.ini
|
||||||
RUN echo 'xdebug.profiler_enable=0' >> /usr/local/etc/php/php.ini
|
RUN echo 'xdebug.profiler_enable=0' >> /usr/local/etc/php/php.ini
|
||||||
RUN echo 'xdebug.remote_log="/tmp/xdebug.log"' >> /usr/local/etc/php/php.ini
|
RUN echo 'xdebug.remote_log="/tmp/xdebug.log"' >> /usr/local/etc/php/php.ini
|
||||||
|
RUN echo '172.17.0.1 docker.host' >> /etc/hosts
|
||||||
|
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
mariadb:
|
mariadb:
|
||||||
image: mariadb:latest
|
build: mariadb
|
||||||
environment:
|
environment:
|
||||||
MYSQL_ROOT_PASSWORD: root
|
MYSQL_ROOT_PASSWORD: root
|
||||||
MYSQL_DATABASE: dolibarr
|
MYSQL_DATABASE: dolibarr
|
||||||
|
|||||||
@ -3,7 +3,8 @@
|
|||||||
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
|
||||||
|
|
||||||
chown -hR www-data:www-data /var/www
|
chgrp -hR www-data /var/www/html
|
||||||
|
chmod g+rwx /var/www/html/conf
|
||||||
|
|
||||||
if [ ! -f /usr/local/etc/php/php.ini ]; then
|
if [ ! -f /usr/local/etc/php/php.ini ]; then
|
||||||
cat <<EOF > /usr/local/etc/php/php.ini
|
cat <<EOF > /usr/local/etc/php/php.ini
|
||||||
|
|||||||
3
build/docker/mariadb/Dockerfile
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
FROM mariadb:latest
|
||||||
|
# Enable comented out UTF8 charset/collation options
|
||||||
|
RUN sed '/utf8/ s/^#//' /etc/mysql/mariadb.cnf >/tmp/t && mv /tmp/t /etc/mysql/mariadb.cnf
|
||||||
@ -36,7 +36,7 @@ $SOURCE="../..";
|
|||||||
$result = open( IN, "< " . $SOURCE . "/htdocs/filefunc.inc.php" );
|
$result = open( IN, "< " . $SOURCE . "/htdocs/filefunc.inc.php" );
|
||||||
if ( !$result ) { die "Error: Can't open descriptor file " . $SOURCE . "/htdocs/filefunc.inc.php\n"; }
|
if ( !$result ) { die "Error: Can't open descriptor file " . $SOURCE . "/htdocs/filefunc.inc.php\n"; }
|
||||||
while (<IN>) {
|
while (<IN>) {
|
||||||
if ( $_ =~ /define\('DOL_VERSION','([\d\.a-z\-]+)'\)/ ) { $PROJVERSION = $1; break; }
|
if ( $_ =~ /define\('DOL_VERSION', '([\d\.a-z\-]+)'\)/ ) { $PROJVERSION = $1; break; }
|
||||||
}
|
}
|
||||||
close IN;
|
close IN;
|
||||||
($MAJOR,$MINOR,$BUILD)=split(/\./,$PROJVERSION,3);
|
($MAJOR,$MINOR,$BUILD)=split(/\./,$PROJVERSION,3);
|
||||||
|
|||||||
29
build/exakat/README.md
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
|
||||||
|
== Install exakat ==
|
||||||
|
mkdir exakat
|
||||||
|
cd exakat
|
||||||
|
curl -o exakat.phar http://dist.exakat.io/index.php?file=latest
|
||||||
|
curl -o apache-tinkerpop-gremlin-server-3.3.5-bin.zip http://dist.exakat.io/apache-tinkerpop-gremlin-server-3.3.5-bin.zip
|
||||||
|
unzip apache-tinkerpop-gremlin-server-3.3.5-bin.zip
|
||||||
|
mv apache-tinkerpop-gremlin-server-3.3.5 tinkergraph
|
||||||
|
rm -rf apache-tinkerpop-gremlin-server-3.3.5-bin.zip
|
||||||
|
cd tinkergraph ./bin/gremlin-server.sh -i org.apache.tinkerpop neo4j-gremlin 3.3.5
|
||||||
|
cd ..
|
||||||
|
|
||||||
|
php exakat.phar version
|
||||||
|
php exakat.phar doctor
|
||||||
|
|
||||||
|
== Init project ==
|
||||||
|
php
|
||||||
|
|
||||||
|
|
||||||
|
Edit config.ini file to exclude some dirs:
|
||||||
|
ignore_dirs[] = "/htdocs/includes";
|
||||||
|
ignore_dirs[] = "/scripts";
|
||||||
|
ignore_dirs[] = "/build";
|
||||||
|
ignore_dirs[] = "/dev";
|
||||||
|
ignore_dirs[] = "/documents";
|
||||||
|
|
||||||
|
|
||||||
|
== Analyze project ==
|
||||||
|
php
|
||||||
@ -145,7 +145,7 @@ $iterator1 = new RecursiveIteratorIterator($dir_iterator1);
|
|||||||
// Need to ignore document custom etc. Note: this also ignore natively symbolic links.
|
// Need to ignore document custom etc. Note: this also ignore natively symbolic links.
|
||||||
$files = new RegexIterator($iterator1, '#^(?:[A-Z]:)?(?:/(?!(?:'.($includecustom?'':'custom\/|').'documents\/|conf\/|install\/))[^/]+)+/[^/]+\.(?:php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$#i');
|
$files = new RegexIterator($iterator1, '#^(?:[A-Z]:)?(?:/(?!(?:'.($includecustom?'':'custom\/|').'documents\/|conf\/|install\/))[^/]+)+/[^/]+\.(?:php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$#i');
|
||||||
*/
|
*/
|
||||||
$regextoinclude='\.(php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$';
|
$regextoinclude='\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$';
|
||||||
$regextoexclude='('.($includecustom?'':'custom|').'documents|conf|install|public\/test|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs
|
$regextoexclude='('.($includecustom?'':'custom|').'documents|conf|install|public\/test|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs
|
||||||
$files = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
|
$files = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
|
||||||
$dir='';
|
$dir='';
|
||||||
@ -164,7 +164,7 @@ foreach ($files as $filetmp) {
|
|||||||
if (filetype($file)=="file") {
|
if (filetype($file)=="file") {
|
||||||
$md5=md5_file($file);
|
$md5=md5_file($file);
|
||||||
$checksumconcat[]=$md5;
|
$checksumconcat[]=$md5;
|
||||||
fputs($fp, ' <md5file name="'.basename($file).'">'.$md5.'</md5file>'."\n");
|
fputs($fp, ' <md5file name="'.basename($file).'" size="'.filesize($file).'">'.$md5.'</md5file>'."\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fputs($fp, ' </dir>'."\n");
|
fputs($fp, ' </dir>'."\n");
|
||||||
@ -207,7 +207,7 @@ foreach ($files as $filetmp) {
|
|||||||
if (filetype($file)=="file") {
|
if (filetype($file)=="file") {
|
||||||
$md5=md5_file($file);
|
$md5=md5_file($file);
|
||||||
$checksumconcat[]=$md5;
|
$checksumconcat[]=$md5;
|
||||||
fputs($fp, ' <md5file name="'.basename($file).'">'.$md5.'</md5file>'."\n");
|
fputs($fp, ' <md5file name="'.basename($file).'" size="'.filesize($file).'">'.$md5.'</md5file>'."\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fputs($fp, ' </dir>'."\n");
|
fputs($fp, ' </dir>'."\n");
|
||||||
|
|||||||
@ -461,15 +461,18 @@ if ($nboftargetok) {
|
|||||||
print "Clean $BUILDROOT\n";
|
print "Clean $BUILDROOT\n";
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/.buildpath`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/.buildpath`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/.editorconfig`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/.codeclimate`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/.externalToolBuilders`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/.externalToolBuilders`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/.git*`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/.git*`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
|
||||||
|
$ret=`rm -fr $BUILDROOT/$PROJECT/.pydevproject`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/.settings`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/.settings`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/.scrutinizer.yml`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/.scrutinizer.yml`;
|
||||||
|
$ret=`rm -fr $BUILDROOT/$PROJECT/.stickler.yml`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/.travis.yml`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/.travis.yml`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/.tx`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/.tx`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/build.xml`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/build.xml`;
|
||||||
|
$ret=`rm -f $BUILDROOT/$PROJECT/phpstan.neon`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/pom.xml`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/pom.xml`;
|
||||||
|
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
|
||||||
|
|||||||
@ -24,10 +24,10 @@
|
|||||||
"vendor-dir" : "htdocs/includes"
|
"vendor-dir" : "htdocs/includes"
|
||||||
},
|
},
|
||||||
"require" : {
|
"require" : {
|
||||||
"php" : ">=5.3.0",
|
"php" : ">=5.5.0",
|
||||||
"ext-curl" : "*",
|
"ext-curl" : "*",
|
||||||
"ckeditor/ckeditor" : "4.12.1",
|
"ckeditor/ckeditor" : "4.12.1",
|
||||||
"mike42/escpos-php" : "1.2.1",
|
"mike42/escpos-php" : "2.2",
|
||||||
"mobiledetect/mobiledetectlib" : "2.8.33",
|
"mobiledetect/mobiledetectlib" : "2.8.33",
|
||||||
"phpoffice/phpexcel" : "1.8.1",
|
"phpoffice/phpexcel" : "1.8.1",
|
||||||
"restler/framework" : "3.0.0-RC6",
|
"restler/framework" : "3.0.0-RC6",
|
||||||
@ -48,13 +48,12 @@
|
|||||||
"ext-mssql" : "To use with MSSQL (experimental)",
|
"ext-mssql" : "To use with MSSQL (experimental)",
|
||||||
"ext-pdo_sqlite" : "To use with SQLite (experimental)",
|
"ext-pdo_sqlite" : "To use with SQLite (experimental)",
|
||||||
"ext-gd" : "Image manipulation (Required but maybe built-in PHP)",
|
"ext-gd" : "Image manipulation (Required but maybe built-in PHP)",
|
||||||
"ext-imagick" : "Image manipulation (TCPDF)",
|
"ext-imagick" : "Generation of thumbs from PDF",
|
||||||
"ext-mcrypt" : "(Required but maybe built-in PHP)",
|
"ext-mcrypt" : "(Required but maybe built-in PHP)",
|
||||||
"ext-openssl" : "Secure connections (Emails, SOAP\u2026)",
|
"ext-openssl" : "Secure connections (Emails, SOAP\u2026)",
|
||||||
"ext-mbstring" : "Handle non UTF-8 databases",
|
"ext-mbstring" : "Handle non UTF-8 characters",
|
||||||
"ext-soap" : "Native SOAP",
|
"ext-soap" : "Native SOAP",
|
||||||
"ext-zip" : "ODT and Excel support",
|
"ext-zip" : "ODT, Excel and file compression support",
|
||||||
"ext-xml" : "Excel support",
|
"ext-xml" : "Excel support"
|
||||||
"firephp/firephp-core" : "Logging to Firebug console support"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -52,6 +52,36 @@ Replace call to serialize_val with no bugged value
|
|||||||
|
|
||||||
TCPDF:
|
TCPDF:
|
||||||
------
|
------
|
||||||
|
* Replace in tcpdf.php:
|
||||||
|
|
||||||
|
if (isset($this->imagekeys)) {
|
||||||
|
foreach($this->imagekeys as $file) {
|
||||||
|
unlink($file);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
with
|
||||||
|
|
||||||
|
if (isset($this->imagekeys)) {
|
||||||
|
foreach($this->imagekeys as $file) {
|
||||||
|
// unlink($file);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
* In tecnickcom/tcpdf/include/tcpdf_static, in function fopenLocal, replace
|
||||||
|
|
||||||
|
if (strpos($filename, '://') === false) {
|
||||||
|
|
||||||
|
with
|
||||||
|
|
||||||
|
if (strpos($filename, '//') === 0)
|
||||||
|
{
|
||||||
|
// Share folder on a (windows) server
|
||||||
|
// e.g.: "//[MyServerName]/[MySharedFolder]/"
|
||||||
|
//
|
||||||
|
// nothing to change
|
||||||
|
}
|
||||||
|
elseif (strpos($filename, '://') === false)
|
||||||
|
|
||||||
* To avoid to have QRcode changed because generated with a random mask, replace
|
* To avoid to have QRcode changed because generated with a random mask, replace
|
||||||
define('QR_FIND_FROM_RANDOM', 2);
|
define('QR_FIND_FROM_RANDOM', 2);
|
||||||
with
|
with
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 1.0 MiB After Width: | Height: | Size: 142 KiB |
|
Before Width: | Height: | Size: 1.0 MiB After Width: | Height: | Size: 122 KiB |
|
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 113 KiB |
BIN
dev/initdemo/documents_demo/categorie/2/3/32/photos/Fruits.jpg
Normal file
|
After Width: | Height: | Size: 20 KiB |
|
After Width: | Height: | Size: 3.3 KiB |
|
After Width: | Height: | Size: 8.6 KiB |
|
After Width: | Height: | Size: 31 KiB |
|
After Width: | Height: | Size: 2.7 KiB |
|
After Width: | Height: | Size: 8.0 KiB |
BIN
dev/initdemo/documents_demo/categorie/4/3/34/photos/Pies.jpg
Normal file
|
After Width: | Height: | Size: 22 KiB |
|
After Width: | Height: | Size: 2.9 KiB |
|
After Width: | Height: | Size: 7.2 KiB |
BIN
dev/initdemo/documents_demo/categorie/5/3/35/photos/Other.jpg
Normal file
|
After Width: | Height: | Size: 53 KiB |
|
After Width: | Height: | Size: 3.8 KiB |
|
After Width: | Height: | Size: 11 KiB |
|
After Width: | Height: | Size: 17 KiB |
|
After Width: | Height: | Size: 2.8 KiB |
|
After Width: | Height: | Size: 8.4 KiB |
|
Before Width: | Height: | Size: 8.2 KiB After Width: | Height: | Size: 8.2 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 48 KiB |
|
Before Width: | Height: | Size: 81 KiB |
|
Before Width: | Height: | Size: 33 KiB |
|
After Width: | Height: | Size: 5.9 KiB |
|
After Width: | Height: | Size: 8.5 KiB |
|
After Width: | Height: | Size: 7.7 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 2.8 KiB |
|
After Width: | Height: | Size: 8.1 KiB |
|
Before Width: | Height: | Size: 6.4 KiB |
|
Before Width: | Height: | Size: 6.9 KiB |
|
Before Width: | Height: | Size: 3.6 KiB |
|
After Width: | Height: | Size: 15 KiB |
|
After Width: | Height: | Size: 1.4 KiB |
|
After Width: | Height: | Size: 2.5 KiB |
BIN
dev/initdemo/documents_demo/produit/POS-CARROT/FR-CAR-Carrot.jpg
Normal file
|
After Width: | Height: | Size: 14 KiB |
|
After Width: | Height: | Size: 1.7 KiB |
|
After Width: | Height: | Size: 3.7 KiB |
|
After Width: | Height: | Size: 36 KiB |
|
After Width: | Height: | Size: 1.6 KiB |
|
After Width: | Height: | Size: 3.6 KiB |
BIN
dev/initdemo/documents_demo/produit/POS-Eggs/POS-Eggs-Eggs.jpg
Normal file
|
After Width: | Height: | Size: 16 KiB |
|
After Width: | Height: | Size: 1.6 KiB |
|
After Width: | Height: | Size: 3.0 KiB |
BIN
dev/initdemo/documents_demo/produit/POS-KIWI/POS-KIWI-Kiwi.jpg
Normal file
|
After Width: | Height: | Size: 14 KiB |
|
After Width: | Height: | Size: 1.9 KiB |
|
After Width: | Height: | Size: 4.0 KiB |
|
After Width: | Height: | Size: 32 KiB |
|
After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 3.3 KiB |
|
After Width: | Height: | Size: 25 KiB |
|
After Width: | Height: | Size: 1.4 KiB |
|
After Width: | Height: | Size: 2.7 KiB |
BIN
dev/initdemo/documents_demo/societe/12/courrier_consult.odt
Normal file
BIN
dev/initdemo/documents_demo/societe/12/logos/person8.jpeg
Normal file
|
After Width: | Height: | Size: 7.0 KiB |
|
Before Width: | Height: | Size: 5.8 KiB |
|
After Width: | Height: | Size: 1.8 KiB |
|
After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 4.8 KiB |
BIN
dev/initdemo/documents_demo/societe/12/radiography1.jpg
Normal file
|
After Width: | Height: | Size: 18 KiB |
BIN
dev/initdemo/documents_demo/societe/12/radiography2-knee.jpg
Normal file
|
After Width: | Height: | Size: 8.7 KiB |
|
After Width: | Height: | Size: 1.6 KiB |
|
After Width: | Height: | Size: 3.5 KiB |
|
After Width: | Height: | Size: 1.6 KiB |
|
After Width: | Height: | Size: 3.8 KiB |
|
Before Width: | Height: | Size: 1.0 MiB After Width: | Height: | Size: 154 KiB |
|
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 172 KiB |
|
Before Width: | Height: | Size: 1.0 MiB After Width: | Height: | Size: 147 KiB |
|
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 148 KiB |
|
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 143 KiB |
|
Before Width: | Height: | Size: 1.0 MiB After Width: | Height: | Size: 142 KiB |
|
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 113 KiB |
|
Before Width: | Height: | Size: 1.0 MiB After Width: | Height: | Size: 122 KiB |
|
Before Width: | Height: | Size: 991 KiB After Width: | Height: | Size: 117 KiB |