dolibarr-git
[Top][All Lists]
Advanced

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

[Dolibarr-git] [Dolibarr/dolibarr] 81a893: FIX autofocus on input search


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] 81a893: FIX autofocus on input search product
Date: Sat, 21 Nov 2015 03:49:01 -0800

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 81a8933256c621471a1b0e2340b1d193eb120097
      
https://github.com/Dolibarr/dolibarr/commit/81a8933256c621471a1b0e2340b1d193eb120097
  Author: phf <address@hidden>
  Date:   2015-11-13 (Fri, 13 Nov 2015)

  Changed paths:
    M htdocs/core/class/html.form.class.php

  Log Message:
  -----------
  FIX autofocus on input search product


  Commit: 2a2155a239a857d305208f7027082535df4f685a
      
https://github.com/Dolibarr/dolibarr/commit/2a2155a239a857d305208f7027082535df4f685a
  Author: Florian HENRY <address@hidden>
  Date:   2015-11-13 (Fri, 13 Nov 2015)

  Changed paths:
    M htdocs/core/class/html.form.class.php

  Log Message:
  -----------
  FIX : showrefnav htmlspecialchar instead of < >


  Commit: 85c0ed39f1e191085788802b3484b814c0589dfe
      
https://github.com/Dolibarr/dolibarr/commit/85c0ed39f1e191085788802b3484b814c0589dfe
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-13 (Fri, 13 Nov 2015)

  Changed paths:
    M htdocs/core/class/html.form.class.php

  Log Message:
  -----------
  Merge pull request #3974 from atm-ph/fix_38_aufocus

FIX autofocus on input search product


  Commit: 5b1e20494b5ce335de8880c27392ff2808938503
      
https://github.com/Dolibarr/dolibarr/commit/5b1e20494b5ce335de8880c27392ff2808938503
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-13 (Fri, 13 Nov 2015)

  Changed paths:
    M htdocs/core/class/html.form.class.php

  Log Message:
  -----------
  Merge pull request #3977 from FHenry/3.8

FIX : showrefnav htmlspecialchar instead of < >


  Commit: b75923871c887a17d8a487d37272d62fab0582c5
      
https://github.com/Dolibarr/dolibarr/commit/b75923871c887a17d8a487d37272d62fab0582c5
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-14 (Sat, 14 Nov 2015)

  Changed paths:
    M htdocs/core/lib/pdf.lib.php

  Log Message:
  -----------
  FIX: Too many information were hidden. A lot of users still need bank
account on PDF.


  Commit: b4af55ab406098a7e7aa56a26b470f4eff40ca18
      
https://github.com/Dolibarr/dolibarr/commit/b4af55ab406098a7e7aa56a26b470f4eff40ca18
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-14 (Sat, 14 Nov 2015)

  Changed paths:
    M htdocs/core/class/html.form.class.php

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


  Commit: 6895daa5e96c49c604a802898e6af6cc3a75b907
      
https://github.com/Dolibarr/dolibarr/commit/6895daa5e96c49c604a802898e6af6cc3a75b907
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-14 (Sat, 14 Nov 2015)

  Changed paths:
    M htdocs/admin/company.php

  Log Message:
  -----------
  Fix tr/td not correctly open/closed
Fix default value was not set


  Commit: c3b7bbfb3b05b9b7df4792b48910fbe7485046ae
      
https://github.com/Dolibarr/dolibarr/commit/c3b7bbfb3b05b9b7df4792b48910fbe7485046ae
  Author: Florian HENRY <address@hidden>
  Date:   2015-11-15 (Sun, 15 Nov 2015)

  Changed paths:
    M htdocs/core/class/html.formmail.class.php

  Log Message:
  -----------
  FIX : #3990


  Commit: 43f3999234a33a1c8cf3a58ac239f9b9ded3aadf
      
https://github.com/Dolibarr/dolibarr/commit/43f3999234a33a1c8cf3a58ac239f9b9ded3aadf
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M dev/initdata/mysqldump_dolibarr_3.8.0.sql
    M dev/initdata/savedemo.sh

  Log Message:
  -----------
  Clean demo file


  Commit: 0a92849de3fce4da8eced75797abf4fa45708243
      
