lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,329 Commits 43 Branches 150 Tags 886 MiB
3.2
Commit Graph

2290 Commits

Author SHA1 Message Date
Regis Houssin
ba896c024d Fix: problem with template 2012-07-07 11:01:48 +02:00
Regis Houssin
c8eb666826 Fix: compatibility with multicompany 2012-07-06 20:53:18 +02:00
Regis Houssin
ab6129a1cc Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-03 16:43:42 +02:00
Regis Houssin
a13bf2b93f Fix: test if ckeditor is enable 2012-07-03 16:42:34 +02:00
Regis Houssin
3e30cde02e Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-02 20:07:44 +02:00
Regis Houssin
ea21064ca2 Fix: access problem if thirdparty module is disable 2012-07-02 20:06:08 +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
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
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
Laurent Destailleur
0b56923de5 Fix: Panicum module for supplier accountancy code 2012-06-28 19:49:54 +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
Laurent Destailleur
62f14e3dd5 Fix: Removed warning. Fix compatibility. 2012-06-26 23:13:03 +02:00
Laurent Destailleur
8deeac403a Fix: Label was not translated 2012-06-23 15:03:02 +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
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
Laurent Destailleur
eb543f0606 Fix: missing a return into clean_url function 2012-06-15 12:44:11 +02:00
Laurent Destailleur
2e74a4ba85 Fix: The fix made by renaming PDF_ADDALSOTARGETDETAILS into MAIN_PDF_ADDALSOSOURCEDETAILS was fixing things in the wrong direction. The regression was the missing data on the recipient compared to 3.1.1 2012-06-15 11:26:16 +02:00
Laurent Destailleur
5d502aa7d1 Fix: function dol_nboflines_bis 2012-06-15 00:17:12 +02:00
Laurent Destailleur
c28c5c1003 Fix: Bad calculation of nb of line. Fix: Bad position of lines into pdf_soleil 2012-06-14 20:01:47 +02:00
Laurent Destailleur
383195581f Fix: Messy source address 2012-06-14 17:51:56 +02:00
Regis Houssin
707bffd181 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-06-13 21:54:27 +02:00
Laurent Destailleur
6406d4e64c Fix: typo error 2012-06-13 20:16:21 +02:00
Regis Houssin
c8c31b2167 Fix: mutualize ckeditor parameters 2012-06-12 23:14:54 +02:00
Regis Houssin
c4fbdbbce4 Fix: mutualize ckeditor parameters 2012-06-12 23:13:59 +02:00
Regis Houssin
548266d607 Fix: uniformize code 2012-06-11 21:46:37 +02:00
Regis Houssin
c9be1cbb8b Fix: missing remove_file action 
Fix: use object instead id and store odt filename in object for use in
triggers
 2012-06-10 17:09:44 +02:00
Regis Houssin
c9c4ba2a72 Fix: problem with external modules and uniformize code 
Conflicts:
	htdocs/comm/propal/document.php
	htdocs/core/class/fileupload.class.php
	htdocs/projet/fiche.php

Change-Id: Ib36cd4d6ad5eb1e9ad2a188ef276f37c098cfef4
 2012-06-09 18:47:16 +02:00
Regis Houssin
1c3bf3bb22 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-06-08 18:21:22 +02:00
Regis Houssin
4713738ea3 Fix: avoid warning 2012-06-08 18:19:55 +02:00
Regis Houssin
176c6013ec Fix: bad option name 2012-06-08 11:48:07 +02:00
Regis Houssin
6f28b69804 Fix: add iframe transport for compatibility with all browser 2012-06-08 11:36:46 +02:00
Regis Houssin
aee1c3b069 Fix: more clean code for new version of jQuery fileupload 2012-06-08 07:25:55 +02:00
Regis Houssin
1649a9a1b1 Fix: reload page after file upload completed 2012-06-08 07:25:20 +02:00
Regis Houssin
8c4ddb99be Fix: add max file size 2012-06-08 07:25:07 +02:00
Regis Houssin
c43b5f99ac Works on jQuery fileupload upgrade (Todo: css problem) 2012-06-08 07:24:22 +02:00
Laurent Destailleur
d8894b149e Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-06 23:13:41 +02:00
Regis Houssin
0d1159d862 Fix: problem with external module 2012-06-06 23:02:46 +02:00
Laurent Destailleur
06442f4755 Fix: Var not initialized 2012-06-06 21:39:37 +02:00
Regis Houssin
54dd02413f Fix: missing search in alternative root directory 2012-06-06 14:05:04 +02:00
Laurent Destailleur
a5a4ef538d Fix: Exclude temp file 2012-06-06 00:23:00 +02:00
Laurent Destailleur
1c32b4231d Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-05 12:55:12 +02:00
Laurent Destailleur
31560e19df Fix with PHP 5.2 2012-06-05 12:54:34 +02:00
Regis Houssin
ff33cb4a88 Fix: merge array of hookmanager errors 2012-06-03 23:55:05 +02:00
Laurent Destailleur
a51114d571 Fix: regression. quote was no more supported. 2012-06-01 09:34:43 +02:00
Laurent Destailleur
52f270d623 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-01 09:28:49 +02:00
Regis Houssin
9c42cdc7d3 Fix: clear file name send by php 2012-06-01 07:14:29 +02:00
Laurent Destailleur
4fd98dfb72 Fix: Revert a lot of commits made on wrong branch. No new features, no 
change on architecture on a beta, only bug fixes on visible features.
 2012-06-01 02:22:39 +02:00
