dolibarr-git
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] 0a6700: Fix :: Account_parent must be


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] 0a6700: Fix :: Account_parent must be an int - Step 1
Date: Thu, 26 Jun 2014 12:42:23 -0700

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 0a670092d589ad579c6abb30c688719295d76532
      
https://github.com/Dolibarr/dolibarr/commit/0a670092d589ad579c6abb30c688719295d76532
  Author: aspangaro <address@hidden>
  Date:   2014-05-23 (Fri, 23 May 2014)

  Changed paths:
    M htdocs/install/mysql/data/llx_accounting.sql

  Log Message:
  -----------
  Fix :: Account_parent must be an int - Step 1


  Commit: 22bd18486bf8f4acdafe5b41fe02f98db581446c
      
https://github.com/Dolibarr/dolibarr/commit/22bd18486bf8f4acdafe5b41fe02f98db581446c
  Author: aspangaro <address@hidden>
  Date:   2014-05-23 (Fri, 23 May 2014)

  Changed paths:
    M ChangeLog
    M build/exe/doliwamp/php.ini.install
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    A dev/translation/strip_language_file.php
    M dev/translation/txpull.sh
    M dev/translation/txpush.sh
    M htdocs/admin/boxes.php
    M htdocs/admin/dict.php
    M htdocs/comm/mailing/cibles.php
    M htdocs/comm/mailing/fiche.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/list.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/liste.php
    M htdocs/compta/bank/search.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/prelevement/bons.php
    M htdocs/compta/prelevement/factures.php
    M htdocs/compta/prelevement/fiche-rejet.php
    M htdocs/compta/prelevement/fiche-stat.php
    M htdocs/compta/prelevement/fiche.php
    M htdocs/compta/prelevement/ligne.php
    M htdocs/compta/prelevement/lignes.php
    M htdocs/compta/prelevement/liste.php
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/db/pgsql.class.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/lib/member.lib.php
    M htdocs/core/modules/commande/mod_commande_marbre.php
    M htdocs/core/modules/contract/doc/pdf_strato.modules.php
    M htdocs/core/modules/contract/mod_contract_serpis.php
    M htdocs/core/modules/expedition/mod_expedition_safor.php
    M htdocs/core/modules/facture/mod_facture_mars.php
    M htdocs/core/modules/facture/mod_facture_terre.php
    M htdocs/core/modules/fichinter/mod_pacific.php
    M htdocs/core/modules/livraison/mod_livraison_jade.php
    M htdocs/core/modules/mailings/contacts4.modules.php
    M htdocs/core/modules/mailings/fraise.modules.php
    M htdocs/core/modules/mailings/framboise.modules.php
    M htdocs/core/modules/mailings/pomme.modules.php
    M htdocs/core/modules/mailings/thirdparties.modules.php
    M htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
    M htdocs/core/modules/mailings/xinputuser.modules.php
    M htdocs/core/modules/member/doc/pdf_standard.class.php
    M htdocs/core/modules/modAgenda.class.php
    M htdocs/core/modules/modBarcode.class.php
    M htdocs/core/modules/modExpedition.class.php
    M htdocs/core/modules/modProduct.class.php
    M htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
    M htdocs/core/modules/project/mod_project_simple.php
    M htdocs/core/modules/project/task/mod_task_simple.php
    M htdocs/core/modules/propale/mod_propale_marbre.php
    M htdocs/core/modules/societe/mod_codeclient_monkey.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
    M htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/exports/export.php
    M htdocs/fourn/commande/liste.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/fourn/facture/list.php
    M htdocs/install/check.php
    M htdocs/langs/de_AT/admin.lang
    M htdocs/langs/de_AT/agenda.lang
    M htdocs/langs/de_AT/banks.lang
    M htdocs/langs/de_AT/bills.lang
    M htdocs/langs/de_AT/bookmarks.lang
    M htdocs/langs/de_AT/boxes.lang
    M htdocs/langs/de_AT/categories.lang
    M htdocs/langs/de_AT/commercial.lang
    M htdocs/langs/de_AT/companies.lang
    M htdocs/langs/de_AT/compta.lang
    M htdocs/langs/de_AT/contracts.lang
    M htdocs/langs/de_AT/deliveries.lang
    M htdocs/langs/de_AT/dict.lang
    M htdocs/langs/de_AT/donations.lang
    M htdocs/langs/de_AT/ecm.lang
    M htdocs/langs/de_AT/errors.lang
    M htdocs/langs/de_AT/exports.lang
    M htdocs/langs/de_AT/ftp.lang
    M htdocs/langs/de_AT/help.lang
    M htdocs/langs/de_AT/install.lang
    M htdocs/langs/de_AT/interventions.lang
    M htdocs/langs/de_AT/languages.lang
    M htdocs/langs/de_AT/ldap.lang
    M htdocs/langs/de_AT/mails.lang
    M htdocs/langs/de_AT/main.lang
    M htdocs/langs/de_AT/members.lang
    M htdocs/langs/de_AT/orders.lang
    M htdocs/langs/de_AT/oscommerce.lang
    M htdocs/langs/de_AT/other.lang
    M htdocs/langs/de_AT/paybox.lang
    M htdocs/langs/de_AT/paypal.lang
    M htdocs/langs/de_AT/products.lang
    M htdocs/langs/de_AT/projects.lang
    M htdocs/langs/de_AT/propal.lang
    M htdocs/langs/de_AT/sendings.lang
    M htdocs/langs/de_AT/shop.lang
    M htdocs/langs/de_AT/stocks.lang
    M htdocs/langs/de_AT/suppliers.lang
    M htdocs/langs/de_AT/trips.lang
    M htdocs/langs/de_AT/users.lang
    M htdocs/langs/de_AT/withdrawals.lang
    M htdocs/langs/de_DE/admin.lang
    M htdocs/langs/de_DE/holiday.lang
    M htdocs/langs/de_DE/install.lang
    M htdocs/langs/el_GR/admin.lang
    M htdocs/langs/el_GR/agenda.lang
    M htdocs/langs/el_GR/banks.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/errors.lang
    M htdocs/langs/el_GR/exports.lang
    M htdocs/langs/el_GR/holiday.lang
    M htdocs/langs/el_GR/install.lang
    M htdocs/langs/el_GR/mails.lang
    M htdocs/langs/el_GR/other.lang
    M htdocs/langs/el_GR/withdrawals.lang
    M htdocs/langs/en_US/contracts.lang
    M htdocs/langs/en_US/exports.lang
    M htdocs/langs/en_US/mails.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/es_ES/main.lang
    M htdocs/langs/es_ES/orders.lang
    M htdocs/langs/fr_BE/bills.lang
    M htdocs/langs/fr_BE/main.lang
    M htdocs/langs/fr_CA/admin.lang
    M htdocs/langs/fr_CA/companies.lang
    M htdocs/langs/fr_CA/main.lang
    M htdocs/langs/fr_CH/bills.lang
    M htdocs/langs/fr_CH/main.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/bills.lang
    M htdocs/langs/fr_FR/companies.lang
    M htdocs/langs/fr_FR/members.lang
    M htdocs/langs/fr_NC/admin.lang
    M htdocs/langs/fr_NC/companies.lang
    M htdocs/langs/fr_NC/main.lang
    M htdocs/langs/it_IT/holiday.lang
    M htdocs/langs/lt_LT/admin.lang
    M htdocs/langs/nl_BE/admin.lang
    M htdocs/langs/nl_BE/agenda.lang
    M htdocs/langs/nl_BE/banks.lang
    M htdocs/langs/nl_BE/bills.lang
    M htdocs/langs/nl_BE/bookmarks.lang
    M htdocs/langs/nl_BE/boxes.lang
    M htdocs/langs/nl_BE/categories.lang
    M htdocs/langs/nl_BE/commercial.lang
    M htdocs/langs/nl_BE/companies.lang
    M htdocs/langs/nl_BE/compta.lang
    M htdocs/langs/nl_BE/contracts.lang
    M htdocs/langs/nl_BE/deliveries.lang
    M htdocs/langs/nl_BE/dict.lang
    M htdocs/langs/nl_BE/donations.lang
    M htdocs/langs/nl_BE/ecm.lang
    M htdocs/langs/nl_BE/errors.lang
    M htdocs/langs/nl_BE/exports.lang
    M htdocs/langs/nl_BE/ftp.lang
    M htdocs/langs/nl_BE/help.lang
    M htdocs/langs/nl_BE/install.lang
    M htdocs/langs/nl_BE/interventions.lang
    M htdocs/langs/nl_BE/languages.lang
    M htdocs/langs/nl_BE/ldap.lang
    M htdocs/langs/nl_BE/mails.lang
    M htdocs/langs/nl_BE/main.lang
    M htdocs/langs/nl_BE/members.lang
    M htdocs/langs/nl_BE/orders.lang
    M htdocs/langs/nl_BE/oscommerce.lang
    M htdocs/langs/nl_BE/other.lang
    M htdocs/langs/nl_BE/paybox.lang
    M htdocs/langs/nl_BE/products.lang
    M htdocs/langs/nl_BE/projects.lang
    M htdocs/langs/nl_BE/propal.lang
    M htdocs/langs/nl_BE/sendings.lang
    M htdocs/langs/nl_BE/shop.lang
    M htdocs/langs/nl_BE/stocks.lang
    M htdocs/langs/nl_BE/suppliers.lang
    M htdocs/langs/nl_BE/trips.lang
    M htdocs/langs/nl_BE/users.lang
    M htdocs/langs/nl_BE/withdrawals.lang
    M htdocs/langs/pt_BR/admin.lang
    M htdocs/langs/pt_BR/agenda.lang
    M htdocs/langs/pt_BR/banks.lang
    M htdocs/langs/pt_BR/bills.lang
    M htdocs/langs/pt_BR/bookmarks.lang
    M htdocs/langs/pt_BR/boxes.lang
    M htdocs/langs/pt_BR/cashdesk.lang
    M htdocs/langs/pt_BR/categories.lang
    M htdocs/langs/pt_BR/commercial.lang
    M htdocs/langs/pt_BR/companies.lang
    M htdocs/langs/pt_BR/compta.lang
    M htdocs/langs/pt_BR/contracts.lang
    M htdocs/langs/pt_BR/cron.lang
    M htdocs/langs/pt_BR/deliveries.lang
    M htdocs/langs/pt_BR/dict.lang
    M htdocs/langs/pt_BR/donations.lang
    M htdocs/langs/pt_BR/ecm.lang
    M htdocs/langs/pt_BR/errors.lang
    M htdocs/langs/pt_BR/exports.lang
    M htdocs/langs/pt_BR/externalsite.lang
    M htdocs/langs/pt_BR/ftp.lang
    M htdocs/langs/pt_BR/help.lang
    M htdocs/langs/pt_BR/holiday.lang
    M htdocs/langs/pt_BR/install.lang
    M htdocs/langs/pt_BR/interventions.lang
    M htdocs/langs/pt_BR/languages.lang
    M htdocs/langs/pt_BR/ldap.lang
    M htdocs/langs/pt_BR/mailmanspip.lang
    M htdocs/langs/pt_BR/mails.lang
    M htdocs/langs/pt_BR/main.lang
    M htdocs/langs/pt_BR/margins.lang
    M htdocs/langs/pt_BR/members.lang
    M htdocs/langs/pt_BR/opensurvey.lang
    M htdocs/langs/pt_BR/orders.lang
    M htdocs/langs/pt_BR/oscommerce.lang
    M htdocs/langs/pt_BR/other.lang
    M htdocs/langs/pt_BR/paybox.lang
    M htdocs/langs/pt_BR/paypal.lang
    M htdocs/langs/pt_BR/products.lang
    M htdocs/langs/pt_BR/projects.lang
    M htdocs/langs/pt_BR/propal.lang
    M htdocs/langs/pt_BR/sendings.lang
    M htdocs/langs/pt_BR/shop.lang
    M htdocs/langs/pt_BR/sms.lang
    M htdocs/langs/pt_BR/stocks.lang
    M htdocs/langs/pt_BR/suppliers.lang
    M htdocs/langs/pt_BR/trips.lang
    M htdocs/langs/pt_BR/users.lang
    M htdocs/langs/pt_BR/withdrawals.lang
    M htdocs/langs/pt_BR/workflow.lang
    M htdocs/langs/ru_RU/admin.lang
    A test/phpunit/testemailing.txt

  Log Message:
  -----------
  Merge branch 'upstream/develop'


  Commit: 22bb789374983c37163643c13acab9caed2941ee
      
