[Dolibarr-git] [Dolibarr/dolibarr] 2416aa: Merge branch 'develop' of https://github.com/Dolib...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 2416aa29e12da06037480e84de0c8b6bf6ec9b63
      
https://github.com/Dolibarr/dolibarr/commit/2416aa29e12da06037480e84de0c8b6bf6ec9b63
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-02-26 (Tue, 26 Feb 2013)

  Changed paths:
    M doc/images/dolibarr_screenshot5.png
    M htdocs/install/mysql/migration/3.2.0-3.3.0.sql
    M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
    M htdocs/install/mysql/migration/repair.sql
    M htdocs/user/param_ihm.php

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


  Commit: 90d868934bfd286b591b56f5796df1ca26810a88
      
https://github.com/Dolibarr/dolibarr/commit/90d868934bfd286b591b56f5796df1ca26810a88
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-03-01 (Fri, 01 Mar 2013)

  Changed paths:
    M ChangeLog
    M build/debian/changelog
    M build/launchpad/README
    M htdocs/adherents/canvas/actions_adherentcard_common.class.php
    M htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
    M htdocs/adherents/cartes/carte.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/fiche.php
    M htdocs/adherents/stats/geo.php
    M htdocs/admin/company.php
    M htdocs/admin/const.php
    M htdocs/admin/dict.php
    M htdocs/admin/index.php
    M htdocs/admin/mails.php
    M htdocs/categories/categorie.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/fiche.php
    M htdocs/comm/address.php
    M htdocs/comm/mailing/class/mailing.class.php
    M htdocs/comm/prospect/list.php
    M htdocs/compta/bank/bankid_fr.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/fiche.php
    M htdocs/compta/dons/class/don.class.php
    M htdocs/compta/dons/fiche.php
    M htdocs/compta/journal/purchasesjournal.php
    M htdocs/compta/journal/sellsjournal.php
    M htdocs/contact/canvas/actions_contactcard_common.class.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contact/fiche.php
    M htdocs/contact/vcard.php
    M htdocs/core/boxes/box_contacts.php
    M htdocs/core/class/doleditor.class.php
    M htdocs/core/class/html.formcompany.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/menus/standard/auguria.lib.php
    M htdocs/core/menus/standard/auguria_menu.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/menus/standard/eldy_menu.php
    M htdocs/core/menus/standard/empty.php
    M htdocs/core/modules/export/export_csv.modules.php
    M htdocs/core/modules/export/export_excel.modules.php
    M htdocs/core/modules/export/export_excel2007.modules.php
    M htdocs/core/modules/export/export_tsv.modules.php
    M htdocs/core/modules/modAdherent.class.php
    M htdocs/core/modules/syslog/mod_syslog_file.php
    M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
    M htdocs/langs/en_US/paypal.lang
    M htdocs/langs/fr_FR/paypal.lang
    M htdocs/product/stock/class/entrepot.class.php
    M htdocs/product/stock/fiche-valo.php
    M htdocs/projet/tasks/index.php
    M htdocs/public/members/public_card.php
    M htdocs/public/paybox/paymentko.php
    M htdocs/public/paybox/paymentok.php
    M htdocs/public/paypal/paymentko.php
    M htdocs/public/paypal/paymentok.php
    M htdocs/societe/agenda.php
    M htdocs/societe/ajaxcountries.php
    M htdocs/societe/canvas/company/actions_card_company.class.php
    M htdocs/societe/class/address.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/commerciaux.php
    M htdocs/societe/soc.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/webservices/server_contact.php
    M scripts/members/sync_members_ldap2dolibarr.php
    M test/phpunit/AdherentTest.php

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


  Commit: 06f6850b5f210f2595e6036dab023c9e7921c915
      
