[Dolibarr-git] [Dolibarr/dolibarr] 1fb26e: Fix: if 1 experimental module is on, we must alway...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 1fb26e2ab237c74712284c0a9ff6685cdd138072
      
https://github.com/Dolibarr/dolibarr/commit/1fb26e2ab237c74712284c0a9ff6685cdd138072
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-09-15 (Sat, 15 Sep 2012)

  Changed paths:
    M htdocs/admin/modules.php

  Log Message:
  -----------
  Fix: if 1 experimental module is on, we must always show tab


  Commit: 4566595d44c62c0d45e4059fbff63800ddb9c395
      
https://github.com/Dolibarr/dolibarr/commit/4566595d44c62c0d45e4059fbff63800ddb9c395
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-09-15 (Sat, 15 Sep 2012)

  Changed paths:
    M htdocs/core/tpl/freeproductline_create.tpl.php
    M htdocs/core/tpl/predefinedproductline_create.tpl.php

  Log Message:
  -----------
  Fix: W3C when module margin is on


  Commit: 9147911ae460910911084cf0e84f670c382efd2a
      
https://github.com/Dolibarr/dolibarr/commit/9147911ae460910911084cf0e84f670c382efd2a
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-09-15 (Sat, 15 Sep 2012)

  Changed paths:
    M htdocs/adherents/admin/adherent.php
    M htdocs/adherents/admin/mailman.php
    M htdocs/adherents/admin/public.php
    M htdocs/adherents/admin/spip.php
    M htdocs/adherents/agenda.php
    M htdocs/adherents/card_subscriptions.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/cotisations.php
    M htdocs/adherents/fiche.php
    M htdocs/adherents/fiche_subscription.php
    M htdocs/adherents/ldap.php
    M htdocs/adherents/liste.php
    M htdocs/admin/barcode.php
    M htdocs/admin/company.php
    M htdocs/admin/compta.php
    M htdocs/admin/confexped.php
    M htdocs/admin/expedition.php
    M htdocs/admin/facture.php
    M htdocs/admin/fckeditor.php
    M htdocs/admin/ldap.php
    M htdocs/admin/ldap_members.php
    M htdocs/admin/livraison.php
    M htdocs/admin/mails.php
    M htdocs/admin/modules.php
    M htdocs/admin/prelevement.php
    M htdocs/admin/security.php
    M htdocs/admin/stock.php
    M htdocs/admin/tools/purge.php
    M htdocs/asterisk/wrapper.php
    M htdocs/cashdesk/admin/cashdesk.php
    M htdocs/cashdesk/class/Facturation.class.php
    M htdocs/cashdesk/facturation.php
    M htdocs/cashdesk/facturation_dhtml.php
    M htdocs/cashdesk/facturation_verif.php
    M htdocs/cashdesk/index.php
    M htdocs/cashdesk/index_verif.php
    M htdocs/cashdesk/tpl/facturation1.tpl.php
    M htdocs/cashdesk/tpl/menu.tpl.php
    M htdocs/cashdesk/validation_verif.php
    M htdocs/categories/categorie.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/categories/photos.php
    M htdocs/comm/action/document.php
    M htdocs/comm/action/fiche.php
    M htdocs/comm/action/index.php
    M htdocs/comm/addpropal.php
    M htdocs/comm/fiche.php
    M htdocs/comm/index.php
    M htdocs/comm/list.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/apercu.php
    M htdocs/comm/propal/index.php
    M htdocs/comm/propal/list.php
    M htdocs/comm/prospect/fiche.php
    M htdocs/comm/prospect/index.php
    M htdocs/comm/prospect/list.php
    M htdocs/comm/prospect/recap-prospect.php
    M htdocs/comm/recap-client.php
    M htdocs/commande/apercu.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/contact.php
    M htdocs/commande/fiche.php
    M htdocs/commande/index.php
    M htdocs/commande/liste.php
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/bank/account.php
    M htdocs/compta/bank/fiche.php
    M htdocs/compta/bank/ligne.php
    M htdocs/compta/deplacement/fiche.php
    M htdocs/compta/dons/fiche.php
    M htdocs/compta/dons/liste.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/apercu.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/compta/facture/impayees.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/index.php
    M htdocs/compta/localtax/class/localtax.class.php
    M htdocs/compta/localtax/clients.php
    M htdocs/compta/localtax/fiche.php
    M htdocs/compta/paiement.php
    M htdocs/compta/paiement/class/paiement.class.php
    M htdocs/compta/paiement/fiche.php
    M htdocs/compta/paiement/liste.php
    M htdocs/compta/paiement_charge.php
    M htdocs/compta/payment_sc/fiche.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/compta/recap-compta.php
    M htdocs/compta/sociales/class/paymentsocialcontribution.class.php
    M htdocs/compta/stats/cabyuser.php
    M htdocs/compta/stats/casoc.php
    M htdocs/compta/tva/class/tva.class.php
    M htdocs/compta/tva/clients.php
    M htdocs/compta/tva/fiche.php
    M htdocs/compta/tva/quadri_detail.php
    M htdocs/contact/canvas/actions_contactcard_common.class.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contact/fiche.php
    M htdocs/contrat/fiche.php
    M htdocs/core/admin_extrafields.inc.php
    M htdocs/core/ajax/ziptown.php
    M htdocs/core/boxes/box_activity.php
    M htdocs/core/boxes/box_produits.php
    M htdocs/core/boxes/box_services_contracts.php
    M htdocs/core/class/CMailFile.class.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/class/html.formbarcode.class.php
    M htdocs/core/class/html.formcompany.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/class/ldap.class.php
    M htdocs/core/lib/agenda.lib.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/invoice.lib.php
    M htdocs/core/lib/ldap.lib.php
    M htdocs/core/lib/order.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/price.lib.php
    M htdocs/core/lib/product.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/lib/propal.lib.php
    M htdocs/core/lib/security2.lib.php
    M htdocs/core/lib/stock.lib.php
    M htdocs/core/lib/tax.lib.php
    M htdocs/core/login/functions_ldap.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/cheque/pdf/modules_chequereceipts.php
    M htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
    M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/dons/modules_don.php
    M htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
    M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
    M htdocs/core/modules/fichinter/modules_fichinter.php
    M htdocs/core/modules/livraison/modules_livraison.php
    M htdocs/core/modules/livraison/pdf/pdf_sirocco.modules.php
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/modules/member/doc/pdf_standard.class.php
    M htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
    M htdocs/core/modules/project/pdf/pdf_baleine.modules.php
    M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/rapport/pdf_paiement.class.php
    M htdocs/core/modules/societe/modules_societe.class.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/core/tpl/ajaxrow.tpl.php
    M htdocs/core/tpl/contacts.tpl.php
    M htdocs/core/tpl/freeproductline_create.tpl.php
    M htdocs/core/tpl/objectline_add.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/core/tpl/predefinedproductline_create.tpl.php
    M htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
    M htdocs/document.php
    M htdocs/ecm/index.php
    M htdocs/ecm/search.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/contact.php
    M htdocs/expedition/fiche.php
    M htdocs/expedition/shipment.php
    M htdocs/fichinter/apercu.php
    M htdocs/fichinter/fiche.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/dispatch.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/fourn/commande/index.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/fourn/fiche.php
    M htdocs/fourn/index.php
    M htdocs/fourn/liste.php
    M htdocs/fourn/paiement/fiche.php
    M htdocs/fourn/product/categorie.php
    M htdocs/fourn/product/index.php
    M htdocs/fourn/product/photos.php
    M htdocs/fourn/recap-fourn.php
    M htdocs/holiday/admin/holiday.php
    M htdocs/index.php
    M htdocs/livraison/class/livraison.class.php
    M htdocs/livraison/fiche.php
    M htdocs/margin/admin/margin.php
    M htdocs/paybox/admin/paybox.php
    M htdocs/paybox/lib/paybox.lib.php
    M htdocs/paypal/admin/paypal.php
    M htdocs/paypal/lib/paypal.lib.php
    M htdocs/paypal/lib/paypalfunctions.lib.php
    M htdocs/product/admin/product_extrafields.php
    M htdocs/product/canvas/product/tpl/card_create.tpl.php
    M htdocs/product/canvas/product/tpl/card_edit.tpl.php
    M htdocs/product/class/product.class.php
    M htdocs/product/composition/fiche.php
    M htdocs/product/document.php
    M htdocs/product/fiche.php
    M htdocs/product/index.php
    M htdocs/product/liste.php
    M htdocs/product/price.php
    M htdocs/product/reassort.php
    M htdocs/product/stock/class/mouvementstock.class.php
    M htdocs/product/stock/fiche.php
    M htdocs/product/stock/product.php
    M htdocs/projet/element.php
    M htdocs/projet/tasks.php
    M htdocs/public/agenda/agendaexport.php
    M htdocs/public/members/new.php
    M htdocs/public/paybox/newpayment.php
    M htdocs/public/paypal/newpayment.php
    M htdocs/public/paypal/paymentok.php
    M htdocs/societe/agenda.php
    M htdocs/societe/ajaxcompanies.php
    M htdocs/societe/canvas/actions_card_common.class.php
    M htdocs/societe/canvas/company/tpl/card_create.tpl.php
    M htdocs/societe/canvas/company/tpl/card_edit.tpl.php
    M htdocs/societe/canvas/company/tpl/card_view.tpl.php
    M htdocs/societe/canvas/individual/tpl/card_create.tpl.php
    M htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
    M htdocs/societe/canvas/individual/tpl/card_view.tpl.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/document.php
    M htdocs/societe/index.php
    M htdocs/societe/info.php
    M htdocs/societe/note.php
    M htdocs/societe/soc.php
    M htdocs/societe/societe.php
    M htdocs/theme/auguria/style.css.php
    M htdocs/theme/bureau2crea/style.css.php
    M htdocs/theme/cameleo/style.css.php
    M htdocs/user/class/user.class.php
    M htdocs/user/class/usergroup.class.php
    M htdocs/user/fiche.php
    M htdocs/user/group/fiche.php
    M htdocs/user/passwordforgotten.php
    M htdocs/webservices/admin/webservices.php
    M htdocs/webservices/index.php

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

Conflicts:
        htdocs/core/tpl/freeproductline_create.tpl.php
        htdocs/core/tpl/predefinedproductline_create.tpl.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/89e70cd61ad6...9147911ae460