https://github.com/Dolibarr/dolibarr/commit/22bb789374983c37163643c13acab9caed2941ee
  Author: aspangaro <address@hidden>
  Date:   2014-05-29 (Thu, 29 May 2014)

  Changed paths:
    M htdocs/install/mysql/data/llx_accounting.sql

  Log Message:
  -----------
  Chart of accounts BE PCMN-BASE - Account_parent must be an int.


  Commit: aa4e9d5965abc8895e11ae42225541256c1ab2b3
      
https://github.com/Dolibarr/dolibarr/commit/aa4e9d5965abc8895e11ae42225541256c1ab2b3
  Author: aspangaro <address@hidden>
  Date:   2014-05-29 (Thu, 29 May 2014)

  Changed paths:
    M .scrutinizer.yml
    M ChangeLog
    M build/debian/README.howto
    M build/dmg/dolimamp/install.forced.php
    M build/makepack-dolibarr.pl
    M dev/examples/create_invoice.php
    A dev/rmphpclosingtag.sh
    M dev/skeletons/skeleton_class.class.php
    M dev/skeletons/skeleton_webservice_server.php
    M dev/translation/autotranslator.class.php
    M dev/translation/strip_language_file.php
    M htdocs/accountancy/class/accountancyaccount.class.php
    M htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
    M htdocs/adherents/card_subscriptions.php
    M htdocs/adherents/cartes/carte.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/class/adherent_type.class.php
    M htdocs/admin/agenda_extsites.php
    M htdocs/admin/barcode.php
    M htdocs/admin/boxes.php
    M htdocs/admin/compta.php
    M htdocs/admin/fichinter.php
    M htdocs/admin/index.php
    M htdocs/admin/mailing.php
    M htdocs/admin/mails.php
    M htdocs/admin/modules.php
    M htdocs/admin/orderdet_extrafields.php
    M htdocs/admin/osc-languages.php
    M htdocs/admin/supplierorder_extrafields.php
    M htdocs/admin/syslog.php
    M htdocs/admin/system/about.php
    M htdocs/admin/system/os.php
    M htdocs/admin/system/perf.php
    M htdocs/admin/system/phpinfo.php
    M htdocs/admin/system/web.php
    M htdocs/admin/tools/listsessions.php
    M htdocs/cashdesk/affContenu.php
    M htdocs/cashdesk/class/Auth.class.php
    M htdocs/cashdesk/class/Facturation.class.php
    M htdocs/cashdesk/facturation_verif.php
    M htdocs/cashdesk/index_verif.php
    M htdocs/cashdesk/validation.php
    M htdocs/comm/action/class/ical.class.php
    M htdocs/comm/action/index.php
    M htdocs/comm/contact.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/document.php
    M htdocs/comm/propal/list.php
    M htdocs/comm/prospect/list.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/contact.php
    M htdocs/commande/fiche.php
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/bank/account.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/admin/facturedet_cust_extrafields.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/document.php
    M htdocs/compta/localtax/clients.php
    M htdocs/compta/salaries/index.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contact/perso.php
    M htdocs/contrat/info.php
    M htdocs/core/ajax/ajaxdirpreview.php
    M htdocs/core/ajax/bankconciliate.php
    M htdocs/core/ajax/loadinplace.php
    M htdocs/core/boxes/box_actions.php
    M htdocs/core/class/antivir.class.php
    M htdocs/core/class/canvas.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/core/class/rssparser.class.php
    M htdocs/core/db/mysql.class.php
    M htdocs/core/db/mysqli.class.php
    M htdocs/core/db/pgsql.class.php
    M htdocs/core/filemanagerdol/connectors/php/basexml.php
    M htdocs/core/lib/agenda.lib.php
    M htdocs/core/lib/barcode.lib.php
    M htdocs/core/lib/contract.lib.php
    M htdocs/core/lib/fichinter.lib.php
    M htdocs/core/lib/fourn.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/invoice2.lib.php
    M htdocs/core/lib/mailmanspip.lib.php
    M htdocs/core/lib/member.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/security.lib.php
    M htdocs/core/lib/security2.lib.php
    M htdocs/core/lib/tax.lib.php
    M htdocs/core/lib/treeview.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/barcode/mod_barcode_product_standard.php
    M htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
    M htdocs/core/modules/commande/modules_commande.php
    M htdocs/core/modules/contract/mod_contract_serpis.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/core/modules/expedition/mod_expedition_safor.php
    M htdocs/core/modules/facture/mod_facture_terre.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
    M htdocs/core/modules/fichinter/mod_pacific.php
    M htdocs/core/modules/modImport.class.php
    M htdocs/core/modules/modNotification.class.php
    M htdocs/core/modules/modPaypal.class.php
    M htdocs/core/modules/modPrelevement.class.php
    M htdocs/core/modules/modProduct.class.php
    M htdocs/core/modules/modService.class.php
    M htdocs/core/modules/product/mod_codeproduct_elephant.php
    M htdocs/core/modules/project/modules_project.php
    M htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php
    M htdocs/core/modules/project/task/modules_task.php
    M htdocs/core/modules/supplier_order/modules_commandefournisseur.php
    M htdocs/expedition/contact.php
    M htdocs/expedition/fiche.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/fourn/commande/liste.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/fourn/facture/impayees.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/holiday/admin/holiday.php
    M htdocs/holiday/define_holiday.php
    A htdocs/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.js
    M htdocs/install/check.php
    M htdocs/install/mysql/migration/3.4.0-3.5.0.sql
    M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
    M htdocs/install/upgrade.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/livraison/fiche.php
    M htdocs/master.inc.php
    M htdocs/opensurvey/class/opensurveysondage.class.php
    M htdocs/opensurvey/list.php
    M htdocs/opensurvey/public/studs.php
    M htdocs/opensurvey/wizard/choix_date.php
    M htdocs/opensurvey/wizard/create_survey.php
    M htdocs/paypal/admin/paypal.php
    M htdocs/product/class/product.class.php
    M htdocs/product/document.php
    M htdocs/product/fiche.php
    M htdocs/product/liste.php
    M htdocs/product/stats/facture_fournisseur.php
    M htdocs/product/stats/propal.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/valo.php
    M htdocs/projet/activity/index.php
    M htdocs/projet/admin/project_extrafields.php
    M htdocs/projet/document.php
    M htdocs/projet/element.php
    M htdocs/projet/jsgantt_language.js.php
    M htdocs/projet/tasks/index.php
    M htdocs/public/emailing/mailing-unsubscribe.php
    M htdocs/public/paybox/index.php
    M htdocs/resource/add.php
    M htdocs/resource/card.php
    M htdocs/resource/class/html.formresource.class.php
    M htdocs/resource/class/resource.class.php
    M htdocs/societe/ajaxcountries.php
    M htdocs/societe/canvas/individual/actions_card_individual.class.php
    M htdocs/societe/checkvat/checkVatPopup.php
    M htdocs/societe/class/client.class.php
    M htdocs/societe/notify/fiche.php
    M htdocs/support/inc.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/user/clicktodial.php
    M htdocs/webservices/server_category.php
    M scripts/company/export-contacts-xls-example.php
    M scripts/user/sync_users_ldap2dolibarr.php
    M test/phpunit/AllTests.php
    M test/phpunit/BuildDocTest.php
    M test/phpunit/CategorieTest.php
    M test/phpunit/ChargeSocialesTest.php
    M test/phpunit/ContactTest.php
    M test/phpunit/CoreTest.php
    M test/phpunit/DateLibTest.php
    M test/phpunit/DiscountTest.php
    M test/phpunit/FactureFournisseurTest.php
    M test/phpunit/FactureTestRounding.php
    M test/phpunit/FilesLibTest.php
    M test/phpunit/Functions2LibTest.php
    M test/phpunit/FunctionsLibTest.php
    M test/phpunit/HolidayTest.php
    M test/phpunit/ImportTest.php
    M test/phpunit/JsonLibTest.php
    M test/phpunit/LangTest.php
    M test/phpunit/MarginsLibTest.php
    M test/phpunit/NumberingModulesTest.php
    M test/phpunit/PdfDocTest.php
    M test/phpunit/ProjectTest.php
    M test/phpunit/ScriptsTest.php
    M test/phpunit/SecurityTest.php
    M test/phpunit/UserGroupTest.php
    M test/phpunit/WebservicesOrdersTest.php
    M test/phpunit/WebservicesOtherTest.php
    M test/phpunit/WebservicesProductsTest.php
    M test/phpunit/WebservicesUserTest.php
    M test/phpunit/XCalLibTest.php

  Log Message:
  -----------
  Merge branch 'Upstream/develop'


  Commit: 27f0cbdb831605670d0c56ccc2b19c2209b00ce0
      
