[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] b8969e: Prepare 3.6.1
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] b8969e: Prepare 3.6.1 |
|
Date: |
Sat, 27 Sep 2014 17:48:54 -0700 |
Branch: refs/heads/3.6_backported
Home: https://github.com/Dolibarr/dolibarr
Commit: b8969edcc5e367f840523d9960eb416facbaaf61
https://github.com/Dolibarr/dolibarr/commit/b8969edcc5e367f840523d9960eb416facbaaf61
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-27 (Sat, 27 Sep 2014)
Changed paths:
M build/debian/changelog
M build/exe/doliwamp/doliwamp.iss
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/filefunc.inc.php
Log Message:
-----------
Prepare 3.6.1
Commit: 7dcaa6121863d5115adb03666c4653df91894d6a
https://github.com/Dolibarr/dolibarr/commit/7dcaa6121863d5115adb03666c4653df91894d6a
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-27 (Sat, 27 Sep 2014)
Changed paths:
M build/makepack-howto.txt
Log Message:
-----------
Prepare 3.6.1
Commit: e1ba6ccfc6d71b79c001dbd056afe7659b0c17dc
https://github.com/Dolibarr/dolibarr/commit/e1ba6ccfc6d71b79c001dbd056afe7659b0c17dc
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-27 (Sat, 27 Sep 2014)
Changed paths:
M htdocs/projet/activity/list.php
M htdocs/webservices/server_invoice.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: 05f83dddf09464053e17a5072f5febc8345eb2dd
https://github.com/Dolibarr/dolibarr/commit/05f83dddf09464053e17a5072f5febc8345eb2dd
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-27 (Sat, 27 Sep 2014)
Changed paths:
M build/makepack-dolibarr.pl
Log Message:
-----------
Fix: packager
Commit: e8b7c9c6bdad044e675e05484d29d1f24277f348
https://github.com/Dolibarr/dolibarr/commit/e8b7c9c6bdad044e675e05484d29d1f24277f348
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-27 (Sat, 27 Sep 2014)
Changed paths:
M htdocs/adherents/canvas/actions_adherentcard_common.class.php
M htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
M htdocs/comm/action/index.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/contact/canvas/actions_contactcard_common.class.php
M htdocs/contact/canvas/default/actions_contactcard_default.class.php
M htdocs/core/class/canvas.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/hookmanager.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/class/ldap.class.php
M htdocs/core/class/link.class.php
M htdocs/core/class/menubase.class.php
M htdocs/core/class/rssparser.class.php
M htdocs/core/db/DoliDB.class.php
M htdocs/core/lib/admin.lib.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/lib/project.lib.php
M htdocs/core/lib/treeview.lib.php
M htdocs/core/lib/ws.lib.php
M htdocs/core/menus/standard/auguria.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/action/rapport.pdf.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/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
M htdocs/core/modules/contract/doc/pdf_strato.modules.php
M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.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/livraison/pdf/pdf_typhon.modules.php
M htdocs/core/modules/member/doc/pdf_standard.class.php
M htdocs/core/modules/modSalaries.class.php
M htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
M htdocs/core/modules/product/mod_codeproduct_elephant.php
M htdocs/core/modules/product/mod_codeproduct_leopard.php
M htdocs/core/modules/project/pdf/pdf_baleine.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/mod_codeclient_elephant.php
M htdocs/core/modules/societe/mod_codeclient_leopard.php
M htdocs/core/modules/societe/mod_codeclient_monkey.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/imports/import.php
M htdocs/main.inc.php
M htdocs/product/canvas/product/actions_card_product.class.php
M htdocs/product/canvas/service/actions_card_service.class.php
M htdocs/resource/class/actions_resource.class.php
M htdocs/societe/canvas/actions_card_common.class.php
M htdocs/societe/canvas/company/actions_card_company.class.php
M htdocs/societe/canvas/individual/actions_card_individual.class.php
M htdocs/societe/class/societe.class.php
M htdocs/user/class/user.class.php
M test/phpunit/FactureRecTest.php
M test/phpunit/FactureTest.php
M test/phpunit/UserTest.php
Log Message:
-----------
Fix: doxygen
Commit: 5fdd798e9128e0b0ffdf165b6acf059a71164b7d
https://github.com/Dolibarr/dolibarr/commit/5fdd798e9128e0b0ffdf165b6acf059a71164b7d
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-27 (Sat, 27 Sep 2014)
Changed paths:
M htdocs/admin/commande.php
M htdocs/admin/menus/other.php
M htdocs/admin/stock.php
M htdocs/admin/system/database.php
M htdocs/admin/system/dbtable.php
M htdocs/admin/system/dolibarr.php
M htdocs/admin/system/index.php
M htdocs/admin/tools/eaccelerator.php
M htdocs/admin/tools/purge.php
M htdocs/admin/tools/update.php
M htdocs/admin/translation.php
M htdocs/admin/workflow.php
M htdocs/cashdesk/affIndex.php
M htdocs/cashdesk/facturation.php
M htdocs/cashdesk/tpl/menu.tpl.php
M htdocs/categories/viewcat.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/fiche.php
M htdocs/commande/customer.php
M htdocs/compta/facture/apercu.php
M htdocs/core/actions_sendmails.inc.php
M htdocs/core/actions_setnotes.inc.php
M htdocs/core/class/dolprintipp.class.php
M htdocs/core/lib/holiday.lib.php
M htdocs/core/lib/product.lib.php
M htdocs/core/lib/trip.lib.php
M htdocs/core/lib/usergroups.lib.php
M htdocs/core/login/functions_empty.php
M htdocs/core/login/functions_forceuser.php
M htdocs/core/login/functions_http.php
M htdocs/core/login/functions_ldap.php
M htdocs/core/login/functions_openid.php
M htdocs/core/menus/standard/auguria.lib.php
M htdocs/core/modules/propale/modules_propale.php
M htdocs/fichinter/document.php
M htdocs/holiday/define_holiday.php
M htdocs/langs/en_US/compta.lang
M htdocs/livraison/class/livraison.class.php
M htdocs/opensurvey/fonctions.php
M htdocs/opensurvey/results.php
M htdocs/printipp/admin/printipp.php
M htdocs/societe/ajaxcompanies.php
M htdocs/societe/canvas/actions_card_common.class.php
M test/phpunit/CommandeFournisseurTest.php
M test/phpunit/CommandeTest.php
M test/phpunit/CommonObjectTest.php
M test/phpunit/CompanyBankAccountTest.php
M test/phpunit/EntrepotTest.php
M test/phpunit/ExportTest.php
M test/phpunit/FactureRecTest.php
M test/phpunit/FactureTest.php
M test/phpunit/FunctionsLibTest.php
M test/phpunit/PropalTest.php
M test/phpunit/SocieteTest.php
M test/phpunit/UserTest.php
M test/phpunit/WebservicesInvoicesTest.php
M test/phpunit/WebservicesThirdpartyTest.php
Log Message:
-----------
Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on
parameter).
Commit: 7a5c2cf79166a66cbb97b10520280e088d3c3a03
https://github.com/Dolibarr/dolibarr/commit/7a5c2cf79166a66cbb97b10520280e088d3c3a03
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-28 (Sun, 28 Sep 2014)
Changed paths:
M build/debian/changelog
M build/exe/doliwamp/doliwamp.iss
M build/makepack-dolibarr.pl
M build/makepack-howto.txt
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/adherents/canvas/actions_adherentcard_common.class.php
M htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
M htdocs/admin/commande.php
M htdocs/admin/menus/other.php
M htdocs/admin/stock.php
M htdocs/admin/system/database.php
M htdocs/admin/system/dbtable.php
M htdocs/admin/system/dolibarr.php
M htdocs/admin/system/index.php
M htdocs/admin/tools/eaccelerator.php
M htdocs/admin/tools/purge.php
M htdocs/admin/tools/update.php
M htdocs/admin/translation.php
M htdocs/admin/workflow.php
M htdocs/cashdesk/affIndex.php
M htdocs/cashdesk/facturation.php
M htdocs/cashdesk/tpl/menu.tpl.php
M htdocs/categories/viewcat.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/index.php
M htdocs/comm/fiche.php
M htdocs/commande/customer.php
M htdocs/compta/facture/apercu.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/contact/canvas/actions_contactcard_common.class.php
M htdocs/contact/canvas/default/actions_contactcard_default.class.php
M htdocs/core/actions_sendmails.inc.php
M htdocs/core/actions_setnotes.inc.php
M htdocs/core/class/canvas.class.php
M htdocs/core/class/dolprintipp.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/hookmanager.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/class/ldap.class.php
M htdocs/core/class/link.class.php
M htdocs/core/class/menubase.class.php
M htdocs/core/class/rssparser.class.php
M htdocs/core/db/DoliDB.class.php
M htdocs/core/lib/admin.lib.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/lib/holiday.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/lib/product.lib.php
M htdocs/core/lib/project.lib.php
M htdocs/core/lib/treeview.lib.php
M htdocs/core/lib/trip.lib.php
M htdocs/core/lib/usergroups.lib.php
M htdocs/core/lib/ws.lib.php
M htdocs/core/login/functions_empty.php
M htdocs/core/login/functions_forceuser.php
M htdocs/core/login/functions_http.php
M htdocs/core/login/functions_ldap.php
M htdocs/core/login/functions_openid.php
M htdocs/core/menus/standard/auguria.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/action/rapport.pdf.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/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
M htdocs/core/modules/contract/doc/pdf_strato.modules.php
M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.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/member/doc/pdf_standard.class.php
M htdocs/core/modules/modSalaries.class.php
M htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
M htdocs/core/modules/product/mod_codeproduct_elephant.php
M htdocs/core/modules/product/mod_codeproduct_leopard.php
M htdocs/core/modules/project/pdf/pdf_baleine.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/propale/modules_propale.php
M htdocs/core/modules/rapport/pdf_paiement.class.php
M htdocs/core/modules/societe/mod_codeclient_elephant.php
M htdocs/core/modules/societe/mod_codeclient_leopard.php
M htdocs/core/modules/societe/mod_codeclient_monkey.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/fichinter/document.php
M htdocs/filefunc.inc.php
M htdocs/holiday/define_holiday.php
M htdocs/imports/import.php
M htdocs/langs/en_US/compta.lang
M htdocs/livraison/class/livraison.class.php
M htdocs/main.inc.php
M htdocs/opensurvey/fonctions.php
M htdocs/opensurvey/results.php
M htdocs/printipp/admin/printipp.php
M htdocs/product/canvas/product/actions_card_product.class.php
M htdocs/product/canvas/service/actions_card_service.class.php
M htdocs/resource/class/actions_resource.class.php
M htdocs/societe/ajaxcompanies.php
M htdocs/societe/canvas/actions_card_common.class.php
M htdocs/societe/canvas/company/actions_card_company.class.php
M htdocs/societe/canvas/individual/actions_card_individual.class.php
M htdocs/societe/class/societe.class.php
M htdocs/user/class/user.class.php
M test/phpunit/CommandeFournisseurTest.php
M test/phpunit/CommandeTest.php
M test/phpunit/CommonObjectTest.php
M test/phpunit/CompanyBankAccountTest.php
M test/phpunit/EntrepotTest.php
M test/phpunit/ExportTest.php
M test/phpunit/FactureRecTest.php
M test/phpunit/FactureTest.php
M test/phpunit/FunctionsLibTest.php
M test/phpunit/PropalTest.php
M test/phpunit/SocieteTest.php
M test/phpunit/UserTest.php
M test/phpunit/WebservicesInvoicesTest.php
M test/phpunit/WebservicesThirdpartyTest.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.6_backported
Conflicts:
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/4dfe82993718...7a5c2cf79166