[Dolibarr-git] [Dolibarr/dolibarr] 27cc7e: Time spent

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 27cc7ef2b312f5148a3b4f9543ce783ec39c7ebb
      
https://github.com/Dolibarr/dolibarr/commit/27cc7ef2b312f5148a3b4f9543ce783ec39c7ebb
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M htdocs/admin/expensereport.php
    M htdocs/compta/deplacement/index.php
    M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/expensereport/index.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/en_US/trips.lang
    M htdocs/projet/class/task.class.php
    M htdocs/projet/element.php

  Log Message:
  -----------
  Time spent


  Commit: a23e2511b96bb6049da1b6a9d6203a49c0bc0917
      
https://github.com/Dolibarr/dolibarr/commit/a23e2511b96bb6049da1b6a9d6203a49c0bc0917
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M htdocs/contact/card.php
    R htdocs/contact/exportimport.php
    M htdocs/core/lib/contact.lib.php

  Log Message:
  -----------
  Removed useless tab


  Commit: 040a643ee94e5e11b740787d7b5ae7a2bc0f5129
      
https://github.com/Dolibarr/dolibarr/commit/040a643ee94e5e11b740787d7b5ae7a2bc0f5129
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    A .dockerignore
    M COPYRIGHT
    M ChangeLog
    A Dockerfile
    M build/makepack-dolibarr.pl
    A dev/multitail/.multitailrc
    M dev/skeletons/skeleton_page.php
    M htdocs/accountancy/admin/card.php
    M htdocs/accountancy/customer/card.php
    M htdocs/accountancy/customer/lines.php
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/accountancy/supplier/card.php
    M htdocs/accountancy/supplier/lines.php
    M htdocs/adherents/card.php
    M htdocs/adherents/list.php
    M htdocs/admin/dict.php
    M htdocs/admin/ihm.php
    M htdocs/admin/system/filecheck.php
    M htdocs/admin/tools/purge.php
    M htdocs/api/admin/api.php
    M htdocs/api/class/api.class.php
    M htdocs/api/class/api_access.class.php
    M htdocs/barcode/codeinit.php
    M htdocs/cashdesk/facturation_dhtml.php
    M htdocs/cashdesk/javascript/dhtml.js
    M htdocs/cashdesk/tpl/facturation1.tpl.php
    M htdocs/categories/card.php
    M htdocs/categories/categorie.php
    M htdocs/categories/edit.php
    M htdocs/categories/index.php
    M htdocs/categories/viewcat.php
    M htdocs/comm/action/card.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/askpricesupplier/card.php
    M htdocs/comm/card.php
    M htdocs/comm/list.php
    M htdocs/comm/propal.php
    M htdocs/comm/prospect/list.php
    M htdocs/commande/card.php
    M htdocs/compta/bank/account.php
    M htdocs/compta/bank/virement.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/facture/mergepdftool.php
    M htdocs/compta/facture/prelevement.php
    M htdocs/compta/hrm.php
    M htdocs/compta/localtax/clients.php
    M htdocs/compta/localtax/quadri_detail.php
    M htdocs/compta/prelevement/bons.php
    M htdocs/compta/prelevement/card.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/compta/prelevement/create.php
    M htdocs/compta/prelevement/index.php
    R htdocs/compta/prelevement/lignes.php
    M htdocs/compta/recap-compta.php
    M htdocs/contact/card.php
    M htdocs/contact/class/contact.class.php
    M htdocs/core/boxes/modules_boxes.php
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formcompany.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/js/dst.js
    M htdocs/core/js/lib_head.js
    M htdocs/core/js/lib_photosresize.js
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/lib/bank.lib.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/contact.lib.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/fourn.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/lib/images.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/prelevement.lib.php
    M htdocs/core/lib/product.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/lib/report.lib.php
    M htdocs/core/menus/standard/eldy.lib.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/expensereport/doc/pdf_standard.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/doc/pdf_typhon.modules.php
    M htdocs/core/modules/modExpenseReport.class.php
    M htdocs/core/modules/modProjet.class.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.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/core/photos_resize.php
    M htdocs/core/search_page.php
    M htdocs/core/tpl/login.tpl.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/cron/card.php
    M htdocs/cron/class/cronjob.class.php
    M htdocs/don/class/paymentdonation.class.php
    M htdocs/expedition/card.php
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php
    A htdocs/expensereport/class/paymentexpensereport.class.php
    A htdocs/expensereport/payment/card.php
    A htdocs/expensereport/payment/index.html
    A htdocs/expensereport/payment/payment.php
    M htdocs/fichinter/card.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/card.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/commande/dispatch.php
    M htdocs/fourn/facture/list.php
    M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
    M htdocs/fourn/list.php
    M htdocs/holiday/admin/holiday.php
    R htdocs/holiday/admin/tomergewithholiday.php
    M htdocs/holiday/card.php
    M htdocs/holiday/class/holiday.class.php
    M htdocs/holiday/define_holiday.php
    M htdocs/holiday/index.php
    M htdocs/holiday/month_report.php
    M htdocs/holiday/view_log.php
    M htdocs/includes/jquery/css/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
    M htdocs/includes/jquery/css/redmond/images/ui-bg_flat_55_fbec88_40x100.png
    M htdocs/includes/jquery/css/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png
    M htdocs/includes/jquery/css/redmond/images/ui-bg_glass_85_dfeffc_1x400.png
    M htdocs/includes/jquery/css/redmond/images/ui-bg_glass_95_fef1ec_1x400.png
    M 
