[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] abb343: Fix missing name alias field
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] abb343: Fix missing name alias field in societe import/exp... |
|
Date: |
Sat, 03 Nov 2018 11:15:59 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: abb343d37e043840bcfd5d295b71331ab821599f
https://github.com/Dolibarr/dolibarr/commit/abb343d37e043840bcfd5d295b71331ab821599f
Author: Maxime Kohlhaas <address@hidden>
Date: 2018-10-27 (Sat, 27 Oct 2018)
Changed paths:
M htdocs/core/modules/modSociete.class.php
Log Message:
-----------
Fix missing name alias field in societe import/export #9091
Commit: 68804cf8a559cb1383c0801811013df3ccf4163f
https://github.com/Dolibarr/dolibarr/commit/68804cf8a559cb1383c0801811013df3ccf4163f
Author: Laurent Destailleur <address@hidden>
Date: 2018-10-30 (Tue, 30 Oct 2018)
Changed paths:
M htdocs/core/modules/modSociete.class.php
Log Message:
-----------
Merge pull request #9890 from atm-maxime/fix_import_societe_alias
FIX missing name alias field in societe import/export #9091
Commit: 46fd3bcaf87843dd576ea11b35dac93eb00491ca
https://github.com/Dolibarr/dolibarr/commit/46fd3bcaf87843dd576ea11b35dac93eb00491ca
Author: Frédéric FRANCE <address@hidden>
Date: 2018-10-30 (Tue, 30 Oct 2018)
Changed paths:
M htdocs/holiday/month_report.php
Log Message:
-----------
fix display holiday month report if none
Commit: a183c7d1315d02c7f025d85d19969938d82f9709
https://github.com/Dolibarr/dolibarr/commit/a183c7d1315d02c7f025d85d19969938d82f9709
Author: Laurent Destailleur <address@hidden>
Date: 2018-10-30 (Tue, 30 Oct 2018)
Changed paths:
M htdocs/holiday/month_report.php
Log Message:
-----------
Merge pull request #9926 from frederic34/patch-9
fix display holiday month report if none
Commit: 866729cd21a56086a2aa353eb063c4136986d1f7
https://github.com/Dolibarr/dolibarr/commit/866729cd21a56086a2aa353eb063c4136986d1f7
Author: Laurent Destailleur <address@hidden>
Date: 2018-10-30 (Tue, 30 Oct 2018)
Changed paths:
M htdocs/core/class/notify.class.php
Log Message:
-----------
FIX bad link in notification
Commit: ea5b0f53d0579d57caf537ca7c53e795be1924b1
https://github.com/Dolibarr/dolibarr/commit/ea5b0f53d0579d57caf537ca7c53e795be1924b1
Author: Laurent Destailleur <address@hidden>
Date: 2018-10-30 (Tue, 30 Oct 2018)
Changed paths:
M htdocs/holiday/month_report.php
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into 8.0
Commit: c9ef298839bc57c06222cd736fde4df80cd46209
https://github.com/Dolibarr/dolibarr/commit/c9ef298839bc57c06222cd736fde4df80cd46209
Author: Laurent Destailleur <address@hidden>
Date: 2018-10-31 (Wed, 31 Oct 2018)
Changed paths:
M htdocs/install/mysql/data/llx_c_email_templates.sql
M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
M htdocs/langs/fr_FR/members.lang
Log Message:
-----------
Fix setup template emails
Commit: 693570c48b93354725eb62f96506e13498968f99
https://github.com/Dolibarr/dolibarr/commit/693570c48b93354725eb62f96506e13498968f99
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 8.0
Conflicts:
htdocs/core/modules/modSociete.class.php
Commit: 19134e82cbcd6c01f1230bbccb6b1ce3e488b6d7
https://github.com/Dolibarr/dolibarr/commit/19134e82cbcd6c01f1230bbccb6b1ce3e488b6d7
Author: Laurent Destailleur <address@hidden>
Date: 2018-10-31 (Wed, 31 Oct 2018)
Changed paths:
M ChangeLog
Log Message:
-----------
Prepare 8.0.3
Commit: 6c4a2728ca038822c2464ae93cde10608043dc09
https://github.com/Dolibarr/dolibarr/commit/6c4a2728ca038822c2464ae93cde10608043dc09
Author: Laurent Destailleur <address@hidden>
Date: 2018-10-31 (Wed, 31 Oct 2018)
Changed paths:
M build/makepack-dolibarr.pl
Log Message:
-----------
Fix build
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
Commit: 4b402aa6d1a6c98e8b2c80a019320f80eded4c8c
https://github.com/Dolibarr/dolibarr/commit/4b402aa6d1a6c98e8b2c80a019320f80eded4c8c
Author: Laurent Destailleur <address@hidden>
Date: 2018-10-31 (Wed, 31 Oct 2018)
Changed paths:
M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
Log Message:
-----------
Fix regression on name of array
Commit: 5b83026fcd5531c68de6eb92abcb924043bdc3fa
https://github.com/Dolibarr/dolibarr/commit/5b83026fcd5531c68de6eb92abcb924043bdc3fa
Author: Laurent Destailleur <address@hidden>
Date: 2018-10-31 (Wed, 31 Oct 2018)
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 8.0
Commit: 114073555446e0fe6179a0a9cc1aab1e807b0e35
https://github.com/Dolibarr/dolibarr/commit/114073555446e0fe6179a0a9cc1aab1e807b0e35
Author: Laurent Destailleur <address@hidden>
Date: 2018-11-01 (Thu, 01 Nov 2018)
Changed paths:
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix css
Commit: c4bf0f0e038dd41a02ce1c121122e92d981379cb
https://github.com/Dolibarr/dolibarr/commit/c4bf0f0e038dd41a02ce1c121122e92d981379cb
Author: Laurent Destailleur <address@hidden>
Date: 2018-11-03 (Sat, 03 Nov 2018)
Changed paths:
M htdocs/index.php
Log Message:
-----------
CSS Flex
Commit: 67fbb3dbb6571e26f442b26921e82b90ce7c619a
https://github.com/Dolibarr/dolibarr/commit/67fbb3dbb6571e26f442b26921e82b90ce7c619a
Author: Laurent Destailleur <address@hidden>
Date: 2018-11-03 (Sat, 03 Nov 2018)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
M htdocs/core/class/notify.class.php
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/modSociete.class.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
M htdocs/holiday/month_report.php
M htdocs/install/mysql/data/llx_c_email_templates.sql
M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
M htdocs/langs/fr_FR/members.lang
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/core/class/notify.class.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/68ec172798cf...67fbb3dbb657
**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.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] abb343: Fix missing name alias field in societe import/exp...,
Laurent Destailleur <=