[Dolibarr-git] [Dolibarr/dolibarr] ae9c7a: FIX unset categorie

[Laurent Destailleur]

  Branch: refs/heads/7.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ae9c7ad6b6b9668dddf46e9692053049735dd3b5
      
https://github.com/Dolibarr/dolibarr/commit/ae9c7ad6b6b9668dddf46e9692053049735dd3b5
  Author: atm-quentin <address@hidden>
  Date:   2018-02-05 (Mon, 05 Feb 2018)

  Changed paths:
    M htdocs/societe/card.php

  Log Message:
  -----------
  FIX unset categorie


  Commit: bb93b98260dc2de3a82f37df1b424866877849c7
      
https://github.com/Dolibarr/dolibarr/commit/bb93b98260dc2de3a82f37df1b424866877849c7
  Author: atm-quentin <address@hidden>
  Date:   2018-02-05 (Mon, 05 Feb 2018)

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

  Log Message:
  -----------
  NEW field commerciaux and categ export CustomersInvoicesAndPayments


  Commit: 2081aefc84cf1156527c09b7e827b500423a4f00
      
https://github.com/Dolibarr/dolibarr/commit/2081aefc84cf1156527c09b7e827b500423a4f00
  Author: atm-quentin <address@hidden>
  Date:   2018-02-05 (Mon, 05 Feb 2018)

  Changed paths:
    M htdocs/societe/card.php

  Log Message:
  -----------
  FIX creer into lire


  Commit: 783dc18cd07edf047ec41b3a73be4371918dab6a
      
https://github.com/Dolibarr/dolibarr/commit/783dc18cd07edf047ec41b3a73be4371918dab6a
  Author: atm-quentin <address@hidden>
  Date:   2018-02-05 (Mon, 05 Feb 2018)

  Log Message:
  -----------
  Merge


  Commit: d989483d2bc3d2c57814ad4cf9b3927102818354
      
https://github.com/Dolibarr/dolibarr/commit/d989483d2bc3d2c57814ad4cf9b3927102818354
  Author: atm-quentin <address@hidden>
  Date:   2018-02-05 (Mon, 05 Feb 2018)

  Changed paths:
    M htdocs/core/modules/modFacture.class.php
    M htdocs/societe/card.php

  Log Message:
  -----------
  Merge branch '60test' into 6.0


  Commit: 9b5655596249c3e0367f63d44e4d9f8e59da95ca
      
https://github.com/Dolibarr/dolibarr/commit/9b5655596249c3e0367f63d44e4d9f8e59da95ca
  Author: Juanjo Menent <address@hidden>
  Date:   2018-02-06 (Tue, 06 Feb 2018)

  Changed paths:
    M htdocs/compta/prelevement/list.php

  Log Message:
  -----------
  FIX: Withdrawals lines not filter by company name and not respect dropdown 
limit lines by page


  Commit: 3f17c92aa3550b1131205e15b8c519c444821d17
      
https://github.com/Dolibarr/dolibarr/commit/3f17c92aa3550b1131205e15b8c519c444821d17
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-02-08 (Thu, 08 Feb 2018)

  Changed paths:
    M htdocs/societe/card.php

  Log Message:
  -----------
  Update card.php


  Commit: 371b168db1756012915b5079a4d350ea9735681d
      
https://github.com/Dolibarr/dolibarr/commit/371b168db1756012915b5079a4d350ea9735681d
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-02-08 (Thu, 08 Feb 2018)

  Changed paths:
    M htdocs/societe/card.php

  Log Message:
  -----------
  Merge pull request #8133 from atm-quentin/6.0

FIX unset categorie


  Commit: 39cd63e2d4abdcb8d1e035e8c7b870c0cbd33e03
      
https://github.com/Dolibarr/dolibarr/commit/39cd63e2d4abdcb8d1e035e8c7b870c0cbd33e03
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-02-08 (Thu, 08 Feb 2018)

  Changed paths:
    M htdocs/compta/prelevement/list.php

  Log Message:
  -----------
  Merge pull request #8143 from simnandez/6.0

FIX: Withdrawals lines not filter by company name and not respect dropdown 
limit lines by page


  Commit: 2b2e68c78dcc35f4b7cc8ccd5ce2fce279a3af7a
      
https://github.com/Dolibarr/dolibarr/commit/2b2e68c78dcc35f4b7cc8ccd5ce2fce279a3af7a
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-02-08 (Thu, 08 Feb 2018)

  Changed paths:
    M htdocs/compta/prelevement/list.php
    M htdocs/societe/card.php

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

Conflicts:
        htdocs/societe/card.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/c8ba1735635a...2b2e68c78dcc