[Dolibarr-git] [Dolibarr/dolibarr] dcb0d4: Merge pull request #5 from Dolibarr/develop

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: dcb0d47534d5eff5ac1e9fdc7177e54b9faedd7c
      
https://github.com/Dolibarr/dolibarr/commit/dcb0d47534d5eff5ac1e9fdc7177e54b9faedd7c
  Author: Teddy <address@hidden>
  Date:   2014-11-17 (Mon, 17 Nov 2014)

  Changed paths:
    M .scrutinizer.yml
    M .travis.yml
    M COPYRIGHT
    M ChangeLog
    M build/makepack-dolibarr.pl
    M dev/codesniffer/ruleset.xml
    M dev/skeletons/skeleton_class.class.php
    M htdocs/accountancy/admin/account.php
    M htdocs/accountancy/admin/card.php
    M htdocs/accountancy/admin/export.php
    M htdocs/accountancy/admin/fiscalyear.php
    M htdocs/accountancy/bookkeeping/card.php
    M htdocs/accountancy/bookkeeping/list.php
    M htdocs/accountancy/class/bookkeeping.class.php
    M htdocs/accountancy/customer/card.php
    M htdocs/accountancy/customer/index.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/accountancy/journal/cashjournal.php
    M htdocs/accountancy/journal/index.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/accountancy/supplier/card.php
    M htdocs/accountancy/supplier/index.php
    M htdocs/adherents/admin/adherent_type_extrafields.php
    M htdocs/adherents/card.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/admin/dons.php
    M htdocs/admin/menus.php
    M htdocs/admin/menus/index.php
    M htdocs/admin/syslog.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/categories/photos.php
    M htdocs/comm/action/card.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/class/cactioncomm.class.php
    M htdocs/comm/action/document.php
    M htdocs/comm/action/listactions.php
    M htdocs/comm/action/peruser.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/list.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/list.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/class/bankcateg.class.php
    M htdocs/compta/deplacement/list.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/class/paymentterm.class.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/compta/localtax/class/localtax.class.php
    M htdocs/compta/paiement/cheque/index.php
    R htdocs/compta/prelevement/bon.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/compta/prelevement/class/rejetprelevement.class.php
    M htdocs/compta/prelevement/demandes.php
    M htdocs/compta/prelevement/factures.php
    M htdocs/compta/prelevement/ligne.php
    M htdocs/compta/resultat/index.php
    M htdocs/compta/salaries/class/paymentsalary.class.php
    M htdocs/compta/sociales/class/chargesociales.class.php
    M htdocs/compta/sociales/class/paymentsocialcontribution.class.php
    M htdocs/compta/stats/index.php
    M htdocs/compta/tva/class/tva.class.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contact/list.php
    M htdocs/contrat/card.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/antispamimage.php
    M htdocs/core/boxes/box_actions.php
    M htdocs/core/boxes/modules_boxes.php
    M htdocs/core/class/ccountry.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/ctypent.class.php
    M htdocs/core/class/events.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formcompany.class.php
    M htdocs/core/class/html.formcron.class.php
    M htdocs/core/class/html.formsms.class.php
    M htdocs/core/class/ldap.class.php
    M htdocs/core/class/menubase.class.php
    M htdocs/core/class/notify.class.php
    M htdocs/core/class/translate.class.php
    M htdocs/core/db/Database.interface.php
    M htdocs/core/db/DoliDB.class.php
    M htdocs/core/js/lib_head.js
    M htdocs/core/lib/accounting.lib.php
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/invoice2.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/prelevement.lib.php
    M htdocs/core/lib/product.lib.php
    M htdocs/core/lib/report.lib.php
    M htdocs/core/login/functions_dolibarr.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/action/rapport.pdf.php
    M htdocs/core/modules/modAccounting.class.php
    M htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
    M htdocs/core/tpl/admin_extrafields_add.tpl.php
    M htdocs/core/tpl/admin_extrafields_edit.tpl.php
    M htdocs/core/tpl/extrafields_view.tpl.php
    M htdocs/core/tpl/login.tpl.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/core/tpl/passwordforgotten.tpl.php
    M htdocs/cron/class/cronjob.class.php
    M htdocs/ecm/class/ecmdirectory.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fichinter/admin/fichinter_extrafields.php
    M htdocs/fourn/card.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/list.php
    M htdocs/fourn/facture/card.php
    M htdocs/holiday/class/holiday.class.php
    R htdocs/includes/jquery/plugins/multiple-select/LICENSE
    R htdocs/includes/jquery/plugins/multiple-select/README.md
    R htdocs/includes/jquery/plugins/multiple-select/jquery.multiple.select.js
    R htdocs/includes/jquery/plugins/multiple-select/multiple-select.css
    R htdocs/includes/jquery/plugins/multiple-select/multiple-select.jquery.json
    R htdocs/includes/jquery/plugins/multiple-select/multiple-select.png
    A htdocs/includes/jquery/plugins/select2/.gitignore
    A htdocs/includes/jquery/plugins/select2/CONTRIBUTING.md
    A htdocs/includes/jquery/plugins/select2/LICENSE
    A htdocs/includes/jquery/plugins/select2/README.md
    A htdocs/includes/jquery/plugins/select2/bower.json
    A htdocs/includes/jquery/plugins/select2/component.json
    A htdocs/includes/jquery/plugins/select2/composer.json
    A htdocs/includes/jquery/plugins/select2/package.json
    A htdocs/includes/jquery/plugins/select2/release.sh
    A htdocs/includes/jquery/plugins/select2/select2-bootstrap.css
    A htdocs/includes/jquery/plugins/select2/select2-spinner.gif
    A htdocs/includes/jquery/plugins/select2/select2.css
    A htdocs/includes/jquery/plugins/select2/select2.jquery.json
    A htdocs/includes/jquery/plugins/select2/select2.js
    A htdocs/includes/jquery/plugins/select2/select2.min.js
    A htdocs/includes/jquery/plugins/select2/select2.png
    A htdocs/includes/jquery/plugins/select2/select2_locale_ar.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_az.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_bg.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_ca.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_cs.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_da.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_de.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_el.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_en.js.template
    A htdocs/includes/jquery/plugins/select2/select2_locale_es.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_et.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_eu.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_fa.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_fi.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_fr.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_gl.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_he.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_hr.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_hu.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_id.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_is.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_it.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_ja.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_ka.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_ko.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_lt.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_lv.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_mk.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_ms.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_nb.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_nl.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_pl.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_pt-BR.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_pt-PT.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_ro.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_rs.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_ru.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_sk.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_sv.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_th.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_tr.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_ug-CN.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_uk.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_vi.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_zh-CN.js
    A htdocs/includes/jquery/plugins/select2/select2_locale_zh-TW.js
    A htdocs/includes/jquery/plugins/select2/select2x2.png
    M htdocs/install/mssql/functions/functions.sql
    M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/migration/repair.sql
    M htdocs/install/mysql/tables/llx_commande_fournisseur.sql
    M htdocs/install/mysql/tables/llx_contrat.sql
    M htdocs/install/mysql/tables/llx_facture_fourn.sql
    M htdocs/install/mysql/tables/llx_notify.sql
    M htdocs/install/upgrade.php
    M htdocs/install/upgrade2.php
    M htdocs/langs/ar_SA/install.lang
    M htdocs/langs/ar_SA/projects.lang
    M htdocs/langs/en_US/accountancy.lang
    M htdocs/langs/en_US/categories.lang
    M htdocs/langs/en_US/compta.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/margins.lang
    M htdocs/langs/en_US/resource.lang
    M htdocs/langs/en_US/sendings.lang
    M htdocs/langs/en_US/withdrawals.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/agenda.lang
    M htdocs/langs/es_ES/bills.lang
    M htdocs/langs/es_ES/boxes.lang
    M htdocs/langs/es_ES/companies.lang
    M htdocs/langs/es_ES/deliveries.lang
    M htdocs/langs/es_ES/donations.lang
    M htdocs/langs/es_ES/errors.lang
    M htdocs/langs/es_ES/holiday.lang
    M htdocs/langs/es_ES/interventions.lang
    M htdocs/langs/es_ES/mails.lang
    M htdocs/langs/es_ES/main.lang
    M htdocs/langs/es_ES/margins.lang
    M htdocs/langs/es_ES/members.lang
    M htdocs/langs/es_ES/other.lang
    M htdocs/langs/es_ES/products.lang
    M htdocs/langs/es_ES/projects.lang
    M htdocs/langs/es_ES/propal.lang
    M htdocs/langs/es_ES/suppliers.lang
    M htdocs/langs/es_ES/users.lang
    M htdocs/langs/es_ES/withdrawals.lang
    M htdocs/langs/fr_FR/accountancy.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/agenda.lang
    M htdocs/langs/fr_FR/bills.lang
    M htdocs/langs/fr_FR/categories.lang
    M htdocs/langs/fr_FR/commercial.lang
    M htdocs/langs/fr_FR/companies.lang
    M htdocs/langs/fr_FR/deliveries.lang
    M htdocs/langs/fr_FR/donations.lang
    M htdocs/langs/fr_FR/errors.lang
    M htdocs/langs/fr_FR/holiday.lang
    M htdocs/langs/fr_FR/interventions.lang
    M htdocs/langs/fr_FR/mails.lang
    M htdocs/langs/fr_FR/main.lang
    M htdocs/langs/fr_FR/margins.lang
    M htdocs/langs/fr_FR/members.lang
    M htdocs/langs/fr_FR/other.lang
    M htdocs/langs/fr_FR/products.lang
    M htdocs/langs/fr_FR/propal.lang
    M htdocs/langs/fr_FR/resource.lang
    M htdocs/langs/fr_FR/sendings.lang
    M htdocs/langs/fr_FR/suppliers.lang
    M htdocs/langs/fr_FR/users.lang
    M htdocs/langs/id_ID/link.lang
    M htdocs/langs/id_ID/salaries.lang
    M htdocs/langs/sv_SE/accountancy.lang
    M htdocs/langs/sv_SE/admin.lang
    M htdocs/langs/sv_SE/agenda.lang
    M htdocs/langs/sv_SE/banks.lang
    M htdocs/langs/sv_SE/bills.lang
    M htdocs/langs/sv_SE/boxes.lang
    M htdocs/langs/sv_SE/cashdesk.lang
    M htdocs/langs/sv_SE/categories.lang
    M htdocs/langs/sv_SE/commercial.lang
    M htdocs/langs/sv_SE/companies.lang
    M htdocs/langs/sv_SE/contracts.lang
    M htdocs/langs/sv_SE/cron.lang
    M htdocs/langs/sv_SE/deliveries.lang
    M htdocs/langs/sv_SE/dict.lang
    M htdocs/langs/sv_SE/donations.lang
    M htdocs/langs/sv_SE/ecm.lang
    M htdocs/langs/sv_SE/errors.lang
    M htdocs/langs/sv_SE/externalsite.lang
    M htdocs/langs/sv_SE/ftp.lang
    M htdocs/langs/sv_SE/help.lang
    M htdocs/langs/sv_SE/holiday.lang
    M htdocs/langs/sv_SE/languages.lang
    M htdocs/langs/sv_SE/link.lang
    M htdocs/langs/sv_SE/mailmanspip.lang
    M htdocs/langs/sv_SE/main.lang
    M htdocs/langs/sv_SE/members.lang
    M htdocs/langs/sv_SE/opensurvey.lang
    M htdocs/langs/sv_SE/orders.lang
    M htdocs/langs/sv_SE/other.lang
    M htdocs/langs/sv_SE/paypal.lang
    M htdocs/langs/sv_SE/propal.lang
    M htdocs/langs/sv_SE/salaries.lang
    M htdocs/langs/sv_SE/sendings.lang
    M htdocs/langs/sv_SE/stocks.lang
    M htdocs/langs/sv_SE/users.lang
    M htdocs/langs/tr_TR/accountancy.lang
    M htdocs/langs/tr_TR/admin.lang
    M htdocs/langs/tr_TR/agenda.lang
    M htdocs/langs/tr_TR/banks.lang
    M htdocs/langs/tr_TR/bills.lang
    M htdocs/langs/tr_TR/boxes.lang
    M htdocs/langs/tr_TR/categories.lang
    M htdocs/langs/tr_TR/commercial.lang
    M htdocs/langs/tr_TR/companies.lang
    M htdocs/langs/tr_TR/compta.lang
    M htdocs/langs/tr_TR/contracts.lang
    M htdocs/langs/tr_TR/cron.lang
    M htdocs/langs/tr_TR/dict.lang
    M htdocs/langs/tr_TR/donations.lang
    M htdocs/langs/tr_TR/errors.lang
    M htdocs/langs/tr_TR/exports.lang
    M htdocs/langs/tr_TR/help.lang
    M htdocs/langs/tr_TR/holiday.lang
    M htdocs/langs/tr_TR/mails.lang
    M htdocs/langs/tr_TR/main.lang
    M htdocs/langs/tr_TR/margins.lang
    M htdocs/langs/tr_TR/orders.lang
    M htdocs/langs/tr_TR/products.lang
    M htdocs/langs/tr_TR/projects.lang
    M htdocs/langs/tr_TR/sendings.lang
    M htdocs/langs/tr_TR/stocks.lang
    M htdocs/langs/tr_TR/suppliers.lang
    M htdocs/langs/tr_TR/users.lang
    M htdocs/main.inc.php
    M htdocs/opensurvey/class/opensurveysondage.class.php
    M htdocs/product/card.php
    M htdocs/product/class/product.class.php
    M htdocs/product/class/productbatch.class.php
    M htdocs/product/composition/card.php
    M htdocs/product/index.php
    M htdocs/product/list.php
    M htdocs/product/reassort.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/product.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/class/task.class.php
    M htdocs/projet/element.php
    M htdocs/public/test/test_arrays.php
    M htdocs/public/test/test_forms.php
    M htdocs/resource/class/html.formresource.class.php
    M htdocs/resource/class/resource.class.php
    M htdocs/societe/class/address.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/index.php
    M htdocs/societe/notify/card.php
    M htdocs/societe/soc.php
    M htdocs/theme/.gitignore
    A htdocs/theme/eldy/.gitignore
    M htdocs/theme/eldy/style.css.php
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php
    M htdocs/user/class/usergroup.class.php
    M htdocs/webservices/server_thirdparty.php

  Log Message:
  -----------
  Merge pull request #5 from Dolibarr/develop

