[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] b3d58e: FIX large expense note
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] b3d58e: FIX large expense note |
|
Date: |
Thu, 23 Jun 2016 12:05:13 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: b3d58e95109b615b9e5471f24fdaa36277bb2902
https://github.com/Dolibarr/dolibarr/commit/b3d58e95109b615b9e5471f24fdaa36277bb2902
Author: root <address@hidden>
Date: 2016-06-08 (Wed, 08 Jun 2016)
Changed paths:
M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
Log Message:
-----------
FIX large expense note
Commit: c9d743ac26f9f1dae5d7442166da297e00e42143
https://github.com/Dolibarr/dolibarr/commit/c9d743ac26f9f1dae5d7442166da297e00e42143
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths:
M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
Log Message:
-----------
Merge pull request #5330 from atm-alexis/FIX_large_expense_note_and_large_logo
FIX 3.8 large expense note
Commit: 0d62bd704e7a61d66842a7c91cf3e50a249461f9
https://github.com/Dolibarr/dolibarr/commit/0d62bd704e7a61d66842a7c91cf3e50a249461f9
Author: Juanjo Menent <address@hidden>
Date: 2016-06-22 (Wed, 22 Jun 2016)
Changed paths:
M htdocs/compta/index.php
Log Message:
-----------
Fix: Bad column totalizing if MAIN_SHOW_HT_ON_SUMMARY activated
Commit: 7f0ed90652c836cc90007c97776eabc27fd6cc68
https://github.com/Dolibarr/dolibarr/commit/7f0ed90652c836cc90007c97776eabc27fd6cc68
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-23 (Thu, 23 Jun 2016)
Changed paths:
M htdocs/compta/index.php
Log Message:
-----------
Merge pull request #5385 from simnandez/3.9
FIX: Bad column totalizing if MAIN_SHOW_HT_ON_SUMMARY activated
Commit: 3690d11ca28a1d1a368fddbf00976f44a22d3443
https://github.com/Dolibarr/dolibarr/commit/3690d11ca28a1d1a368fddbf00976f44a22d3443
Author: Frédéric FRANCE <address@hidden>
Date: 2016-06-23 (Thu, 23 Jun 2016)
Changed paths:
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
Update pdf.lib.php
Commit: c67fa4129854dc997d2b79ffe9ed7e9de5762e4e
https://github.com/Dolibarr/dolibarr/commit/c67fa4129854dc997d2b79ffe9ed7e9de5762e4e
Author: florian HENRY <address@hidden>
Date: 2016-06-23 (Thu, 23 Jun 2016)
Changed paths:
M htdocs/user/group/perms.php
Log Message:
-----------
FIX : Translate group perms as it is done into user perms
Commit: c53429dcaed24ad4fd96c9ec8fae98d643cecfff
https://github.com/Dolibarr/dolibarr/commit/c53429dcaed24ad4fd96c9ec8fae98d643cecfff
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-23 (Thu, 23 Jun 2016)
Changed paths:
M htdocs/user/group/perms.php
Log Message:
-----------
Merge pull request #5391 from atm-florian/3.9
FIX : Translate group perms as it is done into user perms
Commit: 05cbf37aca6400d35c7e3768f99952e29141b890
https://github.com/Dolibarr/dolibarr/commit/05cbf37aca6400d35c7e3768f99952e29141b890
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-23 (Thu, 23 Jun 2016)
Changed paths:
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
Merge pull request #5387 from frederic34/patch-8
FIX Using parm instead of this in function pdfGetHeightForHtmlContent
Commit: 9b50150fe8d2248fec8414c0ab2fba70802b6719
https://github.com/Dolibarr/dolibarr/commit/9b50150fe8d2248fec8414c0ab2fba70802b6719
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-23 (Thu, 23 Jun 2016)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
FIX #5380
Commit: d78eb4495e6dbe2b1a81ee870dd03732b1bfa8b8
https://github.com/Dolibarr/dolibarr/commit/d78eb4495e6dbe2b1a81ee870dd03732b1bfa8b8
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-23 (Thu, 23 Jun 2016)
Changed paths:
M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: f6119cfee8a6ab51bc9848e78051e9d848112eca
https://github.com/Dolibarr/dolibarr/commit/f6119cfee8a6ab51bc9848e78051e9d848112eca
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-23 (Thu, 23 Jun 2016)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
Commit: 2e4c6597d8b8ff65aa093c10125521f7ec3671c4
https://github.com/Dolibarr/dolibarr/commit/2e4c6597d8b8ff65aa093c10125521f7ec3671c4
Author: Laurent Destailleur <address@hidden>
Date: 2016-06-23 (Thu, 23 Jun 2016)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/index.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
M htdocs/user/group/perms.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/79c3f9f8cc9f...2e4c6597d8b8