Commit Graph

30722 Commits

Author SHA1 Message Date
Laurent Destailleur
924d01249c Prepare 3.3.1 maintenance release 2013-03-02 16:12:06 +01:00
Laurent Destailleur
6f51925c7b Merge pull request #708 from simnandez/develop
[ task #731 ] Uniformize ref generation. Propals
2013-03-02 07:06:53 -08:00
Laurent Destailleur
0f576181be Merge pull request #707 from simnandez/3.3
Fix: Localtax2 for Spain must be based into buyer
2013-03-02 07:05:50 -08:00
Laurent Destailleur
862c56a118 Merge pull request #704 from GPCsolutions/develop-noutf8bom_includes
Removed UTF-8 BOM from included libraries
2013-03-02 07:05:13 -08:00
Laurent Destailleur
6b3b2ea1c7 Merge pull request #706 from atm-maxime/develop
Bug on contact list
2013-03-02 07:04:41 -08:00
Laurent Destailleur
81a06507fa Fix: data not refreshed 2013-03-02 16:01:46 +01:00
simnandez
7d9d575e40 [ task #731 ] Uniformize ref generation. Propals 2013-03-02 15:57:26 +01:00
Laurent Destailleur
f172c900c7 Qual: Uniformize menu code 2013-03-02 14:43:36 +01:00
Laurent Destailleur
f464b7b37c Fix: Avoid using date_format 2013-03-01 23:30:07 +01:00
Laurent Destailleur
5fb4ec7891 Fix: bad field name 2013-03-01 23:14:28 +01:00
simnandez
0cb5b3f50c Fix: Localtax2 for Spain must be based into buyer 2013-03-01 20:32:49 +01:00
Laurent Destailleur
e6afcd328c Look: Minor fix in CSS for IE. 2013-03-01 19:39:54 +01:00
Laurent Destailleur
911c25c3fd Qual: Better error management 2013-03-01 19:25:49 +01:00
Maxime Kohlhaas
da87828200 Fix bug # 740 : address copy 2013-03-01 18:41:41 +01:00
Maxime Kohlhaas
803bee076c Engish standardization correction + search by idprof1 possible 2013-03-01 18:20:42 +01:00
Laurent Destailleur
3022dff108 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-01 18:14:42 +01:00
Maxime Kohlhaas
881b3bc936 Bug fix on contact list due to name column renamed 2013-03-01 18:11:34 +01:00
Laurent Destailleur
562ea22304 Qual: Better error management 2013-03-01 18:10:19 +01:00
Laurent Destailleur
29ccc749ae Merge pull request #703 from GPCsolutions/develop-noutf8bom_main
Removed UTF-8 BOM
2013-03-01 07:23:17 -08:00
Raphaël Doursenaud
a6407a3642 Removed UTF-8 BOM from included libraries 2013-03-01 14:17:36 +01:00
Raphaël Doursenaud
e76ffca9ba Removed UTF-8 BOM 2013-03-01 14:11:42 +01:00
Laurent Destailleur
a1b4d670ff Merge pull request #701 from defrance69/patch-14
Update index.php
2013-03-01 03:48:54 -08:00
Alexis Algoud
49f712546f Add condition for normal traitment on empty hook result.
Note : The normal case on 'formObjectOptions' is currently nothing more (no extrafields,...).
2013-03-01 11:38:24 +01:00
Alexis Algoud
2d36423310 Ajout de la gestion des Hooks (doActions & sur la page d'ajout des commerciaux à une société, /societe/commerciaux.php 2013-03-01 10:42:05 +01:00
BENKE Charles
5ad98a8652 Update index.php
rename search_product by search_project (the real search thing)
2013-03-01 00:56:29 +01:00
eldy
4e52b2596a Uniformize code 2013-02-28 23:49:38 +01:00
fhenry
0d0c1e8c14 Fix [ bug #736 ] 2013-02-28 21:18:52 +01:00
fhenry
7952a1f1a5 rool back changes 2013-02-28 21:15:45 +01:00
fhenry
dcf76d7bcb Fix [ bug #736 ] 2013-02-28 21:13:25 +01:00
Regis Houssin
16ad99f8c5 Fix: to force id field name 2013-02-28 19:41:44 +01:00
Regis Houssin
d9b7886ef9 Fix: try to fix regression, stored the last id created in a session
variable in order to be used to find out information in the "ref_ext" in
order to differentiate automatic actions.
2013-02-28 18:47: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
Grand Philippe
44683a0e21 english language standardization 2013-02-27 11:58:50 +01: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
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
Laurent Destailleur
b9ead08968 Merge pull request #691 from grandoc/develop
english language standardization
2013-02-25 01:32:26 -08:00
Laurent Destailleur
e748f07806 Qual: Using divs instead of tables 2013-02-25 10:31:47 +01:00
Grand Philippe
ffeb066b1b Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-25 10:30:48 +01:00
Laurent Destailleur
ae322ba17f Qual: Better init of default lang 2013-02-25 10:17:38 +01:00
Grand Philippe
eddf910438 fix issue with english language standardization 2013-02-25 10:00:09 +01:00
Grand Philippe
b081589129 english language standardization 2013-02-25 09:52:24 +01:00
Grand Philippe
6decab1847 english language standardization 2013-02-25 09:17:38 +01:00
Grand Philippe
d27568d3d0 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-25 08:16:43 +01:00
Laurent Destailleur
b61c576343 Qual: Still work onto menu management rewrite. 2013-02-24 21:16:36 +01:00
Laurent Destailleur
7238c5156e New: Update jquery mobile lib 2013-02-24 19:33:06 +01:00
Laurent Destailleur
b4329cb5d2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-02-24 18:22:57 +01:00
Laurent Destailleur
24eab5b8fd New: Add page with seach only boxes. 2013-02-24 18:22:28 +01:00
Laurent Destailleur
234e171e9d New: Add option dol_hide_topmenu and dol_hide_leftmenu onto login page. 2013-02-24 18:16:26 +01:00
Laurent Destailleur
fe4ef69360 Fix: Duplicate form 2013-02-24 18:08:52 +01:00
Laurent Destailleur
a6378ab0bb Cleaner HTML code 2013-02-24 18:08:27 +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
8c765ace99 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-24 15:30:39 +01:00
Laurent Destailleur
3baf8a6c00 New: Use div instead of tables into login page. 2013-02-24 14:57:49 +01:00
Laurent Destailleur
6b20370ffa Fix: Check consitency of option NOREQUIREXXX 2013-02-24 14:54:08 +01:00
Grand Philippe
7596096b89 some fix for english language standardization 2013-02-24 14:46:00 +01:00
Grand Philippe
067cb0a409 some fix for english language standardization 2013-02-24 14:32:15 +01:00
Grand Philippe
36ce7a9a10 some fix for english language standardization 2013-02-24 14:11:09 +01:00
Laurent Destailleur
0b61c740a9 Fix: To be sure to start onto an selected top menu 2013-02-24 13:57:17 +01:00
Grand Philippe
77544de01a some fix for english language standardization 2013-02-24 12:50:05 +01:00
Grand Philippe
5d3ab26463 some fix for english language standardization 2013-02-24 12:26:01 +01:00
Grand Philippe
9175f241ff Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-24 10:10:52 +01:00
Laurent Destailleur
08bde6faa5 Fix: Do not load menu when not required. 2013-02-24 03:45:19 +01:00
Laurent Destailleur
50de5a944a Fix: compatibility with new menu manager 2013-02-24 03:29:03 +01:00
Laurent Destailleur
d3c2d088a9 New: Add url to get menu only. Work on progress. 2013-02-24 02:55:25 +01:00
Laurent Destailleur
cd56fa61e6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-02-24 02:47:47 +01:00
Laurent Destailleur
d31306609c Fix: Bad translation if error 2013-02-24 02:47:30 +01:00
Laurent Destailleur
d786e8ca6e Code comment 2013-02-24 02:42:37 +01:00
Laurent Destailleur
c62f87380c Qual: use div instead of table 2013-02-24 02:41:46 +01:00
Grand Philippe
6adc9eb7f2 english language standardization 2013-02-23 17:40:28 +01:00
Grand Philippe
c9f91a6082 english language standardization 2013-02-23 17:01:10 +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
4f9f32eb3e english language standardization 2013-02-23 16:37:17 +01:00
Grand Philippe
ac0e99bc1a english language standardization 2013-02-23 16:21:49 +01:00
Grand Philippe
048035a05b english language standardization 2013-02-23 16:08:35 +01:00
Grand Philippe
382d216d54 english language standardization 2013-02-23 15:58:26 +01:00
Grand Philippe
8d7654916f english language standardization 2013-02-23 15:46:12 +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
Grand Philippe
37cce5d860 fix: change name with lastname 2013-02-23 14:31:59 +01:00
Grand Philippe
5d8dea788c fix: change name with lastname 2013-02-23 14:17:52 +01:00
Grand Philippe
9fc18d23e7 fix: change name with lastname 2013-02-23 13:59:17 +01:00
Grand Philippe
7c2a4500d6 fix: change name with lastname 2013-02-23 12:30:01 +01:00
Laurent Destailleur
37b94e43c8 Merge pull request #685 from frederic34/develop
WIP : Admin for Carriers
2013-02-23 03:11:52 -08:00
Laurent Destailleur
bbe145cc47 Merge pull request #681 from grandoc/develop
english standardization
2013-02-23 03:08:56 -08:00
Laurent Destailleur
845e4ff93d Merge pull request #684 from jfefe/develop
Fix bug #732 : Missing argument when calling selectcontacts method
2013-02-23 02:55:46 -08:00
Grand Philippe
15f8b588d6 english standardization 2013-02-23 11:54:46 +01:00
Grand Philippe
869a014d32 english standardization 2013-02-23 11:42:12 +01:00
Grand Philippe
250a941096 english standardization 2013-02-23 11:11:33 +01:00
Grand Philippe
529b8ae38e english standardization 2013-02-23 10:43:16 +01:00
Grand Philippe
9400d9897a english standardization 2013-02-23 10:35:46 +01:00
frederic34
c8872d7e98 WIP : Admin for carriers 2013-02-23 10:20:31 +01:00
Grand Philippe
88458ca466 english standardization 2013-02-23 10:18:05 +01:00
Grand Philippe
182fdbce32 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-23 10:04:31 +01:00
Laurent Destailleur
1224e79ee3 Qual: Start to clean how menu managers works. 2013-02-22 19:16:03 +01:00
Grand Philippe
c88f2bcb45 english standardization 2013-02-22 17:43:33 +01:00
Grand Philippe
57a75d9882 english standardization 2013-02-22 17:15:49 +01:00
Grand Philippe
a0df6764d8 english standardization 2013-02-22 17:13:11 +01:00
Grand Philippe
844433d0a2 english standardization 2013-02-22 17:11:53 +01:00
Grand Philippe
fb54bceafb english standardization 2013-02-22 16:53:50 +01:00
Grand Philippe
9a431bb8e3 english standardization 2013-02-22 16:33:48 +01:00
Grand Philippe
890b9ca44a english standardization 2013-02-22 16:27:58 +01:00
Grand Philippe
aa28e17953 english standardization 2013-02-22 16:21:30 +01:00
Grand Philippe
38480f5962 english standardization 2013-02-22 16:19:16 +01:00
Grand Philippe
a582fd3f15 english standardization 2013-02-22 16:14:52 +01:00
jfefe
7e79e1a574 Fix bug #735 : Error when trying send expedition card 2013-02-22 16:02:19 +01:00
Grand Philippe
fc4ad12a72 english standardization 2013-02-22 15:57:30 +01:00
jfefe
34bfdf92cd Fix bug #732 : Missing argument when calling selectcontacts method 2013-02-22 15:34:20 +01:00
Maxime Kohlhaas
04e1be4afd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-02-22 15:24:49 +01:00
Maxime Kohlhaas
87dc3a0b22 LDAP sync : trigger was launched even if LDAP_SYNCHRO_ACTIVE is 'ldap2dolibarr' 2013-02-22 15:24:29 +01:00
fhenry
af6bb94ff3 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-02-22 15:02:33 +01:00
fhenry
44b5b98308 Fix [ bug #733 ] 2013-02-22 15:02:06 +01:00
Laurent Destailleur
8c4e13230b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-02-22 14:20:46 +01:00
frederic34
67c06225a5 WIP : Admin for carriers 2013-02-22 14:18:51 +01:00
philippe
b4e43bbc41 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2013-02-22 13:58:19 +01:00
Regis Houssin
ae154ed9a3 Merge branch '3.3' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.3 2013-02-22 13:15:41 +01:00
Regis Houssin
b5d2a378fa Fix: pdf models are unstable and time consuming. 2013-02-22 13:14:54 +01:00
Regis Houssin
7d0f02eb8b Fix: pdf models are unstable and time consuming. 2013-02-22 13:14:04 +01:00
Laurent Destailleur
a1b05f8be4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-02-22 13:02:15 +01:00
Laurent Destailleur
6b50ddf6ec Merge pull request #682 from FHenry/3.3
Fix bug #730
2013-02-22 03:45:32 -08:00
Regis Houssin
8a5f68de9c Fix: wrong hidden 2013-02-22 12:22:28 +01:00
Regis Houssin
dd7411593e Fix: wrong hidden 2013-02-22 12:21:49 +01:00
Laurent Destailleur
327f4062c7 New: Prepare code to be able to choose bank account to show when
building pdf and payment mode is withdraw.
2013-02-22 12:04:38 +01:00
Grand Philippe
960c9ccbaf english standardization 2013-02-22 11:39:47 +01:00
Grand Philippe
19201a1015 english standardization 2013-02-22 11:32:19 +01:00
philippe
fae9f73ea4 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2013-02-22 11:31:52 +01:00
Regis Houssin
3b45cffafa Fix: hide blocs with multi-page 2013-02-22 11:26:23 +01:00
Regis Houssin
8136244d87 Fix: hide blocs with multi-page 2013-02-22 11:25:29 +01:00
Regis Houssin
20522148f2 Fix: regression, the product discount overwrites the default customer
discount !
2013-02-22 11:06:45 +01:00
Regis Houssin
289ff4fe1a Fix: regression, the product discount overwrites the default customer
discount !
2013-02-22 11:03:20 +01:00
Grand Philippe
d255dc5114 english standardization 2013-02-22 10:24:24 +01:00
fhenry
aa473fa3e3 Fix bug #730 2013-02-22 09:42:02 +01:00
Grand Philippe
d229d3a594 english standardization 2013-02-22 09:41:56 +01:00
Grand Philippe
303577a7fa english standardization 2013-02-22 09:36:01 +01:00
Grand Philippe
0af5c434af english standardization 2013-02-22 09:29:34 +01:00
frederic34
751488e291 Merge remote-tracking branch 'upstream/develop' into develop 2013-02-22 09:01:27 +01:00
simnandez
e1683f5f22 Fix: Pagination at bottom not work correctly with filters applied 2013-02-22 08:57:28 +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
simnandez
8fd3d9375d Fix: Pagination at bottom not work correctly with filters applied 2013-02-22 08:56:07 +01:00
eldy
4f1c4f0365 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-02-22 00:11:47 +01:00
eldy
2ecb113d30 Fix: categories are set onto category tab 2013-02-22 00:11:34 +01:00
frederic34
d26024d8fc WIP : Admin for Carriers (Activate/Desactivate) 2013-02-21 23:40:25 +01:00
frederic34
6259f4ce59 Fix : some & -> & 2013-02-21 23:08:58 +01:00
Laurent Destailleur
4a8883dc92 Merge pull request #678 from atm-maxime/develop
Supplier order : add trigger on product dispatch
2013-02-21 12:44:43 -08:00
Laurent Destailleur
0aa24369fd Merge pull request #676 from frederic34/develop
New: Add some carrier
2013-02-21 12:44:30 -08:00
Laurent Destailleur
3053319928 Merge pull request #675 from grandoc/develop
fix : english normalization
2013-02-21 12:40:15 -08:00
Laurent Destailleur
c24b29343a Merge pull request #674 from simnandez/develop
Qual: Try to delete no more used addpropal.php
2013-02-21 12:39:47 -08:00
eldy
e99b0dd96f Fix: Select prospect, customer or both 2013-02-21 21:11:21 +01:00
eldy
3d80a6ebfc Fix: Enhance pgsql driver 2013-02-21 21:04:20 +01:00
simnandez
5d357c7736 Trad: Fix activity box translation 2013-02-21 18:48:56 +01:00
simnandez
8e6cde61c0 Trad: Update translations 2013-02-21 18:44:11 +01:00
Maxime Kohlhaas
2f5bf06aed Supplier order : add trigger on product dispatch 2013-02-21 17:32:57 +01:00
simnandez
723c46ec42 Fix: Pagination at bottom not work correctly with filters applied 2013-02-21 14:29:06 +01:00
frederic34
d7f83c3520 New: Add some carrier 2013-02-21 11:23:12 +01:00
simnandez
4cb6072f03 New: [ task #707 ] Create option ProfIdx are mandatory to validate a
invoice
2013-02-21 11:03:14 +01:00
Laurent Destailleur
ec3dab23ca Fix: Page title 2013-02-21 10:22:33 +01:00
simnandez
c03f346c6d Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2013-02-21 10:12:05 +01:00
Grand Philippe
dc4c013d10 fix : english normalization 2013-02-21 09:44:49 +01:00
Grand Philippe
9d28a1de75 fix : english normalization 2013-02-21 09:35:05 +01:00
Laurent Destailleur
66ca0ba0e2 Fix: alignement 2013-02-20 21:58:13 +01:00
Laurent Destailleur
3687b29a7b Fix: Missing translation 2013-02-20 21:42:20 +01:00
Laurent Destailleur
af26c4ce6d Fix: Missing translation 2013-02-20 21:41:50 +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
320b4bde1f Qual: Code to output tree is now generic 2013-02-20 19:01:29 +01:00
Laurent Destailleur
6db881c09d New: Add link collapse all - expand all.
Fix: Add missing images.
2013-02-20 18:34:54 +01:00
simnandez
b913d186bd Qual: Try to delete no more used addpropal.php 2013-02-20 18:32:14 +01:00
Laurent Destailleur
2017815e89 Fix: Works for both normalized modules and external modules 2013-02-20 17:34:03 +01:00
Laurent Destailleur
1aee361ffd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-02-20 14:58:56 +01:00
Laurent Destailleur
f194ee5363 Fix: core dir of external modules must be into dir of module. 2013-02-20 14:58:40 +01:00
Laurent Destailleur
e5e4c113a3 Merge pull request #672 from jfefe/extrafields
Fix : extrafields value in ODT document
2013-02-20 03:05:54 -08:00
jfefe
4bf550b25c Fix : bad permission in webservice to get contact 2013-02-20 11:37:44 +01:00
jfefe
1941efa45a Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into webservices 2013-02-20 11:15:15 +01:00
jfefe
cb0404a750 New webservice method to update contact 2013-02-20 11:15:05 +01:00
Laurent Destailleur
3c18696f7e Removed deprecated code 2013-02-20 10:37:52 +01:00
Laurent Destailleur
b40f1a5261 Merge pull request #670 from frederic34/develop
language fix
2013-02-19 12:11:23 -08:00
Laurent Destailleur
d07c5ae49f Merge pull request #669 from simnandez/develop
Fix: Translation
2013-02-19 12:11:06 -08:00
Laurent Destailleur
bc505c98a0 Test to avoid infinite loop 2013-02-19 21:10:31 +01:00
Laurent Destailleur
9ddd6215f8 Qual: Replace native code with jquery plugin treeview. 2013-02-19 20:15:30 +01:00
frederic34
da6daef83b fix language holiday admin 2013-02-19 16:36:25 +01:00
frederic34
8c0fbe62f5 fix language holiday 2013-02-19 16:30:51 +01:00
simnandez
94d1f6e0c2 Fix: sourcecompany now works with state instead departement (deprecated)
into build_address
2013-02-19 16:05:55 +01:00
simnandez
9e3497cff3 New: Add ES formated address country rule 2013-02-19 16:02:58 +01:00
Laurent Destailleur
46170c0255 New: Focus on first field 2013-02-19 15:33:49 +01:00
Laurent Destailleur
95098a9b59 Fix: Menu editor 2013-02-19 15:23:25 +01:00
Laurent Destailleur
7367a2472c Look: Mor CSS3 2013-02-19 13:24:32 +01:00
simnandez
df0f281efd Fix: Translation 2013-02-19 12:11:44 +01:00
Laurent Destailleur
3912013a05 Merge pull request #668 from FHenry/develop
Better to use foreach because when add mail in $cible array we can test
2013-02-19 01:14:23 -08:00
Laurent Destailleur
402bc48b24 Merge pull request #666 from grandoc/3.3
fix language
2013-02-19 01:13:00 -08:00
fhenry
3e42f90b1e Better to use foreach because when add mail in $cible array we can test
with (!array_key_exists($obj->email, $cibles)) better than old method
2013-02-19 04:48:39 +01:00
simnandez
15f6f7c335 Fix: Translation 2013-02-18 17:07:20 +01:00
Grand Philippe
3ce75ce382 fix: bad commit 2013-02-18 16:57:38 +01:00
Laurent Destailleur
4119fde0e5 Merge pull request #665 from FHenry/develop
Fix mass mailing tabs regression
2013-02-18 07:46:07 -08:00
Grand Philippe
108b4d1ae9 fix language 2013-02-18 16:10:27 +01:00
jfefe
a197e6a026 Merge branch 'extra_odt' into extrafields 2013-02-18 15:50:47 +01:00
jfefe
110713f6ca Fix : display correct value in ODT for extrafields 2013-02-18 15:47:40 +01:00
fhenry
195af1f2bd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-02-18 15:25:27 +01:00
fhenry
fd4a465c90 Fix mass maling tabs regression 2013-02-18 15:25:13 +01:00
Laurent Destailleur
e9dc4b9db3 Fix: We must not add month holidays after init of sold. 2013-02-18 15:15:10 +01:00
Laurent Destailleur
da7b5e352f Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	
New: Add function dol_set_focus('#xxx')
2013-02-18 15:01:00 +01:00
Grand Philippe
b484fef22a fix language 2013-02-18 14:19:01 +01:00
Laurent Destailleur
70ea5b0b1d Merge pull request #663 from jfefe/extrafields
Work on extrafields
2013-02-18 05:17:06 -08:00
Laurent Destailleur
b5260e4ab1 Fix: Translation 2013-02-18 14:13:02 +01:00
Grand Philippe
020dff3699 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-18 13:48:11 +01:00
Grand Philippe
0a697e1033 fix language 2013-02-18 13:47:46 +01:00
jfefe
2f4a80215b Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields 2013-02-18 13:39:00 +01:00
Laurent Destailleur
f82bec552b Fix: Check id field are mandatory 2013-02-18 13:07:32 +01:00