lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,942 Commits 43 Branches 150 Tags 886 MiB
6db07ac2d8
Commit Graph

36942 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
6db07ac2d8 Fix: Several bugs into filter on statistics pages. 2013-05-20 19:24:27 +02:00
Laurent Destailleur
71e14df62f Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2013-05-20 17:37:08 +02:00
Laurent Destailleur
e00df58153 Merge pull request #965 from grandoc/3.4 
fix: wrong trad
 2013-05-20 07:46:26 -07:00
Laurent Destailleur
416cdd2f9c Merge pull request #956 from cbattarel/3.3 
fix bug : external users should not see costprice and margin infos
 2013-05-20 07:39:39 -07:00
Laurent Destailleur
2321170540 Merge pull request #964 from FHenry/3.4 
Revert Class rewrite and ficheinter line trigger
 2013-05-20 07:35:11 -07:00
Grand Philippe
5f714f1403 fix: wrong trad 2013-05-20 14:39:27 +02:00
Christophe Battarel
f8ca842685 fix typo error 2013-05-20 10:10:34 +02:00
fhenry
3d409390a5 Revert Class rewrite and ficheinter line trigger 2013-05-19 18:37:38 +02:00
Laurent Destailleur
2ac738d8c4 Merge pull request #955 from FHenry/3.4 
Fix error management and SQL resquest in action comm
 2013-05-19 09:02:00 -07:00
fhenry
a6233a738c Fix trigger in deleteline fiche inter 2013-05-19 14:13:41 +02:00
Christophe Battarel
fea0e6de54 Fix - external users should not see costprice and margin infos 2013-05-19 14:06:51 +02:00
Christophe Battarel
347fc6d714 fix unauthorized access to margins for external user 2013-05-19 14:04:21 +02:00
Juanjo Menent
afddded13c Merge pull request #962 from marcosgdf/translations 
Corrected translation key BuyingPrice from lang files
 2013-05-19 03:22:54 -07:00
Juanjo Menent
bd712262b6 Merge pull request #961 from marcosgdf/minor 
Missing success message in margin module config page
 2013-05-19 03:18:50 -07:00
Marcos García
5f4433dbff Missing succes message in margin module config page 2013-05-19 12:09:34 +02:00
Marcos García
08b234ed01 Corrected translation key BuyingPrice from lang files 2013-05-19 12:08:18 +02:00
fhenry
c07d5045d1 Error management 2013-05-19 11:55:03 +02:00
fhenry
6190dddac9 GetElmentURL fichinter instead of ficheinter (to be ok with element of 
fichinter class
 2013-05-19 11:30:35 +02:00
fhenry
94e2ea05d2 Fix trigger ficheinterline 2013-05-19 11:18:45 +02:00
fhenry
a8e1d111c3 Add trigger into ficheinter lines and $user pass trought parameters 
every where
 2013-05-19 10:26:25 +02:00
fhenry
181ce52223 Add ficheinter in GetElementURL for action 2013-05-18 22:17:46 +02:00
fhenry
fefb21a56e Fix bug on Extrafield checkbox 
Fix bug on ActionComm Update
[ task #900 ] Review code of ficheinter.class.php
 2013-05-18 12:17:43 +02:00
simnandez
e2f2ad30ae Fix: Remove windows CR/LF 2013-05-18 09:15:18 +02:00
simnandez
2879a09a03 Fix: Remove windows CR/LF 2013-05-18 09:11:24 +02:00
fhenry
7a6a74f43e Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-05-17 21:35:11 +02:00
fhenry
e19e9e1c63 Add dol_syslog 2013-05-17 21:27:15 +02:00
fhenry
1eddd86950 Fix Bad Formed Request PGSQL 2013-05-17 21:20:02 +02:00
fhenry
1c1736fa20 Fix bad Warning: Bad formed request converted PGSQL 2013-05-17 19:30:48 +02:00
Christophe Battarel
7efe39495a french translation for CostPrice 2013-05-17 15:18:50 +02:00
Christophe Battarel
e3615d43bd fix bug : external users should not see costprice and margin infos 2013-05-17 15:02:27 +02:00
fhenry
5acdbfa8f0 Fix error management and SQL resquest in action comm 2013-05-17 14:45:54 +02:00
Laurent Destailleur
bd92adf092 Better trans 2013-05-17 11:20:44 +02:00
Laurent Destailleur
86d2f34474 Merge pull request #954 from grandoc/3.4 
missing translation for script
 2013-05-17 02:18:26 -07:00
Grand Philippe
f7f59f962b missing translation for script 2013-05-17 10:35:42 +02:00
Juanjo Menent
87329068e2 Merge pull request #953 from FHenry/3.4 
remove pom.xml
 2013-05-17 00:46:04 -07:00
Laurent Destailleur
fdd8d2cc5e Fix: to large a href 2013-05-17 01:30:39 +02:00
Laurent Destailleur
b8cd276128 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-17 00:48:02 +02:00
Laurent Destailleur
b3adbf53e5 Fix data for greece 2013-05-17 00:47:50 +02:00
fhenry
20b3a9873e remove pom.xml 2013-05-16 21:47:51 +02:00
Laurent Destailleur
bab4e1e509 Fix: PHP version was lost 
Fix: split of long text to avoid horizontal scrolls
 2013-05-16 15:15:30 +02:00
Laurent Destailleur
658f0af428 Fix: Removed warning 2013-05-16 15:13:08 +02:00
Laurent Destailleur
b05548a633 Fix: Parameter delay not used when set to 0 2013-05-15 22:32:28 +02:00
Laurent Destailleur
4fede61c16 Update doc 2013-05-15 20:37:50 +02:00
Laurent Destailleur
ad84b83f02 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-15 20:24:08 +02:00
Laurent Destailleur
dd5b3f23e6 Merge pull request #951 from grandoc/3.4 
fix some language issue
 2013-05-15 11:23:17 -07:00
Laurent Destailleur
ff94849b0c Fix: Security test 2013-05-15 19:57:51 +02:00
Laurent Destailleur
626362780a Fix: Remove not used constant 2013-05-15 17:30:18 +02:00
Grand Philippe
2f53eacb4c fix personal value error 2013-05-15 15:40:10 +02:00
Grand Philippe
a8e260da84 fix some language issue 2013-05-15 15:28:53 +02:00
Laurent Destailleur
d92b46c9f9 Fix: Label missing 
Fix: Cancel not working
 2013-05-14 23:41:57 +02:00