[Dolibarr-git] [Dolibarr/dolibarr] 14470f: Merge remote-tracking branch 'refs/remotes/Dolibar...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 14470feabd67b7a6893c1ff049647586cfe138b2
      
https://github.com/Dolibarr/dolibarr/commit/14470feabd67b7a6893c1ff049647586cfe138b2
  Author: fappels <address@hidden>
  Date:   2015-10-26 (Mon, 26 Oct 2015)

  Changed paths:
    M .travis.yml
    M ChangeLog
    M README-FR.md
    M README.md
    M build/makepack-howto.txt
    M dev/skeletons/skeleton_class.class.php
    M htdocs/accountancy/admin/account.php
    M htdocs/accountancy/admin/card.php
    M htdocs/accountancy/admin/export.php
    M htdocs/accountancy/admin/fiscalyear_card.php
    M htdocs/accountancy/admin/importaccounts.php
    M htdocs/accountancy/admin/index.php
    M htdocs/accountancy/admin/journal.php
    M htdocs/accountancy/admin/productaccount.php
    M htdocs/accountancy/bookkeeping/card.php
    M htdocs/adherents/admin/public.php
    M htdocs/adherents/agenda.php
    M htdocs/adherents/card.php
    M htdocs/adherents/card_subscriptions.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/document.php
    M htdocs/adherents/fiche_subscription.php
    M htdocs/adherents/index.php
    M htdocs/adherents/info.php
    M htdocs/adherents/ldap.php
    M htdocs/adherents/list.php
    M htdocs/adherents/note.php
    M htdocs/adherents/type.php
    M htdocs/admin/commande.php
    M htdocs/admin/const.php
    M htdocs/admin/dict.php
    M htdocs/admin/mails.php
    M htdocs/admin/menus/edit.php
    M htdocs/admin/modules.php
    M htdocs/admin/sms.php
    M htdocs/admin/system/about.php
    A htdocs/api/admin/index.html
    A htdocs/api/class/index.html
    M htdocs/barcode/printsheet.php
    M htdocs/categories/card.php
    M htdocs/categories/edit.php
    M htdocs/comm/action/card.php
    M htdocs/comm/askpricesupplier/card.php
    M htdocs/comm/askpricesupplier/class/askpricesupplier.class.php
    M htdocs/comm/index.php
    M htdocs/comm/mailing/card.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/apercu.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/list.php
    M htdocs/comm/remx.php
    M htdocs/commande/apercu.php
    M htdocs/commande/card.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/list.php
    M htdocs/compta/bank/account.php
    M htdocs/compta/bank/document.php
    M htdocs/compta/bank/ligne.php
    M htdocs/compta/bank/virement.php
    M htdocs/compta/deplacement/card.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/admin/facture_cust_extrafields.php
    M htdocs/compta/facture/admin/facturedet_cust_extrafields.php
    M htdocs/compta/facture/apercu.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/hrm.php
    M htdocs/compta/index.php
    M htdocs/compta/prelevement/ligne.php
    M htdocs/compta/salaries/card.php
    M htdocs/compta/sociales/charges.php
    M htdocs/compta/tva/card.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contact/document.php
    M htdocs/contact/list.php
    M htdocs/contrat/card.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/list.php
    M htdocs/core/ajax/selectsearchbox.php
    M htdocs/core/boxes/box_project.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/class/translate.class.php
    M htdocs/core/lib/admin.lib.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/lib/security.lib.php
    M htdocs/core/lib/usergroups.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    A htdocs/core/search.php
    M htdocs/core/search_page.php
    M htdocs/core/tpl/admin_extrafields_add.tpl.php
    M htdocs/core/tpl/admin_extrafields_edit.tpl.php
    M htdocs/core/tpl/document_actions_post_headers.tpl.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/don/card.php
    M htdocs/don/list.php
    M htdocs/ecm/docdir.php
    M htdocs/ecm/index.php
    M htdocs/ecm/index_auto.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/class/expeditionbatch.class.php
    M htdocs/expedition/shipment.php
    M htdocs/expensereport/card.php
    M htdocs/expensereport/list.php
    M htdocs/expensereport/stats/index.php
    M htdocs/expensereport/synchro_compta.php
    M htdocs/exports/export.php
    M htdocs/fichinter/apercu.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fichinter/list.php
    M htdocs/fourn/ajax/getSupplierPrices.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/commande/list.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/list.php
    R htdocs/fourn/list.php
    M htdocs/ftp/admin/ftpclient.php
    M htdocs/holiday/card.php
    M htdocs/holiday/list.php
    M htdocs/imports/import.php
    M htdocs/index.php
    A htdocs/install/.gitignore
    M htdocs/install/check.php
    M htdocs/install/filelist.xml
    M htdocs/install/inc.php
    M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
    M htdocs/install/mysql/tables/llx_commande.sql
    M htdocs/install/mysql/tables/llx_contrat.sql
    M htdocs/install/mysql/tables/llx_ecm_directories.key.sql
    M htdocs/install/mysql/tables/llx_ecm_directories.sql
    A htdocs/install/mysql/tables/llx_ecm_files.key.sql
    A htdocs/install/mysql/tables/llx_ecm_files.sql
    M htdocs/install/mysql/tables/llx_product.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/boxes.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/compta.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/margins.lang
    M htdocs/langs/en_US/orders.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/propal.lang
    M htdocs/langs/en_US/users.lang
    M htdocs/langs/fr_FR/margins.lang
    M htdocs/livraison/class/livraison.class.php
    M htdocs/loan/card.php
    M htdocs/loan/payment/payment.php
    M htdocs/main.inc.php
    M htdocs/margin/admin/margin.php
    M htdocs/opensurvey/card.php
    M htdocs/opensurvey/results.php
    M htdocs/opensurvey/wizard/create_survey.php
    M htdocs/product/admin/product.php
    M htdocs/product/class/html.formproduct.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/fournisseurs.php
    M htdocs/product/index.php
    M htdocs/product/list.php
    M htdocs/product/price.php
    M htdocs/product/stats/commande.php
    M htdocs/product/stats/commande_fournisseur.php
    M htdocs/product/stats/facture.php
    M htdocs/product/stats/facture_fournisseur.php
    M htdocs/product/stats/propal.php
    M htdocs/product/stock/class/entrepot.class.php
    M htdocs/product/stock/massstockmove.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/product.php
    M htdocs/projet/activity/index.php
    M htdocs/projet/card.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/index.php
    M htdocs/projet/list.php
    M htdocs/projet/tasks.php
    M htdocs/projet/tasks/index.php
    M htdocs/projet/tasks/task.php
    M htdocs/projet/tasks/time.php
    M htdocs/public/api/explorer/lib/handlebars-1.0.rc.1.js
    M htdocs/public/api/explorer/lib/handlebars.runtime-1.0.0.beta.6.js
    M htdocs/public/members/new.php
    M htdocs/public/opensurvey/studs.php
    M htdocs/resource/card.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/index.php
    M htdocs/societe/list.php
    M htdocs/societe/notify/card.php
    M htdocs/societe/rib.php
    M htdocs/societe/soc.php
    M htdocs/theme/common/gmap.png
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/img/filter.png
    M htdocs/theme/md/img/sort_asc.png
    M htdocs/theme/md/img/sort_desc.png
    M htdocs/theme/md/style.css.php
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php
    M htdocs/user/hierarchy.php

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into 
develop-best-pmp-pos-margin


  Commit: 4d839eea60310811254b0dcf708a7259d55b2822
      
