[Dolibarr-git] [Dolibarr/dolibarr] bb2c33: Trad

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: bb2c33e2c11c563c583abb80237d2f30335dcb80
      
https://github.com/Dolibarr/dolibarr/commit/bb2c33e2c11c563c583abb80237d2f30335dcb80
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-15 (Sun, 15 Feb 2015)

  Changed paths:
    M htdocs/langs/en_US/main.lang

  Log Message:
  -----------
  Trad


  Commit: 9ab48b3d90a8427b2965ae4e60e3e0ce28ba0016
      
https://github.com/Dolibarr/dolibarr/commit/9ab48b3d90a8427b2965ae4e60e3e0ce28ba0016
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-15 (Sun, 15 Feb 2015)

  Changed paths:
    M htdocs/langs/en_US/main.lang

  Log Message:
  -----------
  Revert "Trad"

This reverts commit bb2c33e2c11c563c583abb80237d2f30335dcb80.


  Commit: 2045fb22e9001c444d685d0eb5242c53ed3b0bbf
      
https://github.com/Dolibarr/dolibarr/commit/2045fb22e9001c444d685d0eb5242c53ed3b0bbf
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-15 (Sun, 15 Feb 2015)

  Changed paths:
    M htdocs/install/upgrade.php

  Log Message:
  -----------
  Lock 5.5.40


  Commit: 3cf4b80baaf8dd8210bbb1d571bb716b17b7f6eb
      
https://github.com/Dolibarr/dolibarr/commit/3cf4b80baaf8dd8210bbb1d571bb716b17b7f6eb
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-16 (Mon, 16 Feb 2015)

  Changed paths:
    M dev/skeletons/modMyModule.class.php
    M htdocs/core/class/canvas.class.php

  Log Message:
  -----------
  Fix missing test of action when using canvas


  Commit: 118ae7e8f812582540aa5fbd68f240c7d398e31a
      
https://github.com/Dolibarr/dolibarr/commit/118ae7e8f812582540aa5fbd68f240c7d398e31a
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-16 (Mon, 16 Feb 2015)

  Changed paths:
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql

  Log Message:
  -----------
  Backport fix done into dev.


  Commit: 03d19bf77fc335032ee1ee92a8cd4587518f7e0a
      
https://github.com/Dolibarr/dolibarr/commit/03d19bf77fc335032ee1ee92a8cd4587518f7e0a
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-16 (Mon, 16 Feb 2015)

  Changed paths:
    M htdocs/opensurvey/list.php

  Log Message:
  -----------
  Fix: Sort criteria


  Commit: aa380f6ee053302cb80aa1b177c47e3ff2f0aa17
      
https://github.com/Dolibarr/dolibarr/commit/aa380f6ee053302cb80aa1b177c47e3ff2f0aa17
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-16 (Mon, 16 Feb 2015)

  Changed paths:
    M htdocs/commande/card.php

  Log Message:
  -----------
  fix bad include


  Commit: 1e78d0e8d499e694545c698b3807af9d83f1b294
      
https://github.com/Dolibarr/dolibarr/commit/1e78d0e8d499e694545c698b3807af9d83f1b294
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-16 (Mon, 16 Feb 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/lib/order.lib.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/langs/en_US/productbatch.lang
    M htdocs/langs/en_US/sendings.lang
    M htdocs/langs/en_US/stocks.lang

  Log Message:
  -----------
  New: Introduce hidden option
STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS to solve, with no risk, a
missing control on missing warehouse.


  Commit: 5688e8ecd815c5eb7e3d45b8cf1f3b94ff336dd7
      
https://github.com/Dolibarr/dolibarr/commit/5688e8ecd815c5eb7e3d45b8cf1f3b94ff336dd7
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-16 (Mon, 16 Feb 2015)

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

  Log Message:
  -----------
  Add todo to show code is missing here


  Commit: 23562a01ab3943c432a16fffb6e78bad66e55a4c
      
https://github.com/Dolibarr/dolibarr/commit/23562a01ab3943c432a16fffb6e78bad66e55a4c
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-16 (Mon, 16 Feb 2015)

  Changed paths:
    M ChangeLog
    M dev/skeletons/modMyModule.class.php
    M htdocs/core/class/canvas.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/upgrade.php
    M htdocs/langs/en_US/productbatch.lang
    M htdocs/langs/en_US/sendings.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/opensurvey/list.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.7' into develop

Conflicts:
        htdocs/expedition/class/expedition.class.php
        htdocs/install/mysql/migration/3.6.0-3.7.0.sql
        htdocs/langs/en_US/stocks.lang


Compare: 
https://github.com/Dolibarr/dolibarr/compare/213c81820445...23562a01ab39