[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 3940ab: FIX: select DISTINCT for natu
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 3940ab: FIX: select DISTINCT for natural search on proposa... |
Date: |
Sat, 16 May 2015 07:42:12 -0700 |
Branch: refs/heads/3.5_backported
Home: https://github.com/Dolibarr/dolibarr
Commit: 3940abe7c19744764df53eeb31f758a2f9e92dc2
https://github.com/Dolibarr/dolibarr/commit/3940abe7c19744764df53eeb31f758a2f9e92dc2
Author: Christophe Battarel <address@hidden>
Date: 2015-02-07 (Sat, 07 Feb 2015)
Changed paths:
M htdocs/comm/propal/list.php
Log Message:
-----------
FIX: select DISTINCT for natural search on proposal list (in the same
way it's done in invoices list)
Commit: 7dea799a9e158bbf5bf739b3d565c763158c2bdf
https://github.com/Dolibarr/dolibarr/commit/7dea799a9e158bbf5bf739b3d565c763158c2bdf
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-02-10 (Tue, 10 Feb 2015)
Changed paths:
M htdocs/core/modules/societe/mod_codecompta_aquarium.php
M htdocs/societe/admin/societe.php
Log Message:
-----------
FIXED Allowed 0 to be used as an account mask
0 is used by some accounting systems and software.
Commit: 6f08893016977a6a4b767bde1bb4259df72af562
https://github.com/Dolibarr/dolibarr/commit/6f08893016977a6a4b767bde1bb4259df72af562
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-02-16 (Mon, 16 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Fix: [ bug #1846 ] Browser IE11 not detected
Commit: 3efb737cbf685501752a6c69131b8d79cf07bbde
https://github.com/Dolibarr/dolibarr/commit/3efb737cbf685501752a6c69131b8d79cf07bbde
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-02-16 (Mon, 16 Feb 2015)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Fix: [ bug #1845 ] Undefined "$conf->browser->ie" var in "functions.lib.php"
Commit: 9f8bee35016fdb80af98f8bfba09ea7e2ab4d10a
https://github.com/Dolibarr/dolibarr/commit/9f8bee35016fdb80af98f8bfba09ea7e2ab4d10a
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M htdocs/comm/propal/list.php
Log Message:
-----------
Merge pull request #2331 from altatof/fix_natural_search
FIX: select DISTINCT for natural search on proposal list (in the same way it's
done in invoices list)
Commit: d549c00b2e0ba14e957130ffce5a794b5e171667
https://github.com/Dolibarr/dolibarr/commit/d549c00b2e0ba14e957130ffce5a794b5e171667
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-20 (Fri, 20 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Merge pull request #2365 from marcosgdf/3.5
Fix: [ bug #1846 ] Browser IE11 not detected
Commit: da042c16771ffd205f2c97f831223b51514862ef
https://github.com/Dolibarr/dolibarr/commit/da042c16771ffd205f2c97f831223b51514862ef
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-14 (Sat, 14 Mar 2015)
Changed paths:
M htdocs/core/modules/societe/mod_codecompta_aquarium.php
M htdocs/societe/admin/societe.php
Log Message:
-----------
Merge pull request #2318 from GPCsolutions/3.5-accountingmask
FIXED Allowed 0 to be used as an account mask
Commit: 4a9a3ab04ba396128ed392a83fb9b9916186781b
https://github.com/Dolibarr/dolibarr/commit/4a9a3ab04ba396128ed392a83fb9b9916186781b
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-14 (Sat, 14 Mar 2015)
Changed paths:
M htdocs/core/modules/societe/mod_codecompta_aquarium.php
M htdocs/societe/admin/societe.php
Log Message:
-----------
Revert "FIXED Allowed 0 to be used as an account mask"
Commit: da72cf387b91a96c0a04689f4d8ef2630c3b8308
https://github.com/Dolibarr/dolibarr/commit/da72cf387b91a96c0a04689f4d8ef2630c3b8308
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-14 (Sat, 14 Mar 2015)
Changed paths:
M htdocs/core/modules/societe/mod_codecompta_aquarium.php
M htdocs/societe/admin/societe.php
Log Message:
-----------
Merge pull request #2451 from Dolibarr/revert-2318-3.5-accountingmask
Revert "FIXED Allowed 0 to be used as an account mask"
Commit: 89b22be063b2c1f2b032e3e9a7b416cfa3c11859
https://github.com/Dolibarr/dolibarr/commit/89b22be063b2c1f2b032e3e9a7b416cfa3c11859
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-14 (Sat, 14 Mar 2015)
Changed paths:
M htdocs/core/modules/societe/mod_codecompta_aquarium.php
Log Message:
-----------
FIXED: Allowed 0 to be used as an account mask. Required by CEGID.
Commit: a9eebb33fdedf7759c714e6ec4f1e13ff43ecab7
https://github.com/Dolibarr/dolibarr/commit/a9eebb33fdedf7759c714e6ec4f1e13ff43ecab7
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-14 (Sat, 14 Mar 2015)
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Commit: 728b64e334dc999fa965d61e2cfe1c4e65bd8747
https://github.com/Dolibarr/dolibarr/commit/728b64e334dc999fa965d61e2cfe1c4e65bd8747
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-04-12 (Sun, 12 Apr 2015)
Changed paths:
M ChangeLog
M htdocs/compta/bank/virement.php
Log Message:
-----------
Fix Bug #2583: Unable to create a bank transfer with localized numbers
Commit: bbd01c0c8d0f238a642e26b5078d593571670879
https://github.com/Dolibarr/dolibarr/commit/bbd01c0c8d0f238a642e26b5078d593571670879
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-04-12 (Sun, 12 Apr 2015)
Changed paths:
M ChangeLog
M htdocs/projet/element.php
Log Message:
-----------
Fix: Bug #2577 Incorrect invoice status in "Linked objects" page of a project
Commit: 9cfb295675bebb049bbc367e902c571f1b9a27c6
https://github.com/Dolibarr/dolibarr/commit/9cfb295675bebb049bbc367e902c571f1b9a27c6
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-04-12 (Sun, 12 Apr 2015)
Changed paths:
M ChangeLog
M htdocs/admin/dict.php
Log Message:
-----------
Fix: Bug #2576 Unable to edit a dictionary entry that has # in its ref
Commit: 6173706531ac4a19e0c5b66d3f066e6b98cc2c8a
https://github.com/Dolibarr/dolibarr/commit/6173706531ac4a19e0c5b66d3f066e6b98cc2c8a
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-04-12 (Sun, 12 Apr 2015)
Changed paths:
M ChangeLog
M htdocs/compta/deplacement/fiche.php
Log Message:
-----------
Fix: [ bug #1906 ] Deplacement does not allow translated decimal format
Commit: 8f0c41dbd21e48fa61164a6794958a7ad6c1e752
https://github.com/Dolibarr/dolibarr/commit/8f0c41dbd21e48fa61164a6794958a7ad6c1e752
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-04-12 (Sun, 12 Apr 2015)
Changed paths:
M ChangeLog
M htdocs/compta/deplacement/fiche.php
Log Message:
-----------
Fix: [ bug #1905 ] Custom deplacement types do not get translated in
deplacement card
Commit: c0ddfbfab7690d15303039f653b86c7055794246
https://github.com/Dolibarr/dolibarr/commit/c0ddfbfab7690d15303039f653b86c7055794246
Author: Laurent Destailleur <address@hidden>
Date: 2015-04-13 (Mon, 13 Apr 2015)
Changed paths:
M ChangeLog
M htdocs/compta/deplacement/fiche.php
Log Message:
-----------
Merge pull request #2597 from marcosgdf/bug-1906
Fixes for bugs #1906 and #1905
Commit: 2b8efc302a173e57138e5be6c9de2af57b9838c8
https://github.com/Dolibarr/dolibarr/commit/2b8efc302a173e57138e5be6c9de2af57b9838c8
Author: Maxime Kohlhaas <address@hidden>
Date: 2015-04-18 (Sat, 18 Apr 2015)
Changed paths:
M htdocs/expedition/class/expedition.class.php
M htdocs/expedition/fiche.php
Log Message:
-----------
Fix : shipment model selection
Commit: 0000043c96973fbaa216a096849b0545417cfa83
https://github.com/Dolibarr/dolibarr/commit/0000043c96973fbaa216a096849b0545417cfa83
Author: Laurent Destailleur <address@hidden>
Date: 2015-04-18 (Sat, 18 Apr 2015)
Changed paths:
M htdocs/expedition/class/expedition.class.php
M htdocs/expedition/fiche.php
Log Message:
-----------
Merge pull request #2629 from atm-maxime/3.5_fix_shipment_model
Fix : shipment model selection
Commit: 9b69b64626a962c55f4df47f1cd5e8c821c0f4ad
https://github.com/Dolibarr/dolibarr/commit/9b69b64626a962c55f4df47f1cd5e8c821c0f4ad
Author: Laurent Destailleur <address@hidden>
Date: 2015-04-18 (Sat, 18 Apr 2015)
Changed paths:
M ChangeLog
M htdocs/compta/bank/virement.php
Log Message:
-----------
Merge branch 'bug-2583' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-2583
Conflicts:
ChangeLog
Commit: b75722d450c78fdf86f704370e873294fa7378ca
https://github.com/Dolibarr/dolibarr/commit/b75722d450c78fdf86f704370e873294fa7378ca
Author: Laurent Destailleur <address@hidden>
Date: 2015-04-18 (Sat, 18 Apr 2015)
Changed paths:
M ChangeLog
M htdocs/compta/bank/virement.php
Log Message:
-----------
git push origin 3.5Merge branch 'marcosgdf-bug-2583' into 3.5
Commit: b7cf0ded002d74d309c2d4293507bf1bfaf51ace
https://github.com/Dolibarr/dolibarr/commit/b7cf0ded002d74d309c2d4293507bf1bfaf51ace
Author: Laurent Destailleur <address@hidden>
Date: 2015-04-18 (Sat, 18 Apr 2015)
Changed paths:
M ChangeLog
M htdocs/projet/element.php
Log Message:
-----------
Merge branch 'bug-2577' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-2577
Conflicts:
ChangeLog
Commit: 5f49b2a9bba08547db25348b59260e4ac029641e
https://github.com/Dolibarr/dolibarr/commit/5f49b2a9bba08547db25348b59260e4ac029641e
Author: Laurent Destailleur <address@hidden>
Date: 2015-04-18 (Sat, 18 Apr 2015)
Changed paths:
M ChangeLog
M htdocs/projet/element.php
Log Message:
-----------
git push origin 3.5Merge branch 'marcosgdf-bug-2577' into 3.5
Commit: ed6abb0f79ade9dcd74e8459909cdf668f50e3f9
https://github.com/Dolibarr/dolibarr/commit/ed6abb0f79ade9dcd74e8459909cdf668f50e3f9
Author: Laurent Destailleur <address@hidden>
Date: 2015-04-18 (Sat, 18 Apr 2015)
Changed paths:
M ChangeLog
M htdocs/admin/dict.php
Log Message:
-----------
Merge branch 'bug-2576' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-2576
Conflicts:
ChangeLog
Commit: 4de4c66bb74bb514129c986e8987f1aab7af9bdb
https://github.com/Dolibarr/dolibarr/commit/4de4c66bb74bb514129c986e8987f1aab7af9bdb
Author: Laurent Destailleur <address@hidden>
Date: 2015-04-18 (Sat, 18 Apr 2015)
Changed paths:
M ChangeLog
M htdocs/admin/dict.php
Log Message:
-----------
git push origin 3.5Merge branch 'marcosgdf-bug-2576' into 3.5
Commit: 37d8dafd4084de854ba66256f40ce2755631a8e9
https://github.com/Dolibarr/dolibarr/commit/37d8dafd4084de854ba66256f40ce2755631a8e9
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-04-18 (Sat, 18 Apr 2015)
Changed paths:
M ChangeLog
M htdocs/compta/bank/virement.php
M htdocs/compta/deplacement/fiche.php
M htdocs/core/modules/societe/mod_codecompta_aquarium.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expedition/fiche.php
M htdocs/projet/element.php
Log Message:
-----------
Merge branch '3.5' into bug-2576
Conflicts:
ChangeLog
Commit: be9ddb7748576aa75beff6988bf43a5dd31655bd
https://github.com/Dolibarr/dolibarr/commit/be9ddb7748576aa75beff6988bf43a5dd31655bd
Author: Laurent Destailleur <address@hidden>
Date: 2015-04-18 (Sat, 18 Apr 2015)
Changed paths:
M ChangeLog
M htdocs/admin/dict.php
Log Message:
-----------
Merge pull request #2595 from marcosgdf/bug-2576
Close #2576 Bug: Unable to edit a dictionary entry that has # in its ref
Commit: b8c512a3d5d0b73fce33933b4c1e6a7b6ab55ce9
https://github.com/Dolibarr/dolibarr/commit/b8c512a3d5d0b73fce33933b4c1e6a7b6ab55ce9
Author: Laurent Destailleur <address@hidden>
Date: 2015-04-18 (Sat, 18 Apr 2015)
Log Message:
-----------
Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5
Commit: f1032baaab0b212af180d4bbc113a254c1adb959
https://github.com/Dolibarr/dolibarr/commit/f1032baaab0b212af180d4bbc113a254c1adb959
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-04-30 (Thu, 30 Apr 2015)
Changed paths:
M htdocs/core/modules/modProjet.class.php
Log Message:
-----------
Allow exporting projects without a third party
FIX #2729
Commit: 6309d2133f17c2dd54cc9ee92e6a25aa58bc5abb
https://github.com/Dolibarr/dolibarr/commit/6309d2133f17c2dd54cc9ee92e6a25aa58bc5abb
Author: Juanjo Menent <address@hidden>
Date: 2015-05-01 (Fri, 01 May 2015)
Changed paths:
M htdocs/core/modules/modProjet.class.php
Log Message:
-----------
Merge pull request #2731 from GPCsolutions/dolibarr-2729
Allow exporting projects without a third party
Commit: f8e8b39ff2b16e08961c5b68deefa8fb97acc295
https://github.com/Dolibarr/dolibarr/commit/f8e8b39ff2b16e08961c5b68deefa8fb97acc295
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-05-10 (Sun, 10 May 2015)
Changed paths:
M ChangeLog
M htdocs/product/class/product.class.php
Log Message:
-----------
FIX #2758 Product::update sets product note to "null" when $prod->note is null
Commit: f6616deef3b74343a5c28adc969540366f1ed878
https://github.com/Dolibarr/dolibarr/commit/f6616deef3b74343a5c28adc969540366f1ed878
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-05-10 (Sun, 10 May 2015)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Removed debugging function
Commit: 5f594d55acb8bd88dd30c4e63cd6a40afc2c0ec3
https://github.com/Dolibarr/dolibarr/commit/5f594d55acb8bd88dd30c4e63cd6a40afc2c0ec3
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-11 (Mon, 11 May 2015)
Changed paths:
M ChangeLog
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge pull request #2805 from marcosgdf/bug-2758
FIX #2758 Product::update sets product note to "null" when $prod->note is null
Commit: ea7eb241e36bd0f732df7466eecbeadbe10074a9
https://github.com/Dolibarr/dolibarr/commit/ea7eb241e36bd0f732df7466eecbeadbe10074a9
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-05-12 (Tue, 12 May 2015)
Changed paths:
M ChangeLog
M htdocs/categories/photos.php
Log Message:
-----------
Close bug #2757 Deleting product category photo gives "Forbidden access" error
Commit: 190f12c4c4b962a14f633e0339b4e476c7446af4
https://github.com/Dolibarr/dolibarr/commit/190f12c4c4b962a14f633e0339b4e476c7446af4
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-05-12 (Tue, 12 May 2015)
Changed paths:
M ChangeLog
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge branch '3.5' into bug-2757
Conflicts:
ChangeLog
Commit: f8e8fe6f34829c3e585c1ed9439ee7c4aa7e1258
https://github.com/Dolibarr/dolibarr/commit/f8e8fe6f34829c3e585c1ed9439ee7c4aa7e1258
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-12 (Tue, 12 May 2015)
Changed paths:
M ChangeLog
M htdocs/categories/photos.php
Log Message:
-----------
Merge pull request #2816 from marcosgdf/bug-2757
Close bug #2757 Deleting product category photo gives "Forbidden access" error
Commit: 80943111cc946c1d2da6320eb12e05c67fd1b3e9
https://github.com/Dolibarr/dolibarr/commit/80943111cc946c1d2da6320eb12e05c67fd1b3e9
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-16 (Sat, 16 May 2015)
Changed paths:
M build/debian/changelog
M build/exe/doliwamp/doliwamp.iss
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
M htdocs/filefunc.inc.php
Log Message:
-----------
Prepare 3.5.7
Commit: 1d8a3809f00261850f993ce77120f765cc42aca7
https://github.com/Dolibarr/dolibarr/commit/1d8a3809f00261850f993ce77120f765cc42aca7
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-16 (Sat, 16 May 2015)
Changed paths:
M ChangeLog
M htdocs/categories/photos.php
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Commit: 4dcdea5219c452e40eb99f75fa0df385c54a9d96
https://github.com/Dolibarr/dolibarr/commit/4dcdea5219c452e40eb99f75fa0df385c54a9d96
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-16 (Sat, 16 May 2015)
Changed paths:
M build/makepack-dolibarr.pl
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
Log Message:
-----------
Prepare package 3.5.7
Removed hardcoded version from rpm spec files, so it will not be
necessary to update this files when making a new release.
Commit: e8fb89f89f2f9be2190f5b4fa8fae7c90a398dc1
https://github.com/Dolibarr/dolibarr/commit/e8fb89f89f2f9be2190f5b4fa8fae7c90a398dc1
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-16 (Sat, 16 May 2015)
Changed paths:
M build/exe/doliwamp/doliwamp.iss
M build/makepack-dolibarr.pl
M build/makepack-howto.txt
Log Message:
-----------
Prepare packaging 3.7
Commit: 9d36f6aa4bc037e92be085af8b8d592ea8bfa28b
https://github.com/Dolibarr/dolibarr/commit/9d36f6aa4bc037e92be085af8b8d592ea8bfa28b
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-16 (Sat, 16 May 2015)
Changed paths:
M ChangeLog
M build/debian/changelog
M build/exe/doliwamp/doliwamp.iss
M build/makepack-dolibarr.pl
M build/makepack-howto.txt
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
M htdocs/admin/dict.php
M htdocs/categories/photos.php
M htdocs/comm/propal/list.php
M htdocs/compta/bank/virement.php
M htdocs/compta/deplacement/fiche.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/modProjet.class.php
M htdocs/core/modules/societe/mod_codecompta_aquarium.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expedition/fiche.php
M htdocs/filefunc.inc.php
M htdocs/product/class/product.class.php
M htdocs/projet/element.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.5_backported
Compare:
https://github.com/Dolibarr/dolibarr/compare/1b5131439d6a...9d36f6aa4bc0
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] 3940ab: FIX: select DISTINCT for natural search on proposa...,
Laurent Destailleur <=