[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] e88830: FIX: dont print empty date in
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] e88830: FIX: dont print empty date in CommonObject::showOu... |
Date: |
Thu, 19 Apr 2018 16:50:22 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: e88830820a55d4820eb8dfc5c19d704b161fd45b
https://github.com/Dolibarr/dolibarr/commit/e88830820a55d4820eb8dfc5c19d704b161fd45b
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-04-18 (Wed, 18 Apr 2018)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
FIX: dont print empty date in CommonObject::showOutputField
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: 893ce55852a3320f90eee6fe293ad27cb8ea577e
https://github.com/Dolibarr/dolibarr/commit/893ce55852a3320f90eee6fe293ad27cb8ea577e
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-04-19 (Thu, 19 Apr 2018)
Changed paths:
M htdocs/core/actions_addupdatedelete.inc.php
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
FIX: commonobject: don't require notnull field if default set
Commit: 15aeffee7d26d1535cc6963ee9d9b07794529267
https://github.com/Dolibarr/dolibarr/commit/15aeffee7d26d1535cc6963ee9d9b07794529267
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-20 (Fri, 20 Apr 2018)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge pull request #8638 from ATM-Marc/FIX_showOutputField_empty_date
FIX: don't print empty date in CommonObject::showOutputField
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: 54154343b2307e0892f36812b6050442c68934c1
https://github.com/Dolibarr/dolibarr/commit/54154343b2307e0892f36812b6050442c68934c1
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 pull request #8643 from ATM-Marc/FIX_7.0_commonobject_default
FIX: CommonObject: don't require 'notnull' field if 'default' set
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
Commit: e621daa61d7db5ec387e2a38c57c3fb5df278f71
https://github.com/Dolibarr/dolibarr/commit/e621daa61d7db5ec387e2a38c57c3fb5df278f71
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/actions_sendmails.inc.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/conf.class.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into develop
Commit: bbd1257222342b2138f7909a782e21534ffdac27
https://github.com/Dolibarr/dolibarr/commit/bbd1257222342b2138f7909a782e21534ffdac27
Author: Laurent Destailleur <address@hidden>
Date: 2018-04-20 (Fri, 20 Apr 2018)
Changed paths:
M htdocs/accountancy/admin/account.php
M htdocs/accountancy/admin/accountmodel.php
M htdocs/accountancy/admin/card.php
M htdocs/accountancy/admin/categories.php
M htdocs/accountancy/admin/categories_list.php
M htdocs/accountancy/admin/defaultaccounts.php
M htdocs/accountancy/admin/export.php
M htdocs/accountancy/admin/fiscalyear.php
M htdocs/accountancy/admin/fiscalyear_card.php
M htdocs/accountancy/admin/fiscalyear_info.php
M htdocs/accountancy/admin/importaccounts.php
M htdocs/accountancy/admin/index.php
M htdocs/accountancy/admin/journals_list.php
M htdocs/accountancy/admin/productaccount.php
M htdocs/accountancy/bookkeeping/balance.php
M htdocs/accountancy/bookkeeping/balancebymonth.php
M htdocs/accountancy/bookkeeping/list.php
M htdocs/accountancy/bookkeeping/listbyaccount.php
M htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
M htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
M htdocs/accountancy/class/accountingaccount.class.php
M htdocs/accountancy/class/accountingjournal.class.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/accountancy/customer/card.php
M htdocs/accountancy/customer/lines.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/expensereport/card.php
M htdocs/accountancy/expensereport/lines.php
M htdocs/accountancy/expensereport/list.php
M htdocs/accountancy/index.php
M htdocs/accountancy/supplier/card.php
M htdocs/accountancy/supplier/lines.php
M htdocs/accountancy/supplier/list.php
M htdocs/admin/defaultvalues.php
M htdocs/admin/tools/dolibarr_export.php
M htdocs/contact/list.php
M htdocs/contrat/card.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/class/html.formticketsup.class.php
M htdocs/public/ticketsup/create_ticket.php
M htdocs/public/ticketsup/list.php
M htdocs/ticketsup/card.php
M htdocs/ticketsup/class/ticketsup.class.php
M htdocs/ticketsup/list.php
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/c10c962d3a83...bbd125722234