https://github.com/Dolibarr/dolibarr/commit/0a92849de3fce4da8eced75797abf4fa45708243
  Author: fmarcet <address@hidden>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M htdocs/fichinter/card.php

  Log Message:
  -----------
  FIX: Can't update line's duration


  Commit: 73da011461922b97fa3e7f5974b39b5fe63cf986
      
https://github.com/Dolibarr/dolibarr/commit/73da011461922b97fa3e7f5974b39b5fe63cf986
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M htdocs/margin/agentMargins.php
    M htdocs/margin/lib/margins.lib.php

  Log Message:
  -----------
  FIX #3997 Wrong permission key used for Margins > Read all


  Commit: 8e9e2911ae4aa551975b635cf0b0d4ed1e40fec1
      
https://github.com/Dolibarr/dolibarr/commit/8e9e2911ae4aa551975b635cf0b0d4ed1e40fec1
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M htdocs/core/class/hookmanager.class.php

  Log Message:
  -----------
  FIX #3996 Dictionnary hooks are not working in 3.8


  Commit: be460b6cbf0a8ac88d5bc76b420c5e02b2185786
      
https://github.com/Dolibarr/dolibarr/commit/be460b6cbf0a8ac88d5bc76b420c5e02b2185786
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M htdocs/fourn/class/fournisseur.commande.class.php

  Log Message:
  -----------
  FIX #3992 CommandeFournisseur::ref is marked as deprecated and it shouldn't be


  Commit: 0880b13142b21ea8092de6dc9dbad24a8c84eae7
      
https://github.com/Dolibarr/dolibarr/commit/0880b13142b21ea8092de6dc9dbad24a8c84eae7
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M htdocs/fourn/class/fournisseur.commande.class.php

  Log Message:
  -----------
  FIX #3988 Undefined variable $conf and $error in CommandeFournisseur::addline


  Commit: ec7e4cb3d4cc15286a2ef0c16c1b9ea850003fec
      
https://github.com/Dolibarr/dolibarr/commit/ec7e4cb3d4cc15286a2ef0c16c1b9ea850003fec
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M htdocs/fourn/class/fournisseur.commande.class.php

  Log Message:
  -----------
  FIX #3989 Undefined variable $conf in CommandeFournisseur::getNomUrl


  Commit: 53fb085766bbccebde5fbf840fc23c5f0c0c5ff4
      
https://github.com/Dolibarr/dolibarr/commit/53fb085766bbccebde5fbf840fc23c5f0c0c5ff4
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M htdocs/fourn/class/fournisseur.commande.class.php

  Log Message:
  -----------
  Corrected indent


  Commit: c21354101fb739e19a574ac42ada5bc35cfe90d6
      
https://github.com/Dolibarr/dolibarr/commit/c21354101fb739e19a574ac42ada5bc35cfe90d6
  Author: phf <address@hidden>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M htdocs/comm/propal/class/propal.class.php

  Log Message:
  -----------
  FIX can not have access to the new ids or propal lines on PROPAL_CLONE


  Commit: a7d2bdc2c1bbd9919d19bd382241c828075a762c
      
https://github.com/Dolibarr/dolibarr/commit/a7d2bdc2c1bbd9919d19bd382241c828075a762c
  Author: Alexis Algoud <address@hidden>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M htdocs/core/class/html.form.class.php

  Log Message:
  -----------
  FIX 3.8 allow to search on alias name into select


  Commit: 21880589d06b8de546b7ac778f2ff45c4844ce25
      
https://github.com/Dolibarr/dolibarr/commit/21880589d06b8de546b7ac778f2ff45c4844ce25
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M htdocs/core/class/html.formmail.class.php

  Log Message:
  -----------
  Merge pull request #3993 from FHenry/3.8

FIX : #3990


  Commit: d16efbaf246313e3d2e11ce8fee951a64a8819b8
      
https://github.com/Dolibarr/dolibarr/commit/d16efbaf246313e3d2e11ce8fee951a64a8819b8
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M htdocs/fichinter/card.php

  Log Message:
  -----------
  Merge pull request #3999 from fmarcet/3.8

FIX: Can't update line's duration


  Commit: 9693982f27cb55e43b6c42cb65d1af620ea7ea67
      
https://github.com/Dolibarr/dolibarr/commit/9693982f27cb55e43b6c42cb65d1af620ea7ea67
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M htdocs/margin/agentMargins.php
    M htdocs/margin/lib/margins.lib.php

  Log Message:
  -----------
  Merge pull request #4002 from marcosgdf/bug-3997

