lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

901 Commits

Author SHA1 Message Date
Frédéric FRANCE
f24a6ed4d6
loadlangs 2018-05-26 19:03:41 +02:00
florian HENRY
22cdbffb0a new : add adv targt emailing amdin with main feature level 1 2018-05-21 10:58:16 +02:00
Laurent Destailleur
63ed5dcccc Fix securekey for new online payment form 2018-05-12 11:23:40 +02:00
Laurent Destailleur
461ae46cc4 FIX When on a high page and searching for a small result, list was not 
visible.
 2018-04-24 11:37:57 +02:00
Laurent Destailleur
69adf73f4f Clean code from $var = True 2018-04-22 19:27:37 +02:00
Laurent Destailleur
ccd9aa8059 Fight against dolibarr warnings 2018-04-21 12:16:12 +02:00
Laurent Destailleur
bbfc4a3e17 NEW Look and feel v8 - Show Picto "+" on all links "Add record" 2018-04-18 03:26:15 +02:00
Laurent Destailleur
8fbde88872 Look and feel v8 2018-04-15 17:37:49 +02:00
Laurent Destailleur
86112f0096 Syntax error 2018-04-13 14:15:33 +02:00
Laurent Destailleur
d4cd5a0d95 Fix syntax error 2018-04-13 13:37:43 +02:00
Laurent Destailleur
1521b0595b Clean code 2018-04-13 11:03:03 +02:00
Laurent Destailleur
4d94327ead Look and feel v8 2018-04-07 16:17:40 +02:00
Marc de Lima Lucio
c2d3e2a701 NEW: generalize button to create object from list, for the remaining lists 2018-04-03 15:28:12 +02:00
Laurent Destailleur
191a1e9350 Fix css 2018-03-02 11:18:29 +01:00
Laurent Destailleur
c67e57836e Code comment 2018-01-29 12:58:33 +01:00
Laurent Destailleur
0a11d52d53 Fix info on email sent 2018-01-29 12:46:07 +01:00
Laurent Destailleur
ba0a96c882 Missing param limit 2018-01-26 15:37:23 +01:00
Laurent Destailleur
c5307e5cac Fix option MAILING_LIMIT_SENDBYWEB 2018-01-26 15:12:40 +01:00
Laurent Destailleur
53b36435d0 Fix on smartphone 2018-01-12 20:50:18 +01:00
Laurent Destailleur
a44363ce3d Fix responsive 2018-01-12 14:41:57 +01:00
Laurent Destailleur
af1028576d Fix on search all (trim search + search from smartphone). 2017-12-12 11:31:30 +01:00
Laurent Destailleur
ce32da6217 Fix debugs APIs 2017-12-01 15:39:18 +01:00
Laurent Destailleur
ff9a62e519 Fix trackid from emailings 2017-11-21 11:15:33 +01:00
Laurent Destailleur
c479efa480 Fix encoding with select2 2017-11-03 16:29:23 +01:00
Laurent Destailleur
2b55fb81b9 Standardize substition keys. 2017-10-13 10:35:21 +02:00
Laurent Destailleur
084dc7798d Standardize use of function getCommonSubstitutionArray 2017-10-09 14:51:42 +02:00
Laurent Destailleur
252f038468 Mutualize code of substitutions for emails 2017-09-22 14:34:31 +02:00
Laurent Destailleur
1e33495f42 Fix remove warnings 2017-09-19 00:31:51 +02:00
Laurent Destailleur
ab5724e7ff Mutualize code for forms to send emails. Remove thousand line of code. 2017-09-17 17:12:14 +02:00
Laurent Destailleur
e56b41c1ae Clean code 2017-09-16 13:28:13 +02:00
Laurent Destailleur
5e34b121dd Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
Laurent Destailleur
1a78e2a055 Mutualize/share code of all payments modes 2017-09-15 13:43:16 +02:00
Laurent Destailleur
e254554461 Code comment 2017-09-15 11:28:21 +02:00
Laurent Destailleur
1ffcb5d94e FIX background color not visible in emailing view 2017-09-15 11:24:32 +02:00
Laurent Destailleur
0ade500535 Better support of text editor when no js available. 2017-09-15 11:19:56 +02:00
Laurent Destailleur
0873260b8a USe second parameter in GETPOST 2017-09-15 10:50:50 +02:00
Laurent Destailleur
3b40c95107 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/class/categorie.class.php
 2017-09-14 21:57:14 +02:00
Laurent Destailleur
c52e593ea8 Fix this->db 2017-09-14 21:27:14 +02:00
Laurent Destailleur
939d33cce7 Fix bug reported by scrutinizer 2017-09-12 19:12:39 +02:00
Laurent Destailleur
47d2350ad4 Fix bugs reported by scrutinizer 2017-09-12 19:03:12 +02:00
Laurent Destailleur
259cca0230 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/admin/mails_templates.php
 2017-09-08 13:30:54 +02:00
Laurent Destailleur
03fe9d4e97 Escape all status 2017-09-08 13:23:12 +02:00
Laurent Destailleur
61cf69f2bb NEW Include a color syntaxed HTML editor for emailing edition. 2017-09-01 13:09:13 +02:00
Laurent Destailleur
a60cd49fb0 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
	htdocs/core/class/CMailFile.class.php
	htdocs/filefunc.inc.php
 2017-08-28 12:53:02 +02:00
