[Dolibarr-git] [Dolibarr/dolibarr] ae7f49: FIX: Deposits and credit notes weren't added in th...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ae7f49b5d81d0cd44528738e9ef129bcc600ea59
      
https://github.com/Dolibarr/dolibarr/commit/ae7f49b5d81d0cd44528738e9ef129bcc600ea59
  Author: Ferran Marcet <address@hidden>
  Date:   2016-12-21 (Wed, 21 Dec 2016)

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

  Log Message:
  -----------
  FIX: Deposits and credit notes weren't added in the received and pending 
columns


  Commit: d53a238b49fd0425a8fae52f310f0602a567b61e
      
https://github.com/Dolibarr/dolibarr/commit/d53a238b49fd0425a8fae52f310f0602a567b61e
  Author: aspangaro <address@hidden>
  Date:   2016-12-22 (Thu, 22 Dec 2016)

  Changed paths:
    M htdocs/accountancy/class/accountancyexport.class.php

  Log Message:
  -----------
  Fix: Accountancy - Problem on quadratus export


  Commit: 792da7f56d9f236a13e8675193fabb50499fd817
      
https://github.com/Dolibarr/dolibarr/commit/792da7f56d9f236a13e8675193fabb50499fd817
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-23 (Fri, 23 Dec 2016)

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

  Log Message:
  -----------
  Merge pull request #6205 from fmarcet/4.0

FIX: Deposits and credit notes weren't added in column invoices list


  Commit: 99a501fcfb75aa923bd8939b2dcb61c14cb3736c
      
https://github.com/Dolibarr/dolibarr/commit/99a501fcfb75aa923bd8939b2dcb61c14cb3736c
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-23 (Fri, 23 Dec 2016)

  Changed paths:
    M htdocs/accountancy/class/accountancyexport.class.php

  Log Message:
  -----------
  Merge pull request #6207 from aspangaro/4.0-p1

Fix: Accountancy - Problem on quadratus export


  Commit: 8ce5ed01923dd105782a1a755a847d03c81d6775
      
https://github.com/Dolibarr/dolibarr/commit/8ce5ed01923dd105782a1a755a847d03c81d6775
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-23 (Fri, 23 Dec 2016)

  Changed paths:
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.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/core/modules/supplier_proposal/doc/pdf_aurore.modules.php

  Log Message:
  -----------
  Fix position of discount on PDF with US letter format


  Commit: a9beeec0b3f519a4cffd13594b816ba32f804ab5
      
https://github.com/Dolibarr/dolibarr/commit/a9beeec0b3f519a4cffd13594b816ba32f804ab5
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-23 (Fri, 23 Dec 2016)

  Changed paths:
    M htdocs/accountancy/class/accountancyexport.class.php
    M htdocs/compta/facture/list.php

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


  Commit: b2fbef4a919e60d759bf372fb99682cb3a0f2b29
      
https://github.com/Dolibarr/dolibarr/commit/b2fbef4a919e60d759bf372fb99682cb3a0f2b29
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-25 (Sun, 25 Dec 2016)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Prepare 4.0.3


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

  Changed paths:
    M htdocs/comm/mailing/card.php
    M htdocs/conf/conf.php.example
    M htdocs/core/class/CMailFile.class.php
    M htdocs/filefunc.inc.php

  Log Message:
  -----------
  Several security fix in using mailings.


  Commit: 635157be4c3075fd8cdf902a4ac2fca3178ed34d
      
https://github.com/Dolibarr/dolibarr/commit/635157be4c3075fd8cdf902a4ac2fca3178ed34d
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-26 (Mon, 26 Dec 2016)

  Changed paths:
    M htdocs/langs/eu_ES/mails.lang

  Log Message:
  -----------
  Fix bad translation


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

  Changed paths:
    M ChangeLog
    M htdocs/accountancy/class/accountancyexport.class.php
    M htdocs/comm/mailing/card.php
    M htdocs/compta/facture/list.php
    M htdocs/conf/conf.php.example
    M htdocs/core/class/CMailFile.class.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.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/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
    M htdocs/langs/eu_ES/mails.lang

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

Conflicts:
        htdocs/compta/facture/list.php
        htdocs/filefunc.inc.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/c9c8079c3d29...bbd3734a2107