[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: |
Sun, 25 Oct 2015 13:12:10 -0700 |
Branch: refs/heads/3.6_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: 453ed8a05e757cfc38d308abe8d8c9da526738a1
https://github.com/Dolibarr/dolibarr/commit/453ed8a05e757cfc38d308abe8d8c9da526738a1
Author: Alexis ALGOUD <address@hidden>
Date: 2015-09-28 (Mon, 28 Sep 2015)
Changed paths:
M htdocs/core/lib/security.lib.php
Log Message:
-----------
FIX error in SQL due to a previous fix
Commit: 0b7305d21a6053f3c5d57593ed16fa01f05c69e1
https://github.com/Dolibarr/dolibarr/commit/0b7305d21a6053f3c5d57593ed16fa01f05c69e1
Author: arnaud <address@hidden>
Date: 2015-09-28 (Mon, 28 Sep 2015)
Changed paths:
M htdocs/compta/facture/class/facturestats.class.php
Log Message:
-----------
FIX facturestat bad sql when customer view is limited
Commit: 34adc60d267a39c596eef3dffdb3a91723ab3dd3
https://github.com/Dolibarr/dolibarr/commit/34adc60d267a39c596eef3dffdb3a91723ab3dd3
Author: Laurent Destailleur <address@hidden>
Date: 2015-10-01 (Thu, 01 Oct 2015)
Changed paths:
M htdocs/core/lib/security.lib.php
Log Message:
-----------
Merge pull request #3618 from
atm-alexis/fix_event_for_user_restricted_if_no_company
FIX error in SQL due to a previous fix
Commit: 1907e5da545e55ea8b0d7a397c95b457f5b234d4
https://github.com/Dolibarr/dolibarr/commit/1907e5da545e55ea8b0d7a397c95b457f5b234d4
Author: Laurent Destailleur <address@hidden>
Date: 2015-10-01 (Thu, 01 Oct 2015)
Changed paths:
M htdocs/compta/facture/class/facturestats.class.php
Log Message:
-----------
Merge pull request #3619 from atm-arnaud/3.6_fix_facturestat
FIX facturestat bad sql when customer view is limited
Commit: 4da8fb901b0d28385fb5f94dd52f412b8c1e15fe
https://github.com/Dolibarr/dolibarr/commit/4da8fb901b0d28385fb5f94dd52f412b8c1e15fe
Author: Laurent Destailleur <address@hidden>
Date: 2015-10-01 (Thu, 01 Oct 2015)
Changed paths:
M htdocs/comm/propal/class/propalestats.class.php
M htdocs/commande/class/commandestats.class.php
M htdocs/compta/facture/class/facturestats.class.php
Log Message:
-----------
Add comment
Commit: 72c31c0fa9b63934bc37c96396a05d3795b35214
https://github.com/Dolibarr/dolibarr/commit/72c31c0fa9b63934bc37c96396a05d3795b35214
Author: Laurent Destailleur <address@hidden>
Date: 2015-10-01 (Thu, 01 Oct 2015)
Changed paths:
M htdocs/compta/facture/class/facturestats.class.php
M htdocs/core/lib/security.lib.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
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: 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: 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: 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: 0b5188db6547094cd72b0cbb64ae940e09bd9983
https://github.com/Dolibarr/dolibarr/commit/0b5188db6547094cd72b0cbb64ae940e09bd9983
Author: Laurent Destailleur <address@hidden>
Date: 2015-10-25 (Sun, 25 Oct 2015)
Changed paths:
M ChangeLog
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/propal/class/propalestats.class.php
M htdocs/commande/class/commandestats.class.php
M htdocs/compta/facture/class/facturestats.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/lib/security.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.6_backported
Compare:
https://github.com/Dolibarr/dolibarr/compare/657a78ebe9f4...0b5188db6547