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

[Dolibarr-git] [Dolibarr/dolibarr] e80f29: Fix: [ bug 1794 ] - Error whe

From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] e80f29: Fix: [ bug 1794 ] - Error when cloning Proposal gi...
Date: Fri, 13 Nov 2015 02:46:08 -0800 
  Branch: refs/heads/3.7_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: e80f29c271f6e75f8771447c12e37526222092c7
      
https://github.com/Dolibarr/dolibarr/commit/e80f29c271f6e75f8771447c12e37526222092c7
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-09-16 (Wed, 16 Sep 2015)

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

  Log Message:
  -----------
  Fix: [ bug 1794 ] - Error when cloning Proposal gives error in a malformed 
page


  Commit: 3818bff86af9a9d0b98114e5fc6a88b926844f2e
      
https://github.com/Dolibarr/dolibarr/commit/3818bff86af9a9d0b98114e5fc6a88b926844f2e
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-09-16 (Wed, 16 Sep 2015)

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

  Log Message:
  -----------
  Fix: [ bug 1776 ] Undefined $deliverycompany variable in pdf_build_address


  Commit: 2d35124c71b683ad8a2ebc015792564b28b7e7ef
      
https://github.com/Dolibarr/dolibarr/commit/2d35124c71b683ad8a2ebc015792564b28b7e7ef
  Author: Alexis Algoud <address@hidden>
  Date:   2015-09-23 (Wed, 23 Sep 2015)

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

  Log Message:
  -----------
  FIX no need to remove file into mail form, the temp dir will be deleted after 
any sending


  Commit: fd29bb34be9645f2c71cd0453730005c11fe31a3
      
https://github.com/Dolibarr/dolibarr/commit/fd29bb34be9645f2c71cd0453730005c11fe31a3
  Author: Florian HENRY <address@hidden>
  Date:   2015-10-01 (Thu, 01 Oct 2015)

  Changed paths:
    M htdocs/comm/mailing/list.php

  Log Message:
  -----------
  FIX : Mass Mailing activity don't display all status


  Commit: e22fb3c538bd214cca9f97c1fb65796e9cc5d795
      
https://github.com/Dolibarr/dolibarr/commit/e22fb3c538bd214cca9f97c1fb65796e9cc5d795
  Author: philippe grand <address@hidden>
  Date:   2015-10-02 (Fri, 02 Oct 2015)

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

  Log Message:
  -----------
  fix : Typo


  Commit: 406b271275d09a38ff4b8753c40590ccac2d2a13
      
https://github.com/Dolibarr/dolibarr/commit/406b271275d09a38ff4b8753c40590ccac2d2a13
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-10-04 (Sun, 04 Oct 2015)

  Changed paths:
    M htdocs/comm/mailing/list.php

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

FIX : Mass Mailing activity don't display all status


  Commit: 78cb31e55f6d00c2f9e3b968df27d50b3a176920
      
https://github.com/Dolibarr/dolibarr/commit/78cb31e55f6d00c2f9e3b968df27d50b3a176920
  Author: philippe grand <address@hidden>
  Date:   2015-10-05 (Mon, 05 Oct 2015)

  Changed paths:
    M htdocs/comm/mailing/list.php

  Log Message:
  -----------
  Merge branch '3.7' of https://github.com/Dolibarr/dolibarr.git into 3.7


  Commit: c9d8e041d56a7bd5cc32681f2be8bdf0ec18fdde
      
https://github.com/Dolibarr/dolibarr/commit/c9d8e041d56a7bd5cc32681f2be8bdf0ec18fdde
  Author: Florian HENRY <address@hidden>
  Date:   2015-10-05 (Mon, 05 Oct 2015)

  Changed paths:
    M htdocs/public/members/new.php

  Log Message:
  -----------
  FIX : New adherent from, always redirect on entity


  Commit: 9dd4a23365d7f857280d224eb1c133d3a5f9fd81
      
https://github.com/Dolibarr/dolibarr/commit/9dd4a23365d7f857280d224eb1c133d3a5f9fd81
  Author: Florian HENRY <address@hidden>
  Date:   2015-10-05 (Mon, 05 Oct 2015)

  Changed paths:
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/resultat/index.php
    M htdocs/langs/en_US/compta.lang
    M htdocs/langs/fr_FR/compta.lang

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


  Commit: bf262c2cae6dd7369bb830bcab3aa393789b76fe
      
https://github.com/Dolibarr/dolibarr/commit/bf262c2cae6dd7369bb830bcab3aa393789b76fe
  Author: Christophe Battarel <address@hidden>
  Date:   2015-10-05 (Mon, 05 Oct 2015)

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

  Log Message:
  -----------
  reenable search criteria in sql clause


  Commit: f3ef9b868f9c4a25189479cc6fe21e0ebfaee39d
      
https://github.com/Dolibarr/dolibarr/commit/f3ef9b868f9c4a25189479cc6fe21e0ebfaee39d
  Author: Christophe Battarel <address@hidden>
  Date:   2015-10-05 (Mon, 05 Oct 2015)

  Changed paths:
    M htdocs/product/class/product.class.php
    M htdocs/product/stock/class/entrepot.class.php

  Log Message:
  -----------
  fix entities warehouse share


  Commit: d24f5538f9cf1c5e0ce8b0eb7a559111f9b50963
      
https://github.com/Dolibarr/dolibarr/commit/d24f5538f9cf1c5e0ce8b0eb7a559111f9b50963
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2015-10-05 (Mon, 05 Oct 2015)

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

  Log Message:
  -----------
  Fix: wrong parameters order


  Commit: 41354ca00d63888f46de15c3ae6c657b3824856d
      
https://github.com/Dolibarr/dolibarr/commit/41354ca00d63888f46de15c3ae6c657b3824856d
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2015-10-05 (Mon, 05 Oct 2015)

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

  Log Message:
  -----------
  Added type hinting to extrafields object


  Commit: 3fdd59bf0a06798476566b6fc173ebb3540ef5cb
      
