[Dolibarr-git] [Dolibarr/dolibarr] e379b2: Merge remote-tracking branch 'origin/3.7' into dev...

[Laurent Destailleur]

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

  Changed paths:
    M .gitignore
    M build/debian/apache/.htaccess
    M build/debian/apache/dolibarr.conf
    M htdocs/core/tpl/login.tpl.php
    A htdocs/custom/README.md
    M htdocs/fourn/class/paiementfourn.class.php
    M htdocs/fourn/paiement/info.php
    M htdocs/langs/cs_CZ/main.lang
    M htdocs/langs/da_DK/accountancy.lang
    M htdocs/langs/da_DK/admin.lang
    M htdocs/langs/de_DE/holiday.lang
    M htdocs/langs/el_GR/accountancy.lang
    M htdocs/langs/el_GR/admin.lang
    M htdocs/langs/el_GR/bills.lang
    M htdocs/langs/el_GR/boxes.lang
    M htdocs/langs/el_GR/companies.lang
    M htdocs/langs/el_GR/compta.lang
    M htdocs/langs/el_GR/donations.lang
    M htdocs/langs/el_GR/holiday.lang
    M htdocs/langs/el_GR/interventions.lang
    M htdocs/langs/el_GR/mails.lang
    M htdocs/langs/el_GR/margins.lang
    M htdocs/langs/el_GR/other.lang
    M htdocs/langs/el_GR/productbatch.lang
    M htdocs/langs/el_GR/products.lang
    M htdocs/langs/el_GR/projects.lang
    M htdocs/langs/el_GR/resource.lang
    M htdocs/langs/el_GR/withdrawals.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/langs/es_ES/opensurvey.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/holiday.lang
    M htdocs/langs/fr_FR/users.lang
    M htdocs/langs/it_IT/stocks.lang
    M htdocs/langs/lv_LV/admin.lang
    M htdocs/langs/lv_LV/agenda.lang
    M htdocs/langs/lv_LV/categories.lang
    M htdocs/langs/lv_LV/contracts.lang
    M htdocs/langs/lv_LV/deliveries.lang
    M htdocs/langs/lv_LV/errors.lang
    M htdocs/langs/lv_LV/externalsite.lang
    M htdocs/langs/lv_LV/other.lang
    M htdocs/langs/lv_LV/printipp.lang
    M htdocs/langs/lv_LV/productbatch.lang
    M htdocs/langs/lv_LV/products.lang
    M htdocs/langs/lv_LV/resource.lang
    M htdocs/langs/lv_LV/stocks.lang
    M htdocs/langs/nl_NL/dict.lang
    M htdocs/langs/nl_NL/opensurvey.lang
    M htdocs/langs/pt_PT/accountancy.lang
    M htdocs/langs/pt_PT/admin.lang
    M htdocs/langs/pt_PT/boxes.lang
    M htdocs/langs/pt_PT/companies.lang
    M htdocs/langs/pt_PT/ftp.lang
    M htdocs/langs/pt_PT/install.lang
    M htdocs/langs/pt_PT/languages.lang
    M htdocs/langs/pt_PT/mailmanspip.lang
    M htdocs/langs/pt_PT/main.lang
    M htdocs/langs/pt_PT/productbatch.lang
    M htdocs/langs/pt_PT/salaries.lang
    M htdocs/langs/pt_PT/users.lang
    M htdocs/langs/ro_RO/accountancy.lang
    M htdocs/langs/ro_RO/admin.lang
    M htdocs/langs/ro_RO/agenda.lang
    M htdocs/langs/ro_RO/banks.lang
    M htdocs/langs/ro_RO/bills.lang
    M htdocs/langs/ro_RO/boxes.lang
    M htdocs/langs/ro_RO/categories.lang
    M htdocs/langs/ro_RO/commercial.lang
    M htdocs/langs/ro_RO/companies.lang
    M htdocs/langs/ro_RO/compta.lang
    M htdocs/langs/ro_RO/contracts.lang
    M htdocs/langs/ro_RO/deliveries.lang
    M htdocs/langs/ro_RO/donations.lang
    M htdocs/langs/ro_RO/ecm.lang
    M htdocs/langs/ro_RO/errors.lang
    M htdocs/langs/ro_RO/exports.lang
    M htdocs/langs/ro_RO/ftp.lang
    M htdocs/langs/ro_RO/help.lang
    M htdocs/langs/ro_RO/install.lang
    M htdocs/langs/ro_RO/ldap.lang
    M htdocs/langs/ro_RO/mails.lang
    M htdocs/langs/ro_RO/main.lang
    M htdocs/langs/ro_RO/members.lang
    M htdocs/langs/ro_RO/opensurvey.lang
    M htdocs/langs/ro_RO/orders.lang
    M htdocs/langs/ro_RO/other.lang
    M htdocs/langs/ro_RO/products.lang
    M htdocs/langs/ro_RO/projects.lang
    M htdocs/langs/ro_RO/propal.lang
    M htdocs/langs/ro_RO/sendings.lang
    M htdocs/langs/ro_RO/sms.lang
    M htdocs/langs/ro_RO/stocks.lang
    M htdocs/langs/ro_RO/suppliers.lang
    M htdocs/langs/ro_RO/trips.lang
    M htdocs/langs/ro_RO/users.lang
    M htdocs/langs/ro_RO/withdrawals.lang
    M htdocs/langs/ro_RO/workflow.lang
    M htdocs/langs/sl_SI/accountancy.lang
    M htdocs/langs/sl_SI/deliveries.lang
    M htdocs/langs/sl_SI/dict.lang
    M htdocs/langs/sl_SI/donations.lang
    M htdocs/langs/sl_SI/holiday.lang
    M htdocs/langs/sl_SI/mails.lang
    M htdocs/langs/sl_SI/printipp.lang
    M htdocs/langs/sv_SE/admin.lang
    M htdocs/langs/sv_SE/agenda.lang
    M htdocs/langs/sv_SE/contracts.lang
    M htdocs/langs/sv_SE/errors.lang
    M htdocs/langs/sv_SE/members.lang
    M htdocs/langs/sv_SE/products.lang
    M htdocs/langs/sv_SE/projects.lang
    M htdocs/langs/sv_SE/withdrawals.lang
    M htdocs/langs/tr_TR/accountancy.lang
    M htdocs/langs/tr_TR/admin.lang
    M htdocs/langs/tr_TR/agenda.lang
    M htdocs/langs/tr_TR/contracts.lang
    M htdocs/langs/tr_TR/withdrawals.lang
    M htdocs/langs/vi_VN/products.lang
    M htdocs/product/stock/product.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.7' into develop

