[Dolibarr-git] [Dolibarr/dolibarr] d39661: NEW: Add a new method for margin calculation. Adde...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: d396612a7cfd941e91fd151f6145d536890707a8
      
https://github.com/Dolibarr/dolibarr/commit/d396612a7cfd941e91fd151f6145d536890707a8
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-13 (Wed, 13 Jan 2016)

  Changed paths:
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/fourn/ajax/getSupplierPrices.php
    M htdocs/langs/en_US/margins.lang
    M htdocs/margin/admin/margin.php
    M htdocs/product/class/product.class.php

  Log Message:
  -----------
  NEW: Add a new method for margin calculation. Added margin on "cost
price" to margin on WAP price and margin on "best supplier price".


  Commit: 9586096f16a012467e6877e506dd5367a65d6359
      
https://github.com/Dolibarr/dolibarr/commit/9586096f16a012467e6877e506dd5367a65d6359
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-13 (Wed, 13 Jan 2016)

  Changed paths:
    M dev/skeletons/modMyModule.class.php

  Log Message:
  -----------
  More code comment


  Commit: 13f10d55fc877ecde54cb817ddf9aea6a98cead0
      
https://github.com/Dolibarr/dolibarr/commit/13f10d55fc877ecde54cb817ddf9aea6a98cead0
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-13 (Wed, 13 Jan 2016)

  Changed paths:
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/supplier/list.php
    M htdocs/adherents/stats/byproperties.php
    M htdocs/adherents/stats/geo.php
    M htdocs/comm/action/index.php
    M htdocs/comm/contact.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/tva/clients.php
    M htdocs/compta/tva/quadri_detail.php
    M htdocs/core/class/commonobject.class.php
    A htdocs/core/modules/facture/doc/pdf_crevette.modules.php
    M htdocs/expedition/list.php
    M htdocs/fourn/facture/card.php
    M htdocs/install/inc.php
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/compta.lang
    M htdocs/langs/fr_FR/bills.lang
    M htdocs/loan/note.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/90833e5d0e06...13f10d55fc87