[Dolibarr-git] [Dolibarr/dolibarr] d9693b: New : Module HRM

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: d9693ba2f2d96e14ec184324a2466b0d8eae5f7d
      
https://github.com/Dolibarr/dolibarr/commit/d9693ba2f2d96e14ec184324a2466b0d8eae5f7d
  Author: aspangaro <address@hidden>
  Date:   2015-10-09 (Fri, 09 Oct 2015)

  Changed paths:
    A htdocs/core/modules/modHRM.class.php

  Log Message:
  -----------
  New : Module HRM


  Commit: 6a7892ca525f25500c72e1e73f66e4c5d203f698
      
https://github.com/Dolibarr/dolibarr/commit/6a7892ca525f25500c72e1e73f66e4c5d203f698
  Author: aspangaro <address@hidden>
  Date:   2015-10-09 (Fri, 09 Oct 2015)

  Changed paths:
    A htdocs/install/mysql/data/llx_c_hrm_department.sql
    A htdocs/install/mysql/data/llx_c_hrm_function.sql
    A htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    A htdocs/install/mysql/tables/llx_c_hrm_department.sql
    A htdocs/install/mysql/tables/llx_c_hrm_function.sql
    A htdocs/install/mysql/tables/llx_establishment.sql

  Log Message:
  -----------
  Add the first tables


  Commit: b571cc86ff91511b8019fa21b831b481000f9afd
      
https://github.com/Dolibarr/dolibarr/commit/b571cc86ff91511b8019fa21b831b481000f9afd
  Author: aspangaro <address@hidden>
  Date:   2015-10-09 (Fri, 09 Oct 2015)

  Changed paths:
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    M htdocs/install/mysql/tables/llx_user.sql
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php

  Log Message:
  -----------
  Add a yn form in user card to know if the user is also an employee


  Commit: bde7279aa1f8ea98612a7893b5d6952a2622878c
      
https://github.com/Dolibarr/dolibarr/commit/bde7279aa1f8ea98612a7893b5d6952a2622878c
  Author: aspangaro <address@hidden>
  Date:   2015-10-09 (Fri, 09 Oct 2015)

  Changed paths:
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    M htdocs/install/mysql/tables/llx_establishment.sql

  Log Message:
  -----------
  Review by Rdoursenaud. Tkanks


  Commit: f6947afc2f778859adced0e086cf080bfe49b696
      
https://github.com/Dolibarr/dolibarr/commit/f6947afc2f778859adced0e086cf080bfe49b696
  Author: aspangaro <address@hidden>
  Date:   2015-10-10 (Sat, 10 Oct 2015)

  Changed paths:
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/adherents/list.php
    M htdocs/adherents/stats/byproperties.php
    M htdocs/adherents/stats/geo.php
    M htdocs/adherents/stats/index.php
    M htdocs/adherents/type.php
    M htdocs/asterisk/wrapper.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/askpricesupplier/list.php
    M htdocs/comm/list.php
    M htdocs/comm/propal/list.php
    M htdocs/comm/propal/stats/index.php
    M htdocs/comm/prospect/list.php
    M htdocs/commande/list.php
    M htdocs/commande/stats/index.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/facture/mergepdftool.php
    M htdocs/compta/facture/stats/index.php
    M htdocs/compta/paiement/cheque/list.php
    M htdocs/compta/paiement/class/paiement.class.php
    M htdocs/compta/paiement/list.php
    M htdocs/compta/stats/cabyuser.php
    M htdocs/compta/stats/casoc.php
    M htdocs/contact/list.php
    M htdocs/contrat/card.php
    M htdocs/contrat/list.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
    M htdocs/core/modules/modWebServicesClient.class.php
    M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
    M htdocs/fourn/list.php
    M htdocs/install/filelist.xml
    M htdocs/product/list.php
    M htdocs/product/reassort.php
    M htdocs/product/reassortlot.php
    M htdocs/product/stats/commande.php
    M htdocs/product/stats/commande_fournisseur.php
    M htdocs/product/stats/contrat.php
    M htdocs/product/stats/facture.php
    M htdocs/product/stats/facture_fournisseur.php
    M htdocs/product/stats/propal.php
    M htdocs/projet/list.php
    M htdocs/projet/stats/index.php
    M htdocs/projet/tasks/index.php
    M htdocs/public/test/test_arrays.php
    M htdocs/societe/list.php
    M htdocs/societe/soc.php
    A htdocs/theme/eldy/img/list.png
    M htdocs/theme/eldy/img/sort_asc.png
    M htdocs/theme/eldy/img/sort_desc.png
    M htdocs/theme/eldy/style.css.php
    A htdocs/theme/md/img/list.png
    M htdocs/theme/md/style.css.php
    M test/phpunit/ModulesTest.php

  Log Message:
  -----------
  Merge remote-tracking branch 'Upstream/develop' into develop-hrm


  Commit: 5d7e05e3137917ad81d98baa2f63f10b387a5c02
      
