[Dolibarr-git] [Dolibarr/dolibarr] d9a1be: ADD : new link on weather board for proposals late

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: d9a1be48cf8626fe48667bb66dc6de65521d3b28
      
https://github.com/Dolibarr/dolibarr/commit/d9a1be48cf8626fe48667bb66dc6de65521d3b28
  Author: geoffrey.girard <address@hidden>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/index.php

  Log Message:
  -----------
  ADD : new link on weather board for proposals late
this link sort on datep asc


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

  Changed paths:
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/index.php

  Log Message:
  -----------
  Merge branch 'new_link_weather_board' of
https://github.com/atm-geoffrey/dolibarr into
atm-geoffrey-new_link_weather_board

Conflicts:
        htdocs/comm/propal/class/propal.class.php
        htdocs/index.php


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

  Changed paths:
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/index.php

  Log Message:
  -----------
  git push origin developMerge branch 'atm-geoffrey-new_link_weather_board' 
into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/fcbc12ce3121...aa573b6dba94