dolibarr-git
[Top][All Lists]
Advanced
[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: Mon, 29 Sep 2014 06:36:41 -0700 
  Branch: refs/heads/3.6
  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: 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: 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: 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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/6a570222cc41...a155fc71e23e
reply via email to
[Prev in Thread] Current Thread [Next in Thread]