[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] aaf2cc: Fix bug n sellist extrafield
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] aaf2cc: Fix bug n sellist extrafield filtered |
Date: |
Thu, 25 Dec 2014 19:15:19 -0800 |
Branch: refs/heads/3.5_backported
Home: https://github.com/Dolibarr/dolibarr
Commit: aaf2cca45f3488a81ffd713e148ea9c3572efaf8
https://github.com/Dolibarr/dolibarr/commit/aaf2cca45f3488a81ffd713e148ea9c3572efaf8
Author: Florian HENRY <address@hidden>
Date: 2014-12-05 (Fri, 05 Dec 2014)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Fix bug n sellist extrafield filtered
Commit: bd8b393d8a8e383e6345488be2836e61d7e1004c
https://github.com/Dolibarr/dolibarr/commit/bd8b393d8a8e383e6345488be2836e61d7e1004c
Author: Florian HENRY <address@hidden>
Date: 2014-12-05 (Fri, 05 Dec 2014)
Changed paths:
M htdocs/projet/class/task.class.php
Log Message:
-----------
Fix [ bug #1740 ] Clone project make task date crazy
Commit: 293726c5e8bdbac98fbaa525de9015b4a2979e55
https://github.com/Dolibarr/dolibarr/commit/293726c5e8bdbac98fbaa525de9015b4a2979e55
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-07 (Sun, 07 Dec 2014)
Changed paths:
M htdocs/core/class/extrafields.class.php
M htdocs/projet/class/task.class.php
Log Message:
-----------
Merge pull request #2135 from FHenry/3.5
3.5
Commit: 146107280160f090dfd7fb1cdf8c37996ae3f7f9
https://github.com/Dolibarr/dolibarr/commit/146107280160f090dfd7fb1cdf8c37996ae3f7f9
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-09 (Tue, 09 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/paypal/lib/paypal.lib.php
Log Message:
-----------
Fix: Paypal link were broken dur to SSL v3 closed.
Commit: b11ac14cf02464aa693785a2740354896fb9469a
https://github.com/Dolibarr/dolibarr/commit/b11ac14cf02464aa693785a2740354896fb9469a
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-09 (Tue, 09 Dec 2014)
Changed paths:
M htdocs/core/class/extrafields.class.php
M htdocs/projet/class/task.class.php
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Commit: 666e66e78f54ca45ed926f20e41fe442c20289d3
https://github.com/Dolibarr/dolibarr/commit/666e66e78f54ca45ed926f20e41fe442c20289d3
Author: aspangaro <address@hidden>
Date: 2014-12-09 (Tue, 09 Dec 2014)
Changed paths:
M htdocs/core/boxes/box_activity.php
Log Message:
-----------
Correct link in activity box
Commit: 81dc1415deabd45c2c3da2f4376d841c825166f4
https://github.com/Dolibarr/dolibarr/commit/81dc1415deabd45c2c3da2f4376d841c825166f4
Author: aspangaro <address@hidden>
Date: 2014-12-09 (Tue, 09 Dec 2014)
Changed paths:
M htdocs/core/class/html.formother.class.php
Log Message:
-----------
Untranslatable token in activity box
Commit: fbb25eae11f80b7bd99ea2ab98688438eee6ea16
https://github.com/Dolibarr/dolibarr/commit/fbb25eae11f80b7bd99ea2ab98688438eee6ea16
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-10 (Wed, 10 Dec 2014)
Changed paths:
M htdocs/core/boxes/box_activity.php
M htdocs/core/class/html.formother.class.php
Log Message:
-----------
Merge pull request #2138 from aspangaro/3.5-patch1
Correct in activity box
Commit: a1bba472a03e146975fd932a1c91490cdddcf57d
https://github.com/Dolibarr/dolibarr/commit/a1bba472a03e146975fd932a1c91490cdddcf57d
Author: Christophe Battarel <address@hidden>
Date: 2014-12-12 (Fri, 12 Dec 2014)
Changed paths:
M htdocs/core/class/hookmanager.class.php
Log Message:
-----------
FIX: hook insertExtraFields must return a returnvalue (0,1,-1)
Commit: 27b47a4f4836f4bbb49898187a1be06d9ca00841
https://github.com/Dolibarr/dolibarr/commit/27b47a4f4836f4bbb49898187a1be06d9ca00841
Author: Christophe Battarel <address@hidden>
Date: 2014-12-12 (Fri, 12 Dec 2014)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
FIX: dont put a mess with date and datetime extrafield value if already
in right format (the bug was in propale/order/invoice extrafields,
mainly visible with 2 datetime extrafields)
Commit: a4a1a991b85b88e418740837bcf4b0f5e0a846a1
https://github.com/Dolibarr/dolibarr/commit/a4a1a991b85b88e418740837bcf4b0f5e0a846a1
Author: Christophe Battarel <address@hidden>
Date: 2014-12-15 (Mon, 15 Dec 2014)
Changed paths:
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
Log Message:
-----------
FIX: avoid milestones in margin calculation
Commit: c9f69279c7ca0eca48e436e48f0e5570c4738305
https://github.com/Dolibarr/dolibarr/commit/c9f69279c7ca0eca48e436e48f0e5570c4738305
Author: Christophe Battarel <address@hidden>
Date: 2014-12-16 (Tue, 16 Dec 2014)
Changed paths:
M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
Log Message:
-----------
FIX: pagebreak on fichinter like in other documents
Commit: 615456382d1fa420971a184ec22ccb11af680b51
https://github.com/Dolibarr/dolibarr/commit/615456382d1fa420971a184ec22ccb11af680b51
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-18 (Thu, 18 Dec 2014)
Changed paths:
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
Log Message:
-----------
Merge pull request #2157 from altatof/fix_margin_jalon
FIX: avoid milestones in margin calculation
Commit: 4887f51174cd7e931bee9f4f575ebacd8f806c8a
https://github.com/Dolibarr/dolibarr/commit/4887f51174cd7e931bee9f4f575ebacd8f806c8a
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-18 (Thu, 18 Dec 2014)
Changed paths:
M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
Log Message:
-----------
Merge pull request #2158 from altatof/fix_fichinter_pdf_pagebreak
FIX: pagebreak on fichinter like in other documents
Commit: 6728ad3c37bac858181559c25078dd8b1aaea915
https://github.com/Dolibarr/dolibarr/commit/6728ad3c37bac858181559c25078dd8b1aaea915
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-18 (Thu, 18 Dec 2014)
Changed paths:
M htdocs/core/class/hookmanager.class.php
Log Message:
-----------
Merge pull request #2148 from altatof/fixhook
FIX: hook insertExtraFields must return a returnvalue (0,1,-1)
Commit: f5da9b5e33db69648386740c58b805759eec8f09
https://github.com/Dolibarr/dolibarr/commit/f5da9b5e33db69648386740c58b805759eec8f09
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-18 (Thu, 18 Dec 2014)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge pull request #2149 from altatof/3.5
FIX: dont put a mess with date and datetime extrafield value if already in
right format
Commit: 47cab9033625e859341a164012226e5b3e38cc39
https://github.com/Dolibarr/dolibarr/commit/47cab9033625e859341a164012226e5b3e38cc39
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-19 (Fri, 19 Dec 2014)
Changed paths:
M dev/codesniffer/ruleset.dtd
M dev/codesniffer/ruleset.xml
Log Message:
-----------
Update codesniffer to remove travis errors.
Commit: 1c2c1ff3d877d31d12d870d319a7318a9e18e4f5
https://github.com/Dolibarr/dolibarr/commit/1c2c1ff3d877d31d12d870d319a7318a9e18e4f5
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-19 (Fri, 19 Dec 2014)
Changed paths:
M dev/codesniffer/ruleset.xml
Log Message:
-----------
Update codesniffer to remove travis errors.
Commit: 416f13c708cbfbff3e0ff0e1997867e3b37b9a0e
https://github.com/Dolibarr/dolibarr/commit/416f13c708cbfbff3e0ff0e1997867e3b37b9a0e
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-12-23 (Tue, 23 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/margin/agentMargins.php
Log Message:
-----------
Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead
of 00H
Commit: f4def9ea288c0677117087f883e1625a01b1f358
https://github.com/Dolibarr/dolibarr/commit/f4def9ea288c0677117087f883e1625a01b1f358
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-12-26 (Fri, 26 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/core/db/pgsql.class.php
Log Message:
-----------
Fix: [ bug #1769 ] Error when installing to a PostgreSQL DB that contains
numbers
Commit: 1d39c1acc22fdd7d2767fea7061b24b3242477d6
https://github.com/Dolibarr/dolibarr/commit/1d39c1acc22fdd7d2767fea7061b24b3242477d6
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-12-26 (Fri, 26 Dec 2014)
Changed paths:
M htdocs/core/db/pgsql.class.php
Log Message:
-----------
Fix: [ bug #1768 ] PHP Warning when error connecting to a PostgreSQL server
in install script
Commit: 8e47fe9e1c0d6983fdffcab77d927c3528dda030
https://github.com/Dolibarr/dolibarr/commit/8e47fe9e1c0d6983fdffcab77d927c3528dda030
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-12-26 (Fri, 26 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/product/popuprop.php
Log Message:
-----------
Fix: [ bug #1757 ] Sorting breaks product/service statistics
Commit: f31bf5d80e54b9c432fa6afa1cbd47e4fd589dc4
https://github.com/Dolibarr/dolibarr/commit/f31bf5d80e54b9c432fa6afa1cbd47e4fd589dc4
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-26 (Fri, 26 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/margin/agentMargins.php
Log Message:
-----------
Merge pull request #2175 from marcosgdf/bug-1752
Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead of
00H
Commit: 83e34a1c4e6614304cd249f22f373fbe51186951
https://github.com/Dolibarr/dolibarr/commit/83e34a1c4e6614304cd249f22f373fbe51186951
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-26 (Fri, 26 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/core/db/pgsql.class.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-1769' into 3.5
Commit: 4e2c321e4d2cafe193ee0c4a0882f2f3ac863f8b
https://github.com/Dolibarr/dolibarr/commit/4e2c321e4d2cafe193ee0c4a0882f2f3ac863f8b
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-26 (Fri, 26 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/margin/agentMargins.php
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Conflicts:
ChangeLog
Commit: 38c9d39c2bddf3fda99ae0ed66bdb97adf9fead6
https://github.com/Dolibarr/dolibarr/commit/38c9d39c2bddf3fda99ae0ed66bdb97adf9fead6
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-26 (Fri, 26 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/product/popuprop.php
Log Message:
-----------
Merge branch 'bug-1757' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1757
Conflicts:
ChangeLog
Commit: 882fd9a7982bd0d4ec0e943292dbf6c423364c0d
https://github.com/Dolibarr/dolibarr/commit/882fd9a7982bd0d4ec0e943292dbf6c423364c0d
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-26 (Fri, 26 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/product/popuprop.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-1757' into 3.5
Commit: 77e48f8c3e2d69aba8898f37384a69c731483686
https://github.com/Dolibarr/dolibarr/commit/77e48f8c3e2d69aba8898f37384a69c731483686
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-26 (Fri, 26 Dec 2014)
Changed paths:
M htdocs/core/db/pgsql.class.php
Log Message:
-----------
Merge branch 'bug-1768' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1768
Commit: 490b0c5f3ad7eb44070b00b221e42577a13bd7ef
https://github.com/Dolibarr/dolibarr/commit/490b0c5f3ad7eb44070b00b221e42577a13bd7ef
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-26 (Fri, 26 Dec 2014)
Changed paths:
M htdocs/core/db/pgsql.class.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-1768' into 3.5
Commit: c9681e47a31d6773565a38fc55da0508d7fb0980
https://github.com/Dolibarr/dolibarr/commit/c9681e47a31d6773565a38fc55da0508d7fb0980
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-26 (Fri, 26 Dec 2014)
Changed paths:
M ChangeLog
M dev/codesniffer/ruleset.dtd
M dev/codesniffer/ruleset.xml
M htdocs/core/boxes/box_activity.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/hookmanager.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/db/pgsql.class.php
M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/paypal/lib/paypal.lib.php
M htdocs/product/popuprop.php
M htdocs/projet/class/task.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.5_backported
Compare:
https://github.com/Dolibarr/dolibarr/compare/feae1685cf25...c9681e47a31d