Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
68,347 Commits 36 Branches 189 Tags
b8c88a214449d5129fd4c479249cfa7c2373d10d
Commit Graph

239 Commits

Author SHA1 Message Date
Laurent Destailleur
0bd4bc39dd Fix responsive 2018-09-05 16:03:43 +02:00
Laurent Destailleur
27e2810e10 Fix date format 2018-08-20 17:14:03 +02:00
Laurent Destailleur
547a0aaac7 FIX Look and feel v8 2018-08-19 02:43:45 +02:00
Laurent Destailleur
af3ab84ebb Fix backward compatibility with old multicompany module 2018-07-05 22:15:55 +02:00
Laurent Destailleur
ad2df304b4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/lines.php
	htdocs/fourn/commande/card.php
	htdocs/societe/class/societe.class.php
 2018-06-18 13:31:29 +02:00
atm-ph
3c80ce501b Fix missing hook on usercard (addMoreActionsButtons) 2018-06-15 16:05:50 +02:00
Frédéric FRANCE
e87ff4d9b0 loadlangs 2018-05-26 16:24:54 +02:00
Laurent Destailleur
e51aa68284 Fix link to warehouses for events 2018-05-24 12:16:04 +02:00
Laurent Destailleur
f84b74f4cc Merge pull request #8583 from hregis/develop_ldap 
NEW add "printUserPasswordField" hooks
 2018-04-13 23:36:20 +02:00
Laurent Destailleur
be965bdbab Clean code 2018-04-13 13:28:48 +02:00
Laurent Destailleur
1521b0595b Clean code 2018-04-13 11:03:03 +02:00
Regis Houssin
a317c54b66 Fix: missing right parameter 2018-04-13 09:39:02 +02:00
Regis Houssin
7c3f0be83d Fix: missing parameters 2018-04-13 09:09:26 +02:00
Regis Houssin
7d1292d838 NEW add "printUserPasswordField" hooks 2018-04-13 09:05:17 +02:00
Laurent Destailleur
a8878c3f7e FIX #6295 2018-04-12 15:17:15 +02:00
Laurent Destailleur
1feee6378f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-11 14:45:52 +02:00
Laurent Destailleur
0d15d8e0ad Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/user/card.php
 2018-04-11 14:45:11 +02:00
Marc de Lima Lucio
307ede8b22 FIX: weird password autocompletion in Goocle Chrome (issue #8479) 2018-04-10 15:03:50 +02:00
Laurent Destailleur
2524a699eb Standardize file name of lists 2018-04-06 00:36:52 +02:00
Laurent Destailleur
3dbe200163 Merge pull request #8497 from ruistrecht-alt/FIX_missing_closing_parentheses 
FIX: missing closing parentheses
 2018-04-05 16:18:12 +02:00
Laurent Destailleur
28b00fc021 Merge pull request #8486 from hregis/develop_email 
Fix: avoid space in email address
 2018-04-05 13:12:03 +02:00
Rui Strecht
b39f617863 Added missing parentheses 2018-04-02 15:29:58 +01:00
Laurent Destailleur
43f8834b28 Uniformize code with the new module builder framework 2018-03-31 18:48:27 +02:00
Regis Houssin
8c610904ac Fix: remove multi spaces 2018-03-30 07:36:23 +02:00
Regis Houssin
546f3f8b96 Fix: avoid space in email address 2018-03-30 07:19:42 +02:00
Laurent Destailleur
75962f5ed1 Merge pull request #8234 from hregis/7.0_entity 
Fix: multicompany transverse mode is managed by the module
 2018-03-02 17:43:47 +01:00
Laurent Destailleur
0cc84ab92f FIX Missing restore_lastsearch_values 2018-02-26 21:21:28 +01:00
Laurent Destailleur
3c552cec15 FIX Missing restore_lastsearch_values 2018-02-26 21:16:40 +01:00
Regis Houssin
60525b9c18 Fix: multicompany transverse mode is managed by the module 2018-02-25 15:35:41 +01:00
Laurent Destailleur
003827eb06 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-25 15:01:19 +01:00
Laurent Destailleur
8dceb8930f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/html.formactions.class.php
	htdocs/user/card.php
 2018-02-25 12:41:17 +01:00
Marc de Lima Lucio
36cc1c6ca9 FIX: solve column mismatch in user card's usergroup list + code cleanup 2018-02-23 11:59:22 +01:00
Laurent Destailleur
b4446764f8 Clean code of deprecated usage 2018-02-21 14:48:25 +01:00
Laurent Destailleur
852c4fc033 Fix context of filter not lost 2018-02-07 12:08:25 +01:00
Laurent Destailleur
d1365c2492 Fix trackid 2018-01-22 17:15:44 +01:00
Laurent Destailleur
731cb3f721 Fix editor of user signature 2017-12-19 17:00:40 +01:00
Laurent Destailleur
f504716501 Fix sync contact - external user 2017-12-19 16:16:31 +01:00
Laurent Destailleur
1ce155728f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/mailings/fraise.modules.php
 2017-12-01 16:25:13 +01:00
Laurent Destailleur
dbde97f25f Update card.php 2017-11-29 15:07:09 +01:00
jfefe
d0ab117488 FIX : external user cannot be set as internal 2017-11-28 15:06:23 +01:00
Regis Houssin
ef44dfc472 Fix: move transversal mode management in multicompany module 2017-11-04 15:40:35 +01:00
Laurent Destailleur
475db3172a NEW Remove js library fileupload that was not used by core code. 2017-10-21 19:40:17 +02:00
Laurent Destailleur
5c189449e1 Move default value for user expense report on tab expense report 2017-10-20 17:02:26 +02:00
Laurent Destailleur
7f85d73001 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/contrat/card.php
	htdocs/expensereport/card.php
	htdocs/fichinter/list.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/card.php
	htdocs/fourn/paiement/card.php
	htdocs/livraison/card.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/societe/rib.php
	htdocs/supplier_proposal/list.php
	htdocs/user/card.php
 2017-10-18 19:51:29 +02:00
Laurent Destailleur
8626d6279a Fix perm to delete files 2017-10-18 17:21:30 +02:00
Laurent Destailleur
4296df45af Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/projet/list.php
	htdocs/user/card.php
 2017-10-13 22:01:56 +02:00
Laurent Destailleur
5f021990b4 Code comment 2017-10-13 17:46:16 +02:00
Laurent Destailleur
33624e1001 NEW Attaching doc automatically in email is now a parameter of template. 2017-10-08 16:34:42 +02:00
Scrutinizer Auto-Fixer
328d39bc71 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-07 11:09:31 +00:00
Laurent Destailleur
4bc7eb0ec1 Merge pull request #7520 from hregis/develop_ldap 
Fix: Set LDAP password when LDAP key changed
 2017-10-06 13:09:28 +02:00