htdocs/includes/jquery/css/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
    M 
htdocs/includes/jquery/css/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
    M 
htdocs/includes/jquery/css/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
    M htdocs/includes/jquery/css/redmond/images/ui-icons_217bc0_256x240.png
    M htdocs/includes/jquery/css/redmond/images/ui-icons_2e83ff_256x240.png
    M htdocs/includes/jquery/css/redmond/images/ui-icons_469bdd_256x240.png
    M htdocs/includes/jquery/css/redmond/images/ui-icons_6da8d5_256x240.png
    M htdocs/includes/jquery/css/redmond/images/ui-icons_cd0a0a_256x240.png
    M htdocs/includes/jquery/css/redmond/images/ui-icons_d8e7f3_256x240.png
    M htdocs/includes/jquery/css/redmond/images/ui-icons_f9bd01_256x240.png
    R htdocs/includes/jquery/css/redmond/jquery-ui-latest.custom.css
    R htdocs/includes/jquery/css/redmond/jquery-ui-latest.custom.min.css
    A htdocs/includes/jquery/css/redmond/jquery-ui.css
    A htdocs/includes/jquery/css/redmond/jquery-ui.min.css
    A htdocs/includes/jquery/css/redmond/theme.css
    M 
htdocs/includes/jquery/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
    M 
htdocs/includes/jquery/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
    M 
htdocs/includes/jquery/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
    M 
htdocs/includes/jquery/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
    M 
htdocs/includes/jquery/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
    M 
htdocs/includes/jquery/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
    M 
htdocs/includes/jquery/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
    M 
htdocs/includes/jquery/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
    M htdocs/includes/jquery/css/smoothness/images/ui-icons_222222_256x240.png
    M htdocs/includes/jquery/css/smoothness/images/ui-icons_2e83ff_256x240.png
    M htdocs/includes/jquery/css/smoothness/images/ui-icons_454545_256x240.png
    M htdocs/includes/jquery/css/smoothness/images/ui-icons_888888_256x240.png
    M htdocs/includes/jquery/css/smoothness/images/ui-icons_cd0a0a_256x240.png
    R htdocs/includes/jquery/css/smoothness/jquery-ui-latest.custom.css
    R htdocs/includes/jquery/css/smoothness/jquery-ui-latest.custom.min.css
    A htdocs/includes/jquery/css/smoothness/jquery-ui.css
    A htdocs/includes/jquery/css/smoothness/jquery-ui.min.css
    A htdocs/includes/jquery/css/smoothness/theme.css
    M 
htdocs/includes/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
    M 
htdocs/includes/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
    M 
htdocs/includes/jquery/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
    M 
htdocs/includes/jquery/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
    M 
htdocs/includes/jquery/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
    M 
htdocs/includes/jquery/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
    M 
htdocs/includes/jquery/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
    M 
htdocs/includes/jquery/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
    M 
