[Dolibarr-git] [Dolibarr/dolibarr] bff5de: Merge remote-tracking branch 'origin/3.3' into 3.3...

[Laurent Destailleur]

  Branch: refs/heads/3.4_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: bff5de182ee97dcbb41baff772c6d2ae60640406
      
https://github.com/Dolibarr/dolibarr/commit/bff5de182ee97dcbb41baff772c6d2ae60640406
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

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

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

Conflicts:
        htdocs/compta/facture/impayees.php


  Commit: 33ff46bb9571943810e3f54c9f74d8045d95cbfa
      
https://github.com/Dolibarr/dolibarr/commit/33ff46bb9571943810e3f54c9f74d8045d95cbfa
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    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/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

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


  Commit: 52fab2575c470d09ff6a2426534c094ebdd28417
      
https://github.com/Dolibarr/dolibarr/commit/52fab2575c470d09ff6a2426534c094ebdd28417
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  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/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:
  -----------
  Prepare for option MAIN_GENERATE_PROPOSALS_WITH_PICTURE


  Commit: 64847ce5977bab745ac11d91fec4ba5acad0fa75
      
https://github.com/Dolibarr/dolibarr/commit/64847ce5977bab745ac11d91fec4ba5acad0fa75
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

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

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


  Commit: 80bcf8bbbe6ff326eaaf85cfea623a0e3385354b
      
https://github.com/Dolibarr/dolibarr/commit/80bcf8bbbe6ff326eaaf85cfea623a0e3385354b
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-27 (Sat, 27 Jul 2013)

  Changed paths:
    M ChangeLog
    M build/debian/changelog
    M build/exe/doliwamp/doliwamp.iss
    M build/makepack-dolibarr.pl
    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/compta/payment_sc/fiche.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/filefunc.inc.php

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


  Commit: f85516ad045539633986a550c794422c575ba912
      
https://github.com/Dolibarr/dolibarr/commit/f85516ad045539633986a550c794422c575ba912
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-27 (Sat, 27 Jul 2013)

  Changed paths:
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php

  Log Message:
  -----------
  New: Can show images of product onto proposals.

Conflicts:
        htdocs/core/modules/propale/doc/pdf_azur.modules.php


  Commit: 285758b8aee4e9083ddf2aa1d1e9e322b4e87ae6
      
https://github.com/Dolibarr/dolibarr/commit/285758b8aee4e9083ddf2aa1d1e9e322b4e87ae6
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-27 (Sat, 27 Jul 2013)

  Changed paths:
    M ChangeLog

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/9dc40cad40c4...285758b8aee4