[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] eb98bd: FIX: Not delete a product whe
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] eb98bd: FIX: Not delete a product when have customer price |
|
Date: |
Fri, 18 Dec 2015 16:11:50 -0800 |
Branch: refs/heads/3.7_backported
Home: https://github.com/Dolibarr/dolibarr
Commit: eb98bd1e788ea181448244e42f7825abc50fdaa2
https://github.com/Dolibarr/dolibarr/commit/eb98bd1e788ea181448244e42f7825abc50fdaa2
Author: fmarcet <address@hidden>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
FIX: Not delete a product when have customer price
Commit: b3ed99ddc1ce64a36495d2bb12d63f49357a3972
https://github.com/Dolibarr/dolibarr/commit/b3ed99ddc1ce64a36495d2bb12d63f49357a3972
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge pull request #4146 from fmarcet/3.6
FIX: Not delete a product when have customer price
Commit: c0862762a567fec7de8099cf5c8d4dd1e37ef16b
https://github.com/Dolibarr/dolibarr/commit/c0862762a567fec7de8099cf5c8d4dd1e37ef16b
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-12-09 (Wed, 09 Dec 2015)
Changed paths:
M .gitignore
M build/.gitignore
M build/aps/APP-META-1.1.xml
M build/aps/APP-META-1.2.xml
M build/aps/README
M build/aps/install.forced.php.install
M build/debian/conf.php.install
M build/debian/control
M build/debian/dolibarr.install
M build/debian/dolibarr.lintian-overrides
M build/debian/dolibarr.templates.futur
M build/debian/install.forced.php.install
M build/debian/po/POTFILES.in
M build/debian/po/fr.po
M build/doxygen/doxygen_footer.html
M build/doxygen/doxygen_header.html
M build/rpm/conf.php
M build/rpm/dolibarr-forrpm.patch
M build/rpm/dolibarr.desktop
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
M build/rpm/file_contexts.dolibarr
M build/rpm/install.forced.php.fedora
M build/rpm/install.forced.php.generic
M build/rpm/install.forced.php.mandriva
M build/rpm/install.forced.php.opensuse
M dev/codesniffer/README
M dev/codesniffer/php.ini
M dev/codesniffer/ruleset.dtd
M dev/codesniffer/ruleset.xml
M dev/codetemplates/README
M dev/codetemplates/codetemplates.dtd
M dev/codetemplates/codetemplates.xml
M dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql
M dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql
M dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql
M dev/dbmodel/emulate_oscommerce/llx_osc_order.sql
M dev/dbmodel/emulate_oscommerce/llx_osc_product.sql
M dev/examples/README
M dev/iso-normes/GURULABS-RPM-GUIDE-v1.0.PDF
M dev/iso-normes/address_format.txt
M dev/iso-normes/banknumber_format.txt
M dev/iso-normes/xmlexport.txt
M dev/phpunit/README
M dev/phpunit/eclipse_setup_for_pti_phpunit.png
M dev/skeletons/build_webservice_from_class.php
M dev/test/testtcpdf.php
M doc/images/appicon_128.png
M doc/images/appicon_16.ico
M doc/images/appicon_16.png
M doc/images/appicon_32.png
M doc/images/appicon_48.ico
M doc/images/appicon_64.png
M doc/images/dolibarr_73x73.png
M doc/images/dolibarr_logo.png
M htdocs/core/filemanagerdol/browser/default/browser.css
M htdocs/core/filemanagerdol/browser/default/images/Folder.gif
M htdocs/core/filemanagerdol/browser/default/images/FolderUp.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/ai.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/avi.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/bmp.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/cs.gif
M
htdocs/core/filemanagerdol/browser/default/images/icons/32/default.icon.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/dll.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/doc.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/exe.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/fla.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/gif.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/htm.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/html.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/jpg.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/js.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/mdb.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/mp3.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/pdf.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/png.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/ppt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/rdp.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/swf.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/swt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/txt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/vsd.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/xls.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/xml.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/zip.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/ai.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/avi.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/bmp.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/cs.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/default.icon.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/dll.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/doc.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/exe.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/fla.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/gif.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/htm.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/html.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/jpg.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/js.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/mdb.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/mp3.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/pdf.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/png.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/ppt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/rdp.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/swf.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/swt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/txt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/vsd.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/xls.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/xml.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/zip.gif
M htdocs/core/filemanagerdol/browser/default/js/common.js
M htdocs/core/filemanagerdol/browser/default/js/fckxml.js
M htdocs/core/filemanagerdol/browser/default/spacer.gif
M htdocs/core/modules/security/generate/README
M htdocs/includes/fpdfi/README.txt
M htdocs/includes/jquery/plugins/colorpicker/jquery.colorpicker.css
M htdocs/includes/jquery/plugins/colorpicker/jquery.colorpicker.js
M htdocs/includes/jquery/plugins/jcrop/css/Jcrop.gif
M htdocs/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css
M htdocs/includes/jquery/plugins/jcrop/index.html
M htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.js
M htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js
M htdocs/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css
M htdocs/includes/jquery/plugins/jnotify/jquery.jnotify.css
M htdocs/includes/jquery/plugins/jpicker/ChangeLog.txt
M htdocs/includes/jquery/plugins/jpicker/Example.html
M htdocs/includes/jquery/plugins/jpicker/ReadMe.txt
M htdocs/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css
M htdocs/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.min.css
M htdocs/includes/jquery/plugins/jpicker/images/AlphaBar.png
M htdocs/includes/jquery/plugins/jpicker/images/Bars.png
M htdocs/includes/jquery/plugins/jpicker/images/Maps.png
M htdocs/includes/jquery/plugins/jpicker/images/NoColor.png
M htdocs/includes/jquery/plugins/jpicker/images/bar-opacity.png
M htdocs/includes/jquery/plugins/jpicker/images/map-opacity.png
M htdocs/includes/jquery/plugins/jpicker/images/mappoint.gif
M htdocs/includes/jquery/plugins/jpicker/images/picker.gif
M htdocs/includes/jquery/plugins/jpicker/images/preview-opacity.png
M htdocs/includes/jquery/plugins/jpicker/images/rangearrows.gif
M htdocs/includes/jquery/plugins/jpicker/jPicker.css
M htdocs/includes/jquery/plugins/jpicker/jpicker-1.1.6.js
M htdocs/includes/jquery/plugins/jpicker/jpicker-1.1.6.min.js
M htdocs/includes/jquery/plugins/jqueryFileTree/images/application.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/code.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/css.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/db.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/directory.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/doc.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/file.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/film.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/flash.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/folder_open.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/html.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/java.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/linux.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/music.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/pdf.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/php.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/picture.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/ppt.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/psd.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/ruby.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/script.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/spinner.gif
M htdocs/includes/jquery/plugins/jqueryFileTree/images/txt.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/xls.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/zip.png
M htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.css
M htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js
M htdocs/includes/jquery/plugins/tiptip/jquery.tipTip.js
M htdocs/includes/jquery/plugins/tiptip/jquery.tipTip.min.js
M htdocs/includes/jquery/plugins/tiptip/tipTip.css
M htdocs/includes/nusoap/lib/Mail/xmail.dtd
M htdocs/includes/nusoap/lib/Mail/xmail.xsl
M htdocs/includes/tcpdf/fonts/dejavusanscondensed.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusanscondensed.z
M htdocs/includes/tcpdf/fonts/dejavusanscondensedb.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusanscondensedb.z
M htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.z
M htdocs/includes/tcpdf/fonts/dejavusanscondensedi.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusanscondensedi.z
M htdocs/includes/tcpdf/fonts/dejavusansextralight.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusansextralight.z
M htdocs/includes/tcpdf/fonts/dejavusansmono.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusansmono.z
M htdocs/includes/tcpdf/fonts/dejavusansmonob.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusansmonob.z
M htdocs/includes/tcpdf/fonts/dejavusansmonobi.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusansmonobi.z
M htdocs/includes/tcpdf/fonts/dejavusansmonoi.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusansmonoi.z
M htdocs/install/doctemplates/projects/template_project.odt
M htdocs/install/mysql/data/llx_c_input_method.sql
M htdocs/install/mysql/data/llx_c_input_reason.sql
M htdocs/install/mysql/migration/2.7.0-2.8.0.sql
M htdocs/install/mysql/migration/2.8.0-2.9.0.sql
M htdocs/install/mysql/migration/3.0.0-3.1.0.sql
M htdocs/install/mysql/migration/3.1.0-3.2.0.sql
M htdocs/install/mysql/migration/3.2.0-3.3.0.sql
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
M htdocs/install/mysql/migration/3.4.0-3.5.0.sql
M htdocs/install/mysql/tables/llx_resource.key.sql
M htdocs/install/mysql/tables/llx_resource.sql
M htdocs/langs/en_US/resource.lang
M htdocs/langs/fr_FR/resource.lang
M htdocs/opensurvey/img/accept-24.png
M htdocs/opensurvey/img/accept.png
M htdocs/opensurvey/img/add-16.png
M htdocs/opensurvey/img/add-24.png
M htdocs/opensurvey/img/calendar-32.png
M htdocs/opensurvey/img/cancel.png
M htdocs/opensurvey/img/chart-32.png
M htdocs/opensurvey/img/fforward.png
M htdocs/opensurvey/img/medaille.png
M htdocs/opensurvey/img/next.png
M htdocs/opensurvey/img/object_opensurvey.png
M htdocs/opensurvey/img/previous.png
M htdocs/opensurvey/img/rewind.png
M htdocs/resource/add.php
M htdocs/resource/card.php
M htdocs/theme/amarok/AUTHOR
M htdocs/theme/amarok/ckeditor/config.js
M htdocs/theme/amarok/img/1downarrow.png
M htdocs/theme/amarok/img/1downarrow_selected.png
M htdocs/theme/amarok/img/1leftarrow.png
M htdocs/theme/amarok/img/1leftarrow_selected.png
M htdocs/theme/amarok/img/1rightarrow.png
M htdocs/theme/amarok/img/1rightarrow_selected.png
M htdocs/theme/amarok/img/1uparrow.png
M htdocs/theme/amarok/img/1uparrow_selected.png
M htdocs/theme/amarok/img/1updownarrow.png
M htdocs/theme/amarok/img/addfile.png
M htdocs/theme/amarok/img/button_edit.png
M htdocs/theme/amarok/img/calc.png
M htdocs/theme/amarok/img/calendar.png
M htdocs/theme/amarok/img/call.png
M htdocs/theme/amarok/img/call_out.png
M htdocs/theme/amarok/img/close.png
M htdocs/theme/amarok/img/delete.png
M htdocs/theme/amarok/img/detail.png
M htdocs/theme/amarok/img/disable.png
M htdocs/theme/amarok/img/edit.png
M htdocs/theme/amarok/img/edit_add.png
M htdocs/theme/amarok/img/edit_remove.png
M htdocs/theme/amarok/img/editdelete.png
M htdocs/theme/amarok/img/error.png
M htdocs/theme/amarok/img/file.png
M htdocs/theme/amarok/img/filenew.png
M htdocs/theme/amarok/img/filter.png
M htdocs/theme/amarok/img/folder-open.png
M htdocs/theme/amarok/img/folder.png
M htdocs/theme/amarok/img/grip.png
M htdocs/theme/amarok/img/help.png
M htdocs/theme/amarok/img/helpdoc.png
M htdocs/theme/amarok/img/high.png
M htdocs/theme/amarok/img/history.png
M htdocs/theme/amarok/img/indent1.png
M htdocs/theme/amarok/img/info.png
M htdocs/theme/amarok/img/lock.png
M htdocs/theme/amarok/img/logout.png
M htdocs/theme/amarok/img/mainlevel.gif
M htdocs/theme/amarok/img/money.png
M htdocs/theme/amarok/img/next.png
M htdocs/theme/amarok/img/object_account.png
M htdocs/theme/amarok/img/object_action.png
M htdocs/theme/amarok/img/object_barcode.png
M htdocs/theme/amarok/img/object_bill.png
M htdocs/theme/amarok/img/object_billa.png
M htdocs/theme/amarok/img/object_billd.png
M htdocs/theme/amarok/img/object_billr.png
M htdocs/theme/amarok/img/object_book.png
M htdocs/theme/amarok/img/object_bookmark.png
M htdocs/theme/amarok/img/object_calendar.png
M htdocs/theme/amarok/img/object_calendarday.png
M htdocs/theme/amarok/img/object_calendarweek.png
M htdocs/theme/amarok/img/object_category-expanded.png
M htdocs/theme/amarok/img/object_category.png
M htdocs/theme/amarok/img/object_commercial.png
M htdocs/theme/amarok/img/object_company.png
M htdocs/theme/amarok/img/object_contact.png
M htdocs/theme/amarok/img/object_contact_all.png
M htdocs/theme/amarok/img/object_contract.png
M htdocs/theme/amarok/img/object_dir.png
M htdocs/theme/amarok/img/object_email.png
M htdocs/theme/amarok/img/object_energie.png
M htdocs/theme/amarok/img/object_generic.png
M htdocs/theme/amarok/img/object_globe.png
M htdocs/theme/amarok/img/object_group.png
M htdocs/theme/amarok/img/object_intervention.png
M htdocs/theme/amarok/img/object_invoice.png
M htdocs/theme/amarok/img/object_label.png
M htdocs/theme/amarok/img/object_list.png
M htdocs/theme/amarok/img/object_opensurvey.png
M htdocs/theme/amarok/img/object_order.png
M htdocs/theme/amarok/img/object_payment.png
M htdocs/theme/amarok/img/object_phoning.png
M htdocs/theme/amarok/img/object_product.png
M htdocs/theme/amarok/img/object_project.png
M htdocs/theme/amarok/img/object_projectpub.png
M htdocs/theme/amarok/img/object_projecttask.png
M htdocs/theme/amarok/img/object_propal.png
M htdocs/theme/amarok/img/object_reduc.png
M htdocs/theme/amarok/img/object_rss.png
M htdocs/theme/amarok/img/object_sending.png
M htdocs/theme/amarok/img/object_service.png
M htdocs/theme/amarok/img/object_stock.png
M htdocs/theme/amarok/img/object_task.png
M htdocs/theme/amarok/img/object_technic.png
M htdocs/theme/amarok/img/object_trip.png
M htdocs/theme/amarok/img/object_user.png
M htdocs/theme/amarok/img/off.png
M htdocs/theme/amarok/img/ok.png
M htdocs/theme/amarok/img/on.png
M htdocs/theme/amarok/img/pdf2.png
M htdocs/theme/amarok/img/pdf3.png
M htdocs/theme/amarok/img/previous.png
M htdocs/theme/amarok/img/printer.png
M htdocs/theme/amarok/img/puce.png
M htdocs/theme/amarok/img/recent.png
M htdocs/theme/amarok/img/redstar.png
M htdocs/theme/amarok/img/refresh.png
M htdocs/theme/amarok/img/reload.png
M htdocs/theme/amarok/img/rightarrow.png
M htdocs/theme/amarok/img/search.png
M htdocs/theme/amarok/img/searchclear.png
M htdocs/theme/amarok/img/setup.png
M htdocs/theme/amarok/img/split.png
M htdocs/theme/amarok/img/star.png
M htdocs/theme/amarok/img/stats.png
M htdocs/theme/amarok/img/statut0.png
M htdocs/theme/amarok/img/statut1.png
M htdocs/theme/amarok/img/statut2.png
M htdocs/theme/amarok/img/statut3.png
M htdocs/theme/amarok/img/statut4.png
M htdocs/theme/amarok/img/statut5.png
M htdocs/theme/amarok/img/statut6.png
M htdocs/theme/amarok/img/statut7.png
M htdocs/theme/amarok/img/statut8.png
M htdocs/theme/amarok/img/statut9.png
M htdocs/theme/amarok/img/stcomm-1.png
M htdocs/theme/amarok/img/stcomm-1_grayed.png
M htdocs/theme/amarok/img/stcomm0.png
M htdocs/theme/amarok/img/stcomm0_grayed.png
M htdocs/theme/amarok/img/stcomm1.png
M htdocs/theme/amarok/img/stcomm1_grayed.png
M htdocs/theme/amarok/img/stcomm2.png
M htdocs/theme/amarok/img/stcomm2_grayed.png
M htdocs/theme/amarok/img/stcomm3.png
M htdocs/theme/amarok/img/stcomm3_grayed.png
M htdocs/theme/amarok/img/stcomm4.png
M htdocs/theme/amarok/img/stcomm4_grayed.png
M htdocs/theme/amarok/img/tick.png
M htdocs/theme/amarok/img/title.png
M htdocs/theme/amarok/img/unlock.png
M htdocs/theme/amarok/img/uparrow.png
M htdocs/theme/amarok/img/vcard.png
M htdocs/theme/amarok/img/view.png
M htdocs/theme/amarok/img/vmenu.png
M htdocs/theme/amarok/img/warning.png
M htdocs/theme/amarok/img/working.gif
M htdocs/theme/amarok/thumb.png
M htdocs/theme/amarok/tpl/README
M htdocs/theme/auguria/img/edit_add.png
M htdocs/theme/auguria/img/edit_remove.png
M htdocs/theme/auguria/img/menus/topmenu_bg.png
M htdocs/theme/auguria/img/menus/topmenu_right.png
M htdocs/theme/auguria/img/object_bill.png
M htdocs/theme/auguria/img/object_book.png
M htdocs/theme/auguria/img/object_calendarday.png
M htdocs/theme/auguria/img/object_calendarweek.png
M htdocs/theme/auguria/img/object_company.png
M htdocs/theme/auguria/img/object_contact.png
M htdocs/theme/auguria/img/object_contract.png
M htdocs/theme/auguria/img/object_invoice.png
M htdocs/theme/auguria/img/object_opensurvey.png
M htdocs/theme/auguria/img/object_order.png
M htdocs/theme/auguria/img/object_product.png
M htdocs/theme/auguria/img/object_propal.png
M htdocs/theme/auguria/img/stats.png
M htdocs/theme/auguria/img/statut8.png
M htdocs/theme/auguria/img/statut9.png
M htdocs/theme/bureau2crea/img/object_calendarday.png
M htdocs/theme/bureau2crea/img/object_calendarweek.png
M htdocs/theme/bureau2crea/img/object_opensurvey.png
M htdocs/theme/bureau2crea/img/stats.png
M htdocs/theme/bureau2crea/img/statut8.png
M htdocs/theme/cameleo/img/object_opensurvey.png
M htdocs/theme/cameleo/img/stats.png
M htdocs/theme/common/devices/audio-card.png
M htdocs/theme/common/devices/audio-headset.png
M htdocs/theme/common/devices/audio-input-line.png
M htdocs/theme/common/devices/audio-input-microphone.png
M htdocs/theme/common/devices/battery.png
M htdocs/theme/common/devices/camera-photo.png
M htdocs/theme/common/devices/camera-web.png
M htdocs/theme/common/devices/computer-laptop.png
M htdocs/theme/common/devices/computer.png
M htdocs/theme/common/devices/cpu.png
M htdocs/theme/common/devices/drive-harddisk.png
M htdocs/theme/common/devices/drive-optical.png
M htdocs/theme/common/devices/drive-removable-media-usb-pendrive.png
M htdocs/theme/common/devices/drive-removable-media-usb.png
M htdocs/theme/common/devices/drive-removable-media.png
M htdocs/theme/common/devices/input-gaming.png
M htdocs/theme/common/devices/input-keyboard.png
M htdocs/theme/common/devices/input-mouse.png
M htdocs/theme/common/devices/input-tablet.png
M htdocs/theme/common/devices/media-flash-memory-stick.png
M htdocs/theme/common/devices/media-flash-sd-mmc.png
M htdocs/theme/common/devices/media-flash-smart-media.png
M htdocs/theme/common/devices/media-flash.png
M htdocs/theme/common/devices/media-floppy.png
M htdocs/theme/common/devices/media-optical-audio.png
M htdocs/theme/common/devices/media-optical-blu-ray.png
M htdocs/theme/common/devices/media-optical-data.png
M htdocs/theme/common/devices/media-optical-dvd-video.png
M htdocs/theme/common/devices/media-optical-dvd.png
M htdocs/theme/common/devices/media-optical-mixed-cd.png
M htdocs/theme/common/devices/media-optical-recordable.png
M htdocs/theme/common/devices/media-optical-video.png
M htdocs/theme/common/devices/media-optical.png
M htdocs/theme/common/devices/media-tape.png
M htdocs/theme/common/devices/modem.png
M htdocs/theme/common/devices/multimedia-player-apple-ipod.png
M htdocs/theme/common/devices/multimedia-player.png
M htdocs/theme/common/devices/network-wired.png
M htdocs/theme/common/devices/network-wireless-connected-00.png
M htdocs/theme/common/devices/network-wireless-connected-100.png
M htdocs/theme/common/devices/network-wireless-connected-25.png
M htdocs/theme/common/devices/network-wireless-connected-50.png
M htdocs/theme/common/devices/network-wireless-connected-75.png
M htdocs/theme/common/devices/network-wireless-disconnected.png
M htdocs/theme/common/devices/network-wireless.png
M htdocs/theme/common/devices/pda.png
M htdocs/theme/common/devices/phone-openmoko-freerunner.png
M htdocs/theme/common/devices/phone.png
M htdocs/theme/common/devices/printer-laser.png
M htdocs/theme/common/devices/printer.png
M htdocs/theme/common/devices/scanner.png
M htdocs/theme/common/devices/video-display.png
M htdocs/theme/common/devices/video-projector.png
M htdocs/theme/common/devices/video-television.png
M htdocs/theme/common/emotes/face-angel.png
M htdocs/theme/common/emotes/face-embarrassed.png
M htdocs/theme/common/emotes/face-kiss.png
M htdocs/theme/common/emotes/face-laugh.png
M htdocs/theme/common/emotes/face-plain.png
M htdocs/theme/common/emotes/face-raspberry.png
M htdocs/theme/common/emotes/face-sad.png
M htdocs/theme/common/emotes/face-smile-big.png
M htdocs/theme/common/emotes/face-smile.png
M htdocs/theme/common/emotes/face-surprise.png
M htdocs/theme/common/emotes/face-uncertain.png
M htdocs/theme/common/emotes/face-wink.png
M htdocs/theme/common/gmap.png
M htdocs/theme/common/ical.gif
M htdocs/theme/common/mime/css.png
M htdocs/theme/common/mime/dotnet.png
M htdocs/theme/common/mime/encrypt.png
M htdocs/theme/common/mime/glasses.png
M htdocs/theme/common/mime/jnlp.png
M htdocs/theme/common/mime/library.png
M htdocs/theme/common/mime/lit.png
M htdocs/theme/common/mime/mdb.png
M htdocs/theme/common/mime/ooffice.png
M htdocs/theme/common/mime/page.png
M htdocs/theme/common/mime/readme.txt
M htdocs/theme/common/mime/rss.png
M htdocs/theme/common/rss.gif
M htdocs/theme/common/treemenu/folder2-expanded.png
M htdocs/theme/common/treemenu/folder2.png
M htdocs/theme/common/vcal.gif
M htdocs/theme/common/weather/weather-clear-night.png
M htdocs/theme/common/weather/weather-clear.png
M htdocs/theme/common/weather/weather-clouds-night.png
M htdocs/theme/common/weather/weather-clouds.png
M htdocs/theme/common/weather/weather-few-clouds-night.png
M htdocs/theme/common/weather/weather-few-clouds.png
M htdocs/theme/common/weather/weather-freezing-rain.png
M htdocs/theme/common/weather/weather-hail.png
M htdocs/theme/common/weather/weather-many-clouds.png
M htdocs/theme/common/weather/weather-mist.png
M htdocs/theme/common/weather/weather-showers-day.png
M htdocs/theme/common/weather/weather-showers-night.png
M htdocs/theme/common/weather/weather-showers-scattered-day.png
M htdocs/theme/common/weather/weather-showers-scattered-night.png
M htdocs/theme/common/weather/weather-showers-scattered.png
M htdocs/theme/common/weather/weather-showers.png
M htdocs/theme/common/weather/weather-snow-rain.png
M htdocs/theme/common/weather/weather-snow-scattered-day.png
M htdocs/theme/common/weather/weather-snow-scattered-night.png
M htdocs/theme/common/weather/weather-snow-scattered.png
M htdocs/theme/common/weather/weather-snow.png
M htdocs/theme/common/weather/weather-storm-day.png
M htdocs/theme/common/weather/weather-storm-night.png
M htdocs/theme/common/weather/weather-storm.png
M htdocs/theme/dolibarr.png
M htdocs/theme/dolibarr_logo.png
M htdocs/theme/doliforge_logo.png
M htdocs/theme/dolistore_logo.png
M htdocs/theme/eldy/img/liste_titre2.png
M htdocs/theme/eldy/img/object_opensurvey.png
M htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
M htdocs/webservices/demo_wsclient_category.php-NORUN
M htdocs/webservices/demo_wsclient_invoice.php-NORUN
M htdocs/webservices/demo_wsclient_order.php-NORUN
M htdocs/webservices/demo_wsclient_other.php-NORUN
M htdocs/webservices/demo_wsclient_productorservice.php-NORUN
M htdocs/webservices/demo_wsclient_thirdparty.php-NORUN
M test/phpunit/CMailFileTest.php
M test/phpunit/CategorieTest.php
M test/phpunit/ChargeSocialesTest.php
M test/phpunit/ContactTest.php
M test/phpunit/CoreTest.php
M test/phpunit/DiscountTest.php
M test/phpunit/EntrepotTest.php
M test/phpunit/Example_import_company_1.csv
M test/phpunit/ExportTest.php
M test/phpunit/Functions2LibTest.php
M test/phpunit/FunctionsLibTest.php
M test/phpunit/ImportTest.php
M test/phpunit/JsonLibTest.php
M test/phpunit/LangTest.php
M test/phpunit/ModulesTest.php
M test/phpunit/PdfDocTest.php
M test/phpunit/PgsqlTest.php
M test/phpunit/PricesTest.php
M test/phpunit/ProductTest.php
M test/phpunit/ScriptsTest.php
M test/phpunit/SecurityTest.php
M test/phpunit/SocieteTest.php
M test/phpunit/SqlTest.php
M test/phpunit/WebservicesInvoicesTest.php
M test/phpunit/WebservicesOrdersTest.php
M test/phpunit/WebservicesOtherTest.php
M test/phpunit/WebservicesProductsTest.php
M test/phpunit/WebservicesThirdpartyTest.php
M test/phpunit/WebservicesUserTest.php
M test/soapui/Dolibarr-soapui-project.xml
Log Message:
-----------
Fix #3930 Removed executable bit
These files doesn't contain executable code and may pose a security
threat.
Commit: 4e9b3394395c93ee6af953fc2390b226186711dd
https://github.com/Dolibarr/dolibarr/commit/4e9b3394395c93ee6af953fc2390b226186711dd
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-12-09 (Wed, 09 Dec 2015)
Changed paths:
M build/aps/install.forced.php.install
M build/debian/conf.php.install
M build/debian/install.forced.php.install
M build/rpm/conf.php
M build/rpm/install.forced.php.fedora
M build/rpm/install.forced.php.generic
M build/rpm/install.forced.php.mandriva
M build/rpm/install.forced.php.opensuse
Log Message:
-----------
[Qual] Removed PHP closing tag
Commit: 3fea57f83b457fff672b5aa68674f451582a086c
https://github.com/Dolibarr/dolibarr/commit/3fea57f83b457fff672b5aa68674f451582a086c
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
M .gitignore
M build/.gitignore
M build/aps/APP-META-1.1.xml
M build/aps/APP-META-1.2.xml
M build/aps/README
M build/aps/install.forced.php.install
M build/debian/conf.php.install
M build/debian/control
M build/debian/dolibarr.install
M build/debian/dolibarr.lintian-overrides
M build/debian/dolibarr.templates.futur
M build/debian/install.forced.php.install
M build/debian/po/POTFILES.in
M build/debian/po/fr.po
M build/doxygen/doxygen_footer.html
M build/doxygen/doxygen_header.html
M build/rpm/conf.php
M build/rpm/dolibarr-forrpm.patch
M build/rpm/dolibarr.desktop
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
M build/rpm/file_contexts.dolibarr
M build/rpm/install.forced.php.fedora
M build/rpm/install.forced.php.generic
M build/rpm/install.forced.php.mandriva
M build/rpm/install.forced.php.opensuse
M dev/codesniffer/README
M dev/codesniffer/php.ini
M dev/codesniffer/ruleset.dtd
M dev/codesniffer/ruleset.xml
M dev/codetemplates/README
M dev/codetemplates/codetemplates.dtd
M dev/codetemplates/codetemplates.xml
M dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql
M dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql
M dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql
M dev/dbmodel/emulate_oscommerce/llx_osc_order.sql
M dev/dbmodel/emulate_oscommerce/llx_osc_product.sql
M dev/examples/README
M dev/iso-normes/GURULABS-RPM-GUIDE-v1.0.PDF
M dev/iso-normes/address_format.txt
M dev/iso-normes/banknumber_format.txt
M dev/iso-normes/xmlexport.txt
M dev/phpunit/README
M dev/phpunit/eclipse_setup_for_pti_phpunit.png
M dev/skeletons/build_webservice_from_class.php
M dev/test/testtcpdf.php
M doc/images/appicon_128.png
M doc/images/appicon_16.ico
M doc/images/appicon_16.png
M doc/images/appicon_32.png
M doc/images/appicon_48.ico
M doc/images/appicon_64.png
M doc/images/dolibarr_73x73.png
M doc/images/dolibarr_logo.png
M htdocs/core/filemanagerdol/browser/default/browser.css
M htdocs/core/filemanagerdol/browser/default/images/Folder.gif
M htdocs/core/filemanagerdol/browser/default/images/FolderUp.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/ai.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/avi.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/bmp.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/cs.gif
M
htdocs/core/filemanagerdol/browser/default/images/icons/32/default.icon.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/dll.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/doc.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/exe.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/fla.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/gif.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/htm.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/html.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/jpg.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/js.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/mdb.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/mp3.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/pdf.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/png.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/ppt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/rdp.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/swf.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/swt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/txt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/vsd.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/xls.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/xml.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/zip.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/ai.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/avi.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/bmp.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/cs.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/default.icon.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/dll.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/doc.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/exe.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/fla.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/gif.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/htm.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/html.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/jpg.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/js.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/mdb.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/mp3.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/pdf.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/png.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/ppt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/rdp.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/swf.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/swt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/txt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/vsd.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/xls.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/xml.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/zip.gif
M htdocs/core/filemanagerdol/browser/default/js/common.js
M htdocs/core/filemanagerdol/browser/default/js/fckxml.js
M htdocs/core/filemanagerdol/browser/default/spacer.gif
M htdocs/core/modules/security/generate/README
M htdocs/includes/fpdfi/README.txt
M htdocs/includes/jquery/plugins/colorpicker/jquery.colorpicker.css
M htdocs/includes/jquery/plugins/colorpicker/jquery.colorpicker.js
M htdocs/includes/jquery/plugins/jcrop/css/Jcrop.gif
M htdocs/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css
M htdocs/includes/jquery/plugins/jcrop/index.html
M htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.js
M htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js
M htdocs/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css
M htdocs/includes/jquery/plugins/jnotify/jquery.jnotify.css
M htdocs/includes/jquery/plugins/jpicker/ChangeLog.txt
M htdocs/includes/jquery/plugins/jpicker/Example.html
M htdocs/includes/jquery/plugins/jpicker/ReadMe.txt
M htdocs/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css
M htdocs/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.min.css
M htdocs/includes/jquery/plugins/jpicker/images/AlphaBar.png
M htdocs/includes/jquery/plugins/jpicker/images/Bars.png
M htdocs/includes/jquery/plugins/jpicker/images/Maps.png
M htdocs/includes/jquery/plugins/jpicker/images/NoColor.png
M htdocs/includes/jquery/plugins/jpicker/images/bar-opacity.png
M htdocs/includes/jquery/plugins/jpicker/images/map-opacity.png
M htdocs/includes/jquery/plugins/jpicker/images/mappoint.gif
M htdocs/includes/jquery/plugins/jpicker/images/picker.gif
M htdocs/includes/jquery/plugins/jpicker/images/preview-opacity.png
M htdocs/includes/jquery/plugins/jpicker/images/rangearrows.gif
M htdocs/includes/jquery/plugins/jpicker/jPicker.css
M htdocs/includes/jquery/plugins/jpicker/jpicker-1.1.6.js
M htdocs/includes/jquery/plugins/jpicker/jpicker-1.1.6.min.js
M htdocs/includes/jquery/plugins/jqueryFileTree/images/application.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/code.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/css.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/db.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/directory.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/doc.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/file.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/film.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/flash.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/folder_open.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/html.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/java.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/linux.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/music.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/pdf.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/php.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/picture.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/ppt.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/psd.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/ruby.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/script.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/spinner.gif
M htdocs/includes/jquery/plugins/jqueryFileTree/images/txt.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/xls.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/zip.png
M htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.css
M htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js
M htdocs/includes/jquery/plugins/tiptip/jquery.tipTip.js
M htdocs/includes/jquery/plugins/tiptip/jquery.tipTip.min.js
M htdocs/includes/jquery/plugins/tiptip/tipTip.css
M htdocs/includes/nusoap/lib/Mail/xmail.dtd
M htdocs/includes/nusoap/lib/Mail/xmail.xsl
M htdocs/includes/tcpdf/fonts/dejavusanscondensed.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusanscondensed.z
M htdocs/includes/tcpdf/fonts/dejavusanscondensedb.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusanscondensedb.z
M htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.z
M htdocs/includes/tcpdf/fonts/dejavusanscondensedi.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusanscondensedi.z
M htdocs/includes/tcpdf/fonts/dejavusansextralight.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusansextralight.z
M htdocs/includes/tcpdf/fonts/dejavusansmono.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusansmono.z
M htdocs/includes/tcpdf/fonts/dejavusansmonob.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusansmonob.z
M htdocs/includes/tcpdf/fonts/dejavusansmonobi.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusansmonobi.z
M htdocs/includes/tcpdf/fonts/dejavusansmonoi.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusansmonoi.z
M htdocs/install/doctemplates/projects/template_project.odt
M htdocs/install/mysql/data/llx_c_input_method.sql
M htdocs/install/mysql/data/llx_c_input_reason.sql
M htdocs/install/mysql/migration/2.7.0-2.8.0.sql
M htdocs/install/mysql/migration/2.8.0-2.9.0.sql
M htdocs/install/mysql/migration/3.0.0-3.1.0.sql
M htdocs/install/mysql/migration/3.1.0-3.2.0.sql
M htdocs/install/mysql/migration/3.2.0-3.3.0.sql
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
M htdocs/install/mysql/migration/3.4.0-3.5.0.sql
M htdocs/install/mysql/tables/llx_resource.key.sql
M htdocs/install/mysql/tables/llx_resource.sql
M htdocs/langs/en_US/resource.lang
M htdocs/langs/fr_FR/resource.lang
M htdocs/opensurvey/img/accept-24.png
M htdocs/opensurvey/img/accept.png
M htdocs/opensurvey/img/add-16.png
M htdocs/opensurvey/img/add-24.png
M htdocs/opensurvey/img/calendar-32.png
M htdocs/opensurvey/img/cancel.png
M htdocs/opensurvey/img/chart-32.png
M htdocs/opensurvey/img/fforward.png
M htdocs/opensurvey/img/medaille.png
M htdocs/opensurvey/img/next.png
M htdocs/opensurvey/img/object_opensurvey.png
M htdocs/opensurvey/img/previous.png
M htdocs/opensurvey/img/rewind.png
M htdocs/resource/add.php
M htdocs/resource/card.php
M htdocs/theme/amarok/AUTHOR
M htdocs/theme/amarok/ckeditor/config.js
M htdocs/theme/amarok/img/1downarrow.png
M htdocs/theme/amarok/img/1downarrow_selected.png
M htdocs/theme/amarok/img/1leftarrow.png
M htdocs/theme/amarok/img/1leftarrow_selected.png
M htdocs/theme/amarok/img/1rightarrow.png
M htdocs/theme/amarok/img/1rightarrow_selected.png
M htdocs/theme/amarok/img/1uparrow.png
M htdocs/theme/amarok/img/1uparrow_selected.png
M htdocs/theme/amarok/img/1updownarrow.png
M htdocs/theme/amarok/img/addfile.png
M htdocs/theme/amarok/img/button_edit.png
M htdocs/theme/amarok/img/calc.png
M htdocs/theme/amarok/img/calendar.png
M htdocs/theme/amarok/img/call.png
M htdocs/theme/amarok/img/call_out.png
M htdocs/theme/amarok/img/close.png
M htdocs/theme/amarok/img/delete.png
M htdocs/theme/amarok/img/detail.png
M htdocs/theme/amarok/img/disable.png
M htdocs/theme/amarok/img/edit.png
M htdocs/theme/amarok/img/edit_add.png
M htdocs/theme/amarok/img/edit_remove.png
M htdocs/theme/amarok/img/editdelete.png
M htdocs/theme/amarok/img/error.png
M htdocs/theme/amarok/img/file.png
M htdocs/theme/amarok/img/filenew.png
M htdocs/theme/amarok/img/filter.png
M htdocs/theme/amarok/img/folder-open.png
M htdocs/theme/amarok/img/folder.png
M htdocs/theme/amarok/img/grip.png
M htdocs/theme/amarok/img/help.png
M htdocs/theme/amarok/img/helpdoc.png
M htdocs/theme/amarok/img/high.png
M htdocs/theme/amarok/img/history.png
M htdocs/theme/amarok/img/indent1.png
M htdocs/theme/amarok/img/info.png
M htdocs/theme/amarok/img/lock.png
M htdocs/theme/amarok/img/logout.png
M htdocs/theme/amarok/img/mainlevel.gif
M htdocs/theme/amarok/img/money.png
M htdocs/theme/amarok/img/next.png
M htdocs/theme/amarok/img/object_account.png
M htdocs/theme/amarok/img/object_action.png
M htdocs/theme/amarok/img/object_barcode.png
M htdocs/theme/amarok/img/object_bill.png
M htdocs/theme/amarok/img/object_billa.png
M htdocs/theme/amarok/img/object_billd.png
M htdocs/theme/amarok/img/object_billr.png
M htdocs/theme/amarok/img/object_book.png
M htdocs/theme/amarok/img/object_bookmark.png
M htdocs/theme/amarok/img/object_calendar.png
M htdocs/theme/amarok/img/object_calendarday.png
M htdocs/theme/amarok/img/object_calendarweek.png
M htdocs/theme/amarok/img/object_category-expanded.png
M htdocs/theme/amarok/img/object_category.png
M htdocs/theme/amarok/img/object_commercial.png
M htdocs/theme/amarok/img/object_company.png
M htdocs/theme/amarok/img/object_contact.png
M htdocs/theme/amarok/img/object_contact_all.png
M htdocs/theme/amarok/img/object_contract.png
M htdocs/theme/amarok/img/object_dir.png
M htdocs/theme/amarok/img/object_email.png
M htdocs/theme/amarok/img/object_energie.png
M htdocs/theme/amarok/img/object_generic.png
M htdocs/theme/amarok/img/object_globe.png
M htdocs/theme/amarok/img/object_group.png
M htdocs/theme/amarok/img/object_intervention.png
M htdocs/theme/amarok/img/object_invoice.png
M htdocs/theme/amarok/img/object_label.png
M htdocs/theme/amarok/img/object_list.png
M htdocs/theme/amarok/img/object_opensurvey.png
M htdocs/theme/amarok/img/object_order.png
M htdocs/theme/amarok/img/object_payment.png
M htdocs/theme/amarok/img/object_phoning.png
M htdocs/theme/amarok/img/object_product.png
M htdocs/theme/amarok/img/object_project.png
M htdocs/theme/amarok/img/object_projectpub.png
M htdocs/theme/amarok/img/object_projecttask.png
M htdocs/theme/amarok/img/object_propal.png
M htdocs/theme/amarok/img/object_reduc.png
M htdocs/theme/amarok/img/object_rss.png
M htdocs/theme/amarok/img/object_sending.png
M htdocs/theme/amarok/img/object_service.png
M htdocs/theme/amarok/img/object_stock.png
M htdocs/theme/amarok/img/object_task.png
M htdocs/theme/amarok/img/object_technic.png
M htdocs/theme/amarok/img/object_trip.png
M htdocs/theme/amarok/img/object_user.png
M htdocs/theme/amarok/img/off.png
M htdocs/theme/amarok/img/ok.png
M htdocs/theme/amarok/img/on.png
M htdocs/theme/amarok/img/pdf2.png
M htdocs/theme/amarok/img/pdf3.png
M htdocs/theme/amarok/img/previous.png
M htdocs/theme/amarok/img/printer.png
M htdocs/theme/amarok/img/puce.png
M htdocs/theme/amarok/img/recent.png
M htdocs/theme/amarok/img/redstar.png
M htdocs/theme/amarok/img/refresh.png
M htdocs/theme/amarok/img/reload.png
M htdocs/theme/amarok/img/rightarrow.png
M htdocs/theme/amarok/img/search.png
M htdocs/theme/amarok/img/searchclear.png
M htdocs/theme/amarok/img/setup.png
M htdocs/theme/amarok/img/split.png
M htdocs/theme/amarok/img/star.png
M htdocs/theme/amarok/img/stats.png
M htdocs/theme/amarok/img/statut0.png
M htdocs/theme/amarok/img/statut1.png
M htdocs/theme/amarok/img/statut2.png
M htdocs/theme/amarok/img/statut3.png
M htdocs/theme/amarok/img/statut4.png
M htdocs/theme/amarok/img/statut5.png
M htdocs/theme/amarok/img/statut6.png
M htdocs/theme/amarok/img/statut7.png
M htdocs/theme/amarok/img/statut8.png
M htdocs/theme/amarok/img/statut9.png
M htdocs/theme/amarok/img/stcomm-1.png
M htdocs/theme/amarok/img/stcomm-1_grayed.png
M htdocs/theme/amarok/img/stcomm0.png
M htdocs/theme/amarok/img/stcomm0_grayed.png
M htdocs/theme/amarok/img/stcomm1.png
M htdocs/theme/amarok/img/stcomm1_grayed.png
M htdocs/theme/amarok/img/stcomm2.png
M htdocs/theme/amarok/img/stcomm2_grayed.png
M htdocs/theme/amarok/img/stcomm3.png
M htdocs/theme/amarok/img/stcomm3_grayed.png
M htdocs/theme/amarok/img/stcomm4.png
M htdocs/theme/amarok/img/stcomm4_grayed.png
M htdocs/theme/amarok/img/tick.png
M htdocs/theme/amarok/img/title.png
M htdocs/theme/amarok/img/unlock.png
M htdocs/theme/amarok/img/uparrow.png
M htdocs/theme/amarok/img/vcard.png
M htdocs/theme/amarok/img/view.png
M htdocs/theme/amarok/img/vmenu.png
M htdocs/theme/amarok/img/warning.png
M htdocs/theme/amarok/img/working.gif
M htdocs/theme/amarok/thumb.png
M htdocs/theme/amarok/tpl/README
M htdocs/theme/auguria/img/edit_add.png
M htdocs/theme/auguria/img/edit_remove.png
M htdocs/theme/auguria/img/menus/topmenu_bg.png
M htdocs/theme/auguria/img/menus/topmenu_right.png
M htdocs/theme/auguria/img/object_bill.png
M htdocs/theme/auguria/img/object_book.png
M htdocs/theme/auguria/img/object_calendarday.png
M htdocs/theme/auguria/img/object_calendarweek.png
M htdocs/theme/auguria/img/object_company.png
M htdocs/theme/auguria/img/object_contact.png
M htdocs/theme/auguria/img/object_contract.png
M htdocs/theme/auguria/img/object_invoice.png
M htdocs/theme/auguria/img/object_opensurvey.png
M htdocs/theme/auguria/img/object_order.png
M htdocs/theme/auguria/img/object_product.png
M htdocs/theme/auguria/img/object_propal.png
M htdocs/theme/auguria/img/stats.png
M htdocs/theme/auguria/img/statut8.png
M htdocs/theme/auguria/img/statut9.png
M htdocs/theme/bureau2crea/img/object_calendarday.png
M htdocs/theme/bureau2crea/img/object_calendarweek.png
M htdocs/theme/bureau2crea/img/object_opensurvey.png
M htdocs/theme/bureau2crea/img/stats.png
M htdocs/theme/bureau2crea/img/statut8.png
M htdocs/theme/cameleo/img/object_opensurvey.png
M htdocs/theme/cameleo/img/stats.png
M htdocs/theme/common/devices/audio-card.png
M htdocs/theme/common/devices/audio-headset.png
M htdocs/theme/common/devices/audio-input-line.png
M htdocs/theme/common/devices/audio-input-microphone.png
M htdocs/theme/common/devices/battery.png
M htdocs/theme/common/devices/camera-photo.png
M htdocs/theme/common/devices/camera-web.png
M htdocs/theme/common/devices/computer-laptop.png
M htdocs/theme/common/devices/computer.png
M htdocs/theme/common/devices/cpu.png
M htdocs/theme/common/devices/drive-harddisk.png
M htdocs/theme/common/devices/drive-optical.png
M htdocs/theme/common/devices/drive-removable-media-usb-pendrive.png
M htdocs/theme/common/devices/drive-removable-media-usb.png
M htdocs/theme/common/devices/drive-removable-media.png
M htdocs/theme/common/devices/input-gaming.png
M htdocs/theme/common/devices/input-keyboard.png
M htdocs/theme/common/devices/input-mouse.png
M htdocs/theme/common/devices/input-tablet.png
M htdocs/theme/common/devices/media-flash-memory-stick.png
M htdocs/theme/common/devices/media-flash-sd-mmc.png
M htdocs/theme/common/devices/media-flash-smart-media.png
M htdocs/theme/common/devices/media-flash.png
M htdocs/theme/common/devices/media-floppy.png
M htdocs/theme/common/devices/media-optical-audio.png
M htdocs/theme/common/devices/media-optical-blu-ray.png
M htdocs/theme/common/devices/media-optical-data.png
M htdocs/theme/common/devices/media-optical-dvd-video.png
M htdocs/theme/common/devices/media-optical-dvd.png
M htdocs/theme/common/devices/media-optical-mixed-cd.png
M htdocs/theme/common/devices/media-optical-recordable.png
M htdocs/theme/common/devices/media-optical-video.png
M htdocs/theme/common/devices/media-optical.png
M htdocs/theme/common/devices/media-tape.png
M htdocs/theme/common/devices/modem.png
M htdocs/theme/common/devices/multimedia-player-apple-ipod.png
M htdocs/theme/common/devices/multimedia-player.png
M htdocs/theme/common/devices/network-wired.png
M htdocs/theme/common/devices/network-wireless-connected-00.png
M htdocs/theme/common/devices/network-wireless-connected-100.png
M htdocs/theme/common/devices/network-wireless-connected-25.png
M htdocs/theme/common/devices/network-wireless-connected-50.png
M htdocs/theme/common/devices/network-wireless-connected-75.png
M htdocs/theme/common/devices/network-wireless-disconnected.png
M htdocs/theme/common/devices/network-wireless.png
M htdocs/theme/common/devices/pda.png
M htdocs/theme/common/devices/phone-openmoko-freerunner.png
M htdocs/theme/common/devices/phone.png
M htdocs/theme/common/devices/printer-laser.png
M htdocs/theme/common/devices/printer.png
M htdocs/theme/common/devices/scanner.png
M htdocs/theme/common/devices/video-display.png
M htdocs/theme/common/devices/video-projector.png
M htdocs/theme/common/devices/video-television.png
M htdocs/theme/common/emotes/face-angel.png
M htdocs/theme/common/emotes/face-embarrassed.png
M htdocs/theme/common/emotes/face-kiss.png
M htdocs/theme/common/emotes/face-laugh.png
M htdocs/theme/common/emotes/face-plain.png
M htdocs/theme/common/emotes/face-raspberry.png
M htdocs/theme/common/emotes/face-sad.png
M htdocs/theme/common/emotes/face-smile-big.png
M htdocs/theme/common/emotes/face-smile.png
M htdocs/theme/common/emotes/face-surprise.png
M htdocs/theme/common/emotes/face-uncertain.png
M htdocs/theme/common/emotes/face-wink.png
M htdocs/theme/common/gmap.png
M htdocs/theme/common/ical.gif
M htdocs/theme/common/mime/css.png
M htdocs/theme/common/mime/dotnet.png
M htdocs/theme/common/mime/encrypt.png
M htdocs/theme/common/mime/glasses.png
M htdocs/theme/common/mime/jnlp.png
M htdocs/theme/common/mime/library.png
M htdocs/theme/common/mime/lit.png
M htdocs/theme/common/mime/mdb.png
M htdocs/theme/common/mime/ooffice.png
M htdocs/theme/common/mime/page.png
M htdocs/theme/common/mime/readme.txt
M htdocs/theme/common/mime/rss.png
M htdocs/theme/common/rss.gif
M htdocs/theme/common/treemenu/folder2-expanded.png
M htdocs/theme/common/treemenu/folder2.png
M htdocs/theme/common/vcal.gif
M htdocs/theme/common/weather/weather-clear-night.png
M htdocs/theme/common/weather/weather-clear.png
M htdocs/theme/common/weather/weather-clouds-night.png
M htdocs/theme/common/weather/weather-clouds.png
M htdocs/theme/common/weather/weather-few-clouds-night.png
M htdocs/theme/common/weather/weather-few-clouds.png
M htdocs/theme/common/weather/weather-freezing-rain.png
M htdocs/theme/common/weather/weather-hail.png
M htdocs/theme/common/weather/weather-many-clouds.png
M htdocs/theme/common/weather/weather-mist.png
M htdocs/theme/common/weather/weather-showers-day.png
M htdocs/theme/common/weather/weather-showers-night.png
M htdocs/theme/common/weather/weather-showers-scattered-day.png
M htdocs/theme/common/weather/weather-showers-scattered-night.png
M htdocs/theme/common/weather/weather-showers-scattered.png
M htdocs/theme/common/weather/weather-showers.png
M htdocs/theme/common/weather/weather-snow-rain.png
M htdocs/theme/common/weather/weather-snow-scattered-day.png
M htdocs/theme/common/weather/weather-snow-scattered-night.png
M htdocs/theme/common/weather/weather-snow-scattered.png
M htdocs/theme/common/weather/weather-snow.png
M htdocs/theme/common/weather/weather-storm-day.png
M htdocs/theme/common/weather/weather-storm-night.png
M htdocs/theme/common/weather/weather-storm.png
M htdocs/theme/dolibarr.png
M htdocs/theme/dolibarr_logo.png
M htdocs/theme/doliforge_logo.png
M htdocs/theme/dolistore_logo.png
M htdocs/theme/eldy/img/liste_titre2.png
M htdocs/theme/eldy/img/object_opensurvey.png
M htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
M htdocs/webservices/demo_wsclient_category.php-NORUN
M htdocs/webservices/demo_wsclient_invoice.php-NORUN
M htdocs/webservices/demo_wsclient_order.php-NORUN
M htdocs/webservices/demo_wsclient_other.php-NORUN
M htdocs/webservices/demo_wsclient_productorservice.php-NORUN
M htdocs/webservices/demo_wsclient_thirdparty.php-NORUN
M test/phpunit/CMailFileTest.php
M test/phpunit/CategorieTest.php
M test/phpunit/ChargeSocialesTest.php
M test/phpunit/ContactTest.php
M test/phpunit/CoreTest.php
M test/phpunit/DiscountTest.php
M test/phpunit/EntrepotTest.php
M test/phpunit/Example_import_company_1.csv
M test/phpunit/ExportTest.php
M test/phpunit/Functions2LibTest.php
M test/phpunit/FunctionsLibTest.php
M test/phpunit/ImportTest.php
M test/phpunit/JsonLibTest.php
M test/phpunit/LangTest.php
M test/phpunit/ModulesTest.php
M test/phpunit/PdfDocTest.php
M test/phpunit/PgsqlTest.php
M test/phpunit/PricesTest.php
M test/phpunit/ProductTest.php
M test/phpunit/ScriptsTest.php
M test/phpunit/SecurityTest.php
M test/phpunit/SocieteTest.php
M test/phpunit/SqlTest.php
M test/phpunit/WebservicesInvoicesTest.php
M test/phpunit/WebservicesOrdersTest.php
M test/phpunit/WebservicesOtherTest.php
M test/phpunit/WebservicesProductsTest.php
M test/phpunit/WebservicesThirdpartyTest.php
M test/phpunit/WebservicesUserTest.php
M test/soapui/Dolibarr-soapui-project.xml
Log Message:
-----------
Merge pull request #4192 from GPCsolutions/3.6-3930
Fix #3930 Removed executable bit
Commit: 4a88c9ea9fe5dd50d2fd550d2094d37abc16db77
https://github.com/Dolibarr/dolibarr/commit/4a88c9ea9fe5dd50d2fd550d2094d37abc16db77
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-13 (Sun, 13 Dec 2015)
Changed paths:
M build/.gitignore
M build/aps/APP-META-1.1.xml
M build/aps/APP-META-1.2.xml
M build/aps/README
M build/aps/install.forced.php.install
M build/debian/conf.php.install
M build/debian/dolibarr.install
M build/debian/dolibarr.lintian-overrides
M build/debian/dolibarr.templates.futur
M build/debian/install.forced.php.install
M build/debian/po/POTFILES.in
M build/debian/po/fr.po
M build/doxygen/doxygen_footer.html
M build/doxygen/doxygen_header.html
M build/rpm/conf.php
M build/rpm/dolibarr-forrpm.patch
M build/rpm/dolibarr.desktop
M build/rpm/file_contexts.dolibarr
M build/rpm/install.forced.php.fedora
M build/rpm/install.forced.php.generic
M build/rpm/install.forced.php.mandriva
M build/rpm/install.forced.php.opensuse
M dev/codesniffer/README
M dev/codesniffer/php.ini
M dev/codesniffer/ruleset.dtd
M dev/codesniffer/ruleset.xml
M dev/codetemplates/README
M dev/codetemplates/codetemplates.dtd
M dev/codetemplates/codetemplates.xml
M dev/examples/README
M dev/iso-normes/GURULABS-RPM-GUIDE-v1.0.PDF
M dev/iso-normes/address_format.txt
M dev/iso-normes/banknumber_format.txt
M dev/iso-normes/xmlexport.txt
M dev/phpunit/README
M dev/phpunit/eclipse_setup_for_pti_phpunit.png
M dev/skeletons/build_webservice_from_class.php
M dev/test/testtcpdf.php
M doc/images/appicon_128.png
M doc/images/appicon_16.ico
M doc/images/appicon_16.png
M doc/images/appicon_32.png
M doc/images/appicon_48.ico
M doc/images/appicon_64.png
M doc/images/dolibarr_73x73.png
M doc/images/dolibarr_logo.png
M htdocs/core/filemanagerdol/browser/default/browser.css
M htdocs/core/filemanagerdol/browser/default/images/Folder.gif
M htdocs/core/filemanagerdol/browser/default/images/FolderUp.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/ai.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/avi.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/bmp.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/cs.gif
M
htdocs/core/filemanagerdol/browser/default/images/icons/32/default.icon.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/dll.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/doc.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/exe.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/fla.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/gif.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/htm.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/html.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/jpg.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/js.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/mdb.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/mp3.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/pdf.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/png.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/ppt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/rdp.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/swf.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/swt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/txt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/vsd.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/xls.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/xml.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/zip.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/ai.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/avi.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/bmp.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/cs.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/default.icon.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/dll.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/doc.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/exe.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/fla.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/gif.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/htm.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/html.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/jpg.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/js.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/mdb.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/mp3.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/pdf.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/png.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/ppt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/rdp.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/swf.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/swt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/txt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/vsd.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/xls.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/xml.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/zip.gif
M htdocs/core/filemanagerdol/browser/default/js/common.js
M htdocs/core/filemanagerdol/browser/default/js/fckxml.js
M htdocs/core/filemanagerdol/browser/default/spacer.gif
M htdocs/core/modules/security/generate/README
M htdocs/includes/fpdfi/README.txt
M htdocs/includes/jquery/plugins/colorpicker/jquery.colorpicker.css
M htdocs/includes/jquery/plugins/colorpicker/jquery.colorpicker.js
M htdocs/includes/jquery/plugins/jcrop/css/Jcrop.gif
M htdocs/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css
M htdocs/includes/jquery/plugins/jcrop/index.html
M htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.js
M htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js
M htdocs/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css
M htdocs/includes/jquery/plugins/jnotify/jquery.jnotify.css
M htdocs/includes/jquery/plugins/jpicker/ChangeLog.txt
M htdocs/includes/jquery/plugins/jpicker/Example.html
M htdocs/includes/jquery/plugins/jpicker/ReadMe.txt
M htdocs/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css
M htdocs/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.min.css
M htdocs/includes/jquery/plugins/jpicker/images/AlphaBar.png
M htdocs/includes/jquery/plugins/jpicker/images/Bars.png
M htdocs/includes/jquery/plugins/jpicker/images/Maps.png
M htdocs/includes/jquery/plugins/jpicker/images/NoColor.png
M htdocs/includes/jquery/plugins/jpicker/images/bar-opacity.png
M htdocs/includes/jquery/plugins/jpicker/images/map-opacity.png
M htdocs/includes/jquery/plugins/jpicker/images/mappoint.gif
M htdocs/includes/jquery/plugins/jpicker/images/picker.gif
M htdocs/includes/jquery/plugins/jpicker/images/preview-opacity.png
M htdocs/includes/jquery/plugins/jpicker/images/rangearrows.gif
M htdocs/includes/jquery/plugins/jpicker/jPicker.css
M htdocs/includes/jquery/plugins/jpicker/jpicker-1.1.6.js
M htdocs/includes/jquery/plugins/jpicker/jpicker-1.1.6.min.js
M htdocs/includes/jquery/plugins/jqueryFileTree/images/application.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/code.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/css.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/db.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/directory.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/doc.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/file.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/film.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/flash.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/folder_open.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/html.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/java.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/linux.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/music.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/pdf.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/php.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/picture.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/ppt.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/psd.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/ruby.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/script.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/spinner.gif
M htdocs/includes/jquery/plugins/jqueryFileTree/images/txt.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/xls.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/zip.png
M htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.css
M htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js
M htdocs/includes/jquery/plugins/tiptip/jquery.tipTip.js
M htdocs/includes/jquery/plugins/tiptip/jquery.tipTip.min.js
M htdocs/includes/jquery/plugins/tiptip/tipTip.css
M htdocs/includes/nusoap/lib/Mail/xmail.dtd
M htdocs/includes/nusoap/lib/Mail/xmail.xsl
M htdocs/includes/tcpdf/fonts/dejavusanscondensed.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusanscondensed.z
M htdocs/includes/tcpdf/fonts/dejavusanscondensedb.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusanscondensedb.z
M htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.z
M htdocs/includes/tcpdf/fonts/dejavusanscondensedi.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusanscondensedi.z
M htdocs/includes/tcpdf/fonts/dejavusansextralight.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusansextralight.z
M htdocs/includes/tcpdf/fonts/dejavusansmono.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusansmono.z
M htdocs/includes/tcpdf/fonts/dejavusansmonob.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusansmonob.z
M htdocs/includes/tcpdf/fonts/dejavusansmonobi.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusansmonobi.z
M htdocs/includes/tcpdf/fonts/dejavusansmonoi.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusansmonoi.z
M htdocs/install/doctemplates/projects/template_project.odt
M htdocs/install/mysql/data/llx_c_input_method.sql
M htdocs/install/mysql/data/llx_c_input_reason.sql
M htdocs/install/mysql/migration/3.0.0-3.1.0.sql
M htdocs/install/mysql/migration/3.1.0-3.2.0.sql
M htdocs/install/mysql/migration/3.2.0-3.3.0.sql
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
M htdocs/install/mysql/migration/3.4.0-3.5.0.sql
M htdocs/install/mysql/tables/llx_resource.key.sql
M htdocs/opensurvey/img/accept-24.png
M htdocs/opensurvey/img/accept.png
M htdocs/opensurvey/img/add-16.png
M htdocs/opensurvey/img/add-24.png
M htdocs/opensurvey/img/calendar-32.png
M htdocs/opensurvey/img/cancel.png
M htdocs/opensurvey/img/chart-32.png
M htdocs/opensurvey/img/fforward.png
M htdocs/opensurvey/img/medaille.png
M htdocs/opensurvey/img/next.png
M htdocs/opensurvey/img/object_opensurvey.png
M htdocs/opensurvey/img/previous.png
M htdocs/opensurvey/img/rewind.png
M htdocs/product/class/product.class.php
M htdocs/theme/amarok/AUTHOR
M htdocs/theme/amarok/img/mainlevel.gif
M htdocs/theme/amarok/img/working.gif
M htdocs/theme/amarok/tpl/README
M htdocs/theme/common/ical.gif
M htdocs/theme/common/mime/readme.txt
M htdocs/theme/common/rss.gif
M htdocs/theme/common/vcal.gif
M htdocs/webservices/demo_wsclient_order.php-NORUN
M test/phpunit/CMailFileTest.php
M test/phpunit/ChargeSocialesTest.php
M test/phpunit/ContactTest.php
M test/phpunit/CoreTest.php
M test/phpunit/DiscountTest.php
M test/phpunit/EntrepotTest.php
M test/phpunit/Example_import_company_1.csv
M test/phpunit/ImportTest.php
M test/phpunit/PdfDocTest.php
M test/phpunit/PgsqlTest.php
M test/phpunit/ProductTest.php
M test/phpunit/ScriptsTest.php
M test/phpunit/WebservicesOrdersTest.php
M test/phpunit/WebservicesOtherTest.php
M test/phpunit/WebservicesProductsTest.php
M test/phpunit/WebservicesUserTest.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/product/class/product.class.php
Commit: 1978eebb69d3c5cbbb5ab6b56cb6dfe837ef5e5b
https://github.com/Dolibarr/dolibarr/commit/1978eebb69d3c5cbbb5ab6b56cb6dfe837ef5e5b
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-13 (Sun, 13 Dec 2015)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Fix bad merge
Commit: dfbc2814e78d9c91f122b172096546ec63975d47
https://github.com/Dolibarr/dolibarr/commit/dfbc2814e78d9c91f122b172096546ec63975d47
Author: aspangaro <address@hidden>
Date: 2015-12-15 (Tue, 15 Dec 2015)
Changed paths:
M htdocs/accountancy/admin/card.php
Log Message:
-----------
Fix: Add an empty field for list of parent account - This value can be null
Commit: cb7f29b332e95df302a68ffc765643f56af30610
https://github.com/Dolibarr/dolibarr/commit/cb7f29b332e95df302a68ffc765643f56af30610
Author: Regis Houssin <address@hidden>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M htdocs/includes/adodbtime/adodb-time.inc.php
Log Message:
-----------
Fix: PHP 7 - Fatal error: 'break' not in the 'loop' or 'switch' context
Commit: 198e2cdcfa5ec2aa5a3f8426b0e0ffa8fd93f4b5
https://github.com/Dolibarr/dolibarr/commit/198e2cdcfa5ec2aa5a3f8426b0e0ffa8fd93f4b5
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M htdocs/includes/adodbtime/adodb-time.inc.php
Log Message:
-----------
Merge pull request #4237 from hregis/3.7_bug
Fix: PHP 7 - Fatal error: 'break' not in the 'loop' or 'switch' context
Commit: 7c1fc2fee1b28a70171a334895711ed109a4abc7
https://github.com/Dolibarr/dolibarr/commit/7c1fc2fee1b28a70171a334895711ed109a4abc7
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M htdocs/accountancy/admin/card.php
Log Message:
-----------
Merge pull request #4233 from aspangaro/3.7-accountancy1
Fix: Accountancy Add an empty field for list of parent account - This value can
be null
Commit: e6ec797af8e90ff5ec60135122cdc8561003f425
https://github.com/Dolibarr/dolibarr/commit/e6ec797af8e90ff5ec60135122cdc8561003f425
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-12-17 (Thu, 17 Dec 2015)
Changed paths:
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
M htdocs/core/modules/project/pdf/pdf_baleine.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
FIX #4242 Allow disabling dashes in documents
Commit: 02e053acc63916dc203ac16282210b40cbd0d44a
https://github.com/Dolibarr/dolibarr/commit/02e053acc63916dc203ac16282210b40cbd0d44a
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-12-17 (Thu, 17 Dec 2015)
Changed paths:
M htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
M htdocs/core/modules/project/doc/pdf_baleine.modules.php
Log Message:
-----------
FIX #4242 Allow disabling dashes in documents
3.7 specific fix since document files have moved
Commit: 21f7271e5177316d3ed7779dbafae20ae49d5a00
https://github.com/Dolibarr/dolibarr/commit/21f7271e5177316d3ed7779dbafae20ae49d5a00
Author: fmarcet <address@hidden>
Date: 2015-12-17 (Thu, 17 Dec 2015)
Changed paths:
M htdocs/contrat/class/contrat.class.php
Log Message:
-----------
FIX: Not deleting contrats on element_element table
Commit: 3d6f1d911a4c183ed15e0b144e2837f7a39f8ff5
https://github.com/Dolibarr/dolibarr/commit/3d6f1d911a4c183ed15e0b144e2837f7a39f8ff5
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
M htdocs/core/modules/project/pdf/pdf_baleine.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
Merge pull request #4247 from GPCsolutions/3.6-4242
FIX #4242 Allow disabling dashes in documents
Commit: 2a137cd126deb32779d7a9f1ef03266e62d9e960
https://github.com/Dolibarr/dolibarr/commit/2a137cd126deb32779d7a9f1ef03266e62d9e960
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
M htdocs/core/modules/project/doc/pdf_baleine.modules.php
Log Message:
-----------
Merge pull request #4248 from GPCsolutions/3.7-4242
FIX #4242 Allow disabling dashes in documents
Commit: 7af4d91828ede69ea215ce28714c31934cd267d4
https://github.com/Dolibarr/dolibarr/commit/7af4d91828ede69ea215ce28714c31934cd267d4
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M htdocs/contrat/class/contrat.class.php
Log Message:
-----------
Merge pull request #4251 from fmarcet/3.6
FIX: Not deleting contracts on element_element table
Commit: aa7e74f4c866d8dcf8d3dbb976bbeb4cfbcf7d00
https://github.com/Dolibarr/dolibarr/commit/aa7e74f4c866d8dcf8d3dbb976bbeb4cfbcf7d00
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M .travis.yml
Log Message:
-----------
Try to fix travis error using the new setup
Commit: 5c8731b1974eaf3d3f5d9b295ccfab5f72ea9bb3
https://github.com/Dolibarr/dolibarr/commit/5c8731b1974eaf3d3f5d9b295ccfab5f72ea9bb3
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M htdocs/accountancy/admin/card.php
M htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
M htdocs/core/modules/project/doc/pdf_baleine.modules.php
M htdocs/includes/adodbtime/adodb-time.inc.php
Log Message:
-----------
Merge branch '3.7' of address@hidden:Dolibarr/dolibarr.git into 3.7
Commit: 480111c6b19ccd6ade97b4250ba23a2aedc54ef1
https://github.com/Dolibarr/dolibarr/commit/480111c6b19ccd6ade97b4250ba23a2aedc54ef1
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M .travis.yml
Log Message:
-----------
Try to fix travis error using new setup
Commit: 056ab6368029a681cbfa40222a3f2ef81559fb9a
https://github.com/Dolibarr/dolibarr/commit/056ab6368029a681cbfa40222a3f2ef81559fb9a
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M .travis.yml
Log Message:
-----------
Try to fix travis error using new setup
Commit: 0dc4130a17ecba7e2811404c7511b9972948331e
https://github.com/Dolibarr/dolibarr/commit/0dc4130a17ecba7e2811404c7511b9972948331e
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M .travis.yml
Log Message:
-----------
Add debug
Commit: 064fad136e60c741527f4f9eb048b73bdee11dac
https://github.com/Dolibarr/dolibarr/commit/064fad136e60c741527f4f9eb048b73bdee11dac
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M composer.json
Log Message:
-----------
Try to solve travis pb
Commit: 11042fe49969ff0038dfaee70141776a433bd0b5
https://github.com/Dolibarr/dolibarr/commit/11042fe49969ff0038dfaee70141776a433bd0b5
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M .travis.yml
Log Message:
-----------
Restore data missin help debug
Commit: 61df71cc6450f1c5f32cb551eaacd54728018709
https://github.com/Dolibarr/dolibarr/commit/61df71cc6450f1c5f32cb551eaacd54728018709
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M .travis.yml
Log Message:
-----------
Fix travis
Commit: b47dc8a394ac172db821d723fe17e24bed7b80ee
https://github.com/Dolibarr/dolibarr/commit/b47dc8a394ac172db821d723fe17e24bed7b80ee
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M .travis.yml
A build/travis-ci/apache.conf
Log Message:
-----------
Fix to use new travis setup
Commit: c1c0fa88c22dd5e0d2ee586ba95d550b08046620
https://github.com/Dolibarr/dolibarr/commit/c1c0fa88c22dd5e0d2ee586ba95d550b08046620
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M .travis.yml
A build/travis-ci/apache.conf
Log Message:
-----------
Fix for new travis setup
Commit: ebf68ecbe07468576ec44767b22d6afe2953b305
https://github.com/Dolibarr/dolibarr/commit/ebf68ecbe07468576ec44767b22d6afe2953b305
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M .travis.yml
M htdocs/contrat/class/contrat.class.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
M htdocs/core/modules/project/doc/pdf_baleine.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
.travis.yml
htdocs/contrat/class/contrat.class.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/modules/project/pdf/pdf_baleine.modules.php
Commit: 41cdb65521cb2cbea078a5c9614284575e21fd13
https://github.com/Dolibarr/dolibarr/commit/41cdb65521cb2cbea078a5c9614284575e21fd13
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M test/phpunit/WebservicesProductsTest.php
Log Message:
-----------
Test to solve travis error
Commit: a136e90749812163b7464efae9d2aecfb27ec1d5
https://github.com/Dolibarr/dolibarr/commit/a136e90749812163b7464efae9d2aecfb27ec1d5
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-19 (Sat, 19 Dec 2015)
Changed paths:
M .travis.yml
M htdocs/filefunc.inc.php
M test/phpunit/AllTests.php
M test/phpunit/WebservicesProductsTest.php
Log Message:
-----------
Fix travis
Commit: 0df45f10c15bbcdbd10c755f3f5c85664a7337bd
https://github.com/Dolibarr/dolibarr/commit/0df45f10c15bbcdbd10c755f3f5c85664a7337bd
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-19 (Sat, 19 Dec 2015)
Changed paths:
M .travis.yml
M htdocs/filefunc.inc.php
Log Message:
-----------
Fix travis
Commit: b1b2038d71033771263b8d8b63888c2d0b89ecad
https://github.com/Dolibarr/dolibarr/commit/b1b2038d71033771263b8d8b63888c2d0b89ecad
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-19 (Sat, 19 Dec 2015)
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Commit: a08909db26f65645e6078184c00aa2529653e007
https://github.com/Dolibarr/dolibarr/commit/a08909db26f65645e6078184c00aa2529653e007
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-19 (Sat, 19 Dec 2015)
Changed paths:
M .travis.yml
M build/.gitignore
M build/aps/APP-META-1.1.xml
M build/aps/APP-META-1.2.xml
M build/aps/README
M build/aps/install.forced.php.install
M build/debian/conf.php.install
M build/debian/dolibarr.install
M build/debian/dolibarr.lintian-overrides
M build/debian/dolibarr.templates.futur
M build/debian/install.forced.php.install
M build/debian/po/POTFILES.in
M build/debian/po/fr.po
M build/doxygen/doxygen_footer.html
M build/doxygen/doxygen_header.html
M build/rpm/conf.php
M build/rpm/dolibarr-forrpm.patch
M build/rpm/dolibarr.desktop
M build/rpm/file_contexts.dolibarr
M build/rpm/install.forced.php.fedora
M build/rpm/install.forced.php.generic
M build/rpm/install.forced.php.mandriva
M build/rpm/install.forced.php.opensuse
A build/travis-ci/apache.conf
M composer.json
M dev/codesniffer/README
M dev/codesniffer/php.ini
M dev/codesniffer/ruleset.dtd
M dev/codesniffer/ruleset.xml
M dev/codetemplates/README
M dev/codetemplates/codetemplates.dtd
M dev/codetemplates/codetemplates.xml
M dev/examples/README
M dev/iso-normes/GURULABS-RPM-GUIDE-v1.0.PDF
M dev/iso-normes/address_format.txt
M dev/iso-normes/banknumber_format.txt
M dev/iso-normes/xmlexport.txt
M dev/phpunit/README
M dev/phpunit/eclipse_setup_for_pti_phpunit.png
M dev/skeletons/build_webservice_from_class.php
M dev/test/testtcpdf.php
M doc/images/appicon_128.png
M doc/images/appicon_16.ico
M doc/images/appicon_16.png
M doc/images/appicon_32.png
M doc/images/appicon_48.ico
M doc/images/appicon_64.png
M doc/images/dolibarr_73x73.png
M doc/images/dolibarr_logo.png
M htdocs/accountancy/admin/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/filemanagerdol/browser/default/browser.css
M htdocs/core/filemanagerdol/browser/default/images/Folder.gif
M htdocs/core/filemanagerdol/browser/default/images/FolderUp.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/ai.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/avi.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/bmp.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/cs.gif
M
htdocs/core/filemanagerdol/browser/default/images/icons/32/default.icon.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/dll.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/doc.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/exe.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/fla.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/gif.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/htm.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/html.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/jpg.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/js.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/mdb.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/mp3.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/pdf.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/png.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/ppt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/rdp.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/swf.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/swt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/txt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/vsd.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/xls.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/xml.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/32/zip.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/ai.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/avi.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/bmp.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/cs.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/default.icon.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/dll.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/doc.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/exe.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/fla.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/gif.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/htm.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/html.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/jpg.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/js.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/mdb.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/mp3.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/pdf.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/png.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/ppt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/rdp.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/swf.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/swt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/txt.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/vsd.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/xls.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/xml.gif
M htdocs/core/filemanagerdol/browser/default/images/icons/zip.gif
M htdocs/core/filemanagerdol/browser/default/js/common.js
M htdocs/core/filemanagerdol/browser/default/js/fckxml.js
M htdocs/core/filemanagerdol/browser/default/spacer.gif
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/security/generate/README
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/filefunc.inc.php
M htdocs/includes/adodbtime/adodb-time.inc.php
M htdocs/includes/fpdfi/README.txt
M htdocs/includes/jquery/plugins/colorpicker/jquery.colorpicker.css
M htdocs/includes/jquery/plugins/colorpicker/jquery.colorpicker.js
M htdocs/includes/jquery/plugins/jcrop/css/Jcrop.gif
M htdocs/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css
M htdocs/includes/jquery/plugins/jcrop/index.html
M htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.js
M htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js
M htdocs/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css
M htdocs/includes/jquery/plugins/jnotify/jquery.jnotify.css
M htdocs/includes/jquery/plugins/jpicker/ChangeLog.txt
M htdocs/includes/jquery/plugins/jpicker/Example.html
M htdocs/includes/jquery/plugins/jpicker/ReadMe.txt
M htdocs/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css
M htdocs/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.min.css
M htdocs/includes/jquery/plugins/jpicker/images/AlphaBar.png
M htdocs/includes/jquery/plugins/jpicker/images/Bars.png
M htdocs/includes/jquery/plugins/jpicker/images/Maps.png
M htdocs/includes/jquery/plugins/jpicker/images/NoColor.png
M htdocs/includes/jquery/plugins/jpicker/images/bar-opacity.png
M htdocs/includes/jquery/plugins/jpicker/images/map-opacity.png
M htdocs/includes/jquery/plugins/jpicker/images/mappoint.gif
M htdocs/includes/jquery/plugins/jpicker/images/picker.gif
M htdocs/includes/jquery/plugins/jpicker/images/preview-opacity.png
M htdocs/includes/jquery/plugins/jpicker/images/rangearrows.gif
M htdocs/includes/jquery/plugins/jpicker/jPicker.css
M htdocs/includes/jquery/plugins/jpicker/jpicker-1.1.6.js
M htdocs/includes/jquery/plugins/jpicker/jpicker-1.1.6.min.js
M htdocs/includes/jquery/plugins/jqueryFileTree/images/application.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/code.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/css.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/db.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/directory.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/doc.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/file.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/film.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/flash.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/folder_open.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/html.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/java.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/linux.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/music.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/pdf.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/php.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/picture.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/ppt.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/psd.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/ruby.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/script.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/spinner.gif
M htdocs/includes/jquery/plugins/jqueryFileTree/images/txt.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/xls.png
M htdocs/includes/jquery/plugins/jqueryFileTree/images/zip.png
M htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.css
M htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js
M htdocs/includes/jquery/plugins/tiptip/jquery.tipTip.js
M htdocs/includes/jquery/plugins/tiptip/jquery.tipTip.min.js
M htdocs/includes/jquery/plugins/tiptip/tipTip.css
M htdocs/includes/nusoap/lib/Mail/xmail.dtd
M htdocs/includes/nusoap/lib/Mail/xmail.xsl
M htdocs/includes/tcpdf/fonts/dejavusanscondensed.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusanscondensed.z
M htdocs/includes/tcpdf/fonts/dejavusanscondensedb.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusanscondensedb.z
M htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.z
M htdocs/includes/tcpdf/fonts/dejavusanscondensedi.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusanscondensedi.z
M htdocs/includes/tcpdf/fonts/dejavusansextralight.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusansextralight.z
M htdocs/includes/tcpdf/fonts/dejavusansmono.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusansmono.z
M htdocs/includes/tcpdf/fonts/dejavusansmonob.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusansmonob.z
M htdocs/includes/tcpdf/fonts/dejavusansmonobi.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusansmonobi.z
M htdocs/includes/tcpdf/fonts/dejavusansmonoi.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusansmonoi.z
M htdocs/install/doctemplates/projects/template_project.odt
M htdocs/install/mysql/data/llx_c_input_method.sql
M htdocs/install/mysql/data/llx_c_input_reason.sql
M htdocs/install/mysql/migration/3.0.0-3.1.0.sql
M htdocs/install/mysql/migration/3.1.0-3.2.0.sql
M htdocs/install/mysql/migration/3.2.0-3.3.0.sql
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
M htdocs/install/mysql/migration/3.4.0-3.5.0.sql
M htdocs/install/mysql/tables/llx_resource.key.sql
M htdocs/opensurvey/img/accept-24.png
M htdocs/opensurvey/img/accept.png
M htdocs/opensurvey/img/add-16.png
M htdocs/opensurvey/img/add-24.png
M htdocs/opensurvey/img/calendar-32.png
M htdocs/opensurvey/img/cancel.png
M htdocs/opensurvey/img/chart-32.png
M htdocs/opensurvey/img/fforward.png
M htdocs/opensurvey/img/medaille.png
M htdocs/opensurvey/img/next.png
M htdocs/opensurvey/img/object_opensurvey.png
M htdocs/opensurvey/img/previous.png
M htdocs/opensurvey/img/rewind.png
M htdocs/product/class/product.class.php
M htdocs/theme/amarok/AUTHOR
M htdocs/theme/amarok/img/mainlevel.gif
M htdocs/theme/amarok/img/working.gif
M htdocs/theme/amarok/tpl/README
M htdocs/theme/common/ical.gif
M htdocs/theme/common/mime/readme.txt
M htdocs/theme/common/rss.gif
M htdocs/theme/common/vcal.gif
M htdocs/webservices/demo_wsclient_order.php-NORUN
M test/phpunit/AllTests.php
M test/phpunit/CMailFileTest.php
M test/phpunit/ChargeSocialesTest.php
M test/phpunit/ContactTest.php
M test/phpunit/CoreTest.php
M test/phpunit/DiscountTest.php
M test/phpunit/EntrepotTest.php
M test/phpunit/Example_import_company_1.csv
M test/phpunit/ImportTest.php
M test/phpunit/PdfDocTest.php
M test/phpunit/PgsqlTest.php
M test/phpunit/ProductTest.php
M test/phpunit/ScriptsTest.php
M test/phpunit/WebservicesOrdersTest.php
M test/phpunit/WebservicesOtherTest.php
M test/phpunit/WebservicesProductsTest.php
M test/phpunit/WebservicesUserTest.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.7_backported
Compare:
https://github.com/Dolibarr/dolibarr/compare/320563eea98f...a08909db26f6