htdocs/includes/jquery/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
    M htdocs/includes/jquery/css/ui-lightness/images/ui-icons_222222_256x240.png
    M htdocs/includes/jquery/css/ui-lightness/images/ui-icons_228ef1_256x240.png
    M htdocs/includes/jquery/css/ui-lightness/images/ui-icons_ef8c08_256x240.png
    M htdocs/includes/jquery/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
    M htdocs/includes/jquery/css/ui-lightness/images/ui-icons_ffffff_256x240.png
    R htdocs/includes/jquery/css/ui-lightness/jquery-ui-latest.custom.css
    R htdocs/includes/jquery/css/ui-lightness/jquery-ui-latest.custom.min.css
    A htdocs/includes/jquery/css/ui-lightness/jquery-ui.css
    A htdocs/includes/jquery/css/ui-lightness/jquery-ui.min.css
    A htdocs/includes/jquery/css/ui-lightness/theme.css
    R htdocs/includes/jquery/js/jquery-latest.js
    R htdocs/includes/jquery/js/jquery-latest.min.js
    R htdocs/includes/jquery/js/jquery-ui-latest.custom.js
    R htdocs/includes/jquery/js/jquery-ui-latest.custom.min.js
    A htdocs/includes/jquery/js/jquery-ui.js
    A htdocs/includes/jquery/js/jquery-ui.min.js
    A htdocs/includes/jquery/js/jquery.js
    A htdocs/includes/jquery/js/jquery.min.js
    M htdocs/includes/jquery/plugins/flot/API.md
    M htdocs/includes/jquery/plugins/flot/CONTRIBUTING.md
    M htdocs/includes/jquery/plugins/flot/LICENSE.txt
    M htdocs/includes/jquery/plugins/flot/NEWS.md
    M htdocs/includes/jquery/plugins/flot/README.md
    M htdocs/includes/jquery/plugins/flot/jquery.colorhelpers.js
    M htdocs/includes/jquery/plugins/flot/jquery.colorhelpers.min.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.canvas.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.canvas.min.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.categories.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.categories.min.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.crosshair.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.crosshair.min.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.errorbars.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.errorbars.min.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.fillbetween.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.fillbetween.min.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.image.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.image.min.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.min.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.navigate.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.navigate.min.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.pie.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.pie.min.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.resize.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.resize.min.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.selection.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.selection.min.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.stack.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.stack.min.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.symbol.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.symbol.min.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.threshold.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.threshold.min.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.time.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.time.min.js
    A htdocs/includes/jstz/jstz.min.js
    M htdocs/install/filelist.xml
    A htdocs/install/mysql/data/llx_c_holiday_type.sql
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/install/mysql/tables/llx_actioncomm.sql
    A htdocs/install/mysql/tables/llx_c_holiday_types.key.sql
    A htdocs/install/mysql/tables/llx_c_holiday_types.sql
    M htdocs/install/mysql/tables/llx_expensereport.sql
    M htdocs/install/mysql/tables/llx_expensereport_det.sql
    M htdocs/install/mysql/tables/llx_holiday.sql
    M htdocs/install/mysql/tables/llx_holiday_logs.sql
    R htdocs/install/mysql/tables/llx_holiday_types.sql
    M htdocs/install/mysql/tables/llx_holiday_users.sql
    A htdocs/install/mysql/tables/llx_payment_expensereport.sql
    M htdocs/install/mysql/tables/llx_societe.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/agenda.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/cron.lang
    M htdocs/langs/en_US/holiday.lang
    M htdocs/langs/en_US/mails.lang
    M htdocs/langs/en_US/members.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/en_US/withdrawals.lang
    M htdocs/langs/en_US/workflow.lang
    M htdocs/langs/fr_FR/agenda.lang
    M htdocs/langs/fr_FR/withdrawals.lang
    M htdocs/main.inc.php
    M htdocs/product/admin/product.php
    M htdocs/product/canvas/product/tpl/card_create.tpl.php
    M htdocs/product/canvas/service/tpl/card_create.tpl.php
    M htdocs/product/card.php
    M htdocs/product/class/product.class.php
    M htdocs/product/composition/card.php
    M htdocs/product/document.php
    M htdocs/product/list.php
    R htdocs/product/photos.php
    M htdocs/product/price.php
    M htdocs/product/stats/card.php
    M htdocs/product/stock/tpl/stockcorrection.tpl.php
    M htdocs/product/stock/tpl/stocktransfer.tpl.php
    M htdocs/projet/activity/index.php
    M htdocs/projet/activity/perday.php
    M htdocs/projet/activity/perweek.php
    M htdocs/projet/admin/project.php
    M htdocs/projet/element.php
    M htdocs/projet/list.php
    A htdocs/public/api/htaccess.txt
    M htdocs/public/api/index.php
    M htdocs/public/cron/cron_run_jobs.php
    M htdocs/societe/agenda.php
    M htdocs/societe/canvas/actions_card_common.class.php
    M htdocs/societe/class/companybankaccount.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/consumption.php
    M htdocs/societe/document.php
    M htdocs/societe/index.php
    A htdocs/societe/list.php
    M htdocs/societe/note.php
    M htdocs/societe/notify/card.php
    M htdocs/societe/price.php
    M htdocs/societe/rib.php
    M htdocs/societe/soc.php
    R htdocs/societe/societe.php
    M htdocs/societe/societecontact.php
    M htdocs/support/default.css
    M htdocs/support/index.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/img/menus_black/globe.png
    A htdocs/theme/eldy/img/menus_black/holiday.png
    A htdocs/theme/eldy/img/title_hrm.png
    M htdocs/theme/eldy/style.css.php
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php
    M htdocs/user/hierarchy.php
    M htdocs/user/index.php
    M scripts/accountancy/export-thirdpartyaccount.php

  Log Message:
  -----------
  Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into
develop

Conflicts:
        htdocs/expensereport/card.php
        htdocs/projet/element.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/460c926f9854...040a643ee94e