[Dolibarr-git] [Dolibarr/dolibarr] cf857b: Fix: select date problem with

dolibarr-git
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] cf857b: Fix: select date problem with

From:	Laurent Destailleur
Subject:	[Dolibarr-git] [Dolibarr/dolibarr] cf857b: Fix: select date problem with mobile device (#3039...
Date:	Thu, 30 Jul 2015 06:08:35 -0700
  Branch: refs/heads/3.7_backported
  Home:   https://github.com/Dolibarr/dolibarr
  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: 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: 8a36353385a7eecefb2441833f33dc6eeee78f11
      
https://github.com/Dolibarr/dolibarr/commit/8a36353385a7eecefb2441833f33dc6eeee78f11
  Author: Florian HENRY <address@hidden>
  Date:   2015-07-06 (Mon, 06 Jul 2015)

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

  Log Message:
  -----------
  FIX : when fetch_optionnal_by_label in Extrafields with $this->db cannot
work because this->db is never instanciated


  Commit: ec89f00103776ce7d2b6509ff6cfccf1343958ff
      
https://github.com/Dolibarr/dolibarr/commit/ec89f00103776ce7d2b6509ff6cfccf1343958ff
  Author: Florian HENRY <address@hidden>
  Date:   2015-07-06 (Mon, 06 Jul 2015)

  Changed paths:
    M htdocs/core/ajax/constantonoff.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/main.inc.php
    M htdocs/paypal/lib/paypal.lib.php

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


  Commit: b6850e36c92ec80095d60451df57056aa183b1aa
      
https://github.com/Dolibarr/dolibarr/commit/b6850e36c92ec80095d60451df57056aa183b1aa
  Author: Florian HENRY <address@hidden>
  Date:   2015-07-06 (Mon, 06 Jul 2015)

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

  Log Message:
  -----------
  fix previous commit


  Commit: 36aebb5fc4e938e1a43daa61799f7552ece08579
      
https://github.com/Dolibarr/dolibarr/commit/36aebb5fc4e938e1a43daa61799f7552ece08579
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-07-06 (Mon, 06 Jul 2015)

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

  Log Message:
  -----------
  Merge pull request #3151 from FHenry/3.7

FIX : when fetch_optionnal_by_label in Extrafields with $this->db cannot


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

  Changed paths:
    M ChangeLog
    M htdocs/core/lib/files.lib.php
    M htdocs/core/tpl/document_actions_pre_headers.tpl.php

  Log Message:
  -----------
  Fix: [ bug #3055 ] Product image thumbnails were not deleted after deleting 
the image

Close #3055


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

  Changed paths:
    M ChangeLog
    M htdocs/core/lib/files.lib.php
    M htdocs/core/tpl/document_actions_pre_headers.tpl.php

  Log Message:
  -----------
  Merge pull request #3157 from marcosgdf/bug-3055

FIX #3055 Product image thumbnails were not deleted after deleting the image


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

  Changed paths:
    M htdocs/contact/card.php

  Log Message:
  -----------
  FIX translate Jabberid on contact page with edit view


  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: c1445a88e1c00e3983567ca58b88ea9753514ba0
      
https://github.com/Dolibarr/dolibarr/commit/c1445a88e1c00e3983567ca58b88ea9753514ba0
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-07-11 (Sat, 11 Jul 2015)

  Changed paths:
    M htdocs/contact/card.php

  Log Message:
  -----------
  Merge pull request #3171 from atm-ph/fix_37_translate_contact

FIX translate Jabberid on contact page with edit view


  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: bde4503abdb8007e96ae3419087dd5aefefa3060
      
https://github.com/Dolibarr/dolibarr/commit/bde4503abdb8007e96ae3419087dd5aefefa3060
  Author: phf <address@hidden>
  Date:   2015-07-15 (Wed, 15 Jul 2015)

  Changed paths:
    M htdocs/langs/fr_FR/categories.lang

  Log Message:
  -----------
  FIX : translation for 1 word do not work if product/service module are 
disabled because the translation search in products.lang


  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: 1a61ab055f1cbd1e4533569e63830d9580a3bc0a
      
https://github.com/Dolibarr/dolibarr/commit/1a61ab055f1cbd1e4533569e63830d9580a3bc0a
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-07-16 (Thu, 16 Jul 2015)

  Changed paths:
    M htdocs/langs/fr_FR/categories.lang

  Log Message:
  -----------
  Merge pull request #3207 from atm-ph/fix_37_translation_category

FIX : translation for 1 word do not work


  Commit: 244d1839e4c132d9c3fed0fa4125256b030631cd
      
https://github.com/Dolibarr/dolibarr/commit/244d1839e4c132d9c3fed0fa4125256b030631cd
  Author: Gauthier <address@hidden>
  Date:   2015-07-17 (Fri, 17 Jul 2015)

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

  Log Message:
  -----------
  FIX : load propal langs for availability traduction


  Commit: 953a21b55e0445b5d08463230267baf97a0b89f4
      
https://github.com/Dolibarr/dolibarr/commit/953a21b55e0445b5d08463230267baf97a0b89f4
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2015-07-17 (Fri, 17 Jul 2015)

  Changed paths:
    M htdocs/webservices/server_productorservice.php

  Log Message:
  -----------
  FIX #3262 Webservice getProductsForCategory()

Wrong variable name was used!


  Commit: 7660d846e3ceb27d6f156cc4c31a30412466099d
      
https://github.com/Dolibarr/dolibarr/commit/7660d846e3ceb27d6f156cc4c31a30412466099d
  Author: Juanjo Menent <address@hidden>
  Date:   2015-07-17 (Fri, 17 Jul 2015)

  Changed paths:
    M htdocs/webservices/server_productorservice.php

  Log Message:
  -----------
  Merge pull request #3263 from GPCsolutions/dolibarr3.7-3262

FIX #3262 Webservice getProductsForCategory()


  Commit: 57f5c958947414ac1624e20ba90ffa794db9e6d2
      
https://github.com/Dolibarr/dolibarr/commit/57f5c958947414ac1624e20ba90ffa794db9e6d2
  Author: Juanjo Menent <address@hidden>
  Date:   2015-07-17 (Fri, 17 Jul 2015)

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

  Log Message:
  -----------
  Merge pull request #3261 from atm-gauthier/3.7_fix_trad_availability

FIX : load propal langs for availability traduction


  Commit: e9d1e6265d0a15377629baf66fe9dd57046c517d
      
https://github.com/Dolibarr/dolibarr/commit/e9d1e6265d0a15377629baf66fe9dd57046c517d
  Author: Marcos Garcí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 Garcí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 Garcí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 Garcí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 Garcí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: 2bb1945a2f4432e0737173a9629a0351295b50dc
      
https://github.com/Dolibarr/dolibarr/commit/2bb1945a2f4432e0737173a9629a0351295b50dc
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-07-19 (Sun, 19 Jul 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/facture/stats/index.php
    M htdocs/compta/prelevement/class/rejetprelevement.class.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/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/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/langs/en_US/errors.lang
    M htdocs/product/reassort.php
    M htdocs/projet/list.php
    M htdocs/societe/info.php
    M htdocs/societe/soc.php

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

Conflicts:
        htdocs/compta/prelevement/class/rejetprelevement.class.php
        htdocs/compta/sociales/class/paymentsocialcontribution.class.php
        htdocs/contact/exportimport.php
        htdocs/contact/ldap.php
        htdocs/contact/perso.php
        htdocs/contact/vcard.php
        htdocs/core/class/commonobject.class.php
        htdocs/product/reassort.php
        htdocs/projet/liste.php
        htdocs/societe/consumption.php
        htdocs/societe/info.php


  Commit: 8505e914695a0723da9fe719f1dfc3e1f4b4495b
      
https://github.com/Dolibarr/dolibarr/commit/8505e914695a0723da9fe719f1dfc3e1f4b4495b
  Author: Marcos Garcí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 Garcí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: 1be33e1ddaacc718ee7436e01a6cf613c24b8d56
      
https://github.com/Dolibarr/dolibarr/commit/1be33e1ddaacc718ee7436e01a6cf613c24b8d56
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-07-19 (Sun, 19 Jul 2015)

  Changed paths:
    M ChangeLog
    M htdocs/projet/card.php
    M htdocs/projet/class/project.class.php

  Log Message:
  -----------
  FIX [ bug 1634 ] Error deleting a project when it had many linked objects

 Projet::delete was throwing DB error messages directly to the user instead of 
logging them and showing a proper error message to the user


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

  Changed paths:
    M ChangeLog
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/facture/stats/index.php
    M htdocs/compta/prelevement/class/rejetprelevement.class.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/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/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/langs/en_US/errors.lang
    M htdocs/langs/fr_FR/categories.lang
    M htdocs/product/reassort.php
    M htdocs/projet/list.php
    M htdocs/societe/info.php
    M htdocs/societe/soc.php
    M htdocs/webservices/server_productorservice.php

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


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

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

  Log Message:
  -----------
  FIX [ bug 1925 ] "Link to order" option in supplier invoices is not working 
properly

Patch submitted by Philippe (pheno) at 
https://doliforge.org/tracker/?func=detail&aid=1925&group_id=144


  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: 8fa35fcb7bb275a0b06ec919fba0452bc27510bf
      
https://github.com/Dolibarr/dolibarr/commit/8fa35fcb7bb275a0b06ec919fba0452bc27510bf
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-07-19 (Sun, 19 Jul 2015)

  Changed paths:
    M ChangeLog
    M htdocs/projet/card.php
    M htdocs/projet/class/project.class.php

  Log Message:
  -----------
  Merge pull request #3278 from marcosgdf/bug-1634

FIX [ bug 1634 ] Error deleting a project when it had many linked objects


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

  Changed paths:
    M htdocs/projet/card.php

  Log Message:
  -----------
  Fix report of all error messages


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

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

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

Conflicts:
        ChangeLog


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

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

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


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

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

  Log Message:
  -----------
  Fix: [ bug #3198 ] Trigger LINECONTRACT_INSERT passes Contrat as $object 
instead of ContratLigne

Created new ContratLigne::insert function

Close #3198


  Commit: 038f171d6cb628ad9f1902f0f33232580c63d3a0
      
https://github.com/Dolibarr/dolibarr/commit/038f171d6cb628ad9f1902f0f33232580c63d3a0
  Author: Marcos Garcí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: f0ed7dac095a90ede5311fa087557f29303ccc2e
      
https://github.com/Dolibarr/dolibarr/commit/f0ed7dac095a90ede5311fa087557f29303ccc2e
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-07-20 (Mon, 20 Jul 2015)

  Changed paths:
    M build/makepack-dolibarr.pl
    M htdocs/.gitignore

  Log Message:
  -----------
  Exclude tested module


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

  Changed paths:
    M htdocs/comm/action/class/actioncomm.class.php

  Log Message:
  -----------
  Fix bad signature of fetch. The ref_ext is missing.


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

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

  Log Message:
  -----------
  Comments


  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: 9e35fd1bc3779ffaec9b09344956cf0ea8e7008c
      
https://github.com/Dolibarr/dolibarr/commit/9e35fd1bc3779ffaec9b09344956cf0ea8e7008c
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-07-21 (Tue, 21 Jul 2015)

  Changed paths:
    M htdocs/comm/action/class/actioncomm.class.php

  Log Message:
  -----------
  Doc comments


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

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

  Log Message:
  -----------
  FIX : Line break display as a block


  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: 96f1c25a730ab4d4e019cde7ef078e8d8686b8a3
      
https://github.com/Dolibarr/dolibarr/commit/96f1c25a730ab4d4e019cde7ef078e8d8686b8a3
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-07-23 (Thu, 23 Jul 2015)

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

  Log Message:
  -----------
  Merge pull request #3287 from marcosgdf/bug-3198

Fix: [ bug #3198 ] Trigger LINECONTRACT_INSERT passes Contrat as $object 
instead of ContratLigne


  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: c0412acdea3ee24faf0a8cb0909508c49eb685fc
      
https://github.com/Dolibarr/dolibarr/commit/c0412acdea3ee24faf0a8cb0909508c49eb685fc
  Author: Florian HENRY <address@hidden>
  Date:   2015-07-27 (Mon, 27 Jul 2015)

  Changed paths:
    M htdocs/adherents/admin/public.php

  Log Message:
  -----------
  FIX : #3318


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

  Changed paths:
    M ChangeLog
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php

  Log Message:
  -----------
  Fix: Not showing delivery date on rouget pdf (expedition)


  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: d78292b9af3b5e477ae4587fc9cc08dd79896055
      
https://github.com/Dolibarr/dolibarr/commit/d78292b9af3b5e477ae4587fc9cc08dd79896055
  Author: Florian HENRY <address@hidden>
  Date:   2015-07-27 (Mon, 27 Jul 2015)

  Changed paths:
    M htdocs/main.inc.php

  Log Message:
  -----------
  FIX : if multicompany enabled, call to undifend method _setCookie
instead of setCookie


  Commit: 517e9094da6fcee5c3594140f2f965550b7d282e
      
https://github.com/Dolibarr/dolibarr/commit/517e9094da6fcee5c3594140f2f965550b7d282e
  Author: Florian HENRY <address@hidden>
  Date:   2015-07-27 (Mon, 27 Jul 2015)

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

  Log Message:
  -----------
  FIX : Avoid warning strict mode when hosting server do not have
php5_curl installed


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

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

  Log Message:
  -----------
  FIX : Line break display as a block


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

  Changed paths:
    M htdocs/comm/action/card.php

  Log Message:
  -----------
  FIX : When we add an user on event in create mode, we lose linked object


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

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

  Log Message:
  -----------
  Merge pull request #3308 from 
atm-gauthier/3.7_fix_display_extraf_text_line_break

FIX : Line break display as a block


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

  Changed paths:
    M htdocs/adherents/admin/public.php
    M htdocs/core/lib/json.lib.php
    M htdocs/main.inc.php

  Log Message:
  -----------
  Merge pull request #3319 from FHenry/3.7

FIX : #3318


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

  Changed paths:
    M ChangeLog
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php

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

Fix: Not showing delivery date on rouget pdf (expedition)


  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: cc49b39eb655831de33dc277f2dceef0f9eed935
      
https://github.com/Dolibarr/dolibarr/commit/cc49b39eb655831de33dc277f2dceef0f9eed935
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-07-28 (Tue, 28 Jul 2015)

  Changed paths:
    M htdocs/comm/action/card.php

  Log Message:
  -----------
  Merge pull request #3329 from 
atm-gauthier/3.7_fix_add_user_on_event_in_create_mode

FIX : When we add an user on event in create mode, we lose linked object


  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: 13dee1876a6d32c885611be78f406abf608b3f49
      
https://github.com/Dolibarr/dolibarr/commit/13dee1876a6d32c885611be78f406abf608b3f49
  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/compta/resultat/clientfourn.php
    M htdocs/compta/resultat/index.php
    M htdocs/core/menus/standard/eldy.lib.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/projet/class/task.class.php

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

Conflicts:
        htdocs/compta/resultat/clientfourn.php


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

  Changed paths:
    M ChangeLog
    M build/makepack-dolibarr.pl
    M htdocs/.gitignore
    M htdocs/adherents/admin/public.php
    M htdocs/comm/action/card.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/compta/bank/class/account.class.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/card.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/vcard.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/actions_extrafields.inc.php
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/vcard.class.php
    M htdocs/core/lib/date.lib.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/json.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.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/document_actions_pre_headers.tpl.php
    M htdocs/fourn/facture/card.php
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/fr_FR/categories.lang
    M htdocs/main.inc.php
    M htdocs/product/reassort.php
    M htdocs/projet/card.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/class/task.class.php
    M htdocs/projet/list.php
    M htdocs/societe/info.php
    M htdocs/societe/soc.php
    M htdocs/webservices/server_productorservice.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/91c05a516c40...bbc8433f557d
[Prev in Thread]
Current Thread
[Next in Thread]
[Dolibarr-git] [Dolibarr/dolibarr] cf857b: Fix: select date problem with mobile device (#3039..., Juanjo Menent, 2015/07/09
- [Dolibarr-git] [Dolibarr/dolibarr] cf857b: Fix: select date problem with mobile device (#3039..., Laurent Destailleur, 2015/07/19
- [Dolibarr-git] [Dolibarr/dolibarr] cf857b: Fix: select date problem with mobile device (#3039..., Laurent Destailleur, 2015/07/19
- [Dolibarr-git] [Dolibarr/dolibarr] cf857b: Fix: select date problem with mobile device (#3039..., Laurent Destailleur, 2015/07/19
- [Dolibarr-git] [Dolibarr/dolibarr] cf857b: Fix: select date problem with mobile device (#3039..., Laurent Destailleur <=
Prev by Date: [Dolibarr-git] [Dolibarr/dolibarr] 08c9dd: FIX #2983 Load gravatar avatar images securely ove...
Next by Date: [Dolibarr-git] [Dolibarr/dolibarr] 84e458: Doc comments
Previous by thread: [Dolibarr-git] [Dolibarr/dolibarr] cf857b: Fix: select date problem with mobile device (#3039...
Next by thread: [Dolibarr-git] [Dolibarr/dolibarr] d286c1: Update lines.php with elarifr modification
Index(es):
- Date
- Thread