dolibarr-git
[Top][All Lists]
Advanced

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

[Dolibarr-git] [Dolibarr/dolibarr] cc37a7: Fix parenthesis


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] cc37a7: Fix parenthesis
Date: Wed, 14 Jun 2017 01:48:47 -0700

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: cc37a7d84823b6db24ae6a09d53451ec0c841a35
      
https://github.com/Dolibarr/dolibarr/commit/cc37a7d84823b6db24ae6a09d53451ec0c841a35
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-09 (Fri, 09 Jun 2017)

  Changed paths:
    M htdocs/compta/prelevement/class/bonprelevement.class.php

  Log Message:
  -----------
  Fix parenthesis


  Commit: d037515e37938161982583d866c598fc03061c9d
      
https://github.com/Dolibarr/dolibarr/commit/d037515e37938161982583d866c598fc03061c9d
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-10 (Sat, 10 Jun 2017)

  Changed paths:
    M htdocs/core/lib/functions.lib.php
    M htdocs/user/index.php

  Log Message:
  -----------
  FIX SQL injection on user/index.php parameter search_statut.

Conflicts:
        htdocs/user/index.php


  Commit: 9c482b9f2a021604e29b7321e2e18eed60d08932
      
https://github.com/Dolibarr/dolibarr/commit/9c482b9f2a021604e29b7321e2e18eed60d08932
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-10 (Sat, 10 Jun 2017)

  Changed paths:
    M htdocs/core/datepicker.php
    M htdocs/core/get_menudiv.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/search_page.php
    M htdocs/externalsite/frames.php
    M htdocs/install/inc.php
    M htdocs/main.inc.php
    M htdocs/master.inc.php
    M htdocs/support/inc.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php

  Log Message:
  -----------
  FIX CVE-2017-7886


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

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

  Log Message:
  -----------
  Fix permission on recurring invoice list


  Commit: 5def2d2600276918d80aab9ece3c2f36af8f7bfd
      
https://github.com/Dolibarr/dolibarr/commit/5def2d2600276918d80aab9ece3c2f36af8f7bfd
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    M htdocs/product/price.php

  Log Message:
  -----------
  Add div to help debug of html content


  Commit: 4c0b0ef4c2b37f106d0017d3fbd21258fcaea2c5
      
https://github.com/Dolibarr/dolibarr/commit/4c0b0ef4c2b37f106d0017d3fbd21258fcaea2c5
  Author: phf <address@hidden>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Fix display on situation invoice


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

  Changed paths:
    M htdocs/product/list.php

  Log Message:
  -----------
  Fix option STOCK_SUPPORTS_SERVICES (stock not visible when it should)


  Commit: f2961b8652dce6ff9cf86a3d1fb4c1ab042a7c3e
      
https://github.com/Dolibarr/dolibarr/commit/f2961b8652dce6ff9cf86a3d1fb4c1ab042a7c3e
  Author: phf <address@hidden>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    M htdocs/supplier_proposal/card.php

  Log Message:
  -----------
  Fix 6993 - supplier propal check min price on update line


  Commit: 9b979e3cb765744b1c443d7c8811a0a1b9238a60
      
https://github.com/Dolibarr/dolibarr/commit/9b979e3cb765744b1c443d7c8811a0a1b9238a60
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    M htdocs/user/card.php

  Log Message:
  -----------
  Fix wrong warning when user is disabled


  Commit: 9e5af63c2cff16d471b49720d059d1198b4d481a
      
https://github.com/Dolibarr/dolibarr/commit/9e5af63c2cff16d471b49720d059d1198b4d481a
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Merge pull request #6996 from atm-ph/fix_5.0_display_situtation_amount

Fix display on situation invoice


  Commit: 7b8a35630c2ec13d4184914633350e3b973f7a26
      
https://github.com/Dolibarr/dolibarr/commit/7b8a35630c2ec13d4184914633350e3b973f7a26
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    M htdocs/supplier_proposal/card.php

  Log Message:
  -----------
  Merge pull request #6997 from atm-ph/fix_6993

Fix 6993 - supplier propal check min price on update line


  Commit: 70c7bcc85fae6b43d1ce4e1045c63ff7f7cf100e
      
https://github.com/Dolibarr/dolibarr/commit/70c7bcc85fae6b43d1ce4e1045c63ff7f7cf100e
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

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

  Log Message:
  -----------
  Complete css to get value unique


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

  Changed paths:
    M htdocs/compta/facture.php
    M htdocs/supplier_proposal/card.php

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


  Commit: 83a5b8e078ba57ba3d4070e5f3f2cb944c28e555
      
https://github.com/Dolibarr/dolibarr/commit/83a5b8e078ba57ba3d4070e5f3f2cb944c28e555
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
    M htdocs/fourn/commande/card.php

  Log Message:
  -----------
  FIX Can set supplier invoice to billed.


  Commit: 7939daa2256170116ce90c29d6d4a9c46f2b0377
      
https://github.com/Dolibarr/dolibarr/commit/7939daa2256170116ce90c29d6d4a9c46f2b0377
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
    M htdocs/core/datepicker.php
    M htdocs/core/get_menudiv.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/search_page.php
    M htdocs/externalsite/frames.php
    M htdocs/fourn/commande/card.php
    M htdocs/install/inc.php
    M htdocs/main.inc.php
    M htdocs/master.inc.php
    M htdocs/support/inc.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M htdocs/user/index.php

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

Conflicts:
        htdocs/core/lib/functions.lib.php
        htdocs/theme/eldy/style.css.php
        htdocs/theme/md/style.css.php
        htdocs/user/index.php


  Commit: 0e867229dbd68bf0da952223677bebdb7714e037
      
https://github.com/Dolibarr/dolibarr/commit/0e867229dbd68bf0da952223677bebdb7714e037
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
    M htdocs/fourn/commande/card.php

  Log Message:
  -----------
  FIX Can't create invoice if PO disapproved


  Commit: b889db997a0ec12e77c688ed31978aefd70f4444
      
https://github.com/Dolibarr/dolibarr/commit/b889db997a0ec12e77c688ed31978aefd70f4444
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
    M htdocs/compta/facture/card.php
    M htdocs/core/datepicker.php
    M htdocs/core/get_menudiv.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/menus/standard/auguria.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/menus/standard/empty.php
    M htdocs/core/search_page.php
    M htdocs/fourn/commande/card.php
    M htdocs/install/inc.php
    M htdocs/product/list.php
    M htdocs/product/price.php
    M htdocs/supplier_proposal/card.php
    M htdocs/support/inc.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M htdocs/user/card.php

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

Conflicts:
        htdocs/compta/facture.php
        htdocs/core/datepicker.php
        htdocs/core/get_menudiv.php
        htdocs/core/menus/standard/auguria.lib.php
        htdocs/core/menus/standard/eldy.lib.php
        htdocs/core/search_page.php
        htdocs/main.inc.php
        htdocs/master.inc.php
        htdocs/product/list.php
        htdocs/theme/eldy/style.css.php
        htdocs/theme/md/style.css.php
        htdocs/user/card.php
        htdocs/user/index.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/a88bafe1986a...b889db997a0e

reply via email to

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