Conflicts:
        htdocs/product/stock/product.php


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

  Changed paths:
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/fourn/ajax/getSupplierPrices.php

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


  Commit: b93c3cc7ce46ec2aa65eb51bc574f7e8703d59dd
      
https://github.com/Dolibarr/dolibarr/commit/b93c3cc7ce46ec2aa65eb51bc574f7e8703d59dd
  Author: Emmanuel Haguet <address@hidden>
  Date:   2015-01-20 (Tue, 20 Jan 2015)

  Changed paths:
    A scripts/pixium/data.csv
    A scripts/pixium/import_fournisseur.php

  Log Message:
  -----------
  Script Import Fournisseur + données au format CSV


  Commit: 0b3aebeac087bcb23ea19eae5c096fc8cf7604d5
      
https://github.com/Dolibarr/dolibarr/commit/0b3aebeac087bcb23ea19eae5c096fc8cf7604d5
  Author: Emmanuel Haguet <address@hidden>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    R scripts/pixium/data.csv
    A scripts/pixium/fournisseurs_et_produits.csv
    M scripts/pixium/import_fournisseur.php
    A scripts/pixium/import_produit.php

  Log Message:
  -----------
  renommage data.csv, User dolibarr et 2ème script


  Commit: 296d947bd26875babc2e581d7a787b3d50728078
      
https://github.com/Dolibarr/dolibarr/commit/296d947bd26875babc2e581d7a787b3d50728078
  Author: Emmanuel Haguet <address@hidden>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    M scripts/pixium/import_fournisseur.php
    M scripts/pixium/import_produit.php

  Log Message:
  -----------
  Corrections (fichier, calcul de ref)


  Commit: 4aa4f5f5e9ee043ec62bc54377bc410d2c59a619
      
