[Dolibarr-git] [Dolibarr/dolibarr] ae23d7: Add field nb_holidays and salary.

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ae23d78c7414c240d6e2f57fcf7d82c0ae3e3c9f
      
https://github.com/Dolibarr/dolibarr/commit/ae23d78c7414c240d6e2f57fcf7d82c0ae3e3c9f
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-04-25 (Fri, 25 Apr 2014)

  Changed paths:
    M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
    M htdocs/install/mysql/tables/llx_user.sql

  Log Message:
  -----------
  Add field nb_holidays and salary.


  Commit: 196cf53dbd133f5dce181551bc591b0cda064ecf
      
https://github.com/Dolibarr/dolibarr/commit/196cf53dbd133f5dce181551bc591b0cda064ecf
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-04-25 (Fri, 25 Apr 2014)

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

  Log Message:
  -----------
  Fix: Pb of return values


  Commit: 9a320cc50fe4a8c663b62bf40f0ae62bbfb718da
      
https://github.com/Dolibarr/dolibarr/commit/9a320cc50fe4a8c663b62bf40f0ae62bbfb718da
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-04-25 (Fri, 25 Apr 2014)

  Changed paths:
    M htdocs/core/js/lib_head.js

  Log Message:
  -----------
  Removed a function we should not have.


  Commit: 71ca269c71172ff065760c90ae3dda53138d7931
      
https://github.com/Dolibarr/dolibarr/commit/71ca269c71172ff065760c90ae3dda53138d7931
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-04-25 (Fri, 25 Apr 2014)

  Changed paths:
    M ChangeLog
    R doc/images/dolibarr_screenshot6.png
    M htdocs/adherents/class/adherent.class.php
    M htdocs/admin/const.php
    M htdocs/core/ajax/row.php
    M htdocs/core/class/CMailFile.class.php
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/class/commoninvoice.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/class/cookie.class.php
    M htdocs/core/class/discount.class.php
    M htdocs/core/class/dolprintipp.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/fileupload.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formadmin.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/html.formsms.class.php
    M htdocs/core/class/infobox.class.php
    M htdocs/core/class/ldap.class.php
    M htdocs/core/class/menubase.class.php
    M htdocs/core/class/rssparser.class.php
    M htdocs/core/class/stats.class.php
    M htdocs/core/class/translate.class.php
    M htdocs/core/filemanagerdol/connectors/php/util.php
    M htdocs/core/lib/agenda.lib.php
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/lib/categories.lib.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/contract.lib.php
    M htdocs/core/lib/cron.lib.php
    M htdocs/core/lib/date.lib.php
    M htdocs/core/lib/fichinter.lib.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/images.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/price.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/lib/usergroups.lib.php
    M htdocs/core/menus/standard/auguria.lib.php
    M htdocs/core/menus/standard/auguria_menu.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/menus/standard/eldy_menu.php
    M htdocs/core/menus/standard/empty.php
    M htdocs/core/modules/action/rapport.pdf.php
    M htdocs/core/modules/barcode/mod_barcode_product_standard.php
    M htdocs/core/modules/commande/mod_commande_marbre.php
    M htdocs/core/modules/commande/modules_commande.php
    M htdocs/core/modules/contract/doc/pdf_strato.modules.php
    M htdocs/core/modules/contract/mod_contract_serpis.php
    M htdocs/core/modules/contract/modules_contract.php
    M htdocs/core/modules/dons/modules_don.php
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    M htdocs/core/modules/expedition/mod_expedition_safor.php
    M htdocs/core/modules/expedition/modules_expedition.php
    M htdocs/core/modules/export/export_excel.modules.php
    M htdocs/core/modules/export/export_excel2007.modules.php
    M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
    M htdocs/core/modules/facture/mod_facture_mars.php
    M htdocs/core/modules/facture/mod_facture_terre.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
    M htdocs/core/modules/fichinter/mod_pacific.php
    M htdocs/core/modules/fichinter/modules_fichinter.php
    M htdocs/core/modules/livraison/mod_livraison_jade.php
    M htdocs/core/modules/livraison/mod_livraison_saphir.php
    M htdocs/core/modules/livraison/modules_livraison.php
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/modules/member/modules_cards.php
    M htdocs/core/modules/modCron.class.php
    M htdocs/core/modules/modExpedition.class.php
    M htdocs/core/modules/modProjet.class.php
    M htdocs/core/modules/modSkype.class.php
    M htdocs/core/modules/product/mod_codeproduct_elephant.php
    M htdocs/core/modules/product/mod_codeproduct_leopard.php
    M htdocs/core/modules/project/mod_project_simple.php
    M htdocs/core/modules/project/task/mod_task_simple.php
    M htdocs/core/modules/project/task/pdf/doc_generic_task_odt.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/propale/mod_propale_marbre.php
    M htdocs/core/modules/propale/modules_propale.php
    M htdocs/core/modules/rapport/pdf_paiement.class.php
    M htdocs/core/modules/societe/mod_codeclient_elephant.php
    M htdocs/core/modules/societe/mod_codeclient_leopard.php
    M htdocs/core/modules/societe/mod_codeclient_monkey.php
    M htdocs/core/modules/societe/mod_codecompta_panicum.php
    M htdocs/core/modules/societe/modules_societe.class.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
    M htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
    M htdocs/core/modules/supplier_order/modules_commandefournisseur.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/core/modules/syslog/mod_syslog_chromephp.php
    M htdocs/core/modules/syslog/mod_syslog_firephp.php
    M htdocs/core/search_page.php
    M htdocs/cron/class/cronjob.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/class/expeditionbatch.class.php
    M htdocs/langs/en_US/products.lang
    M htdocs/main.inc.php
    M htdocs/public/paybox/paymentok.php
    M htdocs/public/paypal/paymentok.php

  Log Message:
  -----------
  Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into
develop

Conflicts:
        htdocs/core/menus/standard/auguria.lib.php
        htdocs/core/menus/standard/eldy.lib.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/b117ea83be1e...71ca269c7117