FIX #3997 Wrong permission key used for Margins > Read all


  Commit: 0e511027f6e246ba7e9a19bd276059c80bc39057
      
https://github.com/Dolibarr/dolibarr/commit/0e511027f6e246ba7e9a19bd276059c80bc39057
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M htdocs/core/class/hookmanager.class.php

  Log Message:
  -----------
  Merge pull request #4003 from marcosgdf/bug-3996

FIX #3996 Dictionnary hooks are not working in 3.8


  Commit: 76eeb0d2f195cb95b5923256b004d3b89c09cdfb
      
https://github.com/Dolibarr/dolibarr/commit/76eeb0d2f195cb95b5923256b004d3b89c09cdfb
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M htdocs/fourn/class/fournisseur.commande.class.php

  Log Message:
  -----------
  Merge pull request #4004 from marcosgdf/bug-3992

FIX #3992 CommandeFournisseur::ref is marked as deprecated and it shouldn't be


  Commit: 04ffe1c7f02978feff50b273de2e32c028efa09a
      
https://github.com/Dolibarr/dolibarr/commit/04ffe1c7f02978feff50b273de2e32c028efa09a
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M htdocs/fourn/class/fournisseur.commande.class.php

  Log Message:
  -----------
  Merge pull request #4005 from marcosgdf/bug-3988

FIX #3988 Undefined variable $conf and $error in CommandeFournisseur::addline


  Commit: 835700bb2551b3688b1385979f5089703067e03d
      
https://github.com/Dolibarr/dolibarr/commit/835700bb2551b3688b1385979f5089703067e03d
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M htdocs/fourn/class/fournisseur.commande.class.php

  Log Message:
  -----------
  Merge pull request #4006 from marcosgdf/bug-3989

FIX #3989 Undefined variable $conf in CommandeFournisseur::getNomUrl


  Commit: 2f1a1c511125cc79928334b21a3847d5aad9bf45
      
https://github.com/Dolibarr/dolibarr/commit/2f1a1c511125cc79928334b21a3847d5aad9bf45
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M htdocs/comm/propal/class/propal.class.php

  Log Message:
  -----------
  Merge pull request #4008 from atm-ph/fix_38_trigger_propal_clone

FIX can not have access to the new ids or propal lines on PROPAL_CLONE


  Commit: 508b11733af4ab76fd14536135a953fcaf03cd51
      
https://github.com/Dolibarr/dolibarr/commit/508b11733af4ab76fd14536135a953fcaf03cd51
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M htdocs/core/class/html.form.class.php

  Log Message:
  -----------
  Merge pull request #4010 from atm-alexis/3.8_FIX_Allow_to_search_on_alias_name

FIX 3.8 allow to search on alias name into select


  Commit: 5082b1cc66a734adf615f1e6e6ea96a21e94ce3f
      
https://github.com/Dolibarr/dolibarr/commit/5082b1cc66a734adf615f1e6e6ea96a21e94ce3f
  Author: Nikos Drosis <address@hidden>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M htdocs/core/lib/functions2.lib.php

  Log Message:
  -----------
  Fix for utf-8 characters in the mask mercure


  Commit: 0cbf8ca1dd45a3959dd3713b6164480b1cd051dc
      
https://github.com/Dolibarr/dolibarr/commit/0cbf8ca1dd45a3959dd3713b6164480b1cd051dc
  Author: fmarcet <address@hidden>
  Date:   2015-11-18 (Wed, 18 Nov 2015)

  Changed paths:
    M htdocs/core/tpl/document_actions_pre_headers.tpl.php

  Log Message:
  -----------
  FIX #3726 When upload file, don't test if PRODUCT_USE_OLD_PATH_FOR_PHOTO
variable is empty or not


  Commit: 85a58f666ae01939c5a62c77ac67451d59f24b3a
      
https://github.com/Dolibarr/dolibarr/commit/85a58f666ae01939c5a62c77ac67451d59f24b3a
  Author: arnaud <address@hidden>
  Date:   2015-11-18 (Wed, 18 Nov 2015)

  Changed paths:
    M htdocs/core/boxes/box_project.php

  Log Message:
  -----------
  FIX product link in project box


  Commit: f615927d241a6e004a364afcf3a686f46eb8766e
      
