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

1364 Commits

Author SHA1 Message Date
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
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
a717297a8c Works on jQuery fileupload upgrade (Todo: css problem) 2012-05-30 23:36:17 +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
Regis Houssin
21d30c1b3e Fix: jquery fileupload broken feature 2012-05-25 20:54:45 +02:00
Laurent Destailleur
229ae171de Fix: bug on projects visibility for external users 2012-05-23 13:10: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
Laurent Destailleur
82b31e1f5b Fix: Works with checkbox htdocs/core/class/html.form.class.php 2012-05-07 19:06:23 +02:00
Laurent Destailleur
748ac3a5a7 Fix: setStatut works for user class 2012-05-06 00:06:07 +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
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
ca7fa84d80 Fix: eldy theme still works without css3 2012-04-17 10:34:54 +02:00
Laurent Destailleur
71c43c9069 Fix: debian epiphany and iceweasel browsers. 2012-04-14 03:18:42 +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
307c010b90 Fix: Removed warning 2012-04-11 08:32:29 +02:00
Laurent Destailleur
9df05381d1 Fix: Bug war. 
Look: enhance look for map views.
 2012-04-08 13:05:58 +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
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
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
Regis Houssin
c57063878d New: add workflow module part for external modules 2012-04-04 09:29:05 +02:00
Laurent Destailleur
74c39a10a2 Work on ajax ecm module 2012-03-25 22:47:37 +02:00
Regis Houssin
cf7170c14d Fix: set to null if empty 2012-03-24 22:18:11 +08:00
Regis Houssin
0aa40b0503 Fix: add multiselectarray() method and jQuery multiselect plugin 2012-03-24 19:52:28 +08:00
Regis Houssin
3c794967c3 Fix: multiple avoid warning with php strict mode 2012-03-23 17:18:33 +01:00
Regis Houssin
be7da6f52c Fix: avoid warning in php strict mode 2012-03-23 16:44:45 +01:00
Regis Houssin
89be120764 Fix: missing actiontype of canvas 2012-03-23 22:46:15 +08:00
Laurent Destailleur
0321ac19c9 Fix: Remove width (total was not 100%) 
Doxygen
 2012-03-23 00:01:37 +01:00
Laurent Destailleur
0fd372e5da Trans: Update language files 
New: Prepare code to allow any module to change/add content of
predefined mail and signature.
 2012-03-22 23:52:02 +01:00
Regis Houssin
ed46d0d65f Fix: possibility to add options 2012-03-22 19:48:42 +08:00
Laurent Destailleur
19940e5f58 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-22 09:39:41 +01:00
Laurent Destailleur
6f7f4b6bc2 Doxygen 2012-03-22 09:39:18 +01:00
Regis Houssin
5d2da2c884 Fix: uniformize code 2012-03-22 08:33:44 +01:00
Laurent Destailleur
bf9b7e9090 New: Can add more js during CKEditor creation 2012-03-22 00:22:40 +01:00
Laurent Destailleur
dbc457176c Fix: When option MAIN_DISABLE_NOTES_TAB is not enabled, we must show all 
notes with no need to click (saved 2 clicks)
 2012-03-22 00:21:45 +01:00
Laurent Destailleur
05ff0c7f0b New: Can add more js when creating editor. 2012-03-22 00:09:05 +01:00
Laurent Destailleur
ee1c507190 Add id on field 2012-03-21 21:31:10 +01:00
Regis Houssin
95aa484e44 Fix: move in constructor 2012-03-21 08:53:49 +01:00
Regis Houssin
52a8216e3e Fix: avoid php E_STRICT errors and compatibility with php 5.4 2012-03-21 02:12:44 +01:00
Regis Houssin
e02fe135db Fix: instantiate $mc object at the end 2012-03-20 15:28:21 +01:00
Regis Houssin
ea65c45b2c Fix: backward compatibility 2012-03-20 15:14:37 +01:00
Laurent Destailleur
4690944216 checkstyle 2012-03-20 12:46:57 +01:00
Laurent Destailleur
3383d314c9 Doxygen 2012-03-19 17:18:11 +01:00
Laurent Destailleur
fb33dd6801 Qual: Move class file into class dir 
Qual: Utility methods must be static.
 2012-03-19 15:51:55 +01:00
Regis Houssin
99ab46510b Fix: remove private status for external modules 2012-03-18 20:23:50 +01:00
Regis Houssin
4ecc64504d Fix: use the original json functions 2012-03-18 19:59:38 +01:00
Laurent Destailleur
7c4ef2fbf7 Qual: Move some class as private 2012-03-18 17:47:17 +01:00
Regis Houssin
579df2b131 Add TODO 2012-03-18 15:30:01 +01:00
Regis Houssin
79bdb85f6d Fix: missing return num 2012-03-18 14:25:39 +01:00
Regis Houssin
5d33f687ae Fix: change for getJSON format 2012-03-18 14:17:10 +01:00
Regis Houssin
7f7ef8da1e Fix: this parameter is used by editInPlace() method for define the save 
method
 2012-03-18 14:10:04 +01:00
