[Dolibarr-git] [Dolibarr/dolibarr] ef86f1: Fix: duplicate field

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ef86f150beddcc02db9b4a59146a79ba1e77144e
      
https://github.com/Dolibarr/dolibarr/commit/ef86f150beddcc02db9b4a59146a79ba1e77144e
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-10-08 (Tue, 08 Oct 2013)

  Changed paths:
    M htdocs/comm/propal/list.php

  Log Message:
  -----------
  Fix: duplicate field


  Commit: 3f8738ad2b516c547f93f5d5ec5d13e887a364f1
      
https://github.com/Dolibarr/dolibarr/commit/3f8738ad2b516c547f93f5d5ec5d13e887a364f1
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-10-08 (Tue, 08 Oct 2013)

  Changed paths:
    M htdocs/core/class/translate.class.php
    M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
    M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
    M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
    M htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php
    M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
    M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop


  Commit: 87ca1d2e2ec82ebda57d760ca437dea70d75af58
      
https://github.com/Dolibarr/dolibarr/commit/87ca1d2e2ec82ebda57d760ca437dea70d75af58
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-10-08 (Tue, 08 Oct 2013)

  Changed paths:
    M htdocs/langs/fr_FR/categories.lang

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/4dc1708f2613...87ca1d2e2ec8