[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 444fce: Prepare 3.7.4
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 444fce: Prepare 3.7.4 |
|
Date: |
Fri, 25 Mar 2016 08:10:15 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 444fce0bd9ccecef83a3dbbb8ed2704efcbd264d
https://github.com/Dolibarr/dolibarr/commit/444fce0bd9ccecef83a3dbbb8ed2704efcbd264d
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-11 (Fri, 11 Mar 2016)
Changed paths:
M ChangeLog
M htdocs/filefunc.inc.php
Log Message:
-----------
Prepare 3.7.4
Commit: 99ceb006e444e2591a68e91d809f5764c968ec82
https://github.com/Dolibarr/dolibarr/commit/99ceb006e444e2591a68e91d809f5764c968ec82
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-21 (Mon, 21 Mar 2016)
Changed paths:
M htdocs/projet/class/project.class.php
Log Message:
-----------
FIX Bad include and param for project numbering module call
Commit: 876484dfb565e9284a2645e4b7e6c5bb209494e7
https://github.com/Dolibarr/dolibarr/commit/876484dfb565e9284a2645e4b7e6c5bb209494e7
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-22 (Tue, 22 Mar 2016)
Changed paths:
M htdocs/core/modules/modCommande.class.php
Log Message:
-----------
FIX Duplicate records into export
Commit: 4f3f1eda7b51ae72bbda68db496804964cd493a7
https://github.com/Dolibarr/dolibarr/commit/4f3f1eda7b51ae72bbda68db496804964cd493a7
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-22 (Tue, 22 Mar 2016)
Changed paths:
M htdocs/core/modules/modPropale.class.php
Log Message:
-----------
FIX Duplicate records into export
Commit: 8189a5eadd1c81618cfa2799ec202915d64a42a5
https://github.com/Dolibarr/dolibarr/commit/8189a5eadd1c81618cfa2799ec202915d64a42a5
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-22 (Tue, 22 Mar 2016)
Changed paths:
M htdocs/projet/class/project.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into 3.9
Commit: 20d785ad28e92230bdc61295f06d5787ff3e21c8
https://github.com/Dolibarr/dolibarr/commit/20d785ad28e92230bdc61295f06d5787ff3e21c8
Author: Regis Houssin <address@hidden>
Date: 2016-03-23 (Wed, 23 Mar 2016)
Changed paths:
M ChangeLog
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8_fix_merge
Conflicts:
htdocs/filefunc.inc.php
Commit: 52d88db5c3e9565fa4a3074ef9353916c81bb293
https://github.com/Dolibarr/dolibarr/commit/52d88db5c3e9565fa4a3074ef9353916c81bb293
Author: fmarcet <address@hidden>
Date: 2016-03-23 (Wed, 23 Mar 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: Email templates not compatible with Multicompany
Conflicts:
htdocs/admin/dict.php
Commit: e2b4d39292de9daf9f65489faa6d951e7239acb0
https://github.com/Dolibarr/dolibarr/commit/e2b4d39292de9daf9f65489faa6d951e7239acb0
Author: fmarcet <address@hidden>
Date: 2016-03-23 (Wed, 23 Mar 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: Email templates not compatible with Multicompany
Conflicts:
htdocs/admin/dict.php
Commit: 84e5c8b437ebeee7afea8f9c609eb457ba4b876f
https://github.com/Dolibarr/dolibarr/commit/84e5c8b437ebeee7afea8f9c609eb457ba4b876f
Author: fmarcet <address@hidden>
Date: 2016-03-23 (Wed, 23 Mar 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: Email templates not compatible with Multicompany
Conflicts:
htdocs/admin/dict.php
Commit: b8bc881e5af2a40702901fa42905de07a16ef808
https://github.com/Dolibarr/dolibarr/commit/b8bc881e5af2a40702901fa42905de07a16ef808
Author: fmarcet <address@hidden>
Date: 2016-03-23 (Wed, 23 Mar 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: Email templates not compatible with Multicompany
Conflicts:
htdocs/admin/dict.php
Commit: b38e75c404f8d3ae69e8a3ff3d3aa6d26ef3cf7d
https://github.com/Dolibarr/dolibarr/commit/b38e75c404f8d3ae69e8a3ff3d3aa6d26ef3cf7d
Author: Regis Houssin <address@hidden>
Date: 2016-03-23 (Wed, 23 Mar 2016)
Changed paths:
M ChangeLog
M htdocs/admin/dict.php
Log Message:
-----------
Merge branch '3.8_fix_merge' into 3.9_fix_merge
Commit: 6efae723f5cd748e8a927c41f7e5746d9d7f370f
https://github.com/Dolibarr/dolibarr/commit/6efae723f5cd748e8a927c41f7e5746d9d7f370f
Author: Juanjo Menent <address@hidden>
Date: 2016-03-23 (Wed, 23 Mar 2016)
Changed paths:
M ChangeLog
M htdocs/admin/dict.php
Log Message:
-----------
Merge pull request #4882 from hregis/3.9_fix_merge
Fix: 3.8-3.9 fix merge
Commit: bdead30e751e655e218dac821f3910ccfd9c84dc
https://github.com/Dolibarr/dolibarr/commit/bdead30e751e655e218dac821f3910ccfd9c84dc
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-25 (Fri, 25 Mar 2016)
Changed paths:
M htdocs/compta/localtax/quadri_detail.php
Log Message:
-----------
FIX Missing function
Commit: 4e1b46feeb26b7ea83db6fc5300ee765298046fc
https://github.com/Dolibarr/dolibarr/commit/4e1b46feeb26b7ea83db6fc5300ee765298046fc
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-25 (Fri, 25 Mar 2016)
Changed paths:
M ChangeLog
M htdocs/admin/dict.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: 5e55f0ecceaaa5eebfd9c562f651b0b3e99bfc89
https://github.com/Dolibarr/dolibarr/commit/5e55f0ecceaaa5eebfd9c562f651b0b3e99bfc89
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-25 (Fri, 25 Mar 2016)
Changed paths:
M htdocs/compta/tva/index.php
Log Message:
-----------
Fix bad function name into hook
Commit: 85cd0038f57134b2e29994e44ba3fc9deedfe520
https://github.com/Dolibarr/dolibarr/commit/85cd0038f57134b2e29994e44ba3fc9deedfe520
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-25 (Fri, 25 Mar 2016)
Changed paths:
M ChangeLog
M htdocs/admin/dict.php
M htdocs/compta/localtax/index.php
M htdocs/compta/localtax/quadri_detail.php
M htdocs/compta/tva/index.php
M htdocs/projet/class/project.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.9' into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/61bc8fc9ef5d...85cd0038f571