https://github.com/Dolibarr/dolibarr/commit/4aa4f5f5e9ee043ec62bc54377bc410d2c59a619
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

  Changed paths:
    M .travis.yml
    M .tx/config
    M COPYRIGHT
    M ChangeLog
    M build/makepack-howto.txt
    M dev/codesniffer/ruleset.xml
    M dev/initdata/mysqldump_dolibarr_3.7.0.sql
    M dev/ldap/ldapadd_sample1.txt
    M dev/ldap/ldapadd_sample2.txt
    M dev/ldap/ldapadd_sample3.txt
    M dev/ldap/ldapdelete_sample1.txt
    M dev/ldap/ldapdelete_sample3.txt
    M dev/ldap/ldapmodify_sample1.txt
    A dev/ldap/ldapsearch_sample1.txt
    M htdocs/accountancy/class/accountingaccount.class.php
    M htdocs/accountancy/class/bookkeeping.class.php
    R htdocs/accountancy/customer/index.html
    M htdocs/accountancy/customer/list.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/accountancy/journal/cashjournal.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/adherents/card.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/class/adherent_type.class.php
    M htdocs/adherents/class/cotisation.class.php
    M htdocs/admin/agenda_xcal.php
    M htdocs/admin/bank.php
    A htdocs/admin/bank_extrafields.php
    M htdocs/admin/commande.php
    M htdocs/admin/contract.php
    M htdocs/admin/expedition.php
    M htdocs/admin/facture.php
    M htdocs/admin/fichinter.php
    M htdocs/admin/livraison.php
    M htdocs/admin/mailing.php
    M htdocs/admin/mails.php
    M htdocs/admin/propal.php
    M htdocs/admin/supplier_invoice.php
    M htdocs/admin/supplier_order.php
    M htdocs/categories/categorie.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/index.php
    M htdocs/comm/action/listactions.php
    M htdocs/comm/action/peruser.php
    M htdocs/comm/card.php
    M htdocs/comm/index.php
    M htdocs/comm/mailing/card.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/index.php
    M htdocs/comm/prospect/list.php
    M htdocs/commande/card.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/index.php
    M htdocs/compta/bank/card.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/ligne.php
    M htdocs/compta/deplacement/class/deplacement.class.php
    M htdocs/compta/dons/class/don.class.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture-rec.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/impayees.php
    M htdocs/compta/journal/sellsjournal.php
    M htdocs/compta/localtax/class/localtax.class.php
    M htdocs/compta/paiement.php
    M htdocs/compta/paiement/cheque/class/remisecheque.class.php
    M htdocs/compta/paiement/class/paiement.class.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/resultat/index.php
    M htdocs/compta/salaries/class/paymentsalary.class.php
    M htdocs/compta/sociales/class/chargesociales.class.php
    M htdocs/compta/sociales/class/paymentsocialcontribution.class.php
    M htdocs/compta/stats/cabyprodserv.php
    M htdocs/compta/stats/cabyuser.php
    M htdocs/compta/stats/casoc.php
    M htdocs/compta/stats/index.php
    M htdocs/compta/tva/class/tva.class.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contrat/class/contrat.class.php
    A htdocs/core/actions_printing.inc.php
    R htdocs/core/actions_printipp.inc.php
    M htdocs/core/actions_sendmails.inc.php
    M htdocs/core/boxes/box_actions.php
    M htdocs/core/boxes/box_activity.php
    M htdocs/core/boxes/box_bookmarks.php
    M htdocs/core/boxes/box_clients.php
    M htdocs/core/boxes/box_commandes.php
    M htdocs/core/boxes/box_comptes.php
    M htdocs/core/boxes/box_contacts.php
    M htdocs/core/boxes/box_contracts.php
    M htdocs/core/boxes/box_external_rss.php
    M htdocs/core/boxes/box_factures.php
    M htdocs/core/boxes/box_factures_fourn.php
    M htdocs/core/boxes/modules_boxes.php
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/class/commoninvoice.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/discount.class.php
    M htdocs/core/class/dolprintipp.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/menubase.class.php
    M htdocs/core/datepicker.php
    M htdocs/core/lib/accounting.lib.php
    M htdocs/core/lib/agenda.lib.php
    M htdocs/core/lib/bank.lib.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/lib/json.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/price.lib.php
    M htdocs/core/lib/tax.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/modules/action/rapport.pdf.php
    M htdocs/core/modules/cheque/pdf/pdf_blochet.class.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/modDeplacement.class.php
    R htdocs/core/modules/modPrintIPP.class.php
    A htdocs/core/modules/modPrinting.class.php
    M htdocs/core/modules/modSyslog.class.php
    M htdocs/core/modules/modUser.class.php
    A htdocs/core/modules/printing/index.html
    A htdocs/core/modules/printing/modules_printing.php
    A htdocs/core/modules/printing/printgcp.modules.php
    A htdocs/core/modules/printing/printipp.modules.php
    M htdocs/core/modules/project/doc/pdf_baleine.modules.php
    M htdocs/core/modules/rapport/pdf_paiement.class.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
    M htdocs/core/tpl/admin_extrafields_add.tpl.php
    M htdocs/core/tpl/admin_extrafields_edit.tpl.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/cron/card.php
    A htdocs/custom/.gitignore
    A htdocs/custom/index.html
    M htdocs/ecm/class/ecmdirectory.class.php
    M htdocs/expedition/card.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fourn/ajax/getSupplierPrices.php
    M htdocs/fourn/card.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/class/paiementfourn.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/fourn/index.php
    M htdocs/holiday/class/holiday.class.php
    M htdocs/includes/printipp/BasicIPP.php
    M htdocs/includes/printipp/CupsPrintIPP.php
    M htdocs/includes/printipp/ExtendedPrintIPP.php
    M htdocs/includes/printipp/PrintIPP.php
    M htdocs/includes/printipp/http_class.php
    M htdocs/install/mysql/data/llx_const.sql
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/install/mysql/tables/llx_actioncomm_resources.key.sql
    A htdocs/install/mysql/tables/llx_bank_account_extrafields.key.sql
    A htdocs/install/mysql/tables/llx_bank_account_extrafields.sql
    M htdocs/install/mysql/tables/llx_contrat.sql
    M htdocs/install/mysql/tables/llx_facture.sql
    M htdocs/install/mysql/tables/llx_facturedet.sql
    R htdocs/install/mysql/tables/llx_printer_ipp.sql
    A htdocs/install/mysql/tables/llx_printing.sql
    M htdocs/install/upgrade2.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/agenda.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/install.lang
    M htdocs/langs/en_US/main.lang
    A htdocs/langs/en_US/printgcp.lang
    A htdocs/langs/en_US/printing.lang
    M htdocs/langs/en_US/printipp.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/bills.lang
    M htdocs/langs/fr_FR/errors.lang
    M htdocs/langs/fr_FR/projects.lang
    M htdocs/livraison/class/livraison.class.php
    M htdocs/main.inc.php
    M htdocs/margin/index.php
    M htdocs/margin/lib/margins.lib.php
    A htdocs/printing/admin/index.html
    A htdocs/printing/admin/printing.php
    A htdocs/printing/index.php
    A htdocs/printing/lib/index.html
    A htdocs/printing/lib/printing.lib.php
    R htdocs/printipp/admin/index.html
    R htdocs/printipp/admin/printipp.php
    R htdocs/printipp/index.php
    R htdocs/printipp/lib/index.html
    R htdocs/printipp/lib/printipp.lib.php
    M htdocs/product/class/product.class.php
    M htdocs/product/document.php
    M htdocs/product/fournisseurs.php
    M htdocs/product/stock/class/entrepot.class.php
    M htdocs/projet/card.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/class/task.class.php
    M htdocs/projet/element.php
    M htdocs/public/agenda/agendaexport.php
    M htdocs/public/test/test_arrays.php
    M htdocs/public/test/test_forms.php
    M htdocs/resource/card.php
    M htdocs/resource/class/resource.class.php
    M htdocs/societe/agenda.php
    M htdocs/societe/class/address.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/consumption.php
    M htdocs/societe/info.php
    M htdocs/societe/soc.php
    A htdocs/theme/eldy/img/menus/README.md
    A htdocs/theme/eldy/img/menus/chart.png
    M htdocs/theme/eldy/style.css.php
    M htdocs/user/class/user.class.php
    M htdocs/user/class/usergroup.class.php
    M scripts/accountancy/export-thirdpartyaccount.php
    M scripts/emailings/mailing-send.php
    M scripts/odt2pdf/odt2pdf.sh
    M test/phpunit/FactureTest.php
    M test/phpunit/NumberingModulesTest.php
    M test/phpunit/PricesTest.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin_dolibarr/develop' into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/6bda61436b6b...4aa4f5f5e9ee