https://github.com/Dolibarr/dolibarr/commit/3fdd59bf0a06798476566b6fc173ebb3540ef5cb
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2015-10-05 (Mon, 05 Oct 2015)

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

  Log Message:
  -----------
  Fix #3666 checkbox extrafields on edit


  Commit: afbee44993e6c5c6ae80f7e46f5eba72bd523fab
      
https://github.com/Dolibarr/dolibarr/commit/afbee44993e6c5c6ae80f7e46f5eba72bd523fab
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2015-10-05 (Mon, 05 Oct 2015)

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

  Log Message:
  -----------
  Fix #3667 checkbox extrafields on edit

For actions and members.


  Commit: c208fccf35aaf44b83bdc3edc0c2e5d5623d4b87
      
https://github.com/Dolibarr/dolibarr/commit/c208fccf35aaf44b83bdc3edc0c2e5d5623d4b87
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2015-10-06 (Tue, 06 Oct 2015)

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

  Log Message:
  -----------
  [Qual] Prevent warning

calcul_price_total() prefers to have the seller and localtaxes specified


  Commit: 8f5d9597f8f7fc07dc5ac979fd7b1d32b29d347f
      
https://github.com/Dolibarr/dolibarr/commit/8f5d9597f8f7fc07dc5ac979fd7b1d32b29d347f
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-10-07 (Wed, 07 Oct 2015)

  Changed paths:
    M htdocs/adherents/type.php
    M htdocs/comm/action/card.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/extrafields.class.php

  Log Message:
  -----------
  Merge pull request #3675 from GPCsolutions/3.7-3666

Fixes for checkbox extrafields


  Commit: 6cce2860c24f0605a20cde6a21fcc5a79720da5d
      
https://github.com/Dolibarr/dolibarr/commit/6cce2860c24f0605a20cde6a21fcc5a79720da5d
  Author: philippe grand <address@hidden>
  Date:   2015-10-08 (Thu, 08 Oct 2015)

  Changed paths:
    M htdocs/adherents/type.php
    M htdocs/comm/action/card.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/extrafields.class.php

  Log Message:
  -----------
  Merge branch '3.7' of https://github.com/Dolibarr/dolibarr.git into 3.7


  Commit: 0e343ae3b2920ccd01353f2216d4d81ac0d66470
      
https://github.com/Dolibarr/dolibarr/commit/0e343ae3b2920ccd01353f2216d4d81ac0d66470
  Author: philippe grand <address@hidden>
  Date:   2015-10-08 (Thu, 08 Oct 2015)

  Changed paths:
    M htdocs/adherents/admin/public.php
    M htdocs/adherents/card.php
    M htdocs/admin/dict.php
    M htdocs/cashdesk/admin/cashdesk.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/compta/bank/releve.php
    M htdocs/compta/stats/index.php
    M htdocs/core/lib/memory.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/lib/tax.lib.php
    M htdocs/core/modules/import/import_csv.modules.php
    M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
    M htdocs/livraison/card.php
    M htdocs/opensurvey/card.php
    M htdocs/product/composition/card.php
    M htdocs/product/stock/valo.php
    M htdocs/projet/note.php
    M htdocs/societe/canvas/company/tpl/card_view.tpl.php
    M htdocs/societe/canvas/individual/tpl/card_view.tpl.php
    M htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
    M htdocs/webservices/demo_wsclient_category.php-NORUN
    M htdocs/webservices/demo_wsclient_invoice.php-NORUN
    M htdocs/webservices/demo_wsclient_other.php-NORUN
    M htdocs/webservices/demo_wsclient_productorservice.php-NORUN
    M htdocs/webservices/demo_wsclient_thirdparty.php-NORUN
    M scripts/contracts/email_expire_services_to_representatives.php
    M scripts/invoices/email_unpaid_invoices_to_representatives.php

  Log Message:
  -----------
  syntax error


  Commit: 00f0aff6f0cead68aa186b5c704b564b27d04ed2
      
https://github.com/Dolibarr/dolibarr/commit/00f0aff6f0cead68aa186b5c704b564b27d04ed2
  Author: Christophe Battarel <address@hidden>
  Date:   2015-10-08 (Thu, 08 Oct 2015)

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

  Log Message:
  -----------
  FIX: change order date on clone (as everywhere else)


  Commit: 53c9cb38efb1e7e0077badf7630f8870e3c78f78
      
https://github.com/Dolibarr/dolibarr/commit/53c9cb38efb1e7e0077badf7630f8870e3c78f78
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-10-09 (Fri, 09 Oct 2015)

  Changed paths:
    M htdocs/public/members/new.php

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

        FIX : New adherent from, always redirect on entity


  Commit: e886c89e063e9307ca2e8475f53c3d9e24e4b217
      
https://github.com/Dolibarr/dolibarr/commit/e886c89e063e9307ca2e8475f53c3d9e24e4b217
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-10-09 (Fri, 09 Oct 2015)

  Changed paths:
    M htdocs/product/class/product.class.php
    M htdocs/product/stock/class/entrepot.class.php

  Log Message:
  -----------
  Merge pull request #3668 from altatof/fix_stock_entity

fix entities warehouse share


  Commit: c675f88dda57b085932ba44a670af313b8f8fd79
      
https://github.com/Dolibarr/dolibarr/commit/c675f88dda57b085932ba44a670af313b8f8fd79
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-10-09 (Fri, 09 Oct 2015)

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

  Log Message:
  -----------
  Merge pull request #3678 from GPCsolutions/3.7-calcul_price_total-warning

[Qual] Prevent warning


  Commit: b27989d5d488e403f3232c7ac52126d55e6d51f6
      
https://github.com/Dolibarr/dolibarr/commit/b27989d5d488e403f3232c7ac52126d55e6d51f6
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-10-09 (Fri, 09 Oct 2015)

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

  Log Message:
  -----------
  Merge pull request #3665 from altatof/fix_extrafields

reenable search criteria in sql clause


  Commit: f9485bd25bd109a7998ae593a36fb21cbb65ca9c
      
