[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] bf27ca: fix : use template at the goo
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] bf27ca: fix : use template at the goos place for generate ... |
|
Date: |
Thu, 19 Apr 2018 16:40:07 -0700 |
Branch: refs/heads/7.0
Home: https://github.com/Dolibarr/dolibarr
Commit: bf27ca1b11d582de3d669f4129c986984c7d8cd7
https://github.com/Dolibarr/dolibarr/commit/bf27ca1b11d582de3d669f4129c986984c7d8cd7
Author: florian HENRY <address@hidden>
Date: 2018-04-18 (Wed, 18 Apr 2018)
Changed paths:
M htdocs/supplier_proposal/card.php
Log Message:
-----------
fix : use template at the goos place for generate doc for supplier
propoal
Commit: 882863ab48fdbdc6fea61e1e3b0a9dcba44a981f
https://github.com/Dolibarr/dolibarr/commit/882863ab48fdbdc6fea61e1e3b0a9dcba44a981f
Author: florian HENRY <address@hidden>
Date: 2018-04-18 (Wed, 18 Apr 2018)
Changed paths:
M htdocs/core/class/conf.class.php
Log Message:
-----------
fix : define in conf dir_output for suipplier_proposal modules
Commit: e1585ef7e3eb22e6f73f015e82bbeaf6a5721af5
https://github.com/Dolibarr/dolibarr/commit/e1585ef7e3eb22e6f73f015e82bbeaf6a5721af5
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-20 (Fri, 20 Apr 2018)
Changed paths:
M htdocs/core/class/conf.class.php
M htdocs/supplier_proposal/card.php
Log Message:
-----------
Merge pull request #8640 from atm-florian/6.0
fix : use template at the goos place for generate doc for supplier
Commit: c6a53ca25dbda61316a615f87835562c6fbc1ea1
https://github.com/Dolibarr/dolibarr/commit/c6a53ca25dbda61316a615f87835562c6fbc1ea1
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-20 (Fri, 20 Apr 2018)
Changed paths:
M htdocs/core/actions_sendmails.inc.php
M htdocs/core/class/conf.class.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/supplier_proposal/card.php
Commit: 7a703e149f6fc58b0512a827516592efe6f229cb
https://github.com/Dolibarr/dolibarr/commit/7a703e149f6fc58b0512a827516592efe6f229cb
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-20 (Fri, 20 Apr 2018)
Changed paths:
M htdocs/core/actions_addupdatedelete.inc.php
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Compare:
https://github.com/Dolibarr/dolibarr/compare/54154343b230...7a703e149f6f