[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 9b40cc: fix
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 9b40cc: fix |
|
Date: |
Thu, 11 Sep 2014 08:47:52 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 9b40cc9e891fc817ddd5ce65abffe7b8d3ef5e85
https://github.com/Dolibarr/dolibarr/commit/9b40cc9e891fc817ddd5ce65abffe7b8d3ef5e85
Author: Florian HENRY <address@hidden>
Date: 2014-09-02 (Tue, 02 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
fix
Commit: b04eae95e5e72f3768e010af9bc4890ee623cc2a
https://github.com/Dolibarr/dolibarr/commit/b04eae95e5e72f3768e010af9bc4890ee623cc2a
Author: Florian HENRY <address@hidden>
Date: 2014-09-03 (Wed, 03 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture.php
M htdocs/fourn/facture/fiche.php
M htdocs/langs/en_US/resource.lang
M htdocs/langs/fr_FR/resource.lang
M htdocs/product/fiche.php
M htdocs/product/price.php
M htdocs/resource/class/actions_resource.class.php
M htdocs/resource/class/resource.class.php
M htdocs/resource/element_resource.php
M htdocs/societe/price.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.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Commit: 85cabbf921b88150cd57f2ff0e23db9d9d67fb04
https://github.com/Dolibarr/dolibarr/commit/85cabbf921b88150cd57f2ff0e23db9d9d67fb04
Author: Florian HENRY <address@hidden>
Date: 2014-09-04 (Thu, 04 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/compta/facture/prelevement.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/core/class/html.formfile.class.php
Log Message:
-----------
Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6
Conflicts:
ChangeLog
Commit: f62e7d6043e0199d729a691c7a70630782a5e6db
https://github.com/Dolibarr/dolibarr/commit/f62e7d6043e0199d729a691c7a70630782a5e6db
Author: Cedric <address@hidden>
Date: 2014-09-07 (Sun, 07 Sep 2014)
Changed paths:
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
Little fix
Commit: c5ccf2998b520a65ee77159c1c648564d9419a6f
https://github.com/Dolibarr/dolibarr/commit/c5ccf2998b520a65ee77159c1c648564d9419a6f
Author: Raphaël Doursenaud <address@hidden>
Date: 2014-09-08 (Mon, 08 Sep 2014)
Changed paths:
M htdocs/projet/class/project.class.php
Log Message:
-----------
Fixed forgotten rename
Commit: 367d225d3edf19de42d8909d68bd3936acce8010
https://github.com/Dolibarr/dolibarr/commit/367d225d3edf19de42d8909d68bd3936acce8010
Author: Raphaël Doursenaud <address@hidden>
Date: 2014-09-08 (Mon, 08 Sep 2014)
Changed paths:
M htdocs/projet/class/project.class.php
Log Message:
-----------
Fixed missing class include for task duplication
Commit: 7851587a114cdb53652be2cfcddb293783236ae5
https://github.com/Dolibarr/dolibarr/commit/7851587a114cdb53652be2cfcddb293783236ae5
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-11 (Thu, 11 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Merge pull request #1869 from FHenry/3.6
Extrafield feature select from table should try to translate multiple column
when not needed
Commit: dddafacad94b2cde6ff7772edb74685972634e66
https://github.com/Dolibarr/dolibarr/commit/dddafacad94b2cde6ff7772edb74685972634e66
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-11 (Thu, 11 Sep 2014)
Changed paths:
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
Merge pull request #1871 from KreizIT/3.6
Little fix
Commit: 98d7ce94b8d012260c229eb67d79e2d23ea9ed6f
https://github.com/Dolibarr/dolibarr/commit/98d7ce94b8d012260c229eb67d79e2d23ea9ed6f
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-11 (Thu, 11 Sep 2014)
Changed paths:
M htdocs/projet/class/project.class.php
Log Message:
-----------
Merge pull request #1873 from GPCsolutions/projectfixes
Projectfixes
Commit: 744f37092016120f75bba9b5257d767eb6dc2f0a
https://github.com/Dolibarr/dolibarr/commit/744f37092016120f75bba9b5257d767eb6dc2f0a
Author: Laurent Destailleur <address@hidden>
Date: 2014-09-11 (Thu, 11 Sep 2014)
Changed paths:
M ChangeLog
M htdocs/core/class/extrafields.class.php
M htdocs/expedition/class/expedition.class.php
M htdocs/projet/class/project.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/0d37d51cef65...744f37092016