[Dolibarr-git] [Dolibarr/dolibarr] 87fc27: Avoid missing class error for

dolibarr-git
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 87fc27: Avoid missing class error for

From:	Laurent Destailleur
Subject:	[Dolibarr-git] [Dolibarr/dolibarr] 87fc27: Avoid missing class error for fetch_thirdparty met...
Date:	Tue, 09 Dec 2014 15:15:15 -0800
  Branch: refs/heads/3.6_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 87fc27c7e649566ebb467dc32af7b65ee623f292
      
https://github.com/Dolibarr/dolibarr/commit/87fc27c7e649566ebb467dc32af7b65ee623f292
  Author: jfefe <address@hidden>
  Date:   2014-10-06 (Mon, 06 Oct 2014)

  Changed paths:
    M htdocs/core/class/commonobject.class.php

  Log Message:
  -----------
  Avoid missing class error for fetch_thirdparty method


  Commit: 6a4468d94ea397695033249d40e73095970fd247
      
https://github.com/Dolibarr/dolibarr/commit/6a4468d94ea397695033249d40e73095970fd247
  Author: jfefe <address@hidden>
  Date:   2014-10-06 (Mon, 06 Oct 2014)

  Changed paths:
    M htdocs/core/class/commonobject.class.php

  Log Message:
  -----------
  Not need to test if class exists with require_once


  Commit: 7ed496d7d9e64664fa502dfa8bd6072599665702
      
https://github.com/Dolibarr/dolibarr/commit/7ed496d7d9e64664fa502dfa8bd6072599665702
  Author: Christophe Battarel <address@hidden>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php

  Log Message:
  -----------
  FIX: copy extrafields when creating order from propale and creating
invoice from order


  Commit: c0a3606a595fa21a015ef262ce98fd0e32453412
      
https://github.com/Dolibarr/dolibarr/commit/c0a3606a595fa21a015ef262ce98fd0e32453412
  Author: Florian HENRY <address@hidden>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

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

  Log Message:
  -----------
  Fix problem on task creation with chrome for french browser.


  Commit: 00c6033e11b35d5f004fddacd82f3f3464d1ea9e
      
https://github.com/Dolibarr/dolibarr/commit/00c6033e11b35d5f004fddacd82f3f3464d1ea9e
  Author: Florian HENRY <address@hidden>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M htdocs/user/fiche.php

  Log Message:
  -----------
  Fix display user signature when WYSIWYG is enabled


  Commit: 314be02e65c4a92aad34c8835c9619d61d8e8f41
      
https://github.com/Dolibarr/dolibarr/commit/314be02e65c4a92aad34c8835c9619d61d8e8f41
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-15 (Sat, 15 Nov 2014)

  Changed paths:
    M htdocs/core/lib/functions.lib.php
    M htdocs/user/fiche.php

  Log Message:
  -----------
  Merge pull request #2017 from FHenry/3.6

Fix problem on task creation with chrome for french browser.


  Commit: 2aeb0f4f5bff12f162db84265b03427ef676734f
      
https://github.com/Dolibarr/dolibarr/commit/2aeb0f4f5bff12f162db84265b03427ef676734f
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-15 (Sat, 15 Nov 2014)

  Changed paths:
    M htdocs/core/class/commonobject.class.php

  Log Message:
  -----------
  Merge pull request #1941 from jfefe/patch-3

Avoid missing class error for fetch_thirdparty method


  Commit: 64a2cce7c0b74df1c8e5f7146f5c48914ecb1ba2
      
https://github.com/Dolibarr/dolibarr/commit/64a2cce7c0b74df1c8e5f7146f5c48914ecb1ba2
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-16 (Sun, 16 Nov 2014)

  Changed paths:
    M htdocs/core/class/commonobject.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.5' into 3.6


  Commit: 01279edfc82213a4b875d709c5e452a44bfc791f
      
