Commit Graph

32077 Commits

Author SHA1 Message Date
Regis Houssin
ea21064ca2 Fix: access problem if thirdparty module is disable 2012-07-02 20:06:08 +02:00
Regis Houssin
4e395e741c Merge pull request #237 from simnandez/3.2
Trad: Add missing translations
2012-07-02 09:01:18 -07:00
simnandez
b5a12ff088 Trad: Add missing translations 2012-07-02 17:36:41 +02:00
Regis Houssin
92858a7b47 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-02 17:13:39 +02:00
Regis Houssin
9623d50f48 Fix: big problem with linked elements 2012-07-02 17:11:35 +02:00
Regis Houssin
deecfe5d07 Fix: wrong sql request 2012-07-02 16:14:44 +02:00
Regis Houssin
067a9b0820 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git
into 3.2.1

Conflicts:
	htdocs/product/class/product.class.php
2012-07-02 15:49:04 +02:00
Regis Houssin
1f98a23587 Fix: compatibility with multicompany
Conflicts:
	htdocs/product/class/product.class.php
2012-07-02 15:46:31 +02:00
Regis Houssin
cd3df1d6e1 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-02 10:39:40 +02:00
Regis Houssin
1d5db424a1 Fix: missing contract reference 2012-07-02 10:38:40 +02:00
Regis Houssin
b632c2233b Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git
into 3.2.1
2012-07-02 10:17:42 +02:00
Regis Houssin
8d0cafc687 Fix: sql request error 2012-07-02 10:15:03 +02:00
Laurent Destailleur
57958e25bf Prepare 3.2 release 2012-06-30 02:21:59 +02:00
Laurent Destailleur
9edb149d2c Prepare 3.2 final 2012-06-30 01:48:25 +02:00
Laurent Destailleur
622720132d Use stable url 2012-06-30 01:45:54 +02:00
Laurent Destailleur
bdd8b393f9 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-30 01:15:50 +02:00
Regis Houssin
123b45aa4b Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-06-29 10:10:18 +02:00
Regis Houssin
55ac02382b Fix: missing parameters ! 2012-06-29 10:09:15 +02:00
Regis Houssin
87f2ec663d Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-06-29 09:37:46 +02:00
Regis Houssin
70cd7b87e9 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-29 09:36:33 +02:00
Regis Houssin
18ae5ff6ea New: remove linked elements invalid 2012-06-29 09:36:18 +02:00
Laurent Destailleur
52c2d39194 Fix: Can't modifiy accountancy code sell 2012-06-28 19:59:33 +02:00
Laurent Destailleur
0b56923de5 Fix: Panicum module for supplier accountancy code 2012-06-28 19:49:54 +02:00
Regis Houssin
11f78c1913 Fix: add ckeditor create div option with dolibarr_mailings toolbar 2012-06-27 16:39:39 +02:00
Regis Houssin
3164b5615c Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-06-27 16:37:47 +02:00
jfefe
189cba6c41 Fix : use lastname to test contact ldap synchro (not name) 2012-06-27 13:29:45 +02:00
Laurent Destailleur
de5612ae0b Fix: Missing include 2012-06-27 13:28:51 +02:00
Laurent Destailleur
f23d826e0a Fix: Bad hour 2012-06-27 01:41:44 +02:00
Laurent Destailleur
62f14e3dd5 Fix: Removed warning. Fix compatibility. 2012-06-26 23:13:03 +02:00
Laurent Destailleur
643e077c68 Fix: turkish language 2012-06-24 20:01:34 +02:00
Laurent Destailleur
5e490f8530 Fix: Remove warning 2012-06-24 19:43:26 +02:00
Laurent Destailleur
a67f6cc732 Fix: Preview of shiping receipts 2012-06-23 21:00:43 +02:00
Laurent Destailleur
06c17b806e Fix: fckeditor ko on linux package 2012-06-23 20:17:31 +02:00
Laurent Destailleur
8deeac403a Fix: Label was not translated 2012-06-23 15:03:02 +02:00
Regis Houssin
56f7d31d11 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-06-21 09:03:14 +02:00
Laurent Destailleur
ed724b82d3 Fix: We must not define language var if parm not defined.
Conflicts:
	htdocs/master.inc.php
2012-06-20 23:38:31 +02:00
Regis Houssin
d941d1efee Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git
into 3.2.1

Conflicts:
	build/makepack-dolibarr.pl
	htdocs/filefunc.inc.php
	htdocs/install/inc.php
2012-06-20 22:29:28 +02:00
Regis Houssin
9fed7fba30 Fix: missing not empty test 2012-06-20 22:24:26 +02:00
Laurent Destailleur
cb04444301 Fix: If option to not manage a login is on, login is not output into
info message.
Fix: Bad error management
2012-06-19 21:55:28 +02:00
Laurent Destailleur
8c030f4f81 Fix: rebuild_merge_pdf does not regenerate files already existing by
default.
2012-06-19 21:34:55 +02:00
Regis Houssin
4ef651d50b Merge pull request #231 from simnandez/3.2
3.2
2012-06-18 01:30:10 -07:00
simnandez
6bd438fc7f Doc: Update ChangeLog 2012-06-18 10:24:52 +02:00
Laurent Destailleur
657c7eb4cf Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into
3.2

Conflicts:
	build/exe/doliwamp/doliwamp.iss
	build/makepack-howto.txt
2012-06-17 22:35:47 +02:00
Laurent Destailleur
a00439b375 Prepare release 2012-06-17 22:30:01 +02:00
Laurent Destailleur
cb6f9f40b8 Prepare release 2012-06-17 19:22:44 +02:00
Laurent Destailleur
cfa8ca5c52 Fix: Removed warning 2012-06-17 17:45:25 +02:00
Laurent Destailleur
3354b35e75 Fix: Avoid warning if param is empty 2012-06-17 17:34:21 +02:00
Regis Houssin
9b1047eea7 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git
into 3.2.1
2012-06-16 08:26:26 +02:00
Laurent Destailleur
3556adc11d Fix: Permissions for click2dial tab 2012-06-16 00:10:47 +02:00
Regis Houssin
0d83691c5b Merge pull request #229 from simnandez/3.2
Fix: [ bug #427 ] Bad links to wiki help in certains menus
2012-06-15 06:57:54 -07:00