[Dolibarr-git] [Dolibarr/dolibarr] ab558e: Update product.php

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ab558ee5fae5fbbaa92452160e80d8664e83453a
      
https://github.com/Dolibarr/dolibarr/commit/ab558ee5fae5fbbaa92452160e80d8664e83453a
  Author: Frédéric FRANCE <address@hidden>
  Date:   2017-12-14 (Thu, 14 Dec 2017)

  Changed paths:
    M htdocs/product/admin/product.php

  Log Message:
  -----------
  Update product.php


  Commit: 0db03cfbccc3b1cf80631cae5aa6b63d410782f2
      
https://github.com/Dolibarr/dolibarr/commit/0db03cfbccc3b1cf80631cae5aa6b63d410782f2
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-12-16 (Sat, 16 Dec 2017)

  Changed paths:
    M htdocs/product/admin/product.php

  Log Message:
  -----------
  Merge pull request #7957 from frederic34/patch-1

Update product.php


  Commit: 59a89b250da4b2b6ac8465b07161355af3c5bb08
      
https://github.com/Dolibarr/dolibarr/commit/59a89b250da4b2b6ac8465b07161355af3c5bb08
  Author: Regis Houssin <address@hidden>
  Date:   2017-12-27 (Wed, 27 Dec 2017)

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

  Log Message:
  -----------
  Fix: avoid warning (https://github.com/Dolibarr/dolibarr/issues/7993)


  Commit: 0abe19c30db184fe3d47e31fe43def562dd883ed
      
https://github.com/Dolibarr/dolibarr/commit/0abe19c30db184fe3d47e31fe43def562dd883ed
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-12-28 (Thu, 28 Dec 2017)

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

  Log Message:
  -----------
  Merge pull request #7998 from hregis/6.0_bug

Fix: avoid warning


  Commit: c7798d11ce9fa418f8ce4ea1222010d9654cc90c
      
https://github.com/Dolibarr/dolibarr/commit/c7798d11ce9fa418f8ce4ea1222010d9654cc90c
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-01-03 (Wed, 03 Jan 2018)

  Changed paths:
    M htdocs/product/admin/product.php

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


  Commit: f6ff6610e44ceeabb7280ffc73a43b675a66cbf7
      
https://github.com/Dolibarr/dolibarr/commit/f6ff6610e44ceeabb7280ffc73a43b675a66cbf7
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-01-03 (Wed, 03 Jan 2018)

  Changed paths:
    M htdocs/comm/propal/document.php
    M htdocs/comm/propal/info.php
    M htdocs/comm/propal/note.php
    M htdocs/commande/document.php
    M htdocs/commande/info.php
    M htdocs/commande/note.php
    M htdocs/compta/facture/contact.php
    M htdocs/compta/facture/document.php
    M htdocs/compta/facture/info.php
    M htdocs/compta/facture/note.php
    M htdocs/compta/facture/prelevement.php
    M htdocs/compta/paiement.php
    M htdocs/contact/list.php
    M htdocs/contrat/card.php
    M htdocs/contrat/contact.php
    M htdocs/contrat/document.php
    M htdocs/contrat/info.php
    M htdocs/contrat/note.php
    M htdocs/core/lib/ajax.lib.php
    M htdocs/fichinter/document.php
    M htdocs/fichinter/info.php
    M htdocs/fichinter/note.php
    M htdocs/fourn/commande/contact.php
    M htdocs/fourn/commande/document.php
    M htdocs/fourn/commande/info.php
    M htdocs/fourn/commande/note.php
    M htdocs/fourn/facture/contact.php
    M htdocs/fourn/facture/document.php
    M htdocs/fourn/facture/info.php
    M htdocs/fourn/facture/note.php
    M htdocs/langs/fr_FR/other.lang
    M htdocs/loan/document.php
    M htdocs/loan/info.php
    M htdocs/loan/note.php
    M htdocs/supplier_proposal/document.php
    M htdocs/supplier_proposal/info.php
    M htdocs/supplier_proposal/note.php

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


  Commit: 48261f793d145ae44180570e8d2b39374ceb7ef5
      
https://github.com/Dolibarr/dolibarr/commit/48261f793d145ae44180570e8d2b39374ceb7ef5
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-01-03 (Wed, 03 Jan 2018)

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

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

Conflicts:
        htdocs/product/admin/product.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/bc1f741600a4...48261f793d14