[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 337643: Accountancy : Correct errors
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 337643: Accountancy : Correct errors of display in bank jo... |
|
Date: |
Sun, 13 Dec 2015 07:23:42 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 337643e53e29b9862b92c6d73ce7a27975e79d02
https://github.com/Dolibarr/dolibarr/commit/337643e53e29b9862b92c6d73ce7a27975e79d02
Author: aspangaro <address@hidden>
Date: 2015-11-04 (Wed, 04 Nov 2015)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
Log Message:
-----------
Accountancy : Correct errors of display in bank journal
Commit: 875d1d078d24fe4c0828f26a93cc739d7e45df87
https://github.com/Dolibarr/dolibarr/commit/875d1d078d24fe4c0828f26a93cc739d7e45df87
Author: fappels <address@hidden>
Date: 2015-11-07 (Sat, 07 Nov 2015)
Changed paths:
M htdocs/admin/dict.php
M htdocs/compta/facture.php
M htdocs/core/class/html.formfile.class.php
A htdocs/core/js/select2_locale.js.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/mailings/modules_mailings.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/tpl/document_actions_pre_headers.tpl.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/commande/orderstoinvoice.php
R htdocs/install/filelist.xml
M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
M htdocs/langs/en_US/main.lang
M htdocs/main.inc.php
M htdocs/product/class/product.class.php
M htdocs/product/document.php
M htdocs/product/stats/commande.php
M htdocs/product/stats/commande_fournisseur.php
M htdocs/product/stats/propal.php
M htdocs/public/emailing/mailing-read.php
M htdocs/societe/price.php
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/Dolibarr/3.8' into 3.8
Commit: d36a4632212e11f2c60202568456756ac2ea2fa0
https://github.com/Dolibarr/dolibarr/commit/d36a4632212e11f2c60202568456756ac2ea2fa0
Author: fappels <address@hidden>
Date: 2015-11-07 (Sat, 07 Nov 2015)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.8.0.sql
M htdocs/comm/action/card.php
M htdocs/comm/mailing/card.php
M htdocs/comm/propal/list.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/list.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/list.php
M htdocs/core/lib/admin.lib.php
M htdocs/core/lib/ajax.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/expedition/class/expedition.class.php
M htdocs/fourn/ajax/getSupplierPrices.php
M htdocs/fourn/facture/card.php
M htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.js
M htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js
M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
M htdocs/product/stock/product.php
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/Dolibarr/3.8' into 3.8
Commit: 06f752b250ff084f3d9bf9256cebf30f0d77c0d6
https://github.com/Dolibarr/dolibarr/commit/06f752b250ff084f3d9bf9256cebf30f0d77c0d6
Author: aspangaro <address@hidden>
Date: 2015-11-16 (Mon, 16 Nov 2015)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
M htdocs/accountancy/customer/card.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/supplier/card.php
M htdocs/accountancy/supplier/list.php
M htdocs/comm/action/card.php
M htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/treso.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/localtax/card.php
M htdocs/core/lib/files.lib.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
M htdocs/expedition/class/expedition.class.php
M htdocs/fichinter/card.php
M htdocs/product/stock/product.php
M htdocs/societe/rib.php
Log Message:
-----------
Merge remote-tracking branch 'Upstream/3.7' into 3.7-accountancy
Commit: 9f27e2323f33e42e27fb55ddaf7dfffced77f87a
https://github.com/Dolibarr/dolibarr/commit/9f27e2323f33e42e27fb55ddaf7dfffced77f87a
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-11-21 (Sat, 21 Nov 2015)
Changed paths:
M htdocs/product/stock/class/mouvementstock.class.php
Log Message:
-----------
FIX #3734 Do not show empty links of deleted source objects in stock movement
list
Commit: d64664f5a78281469de67ffd95b0434dc0d7028a
https://github.com/Dolibarr/dolibarr/commit/d64664f5a78281469de67ffd95b0434dc0d7028a
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-21 (Sat, 21 Nov 2015)
Changed paths:
M htdocs/product/stock/class/mouvementstock.class.php
Log Message:
-----------
Merge pull request #4057 from marcosgdf/bug-3734
FIX #3734 Do not show empty links of deleted source objects in stock movement
list
Commit: 91ce70a6e98035e8796f2953974a9ba3fe9a17f5
https://github.com/Dolibarr/dolibarr/commit/91ce70a6e98035e8796f2953974a9ba3fe9a17f5
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-11-23 (Mon, 23 Nov 2015)
Changed paths:
M htdocs/langs/en_US/users.lang
Log Message:
-----------
FIX #4081 Added missing translation
Commit: 973e42d10f5a70fc26f1e133f8006160c9de8169
https://github.com/Dolibarr/dolibarr/commit/973e42d10f5a70fc26f1e133f8006160c9de8169
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-11-25 (Wed, 25 Nov 2015)
Changed paths:
M htdocs/core/lib/date.lib.php
Log Message:
-----------
FIX #4097 Public holiday calculation
The last day was ommitted and never parsed. If this day was a
saturday, sunday or public holiday day, it was not computed.
Commit: 8c0dffd24e2be2552bc8deb631832efb25e787ab
https://github.com/Dolibarr/dolibarr/commit/8c0dffd24e2be2552bc8deb631832efb25e787ab
Author: aspangaro <address@hidden>
Date: 2015-11-25 (Wed, 25 Nov 2015)
Changed paths:
M htdocs/commande/orderstoinvoice.php
M htdocs/core/boxes/box_project.php
M htdocs/core/modules/modCategorie.class.php
Log Message:
-----------
Merge remote-tracking branch 'Upstream/3.7' into 3.7-accountancy
Commit: 041fa8d3f38d54be4702b2e6922c3a11bb94e341
https://github.com/Dolibarr/dolibarr/commit/041fa8d3f38d54be4702b2e6922c3a11bb94e341
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-26 (Thu, 26 Nov 2015)
Changed paths:
M htdocs/langs/en_US/users.lang
Log Message:
-----------
Merge pull request #4083 from GPCsolutions/3.6-4081
FIX #4081 Added missing translation
Commit: 9a2259c6811e76cc0771a52c18980ddefeba0c1f
https://github.com/Dolibarr/dolibarr/commit/9a2259c6811e76cc0771a52c18980ddefeba0c1f
Author: aspangaro <address@hidden>
Date: 2015-11-26 (Thu, 26 Nov 2015)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
M htdocs/core/lib/report.lib.php
M htdocs/langs/en_US/accountancy.lang
Log Message:
-----------
Correct button 'Export' and 'Write bookkeeping' on finance journal
Commit: 37da315af64a8c41ef76d4db66da6a2515e373dc
https://github.com/Dolibarr/dolibarr/commit/37da315af64a8c41ef76d4db66da6a2515e373dc
Author: aspangaro <address@hidden>
Date: 2015-11-26 (Thu, 26 Nov 2015)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
Log Message:
-----------
Remove old code
Commit: 208bf2545fd1519c639097db6241f793a78a9adf
https://github.com/Dolibarr/dolibarr/commit/208bf2545fd1519c639097db6241f793a78a9adf
Author: fmarcet <address@hidden>
Date: 2015-11-26 (Thu, 26 Nov 2015)
Changed paths:
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Fix: Bug when idprof is mandatory on thrid creation and we use
multicompany
Commit: 2ce00b2956dcd9830c3b1e4ca3bdae6358ec82fe
https://github.com/Dolibarr/dolibarr/commit/2ce00b2956dcd9830c3b1e4ca3bdae6358ec82fe
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-28 (Sat, 28 Nov 2015)
Changed paths:
M htdocs/core/lib/date.lib.php
Log Message:
-----------
Merge pull request #4099 from GPCsolutions/3.6-4097
FIX #4097 Public holiday calculation
Commit: ae87a270e4414eef36e580b8df0572e14855b323
https://github.com/Dolibarr/dolibarr/commit/ae87a270e4414eef36e580b8df0572e14855b323
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-28 (Sat, 28 Nov 2015)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
M htdocs/core/lib/report.lib.php
M htdocs/langs/en_US/accountancy.lang
Log Message:
-----------
Merge pull request #4101 from aspangaro/3.7-accountancy
Fix #4069 Accountancy - button "export" don't work on finance journal
Commit: e72f4cb063533a85be39860d2341bb6942e7b60d
https://github.com/Dolibarr/dolibarr/commit/e72f4cb063533a85be39860d2341bb6942e7b60d
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-28 (Sat, 28 Nov 2015)
Changed paths:
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Merge pull request #4102 from fmarcet/3.6
Fix: Bug when idprof is mandatory on thrid creation and we use multicompany
Commit: 38957f7fb77a6ba9da18fecb9c2e87a6a4bc04ef
https://github.com/Dolibarr/dolibarr/commit/38957f7fb77a6ba9da18fecb9c2e87a6a4bc04ef
Author: fappels <address@hidden>
Date: 2015-11-29 (Sun, 29 Nov 2015)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
M build/makepack-howto.txt
M dev/initdata/mysqldump_dolibarr_3.8.0.sql
M dev/initdata/savedemo.sh
M htdocs/.gitignore
M htdocs/accountancy/customer/card.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/supplier/card.php
M htdocs/accountancy/supplier/list.php
M htdocs/admin/company.php
M htdocs/admin/menus/edit.php
M htdocs/comm/action/card.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/mailing/cibles.php
M htdocs/comm/mailing/class/mailing.class.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/orderstoinvoice.php
M htdocs/compta/bank/treso.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/localtax/card.php
M htdocs/core/boxes/box_project.php
M htdocs/core/boxes/modules_boxes.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/dolgeoip.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/hookmanager.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/modules/modCategorie.class.php
M htdocs/core/modules/modCommande.class.php
M htdocs/core/modules/modPropale.class.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
M htdocs/core/tpl/document_actions_pre_headers.tpl.php
M htdocs/core/tpl/login.tpl.php
M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
M htdocs/expedition/class/expedition.class.php
M htdocs/fichinter/card.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
M htdocs/install/pgsql/functions/functions.sql
M htdocs/margin/agentMargins.php
M htdocs/margin/lib/margins.lib.php
M htdocs/product/card.php
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/Dolibarr/3.8' into 3.8
Commit: 4a0ea9777239108a32bf6aad2f4a1b513f3b612f
https://github.com/Dolibarr/dolibarr/commit/4a0ea9777239108a32bf6aad2f4a1b513f3b612f
Author: fappels <address@hidden>
Date: 2015-11-29 (Sun, 29 Nov 2015)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
Log Message:
-----------
FIX #3953 rounding of buying price
fix javascript for rounding of buying price
Commit: b1122b55d464a170c0c846c20b91d1ad67e93be6
https://github.com/Dolibarr/dolibarr/commit/b1122b55d464a170c0c846c20b91d1ad67e93be6
Author: aspangaro <address@hidden>
Date: 2015-11-30 (Mon, 30 Nov 2015)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
Log Message:
-----------
Fix : accountancy code on finance journal is not a constant
Commit: eb504ffacc7ac1c305d78c8f0d6a5e9cdb4617b9
https://github.com/Dolibarr/dolibarr/commit/eb504ffacc7ac1c305d78c8f0d6a5e9cdb4617b9
Author: ricardomm <GitRepositorio>
Date: 2015-12-02 (Wed, 02 Dec 2015)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
minor fix accessing $db
Commit: bd632cf2b0205c4e7a5c08c631a088ae31986378
https://github.com/Dolibarr/dolibarr/commit/bd632cf2b0205c4e7a5c08c631a088ae31986378
Author: Florian HENRY <address@hidden>
Date: 2015-12-02 (Wed, 02 Dec 2015)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
FIX : Use "WHERE true" instead of "WHERE 1" #4132
Commit: 281eaf2987df657006059d1d24acf73fda0a1607
https://github.com/Dolibarr/dolibarr/commit/281eaf2987df657006059d1d24acf73fda0a1607
Author: Florian HENRY <address@hidden>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
FIX : Use "WHERE true" instead of "WHERE 1" #4132
Commit: b4160c7f81536d2f91afbfca528eac6f49017355
https://github.com/Dolibarr/dolibarr/commit/b4160c7f81536d2f91afbfca528eac6f49017355
Author: Florian HENRY <address@hidden>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M htdocs/comm/card.php
Log Message:
-----------
Cannot change the date of a contract #4088
Commit: ee08c4afc4ee134683638fbc2e8c11b401850f03
https://github.com/Dolibarr/dolibarr/commit/ee08c4afc4ee134683638fbc2e8c11b401850f03
Author: Florian HENRY <address@hidden>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M htdocs/comm/card.php
Log Message:
-----------
Display the ref_supplier inside the contract list of /comm/card.php
#4090
Commit: 7bad058f47b245868287dd7faeed4ea7c6175d45
https://github.com/Dolibarr/dolibarr/commit/7bad058f47b245868287dd7faeed4ea7c6175d45
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
Log Message:
-----------
Merge pull request #4114 from fappels/3.8_fix_round_buyprice
FIX #3953 rounding of buying price
Commit: 10a925f7b4f0625b8c1353c44140588ee4794f47
https://github.com/Dolibarr/dolibarr/commit/10a925f7b4f0625b8c1353c44140588ee4794f47
Author: Florian HENRY <address@hidden>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
FIX: WHERE 1=1
Commit: a7020506aa76b9a88ebf7d7ced63cf60c0c3809c
https://github.com/Dolibarr/dolibarr/commit/a7020506aa76b9a88ebf7d7ced63cf60c0c3809c
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
Log Message:
-----------
Merge pull request #4123 from aspangaro/3.7-accountancy
Fix : accountancy code on finance journal is not a constant
Commit: c86d4b51b1d8baeea0693045807d75808d2e9e5e
https://github.com/Dolibarr/dolibarr/commit/c86d4b51b1d8baeea0693045807d75808d2e9e5e
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge pull request #4133 from ricardomm85/3.8
minor fix accessing $db
Commit: 1694481df88c3aad6c8e839c4b64f32aca873598
https://github.com/Dolibarr/dolibarr/commit/1694481df88c3aad6c8e839c4b64f32aca873598
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Merge pull request #4134 from FHenry/3.7
FIX : Use "WHERE true" instead of "WHERE 1" #4132
Commit: a7d03af4afdbd2cfe8bd3990ce98e9f9d330b0b4
https://github.com/Dolibarr/dolibarr/commit/a7d03af4afdbd2cfe8bd3990ce98e9f9d330b0b4
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M htdocs/compta/facture/mergepdftool.php
Log Message:
-----------
Fix sending emails from mergepedtool was just doing wrong things.
Commit: 64e35255ae950e5c89827b7092525c876d3ec746
https://github.com/Dolibarr/dolibarr/commit/64e35255ae950e5c89827b7092525c876d3ec746
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M htdocs/core/class/html.formprojet.class.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/product/class/product.class.php
M htdocs/resource/class/resource.class.php
M htdocs/resource/list.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 7105fabb799123a9f2aa144a92f02419adad7ca6
https://github.com/Dolibarr/dolibarr/commit/7105fabb799123a9f2aa144a92f02419adad7ca6
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M htdocs/core/lib/date.lib.php
M htdocs/langs/en_US/users.lang
M htdocs/product/stock/class/mouvementstock.class.php
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/langs/en_US/users.lang
htdocs/product/stock/class/mouvementstock.class.php
Commit: 3dec67ffdf59a4416ae88d0f8c64630586628692
https://github.com/Dolibarr/dolibarr/commit/3dec67ffdf59a4416ae88d0f8c64630586628692
Author: Florian HENRY <address@hidden>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M htdocs/compta/facture/mergepdftool.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 12702ee128f3b0bf73bf09c18d2020002514282e
https://github.com/Dolibarr/dolibarr/commit/12702ee128f3b0bf73bf09c18d2020002514282e
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/lib/date.lib.php
M htdocs/core/lib/report.lib.php
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/users.lang
M htdocs/product/stock/class/mouvementstock.class.php
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/core/lib/report.lib.php
htdocs/product/stock/class/mouvementstock.class.php
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: d2b221cfd1ebb60a0d53b8b74b27b9cc9a730550
https://github.com/Dolibarr/dolibarr/commit/d2b221cfd1ebb60a0d53b8b74b27b9cc9a730550
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M dev/codesniffer/ruleset.xml
Log Message:
-----------
Upgrade PHPCS rules
Commit: 7d7a978ba0ebcf03f98559593399e561b403e38a
https://github.com/Dolibarr/dolibarr/commit/7d7a978ba0ebcf03f98559593399e561b403e38a
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M htdocs/comm/card.php
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Merge pull request #4145 from FHenry/3.8
FIX : Contract date inconsistency between /comm/card.php and #4089
Commit: 00aa5aace7a5a236701a7c91491689a527a1f399
https://github.com/Dolibarr/dolibarr/commit/00aa5aace7a5a236701a7c91491689a527a1f399
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M dev/codesniffer/ruleset.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
dev/codesniffer/ruleset.xml
Commit: 955fad910d14b6df467bde90379fe9ff67562ef9
https://github.com/Dolibarr/dolibarr/commit/955fad910d14b6df467bde90379fe9ff67562ef9
Author: Florian HENRY <address@hidden>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M htdocs/comm/mailing/class/mailing.class.php
Log Message:
-----------
FIX : Bug: $this is not accessible in static context in
Mailing::libStatutDest #4050
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: 02784c89f98ea43e00abdd6e567583379ca85ab3
https://github.com/Dolibarr/dolibarr/commit/02784c89f98ea43e00abdd6e567583379ca85ab3
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M htdocs/comm/mailing/class/mailing.class.php
Log Message:
-----------
Merge pull request #4153 from FHenry/3.8
FIX : Bug: $this is not accessible Mailing::libStatutDest #4050
Commit: a209d1864984e26b39cbfd13f2634d513ef466ec
https://github.com/Dolibarr/dolibarr/commit/a209d1864984e26b39cbfd13f2634d513ef466ec
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M htdocs/compta/deplacement/card.php
Log Message:
-----------
FIX Can use formated float number on old expense report module.
Commit: 3f9efc537b09f142baeb249ea4e1f8a6c88c9f54
https://github.com/Dolibarr/dolibarr/commit/3f9efc537b09f142baeb249ea4e1f8a6c88c9f54
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-12-07 (Mon, 07 Dec 2015)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
Log Message:
-----------
FIX #3953 Don't round supplier price
The price is already rounded when inserted on the product page.
It's also rounded at display.
There's no need to round it here.
Rounding it leads to serious calculation errors.
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: 99c99570cccd221b74e7dc566085868f3149217b
https://github.com/Dolibarr/dolibarr/commit/99c99570cccd221b74e7dc566085868f3149217b
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-10 (Thu, 10 Dec 2015)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
Log Message:
-----------
Merge pull request #4177 from GPCsolutions/3.8-3953
FIX #3953 Don't round supplier price
Commit: 8edf3c65c6ba67a532c300b411f0de178b6762ae
https://github.com/Dolibarr/dolibarr/commit/8edf3c65c6ba67a532c300b411f0de178b6762ae
Author: Florian HENRY <address@hidden>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
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
Log Message:
-----------
work on accounting
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: 9e2a0562212b75b01947a98898a369a7d6171f0e
https://github.com/Dolibarr/dolibarr/commit/9e2a0562212b75b01947a98898a369a7d6171f0e
Author: Juanjo Menent <address@hidden>
Date: 2015-12-11 (Fri, 11 Dec 2015)
Changed paths:
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
Log Message:
-----------
Merge pull request #4205 from FHenry/3.8_accountancy
work on accounting
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: a462cd232d6b5eb271eaaf19736eca5a3408242e
https://github.com/Dolibarr/dolibarr/commit/a462cd232d6b5eb271eaaf19736eca5a3408242e
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/compta/deplacement/card.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/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/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/mime/readme.txt
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.7' into 3.8
Commit: 4b741c6b9c6c1da489a975e78701a2fef4e13e58
https://github.com/Dolibarr/dolibarr/commit/4b741c6b9c6c1da489a975e78701a2fef4e13e58
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-13 (Sun, 13 Dec 2015)
Changed paths:
M test/phpunit/CategorieTest.php
M test/phpunit/ExportTest.php
M test/phpunit/Functions2LibTest.php
M test/phpunit/FunctionsLibTest.php
M test/phpunit/JsonLibTest.php
M test/phpunit/LangTest.php
M test/phpunit/ModulesTest.php
M test/phpunit/PricesTest.php
M test/phpunit/SecurityTest.php
M test/phpunit/SocieteTest.php
M test/phpunit/SqlTest.php
M test/phpunit/WebservicesInvoicesTest.php
M test/phpunit/WebservicesThirdpartyTest.php
Log Message:
-----------
Fix permissions
Commit: 3b595f0247123494d357d3d1185b1b30110a59e8
https://github.com/Dolibarr/dolibarr/commit/3b595f0247123494d357d3d1185b1b30110a59e8
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 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/bookkeeping/list.php
M htdocs/comm/card.php
M htdocs/comm/mailing/class/mailing.class.php
M htdocs/compta/deplacement/card.php
M htdocs/compta/facture/mergepdftool.php
M htdocs/core/class/extrafields.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/report.lib.php
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/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/users.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/product/class/product.class.php
M htdocs/product/stock/class/mouvementstock.class.php
M htdocs/societe/class/societe.class.php
M htdocs/theme/common/mime/readme.txt
M htdocs/webservices/demo_wsclient_order.php-NORUN
M test/phpunit/CategorieTest.php
M test/phpunit/ChargeSocialesTest.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/PdfDocTest.php
M test/phpunit/PgsqlTest.php
M test/phpunit/ProductTest.php
M test/phpunit/ScriptsTest.php
M test/phpunit/SecurityTest.php
M test/phpunit/SqlTest.php
M test/phpunit/WebservicesInvoicesTest.php
M test/phpunit/WebservicesOrdersTest.php
M test/phpunit/WebservicesOtherTest.php
M test/phpunit/WebservicesThirdpartyTest.php
M test/phpunit/WebservicesUserTest.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/accountancy/customer/list.php
htdocs/accountancy/journal/bankjournal.php
htdocs/core/lib/date.lib.php
htdocs/core/lib/report.lib.php
htdocs/langs/en_US/accountancy.lang
Compare:
https://github.com/Dolibarr/dolibarr/compare/7db6ac592f78...3b595f024712