https://github.com/Dolibarr/dolibarr/commit/27f0cbdb831605670d0c56ccc2b19c2209b00ce0
  Author: aspangaro <address@hidden>
  Date:   2014-05-30 (Fri, 30 May 2014)

  Changed paths:
    M dev/deduplicatefilelinesrecursively.sh
    M htdocs/comm/action/fiche.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/compta/facture.php
    M htdocs/core/class/html.form.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/fiche.php
    M htdocs/install/mysql/tables/llx_commande.sql
    M htdocs/install/mysql/tables/llx_expedition.sql
    M htdocs/install/mysql/tables/llx_facture.sql
    M htdocs/install/mysql/tables/llx_livraison.sql
    M htdocs/install/mysql/tables/llx_propal.sql
    M htdocs/install/mysql/tables/llx_societe.sql
    M htdocs/install/mysql/tables/llx_user.sql
    M htdocs/langs/ar_SA/admin.lang
    M htdocs/langs/ar_SA/contracts.lang
    M htdocs/langs/ar_SA/exports.lang
    M htdocs/langs/ar_SA/holiday.lang
    M htdocs/langs/ar_SA/mails.lang
    M htdocs/langs/ar_SA/main.lang
    M htdocs/langs/ar_SA/products.lang
    M htdocs/langs/ar_SA/stocks.lang
    M htdocs/langs/bg_BG/admin.lang
    M htdocs/langs/bg_BG/contracts.lang
    M htdocs/langs/bg_BG/exports.lang
    M htdocs/langs/bg_BG/holiday.lang
    M htdocs/langs/bg_BG/mails.lang
    M htdocs/langs/bg_BG/main.lang
    M htdocs/langs/bg_BG/products.lang
    M htdocs/langs/bg_BG/stocks.lang
    M htdocs/langs/bs_BA/admin.lang
    M htdocs/langs/bs_BA/contracts.lang
    M htdocs/langs/bs_BA/exports.lang
    M htdocs/langs/bs_BA/holiday.lang
    M htdocs/langs/bs_BA/mails.lang
    M htdocs/langs/bs_BA/main.lang
    M htdocs/langs/bs_BA/products.lang
    M htdocs/langs/bs_BA/stocks.lang
    M htdocs/langs/ca_ES/admin.lang
    M htdocs/langs/ca_ES/contracts.lang
    M htdocs/langs/ca_ES/exports.lang
    M htdocs/langs/ca_ES/holiday.lang
    M htdocs/langs/ca_ES/mails.lang
    M htdocs/langs/ca_ES/main.lang
    M htdocs/langs/ca_ES/products.lang
    M htdocs/langs/ca_ES/stocks.lang
    M htdocs/langs/cs_CZ/admin.lang
    M htdocs/langs/cs_CZ/contracts.lang
    M htdocs/langs/cs_CZ/exports.lang
    M htdocs/langs/cs_CZ/holiday.lang
    M htdocs/langs/cs_CZ/mails.lang
    M htdocs/langs/cs_CZ/main.lang
    M htdocs/langs/cs_CZ/products.lang
    M htdocs/langs/cs_CZ/stocks.lang
    M htdocs/langs/da_DK/admin.lang
    M htdocs/langs/da_DK/contracts.lang
    M htdocs/langs/da_DK/exports.lang
    M htdocs/langs/da_DK/holiday.lang
    M htdocs/langs/da_DK/mails.lang
    M htdocs/langs/da_DK/main.lang
    M htdocs/langs/da_DK/products.lang
    M htdocs/langs/da_DK/stocks.lang
    M htdocs/langs/de_DE/admin.lang
    M htdocs/langs/de_DE/contracts.lang
    M htdocs/langs/de_DE/exports.lang
    M htdocs/langs/de_DE/holiday.lang
    M htdocs/langs/de_DE/mails.lang
    M htdocs/langs/de_DE/main.lang
    M htdocs/langs/de_DE/products.lang
    M htdocs/langs/de_DE/stocks.lang
    M htdocs/langs/el_GR/admin.lang
    M htdocs/langs/el_GR/bills.lang
    M htdocs/langs/el_GR/contracts.lang
    M htdocs/langs/el_GR/exports.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/main.lang
    M htdocs/langs/el_GR/products.lang
    M htdocs/langs/el_GR/sms.lang
    M htdocs/langs/el_GR/stocks.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/contracts.lang
    M htdocs/langs/es_ES/exports.lang
    M htdocs/langs/es_ES/holiday.lang
    M htdocs/langs/es_ES/mails.lang
    M htdocs/langs/es_ES/main.lang
    M htdocs/langs/es_ES/products.lang
    M htdocs/langs/es_ES/stocks.lang
    M htdocs/langs/et_EE/admin.lang
    M htdocs/langs/et_EE/contracts.lang
    M htdocs/langs/et_EE/exports.lang
    M htdocs/langs/et_EE/holiday.lang
    M htdocs/langs/et_EE/mails.lang
    M htdocs/langs/et_EE/main.lang
    M htdocs/langs/et_EE/products.lang
    M htdocs/langs/et_EE/stocks.lang
    M htdocs/langs/eu_ES/admin.lang
    M htdocs/langs/eu_ES/contracts.lang
    M htdocs/langs/eu_ES/exports.lang
    M htdocs/langs/eu_ES/holiday.lang
    M htdocs/langs/eu_ES/mails.lang
    M htdocs/langs/eu_ES/main.lang
    M htdocs/langs/eu_ES/products.lang
    M htdocs/langs/eu_ES/stocks.lang
    M htdocs/langs/fa_IR/admin.lang
    M htdocs/langs/fa_IR/agenda.lang
    M htdocs/langs/fa_IR/banks.lang
    M htdocs/langs/fa_IR/bills.lang
    M htdocs/langs/fa_IR/boxes.lang
    M htdocs/langs/fa_IR/cashdesk.lang
    M htdocs/langs/fa_IR/categories.lang
    M htdocs/langs/fa_IR/commercial.lang
    M htdocs/langs/fa_IR/companies.lang
    M htdocs/langs/fa_IR/compta.lang
    M htdocs/langs/fa_IR/contracts.lang
    M htdocs/langs/fa_IR/cron.lang
    M htdocs/langs/fa_IR/deliveries.lang
    M htdocs/langs/fa_IR/dict.lang
    M htdocs/langs/fa_IR/donations.lang
    M htdocs/langs/fa_IR/ecm.lang
    M htdocs/langs/fa_IR/errors.lang
    M htdocs/langs/fa_IR/exports.lang
    M htdocs/langs/fa_IR/externalsite.lang
    M htdocs/langs/fa_IR/ftp.lang
    M htdocs/langs/fa_IR/help.lang
    M htdocs/langs/fa_IR/holiday.lang
    M htdocs/langs/fa_IR/install.lang
    M htdocs/langs/fa_IR/interventions.lang
    M htdocs/langs/fa_IR/languages.lang
    M htdocs/langs/fa_IR/mailmanspip.lang
    M htdocs/langs/fa_IR/mails.lang
    M htdocs/langs/fa_IR/main.lang
    M htdocs/langs/fa_IR/margins.lang
    M htdocs/langs/fa_IR/members.lang
    M htdocs/langs/fa_IR/opensurvey.lang
    M htdocs/langs/fa_IR/orders.lang
    M htdocs/langs/fa_IR/other.lang
    M htdocs/langs/fa_IR/paybox.lang
    M htdocs/langs/fa_IR/paypal.lang
    M htdocs/langs/fa_IR/products.lang
    M htdocs/langs/fa_IR/projects.lang
    M htdocs/langs/fa_IR/propal.lang
    M htdocs/langs/fa_IR/salaries.lang
    M htdocs/langs/fa_IR/sendings.lang
    M htdocs/langs/fa_IR/sms.lang
    M htdocs/langs/fa_IR/stocks.lang
    M htdocs/langs/fa_IR/suppliers.lang
    M htdocs/langs/fa_IR/trips.lang
    M htdocs/langs/fa_IR/users.lang
    M htdocs/langs/fa_IR/withdrawals.lang
    M htdocs/langs/fa_IR/workflow.lang
    M htdocs/langs/fi_FI/admin.lang
    M htdocs/langs/fi_FI/contracts.lang
    M htdocs/langs/fi_FI/exports.lang
    M htdocs/langs/fi_FI/holiday.lang
    M htdocs/langs/fi_FI/mails.lang
    M htdocs/langs/fi_FI/main.lang
    M htdocs/langs/fi_FI/products.lang
    M htdocs/langs/fi_FI/stocks.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/contracts.lang
    M htdocs/langs/fr_FR/exports.lang
    M htdocs/langs/fr_FR/holiday.lang
    M htdocs/langs/fr_FR/mails.lang
    M htdocs/langs/fr_FR/main.lang
    M htdocs/langs/fr_FR/products.lang
    M htdocs/langs/fr_FR/stocks.lang
    M htdocs/langs/he_IL/admin.lang
    M htdocs/langs/he_IL/contracts.lang
    M htdocs/langs/he_IL/exports.lang
    M htdocs/langs/he_IL/holiday.lang
    M htdocs/langs/he_IL/mails.lang
    M htdocs/langs/he_IL/main.lang
    M htdocs/langs/he_IL/products.lang
    M htdocs/langs/he_IL/stocks.lang
    M htdocs/langs/hr_HR/admin.lang

  Log Message:
  -----------
  Merge branch 'Upstream/develop'


  Commit: 576978212e7963877bde7def235bc8b64be29551
      
