Commit Graph

27217 Commits

Author SHA1 Message Date
Regis Houssin
2fe16db244 Fix: bad parameters 2012-05-05 09:03:04 +02:00
Regis Houssin
f4759a0e6e Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-05-04 13:21:50 +02:00
Regis Houssin
656d4942a6 Fix: MultiCompany compatibility for public page 2012-05-04 13:21:28 +02:00
Laurent Destailleur
5953f18f54 Fix: filter on status 2012-05-03 22:58:51 +02:00
Laurent Destailleur
7a6a462ef2 Fix: Bad cr 2012-05-03 22:13:23 +02:00
Regis Houssin
21a4dd9685 Fix: missing entity field in contract
Fix: multicompany compatibility

Conflicts:
	htdocs/contrat/class/contrat.class.php
2012-05-03 18:45:26 +02:00
simnandez
6c7206d210 Trad: add missing translations 2012-05-02 18:17:21 +02:00
Laurent Destailleur
39e34357a1 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-05-02 17:33:26 +02:00
Laurent Destailleur
557c96455e Fix: Use de_De language for de_de, not de_at 2012-05-02 17:30:02 +02:00
Laurent Destailleur
7e933ca175 Merge pull request #191 from simnandez/3.2
Trad: [ bug #378 ] status for order i, process is "waiting for reception"
2012-05-02 07:35:03 -07:00
Laurent Destailleur
47c0b8272d Fix: Middle
Conflicts:
	htdocs/core/tpl/login.tpl.php
2012-05-02 14:19:34 +02:00
Laurent Destailleur
afd9b817be Fix: Missing translation 2012-05-02 13:42:49 +02:00
Laurent Destailleur
f5cc12895a Fix: Missing picto 2012-05-02 13:42:34 +02:00
simnandez
c7daf233cd Trad: [ bug #378 ] status for order i, process is "waiting for
reception"
2012-05-02 09:21:52 +02:00
Laurent Destailleur
9edd80b850 Fix: Clean database to allow constraints 2012-05-01 15:28:11 +02:00
Laurent Destailleur
67adc11086 Fix: [ bug #378 ] status for order i, process is "waiting for reception" 2012-05-01 15:09:50 +02:00
Laurent Destailleur
129bb0cf2f Fix: awful IE 2012-04-30 19:15:16 +02:00
Laurent Destailleur
69b429914f Fix: Firstname/Lastname lost
Conflicts:
	htdocs/admin/tools/update.php
2012-04-30 19:03:14 +02:00
Laurent Destailleur
74887b5850 Fix: Removed warnings 2012-04-30 09:33:43 +02:00
Laurent Destailleur
3641a4b5bb Fix: Regression 2012-04-29 21:49:03 +02:00
Laurent Destailleur
d4d598d0aa Fix: left align 2012-04-28 20:51:51 +02:00
Laurent Destailleur
450ccf31a7 Fix: Bad declaration of error_reporting
Conflicts:
	htdocs/filefunc.inc.php
2012-04-28 18:52:05 +02:00
Laurent Destailleur
6b9717b250 Fix: Use same algo to scan modules than admin/modules page 2012-04-28 18:50:30 +02:00
Laurent Destailleur
2a19e9d2a1 Fix: Var can't be static 2012-04-28 18:24:53 +02:00
Laurent Destailleur
9200847eaa Fix: Try a better fix. Format of content of table should depend of
content and output rules and not on how data was input.
2012-04-28 15:44:04 +02:00
Laurent Destailleur
3918335bf7 No new feature into a beta. Also this feature is a security
hole for the moment, so it should not be enabled as a common default
feautre but must be kept hidden.
2012-04-28 15:32:48 +02:00
Laurent Destailleur
99006125fd Fix: export of print sheets 2012-04-28 14:57:16 +02:00
Regis Houssin
f7b0e1a976 Merge pull request #178 from simnandez/3.2
Fix: Bad include
2012-04-26 01:50:43 -07:00
Regis Houssin
0092f1bc89 Fix: problem of line break between label and description when
using fckeditor
2012-04-26 10:29:46 +02:00
simnandez
6e84b8ca63 Fix: Bad include 2012-04-26 08:50:39 +02:00
FHenry
fa0e1ca87e remove useless line 2012-04-25 18:37:16 +02:00
FHenry
58df839271 Rename global variable from MAIN_SOCIETE_UNSUBSCRIBE to
MAILING_EMAIL_UNSUBSCRIBE to be reliable on dolibarr implementation

Conflicts:
	htdocs/admin/mailing.php
2012-04-25 18:36:58 +02:00
FHenry
d5b21a05b2 Remove Eclipse variable warning 2012-04-25 18:33:30 +02:00
FHenry
455789d575 Remove Eclipse Warning (Undeclare variable) 2012-04-25 18:33:09 +02:00
Laurent Destailleur
d390f3137f Fix: [ bug #367 ] "Multi-tiers" fonctionality inverted in project
contacts.
2012-04-21 19:44:05 +02:00
Laurent Destailleur
2b77a99fa3 Fix: [ bug #372 ] Upgrade error from 3.1.0 to 3.2.0 Beta 2012-04-21 19:12:20 +02:00
Laurent Destailleur
3a2caa3e46 Fix: Try a fix for the lost mainmenu session. 2012-04-20 20:38:49 +02:00
Laurent Destailleur
32339b03fd Add log to try to find the mainmenu lost bug. 2012-04-20 14:48:40 +02:00
Laurent Destailleur
db53aa53b6 Fix: Lines useless 2012-04-20 14:24:02 +02:00
Laurent Destailleur
ab80f6aaa7 Fix: Can clone a proposal 2012-04-20 14:06:59 +02:00
Laurent Destailleur
eff43a8e0c Fix: wrong encoding of special chars 2012-04-20 13:59:35 +02:00
Laurent Destailleur
e503b2d858 Fix: Field must be reset after adding. 2012-04-20 13:50:23 +02:00
Laurent Destailleur
216df5ad07 Fix: Add hidden option to restore lost feature. 2012-04-20 13:46:40 +02:00
Laurent Destailleur
907c7f748d Fix: Bad CR for public note. Must work when text is full text with \n
and also when text is HTML with br.
2012-04-20 13:41:55 +02:00
Laurent Destailleur
91b8f33ea5 Fix: textarea field was not detected 2012-04-20 13:36:51 +02:00
Laurent Destailleur
5580a4cc30 Fix: Missing translation 2012-04-20 13:23:57 +02:00
Laurent Destailleur
cb8b5188be Change to help to fight the mainmenu lost bug. 2012-04-20 13:08:58 +02:00
Laurent Destailleur
8e9f3cabf3 Fix: left menu for home menu 2012-04-20 12:52:36 +02:00
Laurent Destailleur
c31c40a61e Fix: Force mainmenu. This does not solve completely bug of eaccelerator
but provide a way to have access to system menu to help to diagnose.
2012-04-20 12:10:55 +02:00
Laurent Destailleur
e0e3c07670 Fix: upload dir 2012-04-20 09:43:44 +02:00