[Dolibarr-git] [Dolibarr/dolibarr] e1b329: HRM: Update work

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: e1b329e80a8c52bd07be5f161d1e6f6ad1c6aaa2
      
https://github.com/Dolibarr/dolibarr/commit/e1b329e80a8c52bd07be5f161d1e6f6ad1c6aaa2
  Author: aspangaro <address@hidden>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M htdocs/hrm/admin/admin_establishment.php
    M htdocs/hrm/class/employee.class.php
    M htdocs/hrm/class/establishment.class.php
    M htdocs/hrm/employee/list.php
    M htdocs/hrm/establishment/card.php
    M htdocs/hrm/establishment/info.php

  Log Message:
  -----------
  HRM: Update work


  Commit: ca0c68a8e2b7b4dddae5916ffdfaf34175c577d0
      
https://github.com/Dolibarr/dolibarr/commit/ca0c68a8e2b7b4dddae5916ffdfaf34175c577d0
  Author: aspangaro <address@hidden>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M .tx/config
    M COPYRIGHT
    M build/debian/README.howto
    M composer.json
    M composer.lock
    R dev/initdata/generate-commande.php
    R dev/initdata/generate-facture.php
    A dev/initdata/generate-invoice.php
    A dev/initdata/generate-order.php
    A dev/initdata/generate-product.php
    R dev/initdata/generate-produit.php
    R dev/initdata/generate-propale.php
    A dev/initdata/generate-proposal.php
    R dev/initdata/generate-societe.php
    A dev/initdata/generate-thirdparty.php
    M dev/initdata/mysqldump_dolibarr_3.8.0.sql
    M dev/initdata/sftpget_and_loaddump.php
    M dev/skeletons/build_class_from_table.php
    A dev/skeletons/skeleton_card.php
    M dev/skeletons/skeleton_class.class.php
    A dev/skeletons/skeleton_list.php
    R dev/skeletons/skeleton_page.php
    M htdocs/admin/barcode.php
    M htdocs/admin/dict.php
    M htdocs/admin/facture.php
    M htdocs/admin/oauth.php
    M htdocs/admin/payment.php
    M htdocs/admin/pdf.php
    A htdocs/admin/receiptprinter.php
    M htdocs/admin/security.php
    M htdocs/cashdesk/admin/cashdesk.php
    M htdocs/categories/edit.php
    M htdocs/categories/traduction.php
    M htdocs/categories/viewcat.php
    M htdocs/comm/action/card.php
    M htdocs/comm/action/rapport/index.php
    M htdocs/comm/address.php
    M htdocs/comm/askpricesupplier/card.php
    M htdocs/comm/card.php
    M htdocs/comm/mailing/card.php
    M htdocs/comm/mailing/cibles.php
    M htdocs/comm/mailing/index.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/contact.php
    M htdocs/comm/recap-client.php
    M htdocs/comm/remx.php
    M htdocs/commande/card.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/bank/account.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/ligne.php
    M htdocs/compta/bank/rappro.php
    M htdocs/compta/bank/releve.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/paiement.php
    M htdocs/contact/list.php
    M htdocs/contrat/card.php
    M htdocs/contrat/list.php
    A htdocs/core/class/dolreceiptprinter.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/hookmanager.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/admin.lib.php
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/lib/doc.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/geturl.lib.php
    M htdocs/core/lib/images.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/product.lib.php
    A htdocs/core/lib/receiptprinter.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/modules/export/modules_export.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/import/modules_import.php
    M htdocs/core/modules/modOauth.class.php
    A htdocs/core/modules/modReceiptPrinter.class.php
    M htdocs/core/modules/oauth/getgoogleoauthcallback.php
    M htdocs/core/modules/printing/printgcp.modules.php
    M htdocs/core/modules/project/doc/pdf_beluga.modules.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/exports/class/export.class.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/ajax/getSupplierPrices.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/commande/list.php
    M htdocs/fourn/facture/list.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/holiday/list.php
    M htdocs/includes/OAuth/Common/Storage/DoliStorage.php
    R htdocs/install/filelist.xml
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
    M htdocs/install/mysql/tables/llx_budget.sql
    M htdocs/install/mysql/tables/llx_budget_lines.key.sql
    M htdocs/install/mysql/tables/llx_budget_lines.sql
    M htdocs/install/mysql/tables/llx_c_field_list.sql
    A htdocs/install/mysql/tables/llx_categorie_project.key.sql
    A htdocs/install/mysql/tables/llx_categorie_project.sql
    A htdocs/install/mysql/tables/llx_opensurvey_formquestions.sql
    M htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
    A htdocs/install/mysql/tables/llx_opensurvey_user_formanswers.sql
    M htdocs/install/mysql/tables/llx_opensurvey_user_studs.sql
    M htdocs/install/mysql/tables/llx_user_param.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/cashdesk.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/margins.lang
    M htdocs/langs/en_US/oauth.lang
    M htdocs/langs/en_US/printing.lang
    M htdocs/langs/en_US/projects.lang
    A htdocs/langs/en_US/receiptprinter.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/main.inc.php
    M htdocs/margin/tabs/productMargins.php
    M htdocs/margin/tabs/thirdpartyMargins.php
    M htdocs/printing/admin/printing.php
    M htdocs/printing/index.php
    M htdocs/product/admin/product.php
    M htdocs/product/canvas/product/tpl/card_create.tpl.php
    M htdocs/product/canvas/service/tpl/card_create.tpl.php
    M htdocs/product/card.php
    M htdocs/product/class/product.class.php
    M htdocs/product/composition/card.php
    M htdocs/product/document.php
    M htdocs/product/fournisseurs.php
    M htdocs/product/popuprop.php
    M htdocs/product/price.php
    M htdocs/product/stats/card.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/product/stock/product.php
    M htdocs/product/stock/tpl/stockcorrection.tpl.php
    M htdocs/product/stock/tpl/stocktransfer.tpl.php
    M htdocs/product/traduction.php
    M htdocs/projet/admin/project.php
    M htdocs/projet/card.php
    M htdocs/projet/class/project.class.php
    M htdocs/public/paybox/newpayment.php
    M htdocs/public/paypal/newpayment.php
    M htdocs/public/test/test_forms.php
    M htdocs/societe/list.php
    M htdocs/societe/price.php
    A htdocs/theme/common/dolibarr_logo_bw.png
    M htdocs/user/agenda_extsites.php
    M htdocs/user/card.php
    M htdocs/user/clicktodial.php
    M htdocs/user/document.php
    M htdocs/user/hierarchy.php
    M htdocs/user/index.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: e157d8b8d20831eb2b1409a2a93f935b43db376a
      
https://github.com/Dolibarr/dolibarr/commit/e157d8b8d20831eb2b1409a2a93f935b43db376a
  Author: aspangaro <address@hidden>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

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

  Log Message:
  -----------
  Update for fk_country


  Commit: 47ce8baadc97715fd74ba67df99453c41031f849
      
https://github.com/Dolibarr/dolibarr/commit/47ce8baadc97715fd74ba67df99453c41031f849
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M htdocs/hrm/admin/admin_establishment.php
    M htdocs/hrm/class/employee.class.php
    M htdocs/hrm/class/establishment.class.php
    M htdocs/hrm/employee/list.php
    M htdocs/hrm/establishment/card.php
    M htdocs/hrm/establishment/info.php

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

HRM: Update work


Compare: 
https://github.com/Dolibarr/dolibarr/compare/13a0fa2c6907...47ce8baadc97