[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 6d8388: FIX : Bad rank when a bill wa
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 6d8388: FIX : Bad rank when a bill was made by multiple or... |
|
Date: |
Tue, 15 Jul 2014 14:32:12 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 6d83882a5d355b0c3b6a09a4e8047ff039e5505f
https://github.com/Dolibarr/dolibarr/commit/6d83882a5d355b0c3b6a09a4e8047ff039e5505f
Author: Alexis Algoud <address@hidden>
Date: 2014-07-08 (Tue, 08 Jul 2014)
Changed paths:
M htdocs/commande/orderstoinvoice.php
Log Message:
-----------
FIX : Bad rank when a bill was made by multiple orders
Commit: 0598bb611429f53d8cf2d05ab312f2b61f05f73b
https://github.com/Dolibarr/dolibarr/commit/0598bb611429f53d8cf2d05ab312f2b61f05f73b
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-08 (Tue, 08 Jul 2014)
Changed paths:
M .travis.yml
Log Message:
-----------
Fix: travis file for 3.5
Commit: 3f23b116c6a5f58d4fad3b9b1f0acb8408066382
https://github.com/Dolibarr/dolibarr/commit/3f23b116c6a5f58d4fad3b9b1f0acb8408066382
Author: Florian HENRY <address@hidden>
Date: 2014-07-11 (Fri, 11 Jul 2014)
Changed paths:
M htdocs/core/class/html.formprojet.class.php
M htdocs/projet/element.php
Log Message:
-----------
[ bug #1522 ] Liste des propositions commerciales non filtée depuis un
projet
Commit: 7d77772820307ada5407807da695f63514b00b71
https://github.com/Dolibarr/dolibarr/commit/7d77772820307ada5407807da695f63514b00b71
Author: Florian HENRY <address@hidden>
Date: 2014-07-11 (Fri, 11 Jul 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
changelog
Commit: 13cc8620b2075e0845defe91a6eaf25f361b09d3
https://github.com/Dolibarr/dolibarr/commit/13cc8620b2075e0845defe91a6eaf25f361b09d3
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-11 (Fri, 11 Jul 2014)
Changed paths:
M ChangeLog
M htdocs/core/class/html.formprojet.class.php
M htdocs/projet/element.php
Log Message:
-----------
Merge pull request #1732 from FHenry/3.5
[ bug #1522 ] Liste des propositions commerciales non filtée depuis un projet
Commit: 0cba9b8fae2a9e58f35661f393b5f09df6f971c1
https://github.com/Dolibarr/dolibarr/commit/0cba9b8fae2a9e58f35661f393b5f09df6f971c1
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-11 (Fri, 11 Jul 2014)
Changed paths:
M htdocs/commande/orderstoinvoice.php
Log Message:
-----------
Merge pull request #1726 from atm-alexis/3.5
FIX : Bad rank when a bill was made by multiple orders
Commit: ff5ea31452e1796ba2022cf73915e42f417d2139
https://github.com/Dolibarr/dolibarr/commit/ff5ea31452e1796ba2022cf73915e42f417d2139
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-11 (Fri, 11 Jul 2014)
Changed paths:
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
Log Message:
-----------
Fix: Date error
Commit: b9df48d48c72558aff58d826158e42fc6cb774c3
https://github.com/Dolibarr/dolibarr/commit/b9df48d48c72558aff58d826158e42fc6cb774c3
Author: Florian HENRY <address@hidden>
Date: 2014-07-11 (Fri, 11 Jul 2014)
Changed paths:
M htdocs/core/class/cookie.class.php
Log Message:
-----------
Fix
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50854-multi-societe-options-cookies
Commit: c1bfe0f6c5f3bf2a9f24ce245ddc5f27d121e768
https://github.com/Dolibarr/dolibarr/commit/c1bfe0f6c5f3bf2a9f24ce245ddc5f27d121e768
Author: juanjo <address@hidden>
Date: 2014-07-11 (Fri, 11 Jul 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
Update ChangeLog: Remove add_photo_web()
Commit: d289306fa4cea7a0fd8d09b33e9b422671c00dc6
https://github.com/Dolibarr/dolibarr/commit/d289306fa4cea7a0fd8d09b33e9b422671c00dc6
Author: Cedric <address@hidden>
Date: 2014-07-12 (Sat, 12 Jul 2014)
Changed paths:
M htdocs/product/stock/fiche.php
Log Message:
-----------
Security fix
Commit: 4bc8e026b69b58becd91bc924d1cf4a0755824c6
https://github.com/Dolibarr/dolibarr/commit/4bc8e026b69b58becd91bc924d1cf4a0755824c6
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-07-13 (Sun, 13 Jul 2014)
Changed paths:
M ChangeLog
M htdocs/core/class/html.formfile.class.php
Log Message:
-----------
[ bug #1526 ] Thumbs of files uploaded with dots in their names do not load
correctly
Commit: b0ae2fe2aaf069a4a9893d09ae3d588742862318
https://github.com/Dolibarr/dolibarr/commit/b0ae2fe2aaf069a4a9893d09ae3d588742862318
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M htdocs/projet/element.php
Log Message:
-----------
Fixed a bug introduced in commit 0916d2cf3b
Commit: 3930c8829ef5a8cb6e305ca2d828e4f4a019525c
https://github.com/Dolibarr/dolibarr/commit/3930c8829ef5a8cb6e305ca2d828e4f4a019525c
Author: Juanjo Menent <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M htdocs/core/modules/modSociete.class.php
Log Message:
-----------
Fix: Import ProfId1 to siren and ProfId2 to siret
Commit: 3816e0fe1485bdbe73cdf29b340a5c40ebf0e749
https://github.com/Dolibarr/dolibarr/commit/3816e0fe1485bdbe73cdf29b340a5c40ebf0e749
Author: Juanjo Menent <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
Fix: Import ProfId1 to siren and ProfId2 to siret
Commit: f8b5bac05c4e632e7e37be2e75c551cd93155c8b
https://github.com/Dolibarr/dolibarr/commit/f8b5bac05c4e632e7e37be2e75c551cd93155c8b
Author: Juanjo Menent <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M htdocs/core/modules/modSociete.class.php
Log Message:
-----------
Fix: Import ProfId1 to siren and ProfId2 to siret
Commit: 3a8835892e9bf212d7bacbe939f47e26842b0019
https://github.com/Dolibarr/dolibarr/commit/3a8835892e9bf212d7bacbe939f47e26842b0019
Author: Juanjo Menent <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
Fix: Import ProfId1 to siren and ProfId2 to siret
Conflicts:
ChangeLog
Commit: 2ac088d60e734cfc705e723d1979128da0cb6074
https://github.com/Dolibarr/dolibarr/commit/2ac088d60e734cfc705e723d1979128da0cb6074
Author: Juanjo Menent <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M htdocs/product/stock/fiche.php
Log Message:
-----------
Merge pull request #1739 from KreizIT/XssFix
Security fix
Commit: 0bfc90ee9a14cc703fcb7e22e986a8872eca5ea0
https://github.com/Dolibarr/dolibarr/commit/0bfc90ee9a14cc703fcb7e22e986a8872eca5ea0
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M htdocs/projet/element.php
Log Message:
-----------
Merge pull request #1744 from marcosgdf/bug-linkedprojects
Fixed a bug introduced in commit 0916d2cf3b
Commit: d02df05ab869dbd5b6d22ad31ccd89303f24bf3b
https://github.com/Dolibarr/dolibarr/commit/d02df05ab869dbd5b6d22ad31ccd89303f24bf3b
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M ChangeLog
M htdocs/core/class/html.formfile.class.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-1526' into 3.5
Commit: f55814e3b27e0f34f15a1189f98456338bea8e96
https://github.com/Dolibarr/dolibarr/commit/f55814e3b27e0f34f15a1189f98456338bea8e96
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M ChangeLog
M htdocs/core/modules/modSociete.class.php
M htdocs/projet/element.php
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Conflicts:
ChangeLog
Commit: 32a6d59b64160158457a79a2546aa5946439ccdd
https://github.com/Dolibarr/dolibarr/commit/32a6d59b64160158457a79a2546aa5946439ccdd
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M htdocs/core/class/cookie.class.php
Log Message:
-----------
Merge pull request #1734 from FHenry/3.5
Fix
Commit: 9acf60d7c55fdcec677ebc068e526b898143a925
https://github.com/Dolibarr/dolibarr/commit/9acf60d7c55fdcec677ebc068e526b898143a925
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M ChangeLog
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 htdocs/commande/orderstoinvoice.php
M htdocs/core/class/cookie.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/class/html.formprojet.class.php
M htdocs/projet/element.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
.travis.yml
ChangeLog
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/core/class/html.formfile.class.php
Commit: 0cb11a537d35a336956e94536f6d011f70512014
https://github.com/Dolibarr/dolibarr/commit/0cb11a537d35a336956e94536f6d011f70512014
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-15 (Tue, 15 Jul 2014)
Changed paths:
M htdocs/paybox/lib/paybox.lib.php
M htdocs/paypal/lib/paypal.lib.php
Log Message:
-----------
Fix: IP address of user was lost into paypal confirm email
Commit: f096253a6d3d3ccfa6f368d89b68f860beef88ad
https://github.com/Dolibarr/dolibarr/commit/f096253a6d3d3ccfa6f368d89b68f860beef88ad
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-15 (Tue, 15 Jul 2014)
Changed paths:
M .gitignore
M ChangeLog
M dev/vagrant/README.md
M dev/vagrant/dolibarrdev/Vagrantfile
M dev/vagrant/dolibarrdev/puphpet/config.yaml
M dev/vagrant/dolibarrdev/puphpet/files/dot/.gitignore
A dev/vagrant/dolibarrdev/puphpet/files/startup-always/empty
A dev/vagrant/dolibarrdev/puphpet/files/startup-once/empty
M dev/vagrant/dolibarrdev/puphpet/puppet/manifest.pp
A
dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/hash_key_true.rb
M dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/hhvm.pp
A
dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/python/pip.pp
M dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.fixtures.yml
M dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.travis.yml
M dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Changelog
M dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Gemfile
M dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Modulefile
M dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/README.md
M dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Rakefile
M
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/array2csv.rb
M
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/hash2csv.rb
M
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/config.pp
M
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/eventlistener.pp
M
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/fcgi_program.pp
M
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/group.pp
M
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/init.pp
M
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/install.pp
M
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/params.pp
M
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/pip.pp
M
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/program.pp
A
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/reload.pp
M
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/service.pp
A
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/supervisorctl.pp
A
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/centos-65-i386.yml
A
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/centos-65-x64.yml
A
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/debian-73-i386.yml
A
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/debian-73-x64.yml
A
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/nodesets/default.yml
A
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/acceptance/supervisord_spec.rb
M
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/classes/supervisord_spec.rb
M
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/eventlistener_spec.rb
M
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/fcgi_program_spec.rb
M
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/program_spec.rb
A
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/supervisorctl.rb
M
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/spec_helper.rb
A
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/spec_helper_acceptance.rb
R
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/spec_helper_system.rb
R
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/system/basic_spec.rb
M
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/eventlistener.erb
M
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/fcgi_program.erb
M
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/program.erb
A
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/Debian/defaults.erb
A
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/Debian/init.erb
A
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/RedHat/defaults.erb
A
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/RedHat/init.erb
R
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/debian_extra.erb
R
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/debian_init.erb
R
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/redhat_extra.erb
R
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/redhat_init.erb
M
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_main.erb
M
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_unix.erb
M
dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/program.pp
M dev/vagrant/dolibarrdev/puphpet/shell/execute-files.sh
M dev/vagrant/dolibarrdev/puphpet/shell/ssh-keygen.sh
A htdocs/accountancy/class/index.html
A htdocs/accountancy/index.html
R htdocs/accountancy/index.php
R htdocs/adherents/canvas/default/index.php
A htdocs/adherents/canvas/default/tpl/index.html
R htdocs/adherents/canvas/default/tpl/index.php
A htdocs/adherents/canvas/index.html
R htdocs/adherents/canvas/index.php
A htdocs/adherents/cartes/index.html
R htdocs/adherents/cartes/index.php
A htdocs/adherents/class/index.html
A htdocs/asterisk/index.html
R htdocs/asterisk/index.php
A htdocs/barcode/index.html
A htdocs/bookmarks/admin/index.html
A htdocs/bookmarks/class/index.html
A htdocs/bookmarks/index.html
R htdocs/bookmarks/index.php
A htdocs/boutique/admin/index.html
A htdocs/boutique/client/class/index.html
A htdocs/boutique/commande/class/index.html
A htdocs/boutique/critiques/class/index.html
A htdocs/boutique/promotion/class/index.html
A htdocs/cashdesk/admin/index.html
A htdocs/cashdesk/class/index.html
R htdocs/cashdesk/class/index.php
A htdocs/cashdesk/css/index.html
A htdocs/cashdesk/img/index.html
R htdocs/cashdesk/img/index.php
A htdocs/cashdesk/include/index.html
R htdocs/cashdesk/include/index.php
A htdocs/cashdesk/javascript/index.html
R htdocs/cashdesk/javascript/index.php
A htdocs/cashdesk/tpl/index.html
R htdocs/cashdesk/tpl/index.php
A htdocs/categories/admin/index.html
A htdocs/categories/class/index.html
A htdocs/comm/action/class/index.html
A htdocs/comm/admin/index.html
A htdocs/comm/mailing/class/index.html
A htdocs/comm/propal/class/index.html
A htdocs/comm/propal/tpl/index.html
A htdocs/comm/prospect/class/index.html
M htdocs/commande/class/commande.class.php
A htdocs/commande/class/index.html
A htdocs/commande/tpl/index.html
A htdocs/compta/bank/class/index.html
A htdocs/compta/deplacement/class/index.html
A htdocs/compta/dons/class/index.html
A htdocs/compta/facture/admin/index.html
M htdocs/compta/facture/class/facture.class.php
A htdocs/compta/facture/class/index.html
A htdocs/compta/facture/index.html
R htdocs/compta/facture/index.php
A htdocs/compta/facture/tpl/index.html
A htdocs/compta/journal/index.html
A htdocs/compta/localtax/class/index.html
M htdocs/compta/localtax/class/localtax.class.php
A htdocs/compta/paiement/cheque/class/index.html
A htdocs/compta/paiement/class/index.html
A htdocs/compta/payment_sc/index.html
A htdocs/compta/prelevement/class/index.html
A htdocs/compta/salaries/class/index.html
M htdocs/compta/salaries/class/paymentsalary.class.php
A htdocs/compta/sociales/class/index.html
A htdocs/compta/tva/class/index.html
M htdocs/compta/tva/class/tva.class.php
A htdocs/conf/index.html
A htdocs/contact/canvas/default/index.html
R htdocs/contact/canvas/default/index.php
A htdocs/contact/canvas/default/tpl/index.html
R htdocs/contact/canvas/default/tpl/index.php
A htdocs/contact/canvas/index.html
R htdocs/contact/canvas/index.php
A htdocs/contact/class/index.html
A htdocs/contact/index.html
R htdocs/contact/index.php
A htdocs/contrat/admin/index.html
M htdocs/contrat/class/contrat.class.php
A htdocs/contrat/class/index.html
M htdocs/contrat/fiche.php
M htdocs/contrat/liste.php
A htdocs/contrat/tpl/index.html
A htdocs/core/ajax/index.html
R htdocs/core/ajax/index.php
M htdocs/core/boxes/box_actions.php
A htdocs/core/boxes/index.html
R htdocs/core/boxes/index.php
A htdocs/core/class/index.html
R htdocs/core/class/index.php
M htdocs/core/class/link.class.php
A htdocs/core/db/index.html
R htdocs/core/db/index.php
A htdocs/core/filemanagerdol/browser/default/images/icons/32/index.html
A htdocs/core/filemanagerdol/browser/default/images/icons/index.html
A htdocs/core/filemanagerdol/browser/default/images/index.html
A htdocs/core/filemanagerdol/browser/default/index.html
A htdocs/core/filemanagerdol/browser/default/js/index.html
A htdocs/core/filemanagerdol/browser/index.html
A htdocs/core/filemanagerdol/connectors/index.html
A htdocs/core/filemanagerdol/connectors/php/index.html
A htdocs/core/filemanagerdol/index.html
R htdocs/core/filemanagerdol/index.php
A htdocs/core/index.html
R htdocs/core/index.php
A htdocs/core/js/index.html
R htdocs/core/js/index.php
A htdocs/core/lib/index.html
R htdocs/core/lib/index.php
A htdocs/core/login/index.html
R htdocs/core/login/index.php
A htdocs/core/menus/index.html
R htdocs/core/menus/index.php
A htdocs/core/menus/standard/index.html
R htdocs/core/menus/standard/index.php
A htdocs/core/modules/action/index.html
A htdocs/core/modules/barcode/doc/index.html
A htdocs/core/modules/barcode/index.html
A htdocs/core/modules/cheque/index.html
A htdocs/core/modules/cheque/pdf/index.html
A htdocs/core/modules/commande/doc/index.html
A htdocs/core/modules/commande/index.html
A htdocs/core/modules/contract/doc/index.html
A htdocs/core/modules/contract/index.html
A htdocs/core/modules/dons/index.html
A htdocs/core/modules/expedition/doc/index.html
A htdocs/core/modules/expedition/index.html
A htdocs/core/modules/export/index.html
A htdocs/core/modules/facture/doc/index.html
A htdocs/core/modules/facture/index.html
A htdocs/core/modules/fichinter/doc/index.html
A htdocs/core/modules/fichinter/index.html
A htdocs/core/modules/import/index.html
A htdocs/core/modules/index.html
R htdocs/core/modules/index.php
A htdocs/core/modules/livraison/index.html
A htdocs/core/modules/livraison/pdf/index.html
A htdocs/core/modules/mailings/index.html
A htdocs/core/modules/member/doc/index.html
A htdocs/core/modules/member/index.html
M htdocs/core/modules/modSociete.class.php
A htdocs/core/modules/printsheet/doc/index.html
A htdocs/core/modules/printsheet/index.html
A htdocs/core/modules/product/index.html
A htdocs/core/modules/project/index.html
A htdocs/core/modules/project/pdf/index.html
A htdocs/core/modules/project/task/index.html
A htdocs/core/modules/project/task/pdf/index.html
A htdocs/core/modules/propale/doc/index.html
A htdocs/core/modules/propale/index.html
A htdocs/core/modules/rapport/index.html
A htdocs/core/modules/security/generate/index.html
A htdocs/core/modules/security/index.html
A htdocs/core/modules/societe/doc/index.html
A htdocs/core/modules/societe/index.html
A htdocs/core/modules/supplier_invoice/index.html
A htdocs/core/modules/supplier_invoice/pdf/index.html
A htdocs/core/modules/supplier_order/index.html
A htdocs/core/modules/supplier_order/pdf/index.html
A htdocs/core/modules/syslog/index.html
A htdocs/core/tpl/ajax/index.html
A htdocs/core/tpl/index.html
R htdocs/core/tpl/index.php
A htdocs/core/triggers/index.html
R htdocs/core/triggers/index.php
M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
A htdocs/cron/admin/index.html
A htdocs/cron/class/index.html
A htdocs/cron/index.html
A htdocs/ecm/ajax/index.html
A htdocs/ecm/class/index.html
A htdocs/ecm/tpl/index.html
A htdocs/expedition/class/index.html
A htdocs/expedition/tpl/index.html
A htdocs/exports/class/index.html
A htdocs/externalsite/admin/index.html
A htdocs/externalsite/index.html
R htdocs/externalsite/index.php
A htdocs/fichinter/admin/index.html
A htdocs/fichinter/class/index.html
A htdocs/fichinter/index.html
R htdocs/fichinter/index.php
A htdocs/fichinter/tpl/index.html
A htdocs/fourn/ajax/index.html
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/class/fournisseur.product.class.php
A htdocs/fourn/class/index.html
M htdocs/fourn/class/paiementfourn.class.php
M htdocs/fourn/commande/dispatch.php
A htdocs/fourn/commande/tpl/index.html
A htdocs/fourn/facture/index.html
R htdocs/fourn/facture/index.php
A htdocs/fourn/facture/tpl/index.html
A htdocs/fourn/paiement/index.html
R htdocs/fourn/paiement/index.php
A htdocs/ftp/admin/index.html
A htdocs/holiday/admin/index.html
A htdocs/holiday/class/index.html
A htdocs/holiday/img/index.html
M htdocs/imports/class/import.class.php
A htdocs/imports/class/index.html
A htdocs/includes/adodbtime/index.html
R htdocs/includes/adodbtime/index.php
A htdocs/includes/index.html
R htdocs/includes/index.php
A htdocs/install/doctemplates/index.html
A htdocs/install/doctemplates/invoices/index.html
A htdocs/install/doctemplates/orders/index.html
A htdocs/install/doctemplates/projects/index.html
A htdocs/install/doctemplates/proposals/index.html
A htdocs/install/doctemplates/shipment/index.html
A htdocs/install/doctemplates/tasks/index.html
A htdocs/install/doctemplates/thirdparties/index.html
A htdocs/install/lib/index.html
A htdocs/install/mssql/functions/index.html
A htdocs/install/mssql/index.html
A htdocs/install/mysql/data/index.html
A htdocs/install/mysql/functions/index.html
A htdocs/install/mysql/index.html
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
A htdocs/install/mysql/migration/index.html
A htdocs/install/mysql/tables/index.html
M htdocs/install/mysql/tables/llx_contrat.sql
A htdocs/install/pgsql/functions/index.html
A htdocs/install/pgsql/index.html
A htdocs/livraison/class/index.html
A htdocs/livraison/index.html
R htdocs/livraison/index.php
A htdocs/mailmanspip/class/index.html
A htdocs/mailmanspip/index.html
A htdocs/margin/admin/index.html
A htdocs/margin/lib/index.html
M htdocs/margin/productMargins.php
A htdocs/margin/tabs/index.html
A htdocs/opensurvey/class/index.html
M htdocs/opensurvey/class/opensurveysondage.class.php
A htdocs/opensurvey/css/index.html
A htdocs/opensurvey/img/index.html
A htdocs/opensurvey/public/index.html
A htdocs/paybox/admin/index.html
A htdocs/paybox/img/index.html
A htdocs/paybox/index.html
R htdocs/paybox/index.php
A htdocs/paybox/lib/index.html
A htdocs/paypal/admin/index.html
A htdocs/paypal/img/index.html
A htdocs/paypal/index.html
R htdocs/paypal/index.php
A htdocs/paypal/lib/index.html
A htdocs/printipp/admin/index.html
A htdocs/printipp/lib/index.html
A htdocs/product/admin/index.html
A htdocs/product/ajax/index.html
A htdocs/product/canvas/index.html
R htdocs/product/canvas/index.php
A htdocs/product/canvas/product/index.html
R htdocs/product/canvas/product/index.php
A htdocs/product/canvas/product/tpl/index.html
R htdocs/product/canvas/product/tpl/index.php
A htdocs/product/canvas/service/index.html
R htdocs/product/canvas/service/index.php
A htdocs/product/canvas/service/tpl/index.html
R htdocs/product/canvas/service/tpl/index.php
A htdocs/product/class/index.html
A htdocs/product/composition/index.html
R htdocs/product/composition/index.php
A htdocs/product/stats/index.html
R htdocs/product/stats/index.php
A htdocs/product/stock/class/index.html
M htdocs/product/stock/class/mouvementstock.class.php
M htdocs/product/stock/fiche.php
A htdocs/product/stock/img/index.html
A htdocs/product/stock/lib/index.html
A htdocs/projet/admin/index.html
A htdocs/projet/class/index.html
A htdocs/public/cron/index.html
A htdocs/public/emailing/index.html
A htdocs/resource/class/index.html
M htdocs/resource/class/resource.class.php
A htdocs/resource/img/index.html
A htdocs/resource/index.html
A htdocs/societe/ajax/index.html
A htdocs/societe/canvas/company/index.html
R htdocs/societe/canvas/company/index.php
A htdocs/societe/canvas/company/tpl/index.html
R htdocs/societe/canvas/company/tpl/index.php
A htdocs/societe/canvas/index.html
A htdocs/societe/canvas/individual/index.html
R htdocs/societe/canvas/individual/index.php
A htdocs/societe/canvas/individual/tpl/index.html
R htdocs/societe/canvas/individual/tpl/index.php
A htdocs/societe/checkvat/index.html
R htdocs/societe/checkvat/index.php
A htdocs/societe/class/index.html
M htdocs/societe/class/societe.class.php
A htdocs/societe/tpl/index.html
A htdocs/theme/amarok/ckeditor/index.html
A htdocs/theme/amarok/img/index.html
A htdocs/theme/amarok/index.html
R htdocs/theme/amarok/index.php
A htdocs/theme/amarok/tpl/index.html
R htdocs/theme/amarok/tpl/index.php
A htdocs/theme/auguria/ckeditor/index.html
A htdocs/theme/auguria/img/index.html
A htdocs/theme/auguria/img/menus/index.html
A htdocs/theme/auguria/index.html
R htdocs/theme/auguria/index.php
A htdocs/theme/auguria/tpl/index.html
R htdocs/theme/auguria/tpl/index.php
A htdocs/theme/bureau2crea/ckeditor/index.html
A htdocs/theme/bureau2crea/img/bouton/index.html
A htdocs/theme/bureau2crea/img/index.html
A htdocs/theme/bureau2crea/img/menus/index.html
A htdocs/theme/bureau2crea/index.html
R htdocs/theme/bureau2crea/index.php
A htdocs/theme/bureau2crea/tpl/index.html
R htdocs/theme/bureau2crea/tpl/index.php
A htdocs/theme/cameleo/ckeditor/index.html
A htdocs/theme/cameleo/img/bouton/index.html
A htdocs/theme/cameleo/img/index.html
A htdocs/theme/cameleo/img/menus/index.html
A htdocs/theme/cameleo/index.html
R htdocs/theme/cameleo/index.php
A htdocs/theme/cameleo/tpl/index.html
R htdocs/theme/cameleo/tpl/index.php
A htdocs/theme/common/devices/index.html
A htdocs/theme/common/emotes/index.html
A htdocs/theme/common/flags/index.html
A htdocs/theme/common/index.html
A htdocs/theme/common/mime/index.html
A htdocs/theme/common/treemenu/index.html
A htdocs/theme/common/weather/index.html
A htdocs/theme/eldy/ckeditor/index.html
A htdocs/theme/eldy/img/index.html
A htdocs/theme/eldy/img/menus/index.html
A htdocs/theme/eldy/index.html
R htdocs/theme/eldy/index.php
A htdocs/theme/eldy/tpl/index.html
R htdocs/theme/eldy/tpl/index.php
A htdocs/theme/index.html
R htdocs/theme/index.php
A htdocs/user/admin/index.html
A htdocs/user/class/index.html
A htdocs/webservices/admin/index.html
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Commit: 8a8a90de78edd69a0264c2c9b2d28393fbfabf54
https://github.com/Dolibarr/dolibarr/commit/8a8a90de78edd69a0264c2c9b2d28393fbfabf54
Author: Laurent Destailleur <address@hidden>
Date: 2014-07-15 (Tue, 15 Jul 2014)
Changed paths:
M ChangeLog
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 htdocs/commande/orderstoinvoice.php
M htdocs/core/class/cookie.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/class/html.formprojet.class.php
M htdocs/projet/element.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
ChangeLog
Compare:
https://github.com/Dolibarr/dolibarr/compare/3a625ce6bfcd...8a8a90de78ed