Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
florian HENRY
commit
4e34b6e0c6
@ -15,3 +15,5 @@ indent_style = tab
|
|||||||
indent_style = tab
|
indent_style = tab
|
||||||
[*.xml]
|
[*.xml]
|
||||||
indent_style = tab
|
indent_style = tab
|
||||||
|
[*.md]
|
||||||
|
trim_trailing_whitespace = false
|
||||||
|
|||||||
@ -257,7 +257,7 @@ 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
|
||||||
phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/codesniffer/ruleset.xml --encoding=utf-8 .
|
phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 .
|
||||||
set +e
|
set +e
|
||||||
echo
|
echo
|
||||||
|
|
||||||
@ -285,12 +285,15 @@ script:
|
|||||||
php upgrade2.php 3.8.0 3.9.0 > $TRAVIS_BUILD_DIR/upgrade380390-2.log
|
php upgrade2.php 3.8.0 3.9.0 > $TRAVIS_BUILD_DIR/upgrade380390-2.log
|
||||||
php step5.php 3.8.0 3.9.0 > $TRAVIS_BUILD_DIR/upgrade380390-3.log
|
php step5.php 3.8.0 3.9.0 > $TRAVIS_BUILD_DIR/upgrade380390-3.log
|
||||||
php upgrade.php 3.9.0 4.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade390400.log
|
php upgrade.php 3.9.0 4.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade390400.log
|
||||||
php upgrade2.php 3.9.0 4.0.0 MAIN_MODULE_API > $TRAVIS_BUILD_DIR/upgrade390400-2.log
|
php upgrade2.php 3.9.0 4.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL > $TRAVIS_BUILD_DIR/upgrade390400-2.log
|
||||||
php step5.php 3.9.0 4.0.0 > $TRAVIS_BUILD_DIR/upgrade390400-3.log
|
php step5.php 3.9.0 4.0.0 > $TRAVIS_BUILD_DIR/upgrade390400-3.log
|
||||||
|
php upgrade.php 4.0.0 5.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade400500.log
|
||||||
|
php upgrade2.php 4.0.0 5.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL > $TRAVIS_BUILD_DIR/upgrade400500-2.log
|
||||||
|
php step5.php 4.0.0 5.0.0 > $TRAVIS_BUILD_DIR/upgrade400500-3.log
|
||||||
cd -
|
cd -
|
||||||
set +e
|
set +e
|
||||||
echo
|
echo
|
||||||
#cat $TRAVIS_BUILD_DIR/upgrade390400-2.log
|
#cat $TRAVIS_BUILD_DIR/upgrade400500-2.log
|
||||||
#cat /tmp/dolibarr_install.log
|
#cat /tmp/dolibarr_install.log
|
||||||
|
|
||||||
- |
|
- |
|
||||||
|
|||||||
@ -170,7 +170,7 @@ source_file = htdocs/langs/en_US/interventions.lang
|
|||||||
source_lang = en_US
|
source_lang = en_US
|
||||||
type = MOZILLAPROPERTIES
|
type = MOZILLAPROPERTIES
|
||||||
|
|
||||||
[dolibarr.languages]
|
[dolibarr.languages-not-res]
|
||||||
file_filter = htdocs/langs/<lang>/languages.lang
|
file_filter = htdocs/langs/<lang>/languages.lang
|
||||||
source_file = htdocs/langs/en_US/languages.lang
|
source_file = htdocs/langs/en_US/languages.lang
|
||||||
source_lang = en_US
|
source_lang = en_US
|
||||||
|
|||||||
@ -38,9 +38,8 @@ jQuery UI 1.11.4 GPL and MIT License Yes
|
|||||||
jQuery select2 3.5.2 GPL and Apache License Yes JS library plugin for sexier multiselect
|
jQuery select2 3.5.2 GPL and Apache License Yes JS library plugin for sexier multiselect
|
||||||
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
|
||||||
jQuery DataTables 1.9.4 BSD Yes JS library for tables output
|
|
||||||
jQuery FileUpload 5.0.3 GPL and MIT License Yes JS library to upload files
|
jQuery FileUpload 5.0.3 GPL and MIT License Yes JS library to upload files
|
||||||
jQuery Flot 0.7 MIT License Yes JS library to build graph
|
jQuery Flot 0.8.3 MIT License Yes JS library to build graph
|
||||||
jQuery JCrop 0.9.8 GPL and MIT License Yes JS library plugin Crop (to crop images)
|
jQuery JCrop 0.9.8 GPL and MIT License Yes JS library plugin Crop (to crop images)
|
||||||
jQuery Jeditable 1.7.1 GPL and MIT License Yes JS library plugin jeditable (to edit in place)
|
jQuery Jeditable 1.7.1 GPL and MIT License Yes JS library plugin jeditable (to edit in place)
|
||||||
jQuery jNotify 1.1.00 Apache Software License 2.0 Yes JS library plugin jNotify (to use ajax popups)
|
jQuery jNotify 1.1.00 Apache Software License 2.0 Yes JS library plugin jNotify (to use ajax popups)
|
||||||
@ -52,7 +51,7 @@ jQuery Mobile 1.3.0 GPL and MIT License Yes
|
|||||||
jQuery TableDnD 0.6 GPL and MIT License Yes JS library plugin TableDnD (to reorder table rows)
|
jQuery TableDnD 0.6 GPL and MIT License Yes JS library plugin TableDnD (to reorder table rows)
|
||||||
jQuery Timepicker 1.1.0 GPL and MIT License Yes JS library Timepicker addon for Datepicker
|
jQuery Timepicker 1.1.0 GPL and MIT License Yes JS library Timepicker addon for Datepicker
|
||||||
jQuery Tiptip 1.3 GPL and MIT License Yes JS library for tooltips
|
jQuery Tiptip 1.3 GPL and MIT License Yes JS library for tooltips
|
||||||
jsGantt 1.2 BSD License Yes JS library (to build Gantt reports)
|
jsGanttImproved 1.7.5.2 BSD License Yes JS library (to build Gantt reports)
|
||||||
JsTimezoneDetect 1.0.6 MIT License Yes JS library to detect user timezone
|
JsTimezoneDetect 1.0.6 MIT License Yes JS library to detect user timezone
|
||||||
|
|
||||||
For licenses compatibility informations:
|
For licenses compatibility informations:
|
||||||
|
|||||||
326
ChangeLog
326
ChangeLog
@ -12,10 +12,195 @@ Upgrading to any other version or any other database system is abolutely require
|
|||||||
make a Dolibarr upgrade.
|
make a Dolibarr upgrade.
|
||||||
|
|
||||||
|
|
||||||
***** ChangeLog for 4.0 compared to 3.9.* *****
|
|
||||||
|
***** ChangeLog for 5.0.0 compared to 4.0.* *****
|
||||||
For users:
|
For users:
|
||||||
|
...
|
||||||
|
|
||||||
|
WARNING:
|
||||||
|
|
||||||
|
Following changes may create regression for some external modules, but were necessary to make
|
||||||
|
Dolibarr better:
|
||||||
|
- Function delete of class Facture (invoice) need the object $user as first parameter. Also you must
|
||||||
|
check you make a fetch on object before calling the delete.
|
||||||
|
- The old driver of "mysql" has been removed. Dolibarr use the new one (mysqli) by default.
|
||||||
|
- Remove not used function calculate_byte(). Use dol_print_size() instead.
|
||||||
|
- Function pdf_getTotalQty is now deprecated. Not used by Dolibarr core.
|
||||||
|
- Method expensereport->delete(id, user) has been replaced with ->delete(user)
|
||||||
|
Method warehouse->delete(id) has been replace with ->delete(user)
|
||||||
|
This is to follow good practice to make a fetch on object before deleting it.
|
||||||
|
- The form to add a product to a draft proposal/order/invoice from the product card is hidden by default.
|
||||||
|
It was not commonly used and usage generates some problems (cost price for margin calculation not entered, vat setting).
|
||||||
|
Set constant PRODUCT_ADD_FORM_ADD_TO to retrieve it.
|
||||||
|
- The javascript "datatables" library was used to be provided into Dolibarr sources, but it was not used by application.
|
||||||
|
So there is no reason to maintain its compatibility with other dolibarr components. If an external module need this
|
||||||
|
library, this external module must embed hte library in his own sources/packages.
|
||||||
|
- Trigger name SUPPLIER_PROPOSAL_CREATE has been renamed into PROPOSAL_SUPPLIER_CREATE
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
***** ChangeLog for 4.0.1 compared to 4.0.0 *****
|
||||||
|
FIX: #2853
|
||||||
|
FIX: #2991
|
||||||
|
FIX: #3128
|
||||||
|
FIX: #5699
|
||||||
|
FIX: #5734
|
||||||
|
FIX: #5742 error on project list if an extra field separator is added.
|
||||||
|
FIX: #5746 chrome php Try a fix. Not sure it solved all problems reported
|
||||||
|
FIX: #5748 Bug: Error updating to 4.0.1 with Postgresql. Field must be varchar.
|
||||||
|
FIX: #5750 Bug: CmailFile::server_parse enters an infinite loop if $server_response is false
|
||||||
|
FIX: #5752 Bug VAT NPR not propagated during proposal cloning
|
||||||
|
FIX: #5763 Bug: Cannot Create Supplier Price Request
|
||||||
|
FIX: #5770 Dolibarr doesn't modify correctly the hour of a task
|
||||||
|
FIX: #5776
|
||||||
|
FIX: #5802 Incoterms not set
|
||||||
|
FIX: #5813 Bug: Incoterms not being read correctly
|
||||||
|
FIX: #5818
|
||||||
|
FIX: alignement of intervention status
|
||||||
|
FIX: Clean of search fields
|
||||||
|
FIX: Creation of donation should go back on card after creation
|
||||||
|
FIX: Date visible on project overview
|
||||||
|
FIX: Execute a dedicated job from its id may results of launching other jobs too.
|
||||||
|
FIX: Failed to export contact categories with contact extra fields
|
||||||
|
FIX: inversion customer/supplier price
|
||||||
|
FIX: link "back to list" was not visible.
|
||||||
|
FIX: Lost filter on opportunities
|
||||||
|
FIX: Mandatory field payment term was not css highlighted.
|
||||||
|
FIX: Menu users not visible on dolidroid.
|
||||||
|
FIX: SEC for HTB23302
|
||||||
|
FIX: The email test sender in email setup was broken
|
||||||
|
FIX: Translation of "Name" is not a good choice for floow-up.
|
||||||
|
FIX: Update of maxnbrun on job list failed.
|
||||||
|
FIX: Value of payment term and project are not set on correct default value when invoice generated from template.
|
||||||
|
FIX: vat dictionary should allow enter and edit multiple values for localtaxes, separated by: (ex -19:-15)
|
||||||
|
FIX: Vat not visible in dictionnary
|
||||||
|
|
||||||
|
***** ChangeLog for 4.0.0 compared to 3.9.* *****
|
||||||
|
For users:
|
||||||
|
NEW: Add recurring invoice feature and automatic generation of invoices.
|
||||||
|
NEW: Add module "Loan" as stable.
|
||||||
|
NEW: Add module "Supplier commercial proposal" (price request) with stable status.
|
||||||
|
NEW: Can select dynamicaly number of lines to show on page on product, shipment, contact, orders, thirdparties.
|
||||||
|
NEW: Can select fields to show on list also for list of customer orders, supplier orders, shipments, proposals and invoices.
|
||||||
|
NEW: Show into badge on tab head, the number of dedicated contacts for all objects.
|
||||||
|
NEW: Add a checkbox to select/unselect all lines on page that support mass actions (like invoice list page)
|
||||||
|
NEW: Add a new method for margin calculation. Added margin on "cost price" in addition to margin on WAP price and margin on "best supplier price".
|
||||||
|
NEW: Add an explanation message on shipment page to explain you can't make shipment if order is not validated
|
||||||
|
NEW: Add date_rum into table of thirdparty bank account.
|
||||||
|
NEW: The probability of lead/opportunity can be defined per lead.
|
||||||
|
NEW: Added Malta VAT into migration script
|
||||||
|
NEW: Add Expense report into accountancy report
|
||||||
|
NEW: Add Expense report to approve into workboard
|
||||||
|
NEW: Selection of boxes is moved on top of home page
|
||||||
|
NEW: Add filter on a keyword, status and nature into list of modules.
|
||||||
|
NEW: Add hidden option BANK_DISABLE_CHECK_DEPOSIT to disable check deposit feature.
|
||||||
|
NEW: Add hidden option MAIN_PUBLIC_NOTE_IN_ADDRESS
|
||||||
|
NEW: Add index on invoice status
|
||||||
|
NEW: Add constant MAIN_LOGTOHTML to 0 into setup by default to save time when we need to make debug on hosted instance.
|
||||||
|
NEW: Add list of billed
|
||||||
|
NEW: Add minimum stock and desired stock into import/export profiles.
|
||||||
|
NEW: Add state into thirdparty export fields.
|
||||||
|
NEW: Add more trackable events (create, submit and receive supplier order).
|
||||||
|
NEW: Add hidden option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN
|
||||||
|
NEW: Add picto on module list to show warning and if module is an external module.
|
||||||
|
NEW: Add product type filter on turnover report
|
||||||
|
NEW: Add state into list of fields available for personalized fields of thirdparties
|
||||||
|
NEW: Add statistics for interventions module
|
||||||
|
NEW: Add statistics on number of projets on home page
|
||||||
|
NEW: Add statistics and late records into dashboard for supplier proposals.
|
||||||
|
NEW: Add the admin info on combo of type of contact
|
||||||
|
NEW: Add the event BILL_PAYED to the list of supported events for module notification.
|
||||||
|
NEW: Add total weight and volume on PDF.
|
||||||
|
NEW: Add hidden option to hide column qty ordered on shipments.
|
||||||
|
NEW: Add view of virtual stock into product list (when appropriate).
|
||||||
|
NEW: Add warning on tasks when they are late (add also the warning tolerance parameter).
|
||||||
|
NEW: Add weight/volume for one product into shipment export.
|
||||||
|
NEW: Add width and height on product card
|
||||||
|
NEW: allow a document to be linked to project of another customer by config setup.
|
||||||
|
NEW: allow project to be shared across entities (for multicompany module).
|
||||||
|
NEW: All variant of ckeditor config can be tested into the setup page of module.
|
||||||
|
NEW: Can change dynamically number of records visible into lists.
|
||||||
|
NEW: Can change type of extrafields (for some combinations only).
|
||||||
|
NEW: Can define number of first and last line to import into import wizard.
|
||||||
|
NEW: Can edit next execution date of a cron job.
|
||||||
|
NEW: Can edit value date of a vat payment after recording it.
|
||||||
|
NEW: Can filter modules on publisher.
|
||||||
|
NEW: Can filter on employee status when building emailing from users.
|
||||||
|
NEW: Can reopen an closed shipment.
|
||||||
|
NEW: Can search on shipments into the quick search box.
|
||||||
|
NEW: Can select language from a combo list on page to overwrite a translation.
|
||||||
|
NEW: Can select number of lines on page list for projects and tasks.
|
||||||
|
NEW: Can use ^ and $ (to say start with or end with like regex syntax) into search fields when search field is text. Bonus: ^$ can filter all lines with field not defined.
|
||||||
|
NEW: Clean and enhance code for cron engine
|
||||||
|
NEW: Can decrease stock on shipment closing/classifying (only if module lot is not enabled for the moment)
|
||||||
|
NEW: Disabled users are striked.
|
||||||
|
NEW: Enhance navigation of project module
|
||||||
|
NEW: fichinter lines ordered by rang AND DATE
|
||||||
|
NEW: hidden conf to use input file multiple from mail form
|
||||||
|
NEW: hidden feature: SUPPLIERORDER_WITH_NOPRICEDEFINED allow supplier order even if no supplier price defined
|
||||||
|
NEW: Hidden option MAIN_LANDING_PAGE to choose the first page to show after login works as a "global" option (llx_const) and as a "per user" option (llx_user_param).
|
||||||
|
NEW: Holiday is a now a RH module. All RH module provides by default visilibity on users of its hierarchy.
|
||||||
|
NEW: If error is reported during migration process, you can ignore it to avoid to be locked.
|
||||||
|
NEW: if nb total of lines provided in print barre_liste, display in title
|
||||||
|
NEW: If option to see non stable modules is on, add a filter into module list to filter on level (deprecated, experimental, development)
|
||||||
|
NEW: Include number of linked files into badge counter of "Linked files" tab.
|
||||||
|
NEW: Include sales representative into export of thirdparties
|
||||||
|
NEW: Indicator on workboard are red/green if late or not.
|
||||||
|
NEW: Into GED module, filename is truncated only if there is not enough space into table
|
||||||
|
NEW: Introduce a predefined job to run database backup
|
||||||
|
NEW: Introduce option MAIN_WEIGHT_DEFAULT_UNIT and MAIN_VOLUME_DEFAULT_UNIT to force output unit for weight and volume.
|
||||||
|
NEW: Introduce position of records into dictionnary of type of contacts
|
||||||
|
NEW: Link on a user in leave page reach to leave tab of user.
|
||||||
|
NEW: List of user in agenda view per user show photo thumb.
|
||||||
|
NEW: Margins module - Check/update buying price on invoice lines
|
||||||
|
NEW: Merge all admin tools (system and module admin tools) into same entry "Admin tools", so now things are clear: All features restricted to an admin user is inside "setup" (for setup) or "admin tools" (for action tools) instead of 3 different entries.
|
||||||
|
NEW: Merge all boxes "related objects" into one. This save a lot of room on most card and avoid often horizontal scoll.
|
||||||
|
NEW: Moved code that deals with bank categories to BankCateg. Created BankCateg::fetchAll function
|
||||||
|
NEW: Move HRM dictionary from module to core dictionaries.
|
||||||
|
NEW: Mutualize code to manage email substitution variables. Show available variables into page to edit email templates.
|
||||||
|
NEW: Mutualize code: Use one call of function "addThumbs", when possible, to generate thumbs files instead of several call of "vignette" function.
|
||||||
|
NEW: On translation admin page, admin can overwrite a translation value.
|
||||||
|
NEW: Option MAIN_LIST_FILTER_ON_DAY is supported on proposal list.
|
||||||
|
NEW: Add reputation field for price supplier.
|
||||||
|
NEW: Selection of fields is available on member list.
|
||||||
|
NEW: Show a badge with number of withdraw requests done on the withdraw tab of invoice.
|
||||||
|
NEW: Add option to show detail per warehouse into reassort.
|
||||||
|
NEW: Show total number of modules into the module list.
|
||||||
|
NEW: Survey system has now a status like other objects. You can close or reopen a survey.
|
||||||
|
NEW: The note on time spent can be entered when using the "view per day".
|
||||||
|
NEW: Use ellipsis truncation on too large left menu text.
|
||||||
|
NEW: When a new field to show into lists is selected, the form is automatically submited and field added.
|
||||||
|
NEW: When creating a template invoice from a draft invoice, if there is link to contract on draft invoice, link is kept on template invoice.
|
||||||
|
NEW: When emailing is not sent completely, show progression.
|
||||||
|
NEW: Experimental module Accountancy Expert.
|
||||||
|
NEW: Experimental module Multicurency
|
||||||
|
|
||||||
For developers:
|
For developers:
|
||||||
|
NEW: Add entity field in llx_societe_remise_except and llx_societe_remise.
|
||||||
|
NEW: Rest API token is no more reset at each call. We can reset it with param reset=1 on login call.
|
||||||
|
NEW: Add html id/class to locate value in the DOM html
|
||||||
|
NEW: Add a css class style called 'reposition', so when clicking on a link with this class will move scrollbarr to be placed at same page location.
|
||||||
|
NEW: TimeZone can be supplied to mktime
|
||||||
|
NEW: hook in shipment card
|
||||||
|
NEW: Deprecated Societe::set_prospect_level, Societe::set_commnucation_level, Societe::set_OutstandingBill functions
|
||||||
|
NEW: A module can add, into its import profiles, a sql request to execute at end of import. This allow to update dernormalized data after import.
|
||||||
|
NEW: Add hook pdf_build_address
|
||||||
|
NEW: Add a parameter on graph function to show a generic graph when no data are available.
|
||||||
|
NEW: Add $object in parameter of pdf_build_address so we could include hook into the function.
|
||||||
|
NEW: Add a tool for developers to purge database with no loose of setup
|
||||||
|
NEW: Can disable a module by renaming dir of module into module.disabled (this save time for maintenance when working with FTP).
|
||||||
|
NEW: Created AccountLine::insert function and started using it for transaction creation
|
||||||
|
NEW: Created Account::__toString, Account::getFieldsToShow and Account::getAccountNumberOrder to refactor the way account number was shown
|
||||||
|
NEW: Created FormBank::getIBANLabel function to get the label of "IBAN" depending on bank account country
|
||||||
|
NEW: prepare for additional warehouse statuses
|
||||||
|
NEW: project sharing in select_projetcs_list function
|
||||||
|
NEW: Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead
|
||||||
|
NEW: Removed unused FormOrder::selectSourcesCommande function
|
||||||
|
NEW: Renamed ActionComm::add function to ActionComm::create
|
||||||
|
NEW: Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate
|
||||||
|
NEW: Rename path for generic media files
|
||||||
|
NEW: More phpunit tests. Include some REST API into automatic tests.
|
||||||
|
NEW: Move Expense report menu from module to menu files.
|
||||||
|
|
||||||
|
|
||||||
WARNING:
|
WARNING:
|
||||||
@ -35,6 +220,82 @@ So if you included it into your module, change your code like this to be compati
|
|||||||
if (! $res) include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php';
|
if (! $res) include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php';
|
||||||
|
|
||||||
|
|
||||||
|
***** ChangeLog for 3.9.3 compared to 3.9.2 *****
|
||||||
|
FIX: #4383 $userid not defined
|
||||||
|
FIX: #4448 $filebonprev is not used, $this->filename now
|
||||||
|
FIX: #4455
|
||||||
|
FIX: #4749
|
||||||
|
FIX: #4756
|
||||||
|
FIX: #4828
|
||||||
|
FIX: #4926
|
||||||
|
FIX: #4964 buyprice in customer from shipping buyprice wasn't load in expedition::fetch_lines
|
||||||
|
FIX: #5004
|
||||||
|
FIX: #5068
|
||||||
|
FIX: #5170 tva sign with INVOICE_POSITIVE_CREDIT_NOTE option
|
||||||
|
FIX: #5338 use of not initialized var $aphour, $apmin, etc
|
||||||
|
FIX: #5343
|
||||||
|
FIX: #5380
|
||||||
|
FIX: #5383 bad object id on don delete
|
||||||
|
FIX: #5414
|
||||||
|
FIX: #5470 User of expense report in bank transactions page is not correct
|
||||||
|
FIX: a case of corrupted ODT by Word that insert <text:s> when it should not.
|
||||||
|
FIX: Can't create thirdparty or validate invoice if profid is mandatory and profid does not exists for other countries
|
||||||
|
FIX: dasboard wrong for late invoice
|
||||||
|
FIX: duplicate jquery.js files
|
||||||
|
FIX: extrafield cloned on project clone
|
||||||
|
FIX: Failed to open file
|
||||||
|
FIX: Filter on opportunity amount and budget
|
||||||
|
FIX: form_confirm to delete payment on supplier invoice
|
||||||
|
FIX: javascript error with german-switzerland language
|
||||||
|
FIX: large expense note
|
||||||
|
FIX: Missing original .js file (license violation if sources are not provided)
|
||||||
|
FIX: Option strict mode compatibility
|
||||||
|
FIX: product stats all bloc module without enbaled test
|
||||||
|
FIX: receiving link never works
|
||||||
|
FIX: task ODT company object not correctly retrieved
|
||||||
|
FIX: Translate group perms as it is done into user perms
|
||||||
|
FIX: We must take the last recent defined price when using price level
|
||||||
|
|
||||||
|
***** ChangeLog for 3.9.2 compared to 3.9.1 *****
|
||||||
|
FIX: #4813 Won translation for the key OppStatusWON instead OppStatusWIN
|
||||||
|
FIX: #5008 SQL error when editing the reference of a supplier invoice that already exists
|
||||||
|
FIX: #5236 Cron module activated but "Modules tools" does not appear in the left menu.
|
||||||
|
FIX: Accountancy - 3.9 - Chart of accounts are limited on only one country
|
||||||
|
FIX: bug on email template
|
||||||
|
FIX: Can't create a stock transfer from product card
|
||||||
|
FIX: can't fetch by siret or siren because of first "if"
|
||||||
|
FIX: Check stock of product by warehouse if $entrepot_id defined on shippings
|
||||||
|
FIX: Compatible with multicompany
|
||||||
|
FIX: Creation of the second ressource type fails.
|
||||||
|
FIX: end of select when no fournprice
|
||||||
|
FIX: Filter on assigned to was preselected on current user on list "All events" (instead of no filtering)
|
||||||
|
FIX: Filter on category tag for suppliers
|
||||||
|
FIX: hook on group card called but not initialized
|
||||||
|
FIX: Infinite loop on menu tree output for edition
|
||||||
|
FIX: Can show tree of entries added by external modules using fk_mainmenu and fk_leftmenu instead of fk_menu.
|
||||||
|
FIX: init var at wrong place report incorrect "shippable" flag on draft order.
|
||||||
|
FIX: It doesn't check if there is enough stock to update the lines of orders/invoices
|
||||||
|
FIX: Menu statistics was not visible if module proposal was not enabled
|
||||||
|
FIX: Merge manually PR #5161 - Bad translation key
|
||||||
|
FIX: missing column when module was installed before standard integration
|
||||||
|
FIX: Missing number total of modules
|
||||||
|
FIX: Not filtering correctly when coming from dashboard
|
||||||
|
FIX: PROPAL_MERGE_PDF with PRODUCT_USE_OLD_PATH
|
||||||
|
FIX: Remove PHP Warning: Creating default object from empty value.
|
||||||
|
FIX: same page added several times on mergepropal option
|
||||||
|
FIX: search on date into supplier invoice list dont work because of status -1
|
||||||
|
FIX: Search supplier ref on contract
|
||||||
|
FIX: Split of credit note into discount page generates records not correctly recognised as credit note.
|
||||||
|
FIX: SQL error function on getAvailableDiscounts function, on bill create mode if socid is empty
|
||||||
|
FIX: #5087
|
||||||
|
FIX: #5108
|
||||||
|
FIX: #5163
|
||||||
|
FIX: #5195
|
||||||
|
FIX: #5203
|
||||||
|
FIX: #5207
|
||||||
|
FIX: #5209
|
||||||
|
FIX: #5230
|
||||||
|
|
||||||
***** ChangeLog for 3.9.1 compared to 3.9.* *****
|
***** ChangeLog for 3.9.1 compared to 3.9.* *****
|
||||||
FIX: #3815 Call to undefined function local_by_date()
|
FIX: #3815 Call to undefined function local_by_date()
|
||||||
FIX: #4424 Missing email of user popup in supplier orders area
|
FIX: #4424 Missing email of user popup in supplier orders area
|
||||||
@ -258,6 +519,67 @@ This is list of hooks modified:
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
***** ChangeLog for 3.8.5 compared to 3.8.4 *****
|
||||||
|
FIX: #3815 Call to undefined function local_by_date().
|
||||||
|
FIX: #4424 Missing email of user popup in supplier orders area
|
||||||
|
FIX: #4442 Missing translation in Banks menu
|
||||||
|
FIX: #4448 $filebonprev is not used, $this->filename now
|
||||||
|
FIX: #4455
|
||||||
|
FIX: #4737 Bank transacion type selector translation is cropped
|
||||||
|
FIX: #4742 Able to delete a supplier invoice with a registered payment
|
||||||
|
FIX: #4743 UI glitch in project summary page
|
||||||
|
FIX: #4747 Missing UI background when registering a supplier invoice payment
|
||||||
|
FIX: #4748 Supplier invoice payment confirmation amount is not translated
|
||||||
|
FIX: #4749
|
||||||
|
FIX: #4756
|
||||||
|
FIX: #4766 VAT not shown in supplier invoice popup
|
||||||
|
FIX: #4809 - Duplicate functions with different content
|
||||||
|
FIX: #4851 Project selector in supplier invoices shows the project label twice
|
||||||
|
FIX: #4870
|
||||||
|
FIX: #5008 SQL error when editing the reference of a supplier invoice that already exists
|
||||||
|
FIX: #5048 Product supplier list display only one produc
|
||||||
|
FIX: #5170 tva sign with INVOICE_POSITIVE_CREDIT_NOTE option
|
||||||
|
FIX: #5203
|
||||||
|
FIX: #5207
|
||||||
|
FIX: #5338 use of not initialized var $aphour, $apmin, etc
|
||||||
|
FIX: #5380
|
||||||
|
FIX: #5383 bad object id on don delete
|
||||||
|
FIX: #5474 Country_id of "Don" object is still empty
|
||||||
|
FIX: Accountancy - 3.8 - Chart of accounts are limited on only one country
|
||||||
|
FIX: Bad include and param for project numbering module call
|
||||||
|
FIX: Box disabled because bugged
|
||||||
|
FIX: bug on email template
|
||||||
|
FIX: Can correct stock of lot using eatby or sell by date
|
||||||
|
FIX: Can make a movement on "out of sell" products
|
||||||
|
FIX: Can't create thirdparty or validate invoice if profid is mandatory and profid does not exists for other countries
|
||||||
|
FIX: can't fetch by siret or siren because of first "if"
|
||||||
|
FIX: Check stock of product by warehouse if $entrepot_id defined on shippings
|
||||||
|
FIX: correct display of minimum buying price
|
||||||
|
FIX: Creation of thumb image for size "small" was not done.
|
||||||
|
FIX: Direction of movement lost if an error occurs
|
||||||
|
FIX: dont retrieve new buying price on margin display
|
||||||
|
FIX: Duplicate records into export
|
||||||
|
FIX: Email templates not compatible with Multicompany
|
||||||
|
FIX: end of select when no fournprice
|
||||||
|
FIX: finished parameters not used
|
||||||
|
FIX: hook on group card called but not initialized
|
||||||
|
FIX: It doesn't check if there is enough stock to update the lines of orders/invoices
|
||||||
|
FIX: large expense note
|
||||||
|
FIX: missing column when module was installed before standard integration
|
||||||
|
FIX: Missing database escaping on supplier price insert/update
|
||||||
|
FIX: Not filtering correctly when come from dashboard
|
||||||
|
FIX: PROPAL_MERGE_PDF with PRODUCT_USE_OLD_PATH
|
||||||
|
FIX: real min buying price
|
||||||
|
FIX: receiving link never works
|
||||||
|
FIX: same page added several times on mergepropal option
|
||||||
|
FIX: search on date into supplier invoice list dont work because of status -1
|
||||||
|
FIX: Search supplier ref on contract
|
||||||
|
FIX: SQL error function on getAvailableDiscounts function, on bill create mode if socid is empty
|
||||||
|
FIX: systematic rounding causes prices to be updated without reason
|
||||||
|
FIX: task ODT company object not correctly retrieved
|
||||||
|
FIX: Template email must take care of positino column
|
||||||
|
FIX: VAT rate can be negative. Example spain selling to morroco.
|
||||||
|
|
||||||
***** ChangeLog for 3.8.4 compared to 3.8.3 *****
|
***** ChangeLog for 3.8.4 compared to 3.8.3 *****
|
||||||
FIX: #3694
|
FIX: #3694
|
||||||
FIX: #3798 #2519 Cron jobs would never be executed
|
FIX: #3798 #2519 Cron jobs would never be executed
|
||||||
@ -670,7 +992,7 @@ NEW: add hook in send mail
|
|||||||
NEW: Add hooks on list of members to allow an external module to add more fields into list view.
|
NEW: Add hooks on list of members to allow an external module to add more fields into list view.
|
||||||
NEW: Add hooks to allow an external module to complete list of events into calendar views.
|
NEW: Add hooks to allow an external module to complete list of events into calendar views.
|
||||||
NEW: Add opportunity amount on project card.
|
NEW: Add opportunity amount on project card.
|
||||||
NEW: Add option THEME_ELDY_DISABLE_IMAGE to disable images into menu eldy.
|
NEW: Add option THEME_TOPMENU_DISABLE_IMAGE to disable images into menu eldy.
|
||||||
NEW: add PDF icon on linked element into project
|
NEW: add PDF icon on linked element into project
|
||||||
NEW: add "productpricecard" hook and uniformize code
|
NEW: add "productpricecard" hook and uniformize code
|
||||||
NEW: Add ref and label of project into export
|
NEW: Add ref and label of project into export
|
||||||
|
|||||||
11
Dockerfile
11
Dockerfile
@ -1,14 +1,19 @@
|
|||||||
FROM php:5.6-apache
|
FROM php:5.6-apache
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev \
|
RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libldap2-dev \
|
||||||
&& 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/ \
|
||||||
RUN docker-php-ext-install mysqli
|
&& docker-php-ext-install ldap \
|
||||||
|
&& docker-php-ext-install mysqli \
|
||||||
|
&& apt-get purge -y libpng12-dev libjpeg-dev libldap2-dev
|
||||||
|
|
||||||
COPY htdocs/ /var/www/html/
|
COPY htdocs/ /var/www/html/
|
||||||
|
|
||||||
RUN chown -hR www-data:www-data /var/www/html
|
RUN chown -hR www-data:www-data /var/www/html
|
||||||
|
|
||||||
|
VOLUME /var/www/html/conf
|
||||||
|
VOLUME /var/www/html/documents
|
||||||
|
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
377
PITCHME.md
Normal file
377
PITCHME.md
Normal file
@ -0,0 +1,377 @@
|
|||||||
|
#HSLIDE
|
||||||
|
|
||||||
|
## Dolibarr ERP CRM
|
||||||
|
##### <span style="font-family:Helvetica Neue; font-weight:bold">A <span style="color:#e49436">Git</span>Pitch Feature Tour</span>
|
||||||
|
|
||||||
|
#HSLIDE
|
||||||
|
## Slideshow Theme Switcher
|
||||||
|
<span style="font-size:0.6em; color:gray">Available bottom-left of screen.</span> |
|
||||||
|
<span style="font-size:0.6em; color:gray">Start switching themes right now!</span>
|
||||||
|
|
||||||
|
#HSLIDE
|
||||||
|
|
||||||
|
## Tip!
|
||||||
|
For best viewing experience press **F** key to go fullscreen.
|
||||||
|
|
||||||
|
#HSLIDE
|
||||||
|
|
||||||
|
## Markdown Slides
|
||||||
|
<span style="font-size:0.6em; color:gray">Press Down key for details.</span> |
|
||||||
|
<span style="font-size:0.6em; color:gray">See <a href="https://github.com/gitpitch/gitpitch/wiki/Slide-Markdown" target="_blank">GitPitch Wiki</a> for details.</span>
|
||||||
|
|
||||||
|
|
||||||
|
#VSLIDE
|
||||||
|
|
||||||
|
#### Use GitHub Flavored Markdown
|
||||||
|
#### For Slide Content Creation
|
||||||
|
|
||||||
|
<br>
|
||||||
|
|
||||||
|
The same tool you use to create project **READMEs** and **Wikis** for your Git repos.
|
||||||
|
|
||||||
|
#HSLIDE
|
||||||
|
|
||||||
|
## Code Slides
|
||||||
|
<span style="font-size:0.6em; color:gray">Press Down key for examples.</span> |
|
||||||
|
<span style="font-size:0.6em; color:gray">See <a href="https://github.com/gitpitch/gitpitch/wiki/Code-Slides" target="_blank">GitPitch Wiki</a> for details.</span>
|
||||||
|
|
||||||
|
#VSLIDE
|
||||||
|
|
||||||
|
#### Use Markdown Code Blocks
|
||||||
|
|
||||||
|
<br>
|
||||||
|
|
||||||
|
And enjoy code syntax highlighting for dozens of languages powered by <a target="_blank" href="highlight.js](https://highlightjs.org">highlight.js</a>.
|
||||||
|
|
||||||
|
#VSLIDE
|
||||||
|
|
||||||
|
```JavaScript
|
||||||
|
// JavaScript Code Block
|
||||||
|
|
||||||
|
$('button').click(function(){
|
||||||
|
$('h1, h2, p').addClass('blue')
|
||||||
|
$('div').removeClass('important')
|
||||||
|
$('h3').toggleClass('error')
|
||||||
|
$('#foo').attr('alt', 'Lorem Ipsum')
|
||||||
|
});
|
||||||
|
```
|
||||||
|
|
||||||
|
#VSLIDE
|
||||||
|
|
||||||
|
```Scala
|
||||||
|
// Scala Code Block
|
||||||
|
|
||||||
|
HashMap params = HashMap(n -> 10, mean -> 5)
|
||||||
|
|
||||||
|
// Define executable for R stats#rnorm function call.
|
||||||
|
OCPUTask task = OCPU.R()
|
||||||
|
.pkg("stats")
|
||||||
|
.function("rnorm")
|
||||||
|
.input(params.asJava)
|
||||||
|
.library()
|
||||||
|
```
|
||||||
|
|
||||||
|
#VSLIDE
|
||||||
|
|
||||||
|
```Go
|
||||||
|
// Go Code Block
|
||||||
|
|
||||||
|
package main
|
||||||
|
|
||||||
|
import "fmt"
|
||||||
|
|
||||||
|
func swap(x, y string) (string, string) {
|
||||||
|
return y, x
|
||||||
|
}
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
a, b := swap("hello", "world")
|
||||||
|
fmt.Println(a, b)
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
#HSLIDE
|
||||||
|
|
||||||
|
## GIST Slides
|
||||||
|
<span style="font-size:0.6em; color:gray">Press Down key for examples.</span> |
|
||||||
|
<span style="font-size:0.6em; color:gray">See <a href="https://github.com/gitpitch/gitpitch/wiki/GIST-Slides" target="_blank">GitPitch Wiki</a> for details.</span>
|
||||||
|
|
||||||
|
#VSLIDE
|
||||||
|
|
||||||
|
#### GitHub GIST
|
||||||
|
#### Building Blocks For Any Presentation
|
||||||
|
|
||||||
|
<br>
|
||||||
|
|
||||||
|
Enjoy 100% reusable code snippets, excellent syntax highlighting, code indentation and styling.
|
||||||
|
|
||||||
|
#VSLIDE?gist=8da53731fd54bab9d5c6
|
||||||
|
|
||||||
|
#VSLIDE?gist=28ee3d19ddef9d51b15adbdfe9ed48da
|
||||||
|
|
||||||
|
#HSLIDE
|
||||||
|
|
||||||
|
## Image Slides
|
||||||
|
## [ Inline ]
|
||||||
|
<span style="font-size:0.6em; color:gray">Press Down key for examples.</span> |
|
||||||
|
<span style="font-size:0.6em; color:gray">See <a href="https://github.com/gitpitch/gitpitch/wiki/Image-Slides" target="_blank">GitPitch Wiki</a> for details.</span>
|
||||||
|
|
||||||
|
#VSLIDE
|
||||||
|
|
||||||
|
#### Make A Visual Statement
|
||||||
|
|
||||||
|
<br>
|
||||||
|
|
||||||
|
Use inline images to lend a *visual punch* to your slideshow presentations.
|
||||||
|
|
||||||
|
|
||||||
|
#VSLIDE
|
||||||
|
|
||||||
|
<span style="color:gray; font-size:0.7em">Inline Image at <b>Absolute URL</b></span>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<span style="color:gray; font-size: 0.5em;">the <b>Private Investocat</b> by <a href="https://github.com/jeejkang" target="_blank">jeejkang</a></span>
|
||||||
|
|
||||||
|
|
||||||
|
#VSLIDE
|
||||||
|
|
||||||
|
<span style="color:gray; font-size:0.7em">Inline Image at GitHub Repo <b>Relative URL</b></span>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<span style="color:gray; font-size:0.5em">the <b>Octocat-De-Los-Muertos</b> by <a href="https://github.com/cameronmcefee" target="_blank">cameronmcefee</a></span>
|
||||||
|
|
||||||
|
|
||||||
|
#VSLIDE
|
||||||
|
|
||||||
|
<span style="color:gray; font-size:0.7em"><b>Animated GIFs</b> Work Too!</span>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<span style="color:gray; font-size:0.5em">the <b>Daftpunktocat-Guy</b> by <a href="https://github.com/jeejkang" target="_blank">jeejkang</a></span>
|
||||||
|
|
||||||
|
#HSLIDE
|
||||||
|
|
||||||
|
## Image Slides
|
||||||
|
## [ Background ]
|
||||||
|
<span style="font-size:0.6em; color:gray">Press Down key for examples.</span> |
|
||||||
|
<span style="font-size:0.6em; color:gray">See <a href="https://github.com/gitpitch/gitpitch/wiki/Image-Slides#background" target="_blank">GitPitch Wiki</a> for details.</span>
|
||||||
|
|
||||||
|
#VSLIDE
|
||||||
|
|
||||||
|
#### Make A Bold Visual Statement
|
||||||
|
|
||||||
|
<br>
|
||||||
|
|
||||||
|
Use high-resolution background images for maximum impact.
|
||||||
|
|
||||||
|
#VSLIDE?image=https://d1z75bzl1vljy2.cloudfront.net/kitchen-sink/victory.jpg
|
||||||
|
|
||||||
|
#VSLIDE?image=https://d1z75bzl1vljy2.cloudfront.net/kitchen-sink/127.jpg
|
||||||
|
|
||||||
|
|
||||||
|
#HSLIDE
|
||||||
|
|
||||||
|
## Video Slides
|
||||||
|
## [ Inline ]
|
||||||
|
<span style="font-size:0.6em; color:gray">Press Down key for examples.</span> |
|
||||||
|
<span style="font-size:0.6em; color:gray">See <a href="https://github.com/gitpitch/gitpitch/wiki/Video-Slides" target="_blank">GitPitch Wiki</a> for details.</span>
|
||||||
|
|
||||||
|
#VSLIDE
|
||||||
|
|
||||||
|
#### Bring Your Presentations Alive
|
||||||
|
|
||||||
|
<br>
|
||||||
|
|
||||||
|
Embed *YouTube*, *Vimeo*, *MP4* and *WebM* inline on any slide.
|
||||||
|
|
||||||
|
#VSLIDE
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#VSLIDE
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#VSLIDE
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#HSLIDE
|
||||||
|
|
||||||
|
## Video Slides
|
||||||
|
## [ Background ]
|
||||||
|
<span style="font-size:0.6em; color:gray">Press Down key for examples.</span> |
|
||||||
|
<span style="font-size:0.6em; color:gray">See <a href="https://github.com/gitpitch/gitpitch/wiki/Video-Slides#background" target="_blank">GitPitch Wiki</a> for details.</span>
|
||||||
|
|
||||||
|
#VSLIDE
|
||||||
|
|
||||||
|
#### Maximize The Viewer Experience
|
||||||
|
|
||||||
|
<br>
|
||||||
|
|
||||||
|
Go fullscreen with *MP4* and *WebM* videos.
|
||||||
|
|
||||||
|
#VSLIDE?video=http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4
|
||||||
|
|
||||||
|
#HSLIDE
|
||||||
|
|
||||||
|
## Math Notation Slides
|
||||||
|
<span style="font-size:0.6em; color:gray">Press Down key for examples.</span> |
|
||||||
|
<span style="font-size:0.6em; color:gray">See <a href="https://github.com/gitpitch/gitpitch/wiki/Math-Notation-Slides" target="_blank">GitPitch Wiki</a> for details.</span>
|
||||||
|
|
||||||
|
#VSLIDE
|
||||||
|
|
||||||
|
|
||||||
|
#### Beautiful Math Rendered Beautifully
|
||||||
|
|
||||||
|
<br>
|
||||||
|
|
||||||
|
Use *TeX*, *LaTeX* and *MathML* markup powered by <a target="_blank" href="https://www.mathjax.org/">MathJax</a>.
|
||||||
|
|
||||||
|
#VSLIDE
|
||||||
|
|
||||||
|
`$$\sum_{i=0}^n i^2 = \frac{(n^2+n)(2n+1)}{6}$$`
|
||||||
|
|
||||||
|
#VSLIDE
|
||||||
|
|
||||||
|
`\begin{align}
|
||||||
|
\dot{x} & = \sigma(y-x) \\
|
||||||
|
\dot{y} & = \rho x - y - xz \\
|
||||||
|
\dot{z} & = -\beta z + xy
|
||||||
|
\end{align}`
|
||||||
|
|
||||||
|
#VSLIDE
|
||||||
|
|
||||||
|
##### The Cauchy-Schwarz Inequality
|
||||||
|
|
||||||
|
`\[
|
||||||
|
\left( \sum_{k=1}^n a_k b_k \right)^{\!\!2} \leq
|
||||||
|
\left( \sum_{k=1}^n a_k^2 \right) \left( \sum_{k=1}^n b_k^2 \right)
|
||||||
|
\]`
|
||||||
|
|
||||||
|
#VSLIDE
|
||||||
|
|
||||||
|
##### The probability of getting \(k\) heads when flipping \(n\) coins is:
|
||||||
|
|
||||||
|
`\[P(E) = {n \choose k} p^k (1-p)^{ n-k} \]`
|
||||||
|
|
||||||
|
#VSLIDE
|
||||||
|
|
||||||
|
##### In-line Mathematics
|
||||||
|
|
||||||
|
This expression `\(\sqrt{3x-1}+(1+x)^2\)` is an example of an inline equation.
|
||||||
|
|
||||||
|
#HSLIDE
|
||||||
|
|
||||||
|
## Slide Fragments
|
||||||
|
<span style="font-size:0.6em; color:gray">Press Down key for examples.</span> |
|
||||||
|
<span style="font-size:0.6em; color:gray">See <a href="https://github.com/gitpitch/gitpitch/wiki/Fragment-Slides" target="_blank">GitPitch Wiki</a> for details.</span>
|
||||||
|
|
||||||
|
#VSLIDE
|
||||||
|
|
||||||
|
#### Reveal Slide Concepts Piecemeal
|
||||||
|
|
||||||
|
<br>
|
||||||
|
|
||||||
|
Step through slide content in sequence to slowly reveal the bigger picture.
|
||||||
|
|
||||||
|
#VSLIDE
|
||||||
|
|
||||||
|
- Java
|
||||||
|
- Groovy <!-- .element: class="fragment" -->
|
||||||
|
- Kotlin <!-- .element: class="fragment" -->
|
||||||
|
- Scala <!-- .element: class="fragment" -->
|
||||||
|
- The JVM rocks! <!-- .element: class="fragment" -->
|
||||||
|
|
||||||
|
#VSLIDE
|
||||||
|
|
||||||
|
<table>
|
||||||
|
<tr>
|
||||||
|
<th>Firstname</th>
|
||||||
|
<th>Lastname</th>
|
||||||
|
<th>Age</th>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>Jill</td>
|
||||||
|
<td>Smith</td>
|
||||||
|
<td>25</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="fragment">
|
||||||
|
<td>Eve</td>
|
||||||
|
<td>Jackson</td>
|
||||||
|
<td>94</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="fragment">
|
||||||
|
<td>John</td>
|
||||||
|
<td>Doe</td>
|
||||||
|
<td>43</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
#HSLIDE
|
||||||
|
## <span style="text-transform: none">PITCHME.yaml</span> Settings
|
||||||
|
<span style="font-size:0.6em; color:gray">Press Down key for examples.</span> |
|
||||||
|
<span style="font-size:0.6em; color:gray">See <a href="https://github.com/gitpitch/gitpitch/wiki/Slideshow-Settings" target="_blank">GitPitch Wiki</a> for details.</span>
|
||||||
|
|
||||||
|
#VSLIDE
|
||||||
|
|
||||||
|
#### Stamp Your Own Look and Feel
|
||||||
|
|
||||||
|
<br>
|
||||||
|
|
||||||
|
Set a default theme, custom logo, custom css, background image, and preferred code syntax highlighting style.
|
||||||
|
|
||||||
|
#VSLIDE
|
||||||
|
|
||||||
|
#### Customize Slideshow Behavior
|
||||||
|
|
||||||
|
<br>
|
||||||
|
|
||||||
|
Enable auto-slide with custom slide intervals, presentation looping, and RTL flow.
|
||||||
|
|
||||||
|
|
||||||
|
#HSLIDE
|
||||||
|
## Slideshow Keyboard Controls
|
||||||
|
<span style="font-size:0.6em; color:gray">Press Down key for examples.</span> |
|
||||||
|
<span style="font-size:0.6em; color:gray">See <a href="https://github.com/gitpitch/gitpitch/wiki/Slideshow-Fullscreen-Mode" target="_blank">GitPitch Wiki</a> for details.</span>
|
||||||
|
|
||||||
|
#VSLIDE
|
||||||
|
|
||||||
|
#### Try Out These Great Features Now!
|
||||||
|
|
||||||
|
<br>
|
||||||
|
|
||||||
|
| Mode | On Key | Off Key |
|
||||||
|
| ---- | :------: | :--------: |
|
||||||
|
| Fullscreen | F | Esc |
|
||||||
|
| Overview | O | O |
|
||||||
|
| Blackout | B | B |
|
||||||
|
| Help | ? | Esc |
|
||||||
|
|
||||||
|
|
||||||
|
#HSLIDE
|
||||||
|
|
||||||
|
## GitPitch Social
|
||||||
|
<span style="font-size:0.6em; color:gray">Press Down key for examples.</span> |
|
||||||
|
<span style="font-size:0.6em; color:gray">See <a href="https://github.com/gitpitch/gitpitch/wiki/Slideshow-GitHub-Badge" target="_blank">GitPitch Wiki</a> for details.</span>
|
||||||
|
|
||||||
|
#VSLIDE
|
||||||
|
|
||||||
|
#### Slideshows Designed For Sharing
|
||||||
|
|
||||||
|
<br>
|
||||||
|
|
||||||
|
- View any slideshow at its public URL
|
||||||
|
- [Promote](https://github.com/gitpitch/gitpitch/wiki/Slideshow-GitHub-Badge) any slideshow using a GitHub badge
|
||||||
|
- [Embed](https://github.com/gitpitch/gitpitch/wiki/Slideshow-Embedding) any slideshow within a blog or website
|
||||||
|
- [Share](https://github.com/gitpitch/gitpitch/wiki/Slideshow-Sharing) any slideshow on Twitter, LinkedIn, etc
|
||||||
|
- [Print](https://github.com/gitpitch/gitpitch/wiki/Slideshow-Printing) any slideshow as a PDF document
|
||||||
|
- [Download and present](https://github.com/gitpitch/gitpitch/wiki/Slideshow-Offline) any slideshow offline
|
||||||
|
|
||||||
|
#HSLIDE
|
||||||
|
|
||||||
|
## GO FOR IT.
|
||||||
|
## JUST ADD <span style="color:#e49436; text-transform: none">PITCHME.md</span> ;)
|
||||||
14
README-FR.md
14
README-FR.md
@ -3,7 +3,7 @@
|
|||||||
Dolibarr ERP & CRM est un logiciel moderne pour gérer votre activité (société, association, auto-entrepreneurs, artisans).
|
Dolibarr ERP & CRM est un logiciel moderne pour gérer votre activité (société, association, auto-entrepreneurs, artisans).
|
||||||
Il est simple d'utilisation et modulaire, vous permettant de n'activez que les fonctions dont vous avez besoin (contacts, fournisseurs, factures, commandes, stocks, agenda, ...).
|
Il est simple d'utilisation et modulaire, vous permettant de n'activez que les fonctions dont vous avez besoin (contacts, fournisseurs, factures, commandes, stocks, agenda, ...).
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -23,9 +23,9 @@ Ubuntu) ou DoliRpm (la version tout-en-un de Dolibarr pour Fedora, Redhat,
|
|||||||
OpenSuse, Mandriva ou Mageia).
|
OpenSuse, Mandriva ou Mageia).
|
||||||
|
|
||||||
Vous pouvez les télécharger depuis la rubrique *download* du portail officiel:
|
Vous pouvez les télécharger depuis la rubrique *download* du portail officiel:
|
||||||
http://www.dolibarr.org/
|
https://www.dolibarr.org/
|
||||||
|
|
||||||
Si vous avez déjà installé un serveur Web avec PHP et une base de donnée (Mysql),
|
Si vous avez déjà installé un serveur Web avec PHP et une base de donnée (MariaDb/MySql/PostgreSql),
|
||||||
vous pouvez installer Dolibarr avec cette version de la manière suivante:
|
vous pouvez installer Dolibarr avec cette version de la manière suivante:
|
||||||
|
|
||||||
- Copier le répertoire "dolibarr" et son contenu dans la racine de votre serveur
|
- Copier le répertoire "dolibarr" et son contenu dans la racine de votre serveur
|
||||||
@ -117,8 +117,8 @@ Voir fichier ChangeLog.
|
|||||||
- Application simple à utiliser.
|
- Application simple à utiliser.
|
||||||
- Plusieurs thèmes visuels.
|
- Plusieurs thèmes visuels.
|
||||||
- Code simple et facilement personnalisable.
|
- Code simple et facilement personnalisable.
|
||||||
- Requiert PHP et Mysql ou Postgresql (Voir versions exactes sur http://wiki.dolibarr.org/index.php/Prérequis).
|
- Requiert PHP et MariaDb, Mysql ou Postgresql (Voir versions exactes sur http://wiki.dolibarr.org/index.php/Prérequis).
|
||||||
- Compatible avec toutes les offres Cloud du marché respectant les prérequis MySQL et PHP ou Postgresql.
|
- Compatible avec toutes les offres Cloud du marché respectant les prérequis de base de données et PHP.
|
||||||
- Export PDF de tous les éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
|
- Export PDF de tous les éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
|
||||||
|
|
||||||
|
|
||||||
@ -139,13 +139,13 @@ 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>
|
- Google+: <https://plus.google.com/+DolibarrFrance>
|
||||||
- Twitter: <http://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)
|
- [Google+](https://plus.google.com/+DolibarrOrg)
|
||||||
- [Twitter](http://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)
|
||||||
|
|||||||
18
README.md
18
README.md
@ -2,15 +2,15 @@
|
|||||||
|
|
||||||
 
|
 
|
||||||
|
|
||||||
Dolibarr ERP & CRM is a modern software to manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda, ...).
|
Dolibarr ERP & CRM is a modern software package to manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda, ...).
|
||||||
|
|
||||||
It's an Open Source software (wrote in PHP language) designed for small and medium companies, foundation and freelances.
|
It's an Open Source software (wrote in PHP language) designed for small, medium or large companies, foundations and freelances.
|
||||||
|
|
||||||
You can freely use, study, modify or distribute it according to its Free Software licence.
|
You can freely use, study, modify or distribute it according to its Free Software licence.
|
||||||
|
|
||||||
You can use it as a standalone application or as a web application to be able to access it from the Internet or a LAN.
|
You can use it as a standalone application or as a web application to be able to access it from the Internet or a LAN.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## LICENSE
|
## LICENSE
|
||||||
|
|
||||||
@ -24,7 +24,7 @@ Other licenses apply for some included dependencies. See [COPYRIGHT](https://git
|
|||||||
|
|
||||||
### Download
|
### Download
|
||||||
|
|
||||||
Releases can be downloaded from [official website](http://www.dolibarr.org/).
|
Releases can be downloaded from [official website](https://www.dolibarr.org/).
|
||||||
|
|
||||||
### Simple setup
|
### Simple setup
|
||||||
|
|
||||||
@ -36,7 +36,7 @@ If you have low technical skills and you're looking to install Dolibarr ERP/CRM
|
|||||||
|
|
||||||
### Advanced setup
|
### Advanced setup
|
||||||
|
|
||||||
You can use a Web server and a supported database (MySQL recommended) to install the standard version.
|
You can use a Web server and a supported database (MariaDb, MySql or Postgresql) to install the standard version.
|
||||||
|
|
||||||
- Uncompress the downloaded archive
|
- Uncompress the downloaded archive
|
||||||
- Copy directory "dolibarr" and all its files inside your web server root, or copy directory anywhere and set up your web server to use "dolibarr/htdocs" as root for a new web server virtual host (second choice need to be server administrator)
|
- Copy directory "dolibarr" and all its files inside your web server root, or copy directory anywhere and set up your web server to use "dolibarr/htdocs" as root for a new web server virtual host (second choice need to be server administrator)
|
||||||
@ -119,7 +119,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
|
|||||||
- Can manage several currencies by adding external module multi-currency.
|
- Can manage several currencies by adding external module multi-currency.
|
||||||
- Very user friendly and easy to use
|
- Very user friendly and easy to use
|
||||||
- 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)
|
||||||
- Works with PHP 5.3+ and MySQL 4.1+ or PostgreSQL 8.1. (See requirements on the [Wiki](http://wiki.dolibarr.org/index.php/Prerequisite))
|
- Works with PHP 5.3+ and MariaDB 5.0.3+, MySQL 5.0.3+ or PostgreSQL 8.1.4+ (See requirements on the [Wiki](http://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.
|
||||||
- An easy to understand, maintain and code interfaces with your own information system (PHP with no heavy framework; trigger and hook architecture)
|
- An easy to understand, maintain and code interfaces with your own information system (PHP with no heavy framework; trigger and hook architecture)
|
||||||
- Support for country specific features:
|
- Support for country specific features:
|
||||||
@ -133,7 +133,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
|
|||||||
|
|
||||||
### Extending
|
### Extending
|
||||||
|
|
||||||
Dolibarr can be extended with a lot of other external modules from third party developers available at the [DoliStore](http://www.dolistore.com).
|
Dolibarr can be extended with a lot of other external modules from third party developers available at the [DoliStore](https://www.dolistore.com).
|
||||||
|
|
||||||
## FUTURE
|
## FUTURE
|
||||||
|
|
||||||
@ -151,7 +151,7 @@ Administrator, user, developer and translator's documentations are available alo
|
|||||||
|
|
||||||
## CONTRIBUTING
|
## CONTRIBUTING
|
||||||
|
|
||||||
See file [CONTRIBUTING](https://github.com/Dolibarr/dolibarr/blob/develop/CONTRIBUTING.md)
|
See file [CONTRIBUTING](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)
|
||||||
|
|
||||||
## CREDITS
|
## CREDITS
|
||||||
|
|
||||||
@ -165,7 +165,7 @@ Follow Dolibarr project on:
|
|||||||
|
|
||||||
- [Facebook](https://www.facebook.com/dolibarr)
|
- [Facebook](https://www.facebook.com/dolibarr)
|
||||||
- [Google+](https://plus.google.com/+DolibarrOrg)
|
- [Google+](https://plus.google.com/+DolibarrOrg)
|
||||||
- [Twitter](http://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)
|
||||||
|
|||||||
@ -1,78 +0,0 @@
|
|||||||
README (French)
|
|
||||||
################################
|
|
||||||
Building packages
|
|
||||||
################################
|
|
||||||
|
|
||||||
Les sous repertoires du repertoire "build" contiennent tous les fichiers
|
|
||||||
requis pour packager Dolibarr de maniere automatisee.
|
|
||||||
On trouve plusieurs outils:
|
|
||||||
|
|
||||||
- Pour construire un package Dolibarr complet, il suffit de
|
|
||||||
> Editer la version dans le fichier makepack-dolibarr.pl
|
|
||||||
> Lancer la commande perl makepack-dolibarr.pl
|
|
||||||
|
|
||||||
- Pour construire un package d'une traduction, il suffit de lancer le script
|
|
||||||
> perl makepack-dolibarrlang.pl
|
|
||||||
|
|
||||||
- Pour construire un package d'un theme, il suffit de lancer le script
|
|
||||||
> perl makepack-dolibarrtheme.pl
|
|
||||||
|
|
||||||
- Pour construire un package d'un module, il suffit de lancer le script
|
|
||||||
> perl makepack-dolibarrmodule.pl
|
|
||||||
|
|
||||||
- Pour construire un package DoliWamp autoexe:
|
|
||||||
> Installer InnoSetup (http://www.jrsoftware.org)
|
|
||||||
> Installer WampServer dans "C:\Program Files\Wamp" (http://www.wampserver.com)
|
|
||||||
> Installer les addon WampServer afin d'y mettre les versions:
|
|
||||||
Apache2.2.6, Mysql5.0.45, Php5.2.5
|
|
||||||
> Modifier dans le fichier build/exe/doliwamp.iss la variable SourceDir
|
|
||||||
afin d'y mettre le repository Dolibarr.
|
|
||||||
> Modifier AppVerName et OutputBaseFilename.
|
|
||||||
> Lancer innosetup, ouvrir le fichier build/exe/doliwamp.iss et cliquer sur
|
|
||||||
le bouton "Compile". Le fichier .exe sera fabrique dans le repertoire build.
|
|
||||||
|
|
||||||
- Pour generer la documentation developpeur, lancer le script
|
|
||||||
> perl dolybarr-doxygen-build.pl
|
|
||||||
|
|
||||||
|
|
||||||
Note:
|
|
||||||
|
|
||||||
Le repertoire build et tout ce qu'il contient n'est absolument pas requis
|
|
||||||
pour faire fonctionner Dolibarr. Ils ne servent qu'a la generation des
|
|
||||||
packages. Certains packages, une fois construit, n'incluent par le repertoire
|
|
||||||
"build".
|
|
||||||
|
|
||||||
On trouve dans le repertoire "build", les sous-repertoires utilises par
|
|
||||||
l'outil makepack-dolibarr.pl:
|
|
||||||
|
|
||||||
* deb:
|
|
||||||
Fichier de config pour construire un package Debian.
|
|
||||||
|
|
||||||
* rpm:
|
|
||||||
Fichier de config pour construire un package Redhat ou Mandrake.
|
|
||||||
|
|
||||||
* tgz:
|
|
||||||
Fichier de config pour construire un package tgz.
|
|
||||||
|
|
||||||
* exe:
|
|
||||||
Fichier de config pour construire un package exe pour Windows des sources
|
|
||||||
ou pour construire l'assistant d'installation complet DoliWamp.
|
|
||||||
|
|
||||||
* zip:
|
|
||||||
Fichier de config pour construire un package zip.
|
|
||||||
|
|
||||||
* live:
|
|
||||||
Fichier pour fabriquer un live CD de demo de Dolibarr.
|
|
||||||
|
|
||||||
* patch:
|
|
||||||
Fichier exemple de generation de fichier patch pour diffusion d'une
|
|
||||||
modification de Dolibarr.
|
|
||||||
|
|
||||||
* doap:
|
|
||||||
Fichier descriptif DOAP pour promouvoir/decrire la version de Dolibarr.
|
|
||||||
|
|
||||||
* pad:
|
|
||||||
Fichier descriptif PAD pour promouvoir/decrire la version de Dolibarr.
|
|
||||||
|
|
||||||
* dmg:
|
|
||||||
Fichier de config pour construire un package dmg DoliMamp pour Mac OS X
|
|
||||||
@ -288,11 +288,11 @@ from origin/upstream and origin/pristine.
|
|||||||
> debian/get-orig-source.sh
|
> debian/get-orig-source.sh
|
||||||
If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VERIFY_HOSTNAME=0" to solve this.
|
If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VERIFY_HOSTNAME=0" to solve this.
|
||||||
|
|
||||||
* Edit tgz file to remove
|
* Edit orig.tar.gz file to remove
|
||||||
|
- debian
|
||||||
- htdocs/includes/ckeditor
|
- htdocs/includes/ckeditor
|
||||||
- htdocs/includes/jquery/plugins/datatables/extras/TableTools/swf
|
- htdocs/includes/phpexcel or htdocs/includes/phpoffice
|
||||||
- htdocs/includes/phpexcel
|
- htdocs/includes/tcpdf or htdocs/includes/tecnickom
|
||||||
- htdocs/includes/tcpdf
|
|
||||||
And rename file into
|
And rename file into
|
||||||
dolibarr-x.y.z+dfsgw.tgz
|
dolibarr-x.y.z+dfsgw.tgz
|
||||||
(x.y.z = version, w start from 1 and is increased for each new git-import-orig already done)
|
(x.y.z = version, w start from 1 and is increased for each new git-import-orig already done)
|
||||||
|
|||||||
@ -6,3 +6,16 @@ Require all denied
|
|||||||
Order deny, allow
|
Order deny, allow
|
||||||
Denied from all
|
Denied from all
|
||||||
</IfVersion>
|
</IfVersion>
|
||||||
|
|
||||||
|
|
||||||
|
# OPTIMIZE: To use cache on static pages (A259200 = 1 month, A7200 = 2 hours, A691600 = 8 days = recommanded for static resources).
|
||||||
|
# Note that you must also enable the module mod_expires.
|
||||||
|
#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
|
||||||
|
|||||||
@ -100,9 +100,8 @@ $dolibarr_main_db_pass='';
|
|||||||
# This parameter contains the name of the driver used to access your
|
# This parameter contains the name of the driver used to access your
|
||||||
# Dolibarr database.
|
# Dolibarr database.
|
||||||
# Default value: none
|
# Default value: none
|
||||||
# Possible values: mysql, mysqli, pgsql
|
# Possible values: mysqli, pgsql
|
||||||
# Examples:
|
# Examples:
|
||||||
# $dolibarr_main_db_type='mysql';
|
|
||||||
# $dolibarr_main_db_type='mysqli';
|
# $dolibarr_main_db_type='mysqli';
|
||||||
# $dolibarr_main_db_type='pgsql';
|
# $dolibarr_main_db_type='pgsql';
|
||||||
#
|
#
|
||||||
|
|||||||
@ -13,7 +13,7 @@ Architecture: all
|
|||||||
Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,
|
Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,
|
||||||
php5-cli,
|
php5-cli,
|
||||||
# Required PHP extensions
|
# Required PHP extensions
|
||||||
php5-mysql | php5-mysqli, php5-curl, php5-gd, php5-ldap, php5-geoip,
|
php5-mysql | php5-mysqli, php5-curl, php5-gd, php5-ldap,
|
||||||
# Required PHP libraries
|
# Required PHP libraries
|
||||||
php-pear, php-mail-mime,
|
php-pear, php-mail-mime,
|
||||||
# php-tcpdf, libfpdi-php,
|
# php-tcpdf, libfpdi-php,
|
||||||
@ -26,15 +26,15 @@ Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm |
|
|||||||
# Misc dependencies
|
# Misc dependencies
|
||||||
# fonts-dejavu-core | ttf-dejavu-core,
|
# fonts-dejavu-core | ttf-dejavu-core,
|
||||||
xdg-utils,
|
xdg-utils,
|
||||||
mysql-server,
|
virtual-mysql-client,
|
||||||
mysql-client,
|
|
||||||
${misc:Depends},
|
${misc:Depends},
|
||||||
${perl:Depends}
|
${perl:Depends}
|
||||||
Recommends: apache2 | lighttpd | httpd
|
Recommends: apache2 | lighttpd | httpd,
|
||||||
Suggests: www-browser
|
virtual-mysql-server
|
||||||
|
Suggests: www-browser, php5-geoip
|
||||||
Description: Web based software to manage a company or foundation
|
Description: Web based software to manage a company or foundation
|
||||||
Dolibarr ERP & CRM is an easy to use open source/free software for small
|
Dolibarr ERP & CRM is an easy to use open source/free software package for
|
||||||
and medium companies, foundations or freelances. It includes different
|
companies, foundations or freelances. It includes different
|
||||||
features for Enterprise Resource Planning (ERP) and Customer Relationship
|
features for Enterprise Resource Planning (ERP) and Customer Relationship
|
||||||
Management (CRM) but also for different other activities.
|
Management (CRM) but also for different other activities.
|
||||||
.
|
.
|
||||||
|
|||||||
@ -1,2 +1 @@
|
|||||||
README.md
|
README.md
|
||||||
README-FR.md
|
|
||||||
|
|||||||
@ -1,3 +1,5 @@
|
|||||||
# Remove warning, we want to keep both standard and minified sources.
|
# Remove warning, we want to keep both standard and minified sources.
|
||||||
dolibarr: source-contains-prebuilt-javascript-object htdocs/includes/jsgantt/*
|
dolibarr: source-contains-prebuilt-javascript-object htdocs/includes/jsgantt/*
|
||||||
dolibarr: source-contains-prebuilt-javascript-object htdocs/includes/jquery/*
|
dolibarr: source-contains-prebuilt-javascript-object htdocs/includes/jquery/*
|
||||||
|
# This is a textual data file
|
||||||
|
source-is-missing htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.json
|
||||||
@ -2,4 +2,4 @@
|
|||||||
version=3
|
version=3
|
||||||
|
|
||||||
#http://sf.net/dolibarr/dolibarr-(.+)\.tgz
|
#http://sf.net/dolibarr/dolibarr-(.+)\.tgz
|
||||||
http://www.dolibarr.org/files/stable/standard/dolibarr-(.+)\.tgz
|
http://www.dolibarr.org/files/stable/package_debian-ubuntu/dolibarr_(.+)\.orig\.tar\.gz
|
||||||
|
|||||||
@ -4,17 +4,14 @@ File added into doxygen generated documentation
|
|||||||
|
|
||||||
|
|
||||||
<!-- Google analytics -->
|
<!-- Google analytics -->
|
||||||
<script type="text/javascript">
|
<script>
|
||||||
|
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
|
||||||
|
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
|
||||||
|
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
|
||||||
|
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
|
||||||
|
|
||||||
var _gaq = _gaq || [];
|
ga('create', 'UA-9049390-16', 'auto');
|
||||||
_gaq.push(['_setAccount', 'UA-9049390-1']);
|
ga('send', 'pageview');
|
||||||
_gaq.push(['_trackPageview']);
|
|
||||||
|
|
||||||
(function() {
|
|
||||||
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
|
|
||||||
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
|
|
||||||
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
|
|
||||||
})();
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
<!-- End google analytics -->
|
<!-- End google analytics -->
|
||||||
@ -22,7 +19,7 @@ File added into doxygen generated documentation
|
|||||||
|
|
||||||
<hr class="footer" />
|
<hr class="footer" />
|
||||||
<address class="footer"><small>Generated on $datetime
|
<address class="footer"><small>Generated on $datetime
|
||||||
for <a href="http://www.dolibarr.org">$projectname</a> by Doxygen $doxygenversion </small></address>
|
for <a href="https://www.dolibarr.org">$projectname</a> by Doxygen $doxygenversion </small></address>
|
||||||
|
|
||||||
|
|
||||||
<!-- Google AdSense -->
|
<!-- Google AdSense -->
|
||||||
@ -35,11 +32,20 @@ google_ad_width = 468;
|
|||||||
google_ad_height = 60;
|
google_ad_height = 60;
|
||||||
//-->
|
//-->
|
||||||
</script>
|
</script>
|
||||||
<script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"></script>
|
<script type="text/javascript" src="https://pagead2.googlesyndication.com/pagead/show_ads.js"></script>
|
||||||
</div>
|
</div>
|
||||||
<!-- End google adsense -->
|
<!-- End google adsense -->
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Twitter ad collector -->
|
||||||
|
<script src="//platform.twitter.com/oct.js" type="text/javascript"></script>
|
||||||
|
<script type="text/javascript">twttr.conversion.trackPid('ntm4n', { tw_sale_amount: 0, tw_order_quantity: 0 });</script>
|
||||||
|
<noscript>
|
||||||
|
<img height="1" width="1" style="display:none;" alt="" src="https://analytics.twitter.com/i/adsct?txn_id=ntm4n&p_id=Twitter&tw_sale_amount=0&tw_order_quantity=0" />
|
||||||
|
<img height="1" width="1" style="display:none;" alt="" src="//t.co/i/adsct?txn_id=ntm4n&p_id=Twitter&tw_sale_amount=0&tw_order_quantity=0" />
|
||||||
|
</noscript>
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
@ -1,6 +1,4 @@
|
|||||||
<!--
|
<!-- File added into doxygen generated documentation -->
|
||||||
File added into doxygen generated documentation
|
|
||||||
-->
|
|
||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||||
<head>
|
<head>
|
||||||
@ -14,7 +12,23 @@ File added into doxygen generated documentation
|
|||||||
<link href="tabs.css" rel="stylesheet" type="text/css" />
|
<link href="tabs.css" rel="stylesheet" type="text/css" />
|
||||||
<link href="doxygen.css" rel="stylesheet" type="text/css" />
|
<link href="doxygen.css" rel="stylesheet" type="text/css" />
|
||||||
<!-- End from dolibarr.org -->
|
<!-- End from dolibarr.org -->
|
||||||
|
|
||||||
|
<!-- Facebook Pixel Code -->
|
||||||
|
<script>
|
||||||
|
!function(f,b,e,v,n,t,s){if(f.fbq)return;n=f.fbq=function(){n.callMethod?
|
||||||
|
n.callMethod.apply(n,arguments):n.queue.push(arguments)};if(!f._fbq)f._fbq=n;
|
||||||
|
n.push=n;n.loaded=!0;n.version='2.0';n.queue=[];t=b.createElement(e);t.async=!0;
|
||||||
|
t.src=v;s=b.getElementsByTagName(e)[0];s.parentNode.insertBefore(t,s)}(window,
|
||||||
|
document,'script','//connect.facebook.net/en_US/fbevents.js');
|
||||||
|
|
||||||
|
fbq('init', '1998533953704960');
|
||||||
|
fbq('track', "PageView");</script>
|
||||||
|
<noscript><img height="1" width="1" style="display:none"
|
||||||
|
src="https://www.facebook.com/tr?id=1998533953704960&ev=PageView&noscript=1"
|
||||||
|
/></noscript>
|
||||||
|
<!-- End Facebook Pixel Code -->
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<div id="top">
|
<div id="top">
|
||||||
|
|
||||||
|
|||||||
@ -20,7 +20,7 @@ DoYouWantToStart=Vol iniciar el proc
|
|||||||
TechnicalParameters=Paràmetres tècnics
|
TechnicalParameters=Paràmetres tècnics
|
||||||
IfFirstInstall=Si es tracta de la primera instal lació, haurà d'especificar alguns paràmetres tècnics. Si no els entén, no sabeu o va a procedir a una actualització, deixi els camps amb els valors proposats per defecte.
|
IfFirstInstall=Si es tracta de la primera instal lació, haurà d'especificar alguns paràmetres tècnics. Si no els entén, no sabeu o va a procedir a una actualització, deixi els camps amb els valors proposats per defecte.
|
||||||
|
|
||||||
; WARNING !!! STRINGS HERE MUST BE LOWER THAN 60 CHARACTERS
|
; WARNING !!! STRINGS HERE MUST BE LOWER THAN 70 CHARACTERS
|
||||||
SMTPServer=Servidor SMTP (El seu o el del seu ISP, únicament primera instal.lació) :
|
SMTPServer=Servidor SMTP (El seu o el del seu ISP, únicament primera instal.lació) :
|
||||||
ApachePort=Puerto Apache (únicament primera instal.lació, normalment és el 80) :
|
ApachePort=Puerto Apache (únicament primera instal.lació, normalment és el 80) :
|
||||||
MySqlPort=Puerto Mysql (únicament primera instal.lació, normalment és el 3306) :
|
MySqlPort=Puerto Mysql (únicament primera instal.lació, normalment és el 3306) :
|
||||||
@ -31,6 +31,7 @@ FailedToDeleteLock=FailedToDeleteLock=Error en l'eliminaci
|
|||||||
PortAlreadyInUse=Sembla que el port %1 ja està sent utilitzat. Es recomana cancel·lar, tornar enrere i especificar un altre valor per al port% 2. Cancel·lar i escollir un altre valor?
|
PortAlreadyInUse=Sembla que el port %1 ja està sent utilitzat. Es recomana cancel·lar, tornar enrere i especificar un altre valor per al port% 2. Cancel·lar i escollir un altre valor?
|
||||||
|
|
||||||
FirefoxDetected=S'ha detectat Firefox al seu ordinador. Voleu activar per defecte com a navegador per Dolibarr?
|
FirefoxDetected=S'ha detectat Firefox al seu ordinador. Voleu activar per defecte com a navegador per Dolibarr?
|
||||||
|
ChromeDetected=S'ha detectat Chrome al seu ordinador. Voleu activar per defecte com a navegador per Dolibarr?
|
||||||
ChooseDefaultBrowser=Esculli el seu navegador per defecte. Si no està segur, simplement feu clic a Obrir:
|
ChooseDefaultBrowser=Esculli el seu navegador per defecte. Si no està segur, simplement feu clic a Obrir:
|
||||||
|
|
||||||
LaunchNow=Llançar ara Dolibarr
|
LaunchNow=Llançar ara Dolibarr
|
||||||
|
|||||||
@ -31,6 +31,7 @@ FailedToDeleteLock=Failed to delete the file %1/www/dolibarr/install.lock. You c
|
|||||||
PortAlreadyInUse=Port %1 seems to be already in use. You should cancel to go back and choose another value for %2 port. Cancel choice and choose another value ?
|
PortAlreadyInUse=Port %1 seems to be already in use. You should cancel to go back and choose another value for %2 port. Cancel choice and choose another value ?
|
||||||
|
|
||||||
FirefoxDetected=Firefox has been detected on your computer. Would you like to use it as the default browser for Dolibarr ?
|
FirefoxDetected=Firefox has been detected on your computer. Would you like to use it as the default browser for Dolibarr ?
|
||||||
|
ChromeDetected=Chrome has been detected on your computer. Would you like to use it as the default browser for Dolibarr ?
|
||||||
ChooseDefaultBrowser=Please choose your default browser. If you are not sure, just click Open :
|
ChooseDefaultBrowser=Please choose your default browser. If you are not sure, just click Open :
|
||||||
|
|
||||||
LaunchNow=Launch Dolibarr now
|
LaunchNow=Launch Dolibarr now
|
||||||
|
|||||||
@ -21,10 +21,10 @@ TechnicalParameters=Param
|
|||||||
IfFirstInstall=S'il s'agit de la première installation, merci de spécifier ces quelques paramètres techniques. Si vous ne les comprennez pas, êtes non sûr, ou procédez à une mise à jour, laissez les champs avec les valeurs proposées par défaut.
|
IfFirstInstall=S'il s'agit de la première installation, merci de spécifier ces quelques paramètres techniques. Si vous ne les comprennez pas, êtes non sûr, ou procédez à une mise à jour, laissez les champs avec les valeurs proposées par défaut.
|
||||||
|
|
||||||
|
|
||||||
; WARNING !!! STRINGS FOR THIS 4 STRINGS MUST BE LOWER THAN 60 CHARACTERS
|
; WARNING !!! STRINGS FOR THIS 4 STRINGS MUST BE LOWER THAN 70 CHARACTERS
|
||||||
SMTPServer=Serveur SMTP (le votre ou celui de votre FAI, première installation uniquement) :
|
SMTPServer=Serveur SMTP (le votre ou de votre FAI, première installation uniquement):
|
||||||
ApachePort=Port Apache (première installation uniquement, le choix standard est 80) :
|
ApachePort=Port Apache (première installation uniquement, le choix standard est 80):
|
||||||
MySqlPort=Port Mysql (première installation uniquement, le choix standard est 3306) :
|
MySqlPort=Port Mysql (première installation uniquement, le choix standard est 3306):
|
||||||
MySqlPassword=Mot de passe serveur+base MySql de root (première installation uniquement):
|
MySqlPassword=Mot de passe serveur+base MySql de root (première installation uniquement):
|
||||||
|
|
||||||
FailedToDeleteLock=Echec de la suppression du fichier %1/www/dolibarr/install.lock. Vous pouvez ignorer l'avertissement mais il est possible que vous deviez le supprimer manuellement plus tard. Dans ce cas, cela vous sera signalé. Cliquez sur OK pour continuer...
|
FailedToDeleteLock=Echec de la suppression du fichier %1/www/dolibarr/install.lock. Vous pouvez ignorer l'avertissement mais il est possible que vous deviez le supprimer manuellement plus tard. Dans ce cas, cela vous sera signalé. Cliquez sur OK pour continuer...
|
||||||
@ -32,6 +32,7 @@ FailedToDeleteLock=Echec de la suppression du fichier %1/www/dolibarr/install.lo
|
|||||||
PortAlreadyInUse=Le port %1 semble déjà utilisé. Il est recommandé d'annuler pour revenir en arrière et spécifier une autre valeur pour le port %2. Annuler le choix et choisir une autre valeur ?
|
PortAlreadyInUse=Le port %1 semble déjà utilisé. Il est recommandé d'annuler pour revenir en arrière et spécifier une autre valeur pour le port %2. Annuler le choix et choisir une autre valeur ?
|
||||||
|
|
||||||
FirefoxDetected=Firefox a été détecté sur votre ordinateur. Voulez-vous en faire votre navigateur par défaut pour Dolibarr ?
|
FirefoxDetected=Firefox a été détecté sur votre ordinateur. Voulez-vous en faire votre navigateur par défaut pour Dolibarr ?
|
||||||
|
ChromeDetected=Chrome a été détecté sur votre ordinateur. Voulez-vous en faire votre navigateur par défaut pour Dolibarr ?
|
||||||
ChooseDefaultBrowser=Merci de choisir votre navigateur par défaut. Si vous n'êtes pas sûr, cliquez simplement sur Ouvrir :
|
ChooseDefaultBrowser=Merci de choisir votre navigateur par défaut. Si vous n'êtes pas sûr, cliquez simplement sur Ouvrir :
|
||||||
|
|
||||||
LaunchNow=Lancer Dolibarr maintenant
|
LaunchNow=Lancer Dolibarr maintenant
|
||||||
|
|||||||
@ -20,7 +20,7 @@ DoYouWantToStart=
|
|||||||
TechnicalParameters=Parámetros técnicos
|
TechnicalParameters=Parámetros técnicos
|
||||||
IfFirstInstall=Si se trata de la primera instalación, deberá especificar algunos parámetros técnicos. Si no los entiende, no está seguro o va a proceder a una actualización, deje los campos con los valores propuestos por defecto.
|
IfFirstInstall=Si se trata de la primera instalación, deberá especificar algunos parámetros técnicos. Si no los entiende, no está seguro o va a proceder a una actualización, deje los campos con los valores propuestos por defecto.
|
||||||
|
|
||||||
; WARNING !!! STRINGS HERE MUST BE LOWER THAN 60 CHARACTERS
|
; WARNING !!! STRINGS HERE MUST BE LOWER THAN 70 CHARACTERS
|
||||||
SMTPServer=Servidor SMTP (El suyo o el de su ISP, únicamente primera instalación) :
|
SMTPServer=Servidor SMTP (El suyo o el de su ISP, únicamente primera instalación) :
|
||||||
ApachePort=Puerto Apache (únicamente primera instalación, normalmente es el 80) :
|
ApachePort=Puerto Apache (únicamente primera instalación, normalmente es el 80) :
|
||||||
MySqlPort=Puerto Mysql (únicamente primera instalación, normalmente es el 3306) :
|
MySqlPort=Puerto Mysql (únicamente primera instalación, normalmente es el 3306) :
|
||||||
@ -31,6 +31,7 @@ FailedToDeleteLock=Error en la eliminaci
|
|||||||
PortAlreadyInUse=Parece que el puerto %1 ya esta siendo usado. Se recomienda cancelar, volver atras y especificar otro valor para el puerto %2. ¿Cancelar y escojer otro valor?
|
PortAlreadyInUse=Parece que el puerto %1 ya esta siendo usado. Se recomienda cancelar, volver atras y especificar otro valor para el puerto %2. ¿Cancelar y escojer otro valor?
|
||||||
|
|
||||||
FirefoxDetected=Se ha detectado Firefox en su ordenador. Desea activarlo por defecto como navegador para Dolibarr ?
|
FirefoxDetected=Se ha detectado Firefox en su ordenador. Desea activarlo por defecto como navegador para Dolibarr ?
|
||||||
|
ChromeDetected=Se ha detectado Chrome en su ordenador. Desea activarlo por defecto como navegador para Dolibarr ?
|
||||||
ChooseDefaultBrowser=Escoja su navegador por defecto. Si no está seguro, simplementa haga clic en Abrir :
|
ChooseDefaultBrowser=Escoja su navegador por defecto. Si no está seguro, simplementa haga clic en Abrir :
|
||||||
|
|
||||||
LaunchNow=Lanzar ahora Dolibarr
|
LaunchNow=Lanzar ahora Dolibarr
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
Alias /dolibarr "WAMPROOT/www/dolibarr/htdocs/"
|
Alias /dolibarr "WAMPROOT/www/dolibarr/htdocs/"
|
||||||
|
|
||||||
# NOTE:
|
# NOTE FOR APACHE 2.2:
|
||||||
# To restrict access to dolibarr from outside set lines
|
# To restrict access to dolibarr from outside set lines
|
||||||
#
|
#
|
||||||
# Order Deny,Allow
|
# Order Deny,Allow
|
||||||
@ -12,10 +12,18 @@ Alias /dolibarr "WAMPROOT/www/dolibarr/htdocs/"
|
|||||||
# Order Allow,Deny
|
# Order Allow,Deny
|
||||||
# Allow from all
|
# Allow from all
|
||||||
#
|
#
|
||||||
|
# NOTE FOR APACHE 2.3:
|
||||||
|
# To restrict access to dolibarr from outside set lines
|
||||||
|
#
|
||||||
|
# Require local
|
||||||
|
#
|
||||||
|
# instead of
|
||||||
|
#
|
||||||
|
# Require all granted
|
||||||
|
#
|
||||||
|
|
||||||
<Directory "WAMPROOT/www/dolibarr/htdocs/">
|
<Directory "WAMPROOT/www/dolibarr/htdocs/">
|
||||||
Options Indexes FollowSymLinks MultiViews
|
Options Indexes FollowSymLinks MultiViews
|
||||||
AllowOverride all
|
AllowOverride all
|
||||||
Order Allow,Deny
|
Require all granted
|
||||||
Allow from all
|
|
||||||
</Directory>
|
</Directory>
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 51 KiB After Width: | Height: | Size: 51 KiB |
@ -42,6 +42,7 @@ SolidCompression=yes
|
|||||||
WizardImageFile=build\exe\doliwamp\doliwamp.bmp
|
WizardImageFile=build\exe\doliwamp\doliwamp.bmp
|
||||||
WizardSmallImageFile=build\exe\doliwamp\doliwampsmall.bmp
|
WizardSmallImageFile=build\exe\doliwamp\doliwampsmall.bmp
|
||||||
SetupIconFile=doc\images\dolibarr.ico
|
SetupIconFile=doc\images\dolibarr.ico
|
||||||
|
;To say the installer must be ran as admin
|
||||||
PrivilegesRequired=admin
|
PrivilegesRequired=admin
|
||||||
DisableProgramGroupPage=yes
|
DisableProgramGroupPage=yes
|
||||||
ChangesEnvironment=no
|
ChangesEnvironment=no
|
||||||
@ -99,17 +100,18 @@ Source: "build\exe\doliwamp\builddemosslfiles.bat.install"; DestDir: "{app}\"; F
|
|||||||
Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversion;
|
Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversion;
|
||||||
; PhpMyAdmin, Apache, Php, Mysql
|
; PhpMyAdmin, 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 or 5.1.36
|
; 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.2.11, php 5.3.0 (if no php_exif, php_pgsql, php_zip), mysql 5.0.45 or 5.1.36
|
; Value OK: apache 2.2.11, php 5.3.0 (if no php_exif, php_pgsql, php_zip), mysql 5.0.45
|
||||||
|
; Value ???: apache 2.4.19, 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:\Program Files\Wamp\apps\phpmyadmin4.1.14\*.*"; DestDir: "{app}\apps\phpmyadmin4.1.14"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log,darkblue_orange"
|
Source: "C:\Program Files\Wamp\apps\phpmyadmin4.1.14\*.*"; DestDir: "{app}\apps\phpmyadmin4.1.14"; 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:\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:\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:\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:\Program Files\Wamp\bin\mysql\mysql5.6.17\*.*"; DestDir: "{app}\bin\mysql\mysql5.6.17"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
|
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"
|
||||||
; Mysql data files (does not overwrite if exists)
|
; Mysql data files (does not overwrite if exists)
|
||||||
Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db"
|
Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db"
|
||||||
; Dolibarr
|
; Dolibarr
|
||||||
Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,custom\*,custom2\*,documents\*,includes\ckeditor\_source\*,includes\savant\*,includes\phpmailer\*,jquery\plugins\template\*,nltechno*\*,PHPExcel\Shared\PDF\*,PHPExcel\Shared\PCLZip\*,tcpdf\fonts\dejavu-fonts-ttf-2.33\*,tcpdf\fonts\freefont-20100919\*,tcpdf\fonts\utils\*,*\conf.php,*\conf.php.mysql,*\conf.php.old,*\conf.php.postgres,*\conf.php.sav,*\install.forced.php"
|
Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,custom\*,custom2\*,documents\*,includes\ckeditor\_source\*,includes\savant\*,includes\phpmailer\*,jquery\plugins\template\*,nltechno*\*,PHPExcel\Shared\PDF\*,PHPExcel\Shared\PCLZip\*,tcpdf\fonts\dejavu-fonts-ttf-2.33\*,tcpdf\fonts\freefont-20100919\*,tcpdf\fonts\utils\*,*\conf.php,*\conf.php.mysql,*\conf.php.old,*\conf.php.postgres,*\conf.php.sav,*\install.forced.php"
|
||||||
Source: "dev\*.*"; DestDir: "{app}\www\dolibarr\dev"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,dbmodel\*,fpdf\*,initdata\*,iso-normes\*,licence\*,phpcheckstyle\*,phpunit\*,samples\*,test\*,uml\*,vagrant\*,xdebug\*"
|
Source: "dev\*.*"; DestDir: "{app}\www\dolibarr\dev"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,dbmodel\*,fpdf\*,initdata\*,initdemo\*,iso-normes\*,licence\*,phpcheckstyle\*,phpunit\*,samples\*,test\*,uml\*,vagrant\*,xdebug\*"
|
||||||
Source: "doc\*.*"; DestDir: "{app}\www\dolibarr\doc"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,wiki\*,plaquette\*,dev\*,images\dolibarr_screenshot2.png,images\dolibarr_screenshot3.png,images\dolibarr_screenshot4.png,images\dolibarr_screenshot5.png,images\dolibarr_screenshot6.png,images\dolibarr_screenshot7.png,images\dolibarr_screenshot8.png,images\dolibarr_screenshot9.png,images\dolibarr_screenshot10.png,images\dolibarr_screenshot11.png,images\dolibarr_screenshot12.png"
|
Source: "doc\*.*"; DestDir: "{app}\www\dolibarr\doc"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,wiki\*,plaquette\*,dev\*,images\dolibarr_screenshot2.png,images\dolibarr_screenshot3.png,images\dolibarr_screenshot4.png,images\dolibarr_screenshot5.png,images\dolibarr_screenshot6.png,images\dolibarr_screenshot7.png,images\dolibarr_screenshot8.png,images\dolibarr_screenshot9.png,images\dolibarr_screenshot10.png,images\dolibarr_screenshot11.png,images\dolibarr_screenshot12.png"
|
||||||
Source: "scripts\*.*"; DestDir: "{app}\www\dolibarr\scripts"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,product\materiel.net.php,product\import-product.php"
|
Source: "scripts\*.*"; DestDir: "{app}\www\dolibarr\scripts"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,product\materiel.net.php,product\import-product.php"
|
||||||
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"
|
||||||
@ -118,8 +120,8 @@ Source: "build\exe\doliwamp\phpmyadmin.conf.install"; DestDir: "{app}\alias"; Fl
|
|||||||
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\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.9\conf"; Flags: ignoreversion;
|
Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.4.9\conf"; Flags: ignoreversion;
|
||||||
Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mysql\mysql5.5.12"; Flags: ignoreversion;
|
Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion;
|
||||||
Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php5.6.17"; Flags: ignoreversion;
|
Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php5.5.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;
|
||||||
@ -145,6 +147,16 @@ Name: "{userdesktop}\Dolibarr Help center"; Filename: "{app}\rundolihelp.bat"; W
|
|||||||
;Name: "{userstartup}\DoliWamp server"; Filename: "{app}\startdoliwamp.bat"; WorkingDir: "{app}"; Flags: runminimized; IconFilename: {app}\www\dolibarr\doc\images\dolibarr.ico
|
;Name: "{userstartup}\DoliWamp server"; Filename: "{app}\startdoliwamp.bat"; WorkingDir: "{app}"; Flags: runminimized; IconFilename: {app}\www\dolibarr\doc\images\dolibarr.ico
|
||||||
|
|
||||||
|
|
||||||
|
[Registry]
|
||||||
|
; Add "run as admin" flag. Same than command line: reg add "HKCU\Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers" /v "<Path to your exe>" /t REG_SZ /d RUNASADMIN
|
||||||
|
Root: "HKLM"; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"; ValueType: string; ValueName: "{app}\startdoliwamp.bat"; ValueData: "RUNASADMIN";
|
||||||
|
Root: "HKLM"; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"; ValueType: string; ValueName: "{app}\stopdoliwamp.bat"; ValueData: "RUNASADMIN";
|
||||||
|
Root: "HKLM32"; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"; ValueType: string; ValueName: "{app}\startdoliwamp.bat"; ValueData: "RUNASADMIN";
|
||||||
|
Root: "HKLM32"; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"; ValueType: string; ValueName: "{app}\stopdoliwamp.bat"; ValueData: "RUNASADMIN";
|
||||||
|
Root: "HKLM64"; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"; ValueType: string; ValueName: "{app}\startdoliwamp.bat"; ValueData: "RUNASADMIN"; Check: IsWin64
|
||||||
|
Root: "HKLM64"; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"; ValueType: string; ValueName: "{app}\stopdoliwamp.bat"; ValueData: "RUNASADMIN"; Check: IsWin64
|
||||||
|
|
||||||
|
|
||||||
[Code]
|
[Code]
|
||||||
|
|
||||||
//variables globales
|
//variables globales
|
||||||
@ -197,7 +209,7 @@ 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.9';
|
||||||
phpVersion := '5.5.12' ;
|
phpVersion := '5.5.12' ;
|
||||||
mysqlVersion := '5.6.17';
|
mysqlVersion := '5.0.45';
|
||||||
phpmyadminVersion := '4.1.14';
|
phpmyadminVersion := '4.1.14';
|
||||||
|
|
||||||
smtpServer := 'localhost';
|
smtpServer := 'localhost';
|
||||||
@ -232,9 +244,9 @@ begin
|
|||||||
if RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\MSCRM','SMTPServer', value) then
|
if RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\MSCRM','SMTPServer', value) then
|
||||||
begin
|
begin
|
||||||
if value <> '' then smtpServer:=value;
|
if value <> '' then smtpServer:=value;
|
||||||
end
|
end;
|
||||||
end
|
end;
|
||||||
end
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
if RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\NLTechno\DoliWamp','apachePort', value) then
|
if RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\NLTechno\DoliWamp','apachePort', value) then
|
||||||
@ -255,14 +267,13 @@ begin
|
|||||||
|
|
||||||
// Prepare an object calle "Page" of type wpInstalling.
|
// Prepare an object calle "Page" of type wpInstalling.
|
||||||
// Object will be show later in NextButtonClick function.
|
// Object will be show later in NextButtonClick function.
|
||||||
Page := CreateInputQueryPage(wpInstalling,
|
Page := CreateInputQueryPage(wpInstalling, CustomMessage('TechnicalParameters'), '', CustomMessage('IfFirstInstall'));
|
||||||
CustomMessage('TechnicalParameters'), '',
|
|
||||||
CustomMessage('IfFirstInstall'));
|
|
||||||
|
|
||||||
// TODO Add control differently if first install or update
|
// TODO Add control differently if first install or update
|
||||||
if firstinstall
|
if firstinstall
|
||||||
then
|
then
|
||||||
begin
|
begin
|
||||||
|
// False means it's not a password edit
|
||||||
Page.Add(CustomMessage('SMTPServer'), False);
|
Page.Add(CustomMessage('SMTPServer'), False);
|
||||||
Page.Add(CustomMessage('ApachePort'), False);
|
Page.Add(CustomMessage('ApachePort'), False);
|
||||||
Page.Add(CustomMessage('MySqlPort'), False);
|
Page.Add(CustomMessage('MySqlPort'), False);
|
||||||
@ -270,6 +281,7 @@ begin
|
|||||||
end
|
end
|
||||||
else
|
else
|
||||||
begin
|
begin
|
||||||
|
// False means it's not a password edit
|
||||||
Page.Add(CustomMessage('SMTPServer'), False);
|
Page.Add(CustomMessage('SMTPServer'), False);
|
||||||
Page.Add(CustomMessage('ApachePort'), False);
|
Page.Add(CustomMessage('ApachePort'), False);
|
||||||
Page.Add(CustomMessage('MySqlPort'), False);
|
Page.Add(CustomMessage('MySqlPort'), False);
|
||||||
@ -309,8 +321,7 @@ function NextButtonClick(CurPageID: Integer): Boolean;
|
|||||||
var myResult: Integer;
|
var myResult: Integer;
|
||||||
var res: Boolean;
|
var res: Boolean;
|
||||||
var paramok: Boolean;
|
var paramok: Boolean;
|
||||||
var datadirold: String;
|
var datadir: String;
|
||||||
var datadirnew: String;
|
|
||||||
var exedirold: String;
|
var exedirold: String;
|
||||||
var exedirnew: String;
|
var exedirnew: String;
|
||||||
var themessage: String;
|
var themessage: String;
|
||||||
@ -329,10 +340,22 @@ begin
|
|||||||
winPath := ExpandConstant('{win}');
|
winPath := ExpandConstant('{win}');
|
||||||
pathWithSlashes := path;
|
pathWithSlashes := path;
|
||||||
StringChange (pathWithSlashes, '\','/');
|
StringChange (pathWithSlashes, '\','/');
|
||||||
datadirold := pathWithSlashes+'/bin/mysql/mysql5.6.17/data';
|
datadir := pathWithSlashes+'/bin/mysql/data';
|
||||||
datadirnew := pathWithSlashes+'/bin/mysql/data';
|
exedirold := pathWithSlashes+'/bin/mysql/mysql5.0.45';
|
||||||
exedirold := pathWithSlashes+'/bin/mysql/mysql5.6.17';
|
exedirnew := pathWithSlashes+'/bin/mysql/mysql5.0.45';
|
||||||
exedirnew := pathWithSlashes+'/bin/mysql/mysql5.6.17';
|
|
||||||
|
|
||||||
|
//----------------------------------------------
|
||||||
|
// Test if msvcr110 DLL has been installed
|
||||||
|
//----------------------------------------------
|
||||||
|
|
||||||
|
if not FileExists ('c:/windows/system32/msvcr110.dll') and not FileExists ('c:/windows/sysWOW64/msvcr110.dll') and not FileExists ('c:/winnt/system32/msvcr110.dll') and not FileExists ('c:/winnt/sysWOW64/msvcr110.dll') then
|
||||||
|
begin
|
||||||
|
// TODO Copy file or ask to install package ?
|
||||||
|
//CustomMessage('YouWillInstallDoliWamp')+#13#13
|
||||||
|
MsgBox('The package vcredist_x86.exe must have been installed first. It seems it is not. Please install it first from <a href="http://ccc">http://www.microsoft.com/en-us/download/details.aspx?id=30679</a> then restart DoliWamp installation/upgrade.',mbInformation,MB_OK);
|
||||||
|
end;
|
||||||
|
|
||||||
|
|
||||||
// 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.
|
||||||
@ -401,7 +424,7 @@ begin
|
|||||||
begin
|
begin
|
||||||
themessage := FmtMessage(CustomMessage('FailedToDeleteLock'),[pathWithSlashes]);
|
themessage := FmtMessage(CustomMessage('FailedToDeleteLock'),[pathWithSlashes]);
|
||||||
MsgBox(themessage,mbInformation,MB_OK);
|
MsgBox(themessage,mbInformation,MB_OK);
|
||||||
end
|
end;
|
||||||
|
|
||||||
|
|
||||||
// Check if parameters already defined in conf.php file
|
// Check if parameters already defined in conf.php file
|
||||||
@ -522,13 +545,29 @@ begin
|
|||||||
begin
|
begin
|
||||||
//navigateur
|
//navigateur
|
||||||
browser := 'iexplore.exe';
|
browser := 'iexplore.exe';
|
||||||
if FileExists (pfPath+'/Mozilla Firefox/firefox.exe') then
|
|
||||||
|
if browser = 'iexplore.exe' then
|
||||||
begin
|
begin
|
||||||
if MsgBox(CustomMessage('FirefoxDetected'),mbConfirmation,MB_YESNO) = IDYES then
|
if FileExists (pfPath+'/Google/Chrome/Application/chrome.exe') then
|
||||||
begin
|
begin
|
||||||
browser := pfPath+'/Mozilla Firefox/firefox.exe';
|
if MsgBox(CustomMessage('ChromeDetected'),mbConfirmation,MB_YESNO) = IDYES then
|
||||||
|
begin
|
||||||
|
browser := pfPath+'/Google/Chrome/Application/chrome.exe';
|
||||||
|
end;
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
if browser = 'iexplore.exe' then
|
||||||
|
begin
|
||||||
|
if FileExists (pfPath+'/Mozilla Firefox/firefox.exe') then
|
||||||
|
begin
|
||||||
|
if MsgBox(CustomMessage('FirefoxDetected'),mbConfirmation,MB_YESNO) = IDYES then
|
||||||
|
begin
|
||||||
|
browser := pfPath+'/Mozilla Firefox/firefox.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
|
||||||
@ -558,7 +597,7 @@ begin
|
|||||||
StringChangeEx (srcContents, 'WAMPAPACHEPORT', myporta, True);
|
StringChangeEx (srcContents, 'WAMPAPACHEPORT', myporta, True);
|
||||||
StringChangeEx (srcContents, 'WAMPAPACHEPSSL', myportas, True);
|
StringChangeEx (srcContents, 'WAMPAPACHEPSSL', myportas, True);
|
||||||
SaveStringToFile(destFileA,srcContents, False);
|
SaveStringToFile(destFileA,srcContents, False);
|
||||||
end
|
end;
|
||||||
|
|
||||||
|
|
||||||
if MsgBox(CustomMessage('DoliWampWillStartApacheMysql'),mbConfirmation,MB_YESNO) = IDYES then
|
if MsgBox(CustomMessage('DoliWampWillStartApacheMysql'),mbConfirmation,MB_YESNO) = IDYES then
|
||||||
@ -581,7 +620,7 @@ begin
|
|||||||
StringChangeEx (srcContents, 'WAMPPHPMYADMINVERSION', phpmyadminVersion, True);
|
StringChangeEx (srcContents, 'WAMPPHPMYADMINVERSION', phpmyadminVersion, True);
|
||||||
|
|
||||||
SaveStringToFile(destFile,srcContents, False);
|
SaveStringToFile(destFile,srcContents, False);
|
||||||
end
|
end;
|
||||||
DeleteFile(srcFile);
|
DeleteFile(srcFile);
|
||||||
|
|
||||||
|
|
||||||
@ -593,15 +632,29 @@ begin
|
|||||||
destFile := pathWithSlashes+'/alias/dolibarr.conf';
|
destFile := pathWithSlashes+'/alias/dolibarr.conf';
|
||||||
srcFile := pathWithSlashes+'/alias/dolibarr.conf.install';
|
srcFile := pathWithSlashes+'/alias/dolibarr.conf.install';
|
||||||
|
|
||||||
if not FileExists (destFile) and FileExists(srcFile) then
|
if FileExists(srcFile) then
|
||||||
begin
|
begin
|
||||||
LoadStringFromFile (srcFile, srcContents);
|
if not FileExists (destFile) then
|
||||||
|
begin
|
||||||
|
LoadStringFromFile (srcFile, srcContents);
|
||||||
|
|
||||||
StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
|
StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
|
||||||
StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
|
StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
|
||||||
|
|
||||||
SaveStringToFile(destFile, srcContents, False);
|
SaveStringToFile(destFile, srcContents, False);
|
||||||
end
|
end
|
||||||
|
else
|
||||||
|
begin
|
||||||
|
// We must replace to use format 2.4 of apache
|
||||||
|
DeleteFile(destFile);
|
||||||
|
LoadStringFromFile (srcFile, srcContents);
|
||||||
|
|
||||||
|
StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
|
||||||
|
StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
|
||||||
|
|
||||||
|
SaveStringToFile(destFile, srcContents, False);
|
||||||
|
end;
|
||||||
|
end;
|
||||||
DeleteFile(srcFile);
|
DeleteFile(srcFile);
|
||||||
|
|
||||||
|
|
||||||
@ -614,14 +667,25 @@ begin
|
|||||||
destFile := pathWithSlashes+'/apps/phpmyadmin'+phpmyadminVersion+'/config.inc.php';
|
destFile := pathWithSlashes+'/apps/phpmyadmin'+phpmyadminVersion+'/config.inc.php';
|
||||||
srcFile := pathWithSlashes+'/apps/phpmyadmin'+phpmyadminVersion+'/config.inc.php.install';
|
srcFile := pathWithSlashes+'/apps/phpmyadmin'+phpmyadminVersion+'/config.inc.php.install';
|
||||||
|
|
||||||
if not FileExists (destFile) and FileExists (srcFile) then
|
if FileExists(srcFile) then
|
||||||
begin
|
begin
|
||||||
// sinon on prends le fichier par defaut
|
if not FileExists (destFile) then
|
||||||
LoadStringFromFile (srcFile, srcContents);
|
begin
|
||||||
StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
|
LoadStringFromFile (srcFile, srcContents);
|
||||||
StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
|
StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
|
||||||
SaveStringToFile(destFile,srcContents, False);
|
StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
|
||||||
end
|
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;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -644,7 +708,7 @@ begin
|
|||||||
StringChangeEx (srcContents, 'WAMPAPACHEPSSL', myportas, True);
|
StringChangeEx (srcContents, 'WAMPAPACHEPSSL', myportas, True);
|
||||||
|
|
||||||
SaveStringToFile(destFile,srcContents, False);
|
SaveStringToFile(destFile,srcContents, False);
|
||||||
end
|
end;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -663,10 +727,10 @@ begin
|
|||||||
//installDir et version de php
|
//installDir et version de php
|
||||||
StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
|
StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
|
||||||
StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
|
StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
|
||||||
StringChangeEx (srcContents, 'WAMPMYSQLVERSION', myport, True);
|
StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True);
|
||||||
|
|
||||||
SaveStringToFile(destFile,srcContents, False);
|
SaveStringToFile(destFile,srcContents, False);
|
||||||
end
|
end;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -698,7 +762,7 @@ begin
|
|||||||
StringChangeEx (srcContents, 'WAMPAPACHEPORT', myporta, True);
|
StringChangeEx (srcContents, 'WAMPAPACHEPORT', myporta, True);
|
||||||
StringChangeEx (srcContents, 'WAMPAPACHEPSSL', myportas, True);
|
StringChangeEx (srcContents, 'WAMPAPACHEPSSL', myportas, True);
|
||||||
SaveStringToFile(destFile, srcContents, False);
|
SaveStringToFile(destFile, srcContents, False);
|
||||||
end
|
end;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -721,7 +785,7 @@ begin
|
|||||||
StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
|
StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
|
||||||
|
|
||||||
SaveStringToFile(destFile,srcContents, False);
|
SaveStringToFile(destFile,srcContents, False);
|
||||||
end
|
end;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -737,32 +801,12 @@ begin
|
|||||||
LoadStringFromFile (srcFile, srcContents);
|
LoadStringFromFile (srcFile, srcContents);
|
||||||
|
|
||||||
//version de apache et mysql
|
//version de apache et mysql
|
||||||
|
StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
|
||||||
StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True);
|
StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True);
|
||||||
StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
|
StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
|
||||||
|
|
||||||
SaveStringToFile(destFile,srcContents, False);
|
SaveStringToFile(destFile,srcContents, False);
|
||||||
end
|
end;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//----------------------------------------------
|
|
||||||
// Create file install_services_auto.bat (always)
|
|
||||||
//----------------------------------------------
|
|
||||||
|
|
||||||
destFile := pathWithSlashes+'/install_services_auto.bat';
|
|
||||||
srcFile := pathWithSlashes+'/install_services_auto.bat.install';
|
|
||||||
|
|
||||||
if FileExists (srcFile) then
|
|
||||||
begin
|
|
||||||
LoadStringFromFile (srcFile, srcContents);
|
|
||||||
|
|
||||||
//version de apache et mysql
|
|
||||||
StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True);
|
|
||||||
StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
|
|
||||||
|
|
||||||
SaveStringToFile(destFile,srcContents, False);
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -778,11 +822,12 @@ begin
|
|||||||
LoadStringFromFile (srcFile, srcContents);
|
LoadStringFromFile (srcFile, srcContents);
|
||||||
|
|
||||||
//version de apache et mysql
|
//version de apache et mysql
|
||||||
|
StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
|
||||||
StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True);
|
StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True);
|
||||||
StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
|
StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
|
||||||
|
|
||||||
SaveStringToFile(destFile,srcContents, False);
|
SaveStringToFile(destFile,srcContents, False);
|
||||||
end
|
end;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -803,7 +848,7 @@ begin
|
|||||||
StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
|
StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
|
||||||
|
|
||||||
SaveStringToFile(destFile,srcContents, False);
|
SaveStringToFile(destFile,srcContents, False);
|
||||||
end
|
end;
|
||||||
|
|
||||||
|
|
||||||
//----------------------------------------------
|
//----------------------------------------------
|
||||||
@ -824,7 +869,7 @@ begin
|
|||||||
StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
|
StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
|
||||||
|
|
||||||
SaveStringToFile(destFile,srcContents, False);
|
SaveStringToFile(destFile,srcContents, False);
|
||||||
end
|
end;
|
||||||
|
|
||||||
|
|
||||||
//----------------------------------------------
|
//----------------------------------------------
|
||||||
@ -845,7 +890,7 @@ begin
|
|||||||
StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
|
StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
|
||||||
|
|
||||||
SaveStringToFile(destFile,srcContents, False);
|
SaveStringToFile(destFile,srcContents, False);
|
||||||
end
|
end;
|
||||||
|
|
||||||
|
|
||||||
//----------------------------------------------
|
//----------------------------------------------
|
||||||
@ -864,7 +909,7 @@ begin
|
|||||||
StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
|
StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
|
||||||
|
|
||||||
SaveStringToFile(destFile,srcContents, False);
|
SaveStringToFile(destFile,srcContents, False);
|
||||||
end
|
end;
|
||||||
|
|
||||||
|
|
||||||
//----------------------------------------------
|
//----------------------------------------------
|
||||||
@ -881,7 +926,7 @@ begin
|
|||||||
StringChangeEx (srcContents, 'WAMPSMTP', mysmtp, True);
|
StringChangeEx (srcContents, 'WAMPSMTP', mysmtp, True);
|
||||||
StringChangeEx (srcContents, 'WAMPPHPVERSION', phpVersion, True);
|
StringChangeEx (srcContents, 'WAMPPHPVERSION', phpVersion, True);
|
||||||
SaveStringToFile(destFile,srcContents, False);
|
SaveStringToFile(destFile,srcContents, False);
|
||||||
end
|
end;
|
||||||
|
|
||||||
//----------------------------------------------
|
//----------------------------------------------
|
||||||
// Create file php.ini in apache (if not exists)
|
// Create file php.ini in apache (if not exists)
|
||||||
@ -897,7 +942,7 @@ begin
|
|||||||
StringChangeEx (srcContents, 'WAMPSMTP', mysmtp, True);
|
StringChangeEx (srcContents, 'WAMPSMTP', mysmtp, True);
|
||||||
StringChangeEx (srcContents, 'WAMPPHPVERSION', phpVersion, True);
|
StringChangeEx (srcContents, 'WAMPPHPVERSION', phpVersion, True);
|
||||||
SaveStringToFile(destFile,srcContents, False);
|
SaveStringToFile(destFile,srcContents, False);
|
||||||
end
|
end;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -939,7 +984,7 @@ begin
|
|||||||
|
|
||||||
res := False;
|
res := False;
|
||||||
|
|
||||||
end
|
end;
|
||||||
|
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
@ -949,9 +994,9 @@ begin
|
|||||||
|
|
||||||
res := False;
|
res := False;
|
||||||
|
|
||||||
end
|
end;
|
||||||
|
|
||||||
end
|
end;
|
||||||
|
|
||||||
|
|
||||||
Result := res;
|
Result := res;
|
||||||
@ -966,7 +1011,6 @@ end;
|
|||||||
procedure DeinitializeSetup();
|
procedure DeinitializeSetup();
|
||||||
begin
|
begin
|
||||||
// DeleteFile(path+'\install_services.bat');
|
// DeleteFile(path+'\install_services.bat');
|
||||||
// DeleteFile(path+'\install_services_auto.bat');
|
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
||||||
@ -1003,7 +1047,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\mysql\mysql5.6.17\*.*"
|
Type: files; Name: "{app}\bin\mysql\mysql5.0.45\*.*"
|
||||||
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"
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 3.2 KiB |
@ -66,19 +66,23 @@ Listen WAMPAPACHEPORT
|
|||||||
#
|
#
|
||||||
LoadModule actions_module modules/mod_actions.so
|
LoadModule actions_module modules/mod_actions.so
|
||||||
LoadModule alias_module modules/mod_alias.so
|
LoadModule alias_module modules/mod_alias.so
|
||||||
|
LoadModule allowmethods_module modules/mod_allowmethods.so
|
||||||
LoadModule asis_module modules/mod_asis.so
|
LoadModule asis_module modules/mod_asis.so
|
||||||
LoadModule auth_basic_module modules/mod_auth_basic.so
|
LoadModule auth_basic_module modules/mod_auth_basic.so
|
||||||
#LoadModule auth_digest_module modules/mod_auth_digest.so
|
#LoadModule auth_digest_module modules/mod_auth_digest.so
|
||||||
#LoadModule authn_anon_module modules/mod_authn_anon.so
|
#LoadModule authn_anon_module modules/mod_authn_anon.so
|
||||||
#LoadModule authn_dbm_module modules/mod_authn_dbm.so
|
#LoadModule authn_dbm_module modules/mod_authn_dbm.so
|
||||||
LoadModule authn_default_module modules/mod_authn_default.so
|
|
||||||
LoadModule authn_file_module modules/mod_authn_file.so
|
LoadModule authn_file_module modules/mod_authn_file.so
|
||||||
|
LoadModule authz_core_module modules/mod_authz_core.so
|
||||||
#LoadModule authz_dbm_module modules/mod_authz_dbm.so
|
#LoadModule authz_dbm_module modules/mod_authz_dbm.so
|
||||||
LoadModule authz_default_module modules/mod_authz_default.so
|
#LoadModule authz_default_module modules/mod_authz_default.so
|
||||||
LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
|
LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
|
||||||
LoadModule authz_host_module modules/mod_authz_host.so
|
LoadModule authz_host_module modules/mod_authz_host.so
|
||||||
LoadModule authz_user_module modules/mod_authz_user.so
|
LoadModule authz_user_module modules/mod_authz_user.so
|
||||||
LoadModule autoindex_module modules/mod_autoindex.so
|
LoadModule autoindex_module modules/mod_autoindex.so
|
||||||
|
LoadModule buffer_module modules/mod_buffer.so
|
||||||
|
LoadModule cache_module modules/mod_cache.so
|
||||||
|
LoadModule cache_disk_module modules/mod_cache_disk.so
|
||||||
#LoadModule cern_meta_module modules/mod_cern_meta.so
|
#LoadModule cern_meta_module modules/mod_cern_meta.so
|
||||||
LoadModule cgi_module modules/mod_cgi.so
|
LoadModule cgi_module modules/mod_cgi.so
|
||||||
#LoadModule dav_module modules/mod_dav.so
|
#LoadModule dav_module modules/mod_dav.so
|
||||||
@ -96,23 +100,23 @@ LoadModule isapi_module modules/mod_isapi.so
|
|||||||
LoadModule log_config_module modules/mod_log_config.so
|
LoadModule log_config_module modules/mod_log_config.so
|
||||||
LoadModule mime_module modules/mod_mime.so
|
LoadModule mime_module modules/mod_mime.so
|
||||||
#LoadModule mime_magic_module modules/mod_mime_magic.so
|
#LoadModule mime_magic_module modules/mod_mime_magic.so
|
||||||
|
LoadModule negotiation_module modules/mod_negotiation.so
|
||||||
#LoadModule proxy_module modules/mod_proxy.so
|
#LoadModule proxy_module modules/mod_proxy.so
|
||||||
#LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
|
#LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
|
||||||
#LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
|
#LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
|
||||||
#LoadModule proxy_connect_module modules/mod_proxy_connect.so
|
#LoadModule proxy_connect_module modules/mod_proxy_connect.so
|
||||||
#LoadModule proxy_http_module modules/mod_proxy_http.so
|
#LoadModule proxy_http_module modules/mod_proxy_http.so
|
||||||
#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
|
#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
|
||||||
LoadModule negotiation_module modules/mod_negotiation.so
|
|
||||||
LoadModule rewrite_module modules/mod_rewrite.so
|
LoadModule rewrite_module modules/mod_rewrite.so
|
||||||
LoadModule setenvif_module modules/mod_setenvif.so
|
LoadModule setenvif_module modules/mod_setenvif.so
|
||||||
#LoadModule speling_module modules/mod_speling.so
|
#LoadModule speling_module modules/mod_speling.so
|
||||||
|
#LoadModule ssl_module modules/mod_ssl.so
|
||||||
LoadModule status_module modules/mod_status.so
|
LoadModule status_module modules/mod_status.so
|
||||||
#LoadModule unique_id_module modules/mod_unique_id.so
|
#LoadModule unique_id_module modules/mod_unique_id.so
|
||||||
LoadModule userdir_module modules/mod_userdir.so
|
LoadModule userdir_module modules/mod_userdir.so
|
||||||
#LoadModule usertrack_module modules/mod_usertrack.so
|
#LoadModule usertrack_module modules/mod_usertrack.so
|
||||||
LoadModule vhost_alias_module modules/mod_vhost_alias.so
|
LoadModule vhost_alias_module modules/mod_vhost_alias.so
|
||||||
#LoadModule ssl_module modules/mod_ssl.so
|
LoadModule php5_module "WAMPROOT/bin/php/phpWAMPPHPVERSION/php5apache2_4.dll"
|
||||||
LoadModule php5_module "WAMPROOT/bin/php/phpWAMPPHPVERSION/php5apache2_2.dll"
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# ExtendedStatus controls whether Apache will generate "full" status
|
# ExtendedStatus controls whether Apache will generate "full" status
|
||||||
@ -123,9 +127,9 @@ ExtendedStatus On
|
|||||||
|
|
||||||
<Location /server-status>
|
<Location /server-status>
|
||||||
SetHandler server-status
|
SetHandler server-status
|
||||||
Order Deny,Allow
|
Require local
|
||||||
Deny from all
|
#Require ip 1.2.3.4
|
||||||
Allow from localhost, 127.0.0.1
|
#Require host 1.2.3.4
|
||||||
</Location>
|
</Location>
|
||||||
|
|
||||||
|
|
||||||
@ -211,9 +215,7 @@ KeepAliveTimeout 30
|
|||||||
<Directory />
|
<Directory />
|
||||||
Options FollowSymLinks
|
Options FollowSymLinks
|
||||||
AllowOverride None
|
AllowOverride None
|
||||||
Order deny,allow
|
Require all denied
|
||||||
Deny from all
|
|
||||||
Satisfy all
|
|
||||||
</Directory>
|
</Directory>
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -253,9 +255,13 @@ KeepAliveTimeout 30
|
|||||||
# Controls who can get stuff from this server.
|
# Controls who can get stuff from this server.
|
||||||
#
|
#
|
||||||
# onlineoffline tag - don't remove
|
# onlineoffline tag - don't remove
|
||||||
Order Deny,Allow
|
|
||||||
Deny from all
|
Require all granted
|
||||||
Allow from 127.0.0.1
|
|
||||||
|
<RequireAny>
|
||||||
|
Require ip 127.0.0.1
|
||||||
|
Require host localhost
|
||||||
|
</RequireAny>
|
||||||
|
|
||||||
</Directory>
|
</Directory>
|
||||||
|
|
||||||
@ -272,8 +278,7 @@ KeepAliveTimeout 30
|
|||||||
# viewed by Web clients.
|
# viewed by Web clients.
|
||||||
#
|
#
|
||||||
<FilesMatch "^\.ht">
|
<FilesMatch "^\.ht">
|
||||||
Order allow,deny
|
Require all denied
|
||||||
Deny from all
|
|
||||||
</FilesMatch>
|
</FilesMatch>
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -359,8 +364,7 @@ LogLevel warn
|
|||||||
<Directory "cgi-bin">
|
<Directory "cgi-bin">
|
||||||
AllowOverride None
|
AllowOverride None
|
||||||
Options None
|
Options None
|
||||||
Order allow,deny
|
Require all granted
|
||||||
Allow from all
|
|
||||||
</Directory>
|
</Directory>
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -410,7 +414,7 @@ LogLevel warn
|
|||||||
# keep browsers from trying to display binary files as though they are
|
# keep browsers from trying to display binary files as though they are
|
||||||
# text.
|
# text.
|
||||||
#
|
#
|
||||||
DefaultType text/plain
|
#DefaultType text/plain
|
||||||
|
|
||||||
<IfModule mime_module>
|
<IfModule mime_module>
|
||||||
#
|
#
|
||||||
@ -745,7 +749,7 @@ SSLCertificateKeyFile "WAMPROOT/myserver.key"
|
|||||||
# You can also set this with constant MAIN_OPTIMIZE_SPEED and bit 2 set.
|
# You can also set this with constant MAIN_OPTIMIZE_SPEED and bit 2 set.
|
||||||
#TODO
|
#TODO
|
||||||
|
|
||||||
# OPTIMIZE: To use cache on static pages (A259200 = 1 month).
|
# OPTIMIZE: To use cache on static pages (A259200 = 1 month, A7200 = 2 hours, A691600 = 8 days = recommanded for static resources).
|
||||||
# Note that you must also enable the module mod_expires.
|
# Note that you must also enable the module mod_expires.
|
||||||
#ExpiresActive On
|
#ExpiresActive On
|
||||||
#ExpiresByType image/x-icon A2592000
|
#ExpiresByType image/x-icon A2592000
|
||||||
|
|||||||
@ -8,6 +8,8 @@ echo ---- Execute install_services.bat >> doliwamp.log 2>>&1
|
|||||||
REM NET STOP doliwampapache
|
REM NET STOP doliwampapache
|
||||||
REM NET STOP doliwampmysqld
|
REM NET STOP doliwampmysqld
|
||||||
|
|
||||||
|
cd "WAMPROOT"
|
||||||
|
|
||||||
REM Apache x.x
|
REM Apache x.x
|
||||||
.\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -k install -n doliwampapache
|
.\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -k install -n doliwampapache
|
||||||
REM reg add HKLM\SYSTEM\CurrentControlSet\Services\doliwampapache /V Start /t REG_DWORD /d 3 /f
|
REM reg add HKLM\SYSTEM\CurrentControlSet\Services\doliwampapache /V Start /t REG_DWORD /d 3 /f
|
||||||
@ -19,3 +21,5 @@ REM Mysql 5.1+
|
|||||||
REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --install doliwampmysqld
|
REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --install doliwampmysqld
|
||||||
|
|
||||||
echo ---- End script >> doliwamp.log 2>>&1
|
echo ---- End script >> doliwamp.log 2>>&1
|
||||||
|
|
||||||
|
REM pause
|
||||||
|
|||||||
@ -77,10 +77,6 @@ log-error=WAMPROOT/logs/mysql.log
|
|||||||
#Path to the database root
|
#Path to the database root
|
||||||
datadir=WAMPROOT/bin/mysql/data
|
datadir=WAMPROOT/bin/mysql/data
|
||||||
|
|
||||||
# The default character set that will be used when a new schema or table is
|
|
||||||
# created and no character set is defined
|
|
||||||
default-character-set=latin1
|
|
||||||
|
|
||||||
# The default storage engine that will be used when create new tables when
|
# The default storage engine that will be used when create new tables when
|
||||||
default-storage-engine=INNODB
|
default-storage-engine=INNODB
|
||||||
|
|
||||||
@ -101,13 +97,6 @@ max_connections=255
|
|||||||
# slowdown instead of a performance improvement.
|
# slowdown instead of a performance improvement.
|
||||||
query_cache_size=8M
|
query_cache_size=8M
|
||||||
|
|
||||||
# The number of open tables for all threads. Increasing this value
|
|
||||||
# increases the number of file descriptors that mysqld requires.
|
|
||||||
# Therefore you have to make sure to set the amount of open files
|
|
||||||
# allowed to at least 4096 in the variable "open-files-limit" in
|
|
||||||
# section [mysqld_safe]
|
|
||||||
table_cache=510
|
|
||||||
|
|
||||||
# Maximum size for internal (in-memory) temporary tables. If a table
|
# Maximum size for internal (in-memory) temporary tables. If a table
|
||||||
# grows larger than this value, it is automatically converted to disk
|
# grows larger than this value, it is automatically converted to disk
|
||||||
# based table This limitation is for a single table. There can be many
|
# based table This limitation is for a single table. There can be many
|
||||||
@ -125,18 +114,6 @@ thread_cache_size=12
|
|||||||
|
|
||||||
#*** MyISAM Specific options
|
#*** MyISAM Specific options
|
||||||
|
|
||||||
# The maximum size of the temporary file MySQL is allowed to use while
|
|
||||||
# recreating the index (during REPAIR, ALTER TABLE or LOAD DATA INFILE.
|
|
||||||
# If the file-size would be bigger than this, the index will be created
|
|
||||||
# through the key cache (which is slower).
|
|
||||||
myisam_max_sort_file_size=100G
|
|
||||||
|
|
||||||
# If the temporary file used for fast index creation would be bigger
|
|
||||||
# than using the key cache by the amount specified here, then prefer the
|
|
||||||
# key cache method. This is mainly used to force long character keys in
|
|
||||||
# large tables to use the slower key cache method to create the index.
|
|
||||||
myisam_max_extra_sort_file_size=100G
|
|
||||||
|
|
||||||
# If the temporary file used for fast index creation would be bigger
|
# If the temporary file used for fast index creation would be bigger
|
||||||
# than using the key cache by the amount specified here, then prefer the
|
# than using the key cache by the amount specified here, then prefer the
|
||||||
# key cache method. This is mainly used to force long character keys in
|
# key cache method. This is mainly used to force long character keys in
|
||||||
@ -170,13 +147,6 @@ sort_buffer_size=203K
|
|||||||
# and speed up some things.
|
# and speed up some things.
|
||||||
#skip-innodb
|
#skip-innodb
|
||||||
|
|
||||||
# Additional memory pool that is used by InnoDB to store metadata
|
|
||||||
# information. If InnoDB requires more memory for this purpose it will
|
|
||||||
# start to allocate it from the OS. As this is fast enough on most
|
|
||||||
# recent operating systems, you normally do not need to change this
|
|
||||||
# value. SHOW INNODB STATUS will display the current amount used.
|
|
||||||
innodb_additional_mem_pool_size=2M
|
|
||||||
|
|
||||||
# If set to 1, InnoDB will flush (fsync) the transaction logs to the
|
# If set to 1, InnoDB will flush (fsync) the transaction logs to the
|
||||||
# disk at each commit, which offers full ACID behavior. If you are
|
# disk at each commit, which offers full ACID behavior. If you are
|
||||||
# willing to compromise this safety, and you are running small
|
# willing to compromise this safety, and you are running small
|
||||||
@ -226,7 +196,7 @@ port=WAMPMYSQLPORT
|
|||||||
|
|
||||||
|
|
||||||
#Path to installation directory. All paths are usually resolved relative to this.
|
#Path to installation directory. All paths are usually resolved relative to this.
|
||||||
basedir=WAMPROOT/bin/mysql/mysql5.6.17
|
basedir=WAMPROOT/bin/mysql/mysqlWAMPMYSQLVERSION
|
||||||
|
|
||||||
#log file
|
#log file
|
||||||
log-error=WAMPROOT/logs/mysql.log
|
log-error=WAMPROOT/logs/mysql.log
|
||||||
@ -234,10 +204,6 @@ log-error=WAMPROOT/logs/mysql.log
|
|||||||
#Path to the database root
|
#Path to the database root
|
||||||
datadir=WAMPROOT/bin/mysql/data
|
datadir=WAMPROOT/bin/mysql/data
|
||||||
|
|
||||||
# The default character set that will be used when a new schema or table is
|
|
||||||
# created and no character set is defined
|
|
||||||
default-character-set=latin1
|
|
||||||
|
|
||||||
# The default storage engine that will be used when create new tables when
|
# The default storage engine that will be used when create new tables when
|
||||||
default-storage-engine=INNODB
|
default-storage-engine=INNODB
|
||||||
|
|
||||||
@ -258,13 +224,6 @@ max_connections=255
|
|||||||
# slowdown instead of a performance improvement.
|
# slowdown instead of a performance improvement.
|
||||||
query_cache_size=8M
|
query_cache_size=8M
|
||||||
|
|
||||||
# The number of open tables for all threads. Increasing this value
|
|
||||||
# increases the number of file descriptors that mysqld requires.
|
|
||||||
# Therefore you have to make sure to set the amount of open files
|
|
||||||
# allowed to at least 4096 in the variable "open-files-limit" in
|
|
||||||
# section [mysqld_safe]
|
|
||||||
table_cache=510
|
|
||||||
|
|
||||||
# Maximum size for internal (in-memory) temporary tables. If a table
|
# Maximum size for internal (in-memory) temporary tables. If a table
|
||||||
# grows larger than this value, it is automatically converted to disk
|
# grows larger than this value, it is automatically converted to disk
|
||||||
# based table This limitation is for a single table. There can be many
|
# based table This limitation is for a single table. There can be many
|
||||||
@ -282,18 +241,6 @@ thread_cache_size=12
|
|||||||
|
|
||||||
#*** MyISAM Specific options
|
#*** MyISAM Specific options
|
||||||
|
|
||||||
# The maximum size of the temporary file MySQL is allowed to use while
|
|
||||||
# recreating the index (during REPAIR, ALTER TABLE or LOAD DATA INFILE.
|
|
||||||
# If the file-size would be bigger than this, the index will be created
|
|
||||||
# through the key cache (which is slower).
|
|
||||||
myisam_max_sort_file_size=100G
|
|
||||||
|
|
||||||
# If the temporary file used for fast index creation would be bigger
|
|
||||||
# than using the key cache by the amount specified here, then prefer the
|
|
||||||
# key cache method. This is mainly used to force long character keys in
|
|
||||||
# large tables to use the slower key cache method to create the index.
|
|
||||||
myisam_max_extra_sort_file_size=100G
|
|
||||||
|
|
||||||
# If the temporary file used for fast index creation would be bigger
|
# If the temporary file used for fast index creation would be bigger
|
||||||
# than using the key cache by the amount specified here, then prefer the
|
# than using the key cache by the amount specified here, then prefer the
|
||||||
# key cache method. This is mainly used to force long character keys in
|
# key cache method. This is mainly used to force long character keys in
|
||||||
@ -327,13 +274,6 @@ sort_buffer_size=203K
|
|||||||
# and speed up some things.
|
# and speed up some things.
|
||||||
#skip-innodb
|
#skip-innodb
|
||||||
|
|
||||||
# Additional memory pool that is used by InnoDB to store metadata
|
|
||||||
# information. If InnoDB requires more memory for this purpose it will
|
|
||||||
# start to allocate it from the OS. As this is fast enough on most
|
|
||||||
# recent operating systems, you normally do not need to change this
|
|
||||||
# value. SHOW INNODB STATUS will display the current amount used.
|
|
||||||
innodb_additional_mem_pool_size=2M
|
|
||||||
|
|
||||||
# If set to 1, InnoDB will flush (fsync) the transaction logs to the
|
# If set to 1, InnoDB will flush (fsync) the transaction logs to the
|
||||||
# disk at each commit, which offers full ACID behavior. If you are
|
# disk at each commit, which offers full ACID behavior. If you are
|
||||||
# willing to compromise this safety, and you are running small
|
# willing to compromise this safety, and you are running small
|
||||||
|
|||||||
@ -1,22 +1,29 @@
|
|||||||
Alias /phpmyadmin "WAMPROOT/apps/phpmyadminWAMPPHPMYADMINVERSION/"
|
Alias /phpmyadmin "WAMPROOT/apps/phpmyadminWAMPPHPMYADMINVERSION/"
|
||||||
|
|
||||||
# to give access to phpmyadmin from outside
|
# NOTE FOR APACHE 2.2:
|
||||||
# replace the lines
|
# To grant access to dolibarr from outside set lines
|
||||||
#
|
#
|
||||||
# Order Deny,Allow
|
# Order Allow,Deny
|
||||||
|
# Allow from all
|
||||||
|
#
|
||||||
|
# instead of
|
||||||
|
#
|
||||||
|
# Order Deny,Allow
|
||||||
# Deny from all
|
# Deny from all
|
||||||
# Allow from 127.0.0.1
|
# Allow from 127.0.0.1
|
||||||
#
|
#
|
||||||
# by
|
# NOTE FOR APACHE 2.3:
|
||||||
|
# To grant access to dolibarr from outside set lines
|
||||||
#
|
#
|
||||||
# Order Allow,Deny
|
# Require all granted
|
||||||
# Allow from all
|
#
|
||||||
|
# instead of
|
||||||
|
#
|
||||||
|
# Require local
|
||||||
#
|
#
|
||||||
|
|
||||||
<Directory "WAMPROOT/apps/phpmyadminWAMPPHPMYADMINVERSION/">
|
<Directory "WAMPROOT/apps/phpmyadminWAMPPHPMYADMINVERSION/">
|
||||||
Options Indexes FollowSymLinks MultiViews
|
Options Indexes FollowSymLinks MultiViews
|
||||||
AllowOverride all
|
AllowOverride all
|
||||||
Order Deny,Allow
|
Require local
|
||||||
Deny from all
|
|
||||||
Allow from 127.0.0.1
|
|
||||||
</Directory>
|
</Directory>
|
||||||
@ -10,9 +10,11 @@ NET START doliwampapache >> doliwamp.log 2>>&1
|
|||||||
echo NET START doliwampmysqld >> doliwamp.log 2>>&1
|
echo NET START doliwampmysqld >> doliwamp.log 2>>&1
|
||||||
NET START doliwampmysqld >> doliwamp.log 2>>&1
|
NET START doliwampmysqld >> doliwamp.log 2>>&1
|
||||||
|
|
||||||
|
REM You can also check logs into c:/dolibarr/logs if start fails
|
||||||
|
|
||||||
echo Please wait...
|
echo Please wait...
|
||||||
echo ---- End script >> doliwamp.log 2>>&1
|
echo ---- End script >> doliwamp.log 2>>&1
|
||||||
|
|
||||||
REM sleep is not a Windows commande
|
REM sleep is not a Windows commande
|
||||||
REM sleep 1
|
REM sleep 2
|
||||||
ping 1.1.1.1 -n 1 -w 1000 > nul
|
ping 127.0.0.1 -n 2 -w 1000 > nul
|
||||||
|
|||||||
@ -13,5 +13,6 @@ echo
|
|||||||
|
|
||||||
echo Running Mysql as user process (this process does not return so we use "start")
|
echo Running Mysql as user process (this process does not return so we use "start")
|
||||||
start WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --defaults-file=WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\my.ini --console
|
start WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --defaults-file=WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\my.ini --console
|
||||||
|
REM start WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --defaults-file=WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\my.ini --console
|
||||||
|
|
||||||
pause
|
pause
|
||||||
@ -16,3 +16,5 @@ echo ---- End script >> doliwamp.log 2>>&1
|
|||||||
REM sleep is not a Windows command
|
REM sleep is not a Windows command
|
||||||
REM sleep 1
|
REM sleep 1
|
||||||
ping 1.1.1.1 -n 1 -w 1000 > nul
|
ping 1.1.1.1 -n 1 -w 1000 > nul
|
||||||
|
|
||||||
|
REM pause
|
||||||
|
|||||||
@ -3,10 +3,19 @@ REM --------------------------------------------------------
|
|||||||
REM This script install Apache and Mysql DoliWamp services
|
REM This script install Apache and Mysql DoliWamp services
|
||||||
REM --------------------------------------------------------
|
REM --------------------------------------------------------
|
||||||
|
|
||||||
|
cd "WAMPROOT"
|
||||||
|
|
||||||
echo ---- Execute uninstall_services.bat >> doliwamp.log 2>>&1
|
echo ---- Execute uninstall_services.bat >> doliwamp.log 2>>&1
|
||||||
NET STOP doliwampapache
|
NET STOP doliwampapache
|
||||||
.\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -k uninstall -n doliwampapache
|
.\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -k uninstall -n doliwampapache
|
||||||
|
|
||||||
NET STOP doliwampmysqld
|
NET STOP doliwampmysqld
|
||||||
|
REM Mysql 5.0-
|
||||||
.\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --remove doliwampmysqld
|
.\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --remove doliwampmysqld
|
||||||
|
REM Mysql 5.1+
|
||||||
|
REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --remove doliwampmysqld
|
||||||
|
|
||||||
REM wampmanager.exe -quit -id={doliwampserver}
|
REM wampmanager.exe -quit -id={doliwampserver}
|
||||||
echo ---- End script >> doliwamp.log 2>>&1
|
echo ---- End script >> doliwamp.log 2>>&1
|
||||||
|
|
||||||
|
REM pause
|
||||||
|
|||||||
@ -32,11 +32,33 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
|
|||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
require_once($path."../htdocs/master.inc.php");
|
||||||
|
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
|
||||||
|
|
||||||
// Main
|
|
||||||
|
/*
|
||||||
|
* Main
|
||||||
|
*/
|
||||||
|
|
||||||
|
if (empty($argv[1]))
|
||||||
|
{
|
||||||
|
print "Usage: ".$script_file." release=x.y.z\n";
|
||||||
|
exit -1;
|
||||||
|
}
|
||||||
parse_str($argv[1]);
|
parse_str($argv[1]);
|
||||||
|
|
||||||
|
if ($release != DOL_VERSION)
|
||||||
|
{
|
||||||
|
print 'Error: release is not version declared into filefunc.in.php.'."\n";
|
||||||
|
exit -1;
|
||||||
|
}
|
||||||
|
|
||||||
//$outputfile=dirname(__FILE__).'/../htdocs/install/filelist-'.$release.'.xml';
|
//$outputfile=dirname(__FILE__).'/../htdocs/install/filelist-'.$release.'.xml';
|
||||||
$outputfile=dirname(__FILE__).'/../htdocs/install/filelist.xml';
|
$outputdir=dirname(__FILE__).'/../htdocs/install';
|
||||||
|
print 'Delete current files '.$outputdir.'/filelist*.xml'."\n";
|
||||||
|
dol_delete_file($outputdir.'/filelist*.xml',0,1,1);
|
||||||
|
|
||||||
|
$outputfile=$outputdir.'/filelist-'.$release.'.xml';
|
||||||
$fp = fopen($outputfile,'w');
|
$fp = fopen($outputfile,'w');
|
||||||
fputs($fp, '<?xml version="1.0" encoding="UTF-8" ?>'."\n");
|
fputs($fp, '<?xml version="1.0" encoding="UTF-8" ?>'."\n");
|
||||||
fputs($fp, '<checksum_list version="'.$release.'">'."\n");
|
fputs($fp, '<checksum_list version="'.$release.'">'."\n");
|
||||||
@ -53,7 +53,7 @@ if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake
|
|||||||
|
|
||||||
|
|
||||||
use vars qw/ $REVISION $VERSION /;
|
use vars qw/ $REVISION $VERSION /;
|
||||||
$VERSION="3.3";
|
$VERSION="4.0";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -173,6 +173,7 @@ $build =~ s/-.*$//g;
|
|||||||
# now build is 0+nmu1 for example
|
# now build is 0+nmu1 for example
|
||||||
$FILENAMEDEBNATIVE="${PROJECT}_${MAJOR}.${MINOR}.${build}";
|
$FILENAMEDEBNATIVE="${PROJECT}_${MAJOR}.${MINOR}.${build}";
|
||||||
$FILENAMEDEB="${PROJECT}_${MAJOR}.${MINOR}.${newbuild}";
|
$FILENAMEDEB="${PROJECT}_${MAJOR}.${MINOR}.${newbuild}";
|
||||||
|
$FILENAMEDEBSHORT="${PROJECT}_${MAJOR}.${MINOR}.${build}";
|
||||||
|
|
||||||
|
|
||||||
my $copyalreadydone=0;
|
my $copyalreadydone=0;
|
||||||
@ -316,8 +317,13 @@ print "\n";
|
|||||||
if ($CHOOSEDTARGET{'-CHKSUM'})
|
if ($CHOOSEDTARGET{'-CHKSUM'})
|
||||||
{
|
{
|
||||||
print 'Create xml check file with md5 checksum with command php '.$SOURCE.'/build/generate_filecheck_xml.php release='.$MAJOR.'.'.$MINOR.'.'.$BUILD."\n";
|
print 'Create xml check file with md5 checksum with command php '.$SOURCE.'/build/generate_filecheck_xml.php release='.$MAJOR.'.'.$MINOR.'.'.$BUILD."\n";
|
||||||
$ret=`php $SOURCE/build/generate_filecheck_xml.php release=$MAJOR.$MINOR.$BUILD`;
|
$ret=`php $SOURCE/build/generate_filelist_xml.php release=$MAJOR.$MINOR.$BUILD`;
|
||||||
print $ret."\n";
|
print $ret."\n";
|
||||||
|
# Copy to final dir
|
||||||
|
$NEWDESTI=$DESTI;
|
||||||
|
print "Copy \"$SOURCE/htdocs/install/filelist-$MAJOR.$MINOR.$BUILD.xml\" to $NEWDESTI/signatures/filelist-$MAJOR.$MINOR.$BUILD.xml\n";
|
||||||
|
use File::Copy qw(copy);
|
||||||
|
copy "$SOURCE/htdocs/install/filelist-$MAJOR.$MINOR.$BUILD.xml", "$NEWDESTI/signatures/filelist-$MAJOR.$MINOR.$BUILD.xml";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -356,25 +362,29 @@ if ($nboftargetok) {
|
|||||||
# Test that the ChangeLog is ok
|
# Test that the ChangeLog is ok
|
||||||
$TMPBUILDTOCHECKCHANGELOG=$BUILD;
|
$TMPBUILDTOCHECKCHANGELOG=$BUILD;
|
||||||
$TMPBUILDTOCHECKCHANGELOG =~ s/\-rc\d*//;
|
$TMPBUILDTOCHECKCHANGELOG =~ s/\-rc\d*//;
|
||||||
|
$TMPBUILDTOCHECKCHANGELOG =~ s/\-beta\d*//;
|
||||||
print "Check if ChangeLog is ok for version $MAJOR.$MINOR\.$TMPBUILDTOCHECKCHANGELOG\n";
|
print "Check if ChangeLog is ok for version $MAJOR.$MINOR\.$TMPBUILDTOCHECKCHANGELOG\n";
|
||||||
$ret=`grep "ChangeLog for $MAJOR.$MINOR\.$TMPBUILDTOCHECKCHANGELOG" "$SOURCE/ChangeLog" 2>&1`;
|
$ret=`grep "ChangeLog for $MAJOR.$MINOR\.$TMPBUILDTOCHECKCHANGELOG" "$SOURCE/ChangeLog" 2>&1`;
|
||||||
if (! $ret)
|
if (! $ret)
|
||||||
{
|
{
|
||||||
print "Error: The ChangeLogFile was not updated. Run the following command before building package for $MAJOR.$MINOR.$BUILD:\n";
|
print "Error: The ChangeLogFile was not updated. Run the following command before building package for $MAJOR.$MINOR.$BUILD:\n";
|
||||||
if (! $BUILD || $BUILD eq '0-rc') # For a major version
|
|
||||||
{
|
|
||||||
print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log `git rev-list --boundary '.$MAJOR.'.'.$MINOR.'..origin/develop | grep ^- | cut -c2- | head -n 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';
|
|
||||||
}
|
|
||||||
else # For a maintenance release
|
|
||||||
{
|
|
||||||
print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-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';
|
|
||||||
}
|
|
||||||
print "\n";
|
|
||||||
exit;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
print "ChangeLog for $MAJOR.$MINOR\.$BUILD was found into '$SOURCE/ChangeLog'\n";
|
print "ChangeLog for $MAJOR.$MINOR\.$BUILD was found into '$SOURCE/ChangeLog. But you can regenerate it with commande:'\n";
|
||||||
|
}
|
||||||
|
if (! $BUILD || $BUILD eq '0-rc') # For a major version
|
||||||
|
{
|
||||||
|
print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log `git rev-list --boundary '.$MAJOR.'.'.$MINOR.'..origin/develop | grep ^- | cut -c2- | head -n 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';
|
||||||
|
}
|
||||||
|
else # For a maintenance release
|
||||||
|
{
|
||||||
|
print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-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';
|
||||||
|
}
|
||||||
|
print "\n";
|
||||||
|
if (! $ret)
|
||||||
|
{
|
||||||
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
print 'Run git tag -a -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n";
|
print 'Run git tag -a -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n";
|
||||||
@ -388,10 +398,15 @@ if ($nboftargetok) {
|
|||||||
{
|
{
|
||||||
print 'Run git tag -a -f -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n";
|
print 'Run git tag -a -f -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n";
|
||||||
$ret=`git tag -a -f -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD"`;
|
$ret=`git tag -a -f -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD"`;
|
||||||
|
print 'Run git push -f --tags'."\n";
|
||||||
|
$ret=`git push -f --tags`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
print 'Run git push --tags'."\n";
|
else
|
||||||
$ret=`git push --tags`;
|
{
|
||||||
|
print 'Run git push --tags'."\n";
|
||||||
|
$ret=`git push --tags`;
|
||||||
|
}
|
||||||
chdir("$olddir");
|
chdir("$olddir");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -458,6 +473,7 @@ if ($nboftargetok) {
|
|||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/codetemplates`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/codetemplates`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/dbmodel`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/dbmodel`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/initdata`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/initdata`;
|
||||||
|
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/initdemo`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/iso-normes`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/iso-normes`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/ldap`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/ldap`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`;
|
||||||
@ -595,7 +611,7 @@ if ($nboftargetok) {
|
|||||||
if ($target eq 'TGZ')
|
if ($target eq 'TGZ')
|
||||||
{
|
{
|
||||||
$NEWDESTI=$DESTI;
|
$NEWDESTI=$DESTI;
|
||||||
if ($NEWPUBLISH =~ /stable/)
|
if ($NEWDESTI =~ /stable/)
|
||||||
{
|
{
|
||||||
mkdir($DESTI.'/standard');
|
mkdir($DESTI.'/standard');
|
||||||
if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; }
|
if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; }
|
||||||
@ -627,7 +643,7 @@ if ($nboftargetok) {
|
|||||||
if ($target eq 'XZ')
|
if ($target eq 'XZ')
|
||||||
{
|
{
|
||||||
$NEWDESTI=$DESTI;
|
$NEWDESTI=$DESTI;
|
||||||
if ($NEWPUBLISH =~ /stable/)
|
if ($NEWDESTI =~ /stable/)
|
||||||
{
|
{
|
||||||
mkdir($DESTI.'/standard');
|
mkdir($DESTI.'/standard');
|
||||||
if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; }
|
if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; }
|
||||||
@ -664,7 +680,7 @@ if ($nboftargetok) {
|
|||||||
if ($target eq 'ZIP')
|
if ($target eq 'ZIP')
|
||||||
{
|
{
|
||||||
$NEWDESTI=$DESTI;
|
$NEWDESTI=$DESTI;
|
||||||
if ($NEWPUBLISH =~ /stable/)
|
if ($NEWDESTI =~ /stable/)
|
||||||
{
|
{
|
||||||
mkdir($DESTI.'/standard');
|
mkdir($DESTI.'/standard');
|
||||||
if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; }
|
if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; }
|
||||||
@ -705,7 +721,7 @@ if ($nboftargetok) {
|
|||||||
if ($target =~ /FEDO/i) { $subdir="package_rpm_redhat-fedora"; }
|
if ($target =~ /FEDO/i) { $subdir="package_rpm_redhat-fedora"; }
|
||||||
if ($target =~ /MAND/i) { $subdir="package_rpm_mandriva"; }
|
if ($target =~ /MAND/i) { $subdir="package_rpm_mandriva"; }
|
||||||
if ($target =~ /OPEN/i) { $subdir="package_rpm_opensuse"; }
|
if ($target =~ /OPEN/i) { $subdir="package_rpm_opensuse"; }
|
||||||
if ($NEWPUBLISH =~ /stable/)
|
if ($NEWDESTI =~ /stable/)
|
||||||
{
|
{
|
||||||
mkdir($DESTI.'/'.$subdir);
|
mkdir($DESTI.'/'.$subdir);
|
||||||
if (-d $DESTI.'/'.$subdir) { $NEWDESTI=$DESTI.'/'.$subdir; }
|
if (-d $DESTI.'/'.$subdir) { $NEWDESTI=$DESTI.'/'.$subdir; }
|
||||||
@ -791,7 +807,7 @@ if ($nboftargetok) {
|
|||||||
if ($target eq 'DEB')
|
if ($target eq 'DEB')
|
||||||
{
|
{
|
||||||
$NEWDESTI=$DESTI;
|
$NEWDESTI=$DESTI;
|
||||||
if ($NEWPUBLISH =~ /stable/)
|
if ($NEWDESTI =~ /stable/)
|
||||||
{
|
{
|
||||||
mkdir($DESTI.'/package_debian-ubuntu');
|
mkdir($DESTI.'/package_debian-ubuntu');
|
||||||
if (-d $DESTI.'/package_debian-ubuntu') { $NEWDESTI=$DESTI.'/package_debian-ubuntu'; }
|
if (-d $DESTI.'/package_debian-ubuntu') { $NEWDESTI=$DESTI.'/package_debian-ubuntu'; }
|
||||||
@ -822,7 +838,7 @@ if ($nboftargetok) {
|
|||||||
$ret=`$cmd`;
|
$ret=`$cmd`;
|
||||||
|
|
||||||
print "Remove other files\n";
|
print "Remove other files\n";
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/README-FR`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/README-FR.md`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/README`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/README`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/README-FR`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/README-FR`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/aps`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/aps`;
|
||||||
@ -994,7 +1010,7 @@ if ($nboftargetok) {
|
|||||||
if ($target eq 'APS')
|
if ($target eq 'APS')
|
||||||
{
|
{
|
||||||
$NEWDESTI=$DESTI;
|
$NEWDESTI=$DESTI;
|
||||||
if ($NEWPUBLISH =~ /stable/)
|
if ($NEWDESTI =~ /stable/)
|
||||||
{
|
{
|
||||||
mkdir($DESTI.'/package_aps');
|
mkdir($DESTI.'/package_aps');
|
||||||
if (-d $DESTI.'/package_aps') { $NEWDESTI=$DESTI.'/package_aps'; }
|
if (-d $DESTI.'/package_aps') { $NEWDESTI=$DESTI.'/package_aps'; }
|
||||||
@ -1080,7 +1096,7 @@ if ($nboftargetok) {
|
|||||||
if ($target eq 'EXEDOLIWAMP')
|
if ($target eq 'EXEDOLIWAMP')
|
||||||
{
|
{
|
||||||
$NEWDESTI=$DESTI;
|
$NEWDESTI=$DESTI;
|
||||||
if ($NEWPUBLISH =~ /stable/)
|
if ($NEWDESTI =~ /stable/)
|
||||||
{
|
{
|
||||||
mkdir($DESTI.'/package_windows');
|
mkdir($DESTI.'/package_windows');
|
||||||
if (-d $DESTI.'/package_windows') { $NEWDESTI=$DESTI.'/package_windows'; }
|
if (-d $DESTI.'/package_windows') { $NEWDESTI=$DESTI.'/package_windows'; }
|
||||||
@ -1109,6 +1125,7 @@ if ($nboftargetok) {
|
|||||||
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"`;
|
$ret=`mv "$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe" "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"`;
|
||||||
|
|
||||||
|
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"`;
|
||||||
|
|
||||||
next;
|
next;
|
||||||
@ -1121,21 +1138,41 @@ if ($nboftargetok) {
|
|||||||
{
|
{
|
||||||
if ($CHOOSEDPUBLISH{$target} < 0) { next; }
|
if ($CHOOSEDPUBLISH{$target} < 0) { next; }
|
||||||
|
|
||||||
print "\nList of files to publish\n";
|
print "\nList of files to publish (BUILD=$BUILD)\n";
|
||||||
%filestoscansf=(
|
%filestoscansf=(
|
||||||
|
"$DESTI/signatures/filelist-$MAJOR.$MINOR.$BUILD.xml"=>'signatures',
|
||||||
"$DESTI/package_rpm_generic/$FILENAMERPM"=>'Dolibarr installer for Fedora-Redhat-Mandriva-Opensuse (DoliRpm)',
|
"$DESTI/package_rpm_generic/$FILENAMERPM"=>'Dolibarr installer for Fedora-Redhat-Mandriva-Opensuse (DoliRpm)',
|
||||||
"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_all.deb"=>'Dolibarr installer for Debian-Ubuntu (DoliDeb)',
|
"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_all.deb"=>'Dolibarr installer for Debian-Ubuntu (DoliDeb)',
|
||||||
|
"$DESTI/package_debian-ubuntu/${FILENAMEDEBSHORT}.orig.tar.gz"=>'none',
|
||||||
"$DESTI/package_windows/$FILENAMEEXEDOLIWAMP.exe"=>'Dolibarr installer for Windows (DoliWamp)',
|
"$DESTI/package_windows/$FILENAMEEXEDOLIWAMP.exe"=>'Dolibarr installer for Windows (DoliWamp)',
|
||||||
"$DESTI/standard/$FILENAMETGZ.tgz"=>'Dolibarr ERP-CRM',
|
"$DESTI/standard/$FILENAMETGZ.tgz"=>'Dolibarr ERP-CRM',
|
||||||
"$DESTI/standard/$FILENAMETGZ.zip"=>'Dolibarr ERP-CRM'
|
"$DESTI/standard/$FILENAMETGZ.zip"=>'Dolibarr ERP-CRM'
|
||||||
);
|
);
|
||||||
%filestoscanstableasso=(
|
%filestoscanstableasso=(
|
||||||
|
"$DESTI/signatures/filelist-$MAJOR.$MINOR.$BUILD.xml"=>'signatures',
|
||||||
"$DESTI/package_rpm_generic/$FILENAMERPM"=>'package_rpm_generic',
|
"$DESTI/package_rpm_generic/$FILENAMERPM"=>'package_rpm_generic',
|
||||||
"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_all.deb"=>'package_debian-ubuntu',
|
"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_all.deb"=>'package_debian-ubuntu',
|
||||||
|
"$DESTI/package_debian-ubuntu/${FILENAMEDEBSHORT}.orig.tar.gz"=>'package_debian-ubuntu',
|
||||||
"$DESTI/package_windows/$FILENAMEEXEDOLIWAMP.exe"=>'package_windows',
|
"$DESTI/package_windows/$FILENAMEEXEDOLIWAMP.exe"=>'package_windows',
|
||||||
"$DESTI/standard/$FILENAMETGZ.tgz"=>'standard',
|
"$DESTI/standard/$FILENAMETGZ.tgz"=>'standard',
|
||||||
"$DESTI/standard/$FILENAMETGZ.zip"=>'standard'
|
"$DESTI/standard/$FILENAMETGZ.zip"=>'standard'
|
||||||
);
|
);
|
||||||
|
if ($target eq 'ASSO' && $BUILD =~ /[a-z]/i) { # Not stable
|
||||||
|
%filestoscansf=(
|
||||||
|
"$DESTI/$FILENAMERPM"=>'Dolibarr installer for Fedora-Redhat-Mandriva-Opensuse (DoliRpm)',
|
||||||
|
"$DESTI/${FILENAMEDEB}_all.deb"=>'Dolibarr installer for Debian-Ubuntu (DoliDeb)',
|
||||||
|
"$DESTI/$FILENAMEEXEDOLIWAMP.exe"=>'Dolibarr installer for Windows (DoliWamp)',
|
||||||
|
"$DESTI/$FILENAMETGZ.tgz"=>'Dolibarr ERP-CRM',
|
||||||
|
"$DESTI/$FILENAMETGZ.zip"=>'Dolibarr ERP-CRM'
|
||||||
|
);
|
||||||
|
%filestoscanstableasso=(
|
||||||
|
"$DESTI/$FILENAMERPM"=>'',
|
||||||
|
"$DESTI/${FILENAMEDEB}_all.deb"=>'',
|
||||||
|
"$DESTI/$FILENAMEEXEDOLIWAMP.exe"=>'',
|
||||||
|
"$DESTI/$FILENAMETGZ.tgz"=>'',
|
||||||
|
"$DESTI/$FILENAMETGZ.zip"=>''
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
use POSIX qw/strftime/;
|
use POSIX qw/strftime/;
|
||||||
foreach my $file (sort keys %filestoscansf)
|
foreach my $file (sort keys %filestoscansf)
|
||||||
@ -1177,7 +1214,7 @@ if ($nboftargetok) {
|
|||||||
|
|
||||||
print "\n";
|
print "\n";
|
||||||
|
|
||||||
if ($target eq 'SF') {
|
if ($target eq 'SF' && $filestoscan{$file} ne 'none') {
|
||||||
$destFolder="$NEWPUBLISH/$filestoscan{$file}/".$MAJOR.'.'.$MINOR.'.'.$BUILD;
|
$destFolder="$NEWPUBLISH/$filestoscan{$file}/".$MAJOR.'.'.$MINOR.'.'.$BUILD;
|
||||||
}
|
}
|
||||||
elsif ($target eq 'ASSO' and $NEWPUBLISH =~ /stable/) {
|
elsif ($target eq 'ASSO' and $NEWPUBLISH =~ /stable/) {
|
||||||
|
|||||||
@ -9,7 +9,8 @@ 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.
|
||||||
To generate a changelog of a major new version x.y.0, you can do "cd ~/git/dolibarr_x.y; git log `git rev-list --boundary x.y..origin/develop | grep ^- | cut -c2- | head -n 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 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 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"
|
||||||
- Update version number with x.y.z-w in htdocs/filefunc.inc.php
|
- Update version number with x.y.z-w in htdocs/filefunc.inc.php
|
||||||
- Commit all changes.
|
- Commit all changes.
|
||||||
@ -31,7 +32,8 @@ 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.
|
||||||
To generate a changelog of a major new version x.y.0, you can do "cd ~/git/dolibarr_x.y; git log `git rev-list --boundary x.y..origin/develop | grep ^- | cut -c2- | head -n 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 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 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"
|
||||||
- Update version number with x.y.z in htdocs/filefunc.inc.php
|
- Update version number with x.y.z in htdocs/filefunc.inc.php
|
||||||
- Commit all changes.
|
- Commit all changes.
|
||||||
|
|||||||
@ -192,6 +192,7 @@ done >>%{name}.lang
|
|||||||
%_datadir/dolibarr/htdocs/loan
|
%_datadir/dolibarr/htdocs/loan
|
||||||
%_datadir/dolibarr/htdocs/mailmanspip
|
%_datadir/dolibarr/htdocs/mailmanspip
|
||||||
%_datadir/dolibarr/htdocs/margin
|
%_datadir/dolibarr/htdocs/margin
|
||||||
|
%_datadir/dolibarr/htdocs/multicurrency
|
||||||
%_datadir/dolibarr/htdocs/opensurvey
|
%_datadir/dolibarr/htdocs/opensurvey
|
||||||
%_datadir/dolibarr/htdocs/paybox
|
%_datadir/dolibarr/htdocs/paybox
|
||||||
%_datadir/dolibarr/htdocs/paypal
|
%_datadir/dolibarr/htdocs/paypal
|
||||||
@ -206,6 +207,7 @@ done >>%{name}.lang
|
|||||||
%_datadir/dolibarr/htdocs/theme
|
%_datadir/dolibarr/htdocs/theme
|
||||||
%_datadir/dolibarr/htdocs/user
|
%_datadir/dolibarr/htdocs/user
|
||||||
%_datadir/dolibarr/htdocs/webservices
|
%_datadir/dolibarr/htdocs/webservices
|
||||||
|
%_datadir/dolibarr/htdocs/websites
|
||||||
%_datadir/dolibarr/htdocs/*.ico
|
%_datadir/dolibarr/htdocs/*.ico
|
||||||
%_datadir/dolibarr/htdocs/*.patch
|
%_datadir/dolibarr/htdocs/*.patch
|
||||||
%_datadir/dolibarr/htdocs/*.php
|
%_datadir/dolibarr/htdocs/*.php
|
||||||
|
|||||||
@ -272,6 +272,7 @@ done >>%{name}.lang
|
|||||||
%_datadir/dolibarr/htdocs/loan
|
%_datadir/dolibarr/htdocs/loan
|
||||||
%_datadir/dolibarr/htdocs/mailmanspip
|
%_datadir/dolibarr/htdocs/mailmanspip
|
||||||
%_datadir/dolibarr/htdocs/margin
|
%_datadir/dolibarr/htdocs/margin
|
||||||
|
%_datadir/dolibarr/htdocs/multicurrency
|
||||||
%_datadir/dolibarr/htdocs/opensurvey
|
%_datadir/dolibarr/htdocs/opensurvey
|
||||||
%_datadir/dolibarr/htdocs/paybox
|
%_datadir/dolibarr/htdocs/paybox
|
||||||
%_datadir/dolibarr/htdocs/paypal
|
%_datadir/dolibarr/htdocs/paypal
|
||||||
@ -286,6 +287,7 @@ done >>%{name}.lang
|
|||||||
%_datadir/dolibarr/htdocs/theme
|
%_datadir/dolibarr/htdocs/theme
|
||||||
%_datadir/dolibarr/htdocs/user
|
%_datadir/dolibarr/htdocs/user
|
||||||
%_datadir/dolibarr/htdocs/webservices
|
%_datadir/dolibarr/htdocs/webservices
|
||||||
|
%_datadir/dolibarr/htdocs/websites
|
||||||
%_datadir/dolibarr/htdocs/*.ico
|
%_datadir/dolibarr/htdocs/*.ico
|
||||||
%_datadir/dolibarr/htdocs/*.patch
|
%_datadir/dolibarr/htdocs/*.patch
|
||||||
%_datadir/dolibarr/htdocs/*.php
|
%_datadir/dolibarr/htdocs/*.php
|
||||||
|
|||||||
@ -189,6 +189,7 @@ done >>%{name}.lang
|
|||||||
%_datadir/dolibarr/htdocs/loan
|
%_datadir/dolibarr/htdocs/loan
|
||||||
%_datadir/dolibarr/htdocs/mailmanspip
|
%_datadir/dolibarr/htdocs/mailmanspip
|
||||||
%_datadir/dolibarr/htdocs/margin
|
%_datadir/dolibarr/htdocs/margin
|
||||||
|
%_datadir/dolibarr/htdocs/multicurrency
|
||||||
%_datadir/dolibarr/htdocs/opensurvey
|
%_datadir/dolibarr/htdocs/opensurvey
|
||||||
%_datadir/dolibarr/htdocs/paybox
|
%_datadir/dolibarr/htdocs/paybox
|
||||||
%_datadir/dolibarr/htdocs/paypal
|
%_datadir/dolibarr/htdocs/paypal
|
||||||
@ -203,6 +204,7 @@ done >>%{name}.lang
|
|||||||
%_datadir/dolibarr/htdocs/theme
|
%_datadir/dolibarr/htdocs/theme
|
||||||
%_datadir/dolibarr/htdocs/user
|
%_datadir/dolibarr/htdocs/user
|
||||||
%_datadir/dolibarr/htdocs/webservices
|
%_datadir/dolibarr/htdocs/webservices
|
||||||
|
%_datadir/dolibarr/htdocs/websites
|
||||||
%_datadir/dolibarr/htdocs/*.ico
|
%_datadir/dolibarr/htdocs/*.ico
|
||||||
%_datadir/dolibarr/htdocs/*.patch
|
%_datadir/dolibarr/htdocs/*.patch
|
||||||
%_datadir/dolibarr/htdocs/*.php
|
%_datadir/dolibarr/htdocs/*.php
|
||||||
|
|||||||
@ -200,6 +200,7 @@ done >>%{name}.lang
|
|||||||
%_datadir/dolibarr/htdocs/loan
|
%_datadir/dolibarr/htdocs/loan
|
||||||
%_datadir/dolibarr/htdocs/mailmanspip
|
%_datadir/dolibarr/htdocs/mailmanspip
|
||||||
%_datadir/dolibarr/htdocs/margin
|
%_datadir/dolibarr/htdocs/margin
|
||||||
|
%_datadir/dolibarr/htdocs/multicurrency
|
||||||
%_datadir/dolibarr/htdocs/opensurvey
|
%_datadir/dolibarr/htdocs/opensurvey
|
||||||
%_datadir/dolibarr/htdocs/paybox
|
%_datadir/dolibarr/htdocs/paybox
|
||||||
%_datadir/dolibarr/htdocs/paypal
|
%_datadir/dolibarr/htdocs/paypal
|
||||||
@ -214,6 +215,7 @@ done >>%{name}.lang
|
|||||||
%_datadir/dolibarr/htdocs/theme
|
%_datadir/dolibarr/htdocs/theme
|
||||||
%_datadir/dolibarr/htdocs/user
|
%_datadir/dolibarr/htdocs/user
|
||||||
%_datadir/dolibarr/htdocs/webservices
|
%_datadir/dolibarr/htdocs/webservices
|
||||||
|
%_datadir/dolibarr/htdocs/websites
|
||||||
%_datadir/dolibarr/htdocs/*.ico
|
%_datadir/dolibarr/htdocs/*.ico
|
||||||
%_datadir/dolibarr/htdocs/*.patch
|
%_datadir/dolibarr/htdocs/*.patch
|
||||||
%_datadir/dolibarr/htdocs/*.php
|
%_datadir/dolibarr/htdocs/*.php
|
||||||
|
|||||||
@ -2,14 +2,22 @@
|
|||||||
"name": "dolibarr/dolibarr",
|
"name": "dolibarr/dolibarr",
|
||||||
"type": "project",
|
"type": "project",
|
||||||
"description": "Dolibarr ERP & CRM is a modern and easy to use web software to manage your business",
|
"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"],
|
"keywords": [
|
||||||
"homepage": "http://www.dolibarr.org",
|
"erp",
|
||||||
|
"crm",
|
||||||
|
"invoice",
|
||||||
|
"sme",
|
||||||
|
"proposal",
|
||||||
|
"order",
|
||||||
|
"stock",
|
||||||
|
"agenda"
|
||||||
|
],
|
||||||
|
"homepage": "https://www.dolibarr.org",
|
||||||
"license": "GPL-3.0+",
|
"license": "GPL-3.0+",
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/Dolibarr/dolibarr/issues",
|
"issues": "https://github.com/Dolibarr/dolibarr/issues",
|
||||||
"forum": "http://www.dolibarr.org/forum",
|
"forum": "https://www.dolibarr.org/forum",
|
||||||
"wiki": "http://wiki.dolibarr.org",
|
"wiki": "https://wiki.dolibarr.org",
|
||||||
"irc": "irc://chat.freenode.net/dolibarr",
|
|
||||||
"source": "https://github.com/Dolibarr/dolibarr"
|
"source": "https://github.com/Dolibarr/dolibarr"
|
||||||
},
|
},
|
||||||
"config": {
|
"config": {
|
||||||
@ -30,7 +38,8 @@
|
|||||||
"jakub-onderka/php-parallel-lint": "^0",
|
"jakub-onderka/php-parallel-lint": "^0",
|
||||||
"jakub-onderka/php-console-highlighter": "^0",
|
"jakub-onderka/php-console-highlighter": "^0",
|
||||||
"phpunit/phpunit": "^4",
|
"phpunit/phpunit": "^4",
|
||||||
"squizlabs/php_codesniffer": "^2"
|
"squizlabs/php_codesniffer": "^2",
|
||||||
|
"phpunit/phpunit-selenium": "^2"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"ext-mysqlnd": "To use with MySQL or MariaDB",
|
"ext-mysqlnd": "To use with MySQL or MariaDB",
|
||||||
@ -46,7 +55,6 @@
|
|||||||
"ext-soap": "Native SOAP",
|
"ext-soap": "Native SOAP",
|
||||||
"ext-zip": "ODT and Excel support",
|
"ext-zip": "ODT and Excel support",
|
||||||
"ext-xml": "Excel support",
|
"ext-xml": "Excel support",
|
||||||
"firephp/firephp-core": "Logging to Firebug console support",
|
"firephp/firephp-core": "Logging to Firebug console support"
|
||||||
"raven/raven": "Sentry logging server support"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -7,7 +7,7 @@ provided with a standard release.
|
|||||||
|
|
||||||
|
|
||||||
There is also some documentation on Dolibarr Wiki:
|
There is also some documentation on Dolibarr Wiki:
|
||||||
http://wiki.dolibarr.org/
|
https://wiki.dolibarr.org/
|
||||||
and
|
and
|
||||||
http://www.dolibarr.org/html_doxygen/index.html
|
https://doxygen.dolibarr.org/
|
||||||
|
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 36 KiB |
@ -2,4 +2,4 @@ README
|
|||||||
------
|
------
|
||||||
|
|
||||||
Scripts in this directory can be used to load or purge data of a database instance.
|
Scripts in this directory can be used to load or purge data of a database instance.
|
||||||
WARNING: This may erase data.
|
WARNING: Some of this script may delete definitely data.
|
||||||
|
|||||||
@ -31,8 +31,8 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Recupere root dolibarr
|
// Recupere root dolibarr
|
||||||
$path=preg_replace('/generate-facture.php/i','',$_SERVER["PHP_SELF"]);
|
//$path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]);
|
||||||
require ($path."../../htdocs/master.inc.php");
|
require (__DIR__. '/../../htdocs/master.inc.php');
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
|
||||||
|
|
||||||
|
|||||||
@ -32,8 +32,8 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Recupere root dolibarr
|
// Recupere root dolibarr
|
||||||
$path=preg_replace('/generate-commande.php/i','',$_SERVER["PHP_SELF"]);
|
//$path=preg_replace('/generate-commande.php/i','',$_SERVER["PHP_SELF"]);
|
||||||
require ($path."../../htdocs/master.inc.php");
|
require (__DIR__. '/../../htdocs/master.inc.php');
|
||||||
include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
|
include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
|
||||||
include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
|
include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
|
||||||
include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
|
include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
|
||||||
|
|||||||
@ -32,8 +32,8 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Recupere root dolibarr
|
// Recupere root dolibarr
|
||||||
$path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]);
|
//$path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]);
|
||||||
require ($path."../../htdocs/master.inc.php");
|
require (__DIR__. '/../../htdocs/master.inc.php');
|
||||||
include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
|
include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
|
||||||
include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
|
include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
|
||||||
include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
|
include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
|
||||||
|
|||||||
@ -32,8 +32,8 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Recupere root dolibarr
|
// Recupere root dolibarr
|
||||||
$path=preg_replace('/generate-propale.php/i','',$_SERVER["PHP_SELF"]);
|
//$path=preg_replace('/generate-propale.php/i','',$_SERVER["PHP_SELF"]);
|
||||||
require ($path."../../htdocs/master.inc.php");
|
require (__DIR__. '/../../htdocs/master.inc.php');
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
|
||||||
|
|||||||
@ -32,8 +32,8 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Recupere root dolibarr
|
// Recupere root dolibarr
|
||||||
$path=preg_replace('/generate-societe.php/i','',$_SERVER["PHP_SELF"]);
|
//$path=preg_replace('/generate-societe.php/i','',$_SERVER["PHP_SELF"]);
|
||||||
require ($path."../../htdocs/master.inc.php");
|
require (__DIR__. '/../../htdocs/master.inc.php');
|
||||||
include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
|
include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
|
||||||
include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
|
include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
|
||||||
include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
|
include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
#!/usr/bin/env php
|
#!/usr/bin/env php
|
||||||
<?php
|
<?php
|
||||||
/* Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net>
|
/* Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
|
* Copyright (C) 2016 Juanjo Menent <jmenent@2byte.es>
|
||||||
*
|
*
|
||||||
* 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
|
||||||
@ -56,7 +57,7 @@ $error=0;
|
|||||||
|
|
||||||
@set_time_limit(0);
|
@set_time_limit(0);
|
||||||
print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
|
print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
|
||||||
dol_syslog($script_file." launched with arg ".join(',',$argv));
|
dol_syslog($script_file." launched with arg ".implode(',',$argv));
|
||||||
|
|
||||||
$mode = $argv[1];
|
$mode = $argv[1];
|
||||||
$filepath = $argv[2];
|
$filepath = $argv[2];
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
#!/usr/bin/env php
|
#!/usr/bin/env php
|
||||||
<?php
|
<?php
|
||||||
/* Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net>
|
/* Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
|
* Copyright (C) 2016 Juanjo Menent <jmenent@2byte.es>
|
||||||
*
|
*
|
||||||
* 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
|
||||||
@ -56,7 +57,7 @@ $error=0;
|
|||||||
|
|
||||||
@set_time_limit(0);
|
@set_time_limit(0);
|
||||||
print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
|
print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
|
||||||
dol_syslog($script_file." launched with arg ".join(',',$argv));
|
dol_syslog($script_file." launched with arg ".implode(',',$argv));
|
||||||
|
|
||||||
$mode = $argv[1];
|
$mode = $argv[1];
|
||||||
$filepath = $argv[2];
|
$filepath = $argv[2];
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
#!/usr/bin/env php
|
#!/usr/bin/env php
|
||||||
<?php
|
<?php
|
||||||
/* Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net>
|
/* Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
|
* Copyright (C) 2016 Juanjo Menent <jmenent@2byte.es>
|
||||||
*
|
*
|
||||||
* 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
|
||||||
@ -56,7 +57,7 @@ $error=0;
|
|||||||
|
|
||||||
@set_time_limit(0);
|
@set_time_limit(0);
|
||||||
print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
|
print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
|
||||||
dol_syslog($script_file." launched with arg ".join(',',$argv));
|
dol_syslog($script_file." launched with arg ".implode(',',$argv));
|
||||||
|
|
||||||
$mode = $argv[1];
|
$mode = $argv[1];
|
||||||
$filepath = $argv[2];
|
$filepath = $argv[2];
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
#!/usr/bin/env php
|
#!/usr/bin/env php
|
||||||
<?php
|
<?php
|
||||||
/* Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net>
|
/* Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
*
|
* Copyright (C) 2016 Juanjo Menent <jmenent@2byte.es>
|
||||||
* 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 3 of the License, or
|
* the Free Software Foundation; either version 3 of the License, or
|
||||||
@ -146,7 +146,7 @@ $sqls=array(
|
|||||||
|
|
||||||
@set_time_limit(0);
|
@set_time_limit(0);
|
||||||
print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
|
print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
|
||||||
dol_syslog($script_file." launched with arg ".join(',',$argv));
|
dol_syslog($script_file." launched with arg ".implode(',',$argv));
|
||||||
|
|
||||||
$mode = $argv[1];
|
$mode = $argv[1];
|
||||||
$option = $argv[2];
|
$option = $argv[2];
|
||||||
@ -154,14 +154,14 @@ $option = $argv[2];
|
|||||||
if (empty($mode) || ! in_array($mode,array('test','confirm'))) {
|
if (empty($mode) || ! in_array($mode,array('test','confirm'))) {
|
||||||
print "Usage: $script_file (test|confirm) (all|option)\n";
|
print "Usage: $script_file (test|confirm) (all|option)\n";
|
||||||
print "\n";
|
print "\n";
|
||||||
print "option can be ".join(',',array_keys($sqls))."\n";
|
print "option can be ".implode(',',array_keys($sqls))."\n";
|
||||||
exit(-1);
|
exit(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (empty($option) || ! in_array($option, array_merge(array('all'),array_keys($sqls))) ) {
|
if (empty($option) || ! in_array($option, array_merge(array('all'),array_keys($sqls))) ) {
|
||||||
print "Usage: $script_file (test|confirm) (all|option)\n";
|
print "Usage: $script_file (test|confirm) (all|option)\n";
|
||||||
print "\n";
|
print "\n";
|
||||||
print "option can be ".join(',',array_keys($sqls))."\n";
|
print "option can be ".implode(',',array_keys($sqls))."\n";
|
||||||
exit(-1);
|
exit(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
After Width: | Height: | Size: 33 KiB |
BIN
dev/initdemo/documents_demo/produit/DOLICLOUD/dolicloud_logo.png
Normal file
BIN
dev/initdemo/documents_demo/produit/DOLICLOUD/dolicloud_logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 32 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 6.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 17 KiB |
BIN
dev/initdemo/documents_demo/societe/contact/10/eldy_php.jpg
Normal file
BIN
dev/initdemo/documents_demo/societe/contact/10/eldy_php.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 34 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 7.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.9 KiB |
Binary file not shown.
BIN
dev/initdemo/documents_demo/users/9/1/eldy_php.jpg
Normal file
BIN
dev/initdemo/documents_demo/users/9/1/eldy_php.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 34 KiB |
BIN
dev/initdemo/documents_demo/users/9/1/thumbs/eldy_php_mini.jpg
Normal file
BIN
dev/initdemo/documents_demo/users/9/1/thumbs/eldy_php_mini.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.5 KiB |
BIN
dev/initdemo/documents_demo/users/9/1/thumbs/eldy_php_small.jpg
Normal file
BIN
dev/initdemo/documents_demo/users/9/1/thumbs/eldy_php_small.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.1 KiB |
@ -15,7 +15,7 @@
|
|||||||
|
|
||||||
|
|
||||||
export mydir=`echo "$0" | sed -e 's/initdemo.sh//'`;
|
export mydir=`echo "$0" | sed -e 's/initdemo.sh//'`;
|
||||||
if [ "x$mydir" = "x" ]
|
if [ "x$mydir" = 'x' -o "x$mydir" = 'x./' ]
|
||||||
then
|
then
|
||||||
export mydir="."
|
export mydir="."
|
||||||
fi
|
fi
|
||||||
@ -132,23 +132,6 @@ then
|
|||||||
exit;;
|
exit;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# ---------------------------- chemin d'acces du repertoire documents
|
|
||||||
#DIALOG=${DIALOG=dialog}
|
|
||||||
#fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
|
|
||||||
#trap "rm -f $fichtemp" 0 1 2 5 15
|
|
||||||
#$DIALOG --title "Init Dolibarr with demo values" --clear \
|
|
||||||
# --inputbox "Full path to documents directory (ex: /var/www/dolibarr/documents)- no / at end :" 16 55 2> $fichtemp
|
|
||||||
|
|
||||||
#valret=$?
|
|
||||||
|
|
||||||
#case $valret in
|
|
||||||
# 0)
|
|
||||||
#docs=`cat $fichtemp`;;
|
|
||||||
# 1)
|
|
||||||
#exit;;
|
|
||||||
# 255)
|
|
||||||
#exit;;
|
|
||||||
#esac
|
|
||||||
|
|
||||||
# ---------------------------- confirmation
|
# ---------------------------- confirmation
|
||||||
DIALOG=${DIALOG=dialog}
|
DIALOG=${DIALOG=dialog}
|
||||||
@ -177,6 +160,25 @@ echo "mysql -P$port -u$admin -p***** $base < $mydir/$dumpfile"
|
|||||||
mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile
|
mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile
|
||||||
export res=$?
|
export res=$?
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------- copy demo files
|
||||||
|
export documentdir=`cat $mydir/../../htdocs/conf/conf.php | grep '^\$dolibarr_main_data_root' | sed -e 's/$dolibarr_main_data_root=//' | sed -e 's/;//' | sed -e "s/'//g" `
|
||||||
|
if [ "x$documentdir" != "x" ]
|
||||||
|
then
|
||||||
|
echo cp -pr $mydir/documents_demo/* "$documentdir/"
|
||||||
|
cp -pr $mydir/documents_demo/* "$documentdir/"
|
||||||
|
echo cp -pr $mydir/../../htdocs/install/doctemplates/* "$documentdir/doctemplates/"
|
||||||
|
cp -pr $mydir/../../htdocs/install/doctemplates/* "$documentdir/doctemplates/"
|
||||||
|
mkdir -p "$documentdir/ecm/Administrative documents"
|
||||||
|
mkdir -p "$documentdir/ecm/Images"
|
||||||
|
echo cp -pr $mydir/../../doc/images/* "$documentdir/ecm/Images"
|
||||||
|
cp -pr $mydir/../../doc/images/* "$documentdir/ecm/Images"
|
||||||
|
else
|
||||||
|
echo Detection of documents directory failed so demo files were not copied.
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if [ "x$res" = "x0" ]
|
if [ "x$res" = "x0" ]
|
||||||
then
|
then
|
||||||
echo "Success, file successfully loaded."
|
echo "Success, file successfully loaded."
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user