https://github.com/Dolibarr/dolibarr/commit/5d7e05e3137917ad81d98baa2f63f10b387a5c02
  Author: aspangaro <address@hidden>
  Date:   2015-10-10 (Sat, 10 Oct 2015)

  Changed paths:
    M htdocs/core/modules/modHRM.class.php
    M htdocs/install/mysql/data/llx_c_hrm_department.sql
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql

  Log Message:
  -----------
  Correct review


  Commit: 11387a5d38052784331874d42c6886f938b0e26e
      
https://github.com/Dolibarr/dolibarr/commit/11387a5d38052784331874d42c6886f938b0e26e
  Author: aspangaro <address@hidden>
  Date:   2015-10-10 (Sat, 10 Oct 2015)

  Changed paths:
    M .tx/config
    A htdocs/langs/en_US/hrm.lang

  Log Message:
  -----------
  Add language file


  Commit: cd7c5645c790980298381b2509c24c71c6eaf29f
      
https://github.com/Dolibarr/dolibarr/commit/cd7c5645c790980298381b2509c24c71c6eaf29f
  Author: aspangaro <address@hidden>
  Date:   2015-10-10 (Sat, 10 Oct 2015)

  Changed paths:
    A htdocs/core/lib/hrm.lib.php

  Log Message:
  -----------
  Add library


  Commit: 8f8de587b8e8c2049ea721d8a6862aeaa1b3c116
      
https://github.com/Dolibarr/dolibarr/commit/8f8de587b8e8c2049ea721d8a6862aeaa1b3c116
  Author: aspangaro <address@hidden>
  Date:   2015-10-10 (Sat, 10 Oct 2015)

  Changed paths:
    M htdocs/core/modules/modHRM.class.php
    A htdocs/hrm/admin/admin_establishment.php
    A htdocs/hrm/admin/admin_hrm.php
    A htdocs/hrm/admin/index.html
    A htdocs/hrm/class/establishment.class.php
    A htdocs/hrm/class/index.html
    A htdocs/hrm/establishment/card.php
    A htdocs/hrm/establishment/index.html
    A htdocs/hrm/establishment/info.php
    A htdocs/hrm/index.html
    A htdocs/theme/eldy/img/object_building.png
    A htdocs/theme/md/img/object_building.png

  Log Message:
  -----------
  Add admin & first version to manage establishment


  Commit: 4008a076aba34e2ab0dc478bbbf23f71a130c9e2
      
https://github.com/Dolibarr/dolibarr/commit/4008a076aba34e2ab0dc478bbbf23f71a130c9e2
  Author: aspangaro <address@hidden>
  Date:   2015-10-10 (Sat, 10 Oct 2015)

  Changed paths:
    M htdocs/hrm/admin/admin_hrm.php
    M htdocs/hrm/class/establishment.class.php
    M htdocs/hrm/establishment/card.php
    M htdocs/hrm/establishment/info.php

  Log Message:
  -----------
  Correct old code


  Commit: 8e37da55c36999ba2f2a5c5867bebf90aa0c3fa3
      
https://github.com/Dolibarr/dolibarr/commit/8e37da55c36999ba2f2a5c5867bebf90aa0c3fa3
  Author: aspangaro <address@hidden>
  Date:   2015-10-10 (Sat, 10 Oct 2015)

  Changed paths:
    M htdocs/admin/ihm.php
    M htdocs/core/modules/modHRM.class.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/main.inc.php

  Log Message:
  -----------
  Add searchform, language key and correct code


  Commit: 8b97196c2f0ae2dcc874f552c5cf2a998d0b24bb
      
https://github.com/Dolibarr/dolibarr/commit/8b97196c2f0ae2dcc874f552c5cf2a998d0b24bb
  Author: aspangaro <address@hidden>
  Date:   2015-10-10 (Sat, 10 Oct 2015)

  Changed paths:
    M htdocs/hrm/admin/admin_establishment.php
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    M htdocs/install/mysql/tables/llx_establishment.sql

  Log Message:
  -----------
  Correct term status & sql error


  Commit: 2857d7cfdaedd0e0d77ff1211c13e314d283aa3e
      