Merge pull request #5 from Dolibarr/develop


  Commit: a9a8e9a73ce981e44aeac7b75ad834256e7f3265
      
https://github.com/Dolibarr/dolibarr/commit/a9a8e9a73ce981e44aeac7b75ad834256e7f3265
  Author: Andrelec1 <address@hidden>
  Date:   2014-11-17 (Mon, 17 Nov 2014)

  Changed paths:
    M htdocs/fichinter/card.php
    M htdocs/holiday/card.php
    M htdocs/holiday/class/holiday.class.php

  Log Message:
  -----------
  Fix : more than 1000  holidays

Si il y a plus de 1000 jours de congés, le délimiteur des millier fais
bugger les calcule ...


  Commit: 3d968aa4324c03946bdcc33ca1ba43edec0f3285
      
https://github.com/Dolibarr/dolibarr/commit/3d968aa4324c03946bdcc33ca1ba43edec0f3285
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-22 (Sat, 22 Nov 2014)

  Changed paths:
    M htdocs/holiday/card.php
    M htdocs/holiday/class/holiday.class.php

  Log Message:
  -----------
  Merge pull request #2027 from Devensys/Develop-FixGRHconge1

FIX bug in GRH module


Compare: 
https://github.com/Dolibarr/dolibarr/compare/f845cde3f105...3d968aa4324c