https://github.com/Dolibarr/dolibarr/commit/4d839eea60310811254b0dcf708a7259d55b2822
  Author: fappels <address@hidden>
  Date:   2015-10-26 (Mon, 26 Oct 2015)

  Changed paths:
    M htdocs/comm/askpricesupplier/class/askpricesupplier.class.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/langs/en_US/margins.lang

  Log Message:
  -----------
  Fix #2591 Margin is incorrect used with POS

if buy price not defined, define buyprice as configured in margin admin.
If 'Force buying price if null' is off, marge will be equal to suggested
default.(min supplier price or pmp)
Updated all classes reading 'Force buying price if null' setting.


  Commit: 8992cfaeb437cd26178906e07af2674c0d2297ca
      
https://github.com/Dolibarr/dolibarr/commit/8992cfaeb437cd26178906e07af2674c0d2297ca
  Author: fappels <address@hidden>
  Date:   2015-10-27 (Tue, 27 Oct 2015)

  Changed paths:
    M htdocs/core/class/commonobject.class.php

  Log Message:
  -----------
  move require_once


  Commit: 200e4638f4459bd39717032594872eb2f6c7a182
      
https://github.com/Dolibarr/dolibarr/commit/200e4638f4459bd39717032594872eb2f6c7a182
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-02 (Mon, 02 Nov 2015)

  Changed paths:
    M htdocs/comm/askpricesupplier/class/askpricesupplier.class.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/langs/en_US/margins.lang

  Log Message:
  -----------
  Merge pull request #3812 from fappels/develop-best-pmp-pos-margin

Fix: #2591 Margin is incorrect used with POS


Compare: 
https://github.com/Dolibarr/dolibarr/compare/465ad6b3a7ad...200e4638f445