https://github.com/Dolibarr/dolibarr/commit/2857d7cfdaedd0e0d77ff1211c13e314d283aa3e
  Author: aspangaro <address@hidden>
  Date:   2015-10-11 (Sun, 11 Oct 2015)

  Changed paths:
    M htdocs/hrm/class/establishment.class.php
    M htdocs/hrm/establishment/card.php

  Log Message:
  -----------
  Correct


  Commit: 0b54cc450970bbac3c6819c0c1f2ea91e9b98b4d
      
https://github.com/Dolibarr/dolibarr/commit/0b54cc450970bbac3c6819c0c1f2ea91e9b98b4d
  Author: aspangaro <address@hidden>
  Date:   2015-10-11 (Sun, 11 Oct 2015)

  Changed paths:
    M ChangeLog
    M htdocs/asterisk/cidlookup.php
    M htdocs/compta/bank/account.php
    M htdocs/contact/card.php
    M htdocs/contact/info.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/actions_sendmails.inc.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/usergroups.lib.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/facture/card.php
    M htdocs/holiday/list.php
    M htdocs/langs/en_US/main.lang
    M htdocs/societe/info.php
    M htdocs/societe/soc.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M htdocs/user/agenda_extsites.php
    M htdocs/user/card.php
    M htdocs/user/clicktodial.php
    M htdocs/user/document.php
    M htdocs/user/info.php
    M htdocs/user/ldap.php
    M htdocs/user/note.php
    M htdocs/user/param_ihm.php
    M htdocs/user/perms.php

  Log Message:
  -----------
  Merge remote-tracking branch 'Upstream/develop' into develop-hrm


  Commit: aac88519de239a675b5e926a60a78ec775235636
      
https://github.com/Dolibarr/dolibarr/commit/aac88519de239a675b5e926a60a78ec775235636
  Author: aspangaro <address@hidden>
  Date:   2015-10-17 (Sat, 17 Oct 2015)

  Changed paths:
    M ChangeLog
    M README-FR.md
    M README.md
    M build/makepack-howto.txt
    M build/perl/virtualmin/dolibarr.pl
    M dev/skeletons/skeleton_class.class.php
    M htdocs/adherents/admin/public.php
    M htdocs/adherents/agenda.php
    M htdocs/adherents/card.php
    M htdocs/adherents/card_subscriptions.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/document.php
    M htdocs/adherents/fiche_subscription.php
    M htdocs/adherents/index.php
    M htdocs/adherents/info.php
    M htdocs/adherents/ldap.php
    M htdocs/adherents/list.php
    M htdocs/adherents/note.php
    M htdocs/adherents/type.php
    M htdocs/admin/askpricesupplier.php
    M htdocs/admin/barcode.php
    M htdocs/admin/commande.php
    M htdocs/admin/contract.php
    M htdocs/admin/expensereport.php
    M htdocs/admin/facture.php
    M htdocs/admin/fichinter.php
    M htdocs/admin/livraison.php
    M htdocs/admin/notification.php
    M htdocs/admin/propal.php
    M htdocs/admin/salaries.php
    M htdocs/admin/supplier_invoice.php
    M htdocs/admin/supplier_order.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/action/card.php
    M htdocs/comm/askpricesupplier/class/askpricesupplier.class.php
    M htdocs/comm/card.php
    M htdocs/comm/index.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/list.php
    M htdocs/comm/prospect/list.php
    M htdocs/comm/remise.php
    M htdocs/comm/remx.php
    M htdocs/commande/card.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/list.php
    M htdocs/compta/bank/document.php
    M htdocs/compta/facture/admin/facture_cust_extrafields.php
    M htdocs/compta/facture/admin/facturedet_cust_extrafields.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/facture/mergepdftool.php
    M htdocs/compta/hrm.php
    M htdocs/compta/index.php
    M htdocs/contact/card.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contact/document.php
    M htdocs/contact/ldap.php
    M htdocs/contact/list.php
    M htdocs/contact/note.php
    M htdocs/contact/perso.php
    M htdocs/contrat/card.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/list.php
    A htdocs/core/actions_changeselectedfields.inc.php
    M htdocs/core/boxes/box_project.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/translate.class.php
    M htdocs/core/db/DoliDB.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/lib/usergroups.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    A htdocs/core/search.php
    M htdocs/core/search_page.php
    M htdocs/core/tpl/document_actions_post_headers.tpl.php
    M htdocs/core/tpl/notes.tpl.php
    M htdocs/don/list.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/class/expeditionbatch.class.php
    M htdocs/expensereport/card.php
    M htdocs/expensereport/list.php
    M htdocs/expensereport/stats/index.php
    M htdocs/expensereport/synchro_compta.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fichinter/list.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/card.php
    M htdocs/fourn/commande/list.php
    M htdocs/fourn/facture/list.php
    M htdocs/holiday/card.php
    M htdocs/holiday/list.php
    A htdocs/install/.gitignore
    M htdocs/install/filelist.xml
    M htdocs/install/inc.php
    M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
    M htdocs/install/mysql/tables/llx_bank_account.sql
    M htdocs/install/mysql/tables/llx_contrat.sql
    M htdocs/install/mysql/tables/llx_expedition.sql
    M htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
    M htdocs/install/mysql/tables/llx_prelevement_lignes.sql
    M htdocs/install/mysql/tables/llx_societe_rib.sql
    M htdocs/install/mysql/tables/llx_user_param.sql
    M htdocs/langs/en_US/boxes.lang
    M htdocs/langs/en_US/companies.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/products.lang
    M htdocs/langs/en_US/users.lang
    M htdocs/langs/fr_FR/margins.lang
    M htdocs/livraison/class/livraison.class.php
    M htdocs/main.inc.php
    M htdocs/margin/admin/margin.php
    M htdocs/product/admin/product.php
    M htdocs/product/class/product.class.php
    M htdocs/product/index.php
    M htdocs/product/list.php
    M htdocs/product/price.php
    M htdocs/product/stock/class/entrepot.class.php
    M htdocs/projet/activity/index.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/index.php
    M htdocs/projet/list.php
    M htdocs/projet/tasks/index.php
    M htdocs/projet/tasks/time.php
    M htdocs/public/api/explorer/lib/handlebars-1.0.rc.1.js
    M htdocs/public/api/explorer/lib/handlebars.runtime-1.0.0.beta.6.js
    M htdocs/public/members/new.php
    M htdocs/societe/admin/societe.php
    M htdocs/societe/agenda.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/commerciaux.php
    M htdocs/societe/consumption.php
    M htdocs/societe/document.php
    M htdocs/societe/index.php
    M htdocs/societe/list.php
    M htdocs/societe/note.php
    M htdocs/societe/notify/card.php
    M htdocs/societe/price.php
    M htdocs/societe/rib.php
    M htdocs/societe/soc.php
    M htdocs/societe/societecontact.php
    M htdocs/theme/common/gmap.png
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M htdocs/user/agenda_extsites.php
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php
    M htdocs/user/clicktodial.php
    M htdocs/user/document.php
    M htdocs/user/hierarchy.php
    M htdocs/user/ldap.php
    M htdocs/user/note.php
    M htdocs/user/param_ihm.php
    M htdocs/user/perms.php
    M test/phpunit/AllTests.php
    M test/phpunit/CMailFileTest.php
    M test/phpunit/FilesLibTest.php
    M test/phpunit/PricesTest.php
    M test/phpunit/WebservicesProductsTest.php

  Log Message:
  -----------
  Merge remote-tracking branch 'Upstream/develop' into develop-hrm

