dolibarr-git
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] d0a1d2: Merge branch '3.6' of address


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] d0a1d2: Merge branch '3.6' of address@hidden:Dolibarr/doli...
Date: Sat, 12 Sep 2015 02:45:01 -0700

  Branch: refs/heads/3.7_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: d0a1d2c3a500e33c85662a1b7070167a92dd6e60
      
https://github.com/Dolibarr/dolibarr/commit/d0a1d2c3a500e33c85662a1b7070167a92dd6e60
  Author: Florian HENRY <address@hidden>
  Date:   2015-06-05 (Fri, 05 Jun 2015)

  Changed paths:
    M htdocs/fourn/class/fournisseur.product.class.php

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


  Commit: ca44070bbe1ea5d724e7b8f9662db55a4cc0e8f5
      
https://github.com/Dolibarr/dolibarr/commit/ca44070bbe1ea5d724e7b8f9662db55a4cc0e8f5
  Author: Florian HENRY <address@hidden>
  Date:   2015-06-08 (Mon, 08 Jun 2015)

  Changed paths:
    M htdocs/fourn/class/fournisseur.commande.class.php

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


  Commit: 96ce5ab617f1e53fa0a0203c19fcb91e61b1ad92
      
https://github.com/Dolibarr/dolibarr/commit/96ce5ab617f1e53fa0a0203c19fcb91e61b1ad92
  Author: Florian HENRY <address@hidden>
  Date:   2015-06-11 (Thu, 11 Jun 2015)

  Changed paths:
    M htdocs/core/class/html.form.class.php

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


  Commit: ac6619daef402ebefa6b36d9199145449cda54fe
      
https://github.com/Dolibarr/dolibarr/commit/ac6619daef402ebefa6b36d9199145449cda54fe
  Author: Florian HENRY <address@hidden>
  Date:   2015-06-24 (Wed, 24 Jun 2015)

  Changed paths:
    M ChangeLog
    M htdocs/categories/edit.php
    M htdocs/categories/fiche.php
    M htdocs/categories/viewcat.php
    M htdocs/compta/bank/virement.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/report.lib.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/install/upgrade2.php
    M htdocs/main.inc.php
    M htdocs/product/class/product.class.php
    M htdocs/product/liste.php
    M htdocs/product/price.php

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


  Commit: 01d1c89f118787f97b3c19fbb2d590c5b2681f03
      
https://github.com/Dolibarr/dolibarr/commit/01d1c89f118787f97b3c19fbb2d590c5b2681f03
  Author: Florian HENRY <address@hidden>
  Date:   2015-07-15 (Wed, 15 Jul 2015)

  Changed paths:
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/sociales/class/paymentsocialcontribution.class.php
    M htdocs/contact/class/contact.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/modules/export/export_csv.modules.php
    M htdocs/core/modules/export/export_excel.modules.php
    M htdocs/core/modules/export/export_tsv.modules.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/product/reassort.php
    M htdocs/projet/liste.php

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


  Commit: 1d85529eda86b03f206ea627ca917551041a6c18
      
https://github.com/Dolibarr/dolibarr/commit/1d85529eda86b03f206ea627ca917551041a6c18
  Author: Francis Appels <address@hidden>
  Date:   2015-08-11 (Tue, 11 Aug 2015)

  Changed paths:
    M htdocs/product/stock/class/mouvementstock.class.php

  Log Message:
  -----------
  Fix delete not used empty stock record

When removing all stock from warehouse are move all stock to other
warehouse, there is still an 0 stock record in in the stock table for
the source warehouse, not visible in Dolibarr.


  Commit: 8d18507d5f73a89319587f30a6f74c7c2e02bc43
      
https://github.com/Dolibarr/dolibarr/commit/8d18507d5f73a89319587f30a6f74c7c2e02bc43
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-08-14 (Fri, 14 Aug 2015)

  Changed paths:
    M build/makepack-dolibarr.pl

  Log Message:
  -----------
  Bad help


  Commit: 58988d30840e6fc23a2f78e7206cb4abe7691bb5
      
https://github.com/Dolibarr/dolibarr/commit/58988d30840e6fc23a2f78e7206cb4abe7691bb5
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-08-14 (Fri, 14 Aug 2015)

  Changed paths:
    M htdocs/filefunc.inc.php

  Log Message:
  -----------
  3.5.8


  Commit: 2faa5d725e02dc580f47e0ac812be4009f401c05
      
https://github.com/Dolibarr/dolibarr/commit/2faa5d725e02dc580f47e0ac812be4009f401c05
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-08-15 (Sat, 15 Aug 2015)

  Changed paths:
    A htdocs/includes/tcpdf/fonts/dejavusanscondensed.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensed.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedb.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedb.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedi.z
    A htdocs/includes/tcpdf/fonts/dejavusansextralight.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansextralight.z
    A htdocs/includes/tcpdf/fonts/dejavusansmono.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmono.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonob.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonob.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonobi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonobi.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonoi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonoi.z

  Log Message:
  -----------
  Missing tcpdf files


  Commit: 7b7fc44b4691bc97b10a18661a1df71d4736cd52
      
https://github.com/Dolibarr/dolibarr/commit/7b7fc44b4691bc97b10a18661a1df71d4736cd52
  Author: Regis Houssin <address@hidden>
  Date:   2015-08-22 (Sat, 22 Aug 2015)

  Changed paths:
    M htdocs/core/ajax/box.php
    M htdocs/core/ajax/security.php

  Log Message:
  -----------
  Fix: disable hook for avoid errors when object langs is disable


  Commit: edf05e8d94cb8d329524079fcaa4d7f51911a280
      
https://github.com/Dolibarr/dolibarr/commit/edf05e8d94cb8d329524079fcaa4d7f51911a280
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-08-26 (Wed, 26 Aug 2015)

  Changed paths:
    M htdocs/core/ajax/box.php
    M htdocs/core/ajax/security.php

  Log Message:
  -----------
  Merge pull request #3404 from hregis/3.7_bug

