[Dolibarr-git] [Dolibarr/dolibarr] c7d31f: [ task #1204 ] Add ref_int contract field

[Juanjo Menent]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: c7d31f45703a14e2f773ad9d42e1aa04df9cf4ab
      
https://github.com/Dolibarr/dolibarr/commit/c7d31f45703a14e2f773ad9d42e1aa04df9cf4ab
  Author: Florian HENRY <address@hidden>
  Date:   2014-07-11 (Fri, 11 Jul 2014)

  Changed paths:
    M ChangeLog
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/fiche.php
    M htdocs/contrat/liste.php
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/tables/llx_contrat.sql

  Log Message:
  -----------
  [ task #1204 ] Add ref_int contract field


  Commit: 14e3aa8a02095a28cc91dcefcd9dae23b64424a4
      
https://github.com/Dolibarr/dolibarr/commit/14e3aa8a02095a28cc91dcefcd9dae23b64424a4
  Author: Florian HENRY <address@hidden>
  Date:   2014-07-11 (Fri, 11 Jul 2014)

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

  Log Message:
  -----------
  Allow trigger call on update line (class ContratLine must extends
CommonObject to have method call_trigger)


  Commit: d2e17eb32117631a835a87f4ffe1cef783b900f1
      
https://github.com/Dolibarr/dolibarr/commit/d2e17eb32117631a835a87f4ffe1cef783b900f1
  Author: Florian HENRY <address@hidden>
  Date:   2014-07-11 (Fri, 11 Jul 2014)

  Changed paths:
    M ChangeLog
    M htdocs/adherents/index.php
    M htdocs/admin/dict.php
    M htdocs/comm/action/index.php
    A htdocs/comm/action/peruser.php
    M htdocs/comm/index.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/fiche.php
    M htdocs/compta/bank/treso.php
    M htdocs/compta/deplacement/class/deplacement.class.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/hrm.php
    M htdocs/compta/index.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contact/fiche.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/fiche.php
    M htdocs/contrat/liste.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/ctypent.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formcompany.class.php
    M htdocs/core/lib/date.lib.php
    M htdocs/core/tpl/login.tpl.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
    M htdocs/ecm/class/ecmdirectory.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/fiche.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/holiday/class/holiday.class.php
    M htdocs/holiday/fiche.php
    M htdocs/install/check.php
    M htdocs/install/mysql/data/llx_c_typent.sql
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/tables/llx_c_typent.sql
    M htdocs/install/mysql/tables/llx_commande_fournisseur.sql
    M htdocs/install/mysql/tables/llx_contrat.sql
    M htdocs/install/mysql/tables/llx_facture_fourn.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/livraison/class/livraison.class.php
    M htdocs/main.inc.php
    M htdocs/product/class/product.class.php
    M htdocs/product/index.php
    M htdocs/product/stock/product.php
    M htdocs/societe/index.php

  Log Message:
  -----------
  Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into
develop

Conflicts:
        ChangeLog


  Commit: 33f293ae195e482e148eec67b67b8bde6443926c
      
https://github.com/Dolibarr/dolibarr/commit/33f293ae195e482e148eec67b67b8bde6443926c
  Author: Florian HENRY <address@hidden>
  Date:   2014-07-11 (Fri, 11 Jul 2014)

  Changed paths:
    M htdocs/contrat/fiche.php
    M htdocs/contrat/liste.php

  Log Message:
  -----------
  Use good translation


  Commit: d0cc935cd5136934439c86beaa6ed54bb7740fff
      
https://github.com/Dolibarr/dolibarr/commit/d0cc935cd5136934439c86beaa6ed54bb7740fff
  Author: Florian HENRY <address@hidden>
  Date:   2014-07-12 (Sat, 12 Jul 2014)

  Changed paths:
    M ChangeLog
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/localtax/class/localtax.class.php
    M htdocs/compta/salaries/class/paymentsalary.class.php
    M htdocs/compta/tva/class/tva.class.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/boxes/box_actions.php
    M htdocs/core/class/link.class.php
    M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
    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/class/paiementfourn.class.php
    M htdocs/fourn/commande/dispatch.php
    M htdocs/imports/class/import.class.php
    M htdocs/install/mysql/data/llx_c_typent.sql
    M htdocs/opensurvey/class/opensurveysondage.class.php
    M htdocs/product/stock/class/mouvementstock.class.php
    M htdocs/resource/class/resource.class.php
    M htdocs/societe/class/societe.class.php

  Log Message:
  -----------
  Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop


  Commit: 494e5b20a5bd5c8ad2068c500049260580c9a921
      
https://github.com/Dolibarr/dolibarr/commit/494e5b20a5bd5c8ad2068c500049260580c9a921
  Author: Florian HENRY <address@hidden>
  Date:   2014-07-12 (Sat, 12 Jul 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  chnagelog


  Commit: 630bf8f8e06b1b9288c0c9d51448c9c7f0bbc61c
      
https://github.com/Dolibarr/dolibarr/commit/630bf8f8e06b1b9288c0c9d51448c9c7f0bbc61c
  Author: Juanjo Menent <address@hidden>
  Date:   2014-07-12 (Sat, 12 Jul 2014)

  Changed paths:
    M ChangeLog
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/fiche.php
    M htdocs/contrat/liste.php
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/tables/llx_contrat.sql

  Log Message:
  -----------
  Merge pull request #1731 from FHenry/develop

[ task #1204 ] Add ref_ext contract field


Compare: 
https://github.com/Dolibarr/dolibarr/compare/893240ce2132...630bf8f8e06b