dolibarr-git
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] d89955: FIX #3009: Better filtering t

From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] d89955: FIX #3009: Better filtering to prevent SQL injecti...
Date: Thu, 30 Jul 2015 06:01:07 -0700 
  Branch: refs/heads/3.6_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: d89955047b9e257dcb154fcd7baa376b41e77c2a
      
https://github.com/Dolibarr/dolibarr/commit/d89955047b9e257dcb154fcd7baa376b41e77c2a
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2015-06-11 (Thu, 11 Jun 2015)

  Changed paths:
    M htdocs/product/liste.php

  Log Message:
  -----------
  FIX #3009: Better filtering to prevent SQL injection


  Commit: 87a00d6924ff34014eb74acf6373410f6d1db6af
      
https://github.com/Dolibarr/dolibarr/commit/87a00d6924ff34014eb74acf6373410f6d1db6af
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/lib/report.lib.php

  Log Message:
  -----------
  FIX Close bug #2976: "Report" tab is the current tab but it is not marked as 
selected by the UI


  Commit: 300cfd22931b0569668a096a912c9b9839ca1ef0
      
https://github.com/Dolibarr/dolibarr/commit/300cfd22931b0569668a096a912c9b9839ca1ef0
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M ChangeLog
    M htdocs/categories/edit.php
    M htdocs/categories/fiche.php
    M htdocs/categories/viewcat.php

  Log Message:
  -----------
  FIX Close bug #2891 Category hooks do not work


  Commit: 03358925215f3b512fcee4d18e4e1402b1188482
      
https://github.com/Dolibarr/dolibarr/commit/03358925215f3b512fcee4d18e4e1402b1188482
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M htdocs/install/upgrade2.php

  Log Message:
  -----------
  FIX Close bug #2861 Undefined variable $res when migrating from 3.6.2 to 3.7.0


  Commit: e3aa63f3c3bc319672008e430ddb72398d9ce79a
      
https://github.com/Dolibarr/dolibarr/commit/e3aa63f3c3bc319672008e430ddb72398d9ce79a
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Added log


  Commit: 2051a66cd736ddf8cb671a5084d8b9e29bc037b2
      
https://github.com/Dolibarr/dolibarr/commit/2051a66cd736ddf8cb671a5084d8b9e29bc037b2
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

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

  Log Message:
  -----------
  FIX Close #2837 Product list table column header does not match column body


  Commit: f9574fa4588fb94491ec2b8c65dc2450000c3747
      
https://github.com/Dolibarr/dolibarr/commit/f9574fa4588fb94491ec2b8c65dc2450000c3747
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

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

  Log Message:
  -----------
  FIX Close #2835 Customer prices of a product shows incorrect history order


  Commit: ab3190df25b453d6c6a11e83976ca3d282db9ae5
      
https://github.com/Dolibarr/dolibarr/commit/ab3190df25b453d6c6a11e83976ca3d282db9ae5
  Author: Juanjo Menent <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M htdocs/product/liste.php

  Log Message:
  -----------
  Merge pull request #3010 from GPCsolutions/3.6-3009

FIX #3009: Better filtering to prevent SQL injection


  Commit: 12155029279fe748da1ce78275739f38230f1639
      
https://github.com/Dolibarr/dolibarr/commit/12155029279fe748da1ce78275739f38230f1639
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-06-13 (Sat, 13 Jun 2015)

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

  Log Message:
  -----------
  Fix Close bug #2814 JPEG photos are not displayed in Product photos page


  Commit: ea625628cea6930d785267f34f7424306863ba6c
      
https://github.com/Dolibarr/dolibarr/commit/ea625628cea6930d785267f34f7424306863ba6c
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-06-13 (Sat, 13 Jun 2015)

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

  Log Message:
  -----------
  Fix Close bug #2786 Objectline_add template shows "0" for non-vat suppliers


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

  Changed paths:
    M ChangeLog
    M htdocs/categories/edit.php
    M htdocs/categories/fiche.php
    M htdocs/categories/viewcat.php

  Log Message:
  -----------
  Merge pull request #3026 from marcosgdf/bug-2891