Fix: disable hook for avoid errors when object langs is disable


  Commit: 2527ae263be5e3da3f3e0e19572f9b29d66eb106
      
https://github.com/Dolibarr/dolibarr/commit/2527ae263be5e3da3f3e0e19572f9b29d66eb106
  Author: philippe grand <address@hidden>
  Date:   2015-08-27 (Thu, 27 Aug 2015)

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

  Log Message:
  -----------
  fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log 
level'


  Commit: db7defb7c30e982807211df2a4983e9c3440d14e
      
https://github.com/Dolibarr/dolibarr/commit/db7defb7c30e982807211df2a4983e9c3440d14e
  Author: philippe grand <address@hidden>
  Date:   2015-08-27 (Thu, 27 Aug 2015)

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

  Log Message:
  -----------
  Revert "fix : Fatal error: Uncaught exception 'Exception' with message 
'Incorrect log level'"

This reverts commit 2527ae263be5e3da3f3e0e19572f9b29d66eb106.


  Commit: e9f631d2e3a78f3c3277a4415c3f2c4082537914
      
https://github.com/Dolibarr/dolibarr/commit/e9f631d2e3a78f3c3277a4415c3f2c4082537914
  Author: philippe grand <address@hidden>
  Date:   2015-08-27 (Thu, 27 Aug 2015)

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

  Log Message:
  -----------
  fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log 
level'


  Commit: aff134ab65f862a9ca6c1cd3dbe3c9b1e2a5ef80
      
https://github.com/Dolibarr/dolibarr/commit/aff134ab65f862a9ca6c1cd3dbe3c9b1e2a5ef80
  Author: aspangaro <address@hidden>
  Date:   2015-08-27 (Thu, 27 Aug 2015)

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

  Log Message:
  -----------
  Fix #3289 Salaries module shows amounts with currency symbol unlike the rest 
of Dolibarr


  Commit: 6952084be30cef84b22f668bcec0541f240e882f
      
https://github.com/Dolibarr/dolibarr/commit/6952084be30cef84b22f668bcec0541f240e882f
  Author: philippe grand <address@hidden>
  Date:   2015-08-27 (Thu, 27 Aug 2015)

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

  Log Message:
  -----------
  it's a mess


  Commit: 0aba8a1bb1889aae14e4f09800060543fe513f74
      
https://github.com/Dolibarr/dolibarr/commit/0aba8a1bb1889aae14e4f09800060543fe513f74
  Author: Juanjo Menent <address@hidden>
  Date:   2015-08-28 (Fri, 28 Aug 2015)

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

  Log Message:
  -----------
  Merge pull request #3421 from grandoc/grandoc_fix_27082015

Grandoc fix 27082015


  Commit: a7d1a35a56271f4d56c8a3c2be1d8393ff67b048
      
https://github.com/Dolibarr/dolibarr/commit/a7d1a35a56271f4d56c8a3c2be1d8393ff67b048
  Author: Juanjo Menent <address@hidden>
  Date:   2015-08-28 (Fri, 28 Aug 2015)

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

  Log Message:
  -----------
  Merge pull request #3420 from aspangaro/3.7-4

Fix #3289 Salaries module shows amounts with currency symbol unlike t…


  Commit: e2072999cf88313ae82996b803205d66dc831ad8
      
https://github.com/Dolibarr/dolibarr/commit/e2072999cf88313ae82996b803205d66dc831ad8
  Author: Aurélien Stride <address@hidden>
  Date:   2015-08-28 (Fri, 28 Aug 2015)

  Changed paths:
    M htdocs/fourn/commande/card.php

  Log Message:
  -----------
  ADD : ref_supplier to object property, otherwise not visibly updated on change


  Commit: 17b69e16d2fe6bbe487c03c13ea94f054b34cbb4
      
https://github.com/Dolibarr/dolibarr/commit/17b69e16d2fe6bbe487c03c13ea94f054b34cbb4
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-08-29 (Sat, 29 Aug 2015)

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

  Log Message:
  -----------
  Fix remove a bad log reporting error when not


  Commit: a3d612a26a62c0b8ad2d29d0a8feb971086c64fc
      
https://github.com/Dolibarr/dolibarr/commit/a3d612a26a62c0b8ad2d29d0a8feb971086c64fc
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-08-29 (Sat, 29 Aug 2015)

  Changed paths:
    M htdocs/compta/salaries/index.php
    M htdocs/core/ajax/box.php
    M htdocs/core/ajax/security.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/lib/pdf.lib.php

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


  Commit: c8f12dc5f2dcfff71f799a114e893ac061e4bd3f
      
https://github.com/Dolibarr/dolibarr/commit/c8f12dc5f2dcfff71f799a114e893ac061e4bd3f
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-08-29 (Sat, 29 Aug 2015)

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

  Log Message:
  -----------
  Fix PUT method for already formated strings


  Commit: b953d2c4665bd0eb0e8c769189669da6191e7d8e
      