Conflicts:
        htdocs/user/card.php


  Commit: 8df59134a9e437bb0f95f1a8148205c4205c003b
      
https://github.com/Dolibarr/dolibarr/commit/8df59134a9e437bb0f95f1a8148205c4205c003b
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-10-22 (Thu, 22 Oct 2015)

  Changed paths:
    M .tx/config
    M htdocs/admin/ihm.php
    A htdocs/core/lib/hrm.lib.php
    A htdocs/core/modules/modHRM.class.php
    A htdocs/hrm/admin/admin_establishment.php
    A htdocs/hrm/admin/admin_hrm.php
    A htdocs/hrm/admin/index.html
    A htdocs/hrm/class/establishment.class.php
    A htdocs/hrm/class/index.html
    A htdocs/hrm/establishment/card.php
    A htdocs/hrm/establishment/index.html
    A htdocs/hrm/establishment/info.php
    A htdocs/hrm/index.html
    A htdocs/install/mysql/data/llx_c_hrm_department.sql
    A htdocs/install/mysql/data/llx_c_hrm_function.sql
    A htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    A htdocs/install/mysql/tables/llx_c_hrm_department.sql
    A htdocs/install/mysql/tables/llx_c_hrm_function.sql
    A htdocs/install/mysql/tables/llx_establishment.sql
    M htdocs/install/mysql/tables/llx_user.sql
    M htdocs/langs/en_US/admin.lang
    A htdocs/langs/en_US/hrm.lang
    M htdocs/main.inc.php
    A htdocs/theme/eldy/img/object_building.png
    A htdocs/theme/md/img/object_building.png
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php

  Log Message:
  -----------
  Merge pull request #3705 from aspangaro/develop-hrm

New : Module HRM


Compare: 
https://github.com/Dolibarr/dolibarr/compare/cac4a85ccdf8...8df59134a9e4