[Dolibarr-git] [Dolibarr/dolibarr] df305b: Deactivate conflict with Mod Deplacement - Need to...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: df305bd31661351190d95fff91323b4bf840fb5b
      
https://github.com/Dolibarr/dolibarr/commit/df305bd31661351190d95fff91323b4bf840fb5b
  Author: aspangaro <address@hidden>
  Date:   2015-03-07 (Sat, 07 Mar 2015)

  Changed paths:
    M htdocs/core/modules/modExpenseReport.class.php

  Log Message:
  -----------
  Deactivate conflict with Mod Deplacement - Need to access on old data


  Commit: 402e0c8ad5d90a33cc107b68cc597d9836f862d0
      
https://github.com/Dolibarr/dolibarr/commit/402e0c8ad5d90a33cc107b68cc597d9836f862d0
  Author: aspangaro <address@hidden>
  Date:   2015-03-07 (Sat, 07 Mar 2015)

  Changed paths:
    M htdocs/admin/dict.php

  Log Message:
  -----------
  Add condition to access on dictionary c_type_fees when the module is enabled


  Commit: f780e908f419cf49421177870283050765368eba
      
https://github.com/Dolibarr/dolibarr/commit/f780e908f419cf49421177870283050765368eba
  Author: aspangaro <address@hidden>
  Date:   2015-03-07 (Sat, 07 Mar 2015)

  Changed paths:
    A htdocs/expensereport/ajax/index.html
    A htdocs/expensereport/class/index.html
    A htdocs/expensereport/index.html
    A htdocs/expensereport/stats/index.html

  Log Message:
  -----------
  Add index.html


  Commit: 1baf71874ccf9a9e366a39db617f284f6e70e4cf
      
https://github.com/Dolibarr/dolibarr/commit/1baf71874ccf9a9e366a39db617f284f6e70e4cf
  Author: aspangaro <address@hidden>
  Date:   2015-03-07 (Sat, 07 Mar 2015)

  Changed paths:
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/expensereport/list.php
    M htdocs/expensereport/synchro_compta.php

  Log Message:
  -----------
  Sql & $_SERVER["PHP_SELF"]


  Commit: 2c738df1970fd460bbd65e955573801dc2e186a0
      
https://github.com/Dolibarr/dolibarr/commit/2c738df1970fd460bbd65e955573801dc2e186a0
  Author: aspangaro <address@hidden>
  Date:   2015-03-07 (Sat, 07 Mar 2015)

  Changed paths:
    M htdocs/expensereport/class/expensereport.class.php

  Log Message:
  -----------
  Add GPLV3 & Copyright


  Commit: 55db57d10c8fd8c0eeb5acc3186892bc3af25ef0
      
https://github.com/Dolibarr/dolibarr/commit/55db57d10c8fd8c0eeb5acc3186892bc3af25ef0
  Author: aspangaro <address@hidden>
  Date:   2015-03-07 (Sat, 07 Mar 2015)

  Changed paths:
    M htdocs/expensereport/class/expensereportstats.class.php
    M htdocs/expensereport/export_csv.php
    M htdocs/expensereport/index.php
    M htdocs/expensereport/list.php
    M htdocs/expensereport/synchro_compta.php

  Log Message:
  -----------
  Path


  Commit: 26b1f6902548a7b86c66283bb863695718ba3d7c
      
https://github.com/Dolibarr/dolibarr/commit/26b1f6902548a7b86c66283bb863695718ba3d7c
  Author: aspangaro <address@hidden>
  Date:   2015-03-07 (Sat, 07 Mar 2015)

  Changed paths:
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/expensereport/index.php

  Log Message:
  -----------
  Add traduction on type label


  Commit: 80ad1be8208d507e64cf9e5596a7c065adc8ad95
      
https://github.com/Dolibarr/dolibarr/commit/80ad1be8208d507e64cf9e5596a7c065adc8ad95
  Author: aspangaro <address@hidden>
  Date:   2015-03-08 (Sun, 08 Mar 2015)

  Changed paths:
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/card.php
    M htdocs/comm/propal/list.php
    M htdocs/commande/card.php
    M htdocs/commande/list.php
    M htdocs/compta/bank/index.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/list.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/class/html.formorder.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/expedition/shipment.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.commande.dispatch.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/commande/dispatch.php
    M htdocs/fourn/commande/list.php
    M htdocs/fourn/facture/list.php
    M htdocs/fourn/product/list.php
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/orders.lang
    M htdocs/product/class/product.class.php
    M htdocs/product/stats/commande.php
    M htdocs/product/stats/commande_fournisseur.php
    M htdocs/product/stats/facture.php
    M htdocs/product/stats/facture_fournisseur.php
    M htdocs/product/stats/propal.php
    M htdocs/theme/amarok/style.css.php
    M htdocs/theme/auguria/style.css.php
    M htdocs/theme/bureau2crea/style.css.php
    M htdocs/theme/cameleo/style.css.php
    M htdocs/theme/eldy/style.css.php

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


  Commit: f3258d59c6f97e192256815dd5cb002c3f78749b
      
https://github.com/Dolibarr/dolibarr/commit/f3258d59c6f97e192256815dd5cb002c3f78749b
  Author: aspangaro <address@hidden>
  Date:   2015-03-08 (Sun, 08 Mar 2015)

  Changed paths:
    M htdocs/compta/hrm.php
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/expensereport/class/expensereportstats.class.php
    M htdocs/expensereport/index.php
    M htdocs/expensereport/list.php
    M htdocs/expensereport/synchro_compta.php
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/install/mysql/tables/llx_expensereport.sql

  Log Message:
  -----------
  Uniformize status & add price()


  Commit: 69dc3cdd6153cd6ccccdc5419c28af79096a9cd5
      
https://github.com/Dolibarr/dolibarr/commit/69dc3cdd6153cd6ccccdc5419c28af79096a9cd5
  Author: aspangaro <address@hidden>
  Date:   2015-03-08 (Sun, 08 Mar 2015)

  Changed paths:
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
    M htdocs/core/modules/modExpenseReport.class.php
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/expensereport/list.php

  Log Message:
  -----------
  Correct fk_statut & work en list


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

  Changed paths:
    M htdocs/admin/dict.php
    M htdocs/compta/hrm.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
    M htdocs/core/modules/modExpenseReport.class.php
    A htdocs/expensereport/ajax/index.html
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/expensereport/class/expensereportstats.class.php
    A htdocs/expensereport/class/index.html
    M htdocs/expensereport/export_csv.php
    A htdocs/expensereport/index.html
    M htdocs/expensereport/index.php
    M htdocs/expensereport/list.php
    A htdocs/expensereport/stats/index.html
    M htdocs/expensereport/synchro_compta.php
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/install/mysql/tables/llx_expensereport.sql

  Log Message:
  -----------
  Merge pull request #2441 from aspangaro/develop-ReviewER

FIXED: Review Expense Report


Compare: 
https://github.com/Dolibarr/dolibarr/compare/5748ea8f35e5...e8732df74754