https://github.com/Dolibarr/dolibarr/commit/576978212e7963877bde7def235bc8b64be29551
  Author: aspangaro <address@hidden>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M ChangeLog
    M build/debian/changelog
    M build/debian/control
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M htdocs/admin/facture.php
    M htdocs/admin/fichinter.php
    M htdocs/admin/supplier_invoice.php
    M htdocs/admin/supplier_order.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/remise.php
    M htdocs/compta/bank/account.php
    M htdocs/compta/bank/index.php
    M htdocs/compta/facture.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/fileupload.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/security2.lib.php
    M htdocs/core/modules/modSalaries.class.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/fiche.php
    M htdocs/fichinter/fiche.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/fourn/paiement/fiche.php
    M htdocs/langs/ar_SA/admin.lang
    M htdocs/langs/ar_SA/languages.lang
    M htdocs/langs/bg_BG/admin.lang
    M htdocs/langs/bg_BG/languages.lang
    M htdocs/langs/bs_BA/admin.lang
    M htdocs/langs/bs_BA/languages.lang
    M htdocs/langs/ca_ES/admin.lang
    M htdocs/langs/ca_ES/languages.lang
    M htdocs/langs/cs_CZ/admin.lang
    M htdocs/langs/cs_CZ/companies.lang
    M htdocs/langs/cs_CZ/languages.lang
    M htdocs/langs/da_DK/admin.lang
    M htdocs/langs/da_DK/languages.lang
    M htdocs/langs/de_DE/admin.lang
    M htdocs/langs/de_DE/languages.lang
    M htdocs/langs/el_GR/admin.lang
    M htdocs/langs/el_GR/contracts.lang
    M htdocs/langs/el_GR/exports.lang
    M htdocs/langs/el_GR/languages.lang
    M htdocs/langs/el_GR/main.lang
    M htdocs/langs/el_GR/products.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/languages.lang
    A htdocs/langs/es_DO/admin.lang
    A htdocs/langs/es_DO/companies.lang
    A htdocs/langs/es_DO/compta.lang
    A htdocs/langs/es_DO/main.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/languages.lang
    M htdocs/langs/es_ES/suppliers.lang
    M htdocs/langs/et_EE/admin.lang
    M htdocs/langs/et_EE/languages.lang
    M htdocs/langs/eu_ES/admin.lang
    M htdocs/langs/eu_ES/languages.lang
    M htdocs/langs/fa_IR/admin.lang
    M htdocs/langs/fa_IR/agenda.lang
    M htdocs/langs/fa_IR/banks.lang
    M htdocs/langs/fa_IR/bills.lang
    M htdocs/langs/fa_IR/boxes.lang
    M htdocs/langs/fa_IR/categories.lang
    M htdocs/langs/fa_IR/commercial.lang
    M htdocs/langs/fa_IR/companies.lang
    M htdocs/langs/fa_IR/compta.lang
    M htdocs/langs/fa_IR/contracts.lang
    M htdocs/langs/fa_IR/cron.lang
    M htdocs/langs/fa_IR/deliveries.lang
    M htdocs/langs/fa_IR/ecm.lang
    M htdocs/langs/fa_IR/errors.lang
    M htdocs/langs/fa_IR/exports.lang
    M htdocs/langs/fa_IR/ftp.lang
    M htdocs/langs/fa_IR/help.lang
    M htdocs/langs/fa_IR/holiday.lang
    M htdocs/langs/fa_IR/install.lang
    M htdocs/langs/fa_IR/interventions.lang
    M htdocs/langs/fa_IR/languages.lang
    M htdocs/langs/fa_IR/mailmanspip.lang
    M htdocs/langs/fa_IR/mails.lang
    M htdocs/langs/fa_IR/main.lang
    M htdocs/langs/fa_IR/members.lang
    M htdocs/langs/fa_IR/opensurvey.lang
    M htdocs/langs/fa_IR/orders.lang
    M htdocs/langs/fa_IR/other.lang
    M htdocs/langs/fa_IR/paybox.lang
    M htdocs/langs/fa_IR/paypal.lang
    M htdocs/langs/fa_IR/products.lang
    M htdocs/langs/fa_IR/projects.lang
    M htdocs/langs/fa_IR/propal.lang
    M htdocs/langs/fa_IR/sendings.lang
    M htdocs/langs/fa_IR/sms.lang
    M htdocs/langs/fa_IR/stocks.lang
    M htdocs/langs/fa_IR/suppliers.lang
    M htdocs/langs/fa_IR/users.lang
    M htdocs/langs/fa_IR/withdrawals.lang
    M htdocs/langs/fi_FI/admin.lang
    M htdocs/langs/fi_FI/languages.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/languages.lang
    M htdocs/langs/he_IL/admin.lang
    M htdocs/langs/he_IL/languages.lang
    M htdocs/langs/hr_HR/admin.lang
    M htdocs/langs/hr_HR/agenda.lang
    M htdocs/langs/hr_HR/bills.lang
    M htdocs/langs/hr_HR/companies.lang
    M htdocs/langs/hr_HR/contracts.lang
    M htdocs/langs/hr_HR/deliveries.lang
    M htdocs/langs/hr_HR/languages.lang
    M htdocs/langs/hr_HR/main.lang
    M htdocs/langs/hr_HR/products.lang
    M htdocs/langs/hr_HR/propal.lang
    M htdocs/langs/hu_HU/admin.lang
    M htdocs/langs/hu_HU/languages.lang
    M htdocs/langs/id_ID/admin.lang
    M htdocs/langs/id_ID/languages.lang
    M htdocs/langs/is_IS/admin.lang
    M htdocs/langs/is_IS/languages.lang
    M htdocs/langs/it_IT/admin.lang
    M htdocs/langs/it_IT/languages.lang
    M htdocs/langs/ja_JP/admin.lang
    M htdocs/langs/ja_JP/languages.lang
    M htdocs/langs/ko_KR/admin.lang
    M htdocs/langs/ko_KR/languages.lang
    M htdocs/langs/lt_LT/admin.lang
    M htdocs/langs/lt_LT/languages.lang
    M htdocs/langs/lv_LV/admin.lang
    M htdocs/langs/lv_LV/languages.lang
    M htdocs/langs/mk_MK/admin.lang
    M htdocs/langs/mk_MK/languages.lang
    M htdocs/langs/nb_NO/admin.lang
    M htdocs/langs/nb_NO/languages.lang
    M htdocs/langs/nl_NL/admin.lang
    M htdocs/langs/nl_NL/languages.lang
    M htdocs/langs/pl_PL/admin.lang
    M htdocs/langs/pl_PL/languages.lang
    M htdocs/langs/pt_PT/admin.lang
    M htdocs/langs/pt_PT/languages.lang
    M htdocs/langs/ro_RO/admin.lang
    M htdocs/langs/ro_RO/languages.lang
    M htdocs/langs/ru_RU/admin.lang
    M htdocs/langs/ru_RU/languages.lang
    M htdocs/langs/sk_SK/admin.lang
    M htdocs/langs/sk_SK/languages.lang
    M htdocs/langs/sl_SI/admin.lang
    M htdocs/langs/sl_SI/install.lang
    M htdocs/langs/sl_SI/languages.lang
    M htdocs/langs/sq_AL/admin.lang
    M htdocs/langs/sq_AL/languages.lang
    M htdocs/langs/sv_SE/admin.lang
    M htdocs/langs/sv_SE/languages.lang
    M htdocs/langs/th_TH/admin.lang
    M htdocs/langs/th_TH/languages.lang
    M htdocs/langs/tr_TR/admin.lang
    M htdocs/langs/tr_TR/contracts.lang
    M htdocs/langs/tr_TR/install.lang
    M htdocs/langs/tr_TR/languages.lang
    M htdocs/langs/uk_UA/admin.lang
    M htdocs/langs/uk_UA/languages.lang
    M htdocs/langs/uz_UZ/admin.lang
    M htdocs/langs/uz_UZ/languages.lang
    M htdocs/langs/vi_VN/admin.lang
    M htdocs/langs/vi_VN/languages.lang
    M htdocs/langs/zh_CN/admin.lang
    M htdocs/langs/zh_CN/languages.lang
    M htdocs/langs/zh_TW/admin.lang
    M htdocs/langs/zh_TW/languages.lang
    M htdocs/main.inc.php
    M htdocs/master.inc.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/contact.php
    M htdocs/projet/element.php
    A htdocs/projet/ganttchart.inc.php
    R htdocs/projet/ganttchart.php
    M htdocs/projet/ganttview.php
    M htdocs/projet/note.php
    M htdocs/projet/tasks.php
    M htdocs/projet/tasks/contact.php
    M htdocs/projet/tasks/document.php
    M htdocs/projet/tasks/note.php
    M htdocs/projet/tasks/task.php
    M htdocs/projet/tasks/time.php
    M htdocs/public/demo/index.php
    M htdocs/public/members/new.php
    M htdocs/public/members/public_card.php
    M htdocs/public/members/public_list.php
    M htdocs/public/paybox/newpayment.php
    M htdocs/public/paybox/paymentko.php
    M htdocs/public/paybox/paymentok.php
    M htdocs/public/paypal/newpayment.php
    M htdocs/public/paypal/paymentko.php
    M htdocs/public/paypal/paymentok.php
    M htdocs/societe/soc.php
    M htdocs/user/class/user.class.php
    M htdocs/user/class/usergroup.class.php
    M htdocs/user/fiche.php
    M htdocs/user/hierarchy.php
    M htdocs/user/home.php
    M htdocs/user/index.php
    M test/phpunit/LangTest.php

  Log Message:
  -----------
  Merge branch 'Upstream/develop'


  Commit: 54a79c2b3448b16857f43aa7fd9403a7637f32d5
      
