Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
37,867 Commits 35 Branches 179 Tags 1.7 GiB
95ea3a01df
Commit Graph

990 Commits

Author SHA1 Message Date
Maxime Kohlhaas
b22b604d02 Accountancy code on user object in prevision of the complete accountancy module 2013-06-25 11:14:00 +02:00
Laurent Destailleur
1d8b9949d6 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/bank/annuel.php
	htdocs/compta/bank/categ.php
	htdocs/compta/bank/releve.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/tpl/contacts.tpl.php
	htdocs/cron/list.php
	htdocs/main.inc.php
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/theme/bureau2crea/style.css.php
	htdocs/theme/eldy/style.css.php
	htdocs/user/class/user.class.php
	htdocs/viewimage.php
 2013-06-24 20:02:02 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Grand Philippe
b599481ef6 standardize code 2013-06-20 09:18:12 +02:00
Laurent Destailleur
71b61fc1f5 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/langs/fr_FR/mails.lang
	htdocs/user/logout.php
 2013-06-18 09:51:37 +02:00
Laurent Destailleur
8b73b2b4f3 Fix: Solve some problem of redirect when logout 
Conflicts:
	htdocs/user/logout.php
 2013-06-17 14:54:44 +02:00
Laurent Destailleur
ac16127894 Fix: Solve some problem of redirect when logout 2013-06-17 14:47:14 +02:00
Laurent Destailleur
c748f3d834 Qual: Removed useless methods 
Qual: Removed deprecated vars
Qual: Free memory
 2013-06-16 21:31:21 +02:00
Raphaël Doursenaud
686f5add82 Normalized line endings to LF 2013-06-05 16:12:07 +02:00
Laurent Destailleur
701d8485ef Merge remote-tracking branch 'origin/3.4' into develop 2013-05-24 19:00:16 +02:00
Laurent Destailleur
7bbdae239f Fix: Removed errors with not defined vars 2013-05-24 14:32:12 +02:00
Laurent Destailleur
6c4e47514d Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/holiday/fiche.php
 2013-05-11 15:26:24 +02:00
fhenry
a4e8e8eb4b Add fecth extrafield into fetch user class 2013-05-10 12:03:27 +02:00
fhenry
6427129480 Fix extrafields update/save on User/fiche.php 2013-05-07 12:25:32 +02:00
Laurent Destailleur
0b228b3a87 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/user/perms.php
 2013-05-03 18:33:05 +02:00
Laurent Destailleur
723bd6f750 Fix: [ bug #872 ] Erreur sur page Accueil Commerciale avec pgsql 
(3.4-beta).
Fix: Permission tab was not visible for external users.
 2013-05-03 16:10:28 +02:00
Marcos García
818c6e648a Removed duplicated code 2013-04-29 22:04:46 +02:00
Laurent Destailleur
e4ea3b9b0e Propagation of param missing. 2013-04-27 21:35:30 +02:00
fhenry
91885a8bd4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-26 20:54:53 +02:00
Laurent Destailleur
2a74cb81f0 Fix: Removed warnings 2013-04-26 19:13:39 +02:00
fhenry
a06581771c Reveiw extrafield for womplaiance with wiki 
http://wiki.dolibarr.org/index.php/Extrafields
 2013-04-26 10:29:14 +02:00
Laurent Destailleur
3ecb61f18e Fix: Using div 2013-04-25 20:36:38 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
Laurent Destailleur
f7aa90b3b3 Add user help 2013-04-24 12:43:23 +02:00
Laurent Destailleur
a8ea2a9d06 Prepare code for small screens 2013-04-24 04:06:13 +02:00
Laurent Destailleur
d5f3f47782 New: Use div for tabs. 2013-04-24 03:56:13 +02:00
Juanjo Menent
2d9da0c4cf Merge pull request #848 from GPCsolutions/note 
Note update fixes batch
 2013-04-20 00:43:05 -07:00
Raphaël Doursenaud
052d75321f Fixed user note with new update note API 2013-04-20 06:43:13 +02:00
fhenry
07a4709b45 fix [ bug #825 ] User first name not visible into users->perms 2013-04-17 21:14:46 +02:00
Laurent Destailleur
263e9098fa Fix: group name not visible 2013-04-14 02:54:54 +02:00
Laurent Destailleur
bda39f25bf New: Default aprrover for holidays i sby default hierchical parent. 2013-04-14 01:04:11 +02:00
Laurent Destailleur
8f7f0b142d Fix: Change of permission are immediatly effective 2013-04-12 14:27:41 +02:00
Laurent Destailleur
b52ca834a0 Optimize size of area 2013-04-11 10:23:35 +02:00
Laurent Destailleur
750b30863f Qual: Clean code from things that should be inside external module. 2013-04-11 09:15:41 +02:00
Laurent Destailleur
a3c5db968e Merge pull request #800 from FHenry/develop 
Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse...
 2013-04-05 13:39:52 -07:00
Laurent Destailleur
1fb3159045 Qual: Uniformize code 2013-04-05 18:09:05 +02:00
fhenry
c109467d20 Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse... 2013-04-04 13:58:33 +02:00
Laurent Destailleur
545ac638b0 Qual: Removed deprecated code for using a specific mobile theme. 
New: Include terminal variables to optimize any themes.
Qual: First change to allow butAction buttons to wrap on new lines for
small size screens.
 2013-04-03 15:20:56 +02:00
Laurent Destailleur
cf4603f5af Merge pull request #793 from jfefe/extrafields 
Task #784 : display calendar into data type extrafields / new methods to manage extrafields
 2013-04-01 12:00:08 -07:00
jfefe
cf6f4405cb Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields 
Conflicts:
	htdocs/comm/propal.php
 2013-04-01 19:44:55 +02:00
jfefe
a8874ebcc8 Uniformize usage of extrafields methods 2013-04-01 19:43:26 +02:00
Laurent Destailleur
3c37f89d2e Work on new menu managers - step x 2013-04-01 16:02:16 +02:00
Laurent Destailleur
bbe68e341c Fix: dol_hide_topmenu and dol_hide_leftmenu not lost after logout 2013-04-01 15:28:53 +02:00
Laurent Destailleur
df08d838d7 More robust phpunit tests 2013-04-01 14:49:33 +02:00
Laurent Destailleur
cc69cf7b76 New: Can defined a clicktodial setup per user 2013-03-31 16:44:24 +02:00
Laurent Destailleur
294a085047 New: ClickToDial setup is easier 2013-03-31 04:03:08 +02:00
Laurent Destailleur
f52fe71018 Fix: Bad div closing 2013-03-30 19:40:52 +01:00
Laurent Destailleur
89365786a8 New: enhance tool fixdosfiles.sh 
Convert DOS files to unix
 2013-03-30 14:27:13 +01:00
Maxime Kohlhaas
d8090ba994 Fix : "Firstname" was used as var instead of "firstname" 2013-03-29 18:47:53 +01:00
jfefe
013eac1147 Better error management when add/update extrafield 
Usage of setEventMessage() function
 2013-03-27 21:24:45 +01:00