Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-17 15:01:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
49,784 Commits 36 Branches 190 Tags
039039bb0078007af2495f1655956afb51a4ac05
Commit Graph

1652 Commits

Author SHA1 Message Date
eldy
fc011610bb Fix: pgsql 2013-01-20 15:21:18 +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
simnandez
a57f291aa2 Fix: Bad Spanish departament name 2013-01-18 09:28:54 +01:00
Laurent Destailleur
f1f7ff315f Fix: CRLF 2013-01-16 15:54:07 +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
fhenry
e3fd60c762 Add adherent type extrafield extrafield table in migration script 2013-01-16 13:49:44 +01:00
Laurent Destailleur
f57409ddcd Merge remote-tracking branch 'origin/3.3' into develop 2013-01-15 12:06:41 +01:00
Laurent Destailleur
285bcbecb7 Fix: init of new syslog handler system 2013-01-14 17:12:13 +01:00
Laurent Destailleur
0861fbfeb6 Fix: Missing kenya currency 2013-01-13 23:47:23 +01:00
Laurent Destailleur
29e6d01e51 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2013-01-13 19:33:54 +01:00
Laurent Destailleur
ec8b260bf6 New: Prepare 3.4 branch 
New: Add hook for agenda, info and category tabs
 2013-01-12 14:34:16 +01:00
Laurent Destailleur
5c51905f63 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-09 19:15:51 +01:00
Laurent Destailleur
24b50b8ed3 Fix: Example an label of category import 2013-01-09 13:29:12 +01:00
fhenry
23b2aa6a7b [ task #664 ] Add extrafields behaviours to Member Type 2013-01-08 19:16:39 +01:00
eldy
2c59c6311f Merge remote-tracking branch 'origin/3.3' into develop 2013-01-06 21:36:39 +01:00
eldy
492d00ee86 Fix: Syntax error with pgsql 2013-01-06 20:45:03 +01:00
Cedric GROSS
6a9c3dee52 Add SASU form 2013-01-05 17:07:25 +01:00
simnandez
d0265db3d2 Fix: Modify Spanish localtax2 to new rate 2013-01-05 09:07:01 +01:00
simnandez
9a3681e6b0 Fix: Bug creating invoice from a contract 2013-01-04 16:23:15 +01:00
Marcos García
406ce9e11c Update changelog + update deprecated triggers in database 2012-12-31 04:11:13 +01:00
Laurent Destailleur
86c9011437 Merge pull request #561 from marcosgdf/3.3 
Updated changelog + also removed unused triggers when migrating from 3.2.X
 2012-12-30 08:36:25 -08:00
Laurent Destailleur
753d79f181 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2012-12-30 17:14:06 +01:00
Laurent Destailleur
0d09de0cf8 Fix: Normalize trigger names for fichinter module. 2012-12-30 17:13:43 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Laurent Destailleur
201829e60c Fix:[ bug #653 ] Error while creating additional attributes 2012-12-30 13:49:37 +01:00
Marcos García
99bf09dc9e Updated changelog + also removed unused triggers when migrating from 3.2.x 2012-12-29 18:28:24 +01:00
Laurent Destailleur
5e05e0aa55 Fix: Trigger names 2012-12-29 17:34:52 +01:00
Laurent Destailleur
d4f81a9ee7 Fix: Predefined invoice feature was broken. 2012-12-27 12:51:38 +01:00
Laurent Destailleur
e4b4f459da Fix: Missing drop of table deprecated into 3.2 2012-12-18 10:10:04 +01:00
Grand Philippe
993e484bdd prepare multi-user event 2012-12-12 12:17:56 +01:00
Laurent Destailleur
43fe5766a1 New: Holiday need to support half day to be usefull. 2012-12-10 16:10:08 +01:00
Laurent Destailleur
70be706347 New: Add greece regions and provinces 2012-12-09 20:01:16 +01:00
Laurent Destailleur
c44481fb91 Normalize key name 2012-12-09 18:47:23 +01:00
fhenry
0e76875e9c prepare single login at one time 2012-12-08 18:41:32 +01:00
fhenry
4570c57bfd Change-Id: I003fa45e6e932350b9d21b00ed4817b943470223 2012-12-08 18:28:19 +01:00
fhenry
131dc88139 prepare module for "Single login at one time" 2012-12-08 18:14:13 +01:00
fhenry
b3d21a4320 Fix [ bug #634 ] Install faild on PostGreSQL 
Fix  [ bug #631 ] Index Creation failed on fresh install with PostgreSQL
 2012-12-08 17:01:07 +01:00
Laurent Destailleur
db91526643 Fix: Solve conflict into migration/backup/restore (child tables 
must be after parent tables).
Fix: Migration of old version
 2012-12-08 14:16:39 +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
Laurent Destailleur
bac4bf07a3 New: Add patch from pgrand to start link of several contacts onto an 
event
 2012-12-03 20:19:35 +01:00
Laurent Destailleur
518b169a89 Increase field size (some system need to store an url here) 2012-12-02 19:41:49 +01:00
Laurent Destailleur
7b824665a5 Revert "Increase field size (some system need to store an url here)" 
This reverts commit 7ade37831e.
 2012-12-02 19:41:06 +01:00
Laurent Destailleur
7ade37831e Increase field size (some system need to store an url here) 2012-12-02 19:33:39 +01:00
Laurent Destailleur
4136c27516 RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50 
commits !
 2012-12-01 15:45:05 +01:00
Maxime Kohlhaas
e45438994c 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-01 14:36:51 +01:00
Laurent Destailleur
daacf797c4 Merge pull request #500 from cbattarel/develop 
[Task #204] more local taxes manangement
 2012-12-01 02:49:45 -08:00
Laurent Destailleur
008f5fbcfc New: extrafields are available onto users cards. 2012-11-30 15:55:59 +01:00
Laurent Destailleur
49a6c661fd Merge pull request #505 from FHenry/develop 
Fix installation error Erreur SQL : DB_ERROR_SYNTAX - insert into
 2012-11-29 14:07:47 -08:00
fhenry
c3ced863c1 Fix installation error Erreur SQL : DB_ERROR_SYNTAX - insert into 
llx_c_actioncomm (id, code, type, libelle, module, active, position)
values ( 5, 'AC_RDV', 'system', 'Rendez-vous' ,NULL, ,1 1); - You have
an error in your SQL syntax; check the manual that corresponds to your
MySQL server version for the right syntax to use near '1 1)' at line 1
 2012-11-29 17:59:28 +01:00