Laurent Destailleur
2d818fc886 Revert "Fix: add max file size" 
This reverts commit 8b224e9e2d.
 2012-06-01 02:07:24 +02:00
Laurent Destailleur
180908bfe1 Revert "Fix: reload page after file upload completed" 
This reverts commit 368af101ef.
 2012-06-01 02:07:11 +02:00
Laurent Destailleur
73f1d8ee99 Revert "Fix: more clean code for new version of jQuery fileupload" 
This reverts commit d7308525ae.
 2012-06-01 02:06:43 +02:00
Laurent Destailleur
1a73347866 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-01 01:54:24 +02:00
Regis Houssin
d7308525ae Fix: more clean code for new version of jQuery fileupload 2012-05-31 21:12:40 +02:00
Regis Houssin
368af101ef Fix: reload page after file upload completed 2012-05-30 23:37:02 +02:00
Regis Houssin
8b224e9e2d Fix: add max file size 2012-05-30 23:36:50 +02:00
Regis Houssin
a717297a8c Works on jQuery fileupload upgrade (Todo: css problem) 2012-05-30 23:36:17 +02:00
Laurent Destailleur
a83c7d0992 Fix: Regression with quot management. Try a better fix. 2012-05-30 12:49:22 +02:00
Laurent Destailleur
92fe8ebe1d Fix: js not escaped 2012-05-30 12:33:47 +02:00
Laurent Destailleur
a465814fd4 More fix for canvas features 
Conflicts:
	htdocs/product/canvas/product/tpl/card_create.tpl.php
	htdocs/product/fiche.php
 2012-05-30 03:50:53 +02:00
Laurent Destailleur
514babeab1 Fix: delete of documents is done by page of element, not by the view 
wrapper.

Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/projet/fiche.php
 2012-05-30 00:18:11 +02:00
Regis Houssin
5c2922a17b Fix: big problem with files upload and more compatible with external 
modules

Conflicts:
	htdocs/compta/facture.php
 2012-05-30 00:09:38 +02:00
Laurent Destailleur
b6c9a37415 Fix: Avoid to have a special php module. 2012-05-28 23:06:32 +02:00
Regis Houssin
21d30c1b3e Fix: jquery fileupload broken feature 2012-05-25 20:54:45 +02:00
Laurent Destailleur
190bcf61e4 Fix: Permissions to see project 2012-05-23 14:30:55 +02:00
Laurent Destailleur
229ae171de Fix: bug on projects visibility for external users 2012-05-23 13:10:51 +02:00
Laurent Destailleur
c1b1dcc5e7 Fix: Translation of payment term/cond 2012-05-21 20:24:20 +02:00
Laurent Destailleur
94f9fb2e2f Fix: daylight depends also on year (not only month and day) 2012-05-15 00:49:57 +02:00
Laurent Destailleur
dc1457b96a Fix: Bad timezone function. Daylight was not used. 2012-05-14 21:07:49 +02:00
Laurent Destailleur
6f1fd1ae53 Fix: pgsql 2012-05-13 17:36:43 +02:00
Laurent Destailleur
ee31359488 Fix: pgsql compatibility not complete. 2012-05-13 14:33:46 +02:00
Laurent Destailleur
230f4f8f57 Fix: Missing lang 2012-05-12 18:31:04 +02:00
Laurent Destailleur
4278a113a0 Fix: hour reported is not user hour. To fix this, we show both hour 
"server and user" but only if it differs.

