[Dolibarr-git] [Dolibarr/dolibarr] 7e37cb: Fix resource module can't work because mandatory d...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 7e37cbb9e37117fdf689a2d31655afbce9c46945
      
https://github.com/Dolibarr/dolibarr/commit/7e37cbb9e37117fdf689a2d31655afbce9c46945
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-27 (Wed, 27 Jul 2016)

  Changed paths:
    M htdocs/core/menus/init_menu_auguria.sql
    A htdocs/install/mysql/data/llx_c_type_resource.sql

  Log Message:
  -----------
  Fix resource module can't work because mandatory data not available.


  Commit: c242e53db6cc0306a109ab96b492c6a9b48e3e4c
      
https://github.com/Dolibarr/dolibarr/commit/c242e53db6cc0306a109ab96b492c6a9b48e3e4c
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-27 (Wed, 27 Jul 2016)

  Changed paths:
    M htdocs/resource/add.php

  Log Message:
  -----------
  FIX #5523


  Commit: 972baa34e748ed9d0c1836b5ab47b2a5d8d6d81c
      
https://github.com/Dolibarr/dolibarr/commit/972baa34e748ed9d0c1836b5ab47b2a5d8d6d81c
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-27 (Wed, 27 Jul 2016)

  Changed paths:
    M htdocs/printing/index.php

  Log Message:
  -----------
  FIX #5512


  Commit: 889b15689bc889470e28cb4c0d1408ad33a9a981
      
https://github.com/Dolibarr/dolibarr/commit/889b15689bc889470e28cb4c0d1408ad33a9a981
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-27 (Wed, 27 Jul 2016)

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

  Log Message:
  -----------
  FIX #5510


  Commit: 2a28d77eeb5d7fee611ca2edd26f646922bd0820
      
https://github.com/Dolibarr/dolibarr/commit/2a28d77eeb5d7fee611ca2edd26f646922bd0820
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-27 (Wed, 27 Jul 2016)

  Changed paths:
    M htdocs/install/mysql/data/llx_accounting.sql
    M htdocs/install/mysql/tables/llx_accounting_account.key.sql
    M htdocs/install/mysql/tables/llx_accounting_account.sql

  Log Message:
  -----------
  FIX #5465 - Fix type account_parent


  Commit: fb8f0ed657bd1c8d4391cfa8005aa2b7984facb7
      
https://github.com/Dolibarr/dolibarr/commit/fb8f0ed657bd1c8d4391cfa8005aa2b7984facb7
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-27 (Wed, 27 Jul 2016)

  Changed paths:
    M htdocs/compta/bank/account.php

  Log Message:
  -----------
  FIX #5503


  Commit: 0334b58a4b5274f7e8bd016b2951fe9fc4f5854a
      
https://github.com/Dolibarr/dolibarr/commit/0334b58a4b5274f7e8bd016b2951fe9fc4f5854a
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-27 (Wed, 27 Jul 2016)

  Changed paths:
    M htdocs/admin/commande.php
    M htdocs/admin/propal.php
    M htdocs/comm/propal/card.php
    M htdocs/supplier_proposal/card.php

  Log Message:
  -----------
  Hide feature not yet validated to be ready for a stable 4.0


  Commit: dfa33bf17333c988332322fe8971051fbb455e3f
      
https://github.com/Dolibarr/dolibarr/commit/dfa33bf17333c988332322fe8971051fbb455e3f
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-28 (Thu, 28 Jul 2016)

  Changed paths:
    M htdocs/core/menus/init_menu_auguria.sql

  Log Message:
  -----------
  Fix men unot visible


  Commit: 37a1b8cbc8757568e8778e37d082e23d6a7431e5
      
https://github.com/Dolibarr/dolibarr/commit/37a1b8cbc8757568e8778e37d082e23d6a7431e5
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-28 (Thu, 28 Jul 2016)

  Changed paths:
    M htdocs/fourn/class/fournisseur.commande.class.php

  Log Message:
  -----------
  Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop


  Commit: f54946bacbb7ad4087561f10971f4af54baad5b2
      
https://github.com/Dolibarr/dolibarr/commit/f54946bacbb7ad4087561f10971f4af54baad5b2
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-28 (Thu, 28 Jul 2016)

  Changed paths:
    M htdocs/admin/commande.php
    M htdocs/admin/propal.php
    M htdocs/comm/propal/card.php
    M htdocs/compta/bank/account.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/modules/modCron.class.php
    M htdocs/install/mysql/data/llx_accounting.sql
    A htdocs/install/mysql/data/llx_c_type_resource.sql
    M htdocs/install/mysql/tables/llx_accounting_account.key.sql
    M htdocs/install/mysql/tables/llx_accounting_account.sql
    M htdocs/printing/index.php
    M htdocs/resource/add.php
    M htdocs/supplier_proposal/card.php

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

Conflicts:
        htdocs/core/menus/init_menu_auguria.sql


Compare: 
https://github.com/Dolibarr/dolibarr/compare/209bb213c063...f54946bacbb7