[Dolibarr-git] [Dolibarr/dolibarr] dae204: Fix: add template for view/edit notes in object ca...

[Regis Houssin]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: dae20441d07210a1cff127fe5d5c9911050c4bc9
      
https://github.com/Dolibarr/dolibarr/commit/dae20441d07210a1cff127fe5d5c9911050c4bc9
  Author: Regis Houssin <address@hidden>
  Date:   2012-03-16 (Fri, 16 Mar 2012)

  Changed paths:
    M htdocs/comm/propal.php
  M htdocs/commande/class/commande.class.php
  M htdocs/commande/fiche.php
  A htdocs/core/tpl/notes.tpl.php
  M htdocs/core/tpl/triggers.tpl.php

  Log Message:
  -----------
  Fix: add template for view/edit notes in object card and add possibility
to show/hide this bloc


  Commit: ae54a229fb7d3ce072c7dd86042f6e18eb7d37a3
      
https://github.com/Dolibarr/dolibarr/commit/ae54a229fb7d3ce072c7dd86042f6e18eb7d37a3
  Author: Regis Houssin <address@hidden>
  Date:   2012-03-16 (Fri, 16 Mar 2012)

  Changed paths:
    M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
  M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
  M htdocs/core/modules/commande/mod_commande_marbre.php
  M htdocs/core/modules/commande/mod_commande_saphir.php
  M htdocs/core/modules/contract/mod_contract_magre.php
  M htdocs/core/modules/contract/mod_contract_serpis.php
  M htdocs/install/mysql/data/llx_20_c_departements.sql
  M htdocs/install/mysql/migration/3.1.0-3.2.0.sql

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


Compare: https://github.com/Dolibarr/dolibarr/compare/6ae4292...ae54a22