Laurent Destailleur
075a138e14 Fix substitution of __EMAIL__ 2017-08-28 12:49:57 +02:00
Laurent Destailleur
54cc1ac800 Merge emailing target selectors. 2017-08-25 21:20:27 +02:00
Laurent Destailleur
d108d04add NEW Can filter on the "other" column on emailing target list 2017-08-25 19:26:48 +02:00
Laurent Destailleur
5b1f5b0f20 Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
Laurent Destailleur
bdfb0b7561 FIX pgsql compatibility. Add PHPUnit to avoid using dates without quotes 2017-07-26 21:22:53 +02:00
Laurent Destailleur
58ce8eaf46 Merge pull request #7138 from atm-florian/6.0_fix_advtargetmailing 
Fix AdvtargetEmailing
 2017-07-13 14:26:23 +02:00
Laurent Destailleur
2870798d07 Fix remove warnings 2017-07-13 00:35:10 +02:00
florian HENRY
816283d1e5 fix SQL 2017-07-12 17:51:32 +02:00
florian HENRY
c85bf18f0e Fix AdvtargetEmailing 2017-07-11 14:47:37 +02:00
Laurent Destailleur
a96362e2f9 Fix #formmailbeforetitle not supported everywhere 2017-06-11 11:40:01 +02:00
Laurent Destailleur
e93cefbbf0 FIX #6985 2017-06-11 10:37:58 +02:00
Laurent Destailleur
7c0de18ac1 Fix code comment 2017-06-10 12:56:28 +02:00
Laurent Destailleur
b441c62e1d Fix syntax error 2017-06-08 14:55:12 +02:00
Laurent Destailleur
b1f93ccb0c Fix security 2017-06-08 14:33:46 +02:00
Regis Houssin
2b36135641 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_mc
 2017-06-07 20:14:03 +02:00
Laurent Destailleur
1820649175 Maxi debug of v6 2017-06-07 19:28:31 +02:00
Regis Houssin
bfd6116e5b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2017-06-06 15:03:36 +02:00
Laurent Destailleur
02b5d9e6f7 FIX #6945 2017-06-06 10:53:53 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
b3dc73e611 Look and feel v6 2017-05-21 02:43:51 +02:00
Laurent Destailleur
7dbe3b1da9 Merge pull request #6843 from aspangaro/6.0-multijournal 
Fix : Sql error on salaries index for accountancy multijournal + debug
 2017-05-18 17:45:21 +02:00
Laurent Destailleur
68e333879f Fix var not sanitized 2017-05-16 13:27:32 +02:00
Alexandre SPANGARO
93554b7e30 Typo searchpicto 2017-05-14 21:06:33 +02:00
Laurent Destailleur
553f5b990c Fix scrutinizer errors 2017-05-13 18:50:55 +02:00
Laurent Destailleur
fa290c34fa Fix against SQL injection. Add phpunit to detect missing escapement. 2017-05-12 16:55:11 +02:00
Laurent Destailleur
e5c898e0d6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	build/makepack-dolibarr.pl
	htdocs/fichinter/list.php
	htdocs/product/list.php
	htdocs/projet/tasks/list.php
 2017-05-10 00:48:27 +02:00
Laurent Destailleur
6d01bd712d FIX Better sanitizing of search all parameter. 2017-05-09 19:36:10 +02:00
Laurent Destailleur
910a925167 NEW Add last activation author and ip of modules 2017-05-06 20:43:14 +02:00
Laurent Destailleur
0c76db7973 FIX #6698 #6742 2017-05-04 13:41:37 +02:00
Laurent Destailleur
3da0aea168 Prepare code to use different SMTP servers. 2017-04-18 01:39:06 +02:00
Laurent Destailleur
0994622bf8 NEW Can use translations into all substitutions (watermark, freetext...) 2017-04-17 23:54:09 +02:00
Laurent Destailleur
846204bdb4 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 13:02:29 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
6aa56ce0fa NEW Add a tracking id into mass emailing 
Prepare code to use a dedicated SMTP server according to context.
 2017-04-11 10:57:17 +02:00
Laurent Destailleur
da1427ef54 Work on 6.0 look and feel 2017-03-30 16:10:08 +02:00
Laurent Destailleur
47dd53abbe NEW The substitution keys available for emailing edition is now into a 
popup
 2017-03-11 02:36:22 +01:00
Laurent Destailleur
19e60f03b9 Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms 2017-02-21 14:17:44 +01:00
Laurent Destailleur
eef3824f8c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/categories.php
	htdocs/admin/dict.php
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/bills.lang
 2017-02-21 10:34:52 +01:00
Laurent Destailleur
fd111cb1c6 NEW tooltip can be on hover or on click with textwithpicto function. 2017-02-17 17:11:14 +01:00
Laurent Destailleur
7f21c3f3f2 Fix css email topic 2017-02-17 13:16:29 +01:00
Laurent Destailleur
45263c85ec Fix in emailing 2017-01-29 20:33:08 +01:00
Laurent Destailleur
ff8b7e6e4d Fix size of email 2017-01-29 18:35:56 +01:00
Laurent Destailleur
92e61e6707 Fix hide url if not defined 2017-01-29 18:29:37 +01:00
Laurent Destailleur
756919de2a Fix deadlock feature: could not solve a situation where an emailing was 
validated by error.
 2017-01-29 16:08:45 +01:00
Laurent Destailleur
b4b81d8dcb Fix css and missing translation key 2017-01-29 15:07:18 +01:00
Laurent Destailleur
d14e4dbaba Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on 2017-01-15 20:49:20 +01:00
Laurent Destailleur
6aa26e0f62 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/product/stock/massstockmove.php
	htdocs/projet/info.php
	htdocs/projet/tasks/time.php
	htdocs/societe/class/societe.class.php
 2017-01-13 16:49:18 +01:00
Laurent Destailleur
31818e8816 Fix missing translation 2017-01-13 15:32:20 +01:00
Laurent Destailleur
bbd3734a21 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
 2016-12-26 12:42:23 +01:00
