[Dolibarr-git] [Dolibarr/dolibarr] 08e839: Fix empty extrafields if from origin

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 08e83983d0466fc7573eb6deaaac5e31942a3369
      
https://github.com/Dolibarr/dolibarr/commit/08e83983d0466fc7573eb6deaaac5e31942a3369
  Author: atm-ph <address@hidden>
  Date:   2017-10-26 (Thu, 26 Oct 2017)

  Changed paths:
    M htdocs/contrat/card.php

  Log Message:
  -----------
  Fix empty extrafields if from origin


  Commit: 1d0c93c0b6dcf2dcbafe4a17d7b8d7e675ed35cc
      
https://github.com/Dolibarr/dolibarr/commit/1d0c93c0b6dcf2dcbafe4a17d7b8d7e675ed35cc
  Author: florian HENRY <address@hidden>
  Date:   2017-10-26 (Thu, 26 Oct 2017)

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

  Log Message:
  -----------
  FIX : #7458


  Commit: 9427b2f4b1569c02dccf3612dc0d744f415d3543
      
https://github.com/Dolibarr/dolibarr/commit/9427b2f4b1569c02dccf3612dc0d744f415d3543
  Author: florian HENRY <address@hidden>
  Date:   2017-10-26 (Thu, 26 Oct 2017)

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

  Log Message:
  -----------
  fix supplier payamnet blockedlog


  Commit: 5f89b4427f05baa6163e71f2744795591e6da59f
      
https://github.com/Dolibarr/dolibarr/commit/5f89b4427f05baa6163e71f2744795591e6da59f
  Author: florian HENRY <address@hidden>
  Date:   2017-10-26 (Thu, 26 Oct 2017)

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

  Log Message:
  -----------
  fixagain blocked log supplier


  Commit: a7655b69e87bb6fe0b62552b8ed74db49175b9aa
      
https://github.com/Dolibarr/dolibarr/commit/a7655b69e87bb6fe0b62552b8ed74db49175b9aa
  Author: florian HENRY <address@hidden>
  Date:   2017-10-26 (Thu, 26 Oct 2017)

  Changed paths:
    M htdocs/blockedlog/class/blockedlog.class.php
    M 
htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php

  Log Message:
  -----------
  agin fix blockedlog on supplier incvoive payument


  Commit: f4a95f89ac323775998dce0c349f622cfe44cf03
      
https://github.com/Dolibarr/dolibarr/commit/f4a95f89ac323775998dce0c349f622cfe44cf03
  Author: florian HENRY <address@hidden>
  Date:   2017-10-26 (Thu, 26 Oct 2017)

  Changed paths:
    M 
htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php

  Log Message:
  -----------
  Ok, now suppliers payment are correctly logged


  Commit: 82231b77a246722e33bcb63f59a62d6871ab187c
      
https://github.com/Dolibarr/dolibarr/commit/82231b77a246722e33bcb63f59a62d6871ab187c
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-27 (Fri, 27 Oct 2017)

  Changed paths:
    M htdocs/margin/tabs/thirdpartyMargins.php
    M htdocs/societe/card.php
    M htdocs/societe/notify/card.php

  Log Message:
  -----------
  Fix data for supplier must be not visible if supplier module off


  Commit: 71622b9f86798d107e6ea71261bf07632f415057
      
https://github.com/Dolibarr/dolibarr/commit/71622b9f86798d107e6ea71261bf07632f415057
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-27 (Fri, 27 Oct 2017)

  Changed paths:
    M htdocs/contrat/card.php

  Log Message:
  -----------
  Merge pull request #7711 from atm-ph/fix_6_0_empty_extrafields

Fix empty extrafields if from origin


  Commit: bbc13b8ac953de2c50e35dd879e965fe5a3665f7
      
https://github.com/Dolibarr/dolibarr/commit/bbc13b8ac953de2c50e35dd879e965fe5a3665f7
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-27 (Fri, 27 Oct 2017)

  Changed paths:
    M htdocs/blockedlog/class/blockedlog.class.php
    M 
htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php

  Log Message:
  -----------
  Merge pull request #7712 from atm-florian/6.0

FIX : #7458


  Commit: e4645cf2c5dadf019d307a236226b7864035809e
      
https://github.com/Dolibarr/dolibarr/commit/e4645cf2c5dadf019d307a236226b7864035809e
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-27 (Fri, 27 Oct 2017)

  Changed paths:
    M htdocs/blockedlog/class/blockedlog.class.php
    M htdocs/contrat/card.php
    M 
htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
    M htdocs/margin/tabs/thirdpartyMargins.php
    M htdocs/societe/card.php
    M htdocs/societe/notify/card.php

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

Conflicts:
        htdocs/blockedlog/class/blockedlog.class.php
        htdocs/contrat/card.php
        htdocs/societe/card.php


  Commit: 5285f3ee15770fc34cabeefa03e527f05b0659d4
      
https://github.com/Dolibarr/dolibarr/commit/5285f3ee15770fc34cabeefa03e527f05b0659d4
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-27 (Fri, 27 Oct 2017)

  Changed paths:
    M htdocs/projet/list.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/a00cf6b28b26...5285f3ee1577