Regis Houssin
cfd72a5f73 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-18 14:07:07 +01:00
Regis Houssin
808c4b5732 New: testing a new method to avoid reloading the page 2012-03-18 14:06:55 +01:00
Laurent Destailleur
b0d319eaf7 Update code comments. 
TODO: What is the goal of field 5 in
ckeditor:dolibarr_zzz:width:height:?:1:rows:cols
 2012-03-18 12:48:07 +01:00
Regis Houssin
3cdff5361f Fix: add empty message in combobox 2012-03-18 12:18:23 +01:00
Regis Houssin
9526465824 Fix: for compatibility with edit in place 2012-03-18 11:22:28 +01:00
Regis Houssin
630844d698 Fix: wrong copy/paste :-) 2012-03-18 11:17:50 +01:00
Regis Houssin
d752e25946 New: add new notes system in contract and order/invoice supplier module 2012-03-18 11:13:01 +01:00
Laurent Destailleur
59bef9caa1 Qual: Uniformize code to use new note system. 2012-03-18 02:01:23 +01:00
Laurent Destailleur
a7a55645d8 Fix: Some fix when using fckeditor with notes. 
Qual: Uniformize code to use new system for notes.
Qual: Removed duplicate updatenote method into commandefournisseur
class.
 2012-03-18 00:59:24 +01:00
Laurent Destailleur
8d1b9055b4 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/tpl/notes.tpl.php
 2012-03-17 23:32:28 +01:00
Laurent Destailleur
21a1d47130 New: Can define if ckeditor is opened or not in editval 
New: Can use a width of 100% in ckeditor
 2012-03-17 23:27:53 +01:00
Laurent Destailleur
4c2da4f5fa New: Can define if ckeditor is opened or not in editval 
New: Can use a width of 100% in ckeditor
 2012-03-17 23:11:25 +01:00
Regis Houssin
281c6b7f2a New: sharing code of contact and note tabs 2012-03-17 16:05:58 +01:00
Regis Houssin
60a6c3fa95 Fix: missing fetch for get extraparams 2012-03-16 19:16:17 +01:00
Regis Houssin
b862b37731 New: update CKEditor to 3.6.2 2012-03-16 16:56:18 +01:00
Regis Houssin
391ce8490f New: add "extraparams" field for stock extra parameters with json 2012-03-16 14:32:37 +01:00
Laurent Destailleur
245edb8596 Fix: Maxi debug on sending document by email. Works now with odt too. 2012-03-16 00:34:41 +01:00
Laurent Destailleur
bc94ec9cd6 Fix: We allow to add credit not higher than invoice amount. 2012-03-15 22:51:02 +01:00
Laurent Destailleur
5f8fc30121 Fix: Avoid duplicate hooks 2012-03-15 22:37:42 +01:00
Regis Houssin
e8ec5f5ad7 New: add vat rate in supplier price 
New: add events system in jquery combobox
 2012-03-15 16:52:18 +01:00
Regis Houssin
704d7de02a New: add load_cache_vatrates() method 2012-03-15 11:01:29 +01:00
Regis Houssin
993b5eefaf Fix: wrong blank space for jquery combobox 
Fix: uniformize code
 2012-03-15 10:14:54 +01:00
Regis Houssin
942b1f2a19 Fix: status not updated after reopen 2012-03-15 06:59:27 +01:00
Regis Houssin
5d0a8945c1 New: add getNomUrl() method 2012-03-14 19:17:04 +01:00
Regis Houssin
9b7afbc29b Works on alternative addresses management 2012-03-14 18:03:36 +01:00
Regis Houssin
44158efa95 Fix: possibility to have dynamic menu title with auguria menu 2012-03-14 16:07:44 +01:00
Regis Houssin
0c8686b5b4 Fix: possibility to use alternative addresses management 2012-03-14 15:04:55 +01:00
Laurent Destailleur
84397b4735 New: Add same contact tab than for object origin. This is to avoid to 
switch to view/edit.
 2012-03-14 14:00:20 +01:00
Regis Houssin
5fbd8e4cee Fix: move method in common class 2012-03-14 11:11:46 +01:00
Regis Houssin
ba15a73831 Works on an alternative address management 2012-03-14 07:49:41 +01:00
Regis Houssin
f8bf7ade83 Fix: move method in common class 2012-03-13 20:01:10 +01:00
Regis Houssin
9831a2028c Fix: missing variable 2012-03-13 19:36:00 +01:00
Regis Houssin
deb30b6f17 Fix: uniformize code 2012-03-13 19:34:22 +01:00