[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 7c29fb: Fix replacement and vars name
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 7c29fb: Fix replacement and vars names |
Date: |
Mon, 24 Jun 2019 07:36:14 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 7c29fb614c34119ed919b3eb5fa86ba53eb4665f
https://github.com/Dolibarr/dolibarr/commit/7c29fb614c34119ed919b3eb5fa86ba53eb4665f
Author: John Botella <address@hidden>
Date: 2019-06-20 (Thu, 20 Jun 2019)
Changed paths:
M htdocs/core/actions_massactions.inc.php
Log Message:
-----------
Fix replacement and vars names
Commit: 252bd6d9ba7122447790e6d48c83e4dd64474762
https://github.com/Dolibarr/dolibarr/commit/252bd6d9ba7122447790e6d48c83e4dd64474762
Author: John Botella <address@hidden>
Date: 2019-06-20 (Thu, 20 Jun 2019)
Changed paths:
M htdocs/core/tpl/massactions_pre.tpl.php
Log Message:
-----------
FIX condition
Commit: 9305403bea79f07eef481067718110e03172dab5
https://github.com/Dolibarr/dolibarr/commit/9305403bea79f07eef481067718110e03172dab5
Author: John Botella <address@hidden>
Date: 2019-06-20 (Thu, 20 Jun 2019)
Changed paths:
M htdocs/core/actions_massactions.inc.php
Log Message:
-----------
Fix duplicate pdf in mass sendmail
Commit: 6a68c8cd996318c4d5997de97035157bddfbd87e
https://github.com/Dolibarr/dolibarr/commit/6a68c8cd996318c4d5997de97035157bddfbd87e
Author: John Botella <address@hidden>
Date: 2019-06-20 (Thu, 20 Jun 2019)
Changed paths:
M htdocs/core/actions_massactions.inc.php
M htdocs/core/tpl/massactions_pre.tpl.php
Log Message:
-----------
Fix display option email per participient
Commit: b21006614c874e9a59c7f25d2a711a0795474a11
https://github.com/Dolibarr/dolibarr/commit/b21006614c874e9a59c7f25d2a711a0795474a11
Author: John Botella <address@hidden>
Date: 2019-06-20 (Thu, 20 Jun 2019)
Changed paths:
M htdocs/core/class/html.formmail.class.php
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Fix substitutions null
Commit: 0865bdb60f77460b969b730f9bd175bfd90a660b
https://github.com/Dolibarr/dolibarr/commit/0865bdb60f77460b969b730f9bd175bfd90a660b
Author: florian HENRY <address@hidden>
Date: 2019-06-20 (Thu, 20 Jun 2019)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
fix depending extrafeilds list
Commit: e5298d066625c4af59b8ccbcdf5401391563fbb5
https://github.com/Dolibarr/dolibarr/commit/e5298d066625c4af59b8ccbcdf5401391563fbb5
Author: John Botella <address@hidden>
Date: 2019-06-21 (Fri, 21 Jun 2019)
Changed paths:
M htdocs/user/card.php
Log Message:
-----------
Fix send mail ancor
Commit: 200b66d11f8b349fa78f939543b1743872b3cdec
https://github.com/Dolibarr/dolibarr/commit/200b66d11f8b349fa78f939543b1743872b3cdec
Author: John Botella <address@hidden>
Date: 2019-06-21 (Fri, 21 Jun 2019)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Remove a backported fix because failling at init test
Commit: ec7ebe9f39bf21b855e1a9c19c34535cb76cfaa6
https://github.com/Dolibarr/dolibarr/commit/ec7ebe9f39bf21b855e1a9c19c34535cb76cfaa6
Author: John Botella <address@hidden>
Date: 2019-06-21 (Fri, 21 Jun 2019)
Changed paths:
M htdocs/adherents/class/adherent.class.php
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
redo backported fix and update adherent substitution methode
Commit: 7e1020861907c11cdcf47e4c1c6f1a8e6d82dafa
https://github.com/Dolibarr/dolibarr/commit/7e1020861907c11cdcf47e4c1c6f1a8e6d82dafa
Author: Laurent Destailleur <address@hidden>
Date: 2019-06-24 (Mon, 24 Jun 2019)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge pull request #11380 from atm-florian/9.0
fix depending extrafeilds list
Commit: 7bbbe49b70babf0cea5bb793b3295ad2f35eba8b
https://github.com/Dolibarr/dolibarr/commit/7bbbe49b70babf0cea5bb793b3295ad2f35eba8b
Author: Laurent Destailleur <address@hidden>
Date: 2019-06-24 (Mon, 24 Jun 2019)
Changed paths:
M htdocs/user/card.php
Log Message:
-----------
Merge pull request #11389 from atm-john/9.0_fix_ancor
Fix send mail ancor
Commit: 04606ec6a3510f30211bf8578f58dc3ac1099c02
https://github.com/Dolibarr/dolibarr/commit/04606ec6a3510f30211bf8578f58dc3ac1099c02
Author: Laurent Destailleur <address@hidden>
Date: 2019-06-24 (Mon, 24 Jun 2019)
Changed paths:
M htdocs/adherents/class/adherent.class.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/tpl/massactions_pre.tpl.php
Log Message:
-----------
Merge pull request #11384 from ATM-Consulting/7.0_fix_mass_send_mail
FIX mass send mail
Commit: 3c4956838e4a2f41b73f80cffb6fa5493f384362
https://github.com/Dolibarr/dolibarr/commit/3c4956838e4a2f41b73f80cffb6fa5493f384362
Author: Laurent Destailleur <address@hidden>
Date: 2019-06-24 (Mon, 24 Jun 2019)
Changed paths:
M htdocs/adherents/class/adherent.class.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/tpl/massactions_pre.tpl.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/tpl/massactions_pre.tpl.php
Commit: 3d185b6818a3613d9cd1a9c9fecf3f3fb1cfeb94
https://github.com/Dolibarr/dolibarr/commit/3d185b6818a3613d9cd1a9c9fecf3f3fb1cfeb94
Author: Laurent Destailleur <address@hidden>
Date: 2019-06-24 (Mon, 24 Jun 2019)
Changed paths:
M htdocs/core/actions_massactions.inc.php
M htdocs/core/class/html.formmail.class.php
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/core/actions_massactions.inc.php
htdocs/core/tpl/massactions_pre.tpl.php
Commit: 84575df7e6ecf5833c22f470c047a06f35b05a2b
https://github.com/Dolibarr/dolibarr/commit/84575df7e6ecf5833c22f470c047a06f35b05a2b
Author: Laurent Destailleur <address@hidden>
Date: 2019-06-24 (Mon, 24 Jun 2019)
Changed paths:
M htdocs/core/class/commonobject.class.php
M htdocs/user/card.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Commit: b98874848f0806032a0f54a3eb97ee13d906afab
https://github.com/Dolibarr/dolibarr/commit/b98874848f0806032a0f54a3eb97ee13d906afab
Author: Laurent Destailleur <address@hidden>
Date: 2019-06-24 (Mon, 24 Jun 2019)
Changed paths:
M htdocs/core/tpl/massactions_pre.tpl.php
Log Message:
-----------
Fix backport 9.0
Commit: 43123d6a8742dd2b1209603a638cddf8432270e3
https://github.com/Dolibarr/dolibarr/commit/43123d6a8742dd2b1209603a638cddf8432270e3
Author: Laurent Destailleur <address@hidden>
Date: 2019-06-24 (Mon, 24 Jun 2019)
Changed paths:
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Commit: 70f19b3a3d5e1408f95a4d2e9bcb264541fd3f2c
https://github.com/Dolibarr/dolibarr/commit/70f19b3a3d5e1408f95a4d2e9bcb264541fd3f2c
Author: Laurent Destailleur <address@hidden>
Date: 2019-06-24 (Mon, 24 Jun 2019)
Changed paths:
M htdocs/core/actions_massactions.inc.php
Log Message:
-----------
Fix counter of record
Commit: 609eefaf08b58f5a2b92ca34a5f7bd373b4c6b15
https://github.com/Dolibarr/dolibarr/commit/609eefaf08b58f5a2b92ca34a5f7bd373b4c6b15
Author: Laurent Destailleur <address@hidden>
Date: 2019-06-24 (Mon, 24 Jun 2019)
Changed paths:
M htdocs/core/actions_massactions.inc.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/user/card.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/actions_massactions.inc.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/202fbf5e7d5c...609eefaf08b5