[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 5234e8: Update index.php
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 5234e8: Update index.php |
Date: |
Wed, 22 Jun 2016 11:22:33 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 5234e8fc8ff67c8a1192066cd23ef49f959b99bd
https://github.com/Dolibarr/dolibarr/commit/5234e8fc8ff67c8a1192066cd23ef49f959b99bd
Author: Frédéric FRANCE <address@hidden>
Date: 2016-06-14 (Tue, 14 Jun 2016)
Changed paths:
M htdocs/accountancy/customer/index.php
Log Message:
-----------
Update index.php
Commit: 3646b5f5ae6bad2d95051975ba0077641781a11c
https://github.com/Dolibarr/dolibarr/commit/3646b5f5ae6bad2d95051975ba0077641781a11c
Author: Frédéric FRANCE <address@hidden>
Date: 2016-06-14 (Tue, 14 Jun 2016)
Changed paths:
M htdocs/imports/import.php
Log Message:
-----------
Update import.php
Commit: f51386c59fb1c7964fd33028c7c524fc5a63e49d
https://github.com/Dolibarr/dolibarr/commit/f51386c59fb1c7964fd33028c7c524fc5a63e49d
Author: Maxime Kohlhaas <address@hidden>
Date: 2016-06-15 (Wed, 15 Jun 2016)
Changed paths:
M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
Log Message:
-----------
FIX #5343
Commit: 748b3bb2bad930e317f8d1c0b21ca8adecb35e2b
https://github.com/Dolibarr/dolibarr/commit/748b3bb2bad930e317f8d1c0b21ca8adecb35e2b
Author: Maxime Kohlhaas <address@hidden>
Date: 2016-06-15 (Wed, 15 Jun 2016)
Changed paths:
M htdocs/imports/import.php
Log Message:
-----------
Fix travis error for GETPOST in empty
Commit: af5a75c39bec0cc52a9d858d7606f43eba85f267
https://github.com/Dolibarr/dolibarr/commit/af5a75c39bec0cc52a9d858d7606f43eba85f267
Author: Maxime Kohlhaas <address@hidden>
Date: 2016-06-15 (Wed, 15 Jun 2016)
Changed paths:
M htdocs/compta/facture.php
M htdocs/societe/soc.php
Log Message:
-----------
Merge branch '3.9' of https://github.com/Dolibarr/dolibarr into 3.9
Commit: 31f6cd735365e2e1d5efb33354e6a4df163aab48
https://github.com/Dolibarr/dolibarr/commit/31f6cd735365e2e1d5efb33354e6a4df163aab48
Author: Maxime Kohlhaas <address@hidden>
Date: 2016-06-16 (Thu, 16 Jun 2016)
Log Message:
-----------
Merge branch '3.9' of https://github.com/Dolibarr/dolibarr into 3.9
Commit: 9781baa743fbdcdcf72b7a9cc30ec25f25123b97
https://github.com/Dolibarr/dolibarr/commit/9781baa743fbdcdcf72b7a9cc30ec25f25123b97
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths:
M htdocs/projet/list.php
Log Message:
-----------
FIX Filter on opportunity amount and budget
Commit: f94d140d2a21b5b56adcb9de6517d73954056f43
https://github.com/Dolibarr/dolibarr/commit/f94d140d2a21b5b56adcb9de6517d73954056f43
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths:
M htdocs/product/stock/product.php
Log Message:
-----------
Fix bad sql field name
Commit: 5a51850d54368cc0583161ef6bbbc323ad4dd86a
https://github.com/Dolibarr/dolibarr/commit/5a51850d54368cc0583161ef6bbbc323ad4dd86a
Author: Drosis Nikos <address@hidden>
Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths:
M htdocs/install/mysql/data/llx_c_tva.sql
Log Message:
-----------
Greece VAT 23 -> 24
Commit: 84e13c153d9c768aadce62ab5af0746ce7b7b7e5
https://github.com/Dolibarr/dolibarr/commit/84e13c153d9c768aadce62ab5af0746ce7b7b7e5
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths:
M htdocs/imports/import.php
Log Message:
-----------
Merge pull request #5354 from atm-maxime/fix_travis
FIX PHP 5.3 compatibility
Commit: 252ca09717d96a78b02305c7acb42676641ffa10
https://github.com/Dolibarr/dolibarr/commit/252ca09717d96a78b02305c7acb42676641ffa10
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths:
M htdocs/install/mysql/data/llx_c_tva.sql
Log Message:
-----------
Merge pull request #5358 from ndrosis/patch-24
Greece VAT 23 -> 24
Commit: bc22f39aa45c25a67b0937c5ea6741281654f80e
https://github.com/Dolibarr/dolibarr/commit/bc22f39aa45c25a67b0937c5ea6741281654f80e
Author: Frédéric FRANCE <address@hidden>
Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths:
M htdocs/imports/import.php
Log Message:
-----------
Update import.php
Commit: b4384c13e178909e6bd8830ae224448374b82440
https://github.com/Dolibarr/dolibarr/commit/b4384c13e178909e6bd8830ae224448374b82440
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths:
M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
Log Message:
-----------
Merge pull request #5349 from atm-maxime/3.9
FIX #5343
Commit: 19eacba248ffd2b7be6a12846a44ca1d8d265824
https://github.com/Dolibarr/dolibarr/commit/19eacba248ffd2b7be6a12846a44ca1d8d265824
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths:
M htdocs/accountancy/customer/index.php
Log Message:
-----------
Merge pull request #5348 from frederic34/patch-8
FIX Bad name of table into sql request llx_accountingaccount instead of
llx_accounting_account
Commit: a3d53b269f8fd7448793c22d89d1a0e27af9c085
https://github.com/Dolibarr/dolibarr/commit/a3d53b269f8fd7448793c22d89d1a0e27af9c085
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M htdocs/core/js/lib_head.js.php
Log Message:
-----------
FIX javascript error with german-switzerland language
Commit: 76df7afa855c9a7d892601bbb5dfcca4d34aee7d
https://github.com/Dolibarr/dolibarr/commit/76df7afa855c9a7d892601bbb5dfcca4d34aee7d
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M htdocs/accountancy/customer/index.php
M htdocs/imports/import.php
M htdocs/install/mysql/data/llx_c_tva.sql
M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: d7177575949edd6066a524ce209b6ff7a9f2897d
https://github.com/Dolibarr/dolibarr/commit/d7177575949edd6066a524ce209b6ff7a9f2897d
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M htdocs/core/js/lib_head.js.php
Log Message:
-----------
Protect against bad value of accurancy to avoid javascript error
Commit: 386b19d4b1f91225c9e2207ce98494e72acdaca0
https://github.com/Dolibarr/dolibarr/commit/386b19d4b1f91225c9e2207ce98494e72acdaca0
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-19 (Sun, 19 Jun 2016)
Changed paths:
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
Log Message:
-----------
Fix regression. Add hidden option PROPAL_DISABLE_SIGNATURE to restore
old behaviour.
Commit: f514400d8781406fef3e9a3c2367ba5c75198e1d
https://github.com/Dolibarr/dolibarr/commit/f514400d8781406fef3e9a3c2367ba5c75198e1d
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-22 (Wed, 22 Jun 2016)
Changed paths:
M htdocs/includes/odtphp/odf.php
Log Message:
-----------
FIX a case of corrupted ODT by Word that insert <text:s> when it should
not.
Commit: 00749b2a652bf52699b3aa08dc3a7897b5d498ec
https://github.com/Dolibarr/dolibarr/commit/00749b2a652bf52699b3aa08dc3a7897b5d498ec
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-22 (Wed, 22 Jun 2016)
Changed paths:
M htdocs/accountancy/customer/index.php
M htdocs/core/js/lib_head.js.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/includes/odtphp/Segment.php
M htdocs/includes/odtphp/SegmentIterator.php
M htdocs/includes/odtphp/odf.php
M htdocs/projet/list.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/imports/import.php
htdocs/includes/odtphp/odf.php
htdocs/product/stock/product.php
htdocs/projet/list.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/7f0062cb4cd8...00749b2a652b