[Dolibarr-git] [Dolibarr/dolibarr] 6a3310: Fix: PRODUCT_USE_OLD_PATH

dolibarr-git
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 6a3310: Fix: PRODUCT_USE_OLD_PATH_FOR

From:	Laurent Destailleur
Subject:	[Dolibarr-git] [Dolibarr/dolibarr] 6a3310: Fix: PRODUCT_USE_OLD_PATH_FOR_PHOTO use entity 0 f...
Date:	Sun, 14 Jun 2015 08:19:00 -0700
  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 6a3310daf7aecda23535f21d8848bf2185e6d030
      
https://github.com/Dolibarr/dolibarr/commit/6a3310daf7aecda23535f21d8848bf2185e6d030
  Author: Regis Houssin <address@hidden>
  Date:   2015-06-04 (Thu, 04 Jun 2015)

  Changed paths:
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql

  Log Message:
  -----------
  Fix: PRODUCT_USE_OLD_PATH_FOR_PHOTO use entity 0 for multicompany
Fix: use encrypt/decrypt with llx_const for experimental encryption of
sensitive data


  Commit: 5139954365489c3d7e65a7525a27d094944b8ab3
      
https://github.com/Dolibarr/dolibarr/commit/5139954365489c3d7e65a7525a27d094944b8ab3
  Author: Regis Houssin <address@hidden>
  Date:   2015-06-04 (Thu, 04 Jun 2015)

  Changed paths:
    M htdocs/comm/propal.php
    M htdocs/commande/card.php
    M htdocs/compta/facture.php
    M htdocs/expedition/card.php
    M htdocs/fichinter/card.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/facture/card.php

  Log Message:
  -----------
  Fix: add filter in "dol_most_recent_files" for avoid conflict with
option "Save file on server with name "FA0700034_Original filename""


  Commit: 65b049fdf559aee19a45a6d4bca664c9767114c9
      
https://github.com/Dolibarr/dolibarr/commit/65b049fdf559aee19a45a6d4bca664c9767114c9
  Author: Regis Houssin <address@hidden>
  Date:   2015-06-08 (Mon, 08 Jun 2015)

  Changed paths:
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql

  Log Message:
  -----------
  Fix: Drop foreign key for avoid Mysql crash


  Commit: 792911b14f02b7c2226b626a2761bc949c624ac5
      
https://github.com/Dolibarr/dolibarr/commit/792911b14f02b7c2226b626a2761bc949c624ac5
  Author: Regis Houssin <address@hidden>
  Date:   2015-06-08 (Mon, 08 Jun 2015)

  Changed paths:
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql

  Log Message:
  -----------
  Revert "Fix: Drop foreign key for avoid Mysql crash"

This reverts commit 65b049fdf559aee19a45a6d4bca664c9767114c9.


  Commit: 8d824785f0420ddfd74de79917e610f08fc609eb
      
https://github.com/Dolibarr/dolibarr/commit/8d824785f0420ddfd74de79917e610f08fc609eb
  Author: Regis Houssin <address@hidden>
  Date:   2015-06-08 (Mon, 08 Jun 2015)

  Changed paths:
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/expedition/tpl/linkedobjectblock.tpl.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
    M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql

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


  Commit: 14780747fcc9b232acb73558fe5032665988b426
      
https://github.com/Dolibarr/dolibarr/commit/14780747fcc9b232acb73558fe5032665988b426
  Author: Regis Houssin <address@hidden>
  Date:   2015-06-10 (Wed, 10 Jun 2015)

  Changed paths:
    M htdocs/comm/propal.php
    M htdocs/commande/card.php
    M htdocs/compta/facture.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/tpl/document_actions_post_headers.tpl.php
    M htdocs/expedition/card.php
    M htdocs/fichinter/card.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/facture/card.php
    M htdocs/public/demo/index.php
    M htdocs/public/members/public_card.php
    M htdocs/public/members/public_list.php
    M htdocs/theme/eldy/style.css.php

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


  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: 4ee6c1810ef54af0613053cf252fa30fd9e84f9f
      
https://github.com/Dolibarr/dolibarr/commit/4ee6c1810ef54af0613053cf252fa30fd9e84f9f
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2015-06-11 (Thu, 11 Jun 2015)

  Changed paths:
    M htdocs/product/list.php

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


  Commit: 5783c185bddfe5bc0d8c89b97319d4de2d55bd89
      
