[Dolibarr-git] [Dolibarr/dolibarr] 4acb9f: Merge branch 'upstream/3.4'

[Laurent Destailleur]

  Branch: refs/heads/3.4
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 4acb9f8cba733943cfa4a7a437d0265f44cda26c
      
https://github.com/Dolibarr/dolibarr/commit/4acb9f8cba733943cfa4a7a437d0265f44cda26c
  Author: aspangaro <address@hidden>
  Date:   2013-11-14 (Thu, 14 Nov 2013)

  Changed paths:
    M ChangeLog
    M htdocs/adherents/admin/adherent.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/document.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/document.php
    M htdocs/compta/bank/account.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/list.php
    M htdocs/cron/card.php
    M htdocs/cron/list.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/document.php
    M htdocs/langs/en_US/dict.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/cron.lang
    M htdocs/langs/fr_FR/dict.lang
    M htdocs/langs/fr_FR/projects.lang
    M htdocs/product/fiche.php
    M htdocs/societe/class/societe.class.php

  Log Message:
  -----------
  Merge branch 'upstream/3.4'


  Commit: e8c7bb9c6202abaec0c1d9e4b62550c705f48d5a
      
https://github.com/Dolibarr/dolibarr/commit/e8c7bb9c6202abaec0c1d9e4b62550c705f48d5a
  Author: aspangaro <address@hidden>
  Date:   2013-11-14 (Thu, 14 Nov 2013)

  Changed paths:
    M htdocs/compta/prelevement/bons.php
    M htdocs/compta/prelevement/factures.php
    M htdocs/compta/prelevement/fiche-rejet.php
    M htdocs/compta/prelevement/fiche-stat.php
    M htdocs/compta/prelevement/fiche.php
    M htdocs/compta/prelevement/ligne.php
    M htdocs/compta/prelevement/lignes.php
    M htdocs/compta/prelevement/liste.php

  Log Message:
  -----------
  Fix for language


  Commit: 8050f8e9fe3619430511a65c07400260aaa04bd0
      
https://github.com/Dolibarr/dolibarr/commit/8050f8e9fe3619430511a65c07400260aaa04bd0
  Author: aspangaro <address@hidden>
  Date:   2013-11-14 (Thu, 14 Nov 2013)

  Changed paths:
    M htdocs/societe/rib.php

  Log Message:
  -----------
  Fix problem field


  Commit: 200553c001264dc51e9fc214c7ce4f65ca65fa06
      
https://github.com/Dolibarr/dolibarr/commit/200553c001264dc51e9fc214c7ce4f65ca65fa06
  Author: aspangaro <address@hidden>
  Date:   2013-11-14 (Thu, 14 Nov 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Update ChangeLog


  Commit: 4099038083196bf4103959087066f34403b876b2
      
https://github.com/Dolibarr/dolibarr/commit/4099038083196bf4103959087066f34403b876b2
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-11-15 (Fri, 15 Nov 2013)

  Changed paths:
    M ChangeLog
    M htdocs/compta/prelevement/bons.php
    M htdocs/compta/prelevement/factures.php
    M htdocs/compta/prelevement/fiche-rejet.php
    M htdocs/compta/prelevement/fiche-stat.php
    M htdocs/compta/prelevement/fiche.php
    M htdocs/compta/prelevement/ligne.php
    M htdocs/compta/prelevement/lignes.php
    M htdocs/compta/prelevement/liste.php
    M htdocs/societe/rib.php

  Log Message:
  -----------
  Merge pull request #1301 from aspangaro/3.4

Fix 3.4


Compare: 
https://github.com/Dolibarr/dolibarr/compare/0dfbfbc19a8a...409903808319