https://github.com/Dolibarr/dolibarr/commit/f9485bd25bd109a7998ae593a36fb21cbb65ca9c
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-10-09 (Fri, 09 Oct 2015)

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

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

Conflicts:
        htdocs/core/class/extrafields.class.php


  Commit: 279e7028fb7a186a20dee0da39abd328f001770d
      
https://github.com/Dolibarr/dolibarr/commit/279e7028fb7a186a20dee0da39abd328f001770d
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-10-09 (Fri, 09 Oct 2015)

  Changed paths:
    M ChangeLog
    M htdocs/adherents/admin/public.php
    M htdocs/adherents/card.php
    M htdocs/admin/dict.php
    M htdocs/cashdesk/admin/cashdesk.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/propal.php
    M htdocs/commande/card.php
    M htdocs/compta/bank/releve.php
    M htdocs/compta/facture.php
    M htdocs/compta/stats/index.php
    M htdocs/core/lib/memory.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/lib/tax.lib.php
    M htdocs/core/modules/import/import_csv.modules.php
    M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
    M htdocs/fourn/commande/card.php
    M htdocs/livraison/card.php
    M htdocs/opensurvey/card.php
    M htdocs/product/composition/card.php
    M htdocs/product/stock/valo.php
    M htdocs/projet/note.php
    M htdocs/societe/canvas/company/tpl/card_view.tpl.php
    M htdocs/societe/canvas/individual/tpl/card_view.tpl.php
    M htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
    M htdocs/webservices/demo_wsclient_category.php-NORUN
    M htdocs/webservices/demo_wsclient_invoice.php-NORUN
    M htdocs/webservices/demo_wsclient_other.php-NORUN
    M htdocs/webservices/demo_wsclient_productorservice.php-NORUN
    M htdocs/webservices/demo_wsclient_thirdparty.php-NORUN
    M scripts/contracts/email_expire_services_to_representatives.php
    M scripts/invoices/email_unpaid_invoices_to_representatives.php

  Log Message:
  -----------
  Merge pull request #3686 from grandoc/3.7

3.7


  Commit: 384c89dcef32c4c17832e7aaf93e985cdfbee428
      
https://github.com/Dolibarr/dolibarr/commit/384c89dcef32c4c17832e7aaf93e985cdfbee428
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-10-09 (Fri, 09 Oct 2015)

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

  Log Message:
  -----------
  Merge pull request #3701 from altatof/fix_orderdateonclone

FIX: change order date on clone (as everywhere else)


  Commit: 3f8e9bd1810450d05974d770fdf64d8707139273
      
https://github.com/Dolibarr/dolibarr/commit/3f8e9bd1810450d05974d770fdf64d8707139273
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-10-10 (Sat, 10 Oct 2015)

  Changed paths:
    M htdocs/product/index.php

  Log Message:
  -----------
  Remove warning


  Commit: 252f00dfe7c48d44044b3d871ee7eb9eb5a690b7
      
https://github.com/Dolibarr/dolibarr/commit/252f00dfe7c48d44044b3d871ee7eb9eb5a690b7
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-10-11 (Sun, 11 Oct 2015)

  Changed paths:
    M ChangeLog
    M htdocs/comm/propal/class/propalestats.class.php
    M htdocs/commande/class/commandestats.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/class/facturestats.class.php
    M htdocs/compta/paiement/cheque/class/remisecheque.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/lib/security.lib.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/commande/dispatch.php
    M htdocs/product/class/html.formproduct.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/index.php
    M htdocs/product/stock/class/entrepot.class.php
    M htdocs/product/stock/index.php
    M htdocs/product/stock/liste.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/product.php
    M htdocs/product/stock/valo.php

  Log Message:
  -----------
  Merge branch '3.6' into clone-proposals


  Commit: 9f1fa7e212be3a879e8604b7140469b6f973ed60
      
