lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,651 Commits 43 Branches 150 Tags 886 MiB
07fc51b7ff
Commit Graph

2096 Commits

Author SHA1 Message Date
Laurent Destailleur
dc86095c06 Doxygen 2012-03-18 02:19:27 +01:00
Laurent Destailleur
59bef9caa1 Qual: Uniformize code to use new note system. 2012-03-18 02:01:23 +01:00
Laurent Destailleur
763eb8f32c Fix: jpeg works like jpg 2012-03-18 01:21:18 +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
Laurent Destailleur
e5190a00c8 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-17 21:32:32 +01:00
Laurent Destailleur
d59848e18e New: Enhance box management 2012-03-17 21:32:10 +01:00
Regis Houssin
815ee68f8f Fix: use div instead table 2012-03-17 18:10:59 +01:00
Regis Houssin
e8b40ab22c Try to build table with div and css 2012-03-17 17:37:15 +01:00
Regis Houssin
281c6b7f2a New: sharing code of contact and note tabs 2012-03-17 16:05:58 +01:00
Laurent Destailleur
da94f76364 New: When a module with boxes is activated, box is also activated by 
default for everybody, except for users that had personlized their box
view.
 2012-03-17 14:29:48 +01:00
Laurent Destailleur
1d51ee3aab Perf: Reduce quantity of code for boxes. 2012-03-17 14:04:16 +01:00
Regis Houssin
e16b1067cd Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/core/ajax/extraparams.php
 2012-03-17 09:47:56 +01:00
Regis Houssin
181fac1d9d Fix: End of line character is invalid; expected "\n" but found "\r\n" 2012-03-17 09:45:14 +01:00
Regis Houssin
938d0beccf Fix: End of line character is invalid; expected "\n" but found "\r\n" 2012-03-17 09:30:49 +01:00
Laurent Destailleur
d8becd3cdb Doxygen 2012-03-17 01:13:10 +01:00
Laurent Destailleur
02cdd86066 Doxygen 2012-03-17 00:47:01 +01:00
Laurent Destailleur
a458ea3582 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-17 00:23:17 +01:00
Laurent Destailleur
3f11e51fbb Doxygen 2012-03-17 00:22:48 +01:00
Regis Houssin
e84c77ba31 New: add template for infos and contacts tabs and show/hide bloc system 2012-03-16 22:02:14 +01:00
Regis Houssin
60a6c3fa95 Fix: missing fetch for get extraparams 2012-03-16 19:16:17 +01:00
Regis Houssin
205f884ec0 Fix: try to use div title with show/hide effect 2012-03-16 18:36:32 +01:00
Regis Houssin
5de859d14b Fix: missing colspan if view line number is active 2012-03-16 17:26:19 +01:00
Regis Houssin
b862b37731 New: update CKEditor to 3.6.2 2012-03-16 16:56:18 +01:00
Regis Houssin
09e6867029 New: add view/edit notes in "deplacement" and "fichinter" cards 2012-03-16 16:01:45 +01:00
Regis Houssin
77de410491 Fix: doxygen 2012-03-16 14:41:22 +01:00
Regis Houssin
391ce8490f New: add "extraparams" field for stock extra parameters with json 2012-03-16 14:32:37 +01:00
Regis Houssin
1622a86d71 New: possibility to view/edit notes in invoice card 2012-03-16 11:12:59 +01:00
Regis Houssin
88d5cbc678 New: possibility to view/edit notes in order card 2012-03-16 09:46:21 +01:00
Regis Houssin
ae54a229fb Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-16 09:39:45 +01:00
Regis Houssin
dae20441d0 Fix: add template for view/edit notes in object card and add possibility 
to show/hide this bloc
 2012-03-16 09:39:32 +01:00
