[Dolibarr/dolibarr] 7f5933: FIX shipping extrafields line

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 7f5933adbc9f839d7f5be7a7df002743fed3357c
      
https://github.com/Dolibarr/dolibarr/commit/7f5933adbc9f839d7f5be7a7df002743fed3357c
  Author: atm-quentin <address@hidden>
  Date:   2019-10-23 (Wed, 23 Oct 2019)

  Changed paths:
    M htdocs/expedition/card.php

  Log Message:
  -----------
  FIX shipping extrafields line


  Commit: dae475bac1164e09882664c6b1596c0e16121c95
      
https://github.com/Dolibarr/dolibarr/commit/dae475bac1164e09882664c6b1596c0e16121c95
  Author: com4WEB <address@hidden>
  Date:   2019-10-29 (Tue, 29 Oct 2019)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Update ChangeLog

some text erros in changelog


  Commit: db86dff7d16bd7d03ae92ae8dff0e0dfd08af55e
      
https://github.com/Dolibarr/dolibarr/commit/db86dff7d16bd7d03ae92ae8dff0e0dfd08af55e
  Author: Alexandre SPANGARO <address@hidden>
  Date:   2019-10-29 (Tue, 29 Oct 2019)

  Changed paths:
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/resultat/index.php

  Log Message:
  -----------
  Fix sign for VAT repaid in report


  Commit: 8849cd9897a0cface1198a6108c12820b75b3ad0
      
https://github.com/Dolibarr/dolibarr/commit/8849cd9897a0cface1198a6108c12820b75b3ad0
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-10-30 (Wed, 30 Oct 2019)

  Changed paths:
    M htdocs/compta/resultat/index.php

  Log Message:
  -----------
  Update index.php


  Commit: c5fd25f866a76c29304b11fa798f525f8dab1d93
      
https://github.com/Dolibarr/dolibarr/commit/c5fd25f866a76c29304b11fa798f525f8dab1d93
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-10-30 (Wed, 30 Oct 2019)

  Changed paths:
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/resultat/index.php

  Log Message:
  -----------
  Merge pull request #12262 from aspangaro/10.0_p28

Fix sign for VAT repaid in report


  Commit: 260fa3492dcc8e91aea02671edb18e4961ca95f4
      
https://github.com/Dolibarr/dolibarr/commit/260fa3492dcc8e91aea02671edb18e4961ca95f4
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-10-30 (Wed, 30 Oct 2019)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge pull request #12259 from com4WEB/patch-3

Update ChangeLog


  Commit: 15d0d6e2717006575d14a70bad970725eb50dea0
      
https://github.com/Dolibarr/dolibarr/commit/15d0d6e2717006575d14a70bad970725eb50dea0
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-10-30 (Wed, 30 Oct 2019)

  Changed paths:
    M htdocs/contact/card.php
    M htdocs/contact/class/contact.class.php

  Log Message:
  -----------
  FIX #12258


  Commit: e716e9cba6a46b935b9eed74c26f6f024ba13e31
      
https://github.com/Dolibarr/dolibarr/commit/e716e9cba6a46b935b9eed74c26f6f024ba13e31
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-10-30 (Wed, 30 Oct 2019)

  Changed paths:
    M ChangeLog
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/resultat/index.php

  Log Message:
  -----------
  Merge branch '10.0' of https://github.com/dolibarr/dolibarr into 10.0


  Commit: c839551b918b801b9726c0e63d8a006141e25447
      
https://github.com/Dolibarr/dolibarr/commit/c839551b918b801b9726c0e63d8a006141e25447
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-10-30 (Wed, 30 Oct 2019)

  Changed paths:
    M htdocs/expedition/card.php

  Log Message:
  -----------
  Merge pull request #12206 from atm-quentin/10_fix_expeditiondet_extrafields

FIX shipping extrafields line


  Commit: 83cc9ea643783e27ba863d673fb4f699eb68ff0f
      
https://github.com/Dolibarr/dolibarr/commit/83cc9ea643783e27ba863d673fb4f699eb68ff0f
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-11-01 (Fri, 01 Nov 2019)

  Changed paths:
    M htdocs/holiday/list.php

  Log Message:
  -----------
  FIX Search on leave request ref


  Commit: a3a326b25ef076a3619655e0938cfad200ffcbbf
      
https://github.com/Dolibarr/dolibarr/commit/a3a326b25ef076a3619655e0938cfad200ffcbbf
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-11-01 (Fri, 01 Nov 2019)

  Changed paths:
    M htdocs/holiday/list.php

  Log Message:
  -----------
  FIX Search on leave request ref


  Commit: 2d9135b6ad56131d962890df5ed9910d4d574ddf
      
https://github.com/Dolibarr/dolibarr/commit/2d9135b6ad56131d962890df5ed9910d4d574ddf
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-11-01 (Fri, 01 Nov 2019)

  Changed paths:
    M ChangeLog
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/resultat/index.php
    M htdocs/contact/card.php
    M htdocs/contact/class/contact.class.php
    M htdocs/expedition/card.php
    M htdocs/holiday/list.php

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

Conflicts:
        htdocs/expedition/card.php
        htdocs/holiday/list.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/4616519dcfee...2d9135b6ad56