Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

90 Commits

Author SHA1 Message Date
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
e38427a41f Fix var not initialized 2019-03-08 19:56:21 +01:00
Laurent Destailleur
8fce6e5e31 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/core/modules/mailings/xinputfile.modules.php
	htdocs/fourn/facture/card.php
 2019-03-02 19:13:37 +01:00
Laurent Destailleur
40e923ec85 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/modules/modAgenda.class.php
 2019-03-02 19:07:14 +01:00
Laurent Destailleur
8f8aaf1e8c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-02 19:05:51 +01:00
Marc de Lima Lucio
b96ac794e9 FIX: actioncomm export: ORDER BY clause is in wrong export property + event type filter does not work 2019-02-28 16:15:32 +01:00
Frédéric FRANCE
e6c3eb0ba1 wip 2019-02-26 21:13:07 +01:00
Frédéric FRANCE
1c07006015 wip 2019-02-25 21:36:27 +01:00
Cristian Torres
c781eeb17d [FIX] ORDER BY before custom filters for where 
When filtering data "and cac.libelle" would be appended after ORDER BY
 2019-02-24 20:55:27 +01:00
Cristian Torres
31aa3ec376 [FIX] ORDER BY before custom filters for where 
When filtering data "and cac.libelle" would be appended after ORDER BY
 2019-02-20 11:45:07 -06:00
Frédéric FRANCE
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Laurent Destailleur
db46d82de3 Fix position of menu entries 2018-12-15 15:35:59 +01:00
Laurent Destailleur
628918f863 Remove var_dump 2018-11-12 16:43:33 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Laurent Destailleur
e24117e75b Fix position of modules is string on 2 digits 2018-10-06 11:57:53 +02:00
Laurent Destailleur
cc4fbfc3ef Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-09-16 12:54:39 +02:00
Laurent Destailleur
eebd329c7c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modFacture.class.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/en_US/main.lang
	htdocs/stripe/transaction.php
 2018-09-16 09:50:13 +02:00
Laurent Destailleur
34b75828d3 Work on fix for #9043 2018-09-16 09:27:36 +02:00
ias-ceo
fece67b629 use correct resultset 2018-09-12 19:00:19 +02:00
ias-ceo
b4691df8d9 use correct resultset 2018-09-10 17:29:29 +02:00
Laurent Destailleur
f7c87a9ad3 Clean cron init 2018-09-05 22:46:08 +02:00
Frédéric FRANCE
6aee680a4f PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Philippe GRAND
12d4880e7b Docs : update and complete 2018-07-09 10:08:27 +02:00
Laurent Destailleur
46e448a086 Fix default agenda view 2018-04-22 17:57:20 +02:00
Laurent Destailleur
f83369d268 Remove travis warnings 2018-04-22 11:27:26 +02:00
Laurent Destailleur
38d200d8a6 Fix left menu 2018-04-20 13:23:34 +02:00
Laurent Destailleur
029ef534d0 Clean deprecated code (property "special" removed from mod descriptor) 2018-02-25 10:55:02 +01:00
Laurent Destailleur
7ea96d53a2 Minor fixes 2017-11-24 18:12:01 +01:00
Laurent Destailleur
c527189088 Standardize page name 2017-11-16 12:18:25 +01:00
Laurent Destailleur
9cd5c8a564 Code comment 2017-08-22 18:34:58 +02:00
Laurent Destailleur
2104ab9aed Disable event reminder 2017-08-21 13:11:29 +02:00
Laurent Destailleur
8cd2235b4b Start to introduce cron for email reminder. 2017-08-03 11:42:22 +02:00
Laurent Destailleur
08af9bf365 List before 2017-06-27 10:37:00 +02:00
Laurent Destailleur
3fdfebf7ef Fix position of top menu does not follow 'position' field. 2017-06-27 04:25:41 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
8e70c4a0b7 Work on 6.0 new look and feel 2017-03-30 15:39:50 +02:00
Laurent Destailleur
aca1c1944d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/data/llx_c_action_trigger.sql
 2017-03-30 12:02:27 +02:00
Laurent Destailleur
141ef91dea Fix default auto events 2017-03-30 11:53:58 +02:00
Laurent Destailleur
809e3ce4d5 Debug browser notification 2017-01-20 20:10:16 +01:00
Juanjo Menent
6cc3ef0c99 NEW: Events notifications in browser 2017-01-13 16:08:49 +01:00
Laurent Destailleur
f00f3101d9 Merge pull request #6013 from aljawaid/develop 
NEW: Make Top Menu Entries Independent Translation Strings
 2017-01-07 20:45:44 +01:00
Laurent Destailleur
3c79f3acb5 Minor fixes or code comment 2016-12-20 12:06:26 +01:00
IJ
9f28795159 Add Unique Top Menu Translation 
Add unique top menu translation for products/services so it can be better translated separately from other words/links using the same text.
** Requires re-enabling module
 2016-11-19 11:29:35 +00:00
Laurent Destailleur
287f9972a8 Merge branch 'new_no_default_rights' of 
https://github.com/atm-maxime/dolibarr into
atm-maxime-new_no_default_rights

Conflicts:
	htdocs/langs/en_US/admin.lang
 2016-09-30 13:04:14 +02:00
Laurent Destailleur
f1166f1898 Fix warning 2016-09-22 13:00:02 +02:00
Laurent Destailleur
619b65e0b6 Fix warning 2016-09-22 11:06:39 +02:00
Laurent Destailleur
a3d0c01b68 Fix warning 2016-07-26 13:51:13 +02:00
Laurent Destailleur
af09528738 NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and 
__AMOUNT_WO_TAX__ into emails templates.
 2016-07-21 20:45:30 +02:00
Laurent Destailleur
058c431483 FIX The project was lost when creating the event "sent by email". Also, 
event company "create" was not tracked by default like others.
 2016-07-21 13:49:10 +02:00