[Dolibarr-git] [Dolibarr/dolibarr] efd99a: Fix : extrafield errors

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: efd99a6f44003a6f8d353b2e318572cb20b0e8bc
      
https://github.com/Dolibarr/dolibarr/commit/efd99a6f44003a6f8d353b2e318572cb20b0e8bc
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2014-10-27 (Mon, 27 Oct 2014)

  Changed paths:
    M htdocs/core/tpl/extrafields_view.tpl.php

  Log Message:
  -----------
  Fix : extrafield errors


  Commit: 42008fcf98d7fa90dc685fad4fe3a50be637f588
      
https://github.com/Dolibarr/dolibarr/commit/42008fcf98d7fa90dc685fad4fe3a50be637f588
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2014-10-27 (Mon, 27 Oct 2014)

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

  Log Message:
  -----------
  Fix : remove associated users when company is deleted


  Commit: a5739c248ecdf19af7098582ba21641a8c8abd09
      
https://github.com/Dolibarr/dolibarr/commit/a5739c248ecdf19af7098582ba21641a8c8abd09
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2014-10-27 (Mon, 27 Oct 2014)

  Changed paths:
    M htdocs/fourn/class/fournisseur.product.class.php

  Log Message:
  -----------
  Fix : Product supplier prices were not working anymore due to bad SQL


  Commit: fda32f663886c1dbb47f49a27c0d0bd59039af06
      
https://github.com/Dolibarr/dolibarr/commit/fda32f663886c1dbb47f49a27c0d0bd59039af06
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2014-10-27 (Mon, 27 Oct 2014)

  Changed paths:
    M htdocs/contact/card.php
    M htdocs/core/lib/company.lib.php
    M htdocs/projet/tasks/time.php

  Log Message:
  -----------
  FixDosFiles


  Commit: 7b7b7e79e93d5b0062d01866275f569bed950513
      
