[Dolibarr-git] [Dolibarr/dolibarr] 1485ea: Fix: MARGIN_TYPE == 2 is "using PMP price" so i re...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 1485ead215145c5afda1edce4f88ac16e928c6ba
      
https://github.com/Dolibarr/dolibarr/commit/1485ead215145c5afda1edce4f88ac16e928c6ba
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-24 (Wed, 24 Jun 2015)

  Changed paths:
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/margin/admin/margin.php

  Log Message:
  -----------
  Fix: MARGIN_TYPE == 2 is "using PMP price" so i remove a duplicate
option to get same behaviour.


  Commit: 2bc6d6dd4cc33e9f0025a53918404f90e2cde0b4
      
https://github.com/Dolibarr/dolibarr/commit/2bc6d6dd4cc33e9f0025a53918404f90e2cde0b4
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-26 (Fri, 26 Jun 2015)

  Changed paths:
    M COPYRIGHT
    M htdocs/accountancy/admin/index.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/admin/compta.php
    M htdocs/compta/journal/sellsjournal.php
    M htdocs/core/class/hookmanager.class.php
    M htdocs/includes/jquery/plugins/blockUI/jquery.blockUI.js
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/langs/en_US/compta.lang

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/967e7ea4574a...2bc6d6dd4cc3