philippe
|
905d6f7b71
|
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
|
2013-02-26 08:22:48 +01:00 |
|
Laurent Destailleur
|
4fd8143ecc
|
Merge remote-tracking branch 'origin/3.3' into develop
|
2013-02-25 20:24:34 +01:00 |
|
Laurent Destailleur
|
c4948ea3db
|
Fix: It seems foreign key is not deleted sometimes. To be sure, we force
delete also at end.
|
2013-02-25 20:23:44 +01:00 |
|
Laurent Destailleur
|
c44f6004dd
|
Doc
|
2013-02-25 20:17:41 +01:00 |
|
Grand Philippe
|
79c2e17cbb
|
english language standardization
|
2013-02-25 17:56:41 +01:00 |
|
Grand Philippe
|
b081589129
|
english language standardization
|
2013-02-25 09:52:24 +01:00 |
|
Grand Philippe
|
cb28300d7e
|
fix error commit
|
2013-02-24 17:17:25 +01:00 |
|
philippe
|
43b01010d1
|
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
|
2013-02-24 17:09:12 +01:00 |
|
Grand Philippe
|
86de772b31
|
english language standardization
|
2013-02-24 17:08:52 +01:00 |
|
Laurent Destailleur
|
7aca87ea40
|
Merge pull request #690 from frederic34/develop
WIP : Carrier Admin sql data migration
|
2013-02-24 07:45:44 -08:00 |
|
Grand Philippe
|
dfae543d5e
|
english language standardization
|
2013-02-24 15:57:02 +01:00 |
|
Grand Philippe
|
36ce7a9a10
|
some fix for english language standardization
|
2013-02-24 14:11:09 +01:00 |
|
frederic34
|
2a2719d5eb
|
WIP : Carrier Admin sql data migration
|
2013-02-23 16:54:41 +01:00 |
|
Laurent Destailleur
|
4dbf5a20ad
|
Merge pull request #687 from frederic34/develop
WIP : Admin for Carriers
|
2013-02-23 07:38:55 -08:00 |
|
Grand Philippe
|
382d216d54
|
english language standardization
|
2013-02-23 15:58:26 +01:00 |
|
Grand Philippe
|
b699b79a15
|
english language standardization
|
2013-02-23 15:36:12 +01:00 |
|
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 |
|