[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: |
Sun, 29 Mar 2015 08:16:57 -0700 |
Branch: refs/heads/3.6_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: db9d727eb8a45aa3aed8cdcf2ed3568476d63733
https://github.com/Dolibarr/dolibarr/commit/db9d727eb8a45aa3aed8cdcf2ed3568476d63733
Author: Maxime Kohlhaas <address@hidden>
Date: 2015-02-08 (Sun, 08 Feb 2015)
Changed paths:
M htdocs/compta/bank/ligne.php
Log Message:
-----------
FIX : Link to user was wrong on bank transaction card
Commit: d9ac21ab822ede55f6090c86c40eb85da1bfa2a7
https://github.com/Dolibarr/dolibarr/commit/d9ac21ab822ede55f6090c86c40eb85da1bfa2a7
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-02-08 (Sun, 08 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/compta/resultat/clientfourn.php
Log Message:
-----------
Fix: [ bug #1822 ] SQL error in clientfourn.php report with PostgreSQL
Commit: 5747dbfe9becec1acc8acbcfd0d2d4c4bcd26b61
https://github.com/Dolibarr/dolibarr/commit/5747dbfe9becec1acc8acbcfd0d2d4c4bcd26b61
Author: Arnaud Aujon Chevallier <address@hidden>
Date: 2015-02-09 (Mon, 09 Feb 2015)
Changed paths:
M htdocs/webservices/server_productorservice.php
Log Message:
-----------
FIXED : product webservice can now save barcode
Commit: 949f9e40a083cda147619fd5b16bda347eef9f1e
https://github.com/Dolibarr/dolibarr/commit/949f9e40a083cda147619fd5b16bda347eef9f1e
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-02-10 (Tue, 10 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Fix: [ bug #1832 ] SQL error when adding a product with no price defined to
an object
Commit: 58a61e129498aeef2512d27351336772f98b4c7b
https://github.com/Dolibarr/dolibarr/commit/58a61e129498aeef2512d27351336772f98b4c7b
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-02-10 (Tue, 10 Feb 2015)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Changed int typecast to float
Commit: a9dc6bb3d7a8797787d2016f0d9413cb2f00172c
https://github.com/Dolibarr/dolibarr/commit/a9dc6bb3d7a8797787d2016f0d9413cb2f00172c
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-02-10 (Tue, 10 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/fourn/facture/paiement.php
Log Message:
-----------
Fix: [ bug #1826 ] Supplier payment types are not translated in
fourn/facture/paiement.php
Commit: f1d5e1ba7b082295c7603b6ff51d2598b50e75ce
https://github.com/Dolibarr/dolibarr/commit/f1d5e1ba7b082295c7603b6ff51d2598b50e75ce
Author: aspangaro <address@hidden>
Date: 2015-02-10 (Tue, 10 Feb 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
FIXED Correct typo on Changelog
Commit: 6531a5c6c7d54ebce2406b697af95dec17391f28
https://github.com/Dolibarr/dolibarr/commit/6531a5c6c7d54ebce2406b697af95dec17391f28
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-02-10 (Tue, 10 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/compta/salaries/fiche.php
Log Message:
-----------
Fix: [ bug #1830 ] Salaries payment only allows checking accounts
Commit: 863c1f7a13cd73b4d1ee56a62ddf3bfc1338ff13
https://github.com/Dolibarr/dolibarr/commit/863c1f7a13cd73b4d1ee56a62ddf3bfc1338ff13
Author: Arnaud Aujon Chevallier <address@hidden>
Date: 2015-02-10 (Tue, 10 Feb 2015)
Changed paths:
M htdocs/webservices/server_order.php
Log Message:
-----------
fix typo in createOrder
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: 6189db677d3d5dec4b44641b1158f032fb36eb62
https://github.com/Dolibarr/dolibarr/commit/6189db677d3d5dec4b44641b1158f032fb36eb62
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-14 (Sat, 14 Feb 2015)
Changed paths:
M build/makepack-dolibarr.pl
Log Message:
-----------
Fix package .exe
Commit: 2c074a94f39d0f1e3c17499b530134d04a88903b
https://github.com/Dolibarr/dolibarr/commit/2c074a94f39d0f1e3c17499b530134d04a88903b
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-02-15 (Sun, 15 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/core/class/html.formmail.class.php
Log Message:
-----------
Fix: [ bug #1790 ] Sending a test mail from admin page, gives "File already
exists" error
Commit: 5db4bb68a43d25dbbe92223d41d3e56fb770da54
https://github.com/Dolibarr/dolibarr/commit/5db4bb68a43d25dbbe92223d41d3e56fb770da54
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-02-15 (Sun, 15 Feb 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
Updated bug name
Commit: 0a81fe667f42219a66201a2e4440a8b8c8336987
https://github.com/Dolibarr/dolibarr/commit/0a81fe667f42219a66201a2e4440a8b8c8336987
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/agenda.lib.php
Log Message:
-----------
Fix: [ bug #1825 ] External agenda: hide/show checkbox doesn't work
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: 0a1ade22c881fc61f8157a74a5572ccb759edbe7
https://github.com/Dolibarr/dolibarr/commit/0a1ade22c881fc61f8157a74a5572ccb759edbe7
Author: Maxime Kohlhaas <address@hidden>
Date: 2015-02-17 (Tue, 17 Feb 2015)
Changed paths:
M build/makepack-dolibarr.pl
M htdocs/core/tpl/objectline_edit.tpl.php
Log Message:
-----------
Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6
Commit: ca64763440fe211117bc546eb27cf50ffdd41f13
https://github.com/Dolibarr/dolibarr/commit/ca64763440fe211117bc546eb27cf50ffdd41f13
Author: braito4 <address@hidden>
Date: 2015-02-17 (Tue, 17 Feb 2015)
Changed paths:
M htdocs/contact/note.php
Log Message:
-----------
Update note.php
Error in the security check
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: 9eb26c66deab15805f77e57d0396a440458d2258
https://github.com/Dolibarr/dolibarr/commit/9eb26c66deab15805f77e57d0396a440458d2258
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M htdocs/compta/bank/ligne.php
Log Message:
-----------
Merge pull request #2336 from atm-maxime/3.6
FIX : Link to user was wrong on bank transaction card
Commit: 89b93648377c6cac9e85f111b0cd6db0836263bd
https://github.com/Dolibarr/dolibarr/commit/89b93648377c6cac9e85f111b0cd6db0836263bd
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/compta/resultat/clientfourn.php
Log Message:
-----------
Merge pull request #2337 from marcosgdf/bug-1822
Fix: [ bug #1822 ] SQL error in clientfourn.php report with PostgreSQL
Commit: 8f339712ab8b58d579751ec0c30d3f5dd4608313
https://github.com/Dolibarr/dolibarr/commit/8f339712ab8b58d579751ec0c30d3f5dd4608313
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M htdocs/webservices/server_productorservice.php
Log Message:
-----------
Merge pull request #2338 from aaujon/3.6-webservice-product-barcode
FIXED : product webservice can now save barcode
Commit: 6d25cf6f6ab835c8547e2e7aa5d45a262de82947
https://github.com/Dolibarr/dolibarr/commit/6d25cf6f6ab835c8547e2e7aa5d45a262de82947
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Merge branch 'bug-1832' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1832
Conflicts:
ChangeLog
Commit: f831bdd2315d9da8039986763ebc880b4bc6a945
https://github.com/Dolibarr/dolibarr/commit/f831bdd2315d9da8039986763ebc880b4bc6a945
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-1832' into 3.6
Commit: fc415fc3c918b83c8cdb256506ace18a1dd6cc12
https://github.com/Dolibarr/dolibarr/commit/fc415fc3c918b83c8cdb256506ace18a1dd6cc12
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/fourn/facture/paiement.php
Log Message:
-----------
Fix: [ bug #1826 ] Supplier payment types are not translated in
fourn/facture/paiement.php
Commit: 50142a1e6cdb3711f47bfef25a10419279c2bd3d
https://github.com/Dolibarr/dolibarr/commit/50142a1e6cdb3711f47bfef25a10419279c2bd3d
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
Merge branch 'bug-1826' of https://github.com/marcosgdf/dolibarr into
3.6
Conflicts:
ChangeLog
Commit: 231c3f57d30684cd3ae9ea73a90527c6a3eb219e
https://github.com/Dolibarr/dolibarr/commit/231c3f57d30684cd3ae9ea73a90527c6a3eb219e
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
Merge pull request #2342 from aspangaro/3.6
FIXED Correct typo on Changelog
Commit: ead6b4bf951e862fd7f941a11220cfcefdd19e19
https://github.com/Dolibarr/dolibarr/commit/ead6b4bf951e862fd7f941a11220cfcefdd19e19
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/compta/salaries/fiche.php
Log Message:
-----------
Merge branch 'bug-1830' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1830
Conflicts:
ChangeLog
Commit: 9ebd79f52858b1928fd884a33c0686009abdd6c8
https://github.com/Dolibarr/dolibarr/commit/9ebd79f52858b1928fd884a33c0686009abdd6c8
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/compta/salaries/fiche.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-1830' into 3.6
Commit: ceb392038143638376f60e4e34ea98fed3a52dcb
https://github.com/Dolibarr/dolibarr/commit/ceb392038143638376f60e4e34ea98fed3a52dcb
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M htdocs/webservices/server_order.php
Log Message:
-----------
Merge pull request #2346 from aaujon/3.6-webservice-order
fix typo in createOrder
Commit: e7d95f553bdd0038d42bad84dfb5621c284e5bae
https://github.com/Dolibarr/dolibarr/commit/e7d95f553bdd0038d42bad84dfb5621c284e5bae
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M htdocs/comm/propal/list.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Commit: d1a4b6c2c5a7cfab1b21731de2ef790130d55d17
https://github.com/Dolibarr/dolibarr/commit/d1a4b6c2c5a7cfab1b21731de2ef790130d55d17
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-19 (Thu, 19 Feb 2015)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
phpcs
Commit: ec56667f5ea8969536ffc83bcfd1ec9fd387c0e8
https://github.com/Dolibarr/dolibarr/commit/ec56667f5ea8969536ffc83bcfd1ec9fd387c0e8
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-19 (Thu, 19 Feb 2015)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Fix: [ bug #1849 ] Broken flag image when a contact does not have a
country set
Commit: 639aaebacb5c606f709233e9d57536c264a195b8
https://github.com/Dolibarr/dolibarr/commit/639aaebacb5c606f709233e9d57536c264a195b8
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-19 (Thu, 19 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/core/lib/agenda.lib.php
Log Message:
-----------
Merge branch 'bug-1825' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1825
Conflicts:
ChangeLog
Commit: cb32dbc7b8c5755580c84842e4059d56ba4e21da
https://github.com/Dolibarr/dolibarr/commit/cb32dbc7b8c5755580c84842e4059d56ba4e21da
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-19 (Thu, 19 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/core/lib/agenda.lib.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-1825' into 3.6
Commit: fd18aa8717920b4e657fe6f2da630c7309586139
https://github.com/Dolibarr/dolibarr/commit/fd18aa8717920b4e657fe6f2da630c7309586139
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-02-20 (Fri, 20 Feb 2015)
Changed paths:
M htdocs/core/lib/agenda.lib.php
Log Message:
-----------
Better fix for Bug #1825
Commit: 3a917a0d1f319c4314f850386744d0b179b08039
https://github.com/Dolibarr/dolibarr/commit/3a917a0d1f319c4314f850386744d0b179b08039
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-02-20 (Fri, 20 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/comm/propal/list.php
M htdocs/compta/bank/ligne.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/salaries/fiche.php
M htdocs/core/lib/functions.lib.php
M htdocs/fourn/facture/paiement.php
M htdocs/webservices/server_order.php
M htdocs/webservices/server_productorservice.php
Log Message:
-----------
Merge branch '3.6' into bug-1825
Commit: d46c76311c9c869219351c1dc941ac40a3ce78d3
https://github.com/Dolibarr/dolibarr/commit/d46c76311c9c869219351c1dc941ac40a3ce78d3
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-02-20 (Fri, 20 Feb 2015)
Changed paths:
M htdocs/core/class/html.formmail.class.php
Log Message:
-----------
Correction
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: e1e31de2294b7bacf2aa0bcb53ce5ae59e876cce
https://github.com/Dolibarr/dolibarr/commit/e1e31de2294b7bacf2aa0bcb53ce5ae59e876cce
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 remote-tracking branch 'origin/3.5' into 3.6
Commit: bd6b465ee10aa20bc45072f67ddfdc07aff06ea4
https://github.com/Dolibarr/dolibarr/commit/bd6b465ee10aa20bc45072f67ddfdc07aff06ea4
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-20 (Fri, 20 Feb 2015)
Changed paths:
M test/phpunit/FunctionsLibTest.php
Log Message:
-----------
Add phpunit for ie11 and ie10
Commit: 56635cea9870afbce54b86c80b1f3c992633d61e
https://github.com/Dolibarr/dolibarr/commit/56635cea9870afbce54b86c80b1f3c992633d61e
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-20 (Fri, 20 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/core/class/html.formmail.class.php
Log Message:
-----------
Merge branch 'bug-1790' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1790
Conflicts:
ChangeLog
Commit: 29c39d61fb4f1151971bf6781cf11a1c774cc39c
https://github.com/Dolibarr/dolibarr/commit/29c39d61fb4f1151971bf6781cf11a1c774cc39c
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-20 (Fri, 20 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/core/class/html.formmail.class.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-1790' into 3.6
Commit: d9ab05833f4740cc442aa93f0419c65f686a8693
https://github.com/Dolibarr/dolibarr/commit/d9ab05833f4740cc442aa93f0419c65f686a8693
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-20 (Fri, 20 Feb 2015)
Changed paths:
M htdocs/contact/note.php
Log Message:
-----------
Merge pull request #2370 from braito4/patch-1
[FIX #1833] Permissions in contact/note.php wrong
Commit: 72da9b52afc582202157805861442b3e6cb61cac
https://github.com/Dolibarr/dolibarr/commit/72da9b52afc582202157805861442b3e6cb61cac
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-24 (Tue, 24 Feb 2015)
Changed paths:
M htdocs/core/lib/agenda.lib.php
Log Message:
-----------
Merge pull request #2380 from marcosgdf/bug-1825
Better fix for bug 1825
Commit: bfe9bf7a478c4eefe66af7c10d1e5c63c79183c3
https://github.com/Dolibarr/dolibarr/commit/bfe9bf7a478c4eefe66af7c10d1e5c63c79183c3
Author: Juanjo Menent <address@hidden>
Date: 2015-02-27 (Fri, 27 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/compta/prelevement/class/bonprelevement.class.php
Log Message:
-----------
Fix: Bad SEPA xml file creation
Commit: 7ca8fdb20cd833d11ed1b693cadd36ffe521bca3
https://github.com/Dolibarr/dolibarr/commit/7ca8fdb20cd833d11ed1b693cadd36ffe521bca3
Author: Juanjo Menent <address@hidden>
Date: 2015-02-27 (Fri, 27 Feb 2015)
Changed paths:
M htdocs/compta/prelevement/class/bonprelevement.class.php
Log Message:
-----------
PHP norms
Commit: a421564b8453b5b5fa6e80b247943bf179aa53b6
https://github.com/Dolibarr/dolibarr/commit/a421564b8453b5b5fa6e80b247943bf179aa53b6
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-01 (Sun, 01 Mar 2015)
Changed paths:
M htdocs/compta/prelevement/class/bonprelevement.class.php
Log Message:
-----------
Fix phpcs
Commit: 787623882312d836daa11a499bc9b8efbaf44151
https://github.com/Dolibarr/dolibarr/commit/787623882312d836daa11a499bc9b8efbaf44151
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-03-02 (Mon, 02 Mar 2015)
Changed paths:
M htdocs/comm/action/index.php
M htdocs/core/lib/agenda.lib.php
Log Message:
-----------
Fixed bug with hide/show checkboxes reported by Ruben Almeida (aruben)
When an external calendar was called "mytasks", Dolibarr events were also
hidden too.
Commit: 77605bce3e3cc2877e025aeda9b9b4496bdc80f9
https://github.com/Dolibarr/dolibarr/commit/77605bce3e3cc2877e025aeda9b9b4496bdc80f9
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-03-02 (Mon, 02 Mar 2015)
Changed paths:
M ChangeLog
M htdocs/fourn/facture/paiement.php
M htdocs/fourn/paiement/fiche.php
Log Message:
-----------
[ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and
adding a supplier invoice payment
Commit: 41c55d1913c80ef56a7c95e2550b23919071ae14
https://github.com/Dolibarr/dolibarr/commit/41c55d1913c80ef56a7c95e2550b23919071ae14
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-03-04 (Wed, 04 Mar 2015)
Changed paths:
M htdocs/comm/action/index.php
M htdocs/core/lib/agenda.lib.php
Log Message:
-----------
Better fix for bug-1825. There are actually a lot to things to escape and
escaped methods can make conflict with similar names so it is better to make a
md5 to have a unique value
Commit: 4e144b6b7646c91f8d5bf1d48e1b3d6d28d0753d
https://github.com/Dolibarr/dolibarr/commit/4e144b6b7646c91f8d5bf1d48e1b3d6d28d0753d
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-04 (Wed, 04 Mar 2015)
Changed paths:
M htdocs/comm/action/index.php
M htdocs/core/lib/agenda.lib.php
Log Message:
-----------
Merge pull request #2416 from marcosgdf/bug-1825
Fixed bug with hide/show checkboxes reported by Ruben Almeida (aruben)
Commit: 5f9f536f0b1e32304455616f941f2c7a4f587280
https://github.com/Dolibarr/dolibarr/commit/5f9f536f0b1e32304455616f941f2c7a4f587280
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-04 (Wed, 04 Mar 2015)
Changed paths:
M ChangeLog
M htdocs/fourn/facture/paiement.php
M htdocs/fourn/paiement/fiche.php
Log Message:
-----------
Merge pull request #2417 from marcosgdf/bug-1892
[ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding
a supplier invoice payment
Commit: 9a7346f8895e54ef6e4727c87837b4726522b2bb
https://github.com/Dolibarr/dolibarr/commit/9a7346f8895e54ef6e4727c87837b4726522b2bb
Author: Marcos García <address@hidden>
Date: 2015-03-06 (Fri, 06 Mar 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
Update ChangeLog
Commit: 9d320e4268132df3a3accadf196524699f649b3a
https://github.com/Dolibarr/dolibarr/commit/9d320e4268132df3a3accadf196524699f649b3a
Author: Estephe L. <address@hidden>
Date: 2015-03-08 (Sun, 08 Mar 2015)
Changed paths:
M htdocs/core/tpl/objectline_view.tpl.php
Log Message:
-----------
Fix Anchor link for quick access when editing.
This is a quick fix to make anchor link works well when editing a proposal,
order or invoice ...
Commit: f8dfa618595106bdc7b3a0bb0b185ee99735896b
https://github.com/Dolibarr/dolibarr/commit/f8dfa618595106bdc7b3a0bb0b185ee99735896b
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-03-09 (Mon, 09 Mar 2015)
Changed paths:
M htdocs/projet/element.php
Log Message:
-----------
FIXED #1901: Inverted supplier order/invoice buttons in project referring
objects
Commit: 978dc8170dfff1a03138e7dd476a4a2c06c7a490
https://github.com/Dolibarr/dolibarr/commit/978dc8170dfff1a03138e7dd476a4a2c06c7a490
Author: Maxime Kohlhaas <address@hidden>
Date: 2015-03-10 (Tue, 10 Mar 2015)
Changed paths:
M htdocs/comm/propal/list.php
Log Message:
-----------
Fix : display proposal date on proposal list
Commit: 154e1a7991380a2bbe6d8464eb6a73b31bf6b3ec
https://github.com/Dolibarr/dolibarr/commit/154e1a7991380a2bbe6d8464eb6a73b31bf6b3ec
Author: Maxime Kohlhaas <address@hidden>
Date: 2015-03-10 (Tue, 10 Mar 2015)
Changed paths:
M ChangeLog
M htdocs/comm/action/index.php
M htdocs/comm/propal/list.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/salaries/fiche.php
M htdocs/contact/note.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/lib/agenda.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/fourn/facture/paiement.php
M htdocs/fourn/paiement/fiche.php
M htdocs/webservices/server_order.php
M htdocs/webservices/server_productorservice.php
M test/phpunit/FunctionsLibTest.php
Log Message:
-----------
Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6
Commit: 05a2a6af00f1c2a2934574d8d961fe3e27b41a7e
https://github.com/Dolibarr/dolibarr/commit/05a2a6af00f1c2a2934574d8d961fe3e27b41a7e
Author: Maxime Kohlhaas <address@hidden>
Date: 2015-03-10 (Tue, 10 Mar 2015)
Changed paths:
M htdocs/compta/salaries/fiche.php
Log Message:
-----------
FIX : [bug #1900] Unable to remove a salary with enough permissions
Commit: f484abe5ecbd7cd3fcd1bfe19e7c6d77ce5aa9ed
https://github.com/Dolibarr/dolibarr/commit/f484abe5ecbd7cd3fcd1bfe19e7c6d77ce5aa9ed
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-11 (Wed, 11 Mar 2015)
Changed paths:
M htdocs/projet/element.php
Log Message:
-----------
Merge pull request #2446 from GPCsolutions/3.6-#1901
FIXED #1901: Inverted supplier order/invoice buttons in project referring
objects
Commit: 734a7dd5c786032b75dc2e26abba748763b65449
https://github.com/Dolibarr/dolibarr/commit/734a7dd5c786032b75dc2e26abba748763b65449
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-11 (Wed, 11 Mar 2015)
Changed paths:
M htdocs/core/tpl/objectline_view.tpl.php
Log Message:
-----------
Merge pull request #2443 from biznext/patch-4
Fix Anchor link for quick access when editing.
Commit: 242a71e9676edc544355d90b3bad3a75498c52fb
https://github.com/Dolibarr/dolibarr/commit/242a71e9676edc544355d90b3bad3a75498c52fb
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-11 (Wed, 11 Mar 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
Merge pull request #2436 from marcosgdf/patch-1
Update ChangeLog
Commit: 41b09d8c705c1f6022c7bcd78bc0a5199c9d68a1
https://github.com/Dolibarr/dolibarr/commit/41b09d8c705c1f6022c7bcd78bc0a5199c9d68a1
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-11 (Wed, 11 Mar 2015)
Changed paths:
M htdocs/comm/propal/list.php
M htdocs/compta/salaries/fiche.php
Log Message:
-----------
Merge pull request #2448 from atm-maxime/3.6
Fix : display proposal date on proposal list
Commit: 7cab558ed2f9076dddebfc616591b90f8f72cfb0
https://github.com/Dolibarr/dolibarr/commit/7cab558ed2f9076dddebfc616591b90f8f72cfb0
Author: Juanjo Menent <address@hidden>
Date: 2015-03-14 (Sat, 14 Mar 2015)
Changed paths:
M ChangeLog
M htdocs/commande/class/commande.class.php
Log Message:
-----------
Fix: Showing system error if not enough stock of product into orders
creation with lines
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: c4ff66c5d74c83a40957e8fdb0ff18813d3e39bb
https://github.com/Dolibarr/dolibarr/commit/c4ff66c5d74c83a40957e8fdb0ff18813d3e39bb
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:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Commit: 56295ed43819ea1b975021f31fde75be28065067
https://github.com/Dolibarr/dolibarr/commit/56295ed43819ea1b975021f31fde75be28065067
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-03-20 (Fri, 20 Mar 2015)
Changed paths:
M htdocs/commande/liste.php
Log Message:
-----------
Fixed delivery date in order list not showing up
Commit: b52ee1d069ee59a8b99ab0f79bf0381221086853
https://github.com/Dolibarr/dolibarr/commit/b52ee1d069ee59a8b99ab0f79bf0381221086853
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-21 (Sat, 21 Mar 2015)
Changed paths:
M htdocs/commande/liste.php
Log Message:
-----------
Merge pull request #2465 from marcosgdf/bug-delivery_date
Fixed delivery date in order list not showing up
Commit: ea7f00e77756dad0980ad0d1254c3232755c1f98
https://github.com/Dolibarr/dolibarr/commit/ea7f00e77756dad0980ad0d1254c3232755c1f98
Author: Fab <address@hidden>
Date: 2015-03-23 (Mon, 23 Mar 2015)
Changed paths:
M htdocs/commande/liste.php
Log Message:
-----------
Fix displaying of the warning image.
Since last commit, $objp->date_livraison returns nothing ; max() will
then returns wrong result, and the warning image will be displayed when it
should not.
Commit: 2a4687834d634fe5010ab1213c80fbdbaa230a35
https://github.com/Dolibarr/dolibarr/commit/2a4687834d634fe5010ab1213c80fbdbaa230a35
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-23 (Mon, 23 Mar 2015)
Changed paths:
M htdocs/commande/liste.php
Log Message:
-----------
Merge pull request #2474 from netfab/3.6
Fix displaying of the warning image.
Commit: b250c5588ecb612df124c2a70c454bbe6509baa5
https://github.com/Dolibarr/dolibarr/commit/b250c5588ecb612df124c2a70c454bbe6509baa5
Author: Maxime Kohlhaas <address@hidden>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M htdocs/product/stock/product.php
Log Message:
-----------
Fix : Quantity displayed for virtual stock explanations was wrong
Commit: e59fed9f380fc9b24437de735feef6329072c0ef
https://github.com/Dolibarr/dolibarr/commit/e59fed9f380fc9b24437de735feef6329072c0ef
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-03-26 (Thu, 26 Mar 2015)
Changed paths:
M htdocs/commande/liste.php
Log Message:
-----------
Corrected search box alignment in Customer orders list
Commit: 78638a30cd70fb4765c9d1618911473cad541f50
https://github.com/Dolibarr/dolibarr/commit/78638a30cd70fb4765c9d1618911473cad541f50
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-27 (Fri, 27 Mar 2015)
Changed paths:
M htdocs/product/stock/product.php
Log Message:
-----------
Merge pull request #2477 from atm-maxime/3.6
Fix : Quantity displayed for virtual stock explanations was wrong
Commit: d0e4d8046b99e496d0d10873c860d7f8cbe4f289
https://github.com/Dolibarr/dolibarr/commit/d0e4d8046b99e496d0d10873c860d7f8cbe4f289
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-27 (Fri, 27 Mar 2015)
Changed paths:
M htdocs/commande/liste.php
Log Message:
-----------
Merge pull request #2480 from marcosgdf/minor-2
Corrected search box alignment in Customer orders list
Commit: ffe1ee0d84844cbab4fd50954fe491ff808203b5
https://github.com/Dolibarr/dolibarr/commit/ffe1ee0d84844cbab4fd50954fe491ff808203b5
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-28 (Sat, 28 Mar 2015)
Changed paths:
M build/makepack-dolibarr.pl
Log Message:
-----------
Target 98 to publish of dolibarr sevrer is now working
Commit: 253955dc31e78a2a0166dcd92d12307953153c34
https://github.com/Dolibarr/dolibarr/commit/253955dc31e78a2a0166dcd92d12307953153c34
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-28 (Sat, 28 Mar 2015)
Changed paths:
M htdocs/commande/liste.php
M htdocs/product/stock/product.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: 847f1de589f7e04f4b8f7974dfdfac465ed9048b
https://github.com/Dolibarr/dolibarr/commit/847f1de589f7e04f4b8f7974dfdfac465ed9048b
Author: Laurent Destailleur <address@hidden>
Date: 2015-03-29 (Sun, 29 Mar 2015)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
M htdocs/comm/action/index.php
M htdocs/comm/propal/list.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/liste.php
M htdocs/compta/bank/ligne.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/salaries/fiche.php
M htdocs/contact/note.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/lib/agenda.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/societe/mod_codecompta_aquarium.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/fourn/facture/paiement.php
M htdocs/fourn/paiement/fiche.php
M htdocs/product/stock/product.php
M htdocs/projet/element.php
M htdocs/webservices/server_order.php
M htdocs/webservices/server_productorservice.php
M test/phpunit/FunctionsLibTest.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.6_backported
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/resultat/clientfourn.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/ca164690039d...847f1de589f7
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] 3940ab: FIX: select DISTINCT for natural search on proposa...,
Laurent Destailleur <=