https://github.com/Dolibarr/dolibarr/commit/7b7b7e79e93d5b0062d01866275f569bed950513
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2014-10-27 (Mon, 27 Oct 2014)

  Changed paths:
    M ChangeLog
    M dev/fixperms.sh
    M htdocs/adherents/index.php
    M htdocs/admin/agenda.php
    M htdocs/admin/company.php
    M htdocs/admin/dict.php
    M htdocs/admin/notification.php
    M htdocs/categories/categorie.php
    M htdocs/categories/index.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/index.php
    M htdocs/comm/action/listactions.php
    M htdocs/comm/action/peruser.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/apercu.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/apercu.php
    M htdocs/commande/card.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/bank/index.php
    M htdocs/compta/charges/index.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/apercu.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/prelevement/demandes.php
    M htdocs/compta/prelevement/list.php
    M htdocs/contrat/class/contrat.class.php
    A htdocs/core/ajax/productonoff.php
    M htdocs/core/boxes/box_clients.php
    M htdocs/core/boxes/box_prospect.php
    M htdocs/core/class/CMailFile.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/hookmanager.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formactions.class.php
    M htdocs/core/class/html.formcompany.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/class/mobiledetect.class.php
    M htdocs/core/class/notify.class.php
    M htdocs/core/class/rssparser.class.php
    M htdocs/core/class/smtps.class.php
    M htdocs/core/class/translate.class.php
    M htdocs/core/db/DoliDB.class.php
    M htdocs/core/db/mssql.class.php
    M htdocs/core/db/mysql.class.php
    M htdocs/core/db/mysqli.class.php
    M htdocs/core/db/pgsql.class.php
    M htdocs/core/db/sqlite.class.php
    M htdocs/core/lib/admin.lib.php
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/contract.lib.php
    M htdocs/core/lib/fichinter.lib.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/fourn.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/lib/invoice.lib.php
    M htdocs/core/lib/member.lib.php
    M htdocs/core/lib/order.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/lib/propal.lib.php
    M htdocs/core/lib/security.lib.php
    M htdocs/core/lib/security2.lib.php
    M htdocs/core/lib/usergroups.lib.php
    M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
    M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
    M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
    M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
    M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
    M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
    M htdocs/core/triggers/interface_50_modNotification_Notification.class.php
    M htdocs/expedition/card.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/shipment.php
    M htdocs/fichinter/apercu.php
    M htdocs/fichinter/card.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fichinter/list.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/list.php
    M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
    M htdocs/holiday/admin/tomergewithholiday.php
    M htdocs/holiday/index.php
    M htdocs/holiday/tomergewithdefine_holiday.php
    M htdocs/install/mysql/data/llx_00_c_country.sql
    M htdocs/install/mysql/data/llx_c_action_trigger.sql
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/tables/llx_c_country.sql
    M htdocs/install/mysql/tables/llx_extrafields.sql
    M htdocs/install/mysql/tables/llx_notify.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/agenda.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/commercial.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/contracts.lang
    M htdocs/langs/en_US/donations.lang
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/interventions.lang
    M htdocs/langs/en_US/mails.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/margins.lang
    M htdocs/langs/en_US/members.lang
    M htdocs/langs/en_US/orders.lang
    M htdocs/langs/en_US/other.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/en_US/propal.lang
    M htdocs/langs/en_US/resource.lang
    M htdocs/langs/en_US/suppliers.lang
    M htdocs/langs/en_US/trips.lang
    M htdocs/langs/en_US/users.lang
    M htdocs/langs/en_US/withdrawals.lang
    M htdocs/langs/es_ES/main.lang
    M htdocs/livraison/class/livraison.class.php
    M htdocs/main.inc.php
    M htdocs/product/card.php
    M htdocs/product/class/product.class.php
    M htdocs/product/index.php
    M htdocs/product/list.php
    M htdocs/product/photos.php
    M htdocs/product/stock/list.php
    M htdocs/product/stock/product.php
    M htdocs/resource/add.php
    M htdocs/resource/card.php
    M htdocs/societe/ajaxcompanies.php
    M htdocs/societe/consumption.php
    M htdocs/societe/index.php
    M htdocs/societe/notify/card.php
    M htdocs/societe/soc.php
    M htdocs/societe/societecontact.php
    M htdocs/theme/amarok/style.css.php
    M htdocs/theme/auguria/style.css.php
    M htdocs/theme/bureau2crea/style.css.php
    M htdocs/theme/cameleo/style.css.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/user/agenda_extsites.php
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php
    M htdocs/user/passwordforgotten.php
    M htdocs/webservices/server_order.php
    M scripts/accountancy/export-thirdpartyaccount.php
    M test/phpunit/SecurityTest.php

  Log Message:
  -----------
  Merge branch 'develop' of github.com:Dolibarr/dolibarr into mkoevols

Conflicts:
        htdocs/core/lib/company.lib.php


  Commit: 8b179c0d2a4402a275d2337f69d126594fd07d66
      
https://github.com/Dolibarr/dolibarr/commit/8b179c0d2a4402a275d2337f69d126594fd07d66
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2014-10-27 (Mon, 27 Oct 2014)

  Changed paths:
    M htdocs/contrat/card.php

  Log Message:
  -----------
  Fix : typo


  Commit: d6c1b71350451168c34576297b2b2cb7e2a25390
      
https://github.com/Dolibarr/dolibarr/commit/d6c1b71350451168c34576297b2b2cb7e2a25390
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-10-30 (Thu, 30 Oct 2014)

  Changed paths:
    M htdocs/contrat/card.php
    M htdocs/core/tpl/extrafields_view.tpl.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/societe/class/societe.class.php

  Log Message:
  -----------
  Merge pull request #1983 from atm-maxime/mkoevols

Fixes on extrafields, product supplier prices and user / company association 
deletion


Compare: 
https://github.com/Dolibarr/dolibarr/compare/87901d07de6d...d6c1b7135045