[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] d13629: Merge remote-tracking branch
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] d13629: Merge remote-tracking branch 'refs/remotes/upstrea... |
|
Date: |
Fri, 05 Feb 2016 02:12:33 -0800 |
Branch: refs/heads/3.8
Home: https://github.com/Dolibarr/dolibarr
Commit: d1362951d71109f918a4af032038d08437ee7432
https://github.com/Dolibarr/dolibarr/commit/d1362951d71109f918a4af032038d08437ee7432
Author: fappels <address@hidden>
Date: 2016-02-03 (Wed, 03 Feb 2016)
Changed paths:
M .travis.yml
M ChangeLog
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/copyright
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/makepack-dolibarr.pl
M build/makepack-howto.txt
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
A dev/initdata/documents_demo/.htaccess
A dev/initdata/documents_demo/commande/(PROV6)/(PROV6).pdf
A dev/initdata/documents_demo/commande/CO1107-0002/CO1107-0002.pdf
A dev/initdata/documents_demo/commande/CO1107-0003/CO1107-0003.pdf
A dev/initdata/documents_demo/commande/CO1107-0004/CO1107-0004.pdf
A dev/initdata/documents_demo/commande/CO1108-0001/CO1108-0001.pdf
A dev/initdata/documents_demo/custom/main.inc.php
A dev/initdata/documents_demo/custom/master.inc.php
A dev/initdata/documents_demo/doctemplates/invoices/template_invoice.odt
A dev/initdata/documents_demo/doctemplates/orders/template_order.odt
A dev/initdata/documents_demo/doctemplates/projects/template_project.odt
A dev/initdata/documents_demo/doctemplates/proposals/template_proposal.odt
A dev/initdata/documents_demo/doctemplates/tasks/template_task_summary.odt
A
dev/initdata/documents_demo/doctemplates/thirdparties/template_thirdparty.odt
A dev/initdata/documents_demo/expedition/sending/SH1302-0001/SH1302-0001.pdf
A dev/initdata/documents_demo/expensereport/(PROV2)/(PROV2).pdf
A
dev/initdata/documents_demo/expensereport/ADMIN-ER00001-150101/ADMIN-ER00001-150101.pdf
A
dev/initdata/documents_demo/expensereport/ADMIN-ER00002-150101/ADMIN-ER00002-150101.pdf
A dev/initdata/documents_demo/facture/(PROV149)/(PROV149).pdf
A dev/initdata/documents_demo/facture/AV1212-0001/AV1212-0001.pdf
A dev/initdata/documents_demo/facture/AV1212-0002/AV1212-0002.pdf
A dev/initdata/documents_demo/facture/AV1303-0003/AV1303-0003.pdf
A dev/initdata/documents_demo/facture/FA1007-0002/FA1007-0002.pdf
A dev/initdata/documents_demo/facture/FA1107-0006/FA1107-0006.pdf
A dev/initdata/documents_demo/facture/FA1107-0019/FA1107-0019_invoice.odt
A dev/initdata/documents_demo/facture/FA1108-0003/FA1108-0003.pdf
A dev/initdata/documents_demo/facture/FA1108-0004/FA1108-0004.pdf
A dev/initdata/documents_demo/facture/FA1108-0005/FA1108-0005.pdf
A dev/initdata/documents_demo/facture/FA1108-0007/FA1108-0007.pdf
A dev/initdata/documents_demo/facture/FA1212-0009/FA1212-0009.pdf
A dev/initdata/documents_demo/facture/FA1212-0009/FA1212-0009_invoice.odt
A dev/initdata/documents_demo/facture/FA1212-0011/FA1212-0011.pdf
A dev/initdata/documents_demo/facture/FA1212-0021/FA1212-0021.pdf
A dev/initdata/documents_demo/facture/FA1212-0023/FA1212-0023.pdf
A dev/initdata/documents_demo/facture/FA1507-0015/FA1507-0015.pdf
A dev/initdata/documents_demo/facture/FA1507-0015/FA1507-0015_invoice.odt
A dev/initdata/documents_demo/ficheinter/FI1007-0001/FI1007-0001.pdf
A dev/initdata/documents_demo/ficheinter/FI1511-0003/FI1511-0003.pdf
A
dev/initdata/documents_demo/fournisseur/commande/CF1007-0001/CF1007-0001.pdf
A
dev/initdata/documents_demo/fournisseur/commande/CF1007-0002/CF1007-0002.pdf
A
dev/initdata/documents_demo/fournisseur/commande/CF1303-0004/CF1303-0004.pdf
A dev/initdata/documents_demo/fournisseur/facture/6/1/16/16.pdf
A dev/initdata/documents_demo/fournisseur/facture/7/1/17/17.pdf
A dev/initdata/documents_demo/mycompany/logos/mybigcompany.png
A dev/initdata/documents_demo/mycompany/logos/thumbs/mybigcompany_mini.png
A dev/initdata/documents_demo/mycompany/logos/thumbs/mybigcompany_small.png
A dev/initdata/documents_demo/produit/APPLEPIE/applepieproduct.jpg
A
dev/initdata/documents_demo/produit/APPLEPIE/thumbs/applepieproduct_mini.jpg
A dev/initdata/documents_demo/produit/CAKECONTRIB/applepieproduct.jpg
A
dev/initdata/documents_demo/produit/CAKECONTRIB/thumbs/applepieproduct_mini.jpg
A dev/initdata/documents_demo/produit/COMP-XP4523/compxp4523product.jpg
A
dev/initdata/documents_demo/produit/COMP-XP4523/thumbs/compxp4523product_mini.jpg
A dev/initdata/documents_demo/produit/DOLIDROID/dolidroid_114x114.png
A dev/initdata/documents_demo/produit/DOLIDROID/dolidroid_512x512_en.png
A
dev/initdata/documents_demo/produit/DOLIDROID/dolidroid_screenshot_home_720x1280.png
A
dev/initdata/documents_demo/produit/DOLIDROID/thumbs/dolidroid_114x114_mini.png
A
dev/initdata/documents_demo/produit/DOLIDROID/thumbs/dolidroid_512x512_en_mini.png
A
dev/initdata/documents_demo/produit/DOLIDROID/thumbs/dolidroid_screenshot_home_720x1280_mini.png
A dev/initdata/documents_demo/produit/PEARPIE/pearpieproduct.jpg
A dev/initdata/documents_demo/produit/PEARPIE/thumbs/pearpieproduct_mini.jpg
A dev/initdata/documents_demo/produit/PINKDRESS/pinkdressproduct.jpg
A
dev/initdata/documents_demo/produit/PINKDRESS/thumbs/pinkdressproduct_mini.jpg
A dev/initdata/documents_demo/produit/ROLLUPABC/rolluproduct.jpg
A dev/initdata/documents_demo/produit/ROLLUPABC/thumbs/rolluproduct_mini.jpg
A dev/initdata/documents_demo/propale/PR1007-0001/PR1007-0001.pdf
A dev/initdata/documents_demo/propale/PR1007-0002/PR1007-0002.pdf
A dev/initdata/documents_demo/propale/PR1302-0005/PR1302-0005.pdf
A dev/initdata/documents_demo/propale/PR1302-0006/PR1302-0006.pdf
A dev/initdata/documents_demo/propale/PR1302-0007/PR1302-0007.pdf
A dev/initdata/documents_demo/societe/1/logos/indiancompany.png
A dev/initdata/documents_demo/societe/1/logos/thumbs/indiancompany_mini.png
A dev/initdata/documents_demo/societe/1/logos/thumbs/indiancompany_small.png
A dev/initdata/documents_demo/societe/10/logos/logo_nltechno_94x100.png
A
dev/initdata/documents_demo/societe/10/logos/thumbs/logo_nltechno_94x100_mini.png
A
dev/initdata/documents_demo/societe/10/logos/thumbs/logo_nltechno_94x100_small.png
A dev/initdata/documents_demo/societe/11/logos/comapnycorp1company.png
A
dev/initdata/documents_demo/societe/11/logos/thumbs/comapnycorp1company_mini.png
A
dev/initdata/documents_demo/societe/11/logos/thumbs/comapnycorp1company_small.png
A dev/initdata/documents_demo/societe/12/logos/pierrecurie.jpg
A dev/initdata/documents_demo/societe/12/logos/thumbs/pierrecurie_mini.jpg
A dev/initdata/documents_demo/societe/12/logos/thumbs/pierrecurie_small.jpg
A dev/initdata/documents_demo/societe/13/logos/companycorp2company.png
A
dev/initdata/documents_demo/societe/13/logos/thumbs/companycorp2company_mini.png
A
dev/initdata/documents_demo/societe/13/logos/thumbs/companycorp2company_small.png
A dev/initdata/documents_demo/societe/17/logos/bookkeepercompany.png
A
dev/initdata/documents_demo/societe/17/logos/thumbs/bookkeepercompany_mini.png
A
dev/initdata/documents_demo/societe/17/logos/thumbs/bookkeepercompany_small.png
A dev/initdata/documents_demo/societe/19/logos/magicfoodstore.png
A
dev/initdata/documents_demo/societe/19/logos/thumbs/magicfoodstore_mini.png
A
dev/initdata/documents_demo/societe/19/logos/thumbs/magicfoodstore_small.png
A dev/initdata/documents_demo/societe/2/logos/teclibcompany.png
A dev/initdata/documents_demo/societe/2/logos/thumbs/teclibcompany_mini.png
A dev/initdata/documents_demo/societe/2/logos/thumbs/teclibcompany_small.png
A dev/initdata/documents_demo/societe/25/logos/printcompany.png
A dev/initdata/documents_demo/societe/25/logos/thumbs/printcompany_mini.png
A dev/initdata/documents_demo/societe/25/logos/thumbs/printcompany_small.png
A dev/initdata/documents_demo/societe/3/logos/spanishcompany.png
A dev/initdata/documents_demo/societe/3/logos/thumbs/spanishcompany_mini.png
A
dev/initdata/documents_demo/societe/3/logos/thumbs/spanishcompany_small.png
A dev/initdata/documents_demo/societe/4/logos/thumbs/valeencompany_mini.png
A dev/initdata/documents_demo/societe/4/logos/thumbs/valeencompany_small.png
A dev/initdata/documents_demo/societe/4/logos/valeencompany.png
A dev/initdata/documents_demo/societe/5/logos/nocountrycomp.png
A dev/initdata/documents_demo/societe/5/logos/thumbs/nocountrycomp_mini.png
A dev/initdata/documents_demo/societe/5/logos/thumbs/nocountrycomp_small.png
A dev/initdata/documents_demo/societe/6/logos/swisstouch.png
A dev/initdata/documents_demo/societe/6/logos/thumbs/swisstouch_mini.png
A dev/initdata/documents_demo/societe/6/logos/thumbs/swisstouch_small.png
A dev/initdata/documents_demo/societe/7/logos/genericcustomer.png
A
dev/initdata/documents_demo/societe/7/logos/thumbs/genericcustomer_mini.png
A
dev/initdata/documents_demo/societe/7/logos/thumbs/genericcustomer_small.png
A dev/initdata/documents_demo/users/0/1/mariecurie.jpg
A dev/initdata/documents_demo/users/0/1/thumbs/mariecurie_mini.jpg
A dev/initdata/documents_demo/users/0/1/thumbs/mariecurie_small.jpg
A dev/initdata/documents_demo/users/1/0/IMG_0013.jpg
A dev/initdata/documents_demo/users/1/0/alberteinstein.jpg
A dev/initdata/documents_demo/users/1/0/thumbs/IMG_0013_mini.jpg
A dev/initdata/documents_demo/users/1/0/thumbs/IMG_0013_small.jpg
A dev/initdata/documents_demo/users/1/0/thumbs/alberteinstein_mini.jpg
A dev/initdata/documents_demo/users/1/0/thumbs/alberteinstein_small.jpg
A dev/initdata/documents_demo/users/2/0/daviddoe.png
A dev/initdata/documents_demo/users/2/0/thumbs/daviddoe_mini.png
A dev/initdata/documents_demo/users/2/0/thumbs/daviddoe_small.png
A dev/initdata/documents_demo/users/3/0/pierrecurie.jpg
A dev/initdata/documents_demo/users/3/0/thumbs/pierrecurie_mini.jpg
A dev/initdata/documents_demo/users/3/0/thumbs/pierrecurie_small.jpg
A dev/initdata/documents_demo/users/8/1/ldestailleur_200x200.jpg
A dev/initdata/documents_demo/users/8/1/thumbs/ldestailleur_200x200_mini.jpg
A
dev/initdata/documents_demo/users/8/1/thumbs/ldestailleur_200x200_small.jpg
R dev/initdata/img/alberteinstein.jpg
R dev/initdata/img/bookkeepercompany.png
R dev/initdata/img/johndoe.png
R dev/initdata/img/mariecurie.jpg
R dev/initdata/img/mybigcompany.png
R dev/initdata/img/pierrecurie.jpg
R dev/initdata/img/printcompany.png
M dev/initdata/mysqldump_dolibarr_3.8.0.sql
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/account.php
M htdocs/accountancy/admin/card.php
M htdocs/accountancy/bookkeeping/list.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/accountancy/supplier/list.php
M htdocs/admin/agenda_extsites.php
M htdocs/admin/delais.php
M htdocs/admin/dict.php
M htdocs/admin/tools/purge.php
M htdocs/bookmarks/card.php
M htdocs/categories/class/categorie.class.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/card.php
M htdocs/comm/mailing/cibles.php
M htdocs/comm/mailing/class/mailing.class.php
M htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/orderstoinvoice.php
M htdocs/compta/bank/card.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/rappro.php
M htdocs/compta/deplacement/card.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/mergepdftool.php
M htdocs/contrat/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/ajax/row.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/dolprintipp.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formprojet.class.php
M htdocs/core/class/translate.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/lib/admin.lib.php
M htdocs/core/lib/date.lib.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/price.lib.php
M htdocs/core/lib/report.lib.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.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/modECM.class.php
M htdocs/core/modules/project/task/doc/doc_generic_task_odt.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/core/tpl/objectline_create.tpl.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expedition/list.php
M htdocs/expensereport/list.php
M htdocs/filefunc.inc.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/product/list.php
M htdocs/holiday/card.php
M htdocs/holiday/list.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/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/langs/en_US/accountancy.lang
M htdocs/langs/en_US/mails.lang
M htdocs/langs/en_US/projects.lang
M htdocs/langs/en_US/sms.lang
M htdocs/langs/en_US/trips.lang
M htdocs/langs/en_US/users.lang
M htdocs/main.inc.php
M htdocs/margin/tabs/thirdpartyMargins.php
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/opensurvey/wizard/index.php
M htdocs/product/ajax/products.php
M htdocs/product/class/product.class.php
M htdocs/product/list.php
M htdocs/product/price.php
M htdocs/product/stock/class/mouvementstock.class.php
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/projet/element.php
M htdocs/projet/tasks/time.php
M htdocs/public/cron/cron_run_jobs.php
M htdocs/public/demo/index.php
M htdocs/resource/class/resource.class.php
M htdocs/resource/list.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/consumption.php
M htdocs/societe/index.php
M htdocs/societe/notify/card.php
M htdocs/societe/price.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/mime/readme.txt
M htdocs/theme/eldy/style.css.php
M htdocs/user/card.php
M htdocs/user/class/user.class.php
M htdocs/viewimage.php
M htdocs/webservices/demo_wsclient_order.php-NORUN
M test/phpunit/AllTests.php
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/NumberingModulesTest.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
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/upstream/3.8' into 3.8
Commit: 5f7cb75518168d679657b110eec382c26f529b54
https://github.com/Dolibarr/dolibarr/commit/5f7cb75518168d679657b110eec382c26f529b54
Author: Francis Appels <address@hidden>
Date: 2016-02-03 (Wed, 03 Feb 2016)
Changed paths:
M htdocs/product/card.php
Log Message:
-----------
Fix #4556 desiredstock and seuil_stock_alerte cleared on modify product card
removed inputs from update form also removed from update action
Commit: e9ee81682652181fec13fad33b4a1da8bfd8536d
https://github.com/Dolibarr/dolibarr/commit/e9ee81682652181fec13fad33b4a1da8bfd8536d
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-05 (Fri, 05 Feb 2016)
Changed paths:
M htdocs/product/card.php
Log Message:
-----------
Merge pull request #4561 from fappels/3.8
Fix #4556 Desired minimum stock and Stock limit for alert cleared on modify
product
Compare:
https://github.com/Dolibarr/dolibarr/compare/c9c5484805f0...e9ee81682652
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] d13629: Merge remote-tracking branch 'refs/remotes/upstrea...,
Laurent Destailleur <=