[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 848d76: FIX #8023
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 848d76: FIX #8023 |
|
Date: |
Wed, 11 Apr 2018 08:21:32 -0700 |
Branch: refs/heads/7.0
Home: https://github.com/Dolibarr/dolibarr
Commit: 848d76ee78632fc1a642a2293457e99d83433713
https://github.com/Dolibarr/dolibarr/commit/848d76ee78632fc1a642a2293457e99d83433713
Author: atm-arnaud <address@hidden>
Date: 2018-04-10 (Tue, 10 Apr 2018)
Changed paths:
M htdocs/compta/bank/card.php
Log Message:
-----------
FIX #8023
Commit: 5621d1f8ea3bba85e842ee7aa10f872855f3616a
https://github.com/Dolibarr/dolibarr/commit/5621d1f8ea3bba85e842ee7aa10f872855f3616a
Author: gauthier <address@hidden>
Date: 2018-04-10 (Tue, 10 Apr 2018)
Changed paths:
M htdocs/core/tpl/admin_extrafields_view.tpl.php
Log Message:
-----------
FIX #8478 !empty instead of count to avoid warning
Commit: 1fd5dba118c42875cc84efd00515aa8dde11dc5e
https://github.com/Dolibarr/dolibarr/commit/1fd5dba118c42875cc84efd00515aa8dde11dc5e
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-04-10 (Tue, 10 Apr 2018)
Changed paths:
M htdocs/core/class/commondocgenerator.class.php
Log Message:
-----------
FIX: payment term doc-specific label was not used
Commit: ab43d9d675dd19d68afd4961834e54819e52adf8
https://github.com/Dolibarr/dolibarr/commit/ab43d9d675dd19d68afd4961834e54819e52adf8
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/core/class/commondocgenerator.class.php
Log Message:
-----------
Merge pull request #8544 from ATM-Marc/FIX_odt_cond_reglement
FIX: payment term doc-specific label was not used (issue #8414)
Commit: 75bc3d17e6aaa0960acee60afce9283ca0830a8a
https://github.com/Dolibarr/dolibarr/commit/75bc3d17e6aaa0960acee60afce9283ca0830a8a
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/core/tpl/admin_extrafields_view.tpl.php
Log Message:
-----------
Update admin_extrafields_view.tpl.php
Commit: c392b9b8efcc7850f6e642ee53dae8502aad247c
https://github.com/Dolibarr/dolibarr/commit/c392b9b8efcc7850f6e642ee53dae8502aad247c
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/core/tpl/admin_extrafields_view.tpl.php
Log Message:
-----------
Merge pull request #8541 from atm-gauthier/FIX_count_6.0
FIX #8478 !empty instead of count to avoid warning
Commit: 628b437e28750d46ea9454f4be375537229bd2bd
https://github.com/Dolibarr/dolibarr/commit/628b437e28750d46ea9454f4be375537229bd2bd
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/compta/bank/card.php
Log Message:
-----------
Update card.php
Commit: b732844e91c98f62fca4f169875e48bb714fea72
https://github.com/Dolibarr/dolibarr/commit/b732844e91c98f62fca4f169875e48bb714fea72
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/compta/bank/card.php
Log Message:
-----------
Merge pull request #8537 from atm-arnaud/FIX_8023_missing_escape_htmltag
FIX #8023
Commit: 0518218aed63fbe6fdbbc584a97ec5ba1d53d48a
https://github.com/Dolibarr/dolibarr/commit/0518218aed63fbe6fdbbc584a97ec5ba1d53d48a
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/core/tpl/admin_extrafields_view.tpl.php
Log Message:
-----------
Fix regression
Commit: 9fafefa0d78c39d954dc7957dc4aac9117423c38
https://github.com/Dolibarr/dolibarr/commit/9fafefa0d78c39d954dc7957dc4aac9117423c38
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/compta/bank/card.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Commit: 590bc2948a745578d67af7447b42a4e8b8692d96
https://github.com/Dolibarr/dolibarr/commit/590bc2948a745578d67af7447b42a4e8b8692d96
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/compta/bank/card.php
M htdocs/core/class/commondocgenerator.class.php
M htdocs/core/tpl/admin_extrafields_view.tpl.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/compta/bank/card.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
Commit: e4f2e0ecbd0beda6354b75d42b5d9fa2de54a162
https://github.com/Dolibarr/dolibarr/commit/e4f2e0ecbd0beda6354b75d42b5d9fa2de54a162
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-11 (Wed, 11 Apr 2018)
Changed paths:
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/fourn/commande/card.php
M htdocs/langs/de_DE/admin.lang
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Compare:
https://github.com/Dolibarr/dolibarr/compare/73a896665991...e4f2e0ecbd0b