[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 3e9b69: Merge branch '3.6' of address
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 3e9b69: Merge branch '3.6' of address@hidden:Dolibarr/doli... |
|
Date: |
Fri, 03 Oct 2014 12:22:16 -0700 |
Branch: refs/heads/3.6_backported
Home: https://github.com/Dolibarr/dolibarr
Commit: 3e9b69b17cadf1f3f546a3dca2d2c1649bd8cfee
https://github.com/Dolibarr/dolibarr/commit/3e9b69b17cadf1f3f546a3dca2d2c1649bd8cfee
Author: Florian HENRY <address@hidden>
Date: 2014-09-08 (Mon, 08 Sep 2014)
Changed paths:
M COPYRIGHT
M ChangeLog
M htdocs/categories/class/categorie.class.php
M htdocs/commande/fiche.php
M htdocs/commande/orderstoinvoice.php
M htdocs/compta/deplacement/list.php
M htdocs/compta/facture.php
M htdocs/compta/salaries/fiche.php
M htdocs/compta/tva/fiche.php
M htdocs/contrat/fiche.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/date.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/expedition/fiche.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fichinter/fiche.php
M htdocs/fourn/facture/fiche.php
M htdocs/includes/tcpdf/CHANGELOG.TXT
M htdocs/includes/tcpdf/README.TXT
M htdocs/includes/tcpdf/composer.json
M htdocs/includes/tcpdf/config/tcpdf_config.php
R htdocs/includes/tcpdf/fonts/aealarabiya.ctg.z
R htdocs/includes/tcpdf/fonts/aealarabiya.z
R htdocs/includes/tcpdf/fonts/aefurat.ctg.z
R htdocs/includes/tcpdf/fonts/aefurat.z
M htdocs/includes/tcpdf/fonts/cid0cs.php
M htdocs/includes/tcpdf/fonts/cid0ct.php
M htdocs/includes/tcpdf/fonts/cid0jp.php
M htdocs/includes/tcpdf/fonts/cid0kr.php
R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/AUTHORS
R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/BUGS
R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE
R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/NEWS
R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/README
R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/langcover.txt
R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/status.txt
R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/unicover.txt
A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/AUTHORS
A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/BUGS
A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE
A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/NEWS
A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/README
A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/langcover.txt
A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/status.txt
A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/unicover.txt
M htdocs/includes/tcpdf/fonts/dejavusans.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusans.php
M htdocs/includes/tcpdf/fonts/dejavusans.z
M htdocs/includes/tcpdf/fonts/dejavusansb.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusansb.php
M htdocs/includes/tcpdf/fonts/dejavusansb.z
M htdocs/includes/tcpdf/fonts/dejavusansbi.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusansbi.php
M htdocs/includes/tcpdf/fonts/dejavusansbi.z
A htdocs/includes/tcpdf/fonts/dejavusanscondensed.php
A htdocs/includes/tcpdf/fonts/dejavusanscondensedb.php
A htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.php
A htdocs/includes/tcpdf/fonts/dejavusanscondensedi.php
A htdocs/includes/tcpdf/fonts/dejavusansextralight.php
M htdocs/includes/tcpdf/fonts/dejavusansi.ctg.z
M htdocs/includes/tcpdf/fonts/dejavusansi.php
M htdocs/includes/tcpdf/fonts/dejavusansi.z
A htdocs/includes/tcpdf/fonts/dejavusansmono.php
A htdocs/includes/tcpdf/fonts/dejavusansmonob.php
A htdocs/includes/tcpdf/fonts/dejavusansmonobi.php
A htdocs/includes/tcpdf/fonts/dejavusansmonoi.php
R htdocs/includes/tcpdf/fonts/dejavuserifi.z
R htdocs/includes/tcpdf/fonts/freefont-20100919/AUTHORS
R htdocs/includes/tcpdf/fonts/freefont-20100919/COPYING
R htdocs/includes/tcpdf/fonts/freefont-20100919/CREDITS
R htdocs/includes/tcpdf/fonts/freefont-20100919/ChangeLog
R htdocs/includes/tcpdf/fonts/freefont-20100919/INSTALL
R htdocs/includes/tcpdf/fonts/freefont-20100919/README
A htdocs/includes/tcpdf/fonts/freefont-20120503/AUTHORS
A htdocs/includes/tcpdf/fonts/freefont-20120503/COPYING
A htdocs/includes/tcpdf/fonts/freefont-20120503/CREDITS
A htdocs/includes/tcpdf/fonts/freefont-20120503/ChangeLog
A htdocs/includes/tcpdf/fonts/freefont-20120503/INSTALL
A htdocs/includes/tcpdf/fonts/freefont-20120503/README
A htdocs/includes/tcpdf/fonts/freefont-20120503/TROUBLESHOOTING
A htdocs/includes/tcpdf/fonts/freefont-20120503/USAGE
M htdocs/includes/tcpdf/fonts/freemono.ctg.z
M htdocs/includes/tcpdf/fonts/freemono.php
M htdocs/includes/tcpdf/fonts/freemono.z
M htdocs/includes/tcpdf/fonts/freemonob.ctg.z
M htdocs/includes/tcpdf/fonts/freemonob.php
M htdocs/includes/tcpdf/fonts/freemonob.z
M htdocs/includes/tcpdf/fonts/freemonobi.ctg.z
M htdocs/includes/tcpdf/fonts/freemonobi.php
M htdocs/includes/tcpdf/fonts/freemonobi.z
M htdocs/includes/tcpdf/fonts/freemonoi.ctg.z
M htdocs/includes/tcpdf/fonts/freemonoi.php
M htdocs/includes/tcpdf/fonts/freemonoi.z
M htdocs/includes/tcpdf/include/barcodes/datamatrix.php
M htdocs/includes/tcpdf/include/barcodes/pdf417.php
M htdocs/includes/tcpdf/include/sRGB.icc
M htdocs/includes/tcpdf/include/tcpdf_colors.php
M htdocs/includes/tcpdf/include/tcpdf_filters.php
M htdocs/includes/tcpdf/include/tcpdf_font_data.php
M htdocs/includes/tcpdf/include/tcpdf_fonts.php
M htdocs/includes/tcpdf/include/tcpdf_images.php
M htdocs/includes/tcpdf/include/tcpdf_static.php
M htdocs/includes/tcpdf/tcpdf.php
M htdocs/includes/tcpdf/tcpdf_autoconfig.php
M htdocs/includes/tcpdf/tcpdf_barcodes_1d.php
M htdocs/includes/tcpdf/tcpdf_barcodes_2d.php
M htdocs/includes/tcpdf/tcpdf_import.php
M htdocs/includes/tcpdf/tcpdf_parser.php
M htdocs/livraison/class/livraison.class.php
M htdocs/livraison/fiche.php
M htdocs/opensurvey/class/opensurveysondage.class.php
M htdocs/opensurvey/public/studs.php
M htdocs/opensurvey/results.php
M htdocs/societe/consumption.php
M test/phpunit/FunctionsLibTest.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: 287e2ca032034586a97257a4c6b192c11bfd7a95
https://github.com/Dolibarr/dolibarr/commit/287e2ca032034586a97257a4c6b192c11bfd7a95
Author: Florian HENRY <address@hidden>
Date: 2014-09-15 (Mon, 15 Sep 2014)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Add ref_ext into fetch product (else fetch and update set this column to
null)
Commit: ffc550de6da5a821ddc93f7cdcbd24a163c8b65f
https://github.com/Dolibarr/dolibarr/commit/ffc550de6da5a821ddc93f7cdcbd24a163c8b65f
Author: Florian HENRY <address@hidden>
Date: 2014-09-15 (Mon, 15 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/adherents/class/adherent.class.php
M htdocs/cashdesk/index.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/info.php
M htdocs/commande/orderstoinvoice.php
M htdocs/compta/bank/bankid_fr.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/prelevement/liste.php
M htdocs/compta/prelevement/rejets.php
M htdocs/compta/recap-compta.php
M htdocs/contact/info.php
M htdocs/contrat/class/contrat.class.php
M htdocs/contrat/info.php
M htdocs/core/class/commonobject.class.php
M htdocs/expedition/class/expedition.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/holiday/index.php
M htdocs/opensurvey/list.php
M htdocs/product/index.php
M htdocs/product/stats/contrat.php
M htdocs/product/stock/liste.php
M htdocs/product/stock/massstockmove.php
M htdocs/product/stock/replenishorders.php
M htdocs/projet/class/project.class.php
M htdocs/projet/class/task.class.php
M htdocs/projet/contact.php
M htdocs/projet/fiche.php
M htdocs/projet/tasks/index.php
A htdocs/theme/amarok/img/object_address.png
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: c570b5fbfcf135b23e8175946a4ef10f2c8f522a
https://github.com/Dolibarr/dolibarr/commit/c570b5fbfcf135b23e8175946a4ef10f2c8f522a
Author: Florian HENRY <address@hidden>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M ChangeLog
M build/debian/control
M build/debian/copyright
M build/debian/get-orig-source.sh
M htdocs/admin/menus/edit.php
M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
M htdocs/commande/tpl/linkedobjectblock.tpl.php
M htdocs/compta/bank/account.php
M htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
M htdocs/core/class/commonobject.class.php
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/class/paiementfourn.class.php
M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/paiement/fiche.php
M htdocs/langs/en_US/dict.lang
M htdocs/product/class/product.class.php
M htdocs/product/fiche.php
M htdocs/product/reassort.php
M htdocs/societe/soc.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: 4b74b0529f1a3042b47d11286f6cc23bfff0be30
https://github.com/Dolibarr/dolibarr/commit/4b74b0529f1a3042b47d11286f6cc23bfff0be30
Author: Florian HENRY <address@hidden>
Date: 2014-09-22 (Mon, 22 Sep 2014)
Changed paths:
M ChangeLog
M build/debian/control
M htdocs/.gitignore
M htdocs/compta/paiement.php
M htdocs/core/lib/functions2.lib.php
M htdocs/fourn/facture/fiche.php
M htdocs/fourn/facture/paiement.php
M htdocs/install/mysql/migration/repair.sql
M htdocs/langs/en_US/errors.lang
M htdocs/langs/es_ES/errors.lang
M htdocs/langs/fr_FR/errors.lang
M htdocs/product/class/product.class.php
M htdocs/projet/index.php
M htdocs/projet/tasks/index.php
M htdocs/societe/consumption.php
M htdocs/webservices/server_invoice.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: 248ef4fd46f0ae2250230329272581177d96190e
https://github.com/Dolibarr/dolibarr/commit/248ef4fd46f0ae2250230329272581177d96190e
Author: Eden <address@hidden>
Date: 2014-09-23 (Tue, 23 Sep 2014)
Changed paths:
M htdocs/admin/ldap_groups.php
M htdocs/user/group/ldap.php
Log Message:
-----------
Fix: gidNumber ldap attribute was not defined i using posixGroup objectClass
Commit: 860253759b50bf864d253bb767003c5c17f5fd97
https://github.com/Dolibarr/dolibarr/commit/860253759b50bf864d253bb767003c5c17f5fd97
Author: Florian HENRY <address@hidden>
Date: 2014-09-23 (Tue, 23 Sep 2014)
Changed paths:
M htdocs/fourn/fiche.php
Log Message:
-----------
Add hook for addMorButton into supplier card
Commit: fa79f280ea8301c5b06bed0d82efef8a7460da73
https://github.com/Dolibarr/dolibarr/commit/fa79f280ea8301c5b06bed0d82efef8a7460da73
Author: Florian HENRY <address@hidden>
Date: 2014-09-23 (Tue, 23 Sep 2014)
Changed paths:
M htdocs/webservices/server_invoice.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: d1868b643ea842200237bb7f9a84e200fe4344ed
https://github.com/Dolibarr/dolibarr/commit/d1868b643ea842200237bb7f9a84e200fe4344ed
Author: Christophe Battarel <address@hidden>
Date: 2014-09-24 (Wed, 24 Sep 2014)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
FIX: clone line extrafields value on quote, order and invoice
Commit: 2c52de3840c520965839d43a8307074255b23304
https://github.com/Dolibarr/dolibarr/commit/2c52de3840c520965839d43a8307074255b23304
Author: Christophe Battarel <address@hidden>
Date: 2014-09-24 (Wed, 24 Sep 2014)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
fix missing ","
Commit: 959d463fc5337dc4948694c58bbc8b9d935f8bad
https://github.com/Dolibarr/dolibarr/commit/959d463fc5337dc4948694c58bbc8b9d935f8bad
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-24 (Wed, 24 Sep 2014)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Merge pull request #1921 from altairis-fr/clone_extra
FIX: clone line extrafields value on quote, order and invoice
Commit: 7b9f154c295eb10c02e9d79bd526ff99ef6f04fc
https://github.com/Dolibarr/dolibarr/commit/7b9f154c295eb10c02e9d79bd526ff99ef6f04fc
Author: fmarcet <address@hidden>
Date: 2014-09-25 (Thu, 25 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/compta/prelevement/class/bonprelevement.class.php
Log Message:
-----------
Fix: Withdrawal total amount is double
Commit: 249d37a093f64c4c0e9099f0230f50b4aea1c71b
https://github.com/Dolibarr/dolibarr/commit/249d37a093f64c4c0e9099f0230f50b4aea1c71b
Author: Florian HENRY <address@hidden>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
M htdocs/projet/activity/list.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: 96c5771718ec4ca070d948c5b4161eb361dd1484
https://github.com/Dolibarr/dolibarr/commit/96c5771718ec4ca070d948c5b4161eb361dd1484
Author: Florian HENRY <address@hidden>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/webservices/server_category.php
Log Message:
-----------
Fix web service category
Commit: 6a570222cc413ffe305f32b08939e63f5e7c814a
https://github.com/Dolibarr/dolibarr/commit/6a570222cc413ffe305f32b08939e63f5e7c814a
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-28 (Sun, 28 Sep 2014)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
Log Message:
-----------
Fix: Missing fields into select
Commit: 0ee90493742cee8a522599603eb8ca571cde4caa
https://github.com/Dolibarr/dolibarr/commit/0ee90493742cee8a522599603eb8ca571cde4caa
Author: Florian HENRY <address@hidden>
Date: 2014-09-29 (Mon, 29 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/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/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 branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: 3f23c8956ca4c2aa71b9f53796334c10389682d5
https://github.com/Dolibarr/dolibarr/commit/3f23c8956ca4c2aa71b9f53796334c10389682d5
Author: Florian HENRY <address@hidden>
Date: 2014-09-29 (Mon, 29 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/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/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_fixwebservice
Commit: a155fc71e23ed0464d82c0e9f6642b3a054db8c6
https://github.com/Dolibarr/dolibarr/commit/a155fc71e23ed0464d82c0e9f6642b3a054db8c6
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-29 (Mon, 29 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/fourn/fiche.php
M htdocs/product/class/product.class.php
M htdocs/webservices/server_category.php
Log Message:
-----------
Merge pull request #1928 from FHenry/3.6_fixwebservice
3.6 fixwebservice
Commit: c6fc07e41260de7b7f32ba675922fac3823ea1f2
https://github.com/Dolibarr/dolibarr/commit/c6fc07e41260de7b7f32ba675922fac3823ea1f2
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-29 (Mon, 29 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/compta/prelevement/class/bonprelevement.class.php
Log Message:
-----------
Merge pull request #1926 from fmarcet/3.6
Fix: Withdrawal total amount is double
Commit: c7d02aa1dfb1ab41a1499f0dd20453922b41c52f
https://github.com/Dolibarr/dolibarr/commit/c7d02aa1dfb1ab41a1499f0dd20453922b41c52f
Author: Florian HENRY <address@hidden>
Date: 2014-09-29 (Mon, 29 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/webservices/server_category.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: 2ae776e51b6135e486a1493f6febb703bdbe3b86
https://github.com/Dolibarr/dolibarr/commit/2ae776e51b6135e486a1493f6febb703bdbe3b86
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-29 (Mon, 29 Sep 2014)
Log Message:
-----------
Merge pull request #1915 from FHenry/3.6
add ref_ext into fetch product and add hook into supplier card
Commit: 8121aeb0b63ea06a27c50eecf979a9fcf14837d6
https://github.com/Dolibarr/dolibarr/commit/8121aeb0b63ea06a27c50eecf979a9fcf14837d6
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-29 (Mon, 29 Sep 2014)
Changed paths:
M htdocs/admin/ldap_groups.php
M htdocs/user/group/ldap.php
Log Message:
-----------
Merge pull request #1914 from aternatik/fix_ldapgrp
Fix: gidNumber ldap attribute was not defined
Commit: 8c6ce79d9d0da035f67d0e67a0db34ec7c9cb8a7
https://github.com/Dolibarr/dolibarr/commit/8c6ce79d9d0da035f67d0e67a0db34ec7c9cb8a7
Author: Drosis Nikos <address@hidden>
Date: 2014-09-29 (Mon, 29 Sep 2014)
Changed paths:
M htdocs/compta/sociales/charges.php
Log Message:
-----------
Fix Lang for Payment Type
Commit: 920c9c725104b58ca3375ff7bf436042aa04f976
https://github.com/Dolibarr/dolibarr/commit/920c9c725104b58ca3375ff7bf436042aa04f976
Author: Maxime Kohlhaas <address@hidden>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M htdocs/comm/propal.php
M htdocs/commande/fiche.php
M htdocs/compta/facture.php
Log Message:
-----------
Fix : tva not coming from multiprice
Commit: 78ec4d595b11c22317c54074d0b61a998b3b18cb
https://github.com/Dolibarr/dolibarr/commit/78ec4d595b11c22317c54074d0b61a998b3b18cb
Author: Florian HENRY <address@hidden>
Date: 2014-10-02 (Thu, 02 Oct 2014)
Changed paths:
M ChangeLog
M htdocs/product/composition/fiche.php
Log Message:
-----------
Fix trad currency
Commit: d6fc967162dcd3f184155b0cafc3c49ca3e34bda
https://github.com/Dolibarr/dolibarr/commit/d6fc967162dcd3f184155b0cafc3c49ca3e34bda
Author: Florian HENRY <address@hidden>
Date: 2014-10-02 (Thu, 02 Oct 2014)
Changed paths:
M htdocs/admin/ldap_groups.php
M htdocs/user/group/ldap.php
Log Message:
-----------
Merge branch '3.6' into 3.6_fix
Commit: 4b28ff005ef29c8de594eca9b24c2ab8a54356ea
https://github.com/Dolibarr/dolibarr/commit/4b28ff005ef29c8de594eca9b24c2ab8a54356ea
Author: Florian HENRY <address@hidden>
Date: 2014-10-02 (Thu, 02 Oct 2014)
Changed paths:
M ChangeLog
M htdocs/categories/fiche.php
Log Message:
-----------
Return error message on category creation failure
Commit: ae303f34a4deea8b0eea98785b25a4db7b0fb919
https://github.com/Dolibarr/dolibarr/commit/ae303f34a4deea8b0eea98785b25a4db7b0fb919
Author: Laurent Destailleur <address@hidden>
Date: 2014-10-03 (Fri, 03 Oct 2014)
Changed paths:
M ChangeLog
M htdocs/categories/fiche.php
M htdocs/product/composition/fiche.php
Log Message:
-----------
Merge pull request #1935 from FHenry/3.6_fix
3.6 fix - Fix trad currency - Return error message on category creation
failure
Commit: d455ee7b5622d9c2534338dd88cd1fe0fc5a9c64
https://github.com/Dolibarr/dolibarr/commit/d455ee7b5622d9c2534338dd88cd1fe0fc5a9c64
Author: Laurent Destailleur <address@hidden>
Date: 2014-10-03 (Fri, 03 Oct 2014)
Changed paths:
M htdocs/comm/propal.php
M htdocs/commande/fiche.php
M htdocs/compta/facture.php
Log Message:
-----------
Merge pull request #1933 from atm-maxime/3.5
Fix : tva not coming from multiprice
Commit: ebd86f5388a751b079856ed6afe814145f6a2431
https://github.com/Dolibarr/dolibarr/commit/ebd86f5388a751b079856ed6afe814145f6a2431
Author: Laurent Destailleur <address@hidden>
Date: 2014-10-03 (Fri, 03 Oct 2014)
Changed paths:
M htdocs/compta/sociales/charges.php
Log Message:
-----------
Merge pull request #1931 from ndrosis/patch-8
Fix Lang for Payment Type
Commit: c69565fd69f826f3fc3c846a849f8e088828f4a1
https://github.com/Dolibarr/dolibarr/commit/c69565fd69f826f3fc3c846a849f8e088828f4a1
Author: Laurent Destailleur <address@hidden>
Date: 2014-10-03 (Fri, 03 Oct 2014)
Changed paths:
M htdocs/core/actions_extrafields.inc.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Fix: column name should not be an numeric
Commit: 868809caba6035f9682e26fa1da755a5bc56d850
https://github.com/Dolibarr/dolibarr/commit/868809caba6035f9682e26fa1da755a5bc56d850
Author: Laurent Destailleur <address@hidden>
Date: 2014-10-03 (Fri, 03 Oct 2014)
Changed paths:
M ChangeLog
M htdocs/admin/ldap_groups.php
M htdocs/categories/fiche.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/sociales/charges.php
M htdocs/fourn/fiche.php
M htdocs/product/class/product.class.php
M htdocs/product/composition/fiche.php
M htdocs/user/group/ldap.php
M htdocs/webservices/server_category.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: a853aed348f2fcc9c8e0258beec591407f1b4634
https://github.com/Dolibarr/dolibarr/commit/a853aed348f2fcc9c8e0258beec591407f1b4634
Author: Laurent Destailleur <address@hidden>
Date: 2014-10-03 (Fri, 03 Oct 2014)
Changed paths:
M htdocs/projet/class/task.class.php
M htdocs/projet/tasks/task.php
M htdocs/projet/tasks/time.php
Log Message:
-----------
Fix: Some fields not visibles. Wrong value for calculated time.
Commit: b85a8359884e90264b92afc7997e828fcce1ff8c
https://github.com/Dolibarr/dolibarr/commit/b85a8359884e90264b92afc7997e828fcce1ff8c
Author: Laurent Destailleur <address@hidden>
Date: 2014-10-03 (Fri, 03 Oct 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
Prepare 3.6.1
Commit: 05fe8e45b3ead4dd32b75e2c280b8be4c21356ea
https://github.com/Dolibarr/dolibarr/commit/05fe8e45b3ead4dd32b75e2c280b8be4c21356ea
Author: Laurent Destailleur <address@hidden>
Date: 2014-10-03 (Fri, 03 Oct 2014)
Changed paths:
M build/makepack-dolibarr.pl
Log Message:
-----------
Exclude module dire from package
Commit: d51827816619e1dd960c8c61829823288ef2f27e
https://github.com/Dolibarr/dolibarr/commit/d51827816619e1dd960c8c61829823288ef2f27e
Author: Laurent Destailleur <address@hidden>
Date: 2014-10-03 (Fri, 03 Oct 2014)
Changed paths:
M build/makepack-dolibarr.pl
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/fiche.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/fiche.php
htdocs/compta/facture/class/facture.class.php
Commit: 980a20a133d4a7f1b3fed0e21367cc964246f230
https://github.com/Dolibarr/dolibarr/commit/980a20a133d4a7f1b3fed0e21367cc964246f230
Author: Laurent Destailleur <address@hidden>
Date: 2014-10-03 (Fri, 03 Oct 2014)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
M htdocs/admin/ldap_groups.php
M htdocs/categories/fiche.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/fiche.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/sociales/charges.php
M htdocs/core/actions_extrafields.inc.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/fourn/fiche.php
M htdocs/product/class/product.class.php
M htdocs/product/composition/fiche.php
M htdocs/projet/class/task.class.php
M htdocs/projet/tasks/task.php
M htdocs/projet/tasks/time.php
M htdocs/user/group/ldap.php
M htdocs/webservices/server_category.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.6_backported
Conflicts:
htdocs/compta/facture.php
htdocs/compta/prelevement/class/bonprelevement.class.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/dd0fcd55ae5a...980a20a133d4
- [Dolibarr-git] [Dolibarr/dolibarr] 3e9b69: Merge branch '3.6' of address@hidden:Dolibarr/doli...,
Laurent Destailleur <=