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

1845 Commits

Author SHA1 Message Date
Laurent Destailleur
af6f075b5c Qual: Better error management. 
Qual: Uniformize code for canvas
 2013-04-09 23:56:52 +02:00
Laurent Destailleur
7ebd24daea Merge pull request #805 from zedzedtop/develop 
Develop
 2013-04-05 13:28:58 -07:00
Laurent Destailleur
76910d4159 Look: Start to use div to render actions buttons 2013-04-03 18:37:54 +02: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
7ca7c552c0 Use new function to show extrafields on products 2013-04-01 18:59:41 +02:00
Laurent Destailleur
f52fe71018 Fix: Bad div closing 2013-03-30 19:40:52 +01:00
jfefe
3fe1b26136 New method to CommonObject to display extrafields data output 
Try for product
 2013-03-30 17:43:21 +01:00
jfefe
bd4e62a5e7 Implement extrafields : calendar on date type and new separator type 2013-03-30 16:58:49 +01:00
Grand Philippe
671837bfcc Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-03-30 14:32:17 +01:00
Grand Philippe
ee7490a30a fix : language error 2013-03-30 14:31:10 +01:00
Laurent Destailleur
89365786a8 New: enhance tool fixdosfiles.sh 
Convert DOS files to unix
 2013-03-30 14:27:13 +01:00
Sébastien de Chateauvieux
eda6187982 TVA NPR : can use * in tva when set supplier price 2013-03-28 09:30:42 +04:00
Sébastien de Chateauvieux
aaaa5242d6 TVA NP : update price calculation 2013-03-25 17:42:48 +04:00
Laurent Destailleur
fcef334122 Merge pull request #748 from GPCsolutions/naturalsearch 
Natural search
 2013-03-16 07:38:55 -07:00
Laurent Destailleur
55f9879a6c Replace table with div. Prepare work for android application. 2013-03-16 14:53:15 +01:00
Raphaël Doursenaud
86dab44c98 Added natural search to products 2013-03-15 15:33:49 +01:00
Laurent Destailleur
fc3483a4bb Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/webservices/server_user.php
 2013-03-12 14:55:13 +01:00
Grand Philippe
dd248e9d58 fix : dyslexia 2013-03-11 17:19:03 +01:00
Laurent Destailleur
418eeef8b4 Fix: Ton of bugs into renaming fields 2013-03-09 16:19:15 +01:00
Laurent Destailleur
dacba745c5 Merge pull request #694 from grandoc/develop 
english language standardization
 2013-02-26 11:03:16 -08:00
Maxime Kohlhaas
0de4fa09f1 Product price : updated always with HT base type after product import 2013-02-26 12:52:37 +01:00
Grand Philippe
44dee53350 english language standardization 2013-02-25 18:21:12 +01:00
Grand Philippe
b081589129 english language standardization 2013-02-25 09:52:24 +01:00
Grand Philippe
6decab1847 english language standardization 2013-02-25 09:17:38 +01:00
Grand Philippe
86de772b31 english language standardization 2013-02-24 17:08:52 +01:00
Grand Philippe
88458ca466 english standardization 2013-02-23 10:18:05 +01:00
simnandez
e1683f5f22 Fix: Pagination at bottom not work correctly with filters applied 2013-02-22 08:57:28 +01:00
simnandez
8fd3d9375d Fix: Pagination at bottom not work correctly with filters applied 2013-02-22 08:56:07 +01:00
simnandez
723c46ec42 Fix: Pagination at bottom not work correctly with filters applied 2013-02-21 14:29:06 +01:00
Laurent Destailleur
bc505c98a0 Test to avoid infinite loop 2013-02-19 21:10:31 +01:00
Laurent Destailleur
aff919fd10 Fix: Bad test 2013-02-17 12:45:46 +01:00
BENKE Charles
f847558363 Update htdocs/product/class/product.class.php 
fetch_prod_arbo / recursive call of the child product test
 2013-02-15 07:21:10 +01:00
BENKE Charles
f084bbbb19 Update htdocs/product/class/product.class.php 
bug on list of childs of product
if two products have the same label, the list display only one line
 2013-02-08 21:21:25 +01:00
Laurent Destailleur
56e11e52fa New: hookmanager class is used frequently and is a factory object, so we 
can move it during init of environment and use it globally.
 2013-01-25 19:12:54 +01:00
Laurent Destailleur
abb6daf2dc Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/boxes/box_activity.php
 2013-01-19 16:29:16 +01:00
Laurent Destailleur
0e13b3872d Fix: Removed warnings 2013-01-19 14:32:37 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
 2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Regis Houssin
92723bd6fe Fix: broken features 2013-01-15 11:41:12 +01:00
Regis Houssin
8a6bc63127 Fix: uniformize code 2013-01-15 11:23:24 +01:00
Regis Houssin
787d3bd6a9 Fix: use event method 2013-01-15 11:00:32 +01:00
Regis Houssin
9812c91aff Fix: wrong EOL !!!!!!! 2013-01-10 08:27:12 +01:00
Laurent Destailleur
96416735df Fix: [ bug #618 ] External accounts can access confidential informations 
(a lot)
 2013-01-02 18:43:59 +01:00
Laurent Destailleur
815f43904d Fix: Warning if setup not complete 2012-12-30 21:56:53 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Regis Houssin
65090c582d Fix: checkstyle 2012-12-15 11:39:47 +01:00
Laurent Destailleur
f4459ee1f1 Fix: Regression detected by PHPUnit 2012-12-10 19:06:59 +01:00
fhenry
1d6bc23f4d - Uniformize Extrafield deletion for adherent,user,product,societe by 
using commonobject method
 - Add convertion of tms timestamp special case in mysql for pgsql
 2012-12-08 14:23:52 +01:00
Regis Houssin
3d4621327c Fix: EOL !! tant que ce problème sera présent, les risques de problèmes 
de merge et de conflits sera présent !! il faut utiliser la dernière
version d'Eclipse et de Egit...
 2012-12-05 11:18:45 +01:00
Maxime Kohlhaas
954a578ebd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-12-05 09:10:55 +01:00