[Dolibarr-git] [Dolibarr/dolibarr] 6905e0: Fix : bad method name for prospect status

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 6905e054712e42ca8d5c7a8cee8a7616bdd6ec05
      
https://github.com/Dolibarr/dolibarr/commit/6905e054712e42ca8d5c7a8cee8a7616bdd6ec05
  Author: jfefe <address@hidden>
  Date:   2013-02-14 (Thu, 14 Feb 2013)

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

  Log Message:
  -----------
  Fix : bad method name for prospect status


  Commit: b57cb41d11fc047c79936da279dd3d5543d951b4
      
https://github.com/Dolibarr/dolibarr/commit/b57cb41d11fc047c79936da279dd3d5543d951b4
  Author: jfefe <address@hidden>
  Date:   2013-02-14 (Thu, 14 Feb 2013)

  Changed paths:
    M htdocs/core/admin_extrafields.inc.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/tpl/admin_extrafields_add.tpl.php
    M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/errors.lang

  Log Message:
  -----------
  Add select list in extrafields type


  Commit: 21aa0b91fa838a750236d3cfcf96fbd66d24a033
      
https://github.com/Dolibarr/dolibarr/commit/21aa0b91fa838a750236d3cfcf96fbd66d24a033
  Author: jfefe <address@hidden>
  Date:   2013-02-15 (Fri, 15 Feb 2013)

  Changed paths:
    M htdocs/core/admin_extrafields.inc.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/tpl/admin_extrafields_add.tpl.php
    M htdocs/core/tpl/admin_extrafields_edit.tpl.php
    M htdocs/societe/admin/societe_extrafields.php

  Log Message:
  -----------
  Merge branch 'extrafields' into fgd

Conflicts:
        htdocs/core/admin_extrafields.inc.php
        htdocs/core/class/extrafields.class.php
        htdocs/core/tpl/admin_extrafields_add.tpl.php


  Commit: 45f2347be3ecbb1f3138af6ffc5d2bca84f8862e
      
https://github.com/Dolibarr/dolibarr/commit/45f2347be3ecbb1f3138af6ffc5d2bca84f8862e
  Author: jfefe <address@hidden>
  Date:   2013-02-15 (Fri, 15 Feb 2013)

  Changed paths:
    M ChangeLog
    M htdocs/comm/action/index.php
    M htdocs/comm/fiche.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
    M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
    M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
    M htdocs/langs/en_US/users.lang
    M htdocs/langs/fr_FR/users.lang
    M htdocs/theme/amarok/style.css.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/user/class/user.class.php
    M htdocs/user/fiche.php

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


  Commit: 9d70a8b1c5746904c7c0afb4fdeb0b5e9406dc2b
      
https://github.com/Dolibarr/dolibarr/commit/9d70a8b1c5746904c7c0afb4fdeb0b5e9406dc2b
  Author: jfefe <address@hidden>
  Date:   2013-02-15 (Fri, 15 Feb 2013)

  Changed paths:
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/societe/class/societe.class.php

  Log Message:
  -----------
  Merge branch 'extra_odt' into fgd


  Commit: b9caff8dd0b2ea6d404cd8d14ecef874115cc144
      
https://github.com/Dolibarr/dolibarr/commit/b9caff8dd0b2ea6d404cd8d14ecef874115cc144
  Author: jfefe <address@hidden>
  Date:   2013-02-16 (Sat, 16 Feb 2013)

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

  Log Message:
  -----------
  Merge branch 'extra_odt' into fgd


  Commit: 06398d907732df09a5dcc261a6468c974d020e2b
      
https://github.com/Dolibarr/dolibarr/commit/06398d907732df09a5dcc261a6468c974d020e2b
  Author: jfefe <address@hidden>
  Date:   2013-02-17 (Sun, 17 Feb 2013)

  Changed paths:
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/societe/class/societe.class.php

  Log Message:
  -----------
  Fix : bad name of property when retrieve extrafields for thirdparty


  Commit: d5f0eac9082d78c1ea7824f822b10324206a421e
      