Laurent Destailleur
e297b64722 Several security fix in using mailings. 2016-12-26 12:35:10 +01:00
Laurent Destailleur
e50bbb05fa Fix security bugs 2016-12-18 13:04:24 +01:00
Laurent Destailleur
9d3bd9d36f Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/errors.lang
 2016-12-18 11:57:04 +01:00
Laurent Destailleur
394e284a4a Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/core/class/CMailFile.class.php
	htdocs/langs/en_US/errors.lang
 2016-12-18 02:16:40 +01:00
Laurent Destailleur
73e6663230 Fix help/messages for emailing to warn users. 2016-12-17 14:47:06 +01:00
Laurent Destailleur
c750ba8b99 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/install/mysql/data/llx_c_payment_term.sql
	htdocs/langs/en_US/bills.lang
	htdocs/langs/en_US/mails.lang
 2016-12-16 13:56:55 +01:00
Laurent Destailleur
929904041d Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/conf/conf.php.example
	htdocs/langs/en_US/mails.lang
 2016-12-16 13:53:34 +01:00
Laurent Destailleur
534e2b1282 FIX Security to restrict email sending was not efficient 2016-12-16 13:46:39 +01:00
florian HENRY
654fbc5dc7 fix travis 2016-12-10 11:36:43 +01:00
florian HENRY
a0e8b509db Finish Advance target emailing feature (back from hashes since 3.7) 2016-12-09 19:06:59 +01:00
Laurent Destailleur
bd8f923cee Several fixes in filter on lists 2016-11-29 22:52:16 +01:00
Laurent Destailleur
2c9edd4205 Maxi debug on list. Fix responsive design. 2016-11-27 13:49:46 +01:00
Laurent Destailleur
a8c3ce4e55 FIX A form should not be inside a table. Create javascript troubles. 2016-11-26 12:21:50 +01:00
Laurent Destailleur
16ce156631 Fix responsive design 2016-11-25 18:32:52 +01:00
Laurent Destailleur
da387db166 NEW Error code of each email sent is visible in list of email targets 2016-11-11 14:03:57 +01:00
Laurent Destailleur
2cfcca82b4 Fix list of linked object block 2016-11-11 02:18:48 +01:00
Laurent Destailleur
e4c4ced5a3 Complete work on usin dol_banner 2016-11-11 01:55:53 +01:00
Laurent Destailleur
ab269bd7a6 Better responsive 2016-11-11 01:15:41 +01:00
Laurent Destailleur
0fea6f22a9 Change code to reduce need of jmobile 2016-11-05 03:27:56 +01:00
Laurent Destailleur
8f809e403d Uniformize code 2016-08-24 19:38:34 +02:00
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
Laurent Destailleur
a612289136 FIX Storing and deleting files on emailing was done at wrong place 2015-11-05 03:02:31 +01:00
philippe grand
f31ddc23aa [Qual] Uniformize code 2015-10-17 16:18:33 +02:00
Laurent Destailleur
68d4a9fc63 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/societe/list.php
 2015-10-04 20:57:00 +02:00
Laurent Destailleur
c20296f963 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-10-04 20:46:17 +02:00
Florian HENRY
fd29bb34be FIX : Mass Mailing activity don't display all status 2015-10-01 16:09:04 +02:00
Laurent Destailleur
62792c08eb Merge pull request #3591 from GPCsolutions/inherited 
[Qual] Cleanup of inherited class properties
 2015-09-26 11:23:59 +02:00
Raphaël Doursenaud
67ddb6c94e [Qual] Cleanup of inherited class properties 2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
Raphaël Doursenaud
dabfad1529 [Qual] Replaced deprecated print_titre() 2015-09-24 18:27:13 +02:00
Laurent Destailleur
563c434fcf Fix injection 2015-09-03 09:56:33 +02:00
philippe grand
39c2c6b61b the form should be outside table to avoid errors 2015-08-15 15:30:12 +02:00
Laurent Destailleur
9c80735310 An easier to use dictionary page to edit email template. 
Uniformize look.
 2015-07-04 03:28:52 +02:00
Laurent Destailleur
4a1dfa60a5 Uniformize code 2015-06-30 13:14:19 +02:00
aspangaro
9d2e964b00 Fix: print_liste_field_titre(''); 2015-06-26 06:23:29 +02:00
Laurent Destailleur
43ed48896a Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/debian/changelog
	htdocs/filefunc.inc.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2015-06-05 18:31:53 +02:00
phf
0523f226cf FIX : when mailing is deleted, the targets list was kept in database 2015-06-01 12:29:10 +02:00
Laurent Destailleur
995a2c127d Working on finishing of look 2015-05-22 15:29:19 +02:00
Laurent Destailleur
a258370f8a Prepare code for generic solution where all path are forged using 
get_exdir.
 2015-05-18 22:25:51 +02:00
Laurent Destailleur
100fa1067e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/bank/virement.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modProjet.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_GB/admin.lang
	htdocs/langs/es_AR/orders.lang
	htdocs/langs/es_AR/trips.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/orders.lang
	htdocs/langs/es_CO/trips.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pt_BR/trips.lang
	htdocs/langs/ro_RO/productbatch.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/main.inc.php
	htdocs/projet/element.php
 2015-04-22 17:57:57 +02:00
jean
8006edc278 correct issue 2589 getting user signature in script, when user is sended 
through a script parameter
 2015-04-18 16:39:53 +02:00
Laurent Destailleur
daabc113a5 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	README.md
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/cashjournal.php
 2015-02-26 13:36:07 +01:00
Laurent Destailleur
41a74c62e2 Fix trigger to insert lines where called when inserting line but also 
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
 2015-02-26 13:03:17 +01:00
