dolibarr-git
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] f7e0ef: Bad translation


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] f7e0ef: Bad translation
Date: Thu, 21 Aug 2014 15:02:21 -0700

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: f7e0ef74d7c7f1e07ad3d1b906b6f58c8ca2e71c
      
https://github.com/Dolibarr/dolibarr/commit/f7e0ef74d7c7f1e07ad3d1b906b6f58c8ca2e71c
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Changed paths:
    M htdocs/langs/en_US/admin.lang

  Log Message:
  -----------
  Bad translation


  Commit: 967991f31ad3f4eec84777137be7702859c56394
      
https://github.com/Dolibarr/dolibarr/commit/967991f31ad3f4eec84777137be7702859c56394
  Author: Regis Houssin <address@hidden>
  Date:   2014-08-18 (Mon, 18 Aug 2014)

  Changed paths:
    M htdocs/core/modules/project/modules_project.php
    M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN

  Log Message:
  -----------
  Fix: project builddoc trigger is used now


  Commit: cb2b6e6e40035b28cb241681efda8ec6f97eaf80
      
https://github.com/Dolibarr/dolibarr/commit/cb2b6e6e40035b28cb241681efda8ec6f97eaf80
  Author: Regis Houssin <address@hidden>
  Date:   2014-08-18 (Mon, 18 Aug 2014)

  Changed paths:
    M htdocs/commande/class/commande.class.php

  Log Message:
  -----------
  Fix: define new ref before trigger


  Commit: ee65e42b1c98a60412dfdee04f2e5310a639e5f6
      
https://github.com/Dolibarr/dolibarr/commit/ee65e42b1c98a60412dfdee04f2e5310a639e5f6
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-19 (Tue, 19 Aug 2014)

  Changed paths:
    M htdocs/commande/class/commande.class.php

  Log Message:
  -----------
  The "final ref" of an object must be set only once all database actions
are ok. So after trigger call.
If a trigger need to know new information on an object, trigger must
make a fetch on object.

Revert "Fix: define new ref before trigger"

This reverts commit cb2b6e6e40035b28cb241681efda8ec6f97eaf80.


  Commit: 2f4e1f09e678d7c11a65b7d429b0b2071e5d6c79
      
https://github.com/Dolibarr/dolibarr/commit/2f4e1f09e678d7c11a65b7d429b0b2071e5d6c79
  Author: aspangaro <address@hidden>
  Date:   2014-08-21 (Thu, 21 Aug 2014)

  Changed paths:
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php

  Log Message:
  -----------
  Fix :: Entries salaries into menu doesn't appears when this module is 
activated alone - Needed module tax at the moment


  Commit: e3fede595ff703484594b91a6bfe7217554f51e3
      