https://github.com/Dolibarr/dolibarr/commit/d5f0eac9082d78c1ea7824f822b10324206a421e
  Author: jfefe <address@hidden>
  Date:   2013-02-17 (Sun, 17 Feb 2013)

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

  Log Message:
  -----------
  Missing object $langs when showing extrafield of type 'price'


  Commit: a5279499ef040930bd79963d0403adc82130d245
      
https://github.com/Dolibarr/dolibarr/commit/a5279499ef040930bd79963d0403adc82130d245
  Author: jfefe <address@hidden>
  Date:   2013-02-17 (Sun, 17 Feb 2013)

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

  Log Message:
  -----------
  Fix : in ODT show value and not label of company extrafield


  Commit: 8ca9d8e6014f16ccf7822c3c8ef3c137d3bfc981
      
https://github.com/Dolibarr/dolibarr/commit/8ca9d8e6014f16ccf7822c3c8ef3c137d3bfc981
  Author: jfefe <address@hidden>
  Date:   2013-02-17 (Sun, 17 Feb 2013)

  Changed paths:
    M ChangeLog
    M build/makepack-howto.txt
    M build/pad/pad_dolibarr.xml
    M build/pad/pad_doliwamp.xml
    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/adherents/class/adherent.class.php
    M htdocs/adherents/fiche.php
    M htdocs/adherents/liste.php
    M htdocs/adherents/type.php
    M htdocs/admin/mailing.php
    M htdocs/comm/action/listactions.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/prospect/list.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/dons/class/don.class.php
    M htdocs/compta/dons/fiche.php
    M htdocs/compta/facture.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contact/fiche.php
    M htdocs/core/class/CMailFile.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/modules/dons/html_cerfafr.modules.php
    M htdocs/core/modules/modAdherent.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/holiday/index.php
    M htdocs/install/mysql/data/llx_c_tva.sql
    M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
    M htdocs/install/mysql/tables/llx_adherent.sql
    M htdocs/install/mysql/tables/llx_commande.sql
    M htdocs/install/mysql/tables/llx_don.sql
    M htdocs/install/mysql/tables/llx_propal.sql
    M htdocs/langs/en_US/holiday.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/holiday.lang
    M htdocs/product/class/product.class.php
    M htdocs/user/class/user.class.php
    M htdocs/user/fiche.php

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

Conflicts:
        htdocs/comm/prospect/list.php


  Commit: 4ff08b026fbfc617260b3b7ccae9c125a83d4885
      
https://github.com/Dolibarr/dolibarr/commit/4ff08b026fbfc617260b3b7ccae9c125a83d4885
  Author: jfefe <address@hidden>
  Date:   2013-02-17 (Sun, 17 Feb 2013)

  Changed paths:
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/societe/soc.php

  Log Message:
  -----------
  Merge branch 'extrafields' into fgd

Conflicts:
        htdocs/core/class/commondocgenerator.class.php


  Commit: 9c1cb5bc2ad97854f02a3dc8e92b0e71275fe6e7
      
https://github.com/Dolibarr/dolibarr/commit/9c1cb5bc2ad97854f02a3dc8e92b0e71275fe6e7
  Author: jfefe <address@hidden>
  Date:   2013-02-18 (Mon, 18 Feb 2013)

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

  Log Message:
  -----------
  Merge branch 'extra_odt' into fgd


  Commit: 66debfe19e9ec594b98200478079726ea6b1c252
      
https://github.com/Dolibarr/dolibarr/commit/66debfe19e9ec594b98200478079726ea6b1c252
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

  Log Message:
  -----------
  Merge pull request #656 from polto/fgd

Fix : bad method name for prospect status


Compare: 
https://github.com/Dolibarr/dolibarr/compare/4a8883dc9204...66debfe19e9e