[Dolibarr-git] [Dolibarr/dolibarr] dc790f: NEW: Feature request: A page to merge two thirdpar...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: dc790ff5866fa8099f7207f241e0a0c410a06937
      
https://github.com/Dolibarr/dolibarr/commit/dc790ff5866fa8099f7207f241e0a0c410a06937
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/adherents/class/adherent.class.php
    M htdocs/admin/prelevement.php
    M htdocs/bookmarks/class/bookmark.class.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/list.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/facture/class/facture-rec.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/prelevement/class/ligneprelevement.class.php
    M htdocs/compta/salaries/index.php
    M htdocs/compta/stats/casoc.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/modules/mailings/contacts3.modules.php
    M htdocs/core/modules/mailings/contacts4.modules.php
    M htdocs/core/modules/mailings/thirdparties.modules.php
    M htdocs/core/modules/modCategorie.class.php
    M htdocs/core/modules/modUser.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/fourn/list.php
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/install/mysql/tables/llx_categorie_fournisseur.key.sql
    M htdocs/install/mysql/tables/llx_categorie_fournisseur.sql
    M htdocs/install/mysql/tables/llx_categorie_societe.key.sql
    M htdocs/install/mysql/tables/llx_categorie_societe.sql
    M htdocs/install/mysql/tables/llx_societe_remise_except.key.sql
    M htdocs/install/mysql/tables/llx_user.key.sql
    M htdocs/install/mysql/tables/llx_user.sql
    M htdocs/langs/en_US/companies.lang
    M htdocs/livraison/class/livraison.class.php
    M htdocs/product/class/product.class.php
    M htdocs/projet/class/project.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/soc.php
    M htdocs/societe/societe.php
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php
    M htdocs/user/home.php
    M htdocs/user/index.php
    M htdocs/webservices/server_thirdparty.php

  Log Message:
  -----------
  NEW: Feature request: A page to merge two thirdparties into one #2613


  Commit: 9dd73de9b0f590a417feca348e9968a7d3addd19
      
https://github.com/Dolibarr/dolibarr/commit/9dd73de9b0f590a417feca348e9968a7d3addd19
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/adherents/class/adherent.class.php
    M htdocs/admin/prelevement.php
    M htdocs/bookmarks/class/bookmark.class.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/list.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/facture/class/facture-rec.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/prelevement/class/ligneprelevement.class.php
    M htdocs/compta/salaries/index.php
    M htdocs/compta/stats/casoc.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/modules/mailings/contacts3.modules.php
    M htdocs/core/modules/mailings/contacts4.modules.php
    M htdocs/core/modules/mailings/thirdparties.modules.php
    M htdocs/core/modules/modCategorie.class.php
    M htdocs/core/modules/modUser.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/fourn/list.php
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/install/mysql/tables/llx_categorie_fournisseur.key.sql
    M htdocs/install/mysql/tables/llx_categorie_fournisseur.sql
    M htdocs/install/mysql/tables/llx_categorie_societe.key.sql
    M htdocs/install/mysql/tables/llx_categorie_societe.sql
    M htdocs/install/mysql/tables/llx_societe_remise_except.key.sql
    M htdocs/install/mysql/tables/llx_user.key.sql
    M htdocs/install/mysql/tables/llx_user.sql
    M htdocs/langs/en_US/companies.lang
    M htdocs/livraison/class/livraison.class.php
    M htdocs/product/class/product.class.php
    M htdocs/projet/class/project.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/soc.php
    M htdocs/societe/societe.php
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php
    M htdocs/user/home.php
    M htdocs/user/index.php
    M htdocs/webservices/server_thirdparty.php

  Log Message:
  -----------
  Merge branch 'fr-2613' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-fr-2613

Conflicts:
        htdocs/install/mysql/migration/3.7.0-3.8.0.sql


  Commit: d22a403416b1e31f949439e532c960337031c5d1
      
https://github.com/Dolibarr/dolibarr/commit/d22a403416b1e31f949439e532c960337031c5d1
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/adherents/class/adherent.class.php
    M htdocs/admin/prelevement.php
    M htdocs/bookmarks/class/bookmark.class.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/list.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/facture/class/facture-rec.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/prelevement/class/ligneprelevement.class.php
    M htdocs/compta/salaries/index.php
    M htdocs/compta/stats/casoc.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/modules/mailings/contacts3.modules.php
    M htdocs/core/modules/mailings/contacts4.modules.php
    M htdocs/core/modules/mailings/thirdparties.modules.php
    M htdocs/core/modules/modCategorie.class.php
    M htdocs/core/modules/modUser.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/fourn/list.php
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/install/mysql/tables/llx_categorie_fournisseur.key.sql
    M htdocs/install/mysql/tables/llx_categorie_fournisseur.sql
    M htdocs/install/mysql/tables/llx_categorie_societe.key.sql
    M htdocs/install/mysql/tables/llx_categorie_societe.sql
    M htdocs/install/mysql/tables/llx_societe_remise_except.key.sql
    M htdocs/install/mysql/tables/llx_user.key.sql
    M htdocs/install/mysql/tables/llx_user.sql
    M htdocs/langs/en_US/companies.lang
    M htdocs/livraison/class/livraison.class.php
    M htdocs/product/class/product.class.php
    M htdocs/projet/class/project.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/soc.php
    M htdocs/societe/societe.php
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php
    M htdocs/user/home.php
    M htdocs/user/index.php
    M htdocs/webservices/server_thirdparty.php

  Log Message:
  -----------
  git push origin developMerge branch 'marcosgdf-fr-2613' into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/1598a5d3a6a2...d22a403416b1