https://github.com/Dolibarr/dolibarr/commit/01279edfc82213a4b875d709c5e452a44bfc791f
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-16 (Sun, 16 Nov 2014)

  Changed paths:
    M htdocs/compta/bank/treso.php

  Log Message:
  -----------
  Fixed: [ bug #1570 ] Negative supplier invoices do not appear in bank
planned transactions.


  Commit: d0dc792b3cd829c6ef86fa555f880ed8400d3deb
      
https://github.com/Dolibarr/dolibarr/commit/d0dc792b3cd829c6ef86fa555f880ed8400d3deb
  Author: Christophe Battarel <address@hidden>
  Date:   2014-11-17 (Mon, 17 Nov 2014)

  Changed paths:
    M htdocs/core/class/commonobject.class.php

  Log Message:
  -----------
  check extrafields before inserting in DB


  Commit: 1b24356e0f9b7b4cfd8a19464096c788d2cc2560
      
https://github.com/Dolibarr/dolibarr/commit/1b24356e0f9b7b4cfd8a19464096c788d2cc2560
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-18 (Tue, 18 Nov 2014)

  Changed paths:
    M htdocs/paypal/lib/paypal.lib.php

  Log Message:
  -----------
  ssl option is set to CURL_SSLVERSION_TLSv1.
Some site disabled ssl v1 to 3 (ex: paypal).


  Commit: 3dacdf4e4a5ff54dc7a57a262d95465fc4580569
      
https://github.com/Dolibarr/dolibarr/commit/3dacdf4e4a5ff54dc7a57a262d95465fc4580569
  Author: Juanjo Menent <address@hidden>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M htdocs/core/class/commonobject.class.php
    M htdocs/product/class/product.class.php

  Log Message:
  -----------
  Fix: Conflicts and remove duplicate code


  Commit: 7d8cf99d58a61603ae52cc4cf429b505ba9e79d8
      
https://github.com/Dolibarr/dolibarr/commit/7d8cf99d58a61603ae52cc4cf429b505ba9e79d8
  Author: Christophe Battarel <address@hidden>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php

  Log Message:
  -----------
  FIX: bad margin and buy_price calculation when total_ht = 0 (discount
100%) on a line


  Commit: fdac53bfca37b034a8decfb4f0e568cbc93a5b27
      
https://github.com/Dolibarr/dolibarr/commit/fdac53bfca37b034a8decfb4f0e568cbc93a5b27
  Author: BENKE Charles <address@hidden>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M htdocs/core/tpl/objectline_create.tpl.php

  Log Message:
  -----------
  Update objectline_create.tpl.php

add label tags for product mode type


  Commit: 2f4de2ef75b5feda7efe1f3f0bb7328f788b6400
      
https://github.com/Dolibarr/dolibarr/commit/2f4de2ef75b5feda7efe1f3f0bb7328f788b6400
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-22 (Sat, 22 Nov 2014)

  Changed paths:
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/commonobject.class.php

  Log Message:
  -----------
  Merge pull request #2016 from altatof/3.5

FIX: copy extrafields when creating order from propale and creating


  Commit: 9aab62ab36d4367f3a58b3e6edae408109e4f5d5
      
https://github.com/Dolibarr/dolibarr/commit/9aab62ab36d4367f3a58b3e6edae408109e4f5d5
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-22 (Sat, 22 Nov 2014)

  Changed paths:
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/commonobject.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.5' into 3.6


  Commit: 891f8d9442d5532dba9a3440c8028caf31ff02c4
      
https://github.com/Dolibarr/dolibarr/commit/891f8d9442d5532dba9a3440c8028caf31ff02c4
  Author: Frédéric FRANCE <address@hidden>
  Date:   2014-11-22 (Sat, 22 Nov 2014)

  Changed paths:
    M htdocs/webservices/server_contact.php

  Log Message:
  -----------
  Fix bug 1692 Can't update phone_pro with the contact webservice


  Commit: 7a272afd120029ba06d00ff6d56d7a8e129cbb8f
      
https://github.com/Dolibarr/dolibarr/commit/7a272afd120029ba06d00ff6d56d7a8e129cbb8f
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-11-23 (Sun, 23 Nov 2014)

  Changed paths:
    M ChangeLog
    M htdocs/fichinter/fiche.php

  Log Message:
  -----------
  Fixed [ bug #1595 ] Selected boolean extrafield in intervention creation 
page, does not save state


  Commit: dcfaeb6606657471e63100a50694fb08c1e3eac1
      
https://github.com/Dolibarr/dolibarr/commit/dcfaeb6606657471e63100a50694fb08c1e3eac1
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-11-23 (Sun, 23 Nov 2014)

  Changed paths:
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/bank/treso.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/paypal/lib/paypal.lib.php
    M htdocs/product/class/product.class.php
    M htdocs/user/fiche.php

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/3.6' into 3.6


  Commit: 989cd87446522513fd7f886a19803c12200d1fe4
      
https://github.com/Dolibarr/dolibarr/commit/989cd87446522513fd7f886a19803c12200d1fe4
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-23 (Sun, 23 Nov 2014)

  Changed paths:
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php

  Log Message:
  -----------
  Merge pull request #2066 from altatof/fix_margin_recap

FIX: bad margin and buy_price calculation when total_ht = 0 (discount 100%) on 
a line


  Commit: bd8391163a04ce2a193a472ee31c5196ed8689b6
      
https://github.com/Dolibarr/dolibarr/commit/bd8391163a04ce2a193a472ee31c5196ed8689b6
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-23 (Sun, 23 Nov 2014)

  Changed paths:
    M htdocs/webservices/server_contact.php

  Log Message:
  -----------
  Merge pull request #2067 from frederic34/patch-2

Fix bug 1692 Can't update phone_pro with the contact webservice


  Commit: 1f986014f114c90c367110e258d33487d5360052
      
https://github.com/Dolibarr/dolibarr/commit/1f986014f114c90c367110e258d33487d5360052
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-23 (Sun, 23 Nov 2014)

  Changed paths:
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php
    M htdocs/webservices/server_contact.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.5' into 3.6


  Commit: 375d9aa33650f6c396ee1ae0166f33535bda12bf
      
https://github.com/Dolibarr/dolibarr/commit/375d9aa33650f6c396ee1ae0166f33535bda12bf
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-23 (Sun, 23 Nov 2014)

  Changed paths:
    M ChangeLog
    M htdocs/fichinter/fiche.php

  Log Message:
  -----------
  Merge pull request #2077 from marcosgdf/3.6

Fixed [ bug #1595 ] Selected boolean extrafield in intervention creation page, 
does not save state


  Commit: 1dbb19e8ef4a9b6ee76241eb61238253496e337c
      
https://github.com/Dolibarr/dolibarr/commit/1dbb19e8ef4a9b6ee76241eb61238253496e337c
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-24 (Mon, 24 Nov 2014)

  Changed paths:
    M htdocs/core/tpl/objectline_create.tpl.php

  Log Message:
  -----------
  Merge pull request #2058 from defrance69/patch-30

Update objectline_create.tpl.php


  Commit: 18406fc550d68bb5e851e242b6f928327bbe1a20
      
https://github.com/Dolibarr/dolibarr/commit/18406fc550d68bb5e851e242b6f928327bbe1a20
  Author: Francis Appels <address@hidden>
  Date:   2014-11-25 (Tue, 25 Nov 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
    M htdocs/core/modules/contract/doc/pdf_strato.modules.php
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

  Log Message:
  -----------
  Fix: Show sender Country on PDF docs

Show sender Country on PDF docs when sender Country != receiver Country


  Commit: b1a4b8e7d0aa8ff376e5dbfcf89260eb6e189d62
      
https://github.com/Dolibarr/dolibarr/commit/b1a4b8e7d0aa8ff376e5dbfcf89260eb6e189d62
  Author: Francis Appels <address@hidden>
  Date:   2014-11-25 (Tue, 25 Nov 2014)

  Changed paths:
    M ChangeLog
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php

  Log Message:
  -----------
  Fix: [ bug #1624 ] POS set buy price for margin

Use lowest buying price for margin when selling with POS or external
module. A POS user does not worry about suppliers.


  Commit: 4be9730518471568abb529ae9a4ef653d95a81ec
      
https://github.com/Dolibarr/dolibarr/commit/4be9730518471568abb529ae9a4ef653d95a81ec
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-11-28 (Fri, 28 Nov 2014)

  Changed paths:
    M ChangeLog
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
    M htdocs/core/modules/contract/doc/pdf_strato.modules.php
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

  Log Message:
  -----------
  Merge pull request #2099 from fappels/3.6

Fix: Show sender Country on PDF docs


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

  Changed paths:
    M htdocs/core/tpl/objectline_create.tpl.php

  Log Message:
  -----------
  Revert "Update objectline_create.tpl.php"

This reverts commit fdac53bfca37b034a8decfb4f0e568cbc93a5b27.


  Commit: f6ab7ca0c96f69822f10c5173eb71d062294f6bb
      
https://github.com/Dolibarr/dolibarr/commit/f6ab7ca0c96f69822f10c5173eb71d062294f6bb
  Author: aspangaro <address@hidden>
  Date:   2014-12-02 (Tue, 02 Dec 2014)

  Changed paths:
    M htdocs/admin/ihm.php

  Log Message:
  -----------
  Typo


  Commit: 5a05d4a4b8efa4d546e84970b491267f0649585f
      
https://github.com/Dolibarr/dolibarr/commit/5a05d4a4b8efa4d546e84970b491267f0649585f
  Author: aspangaro <address@hidden>
  Date:   2014-12-02 (Tue, 02 Dec 2014)

  Changed paths:
    M htdocs/core/datepicker.php

  Log Message:
  -----------
  Untranslatable token Calendar in datepicker


  Commit: 477aeecdac467663a3fbe42aaa5cdf27130b17e5
      
https://github.com/Dolibarr/dolibarr/commit/477aeecdac467663a3fbe42aaa5cdf27130b17e5
  Author: aspangaro <address@hidden>
  Date:   2014-12-02 (Tue, 02 Dec 2014)

  Changed paths:
    M htdocs/product/liste.php

  Log Message:
  -----------
  #1725 Missing table cells in services list header


  Commit: 4ff78c09fca2cfd77cdf3e91f9572e5548b3955d
      
https://github.com/Dolibarr/dolibarr/commit/4ff78c09fca2cfd77cdf3e91f9572e5548b3955d
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-12-03 (Wed, 03 Dec 2014)

  Changed paths:
    M htdocs/admin/ihm.php

  Log Message:
  -----------
  Merge pull request #2132 from aspangaro/3.6-patch1

Typo


  Commit: e21d6b09544273ea503c4939df892d8b05393d58
      
https://github.com/Dolibarr/dolibarr/commit/e21d6b09544273ea503c4939df892d8b05393d58
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-12-03 (Wed, 03 Dec 2014)

  Changed paths:
    M htdocs/core/datepicker.php

  Log Message:
  -----------
  Merge pull request #2131 from aspangaro/3.6-patch

Untranslatable token Calendar in datepicker


  Commit: 9e1b0d1abceeaebd96cfeac2c623dd16cec10eeb
      
https://github.com/Dolibarr/dolibarr/commit/9e1b0d1abceeaebd96cfeac2c623dd16cec10eeb
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M ChangeLog
    M build/debian/changelog
    M build/exe/doliwamp/doliwamp.iss
    M build/makepack-howto.txt
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M htdocs/filefunc.inc.php

  Log Message:
  -----------
  Prepare 3.5.6


  Commit: a07852c6993a937fa48305c197cefd10d396620c
      
https://github.com/Dolibarr/dolibarr/commit/a07852c6993a937fa48305c197cefd10d396620c
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M ChangeLog
    M build/debian/changelog
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
        build/debian/changelog
        build/exe/doliwamp/doliwamp.iss
        build/rpm/dolibarr_fedora.spec
        build/rpm/dolibarr_generic.spec
        build/rpm/dolibarr_mandriva.spec
        build/rpm/dolibarr_opensuse.spec
        htdocs/filefunc.inc.php


  Commit: ae3c83b7dcb7fe5952a6feca7e244e0c191f98f6
      
https://github.com/Dolibarr/dolibarr/commit/ae3c83b7dcb7fe5952a6feca7e244e0c191f98f6
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

  Changed paths:
    M htdocs/product/liste.php

  Log Message:
  -----------
  Merge pull request #2133 from aspangaro/3.6-patch2

#1725 Missing table cells in services list header


  Commit: 50e011d44f5121e22e8dd95dfad7bf09d6081f7d
      
https://github.com/Dolibarr/dolibarr/commit/50e011d44f5121e22e8dd95dfad7bf09d6081f7d
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-12-10 (Wed, 10 Dec 2014)

  Changed paths:
    M ChangeLog
    M build/debian/changelog
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M htdocs/admin/ihm.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/bank/treso.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/datepicker.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
    M htdocs/core/modules/contract/doc/pdf_strato.modules.php
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
    R htdocs/core/modules/livraison/doc/index.html
    R htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
    A htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/fichinter/fiche.php
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php
    M htdocs/paypal/lib/paypal.lib.php
    M htdocs/product/class/product.class.php
    M htdocs/product/liste.php
    M htdocs/user/fiche.php
    M htdocs/webservices/server_contact.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.6' into 3.6_backported

Conflicts:
        htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
        htdocs/product/class/product.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/acde5c28bd2e...50e011d44f51
[Prev in Thread]
Current Thread
[Next in Thread]
[Dolibarr-git] [Dolibarr/dolibarr] 87fc27: Avoid missing class error for fetch_thirdparty met..., Laurent Destailleur <=
Prev by Date: [Dolibarr-git] [Dolibarr/dolibarr] 9be99b: Fixed: We must use PMP of product. Not warehouse.
Next by Date: [Dolibarr-git] [Dolibarr/dolibarr] 7834a9: Add hidden constant to solve bug of too low size t...
Previous by thread: [Dolibarr-git] [Dolibarr/dolibarr] 9be99b: Fixed: We must use PMP of product. Not warehouse.
Next by thread: [Dolibarr-git] [Dolibarr/dolibarr] 7834a9: Add hidden constant to solve bug of too low size t...
Index(es):
- Date
- Thread