https://github.com/Dolibarr/dolibarr/commit/e3fede595ff703484594b91a6bfe7217554f51e3
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-22 (Fri, 22 Aug 2014)

  Changed paths:
    M .gitignore
    M .travis.yml
    M ChangeLog
    M build/debian/README.howto
    M build/makepack-dolibarr.pl
    M build/rpm/conf.php
    M dev/codesniffer/ruleset.xml
    M dev/dolibarr_changes.txt
    M dev/initdata/generate-facture.php
    M dev/initdata/generate-propale.php
    M dev/skeletons/modMyModule.class.php
    M dev/skeletons/skeleton_class.class.php
    M dev/skeletons/skeleton_page.php
    M dev/skeletons/skeleton_script.php
    M dev/vagrant/README.md
    M dev/vagrant/dolibarrdev/Vagrantfile
    M dev/vagrant/dolibarrdev/puphpet/.gitattributes
    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/epel/Gemfile
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/LICENSE
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/Modulefile
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/README.md
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/Rakefile
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/files/RPM-GPG-KEY-EPEL-5
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/files/RPM-GPG-KEY-EPEL-6
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/files/RPM-GPG-KEY-EPEL-7
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/lib/facter/os_maj_version.rb
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/manifests/init.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/manifests/params.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/manifests/rpm_gpg_key.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/metadata.json
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/epel_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_base.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_debuginfo.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_gpgkey.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_source.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_testing.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_testing_debuginfo.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/classes/shared_testing_source.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/defines/rpm_gpg_key_spec.rb
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/spec_helper.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/spec_helper_system.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/system/basic_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/system/usage_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/spec/unit/facter/os_maj_version_spec.rb
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/epel/tests/init.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/.fixtures.yml
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/.nodeset.yml
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/.rspec
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/.travis.yml
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/Gemfile
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/Gemfile.lock
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/LICENSE
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/Modulefile
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/README.md
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/Rakefile
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/manifests/init.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/manifests/params.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/manifests/repo/apt.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/manifests/repo/yum.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/spec/classes/erlang_spec.rb
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/spec/spec_helper.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/spec/spec_helper_system.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/erlang/spec/system/erlang_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/hash_key_true.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/value_true.rb
    M dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/hhvm.pp
    M dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/params.pp
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/pear.pp
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/pecl.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/python/pip.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/supervisord.pp
    M dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/README.md
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/files/plugins/amqp_client-2.3.1.ez
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_plugin/rabbitmqplugins.rb
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_user/rabbitmqctl.rb
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_user.rb
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/config.pp
    M dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/init.pp
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/management.pp
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/params.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/policy.pp
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/server.pp
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/classes/rabbitmq_spec.rb
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_user/rabbitmqctl_spec.rb
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/templates/rabbitmq.config.erb
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/Modulefile
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/README.md
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/manifests/db.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/manifests/init.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/metadata.json
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/spec/spec.opts
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/spec/spec_helper.rb
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/sqlite/tests/init.pp
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/border.png
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/controls.png
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/loading_background.png
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_green.png
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_red.png
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_yellow.png
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/magnify.png
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_75_dadada_1x400.png
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_222222_256x240.png
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_2e83ff_256x240.png
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_454545_256x240.png
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_888888_256x240.png
    M 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_cd0a0a_256x240.png
    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
    A dev/vagrant/dolibarrdev/puphpet/shell/hostsupdater-notice.txt
    M dev/vagrant/dolibarrdev/puphpet/shell/important-notices.sh
    M dev/vagrant/dolibarrdev/puphpet/shell/initial-setup.sh
    A dev/vagrant/dolibarrdev/puphpet/shell/install-puppet.sh
    A dev/vagrant/dolibarrdev/puphpet/shell/install-ruby.sh
    M dev/vagrant/dolibarrdev/puphpet/shell/os-detect.sh
    R dev/vagrant/dolibarrdev/puphpet/shell/r10k.sh
    M dev/vagrant/dolibarrdev/puphpet/shell/ssh-keygen.sh
    R dev/vagrant/dolibarrdev/puphpet/shell/update-puppet.sh
    M htdocs/.gitignore
    A htdocs/accountancy/class/index.html
    A htdocs/accountancy/index.html
    R htdocs/accountancy/index.php
    M htdocs/adherents/admin/adherent.php
    M htdocs/adherents/admin/adherent_extrafields.php
    M htdocs/adherents/admin/adherent_type_extrafields.php
    M htdocs/adherents/admin/public.php
    M htdocs/adherents/canvas/actions_adherentcard_common.class.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
    M htdocs/adherents/card_subscriptions.php
    M htdocs/adherents/cartes/carte.php
    A htdocs/adherents/cartes/index.html
    R htdocs/adherents/cartes/index.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/class/adherent_type.class.php
    M htdocs/adherents/class/cotisation.class.php
    A htdocs/adherents/class/index.html
    M htdocs/adherents/fiche.php
    M htdocs/adherents/fiche_subscription.php
    M htdocs/adherents/index.php
    M htdocs/adherents/ldap.php
    M htdocs/adherents/liste.php
    M htdocs/adherents/stats/byproperties.php
    M htdocs/adherents/stats/geo.php
    M htdocs/adherents/type.php
    M htdocs/admin/agenda.php
    M htdocs/admin/agenda_extrafields.php
    M htdocs/admin/agenda_extsites.php
    M htdocs/admin/agenda_other.php
    M htdocs/admin/barcode.php
    M htdocs/admin/boxes.php
    M htdocs/admin/commande.php
    M htdocs/admin/company.php
    M htdocs/admin/const.php
    M htdocs/admin/dict.php
    M htdocs/admin/dons.php
    M htdocs/admin/external_rss.php
    M htdocs/admin/facture.php
    M htdocs/admin/fckeditor.php
    A htdocs/admin/fiscalyear.php
    A htdocs/admin/fiscalyear_card.php
    A htdocs/admin/fiscalyear_info.php
    M htdocs/admin/ihm.php
    M htdocs/admin/ldap_users.php
    M htdocs/admin/limits.php
    M htdocs/admin/mails.php
    M htdocs/admin/menus.php
    M htdocs/admin/menus/edit.php
    M htdocs/admin/menus/index.php
    M htdocs/admin/menus/other.php
    M htdocs/admin/order_extrafields.php
    M htdocs/admin/orderdet_extrafields.php
    M htdocs/admin/security_other.php
    M htdocs/admin/stock.php
    M htdocs/admin/supplierinvoice_extrafields.php
    M htdocs/admin/supplierorder_extrafields.php
    A htdocs/admin/system/browser.php
    M htdocs/admin/system/database.php
    M htdocs/admin/system/dbtable.php
    M htdocs/admin/system/dolibarr.php
    M htdocs/admin/system/index.php
    M htdocs/admin/tools/dolibarr_export.php
    M htdocs/admin/tools/dolibarr_import.php
    M htdocs/admin/tools/eaccelerator.php
    M htdocs/admin/tools/export.php
    M htdocs/admin/tools/listevents.php
    M htdocs/admin/tools/purge.php
    M htdocs/admin/tools/update.php
    M htdocs/admin/translation.php
    M htdocs/admin/workflow.php
    A htdocs/asterisk/index.html
    R htdocs/asterisk/index.php
    M htdocs/barcode/codeinit.php
    A htdocs/barcode/index.html
    M htdocs/bookmarks/admin/bookmark.php
    A htdocs/bookmarks/admin/index.html
    M htdocs/bookmarks/class/bookmark.class.php
    A htdocs/bookmarks/class/index.html
    M htdocs/bookmarks/fiche.php
    A htdocs/bookmarks/index.html
    R htdocs/bookmarks/index.php
    M htdocs/bookmarks/liste.php
    M htdocs/boutique/admin/boutique.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
    M htdocs/boutique/index.php
    A htdocs/boutique/promotion/class/index.html
    M htdocs/cache.manifest
    M htdocs/cashdesk/admin/cashdesk.php
    A htdocs/cashdesk/admin/index.html
    M htdocs/cashdesk/affIndex.php
    M htdocs/cashdesk/class/Facturation.class.php
    A htdocs/cashdesk/class/index.html
    R htdocs/cashdesk/class/index.php
    A htdocs/cashdesk/css/index.html
    M htdocs/cashdesk/facturation.php
    M htdocs/cashdesk/facturation_dhtml.php
    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/include/keypad.php
    A htdocs/cashdesk/javascript/index.html
    R htdocs/cashdesk/javascript/index.php
    A htdocs/cashdesk/javascript/keypad.js
    M htdocs/cashdesk/tpl/facturation1.tpl.php
    A htdocs/cashdesk/tpl/index.html
    R htdocs/cashdesk/tpl/index.php
    M htdocs/cashdesk/tpl/menu.tpl.php
    M htdocs/cashdesk/tpl/ticket.tpl.php
    M htdocs/categories/admin/categorie_extrafields.php
    A htdocs/categories/admin/index.html
    M htdocs/categories/class/categorie.class.php
    A htdocs/categories/class/index.html
    M htdocs/categories/edit.php
    M htdocs/categories/fiche.php
    M htdocs/categories/traduction.php
    M htdocs/categories/viewcat.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/class/cactioncomm.class.php
    A htdocs/comm/action/class/index.html
    M htdocs/comm/action/contact.php
    M htdocs/comm/action/fiche.php
    M htdocs/comm/action/index.php
    M htdocs/comm/action/listactions.php
    A htdocs/comm/action/peruser.php
    M htdocs/comm/action/rapport/index.php
    M htdocs/comm/address.php
    A htdocs/comm/admin/index.html
    M htdocs/comm/admin/propal_extrafields.php
    M htdocs/comm/admin/propaldet_extrafields.php
    M htdocs/comm/fiche.php
    M htdocs/comm/index.php
    M htdocs/comm/list.php
    M htdocs/comm/mailing/cibles.php
    A htdocs/comm/mailing/class/index.html
    M htdocs/comm/mailing/class/mailing.class.php
    M htdocs/comm/mailing/fiche.php
    M htdocs/comm/mailing/liste.php
    M htdocs/comm/propal.php
    A htdocs/comm/propal/class/index.html
    M htdocs/comm/propal/class/propal.class.php
    A htdocs/comm/propal/tpl/index.html
    A htdocs/comm/prospect/class/index.html
    M htdocs/comm/prospect/list.php
    M htdocs/comm/remise.php
    M htdocs/comm/remx.php
    M htdocs/commande/class/commande.class.php
    A htdocs/commande/class/index.html
    M htdocs/commande/contact.php
    M htdocs/commande/customer.php
    M htdocs/commande/fiche.php
    M htdocs/commande/orderstoinvoice.php
    A htdocs/commande/tpl/index.html
    M htdocs/compta/ajaxpayment.php
    M htdocs/compta/bank/account.php
    M htdocs/compta/bank/annuel.php
    M htdocs/compta/bank/bankid_fr.php
    M htdocs/compta/bank/categ.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/class/bankcateg.class.php
    A htdocs/compta/bank/class/index.html
    M htdocs/compta/bank/fiche.php
    M htdocs/compta/bank/graph.php
    M htdocs/compta/bank/ligne.php
    M htdocs/compta/bank/rappro.php
    M htdocs/compta/bank/releve.php
    M htdocs/compta/bank/search.php
    M htdocs/compta/bank/treso.php
    M htdocs/compta/bank/virement.php
    M htdocs/compta/charges/index.php
    M htdocs/compta/deplacement/class/deplacement.class.php
    A htdocs/compta/deplacement/class/index.html
    M htdocs/compta/deplacement/fiche.php
    M htdocs/compta/dons/class/don.class.php
    A htdocs/compta/dons/class/index.html
    M htdocs/compta/dons/fiche.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/admin/facture_cust_extrafields.php
    M htdocs/compta/facture/admin/facturedet_cust_extrafields.php

  Log Message:
  -----------
  Removed all triggers _BUILDOC. Building a document is not a business