Conflicts:
	htdocs/core/lib/functions2.lib.php
 2012-05-12 16:31:51 +02:00
Laurent Destailleur
be85c5c381 Fix: [ bug #404 ] Impossible d'ajouter un contact lorsque le module LDAP 
est actif (erreur Array 1)
 2012-05-12 12:34:18 +02:00
Laurent Destailleur
c0691b01eb Fix: Synchro with group not done when editing group only of a user. 2012-05-11 12:48:29 +02:00
Laurent Destailleur
795310b934 Fix: A lot of fix for LDAP synchro 2012-05-11 12:13:47 +02:00
Regis Houssin
791c08c006 Fix: [Bug #403] Insertion Image via l'éditeur WISIWIG plante 2012-05-11 10:15:10 +02:00
Laurent Destailleur
bd0be8f358 Fix: escape html tag value 2012-05-09 20:41:41 +02:00
Laurent Destailleur
9f770d862d Fix: Not escaped html value 2012-05-09 17:48:10 +02:00
Regis Houssin
b9b2dbe9b1 Fix: more compatibility with multicompany 2012-05-09 12:44:30 +02:00
simnandez
84a09808fc Fix:[ bug #399 ] Bad calculation of local taxes in update line products 2012-05-09 10:29:12 +02:00
Laurent Destailleur
425ca83a99 Fix: [ bug #397 ] Product VAT is not coming from buying price 2012-05-08 21:55:52 +02:00
Raphaël Doursenaud
ea0e05b07c Fix: Typo 2012-05-07 19:07:59 +02:00
Laurent Destailleur
82b31e1f5b Fix: Works with checkbox htdocs/core/class/html.form.class.php 2012-05-07 19:06:23 +02:00
Laurent Destailleur
01d37ad159 Fix: pagecode when using postgresql 2012-05-06 15:31:43 +02:00
Laurent Destailleur
1b2a4f4742 Fix: log must be before request 2012-05-06 15:28:51 +02:00
Laurent Destailleur
748ac3a5a7 Fix: setStatut works for user class 2012-05-06 00:06:07 +02:00
Laurent Destailleur
5ea6b99593 Fix: several fixes 2012-05-06 00:03:54 +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
Laurent Destailleur
47c0b8272d Fix: Middle 
Conflicts:
	htdocs/core/tpl/login.tpl.php
 2012-05-02 14:19:34 +02:00
Laurent Destailleur
74887b5850 Fix: Removed warnings 2012-04-30 09:33:43 +02:00
Laurent Destailleur
d4d598d0aa Fix: left align 2012-04-28 20:51:51 +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
Regis Houssin
0092f1bc89 Fix: problem of line break between label and description when 
using fckeditor
 2012-04-26 10:29:46 +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
32339b03fd Add log to try to find the mainmenu lost bug. 2012-04-20 14:48:40 +02:00
Laurent Destailleur
eff43a8e0c Fix: wrong encoding of special chars 2012-04-20 13:59:35 +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
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
ca7fa84d80 Fix: eldy theme still works without css3 2012-04-17 10:34:54 +02:00
Laurent Destailleur
ab94865c71 Fix: Generate donation document 2012-04-16 01:28:10 +02:00
Laurent Destailleur
8ec22d9f67 Fix: numbering when reset is on was wrong for past dates 2012-04-15 20:33:13 +02:00
Laurent Destailleur
6212d1a425 Fix: licence pb with fedora 2012-04-14 13:25:26 +02:00
Laurent Destailleur
71c43c9069 Fix: debian epiphany and iceweasel browsers. 2012-04-14 03:18:42 +02:00
Regis Houssin
4f490f3e2d New: add possibility to define a page break, its very important for 
internal and external modules (milestone)
 2012-04-12 20:53:31 +02:00
Laurent Destailleur
0e4ca576ec Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-04-12 00:02:28 +02:00
Laurent Destailleur
53a78838f8 Fix: Avoid call if function not defined 2012-04-11 17:28:04 +02:00
Regis Houssin
eb6008bb4d Fix: missing langs object 2012-04-11 16:27:39 +02:00
Laurent Destailleur
a748466758 Fix: this must not be used inside static classes 2012-04-11 14:45:12 +02:00
Laurent Destailleur
3870428f16 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-04-11 10:46:06 +02:00
Laurent Destailleur
307c010b90 Fix: Removed warning 2012-04-11 08:32:29 +02:00
Regis Houssin
d7e579e234 Fix: invert emetteur and problem with long phone number 2012-04-11 08:32:00 +02:00
Regis Houssin
45e34aba65 Fix: missing company logo and invert from to ! 2012-04-11 08:31:47 +02:00
Laurent Destailleur
49bb9d774d Fix: W3C 2012-04-10 11:00:56 +02:00
Laurent Destailleur
141fa014e6 Revert code because it does not fix security hole completely. Also it 
does work on origin but at a transition level.
Sanitizing for command line data must not appears inside a function used
for http data. I prefer fixing this at the source and also using a rule
that clean all attacks completely instead of a rule that clean "most
problem but not all".
 2012-04-10 01:24:52 +02:00
Laurent Destailleur
4cb6ec76ee Revert "Fix: sql injection" 
This reverts commit 8c3158cf28.
 2012-04-10 01:03:54 +02:00
Laurent Destailleur
212b3bd60e Revert "Fix: add special test" 
This reverts commit ef0e6956b3.
 2012-04-10 01:03:43 +02:00
Regis Houssin
ae8b16b9fc Fix: add special test 2012-04-09 22:53:28 +02:00
Regis Houssin
ef0e6956b3 Fix: add special test 2012-04-09 22:52:13 +02:00
Regis Houssin
8c3158cf28 Fix: sql injection 2012-04-09 22:51:13 +02:00
Regis Houssin
64d60d1270 Fix: sql injection 2012-04-09 22:49:19 +02:00
Laurent Destailleur
557d5e775a Fix: log 2012-04-08 14:21:42 +02:00
Laurent Destailleur
83b4b151e4 Fix: pgsql 2012-04-08 14:14:17 +02:00
Laurent Destailleur
9df05381d1 Fix: Bug war. 
Look: enhance look for map views.
 2012-04-08 13:05:58 +02:00
Laurent Destailleur
6d8a639839 Fix [ bug #322 ] export 
Fix: pgsql compatibility
 2012-04-08 00:05:52 +02:00
Laurent Destailleur
e9292515bc Fix: Long name wrapping. Sender address is third party for supplier 
order/invoice
 2012-04-07 21:34:42 +02:00
Laurent Destailleur
f482ba18c3 Fix: We keep notes 2012-04-07 18:28:03 +02:00
Regis Houssin
921c8607d7 Fix: multicompany sharings and uniformize code 2012-04-07 10:19:33 +02:00
Regis Houssin
13624eeb86 Fix: multicompany sharings compatibility 2012-04-07 09:20:03 +02:00
Laurent Destailleur
6d2a3edf69 War bug 2012-04-07 02:45:31 +02:00
Laurent Destailleur
317abb46fd Fix: Start war bug 2012-04-07 02:24:32 +02:00
Regis Houssin
98f7a189d1 Fix: add backward compatibility 2012-04-06 23:26:04 +02:00
Regis Houssin
94788e2ccb Fix: compatibility with multicompany sharings 
use new $conf->product->dir_output[$object->entity] instead
$conf->product->dir_output
 2012-04-06 22:41:33 +02:00
Regis Houssin
a344f079d6 Fix: backward compatibility 2012-04-06 16:46:19 +02:00
Regis Houssin
1c2f192dd6 Fix: add customer_ref in propal list and clean code 2012-04-06 11:38:13 +02:00
Regis Houssin
a22259907b Fix: possibility to custom helpdoc image 2012-04-05 20:12:11 +02:00
Regis Houssin
f874d68e08 Merge pull request #151 from grandoc/develop 
Prepair to display within a custom place
 2012-04-05 04:15:49 -07:00
Grand Philippe
a66c18c4f8 Prepair to display within a custom place 2012-04-05 13:00:09 +02:00
Regis Houssin
b30669a5d6 Fix: missing $langs 2012-04-05 11:07:16 +02:00
Laurent Destailleur
4b3d2cc273 Fix: Removed warning 2012-04-04 20:37:36 +02:00
Laurent Destailleur
b3c66fc123 Fix: Removed warning 2012-04-04 20:18:39 +02:00