[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, 16 Oct 2015 00:57:21 -0700 |
Branch: refs/heads/3.8
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: 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: 8a02c8288b0bcf1c34365231505f949d0714586d
https://github.com/Dolibarr/dolibarr/commit/8a02c8288b0bcf1c34365231505f949d0714586d
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.7' into 3.8
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/product/index.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/e79fe7401fc6...8a02c8288b0b