[Dolibarr-git] [Dolibarr/dolibarr] adab15: Add conditional substitution IF/ELSEIF/ENDIF for O...

[Regis Houssin]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: adab15a30ac59f2448373ca1a61191bce51794cc
      
https://github.com/Dolibarr/dolibarr/commit/adab15a30ac59f2448373ca1a61191bce51794cc
  Author: Stephen L <address@hidden>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M htdocs/includes/odtphp/odf.php

  Log Message:
  -----------
  Add conditional substitution IF/ELSEIF/ENDIF for ODT

Signed-off-by: Stephen L. <address@hidden>


  Commit: c1d15a9572f35b9e05068af1ae3332fd8e7afc1a
      
https://github.com/Dolibarr/dolibarr/commit/c1d15a9572f35b9e05068af1ae3332fd8e7afc1a
  Author: Stephen L <address@hidden>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M htdocs/comm/action/fiche.php
    M htdocs/compta/deplacement/class/deplacement.class.php
    M htdocs/compta/deplacement/fiche.php
    M htdocs/compta/dons/class/don.class.php
    M htdocs/compta/dons/fiche.php
    M htdocs/compta/tva/class/tva.class.php
    M htdocs/compta/tva/fiche.php
    M htdocs/contact/fiche.php
    M htdocs/contrat/fiche.php
    M htdocs/core/tpl/freeproductline_edit.tpl.php
    M htdocs/core/tpl/predefinedproductline_edit.tpl.php
    M htdocs/expedition/fiche.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fichinter/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/projet/fiche.php
    M htdocs/projet/tasks.php
    M htdocs/projet/tasks/task.php

  Log Message:
  -----------
  Add: hooks and triggers for a lot of core modules (action/calendrier, 
deplacement, dons, tva, contact/tiers, contrat, product lines, expedition, 
fournisseur commandes et factures, fiche intervention, projet et taches)

Signed-off-by: Stephen L. <address@hidden>


  Commit: c0a314000c3a6d6a27552320ecc7ef14edaa1d62
      
https://github.com/Dolibarr/dolibarr/commit/c0a314000c3a6d6a27552320ecc7ef14edaa1d62
  Author: Stephen L <address@hidden>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M htdocs/core/lib/functions.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

  Log Message:
  -----------
  Add custom ODT substitution for lines of products 
(completesubstitutionarray_lines)

Signed-off-by: Stephen L. <address@hidden>


  Commit: ed990c00f5c1f74355caa789668bb487889d4fae
      
https://github.com/Dolibarr/dolibarr/commit/ed990c00f5c1f74355caa789668bb487889d4fae
  Author: Stephen L <address@hidden>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M htdocs/includes/odtphp/odf.php

  Log Message:
  -----------
  Revert "Add conditional substitution IF/ELSEIF/ENDIF for ODT"

This reverts commit adab15a30ac59f2448373ca1a61191bce51794cc.

Revert to cleanup (the conditional substitution is in another pull request)


  Commit: b3d09478ca9d831cde5e15f272c65e0a2d6d2cf1
      
https://github.com/Dolibarr/dolibarr/commit/b3d09478ca9d831cde5e15f272c65e0a2d6d2cf1
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M htdocs/comm/action/fiche.php
    M htdocs/compta/deplacement/class/deplacement.class.php
    M htdocs/compta/deplacement/fiche.php
    M htdocs/compta/dons/class/don.class.php
    M htdocs/compta/dons/fiche.php
    M htdocs/compta/tva/class/tva.class.php
    M htdocs/compta/tva/fiche.php
    M htdocs/contact/fiche.php
    M htdocs/contrat/fiche.php
    M htdocs/core/lib/functions.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/core/tpl/freeproductline_edit.tpl.php
    M htdocs/core/tpl/predefinedproductline_edit.tpl.php
    M htdocs/expedition/fiche.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fichinter/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/projet/fiche.php
    M htdocs/projet/tasks.php
    M htdocs/projet/tasks/task.php

  Log Message:
  -----------
  Merge pull request #313 from lrq3000/develophooks

A lot of hooks and triggers implemented + custom substitution function for 
lines in ODT


Compare: 
https://github.com/Dolibarr/dolibarr/compare/0ff6e4ec54ff...b3d09478ca9d