https://github.com/Dolibarr/dolibarr/commit/f615927d241a6e004a364afcf3a686f46eb8766e
  Author: fmarcet <address@hidden>
  Date:   2015-11-18 (Wed, 18 Nov 2015)

  Changed paths:
    M htdocs/commande/orderstoinvoice.php

  Log Message:
  -----------
  FIX Not use localtaxes when invoice some orders


  Commit: 6c379029fa6351d9e016d161ea78d5ea5a20f86c
      
https://github.com/Dolibarr/dolibarr/commit/6c379029fa6351d9e016d161ea78d5ea5a20f86c
  Author: Juanjo Menent <address@hidden>
  Date:   2015-11-18 (Wed, 18 Nov 2015)

  Changed paths:
    M htdocs/core/boxes/box_project.php

  Log Message:
  -----------
  Merge pull request #4033 from atm-arnaud/3.7_fix_project_box

FIX product link in project box


  Commit: 1f8b05264f6c04fb28dfe942686bbf5c7ccfc04b
      
https://github.com/Dolibarr/dolibarr/commit/1f8b05264f6c04fb28dfe942686bbf5c7ccfc04b
  Author: Juanjo Menent <address@hidden>
  Date:   2015-11-18 (Wed, 18 Nov 2015)

  Changed paths:
    M htdocs/core/tpl/document_actions_pre_headers.tpl.php

  Log Message:
  -----------
  Merge pull request #4030 from fmarcet/3.8

FIX #3726 When upload file, don't test PRODUCT_USE_OLD_PATH_FOR_PHOTO


  Commit: a627e32fca7b380296c3acce3603485581b19869
      
https://github.com/Dolibarr/dolibarr/commit/a627e32fca7b380296c3acce3603485581b19869
  Author: Juanjo Menent <address@hidden>
  Date:   2015-11-18 (Wed, 18 Nov 2015)

  Changed paths:
    M htdocs/commande/orderstoinvoice.php

  Log Message:
  -----------
  Merge pull request #4034 from fmarcet/3.7

FIX Not use localtaxes when invoice some orders


  Commit: 4233d24f4bc22daf0e15caa8ab4fa023f4e2973d
      
https://github.com/Dolibarr/dolibarr/commit/4233d24f4bc22daf0e15caa8ab4fa023f4e2973d
  Author: arnaud <address@hidden>
  Date:   2015-11-19 (Thu, 19 Nov 2015)

  Changed paths:
    M htdocs/core/modules/modCategorie.class.php

  Log Message:
  -----------
  FIX export with category contact extrafields


  Commit: 07226d32ec23bd9da39bc11c67ef0fd380b007dd
      
https://github.com/Dolibarr/dolibarr/commit/07226d32ec23bd9da39bc11c67ef0fd380b007dd
  Author: arnaud <address@hidden>
  Date:   2015-11-20 (Fri, 20 Nov 2015)

  Changed paths:
    M htdocs/core/boxes/box_project.php

  Log Message:
  -----------
  FIX NB task and percent progress in box project


  Commit: ee4eb13fff588e74d8507816065e281144a8b974
      
https://github.com/Dolibarr/dolibarr/commit/ee4eb13fff588e74d8507816065e281144a8b974
  Author: Drosis Nikos <address@hidden>
  Date:   2015-11-20 (Fri, 20 Nov 2015)

  Changed paths:
    M htdocs/core/lib/functions2.lib.php

  Log Message:
  -----------
  Update functions2.lib.php


  Commit: 5dba9ef54e62e03008a2181a7337ee7c1cd5e5f5
      
https://github.com/Dolibarr/dolibarr/commit/5dba9ef54e62e03008a2181a7337ee7c1cd5e5f5
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-11-20 (Fri, 20 Nov 2015)

  Changed paths:
    M htdocs/admin/menus/edit.php

  Log Message:
  -----------
  FIX #4043 Incorrect translation in error mesage in menu creation admin page


  Commit: 2dedea8736833468b12a1c272ec5ab113f7c3477
      
https://github.com/Dolibarr/dolibarr/commit/2dedea8736833468b12a1c272ec5ab113f7c3477
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-11-20 (Fri, 20 Nov 2015)

  Changed paths:
    M htdocs/comm/mailing/cibles.php

  Log Message:
  -----------
  FIX #4016 User link is not correctly formed in emailing receivers


  Commit: 45d6635bf60729883ad0cc0d541e7b41e5d7cbad
      