FIX Close bug #2891 Category hooks do not work


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

  Changed paths:
    M ChangeLog
    M htdocs/core/lib/report.lib.php

  Log Message:
  -----------
  Merge pull request #3022 from marcosgdf/bug-2976

FIX Close bug #2976: "Report" tab is the current tab but it is not marked as 
selected by the UI


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

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

  Log Message:
  -----------
  Merge pull request #3035 from marcosgdf/bug-2786

FIX #2786 Objectline_add template shows "0" for non-vat suppliers


  Commit: cf857b712ab38ad19d51fc9a0112b85319136c78
      
https://github.com/Dolibarr/dolibarr/commit/cf857b712ab38ad19d51fc9a0112b85319136c78
  Author: Regis Houssin <address@hidden>
  Date:   2015-06-14 (Sun, 14 Jun 2015)

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

  Log Message:
  -----------
  Fix: select date problem with mobile device (#3039)


  Commit: b96ed082605596c03b8befdc9246926918aa97a9
      
https://github.com/Dolibarr/dolibarr/commit/b96ed082605596c03b8befdc9246926918aa97a9
  Author: Regis Houssin <address@hidden>
  Date:   2015-06-14 (Sun, 14 Jun 2015)

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

  Log Message:
  -----------
  Fix: select date problem with mobile device (#3039)


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

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

  Log Message:
  -----------
  Merge pull request #3044 from hregis/3.5_bug

Fix: select date problem with mobile device (#3039)


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

  Changed paths:
    M ChangeLog
    M htdocs/install/upgrade2.php

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

Conflicts:
        ChangeLog


  Commit: 288ae5de78aebf4039fef74083189ae8a39d17bb
      
https://github.com/Dolibarr/dolibarr/commit/288ae5de78aebf4039fef74083189ae8a39d17bb
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-14 (Sun, 14 Jun 2015)

  Changed paths:
    M ChangeLog
    M htdocs/install/upgrade2.php

  Log Message:
  -----------
  Merge branch 'marcosgdf-bug-2861' into 3.5


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

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

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

Conflicts:
        ChangeLog


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

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

  Log Message:
  -----------
  Merge branch 'marcosgdf-bug-2837' into 3.5


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

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

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

Conflicts:
        ChangeLog


  Commit: 1fc4716617436bb97b982084dcfbfd2e7fc6a672
      
https://github.com/Dolibarr/dolibarr/commit/1fc4716617436bb97b982084dcfbfd2e7fc6a672
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-14 (Sun, 14 Jun 2015)

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

  Log Message:
  -----------
  Merge branch 'marcosgdf-bug-2835' into 3.5


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

  Changed paths:
    M htdocs/core/lib/functions.lib.php
    M htdocs/main.inc.php

  Log Message:
  -----------
  FIX End log must use same level then start log.


  Commit: 1007aba6a9c3e95b4e936a6bbeeec68d1c29b48c
      
https://github.com/Dolibarr/dolibarr/commit/1007aba6a9c3e95b4e936a6bbeeec68d1c29b48c
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-14 (Sun, 14 Jun 2015)

  Changed paths:
    M ChangeLog
    M htdocs/categories/edit.php
    M htdocs/categories/fiche.php
    M htdocs/categories/viewcat.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/product/liste.php

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


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

  Changed paths:
    M ChangeLog
    M htdocs/compta/bank/virement.php
    M htdocs/core/lib/report.lib.php
    M htdocs/install/upgrade2.php
    M htdocs/product/liste.php
    M htdocs/product/price.php

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

Conflicts:
        htdocs/product/liste.php
        htdocs/product/price.php


  Commit: 2d3ab3b658be95512a93c0791ae192387afc23fc
      
https://github.com/Dolibarr/dolibarr/commit/2d3ab3b658be95512a93c0791ae192387afc23fc
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/bank/virement.php
    M htdocs/core/lib/report.lib.php
    M htdocs/install/upgrade2.php
    M htdocs/product/liste.php
    M htdocs/product/price.php

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/3.5' into bug-2814-2

Conflicts:
        ChangeLog


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

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

  Log Message:
  -----------
  Merge pull request #3034 from marcosgdf/bug-2814-2

Fix #2814 JPEG photos are not displayed in Product photos page


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

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

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


  Commit: 05cb1f7ba753af3681983832efbc64f98f7685cb
      
https://github.com/Dolibarr/dolibarr/commit/05cb1f7ba753af3681983832efbc64f98f7685cb
  Author: fmarcet <address@hidden>
  Date:   2015-06-16 (Tue, 16 Jun 2015)

  Changed paths:
    M htdocs/societe/consumption.php

  Log Message:
  -----------
  Fix: Date filter on customer orders


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

  Changed paths:
    M htdocs/societe/consumption.php

  Log Message:
  -----------
  Merge pull request #3058 from fmarcet/3.5

Fix: Date filter on customer orders


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

  Changed paths:
    M htdocs/core/modules/export/export_csv.modules.php
    M htdocs/core/modules/export/export_excel.modules.php
    M htdocs/core/modules/export/export_tsv.modules.php
    M htdocs/core/modules/modSociete.class.php

  Log Message:
  -----------
  FIX : tool export handle the type "select" extrafields and return the value 
instead of id


  Commit: 582f9cd214b49a0124ce37e0688fc84a1f3cfce0
      
https://github.com/Dolibarr/dolibarr/commit/582f9cd214b49a0124ce37e0688fc84a1f3cfce0
  Author: phf <address@hidden>
  Date:   2015-06-26 (Fri, 26 Jun 2015)

  Changed paths:
    M htdocs/product/reassort.php

  Log Message:
  -----------
  FIX : keep filter by category or by not enough stock if we switch page


  Commit: e72c118274cb10f74f76a90ea99ebfe43bbcf5b8
      
https://github.com/Dolibarr/dolibarr/commit/e72c118274cb10f74f76a90ea99ebfe43bbcf5b8
  Author: Juanjo Menent <address@hidden>
  Date:   2015-06-26 (Fri, 26 Jun 2015)

  Changed paths:
    M htdocs/product/reassort.php

  Log Message:
  -----------
  Merge pull request #3104 from atm-ph/3.6_fix_search_filter_on_reassort

FIX filter by "category / not enough stock"


  Commit: 461b5f08826c24ecdeeca9b747c9cc3ccfc84455
      
https://github.com/Dolibarr/dolibarr/commit/461b5f08826c24ecdeeca9b747c9cc3ccfc84455
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-27 (Sat, 27 Jun 2015)

  Changed paths:
    M htdocs/core/modules/export/export_csv.modules.php
    M htdocs/core/modules/export/export_excel.modules.php
    M htdocs/core/modules/export/export_tsv.modules.php
    M htdocs/core/modules/modSociete.class.php

  Log Message:
  -----------
  Merge pull request #3086 from atm-ph/3.6_fix_export_extrafield_select

FIX : tool export extrafields


  Commit: ee643ed2a72b6ea648b15f058a9d6a6c0d3f9cfe
      
https://github.com/Dolibarr/dolibarr/commit/ee643ed2a72b6ea648b15f058a9d6a6c0d3f9cfe
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2015-07-02 (Thu, 02 Jul 2015)

  Changed paths:
    M htdocs/projet/liste.php

  Log Message:
  -----------
  Fix : Project list was not keeping parameters on sorts


  Commit: c87328b362ec6624ddaa8fc7e914c09d7d5bcf79
      
https://github.com/Dolibarr/dolibarr/commit/c87328b362ec6624ddaa8fc7e914c09d7d5bcf79
  Author: phf <address@hidden>
  Date:   2015-07-02 (Thu, 02 Jul 2015)

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

  Log Message:
  -----------
  FIX : contact country had wrong display if the country dont have translate


  Commit: 5d14d05ce11870e474172fba10198addd7871aa7
      
https://github.com/Dolibarr/dolibarr/commit/5d14d05ce11870e474172fba10198addd7871aa7
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2015-07-03 (Fri, 03 Jul 2015)

  Changed paths:
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/sociales/class/paymentsocialcontribution.class.php

  Log Message:
  -----------
  Fix : Social contribution payment deletion was not deleting the bank line


  Commit: 3c77a5ca21646ebecc8a853113bc37cf76c6acbc
      
https://github.com/Dolibarr/dolibarr/commit/3c77a5ca21646ebecc8a853113bc37cf76c6acbc
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-07-04 (Sat, 04 Jul 2015)

  Changed paths:
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/sociales/class/paymentsocialcontribution.class.php
    M htdocs/projet/liste.php

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

Fix : Project list was not keeping parameters on sorts


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

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

  Log Message:
  -----------
  Merge pull request #3135 from atm-ph/3.6_fix_socpeople_country_display

FIX : wrong display with contact country


  Commit: aff3f03ae09ea1c38c0576109ea3bdfc3e494adc
      
https://github.com/Dolibarr/dolibarr/commit/aff3f03ae09ea1c38c0576109ea3bdfc3e494adc
  Author: Regis Houssin <address@hidden>
  Date:   2015-07-08 (Wed, 08 Jul 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/sociales/class/paymentsocialcontribution.class.php
    M htdocs/contact/class/contact.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/report.lib.php
    M htdocs/core/modules/export/export_csv.modules.php
    M htdocs/core/modules/export/export_excel.modules.php
    M htdocs/core/modules/export/export_tsv.modules.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/install/upgrade2.php
    M htdocs/main.inc.php
    M htdocs/product/class/product.class.php
    M htdocs/product/liste.php
    M htdocs/product/price.php
    M htdocs/product/reassort.php
    M htdocs/projet/liste.php

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


  Commit: 9e7cb70d63a5fcdcb9b073ec011f3b4af8b12c09
      
https://github.com/Dolibarr/dolibarr/commit/9e7cb70d63a5fcdcb9b073ec011f3b4af8b12c09
  Author: Regis Houssin <address@hidden>
  Date:   2015-07-08 (Wed, 08 Jul 2015)

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

  Log Message:
  -----------
  Fix: missing shared parameters


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

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

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

Fix: missing shared parameters


  Commit: 20bdfdb2865f80c8b658db6a6ebfedbdb5687128
      
https://github.com/Dolibarr/dolibarr/commit/20bdfdb2865f80c8b658db6a6ebfedbdb5687128
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2015-07-14 (Tue, 14 Jul 2015)

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

  Log Message:
  -----------
  Fix : withdrawal rejection were taking the total amount of the invoice 
instead of the amount of the withdrawal


  Commit: 5223934ff03c05588f4a6832d110621221ddd346
      
https://github.com/Dolibarr/dolibarr/commit/5223934ff03c05588f4a6832d110621221ddd346
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2015-07-14 (Tue, 14 Jul 2015)

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

  Log Message:
  -----------
  Fix #3188 SQL error if qty or discount is not a number on proposal add line


  Commit: d7e9bccad6d7603292dfe4f74c18c1653cbd3fc9
      
https://github.com/Dolibarr/dolibarr/commit/d7e9bccad6d7603292dfe4f74c18c1653cbd3fc9
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-07-16 (Thu, 16 Jul 2015)

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

  Log Message:
  -----------
  Merge pull request #3199 from atm-maxime/fix_rejet_prel

Fix : withdrawal rejection were taking the total amount of the invoic…


  Commit: e9d1e6265d0a15377629baf66fe9dd57046c517d
      
https://github.com/Dolibarr/dolibarr/commit/e9d1e6265d0a15377629baf66fe9dd57046c517d
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-07-18 (Sat, 18 Jul 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/actions_extrafields.inc.php
    M htdocs/langs/en_US/errors.lang

  Log Message:
  -----------
  Fix: [ bug #2696 ] Adding complementary attribute fails if code is numerics

Close #2696


  Commit: 7185cfeb8424f4785df8f8c9abc5820c2e2a59bf
      
https://github.com/Dolibarr/dolibarr/commit/7185cfeb8424f4785df8f8c9abc5820c2e2a59bf
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-07-18 (Sat, 18 Jul 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture/stats/index.php
    M htdocs/core/class/html.form.class.php

  Log Message:
  -----------
  Fix: [ bug #2715 ] Statistics page has broken layout with long thirdparty 
names


  Commit: b28c4df0d690582f038dd72848476976c691d5b3
      
https://github.com/Dolibarr/dolibarr/commit/b28c4df0d690582f038dd72848476976c691d5b3
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-07-18 (Sat, 18 Jul 2015)

  Changed paths:
    M ChangeLog
    M htdocs/societe/soc.php

  Log Message:
  -----------
  Fix: [ bug #3180 ] formObjectOptions hook when editing thirdparty card does 
not print result

Close #3180


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

  Changed paths:
    M ChangeLog
    M htdocs/core/actions_extrafields.inc.php
    M htdocs/langs/en_US/errors.lang

  Log Message:
  -----------
  Merge pull request #3271 from marcosgdf/bug-2696

Fix: [ bug #2696 ] Adding complementary attribute fails if code is numerics


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

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture/stats/index.php
    M htdocs/core/class/html.form.class.php

  Log Message:
  -----------
  Merge pull request #3272 from marcosgdf/bug-2715

Fix: [ bug #2715 ] Statistics page has broken layout with long thirdparty names


  Commit: 538c8c072b989eb90c16557ad612ce0efdbf632e
      
https://github.com/Dolibarr/dolibarr/commit/538c8c072b989eb90c16557ad612ce0efdbf632e
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-07-19 (Sun, 19 Jul 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture/stats/index.php
    M htdocs/core/class/html.form.class.php

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

Conflicts:
        ChangeLog


  Commit: 3d6c5b09e83f99ccf1466c8143ff47c9fcdf6680
      
https://github.com/Dolibarr/dolibarr/commit/3d6c5b09e83f99ccf1466c8143ff47c9fcdf6680
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-07-19 (Sun, 19 Jul 2015)

  Changed paths:
    M ChangeLog
    M htdocs/societe/info.php

  Log Message:
  -----------
  Fix: [ bug #3268 ] SQL error when accessing thirdparty log page without a 
socid parameter

Close #3268


  Commit: 8d7c1f8d4cecaf7e8fada3ed5399fe34bac9c8f8
      
https://github.com/Dolibarr/dolibarr/commit/8d7c1f8d4cecaf7e8fada3ed5399fe34bac9c8f8
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-07-19 (Sun, 19 Jul 2015)

  Changed paths:
    M ChangeLog
    M htdocs/contact/exportimport.php
    M htdocs/contact/info.php
    M htdocs/contact/ldap.php
    M htdocs/contact/perso.php
    M htdocs/contact/vcard.php

  Log Message:
  -----------
  Fix: [ bug #2570 ] [Contacts] Page should not process if ID is invalid


  Commit: 4100026c7195b2d3432690c8094b0c01daae6906
      
https://github.com/Dolibarr/dolibarr/commit/4100026c7195b2d3432690c8094b0c01daae6906
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-07-19 (Sun, 19 Jul 2015)

  Changed paths:
    M ChangeLog
    M htdocs/societe/info.php

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

Conflicts:
        ChangeLog


  Commit: 739eaedecc7320aad414127836c197af9e642cfb
      
https://github.com/Dolibarr/dolibarr/commit/739eaedecc7320aad414127836c197af9e642cfb
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-07-19 (Sun, 19 Jul 2015)

  Changed paths:
    M ChangeLog
    M htdocs/societe/info.php

  Log Message:
  -----------
  Merge branch 'marcosgdf-bug-3268' into 3.5


  Commit: 2e2f99c3517b95970f404f21b26eedfacef55319
      
https://github.com/Dolibarr/dolibarr/commit/2e2f99c3517b95970f404f21b26eedfacef55319
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-07-19 (Sun, 19 Jul 2015)

  Changed paths:
    M ChangeLog
    M htdocs/societe/soc.php

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

Conflicts:
        ChangeLog


  Commit: 5c2059a79f60efeb43a9fa08f0b58be0ac4db111
      
https://github.com/Dolibarr/dolibarr/commit/5c2059a79f60efeb43a9fa08f0b58be0ac4db111
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-07-19 (Sun, 19 Jul 2015)

  Changed paths:
    M ChangeLog
    M htdocs/societe/soc.php

  Log Message:
  -----------
  Merge branch 'marcosgdf-bug-3180' into 3.5


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

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture/stats/index.php
    M htdocs/compta/prelevement/class/rejetprelevement.class.php
    M htdocs/contact/exportimport.php
    M htdocs/contact/info.php
    M htdocs/contact/ldap.php
    M htdocs/contact/perso.php
    M htdocs/contact/vcard.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/vcard.class.php
    M htdocs/societe/consumption.php
    M htdocs/societe/info.php
    M htdocs/societe/soc.php

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

Conflicts:
        htdocs/contact/vcard.php
        htdocs/societe/consumption.php


  Commit: 8505e914695a0723da9fe719f1dfc3e1f4b4495b
      
https://github.com/Dolibarr/dolibarr/commit/8505e914695a0723da9fe719f1dfc3e1f4b4495b
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-07-19 (Sun, 19 Jul 2015)

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

  Log Message:
  -----------
  Fix: [ bug 1791 ] Margin menu not available if any Finance module is not 
enabled


  Commit: 5b0c216b42c1a6096791169c9109696f28e3dc1b
      
https://github.com/Dolibarr/dolibarr/commit/5b0c216b42c1a6096791169c9109696f28e3dc1b
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-07-19 (Sun, 19 Jul 2015)

  Changed paths:
    M ChangeLog
    M htdocs/contact/exportimport.php
    M htdocs/contact/info.php
    M htdocs/contact/ldap.php
    M htdocs/contact/perso.php
    M htdocs/contact/vcard.php
    M htdocs/societe/info.php
    M htdocs/societe/soc.php

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

Conflicts:
        ChangeLog


  Commit: 14eee82a646a80e2253c0209382bf00bad1308e6
      
https://github.com/Dolibarr/dolibarr/commit/14eee82a646a80e2253c0209382bf00bad1308e6
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-07-19 (Sun, 19 Jul 2015)

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

  Log Message:
  -----------
  Merge pull request #3277 from marcosgdf/bug-1791

Fix: [ bug 1791 ] Margin menu not available if any Finance module is not enabled


  Commit: 038f171d6cb628ad9f1902f0f33232580c63d3a0
      
https://github.com/Dolibarr/dolibarr/commit/038f171d6cb628ad9f1902f0f33232580c63d3a0
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-07-20 (Mon, 20 Jul 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/resultat/index.php

  Log Message:
  -----------
  Fix: [ bug #3074 ] Accruals accounting use payment date instead of commitment 
date in turnover reports for salaries

Close #3074


  Commit: 428bd14b55153547aa44a1b8022d26f702eb6f00
      
https://github.com/Dolibarr/dolibarr/commit/428bd14b55153547aa44a1b8022d26f702eb6f00
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2015-07-21 (Tue, 21 Jul 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture/stats/index.php
    M htdocs/compta/prelevement/class/rejetprelevement.class.php
    M htdocs/contact/exportimport.php
    M htdocs/contact/info.php
    M htdocs/contact/ldap.php
    M htdocs/contact/perso.php
    M htdocs/contact/vcard.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/societe/info.php
    M htdocs/societe/soc.php

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

# Veuillez entrer un message de validation pour expliquer en quoi cette fusion 
est
# nécessaire, surtout si cela fusionne une branche amont mise à jour dans une 
branche de sujet.
#
# Les lignes commençant par '#' seront ignorées, et un message vide
# abandonne la validation.


  Commit: 646ad48bd068d7070b809ac84729ce0d9ed579f6
      
https://github.com/Dolibarr/dolibarr/commit/646ad48bd068d7070b809ac84729ce0d9ed579f6
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2015-07-21 (Tue, 21 Jul 2015)

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

  Log Message:
  -----------
  Better fix for not numeric qty or discount


  Commit: 73c7ef5a88970a4ed370fb777b3460447622af38
      
https://github.com/Dolibarr/dolibarr/commit/73c7ef5a88970a4ed370fb777b3460447622af38
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2015-07-22 (Wed, 22 Jul 2015)

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


  Commit: a0fc119ce55660f80b55b4f40693a1c8da3c4ddd
      
https://github.com/Dolibarr/dolibarr/commit/a0fc119ce55660f80b55b4f40693a1c8da3c4ddd
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-07-23 (Thu, 23 Jul 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/resultat/index.php

  Log Message:
  -----------
  Merge pull request #3290 from marcosgdf/bug-3074

Fix: [ bug #3074 ] Accruals accounting use payment date instead of commitment 
date in turnover reports for salaries


  Commit: 6b2d7f7d19f329991d72559c9a9c2754e0cc17fe
      
https://github.com/Dolibarr/dolibarr/commit/6b2d7f7d19f329991d72559c9a9c2754e0cc17fe
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-07-23 (Thu, 23 Jul 2015)

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

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

Fix #3188 SQL error if qty or discount is not a number on proposal ad…


  Commit: 66761145019ac6356e6ad62e486dc3cb846c9c4e
      
https://github.com/Dolibarr/dolibarr/commit/66761145019ac6356e6ad62e486dc3cb846c9c4e
  Author: fmarcet <address@hidden>
  Date:   2015-07-27 (Mon, 27 Jul 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

  Log Message:
  -----------
  Fix: Not showing product supplier reference when page break


  Commit: 824da6d2b05250fced519f58eacec5583df72aa9
      
https://github.com/Dolibarr/dolibarr/commit/824da6d2b05250fced519f58eacec5583df72aa9
  Author: phf <address@hidden>
  Date:   2015-07-27 (Mon, 27 Jul 2015)

  Changed paths:
    M htdocs/projet/class/task.class.php

  Log Message:
  -----------
  FIX no projet_task_time id from trigger TASK_TIMESPENT_CREATE


  Commit: 565b0861d9c9209fd40b1b15a08ee91fd05792f8
      
https://github.com/Dolibarr/dolibarr/commit/565b0861d9c9209fd40b1b15a08ee91fd05792f8
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-07-28 (Tue, 28 Jul 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

  Log Message:
  -----------
  Merge pull request #3323 from fmarcet/3.6

Fix: Not showing product's supplier reference when page break


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

  Changed paths:
    M htdocs/projet/class/task.class.php

  Log Message:
  -----------
  Merge pull request #3325 from atm-ph/3.6_fix_timespent_id

FIX no projet_task_time id from trigger TASK_TIMESPENT_CREATE


  Commit: 6adc3ba6040fadfc8db6bb4e95f883f27c5bda34
      
https://github.com/Dolibarr/dolibarr/commit/6adc3ba6040fadfc8db6bb4e95f883f27c5bda34
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-07-30 (Thu, 30 Jul 2015)

  Changed paths:
    M ChangeLog
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/core/menus/standard/eldy.lib.php

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

Conflicts:
        htdocs/core/menus/standard/eldy.lib.php


  Commit: a077dd6cadda1fc5ca105e542aba40ef004b995e
      
https://github.com/Dolibarr/dolibarr/commit/a077dd6cadda1fc5ca105e542aba40ef004b995e
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-07-30 (Thu, 30 Jul 2015)

  Changed paths:
    M ChangeLog
    M htdocs/categories/edit.php
    M htdocs/categories/fiche.php
    M htdocs/categories/viewcat.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/virement.php
    M htdocs/compta/facture/stats/index.php
    M htdocs/compta/prelevement/class/rejetprelevement.class.php
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/resultat/index.php
    M htdocs/compta/sociales/class/paymentsocialcontribution.class.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contact/exportimport.php
    M htdocs/contact/info.php
    M htdocs/contact/ldap.php
    M htdocs/contact/perso.php
    M htdocs/contact/vcard.php
    M htdocs/core/actions_extrafields.inc.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/vcard.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/report.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/export/export_csv.modules.php
    M htdocs/core/modules/export/export_excel.modules.php
    M htdocs/core/modules/export/export_tsv.modules.php
    M htdocs/core/modules/modSociete.class.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/tpl/objectline_create.tpl.php
    M htdocs/install/upgrade2.php
    M htdocs/langs/en_US/errors.lang
    M htdocs/main.inc.php
    M htdocs/product/class/product.class.php
    M htdocs/product/liste.php
    M htdocs/product/price.php
    M htdocs/product/reassort.php
    M htdocs/projet/class/task.class.php
    M htdocs/projet/liste.php
    M htdocs/societe/consumption.php
    M htdocs/societe/info.php
    M htdocs/societe/soc.php

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

Conflicts:
        htdocs/compta/resultat/clientfourn.php
        htdocs/compta/resultat/index.php
        htdocs/contact/info.php
        htdocs/product/liste.php
        htdocs/societe/consumption.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/12c71c7004f8...a077dd6cadda
reply via email to
[Prev in Thread] Current Thread [Next in Thread]