[Dolibarr-git] [Dolibarr/dolibarr] c07e26: Merge branch 'develop' into fr-2613

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: c07e26dcacbed62477530847d92560334c5bdaf3
      
https://github.com/Dolibarr/dolibarr/commit/c07e26dcacbed62477530847d92560334c5bdaf3
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M .editorconfig
    M COPYRIGHT
    A dev/translation/sanity_check_en_langfiles.php
    M htdocs/adherents/admin/public.php
    M htdocs/adherents/card.php
    M htdocs/admin/company.php
    M htdocs/admin/dict.php
    M htdocs/cashdesk/admin/cashdesk.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/askpricesupplier/card.php
    M htdocs/comm/card.php
    M htdocs/comm/index.php
    M htdocs/comm/propal.php
    M htdocs/commande/card.php
    M htdocs/compta/bank/releve.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/mergepdftool.php
    M htdocs/compta/stats/index.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/lib/date.lib.php
    M htdocs/core/lib/memory.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/lib/tax.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/import/import_csv.modules.php
    M htdocs/core/modules/modResource.class.php
    M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/tpl/admin_extrafields_add.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/core/tpl/resource_view.tpl.php
    M htdocs/expedition/card.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/fichinter/card.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/paiement.php
    R htdocs/includes/nusoap/lib/Mail/PEAR.php
    R htdocs/includes/nusoap/lib/Mail/RFC822.php
    R htdocs/includes/nusoap/lib/Mail/mail.php
    M htdocs/includes/nusoap/lib/Mail/mime.php
    R htdocs/includes/nusoap/lib/Mail/mimeDecode.php
    M htdocs/includes/nusoap/lib/Mail/mimePart.php
    R htdocs/includes/nusoap/lib/Mail/null.php
    R htdocs/includes/nusoap/lib/Mail/sendmail.php
    R htdocs/includes/nusoap/lib/Mail/smtp.php
    R htdocs/includes/nusoap/lib/Mail/xmail.dtd
    R htdocs/includes/nusoap/lib/Mail/xmail.xsl
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    A htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/agenda.lang
    M htdocs/langs/en_US/askpricesupplier.lang
    M htdocs/langs/en_US/banks.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/boxes.lang
    M htdocs/langs/en_US/categories.lang
    M htdocs/langs/en_US/cron.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/orders.lang
    M htdocs/langs/en_US/printing.lang
    M htdocs/langs/en_US/productbatch.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/sendings.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/langs/en_US/suppliers.lang
    M htdocs/langs/en_US/trips.lang
    M htdocs/langs/en_US/workflow.lang
    M htdocs/livraison/card.php
    M htdocs/opensurvey/card.php
    M htdocs/product/admin/product.php
    A htdocs/product/class/propalmergepdfproduct.class.php
    M htdocs/product/composition/card.php
    M htdocs/product/document.php
    M htdocs/product/stock/valo.php
    M htdocs/projet/note.php
    M htdocs/resource/element_resource.php
    M htdocs/societe/canvas/company/tpl/card_view.tpl.php
    M htdocs/societe/canvas/individual/tpl/card_view.tpl.php
    M htdocs/societe/consumption.php
    M htdocs/societe/soc.php
    M htdocs/theme/eldy/style.css.php
    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_other.php-NORUN
    M htdocs/webservices/demo_wsclient_productorservice.php-NORUN
    M htdocs/webservices/demo_wsclient_thirdparty.php-NORUN
    M scripts/contracts/email_expire_services_to_representatives.php
    M scripts/invoices/email_unpaid_invoices_to_representatives.php

  Log Message:
  -----------
  Merge branch 'develop' into fr-2613

Conflicts:
        htdocs/install/mysql/migration/3.7.0-3.8.0.sql


  Commit: e2e6049c7f5f45943140684c972ae16eacb144b6
      
https://github.com/Dolibarr/dolibarr/commit/e2e6049c7f5f45943140684c972ae16eacb144b6
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/bookmarks/class/bookmark.class.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/compta/facture/class/facture-rec.class.php
    M htdocs/compta/prelevement/class/ligneprelevement.class.php
    M htdocs/contact/class/contact.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/livraison/class/livraison.class.php
    M htdocs/product/class/product.class.php
    M htdocs/projet/class/project.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/user/class/user.class.php

  Log Message:
  -----------
  Copyright


  Commit: 25a996644d38dc96c15d748a25350d9a37825e9c
      
https://github.com/Dolibarr/dolibarr/commit/25a996644d38dc96c15d748a25350d9a37825e9c
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/bookmarks/class/bookmark.class.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/compta/facture/class/facture-rec.class.php
    M htdocs/compta/prelevement/class/ligneprelevement.class.php
    M htdocs/contact/class/contact.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/livraison/class/livraison.class.php
    M htdocs/product/class/product.class.php
    M htdocs/projet/class/project.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/user/class/user.class.php

  Log Message:
  -----------
  Merge branch 'fr-2613' of https://github.com/marcosgdf/dolibarr into develop

Conflicts:
        htdocs/install/mysql/migration/3.7.0-3.8.0.sql


Compare: 
https://github.com/Dolibarr/dolibarr/compare/d22a403416b1...25a996644d38