[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] ca726e: FIX Error generating ODT when
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] ca726e: FIX Error generating ODT when option to use contac... |
Date: |
Wed, 31 Oct 2018 07:38:47 -0700 |
Branch: refs/heads/8.0
Home: https://github.com/Dolibarr/dolibarr
Commit: ca726e6c94fa0abc06375d7d79095ceeabcd494a
https://github.com/Dolibarr/dolibarr/commit/ca726e6c94fa0abc06375d7d79095ceeabcd494a
Author: Laurent Destailleur <address@hidden>
Date: 2018-10-31 (Wed, 31 Oct 2018)
Changed paths:
M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
M htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
M htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
M htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
M htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
Log Message:
-----------
FIX Error generating ODT when option to use contact on doc on
Commit: 07719eaf1e9c8436b50a6653bfba98c3a7c8dbd7
https://github.com/Dolibarr/dolibarr/commit/07719eaf1e9c8436b50a6653bfba98c3a7c8dbd7
Author: Laurent Destailleur <address@hidden>
Date: 2018-10-31 (Wed, 31 Oct 2018)
Changed paths:
M htdocs/core/modules/modSociete.class.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Commit: be8e48b265abddd0b6716c5db22de0cc5edf02ff
https://github.com/Dolibarr/dolibarr/commit/be8e48b265abddd0b6716c5db22de0cc5edf02ff
Author: Laurent Destailleur <address@hidden>
Date: 2018-10-31 (Wed, 31 Oct 2018)
Changed paths:
M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
M htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
M htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
M htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
M htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/6c4a2728ca03...be8e48b265ab
**NOTE:** This service has been marked for deprecation:
https://developer.github.com/changes/2018-04-25-github-services-deprecation/
Functionality will be removed from GitHub.com on January 31st, 2019.