https://github.com/Dolibarr/dolibarr/commit/54a79c2b3448b16857f43aa7fd9403a7637f32d5
  Author: aspangaro <address@hidden>
  Date:   2014-06-24 (Tue, 24 Jun 2014)

  Changed paths:
    M ChangeLog
    M build/debian/changelog
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M dev/vagrant/README.md
    M dev/vagrant/dolibarrdev/Vagrantfile
    M dev/vagrant/dolibarrdev/puphpet/config.yaml
    A dev/vagrant/dolibarrdev/puphpet/files/dot/.bash_git
    M dev/vagrant/dolibarrdev/puphpet/files/dot/.gitignore
    M dev/vagrant/dolibarrdev/puphpet/puppet/Puppetfile
    M dev/vagrant/dolibarrdev/puphpet/puppet/manifest.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.fixtures.yml
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.nodeset.yml
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.puppet-lint.rc
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.travis.yml
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/CHANGELOG.md
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/CONTRIBUTING.md
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/Gemfile
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/LICENSE
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/Modulefile
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/README.md
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/README.passenger.md
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/Rakefile
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/files/httpd
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/a2mod.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/gentoo.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/modfix.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/redhat.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/type/a2mod.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/balancer.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/balancermember.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/confd/no_accf.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/default_confd_files.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/default_mods.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/default_mods/load.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/dev.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/init.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/listen.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/actions.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/alias.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/auth_basic.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/auth_kerb.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/authnz_ldap.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/autoindex.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/cache.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/cgi.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/cgid.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dav.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dav_fs.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dav_svn.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/deflate.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dev.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dir.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/disk_cache.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/event.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/expires.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/fastcgi.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/fcgid.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/headers.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/include.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/info.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/itk.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/ldap.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/mime.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/mime_magic.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/negotiation.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/nss.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/pagespeed.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/passenger.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/perl.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/peruser.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/php.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/prefork.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_ajp.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_balancer.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_html.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_http.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/python.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/reqtimeout.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/rewrite.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/rpaf.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/setenvif.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/speling.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/ssl.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/status.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/suexec.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/suphp.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/userdir.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/vhost_alias.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/worker.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/wsgi.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/xsendfile.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mpm.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/namevirtualhost.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/package.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/params.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/peruser/multiplexer.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/peruser/processor.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/php.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/proxy.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/python.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/service.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/ssl.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/version.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/vhost.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/metadata.json
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/apache_parameters_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/apache_ssl_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/basic_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/class_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/default_mods_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/itk_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_dav_svn_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_deflate_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_fcgid_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_mime_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_pagespeed_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_passenger_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_php_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_proxy_html_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_suphp_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-59-x64.yml
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-64-x64-pe.yml
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-64-x64.yml
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-65-x64.yml
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-607-x64.yml
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-70rc1-x64.yml
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-73-i386.yml
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-73-x64.yml
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/default.yml
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/fedora-18-x64.yml
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/sles-11sp1-x64.yml
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/prefork_worker_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/service_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/unsupported_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/version.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/vhost_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/apache_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/dev_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/auth_kerb_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/authnz_ldap_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/dav_svn_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/deflate_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/dev_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/dir_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/event_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/fastcgi_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/fcgid_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/info_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/itk_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/mime_magic_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/mime_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/pagespeed_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/passenger_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/perl_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/peruser_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/php_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/prefork_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/proxy_html_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/python_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/rpaf_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/speling_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/ssl_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/status_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/suphp_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/worker_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/wsgi_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/params_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/service_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/defines/mod_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/defines/vhost_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/fixtures/files/spec
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/fixtures/modules/site_apache/templates/fake.conf.erb
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/spec.opts
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/spec_helper.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/spec_helper_acceptance.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/unit/provider/a2mod/gentoo_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/confd/no-accf.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/httpd.conf.erb
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/listen.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/alias.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/authnz_ldap.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/autoindex.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/cgid.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/dav_fs.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/deflate.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/dir.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/disk_cache.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/event.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/fastcgi.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/fcgid.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/info.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/itk.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/ldap.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/load.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/mime.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/mime_magic.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/mpm_event.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/negotiation.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/nss.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/pagespeed.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/passenger.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/peruser.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/php5.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/prefork.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/proxy.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/proxy_html.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/reqtimeout.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/rpaf.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/setenvif.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/ssl.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/status.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/suphp.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/userdir.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/worker.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/wsgi.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/namevirtualhost.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/ports_header.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost.conf.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_action.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_aliases.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_block.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_custom_fragment.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_directories.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_error_document.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_fastcgi.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_header.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_itk.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_php_admin.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_proxy.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_rack.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_redirect.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_requestheader.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_rewrite.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_scriptalias.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_serveralias.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_setenv.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_ssl.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_suexec.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_suphp.erb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_wsgi.erb
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/apache.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/dev.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/init.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/mod_load_params.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/mods.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/mods_custom.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/php.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost_directories.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost_ip_based.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost_ssl.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhosts_without_listen.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.fixtures.yml
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.project
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.puppet-lint.rc
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.travis.yml
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/CHANGELOG.md
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/Gemfile
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/LICENSE
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/Modulefile
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/README.md
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/Rakefile
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/backports.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/builddep.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/conf.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/debian/testing.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/debian/unstable.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/force.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/init.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/key.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/params.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/pin.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/ppa.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/release.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/source.pp
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/unattended_upgrades.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/update.pp
    A dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/metadata.json
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_builddep_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_key_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_ppa_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_source_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/backports_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/class_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/conf_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/force_spec.rb
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/debian-70rc1-x64.yml
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/default.yml
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
    A 
dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml

  Log Message:
  -----------
  Merge branch 'Upstream/develop'


  Commit: f336becdb371a18fd675bc18e965b2c125742bb1
      
https://github.com/Dolibarr/dolibarr/commit/f336becdb371a18fd675bc18e965b2c125742bb1
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

  Changed paths:
    M htdocs/install/mysql/data/llx_accounting.sql

  Log Message:
  -----------
  Merge pull request #1635 from aspangaro/develop-accounting

Chart of accounts BE PCMN-BASE - Account_parent must be an int.


Compare: 
https://github.com/Dolibarr/dolibarr/compare/a2f610ffbe96...f336becdb371

reply via email to

[Prev in Thread] Current Thread [Next in Thread]