https://github.com/Dolibarr/dolibarr/commit/5783c185bddfe5bc0d8c89b97319d4de2d55bd89
  Author: fmarcet <address@hidden>
  Date:   2015-06-11 (Thu, 11 Jun 2015)

  Changed paths:
    M htdocs/product/card.php

  Log Message:
  -----------
  Fix: Not reading external barcode numeration module


  Commit: 87a00d6924ff34014eb74acf6373410f6d1db6af
      
https://github.com/Dolibarr/dolibarr/commit/87a00d6924ff34014eb74acf6373410f6d1db6af
  Author: Marcos Garcí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: 60711d35b8d4cf0190a3cdcb9897c5275b432434
      
https://github.com/Dolibarr/dolibarr/commit/60711d35b8d4cf0190a3cdcb9897c5275b432434
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

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

  Log Message:
  -----------
  FIX Close bug #2900 Courtesy title is not stored in create thirdparty form


  Commit: 300cfd22931b0569668a096a912c9b9839ca1ef0
      
https://github.com/Dolibarr/dolibarr/commit/300cfd22931b0569668a096a912c9b9839ca1ef0
  Author: Marcos Garcí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: 200eb7b1bbf1d2b0b3b63ac18de7913a674a5aa3
      
https://github.com/Dolibarr/dolibarr/commit/200eb7b1bbf1d2b0b3b63ac18de7913a674a5aa3
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/localtax/clients.php
    M htdocs/compta/localtax/quadri_detail.php

  Log Message:
  -----------
  FIX Close bug #2855 Wrong translation key in localtax report page


  Commit: 03358925215f3b512fcee4d18e4e1402b1188482
      
https://github.com/Dolibarr/dolibarr/commit/03358925215f3b512fcee4d18e4e1402b1188482
  Author: Marcos Garcí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 Garcí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 Garcí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 Garcí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: 10d27ea59491fd1f19e79773cd5f796f3f905ef1
      
https://github.com/Dolibarr/dolibarr/commit/10d27ea59491fd1f19e79773cd5f796f3f905ef1
  Author: Juanjo Menent <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M htdocs/product/card.php

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

Fix: Not reading external barcode numeration module


  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: 567dece678ad9b77b30b9fe1e7e765a0e53c3428
      
https://github.com/Dolibarr/dolibarr/commit/567dece678ad9b77b30b9fe1e7e765a0e53c3428
  Author: Juanjo Menent <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M htdocs/product/list.php

  Log Message:
  -----------
  Merge pull request #3011 from GPCsolutions/3.7-3009

FIX #3009: Better filtering to prevent SQL injection


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

  Changed paths:
    M ChangeLog
    M htdocs/compta/localtax/clients.php
    M htdocs/compta/localtax/quadri_detail.php

  Log Message:
  -----------
  Merge pull request #3027 from marcosgdf/bug-2855

FIX Close bug #2855 Wrong translation key in localtax report page


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

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Update changelog


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

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge pull request #3032 from simnandez/3.7

Update changelog


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

  Changed paths:
    M ChangeLog
    M htdocs/compta/localtax/clients.php
    M htdocs/compta/localtax/quadri_detail.php
    M htdocs/product/card.php
    M htdocs/product/list.php

  Log Message:
  -----------
  Merge branch '3.7' into bug-2900

Conflicts:
        ChangeLog


  Commit: ea625628cea6930d785267f34f7424306863ba6c
      
https://github.com/Dolibarr/dolibarr/commit/ea625628cea6930d785267f34f7424306863ba6c
  Author: Marcos Garcí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: 296b76603a2354134bad2d0dc913d95ba260f780
      
