[Dolibarr-git] [Dolibarr/dolibarr] 081be3: NEW: Add project and Hook to Loan

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 081be37787e745c96f5806237a511766522d0bc7
      
https://github.com/Dolibarr/dolibarr/commit/081be37787e745c96f5806237a511766522d0bc7
  Author: moreauf <address@hidden>
  Date:   2016-11-14 (Mon, 14 Nov 2016)

  Changed paths:
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
    M htdocs/install/mysql/tables/llx_loan.sql
    M htdocs/loan/card.php
    M htdocs/loan/class/loan.class.php
    M htdocs/projet/ajax/projects.php

  Log Message:
  -----------
  NEW: Add project and Hook to Loan
BUG: Correct discard_closed parametters management in project


  Commit: f97bab6fb8c1c0477207f25ef9c086023a2c84a5
      
https://github.com/Dolibarr/dolibarr/commit/f97bab6fb8c1c0477207f25ef9c086023a2c84a5
  Author: moreauf <address@hidden>
  Date:   2016-11-15 (Tue, 15 Nov 2016)

  Changed paths:
    M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
    M htdocs/install/mysql/tables/llx_c_actioncomm.sql
    M htdocs/langs/en_US/bills.lang

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop

Conflicts:
        htdocs/install/mysql/migration/4.0.0-5.0.0.sql


  Commit: a251f0df51eec143a42e23de6133a4c66e60b0d3
      
https://github.com/Dolibarr/dolibarr/commit/a251f0df51eec143a42e23de6133a4c66e60b0d3
  Author: florian HENRY <address@hidden>
  Date:   2016-11-16 (Wed, 16 Nov 2016)

  Changed paths:
    M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
    M htdocs/install/mysql/tables/llx_loan.sql
    M htdocs/loan/card.php
    M htdocs/loan/class/loan.class.php
    M htdocs/projet/element.php

  Log Message:
  -----------
  Various fix on Loan and project link


  Commit: afd17feffec189f3a52565e80e30731a79e857e3
      
https://github.com/Dolibarr/dolibarr/commit/afd17feffec189f3a52565e80e30731a79e857e3
  Author: florian HENRY <address@hidden>
  Date:   2016-11-16 (Wed, 16 Nov 2016)

  Changed paths:
    M htdocs/accountancy/class/bookkeeping.class.php
    M htdocs/accountancy/class/html.formventilation.class.php
    M htdocs/accountancy/customer/index.php
    M htdocs/accountancy/customer/lines.php
    M htdocs/accountancy/customer/list.php
    M htdocs/accountancy/expensereport/index.php
    M htdocs/accountancy/expensereport/lines.php
    M htdocs/accountancy/expensereport/list.php
    M htdocs/accountancy/supplier/index.php
    M htdocs/accountancy/supplier/lines.php
    M htdocs/accountancy/supplier/list.php
    M htdocs/core/class/html.form.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/langs/en_US/accountancy.lang

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


  Commit: ff734bb5d9379f5ca42b105783df5e0589a11a09
      
https://github.com/Dolibarr/dolibarr/commit/ff734bb5d9379f5ca42b105783df5e0589a11a09
  Author: florian HENRY <address@hidden>
  Date:   2016-11-16 (Wed, 16 Nov 2016)

  Changed paths:
    M htdocs/core/lib/functions.lib.php

  Log Message:
  -----------
  Fix travis


  Commit: 44aa6018481953e9b7b146d0efbb08108f634e4c
      
https://github.com/Dolibarr/dolibarr/commit/44aa6018481953e9b7b146d0efbb08108f634e4c
  Author: florian HENRY <address@hidden>
  Date:   2016-11-16 (Wed, 16 Nov 2016)

  Changed paths:
    M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
    M htdocs/install/mysql/tables/llx_loan.sql
    M htdocs/loan/card.php
    M htdocs/loan/class/loan.class.php

  Log Message:
  -----------
  again revert to fk_project instead of fk_projet


  Commit: e9853f3cd731b606c70127bb4c3abedc79717a19
      
https://github.com/Dolibarr/dolibarr/commit/e9853f3cd731b606c70127bb4c3abedc79717a19
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-07 (Sat, 07 Jan 2017)

  Changed paths:
    M htdocs/commande/card.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
    M htdocs/install/mysql/tables/llx_loan.sql
    M htdocs/loan/card.php
    M htdocs/loan/class/loan.class.php
    M htdocs/projet/ajax/projects.php
    M htdocs/projet/element.php

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/Franck-MOREAU/dolibarr into
Franck-MOREAU-develop

Conflicts:
        htdocs/core/lib/functions.lib.php
        htdocs/install/mysql/migration/4.0.0-5.0.0.sql
        htdocs/loan/card.php
        htdocs/loan/class/loan.class.php
        htdocs/projet/element.php


  Commit: d23aa8ef3c0c16081ebebfd6b3cd2903c711639e
      
https://github.com/Dolibarr/dolibarr/commit/d23aa8ef3c0c16081ebebfd6b3cd2903c711639e
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-07 (Sat, 07 Jan 2017)

  Changed paths:
    M htdocs/commande/card.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
    M htdocs/install/mysql/tables/llx_loan.sql
    M htdocs/loan/card.php
    M htdocs/loan/class/loan.class.php
    M htdocs/projet/ajax/projects.php
    M htdocs/projet/element.php

  Log Message:
  -----------
  git push origin developMerge branch 'Franck-MOREAU-develop' into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/1d291ee0e8f1...d23aa8ef3c0c