lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,479 Commits 43 Branches 150 Tags 886 MiB
2a67af3c94
Commit Graph

1717 Commits

Author SHA1 Message Date
Laurent Destailleur
b21cb5b899 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/facture.php
	htdocs/filefunc.inc.php
 2013-02-17 17:25:38 +01:00
Laurent Destailleur
9f8ffe242a Fix: A text field can not have a default value 2013-02-17 16:26:06 +01:00
Laurent Destailleur
aa8413d7cb Fix: Missing migration 
Fix: Error management
 2013-02-17 16:20:49 +01:00
Laurent Destailleur
249a03dd57 Merge pull request #659 from jfefe/extrafields 
Work on extrafields
 2013-02-16 14:19:24 -08:00
Grand Philippe
785e72d533 fix trad : change adresse versus address 2013-02-15 19:36:09 +01:00
Grand Philippe
2bfd6c40d0 fix trad : change adresse versus address 2013-02-15 19:26:09 +01:00
Grand Philippe
12317d0371 fix trad : change adresse versus address 2013-02-15 19:18:26 +01:00
Grand Philippe
7c47dedbce fix trad: begin change address instead of adresse 2013-02-15 17:33:07 +01:00
jfefe
14f21bc9f1 Add select list in extrafields type 2013-02-15 00:17:42 +01:00
Laurent Destailleur
365680d90e Fix: Missing vat rates 2013-02-13 21:25:17 +01:00
Laurent Destailleur
caec1429b1 Fix: Uniformize database type according to page http:// 2013-02-13 15:19:03 +01:00
Christophe Battarel
b372a8c5ba prepare db for margin on contracts 2013-02-13 08:59:40 +01:00
Christophe Battarel
5c9950f486 prepare db for margin on contracts 2013-02-13 08:55:16 +01:00
Laurent Destailleur
7ee530f826 New: Add field to store hierarchy of users. 2013-01-30 15:23:49 +01:00
Laurent Destailleur
0383080d90 Fix: bad menu file name 2013-01-28 17:37:40 +01:00
Laurent Destailleur
9eaf8af341 Fix: Removed warning (this can be normal behaviour) 
Fix: menu manager name has changed
 2013-01-28 15:35:29 +01:00
Laurent Destailleur
0beea6c23c Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/install/inc.php
 2013-01-28 12:58:16 +01:00
Laurent Destailleur
a8ccc0ab0b Fix: loghandler loaded twice. 2013-01-28 12:36:15 +01:00
Laurent Destailleur
b98151db94 Fix: A log handler can be loaded twice. 2013-01-28 12:22:12 +01:00
Laurent Destailleur
abd8aea06b Fix: Log not reported 
Fix: charset not correctly forced

Conflicts:
	htdocs/install/inc.php
 2013-01-28 11:56:45 +01:00
Laurent Destailleur
eeba48f9b0 Fix: Log not reported 
Fix: charset not correctly forced
 2013-01-28 11:43:49 +01:00
Laurent Destailleur
c2d334624b Qual: Simplify system for menu manager. Only one file, one class per 
manager.
 2013-01-25 17:44:23 +01:00
Laurent Destailleur
a7d41d74e8 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-23 18:09:05 +01:00
Laurent Destailleur
7b1e15f340 New: Allow to use upgrade script to upgrade sql of modules 2013-01-23 14:51:15 +01:00
Laurent Destailleur
ec76127625 Fix: http://www.dolibarr.fr/forum/12-howto--aide/28089-adherents--tiers 
Fix: Update member
 2013-01-22 15:14:46 +01:00
Laurent Destailleur
05bd489b82 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/admin/index.php
 2013-01-21 01:12:19 +01:00
Laurent Destailleur
e236ac3f03 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-01-21 01:07:22 +01:00
Laurent Destailleur
9cf405f9d2 Fix: syntax error 2013-01-21 01:06:52 +01:00
eldy
5c49947750 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-20 15:32:48 +01:00
eldy
d1dc04761a Fix: dev rule to build portable requests 2013-01-20 15:30:51 +01:00
eldy
6ded74d5dd Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-01-20 15:22:14 +01:00
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
Laurent Destailleur
f701559056 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-01-19 14:32:50 +01:00
Laurent Destailleur
0e13b3872d Fix: Removed warnings 2013-01-19 14:32:37 +01:00
Laurent Destailleur
a5b174eccc Fix: Architecture of getCurrency was wrong. Cache was not stored 
correctly and dict file loaded several times. There was also bug on PHP
without mb_string function.
Now function is a method of $langs object. All bug fixes.
 2013-01-18 15:57:11 +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
Laurent Destailleur
d40440fc45 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-16 14:21:56 +01:00
fhenry
e3fd60c762 Add adherent type extrafield extrafield table in migration script 2013-01-16 13:49:44 +01:00
Laurent Destailleur
5497b93247 Fix: Removed warning 2013-01-16 13:43:25 +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
8ac33e98e7 Fix: property object_total_discount was not working when quantity was 
not 1.
 2013-01-10 12:58:46 +01:00
Regis Houssin
9812c91aff Fix: wrong EOL !!!!!!! 2013-01-10 08:27:12 +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
Laurent Destailleur
142f171e50 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/.gitignore
 2013-01-08 11:10:47 +01:00
eldy
24d3fdfe6c Fix: bad setup entry page 2013-01-06 21:52:59 +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
c7b3f2099e Fix: [ bug #648 ] Warning into instalation 
Install must use new log modules.
 2012-12-27 15:22:40 +01:00
Laurent Destailleur
d4f81a9ee7 Fix: Predefined invoice feature was broken. 2012-12-27 12:51:38 +01:00
Laurent Destailleur
6ba4a22d21 Fix: Migration of payment id not complete 2012-12-27 01:22:00 +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
fhenry
dbe00e9fbd Better bahaviour for pgSQL autoupdate trigger 2012-12-08 16:01:05 +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
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
Laurent Destailleur
bee97a6b3b Restore another lost commit. 
Fix: Restore compatibility with FPDF.

Conflicts:
	htdocs/core/lib/pdf.lib.php
 2012-12-05 00:47:20 +01:00
Laurent Destailleur
5d27fd61df Beautify instal pg. 
Fix: Debian package
Restore PHPUnit test (A PHP Unit test that fails should not be removed
but fixed and be kept in error until fix is published. Otherwise,
PHPUnit are useless).

Conflicts:
	htdocs/install/fileconf.php
	htdocs/install/inc.php
 2012-12-05 00:45:10 +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
bba1492621 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-01 12:23:12 +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
624c0fa040 Fix: Restore compatibility with FPDF. 2012-11-30 20:31:43 +01: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
Laurent Destailleur
17e0aedebb Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-11-29 13:20:53 +01:00
Laurent Destailleur
a62f2a7c8d New: Add vat rate for south africa. 2012-11-29 12:53:12 +01:00