Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
61,071 Commits 36 Branches 189 Tags
8f34de1036680906ebdb8c05e6460077b5dc4b43
Commit Graph

124 Commits

Author SHA1 Message Date
Laurent Destailleur
a9e7f8b9e6 Fix trans 2017-08-25 21:27:19 +02:00
Laurent Destailleur
54cc1ac800 Merge emailing target selectors. 2017-08-25 21:20:27 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
8c2b70c4a7 Fix filechecker 2017-03-25 20:51:02 +01:00
Laurent Destailleur
b9a9997688 Page societe/soc.php and compta/facture.php was renamed into card.php 
to match page naming conventions.
 2017-03-20 21:29:22 +01:00
Laurent Destailleur
b4b81d8dcb Fix css and missing translation key 2017-01-29 15:07:18 +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
florian HENRY
1d96f5316e travis 2016-07-05 15:14:28 +02:00
florian HENRY
afb924043f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_fix5353

Conflicts:
	htdocs/core/modules/mailings/advthirdparties.modules.php
 2016-07-04 20:43:14 +02:00
Laurent Destailleur
3d72f788b9 Fix phpcs 2016-07-02 18:02:39 +02:00
florian HENRY
9bbde79755 fix travis 2016-07-01 15:09:28 +02:00
florian HENRY
37ee64ae9b fix 4672 2016-06-30 17:10:06 +02:00
Laurent Destailleur
4382f2a437 Clean language files 2016-06-18 11:06:11 +02:00
Laurent Destailleur
cf8c180fa4 Fix perm and CRLF 2016-05-18 16:26:15 +02:00
Laurent Destailleur
c8d98dbfdc FIX error reported by scrutinizer 2016-05-08 11:33:46 +02:00
Florian HENRY
3d57e83094 Merge branch 'develop' into develop_advtargetemailiing 
Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/install/mysql/tables/llx_c_accounting_category.sql
 2016-05-02 20:40:42 +02:00
Laurent Destailleur
78d18185e4 Several css enhancements 2016-04-22 11:11:08 +02:00
Laurent Destailleur
a10d97cce0 NEW Can filter on status employee when building emailing from users 2016-04-22 11:09:31 +02:00
Scrutinizer Auto-Fixer
c2243909e9 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-04-09 13:07:33 +00: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
Marcos García de La Fuente
89bd173c2f NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate 2016-03-21 21:51:29 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Laurent Destailleur
e169cd3364 Fix usage of filter into selection of email members into emailing. 2016-02-10 23:48:18 +01:00
Laurent Destailleur
2b149aa514 Merge pull request #4148 from AlainRnet/develop 
Update fraise.modules.php
 2015-12-04 10:31:34 +01:00
AlainRnet
ebc1105b5c Update fraise.modules.php 
following discussion with eldy (https://github.com/Dolibarr/dolibarr/pull/4079#issuecomment-161601400) to mix a french forum membre to select mailing member by type, I try to update this selector to integrate selection by type.
Thanks in advance for feedback
 2015-12-03 21:09:09 +01:00
fmarcet
3c5903f75a FIX: Contacts are not added to the list with the status "no contact" 2015-11-02 11:52:58 +01:00
Laurent Destailleur
b57c156b60 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/modules/modContrat.class.php
	htdocs/fichinter/card.php
	htdocs/install/upgrade2.php
 2015-10-01 11:16:35 +02:00
Florian HENRY
a96b92a618 FIX : Email selector contact must not include inactive contact 2015-09-30 14:06:45 +02:00
Raphaël Doursenaud
143a7d7328 Use rfc6761 example.com domain instead of domain.com in examples 
Fix #2988
 2015-06-08 17:13:23 +02:00
Raphaël Doursenaud
3f9270ea78 Qual: added deprecation hinting 
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
 2015-06-01 11:00:11 +02:00
Raphaël Doursenaud
b8d9c20731 [Qual] Fixed HTML input form disabled attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
 2015-05-07 14:21:14 +02:00
Marcos García de La Fuente
dc790ff586 NEW: Feature request: A page to merge two thirdparties into one #2613 2015-04-18 20:41:09 +02:00
Scrutinizer Auto-Fixer
918ed34364 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-04-07 00:45:30 +00:00
Laurent Destailleur
828dc2c9f4 Fix code standard 2015-04-06 12:22:52 +02:00
Scrutinizer Auto-Fixer
b693ed3f51 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-03-16 23:21:17 +00:00
Laurent Destailleur
0a7255ccc1 Fixed: Module for target emailing must not be visible when modules is 
disabled.
 2014-11-29 12:38:36 +01:00
Laurent Destailleur
97eec37f1c Uniformize code: property "nom" for thirdparty is aliased into "name" 
everywhere.
 2014-10-04 17:20:17 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
aspangaro
1a87d98357 Qual: Renamed table llx_c_civilite into llx_c_civility 
field civilite into label in the same table and field civilite into civility in other table
 2014-08-12 06:03:27 +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
7e7958cf73 Removed SQL errors as they are logged by the database handler 2014-06-12 13:49:05 +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
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