[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:	Sun, 12 Apr 2015 03:04:19 -0700
  Branch: refs/heads/3.7
  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: 1272b03e5e090afe54c7f45ea521d4f66e1771fe
      
https://github.com/Dolibarr/dolibarr/commit/1272b03e5e090afe54c7f45ea521d4f66e1771fe
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-12 (Sun, 12 Apr 2015)

  Changed paths:
    M build/debian/changelog
    M htdocs/admin/index.php
    M htdocs/compta/bank/index.php
    M htdocs/compta/facture.php
    M htdocs/core/class/hookmanager.class.php
    M htdocs/core/lib/project.lib.php
    M htdocs/exports/class/export.class.php
    M htdocs/langs/en_US/banks.lang
    M htdocs/projet/element.php
    M htdocs/societe/rib.php
    M htdocs/theme/bureau2crea/img/statut4.png

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

Conflicts:
        build/debian/changelog
        htdocs/commande/fiche.php
        htdocs/compta/facture.php
        htdocs/core/menus/standard/eldy.lib.php
        htdocs/fourn/facture/fiche.php
        htdocs/product/stock/mouvement.php
        htdocs/projet/element.php
        htdocs/societe/rib.php
        htdocs/theme/bureau2crea/img/statut4.png


Compare: 
https://github.com/Dolibarr/dolibarr/compare/1bf95b48c1ba...1272b03e5e09
[Prev in Thread]
Current Thread
[Next in Thread]
[Dolibarr-git] [Dolibarr/dolibarr] b56901: Prepare 3.6.3, Laurent Destailleur <=
- [Dolibarr-git] [Dolibarr/dolibarr] b56901: Prepare 3.6.3, Laurent Destailleur, 2015/04/13
Prev by Date: [Dolibarr-git] [Dolibarr/dolibarr] 1bf95b: Fix remove warning when posting a vote
Next by Date: [Dolibarr-git] [Dolibarr/dolibarr] 6502d1: Fix: filter on stock too low forgot some lines
Previous by thread: [Dolibarr-git] [Dolibarr/dolibarr] 1bf95b: Fix remove warning when posting a vote
Next by thread: [Dolibarr-git] [Dolibarr/dolibarr] b56901: Prepare 3.6.3
Index(es):
- Date
- Thread