https://github.com/Dolibarr/dolibarr/commit/45d6635bf60729883ad0cc0d541e7b41e5d7cbad
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-21 (Sat, 21 Nov 2015)

  Changed paths:
    M htdocs/core/lib/functions2.lib.php

  Log Message:
  -----------
  Merge pull request #4025 from ndrosis/3.8

FIX utf-8 characters in the mask mercure does not break counter


  Commit: 07d24a9a05efc400502f322531283c360a5e40e5
      
https://github.com/Dolibarr/dolibarr/commit/07d24a9a05efc400502f322531283c360a5e40e5
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-21 (Sat, 21 Nov 2015)

  Changed paths:
    M htdocs/core/boxes/box_project.php

  Log Message:
  -----------
  Merge pull request #4044 from atm-arnaud/3.7_fix_project_box_nb_task

FIX Nb of tasks and percent progress in box project


  Commit: 94fdff9a46e07b9fd354871634d5ef00dbfb6739
      
https://github.com/Dolibarr/dolibarr/commit/94fdff9a46e07b9fd354871634d5ef00dbfb6739
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-21 (Sat, 21 Nov 2015)

  Changed paths:
    M htdocs/admin/menus/edit.php

  Log Message:
  -----------
  Merge pull request #4045 from marcosgdf/bug-4043

FIX #4043 Incorrect translation in error mesage in menu creation admin page


  Commit: c77eaeaa7778774774eaa6faf852d0a4953722d6
      
https://github.com/Dolibarr/dolibarr/commit/c77eaeaa7778774774eaa6faf852d0a4953722d6
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-21 (Sat, 21 Nov 2015)

  Changed paths:
    M htdocs/core/modules/modCategorie.class.php

  Log Message:
  -----------
  Merge pull request #4040 from atm-arnaud/3.6_fix_export_category_contact

FIX export with category contact extrafields


  Commit: 30f0b6e2e83e43e512d741eb3e92a821ea1160c2
      
https://github.com/Dolibarr/dolibarr/commit/30f0b6e2e83e43e512d741eb3e92a821ea1160c2
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-21 (Sat, 21 Nov 2015)

  Changed paths:
    M htdocs/comm/mailing/cibles.php

  Log Message:
  -----------
  Merge pull request #4046 from marcosgdf/bug-4016

FIX #4016 User link is not correctly formed in emailing receivers


  Commit: c04743aa84c3fd08733dff2cd0af5a781c0eb490
      
https://github.com/Dolibarr/dolibarr/commit/c04743aa84c3fd08733dff2cd0af5a781c0eb490
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-21 (Sat, 21 Nov 2015)

  Changed paths:
    M htdocs/core/modules/modCategorie.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.6' into 3.7


  Commit: 758b8e1f7e5f05344623d24db38d071cc87334b7
      
https://github.com/Dolibarr/dolibarr/commit/758b8e1f7e5f05344623d24db38d071cc87334b7
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-21 (Sat, 21 Nov 2015)

  Changed paths:
    M htdocs/commande/orderstoinvoice.php
    M htdocs/core/boxes/box_project.php
    M htdocs/core/modules/modCategorie.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.7' into 3.8

Conflicts:
        htdocs/core/boxes/box_project.php


  Commit: 2a345b6fc02b07db82573ce36f762e59a591a7ef
      
https://github.com/Dolibarr/dolibarr/commit/2a345b6fc02b07db82573ce36f762e59a591a7ef
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-21 (Sat, 21 Nov 2015)

  Changed paths:
    M dev/initdata/mysqldump_dolibarr_3.8.0.sql
    M dev/initdata/savedemo.sh
    M htdocs/admin/menus/edit.php
    M htdocs/comm/mailing/cibles.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/orderstoinvoice.php
    M htdocs/core/boxes/box_project.php
    M htdocs/core/class/hookmanager.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/modules/modCategorie.class.php
    M htdocs/core/tpl/document_actions_pre_headers.tpl.php
    M htdocs/fichinter/card.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/margin/agentMargins.php
    M htdocs/margin/lib/margins.lib.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.8' into develop

Conflicts:
        htdocs/admin/company.php
        htdocs/admin/menus/edit.php
        htdocs/core/class/hookmanager.class.php
        htdocs/core/class/html.form.class.php
        htdocs/core/lib/pdf.lib.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/69757210ce1a...2a345b6fc02b

reply via email to

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