Commit Graph

438 Commits

Author SHA1 Message Date
Laurent Destailleur
20a2282efc Updated screenshots 2016-07-31 16:24:32 +02:00
Laurent Destailleur
d22ef4f371 Fix Do not show status 2016-07-06 22:35:12 +02:00
florian HENRY
37ee64ae9b fix 4672 2016-06-30 17:10:06 +02:00
Laurent Destailleur
2767df2e01 FIX Solve problem of sending joinded files of another email when several
tabs are opened on form to send emails.
2016-06-24 16:10:52 +02:00
Laurent Destailleur
eac5cbb0dd FIX Fix the reposition on the clear target button. 2016-06-19 11:59:55 +02:00
Laurent Destailleur
9019576394 Fix css class opacitymedium was not used everywhere. 2016-06-07 15:58:02 +02:00
Laurent Destailleur
9eee61e6b7 Fix trans 2016-06-06 11:13:19 +02:00
Laurent Destailleur
c8d98dbfdc FIX error reported by scrutinizer 2016-05-08 11:33:46 +02:00
Juanjo Menent
ae6e233781 Merge pull request #5176 from Dolibarr/scrutinizer-patch-3
Scrutinizer Auto-Fixes
2016-05-07 00:49:57 +02:00
Laurent Destailleur
bf09e4a0b9 PHPdoc 2016-05-06 21:28:06 +02:00
Scrutinizer Auto-Fixer
9508d8a5c0 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-05-06 19:10:59 +00:00
Laurent Destailleur
91d300289f Minor fix in presentation 2016-05-06 12:15:44 +02:00
Laurent Destailleur
a05963ee2b Better position for clear button 2016-05-06 11:22:58 +02:00
Laurent Destailleur
5a75f346ff Debug advanced selector 2016-05-06 00:02:22 +02:00
Laurent Destailleur
cdbbe8d87b Minor fixes 2016-05-05 23:44:44 +02:00
Florian HENRY
b7a0ab784b travis 2016-04-04 16:59:17 +02:00
Florian HENRY
c0c37c4992 travis 2016-04-04 16:36:39 +02:00
Florian HENRY
86c34a313e travis 2016-04-04 15:28:25 +02:00
Florian HENRY
038b928ea4 fix travis 2016-04-01 17:09:03 +02:00
Florian HENRY
ae51321040 Debug Advance target emailing 2016-04-01 14:30:02 +02:00
Florian HENRY
304aab957b Start implement advance arget emalaing 2016-04-01 10:52:19 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Laurent Destailleur
26de415b77 Revert commit that break compatibility of 100% of modules 2016-03-25 15:24:57 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
4d78932fe8 NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions 2016-03-20 14:15:21 +01:00
Laurent Destailleur
446a080c75 NEW Mutualize code to manage email substitution variables. Show
available variables into page to edit email templates.
2016-03-05 12:20:58 +01:00
Laurent Destailleur
7aaae143fc Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/expedition/card.php
2016-02-15 02:01:58 +01:00
Laurent Destailleur
3bcc7b0f8f Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/comm/remise.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/price.php
2016-02-15 01:37:23 +01:00
aspangaro
45cc841b92 Correct travis 2016-02-13 08:10:13 +01:00
Laurent Destailleur
94732b8ae9 NEW When emailing is not sent completely, show progression 2016-02-12 14:23:40 +01:00
Laurent Destailleur
d0ab1db19b NEW When emailing is not sent completely, show progression 2016-02-12 14:21:44 +01:00
Laurent Destailleur
2796875ed1 Can select size of list of targets of email 2016-02-12 13:58:24 +01:00
Laurent Destailleur
e169cd3364 Fix usage of filter into selection of email members into emailing. 2016-02-10 23:48:18 +01:00
Regis Houssin
0b25601307 Fix: wrong object name 2016-02-08 12:31:40 +01:00
Regis Houssin
9b10f030bf Fix: missing signature and uniformize code between card and script 2016-02-08 12:20:40 +01:00
Laurent Destailleur
5e9fd25a6e Merge remote-tracking branch 'origin/3.8' into 3.9 2016-01-30 15:59:40 +01:00
Regis Houssin
2b7b7e014d Fix: for avoid conflict with "global $m" in memory.lib.php 2016-01-22 13:20:21 +01:00
Laurent Destailleur
db7a98f0ef Fix: When a payment mode was disabled, it was not visible on old
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
2015-12-21 13:56:59 +01:00
Laurent Destailleur
9973315a07 Fix we muste have ($limit = $conf->liste_limite; $offset = $limit *
$page) and not ($offset = $conf->liste_limite * $page).
In a future $limit that could be overwrite from search post form.
2015-12-16 19:38:40 +01:00
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
2015-12-13 16:23:33 +01:00
philippe grand
30eb08151d [Qual] Close database handler should be after Footer 2015-12-11 14:19:38 +01:00
Florian HENRY
955fad910d FIX : Bug: $this is not accessible in static context in
Mailing::libStatutDest #4050
2015-12-04 17:32:17 +01:00
Laurent Destailleur
b47dbc7a5f Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/install/pgsql/functions/functions.sql
	htdocs/projet/element.php
2015-11-26 01:32:21 +01:00
Laurent Destailleur
2a345b6fc0 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/admin/company.php
	htdocs/admin/menus/edit.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
2015-11-21 12:48:41 +01:00
Marcos García de La Fuente
e31a8f25a2 FIX #4018 SQL error if trying to access the mailing/card.php page without an ID defined 2015-11-21 10:55:23 +01:00
Marcos García de La Fuente
2dedea8736 FIX #4016 User link is not correctly formed in emailing receivers 2015-11-20 22:03:44 +01:00
philippe grand
b34edeb751 [Qual] Uniformize code 2015-11-07 21:56:21 +01:00
philippe grand
5f74a0f1c0 Traduction 2015-11-06 09:46:18 +01:00
philippe grand
67c9db6a51 [Qual] Uniformize code 2015-11-06 09:36:16 +01:00
Laurent Destailleur
f319976e5d FIX #3878 Storing and deleting files on emailing was done at wrong place
Conflicts:
	htdocs/comm/mailing/card.php
2015-11-05 03:08:15 +01:00