https://github.com/Dolibarr/dolibarr/commit/06f6850b5f210f2595e6036dab023c9e7921c915
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-03-01 (Fri, 01 Mar 2013)

  Changed paths:
    M doc/images/README
    M htdocs/langs/nl_BE/main.lang
    M htdocs/langs/nl_BE/trips.lang
    M htdocs/langs/pt_PT/agenda.lang
    M htdocs/langs/pt_PT/banks.lang
    M htdocs/langs/pt_PT/bills.lang
    M htdocs/langs/pt_PT/bookmarks.lang
    M htdocs/langs/pt_PT/boxes.lang
    M htdocs/langs/pt_PT/categories.lang
    M htdocs/langs/pt_PT/commercial.lang
    M htdocs/langs/pt_PT/companies.lang
    M htdocs/langs/pt_PT/compta.lang
    M htdocs/langs/pt_PT/contracts.lang
    M htdocs/langs/pt_PT/deliveries.lang
    M htdocs/langs/pt_PT/donations.lang
    M htdocs/langs/pt_PT/ecm.lang
    M htdocs/langs/pt_PT/errors.lang
    M htdocs/langs/pt_PT/exports.lang
    M htdocs/langs/pt_PT/interventions.lang
    M htdocs/langs/pt_PT/mails.lang
    M htdocs/langs/pt_PT/main.lang
    M htdocs/langs/pt_PT/members.lang
    M htdocs/langs/pt_PT/orders.lang
    M htdocs/langs/pt_PT/other.lang
    M htdocs/langs/pt_PT/products.lang
    M htdocs/langs/pt_PT/projects.lang
    M htdocs/langs/pt_PT/propal.lang
    M htdocs/langs/pt_PT/sendings.lang
    M htdocs/langs/pt_PT/suppliers.lang
    M htdocs/langs/pt_PT/users.lang
    M htdocs/langs/pt_PT/withdrawals.lang
    M htdocs/langs/tr_TR/agenda.lang
    M htdocs/langs/tr_TR/banks.lang
    M htdocs/langs/tr_TR/bills.lang
    M htdocs/langs/tr_TR/bookmarks.lang
    M htdocs/langs/tr_TR/boxes.lang
    M htdocs/langs/tr_TR/cashdesk.lang
    M htdocs/langs/tr_TR/categories.lang
    M htdocs/langs/tr_TR/commercial.lang
    M htdocs/langs/tr_TR/companies.lang
    M htdocs/langs/tr_TR/compta.lang
    M htdocs/langs/tr_TR/contracts.lang
    M htdocs/langs/tr_TR/deliveries.lang
    M htdocs/langs/tr_TR/dict.lang
    M htdocs/langs/tr_TR/donations.lang
    M htdocs/langs/tr_TR/ecm.lang
    M htdocs/langs/tr_TR/errors.lang
    M htdocs/langs/tr_TR/exports.lang
    M htdocs/langs/tr_TR/externalsite.lang
    M htdocs/langs/tr_TR/ftp.lang
    M htdocs/langs/tr_TR/help.lang
    M htdocs/langs/tr_TR/install.lang
    M htdocs/langs/tr_TR/interventions.lang
    M htdocs/langs/tr_TR/languages.lang
    M htdocs/langs/tr_TR/ldap.lang
    M htdocs/langs/tr_TR/mails.lang
    M htdocs/langs/tr_TR/members.lang
    M htdocs/langs/tr_TR/orders.lang
    M htdocs/langs/tr_TR/oscommerce.lang
    M htdocs/langs/tr_TR/paybox.lang
    M htdocs/langs/tr_TR/paypal.lang
    M htdocs/langs/tr_TR/projects.lang
    M htdocs/langs/tr_TR/propal.lang
    M htdocs/langs/tr_TR/sendings.lang
    M htdocs/langs/tr_TR/shop.lang
    M htdocs/langs/tr_TR/sms.lang
    M htdocs/langs/tr_TR/suppliers.lang
    M htdocs/langs/tr_TR/trips.lang
    M htdocs/langs/tr_TR/users.lang
    M htdocs/langs/tr_TR/withdrawals.lang
    M htdocs/langs/tr_TR/workflow.lang
    M htdocs/theme/amarok/ckeditor/config.js

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


  Commit: 881b3bc9361f825de0328fa044b1ec76af54beac
      
https://github.com/Dolibarr/dolibarr/commit/881b3bc9361f825de0328fa044b1ec76af54beac
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-03-01 (Fri, 01 Mar 2013)

  Changed paths:
    M htdocs/contact/list.php

  Log Message:
  -----------
  Bug fix on contact list due to name column renamed


  Commit: 803bee076c638e42a8d27883d526836f51bb0159
      
https://github.com/Dolibarr/dolibarr/commit/803bee076c638e42a8d27883d526836f51bb0159
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-03-01 (Fri, 01 Mar 2013)

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

  Log Message:
  -----------
  Engish standardization correction + search by idprof1 possible


  Commit: da878282007e8b5cefe4240c0879e5bc6a2a42d3
      
https://github.com/Dolibarr/dolibarr/commit/da878282007e8b5cefe4240c0879e5bc6a2a42d3
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-03-01 (Fri, 01 Mar 2013)

  Changed paths:
    M htdocs/contact/fiche.php

  Log Message:
  -----------
  Fix bug # 740 : address copy


  Commit: 6b3b2ea1c7263444d31f00b9d11433ee705267ea
      
https://github.com/Dolibarr/dolibarr/commit/6b3b2ea1c7263444d31f00b9d11433ee705267ea
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-02 (Sat, 02 Mar 2013)

  Changed paths:
    M htdocs/contact/fiche.php
    M htdocs/contact/list.php
    M htdocs/societe/soc.php
    M htdocs/societe/societe.php

  Log Message:
  -----------
  Merge pull request #706 from atm-maxime/develop

Bug on contact list


Compare: 
https://github.com/Dolibarr/dolibarr/compare/4a5f2e62e714...6b3b2ea1c726