[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: |
Sat, 20 Dec 2014 06:53:56 -0800 |
Branch: refs/heads/3.6_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: 2c01a4677474011b953c2a2687d884fb10b8b260
https://github.com/Dolibarr/dolibarr/commit/2c01a4677474011b953c2a2687d884fb10b8b260
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-18 (Thu, 18 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/core/boxes/box_activity.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/hookmanager.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/projet/class/task.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
htdocs/paypal/lib/paypal.lib.php
Commit: c209d168818d489fb6689a6f0cf41b95a2c79f5a
https://github.com/Dolibarr/dolibarr/commit/c209d168818d489fb6689a6f0cf41b95a2c79f5a
Author: Florian HENRY <address@hidden>
Date: 2014-12-18 (Thu, 18 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/projet/element.php
Log Message:
-----------
[ bug #1749 ] Undefined $mailchimp
Commit: 6f432063317a0d4f96df0e21d859a262e217f84d
https://github.com/Dolibarr/dolibarr/commit/6f432063317a0d4f96df0e21d859a262e217f84d
Author: Florian HENRY <address@hidden>
Date: 2014-12-18 (Thu, 18 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/core/boxes/box_activity.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/hookmanager.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/projet/class/task.class.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: 7ad1553859996ef275ba096c496933c5693d46e4
https://github.com/Dolibarr/dolibarr/commit/7ad1553859996ef275ba096c496933c5693d46e4
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-18 (Thu, 18 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/projet/element.php
Log Message:
-----------
Merge pull request #2160 from FHenry/3.6
[ bug #1749 ] Undefined $mailchimp
Commit: b1c4d32fbf00dd9a831fae912f1bbc846bf17b90
https://github.com/Dolibarr/dolibarr/commit/b1c4d32fbf00dd9a831fae912f1bbc846bf17b90
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-18 (Thu, 18 Dec 2014)
Changed paths:
M dev/codesniffer/ruleset.xml
Log Message:
-----------
Update phpcs file
Commit: 3c24c1b11a7653d18ce3364f958dd34a5ec97e93
https://github.com/Dolibarr/dolibarr/commit/3c24c1b11a7653d18ce3364f958dd34a5ec97e93
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-18 (Thu, 18 Dec 2014)
Changed paths:
M ChangeLog
M htdocs/projet/element.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: 3debf56c68500191267bab4cff93fb9d6f62e9bc
https://github.com/Dolibarr/dolibarr/commit/3debf56c68500191267bab4cff93fb9d6f62e9bc
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-18 (Thu, 18 Dec 2014)
Changed paths:
M dev/codesniffer/ruleset.xml
Log Message:
-----------
Update phpcs
Commit: 578c4ca3835ac327bceb3e2ad0233ec193de4f4b
https://github.com/Dolibarr/dolibarr/commit/578c4ca3835ac327bceb3e2ad0233ec193de4f4b
Author: HENRY Florian <address@hidden>
Date: 2014-12-19 (Fri, 19 Dec 2014)
Changed paths:
M scripts/odt2pdf/odt2pdf.sh
Log Message:
-----------
Update odt2pdf.sh
Fix odt2pdf.sh
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: 0bb431c4d0514d3295762c23f47edc1716df8964
https://github.com/Dolibarr/dolibarr/commit/0bb431c4d0514d3295762c23f47edc1716df8964
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-19 (Fri, 19 Dec 2014)
Changed paths:
M dev/codesniffer/ruleset.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
dev/codesniffer/ruleset.xml
Commit: 789d588fde9bc1436ce220773254ea34a72f40d3
https://github.com/Dolibarr/dolibarr/commit/789d588fde9bc1436ce220773254ea34a72f40d3
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: 11368e48fe9ea4c3d662477c64cd4298d4343521
https://github.com/Dolibarr/dolibarr/commit/11368e48fe9ea4c3d662477c64cd4298d4343521
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-20 (Sat, 20 Dec 2014)
Changed paths:
M dev/codesniffer/ruleset.xml
Log Message:
-----------
Update codesniffer to remove travis errors.
Commit: beaec59ab6619ee799c30f9b3fff2af458fceb16
https://github.com/Dolibarr/dolibarr/commit/beaec59ab6619ee799c30f9b3fff2af458fceb16
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-20 (Sat, 20 Dec 2014)
Changed paths:
M htdocs/core/db/mysqli.class.php
Log Message:
-----------
PHPCS
Commit: 0628f76a2b00dcf2c31444f1137603994ffcdea9
https://github.com/Dolibarr/dolibarr/commit/0628f76a2b00dcf2c31444f1137603994ffcdea9
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-20 (Sat, 20 Dec 2014)
Changed paths:
M scripts/odt2pdf/odt2pdf.sh
Log Message:
-----------
Merge pull request #2162 from FHenry/3.6
Update odt2pdf.sh
Commit: 219cd0f8552c4e635ced30a32fe4c355290aa7cc
https://github.com/Dolibarr/dolibarr/commit/219cd0f8552c4e635ced30a32fe4c355290aa7cc
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-20 (Sat, 20 Dec 2014)
Changed paths:
M htdocs/langs/fr_FR/compta.lang
Log Message:
-----------
Fixed: Translation
Commit: 321fd47ffc12bf57da9d017dc5ba99ba5e728edd
https://github.com/Dolibarr/dolibarr/commit/321fd47ffc12bf57da9d017dc5ba99ba5e728edd
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-20 (Sat, 20 Dec 2014)
Changed paths:
M scripts/odt2pdf/odt2pdf.sh
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: 49e167e8b8ae781e175dcd3902baaaf446d62ae9
https://github.com/Dolibarr/dolibarr/commit/49e167e8b8ae781e175dcd3902baaaf446d62ae9
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-20 (Sat, 20 Dec 2014)
Changed paths:
M ChangeLog
M dev/codesniffer/ruleset.xml
M htdocs/core/boxes/box_activity.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/hookmanager.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/db/mysqli.class.php
M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
M htdocs/langs/fr_FR/compta.lang
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/projet/class/task.class.php
M htdocs/projet/element.php
M scripts/odt2pdf/odt2pdf.sh
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.6_backported
Compare:
https://github.com/Dolibarr/dolibarr/compare/2f16fca63516...49e167e8b8ae