[Dolibarr-git] [Dolibarr/dolibarr] bf807c: Fix: uniformize code

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: bf807c27e54ba0419a7ca43d9f4d58e9b335f741
      
https://github.com/Dolibarr/dolibarr/commit/bf807c27e54ba0419a7ca43d9f4d58e9b335f741
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-23 (Mon, 23 Jul 2012)

  Changed paths:
    R htdocs/commissions/css/commissions.css
    R htdocs/commissions/img/commissions.png
    R htdocs/commissions/img/object_commissions.png
    M htdocs/commissions/index.php
    M htdocs/commissions/lib/commissions.lib.php
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/modules/modCommissions.class.php
    M htdocs/langs/fr_FR/commissions.lang

  Log Message:
  -----------
  Fix: uniformize code


  Commit: 3fe8b5bc58d06d57f007ce87fa48d00339713531
      
https://github.com/Dolibarr/dolibarr/commit/3fe8b5bc58d06d57f007ce87fa48d00339713531
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-23 (Mon, 23 Jul 2012)

  Changed paths:
    A htdocs/theme/amarok/img/commissions.png
    A htdocs/theme/amarok/img/object_commissions.png
    A htdocs/theme/auguria/img/commissions.png
    A htdocs/theme/auguria/img/object_commissions.png
    A htdocs/theme/bureau2crea/img/commissions.png
    A htdocs/theme/bureau2crea/img/object_commissions.png
    A htdocs/theme/cameleo/img/commissions.png
    A htdocs/theme/cameleo/img/object_commissions.png
    A htdocs/theme/eldy/img/commissions.png
    A htdocs/theme/eldy/img/object_commissions.png

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

Change-Id: Ia9f609c8a1264d245ff5074b981305f7d1792aef


  Commit: 01ab1aa66f3ad599072f0569562c4d9467bb097b
      
https://github.com/Dolibarr/dolibarr/commit/01ab1aa66f3ad599072f0569562c4d9467bb097b
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-23 (Mon, 23 Jul 2012)

  Changed paths:
    M htdocs/admin/commissions.php
    M htdocs/admin/margin.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commissions/lib/commissions.lib.php
    M htdocs/core/modules/modCommande.class.php
    M htdocs/core/modules/modCommissions.class.php
    M htdocs/core/modules/modMargin.class.php

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

Conflicts:
        htdocs/core/modules/modCommissions.class.php


  Commit: b63505ff15db4f2ebf0199949f74d5e9a52bb025
      
https://github.com/Dolibarr/dolibarr/commit/b63505ff15db4f2ebf0199949f74d5e9a52bb025
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-23 (Mon, 23 Jul 2012)

  Changed paths:
    M htdocs/core/db/pgsql.class.php

  Log Message:
  -----------
  Better fix


Compare: 
https://github.com/Dolibarr/dolibarr/compare/7a8224c4d505...b63505ff15db