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

382 Commits

Author SHA1 Message Date
Laurent Destailleur
c9e9f60f8f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-09-25 19:55:52 +02:00
Inovea Conseil
d3d6fca350 Missing space in request 
Fix bug in request
 2017-09-25 10:49:56 +02:00
Laurent Destailleur
35d00fd2ec Fix wrap on lites_total 2017-09-23 09:28:31 +02:00
Laurent Destailleur
a94f2b07e1 Fix css 2017-09-23 02:46:33 +02:00
Laurent Destailleur
eaee8ee586 Fix box activity again 2017-09-17 21:30:27 +02:00
Laurent Destailleur
f76b675e09 Fix box activity again 2017-09-17 21:30:15 +02:00
Laurent Destailleur
99149b5cfe Fix box activity again 2017-09-17 21:30:11 +02:00
Laurent Destailleur
90ab6a1f30 Fix box activity again 2017-09-17 21:29:25 +02:00
Laurent Destailleur
f4b8489bd6 Fix box activity again 2017-09-17 21:24:30 +02:00
Laurent Destailleur
0ed5b329a7 Fix box activity again 2017-09-17 21:21:12 +02:00
Laurent Destailleur
94368accc1 Fix activity box 2017-09-17 20:37:18 +02:00
Laurent Destailleur
fb15b2aab0 Fix activity box 2017-09-17 20:36:45 +02:00
Laurent Destailleur
ee774f1bf9 FIX Calculation in the activity box 2017-09-17 20:20:48 +02:00
Laurent Destailleur
9dbd88f0ba FIX Calculation in the activity box 2017-09-17 20:17:51 +02:00
Laurent Destailleur
ccb5344d32 Fix links 2017-08-23 18:52:03 +02:00
Laurent Destailleur
7ba5cf5958 Debug view of services lines 2017-07-31 13:48:00 +02:00
Laurent Destailleur
f9442c1092 Fix box activity 2017-07-28 11:11:20 +02:00
Laurent Destailleur
7b2a71802b Do some TODO on modulebuilder module. 2017-07-16 13:00:35 +02:00
Laurent Destailleur
c7a6a67e20 Fix remove warnings 2017-06-22 11:04:29 +02:00
Laurent Destailleur
ba3a74576c Merge 5.0 2017-06-12 18:22:51 +02:00
Laurent Destailleur
279e6ab304 Fix missing parameters 2017-06-12 14:54:03 +02:00
Laurent Destailleur
d7cbb598c1 Fix permission for external users 2017-06-12 14:30:00 +02:00
Laurent Destailleur
bf41056c68 Fix test on permission for widgets 2017-06-12 14:21:04 +02:00
Laurent Destailleur
ec24f223b5 Fix permission on widget 2017-06-12 12:55:57 +02:00
Laurent Destailleur
8f7371cdf0 Product has 2 status. Add span to differentiate for css 2017-06-12 12:24:42 +02:00
Laurent Destailleur
20f1bb76cb Fix memu under disabled entries, when using smartphone 2017-06-10 16:13:37 +02:00
Laurent Destailleur
58a407d9f1 Fix style and align when no permission on widget 2017-06-10 00:05:47 +02:00
Laurent Destailleur
1af74b4c42 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/skeletons/skeleton_list.php
	htdocs/admin/perms.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/product/class/product.class.php
	htdocs/product/class/service.class.php
	htdocs/product/index.php
	htdocs/product/list.php
	htdocs/public/members/new.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2017-06-09 12:50:56 +02:00
Laurent Destailleur
02781b41ca Fix several problem with hook printFieldListWhere 2017-06-09 11:02:34 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
f3838ee8f2 Fix limit into message 2017-05-17 18:52:01 +02:00
Laurent Destailleur
68e333879f Fix var not sanitized 2017-05-16 13:27:32 +02:00
Laurent Destailleur
a8c775dcbd Fix compatibility with the removal of "constant". 2017-04-29 18:48:30 +02:00
Laurent Destailleur
4c056d68d8 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/commande/list.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/bills.lang
	htdocs/societe/list.php
 2017-04-15 17:02:05 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
be439f6252 Work on look and feel v6 2017-04-07 16:16:44 +02:00
Laurent Destailleur
01a74a8d23 Work on 6.0 look and feel 2017-03-31 17:41:20 +02:00
Laurent Destailleur
54b03a3552 Work on 6.0 new look and feel 2017-03-29 11:03:13 +02:00
Laurent Destailleur
b5b0eba470 Several enhancement for 6.0 2017-03-28 12:47:48 +02:00
Laurent Destailleur
4012aeff90 Fix translation 2017-03-25 18:35:17 +01:00
Laurent Destailleur
3cc312d485 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/main.lang
 2017-03-23 19:48:34 +01:00
Laurent Destailleur
3adb43c6e5 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/boxes/box_produits.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/langs/en_US/bills.lang
	htdocs/product/class/product.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2017-03-23 12:52:19 +01:00
Laurent Destailleur
ee8112dde7 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/projet/class/project.class.php
 2017-03-21 19:20:14 +01:00
Laurent Destailleur
1e63b98731 Fix responsive 2017-03-21 17:06:27 +01:00
Laurent Destailleur
e2e76b40da FIX list of projects 
Conflicts:
	htdocs/core/boxes/box_project.php
 2017-03-21 13:43:48 +01:00
Laurent Destailleur
36630b9404 FIX Picto of project on dol_banner and box 
Conflicts:
	htdocs/core/boxes/box_project.php
 2017-03-21 13:43:05 +01:00
Laurent Destailleur
aa71710a74 FIX list of projects 2017-03-21 13:38:00 +01:00
Laurent Destailleur
0e997c973f FIX Picto of project on dol_banner and box 2017-03-21 13:13:00 +01:00
Marcos García de La Fuente
a39dccad19 FIX #6503: SQL error in "Last pending payment invoices" 
Close #6503
 2017-03-11 19:00:44 +01:00
Laurent Destailleur
80702e4c0a Fix Better HTML5 compliant 2017-03-10 11:22:27 +01:00