Laurent Destailleur
e3713c8b6d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
 2015-02-19 00:01:26 +01:00
Laurent Destailleur
4963555669 Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-misc

Conflicts:
	htdocs/barcode/codeinit.php
 2015-02-18 22:54:02 +01:00
Marcos García de La Fuente
d1f73499e9 Refactored dashboard indicator 2015-02-15 15:01:28 +01:00
Laurent Destailleur
e3885d6d73 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/lib/tax.lib.php
 2015-02-10 21:36:38 +01:00
Laurent Destailleur
ddb95e5765 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/comm/mailing/fiche.php
	htdocs/compta/paiement/liste.php
	htdocs/contact/class/contact.class.php
	htdocs/core/lib/tax.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/langs/en_US/agenda.lang
	htdocs/webservices/server_contact.php
 2015-02-10 21:33:43 +01:00
Marcos García de La Fuente
023175b9f1 PHPDoc and misc fixes for several folders 2015-02-10 11:38:13 +01:00
Marcos García de La Fuente
0c63644038 Fix: [ bug #1819 ] SQL error when searching for an invoice payment 2015-02-01 13:26:30 +01:00
Laurent Destailleur
449f2b9346 Merge branch 'delay-emailing' of https://github.com/marcosgdf/dolibarr 
into marcosgdf-delay-emailing

Conflicts:
	htdocs/comm/mailing/card.php
 2015-01-21 00:05:19 +01:00
Laurent Destailleur
e220ce5a82 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/custom/.gitignore
	htdocs/expedition/card.php
	htdocs/fourn/card.php
	htdocs/product/fournisseurs.php
 2015-01-18 18:44:22 +01:00
Laurent Destailleur
5c5ff72ecd Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/adherents/fiche.php
	htdocs/comm/fiche.php
	htdocs/comm/mailing/fiche.php
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/paiement.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/core/tpl/login.tpl.php
	htdocs/expedition/fiche.php
	htdocs/fourn/commande/fiche.php
	htdocs/fourn/facture/fiche.php
	htdocs/fourn/facture/paiement.php
	htdocs/fourn/fiche.php
	htdocs/main.inc.php
	htdocs/product/fournisseurs.php
	htdocs/resource/card.php
 2015-01-18 17:13:42 +01:00
Marcos García de La Fuente
fb186d6ef8 Added delay between mails in Newsletter module 2015-01-18 16:26:26 +01:00
Marcos García de La Fuente
7f59cf9194 Fix: [ bug #1787 ] Incorrect behaviour of doActions hook 2015-01-17 19:28:27 +01:00
Laurent Destailleur
01209ff844 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/product/stock/card.php
 2014-11-30 14:15:38 +01:00
Laurent Destailleur
3fe2db6c8d Try to find a solution to fight against spam sending from dolibarr when 
phpmail is set.
No time to find a better solution so i add just a hidden option to
disable phpmail function.
 2014-11-29 13:50:41 +01:00
Laurent Destailleur
c7420662e6 Fixed: Module for target emailing must not be visible when modules is 
disabled.
 2014-11-29 12:40:45 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
Regis Houssin
a2446e51db New: add context "globalcard" for declaring only once all cards 2014-10-06 07:20:58 +02:00
Laurent Destailleur
ec95aacd52 Uniformize code for error reporting after a hook. 2014-09-28 03:41:32 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
aspangaro
b22aef3521 Qual: Renamed all files & links "liste.php" into "list.php" 2014-09-18 20:33:37 +02:00
Laurent Destailleur
a5deeebfdc Add try catch 2014-08-25 19:32:36 +02:00
icfr
d61d4778fb erreur de frappe 2014-07-25 19:03:31 +02:00
Marcos García de La Fuente
4f4ac30fc0 Deprecating arbitrary use of dol_htmloutput* functions 2014-07-20 02:32:13 +02:00
Marcos García de La Fuente
434bb1bec7 Migrated old message notifications to the """new""" system 2014-07-20 00:10:40 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
Marcos García de La Fuente
7e1cf124b8 Merge branch 'develop' into syslog 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/lib/replenishment.lib.php
	htdocs/societe/soc.php
 2014-07-02 21:20:02 +02:00
Marcos García de La Fuente
56abf1cd72 Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Marcos García de La Fuente
ae4bd4445e Moved dol_syslog query log to the database handler and decreased report level to DEBUG 2014-06-09 15:49:54 +02:00
Florian HENRY
0de66e838c camel case 2014-05-30 12:01:26 +02:00
Florian HENRY
d304c7785e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/modules/mailings/pomme.modules.php
 2014-05-29 14:28:01 +02:00
Florian HENRY
c19eabf711 Better target emailing status mangement 2014-05-29 14:26:27 +02:00
Laurent Destailleur
eec5d6d313 Fix: Error management of mass email feature 2014-05-17 19:02:47 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Florian HENRY
dddbc37d35 Enable option clone target emailing 2014-04-28 17:18:11 +02:00
Laurent Destailleur
cafa61ef7d Fix: Use correct syntax of date into sql requests (with quotes) 2014-03-15 23:12:00 +01:00
Laurent Destailleur
6a3323d6d1 Fix: Readonly mode does not need to use a specific toolbar with ckeditor 
4.
 2014-03-08 13:46:17 +01:00
Laurent Destailleur
6f962397e4 Start to work on a mass send remind feature. 2014-02-19 20:23:02 +01:00
Laurent Destailleur
1fd67807ce Merge remote-tracking branch 'origin/3.5' into develop 2014-01-18 01:13:29 +01:00
Laurent Destailleur
fce9baddf0 New: Add substitution key into emailing module to include securitykey 
used for paypal links into email.
 2014-01-15 17:21:13 +01:00
Grand Philippe
462f65614d Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1 2014-01-13 10:10:17 +01:00
Grand Philippe
c5689b86b4 Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1 2014-01-13 09:43:21 +01:00
Laurent Destailleur
b7190d2609 Fix: Several bugs. 2013-11-16 13:00:21 +01:00
Laurent Destailleur
2f47b0fcfd Fix: picto for status8 is a flash red icon to report a critical error 
that need a task to fix. This is not the case for a close thirdparty (a
close thirdparty is a regular status). However to have a bigger contrast
with thirdparty active, i set picto to statut5.png
 2013-11-04 23:56:15 +01:00
Laurent Destailleur
91718bc902 Qual: Replace deprecated call ->form_confirm with ->formconfirm 2013-09-06 11:51:24 +02:00
Laurent Destailleur
d802470aae I killed <td nowrap>. Hello <td class="nowrap"> ! 2013-07-19 14:23:42 +02:00
Grand Philippe
b599481ef6 standardize code 2013-06-20 09:18:12 +02:00
Marcos García
f25731b748 CR Fix 
Git required me to commit these changes
 2013-06-12 22:36:30 +02:00
Laurent Destailleur
977cd8ca4c Fix: filtering was deleting data ! 2013-06-12 22:12:06 +02:00
Laurent Destailleur
205335f347 Fix: Readonly mode for email was ok for eldy only. 2013-06-03 20:16:07 +02:00
Laurent Destailleur
5090cfee54 Fix: Clear of list broken 2013-05-27 16:12:33 +02:00
fhenry
a06581771c Reveiw extrafield for womplaiance with wiki 
http://wiki.dolibarr.org/index.php/Extrafields
 2013-04-26 10:29:14 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
Laurent Destailleur
22731788c5 Qual: Remove duplicate script. Enhance old one. 2013-04-14 20:15:55 +02:00
Laurent Destailleur
20c9370690 New: Support the mode readonly of ckeditor 2013-04-13 16:23:05 +02:00
Laurent Destailleur
f3adcc311d Qual: Removed useless table 2013-04-10 18:34:19 +02:00
Laurent Destailleur
a32a02e4c1 Fix: Removed warnings 2013-04-10 16:51:13 +02:00
Laurent Destailleur
1cf2276584 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/prospect/list.php
 2013-04-05 22:59:06 +02:00
fhenry
81b34f9918 Fix Error come from [Dolibarr-dev] Errors on comm/mailing/index.php page 
mail
 2013-04-05 09:23:31 +02:00
jfefe
cf6f4405cb Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields 
Conflicts:
	htdocs/comm/propal.php
 2013-04-01 19:44:55 +02:00
jfefe
a8874ebcc8 Uniformize usage of extrafields methods 2013-04-01 19:43:26 +02:00
Laurent Destailleur
f52fe71018 Fix: Bad div closing 2013-03-30 19:40:52 +01:00
Laurent Destailleur
89365786a8 New: enhance tool fixdosfiles.sh 
Convert DOS files to unix
 2013-03-30 14:27:13 +01:00
Laurent Destailleur
85cafee19f New: Add substitutions keys in view 2013-03-24 19:06:20 +01:00
Laurent Destailleur
b3d4811b6f New: Another method to allow style tags into email. 
Preivous one was using encoding, but this create data to not be stored
correctly into database. Old method is still available by adding
'_encoded' at end of toolbar name.
 2013-03-24 19:00:58 +01:00
Laurent Destailleur
55f9879a6c Replace table with div. Prepare work for android application. 2013-03-16 14:53:15 +01:00
Laurent Destailleur
298ba17e8f Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/exports/class/export.class.php
	htdocs/webservices/server_user.php
 2013-03-15 01:10:56 +01:00
Laurent Destailleur
9729e83e66 Fix: Do not use deprecated function 
New: ajax constant on off can be reversed
 2013-03-13 23:05:34 +01:00
fhenry
d4621c3921 Fix syntax error 2013-03-13 10:15:37 +01:00
Laurent Destailleur
5bc66318c2 New: use dolGetFirstLastname() everywher we should. 2013-03-11 15:54:01 +01:00
Laurent Destailleur
402fe2e417 Merge remote-tracking branch 'origin/3.3' into develop 2013-02-26 20:05:23 +01:00
Grand Philippe
a237be0d24 english language standardization 2013-02-23 15:26:39 +01:00
fhenry
44b5b98308 Fix [ bug #733 ] 2013-02-22 15:02:06 +01:00
Laurent Destailleur
56e11e52fa New: hookmanager class is used frequently and is a factory object, so we 
can move it during init of environment and use it globally.
 2013-01-25 19:12:54 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
 2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Regis Houssin
9812c91aff Fix: wrong EOL !!!!!!! 2013-01-10 08:27:12 +01:00
Laurent Destailleur
96416735df Fix: [ bug #618 ] External accounts can access confidential informations 
(a lot)
 2013-01-02 18:43:59 +01:00
Laurent Destailleur
dbdc4e6ce8 Fix: Normalize option names 2012-12-31 13:40:13 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Regis Houssin
2d5368e135 Fix: converting line delimiters 2012-11-20 12:11:19 +01:00
Laurent Destailleur
255bd565fb Removed warning 2012-11-17 00:58:43 +01:00
Laurent Destailleur
ce10c87e09 Fix: No message to show result 
Fix: Must not overwrite property of object
 2012-11-14 18:58:55 +01:00
Laurent Destailleur
cbff238cbd New: Support property "required" for extra fields. 2012-10-25 16:23:58 +02:00
Marcos García
be174c6b46 Fixed problem with accentuated strings 2012-09-12 17:32:14 +02:00
Marcos García
d5fc2a9488 Fixed incorrect BackToList link 2012-09-12 16:11:16 +02:00
Laurent Destailleur
2c2d17b101 Fix: Try a fix to avoid having the hover on array that should not have 
it.
 2012-09-09 13:13:24 +02:00
Laurent Destailleur
221b671636 New: The signature feature is full ok now. 2012-09-06 19:07:51 +02:00
Laurent Destailleur
aef1e29ad7 Qual: Interface is more clear. 2012-09-05 19:35:04 +02:00
Marcos García
4209898d20 Lower-cased Header function 2012-08-31 05:58:38 +02:00
Regis Houssin
4d1555f4ca Merge pull request #338 from atm-maxime/mko515 
Mko515
 2012-08-23 00:01:05 -07:00
Maxime Kohlhaas
332ee652c3 Clear action was called with a rowid instead of id (rowid is for a target of the emailing, id is for the emailing) 2012-08-23 08:45:45 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
ea119c45a2 Lower-cased all <?PHP 2012-08-22 23:27:53 +02:00
Marcos García
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Regis Houssin
eee5653c54 Fix: try to use the new message system 2012-07-29 12:54:19 +02:00
Regis Houssin
9cdba5bb61 Fix: try another method more clean and can be deployed on any type of 
message
 2012-07-29 08:26:33 +02:00
Regis Houssin
75588c2eb3 Merge pull request #272 from marcosgdf/backtolist-links 
Created BackToList links
 2012-07-28 13:15:42 -07:00
Regis Houssin
c7bacecf10 Fix: try to use another method for messages 2012-07-28 22:07:27 +02:00
Marcos García
9dc38f4382 Created rest of BackToList links 2012-07-28 21:49:47 +02:00
FHenry
6fc9bf5143 Correct mail tag __UNSUSCRIBE__ to __UNSUBSCRIBE__ 2012-07-24 10:18:17 +02:00
Regis Houssin
d5ff308992 Fix: declare $mesg and $mesgs in main.inc.php 
Fix: strict mode be back
 2012-07-23 20:52:55 +02:00
Regis Houssin
fb23364511 Fix: uniformize code 2012-07-23 16:10:54 +02:00
Laurent Destailleur
1c17767dda Fix: Send instructions must be into core page. 2012-07-22 23:22:40 +02:00
Regis Houssin
2e22ac895f Fix: change smtps for have the same email structure of phpmail 2012-06-17 18:43:30 +02:00
Regis Houssin
cf7872497e New: add EXTERNAL_USERS_ARE_AUTHORIZED for bypass security access for 
external users
 2012-06-15 16:53:44 +02:00
Regis Houssin
c6d703de54 Fix: convert lines delimiters 2012-06-15 11:20:09 +02:00
Regis Houssin
a7e45ae10d Fix: missing urlfrom 2012-06-15 11:18:44 +02:00
Regis Houssin
1155b0097b New: add advanced rights 2012-06-14 20:11:54 +02:00
Regis Houssin
515d8278bc Fix: wrong method 2012-06-14 09:44:27 +02:00
Regis Houssin
159206d52c Fix: $id and $rowid conflict 2012-06-14 09:27:16 +02:00
Regis Houssin
7644fa96dc Fix: uniformize code and add specific rights 2012-06-13 21:48:59 +02:00
Regis Houssin
0d6004588e Fix: adjust user rights and change status icon 2012-06-13 21:48:38 +02:00
Regis Houssin
6246228544 New: add extraparams, hooks and extrafields for emailing card 2012-06-13 09:28:59 +02:00
Laurent Destailleur
d9efb88d35 Fix: Can edit emailing even when validated. 2012-05-30 21:40:32 +02:00
Laurent Destailleur
7213ae09fe Checkstyle 2012-05-29 00:08:00 +02:00
Laurent Destailleur
6b2faf02d9 Checkstyle 2012-05-23 23:34:00 +02:00
Laurent Destailleur
ed93e5cc7c Qual: Serious clean of code of formconfirm method. This also solve bugs 
of ecm module when using ajax.
 2012-05-23 23:23:57 +02:00
FHenry
63f6707a7b correct bug #410 
Conflicts:
	htdocs/comm/mailing/cibles.php
 2012-05-21 16:16:24 +02:00
Laurent Destailleur
d0c0a0a42c Fix: Bad warning 2012-05-09 18:16:09 +02:00
Laurent Destailleur
8823f9234f Fix: Bad warning 2012-05-09 17:58:38 +02:00
Laurent Destailleur
cc2ce60312 Fix: Validate broken, missing warning on bad email. 2012-05-09 17:15:44 +02:00
Laurent Destailleur
34f433ee4b Uniformize code 2012-05-09 17:14:46 +02:00
Laurent Destailleur
aa6eb25f85 Qual: Uniformize code 2012-05-09 16:40:54 +02:00
Regis Houssin
73487a6aec Fix: replace mktime() by dol_now() 2012-04-30 15:01:25 +02:00
FHenry
dc42e16ff1 Secure URL use to CheckRead and Unsubcribe with security key in 
configuration screen
 2012-04-30 13:49:29 +02:00
FHenry
5ed77c8d40 Rename global variable from MAIN_SOCIETE_UNSUBSCRIBE to 
MAILING_EMAIL_UNSUBSCRIBE to be reliable on dolibarr implementation
 2012-04-22 11:19:04 +02:00
FHenry
2749117aba Add __MAILTOEMAIL__ and configutation gobal varialbe of Check Read and 
unsubscribe in Admin part
 2012-04-10 14:32:54 +02:00
Regis Houssin
533d862470 Fix: wrong var name and multi-line function call not indented correctly 2012-04-06 08:34:33 +02:00
Laurent Destailleur
befaf655aa Fix: Disable feature by default. Need option MAIN_SOCIETE_UNSUBSCRIBE to 
enable because feature is a security hole.
 2012-04-05 21:02:00 +02:00
FHenry
6f7773d7e2 Correction lien desincription et mailto:email 2012-04-05 16:45:41 +02:00
FHenry
5bfff3920f Module e-maillling : Correctif et evolution Accusé de lecture et 
desinscription
 2012-04-04 15:23:32 +02:00
Laurent Destailleur
c77bc5adf5 Doxygen 2012-03-31 15:42:33 +02:00
Regis Houssin
83272dfd69 Fix: compatibility with edit in place 2012-03-23 21:22:47 +01:00
Regis Houssin
d5aad28768 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/comm/mailing/fiche.php
 2012-03-23 20:06:11 +01:00
Regis Houssin
8c7f405ac9 Fix: uniformize code 2012-03-23 20:03:57 +01:00
Regis Houssin
ffc6812241 Fix: avoid php strict mode warning 2012-03-23 18:19:50 +01:00
Laurent Destailleur
0fd372e5da Trans: Update language files 
New: Prepare code to allow any module to change/add content of
predefined mail and signature.
 2012-03-22 23:52:02 +01:00
Laurent Destailleur
ed41e03589 Qual: Fix a ton of CheckStyle errors 2012-03-18 19:23:01 +01:00
FHenry
0cf4619682 Emailing campaign- unsubcribe and use of md5 tag 2012-03-01 14:51:07 +01:00
Laurent Destailleur
1645ddbe47 Sec: Sanitize all input for ids. 2012-02-27 22:26:22 +01:00
FHenry
229176ea65 Read Receipt in module emailing 2012-02-22 20:49:55 +01:00
Laurent Destailleur
0a17345415 Doxygen 2012-02-16 18:39:22 +01:00
Laurent Destailleur
78f038766e Sort emailing submodules by name 2012-01-26 23:08:20 +01:00
Laurent Destailleur
0ab6cec007 New: emailing submodules can be stored into the module directory. 2012-01-26 23:05:59 +01:00
Laurent Destailleur
3f8d2cbef8 Qual: Remove checkstyle warnings 2012-01-04 21:23:50 +01:00
Laurent Destailleur
484d0c82bf Uniformize code 2011-12-17 13:51:31 +01:00
Laurent Destailleur
311f013289 Fix: [ bug #236 ] Can't attach a file to e-mailings 2011-11-21 13:17:14 +01:00
Regis Houssin
cbec43e098 Fix: change 'editfieldkey' and 'editfieldval' for compatibility with 
external module and hook system.
Fix: uniform code
 2011-11-09 06:14:42 +08:00
Regis Houssin
f0c327c070 Fix: uniform code 
replace all $html by $form with exceptions "$htmlname, $htmltooltip"
 2011-11-08 17:22:31 +08:00
Laurent Destailleur
40da2e23d2 Qual: Reduce sub-options of module fckeditor. This make code cleaner 
and all this duplicated options were useless.
 2011-11-05 23:18:49 +01:00
Regis Houssin
3338649316 [task #217] Move core files in core directory 2011-10-24 14:11:49 +02:00
Regis Houssin
56d6cbe56f [task #216] Move lib in core directory 2011-10-24 12:59:44 +02:00
Regis Houssin
c65238b773 [task #216] Move lib in core directory 2011-10-24 10:45:06 +02:00
Regis Houssin
30c5f4b214 Move all core class in htdocs/core/class 2011-10-24 09:29:17 +02:00
Laurent Destailleur
be6286c4b8 Qual: More POO. 
Qual: Doxygen
 2011-09-20 17:19:46 +00:00
Regis Houssin
2c1b3722f2 Fix: replace sizeof() by count() 2011-09-17 19:49:50 +00:00
Regis Houssin
2ecc03104c Fix: remove obsolete tags (in progress) 2011-08-27 15:14:31 +00:00
Regis Houssin
726d9581dd Fix: remove obsolete tags (in progress) 2011-08-27 14:24:16 +00:00
Laurent Destailleur
9f663d5677 Qual: Clean code 2011-08-20 15:11:31 +00:00
Laurent Destailleur
f4606c2253 Fix: Avoid errors into rpm packages 2011-08-03 00:45:22 +00:00
Laurent Destailleur
3c0aaac072 Use global option if local not defined 2011-07-10 13:33:53 +00:00
Laurent Destailleur
3b3f937e47 Fix: EMail sent message 2011-07-02 16:48:31 +00:00
Laurent Destailleur
337f41c8e1 Uniformize code 2011-06-17 22:24:52 +00:00
Laurent Destailleur
9cc22004fc Use function to notify errors 2011-06-15 09:58:13 +00:00
Laurent Destailleur
40e4aeb34a New: Replace internal javascript with jquery plugins. 2011-06-11 02:25:05 +00:00
Laurent Destailleur
311339b0ca Qual: Optimize substitution engine 2011-06-08 22:08:02 +00:00
Laurent Destailleur
733e0a54f0 Fix: Missing trans 2011-05-25 19:21:34 +00:00
Regis Houssin
78bc93405b Fix: problem for delete an attach file 2011-03-25 19:12:59 +00:00
Laurent Destailleur
0e82e249a5 Fix: EMail from and errrors to must not be editable when email is sent 2011-03-23 19:30:37 +00:00
Regis Houssin
aba9bb9acd Fix: compatibility with pgsql, replace all addslashes by $db->escape in other files 2011-02-24 18:22:24 +00:00
Regis Houssin
3b4ea76538 Fix: compatibility with pgsql, replace all addslashes by $this->db->escape in class 2011-02-24 18:11:12 +00:00
Laurent Destailleur
638cb105df Fix: HTML tags must be escaped 2011-02-18 10:45:38 +00:00
Regis Houssin
09f6fab2cc New: add width parameter in editor 2011-02-02 16:56:55 +00:00
Regis Houssin
88354f1bce Fix: use a negative value to not allow the sending of email marketing, only the test can 2011-01-21 10:58:05 +00:00
Laurent Destailleur
f0f9e5fb53 Fix: Link to source was wrong 2010-12-28 02:04:41 +00:00
Regis Houssin
5d34c94158 New: add possibility to overwrite mailing limit sendbyweb in conf.php 2010-12-27 14:54:27 +00:00
Laurent Destailleur
b5e5dc3849 Fix: Fix regression by adding "custom" feature making web server hang in infinite loop. 2010-12-15 18:15:08 +00:00
Laurent Destailleur
6539f61785 Fix: Maxi debug of emailing feature 2010-12-13 18:40:04 +00:00
Laurent Destailleur
6e75a3d203 Restore work lost by savannah backup 2010-12-01 21:16:28 +00:00
Laurent Destailleur
adfb9ea341 Sec: Removed security holes 2010-11-20 13:08:44 +00:00
Laurent Destailleur
46ad8917ad Perf: A little speed enhancement on document tabs. 2010-10-03 15:50:34 +00:00
Laurent Destailleur
554abc46c7 Work on task #10579 : Simplify code using editor 2010-09-02 18:51:47 +00:00
Laurent Destailleur
11041ce3fa New: task #10538: Add filter on expiration date of subscription for foundation module email selector. 
Fix: Postgresql compatibility.
 2010-08-12 22:23:44 +00:00
Laurent Destailleur
2ff16421a5 Fix: Permissions 2010-07-15 08:46:33 +00:00
Laurent Destailleur
adac87c322 Fix: Permission edition 2010-07-15 08:42:05 +00:00
Laurent Destailleur
d581065f83 Fix: Message more clear. 2010-07-11 12:16:04 +00:00
Laurent Destailleur
97a372ddf5 Fix: Button Validate was not visible. 2010-07-11 11:36:35 +00:00
Laurent Destailleur
6296c2ab22 Removed deprecated code 2010-06-18 22:26:35 +00:00
Laurent Destailleur
10f86aa217 Reorganize class files. 2010-06-05 15:32:18 +00:00
Laurent Destailleur
f83954daef Fix: Change status of order to cancel 2010-05-17 12:43:36 +00:00
Laurent Destailleur
2a29f90d14 Fix: Bad path for some includes 
New: Add more predefined actions
 2010-05-12 11:58:58 +00:00
Laurent Destailleur
fa8a201d04 Mutualize a lot of code 2010-05-12 11:29:21 +00:00
Laurent Destailleur
f7e30a0a5b Qual: Removed pdate 2010-05-08 19:31:44 +00:00
Philippe Grand
4deb00ef2e according to new tree directory 2010-05-03 08:43:33 +00:00
Philippe Grand
a981577553 according to new tree directory 2010-05-03 08:43:32 +00:00
Laurent Destailleur
968addfad3 Fix: Better error management in upload files 2010-05-01 14:28:48 +00:00
Philippe Grand
b68a359265 according to new tree directory 2010-04-28 10:02:54 +00:00
Laurent Destailleur
fd04ae0500 New: Can join files on emailing campaigns. 2010-04-17 13:23:50 +00:00
Laurent Destailleur
846ed3688e EMailing edit page more user firendly 2010-04-17 09:47:25 +00:00
Regis Houssin
2ca163f388 Fix: class not found 
Fix: utf-8
 2010-04-09 22:44:55 +00:00
Philippe Grand
78b9faca85 move class file commonobject to core directory 2010-03-29 16:40:57 +00:00
Laurent Destailleur
f8329da895 Remove pre.inc.php 2010-03-27 02:35:08 +00:00
Laurent Destailleur
465cc90759 Fix W3C errors in page forging 2010-03-15 23:54:37 +00:00
Laurent Destailleur
8980d9acc2 Move permission "see hidden categories" into "see hidden products/services". 2010-03-12 23:40:39 +00:00
Laurent Destailleur
3b00caf734 New: task #10113 : Show list of emailing on clicking on "number of mass emailing received" 2010-02-21 21:21:12 +00:00
Laurent Destailleur
db5642274d Look: Use style fieldrequired on mandatory fields 2010-02-21 19:35:58 +00:00
Laurent Destailleur
6ef542d940 New: Can remove attached files before sending emails 2010-01-13 10:30:33 +00:00
Laurent Destailleur
dca2580ea1 Fix: EMail content can't be empty 
New: Use confirm box to send email
New: Show command line to send even if send by web is allowed
 2009-12-30 00:18:01 +00:00
Laurent Destailleur
f7be904ab6 New: Add a default errors-to for emailing module. 2009-12-29 20:32:59 +00:00
Laurent Destailleur
3ef86dedec Qual: Translation of status must be in the "view" functions. 2009-12-17 15:52:37 +00:00
Laurent Destailleur
aa1a21c7e4 Fix: Errors with numberwords module 2009-11-01 15:26:56 +00:00
Regis Houssin
37c2825f93 Fix: functions "ereg", "ereg_replace", "eregi", "eregi_replace" is deprecated since php 5.3.0 2009-10-22 15:09:04 +00:00
Regis Houssin
8b452fefa8 Fix: functions "ereg", "ereg_replace", "eregi", "eregi_replace" is deprecated since php 5.3.0 2009-10-21 09:42:47 +00:00