Raphaël Doursenaud
e76ffca9ba
Removed UTF-8 BOM
2013-03-01 14:11:42 +01:00
Laurent Destailleur
bf0e4d73d0
Fix launchpad conflicts
2013-03-01 10:04:50 +01:00
Laurent Destailleur
0b51eff562
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-03-01 09:55:17 +01:00
Laurent Destailleur
5075e9c716
Update to 3.4
2013-03-01 09:55:04 +01:00
eldy
4e52b2596a
Uniformize code
2013-02-28 23:49:38 +01:00
Laurent Destailleur
1d76b3153e
Start to work onto payment return
2013-02-28 17:37:07 +01:00
Laurent Destailleur
7bbbda2dce
New: dol_syslog method accept a suffix to use different log files for
...
log.
2013-02-28 16:19:16 +01:00
Laurent Destailleur
fd6b51413c
Civility not required in a short label
2013-02-28 15:37:53 +01:00
Laurent Destailleur
33feddcd32
Qual: Rewrite of menu manager. next step.
2013-02-27 21:40:43 +01:00
Laurent Destailleur
b9848702a8
Merge remote-tracking branch 'origin/3.3' into develop
2013-02-27 19:44:22 +01:00
Laurent Destailleur
d190e924b3
Fix: Update of type was not working.
2013-02-27 19:43:40 +01:00
Laurent Destailleur
8b244b0d61
Fix: select lost if error
2013-02-27 19:21:40 +01:00
Laurent Destailleur
47c89dfd8e
Fix: trans
2013-02-27 17:47:51 +01:00
Laurent Destailleur
0d94ec4fee
Fix: trans
2013-02-27 17:47:21 +01:00
Laurent Destailleur
f2371be191
Fix: Update button does not appear
2013-02-27 15:24:08 +01:00
Laurent Destailleur
f294ea5fb0
Fix: Update button does not appear
2013-02-27 15:23:25 +01:00
Laurent Destailleur
0a62832f06
Merge pull request #698 from grandoc/develop
...
english language standardization
2013-02-27 05:27:09 -08:00
Grand Philippe
44683a0e21
english language standardization
2013-02-27 11:58:50 +01:00
Laurent Destailleur
ed8a746f41
Merge pull request #697 from grandoc/develop
...
english language standardization
2013-02-27 02:36:56 -08:00
Grand Philippe
6fb6b916c7
english language standardization
2013-02-27 11:24:50 +01:00
Laurent Destailleur
283aeb2945
Fix: Add option MAIN_USE_LOCALTAX_TYPE_7 to hide localtax 7 because
...
type 7 need to be implemented at invoice level, not line level. This
disable the feature (we need better implementation) without removing it
for people using it in the past.
2013-02-27 01:06:08 +01:00
Laurent Destailleur
61d5bd9962
css
2013-02-27 01:05:30 +01:00
Laurent Destailleur
029dec126d
Fix: Add option MAIN_USE_LOCALTAX_TYPE_7 to hide localtax 7 because
...
type 7 need to be implemented at invoice level, not line level. This
disable the feature (we need better implementation) without removing it
for people using it in the past.
2013-02-27 01:05:16 +01:00
Laurent Destailleur
6f0c35ef61
Fix: Bad migration instruct
2013-02-26 22:57:01 +01:00
Laurent Destailleur
453539511a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-02-26 21:36:18 +01:00
Laurent Destailleur
bdcb6bdef5
Try to aplpy enhancements defined into
...
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/38958-resolu-probleme-exports#38968
2013-02-26 20:15:20 +01:00
Laurent Destailleur
6692c1072a
Merge pull request #696 from jfefe/develop
...
Fix : bad sql request for cp field
2013-02-26 11:07:16 -08:00
Laurent Destailleur
402fe2e417
Merge remote-tracking branch 'origin/3.3' into develop
2013-02-26 20:05:23 +01:00
Laurent Destailleur
18aff92366
Merge pull request #683 from FHenry/3.3
...
Fix [ bug #733 ]
2013-02-26 11:03:36 -08:00
Laurent Destailleur
dacba745c5
Merge pull request #694 from grandoc/develop
...
english language standardization
2013-02-26 11:03:16 -08:00
Laurent Destailleur
b8a330ee80
Merge pull request #693 from atm-maxime/develop
...
LDAP : update user sync + add groups sync and users associated to group ...
2013-02-26 11:02:43 -08:00
Grand Philippe
d8edb3c074
display enhancement for models
2013-02-26 17:41:08 +01:00
Maxime Kohlhaas
0de4fa09f1
Product price : updated always with HT base type after product import
2013-02-26 12:52:37 +01:00
jfefe
428ba7feaf
Fix : bad sql request for cp field
2013-02-26 12:41:52 +01:00
Maxime Kohlhaas
e208bdf881
Theme : amarok was missing favicon, put eldy's one in place, to be replaced by a specific favicon
2013-02-26 12:05:55 +01:00
Maxime Kohlhaas
3d814c58e5
Bug # 736 : incorrect table name in migration script, muse be done in 3.3 branch too
2013-02-26 09:28:56 +01:00
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
e776e849ce
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-02-25 20:17:56 +01:00
Laurent Destailleur
c44f6004dd
Doc
2013-02-25 20:17:41 +01:00
Grand Philippe
44dee53350
english language standardization
2013-02-25 18:21:12 +01:00
Grand Philippe
79c2e17cbb
english language standardization
2013-02-25 17:56:41 +01:00
Maxime Kohlhaas
cd5bda27f4
Supplier dispatch : add new trigger called after order is dispatched
2013-02-25 16:56:37 +01:00
Maxime Kohlhaas
1eddf95d95
LDAP : update user sync + add groups sync and users associated to group + add fetch by name on group class
2013-02-25 16:46:31 +01:00
Laurent Destailleur
43a248b88b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
ChangeLog
2013-02-25 13:01:56 +01:00
Laurent Destailleur
2dc4b91521
New: Function plimit of databases drivers accept -1 as value (it means
...
default value set into conf->liste_limit).
2013-02-25 12:51:38 +01:00
Laurent Destailleur
00e8f78b77
Merge pull request #692 from atm-maxime/develop
...
LDAP sync improvements
2013-02-25 03:36:37 -08:00
Maxime Kohlhaas
428f844b4d
LDAP : add option to get data as an array
2013-02-25 11:57:52 +01:00
Maxime Kohlhaas
cfa1a41a16
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2013-02-25 11:54:26 +01:00
