[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 444fce: Prepare 3.7.4
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 444fce: Prepare 3.7.4 |
|
Date: |
Fri, 25 Mar 2016 10:15:56 -0700 |
Branch: refs/heads/3.9_backported
Home: https://github.com/Dolibarr/dolibarr
Commit: 444fce0bd9ccecef83a3dbbb8ed2704efcbd264d
https://github.com/Dolibarr/dolibarr/commit/444fce0bd9ccecef83a3dbbb8ed2704efcbd264d
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-11 (Fri, 11 Mar 2016)
Changed paths:
M ChangeLog
M htdocs/filefunc.inc.php
Log Message:
-----------
Prepare 3.7.4
Commit: 08c5fd2e36af5b7b775cd7a73a35f914d58acee4
https://github.com/Dolibarr/dolibarr/commit/08c5fd2e36af5b7b775cd7a73a35f914d58acee4
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-14 (Mon, 14 Mar 2016)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
FIX #4809 - Duplicate functions with different content
Commit: aa7eb4935c5d4c60a115408d4ca64501e5968fcd
https://github.com/Dolibarr/dolibarr/commit/aa7eb4935c5d4c60a115408d4ca64501e5968fcd
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-17 (Thu, 17 Mar 2016)
Changed paths:
M htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
Log Message:
-----------
FIX VAT rate can be negative. Example spain selling to morroco.
Commit: 19e3c1b0894102ca8f3933894d5d23457bc591d2
https://github.com/Dolibarr/dolibarr/commit/19e3c1b0894102ca8f3933894d5d23457bc591d2
Author: Alexis Algoud <address@hidden>
Date: 2016-03-17 (Thu, 17 Mar 2016)
Changed paths:
M htdocs/product/ajax/products.php
Log Message:
-----------
FIX finished parameters not used
Commit: b023aa317f2e79112c5f73220068867692a5169c
https://github.com/Dolibarr/dolibarr/commit/b023aa317f2e79112c5f73220068867692a5169c
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-18 (Fri, 18 Mar 2016)
Changed paths:
M htdocs/product/ajax/products.php
Log Message:
-----------
Merge pull request #4840 from atm-alexis/3.8_FIX_finished_param_not_use
FIX finished parameters not used
Commit: 7fa71214bce679371cbcea7faf3a3fa1cc9cf793
https://github.com/Dolibarr/dolibarr/commit/7fa71214bce679371cbcea7faf3a3fa1cc9cf793
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-18 (Fri, 18 Mar 2016)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/product/ajax/products.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
htdocs/core/modules/commande/doc/pdf_proforma.modules.php
Commit: 5edeeae38487387637c95f4045bd29360fbc3986
https://github.com/Dolibarr/dolibarr/commit/5edeeae38487387637c95f4045bd29360fbc3986
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-18 (Fri, 18 Mar 2016)
Changed paths:
M htdocs/core/lib/functions.lib.php
M htdocs/langs/en_US/errors.lang
M htdocs/user/card.php
Log Message:
-----------
FIX Bad error and style message when changing its own login
Commit: c5e744bfc2f8c54a1b79567e0c901c835b32c317
https://github.com/Dolibarr/dolibarr/commit/c5e744bfc2f8c54a1b79567e0c901c835b32c317
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-18 (Fri, 18 Mar 2016)
Changed paths:
M htdocs/compta/bank/search.php
Log Message:
-----------
FIX #4839
Commit: 875f4023de7540af17118399e3baabfcfb2d5079
https://github.com/Dolibarr/dolibarr/commit/875f4023de7540af17118399e3baabfcfb2d5079
Author: Juanjo Menent <address@hidden>
Date: 2016-03-18 (Fri, 18 Mar 2016)
Changed paths:
M htdocs/societe/soc.php
Log Message:
-----------
FIX: Can not select a commercial on the creation of a third
Commit: fb625f0ca71f75d03e187be490dcda8fc95f0855
https://github.com/Dolibarr/dolibarr/commit/fb625f0ca71f75d03e187be490dcda8fc95f0855
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-18 (Fri, 18 Mar 2016)
Changed paths:
M htdocs/contact/list.php
M htdocs/product/list.php
M htdocs/societe/list.php
M htdocs/user/index.php
Log Message:
-----------
FIX #4812
Commit: 227e27bf4a9a0f17db8db8b0d53f6f409e03a534
https://github.com/Dolibarr/dolibarr/commit/227e27bf4a9a0f17db8db8b0d53f6f409e03a534
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-18 (Fri, 18 Mar 2016)
Changed paths:
M htdocs/societe/soc.php
Log Message:
-----------
Merge pull request #4845 from simnandez/3.9
FIX: Can not select a commercial on the creation of a third
Commit: 6f8200893bea5f51262cda805e2201f828e0aaeb
https://github.com/Dolibarr/dolibarr/commit/6f8200893bea5f51262cda805e2201f828e0aaeb
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-18 (Fri, 18 Mar 2016)
Changed paths:
M htdocs/projet/admin/project.php
Log Message:
-----------
FIX #4784
Commit: bc377258e1f630251a6a9db195ebc4459f4fcc97
https://github.com/Dolibarr/dolibarr/commit/bc377258e1f630251a6a9db195ebc4459f4fcc97
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-18 (Fri, 18 Mar 2016)
Changed paths:
M htdocs/societe/soc.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: 31fa9221dd37455d51e704b831505c96c241726c
https://github.com/Dolibarr/dolibarr/commit/31fa9221dd37455d51e704b831505c96c241726c
Author: Josep Lluís <address@hidden>
Date: 2016-03-18 (Fri, 18 Mar 2016)
Changed paths:
M htdocs/contact/list.php
Log Message:
-----------
Change of wrong key "Firsname" translation
Change of wrong key "Firsname" to "Firstname" for translation
Commit: c0cd4cec230c3bbe5f5616713e1f9dd61683ff93
https://github.com/Dolibarr/dolibarr/commit/c0cd4cec230c3bbe5f5616713e1f9dd61683ff93
Author: Juanjo Menent <address@hidden>
Date: 2016-03-18 (Fri, 18 Mar 2016)
Changed paths:
M htdocs/contact/list.php
Log Message:
-----------
Merge pull request #4847 from joseplluis/patch-1
Fix: Change of wrong key "Firsname" translation
Commit: b4e775dd351e058feb0ff820027d33709a1d259b
https://github.com/Dolibarr/dolibarr/commit/b4e775dd351e058feb0ff820027d33709a1d259b
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-18 (Fri, 18 Mar 2016)
Changed paths:
M htdocs/compta/tva/card.php
Log Message:
-----------
FIX Parsing of amount to pay vat
Commit: 101e5ae4c6dfde54aff5ef05b7ec9c522cd57999
https://github.com/Dolibarr/dolibarr/commit/101e5ae4c6dfde54aff5ef05b7ec9c522cd57999
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-18 (Fri, 18 Mar 2016)
Changed paths:
M htdocs/contact/list.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: f0eb8ac79467e34cb4ab5e3534a4b51b5c890941
https://github.com/Dolibarr/dolibarr/commit/f0eb8ac79467e34cb4ab5e3534a4b51b5c890941
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-19 (Sat, 19 Mar 2016)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Fix regression Product ref not visible
Commit: d09faadc248ad15f24b7a221b5ebd238632a7931
https://github.com/Dolibarr/dolibarr/commit/d09faadc248ad15f24b7a221b5ebd238632a7931
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-19 (Sat, 19 Mar 2016)
Changed paths:
M htdocs/product/ajax/products.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 4436ec954fe50f3e3a203e71b990910f318ead2a
https://github.com/Dolibarr/dolibarr/commit/4436ec954fe50f3e3a203e71b990910f318ead2a
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-19 (Sat, 19 Mar 2016)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into 3.9
Commit: 660f825a3465874bea3df3a119d35cd4adeb1d24
https://github.com/Dolibarr/dolibarr/commit/660f825a3465874bea3df3a119d35cd4adeb1d24
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-19 (Sat, 19 Mar 2016)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Fix regression description line not visible
Commit: ee857055be6c6296af340edf4d57e8b916855ebc
https://github.com/Dolibarr/dolibarr/commit/ee857055be6c6296af340edf4d57e8b916855ebc
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-19 (Sat, 19 Mar 2016)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into 3.9
Commit: af3256f84a7022e83d4bd8c90cb46e4590c37f99
https://github.com/Dolibarr/dolibarr/commit/af3256f84a7022e83d4bd8c90cb46e4590c37f99
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-19 (Sat, 19 Mar 2016)
Changed paths:
M htdocs/cashdesk/affContenu.php
M htdocs/cashdesk/affIndex.php
M htdocs/cashdesk/class/Facturation.class.php
M htdocs/cashdesk/facturation_verif.php
M htdocs/cashdesk/index_verif.php
M htdocs/cashdesk/tpl/facturation1.tpl.php
M htdocs/cashdesk/tpl/menu.tpl.php
M htdocs/cashdesk/tpl/validation1.tpl.php
M htdocs/cashdesk/validation_verif.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Fix first change to fix serious pb with vat definition when using the
POS.
Commit: 6b821f15d1c9fd3bec1546700cc1f587c363fed1
https://github.com/Dolibarr/dolibarr/commit/6b821f15d1c9fd3bec1546700cc1f587c363fed1
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-20 (Sun, 20 Mar 2016)
Changed paths:
M htdocs/cashdesk/class/Facturation.class.php
M htdocs/cashdesk/validation_verif.php
M htdocs/core/lib/price.lib.php
Log Message:
-----------
FIX Bad vat definition when using POS module
Commit: 706a7f05b89bba2771016cfe0a2c18d9c5e286f2
https://github.com/Dolibarr/dolibarr/commit/706a7f05b89bba2771016cfe0a2c18d9c5e286f2
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-20 (Sun, 20 Mar 2016)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
FIX PHPCS
Commit: 99ceb006e444e2591a68e91d809f5764c968ec82
https://github.com/Dolibarr/dolibarr/commit/99ceb006e444e2591a68e91d809f5764c968ec82
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-21 (Mon, 21 Mar 2016)
Changed paths:
M htdocs/projet/class/project.class.php
Log Message:
-----------
FIX Bad include and param for project numbering module call
Commit: 876484dfb565e9284a2645e4b7e6c5bb209494e7
https://github.com/Dolibarr/dolibarr/commit/876484dfb565e9284a2645e4b7e6c5bb209494e7
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-22 (Tue, 22 Mar 2016)
Changed paths:
M htdocs/core/modules/modCommande.class.php
Log Message:
-----------
FIX Duplicate records into export
Commit: 4f3f1eda7b51ae72bbda68db496804964cd493a7
https://github.com/Dolibarr/dolibarr/commit/4f3f1eda7b51ae72bbda68db496804964cd493a7
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-22 (Tue, 22 Mar 2016)
Changed paths:
M htdocs/core/modules/modPropale.class.php
Log Message:
-----------
FIX Duplicate records into export
Commit: 8189a5eadd1c81618cfa2799ec202915d64a42a5
https://github.com/Dolibarr/dolibarr/commit/8189a5eadd1c81618cfa2799ec202915d64a42a5
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-22 (Tue, 22 Mar 2016)
Changed paths:
M htdocs/projet/class/project.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into 3.9
Commit: 20d785ad28e92230bdc61295f06d5787ff3e21c8
https://github.com/Dolibarr/dolibarr/commit/20d785ad28e92230bdc61295f06d5787ff3e21c8
Author: Regis Houssin <address@hidden>
Date: 2016-03-23 (Wed, 23 Mar 2016)
Changed paths:
M ChangeLog
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8_fix_merge
Conflicts:
htdocs/filefunc.inc.php
Commit: 52d88db5c3e9565fa4a3074ef9353916c81bb293
https://github.com/Dolibarr/dolibarr/commit/52d88db5c3e9565fa4a3074ef9353916c81bb293
Author: fmarcet <address@hidden>
Date: 2016-03-23 (Wed, 23 Mar 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: Email templates not compatible with Multicompany
Conflicts:
htdocs/admin/dict.php
Commit: e2b4d39292de9daf9f65489faa6d951e7239acb0
https://github.com/Dolibarr/dolibarr/commit/e2b4d39292de9daf9f65489faa6d951e7239acb0
Author: fmarcet <address@hidden>
Date: 2016-03-23 (Wed, 23 Mar 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: Email templates not compatible with Multicompany
Conflicts:
htdocs/admin/dict.php
Commit: 84e5c8b437ebeee7afea8f9c609eb457ba4b876f
https://github.com/Dolibarr/dolibarr/commit/84e5c8b437ebeee7afea8f9c609eb457ba4b876f
Author: fmarcet <address@hidden>
Date: 2016-03-23 (Wed, 23 Mar 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: Email templates not compatible with Multicompany
Conflicts:
htdocs/admin/dict.php
Commit: b8bc881e5af2a40702901fa42905de07a16ef808
https://github.com/Dolibarr/dolibarr/commit/b8bc881e5af2a40702901fa42905de07a16ef808
Author: fmarcet <address@hidden>
Date: 2016-03-23 (Wed, 23 Mar 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: Email templates not compatible with Multicompany
Conflicts:
htdocs/admin/dict.php
Commit: b38e75c404f8d3ae69e8a3ff3d3aa6d26ef3cf7d
https://github.com/Dolibarr/dolibarr/commit/b38e75c404f8d3ae69e8a3ff3d3aa6d26ef3cf7d
Author: Regis Houssin <address@hidden>
Date: 2016-03-23 (Wed, 23 Mar 2016)
Changed paths:
M ChangeLog
M htdocs/admin/dict.php
Log Message:
-----------
Merge branch '3.8_fix_merge' into 3.9_fix_merge
Commit: 6efae723f5cd748e8a927c41f7e5746d9d7f370f
https://github.com/Dolibarr/dolibarr/commit/6efae723f5cd748e8a927c41f7e5746d9d7f370f
Author: Juanjo Menent <address@hidden>
Date: 2016-03-23 (Wed, 23 Mar 2016)
Changed paths:
M ChangeLog
M htdocs/admin/dict.php
Log Message:
-----------
Merge pull request #4882 from hregis/3.9_fix_merge
Fix: 3.8-3.9 fix merge
Commit: 192623c58ca6b7b2bbedb57ed4bfb36ee43ebd15
https://github.com/Dolibarr/dolibarr/commit/192623c58ca6b7b2bbedb57ed4bfb36ee43ebd15
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-25 (Fri, 25 Mar 2016)
Changed paths:
M ChangeLog
M htdocs/admin/dict.php
M htdocs/cashdesk/affContenu.php
M htdocs/cashdesk/affIndex.php
M htdocs/cashdesk/class/Facturation.class.php
M htdocs/cashdesk/facturation_verif.php
M htdocs/cashdesk/index_verif.php
M htdocs/cashdesk/tpl/facturation1.tpl.php
M htdocs/cashdesk/tpl/menu.tpl.php
M htdocs/cashdesk/tpl/validation1.tpl.php
M htdocs/cashdesk/validation_verif.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/search.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/tva/card.php
M htdocs/contact/list.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/price.lib.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/langs/en_US/errors.lang
M htdocs/product/ajax/products.php
M htdocs/product/list.php
M htdocs/projet/admin/project.php
M htdocs/projet/class/project.class.php
M htdocs/societe/list.php
M htdocs/societe/soc.php
M htdocs/user/card.php
M htdocs/user/index.php
Log Message:
-----------
Merge pull request #4892 from hregis/3.9_backported
Fix: merge 3.9 -> 3.9 backported
Compare:
https://github.com/Dolibarr/dolibarr/compare/e9abdb54fb2f...192623c58ca6