[Dolibarr-git] [Dolibarr/dolibarr] 0a11bf: Update doc

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 0a11bf176934df8a4dbda7689ed6f90230e4eb12
      
https://github.com/Dolibarr/dolibarr/commit/0a11bf176934df8a4dbda7689ed6f90230e4eb12
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-10-29 (Tue, 29 Oct 2013)

  Changed paths:
    M build/obs/README

  Log Message:
  -----------
  Update doc


  Commit: 70342c09b896ade7435794555d1f69d68cc4ebb8
      
https://github.com/Dolibarr/dolibarr/commit/70342c09b896ade7435794555d1f69d68cc4ebb8
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-10-29 (Tue, 29 Oct 2013)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/lib/files.lib.php
    M htdocs/fourn/facture/document.php
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/fr_FR/main.lang

  Log Message:
  -----------
  Fix: Better management of using ajax for upload form (to solve problem
when enabling ajax jquery multifile upload in some cases).
New: Add option to use a specific mask for uploaded filename


  Commit: 5b3ba8566939fd6e9a9c966761610bc010d49179
      
https://github.com/Dolibarr/dolibarr/commit/5b3ba8566939fd6e9a9c966761610bc010d49179
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-10-29 (Tue, 29 Oct 2013)

  Changed paths:
    M ChangeLog
    M htdocs/admin/modules.php
    M htdocs/comm/propal/list.php
    M htdocs/commande/liste.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/list.php
    M htdocs/contact/class/contact.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/modules/modCommande.class.php
    M htdocs/core/modules/modFacture.class.php
    M htdocs/core/modules/modProduct.class.php
    M htdocs/core/modules/modService.class.php
    M htdocs/core/tpl/passwordforgotten.tpl.php
    M htdocs/install/upgrade2.php
    A htdocs/langs/cs_CZ/admin.lang
    A htdocs/langs/cs_CZ/agenda.lang
    A htdocs/langs/cs_CZ/banks.lang
    A htdocs/langs/cs_CZ/bills.lang
    A htdocs/langs/cs_CZ/bookmarks.lang
    A htdocs/langs/cs_CZ/boxes.lang
    A htdocs/langs/cs_CZ/cashdesk.lang
    A htdocs/langs/cs_CZ/categories.lang
    A htdocs/langs/cs_CZ/commercial.lang
    A htdocs/langs/cs_CZ/companies.lang
    A htdocs/langs/cs_CZ/compta.lang
    A htdocs/langs/cs_CZ/contracts.lang
    A htdocs/langs/cs_CZ/cron.lang
    A htdocs/langs/cs_CZ/deliveries.lang
    A htdocs/langs/cs_CZ/dict.lang
    A htdocs/langs/cs_CZ/donations.lang
    A htdocs/langs/cs_CZ/ecm.lang
    A htdocs/langs/cs_CZ/errors.lang
    A htdocs/langs/cs_CZ/exports.lang
    A htdocs/langs/cs_CZ/externalsite.lang
    A htdocs/langs/cs_CZ/ftp.lang
    A htdocs/langs/cs_CZ/help.lang
    A htdocs/langs/cs_CZ/holiday.lang
    A htdocs/langs/cs_CZ/install.lang
    A htdocs/langs/cs_CZ/interventions.lang
    A htdocs/langs/cs_CZ/languages.lang
    A htdocs/langs/cs_CZ/ldap.lang
    A htdocs/langs/cs_CZ/mailmanspip.lang
    A htdocs/langs/cs_CZ/mails.lang
    A htdocs/langs/cs_CZ/main.lang
    A htdocs/langs/cs_CZ/margins.lang
    A htdocs/langs/cs_CZ/members.lang
    A htdocs/langs/cs_CZ/opensurvey.lang
    A htdocs/langs/cs_CZ/orders.lang
    A htdocs/langs/cs_CZ/oscommerce.lang
    A htdocs/langs/cs_CZ/other.lang
    A htdocs/langs/cs_CZ/paybox.lang
    A htdocs/langs/cs_CZ/paypal.lang
    A htdocs/langs/cs_CZ/printipp.lang
    A htdocs/langs/cs_CZ/products.lang
    A htdocs/langs/cs_CZ/projects.lang
    A htdocs/langs/cs_CZ/propal.lang
    A htdocs/langs/cs_CZ/sendings.lang
    A htdocs/langs/cs_CZ/shop.lang
    A htdocs/langs/cs_CZ/sms.lang
    A htdocs/langs/cs_CZ/stocks.lang
    A htdocs/langs/cs_CZ/suppliers.lang
    A htdocs/langs/cs_CZ/trips.lang
    A htdocs/langs/cs_CZ/users.lang
    A htdocs/langs/cs_CZ/withdrawals.lang
    A htdocs/langs/cs_CZ/workflow.lang
    M htdocs/langs/de_DE/categories.lang
    M htdocs/langs/de_DE/companies.lang
    M htdocs/langs/de_DE/cron.lang
    M htdocs/langs/de_DE/externalsite.lang
    M htdocs/langs/de_DE/main.lang
    M htdocs/langs/de_DE/paypal.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/languages.lang
    M htdocs/langs/es_ES/compta.lang
    M htdocs/langs/es_ES/main.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/languages.lang
    M htdocs/langs/fr_FR/stocks.lang
    M htdocs/langs/it_IT/bills.lang
    M htdocs/langs/it_IT/main.lang
    M htdocs/langs/ko_KR/main.lang
    M htdocs/langs/tr_TR/companies.lang
    M htdocs/product/class/product.class.php
    M htdocs/product/class/service.class.php
    M htdocs/product/composition/fiche.php
    M htdocs/product/fiche.php
    M htdocs/product/stats/fiche.php
    M htdocs/public/cron/cron_run_jobs.php
    M htdocs/public/test/test_arrays.php
    M htdocs/societe/soc.php
    M htdocs/societe/tpl/linesalesrepresentative.tpl.php
    M htdocs/theme/amarok/style.css.php
    M htdocs/theme/auguria/style.css.php
    M htdocs/theme/bureau2crea/style.css.php
    M htdocs/theme/cameleo/style.css.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/webservices/admin/webservices.php
    M htdocs/webservices/server_contact.php

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop

Conflicts:
        ChangeLog


Compare: 
https://github.com/Dolibarr/dolibarr/compare/b4edbde0c8fd...5b3ba8566939