https://github.com/Dolibarr/dolibarr/commit/296b76603a2354134bad2d0dc913d95ba260f780
  Author: Regis Houssin <address@hidden>
  Date:   2015-06-13 (Sat, 13 Jun 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/localtax/clients.php
    M htdocs/compta/localtax/quadri_detail.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/product/card.php
    M htdocs/product/list.php
    M htdocs/theme/eldy/style.css.php

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


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

  Changed paths:
    M htdocs/cashdesk/facturation_dhtml.php
    M htdocs/cashdesk/javascript/dhtml.js
    M htdocs/cashdesk/tpl/facturation1.tpl.php

  Log Message:
  -----------
  Fix: broken feature: barcode search #3019


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

  Changed paths:
    M ChangeLog
    M htdocs/core/tpl/objectline_edit.tpl.php

  Log Message:
  -----------
  Fix [ bug 1852 ] JS error when editing a customer order line


  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: 4dbb3789a23e6a7bed32767ce62f222552d9a834
      
https://github.com/Dolibarr/dolibarr/commit/4dbb3789a23e6a7bed32767ce62f222552d9a834
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-14 (Sun, 14 Jun 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/tpl/objectline_edit.tpl.php

  Log Message:
  -----------
  Merge pull request #3037 from marcosgdf/bug-1852

Fix [ bug 1852 ] JS error when editing a customer order line


  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: aecc5d27a3b8087506a168e6e78bdcdafdf0e941
      
https://github.com/Dolibarr/dolibarr/commit/aecc5d27a3b8087506a168e6e78bdcdafdf0e941
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-14 (Sun, 14 Jun 2015)

  Changed paths:
    M htdocs/cashdesk/facturation_dhtml.php
    M htdocs/cashdesk/javascript/dhtml.js
    M htdocs/cashdesk/tpl/facturation1.tpl.php
    M htdocs/expedition/card.php

  Log Message:
  -----------
  Merge pull request #3036 from hregis/3.7_bug

Fix: broken feature: barcode search #3019


  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: 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: b42f9a670601710ae35f9b623fc493bad22b74ab
      
https://github.com/Dolibarr/dolibarr/commit/b42f9a670601710ae35f9b623fc493bad22b74ab
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-14 (Sun, 14 Jun 2015)

  Changed paths:
    M htdocs/cashdesk/tpl/facturation1.tpl.php

  Log Message:
  -----------
  Fix phpcs


  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: 892ff3b0536c56df98a3023e3bac615482c9f514
      
https://github.com/Dolibarr/dolibarr/commit/892ff3b0536c56df98a3023e3bac615482c9f514
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-14 (Sun, 14 Jun 2015)

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

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

Conflicts:
        ChangeLog


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

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

  Log Message:
  -----------
  Merge branch 'marcosgdf-bug-2900' into 3.7


  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: a7cec18081bcbc98c662e7fdf6a6dbdb18064fc5
      
https://github.com/Dolibarr/dolibarr/commit/a7cec18081bcbc98c662e7fdf6a6dbdb18064fc5
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-14 (Sun, 14 Jun 2015)

  Changed paths:
    M ChangeLog
    M htdocs/categories/card.php
    M htdocs/categories/edit.php
    M htdocs/categories/viewcat.php
    M htdocs/compta/bank/virement.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/report.lib.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/main.inc.php
    M htdocs/product/price.php

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

Conflicts:
        htdocs/categories/fiche.php
        htdocs/core/tpl/objectline_create.tpl.php
        htdocs/install/upgrade2.php
        htdocs/product/liste.php


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

  Changed paths:
    M ChangeLog
    M htdocs/cashdesk/facturation_dhtml.php
    M htdocs/cashdesk/javascript/dhtml.js
    M htdocs/cashdesk/tpl/facturation1.tpl.php
    M htdocs/categories/card.php
    M htdocs/categories/edit.php
    M htdocs/categories/viewcat.php
    M htdocs/compta/bank/virement.php
    M htdocs/compta/localtax/clients.php
    M htdocs/compta/localtax/quadri_detail.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/report.lib.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/main.inc.php
    M htdocs/product/card.php
    M htdocs/product/list.php
    M htdocs/product/price.php
    M htdocs/societe/soc.php

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

Conflicts:
        ChangeLog
        htdocs/compta/bank/virement.php
        htdocs/core/tpl/objectline_create.tpl.php
        htdocs/product/card.php
        htdocs/societe/soc.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/6d064e8b9b80...87e07a3038ee
[Prev in Thread]
Current Thread
[Next in Thread]
[Dolibarr-git] [Dolibarr/dolibarr] 6a3310: Fix: PRODUCT_USE_OLD_PATH_FOR_PHOTO use entity 0 f..., Laurent Destailleur, 2015/06/13
- [Dolibarr-git] [Dolibarr/dolibarr] 6a3310: Fix: PRODUCT_USE_OLD_PATH_FOR_PHOTO use entity 0 f..., Laurent Destailleur <=
Prev by Date: [Dolibarr-git] [Dolibarr/dolibarr] d89955: FIX #3009: Better filtering to prevent SQL injecti...
Next by Date: [Dolibarr-git] [Dolibarr/dolibarr] 6263e9: More info on contact popup
Previous by thread: [Dolibarr-git] [Dolibarr/dolibarr] 6a3310: Fix: PRODUCT_USE_OLD_PATH_FOR_PHOTO use entity 0 f...
Next by thread: [Dolibarr-git] [Dolibarr/dolibarr] ea6256: Fix Close bug #2786 Objectline_add template shows ...
Index(es):
- Date
- Thread