Commit Graph

5862 Commits

Author SHA1 Message Date
Laurent Destailleur
aad7885bca Fix: [bug #1226 ] page ne se charge pas quand beaucoup de prospect en
base
2014-02-08 02:35:59 +01:00
Laurent Destailleur
b750e98d40 Fix: Pb of file upload and download. 2014-02-08 02:02:01 +01:00
Laurent Destailleur
b714347b6b Fix: Substition of extra field was ko for order. 2014-02-08 01:01:31 +01:00
Laurent Destailleur
43970b3bd6 Removed some TODO 2014-02-06 20:45:50 +01:00
Laurent Destailleur
80046a5310 Qual: Mutualize code 2014-02-06 20:40:01 +01:00
Laurent Destailleur
9e06f185c5 Fix: Fix problem of invalid paypal link with \n. 2014-02-06 18:19:49 +01:00
Laurent Destailleur
c9b1c562cc Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-02-06 16:58:53 +01:00
Laurent Destailleur
7078970ed1 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/core/class/html.form.class.php
2014-02-05 21:03:05 +01:00
Laurent Destailleur
255a1f6497 Fix: String translated twice 2014-02-05 20:57:43 +01:00
Grand Philippe
1855ba556a fix misspelled words 2014-02-05 17:53:30 +01:00
Laurent Destailleur
e3ac9db9ec Fix: Data was encode twice making bad translation for language with
special chars.
2014-02-05 12:11:39 +01:00
Laurent Destailleur
9a985821d2 Fix: doxygen 2014-02-04 21:08:25 +01:00
Laurent Destailleur
d8b8f8c646 Uniformize code for contacts forms. 2014-02-04 20:49:07 +01:00
Laurent Destailleur
0da1a64335 Fix: Missing vars and bar id. 2014-02-04 20:41:23 +01:00
Laurent Destailleur
408a028320 Fix: Must return a string 2014-02-03 20:07:25 +01:00
Laurent Destailleur
8f3e9b1832 Fix: function must return a string 2014-02-03 20:05:56 +01:00
Laurent Destailleur
89ebb3c0ef New: Add option MAIN_DISABLE_AJAX_COMBOX 2014-02-03 19:47:35 +01:00
Laurent Destailleur
efcff80a28 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	build/debian/control
	htdocs/fourn/facture/paiement.php
2014-02-03 18:44:48 +01:00
BENKE Charles
b86322c14a Update commonobject.class.php
hook module need extrafields parameter too
2014-02-01 12:55:05 +01:00
Laurent Destailleur
9aaafde6d5 Fix: Pb with cache files for graphical boxes:
Missing year into cache id.
User with restrcited permission on thirdparty must not share same cache
files that "see all" users.
2014-01-31 18:48:57 +01:00
Laurent Destailleur
ba931e18d4 Work on barcode number generation.
Normalize code for barcode module.
2014-01-31 18:12:54 +01:00
Laurent Destailleur
40a53d4b57 Fix: used bad constant name 2014-01-31 16:06:28 +01:00
Laurent Destailleur
7f15aa4582 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-01-31 11:41:17 +01:00
Laurent Destailleur
1b88ab2355 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/contact/class/contact.class.php
2014-01-31 10:12:41 +01:00
Laurent Destailleur
a2afea7ba9 Work on barcode number generation.
Normalize code for barcode module.
2014-01-30 18:21:04 +01:00
Laurent Destailleur
85436f871c Sec: Missing permission tests 2014-01-30 11:48:14 +01:00
Laurent Destailleur
0e9477167d Fix: Bad output of extrafields when list is used. 2014-01-30 11:47:25 +01:00
Laurent Destailleur
8abde9e11f Sec: Missing permission tests 2014-01-30 11:44:31 +01:00
Laurent Destailleur
5076e8ce4e Fix: Bad output of extrafields when list is used. 2014-01-30 10:48:10 +01:00
Laurent Destailleur
bd3a64d580 Add test ($conf->global->FEATURES_LEVEL >= 2) for extrafields on
detailed lines because this feature is currently bugged.
Should work when the 2 forms (predefined product and free product) will
be merged into one (planned for 3.6)
2014-01-30 01:35:01 +01:00
BENKE Charles
a10ccb4d92 Update objectline_add.tpl.php
Adding extra fields on line of element
2014-01-29 16:45:37 +01:00
Florian Henry
779aaa51ab reset function2.lib.php to orign 2014-01-29 10:13:00 +01:00
Florian Henry
526c383f10 Add complete head into agenda 2014-01-29 10:11:39 +01:00
Florian Henry
ca556485e0 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-01-29 10:09:44 +01:00
Laurent Destailleur
ee41273286 Fix: Count of files were wrong 2014-01-26 19:27:42 +01:00
Laurent Destailleur
cd277aaf12 Fix: Missing translation 2014-01-26 19:10:05 +01:00
Laurent Destailleur
557fb0a9b1 Fix: miscellaneous css problems
Fix: Version was missing into home page when login was already done.
2014-01-26 18:30:45 +01:00
Laurent Destailleur
f50ad96beb Fix: var init at wrong place 2014-01-25 23:14:57 +01:00
Laurent Destailleur
1a35fb801a Fix: var init at wrong place 2014-01-25 23:14:25 +01:00
Laurent Destailleur
0a367f03a0 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-25 16:29:19 +01:00
Laurent Destailleur
7149fd76c7 Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
	htdocs/core/lib/functions2.lib.php
2014-01-25 16:28:21 +01:00
Laurent Destailleur
8d916215cc New: Add new hook function addMoreActionsButtons to allow a module to
add/replace action buttons into an element.
2014-01-24 12:51:01 +01:00
Laurent Destailleur
101151630d Fix: doxygen errors 2014-01-24 10:38:45 +01:00
Laurent Destailleur
bdbbb580f8 Merge pull request #1381 from altairis-fr/clonepropal
clone of propal improvements
2014-01-24 01:33:15 -08:00
Laurent Destailleur
bb1575e0e6 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-24 10:20:03 +01:00
simnandez
a059b66b7d Fix: box of bank balances lines without decimals 2014-01-23 16:27:34 +01:00
simnandez
6fed307d70 Fix: box of bank balances lines without decimals 2014-01-23 16:26:07 +01:00
Florian Henry
a7c892e23b Fix Mask numbering 2014-01-21 14:18:00 +01:00
Laurent Destailleur
b8aee5f462 Merge pull request #1388 from FHenry/3.4
Correction Reset Mask (before do not work with FA{yy}{mm}-{0000@99} with date 2014-01-01)
2014-01-21 04:59:43 -08:00
Florian Henry
cd84a5fd17 remove debug 2014-01-21 13:48:47 +01:00