Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-01 14:42:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
77,508 Commits 37 Branches 191 Tags
bf2d052d624a34be524b3ec4f84fa8d66eb2fd65
Commit Graph

2064 Commits

Author SHA1 Message Date
Laurent Destailleur
34f78c555d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-30 20:55:35 +02:00
Alexandre SPANGARO
cededd97d2 FIX Language key 2019-07-29 08:52:08 +02:00
Laurent Destailleur
cf00ae971a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-15 22:45:29 +02:00
Laurent Destailleur
b0d46d492f FIX #11509 2019-07-15 18:40:42 +02:00
Laurent Destailleur
adfbd62f8b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-14 00:44:35 +02:00
Laurent Destailleur
251d501c8e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-14 00:32:46 +02:00
Laurent Destailleur
2a05164bb1 FIX Better PHP compatibility 2019-07-14 00:31:28 +02:00
Laurent Destailleur
e0095871aa Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/stats/byratecountry.php
	htdocs/core/class/html.form.class.php
 2019-07-14 00:19:56 +02:00
Laurent Destailleur
8090a8abb6 Fix param [] -> null 2019-07-14 00:07:27 +02:00
Regis Houssin
4dab57b494 FIX phpcs 2019-07-13 11:24:25 +02:00
Regis Houssin
b7df4a2cd0 FIX this function can not be private 2019-07-13 11:21:07 +02:00
Laurent Destailleur
0a7d70829f Translation of some comments 2019-07-05 21:37:25 +02:00
Laurent Destailleur
06b3f6a62f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/subscription/list.php
 2019-06-25 13:03:54 +02:00
Laurent Destailleur
fa476b4994 Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
Laurent Destailleur
b6ad78fdd9 Fix sort 2019-06-25 11:25:36 +02:00
Laurent Destailleur
5031b6c06b Fix bad id 2019-06-25 11:18:31 +02:00
Laurent Destailleur
5f17cfe462 Fix bad id 2019-06-25 11:09:13 +02:00
Laurent Destailleur
27be93f535 Fix bad id 2019-06-25 11:08:42 +02:00
Laurent Destailleur
4ed2db6d21 Fix bad id 2019-06-25 11:08:14 +02:00
Laurent Destailleur
e6b643e073 Fix syntax error 2019-06-25 11:07:14 +02:00
Laurent Destailleur
36f1527f76 Fix backward compatibility for type of members 2019-06-25 11:06:10 +02:00
Laurent Destailleur
ca3988ca73 Fix backward compatibility for type of members 2019-06-25 10:58:44 +02:00
Laurent Destailleur
732fd8a04b Fix look and feel v10 2019-06-25 10:28:58 +02:00
Laurent Destailleur
74f61b3b9a Fix status not loaded 2019-06-25 10:23:30 +02:00
Laurent Destailleur
7de0f5c0be NEW Avoid wrap between picto and text on getNomUrl 2019-06-25 10:22:39 +02:00
Laurent Destailleur
6b8262bd8f Fix status not loaded 2019-06-25 10:12:24 +02:00
Laurent Destailleur
366efff633 Merge pull request #11107 from gentooza/develop 
NEW adding 'formObjectOptions' hooks loading at card.php of adherents module
 2019-06-24 19:20:36 +02:00
Laurent Destailleur
c3a109d790 Update card.php 2019-06-24 19:20:27 +02:00
Laurent Destailleur
604633afd1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-24 18:45:15 +02:00
Laurent Destailleur
57140b79dc Restore official text of licence 2019-06-24 18:30:07 +02:00
Laurent Destailleur
35c3eb0d7e Fix conflict in a translation key 2019-06-24 17:59:00 +02:00
Philippe GRAND
72c8316eb0 all http addresses should be https now 2019-06-24 09:39:58 +02:00
Laurent Destailleur
efa09301b1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 20:19:14 +02:00
Laurent Destailleur
71b266b5a8 Code comment 2019-06-22 19:20:01 +02:00
Laurent Destailleur
5675e7c50e Clean code of deprecated method 2019-06-22 18:19:40 +02:00
Laurent Destailleur
4308f48cad Merge branch 'develop' into MissingHook 2019-06-20 03:04:32 +02:00
Laurent Destailleur
bf71731fc9 Fix phpcs 2019-06-19 22:28:33 +02:00
Nicolas ZABOURI
b6bd4119d9 FIX travis Public underscore in load_ldap_info 2019-06-19 09:12:01 +02:00
Nicolas ZABOURI
2e4db8c83c Merge remote-tracking branch 'Dolibarr/10.0' into MissingHook 2019-06-19 08:39:05 +02:00
Laurent Destailleur
525598f6aa Fix scrutinizer warnings 2019-06-18 20:01:28 +02:00
Nicolas ZABOURI
492c3b5625 FIX hook 2019-06-18 15:13:08 +02:00
ICstage
820c420ae5 FIX Missing hooks 2019-06-18 14:07:52 +02:00
florian HENRY
cab91e75c6 add missing column adherent list 2019-06-10 10:10:16 +02:00
ptibogxiv
63e205c23f FIX term of lang for explicit date in subscription list 2019-06-07 15:15:05 +02:00
Laurent Destailleur
2218994958 FIX Duplicate encoding on error message 2019-05-29 09:51:45 +02:00
Laurent Destailleur
e8ba312d2a Fix phpcs 2019-05-23 14:25:16 +02:00
Laurent Destailleur
aa93e1c07b Merge pull request #11221 from frederic34/patch-6 
The method _load_ldap_dn() cannot be called...
 2019-05-21 22:39:15 +02:00
Laurent Destailleur
c1a0e9385f Merge pull request #11219 from frederic34/patch-2 
dol_print_object_info return void
 2019-05-21 22:38:39 +02:00
Laurent Destailleur
22e897b1a1 Clean and prepare code to fix a SQL injection 2019-05-21 17:22:38 +02:00
Frédéric FRANCE
a368a6a43e Update adherent_type.class.php 2019-05-19 11:52:34 +02:00