status change but a technical action. So hooks must be used instead.


Merge branch '3.6-patch' of github.com:aspangaro/dolibarr into
aspangaro-3.6-patch

Conflicts:
        htdocs/core/modules/project/modules_project.php
        htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN


  Commit: 137efaa1f42694b02d9462a572c51e701dfb5390
      
https://github.com/Dolibarr/dolibarr/commit/137efaa1f42694b02d9462a572c51e701dfb5390
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-22 (Fri, 22 Aug 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/commande/modules_commande.php
    M htdocs/core/modules/contract/modules_contract.php
    M htdocs/core/modules/expedition/modules_expedition.php
    M htdocs/core/modules/facture/modules_facture.php
    M htdocs/core/modules/fichinter/modules_fichinter.php
    M htdocs/core/modules/livraison/modules_livraison.php
    M htdocs/core/modules/project/task/modules_task.php
    M htdocs/core/modules/propale/modules_propale.php
    M htdocs/core/modules/societe/modules_societe.class.php
    M htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
    M htdocs/core/modules/supplier_order/modules_commandefournisseur.php
    M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
    M htdocs/langs/en_US/admin.lang

  Log Message:
  -----------
  Merge branch 'aspangaro-3.6-patch' into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/fc02f0f08f76...137efaa1f426

reply via email to

[Prev in Thread] Current Thread [Next in Thread]