https://github.com/Dolibarr/dolibarr/commit/9f1fa7e212be3a879e8604b7140469b6f973ed60
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-10-11 (Sun, 11 Oct 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Missing changelog


  Commit: 4e9a378f0d45699b95617cae190540a8d45ad6ee
      
https://github.com/Dolibarr/dolibarr/commit/4e9a378f0d45699b95617cae190540a8d45ad6ee
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-10-11 (Sun, 11 Oct 2015)

  Changed paths:
    M ChangeLog
    M htdocs/comm/propal/class/propalestats.class.php
    M htdocs/commande/class/commandestats.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/class/facturestats.class.php
    M htdocs/compta/paiement/cheque/class/remisecheque.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/lib/security.lib.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/commande/dispatch.php
    M htdocs/product/class/html.formproduct.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/index.php
    M htdocs/product/stock/class/entrepot.class.php
    M htdocs/product/stock/index.php
    M htdocs/product/stock/liste.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/product.php
    M htdocs/product/stock/valo.php

  Log Message:
  -----------
  Merge branch '3.6' into bug-1776


  Commit: fd9f51df88927d9a41c62d50fc6a04d2d6fa515a
      
https://github.com/Dolibarr/dolibarr/commit/fd9f51df88927d9a41c62d50fc6a04d2d6fa515a
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-10-11 (Sun, 11 Oct 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Missing changelog


  Commit: c76af687ed9926a4a135036bb97502fb9932d9b4
      
https://github.com/Dolibarr/dolibarr/commit/c76af687ed9926a4a135036bb97502fb9932d9b4
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-10-11 (Sun, 11 Oct 2015)

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

  Log Message:
  -----------
  Merge pull request #3715 from marcosgdf/clone-proposals

FIX 1794 Error when cloning Proposal gives error in a malformed page


  Commit: 4e4efc97f044b99299d0993149ad9aec88e6e026
      
https://github.com/Dolibarr/dolibarr/commit/4e4efc97f044b99299d0993149ad9aec88e6e026
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-10-11 (Sun, 11 Oct 2015)

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

  Log Message:
  -----------
  Merge branch 'marcosgdf-bug-1776' into 3.6


  Commit: 9fa2afb44bf7db1215aff910b3a407016e038a74
      
https://github.com/Dolibarr/dolibarr/commit/9fa2afb44bf7db1215aff910b3a407016e038a74
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-10-11 (Sun, 11 Oct 2015)

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

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

Conflicts:
        ChangeLog


  Commit: 62dd936b084bf2a357ad9231cefd1b6a58d02cbd
      
https://github.com/Dolibarr/dolibarr/commit/62dd936b084bf2a357ad9231cefd1b6a58d02cbd
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-10-11 (Sun, 11 Oct 2015)

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

  Log Message:
  -----------
  Merge pull request #3573 from atm-alexis/FIX_remove_file_from_mail_remove_file

FIX no need to remove file into mail form


  Commit: 87fad70f4a7c6989983d6a519517b95a2f0c5725
      
https://github.com/Dolibarr/dolibarr/commit/87fad70f4a7c6989983d6a519517b95a2f0c5725
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-10-11 (Sun, 11 Oct 2015)

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

  Log Message:
  -----------
  Revert "FIX no need to remove file into mail form"


  Commit: 84f5b72d2bfb1ddc4113c3c269fb97a1e50868eb
      
https://github.com/Dolibarr/dolibarr/commit/84f5b72d2bfb1ddc4113c3c269fb97a1e50868eb
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-10-11 (Sun, 11 Oct 2015)

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

  Log Message:
  -----------
  Merge pull request #3719 from 
Dolibarr/revert-3573-FIX_remove_file_from_mail_remove_file

Revert "FIX no need to remove file into mail form"


  Commit: 0251728e286a99f5f013f878c9872dde0fbcabf7
      
https://github.com/Dolibarr/dolibarr/commit/0251728e286a99f5f013f878c9872dde0fbcabf7
  Author: Alexis Algoud <address@hidden>
  Date:   2015-10-12 (Mon, 12 Oct 2015)

  Changed paths:
    M htdocs/product/stock/class/entrepot.class.php

  Log Message:
  -----------
  FIX double db escape add too quote


  Commit: 727db565765037705c50905c400d45ef17f77e3f
      
https://github.com/Dolibarr/dolibarr/commit/727db565765037705c50905c400d45ef17f77e3f
  Author: Florian HENRY <address@hidden>
  Date:   2015-10-14 (Wed, 14 Oct 2015)

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

  Log Message:
  -----------
  FIX : #3724 Bug: Blank page after cloning proposal with changed client


  Commit: f08d52b0e81863c1390e533182b64dd8124b8ae0
      
https://github.com/Dolibarr/dolibarr/commit/f08d52b0e81863c1390e533182b64dd8124b8ae0
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-10-14 (Wed, 14 Oct 2015)

  Changed paths:
    M htdocs/product/stock/class/entrepot.class.php

  Log Message:
  -----------
  Merge pull request #3723 from atm-alexis/FIX_double_escape_entrepot

FIX double db escape add too quote


  Commit: 5d585fa04a0ccacd11b34855c34c3a76bfae4e3d
      
https://github.com/Dolibarr/dolibarr/commit/5d585fa04a0ccacd11b34855c34c3a76bfae4e3d
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-10-14 (Wed, 14 Oct 2015)

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

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

FIX : #3724 Bug: Blank page after cloning proposal with changed client


  Commit: 9b85a700130235f5031cfcad96ad3ed41c0b294a
      
https://github.com/Dolibarr/dolibarr/commit/9b85a700130235f5031cfcad96ad3ed41c0b294a
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-10-16 (Fri, 16 Oct 2015)

  Changed paths:
    M ChangeLog
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/product/index.php
    M htdocs/product/stock/class/entrepot.class.php

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

Conflicts:
        ChangeLog
        htdocs/comm/propal.php
        htdocs/comm/propal/class/propal.class.php


  Commit: 6f4cfc86e8e82b98092775113e9d4f1c79560103
      
https://github.com/Dolibarr/dolibarr/commit/6f4cfc86e8e82b98092775113e9d4f1c79560103
  Author: Frédéric FRANCE <address@hidden>
  Date:   2015-10-18 (Sun, 18 Oct 2015)

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

  Log Message:
  -----------
  Update notify.class.php

http://www.dolibarr.fr/forum/12-howto--aide/54061-probleme-sur-la-validation-des-commande-fournisseu
Fatal error: Call to a member function getFullName() on a non-object in 
/home/xxxx/public_html/xxxxx/htdocs/core/class/notify.class.php on line 374


  Commit: d192ed96764942be3215b74b39e35a0bf6325d81
      
https://github.com/Dolibarr/dolibarr/commit/d192ed96764942be3215b74b39e35a0bf6325d81
  Author: Juanjo Menent <address@hidden>
  Date:   2015-10-18 (Sun, 18 Oct 2015)

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

  Log Message:
  -----------
  Merge pull request #3761 from frederic34/patch-18

Fix getFullName() on a non-object in notify.class.php


  Commit: 29b8919a4000e1957defdee0039e1091aa947ca3
      
https://github.com/Dolibarr/dolibarr/commit/29b8919a4000e1957defdee0039e1091aa947ca3
  Author: atm-robin <address@hidden>
  Date:   2015-10-26 (Mon, 26 Oct 2015)

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

  Log Message:
  -----------
  FIX supplier rights for orderToInvoice


  Commit: bd69830cbd518aff0e8e472d22c7f620a9249866
      
https://github.com/Dolibarr/dolibarr/commit/bd69830cbd518aff0e8e472d22c7f620a9249866
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-10-26 (Mon, 26 Oct 2015)

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

  Log Message:
  -----------
  Merge pull request #3803 from atm-robin/3.7_fix_supplier_rights

FIX supplier rights for orderToInvoice


  Commit: c46f9350a583a6bcbd92ba2dc1af3bc75e3d7607
      
https://github.com/Dolibarr/dolibarr/commit/c46f9350a583a6bcbd92ba2dc1af3bc75e3d7607
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2015-10-30 (Fri, 30 Oct 2015)

  Changed paths:
    M htdocs/product/stats/commande.php
    M htdocs/product/stats/commande_fournisseur.php
    M htdocs/product/stats/facture.php
    M htdocs/product/stats/facture_fournisseur.php
    M htdocs/product/stats/propal.php

  Log Message:
  -----------
  Fix : stats were wrong if same product on several lines with same quantity 
because of distinct


  Commit: 64ff12c0097c812af1c4627ed054de738e3cc9cd
      
https://github.com/Dolibarr/dolibarr/commit/64ff12c0097c812af1c4627ed054de738e3cc9cd
  Author: Juanjo Menent <address@hidden>
  Date:   2015-10-30 (Fri, 30 Oct 2015)

  Changed paths:
    M htdocs/product/stats/commande.php
    M htdocs/product/stats/commande_fournisseur.php
    M htdocs/product/stats/facture.php
    M htdocs/product/stats/facture_fournisseur.php
    M htdocs/product/stats/propal.php

  Log Message:
  -----------
  Merge pull request #3835 from atm-maxime/fix_product_stats

Fix : stats were wrong if same product on several lines


  Commit: c06c2d0464925ff0fe8c8982b434b23a2afd4a7a
      
https://github.com/Dolibarr/dolibarr/commit/c06c2d0464925ff0fe8c8982b434b23a2afd4a7a
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-02 (Mon, 02 Nov 2015)

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

  Log Message:
  -----------
  FIX #3841 creation of a task completed has not status set to finished by
default


  Commit: 38ed83d05feba51bbd5a56478ecfda8370816d6e
      
https://github.com/Dolibarr/dolibarr/commit/38ed83d05feba51bbd5a56478ecfda8370816d6e
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-02 (Mon, 02 Nov 2015)

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

Conflicts:
        htdocs/core/lib/company.lib.php


  Commit: 69ac75bef8570112e0ce94e03b2f70805042e35d
      
https://github.com/Dolibarr/dolibarr/commit/69ac75bef8570112e0ce94e03b2f70805042e35d
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2015-11-04 (Wed, 04 Nov 2015)

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

  Log Message:
  -----------
  Fix #3864 Fixed invalid jQuery code


  Commit: fb34f257013b59cb5362e16eb887f3060a8c18a9
      
https://github.com/Dolibarr/dolibarr/commit/fb34f257013b59cb5362e16eb887f3060a8c18a9
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

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

  Log Message:
  -----------
  Merge pull request #3887 from GPCsolutions/dolibarr-3864

Fix #3864 Fixed invalid jQuery code


  Commit: 0543a3192006eed4b24f331e5aef1833ebbfc396
      
https://github.com/Dolibarr/dolibarr/commit/0543a3192006eed4b24f331e5aef1833ebbfc396
  Author: Alexis Algoud <address@hidden>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

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

  Log Message:
  -----------
  FIX event's data lost on user assign update


  Commit: e1ea2215a3b1f753ea45d1415825bb7e40a62ae3
      
https://github.com/Dolibarr/dolibarr/commit/e1ea2215a3b1f753ea45d1415825bb7e40a62ae3
  Author: Alexis Algoud <address@hidden>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

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

  Log Message:
  -----------
  FIX loss data also if update was cancel by error of ended state with no end 
date, try a generic patch


  Commit: 9b797c1831932ef0bd0c1ddacbba2535070c2a0b
      
https://github.com/Dolibarr/dolibarr/commit/9b797c1831932ef0bd0c1ddacbba2535070c2a0b
  Author: Christophe Battarel <address@hidden>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

  Changed paths:
    M htdocs/product/stock/class/entrepot.class.php
    M htdocs/product/stock/fiche.php
    M htdocs/product/stock/valo.php

  Log Message:
  -----------
  FIX bad calculation for stock value


  Commit: b0cf9bd0bebafdaebfe20cc02c4549b5cae1b357
      
https://github.com/Dolibarr/dolibarr/commit/b0cf9bd0bebafdaebfe20cc02c4549b5cae1b357
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

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

  Log Message:
  -----------
  Fix #3864 Really fixed invalid jQuery code


  Commit: fa088eb6cc23185e09bbfa18cd1c53afbebd33b9
      
https://github.com/Dolibarr/dolibarr/commit/fa088eb6cc23185e09bbfa18cd1c53afbebd33b9
  Author: Christophe Battarel <address@hidden>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

  Changed paths:
    M htdocs/product/stock/class/entrepot.class.php
    M htdocs/product/stock/fiche.php
    M htdocs/product/stock/valo.php

  Log Message:
  -----------
  FIX bad calculation for stock value


  Commit: f566b382969841bd32b0d7ba314c73d3e80ecc86
      
https://github.com/Dolibarr/dolibarr/commit/f566b382969841bd32b0d7ba314c73d3e80ecc86
  Author: Christophe Battarel <address@hidden>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

  Changed paths:
    M htdocs/product/stock/product.php

  Log Message:
  -----------
  FIX pmp


  Commit: 75bcb7e53f2dcb3b71cd7c4e8712b473a36ac2e8
      
https://github.com/Dolibarr/dolibarr/commit/75bcb7e53f2dcb3b71cd7c4e8712b473a36ac2e8
  Author: Christophe Battarel <address@hidden>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

  Changed paths:
    M htdocs/product/stock/product.php

  Log Message:
  -----------
  fix pmp


  Commit: ad821358790e17aa2619b3f2aad87be5ad74130a
      
https://github.com/Dolibarr/dolibarr/commit/ad821358790e17aa2619b3f2aad87be5ad74130a
  Author: Christophe Battarel <address@hidden>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

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

  Log Message:
  -----------
  FIX: change order date on clone (as everywhere else)


  Commit: 80d24455402b65b1519fad1c9f12093b829e5690
      
https://github.com/Dolibarr/dolibarr/commit/80d24455402b65b1519fad1c9f12093b829e5690
  Author: Christophe Battarel <address@hidden>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

  Changed paths:
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/expedition/class/expedition.class.php

  Log Message:
  -----------
  FIX: bad stock valorisation


  Commit: 316b7453e47d247ca0af2ae56d8b12bafd86e7b1
      
https://github.com/Dolibarr/dolibarr/commit/316b7453e47d247ca0af2ae56d8b12bafd86e7b1
  Author: Christophe Battarel <address@hidden>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

  Changed paths:
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/expedition/class/expedition.class.php

  Log Message:
  -----------
  FIX bad stock valo


  Commit: cbff03ca0864e170a1187c3227bc81719b16c5e6
      
https://github.com/Dolibarr/dolibarr/commit/cbff03ca0864e170a1187c3227bc81719b16c5e6
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

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

  Log Message:
  -----------
  Merge pull request #3892 from atm-alexis/3.7_FIX_data_lose_event_userassigned

FIX event's data lost on user assign update


  Commit: 60debe31c42f1fa913d29e845b173b28c4c3f8c2
      
https://github.com/Dolibarr/dolibarr/commit/60debe31c42f1fa913d29e845b173b28c4c3f8c2
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

  Changed paths:
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/product/stock/class/entrepot.class.php
    M htdocs/product/stock/fiche.php
    M htdocs/product/stock/product.php
    M htdocs/product/stock/valo.php

  Log Message:
  -----------
  Merge pull request #3894 from altatof/stockvalue

FIX bad calculation for stock value


  Commit: d499fafdb9b3db5d083aff4104370b7d64a8066d
      
https://github.com/Dolibarr/dolibarr/commit/d499fafdb9b3db5d083aff4104370b7d64a8066d
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

  Changed paths:
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/product/stock/class/entrepot.class.php
    M htdocs/product/stock/fiche.php
    M htdocs/product/stock/product.php
    M htdocs/product/stock/valo.php

  Log Message:
  -----------
  Merge pull request #3901 from altatof/3.6

FIX bad calculation for stock value


  Commit: fdf9617e42056daf8d47538ca8806871b96422c5
      
https://github.com/Dolibarr/dolibarr/commit/fdf9617e42056daf8d47538ca8806871b96422c5
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

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

  Log Message:
  -----------
  Merge pull request #3900 from GPCsolutions/dolibarr-3864

Fix #3864 Really fixed invalid jQuery code


  Commit: 5777c16b7255a54f270d48be403a4657e05a3b0f
      
https://github.com/Dolibarr/dolibarr/commit/5777c16b7255a54f270d48be403a4657e05a3b0f
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

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

  Log Message:
  -----------
  Merge pull request #3902 from altatof/clonedorderdate

FIX: change order date on clone (as everywhere else)


  Commit: 375e61de2ec37b7f9236de61a20416530344820e
      
https://github.com/Dolibarr/dolibarr/commit/375e61de2ec37b7f9236de61a20416530344820e
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

  Log Message:
  -----------
  Merge 3.5


  Commit: fe789960264fcf1453e6f281170d0747226beeb8
      
https://github.com/Dolibarr/dolibarr/commit/fe789960264fcf1453e6f281170d0747226beeb8
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

  Changed paths:
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/product/stock/product.php

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

Conflicts:
        htdocs/commande/class/commande.class.php
        htdocs/product/stock/fiche.php
        htdocs/product/stock/valo.php


  Commit: 8d829dca320ca0a9c864a9052447a8d55043d483
      
https://github.com/Dolibarr/dolibarr/commit/8d829dca320ca0a9c864a9052447a8d55043d483
  Author: Florian HENRY <address@hidden>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M htdocs/compta/facture.php

  Log Message:
  -----------
  FIX : only active customer should be return into new invoice creation
select list


  Commit: 600dbced7e859cf5331b8a11bd58dfd1deac7da5
      
https://github.com/Dolibarr/dolibarr/commit/600dbced7e859cf5331b8a11bd58dfd1deac7da5
  Author: Florian HENRY <address@hidden>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M htdocs/comm/action/card.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/product/stock/product.php

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


  Commit: 4d11205a01f056dd1a0dd2baf1223e35ef953d60
      
https://github.com/Dolibarr/dolibarr/commit/4d11205a01f056dd1a0dd2baf1223e35ef953d60
  Author: Christophe Battarel <address@hidden>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

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

  Log Message:
  -----------
  FIX: change object statut on close shipping and remove erratic db commit


  Commit: 87a102f5c8069d6a82eb2e714c163c2269ba1733
      
https://github.com/Dolibarr/dolibarr/commit/87a102f5c8069d6a82eb2e714c163c2269ba1733
  Author: Juanjo Menent <address@hidden>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M htdocs/compta/facture.php

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

FIX : only active customer should be available into select list thirdparty on 
invoice creation


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

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

  Log Message:
  -----------
  Merge pull request #3909 from altatof/fixcloseshipping

FIX: change object statut on close shipping and remove erratic db commit


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

  Changed paths:
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php

  Log Message:
  -----------
  FIX #3928 Creating a Customer order and a Customer invoice from a project, 
does not inherit payment conditions and method of payment of customer card


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

  Changed paths:
    M htdocs/societe/rib.php

  Log Message:
  -----------
  FIX #3707 Thirdparty bank account page table has a glitch


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

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

  Log Message:
  -----------
  FIX #3890 Expected transactions bank account page, shows negative numbers


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

  Changed paths:
    M htdocs/compta/localtax/card.php

  Log Message:
  -----------
  FIX #3679 Error when deleting a Localtax2 special payment


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

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

  Log Message:
  -----------
  FIX #3836 Unable to upload a document to an invoice under some circunstances


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

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

  Log Message:
  -----------
  Removed unwanted change


  Commit: f0a3bca4c205b00d36336063b59ba389480494fe
      
https://github.com/Dolibarr/dolibarr/commit/f0a3bca4c205b00d36336063b59ba389480494fe
  Author: aspangaro <address@hidden>
  Date:   2015-11-08 (Sun, 08 Nov 2015)

  Changed paths:
    M htdocs/accountancy/customer/card.php
    M htdocs/accountancy/customer/list.php
    M htdocs/accountancy/supplier/card.php
    M htdocs/accountancy/supplier/list.php

  Log Message:
  -----------
  Fix: Accountancy compatibility with subtotal & jalon module


  Commit: d69e76168f2e464e831126e5448b3020d1acad04
      
https://github.com/Dolibarr/dolibarr/commit/d69e76168f2e464e831126e5448b3020d1acad04
  Author: Juanjo Menent <address@hidden>
  Date:   2015-11-08 (Sun, 08 Nov 2015)

  Changed paths:
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Merge pull request #3929 from marcosgdf/bug-3928

FIX #3928 Creating a Customer order and a Customer invoice from a project, does 
not inherit payment conditions and method of payment of customer card


  Commit: 0cab08b2f39d35bfd35824ad48dfb3f9983b40e2
      
https://github.com/Dolibarr/dolibarr/commit/0cab08b2f39d35bfd35824ad48dfb3f9983b40e2
  Author: Juanjo Menent <address@hidden>
  Date:   2015-11-08 (Sun, 08 Nov 2015)

  Changed paths:
    M htdocs/societe/rib.php

  Log Message:
  -----------
  Merge pull request #3932 from marcosgdf/bug-3707

FIX #3707 Thirdparty bank account page table has a glitch


  Commit: a6f0baefc108a5a5ec9532750f9abe46897999ba
      
https://github.com/Dolibarr/dolibarr/commit/a6f0baefc108a5a5ec9532750f9abe46897999ba
  Author: Juanjo Menent <address@hidden>
  Date:   2015-11-08 (Sun, 08 Nov 2015)

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

  Log Message:
  -----------
  Merge pull request #3933 from marcosgdf/bug-3980

FIX #3890 Expected transactions bank account page, shows negative numbers


  Commit: 8377d6967ac2cf6878a463c4db3fb2897851a959
      
https://github.com/Dolibarr/dolibarr/commit/8377d6967ac2cf6878a463c4db3fb2897851a959
  Author: Juanjo Menent <address@hidden>
  Date:   2015-11-08 (Sun, 08 Nov 2015)

  Changed paths:
    M htdocs/compta/localtax/card.php

  Log Message:
  -----------
  Merge pull request #3934 from marcosgdf/bug-3679

FIX #3679 Error when deleting a Localtax2 special payment


  Commit: 7673a73a65379f14d862f2bde0921ca68eedb10b
      
https://github.com/Dolibarr/dolibarr/commit/7673a73a65379f14d862f2bde0921ca68eedb10b
  Author: Juanjo Menent <address@hidden>
  Date:   2015-11-08 (Sun, 08 Nov 2015)

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

  Log Message:
  -----------
  Merge pull request #3939 from marcosgdf/bug-3836

FIX #3836 Unable to upload a document to an invoice under some circunstances


  Commit: 0ce7cad48c76373a7fe82574ccb587ac923ac583
      
https://github.com/Dolibarr/dolibarr/commit/0ce7cad48c76373a7fe82574ccb587ac923ac583
  Author: Juanjo Menent <address@hidden>
  Date:   2015-11-08 (Sun, 08 Nov 2015)

  Changed paths:
    M htdocs/accountancy/customer/card.php
    M htdocs/accountancy/customer/list.php
    M htdocs/accountancy/supplier/card.php
    M htdocs/accountancy/supplier/list.php

  Log Message:
  -----------
  Merge pull request #3946 from aspangaro/3.7-1

Fix: Accountancy compatibility with subtotal & jalon module


  Commit: 7a0206adceb3760f867658bff3a0f78bbcdfb3db
      
https://github.com/Dolibarr/dolibarr/commit/7a0206adceb3760f867658bff3a0f78bbcdfb3db
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-08 (Sun, 08 Nov 2015)

  Changed paths:
    M htdocs/commande/class/commande.class.php
    M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php

  Log Message:
  -----------
  FIX Missing to set context into workflow actions, so triggers can't know
we are creating an invoice from order or an order from a proposal.


  Commit: e6ab6bdb8e63b91058e489fae84551acd40819e4
      
https://github.com/Dolibarr/dolibarr/commit/e6ab6bdb8e63b91058e489fae84551acd40819e4
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-08 (Sun, 08 Nov 2015)

  Changed paths:
    M htdocs/accountancy/customer/card.php
    M htdocs/accountancy/customer/list.php
    M htdocs/accountancy/supplier/card.php
    M htdocs/accountancy/supplier/list.php
    M htdocs/compta/facture.php
    M htdocs/compta/localtax/card.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/tpl/document_actions_post_headers.tpl.php
    M htdocs/societe/rib.php

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


  Commit: c639e820621cfe675cea540f443fc007f3972009
      
https://github.com/Dolibarr/dolibarr/commit/c639e820621cfe675cea540f443fc007f3972009
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-08 (Sun, 08 Nov 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  FIX Add a protection to not make release if ChangeLog was not generated.

Conflicts:
        ChangeLog


  Commit: 9b8bb114cd1850ceaf198ed840c40beeb1c0ba6e
      
https://github.com/Dolibarr/dolibarr/commit/9b8bb114cd1850ceaf198ed840c40beeb1c0ba6e
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-08 (Sun, 08 Nov 2015)

  Changed paths:
    M ChangeLog
    M build/makepack-dolibarr.pl

  Log Message:
  -----------
  FIX Add a protection to not make release if ChangeLog was not generated.
Prepare package 3.7.2

Conflicts:
        ChangeLog


  Commit: 04aba8ce96807bf7856d263379fc911227e7660f
      
https://github.com/Dolibarr/dolibarr/commit/04aba8ce96807bf7856d263379fc911227e7660f
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-08 (Sun, 08 Nov 2015)

  Changed paths:
    M build/makepack-dolibarr.pl

  Log Message:
  -----------
  Abandon package APS. Was never used.


  Commit: d4aeb8b3bcea0e212de82f2ade1070f56a262088
      
https://github.com/Dolibarr/dolibarr/commit/d4aeb8b3bcea0e212de82f2ade1070f56a262088
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-08 (Sun, 08 Nov 2015)

  Changed paths:
    M build/makepack-dolibarr.pl

  Log Message:
  -----------
  Abandon package APS. Was never used.


  Commit: 722a133b314807bd08b9a0d59c0614f6b0599d7f
      
https://github.com/Dolibarr/dolibarr/commit/722a133b314807bd08b9a0d59c0614f6b0599d7f
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-08 (Sun, 08 Nov 2015)

  Changed paths:
    M ChangeLog
    M build/makepack-dolibarr.pl

  Log Message:
  -----------
  FIX Add a protection to not make release if ChangeLog was not generated.
Prepare package 3.6.5

Conflicts:
        ChangeLog

Conflicts:
        ChangeLog


  Commit: 350345eccaa70ac932f7ddaa94e6f217f01bef6e
      
https://github.com/Dolibarr/dolibarr/commit/350345eccaa70ac932f7ddaa94e6f217f01bef6e
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-08 (Sun, 08 Nov 2015)

  Changed paths:
    M build/debian/changelog

  Log Message:
  -----------
  Prepare 3.6.5


  Commit: 52bd90f950c8b684a9af8d66325edbd39bb2773a
      
https://github.com/Dolibarr/dolibarr/commit/52bd90f950c8b684a9af8d66325edbd39bb2773a
  Author: Regis Houssin <address@hidden>
  Date:   2015-11-12 (Thu, 12 Nov 2015)

  Changed paths:
    M htdocs/fichinter/card.php

  Log Message:
  -----------
  Fix: wrong var name


  Commit: f65829ec4242dc17d133d965e8b86201835a6c15
      
https://github.com/Dolibarr/dolibarr/commit/f65829ec4242dc17d133d965e8b86201835a6c15
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-12 (Thu, 12 Nov 2015)

  Changed paths:
    M htdocs/fichinter/card.php

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

Fix: wrong var name


  Commit: b3be7f65cd1edd8fd99c652fa8bc53125f9c42d0
      
https://github.com/Dolibarr/dolibarr/commit/b3be7f65cd1edd8fd99c652fa8bc53125f9c42d0
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-13 (Fri, 13 Nov 2015)

  Changed paths:
    M htdocs/accountancy/customer/list.php
    M htdocs/accountancy/supplier/list.php

  Log Message:
  -----------
  Fix syntax error . = instead of .=


  Commit: c7546dbad2909be78e2351acdfa84ff6042fc547
      
https://github.com/Dolibarr/dolibarr/commit/c7546dbad2909be78e2351acdfa84ff6042fc547
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-13 (Fri, 13 Nov 2015)

  Changed paths:
    M htdocs/fichinter/card.php

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


  Commit: eac80d7db4c5ba141b8e08176b77b3d384005230
      
https://github.com/Dolibarr/dolibarr/commit/eac80d7db4c5ba141b8e08176b77b3d384005230
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-13 (Fri, 13 Nov 2015)

  Changed paths:
    M ChangeLog
    M htdocs/commande/card.php
    M htdocs/compta/bank/treso.php
    M htdocs/compta/facture.php
    M htdocs/expedition/class/expedition.class.php

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

Conflicts:
        ChangeLog
        build/debian/changelog
        htdocs/commande/fiche.php
        htdocs/compta/facture.php


  Commit: bad28c6d921949da1ff7772a076d56999942e419
      
https://github.com/Dolibarr/dolibarr/commit/bad28c6d921949da1ff7772a076d56999942e419
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-13 (Fri, 13 Nov 2015)

  Changed paths:
    M htdocs/commande/card.php

  Log Message:
  -----------
  Fi sntax error


  Commit: 599e796aae0f74721d6589e9c33b326445eb6b4a
      
https://github.com/Dolibarr/dolibarr/commit/599e796aae0f74721d6589e9c33b326445eb6b4a
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-13 (Fri, 13 Nov 2015)

  Changed paths:
    M ChangeLog
    M build/makepack-dolibarr.pl
    M htdocs/accountancy/customer/card.php
    M htdocs/accountancy/customer/list.php
    M htdocs/accountancy/supplier/card.php
    M htdocs/accountancy/supplier/list.php
    M htdocs/adherents/admin/public.php
    M htdocs/adherents/card.php
    M htdocs/adherents/type.php
    M htdocs/admin/dict.php
    M htdocs/cashdesk/admin/cashdesk.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/action/card.php
    M htdocs/comm/mailing/list.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/card.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/bank/releve.php
    M htdocs/compta/bank/treso.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/localtax/card.php
    M htdocs/compta/stats/index.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/notify.class.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/memory.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/lib/tax.lib.php
    M htdocs/core/modules/import/import_csv.modules.php
    M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
    M htdocs/core/tpl/document_actions_post_headers.tpl.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fichinter/card.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/commande/orderstoinvoice.php
    M htdocs/livraison/card.php
    M htdocs/opensurvey/card.php
    M htdocs/product/composition/card.php
    M htdocs/product/index.php
    M htdocs/product/stats/commande.php
    M htdocs/product/stats/commande_fournisseur.php
    M htdocs/product/stats/facture.php
    M htdocs/product/stats/facture_fournisseur.php
    M htdocs/product/stats/propal.php
    M htdocs/product/stock/class/entrepot.class.php
    M htdocs/product/stock/product.php
    M htdocs/product/stock/valo.php
    M htdocs/projet/note.php
    M htdocs/public/members/new.php
    M htdocs/societe/canvas/company/tpl/card_view.tpl.php
    M htdocs/societe/canvas/individual/tpl/card_view.tpl.php
    M htdocs/societe/rib.php
    M htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
    M htdocs/webservices/demo_wsclient_category.php-NORUN
    M htdocs/webservices/demo_wsclient_invoice.php-NORUN
    M htdocs/webservices/demo_wsclient_other.php-NORUN
    M htdocs/webservices/demo_wsclient_productorservice.php-NORUN
    M htdocs/webservices/demo_wsclient_thirdparty.php-NORUN
    M scripts/contracts/email_expire_services_to_representatives.php
    M scripts/invoices/email_unpaid_invoices_to_representatives.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/2c87c2e0db71...599e796aae0f
reply via email to
[Prev in Thread] Current Thread [Next in Thread]