https://github.com/Dolibarr/dolibarr/commit/b953d2c4665bd0eb0e8c769189669da6191e7d8e
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-08-29 (Sat, 29 Aug 2015)

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

  Log Message:
  -----------
  FIX [ bug #3426 ] Unable to create an invoice from a contract with extrafields

Close #3426


  Commit: fb70fbdc06d2a786e56ef681bee899a8694b11c4
      
https://github.com/Dolibarr/dolibarr/commit/fb70fbdc06d2a786e56ef681bee899a8694b11c4
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-08-31 (Mon, 31 Aug 2015)

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

  Log Message:
  -----------
  Merge pull request #3428 from marcosgdf/bug-3426

FIX [ bug #3426 ] Unable to create an invoice from a contract with extrafields


  Commit: cf38b17e88f75ed54ffb478ce8d1dde1b8b91fe8
      
https://github.com/Dolibarr/dolibarr/commit/cf38b17e88f75ed54ffb478ce8d1dde1b8b91fe8
  Author: fmarcet <address@hidden>
  Date:   2015-08-31 (Mon, 31 Aug 2015)

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

  Log Message:
  -----------
  FIX: Bad visualization of suppliers name on Incomes-Expenses mode


  Commit: 1a3d8b5ae435fbf5197498c5659ec053e06bf683
      
https://github.com/Dolibarr/dolibarr/commit/1a3d8b5ae435fbf5197498c5659ec053e06bf683
  Author: Aurélien Stride <address@hidden>
  Date:   2015-08-31 (Mon, 31 Aug 2015)

  Changed paths:
    M htdocs/fourn/commande/card.php

  Log Message:
  -----------
  FIX : adjusted test for affecting supplier reference


  Commit: 8941431ee31c73a69dc35bd279ef07ddb7cd4d5e
      
https://github.com/Dolibarr/dolibarr/commit/8941431ee31c73a69dc35bd279ef07ddb7cd4d5e
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-08-31 (Mon, 31 Aug 2015)

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

  Log Message:
  -----------
  Merge pull request #3435 from fmarcet/3.7

FIX: Bad visualization of suppliers name on Incomes-Expenses mode


  Commit: 51d5bff15d761588e96808d1e448c2dfdbf0a874
      
https://github.com/Dolibarr/dolibarr/commit/51d5bff15d761588e96808d1e448c2dfdbf0a874
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2015-08-31 (Mon, 31 Aug 2015)

  Changed paths:
    M htdocs/core/boxes/box_prospect.php

  Log Message:
  -----------
  Fix #3442 Remove useless syslog

Not having the permission to read the box is not an error.
Furthermore, no other boxes have this behavior.


  Commit: 3b493ab0ed6bb5f4a688d48a0b7bec6364efa603
      
https://github.com/Dolibarr/dolibarr/commit/3b493ab0ed6bb5f4a688d48a0b7bec6364efa603
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2015-08-31 (Mon, 31 Aug 2015)

  Changed paths:
    M htdocs/core/modules/syslog/mod_syslog_chromephp.php

  Log Message:
  -----------
  Fix #2863 Sensible defaults for ChromePHP path

Use the provided ChromePHP class by default


  Commit: 2b6a481011783d38c912b33268d79cc9e62be86e
      
https://github.com/Dolibarr/dolibarr/commit/2b6a481011783d38c912b33268d79cc9e62be86e
  Author: fmarcet <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

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

  Log Message:
  -----------
  FIX: The hours of date filter aren't correct


  Commit: 9ec349f4103c13670be8994a45268f47ad0fba2c
      
https://github.com/Dolibarr/dolibarr/commit/9ec349f4103c13670be8994a45268f47ad0fba2c
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/lib/pdf.lib.php

  Log Message:
  -----------
  FIX [ bug #3432 ] Spaces should be removed from IBAN when formatting it

Close #3432


  Commit: 870882257da72e81848739f3482b22d48a59eb70
      
https://github.com/Dolibarr/dolibarr/commit/870882257da72e81848739f3482b22d48a59eb70
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M htdocs/compta/index.php

  Log Message:
  -----------
  Fix #3448 Pass expected date format


  Commit: c4f9bde14d78244b949143bee76f4ac4864cbc5a
      
https://github.com/Dolibarr/dolibarr/commit/c4f9bde14d78244b949143bee76f4ac4864cbc5a
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php

  Log Message:
  -----------
  FIX [ bug #3431 ] Invoice bank account is not respected

Close #3431


  Commit: 3134950dbea66387d859597c69641388eab45110
      
https://github.com/Dolibarr/dolibarr/commit/3134950dbea66387d859597c69641388eab45110
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M ChangeLog
    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/doc/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 [ bug #3383 ] Company name is overlapped with company direction in PDF 
models

Close #3383


  Commit: 216827b1d823f9cb9de588590f3c94b0e4031d5c
      
https://github.com/Dolibarr/dolibarr/commit/216827b1d823f9cb9de588590f3c94b0e4031d5c
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/boxes/box_task.php

  Log Message:
  -----------
  FIX [ bug #3358 ] Tasks box does not work with PostgreSQL

Close #358


  Commit: fbf13ec2c73339e2743a4322d4de6380e33eceb9
      
https://github.com/Dolibarr/dolibarr/commit/fbf13ec2c73339e2743a4322d4de6380e33eceb9
  Author: Regis Houssin <address@hidden>
  Date:   2015-09-02 (Wed, 02 Sep 2015)

  Changed paths:
    M htdocs/commande/orderstoinvoice.php

  Log Message:
  -----------
  Fix: wrong logical operator


  Commit: c4fa4fc931024dfb9cd0df74aa6fedb2ba3de015
      
https://github.com/Dolibarr/dolibarr/commit/c4fa4fc931024dfb9cd0df74aa6fedb2ba3de015
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-02 (Wed, 02 Sep 2015)

  Changed paths:
    M htdocs/compta/facture/impayees.php

  Log Message:
  -----------
  Fix hidden feature to send remind by email


  Commit: 5ef3c517bcbba78be774ab85f205b4e748fff39c
      
https://github.com/Dolibarr/dolibarr/commit/5ef3c517bcbba78be774ab85f205b4e748fff39c
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-02 (Wed, 02 Sep 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/core/class/commonobject.class.php

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


  Commit: 1a08f65942da6cd9ff766a967fafad169d056d92
      
https://github.com/Dolibarr/dolibarr/commit/1a08f65942da6cd9ff766a967fafad169d056d92
  Author: Regis Houssin <address@hidden>
  Date:   2015-09-02 (Wed, 02 Sep 2015)

  Changed paths:
    M htdocs/product/stock/replenish.php

  Log Message:
  -----------
  Fix: problem with pagination


  Commit: c024578ca11ae84877ce869ef9c8e0121ca3da68
      
https://github.com/Dolibarr/dolibarr/commit/c024578ca11ae84877ce869ef9c8e0121ca3da68
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-02 (Wed, 02 Sep 2015)

  Changed paths:
    M htdocs/compta/facture/impayees.php

  Log Message:
  -----------
  Fix bad link and remove a break


  Commit: e3d4b104e2375b4a63e47e2dfd14eeb244a558f6
      
https://github.com/Dolibarr/dolibarr/commit/e3d4b104e2375b4a63e47e2dfd14eeb244a558f6
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M htdocs/compta/index.php

  Log Message:
  -----------
  Merge pull request #3449 from GPCsolutions/3.5-3448

Fix #3448 Pass expected date format


  Commit: 9efecbf52b9386cb5eac97519169a2e109369930
      
https://github.com/Dolibarr/dolibarr/commit/9efecbf52b9386cb5eac97519169a2e109369930
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M htdocs/core/boxes/box_prospect.php

  Log Message:
  -----------
  Merge pull request #3443 from GPCsolutions/3.5-3442

Fix #3442 Remove useless syslog


  Commit: 6ea31d87f8246a455973696ba2b6f82eaa951a45
      
https://github.com/Dolibarr/dolibarr/commit/6ea31d87f8246a455973696ba2b6f82eaa951a45
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M htdocs/core/modules/syslog/mod_syslog_chromephp.php

  Log Message:
  -----------
  Merge pull request #3445 from GPCsolutions/3.7-2863

Fix #2863 Sensible defaults for ChromePHP path


  Commit: 897686a7520b35ab3f7164183574bdcb2d5f3c00
      
https://github.com/Dolibarr/dolibarr/commit/897686a7520b35ab3f7164183574bdcb2d5f3c00
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

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

  Log Message:
  -----------
  Merge pull request #3447 from fmarcet/3.5

FIX: The hours of date filter aren't correct


  Commit: 7640abe6fc89981aa47c0c3a488f9c8421d14637
      
https://github.com/Dolibarr/dolibarr/commit/7640abe6fc89981aa47c0c3a488f9c8421d14637
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M htdocs/commande/orderstoinvoice.php

  Log Message:
  -----------
  Merge pull request #3453 from hregis/3.7_bug

Fix: wrong logical operator


  Commit: 001f1b4c31393a7a1c1514ab335af7787555b044
      
https://github.com/Dolibarr/dolibarr/commit/001f1b4c31393a7a1c1514ab335af7787555b044
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M build/makepack-dolibarr.pl
    M htdocs/compta/index.php
    M htdocs/core/boxes/box_prospect.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php

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

Conflicts:
        htdocs/filefunc.inc.php


  Commit: d64a87d98013da0e0e7bcf0c038489324066d350
      
https://github.com/Dolibarr/dolibarr/commit/d64a87d98013da0e0e7bcf0c038489324066d350
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M htdocs/compta/index.php
    M htdocs/core/boxes/box_prospect.php
    A htdocs/includes/tcpdf/fonts/dejavusanscondensed.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensed.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedb.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedb.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedi.z
    A htdocs/includes/tcpdf/fonts/dejavusansextralight.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansextralight.z
    A htdocs/includes/tcpdf/fonts/dejavusansmono.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmono.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonob.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonob.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonobi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonobi.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonoi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonoi.z
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php

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

Conflicts:
        htdocs/compta/index.php


  Commit: 50184babb95a19ff01efb76696b3e3b60441af8f
      
https://github.com/Dolibarr/dolibarr/commit/50184babb95a19ff01efb76696b3e3b60441af8f
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

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

  Log Message:
  -----------
  FIX [ bug #2893 ] Dolibarr error when viewing an invoice after changing 
invoice mask

Close #2893


  Commit: 08565d46fec7daded48d1ac888f2d7cd5b134062
      
https://github.com/Dolibarr/dolibarr/commit/08565d46fec7daded48d1ac888f2d7cd5b134062
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M build/makepack-dolibarr.pl
    M htdocs/compta/index.php
    M htdocs/core/boxes/box_prospect.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php

  Log Message:
  -----------
  Merge branch '3.6' into bug-2893


  Commit: bd21cf5d68c764f989e1fbea8a5125d0ca6c8290
      
https://github.com/Dolibarr/dolibarr/commit/bd21cf5d68c764f989e1fbea8a5125d0ca6c8290
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Updated changelog


  Commit: 7a115c9366ea56e2239738e4cc023d17d96d6876
      
https://github.com/Dolibarr/dolibarr/commit/7a115c9366ea56e2239738e4cc023d17d96d6876
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M ChangeLog

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


  Commit: 0955432de3bd637eb8077458e04e759d96a7f01a
      
https://github.com/Dolibarr/dolibarr/commit/0955432de3bd637eb8077458e04e759d96a7f01a
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M ChangeLog
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/facture/impayees.php
    M htdocs/compta/index.php
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/salaries/index.php
    M htdocs/contact/class/contact.class.php
    M htdocs/core/boxes/box_prospect.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/lib/geturl.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/modules/syslog/mod_syslog_chromephp.php
    A htdocs/includes/tcpdf/fonts/dejavusanscondensed.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensed.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedb.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedb.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedi.z
    A htdocs/includes/tcpdf/fonts/dejavusansextralight.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansextralight.z
    A htdocs/includes/tcpdf/fonts/dejavusansmono.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmono.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonob.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonob.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonobi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonobi.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonoi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonoi.z
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php

  Log Message:
  -----------
  Merge branch '3.7' into bug-iban-whitespaces-37

# Conflicts:
#       ChangeLog


  Commit: 86dd751f29116d8b814f1b94226f5b37c1ead072
      
https://github.com/Dolibarr/dolibarr/commit/86dd751f29116d8b814f1b94226f5b37c1ead072
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M ChangeLog
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/facture/impayees.php
    M htdocs/compta/index.php
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/salaries/index.php
    M htdocs/contact/class/contact.class.php
    M htdocs/core/boxes/box_prospect.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/lib/geturl.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/modules/syslog/mod_syslog_chromephp.php
    A htdocs/includes/tcpdf/fonts/dejavusanscondensed.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensed.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedb.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedb.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedi.z
    A htdocs/includes/tcpdf/fonts/dejavusansextralight.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansextralight.z
    A htdocs/includes/tcpdf/fonts/dejavusansmono.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmono.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonob.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonob.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonobi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonobi.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonoi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonoi.z
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php

  Log Message:
  -----------
  Merge branch '3.7' into bug-incorrect-pdf-bank

# Conflicts:
#       ChangeLog


  Commit: 67b7162c59a7bb635aeab8a8a0fb24146538d7b9
      
https://github.com/Dolibarr/dolibarr/commit/67b7162c59a7bb635aeab8a8a0fb24146538d7b9
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M ChangeLog
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/facture/impayees.php
    M htdocs/compta/index.php
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/salaries/index.php
    M htdocs/contact/class/contact.class.php
    M htdocs/core/boxes/box_prospect.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/lib/geturl.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/modules/syslog/mod_syslog_chromephp.php
    A htdocs/includes/tcpdf/fonts/dejavusanscondensed.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensed.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedb.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedb.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedi.z
    A htdocs/includes/tcpdf/fonts/dejavusansextralight.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansextralight.z
    A htdocs/includes/tcpdf/fonts/dejavusansmono.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmono.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonob.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonob.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonobi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonobi.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonoi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonoi.z
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php

  Log Message:
  -----------
  Merge branch '3.7' into bug-3383

# Conflicts:
#       ChangeLog


  Commit: 8bf093a7ce38584072701a3ada62d96afb8dfb41
      
https://github.com/Dolibarr/dolibarr/commit/8bf093a7ce38584072701a3ada62d96afb8dfb41
  Author: philippe grand <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

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

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


  Commit: 2d5331b8f860e3cc03b8b57d3f1d37abce7633da
      
https://github.com/Dolibarr/dolibarr/commit/2d5331b8f860e3cc03b8b57d3f1d37abce7633da
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture.php

  Log Message:
  -----------
  FIX [ #3460 ] Selected bank account was not saved when an error happened when 
trying to create a customer invoice

Close #3460


  Commit: ded6e7d6d90afa8f864240da0ef2f97f63bb3dd2
      
https://github.com/Dolibarr/dolibarr/commit/ded6e7d6d90afa8f864240da0ef2f97f63bb3dd2
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M ChangeLog
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/facture/impayees.php
    M htdocs/compta/index.php
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/salaries/index.php
    M htdocs/contact/class/contact.class.php
    M htdocs/core/boxes/box_prospect.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/lib/geturl.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/modules/syslog/mod_syslog_chromephp.php
    A htdocs/includes/tcpdf/fonts/dejavusanscondensed.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensed.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedb.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedb.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedi.z
    A htdocs/includes/tcpdf/fonts/dejavusansextralight.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansextralight.z
    A htdocs/includes/tcpdf/fonts/dejavusansmono.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmono.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonob.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonob.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonobi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonobi.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonoi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonoi.z
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php

  Log Message:
  -----------
  Merge branch '3.7' into bug-3358

# Conflicts:
#       ChangeLog


  Commit: fed70b1376d640ff8a2e16eb1764971c7e9bcc06
      
https://github.com/Dolibarr/dolibarr/commit/fed70b1376d640ff8a2e16eb1764971c7e9bcc06
  Author: philippe grand <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M htdocs/holiday/card.php

  Log Message:
  -----------
  translation missing


  Commit: 51a01921ba30f6219d6d9250ece8265dc3e4315e
      
https://github.com/Dolibarr/dolibarr/commit/51a01921ba30f6219d6d9250ece8265dc3e4315e
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

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

  Log Message:
  -----------
  Merge pull request #3456 from marcosgdf/bug-2893

Fix [ bug #2893 ] Dolibarr error when viewing an invoice after changing invoice 
mask


  Commit: bd38e2f0bd21f55c0445d91209cc738907962dea
      
https://github.com/Dolibarr/dolibarr/commit/bd38e2f0bd21f55c0445d91209cc738907962dea
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/lib/pdf.lib.php

  Log Message:
  -----------
  Merge pull request #3457 from marcosgdf/bug-iban-whitespaces-37

FIX [ bug #3432 ] Spaces should be removed from IBAN when formatting it


  Commit: de741e41e5a875044e29ee826594e3dc8784c641
      
https://github.com/Dolibarr/dolibarr/commit/de741e41e5a875044e29ee826594e3dc8784c641
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php

  Log Message:
  -----------
  git push origin 3.7Merge branch 'marcosgdf-bug-incorrect-pdf-bank' into 3.7


  Commit: b0f604da140cfdef1852c87c0f2ae0230d4e2502
      
https://github.com/Dolibarr/dolibarr/commit/b0f604da140cfdef1852c87c0f2ae0230d4e2502
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/lib/pdf.lib.php

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

Conflicts:
        ChangeLog


  Commit: be9d5b030d1c60099b4cd3666cbaac26c7c69177
      
https://github.com/Dolibarr/dolibarr/commit/be9d5b030d1c60099b4cd3666cbaac26c7c69177
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/boxes/box_task.php

  Log Message:
  -----------
  Merge branch 'bug-3358' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-3358

Conflicts:
        ChangeLog


  Commit: 7009c6b8900af069cf39705a51342a7f33e3796d
      
https://github.com/Dolibarr/dolibarr/commit/7009c6b8900af069cf39705a51342a7f33e3796d
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/boxes/box_task.php

  Log Message:
  -----------
  git push origin 3.7Merge branch 'marcosgdf-bug-3358' into 3.7


  Commit: 54214cfddf8727e6aedec19068d5dd648274f173
      
https://github.com/Dolibarr/dolibarr/commit/54214cfddf8727e6aedec19068d5dd648274f173
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M ChangeLog
    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/doc/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 branch 'bug-3383' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-3383

Conflicts:
        ChangeLog


  Commit: 846899dc06b5c702c8cedb6467504a796aa5547e
      
https://github.com/Dolibarr/dolibarr/commit/846899dc06b5c702c8cedb6467504a796aa5547e
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M ChangeLog
    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/doc/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:
  -----------
  git push origin 3.7Merge branch 'marcosgdf-bug-3383' into 3.7


  Commit: c7b7dff0ede6c263773df9b826735156e8777b28
      
https://github.com/Dolibarr/dolibarr/commit/c7b7dff0ede6c263773df9b826735156e8777b28
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Merge branch 'bug-3460' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-3460

Conflicts:
        ChangeLog


  Commit: 1f25ccf0bf160c54df112bd98ab6219a7852e1bf
      
https://github.com/Dolibarr/dolibarr/commit/1f25ccf0bf160c54df112bd98ab6219a7852e1bf
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture.php

  Log Message:
  -----------
  git push origin 3.7Merge branch 'marcosgdf-bug-3460' into 3.7


  Commit: 2e3d25c055c6ddd364682262a5ba0582445bec7c
      
https://github.com/Dolibarr/dolibarr/commit/2e3d25c055c6ddd364682262a5ba0582445bec7c
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M htdocs/core/modules/modHoliday.class.php
    M htdocs/holiday/card.php

  Log Message:
  -----------
  Merge pull request #3462 from grandoc/3.7

fix : Typo


  Commit: 0016f48facba242af8957cfb1ca003cf568f8a4f
      
https://github.com/Dolibarr/dolibarr/commit/0016f48facba242af8957cfb1ca003cf568f8a4f
  Author: Juanjo Menent <address@hidden>
  Date:   2015-09-04 (Fri, 04 Sep 2015)

  Changed paths:
    M htdocs/fourn/commande/card.php

  Log Message:
  -----------
  Merge pull request #3424 from atm-aurelien/3.7

FIX ref_supplier to object property on supplier ref change


  Commit: ecf80249d1f0e28421e39d7e93e8d5d5c6fce548
      
https://github.com/Dolibarr/dolibarr/commit/ecf80249d1f0e28421e39d7e93e8d5d5c6fce548
  Author: Juanjo Menent <address@hidden>
  Date:   2015-09-04 (Fri, 04 Sep 2015)

  Changed paths:
    M htdocs/product/stock/replenish.php

  Log Message:
  -----------
  Merge pull request #3454 from hregis/3.7_bug3

Fix: problem with pagination


  Commit: 8076ea85eab97f6c27859de0ed0b28f7ab8faf50
      
https://github.com/Dolibarr/dolibarr/commit/8076ea85eab97f6c27859de0ed0b28f7ab8faf50
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-05 (Sat, 05 Sep 2015)

  Changed paths:
    M htdocs/filefunc.inc.php

  Log Message:
  -----------
  3.6.4 was packaged


  Commit: b268ccf064b453974ea197a013e3b46f7ee2b809
      
https://github.com/Dolibarr/dolibarr/commit/b268ccf064b453974ea197a013e3b46f7ee2b809
  Author: aspangaro <address@hidden>
  Date:   2015-09-06 (Sun, 06 Sep 2015)

  Changed paths:
    M htdocs/accountancy/class/bookkeeping.class.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/journal/sellsjournal.php

  Log Message:
  -----------
  Fix #3455 In advanced accounting module, button transfer to general ledger 
don't work


  Commit: a4a72d64c033a775d031628c500d503d0f436fe5
      
https://github.com/Dolibarr/dolibarr/commit/a4a72d64c033a775d031628c500d503d0f436fe5
  Author: aspangaro <address@hidden>
  Date:   2015-09-06 (Sun, 06 Sep 2015)

  Changed paths:
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/langs/en_US/accountancy.lang

  Log Message:
  -----------
  New: Accountancy Add message when general ledger is witten


  Commit: 6c78b930d154a22a5591c3c4b0e8319b948ce348
      
https://github.com/Dolibarr/dolibarr/commit/6c78b930d154a22a5591c3c4b0e8319b948ce348
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-06 (Sun, 06 Sep 2015)

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

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


  Commit: 7505537a3e74e294580f0395b337d65bcd81e2ae
      
https://github.com/Dolibarr/dolibarr/commit/7505537a3e74e294580f0395b337d65bcd81e2ae
  Author: Florian HENRY <address@hidden>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

  Changed paths:
    M ChangeLog
    M build/makepack-dolibarr.pl
    M htdocs/admin/dict.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/fiche.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/stats/index.php
    M htdocs/compta/index.php
    M htdocs/compta/paiement_charge.php
    M htdocs/compta/prelevement/class/rejetprelevement.class.php
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/resultat/index.php
    M htdocs/contact/exportimport.php
    M htdocs/contact/info.php
    M htdocs/contact/ldap.php
    M htdocs/contact/perso.php
    M htdocs/contact/vcard.php
    M htdocs/core/actions_extrafields.inc.php
    M htdocs/core/boxes/box_prospect.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/vcard.class.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/DolibarrModules.class.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/expedition/class/expedition.class.php
    M htdocs/filefunc.inc.php
    A htdocs/includes/tcpdf/fonts/dejavusanscondensed.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensed.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedb.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedb.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedi.z
    A htdocs/includes/tcpdf/fonts/dejavusansextralight.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansextralight.z
    A htdocs/includes/tcpdf/fonts/dejavusansmono.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmono.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonob.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonob.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonobi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonobi.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonoi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonoi.z
    M htdocs/langs/en_US/errors.lang
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php
    M htdocs/projet/class/task.class.php
    M htdocs/societe/consumption.php
    M htdocs/societe/info.php
    M htdocs/societe/soc.php

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


  Commit: e5ad14442a41dba12ed383199788b50e2c3fd6e8
      
https://github.com/Dolibarr/dolibarr/commit/e5ad14442a41dba12ed383199788b50e2c3fd6e8
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

  Changed paths:
    M htdocs/accountancy/class/bookkeeping.class.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/langs/en_US/accountancy.lang

  Log Message:
  -----------
  Merge pull request #3472 from aspangaro/3.7-5

Fix #3455 In advanced accounting module, button transfer to general ledger 
don't work


  Commit: 52cb9581ff0446e36300849ccfbd2470cf0d69fb
      
https://github.com/Dolibarr/dolibarr/commit/52cb9581ff0446e36300849ccfbd2470cf0d69fb
  Author: Florian HENRY <address@hidden>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M htdocs/product/class/html.formproduct.class.php
    M htdocs/product/stock/liste.php
    M htdocs/product/stock/product.php

  Log Message:
  -----------
  Fix multientity stock management


  Commit: 63a817c3a4d368beaff46e3bd72a456409446342
      
https://github.com/Dolibarr/dolibarr/commit/63a817c3a4d368beaff46e3bd72a456409446342
  Author: Florian HENRY <address@hidden>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M htdocs/product/stock/index.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/valo.php

  Log Message:
  -----------
  Fix wahrehouse multientty management


  Commit: 89b723b2a778e1ba4c8d910840fda2e304c92e7f
      
https://github.com/Dolibarr/dolibarr/commit/89b723b2a778e1ba4c8d910840fda2e304c92e7f
  Author: Florian HENRY <address@hidden>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M htdocs/core/modules/modStock.class.php
    M htdocs/product/class/html.formproduct.class.php
    M htdocs/product/stock/index.php
    M htdocs/product/stock/list.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/product.php
    M htdocs/product/stock/valo.php

  Log Message:
  -----------
  FIX : multientity warehouse management


  Commit: 355fcc78cf2fae81ebcc8aea7a86fadea9f803be
      
https://github.com/Dolibarr/dolibarr/commit/355fcc78cf2fae81ebcc8aea7a86fadea9f803be
  Author: Juanjo Menent <address@hidden>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M htdocs/compta/paiement/cheque/class/remisecheque.class.php

  Log Message:
  -----------
  Fix #3475 RemiseCheque: Undefined variable $date


  Commit: 1f44bb5947aae8f8d16a269b71099aba3784eb5c
      
https://github.com/Dolibarr/dolibarr/commit/1f44bb5947aae8f8d16a269b71099aba3784eb5c
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M htdocs/core/modules/modStock.class.php
    M htdocs/product/class/html.formproduct.class.php
    M htdocs/product/stock/index.php
    M htdocs/product/stock/list.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/product.php
    M htdocs/product/stock/valo.php

  Log Message:
  -----------
  Merge pull request #3495 from FHenry/3.7

FIX : multientity warehouse management


  Commit: c13d2d202b142f9aedaf42220c6b1b104edcf3fd
      
https://github.com/Dolibarr/dolibarr/commit/c13d2d202b142f9aedaf42220c6b1b104edcf3fd
  Author: Juanjo Menent <address@hidden>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/paiement/cheque/class/remisecheque.class.php

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

Conflicts:
        ChangeLog
        htdocs/filefunc.inc.php


  Commit: d3f1a7d5b8113b525e2c3e69462c88bfb0de0785
      
https://github.com/Dolibarr/dolibarr/commit/d3f1a7d5b8113b525e2c3e69462c88bfb0de0785
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

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

  Log Message:
  -----------
  FIX Bad condition into invoice export request making reporting too many
rows.


  Commit: 8c1760fbcf8495a49fab50d9a755d78350efe954
      
https://github.com/Dolibarr/dolibarr/commit/8c1760fbcf8495a49fab50d9a755d78350efe954
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M ChangeLog
    M htdocs/accountancy/class/bookkeeping.class.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/paiement/cheque/class/remisecheque.class.php
    M htdocs/core/modules/modHoliday.class.php
    M htdocs/core/modules/modStock.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/holiday/card.php
    M htdocs/langs/en_US/accountancy.lang
    M htdocs/product/class/html.formproduct.class.php
    M htdocs/product/stock/index.php
    M htdocs/product/stock/list.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/product.php
    M htdocs/product/stock/replenish.php
    M htdocs/product/stock/valo.php

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


  Commit: 70df5538148cc8032d09fe396347e74f7701af34
      
https://github.com/Dolibarr/dolibarr/commit/70df5538148cc8032d09fe396347e74f7701af34
  Author: Juanjo Menent <address@hidden>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M htdocs/product/class/html.formproduct.class.php
    M htdocs/product/stock/index.php
    M htdocs/product/stock/liste.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/product.php
    M htdocs/product/stock/valo.php

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

3.6


  Commit: a294700cef7e253e63723e83f68199e9c88571c7
      
https://github.com/Dolibarr/dolibarr/commit/a294700cef7e253e63723e83f68199e9c88571c7
  Author: fappels <address@hidden>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M htdocs/fourn/commande/dispatch.php

  Log Message:
  -----------
  fix dispatch rounding version 1


  Commit: 249883dda2d6e5af6bbc50ac42a37bf1c75a2b67
      
https://github.com/Dolibarr/dolibarr/commit/249883dda2d6e5af6bbc50ac42a37bf1c75a2b67
  Author: fappels <address@hidden>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M ChangeLog
    M build/makepack-dolibarr.pl
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/stats/index.php
    M htdocs/compta/index.php
    M htdocs/compta/prelevement/class/rejetprelevement.class.php
    M htdocs/contact/exportimport.php
    M htdocs/contact/info.php
    M htdocs/contact/ldap.php
    M htdocs/contact/perso.php
    M htdocs/contact/vcard.php
    M htdocs/core/boxes/box_prospect.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/menubase.class.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/filefunc.inc.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php
    M htdocs/societe/info.php
    M htdocs/societe/soc.php

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


  Commit: 8bdfdc0127ceabb2c1af3c4003ab9dbb08d62612
      
https://github.com/Dolibarr/dolibarr/commit/8bdfdc0127ceabb2c1af3c4003ab9dbb08d62612
  Author: fappels <address@hidden>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M htdocs/fourn/commande/dispatch.php

  Log Message:
  -----------
  Fix #3471 3.5 Rounding issue when dispatching non-integer


  Commit: 75a14e02d8e1429c5545d8785fa80792f568b153
      
https://github.com/Dolibarr/dolibarr/commit/75a14e02d8e1429c5545d8785fa80792f568b153
  Author: fappels <address@hidden>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M htdocs/fourn/commande/dispatch.php

  Log Message:
  -----------
  Fix #3471 3.7 Rounding issue when dispatching non-integer


  Commit: c290840513b9cc6bf3ab50e5beace5e3a5aaedb0
      
https://github.com/Dolibarr/dolibarr/commit/c290840513b9cc6bf3ab50e5beace5e3a5aaedb0
  Author: fappels <address@hidden>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M htdocs/product/stock/class/mouvementstock.class.php

  Log Message:
  -----------
  Revert "Fix delete not used empty stock record"

This reverts commit 1d85529eda86b03f206ea627ca917551041a6c18.


  Commit: c6081f0fa2063324f9b040742ab6181bd3be3ceb
      
https://github.com/Dolibarr/dolibarr/commit/c6081f0fa2063324f9b040742ab6181bd3be3ceb
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2015-09-11 (Fri, 11 Sep 2015)

  Changed paths:
    M htdocs/product/class/product.class.php
    M htdocs/product/stock/class/entrepot.class.php

  Log Message:
  -----------
  Fix multientity stock management (F.Henry followup)


  Commit: e1a92c8288ad41cbbf6f7f69afa53d7b0cd3ef74
      
https://github.com/Dolibarr/dolibarr/commit/e1a92c8288ad41cbbf6f7f69afa53d7b0cd3ef74
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-12 (Sat, 12 Sep 2015)

  Changed paths:
    M htdocs/product/class/product.class.php
    M htdocs/product/stock/class/entrepot.class.php

  Log Message:
  -----------
  Merge pull request #3506 from atm-maxime/3.6

Fix multientity stock management (F.Henry followup)


  Commit: a83b3ae7e8052a127e98936617f4e7573a3fa8ac
      
https://github.com/Dolibarr/dolibarr/commit/a83b3ae7e8052a127e98936617f4e7573a3fa8ac
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-12 (Sat, 12 Sep 2015)

  Changed paths:
    M htdocs/fourn/commande/dispatch.php

  Log Message:
  -----------
  Merge pull request #3503 from fappels/3.7-dispatch-rounding

Fix #3471 3.7 Rounding issue when dispatching non-integer


  Commit: a3032d56744c85b4af26ee6f90aa0c277a0d3ca6
      
https://github.com/Dolibarr/dolibarr/commit/a3032d56744c85b4af26ee6f90aa0c277a0d3ca6
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-12 (Sat, 12 Sep 2015)

  Changed paths:
    M htdocs/fourn/commande/dispatch.php

  Log Message:
  -----------
  Merge pull request #3504 from fappels/3.5-patch-Dispatch-rounding

Fix #3471 3.5 Rounding issue when dispatching non-integer


  Commit: 86b1a9cbcee8bb5f6f6acb48f54a2b39fe662f27
      
https://github.com/Dolibarr/dolibarr/commit/86b1a9cbcee8bb5f6f6acb48f54a2b39fe662f27
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-12 (Sat, 12 Sep 2015)

  Changed paths:
    M htdocs/fourn/commande/dispatch.php

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


  Commit: 0c3ebe63c282d157ae5cd1bcea054a18bd0a4510
      
https://github.com/Dolibarr/dolibarr/commit/0c3ebe63c282d157ae5cd1bcea054a18bd0a4510
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-12 (Sat, 12 Sep 2015)

  Changed paths:
    M htdocs/product/class/product.class.php
    M htdocs/product/stock/class/entrepot.class.php

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

Conflicts:
        htdocs/fourn/commande/dispatch.php
        htdocs/product/class/html.formproduct.class.php
        htdocs/product/stock/index.php
        htdocs/product/stock/liste.php
        htdocs/product/stock/mouvement.php
        htdocs/product/stock/product.php
        htdocs/product/stock/valo.php


  Commit: 370b285090cb9bfbc22b3d0134ac3cb408f43886
      
https://github.com/Dolibarr/dolibarr/commit/370b285090cb9bfbc22b3d0134ac3cb408f43886
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-12 (Sat, 12 Sep 2015)

  Changed paths:
    M ChangeLog
    M htdocs/accountancy/class/bookkeeping.class.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/impayees.php
    M htdocs/compta/index.php
    M htdocs/compta/paiement/cheque/class/remisecheque.class.php
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/salaries/index.php
    M htdocs/contact/class/contact.class.php
    M htdocs/core/ajax/box.php
    M htdocs/core/ajax/security.php
    M htdocs/core/boxes/box_prospect.php
    M htdocs/core/boxes/box_task.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/lib/geturl.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/doc/pdf_typhon.modules.php
    M htdocs/core/modules/modFacture.class.php
    M htdocs/core/modules/modHoliday.class.php
    M htdocs/core/modules/modStock.class.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/core/modules/syslog/mod_syslog_chromephp.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/commande/dispatch.php
    M htdocs/holiday/card.php
    A htdocs/includes/tcpdf/fonts/dejavusanscondensed.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensed.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedb.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedb.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedi.z
    A htdocs/includes/tcpdf/fonts/dejavusansextralight.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansextralight.z
    A htdocs/includes/tcpdf/fonts/dejavusansmono.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmono.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonob.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonob.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonobi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonobi.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonoi.ctg.z
    A htdocs/includes/tcpdf/fonts/dejavusansmonoi.z
    M htdocs/langs/en_US/accountancy.lang
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php
    M htdocs/product/class/html.formproduct.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/stock/class/entrepot.class.php
    M htdocs/product/stock/index.php
    M htdocs/product/stock/list.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/product.php
    M htdocs/product/stock/replenish.php
    M htdocs/product/stock/valo.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/b654fe569a6b...370b285090cb

reply via email to

[Prev in Thread] Current Thread [Next in Thread]