Laurent Destailleur
46d08a9d3b Doxygen 2012-03-16 09:35:59 +01:00
Laurent Destailleur
6e864bc992 Doxygen 2012-03-16 09:34:19 +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
d296f17f36 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-15 16:02:43 +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
Laurent Destailleur
25257ee873 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-15 09:26:50 +01:00
Laurent Destailleur
d76802630a Doxygen 2012-03-15 09:26:14 +01:00
Regis Houssin
72d8dbaa55 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-15 07:24:10 +01:00
Regis Houssin
942b1f2a19 Fix: status not updated after reopen 2012-03-15 06:59:27 +01:00
Laurent Destailleur
f96a72b090 doxygen 2012-03-14 23:11:49 +01:00
Regis Houssin
5d0a8945c1 New: add getNomUrl() method 2012-03-14 19:17:04 +01:00
Regis Houssin
43929ab3f9 Fix: javascript DOM problem 2012-03-14 18:25:05 +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
551b9c619a Fix: different trad if addresses management 2012-03-14 15:32:48 +01:00
Regis Houssin
0c8686b5b4 Fix: possibility to use alternative addresses management 2012-03-14 15:04:55 +01:00
Laurent Destailleur
1194de5089 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-14 14:49:09 +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
69e98d4100 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-14 12:14:42 +01:00
Regis Houssin
6bf5132edb Works on alternative addresses management 2012-03-14 12:14:28 +01:00
Laurent Destailleur
fafc61b1d9 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-14 11:50:22 +01:00
Laurent Destailleur
9e5cffc62b Doxygen 2012-03-14 11:49:11 +01:00
Regis Houssin
5fbd8e4cee Fix: move method in common class 2012-03-14 11:11:46 +01:00
Regis Houssin
fdd7b71417 Fix: trad 2012-03-14 09:21:05 +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
Regis Houssin
150f3ecfe3 Fix: move method in common class 2012-03-13 19:24:11 +01:00
Regis Houssin
5b6d6fc731 Fix: wrong object name 2012-03-13 09:45:52 +01:00
Laurent Destailleur
66bad9ea04 Doxygen 2012-03-13 09:38:00 +01:00
Regis Houssin
dec582843b Fix: try to use jeditable autocomplete (not stable) 2012-03-12 16:39:53 +01:00
Regis Houssin
2048c88975 Fix: try jeditable autocomplete 2012-03-12 23:12:58 +08:00
Laurent Destailleur
117bde13d9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-03-12 15:10:13 +01:00
Laurent Destailleur
36db79c249 Doxygen 2012-03-12 15:09:46 +01:00
Regis Houssin
0b67e88f08 Fix: problem if more than one element of the same type 2012-03-12 21:38:28 +08:00
Laurent Destailleur
c040abe574 Fix: Restore note tab as using notes inside the main card is not possible for a lot of users since content of note is too large. Also this tab will receive/show more features in future version (for example, notes specific for each users and history of notes. So i added instead an option to hide tabs for people who don't whant it.. 2012-03-12 11:33:25 +01:00
Regis Houssin
e033f202d1 Fix: more clickless, remove "note" tab 2012-03-12 17:49:53 +08:00
Regis Houssin
733350f2b8 Fix: more simple 2012-03-11 09:31:43 +01:00
Regis Houssin
b27a206b23 Fix: force generic object if savemethod is not defined 2012-03-09 19:03:49 +01:00
Regis Houssin
616698889c Fix: move script to js core file 2012-03-09 18:21:11 +01:00
Regis Houssin
96a5eadcfd Fix: missing extension 2012-03-09 18:03:32 +01:00
Regis Houssin
ca468c2f84 Fix: hook object more simple 2012-03-09 14:48:56 +01:00
Regis Houssin
2117cf7a6a Fix: use $context for key to avoid data corrupt 
Fix: remove dao instantiation
 2012-03-09 14:34:53 +01:00
Laurent Destailleur
bcff85108e Fix: substitutions modules were not executed. 2012-03-09 10:52:54 +01:00
Regis Houssin
99c177df46 Fix: missing object $db 2012-03-09 08:28:30 +01:00
Regis Houssin
d07ff6ec11 Fix: missing object $db 2012-03-08 12:05:32 +01:00
Regis Houssin
ee86da0e1e Fix: refactorize llx_c_currencies and currency symbol 2012-03-08 11:49:38 +01:00
Regis Houssin
635cd4e970 New: add currency code converter 2012-03-07 20:52:28 +01:00
Laurent Destailleur
b08848eb5b New: Add a page to explain how to make translations (only on not 
complete translation languages)
 2012-03-07 14:27:17 +01:00
Regis Houssin
4e99563831 Fix: "code" field is deprecated 2012-03-07 00:28:10 +01:00
Regis Houssin
38b3f592d2 Fix: refactorize with code 2012-03-05 16:26:46 +01:00
Regis Houssin
513a0673d2 Fix: remove unused field 2012-03-05 16:26:29 +01:00
Regis Houssin
7d3e96699d Fix: add load cache for currencies 2012-03-05 16:26:11 +01:00
Laurent Destailleur
e4b697fa75 New: Show delivery date into proposal template azur. 2012-03-04 22:18:15 +01:00
Laurent Destailleur
4677ebd4aa Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-04 13:01:23 +01:00
Laurent Destailleur
055689e2dc New: Import use generated codes if not provided into input file. 2012-03-04 13:00:53 +01:00
Regis Houssin
68ce569d05 Fix: compatibility with edit in place 
Qual: use generic function and remove unused
Todo: Type of product combobox is not compatible with edit in place
 2012-03-04 09:43:56 +01:00
Laurent Destailleur
00b7ad4a78 New: Can convert a product/service into service/product. 2012-03-04 01:41:36 +01:00
Laurent Destailleur
dd92cea7ed Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-03 20:57:00 +01:00
Laurent Destailleur
130bca84d6 Fix: fk_stcomm is no more required. 2012-03-03 20:56:39 +01:00
Regis Houssin
bbbca891f8 Fix: missing entity 2012-03-03 20:19:21 +01:00
Laurent Destailleur
4f5e88adb6 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-03 20:09:09 +01:00
Laurent Destailleur
821ea356d0 Fix: warning not visible when required 2012-03-03 20:06:06 +01:00
Regis Houssin
0dbef2d784 Try to add hook in main login page 2012-03-03 20:05:32 +01:00
Laurent Destailleur
80b75fa67d Fix: boxes must not be removed after update 2012-03-03 17:37:45 +01:00
Laurent Destailleur
6d8c1bf7c6 Fix: Removed warnings 2012-03-03 16:44:05 +01:00
Laurent Destailleur
2772d1dfa2 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-03 16:34:13 +01:00
Laurent Destailleur
fb6aad19e5 New: Import wizard can import personalized fields 2012-03-03 16:33:38 +01:00
Laurent Destailleur
8cf008c10b Fix: Better error management 2012-03-03 13:42:27 +01:00
Regis Houssin
5139c0a69e Fix: time is not necessary 2012-03-03 11:38:45 +01:00
Regis Houssin
b74e24ab46 Fix: increase size 2012-03-03 09:06:26 +01:00
Regis Houssin
047edc69f9 Fix: unit test warning 2012-03-03 07:45:25 +01:00
Laurent Destailleur
cb3104220e Fix: Instantiate if not already done 2012-03-02 19:36:43 +01:00
Regis Houssin
034b0fc4d4 New: add dol_json_encode and dol_json_decode instead 
serialize/unserialize
 2012-03-02 17:48:05 +01:00
Regis Houssin
30c7bf811b Fix: add pdf_writeLinkedObjects method 2012-03-02 15:03:46 +01:00
Regis Houssin
9301def08d Fix: rename method 2012-03-02 15:03:14 +01:00
Regis Houssin
e1f97c009b Fix: for add external linked objects 2012-03-02 17:52:47 +08:00
Regis Houssin
5b3a3b8e2e Fix: add array return 2012-03-02 17:40:16 +08:00
Regis Houssin
61e90e0d9d Fix: add $hookmanager parameter 2012-03-02 10:26:03 +01:00
Regis Houssin
71e5e27e7e Fix: instantiate $hookmanager if not exist 2012-03-02 10:16:50 +01:00
Regis Houssin
f39e156f3a New: add pdf_getLinkedObjects hook 2012-03-02 08:31:38 +01:00
Regis Houssin
64b8486494 New: add method for show linked objects in pdf 2012-03-02 08:11:40 +01:00
FHenry
0cf4619682 Emailing campaign- unsubcribe and use of md5 tag 2012-03-01 14:51:07 +01:00
Laurent Destailleur
9174182a27 Fix: Removed warning 2012-03-01 09:24:45 +01:00
Regis Houssin
6aa7e90834 Fix: merge problem 2012-03-01 08:03:27 +01:00
Regis Houssin
f3cb926c3c Fix: use generic array for all parts 2012-03-01 13:58:33 +08:00
Laurent Destailleur
7c4e908639 models_modules isn't enough so we use same facture_invoice, 
commande_invoice, propale_invoice. This means module descriptor file
should contains
module_parts('facture'=>1) if we want to add doc template for invoice
into module/core/modules/facture/doc
 2012-03-01 02:06:08 +01:00
Laurent Destailleur
badc6d0f45 Fix: Fix tons of bugs after change for new way to declare modules 
features
 2012-03-01 00:03:16 +01:00
Laurent Destailleur
e0f7637bb3 Fix: Restore barcode management 2012-02-29 22:54:34 +01:00
Laurent Destailleur
18a7cd1e33 Perf: Try a speed enhancement 2012-02-29 21:22:08 +01:00
Regis Houssin
0b945f0716 Fix: use dol_buildpath 2012-03-01 04:10:50 +08:00
Laurent Destailleur
dd9e150743 Fix: Bad test 2012-02-29 20:58:05 +01:00
Laurent Destailleur
57c94c6736 Fix: chrome detection 2012-02-29 20:51:44 +01:00
Laurent Destailleur
51fb1b2385 Fix: Code was sharing loop for custom dir and loop for subdir modules. 
The loop to manage customdir must be managed by the dol_buildpath so
only loop on / + module dir must be done.
 2012-02-29 20:07:17 +01:00
Laurent Destailleur
7e3cb90f5a Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-02-29 19:41:45 +01:00
Laurent Destailleur
55904f7f37 New: Test on browser version during install step. 
Mutualize code to detect browser version.
 2012-02-29 19:41:12 +01:00
Regis Houssin
79c0369d66 Fix: possibility to use models of external modules 2012-03-01 01:24:00 +08:00
Regis Houssin
45ff7bddb3 New: Check if there is external models to do asked by plugins 2012-03-01 00:29:56 +08:00
Laurent Destailleur
6550ba53f6 More phpunit test 2012-02-29 11:48:03 +01:00
Regis Houssin
27d88b34d8 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-02-28 19:18:34 +01:00
Regis Houssin
ffc492ba1f Fix: security 2012-02-28 19:18:24 +01:00
Laurent Destailleur
5e32fc70ad Fix: action must always be provided as value can be change during actions 2012-02-28 16:48:18 +01:00
Laurent Destailleur
1c4ca9b335 New: Add hidden option MAIN_ADD_PDF_BACKGROUND to add a PDF as 
background of invoice/order generated PDF.
 2012-02-27 22:57:19 +01:00
Laurent Destailleur
3012e9eeaa Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-02-27 21:56:40 +01:00
Regis Houssin
8f9b9987ff Fix: Multiple directory traversal vulnerabilities with document.php 2012-02-27 17:02:56 +01:00
Laurent Destailleur
563acb5968 For backward compatibility 2012-02-27 10:18:34 +01:00
Regis Houssin
476168410e Fix: declaration of property 2012-02-27 09:09:34 +01:00
Regis Houssin
03e68b3d77 Fix: avoid warning 2012-02-27 09:04:41 +01:00
Regis Houssin
f4bab2f6de Fix: avoid warning and deprecated variable 2012-02-27 08:47:25 +01:00
Laurent Destailleur
7a4398e5a0 doxygen 2012-02-27 00:58:00 +01:00
Laurent Destailleur
16ad5452b6 Fix: When company name is too long, wrapping overwrite address. 2012-02-26 14:27:19 +01:00
Laurent Destailleur
e519bf0c40 Fix: Fix TODO 
Doxygen
 2012-02-25 16:24:36 +01:00
Laurent Destailleur
45f2f7b449 Fix: Second field is required 2012-02-25 16:14:59 +01:00
Regis Houssin
70c9b2bda3 Fix: compatibility with edit in place 2012-02-25 12:09:27 +01:00
Regis Houssin
58c1cb3e7c Fix: function is outside of class and add TODO 2012-02-25 09:05:36 +01:00
Laurent Destailleur
7f1ea8520d Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-02-25 01:34:44 +01:00
Laurent Destailleur
9d9439e498 New: All professional id can contains up to 128 chars instead of 32. 2012-02-25 01:34:05 +01:00
Regis Houssin
e2cea80f69 Fix: problem with this pdf 2012-02-24 17:25:53 +01:00
Regis Houssin
3b0beed51d Fix: professionnal id only visible if not empty 2012-02-24 16:52:33 +01:00
Regis Houssin
8e023bb384 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-02-24 16:32:29 +01:00
Regis Houssin
13f2fe84f9 Fix: missing object $db and missing variables declaration 2012-02-24 16:31:51 +01:00
Laurent Destailleur
db396ed67c Doxygen 2012-02-24 11:23:52 +01:00
Laurent Destailleur
cc6a2c8d84 Fix: Compatibility of new module setup with old setup 2012-02-24 11:06:05 +01:00
Regis Houssin
1b236c5c56 Fix: possibility to add more parameters (eg: entity=0) 2012-02-24 15:53:38 +08:00
Regis Houssin
d7f92041c2 Fix: define an array by default if not exist 2012-02-24 14:00:43 +08:00
Regis Houssin
a68ac56e5b Fix: remove obsolete code 2012-02-23 22:01:55 +01:00
Regis Houssin
673fbc457d Fix: add debug mode and change with new module parts management 2012-02-23 20:42:25 +01:00
Regis Houssin
ee80305e6c Fix: full path is defined by default 2012-02-23 20:03:07 +01:00
Regis Houssin
e536bef00e Fix: serialize array parameters (hooks) 2012-02-23 19:51:56 +01:00
Regis Houssin
3770b7ffcc Fix: remove obsolete code 2012-02-23 19:42:57 +01:00
Regis Houssin
4b4b5be6f5 Fix: bad test 2012-02-23 19:35:13 +01:00
Regis Houssin
e257d7d6d4 New: possibility to defined hooks in array format with parts module 
system
 2012-02-23 17:34:17 +01:00
Regis Houssin
2dabf0e185 Fix: possibility to defined a specific path 2012-02-23 16:20:15 +01:00
Regis Houssin
46ad02cbc8 New: add generic function for module parts 2012-02-23 15:42:03 +01:00
Regis Houssin
a444fc955d New: add generic function for module parts 2012-02-23 14:28:50 +01:00
FHenry
21ffd56795 Correct Bug of CSS in conf 2012-02-23 11:27:13 +01:00
Laurent Destailleur
c5325e94cc Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/admin/syslog.php
 2012-02-23 03:32:19 +01:00
Laurent Destailleur
2647cb72ac New: Now all features can be provided by a module with all files inside 
the directory of module.
 2012-02-22 16:18:03 +01:00
Regis Houssin
94f6034f9a New: adding the ability to display a different value than the original 
value, in the edit in place fields
 2012-02-22 22:05:20 +08:00
Laurent Destailleur
e4cf111ac2 Fix: Do not include an output class (form) inside a core system class. 2012-02-22 14:43:13 +01:00
Laurent Destailleur
3a915de69a Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-02-22 12:12:51 +01:00
Laurent Destailleur
ef6706a6b9 New: Add hook toprightmenu 2012-02-22 12:02:12 +01:00
simnandez
282a50512f Fix: Use transnoentities into description 2012-02-22 09:44:46 +01:00
Regis Houssin
5a715bb4ea Fix: add possibility to defined a different icon with css 2012-02-22 16:27:29 +08:00
Regis Houssin
ea83e474dc New: add possibility to linked other objects from external modules 2012-02-22 01:19:05 +08:00
Regis Houssin
8b107b65e8 Fix: compatibility with multi-company shared 2012-02-21 18:09:21 +08:00
Regis Houssin
0cff48f9b3 Fix: merge conflict 2012-02-21 10:47:08 +01:00
Regis Houssin
e5c0a99584 Fix: for multi-company 
Conflicts:

	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/html.form.class.php
 2012-02-21 10:26:38 +01:00
Laurent Destailleur
f71073c3b5 Doxygen 2012-02-21 00:18:48 +01:00
Laurent Destailleur
9e731a1c9f Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-02-21 00:09:10 +01:00
Laurent Destailleur
b8a61e73a0 New: Add product_label into substitution tags for ODT. 2012-02-20 23:58:36 +01:00
Regis Houssin
cd23f8a040 Fix: bad rights 2012-02-20 21:17:05 +01:00
Regis Houssin
a3ee9f83fe Fix: remove unused object 2012-02-20 20:36:37 +01:00
Regis Houssin
fa3e134a92 Fix: add specific right access for payment 
New: add possibility to defined success message for jeditable
 2012-02-20 20:31:35 +01:00
Laurent Destailleur
58d1a042a5 Fix: print select_societe was wrong as it contains already print 
instructions. Use select_company instead.
 2012-02-20 12:41:12 +01:00
Laurent Destailleur
8c0ad673e8 Reduce size of form.class 2012-02-20 12:31:01 +01:00
Laurent Destailleur
475bba2ea7 Qual: Reduce size of form.class 2012-02-20 12:20:56 +01:00
Laurent Destailleur
5540e5cb82 Qual: Reduce size of form.class 
Qual: Removed not used file
 2012-02-20 10:24:08 +01:00
Laurent Destailleur
b93c03a9c9 Qual: Doxygen 
Perf: Reduc size of form.class.php
 2012-02-20 10:09:28 +01:00
Laurent Destailleur
8466ea055c Checkstyle 2012-02-20 09:42:57 +01:00
Laurent Destailleur
198c453a09 Fix: Default lang on CLI context was wrong 2012-02-20 01:31:02 +01:00
Laurent Destailleur
8d6655061e Qual: Full description of lines for ODT generation share same 
function.
 2012-02-19 21:08:17 +01:00