[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 13e434: Merge branch '3.5' of address
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 13e434: Merge branch '3.5' of address@hidden:Dolibarr/doli... |
|
Date: |
Mon, 04 Aug 2014 13:18:43 -0700 |
Branch: refs/heads/3.6
Home: https://github.com/Dolibarr/dolibarr
Commit: 13e434cf683833912653d4061ce14fa23580839f
https://github.com/Dolibarr/dolibarr/commit/13e434cf683833912653d4061ce14fa23580839f
Author: Florian HENRY <address@hidden>
Date: 2014-07-12 (Sat, 12 Jul 2014)
Changed paths:
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/commande/orderstoinvoice.php
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Commit: 5309fb380b46e6842968ca9f3069bcedb6a380a8
https://github.com/Dolibarr/dolibarr/commit/5309fb380b46e6842968ca9f3069bcedb6a380a8
Author: Florian HENRY <address@hidden>
Date: 2014-07-21 (Mon, 21 Jul 2014)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
M htdocs/compta/facture/impayees.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/langs/en_US/admin.lang
M htdocs/margin/productMargins.php
M htdocs/product/class/product.class.php
M htdocs/projet/element.php
M htdocs/theme/amarok/style.css.php
M htdocs/theme/auguria/style.css.php
M htdocs/theme/bureau2crea/style.css.php
M htdocs/theme/cameleo/style.css.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Commit: 30b41fbd1803c2e628123ba496f780b5cdc448f0
https://github.com/Dolibarr/dolibarr/commit/30b41fbd1803c2e628123ba496f780b5cdc448f0
Author: Florian HENRY <address@hidden>
Date: 2014-07-28 (Mon, 28 Jul 2014)
Changed paths:
M ChangeLog
M build/debian/changelog
M build/doxygen/dolibarr-doxygen.doxyfile
M build/exe/doliwamp/doliwamp.iss
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/adherents/liste.php
M htdocs/core/modules/product/mod_codeproduct_leopard.php
M htdocs/core/modules/societe/mod_codeclient_leopard.php
M htdocs/filefunc.inc.php
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Commit: 23974daca47aee42dc14cf45e518b58fcaa6a3ee
https://github.com/Dolibarr/dolibarr/commit/23974daca47aee42dc14cf45e518b58fcaa6a3ee
Author: Maxime Kohlhaas <address@hidden>
Date: 2014-08-01 (Fri, 01 Aug 2014)
Changed paths:
M htdocs/expedition/index.php
Log Message:
-----------
Fix : shipping list SQL request was not filtering on shipping element
Commit: 8f8c6a9c9eb66841c192908876aabf0d1a9cd562
https://github.com/Dolibarr/dolibarr/commit/8f8c6a9c9eb66841c192908876aabf0d1a9cd562
Author: Florian HENRY <address@hidden>
Date: 2014-08-01 (Fri, 01 Aug 2014)
Changed paths:
M build/debian/dolibarr.postinst
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Commit: 139dfa5b80ff82ef5acb128e303b298cef3caf22
https://github.com/Dolibarr/dolibarr/commit/139dfa5b80ff82ef5acb128e303b298cef3caf22
Author: Florian HENRY <address@hidden>
Date: 2014-08-01 (Fri, 01 Aug 2014)
Changed paths:
M ChangeLog
M htdocs/core/class/html.formfile.class.php
Log Message:
-----------
Fix : Fusion PDF button on unpaid invoice is no more displayed
Commit: 44f06bef2272fa3ff219a2210b27fda6f9dea806
https://github.com/Dolibarr/dolibarr/commit/44f06bef2272fa3ff219a2210b27fda6f9dea806
Author: Florian HENRY <address@hidden>
Date: 2014-08-01 (Fri, 01 Aug 2014)
Changed paths:
M ChangeLog
M htdocs/compta/facture/impayees.php
M htdocs/core/class/html.formfile.class.php
Log Message:
-----------
Unpaid invoice launch fusion PDF action even if it is only search (with
enter keyboard input instead of lens click)
Commit: e56956110fb98f59faf5fc3c5a4d30d40b3e8860
https://github.com/Dolibarr/dolibarr/commit/e56956110fb98f59faf5fc3c5a4d30d40b3e8860
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-04 (Mon, 04 Aug 2014)
Changed paths:
M htdocs/expedition/index.php
Log Message:
-----------
Merge pull request #1796 from atm-maxime/3.5
Fix : shipping list SQL request was not filtering on shipping element
Commit: d14fcf617c0b6bcae19d3a5578f2d172efa3c7d9
https://github.com/Dolibarr/dolibarr/commit/d14fcf617c0b6bcae19d3a5578f2d172efa3c7d9
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-04 (Mon, 04 Aug 2014)
Changed paths:
M ChangeLog
M htdocs/compta/facture/impayees.php
M htdocs/core/class/html.formfile.class.php
Log Message:
-----------
Merge pull request #1799 from FHenry/3.5
Fix : Fusion PDF button on unpaid invoice is no more displayed
Commit: 863d57004ed232fbd397a7d422cd0330d6f5a98c
https://github.com/Dolibarr/dolibarr/commit/863d57004ed232fbd397a7d422cd0330d6f5a98c
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-04 (Mon, 04 Aug 2014)
Changed paths:
M htdocs/user/fiche.php
Log Message:
-----------
Fix: Field must be invisible
Commit: 6a61587085f4fae34d9ce8bd1ea8b125486087b9
https://github.com/Dolibarr/dolibarr/commit/6a61587085f4fae34d9ce8bd1ea8b125486087b9
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-04 (Mon, 04 Aug 2014)
Changed paths:
M htdocs/core/js/dst.js
M htdocs/core/lib/functions.lib.php
M htdocs/main.inc.php
Log Message:
-----------
Try a fix when timezone string is not standard
Conflicts:
htdocs/includes/adodbtime/adodb-time.inc.php
Commit: 76353bf4274be92687cc63794fc7043c1dfc6398
https://github.com/Dolibarr/dolibarr/commit/76353bf4274be92687cc63794fc7043c1dfc6398
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-04 (Mon, 04 Aug 2014)
Changed paths:
M ChangeLog
M htdocs/compta/facture/impayees.php
M htdocs/core/class/html.formfile.class.php
M htdocs/expedition/index.php
M htdocs/user/fiche.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/compta/facture/impayees.php
htdocs/core/lib/functions.lib.php
htdocs/main.inc.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/c7d4b1e3d519...76353bf4274b