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

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 0892724ffe42bf39e2978b5148a5dd7059c627cc
      
https://github.com/Dolibarr/dolibarr/commit/0892724ffe42bf39e2978b5148a5dd7059c627cc
  Author: fappels <address@hidden>
  Date:   2015-11-21 (Sat, 21 Nov 2015)

  Changed paths:
    M dev/skeletons/modMyModule.class.php
    M htdocs/admin/dict.php
    M htdocs/admin/modules.php
    M htdocs/admin/supplier_invoice.php
    M htdocs/admin/supplier_order.php
    M htdocs/admin/tools/listevents.php
    M htdocs/admin/tools/purge.php
    M htdocs/categories/admin/categorie.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/categories/traduction.php
    M htdocs/commande/card.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/list.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/paiement.php
    M htdocs/compta/payment_sc/card.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/card.php
    M htdocs/contact/ldap.php
    M htdocs/contrat/list.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/hrm.lib.php
    M htdocs/core/lib/product.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/modules/modAccounting.class.php
    M htdocs/core/modules/modAdherent.class.php
    M htdocs/core/modules/modAgenda.class.php
    M htdocs/core/modules/modBanque.class.php
    M htdocs/core/modules/modCashDesk.class.php
    M htdocs/core/modules/modCommande.class.php
    M htdocs/core/modules/modComptabilite.class.php
    M htdocs/core/modules/modDocumentGeneration.class.php
    M htdocs/core/modules/modECM.class.php
    M htdocs/core/modules/modExpedition.class.php
    M htdocs/core/modules/modExpenseReport.class.php
    M htdocs/core/modules/modFacture.class.php
    M htdocs/core/modules/modFournisseur.class.php
    M htdocs/core/modules/modHRM.class.php
    M htdocs/core/modules/modHoliday.class.php
    M htdocs/core/modules/modMargin.class.php
    M htdocs/core/modules/modOauth.class.php
    M htdocs/core/modules/modOpenSurvey.class.php
    M htdocs/core/modules/modPrelevement.class.php
    M htdocs/core/modules/modPrinting.class.php
    M htdocs/core/modules/modProduct.class.php
    M htdocs/core/modules/modProductBatch.class.php
    M htdocs/core/modules/modProjet.class.php
    M htdocs/core/modules/modPropale.class.php
    M htdocs/core/modules/modReceiptPrinter.class.php
    M htdocs/core/modules/modResource.class.php
    M htdocs/core/modules/modService.class.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/core/modules/modStock.class.php
    M htdocs/core/modules/modUser.class.php
    M htdocs/core/modules/modWebsite.class.php
    M htdocs/core/tpl/extrafields_view.tpl.php
    M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
    M htdocs/fourn/card.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/commande/list.php
    M htdocs/fourn/commande/orderstoinvoice.php
    M htdocs/holiday/list.php
    M htdocs/hrm/admin/admin_establishment.php
    M htdocs/hrm/admin/admin_hrm.php
    R htdocs/hrm/class/employee.class.php
    R htdocs/hrm/employee/index.html
    R htdocs/hrm/employee/list.php
    M htdocs/index.php
    M htdocs/install/mysql/data/llx_10_c_regions.sql
    M htdocs/install/mysql/data/llx_20_c_departements.sql
    M htdocs/install/mysql/data/llx_c_forme_juridique.sql
    M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
    M htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql
    M htdocs/install/mysql/tables/llx_commande_fournisseur.sql
    M htdocs/install/mysql/tables/llx_cronjob.sql
    M htdocs/install/mysql/tables/llx_product.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/hrm.lang
    M htdocs/langs/en_US/orders.lang
    M htdocs/main.inc.php
    M htdocs/product/card.php
    M htdocs/product/class/product.class.php
    A htdocs/product/info.php
    M htdocs/product/traduction.php
    M htdocs/projet/tasks.php
    M htdocs/societe/info.php
    M htdocs/theme/eldy/img/statut1.png
    A htdocs/theme/eldy/img/statut2.png
    M htdocs/theme/eldy/img/statut4.png
    M htdocs/theme/eldy/img/statut6.png
    M htdocs/theme/eldy/img/statut9.png
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php
    M htdocs/user/index.php

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop


  Commit: ecd3114683137c2ecc8fc4102945eccac9ec4962
      
https://github.com/Dolibarr/dolibarr/commit/ecd3114683137c2ecc8fc4102945eccac9ec4962
  Author: fappels <address@hidden>
  Date:   2015-11-21 (Sat, 21 Nov 2015)

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

  Log Message:
  -----------
  Fix defineBuyPrice no min price is not error

No min buy price is not error, return 0 if no buyprice set


  Commit: c8cf06c14b86a22a56f6bd62f07a7b228a57ab5e
      
https://github.com/Dolibarr/dolibarr/commit/c8cf06c14b86a22a56f6bd62f07a7b228a57ab5e
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-21 (Sat, 21 Nov 2015)

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

  Log Message:
  -----------
  Merge pull request #4059 from fappels/develop_fix_defineBuyPrice

Fix defineBuyPrice no min price is not error


Compare: 
https://github.com/Dolibarr/dolibarr/compare/50cfd38e6215...c8cf06c14b86