[Dolibarr-git] [Dolibarr/dolibarr] b56901: Prepare 3.6.3

dolibarr-git
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] b56901: Prepare 3.6.3

From:	Laurent Destailleur
Subject:	[Dolibarr-git] [Dolibarr/dolibarr] b56901: Prepare 3.6.3
Date:	Sat, 16 May 2015 07:57:06 -0700
  Branch: refs/heads/3.6_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b5690142aa97c5cfa9894034444cabeb06ed0504
      
https://github.com/Dolibarr/dolibarr/commit/b5690142aa97c5cfa9894034444cabeb06ed0504
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-03-29 (Sun, 29 Mar 2015)

  Changed paths:
    M build/debian/changelog

  Log Message:
  -----------
  Prepare 3.6.3


  Commit: fd8d09c8c084a13ec6af0868670038573933d285
      
https://github.com/Dolibarr/dolibarr/commit/fd8d09c8c084a13ec6af0868670038573933d285
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-03-29 (Sun, 29 Mar 2015)

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

  Log Message:
  -----------
  Fix avoid warning


  Commit: 65ec02bae1da37df751ab0c5c91df9f02962a1b1
      
https://github.com/Dolibarr/dolibarr/commit/65ec02bae1da37df751ab0c5c91df9f02962a1b1
  Author: Florian HENRY <address@hidden>
  Date:   2015-03-30 (Mon, 30 Mar 2015)

  Changed paths:
    M htdocs/exports/class/export.class.php

  Log Message:
  -----------
  FIX : [ bug #1913 ] [EXPORT] [PGSQL] Bug when filtering export on a
specific year


  Commit: 104bbfdc1cc42727a67a5308b2af9afa66a81d5b
      
https://github.com/Dolibarr/dolibarr/commit/104bbfdc1cc42727a67a5308b2af9afa66a81d5b
  Author: Florian HENRY <address@hidden>
  Date:   2015-03-30 (Mon, 30 Mar 2015)

  Changed paths:
    M build/debian/changelog
    M build/makepack-dolibarr.pl
    M htdocs/admin/index.php
    M htdocs/core/class/hookmanager.class.php

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


  Commit: f38212f20e8565db6a61673203dd2b998bc068fe
      
https://github.com/Dolibarr/dolibarr/commit/f38212f20e8565db6a61673203dd2b998bc068fe
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M htdocs/exports/class/export.class.php

  Log Message:
  -----------
  Merge pull request #2508 from FHenry/3.6

FIX : [ bug #1913 ] [EXPORT] [PGSQL] Bug when filtering export on a specific 
year


  Commit: dfe4837dbc99f4cbb65d137497ae97549f4f5952
      
https://github.com/Dolibarr/dolibarr/commit/dfe4837dbc99f4cbb65d137497ae97549f4f5952
  Author: Florian HENRY <address@hidden>
  Date:   2015-04-03 (Fri, 03 Apr 2015)

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


  Commit: 092dd38851e582580de4f8adf5e7863356183173
      
https://github.com/Dolibarr/dolibarr/commit/092dd38851e582580de4f8adf5e7863356183173
  Author: Florian HENRY <address@hidden>
  Date:   2015-04-03 (Fri, 03 Apr 2015)

  Changed paths:
    M htdocs/theme/bureau2crea/img/statut4.png

  Log Message:
  -----------
  FIX : [ bug #1916 ] problème d'icone pour l'état "clos" sur les projets


  Commit: 40860a84d17b2e54f18d68a66ca2461a3a687cc0
      
https://github.com/Dolibarr/dolibarr/commit/40860a84d17b2e54f18d68a66ca2461a3a687cc0
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-04-04 (Sat, 04 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Closes #2543: Untranslated "Contract" origin string when creating an invoice 
from a contract


  Commit: 65f4a818d4ed5d65e19aa585c51501618969531a
      
https://github.com/Dolibarr/dolibarr/commit/65f4a818d4ed5d65e19aa585c51501618969531a
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-04-04 (Sat, 04 Apr 2015)

  Changed paths:
    M build/debian/changelog
    M build/makepack-dolibarr.pl
    M htdocs/admin/index.php
    M htdocs/commande/liste.php
    M htdocs/core/class/hookmanager.class.php
    M htdocs/exports/class/export.class.php
    M htdocs/product/stock/product.php

  Log Message:
  -----------
  Merge branch '3.6' into bug-2543


  Commit: 611406b75e049623ca4640f7545dc3ec66aa6acf
      
https://github.com/Dolibarr/dolibarr/commit/611406b75e049623ca4640f7545dc3ec66aa6acf
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-04-04 (Sat, 04 Apr 2015)

  Changed paths:
    M htdocs/societe/rib.php

  Log Message:
  -----------
  Closes #2540 Bug: Incorrect HTML in "Bank account" tab of a Thirdparty


  Commit: 50091dfe8bbada8fde2e5bc318e6570eaa13b15d
      
https://github.com/Dolibarr/dolibarr/commit/50091dfe8bbada8fde2e5bc318e6570eaa13b15d
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-04-04 (Sat, 04 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/fourn/facture/fiche.php

  Log Message:
  -----------
  Closes #2534 SQL error when editing a supplier invoice line


  Commit: 5c8e92d52a8269de43753c60c080f29a797a53db
      
https://github.com/Dolibarr/dolibarr/commit/5c8e92d52a8269de43753c60c080f29a797a53db
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-04-04 (Sat, 04 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/projet/element.php

  Log Message:
  -----------
  Closes #2535 Bug: Untranslated string in "Linked objects" page of a project


  Commit: 54645f0a3ba7f6fd41fd9622a0155ccac5669328
      
https://github.com/Dolibarr/dolibarr/commit/54645f0a3ba7f6fd41fd9622a0155ccac5669328
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-06 (Mon, 06 Apr 2015)

  Changed paths:
    M htdocs/theme/bureau2crea/img/statut4.png

  Log Message:
  -----------
  Merge pull request #2555 from FHenry/3.6

        FIX : [ bug #1916 ] uniformize icon status4 in theme bureau2crea


  Commit: f9608bf41d41a2bb97a9b5bd42633f7ffee4eff3
      
https://github.com/Dolibarr/dolibarr/commit/f9608bf41d41a2bb97a9b5bd42633f7ffee4eff3
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-06 (Mon, 06 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Merge pull request #2547 from marcosgdf/bug-2543

Closes #2543: Untranslated "Contract" origin string when creating an invoice 
from a contract


  Commit: d8b50722f39bacec41d50d7b5258b9a656036984
      
https://github.com/Dolibarr/dolibarr/commit/d8b50722f39bacec41d50d7b5258b9a656036984
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-06 (Mon, 06 Apr 2015)

  Changed paths:
    M htdocs/societe/rib.php

  Log Message:
  -----------
  Merge pull request #2548 from marcosgdf/bug-2540

Close #2540 Bug: Incorrect HTML in "Bank account" tab of a Thirdparty


  Commit: 8ce66aad7987329a857d8355dceafc37f955e646
      
https://github.com/Dolibarr/dolibarr/commit/8ce66aad7987329a857d8355dceafc37f955e646
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-06 (Mon, 06 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/fourn/facture/fiche.php

  Log Message:
  -----------
  Merge branch 'bug-2534' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-2534

Conflicts:
        ChangeLog


  Commit: a92c8ccbd55447db9559be6cbefb7fdbae004434
      
https://github.com/Dolibarr/dolibarr/commit/a92c8ccbd55447db9559be6cbefb7fdbae004434
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-06 (Mon, 06 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/fourn/facture/fiche.php

  Log Message:
  -----------
  git push origin 3.6Merge branch 'marcosgdf-bug-2534' into 3.6


  Commit: a42eb7b787cf342bd2b59f498a004c74cf90cd1c
      
https://github.com/Dolibarr/dolibarr/commit/a42eb7b787cf342bd2b59f498a004c74cf90cd1c
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-06 (Mon, 06 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/projet/element.php

  Log Message:
  -----------
  Merge branch 'bug-2535' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-2535

Conflicts:
        ChangeLog


  Commit: 6afde94acf66a62f82e9a63b87c671f6078da880
      
https://github.com/Dolibarr/dolibarr/commit/6afde94acf66a62f82e9a63b87c671f6078da880
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-06 (Mon, 06 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/projet/element.php

  Log Message:
  -----------
  git push origin 3.6Merge branch 'marcosgdf-bug-2535' into 3.6


  Commit: 7a2942684cffef8e02bc8994cec776b108c5d655
      
https://github.com/Dolibarr/dolibarr/commit/7a2942684cffef8e02bc8994cec776b108c5d655
  Author: Frédéric FRANCE <address@hidden>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M htdocs/compta/bank/index.php

  Log Message:
  -----------
  Fix #2559 Bug: Untranslated "Total" in Bank module


  Commit: 06c749942a8ec344bb6c66483d19ebcb1e04b081
      
https://github.com/Dolibarr/dolibarr/commit/06c749942a8ec344bb6c66483d19ebcb1e04b081
  Author: Frédéric FRANCE <address@hidden>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M htdocs/compta/bank/index.php

  Log Message:
  -----------
  Update index.php


  Commit: 345b609ff05bb0edf8a943fdebdb479fc35418fe
      
https://github.com/Dolibarr/dolibarr/commit/345b609ff05bb0edf8a943fdebdb479fc35418fe
  Author: Juanjo Menent <address@hidden>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M ChangeLog
    A htdocs/theme/amarok/img/object_margin.png

  Log Message:
  -----------
  Closes #2545 Bug: Missing object_margin.png in Amarok theme


  Commit: 35a6ed90a04ff841aad672e47b8bd303cecedbbd
      
https://github.com/Dolibarr/dolibarr/commit/35a6ed90a04ff841aad672e47b8bd303cecedbbd
  Author: Juanjo Menent <address@hidden>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Solves #2542 Bug: Contracts store localtax preferences


  Commit: 9d8cb459f1c935ee82ee315da5f505ed0e3ad23c
      
https://github.com/Dolibarr/dolibarr/commit/9d8cb459f1c935ee82ee315da5f505ed0e3ad23c
  Author: Juanjo Menent <address@hidden>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/product.php

  Log Message:
  -----------
  Fix: Bad permission assignments for stock movements actions


  Commit: bb83eb0f68628ef6c240a297fb2e6456c9531b14
      
https://github.com/Dolibarr/dolibarr/commit/bb83eb0f68628ef6c240a297fb2e6456c9531b14
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M htdocs/compta/bank/index.php

  Log Message:
  -----------
  Merge pull request #2561 from frederic34/patch-5

Fix #2559 Bug: Untranslated "Total" in Bank module


  Commit: 914b324a674b014aace9f7e802a7346422450340
      
https://github.com/Dolibarr/dolibarr/commit/914b324a674b014aace9f7e802a7346422450340
  Author: braito4 <address@hidden>
  Date:   2015-04-09 (Thu, 09 Apr 2015)

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

  Log Message:
  -----------
  minor bug drag and drop total line in tasks list


  Commit: 0e2bc5608d2a2cd8d02a9ed8629e457ee44d3db7
      
https://github.com/Dolibarr/dolibarr/commit/0e2bc5608d2a2cd8d02a9ed8629e457ee44d3db7
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-09 (Thu, 09 Apr 2015)

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

  Log Message:
  -----------
  Merge pull request #2578 from braito4/patch-1

minor bug drag and drop total line in tasks list


  Commit: 1f5ca497d34e77a5c443e61f3c545fcbb5989fec
      
https://github.com/Dolibarr/dolibarr/commit/1f5ca497d34e77a5c443e61f3c545fcbb5989fec
  Author: aspangaro <address@hidden>
  Date:   2015-04-09 (Thu, 09 Apr 2015)

  Changed paths:
    M htdocs/langs/en_US/banks.lang

  Log Message:
  -----------
  Bug: Untranslated table header in /compta/bank/search.php


  Commit: aba83b6467470875ac5d37199d53e420c6cdcd2a
      
https://github.com/Dolibarr/dolibarr/commit/aba83b6467470875ac5d37199d53e420c6cdcd2a
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-09 (Thu, 09 Apr 2015)

  Changed paths:
    M htdocs/langs/en_US/banks.lang

  Log Message:
  -----------
  Merge pull request #2585 from aspangaro/3.6

Fix #2582 - Untranslated table header in /compta/bank/search.php


  Commit: 728b64e334dc999fa965d61e2cfe1c4e65bd8747
      
https://github.com/Dolibarr/dolibarr/commit/728b64e334dc999fa965d61e2cfe1c4e65bd8747
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-04-12 (Sun, 12 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/bank/virement.php

  Log Message:
  -----------
  Fix Bug #2583: Unable to create a bank transfer with localized numbers


  Commit: bbd01c0c8d0f238a642e26b5078d593571670879
      
https://github.com/Dolibarr/dolibarr/commit/bbd01c0c8d0f238a642e26b5078d593571670879
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-04-12 (Sun, 12 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/projet/element.php

  Log Message:
  -----------
  Fix: Bug #2577 Incorrect invoice status in "Linked objects" page of a project


  Commit: 9cfb295675bebb049bbc367e902c571f1b9a27c6
      
https://github.com/Dolibarr/dolibarr/commit/9cfb295675bebb049bbc367e902c571f1b9a27c6
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-04-12 (Sun, 12 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/admin/dict.php

  Log Message:
  -----------
  Fix: Bug #2576 Unable to edit a dictionary entry that has # in its ref


  Commit: 6173706531ac4a19e0c5b66d3f066e6b98cc2c8a
      
https://github.com/Dolibarr/dolibarr/commit/6173706531ac4a19e0c5b66d3f066e6b98cc2c8a
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-04-12 (Sun, 12 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/deplacement/fiche.php

  Log Message:
  -----------
  Fix: [ bug #1906 ] Deplacement does not allow translated decimal format


  Commit: 8f0c41dbd21e48fa61164a6794958a7ad6c1e752
      
https://github.com/Dolibarr/dolibarr/commit/8f0c41dbd21e48fa61164a6794958a7ad6c1e752
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-04-12 (Sun, 12 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/deplacement/fiche.php

  Log Message:
  -----------
  Fix: [ bug #1905 ] Custom deplacement types do not get translated in 
deplacement card


  Commit: c0ddfbfab7690d15303039f653b86c7055794246
      
https://github.com/Dolibarr/dolibarr/commit/c0ddfbfab7690d15303039f653b86c7055794246
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-13 (Mon, 13 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/deplacement/fiche.php

  Log Message:
  -----------
  Merge pull request #2597 from marcosgdf/bug-1906

Fixes for bugs #1906 and #1905


  Commit: 54b8aa8a0b79528aaf45e11e495d4dfef45002f0
      
https://github.com/Dolibarr/dolibarr/commit/54b8aa8a0b79528aaf45e11e495d4dfef45002f0
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

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

  Log Message:
  -----------
  Fixed typo in task export

Closes #2607, #2609


  Commit: 0b6c3cada3858f6096be6124d61c3a0bdfc50d2a
      
https://github.com/Dolibarr/dolibarr/commit/0b6c3cada3858f6096be6124d61c3a0bdfc50d2a
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

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

  Log Message:
  -----------
  Merge pull request #2608 from GPCsolutions/3.6-2607

Fixed typo in task export


  Commit: 3073aab48bbb26a4080696deb1105c12caa8d3c5
      
https://github.com/Dolibarr/dolibarr/commit/3073aab48bbb26a4080696deb1105c12caa8d3c5
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2015-04-17 (Fri, 17 Apr 2015)

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

  Log Message:
  -----------
  Fix : discount were not working anymore on supplier order and bill


  Commit: ae41d38a965f8c5fa263341f3d87527989c9e021
      
https://github.com/Dolibarr/dolibarr/commit/ae41d38a965f8c5fa263341f3d87527989c9e021
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

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

  Log Message:
  -----------
  Merge pull request #2616 from atm-maxime/3.6

Fix : discount were not working anymore on supplier order and bill


  Commit: 2b8efc302a173e57138e5be6c9de2af57b9838c8
      
https://github.com/Dolibarr/dolibarr/commit/2b8efc302a173e57138e5be6c9de2af57b9838c8
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/fiche.php

  Log Message:
  -----------
  Fix : shipment model selection


  Commit: 0000043c96973fbaa216a096849b0545417cfa83
      
https://github.com/Dolibarr/dolibarr/commit/0000043c96973fbaa216a096849b0545417cfa83
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/fiche.php

  Log Message:
  -----------
  Merge pull request #2629 from atm-maxime/3.5_fix_shipment_model

Fix : shipment model selection


  Commit: e0af2feced0795c627439a2a3e62d3d6885b1423
      
https://github.com/Dolibarr/dolibarr/commit/e0af2feced0795c627439a2a3e62d3d6885b1423
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/compta/facture/impayees.php

  Log Message:
  -----------
  Fix : on impayees remain to pay did not include deposits


  Commit: 8b307aac56b3f19147c13b75b3e8f3b24356d209
      
https://github.com/Dolibarr/dolibarr/commit/8b307aac56b3f19147c13b75b3e8f3b24356d209
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/societe/class/societe.class.php

  Log Message:
  -----------
  Fix : customer outstanding was not calculated properly


  Commit: 51522decf34daf43afbf0a6b03added6cd9b6e7b
      
https://github.com/Dolibarr/dolibarr/commit/51522decf34daf43afbf0a6b03added6cd9b6e7b
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

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

  Log Message:
  -----------
  Fix : price in editkeyval function was forcing a price rounding


  Commit: 7375256b99931257741bcc0a4d881f2ab9821711
      
https://github.com/Dolibarr/dolibarr/commit/7375256b99931257741bcc0a4d881f2ab9821711
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

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

  Log Message:
  -----------
  Merge pull request #2643 from atm-maxime/3.6

Fix : price in editkeyval function was forcing a price rounding


  Commit: 4201cf9f7f9ed8e174cdc6fb2b2d7f4127b013f9
      
https://github.com/Dolibarr/dolibarr/commit/4201cf9f7f9ed8e174cdc6fb2b2d7f4127b013f9
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/compta/facture/impayees.php
    M htdocs/societe/class/societe.class.php

  Log Message:
  -----------
  Merge pull request #2638 from atm-maxime/fix_cust_outstanding

Fix cust outstanding


  Commit: 9b69b64626a962c55f4df47f1cd5e8c821c0f4ad
      
https://github.com/Dolibarr/dolibarr/commit/9b69b64626a962c55f4df47f1cd5e8c821c0f4ad
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/bank/virement.php

  Log Message:
  -----------
  Merge branch 'bug-2583' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-2583

Conflicts:
        ChangeLog


  Commit: b75722d450c78fdf86f704370e873294fa7378ca
      
https://github.com/Dolibarr/dolibarr/commit/b75722d450c78fdf86f704370e873294fa7378ca
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/bank/virement.php

  Log Message:
  -----------
  git push origin 3.5Merge branch 'marcosgdf-bug-2583' into 3.5


  Commit: 7b035d3b5fe7a3ed5af70e7be718a0e4fdfb80d7
      
https://github.com/Dolibarr/dolibarr/commit/7b035d3b5fe7a3ed5af70e7be718a0e4fdfb80d7
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/core/menus/standard/eldy.lib.php

  Log Message:
  -----------
  Fix : menu financial was not displayed when only supplier module is activated


  Commit: b7cf0ded002d74d309c2d4293507bf1bfaf51ace
      
https://github.com/Dolibarr/dolibarr/commit/b7cf0ded002d74d309c2d4293507bf1bfaf51ace
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/projet/element.php

  Log Message:
  -----------
  Merge branch 'bug-2577' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-2577

Conflicts:
        ChangeLog


  Commit: 5f49b2a9bba08547db25348b59260e4ac029641e
      
https://github.com/Dolibarr/dolibarr/commit/5f49b2a9bba08547db25348b59260e4ac029641e
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/projet/element.php

  Log Message:
  -----------
  git push origin 3.5Merge branch 'marcosgdf-bug-2577' into 3.5


  Commit: e49a46a386bd707a8f9aada251d55bce8031d1d3
      
https://github.com/Dolibarr/dolibarr/commit/e49a46a386bd707a8f9aada251d55bce8031d1d3
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/core/menus/standard/eldy.lib.php

  Log Message:
  -----------
  Merge pull request #2653 from atm-maxime/3.6

Fix : menu financial was not displayed when only supplier module is acti...


  Commit: ed6abb0f79ade9dcd74e8459909cdf668f50e3f9
      
https://github.com/Dolibarr/dolibarr/commit/ed6abb0f79ade9dcd74e8459909cdf668f50e3f9
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/admin/dict.php

  Log Message:
  -----------
  Merge branch 'bug-2576' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-2576

Conflicts:
        ChangeLog


  Commit: 4de4c66bb74bb514129c986e8987f1aab7af9bdb
      
https://github.com/Dolibarr/dolibarr/commit/4de4c66bb74bb514129c986e8987f1aab7af9bdb
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/admin/dict.php

  Log Message:
  -----------
  git push origin 3.5Merge branch 'marcosgdf-bug-2576' into 3.5


  Commit: 37d8dafd4084de854ba66256f40ce2755631a8e9
      
https://github.com/Dolibarr/dolibarr/commit/37d8dafd4084de854ba66256f40ce2755631a8e9
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/bank/virement.php
    M htdocs/compta/deplacement/fiche.php
    M htdocs/core/modules/societe/mod_codecompta_aquarium.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/fiche.php
    M htdocs/projet/element.php

  Log Message:
  -----------
  Merge branch '3.5' into bug-2576

Conflicts:
        ChangeLog


  Commit: be9ddb7748576aa75beff6988bf43a5dd31655bd
      
https://github.com/Dolibarr/dolibarr/commit/be9ddb7748576aa75beff6988bf43a5dd31655bd
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/admin/dict.php

  Log Message:
  -----------
  Merge pull request #2595 from marcosgdf/bug-2576

Close #2576 Bug: Unable to edit a dictionary entry that has # in its ref


  Commit: b8c512a3d5d0b73fce33933b4c1e6a7b6ab55ce9
      
https://github.com/Dolibarr/dolibarr/commit/b8c512a3d5d0b73fce33933b4c1e6a7b6ab55ce9
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Log Message:
  -----------
  Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5


  Commit: ab77158757a91e17b7ff53f318699c128a8205b7
      
https://github.com/Dolibarr/dolibarr/commit/ab77158757a91e17b7ff53f318699c128a8205b7
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/admin/dict.php
    M htdocs/compta/bank/virement.php
    M htdocs/compta/deplacement/fiche.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/fiche.php
    M htdocs/projet/element.php

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

Conflicts:
        htdocs/expedition/fiche.php


  Commit: 5a66e1f98ad1776a2c32575410c67cafd0e48364
      
https://github.com/Dolibarr/dolibarr/commit/5a66e1f98ad1776a2c32575410c67cafd0e48364
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2015-04-19 (Sun, 19 Apr 2015)

  Changed paths:
    M htdocs/societe/class/societe.class.php

  Log Message:
  -----------
  Fix : include facture class for outstanding bill


  Commit: fdd34c582cc974b420536d54a5a7b402028ed47c
      
https://github.com/Dolibarr/dolibarr/commit/fdd34c582cc974b420536d54a5a7b402028ed47c
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-19 (Sun, 19 Apr 2015)

  Changed paths:
    M htdocs/societe/class/societe.class.php

  Log Message:
  -----------
  Merge pull request #2665 from atm-maxime/3.6

Fix : include facture class for outstanding bill


  Commit: cfaaf56428a4ada5004f86efafbca922cb6fee23
      
https://github.com/Dolibarr/dolibarr/commit/cfaaf56428a4ada5004f86efafbca922cb6fee23
  Author: Juanjo Menent <address@hidden>
  Date:   2015-04-27 (Mon, 27 Apr 2015)

  Changed paths:
    M htdocs/main.inc.php

  Log Message:
  -----------
  Change bugtracker to github in all maintened versions


  Commit: 290856db1ca4f5841ac2171afea8ad5e8fe78e53
      
https://github.com/Dolibarr/dolibarr/commit/290856db1ca4f5841ac2171afea8ad5e8fe78e53
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-29 (Wed, 29 Apr 2015)

  Changed paths:
    M htdocs/user/fiche.php

  Log Message:
  -----------
  Fix remove warning


  Commit: 7419319c0ffe1f53f01498ff705361732158a360
      
https://github.com/Dolibarr/dolibarr/commit/7419319c0ffe1f53f01498ff705361732158a360
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-29 (Wed, 29 Apr 2015)

  Changed paths:
    M build/makepack-dolibarr.pl

  Log Message:
  -----------
  Protection into packager


  Commit: 43efd76b24463e47ab0ea21ead2d6ea2d7033126
      
https://github.com/Dolibarr/dolibarr/commit/43efd76b24463e47ab0ea21ead2d6ea2d7033126
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-29 (Wed, 29 Apr 2015)

  Changed paths:
    M htdocs/user/clicktodial.php

  Log Message:
  -----------
  Fix remove warnings


  Commit: f1032baaab0b212af180d4bbc113a254c1adb959
      
https://github.com/Dolibarr/dolibarr/commit/f1032baaab0b212af180d4bbc113a254c1adb959
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2015-04-30 (Thu, 30 Apr 2015)

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

  Log Message:
  -----------
  Allow exporting projects without a third party

FIX #2729


  Commit: 6309d2133f17c2dd54cc9ee92e6a25aa58bc5abb
      
https://github.com/Dolibarr/dolibarr/commit/6309d2133f17c2dd54cc9ee92e6a25aa58bc5abb
  Author: Juanjo Menent <address@hidden>
  Date:   2015-05-01 (Fri, 01 May 2015)

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

  Log Message:
  -----------
  Merge pull request #2731 from GPCsolutions/dolibarr-2729

Allow exporting projects without a third party


  Commit: a6b0f6cfac2fd54250f99713e500a04e340de56d
      
https://github.com/Dolibarr/dolibarr/commit/a6b0f6cfac2fd54250f99713e500a04e340de56d
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2015-05-01 (Fri, 01 May 2015)

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

  Log Message:
  -----------
  Allow exporting projects without a third party

FIX #2729


  Commit: b203263e9188d051418e70fa281836e867295b24
      
https://github.com/Dolibarr/dolibarr/commit/b203263e9188d051418e70fa281836e867295b24
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2015-05-06 (Wed, 06 May 2015)

  Changed paths:
    M htdocs/core/modules/expedition/modules_expedition.php
    M htdocs/expedition/fiche.php

  Log Message:
  -----------
  Fix : shipment PDF was not using generation params


  Commit: d2603d5308d7a46fa0c994067fabc7ff81055e78
      
https://github.com/Dolibarr/dolibarr/commit/d2603d5308d7a46fa0c994067fabc7ff81055e78
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2015-05-06 (Wed, 06 May 2015)

  Changed paths:
    M htdocs/expedition/class/expedition.class.php

  Log Message:
  -----------
  Fix : shipment was not considered as billed after classifybilled function


  Commit: 42455f771a0a00933e33c94092fd2bad1cc203ef
      
https://github.com/Dolibarr/dolibarr/commit/42455f771a0a00933e33c94092fd2bad1cc203ef
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2015-05-06 (Wed, 06 May 2015)

  Changed paths:
    M htdocs/core/modules/expedition/modules_expedition.php

  Log Message:
  -----------
  Missing comments


  Commit: 179309710cb71c927a4905a630a25a1f4ed297e4
      
https://github.com/Dolibarr/dolibarr/commit/179309710cb71c927a4905a630a25a1f4ed297e4
  Author: Regis Houssin <address@hidden>
  Date:   2015-05-06 (Wed, 06 May 2015)

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

  Log Message:
  -----------
  Fix: use global $object instead parameter


  Commit: 5d65d666f7969d8c4e793900b632fe60c2248b5c
      
https://github.com/Dolibarr/dolibarr/commit/5d65d666f7969d8c4e793900b632fe60c2248b5c
  Author: Juanjo Menent <address@hidden>
  Date:   2015-05-06 (Wed, 06 May 2015)

  Changed paths:
    M htdocs/core/modules/expedition/modules_expedition.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/fiche.php

  Log Message:
  -----------
  Merge pull request #2778 from atm-maxime/3.6

Fix : shipment PDF was not using generation params


  Commit: 1b56144cb8cf5b86d0e44859efc5874612eabc64
      
https://github.com/Dolibarr/dolibarr/commit/1b56144cb8cf5b86d0e44859efc5874612eabc64
  Author: Regis Houssin <address@hidden>
  Date:   2015-05-07 (Thu, 07 May 2015)

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

  Log Message:
  -----------
  Revert "Fix: use global $object instead parameter"

This reverts commit 179309710cb71c927a4905a630a25a1f4ed297e4.


  Commit: c976d32e7d45ddebcc09d72d71df811b25d96e99
      
https://github.com/Dolibarr/dolibarr/commit/c976d32e7d45ddebcc09d72d71df811b25d96e99
  Author: Regis Houssin <address@hidden>
  Date:   2015-05-07 (Thu, 07 May 2015)

  Changed paths:
    M htdocs/core/modules/expedition/modules_expedition.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/fiche.php

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


  Commit: 9a32d7ec2f6a1735609eaf8b469774c17f4d72a8
      
https://github.com/Dolibarr/dolibarr/commit/9a32d7ec2f6a1735609eaf8b469774c17f4d72a8
  Author: Regis Houssin <address@hidden>
  Date:   2015-05-07 (Thu, 07 May 2015)

  Changed paths:
    M htdocs/product/class/product.class.php

  Log Message:
  -----------
  Fix: add $object for use with triggers


  Commit: 29f562460a0498c58f70e335a6e555619c059ca8
      
https://github.com/Dolibarr/dolibarr/commit/29f562460a0498c58f70e335a6e555619c059ca8
  Author: Florian HENRY <address@hidden>
  Date:   2015-05-07 (Thu, 07 May 2015)

  Changed paths:
    M htdocs/contrat/fiche.php

  Log Message:
  -----------
  fix [ bug #1926 ] [contract] Wrong Rights Checked


  Commit: 5395465cfdf935f6f8ff111fef996a605c908a72
      
https://github.com/Dolibarr/dolibarr/commit/5395465cfdf935f6f8ff111fef996a605c908a72
  Author: Florian HENRY <address@hidden>
  Date:   2015-05-07 (Thu, 07 May 2015)

  Changed paths:
    M build/makepack-dolibarr.pl
    M htdocs/core/modules/expedition/modules_expedition.php
    M htdocs/core/modules/modProjet.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/fiche.php
    M htdocs/main.inc.php
    M htdocs/user/clicktodial.php
    M htdocs/user/fiche.php

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


  Commit: b7228e191c07bfbdf8c0f0ed817470da6fec3009
      
https://github.com/Dolibarr/dolibarr/commit/b7228e191c07bfbdf8c0f0ed817470da6fec3009
  Author: Juanjo Menent <address@hidden>
  Date:   2015-05-07 (Thu, 07 May 2015)

  Changed paths:
    M htdocs/contrat/fiche.php

  Log Message:
  -----------
  Merge pull request #2801 from FHenry/3.6

FIX : [ bug #1926 ] [contract] Wrong Rights Checked


  Commit: f8e8b39ff2b16e08961c5b68deefa8fb97acc295
      
https://github.com/Dolibarr/dolibarr/commit/f8e8b39ff2b16e08961c5b68deefa8fb97acc295
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-05-10 (Sun, 10 May 2015)

  Changed paths:
    M ChangeLog
    M htdocs/product/class/product.class.php

  Log Message:
  -----------
  FIX #2758 Product::update sets product note to "null" when $prod->note is null


  Commit: f6616deef3b74343a5c28adc969540366f1ed878
      
https://github.com/Dolibarr/dolibarr/commit/f6616deef3b74343a5c28adc969540366f1ed878
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-05-10 (Sun, 10 May 2015)

  Changed paths:
    M htdocs/product/class/product.class.php

  Log Message:
  -----------
  Removed debugging function


  Commit: 5f594d55acb8bd88dd30c4e63cd6a40afc2c0ec3
      
https://github.com/Dolibarr/dolibarr/commit/5f594d55acb8bd88dd30c4e63cd6a40afc2c0ec3
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-05-11 (Mon, 11 May 2015)

  Changed paths:
    M ChangeLog
    M htdocs/product/class/product.class.php

  Log Message:
  -----------
  Merge pull request #2805 from marcosgdf/bug-2758

FIX #2758 Product::update sets product note to "null" when $prod->note is null


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

  Changed paths:
    M ChangeLog
    M htdocs/product/class/product.class.php

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

Conflicts:
        htdocs/product/class/product.class.php


  Commit: 973e2253bf0191b7ecd7c6cc5b6dfe44f2820b90
      
https://github.com/Dolibarr/dolibarr/commit/973e2253bf0191b7ecd7c6cc5b6dfe44f2820b90
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    M htdocs/product/class/product.class.php

  Log Message:
  -----------
  Merge pull request #2797 from hregis/3.6

Fix: add $object for use with triggers


  Commit: ea7eb241e36bd0f732df7466eecbeadbe10074a9
      
https://github.com/Dolibarr/dolibarr/commit/ea7eb241e36bd0f732df7466eecbeadbe10074a9
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    M ChangeLog
    M htdocs/categories/photos.php

  Log Message:
  -----------
  Close bug #2757 Deleting product category photo gives "Forbidden access" error


  Commit: 190f12c4c4b962a14f633e0339b4e476c7446af4
      
https://github.com/Dolibarr/dolibarr/commit/190f12c4c4b962a14f633e0339b4e476c7446af4
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    M ChangeLog
    M htdocs/product/class/product.class.php

  Log Message:
  -----------
  Merge branch '3.5' into bug-2757

Conflicts:
        ChangeLog


  Commit: f8e8fe6f34829c3e585c1ed9439ee7c4aa7e1258
      
https://github.com/Dolibarr/dolibarr/commit/f8e8fe6f34829c3e585c1ed9439ee7c4aa7e1258
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    M ChangeLog
    M htdocs/categories/photos.php

  Log Message:
  -----------
  Merge pull request #2816 from marcosgdf/bug-2757

Close bug #2757 Deleting product category photo gives "Forbidden access" error


  Commit: 80943111cc946c1d2da6320eb12e05c67fd1b3e9
      
https://github.com/Dolibarr/dolibarr/commit/80943111cc946c1d2da6320eb12e05c67fd1b3e9
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-05-16 (Sat, 16 May 2015)

  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.5.7


  Commit: 1d8a3809f00261850f993ce77120f765cc42aca7
      
https://github.com/Dolibarr/dolibarr/commit/1d8a3809f00261850f993ce77120f765cc42aca7
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-05-16 (Sat, 16 May 2015)

  Changed paths:
    M ChangeLog
    M htdocs/categories/photos.php

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


  Commit: 4dcdea5219c452e40eb99f75fa0df385c54a9d96
      
https://github.com/Dolibarr/dolibarr/commit/4dcdea5219c452e40eb99f75fa0df385c54a9d96
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-05-16 (Sat, 16 May 2015)

  Changed paths:
    M build/makepack-dolibarr.pl
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec

  Log Message:
  -----------
  Prepare package 3.5.7
Removed hardcoded version from rpm spec files, so it will not be
necessary to update this files when making a new release.


  Commit: e8fb89f89f2f9be2190f5b4fa8fae7c90a398dc1
      
https://github.com/Dolibarr/dolibarr/commit/e8fb89f89f2f9be2190f5b4fa8fae7c90a398dc1
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-05-16 (Sat, 16 May 2015)

  Changed paths:
    M build/exe/doliwamp/doliwamp.iss
    M build/makepack-dolibarr.pl
    M build/makepack-howto.txt

  Log Message:
  -----------
  Prepare packaging 3.7


  Commit: cabbb9e4216fc18fc833ee406c83d6b57087c8f4
      
https://github.com/Dolibarr/dolibarr/commit/cabbb9e4216fc18fc833ee406c83d6b57087c8f4
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-05-16 (Sat, 16 May 2015)

  Changed paths:
    M ChangeLog
    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/filefunc.inc.php

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

Conflicts:
        build/debian/changelog
        build/exe/doliwamp/doliwamp.iss
        build/makepack-dolibarr.pl
        build/rpm/dolibarr_fedora.spec
        build/rpm/dolibarr_generic.spec
        build/rpm/dolibarr_mandriva.spec
        build/rpm/dolibarr_opensuse.spec
        htdocs/filefunc.inc.php


  Commit: 5b00ba11fd0bd3fe0628b12e7fed2ad36c319dd7
      
https://github.com/Dolibarr/dolibarr/commit/5b00ba11fd0bd3fe0628b12e7fed2ad36c319dd7
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-05-16 (Sat, 16 May 2015)

  Changed paths:
    M build/exe/doliwamp/doliwamp.iss

  Log Message:
  -----------
  Prepare packaging


  Commit: 06e4c2971f0e20d0ae5b0dcaa6c51fedc6145edd
      
https://github.com/Dolibarr/dolibarr/commit/06e4c2971f0e20d0ae5b0dcaa6c51fedc6145edd
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-05-16 (Sat, 16 May 2015)

  Changed paths:
    M ChangeLog
    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/admin/dict.php
    M htdocs/admin/index.php
    M htdocs/commande/fiche.php
    M htdocs/compta/bank/index.php
    M htdocs/compta/bank/virement.php
    M htdocs/compta/deplacement/fiche.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/impayees.php
    M htdocs/contrat/fiche.php
    M htdocs/core/class/hookmanager.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/expedition/modules_expedition.php
    M htdocs/core/modules/modProjet.class.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/fiche.php
    M htdocs/exports/class/export.class.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/langs/en_US/banks.lang
    M htdocs/main.inc.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/product.php
    M htdocs/projet/element.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/rib.php
    A htdocs/theme/amarok/img/object_margin.png
    M htdocs/theme/bureau2crea/img/statut4.png
    M htdocs/user/clicktodial.php
    M htdocs/user/fiche.php

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

Conflicts:
        build/exe/doliwamp/doliwamp.iss
        htdocs/contrat/fiche.php
        htdocs/core/menus/standard/eldy.lib.php


  Commit: 3fbf329045c89e9ff3f58078db0d667dce634b4c
      
https://github.com/Dolibarr/dolibarr/commit/3fbf329045c89e9ff3f58078db0d667dce634b4c
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-05-16 (Sat, 16 May 2015)

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/e0bff7ee73e7...3fbf329045c8
[Prev in Thread]
Current Thread
[Next in Thread]
[Dolibarr-git] [Dolibarr/dolibarr] b56901: Prepare 3.6.3, Laurent Destailleur <=
Prev by Date: [Dolibarr-git] [Dolibarr/dolibarr] 5b00ba: Prepare packaging
Next by Date: [Dolibarr-git] [Dolibarr/dolibarr] 179309: Fix: use global $object instead parameter
Previous by thread: [Dolibarr-git] [Dolibarr/dolibarr] 5b00ba: Prepare packaging
Next by thread: [Dolibarr-git] [Dolibarr/dolibarr] a4df49: Prepare packaging
Index(es):
- Date
- Thread