Grand Philippe
|
f862adc4d9
|
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop
|
2013-02-23 15:27:06 +01:00 |
|
Grand Philippe
|
a237be0d24
|
english language standardization
|
2013-02-23 15:26:39 +01:00 |
|
frederic34
|
9333fdb97f
|
WIP : Admin for Carriers
|
2013-02-23 15:23:33 +01:00 |
|
Laurent Destailleur
|
37b94e43c8
|
Merge pull request #685 from frederic34/develop
WIP : Admin for Carriers
|
2013-02-23 03:11:52 -08:00 |
|
Grand Philippe
|
15f8b588d6
|
english standardization
|
2013-02-23 11:54:46 +01:00 |
|
Grand Philippe
|
250a941096
|
english standardization
|
2013-02-23 11:11:33 +01:00 |
|
frederic34
|
c8872d7e98
|
WIP : Admin for carriers
|
2013-02-23 10:20:31 +01:00 |
|
Grand Philippe
|
57a75d9882
|
english standardization
|
2013-02-22 17:15:49 +01:00 |
|
Grand Philippe
|
fb54bceafb
|
english standardization
|
2013-02-22 16:53:50 +01:00 |
|
Grand Philippe
|
890b9ca44a
|
english standardization
|
2013-02-22 16:27:58 +01:00 |
|
Grand Philippe
|
a582fd3f15
|
english standardization
|
2013-02-22 16:14:52 +01:00 |
|
Grand Philippe
|
fc4ad12a72
|
english standardization
|
2013-02-22 15:57:30 +01:00 |
|
frederic34
|
67c06225a5
|
WIP : Admin for carriers
|
2013-02-22 14:18:51 +01:00 |
|
Grand Philippe
|
19201a1015
|
english standardization
|
2013-02-22 11:32:19 +01:00 |
|
Grand Philippe
|
d255dc5114
|
english standardization
|
2013-02-22 10:24:24 +01:00 |
|
Grand Philippe
|
0af5c434af
|
english standardization
|
2013-02-22 09:29:34 +01:00 |
|
frederic34
|
de4bc7f39d
|
Fix : It was a bad idea to add COL in the code name of new carriers
|
2013-02-22 08:56:14 +01:00 |
|
frederic34
|
d7f83c3520
|
New: Add some carrier
|
2013-02-21 11:23:12 +01:00 |
|
Laurent Destailleur
|
2852aded3a
|
New: Add button collapse/expand for menu, category and user views.
|
2013-02-20 21:16:31 +01:00 |
|
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
|
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
|
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 |
|
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 |
|