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

30328 Commits

Author SHA1 Message Date
Regis Houssin
830ec2d4fb Fix: reload page after refresh 2012-09-07 13:28:38 +02:00
Regis Houssin
2ee6f33f72 New: add ajax refresh method and code more clear 2012-09-07 13:27:12 +02:00
Regis Houssin
928aae7f79 Fix: strict mode day 2012-09-07 11:40:59 +02:00
Regis Houssin
77bbae7723 Fix: remove older models for avoid warnings 2012-09-07 11:18:08 +02:00
Regis Houssin
b6dc20fb90 Fix: send $varfiles instead _FILES 2012-09-07 10:58:29 +02:00
Regis Houssin
e725ef0eef Fix: find $upload_dir in first part of $dest_file 2012-09-07 10:54:56 +02:00
Regis Houssin
68c71896d4 Fix: add extraparams field for more parameters 2012-09-07 10:50:19 +02:00
Laurent Destailleur
0dfc9e59fe New: Creation of meta file works for all elements. Disabled by default. 2012-09-07 10:30:02 +02:00
Laurent Destailleur
eb3a262289 Fix: br at wrong place 2012-09-07 10:03:25 +02:00
Regis Houssin
171f25d3b2 Fix: getDirList is ambiguous, this method can return dir list or files 
list. Method is renamed to "getNodesList"
 2012-09-07 08:47:10 +02:00
Regis Houssin
b6f090eeef Fix: add notrigger parameter 2012-09-07 08:09:07 +02:00
Laurent Destailleur
13d6024a9f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-07 00:15:08 +02:00
Laurent Destailleur
1275a41244 New: Start to work on position of tasks into a project 2012-09-07 00:14:50 +02:00
Laurent Destailleur
28e7b73d21 Enhancement of holiday module 2012-09-06 23:58:09 +02:00
Laurent Destailleur
6e90e60268 Fix data init 2012-09-06 23:46:35 +02:00
Regis Houssin
83fbaac70d New: add hook in dol_move_uploaded_file method and split function with 
dol_check_uploaded_file method
 2012-09-06 21:30:44 +02:00
Laurent Destailleur
221b671636 New: The signature feature is full ok now. 2012-09-06 19:07:51 +02:00
Regis Houssin
210662d39e Fix: [ bug #533 ] 2012-09-06 15:18:30 +02:00
Regis Houssin
282d9c9c29 Merge pull request #372 from cbattarel/develop 
dont use lines without buying price for margin calculation if ForceBuyPr...
 2012-09-06 06:10:51 -07:00
Christophe Battarel
2b010c9ba4 dont use lines without buying price for margin calculation if ForceBuyPriceIfNull is set 2012-09-06 13:49:39 +02:00
Regis Houssin
20751e0279 Fix: [ bug #533 ] Using quotes in intervention sheet description leads 
to empty description
 2012-09-06 12:55:54 +02:00
Regis Houssin
6f8b403c23 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-06 12:41:08 +02:00
Regis Houssin
b5ba6ef4d9 Fix: broken feature, enable source details by default 2012-09-06 12:37:36 +02:00
Regis Houssin
720d0d99b0 Fix: strict mode 2012-09-06 12:36:55 +02:00
Regis Houssin
3c63307087 Fix: remove dead code 2012-09-06 12:30:03 +02:00
Regis Houssin
4309705b4c Fix: bad array 2012-09-06 12:26:23 +02:00
Laurent Destailleur
055bb7a9b8 Fix: Restore correct includes. 
All entry pages must start with a require main.inc.php, except command
line script that start with master.inc.php.
To avoid errors into jenkins, we must exclude file common.inc.php.
All files ending *.inc.php must be excluded from jenkins because such
files are not "start/entry pages". That's the difference with
standard files *.php.
*.php
 2012-09-06 10:39:25 +02:00
Laurent Destailleur
1a2ead7bdf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-06 10:22:56 +02:00
Laurent Destailleur
7f3013cd8f Fix: Show box even if order was not yet set 2012-09-06 10:22:33 +02:00
Laurent Destailleur
35c44896e4 Strict mode 2012-09-06 10:22:15 +02:00
Laurent Destailleur
0ec9793308 Fix: Bad test 2012-09-06 10:18:45 +02:00
Regis Houssin
00784ffce5 Fir: go to hell 2012-09-06 09:48:25 +02:00
Regis Houssin
c99e730e0c Fix: last try before asylum 2012-09-06 09:27:23 +02:00
Regis Houssin
7bd18ba840 Fix: phpunit error again ! pfff 2012-09-06 09:17:01 +02:00
Regis Houssin
c9ea50c51f Try another method 2012-09-06 09:09:00 +02:00
Regis Houssin
83dd81110d Fix: bad path the return 2012-09-06 09:01:54 +02:00
Regis Houssin
9e4ff47711 Fix: bad path 2012-09-06 08:52:31 +02:00
Regis Houssin
e0bb5f334d Try to avoid phpunit errors 2012-09-06 08:31:38 +02:00
Regis Houssin
0b057a071a Fix: for avoid phpunit errors 2012-09-06 08:24:29 +02:00
Laurent Destailleur
2141a33d53 Trans: Init bulgarian files 2012-09-06 00:17:45 +02:00
Laurent Destailleur
2ff87a2c1c Exclude dir 2012-09-05 20:41:58 +02:00
Laurent Destailleur
856c829c99 New: Add a selection module for emailing to enter a recipient from 
gui.
 2012-09-05 20:41:28 +02:00
Laurent Destailleur
655a288f8b Fix: Removed last separator line 2012-09-05 19:52:17 +02:00
Laurent Destailleur
76bdd878cf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-05 19:35:42 +02:00
Laurent Destailleur
aef1e29ad7 Qual: Interface is more clear. 2012-09-05 19:35:04 +02:00
Regis Houssin
67f0313802 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-05 19:25:20 +02:00
Regis Houssin
9d67b04076 New: add possibility to force entity in login page 2012-09-05 19:22:03 +02:00
Laurent Destailleur
7059cdb07a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-05 18:33:01 +02:00
Laurent Destailleur
20bca1dd5a Qual: Removed useless page 2012-09-05 18:28:12 +02:00
simnandez
bae63a70a1 Trad: Add holiday first translation 2012-09-05 17:51:25 +02:00
Regis Houssin
3823e5d374 New: add possibility to add or force default directories 2012-09-05 17:37:58 +02:00
simnandez
99946d828c Trad: Add missing translations 2012-09-05 16:39:01 +02:00
Laurent Destailleur
2e2f156839 Fix: title 2012-09-05 16:20:51 +02:00
Laurent Destailleur
7910993d90 Update favicon 2012-09-05 15:35:26 +02:00
simnandez
ff0bf4417b Try to enable hover in lists into auguria and eldy themes 2012-09-05 15:29:21 +02:00
Laurent Destailleur
2aafe5eef1 Merge pull request #370 from simnandez/develop 
Develop
 2012-09-05 05:43:16 -07:00
Laurent Destailleur
765fd9341a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-05 14:42:20 +02:00
Laurent Destailleur
d02076f8f2 Strict mode war 2012-09-05 14:41:45 +02:00
simnandez
a3ecb1203b New: Add PRODUCT_PRICE_MODIFY trigger 2012-09-05 14:38:16 +02:00
Regis Houssin
4f056c707c Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-05 14:33:00 +02:00
Regis Houssin
c18375d7ee Fix: broken features 
$reshook may contain returns stacked by other modules
$reshook is always empty with an array for can not lose returns stacked
with other modules
$hookmanager->resArray may contain array stacked by other modules
 2012-09-05 14:30:12 +02:00
Laurent Destailleur
a3cb0e502e Uniformize code and add comment on localtax to prepare usage for other 
countries.
 2012-09-05 14:05:17 +02:00
Laurent Destailleur
00cd6a050d Uniformise code 2012-09-05 13:10:13 +02:00
Laurent Destailleur
0e1dcb9408 Use a more standard behaviour: If hook return non zero, it is a "replace 
code" hook. Otherwise, it is "insert code" hook.
 2012-09-05 13:05:24 +02:00
Laurent Destailleur
9496fdd20b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-05 13:00:01 +02:00
Laurent Destailleur
84438d82f4 Qual: Clean module 2012-09-05 12:59:33 +02:00
Regis Houssin
86f3c8eb26 Fix: return an array 2012-09-05 12:38:39 +02:00
Regis Houssin
696c7eb454 Fix: use require instead include_once 2012-09-05 11:22:52 +02:00
Laurent Destailleur
b20c8d97c0 Fix: Checkstyle 2012-09-05 11:20:52 +02:00
Laurent Destailleur
9c11092f46 Uniformize code 2012-09-05 11:15:38 +02:00
Regis Houssin
5be523faad Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-05 11:05:02 +02:00
Laurent Destailleur
ef7de86d7e Show more param on conf.php file 2012-09-05 10:38:48 +02:00
Regis Houssin
1933bd4b50 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-05 10:17:33 +02:00
Regis Houssin
6bd571b31a New: add hook 'getDirList' in dol_dir_list() method 2012-09-05 10:17:02 +02:00
Laurent Destailleur
92fb64d112 Fix: PHP 5.2 compatibility 2012-09-05 10:11:18 +02:00
Laurent Destailleur
d57ba942f4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-05 09:59:03 +02:00
Laurent Destailleur
cc38fbe33f Uniformize code 2012-09-05 09:58:35 +02:00
Laurent Destailleur
f9607037a7 Qual: Removed deprecated table 2012-09-05 09:58:09 +02:00
Regis Houssin
f056ca3a41 FIXME: class commonagenda not exist 2012-09-05 08:07:15 +02:00
Laurent Destailleur
105cb2373c Add comment 2012-09-05 04:13:31 +02:00
Laurent Destailleur
e441b246a8 Debug of holiday module 2012-09-05 03:57:26 +02:00
Laurent Destailleur
246f3b5bb8 New: Add the holiday module (provided by teclib with permission to add 
it by default).
 2012-09-05 03:26:57 +02:00
Laurent Destailleur
55a5d56ebb Fix: comment 2012-09-04 23:08:57 +02:00
Laurent Destailleur
2f680adbb5 Fix: We must use the shipping address. 2012-09-04 23:03:39 +02:00
Regis Houssin
8a50a391be Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-04 20:47:03 +02:00
Regis Houssin
678e006121 Fix: for test 2012-09-04 20:46:08 +02:00
Laurent Destailleur
95fc429743 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-09-04 20:05:31 +02:00
Laurent Destailleur
aea89389e8 Qual: Uniformize pdf templates 
Qual: Removed duplicate pdf templates when content with no technology
difference nor functionnal difference
 2012-09-04 20:04:38 +02:00
Regis Houssin
58a9dc1afb Fix: syntax error 2012-09-04 19:33:11 +02:00
Regis Houssin
32421ef33c Fix: more simple 2012-09-04 19:25:31 +02:00
Regis Houssin
db9fe97738 New: add "please be patient" message 2012-09-04 19:19:30 +02:00
Regis Houssin
75166db2ed Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-04 18:35:03 +02:00
Regis Houssin
1b238a7086 Fix: try to use jquery blockUI 2012-09-04 18:34:36 +02:00
Laurent Destailleur
2bf933fbab Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-09-04 17:48:33 +02:00
Laurent Destailleur
dcc6b5e2c1 Qual: Removed deprecated files 2012-09-04 17:44:23 +02:00
Regis Houssin
83b5860ee1 Fix: for use with command line 2012-09-04 12:27:43 +02:00
Regis Houssin
65263886f4 Fix: add distinct for avoid double record 2012-09-04 11:51:51 +02:00
Regis Houssin
795bb1de77 Fix: comaptibility with multicompany and transverse mode 2012-09-04 11:09:17 +02:00
Regis Houssin
7f6bf34362 Try to use blockUI 2012-09-04 09:38:38 +02:00
Regis Houssin
2130571712 New: try jquery blockUI plugin 2012-09-03 22:05:13 +02:00
Regis Houssin
15db85bc86 Fix: prepare external extended ged 2012-09-03 21:00:46 +02:00
Laurent Destailleur
bfc933df4d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-03 18:18:12 +02:00
Laurent Destailleur
841586b050 Removed dead code. Allow to use attachment=0. 2012-09-03 18:17:19 +02:00
Regis Houssin
5622d1624c New: prepare for extend GED module 2012-09-03 18:03:39 +02:00
Laurent Destailleur
ac02450200 New: Can also use attachment=0 as parameter (for test purpose) 2012-09-03 18:01:07 +02:00
Regis Houssin
0797ff3057 Fix: missing concat 2012-09-03 17:25:35 +02:00
Regis Houssin
1abc87f642 Fix: can delete an import file with dialog confirm 2012-09-03 17:14:33 +02:00
Regis Houssin
fc29e7c432 Fix: $attachement is already true by default 
Fix: remove deprecated code
 2012-09-03 17:01:03 +02:00
Regis Houssin
14b1b1d6e5 Fix: missing upgrade with minor version 2012-09-03 16:28:55 +02:00
Regis Houssin
616ee24683 Fix: try to use another popup jquery plugin gpl compatible 2012-09-03 11:45:01 +02:00
Laurent Destailleur
36571f1d54 Removed dead code 2012-09-03 10:39:21 +02:00
Laurent Destailleur
51ea3c0775 Minor look fix 2012-09-03 10:27:31 +02:00
Laurent Destailleur
9eb21c3d9f Fix: Minot miscellanous fix 2012-09-03 10:17:58 +02:00
Laurent Destailleur
fdf787fca4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-03 09:45:44 +02:00
Laurent Destailleur
ac5cb23c04 Fix: Parameters at wrong place. 2012-09-03 09:45:26 +02:00
Regis Houssin
d2ae90f938 Fix: strict mode everywhere 2012-09-02 22:48:52 +02:00
Regis Houssin
8a5fe809f4 Fix: remove deprecated function and avoid warnings 2012-09-02 22:31:25 +02:00
Regis Houssin
e36af3085a New: add possibility to have a confirm dialog box with on/off buttons 
Qual: move some functions in lib_head.js
 2012-09-02 22:18:06 +02:00
Regis Houssin
0a88287b50 Fix: strict mode circus 2012-09-02 22:16:57 +02:00
Regis Houssin
7e5971f2d1 Fix: missing conf max_file_size 2012-09-02 22:15:18 +02:00
Regis Houssin
3659887134 Fix: add list of files 2012-09-02 22:15:00 +02:00
Regis Houssin
afdab32bbf Fix: avoid warnings (strict mode) 2012-09-02 22:12:56 +02:00
Regis Houssin
a00205a17d New: add possibility to set and del anothers constants 2012-09-02 22:06:03 +02:00
Regis Houssin
b9ac974013 Fix: use ajax button on/off 2012-09-02 22:04:30 +02:00
Regis Houssin
026cf124af Fix: avoid php warning 2012-09-02 22:01:05 +02:00
Regis Houssin
0ad137e734 Fix: uniformize code 2012-09-02 22:00:14 +02:00
Regis Houssin
00e0649cde Fix: strict mode plaza 2012-09-02 21:58:55 +02:00
Laurent Destailleur
2927a58606 Fix: Some fix into ajax ecm. 
New: The cache for nb of files into a dir is now implemented. By
default it is "not defined" and we refresh it when making a scan of a
dir for all subdirs.
 2012-09-02 20:11:36 +02:00
Laurent Destailleur
913b923886 Fix: error report when duplicate product 2012-09-02 15:09:48 +02:00
Laurent Destailleur
f369c9d99b New: ECM autodir works also for files joined to products and services 2012-09-02 15:03:55 +02:00
Laurent Destailleur
7f40fe18a4 Works on larger screens 2012-09-02 14:43:57 +02:00
Laurent Destailleur
f783960f19 Fix: Avoid repeat of img 2012-09-02 14:32:56 +02:00
Laurent Destailleur
c2dc2ba115 Fix: percentage during creation 2012-09-02 14:26:40 +02:00
Laurent Destailleur
c68ffdfcae Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-02 14:11:28 +02:00
Laurent Destailleur
1253683b83 Fix: edit of percentage 2012-09-02 14:11:07 +02:00
Laurent Destailleur
b891975b7d Fix: edit of percentage 2012-09-02 14:10:51 +02:00
Regis Houssin
ac5e201829 Fix: compatibility between bureau2crea theme and multicompany module 2012-09-02 11:40:20 +02:00
Regis Houssin
63564f8d50 Fix: broken features 2012-09-02 09:27:06 +02:00
Regis Houssin
671006316a Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-02 09:02:16 +02:00
Regis Houssin
9813344346 Fix: broken features and uniformize code 2012-09-02 08:50:42 +02:00
Laurent Destailleur
1ccb8f3363 New: Add a test during upgrade if database version is too low. 2012-09-02 01:47:21 +02:00
Regis Houssin
6f8b63f0ef Merge pull request #367 from simnandez/develop 
Fix: Bad assignation of const for pdf delivery module name
 2012-09-01 09:48:57 -07:00
Regis Houssin
7ff475c462 Fix: Modify spanish VAT to new rates (Juanjo) 2012-09-01 18:43:51 +02:00
Regis Houssin
54acdc71f6 Fix: this field is for 3.3 2012-09-01 18:09:47 +02:00
simnandez
44a3db8785 Fix: Bad assignation of const for pdf delivery module name 2012-09-01 17:02:38 +02:00
Laurent Destailleur
c5dea16e31 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-01 14:34:40 +02:00
Grand Philippe
56a620bc88 fix: wrong link 2012-08-31 19:07:47 +02:00
Laurent Destailleur
f64e6ced25 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-31 18:38:35 +02:00
Laurent Destailleur
9c13f81bef Trans 2012-08-31 18:38:01 +02:00
Regis Houssin
c9886fb86d Fix: same size of view lines 2012-08-31 16:50:46 +02:00
Laurent Destailleur
83ab8c05e2 New: More surface control into project edition 2012-08-31 14:31:36 +02:00
Laurent Destailleur
6709d3d377 Fix: moving date of task when moving date of project was not working 2012-08-31 14:31:08 +02:00
Laurent Destailleur
27846d1698 Fix: Start and end date not saved at project creation 
Conflicts:
	htdocs/projet/class/project.class.php
 2012-08-31 12:55:10 +02:00
Regis Houssin
f81b696890 Fix: code optimization 2012-08-31 09:25:27 +02:00
Regis Houssin
18b7549c52 Fix: use GETPOST('usenewaddlineform') instead MAIN_FEATURES_LEVEL 2012-08-31 08:51:08 +02:00
Regis Houssin
4054e5a8bd Merge pull request #364 from marcosgdf/minor 
Fixed a problem when adding line into proposal
 2012-08-30 23:36:36 -07:00
Regis Houssin
57fa5d6c03 Merge pull request #363 from marcosgdf/translations 
Fixed es_ES translation typo
 2012-08-30 23:33:38 -07:00
Marcos García
bb99e4d40d Fixed a problem when adding line into proposal 2012-08-31 07:49:00 +02:00
Marcos García
2b63ea314c Fixed es_ES translation typo 2012-08-31 07:16:39 +02:00
Marcos García
4209898d20 Lower-cased Header function 2012-08-31 05:58:38 +02:00
Laurent Destailleur
2aa883c25e Better comments 2012-08-31 01:00:18 +02:00
Regis Houssin
9a6ddbe096 Fix: use $mysoc instead customer 2012-08-30 22:14:18 +02:00
Regis Houssin
e84f57e62c Fix: restore broken features 2012-08-30 21:37:37 +02:00
Laurent Destailleur
c7e7b67433 Fix: bad default vat calculation 2012-08-30 21:16:41 +02:00
Laurent Destailleur
cd9a6942ce Revert "Fix: add title" 
This reverts commit f27821a657.
 2012-08-30 20:28:43 +02:00
Regis Houssin
f27821a657 Fix: add title 2012-08-30 19:32:34 +02:00
Regis Houssin
8f21abfc5a Fix: Disabled if customer is not subject to VAT 2012-08-30 19:01:48 +02:00
Laurent Destailleur
96e0586934 Fix: enhance cleaning of database 2012-08-30 17:11:42 +02:00
Laurent Destailleur
ddb31d4b2c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/webservices/server_user.php
 2012-08-30 16:54:59 +02:00
Regis Houssin
88742e41d4 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-30 11:10:53 +02:00
Regis Houssin
95c2650160 Fix: best method 2012-08-30 11:10:17 +02:00
Laurent Destailleur
bd5acde0c7 Add tag to detect new method (to help debugs) 2012-08-29 19:03:58 +02:00
Laurent Destailleur
edab47fbc8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-29 18:23:49 +02:00
Regis Houssin
ffd6c07003 Fix: remove obsolete code 2012-08-29 18:14:20 +02:00
Regis Houssin
13d46da3fe Fix: clear old data before update 2012-08-29 18:01:00 +02:00
Laurent Destailleur
86a12d7471 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-29 17:43:43 +02:00
Laurent Destailleur
d8d28d6350 New: Add ChromePHP output into syslog module. 2012-08-29 17:43:20 +02:00
Regis Houssin
327e51ccd9 Fix: more simple 2012-08-29 17:40:13 +02:00
Regis Houssin
4a97ea9b7b Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-29 17:30:11 +02:00
Laurent Destailleur
21555f00ef Fix: Bad test 2012-08-29 16:59:36 +02:00
Regis Houssin
d6918d7a87 Fix: upgrade ckeditor 2012-08-29 16:31:48 +02:00
Laurent Destailleur
87742cb3d8 Qual: Move an admin tools into admin menu. 
Fix: Fix 7 bugs into the mass vat update tool.
 2012-08-29 14:13:13 +02:00
Regis Houssin
6bdba9fa72 Fix: get the good vat rates 2012-08-29 11:55:53 +02:00
Laurent Destailleur
07aae3200f Fix: Test on ref and ref_ext into webservice 2012-08-29 10:23:15 +02:00
Regis Houssin
5f32617843 Fix: restore dolibarr parameters 2012-08-29 10:14:40 +02:00
Regis Houssin
4da73a8d82 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-29 10:08:46 +02:00
Regis Houssin
54860ef304 Fix: upgrade tcpdf and fpdi 2012-08-29 09:55:32 +02:00
Laurent Destailleur
e027f12e0a Merge pull request #359 from marcosgdf/minor 
Uniformized SQL error management in boxes
 2012-08-29 00:45:27 -07:00
Laurent Destailleur
d710de5e64 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-29 09:43:45 +02:00
Laurent Destailleur
3771ad2e87 Fix: Restore line feed after removing it from select_product function. 2012-08-29 09:43:24 +02:00
Marcos García
89692fb79e Uniformized sql error management 
Eldy told me that this is the correct way to handle SQL errors…
 2012-08-29 08:37:12 +02:00
Regis Houssin
70c467e429 Fix: Update vat rate combobox 2012-08-29 08:17:25 +02:00
Regis Houssin
3cb93e90cd Merge pull request #358 from marcosgdf/translations 
Improved translations
 2012-08-28 22:22:00 -07:00
Marcos García
f9eb3873b0 Improved and added missing es_ES translations 2012-08-29 00:32:57 +02:00
Marcos García
1a676b5b4b Added missing permission translations 2012-08-29 00:32:16 +02:00
Marcos García
7c0463b215 Used incorrect translation keys 
Duplicated keys
 2012-08-29 00:29:47 +02:00
Laurent Destailleur
e3e36dca6d We set to zero to unifrmize way of working between customer and supplier 
payments
 2012-08-28 23:39:11 +02:00
Laurent Destailleur
8a74c928f3 Fix: regression 2012-08-28 23:01:04 +02:00
Laurent Destailleur
745b35f94e Missing translation key 2012-08-28 22:39:22 +02:00
Laurent Destailleur
6853ed0e5e Fix: permission for a user to view its own card using webservice 2012-08-28 22:31:51 +02:00
Laurent Destailleur
bd05056616 Fix: Missing br removed from select_produits 2012-08-28 22:25:58 +02:00
Laurent Destailleur
32ca894952 Try a fix for js syntax error 2012-08-28 22:05:40 +02:00
Laurent Destailleur
990a13146d Fix: permission for a user to view its own card using webservice 2012-08-28 18:47:32 +02:00
Laurent Destailleur
4108e48d5c Merge pull request #349 from FHenry/develop 
Change size of element type
 2012-08-28 09:25:08 -07:00
Laurent Destailleur
2a800816d9 Merge pull request #356 from cbattarel/develop 
modify margin management for global discount + correct bug (wrong consta...
 2012-08-28 09:24:06 -07:00
Laurent Destailleur
4bd6e9e6ad Merge pull request #355 from marcosgdf/cerfafr 
Minor fixes to CerfaFR donation document
 2012-08-28 09:09:29 -07:00
Regis Houssin
4bb837dc6a Fix: update icon 2012-08-28 17:01:16 +02:00
Regis Houssin
c0bde33b1f Fix: [ task #498 ] add same tests in edit mode 2012-08-28 16:11:40 +02:00
Regis Houssin
62a7847c5b Fix: [ task #498 ] debug 2012-08-28 15:35:32 +02:00
Regis Houssin
ce9a16b341 Fix: button add not disabled 2012-08-28 14:42:46 +02:00
Regis Houssin
526f0e310b Fix: convert line delimiters 2012-08-28 12:38:07 +02:00
Regis Houssin
06b4cc3724 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-28 12:37:06 +02:00
Regis Houssin
4332c341bf Fix: check if textarea is not empty for free lines 2012-08-28 12:36:35 +02:00
Christophe Battarel
c1859d361a modify margin management for global discount + correct bug (wrong constant name) 2012-08-28 10:13:58 +02:00
Marcos García
c8869e65a6 Minor fixes to CerfaFR donation document 
* Title wasn't localized
* Fixed donation ref
 2012-08-28 09:58:15 +02:00
Laurent Destailleur
562e2b6a7b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-28 09:33:58 +02:00
Laurent Destailleur
26b05212c7 Fix: Missing include 2012-08-28 09:33:43 +02:00
Regis Houssin
57f5338e4f Merge pull request #353 from marcosgdf/coding-style 
Refactored Mailmanspip class
 2012-08-27 22:55:18 -07:00
Marcos García
c302567d1d Refactored Mailmanspip class 
Removed duplicated code
Added missing error tests and logs
 2012-08-28 07:02:00 +02:00
Marcos García
afee791b35 Forgot to add the copyright 2012-08-28 05:53:44 +02:00
Marcos García
c6fe6c32bc Translated some MailmanSPIP strings 2012-08-28 05:46:48 +02:00
Marcos García
f64ab52993 Fixed MailmanSPIP problem + little refactor 2012-08-28 05:22:39 +02:00
Regis Houssin
eea7127aa2 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-27 21:45:48 +02:00
Regis Houssin
e55c86074e Fix: compatibility with combobox 2012-08-27 21:45:19 +02:00
Laurent Destailleur
24c29e23f9 Fix: Force reload of index page when all boxes were removed. This is to 
be sure to have the combo list complete after this refresh.
 2012-08-27 21:16:26 +02:00
Laurent Destailleur
857a11f508 New: Can select thirdparties into emailing targets, even if module 
category is not enabled.
 2012-08-27 20:21:53 +02:00
Laurent Destailleur
80d9fb7134 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-27 20:02:42 +02:00
Laurent Destailleur
d0d5891eef New: Add unit foot2, inch2, foot3 and inch3 for surface and volumes. 2012-08-27 20:02:23 +02:00
Laurent Destailleur
6c0dac2f17 More things to repair 2012-08-27 19:30:09 +02:00
Regis Houssin
10f9b53557 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-27 19:12:31 +02:00
Regis Houssin
3e2be54ead Fix: restore old method 2012-08-27 19:11:44 +02:00
Laurent Destailleur
29fa8b64c4 Checkstyle 2012-08-27 18:04:00 +02:00
Laurent Destailleur
8a42cc26b7 Fix: Bad syntax of class name 2012-08-27 18:00:59 +02:00
Regis Houssin
7ca0aa8a78 Fix: restore deprecated files 2012-08-27 17:23:35 +02:00
Regis Houssin
07a10d3984 Fix: add compatibility with old static combobox 2012-08-27 17:18:46 +02:00
Laurent Destailleur
426b3c2627 New: Adding a box add it on column with the less boxes. 2012-08-27 14:47:20 +02:00
Laurent Destailleur
b57de4fbac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-27 14:11:58 +02:00
Laurent Destailleur
1255699791 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/tpl/objectline_add.tpl.php
 2012-08-27 14:11:17 +02:00
Regis Houssin
6426ef3f8d Fix: add test for instance 2012-08-27 14:08:59 +02:00
Laurent Destailleur
625f53a708 Fix 4: test on selected value was lenght > 0 but if value is 0, lenght 
is 1 and we want flase here.
Fix 5: Button Add is enabled once a predefined product is selected.
 2012-08-27 13:54:14 +02:00
Regis Houssin
fb866d9106 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_add.tpl.php
 2012-08-27 13:33:31 +02:00
Regis Houssin
2f14fbe791 Fix: debug ckeditor and VAT 2012-08-27 13:27:27 +02:00
Laurent Destailleur
cc22f25d97 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-27 13:07:40 +02:00
Laurent Destailleur
0bdb9aac31 Fix condition of usage of ckeditor 2012-08-27 13:07:25 +02:00
Laurent Destailleur
9570e03b1e Qual: Add TODO 2012-08-27 12:07:50 +02:00
Marcos García
7be72c39b1 Fixed SQL problems with llx_accounting.sql 2012-08-27 03:17:57 +02:00
Marcos García
07070b238b Fixed SQL syntax problem 2012-08-27 02:41:49 +02:00
Laurent Destailleur
35a0311d28 Fix: Checkstyle 2012-08-26 23:15:26 +02:00
Laurent Destailleur
0b42251dfd Checkstyle 2012-08-26 23:13:18 +02:00
Laurent Destailleur
d8e162c309 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-26 22:36:21 +02:00
Laurent Destailleur
bdaaa1d038 New: [ task #494 ] Send an email to foundation when a new member has 
auto-subscribed
 2012-08-26 22:33:27 +02:00
FHenry
d716763896 change size of elementtype 2012-08-26 21:53:40 +02:00
Regis Houssin
efa471b12b Fix: test if ckeditor is enabled 2012-08-26 21:47:56 +02:00
Laurent Destailleur
7fa4b9b423 Fix: Clean feature [ task #515 ] Add a "no e-mail" checkbox on contact 2012-08-26 20:28:19 +02:00
Laurent Destailleur
b2808f6a60 Doxygen 2012-08-26 20:18:29 +02:00
Laurent Destailleur
a18187620e [ bug #512 ] Filter system not working in banks > account > transactions 2012-08-26 19:23:08 +02:00
FHenry
7895ff0e5c Change size of element type 2012-08-26 19:03:23 +02:00
Laurent Destailleur
a08606f456 Add constant because such table should be edited with a specific page 
(that does not exist yet, but that should exists as soon as someone
works on it).
 2012-08-26 18:54:34 +02:00
Laurent Destailleur
5bc5707236 Merge pull request #348 from aspangaro/develop 
I added the patch but i also added a hidden constant to make the accountancy dictionnary appears because this feature is not yet used.
 2012-08-26 09:45:10 -07:00
Laurent Destailleur
fd00b16b19 Fix: Bad log format 2012-08-26 18:28:59 +02:00
Laurent Destailleur
efc61be1a4 Fix: Rounding at wrong place 2012-08-26 18:27:15 +02:00
Laurent Destailleur
56d19437f4 Fix: [ bug #524 ] Donation receipt html_cerfafr is not localized 2012-08-26 18:01:29 +02:00
Spangaro Alexandre
62322b3bda Better translation 2012-08-26 17:24:49 +02:00
Spangaro Alexandre
9050431f87 Simply way to update chart of accounts 2012-08-26 17:11:19 +02:00
Laurent Destailleur
9c04cb25db Qual: Removed not used files. 2012-08-26 15:51:28 +02:00
Laurent Destailleur
15eec16bee Fix: Regression 2012-08-26 15:31:06 +02:00
Laurent Destailleur
7db8c8aab9 Fix: Regression 2012-08-26 14:14:27 +02:00
Laurent Destailleur
1c0303ea6b Fix: Restore broken feature. 2012-08-26 13:44:42 +02:00
Laurent Destailleur
7c455da7c7 Revert "for module ultimatepdf" 
This reverts commit 72895fa4b7.
 2012-08-26 13:24:28 +02:00
Laurent Destailleur
3ab014e5c0 Fix: Use bad date. 
Fix: Autoselect of type.
 2012-08-26 13:09:34 +02:00
Laurent Destailleur
bda132b07f Fix: [ bug #254 ] Database backup not working with complex passwords 2012-08-26 00:33:37 +02:00
Laurent Destailleur
8bcb90fcd0 Fix: syntax error 2012-08-26 00:28:04 +02:00
Regis Houssin
becda06fd6 Fix: security 2012-08-25 19:40:08 +02:00
Regis Houssin
40be4287cf Fix: remove old code 2012-08-25 19:29:26 +02:00
Regis Houssin
e402c9cd28 Fix: use propal instead propale 2012-08-25 19:25:06 +02:00
Regis Houssin
dcfc34e64e Fix: more better of better 2012-08-25 19:20:17 +02:00
Regis Houssin
4dd8119a9e Fix: use better method for avoid warnings 2012-08-25 19:08:06 +02:00
Regis Houssin
f322ec50ed New: [ task #498 ] - final part 2012-08-25 15:21:34 +02:00
Regis Houssin
d88abe8df0 Fix: use label instead libelle 2012-08-25 12:07:18 +02:00
Regis Houssin
6fe631378b Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into task498_objectline 2012-08-25 11:28:08 +02:00
Regis Houssin
e00b74619a Fix: regression 2012-08-25 11:09:58 +02:00
Regis Houssin
954f2afbc5 Fix: remove obsolete code 2012-08-25 10:49:59 +02:00
Regis Houssin
c9113458d9 New: [ task #498 ] part 3 2012-08-25 03:28:30 +02:00
Marcos García
082753d115 Refactored code 2012-08-24 19:55:31 +02:00
Marcos García
977571e032 Forgot to apply the patch to the rest of the files 2012-08-24 18:32:19 +02:00
Grand Philippe
2d34e7bf8b fix some issue within typhon pdf 2012-08-24 16:34:05 +02:00
Regis Houssin
a0b3ea0dd4 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into task498_objectline

Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-08-23 18:52:55 +02:00
Regis Houssin
ead2a81baf Fix: merge problem 2012-08-23 18:45:41 +02:00
Regis Houssin
56a22d2b59 Fix: rename for security raison 2012-08-23 18:15:54 +02:00
Regis Houssin
eca37eb123 Fix: [ bug #497 ] Module Order Supplier inaccessible altogether because 
of a missing SQL field
 2012-08-23 17:24:29 +02:00
Regis Houssin
6a60551fdd Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into task498_objectline

Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-08-23 17:19:05 +02:00
Regis Houssin
45971ce6f0 Merge pull request #343 from marcosgdf/minor 
Translations + Little refactor
 2012-08-23 08:10:54 -07:00
Regis Houssin
995c7f13d3 New: [ task #498 ] part3 2012-08-23 13:45:51 +02:00
Marcos García
752c867882 I like more this variable name :D 2012-08-23 09:45:52 +02:00
Marcos García
cb29cfed7b Translations + Little refactor 2012-08-23 09:43:13 +02:00
Marcos García
0ecfe0465e Fixed bug #499 
The input method of supplier orders wasn't being translated
 2012-08-23 09:20:30 +02:00
Regis Houssin
51d3d33947 Merge pull request #339 from marcosgdf/bug-511 
Fixed bug #511
 2012-08-23 00:02:23 -07:00
Regis Houssin
4d1555f4ca Merge pull request #338 from atm-maxime/mko515 
Mko515
 2012-08-23 00:01:05 -07:00
Marcos García
fcb4f5ce67 Renamed MySQL alias that could cause conflicts 2012-08-23 09:00:31 +02:00
Marcos García
44cc4ae949 Some strings weren't being translated 
Thanks to @grandoc and I.D & L (idl-mp.com) for the french translations
 2012-08-23 08:46:22 +02:00
Maxime Kohlhaas
332ee652c3 Clear action was called with a rowid instead of id (rowid is for a target of the emailing, id is for the emailing) 2012-08-23 08:45:45 +02:00
Maxime Kohlhaas
39de1cb010 Task 515 : Correction on SQL request 2012-08-23 08:43:29 +02:00
Marcos García
66eabbe4a9 Improved es_ES translations 2012-08-23 08:33:18 +02:00
Marcos García
19bf4ab8df Improvements to translations 
Some available translations weren't being translated
Also corrected wrong translation key
Improved es_ES translation string
 2012-08-23 08:29:38 +02:00
Marcos García
43e4f139d5 Fixed bug #511 
A pagination problem was causing duplicated records
https://doliforge.org/tracker/?func=detail&aid=511&group_id=144
 2012-08-23 08:21:32 +02:00
Regis Houssin
f4d75e87d3 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into task498_objectline

Conflicts:
	htdocs/core/class/commonobject.class.php
 2012-08-23 07:53:48 +02:00
Regis Houssin
c8e1aca7d8 New: [ task #498] part2 2012-08-23 07:50:20 +02:00
Regis Houssin
3cdb2ba8e1 Merge pull request #337 from marcosgdf/coding-style 
Improved coding style
 2012-08-22 22:43:03 -07:00
Regis Houssin
99e7b82b69 Merge pull request #336 from marcosgdf/minor 
Fixed string not being translated
 2012-08-22 22:40:02 -07:00
Regis Houssin
08ea9c4351 Merge pull request #334 from grandoc/develop 
Develop
 2012-08-22 22:39:39 -07:00
Regis Houssin
4bdb2047a9 Merge pull request #335 from marcosgdf/translations 
Added missing en_US translations
 2012-08-22 22:38:46 -07:00
Marcos García
5769c0facc Changed incorrect includes 2012-08-23 02:46:16 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
37c4898720 Removed "./" in require statements 
It does not make any sense to do that
 2012-08-23 01:43:44 +02:00
Maxime Kohlhaas
5fd10d14be Task 515 : Corrections + target modules modifications 2012-08-23 00:00:01 +02:00
Marcos García
56264f0bf5 Fixed incorrect change 2012-08-22 23:44:17 +02:00
Marcos García
ea119c45a2 Lower-cased all <?PHP 2012-08-22 23:27:53 +02:00
Marcos García
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Maxime Kohlhaas
06ab1f6f94 Task 515 : New field added on contact : no_email 2012-08-22 22:59:10 +02:00
Marcos García
bed4e7bc72 Fixed string being not translated 2012-08-22 22:36:08 +02:00
Regis Houssin
85c0dd95ca Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into task498_objectline

Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-08-22 17:50:07 +02:00
Regis Houssin
4a5d89e6cc Fix: move barcode type entries in module descriptor for best 
compatibility with multicompany
 2012-08-22 17:44:52 +02:00
Regis Houssin
2ae1d3d3b5 New: [ task #498 ] 2012-08-22 17:42:40 +02:00
Philippe Grand
f6e31ee6bc Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2012-08-22 09:04:41 +02:00
Marcos García
25042c1ef9 Added missing en_US translations 
Made by tanayhan
http://www.dolibarr.org/forum/fbprofile/userid-7996
 2012-08-22 07:13:02 +02:00
Regis Houssin
545cb023ff Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into task498_objectline 2012-08-21 13:48:52 +02:00
Regis Houssin
75bfddd7a6 Fix: wrong ereg 2012-08-21 11:47:56 +02:00
Philippe Grand
6cfe58f083 fix some english translation 2012-08-21 09:39:07 +02:00
Philippe Grand
33ea1e1622 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2012-08-20 14:44:20 +02:00
Laurent Destailleur
2ab1a018df Fix: GETPOST can not always be used to replace isset. 2012-08-20 14:30:16 +02:00
Laurent Destailleur
880276f047 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-08-20 14:14:26 +02:00
Laurent Destailleur
fb074daaf1 Fix: The backto use bad url. 2012-08-20 14:14:01 +02:00
Regis Houssin
3c13395d21 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into task498_objectline 2012-08-20 12:10:20 +02:00
Philippe Grand
158019f161 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2012-08-20 11:07:28 +02:00
Regis Houssin
7c623a9a2e Fix: strict mode bounty 2012-08-20 11:04:56 +02:00
Regis Houssin
5dc10cfcae Fix: possibility to defined another value instead 50% 2012-08-20 10:38:48 +02:00
Regis Houssin
c6d008fb1b Fix: broken feature and add FIXME 2012-08-20 09:40:59 +02:00
Regis Houssin
1aa26d0cd7 Fix: missing show field if "in progress" is chosen first 2012-08-20 08:45:39 +02:00
Philippe Grand
b2771660d3 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2012-08-20 08:43:10 +02:00
Regis Houssin
8719f87781 Fix: avoid warning "is not a legal ECMA-262 octal constant" 2012-08-20 08:30:55 +02:00
Regis Houssin
257dcb8928 Merge pull request #332 from marcosgdf/minor 
Fixed incorrect HTML
 2012-08-19 22:47:48 -07:00
Marcos García
63c4cfb609 Fixed incorrect HTML 2012-08-20 02:45:38 +02:00
Marcos García
344f379683 jQuerified events' javascript 2012-08-20 02:42:56 +02:00
Laurent Destailleur
9c31e6b2db Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-08-20 02:15:50 +02:00
Laurent Destailleur
218b97f2d0 Fix: [ bug #506 ] Can't set percentage of a started event 2012-08-20 02:15:07 +02:00
Regis Houssin
00781031d8 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-20 01:30:28 +02:00
Regis Houssin
3991e0b13d Fix: add accountancy code error message 2012-08-20 01:29:13 +02:00
Laurent Destailleur
f0d0539766 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-08-20 00:40:07 +02:00
Laurent Destailleur
a0796423e9 Move warning to info 2012-08-20 00:39:35 +02:00
Regis Houssin
24cc07815d Fix: remove old accountancy code, can cause blank screen 2012-08-20 00:36:51 +02:00
Laurent Destailleur
c664ac3cfa Fix: Default value was not defined 2012-08-20 00:27:38 +02:00
Regis Houssin
a856ad0afa Fix: strict mode sunshine 2012-08-19 09:05:50 +02:00
Regis Houssin
6729cd9b4b Merge pull request #330 from marcosgdf/fix-bug-504 
Fixed bug #504
 2012-08-18 22:48:24 -07:00
Marcos García
8639f1a414 Fixed bug #504 
https://doliforge.org/tracker/?func=detail&aid=504&atid=246&group_id=144
 2012-08-19 03:37:37 +02:00
Marcos García
bced5f3bca Added missing es_ES translation 2012-08-19 03:36:04 +02:00
Philippe Grand
72895fa4b7 for module ultimatepdf 2012-08-18 21:31:12 +02:00
Regis Houssin
eb24a2fb4d Merge pull request #324 from simnandez/develop 
Trad: Add ca_ES missing translations
 2012-08-18 12:04:58 -07:00
Regis Houssin
88becc9592 Merge pull request #325 from marcosgdf/translations 
Added missing permission translation
 2012-08-18 12:03:41 -07:00
Regis Houssin
4439d829e3 Merge pull request #328 from marcosgdf/coding-style 
Removed duplicated code
 2012-08-18 12:02:52 -07:00
Marcos García
7608905b3c Removed duplicated code 2012-08-18 20:51:30 +02:00
Regis Houssin
b4e324a515 Fix: add ht and ttc fields 2012-08-18 19:05:59 +02:00
Marcos García
d32ed9b39c Missing copyright 2012-08-18 18:49:18 +02:00
Marcos García
44fd4e7eb8 Fixed a SQL error when listing lines of an invoice 
Column 'localtax1_tx' in field list is ambiguous
 2012-08-18 18:47:12 +02:00
simnandez
ea8c380ef3 Trad: Add missing ca_ES translations 2012-08-18 18:45:23 +02:00
Marcos García
12282a8a20 Added missing permission translation 2012-08-18 17:27:12 +02:00
simnandez
c8a1bc5490 Qual: A closed contract no more invoiceable 2012-08-18 16:42:46 +02:00
simnandez
16e5742ae2 Trad: Add ca_ES missing translations 2012-08-18 13:17:27 +02:00
simnandez
8f8cdf78fa Trad: Improve ca_ES and es_ES translations 2012-08-18 12:33:10 +02:00
simnandez
4fdf38b51c Trad: Improve ca_ES and es_ES translations 2012-08-18 12:12:17 +02:00
Regis Houssin
74c1fa2263 Fix: bad rights 2012-08-18 10:52:10 +02:00
Regis Houssin
4aa8d0eb0c Fix: [ bug #501 ] Error while trying to modify an user 2012-08-18 10:19:01 +02:00
Regis Houssin
eeb52eee0d Fix: [ bug #500 ] PHP Warning when creating dict line 2012-08-18 09:57:42 +02:00
Regis Houssin
058d0b1b08 Fix: [ bug #503 ] Unable to delete linked file to a deposit 2012-08-18 08:51:52 +02:00
Regis Houssin
bd99c2d23d Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-18 08:31:59 +02:00
Regis Houssin
d03b29ba78 Fix: [ bug #502 ] Error when validating cheque deposit 2012-08-18 08:30:29 +02:00
Regis Houssin
add63c7320 Merge pull request #321 from marcosgdf/minor 
Project::setClose wasn't setting the new status
 2012-08-17 22:28:39 -07:00
Regis Houssin
e7b63faaa8 Merge pull request #320 from marcosgdf/project-upload-bug 
Fixed a bug where files were not being uploaded to a project's task
 2012-08-17 22:27:39 -07:00
Regis Houssin
09e34068bc Merge pull request #319 from marcosgdf/translations 
A lot of improvements into translations
 2012-08-17 22:22:56 -07:00
Marcos García
737b7d4946 Improved es_ES translation 2012-08-18 06:10:58 +02:00
Marcos García
30d7aa0383 Missing es_ES translation and improved the rest of them 2012-08-18 06:00:05 +02:00
Marcos García
4842da5679 Project::setClose wasn't setting the new status 2012-08-18 05:57:25 +02:00
Marcos García
1339796492 Untranslated dict errors 2012-08-18 05:14:21 +02:00
Marcos García
f7a7ca4ff2 Fixed a bug where files were not being uploaded to a project's task 
Reported by Jose Antonio Garcia in dolibarr.es' forum
http://www.dolibarr.es/index.php/foro/7-bugs-versiones-estables/1250-error-subir-archivo-en-una-tarea-de-un-proyecto
 2012-08-18 04:09:28 +02:00
Marcos García
f5b5f88f84 Added missing copyright 2012-08-18 00:04:52 +02:00
Marcos García
46ab7c597a Missing translation in PoS > Print Ticket page 2012-08-17 23:50:22 +02:00
Marcos García
952204564f Missing dict translation because of translated key 2012-08-17 23:43:08 +02:00
Marcos García
da762903bb Missing paper format dict translations 2012-08-17 23:28:15 +02:00
Regis Houssin
bc9ab610ea Merge pull request #317 from simnandez/develop 
Trad: add mailminspip into ca_ES
 2012-08-17 11:16:32 -07:00
Regis Houssin
5ff8d74d34 Merge pull request #316 from marcosgdf/minor 
Translated message was generating an incomplete string
 2012-08-17 11:15:50 -07:00
Regis Houssin
577a853b9b New: update field "qty" with minimum qty for this supplier price 2012-08-17 18:17:15 +02:00
Regis Houssin
878f54b1e9 Fix: invoice supplier, disable "add" button and show error message if a 
product with no supplier price is selected
 2012-08-17 17:23:36 +02:00
Regis Houssin
7394525388 Fix: disable "add" button and show error message if a product with no 
supplier price is selected
 2012-08-17 16:58:57 +02:00
Regis Houssin
3438305169 FIXME: with ajax autocompleter, does not see the products that have no 
supplier prices because they can be selected and it creates an error
message.
Fix: Do not make a "print" on "hook methods", just get the result
 2012-08-17 15:16:07 +02:00
simnandez
f20c7ea4c9 Trad: add mailminspip into ca_ES 2012-08-17 09:38:09 +02:00
Marcos García
8d6d9e8f8c PoS permission number was incorrect in admin.lang 2012-08-17 07:56:54 +02:00
Marcos García
8ab7a5e276 Improved es_ES translations 2012-08-17 07:55:28 +02:00
Marcos García
24c89ddc12 Translated message was generating an incomplete string 2012-08-17 07:05:28 +02:00
Regis Houssin
4825448ced Merge pull request #315 from marcosgdf/error-messages 
Forgot to migrate to some lines to the new error-handler
 2012-08-16 13:59:05 -07:00
Marcos García
29f2e7236a Forgot to migrate to some lines to the new error-handler 2012-08-16 21:37:33 +02:00
Regis Houssin
3468787a29 Fix: best view 2012-08-16 20:20:23 +02:00
Regis Houssin
d03eb5af4a New: add total vat field 2012-08-16 20:11:48 +02:00
Regis Houssin
97474bf77f Fix: strict mode safari 2012-08-16 19:18:24 +02:00
Stephen L
087cf0bb91 Add conditional substitution IF/ELSEIF/ENDIF for ODT 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2012-08-16 17:30:32 +02:00
Regis Houssin
e1c009fce4 Fix: regression, formconfirm template can't use with variable content 2012-08-16 17:22:00 +02:00
Regis Houssin
7a30416124 Merge pull request #310 from marcosgdf/error-messages 
Added missing error messages in supplier & customer's orders
 2012-08-16 08:16:56 -07:00
Regis Houssin
b3d09478ca Merge pull request #313 from lrq3000/develophooks 
A lot of hooks and triggers implemented + custom substitution function for lines in ODT
 2012-08-16 08:15:19 -07:00
Stephen L
427da6ed5e Add optional options for mysqlnobin export method. 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2012-08-16 16:02:08 +02:00
Stephen L
ed990c00f5 Revert "Add conditional substitution IF/ELSEIF/ENDIF for ODT" 
This reverts commit adab15a30a.

Revert to cleanup (the conditional substitution is in another pull request)
 2012-08-16 13:54:19 +02:00
Marcos García
db5d046ee7 Applied 3.3 error management as @hregis requested 2012-08-16 13:10:14 +02:00
Marcos García
f320ed92cc Translated and upper-cased export formats, improved es_ES translations 
fr_FR exports translations were made by @fhenry and Manuel Pintor (contact@idl-mp.com)
Little refactor too
 2012-08-16 13:07:12 +02:00
Marcos García
3941466cd3 Removed duplicated code 2012-08-16 03:55:41 +02:00
Marcos García
b6cd8b632b Improved es_ES translations 2012-08-15 19:32:26 +02:00
Marcos García
557cb35b8d Added missing translations 2012-08-15 19:17:05 +02:00
Marcos García
cc4d5ff8d8 Removed the use of duplicated key translations 
Nature is now being used instead of MorPhy
UserTitle is now being used instead of Civility
VATIntraVeryShort was being used were not necessary
 2012-08-15 18:55:32 +02:00
Stephen L
44bed57faf Fix: mysqlnobin export method now works better (avoid duplicates values errors when a number is in fact a string and foreign keys checks are always disabled when restoring) 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2012-08-15 18:35:37 +02:00
Marcos García
46db54da21 Renamed ECMNoDirecotyYet to ECMNoDirectoryYet 2012-08-15 16:06:53 +02:00
Marcos García
b4471a4bd7 Added missing error messages in supplier & customer's orders 2012-08-15 15:52:51 +02:00
Regis Houssin
f714897873 Fix: limit to products and services 2012-08-15 10:34:10 +02:00
Regis Houssin
fbb275ee25 Fix: remove bad fixe 2012-08-15 09:15:26 +02:00
Regis Houssin
48efabc8a4 Fix: remove deprecated function and avoid warnings 2012-08-15 09:06:36 +02:00
Regis Houssin
56c73192f1 Merge pull request #308 from marcosgdf/fix-stats 
More fixes to graph stats
 2012-08-14 22:27:11 -07:00
Regis Houssin
a8c8ef456c Merge pull request #301 from marcosgdf/translations 
Improved some translations
 2012-08-14 22:26:50 -07:00
Marcos García
37332ee040 Forgot to rename the variable 2012-08-15 01:20:53 +02:00
Marcos García
9c179699fb Added missing fr_FR translations 2012-08-14 21:33:32 +02:00
Marcos García
c8851cfca6 Fixed a problem with supplier's orders stats 
They were showing orders even if they were not approved or ordered
 2012-08-14 21:23:50 +02:00
Marcos García
764c0a50cd Fixed more average amount graph stats. They include: 
* Customer's orders
* Supplier's orders
* Customer's invoices
* Trips and expense
 2012-08-14 21:23:14 +02:00
Regis Houssin
b77a2255a0 Fix: wrong user count 2012-08-14 19:54:08 +02:00
Stephen L
c0a314000c Add custom ODT substitution for lines of products (completesubstitutionarray_lines) 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2012-08-14 16:03:45 +02:00
Stephen L
c1d15a9572 Add: hooks and triggers for a lot of core modules (action/calendrier, deplacement, dons, tva, contact/tiers, contrat, product lines, expedition, fournisseur commandes et factures, fiche intervention, projet et taches) 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2012-08-14 15:50:45 +02:00
Marcos García
c49e458c6c Propal stats weren't showing average total for more than 1 year 2012-08-14 15:43:14 +02:00
Stephen L
adab15a30a Add conditional substitution IF/ELSEIF/ENDIF for ODT 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2012-08-14 11:38:27 +02:00
Marcos García
3e1e508bf3 Fixed bug #485 
Merged patch from J. Fernando Lagrange (lowmemory)
https://doliforge.org/tracker/?func=detail&aid=485&atid=246&group_id=144
 2012-08-14 09:57:03 +02:00
Marcos García
2f011638b1 Merge branch 'develop' into translations 2012-08-13 10:45:45 +02:00
Marcos García
770194aa91 Improved SPIP CMS translation 2012-08-13 06:28:34 +02:00
Marcos García
1b817e79b9 Improved some es_ES translations & fixed untranslated string 2012-08-13 06:26:56 +02:00
Marcos García
0b7cea6c73 Lowercased strings 2012-08-13 04:49:23 +02:00
Marcos García
2c007644ba Better es_ES translation 2012-08-13 03:11:40 +02:00
Marcos García
651d0e4eca Translated es_ES string 2012-08-11 19:14:25 +02:00
Laurent Destailleur
3b2ffb8cc0 Fix: Removed key of external modules 2012-08-11 02:06:34 +02:00
Laurent Destailleur
724ea40fa4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-11 02:00:02 +02:00
Laurent Destailleur
855bcf1b24 Fix: missing or duplicate key 2012-08-11 01:59:45 +02:00
Laurent Destailleur
0251385624 Fix: Broken feautres after migration from old versions 2012-08-10 19:13:54 +02:00
Laurent Destailleur
0176674c9f Add info for chinese 2012-08-10 04:16:31 +02:00
Laurent Destailleur
8627464596 Exclude file 2012-08-10 03:51:53 +02:00
Laurent Destailleur
4250dedf60 Better message if param not defined 2012-08-10 03:46:17 +02:00
Laurent Destailleur
8e16581e7f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-10 03:13:54 +02:00
Laurent Destailleur
628f1b17a6 Add missing key 2012-08-10 03:06:16 +02:00
Laurent Destailleur
d57a54fd04 Fix: Removed deprecated string key 2012-08-10 03:03:52 +02:00
Laurent Destailleur
84d5b75518 New: Add field tms into llx_bank 2012-08-09 19:04:39 +02:00
Laurent Destailleur
a7d9f13287 Qual: Removed deprecated columns 2012-08-09 18:45:56 +02:00
Laurent Destailleur
b3b598c068 New input reason into dictionnary. 2012-08-09 18:33:45 +02:00
Maxime Kohlhaas
d0fbca4c37 task # 326 : en_US translations :) 2012-08-09 01:51:45 +02:00
Maxime Kohlhaas
44b84b2177 task # 326 : Add a numbering module to suggest automatically a product ref 2012-08-09 01:41:55 +02:00
Laurent Destailleur
32a1301a92 Fix: Use correct object 2012-08-08 22:11:08 +02:00
Laurent Destailleur
2620abc6a0 Use different class for a and img 2012-08-08 20:46:50 +02:00
Laurent Destailleur
0d346ac1c1 New: A module can add several css and several js. 
New: Removed lightbox as it is not compatible with GPL.
 2012-08-08 20:43:23 +02:00
Laurent Destailleur
2220c6e964 Fix: Do not run request if param is empty 2012-08-08 14:07:04 +02:00
Laurent Destailleur
85f5033f47 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-08 04:12:48 +02:00
Laurent Destailleur
54c6db5b81 Qual: Uniformize code for pdf generation. 
Refactoring of pdf code to make code cleaner and fix a lot of bug into
page breaks.
 2012-08-08 04:12:20 +02:00
Laurent Destailleur
6231dd9a10 Fix: Translation 2012-08-08 00:46:08 +02:00
Marcos García
e191196156 Typo 2012-08-07 20:36:35 +02:00
Marcos García
9719c71643 Missing es_ES translation 2012-08-07 20:25:57 +02:00
Marcos García
fd65e73f7e Missing es_ES translation 2012-08-07 20:25:17 +02:00
Laurent Destailleur
2f0a88ce69 [ bug #480 ] Can't receive to stock with strict mode 2012-08-07 19:32:51 +02:00
Laurent Destailleur
da484bdaa5 Fix: Missing desc field 2012-08-07 19:09:41 +02:00
Laurent Destailleur
30444da6b9 Fix: autoselect when it should not 2012-08-07 18:55:55 +02:00
Laurent Destailleur
5ddd982f6e New: If field "signature" is filled into user table, text is added at 
end of predefined email texts. If option MAIL_DO_NOT_USE_SIGN is on,
this feautre is disabled.
 2012-08-07 16:55:14 +02:00
Laurent Destailleur
040c675de6 Fix: Do not overwrite global $user information 2012-08-07 14:54:56 +02:00
Laurent Destailleur
068c536741 Fix: Delete all files (PROV* when validating. 2012-08-07 14:24:54 +02:00
Laurent Destailleur
e47accd87b Qual: Removed deprecated code 2012-08-07 14:13:59 +02:00
Laurent Destailleur
fac878ca69 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-08-07 13:13:30 +02:00
Laurent Destailleur
803f840761 Qual: Rename label to avoid confusion. 
Qual: Fix code to reflect documentation.
 2012-08-07 13:12:20 +02:00
Regis Houssin
5564421e3f Fix: update method return $this->error not $this->errors 2012-08-07 12:00:22 +02:00
Regis Houssin
71a4a2b7f9 Fix: dol_htmloutput_events() already loaded in footer 2012-08-07 11:48:28 +02:00
Laurent Destailleur
edbfd7d4f8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-08-07 11:33:53 +02:00
Laurent Destailleur
5d9f16ca20 New: More surface control on stock correction page 2012-08-07 11:33:11 +02:00
Christophe Battarel
cbd54291b1 also take lines without buying_price in commissions 2012-08-07 09:46:26 +02:00
Marcos García
d5ce19840c Added missing translations 2012-08-06 21:22:45 +02:00
Regis Houssin
f814e4e25f Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-06 20:42:27 +02:00
Regis Houssin
f6a4277525 Fix: remove unused file and missing print 2012-08-06 20:38:03 +02:00
Laurent Destailleur
1e28904d56 New: task #185 : Can input amount when correcting stock to recalculate 
PMP.
 2012-08-06 19:41:03 +02:00
Laurent Destailleur
0ad8f31899 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-08-06 19:24:40 +02:00
Laurent Destailleur
49f8f07737 Start to work on bug [ bug #251 ] and [ bug #260 ]. 2012-08-06 19:22:14 +02:00
Regis Houssin
67d90d9de2 Merge pull request #292 from atm-maxime/mko185 
Mko185
 2012-08-06 10:03:59 -07:00
Regis Houssin
58878cdb6f Fix: update jquery fileupload 2012-08-06 18:43:34 +02:00
Maxime Kohlhaas
c2b38e8415 task #185 2012-08-06 18:11:00 +02:00
Regis Houssin
d830041441 Fix: missing object 2012-08-06 17:43:14 +02:00
Maxime Kohlhaas
e8a3af017e task #185 : Can input HT amount when correcting stock to recalculate PMP 2012-08-06 17:10:55 +02:00
Regis Houssin
1b2e6aa5e4 Fix: remove draft status if invoice is validated 2012-08-06 09:13:50 +02:00
Regis Houssin
a0ac6873ed Fix: use doliforge instead savannah 2012-08-06 08:17:36 +02:00
Regis Houssin
e140724738 Fix: avoid warning 2012-08-06 08:13:58 +02:00
Laurent Destailleur
816e317dd2 Fix into categorie functions 2012-08-05 23:58:42 +02:00
Laurent Destailleur
e53ae6eea2 Fix: W3C 2012-08-05 21:59:45 +02:00
Laurent Destailleur
76cdb809cc Fix: syntax error 2012-08-05 21:30:40 +02:00
Laurent Destailleur
cc76ea1f66 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-05 21:14:52 +02:00
Laurent Destailleur
3af27d17ab Add param to force to hide menu from login page 2012-08-05 21:14:17 +02:00
Laurent Destailleur
4d59ecb049 Fix: Missing condition 2012-08-05 21:06:48 +02:00
Regis Houssin
89cd23452f Fix: missing delete shipping and delivery files 
(minimum for possibility to merge with 3.2)
 2012-08-05 20:41:11 +02:00
Laurent Destailleur
9e6a9f1b12 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-05 19:08:49 +02:00
Regis Houssin
2884aac4bc Fix: delete pdf if supplier invoice is deleted 
Fix: compatibility with external modules

Conflicts:
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
 2012-08-05 18:36:20 +02:00
Regis Houssin
400621135b Fix: indentation 2012-08-05 18:33:11 +02:00
Regis Houssin
25662f9ecc Fix: compatibility with jquery fileupload 2012-08-05 18:32:59 +02:00
Laurent Destailleur
7764cfec83 Trans 2012-08-05 16:43:39 +02:00
Laurent Destailleur
591b029781 Doxygen 2012-08-05 15:15:58 +02:00
Laurent Destailleur
c247c710ec Qual: Uniformize code 2012-08-05 15:00:24 +02:00
Laurent Destailleur
990da41955 Qual: Removed bad herit 2012-08-05 14:56:20 +02:00
Laurent Destailleur
e53e847083 Qual: Uniformize code 2012-08-05 14:37:45 +02:00
Laurent Destailleur
14bda09369 Removed deprecated not used method 2012-08-05 14:11:28 +02:00
Laurent Destailleur
9fef649a7c Removed useless file 2012-08-05 14:06:21 +02:00
Regis Houssin
64e32258c2 Merge pull request #291 from marcosgdf/translations 
Translations
 2012-08-04 22:53:29 -07:00
Laurent Destailleur
b82fb7a7d9 Fix: exit code when upgrade is ran from command line 2012-08-05 00:49:28 +02:00
Marcos García
c76cdd74e7 es_ES typos and missing translation 2012-08-04 14:52:44 +02:00
Marcos García
2726283034 Missing BoxGlobalActivity translation and missing es_ES BoxLatestSupplierOrders translation 2012-08-04 14:45:23 +02:00
Regis Houssin
4d3e798f99 Fix: remove test in $pictoisfullpath and add test in $options 2012-08-04 14:18:02 +02:00
Regis Houssin
46511de913 Fix: remove unused code for avoid warning with IE9 2012-08-04 13:49:04 +02:00
Regis Houssin
e955b041ca Fix: just change $path value 2012-08-04 09:56:25 +02:00
Regis Houssin
320ce03e29 Fix: optimization 
see : http://mkaz.com/web-dev/php-benchmarking-isset-empty-or-var.html
 2012-08-04 08:45:38 +02:00
Regis Houssin
d883c135e0 Merge pull request #290 from marcosgdf/coding-style 
Removed duplicated code
 2012-08-03 23:16:07 -07:00
Laurent Destailleur
7f218bd6ba Better error management 2012-08-04 02:20:51 +02:00
Marcos García
189c3c94da Removed duplicated code 2012-08-04 02:15:39 +02:00
Laurent Destailleur
377b1716ef Fix: permission execute on perl script 
Fix: Checkstyle
 2012-08-04 00:17:34 +02:00
Marcos García
b8add21d93 Reversed lost changes with the previous commit 2012-08-03 23:29:08 +02:00
Regis Houssin
447fc1de1a Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-03 20:10:01 +02:00
Regis Houssin
0d96803937 Fix: strict mode tour 2012-08-03 20:09:37 +02:00
Laurent Destailleur
1307c77900 Fix: Project validation 2012-08-03 19:05:20 +02:00
Laurent Destailleur
9f5fbe78c9 Fix: Bad fix 2012-08-03 18:50:24 +02:00
Laurent Destailleur
5dc6f6aec8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-08-03 17:28:52 +02:00
Laurent Destailleur
a29205cea9 Fix: tr_TR 2012-08-03 17:09:07 +02:00
Regis Houssin
65bb19da02 Merge pull request #288 from marcosgdf/style 
Little refactor to img_phone function
 2012-08-03 05:48:25 -07:00
Marcos García
d30b2804bc Was using tabs instead of spaces 2012-08-03 14:31:10 +02:00
Marcos García
f700f63494 Little refactor + cpd 2012-08-03 14:30:11 +02:00
Laurent Destailleur
236dbb8598 Merge pull request #287 from marcosgdf/translations 
Little fixes to translations
 2012-08-03 05:28:41 -07:00
Marcos García
5b8e8ff11b ECM Area page title translation didn't exist 2012-08-03 14:24:02 +02:00
Laurent Destailleur
6cf97a7317 Clean dead code 2012-08-03 14:18:48 +02:00
Marcos García
0e108226da FeatureNotYetAvailable wasn't being translated 2012-08-03 14:05:28 +02:00
Laurent Destailleur
30d22378ac Restore img_phone as deprecated function after a patch push. 2012-08-03 13:10:15 +02:00
Laurent Destailleur
f1618bcaa7 Merge pull request #282 from marcosgdf/style 
Refactor
 2012-08-03 03:28:10 -07:00
Laurent Destailleur
fdd781f6fe Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-08-03 12:04:28 +02:00
Regis Houssin
286854bf2c Fix: [bug #478] Can access pages belonging to disabled modules 2012-08-03 11:56:42 +02:00
Laurent Destailleur
d4a19f0674 Fix: Removed warning 2012-08-03 10:56:50 +02:00
Laurent Destailleur
18944a3d9b Merge branch 'develop' of https://eldy:ld101010-gb@github.com/Dolibarr/dolibarr.git into develop 2012-08-03 10:29:00 +02:00
Laurent Destailleur
ff0d24a0dc Fix: Remove warning 2012-08-03 10:26:39 +02:00
Laurent Destailleur
1e13a7cf13 Merge pull request #285 from simnandez/develop 
Develop
 2012-08-02 07:46:58 -07:00
Laurent Destailleur
233c47ef08 Merge pull request #286 from FHenry/develop 
update select_contact method to add possibility to display contact
 2012-08-02 07:45:50 -07:00
FHenry
799b1727f8 update select_contact method to add possibility to display contact 
compagny also
 2012-08-02 10:12:32 +02:00
Regis Houssin
e0385cf06f Fix: strict mode palace 2012-08-02 10:07:55 +02:00
Regis Houssin
fe4fc7f8dc Fix: increase speed 2012-08-02 08:02:49 +02:00
Regis Houssin
e717f491c1 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-01 19:41:09 +02:00
Regis Houssin
5ad211a1ca Fix: bad document path with multicompany 2012-08-01 19:34:42 +02:00
Laurent Destailleur
07a09cad1d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-01 19:29:58 +02:00
Laurent Destailleur
b35240c899 Fix: Bad url 2012-08-01 19:29:36 +02:00
Regis Houssin
9451edafd8 Fix: bad link and uniformize code 2012-08-01 18:40:47 +02:00
Regis Houssin
2e73cd7ddf Fix: missing fields and compatibility with milestone 2012-08-01 17:38:10 +02:00
Regis Houssin
d6a4d5ef41 Fix: avoid errors if install directory is deleted before module 
activation
 2012-08-01 14:42:24 +02:00
Regis Houssin
2dcb158915 Fix: strict mode again 2012-08-01 13:32:50 +02:00
Regis Houssin
c558f2206c Fix: strict mode pleasure 2012-08-01 13:30:38 +02:00
Regis Houssin
29fea7bbf4 Fix: regression (multicompany) 2012-08-01 13:03:41 +02:00
Regis Houssin
da44fa7186 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-01 08:23:54 +02:00
Regis Houssin
902f1c7e71 Fix: typo 2012-08-01 08:23:37 +02:00
Laurent Destailleur
4b3aba919f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-31 23:06:12 +02:00
Marcos García
9d422350a5 Translated some comments 2012-07-31 14:41:15 +02:00
Laurent Destailleur
8d031900f9 [ bug #464 ] Payment form should allow to add transmitter for bank transfers 2012-07-31 13:40:38 +02:00
simnandez
47335f0613 Trad: Improve translations 2012-07-31 09:29:19 +02:00
simnandez
40a57f63cb Trad: Improve translations 2012-07-31 09:26:35 +02:00
Regis Houssin
fcae6f8811 Merge pull request #284 from marcosgdf/php-error 
Fixed an error that I introduced in a previous commit...
 2012-07-30 23:36:08 -07:00
Marcos García
dbe2fa55df es_ES translation typo 2012-07-31 01:18:32 +02:00
Marcos García
315896c702 Fixed img_up 2012-07-31 01:17:21 +02:00
Marcos García
c62ac71e03 Typo in es_ES translation 2012-07-31 01:05:03 +02:00
Marcos García
3520513c6b Fixed an error that I introduced in a previous commit... 2012-07-31 00:53:05 +02:00
Marcos García
fc012a394c Duplicated space 2012-07-31 00:44:55 +02:00
Marcos García
e0325f3df1 Missing es_ES translations 2012-07-31 00:36:42 +02:00
Laurent Destailleur
2f19fd9612 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-31 00:07:19 +02:00
Laurent Destailleur
acad2191d5 Fix: Style 2012-07-31 00:06:39 +02:00
Marcos García
571d20d583 Wrong behaviour 2012-07-30 23:27:12 +02:00
Marcos García
2c466159f9 Refactoring 2012-07-30 23:23:58 +02:00
Regis Houssin
97027c7d76 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-30 22:38:46 +02:00
Regis Houssin
66ba264ca3 Fix: strict mode and event message 2012-07-30 22:38:21 +02:00
Marcos García
0e0cf98c4f Code style improved, removed duplicated code, also removed img_phone function as it is no longer used in Dolibarr 2012-07-30 22:36:43 +02:00
Laurent Destailleur
5772e46c9a We start new modules with level "experimental". 2012-07-30 22:18:54 +02:00
Laurent Destailleur
a996e8f98a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-30 21:44:21 +02:00
Laurent Destailleur
190f005b68 New: ECM module is full Ajax 2012-07-30 21:44:00 +02:00
Laurent Destailleur
2191a4dc73 Fix: use ENGINE=innodb instead of type=innodb 2012-07-30 21:43:40 +02:00
Regis Houssin
4f1814d486 Merge pull request #280 from marcosgdf/translations 
Translations
 2012-07-30 11:47:10 -07:00
Marcos García
237d7b744c Including other.lang in files using FeaturesSupported string, also removed duplicated code 2012-07-30 20:39:47 +02:00
Marcos García
a71840bbd9 Revert "Moved FeaturesSupported string from other.lang to admin.lang as it is only used in admin pages" 
This reverts commit 0e952521e1.
 2012-07-30 20:29:54 +02:00
Marcos García
fb95a0ed16 Made corrections that @hregis told me 2012-07-30 20:29:39 +02:00
FHenry
bf2d0ea82a correct checkstyle 2012-07-30 20:15:18 +02:00
FHenry
af91a7185a Checkstyle (from hudson) 2012-07-30 20:11:55 +02:00
Marcos García
7bbfe9c29b Fixed es_ES typo 2012-07-30 20:09:35 +02:00
Marcos García
0e952521e1 Moved FeaturesSupported string from other.lang to admin.lang as it is only used in admin pages 2012-07-30 19:45:51 +02:00
Marcos García
e81a8b1d2c Merge branch 'develop' into translations 2012-07-30 19:04:53 +02:00
Regis Houssin
e44fd4885d Fix: change the last $DB to $db 2012-07-30 18:43:49 +02:00
Marcos García
8f678cebec Added missing translation 2012-07-30 17:33:32 +02:00
Marcos García
5a73c32f46 Migrated ClassName to __construct() function 
Changed $DB to $db
lower-cased "Class"
 2012-07-30 17:17:33 +02:00
Regis Houssin
914087b92e Merge pull request #275 from marcosgdf/translations 
Minor fixes
 2012-07-30 03:03:54 -07:00
Marcos García
7e0892783a Removed duplicated translation and modified a line of code as @hregis requested 2012-07-30 08:21:05 +02:00
Regis Houssin
4750406eba Merge pull request #277 from marcosgdf/phpinfo-improvement 
Phpinfo improvement
 2012-07-29 22:20:21 -07:00
Regis Houssin
a7b1b23461 Merge pull request #276 from marcosgdf/margin-typo 
Fixed untranslated string and broken image in Margins module
 2012-07-29 22:19:03 -07:00
Marcos García
20bf07a3e2 Typo 2012-07-30 03:52:48 +02:00
Marcos García
db2cab0e04 Better parsing, replacing preg_replace for str_replace for easy replacements 2012-07-30 03:51:40 +02:00
Marcos García
a0eb690d0f Fixed untranslated string and broken image 2012-07-30 03:28:16 +02:00
Marcos García
c627e73c9d Realized that es_ES looks better this way 2012-07-30 03:21:33 +02:00
Marcos García
d1cbf4f944 Fixed BIG es_ES translation problem with donations module 
Fixed some es_ES and en_US typos
There was a string that wasn't available for translation
 2012-07-30 03:18:17 +02:00
Marcos García
35f2e731e1 PHP upper-cased + checkstyle 2012-07-29 22:43:54 +02:00
Marcos García
8910fa46da Corrected English translation and added Spanish missing translation 2012-07-29 22:40:11 +02:00
Marcos García
be388b4418 Fixed some typos in es_ES and en_US translations 
Allowed MailmanSPIP module configuration to be translated into other languages
Moved MailmanSPIP-related strings to mailmanspip.lang file
 2012-07-29 22:23:51 +02:00
Marcos García
e26b53e8c5 Fixed a PHP fatal error warning in remisecheque.class.php 2012-07-29 21:43:19 +02:00
Laurent Destailleur
a429a930d0 Fix: Uniformize code and PHPUnit tests 2012-07-29 20:07:03 +02:00
Laurent Destailleur
d85bd3d41c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-29 18:47:03 +02:00
Laurent Destailleur
77e4b088ac Doc 2012-07-29 18:27:53 +02:00
Laurent Destailleur
6739d5fd8d Fix: Add missing error message 2012-07-29 16:51:16 +02:00
Regis Houssin
28851b46c4 Fix: remove duplicate code 2012-07-29 16:44:19 +02:00
Regis Houssin
30ca31de6c Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-29 16:12:05 +02:00
Regis Houssin
a64723ea74 Fix: replace with new event message system 2012-07-29 16:11:52 +02:00
Laurent Destailleur
56e9ffb685 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-29 15:55:59 +02:00
Laurent Destailleur
8c5e8e0690 Fix: [ bug #466 ] Module MailmanSpip 2012-07-29 15:55:19 +02:00
Regis Houssin
1591a5ac3b Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-29 15:47:40 +02:00
Regis Houssin
0aa6694c95 Fix: broken event message 2012-07-29 15:47:24 +02:00
Laurent Destailleur
e8b2489c1c Checkstyle 2012-07-29 15:28:39 +02:00
Laurent Destailleur
b43c7e1b35 Qual: Removed warning 2012-07-29 14:23:33 +02:00
Laurent Destailleur
d6a5b224fb Revert bad practice: setEvent use SESSION. Such usage is limited to HTML 
page context and can be used inside any pages.
However usage of _SESSION must never be used inside a library (except
for function dedicated to HTML page context), and never inside
object classes (we must use $this->errors, $this->mesgs or
$this->warnings instead).
 2012-07-29 14:15:29 +02:00
Laurent Destailleur
0ee08418cc New: Add test on mandatory field 2012-07-29 13:47:42 +02:00
Regis Houssin
eee5653c54 Fix: try to use the new message system 2012-07-29 12:54:19 +02:00
Regis Houssin
77a5ef0b22 Fix: move ajax response in ajax directory 2012-07-29 10:24:42 +02:00
Regis Houssin
beedf13324 Fix: restore broken feature, disable token renewal in ajax response 2012-07-29 09:54:58 +02:00
Regis Houssin
b37a1b3daa Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-29 08:27:02 +02:00
Regis Houssin
9cdba5bb61 Fix: try another method more clean and can be deployed on any type of 
message
 2012-07-29 08:26:33 +02:00
Regis Houssin
f2239c897e Merge pull request #273 from marcosgdf/translations 
Fixed some minor es_ES translation typos
 2012-07-28 13:29:48 -07:00
Regis Houssin
cdc9dda11e Fix: best practice 2012-07-28 22:28:33 +02:00
Regis Houssin
a27e347ee0 Fix: for backward compatibility 2012-07-28 22:20:58 +02:00
Marcos García
535e6f1756 es_ES typos 2012-07-28 22:16:39 +02:00
Regis Houssin
75588c2eb3 Merge pull request #272 from marcosgdf/backtolist-links 
Created BackToList links
 2012-07-28 13:15:42 -07:00
Marcos García
ec36ffd73c Missing expeditions and stocks BackToList links 2012-07-28 22:14:53 +02:00
Regis Houssin
61fc592434 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-28 22:08:05 +02:00
Regis Houssin
c7bacecf10 Fix: try to use another method for messages 2012-07-28 22:07:27 +02:00
Marcos García
04c34b0042 BackToList links in Contacts section 2012-07-28 21:54:36 +02:00
Marcos García
9dc38f4382 Created rest of BackToList links 2012-07-28 21:49:47 +02:00
Marcos García
2eeaad1352 BackToList links in Financial section 2012-07-28 21:22:59 +02:00
Marcos García
32a3477ccb BackToList links in Interventions section 2012-07-28 21:05:00 +02:00
Marcos García
b3b33b7aca BackToList links in Contracts section 2012-07-28 20:59:57 +02:00
Marcos García
90963ca84a BackToList links in Client orders section 2012-07-28 20:54:07 +02:00
Marcos García
472397d5c2 BackToList links in Supplier order section 2012-07-28 20:47:12 +02:00
Regis Houssin
1816886135 Merge pull request #271 from marcosgdf/translations 
Removed space before colon
 2012-07-28 11:30:25 -07:00
simnandez
8a19946e4a Trad: Commissions and margins 
Conflicts:
	htdocs/langs/fr_FR/margins.lang
 2012-07-28 20:22:38 +02:00
Marcos García
16df86003d Removed space before : 2012-07-28 20:20:56 +02:00
Marcos García
8c68b096fd Removed space before : 2012-07-28 20:16:54 +02:00
Regis Houssin
af0b36c1d1 Merge pull request #269 from marcosgdf/translations 
Fixed some typos in es_ES and allowed some strings to be translated
 2012-07-28 11:16:20 -07:00
Marcos García
de7595922e Fixed some typos in es_ES and allowed some strings to be translated 2012-07-28 19:53:13 +02:00
Regis Houssin
9a80f0351d New: add phpmailer class 2012-07-28 19:11:05 +02:00
Regis Houssin
bdc9dbfb01 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-28 19:05:28 +02:00
Raphaël Doursenaud
d34c4518d2 Removed BOM from UTF-8 files 
Fix: convert line delimiters (regis)

Conflicts:
	htdocs/core/filemanagerdol/browser/default/js/common.js
	htdocs/core/filemanagerdol/browser/default/js/fckxml.js
 2012-07-28 19:04:50 +02:00
simnandez
b03fd00c3a Trad: Export de données dangereux 2012-07-28 18:53:05 +02:00
Regis Houssin
49bacc6fda Merge pull request #267 from marcosgdf/trans-and-link-fixes 
Fixed es_ES translations and some BackToList links
 2012-07-28 09:36:28 -07:00
Regis Houssin
e7a994360e Merge pull request #266 from marcosgdf/typo-spanish-translation 
Typo in es_ES translation
 2012-07-28 09:35:28 -07:00
Regis Houssin
1dd14d35f7 Fix: add null value in class method 2012-07-28 18:32:54 +02:00
Marcos García
241241bf0a Fixed some problems with translations 2012-07-28 17:34:21 +02:00
Marcos García
706b637389 Removed unused BackToList link params 2012-07-28 17:20:17 +02:00
Marcos García
f9dbc6d9be Merge branch 'develop' into typo-spanish-translation 
Conflicts:
	htdocs/langs/es_ES/products.lang
 2012-07-28 16:31:34 +02:00
Marcos García
bb8dd6ded6 Fixed 2 fatal errors in commande/fiche.php and a SQL problem too 2012-07-28 16:22:01 +02:00
Regis Houssin
2a3a8f5aa5 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-28 12:35:47 +02:00
Regis Houssin
251640561f Fix: strict mode happy hour 2012-07-28 12:35:11 +02:00
Laurent Destailleur
859c6cee97 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-28 12:32:06 +02:00
Laurent Destailleur
160997cbbe Fix: Bad test 2012-07-28 12:31:37 +02:00
Regis Houssin
a157327859 Fix: strict mode paradise 2012-07-28 11:28:37 +02:00
Regis Houssin
3390a514e1 Fix: include wrong class 2012-07-28 09:57:04 +02:00
Regis Houssin
1e07ed6af6 Fix: broken link 2012-07-28 09:54:47 +02:00
Regis Houssin
a3080acab4 Merge pull request #262 from marcosgdf/minor-fixes-develop 
Pull request #254 into develop
 2012-07-28 00:31:51 -07:00
Regis Houssin
5fb22d689b Fix: best practice 2012-07-28 09:10:09 +02:00
Laurent Destailleur
bf94d05293 New: Add great britain provinces 2012-07-28 03:12:34 +02:00
Laurent Destailleur
7883124958 New: [ task #454 ] Add "No category" into filters on category 2012-07-28 00:53:51 +02:00
Marcos García
c14d9ce13b Typo in es_ES translation 2012-07-28 00:00:46 +02:00
Laurent Destailleur
eb79646315 Fix: restore correct test (empty instead of ! isset) 2012-07-27 23:30:23 +02:00
Laurent Destailleur
a2e745fab6 Fix: Function return was missing in some case. Save bug of empty 
category.
 2012-07-27 23:21:22 +02:00
Marcos García
2204c09e5a Applied commits 16-22 2012-07-27 23:04:05 +02:00
Marcos García
a6c8838b8f Applied patches 9-15 2012-07-27 21:27:03 +02:00
Laurent Destailleur
bd20ab3500 New: Auto check box on page to edit interface options of user. 2012-07-27 20:47:17 +02:00
Laurent Destailleur
1c557a96bd Prepare task 473 2012-07-27 19:26:54 +02:00
Laurent Destailleur
86ac10995f Fix perm 2012-07-27 19:26:38 +02:00
Laurent Destailleur
42d6ed91f7 Fix: Closing tab 2012-07-27 18:41:52 +02:00
Marcos García
5fd7fcb6c4 Applied commits 1-8 2012-07-27 18:40:06 +02:00
Laurent Destailleur
56ced6e5f0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-07-27 16:04:28 +02:00
Laurent Destailleur
0b048ebb94 [ bug #40 ] Export de donnes dangereux 2012-07-27 16:03:20 +02:00
Regis Houssin
6a69b55e5e Fix: tabulation 2012-07-27 14:10:56 +02:00
Raphaël Doursenaud
9ffb6317cf Fix: Allows to use a comma decimal separator in supplier invoices 
payments
 2012-07-27 13:54:16 +02:00
Regis Houssin
20ed6bd5c5 Fix: Bug #460 - Wrong entity assignment when creating a warehouse 2012-07-26 20:52:05 +02:00
Regis Houssin
79181f9183 Fix: add external user filter 2012-07-26 18:24:54 +02:00
Regis Houssin
b2317fd3ee Fix: external user confidentiality 2012-07-26 18:11:06 +02:00
Regis Houssin
5318fb54d5 Fix: bad path 2012-07-26 17:07:10 +02:00
Regis Houssin
b83fbf981d Fix: problem with double quote 2012-07-26 14:33:25 +02:00
Regis Houssin
a6758c2557 Fix: use span instead div for align image warning 2012-07-26 11:34:43 +02:00
Regis Houssin
28a98f6bd9 Fix: wrong action 2012-07-26 10:45:19 +02:00
Regis Houssin
68196e638a Fix: compatibility with edit in place 2012-07-26 09:32:54 +02:00
Laurent Destailleur
ac81e1732e Fix: bad field name 2012-07-26 03:01:15 +02:00
Laurent Destailleur
97906568e3 Typo fix 2012-07-26 02:57:35 +02:00
Laurent Destailleur
ef86d8e2dc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-25 17:39:44 +02:00
Laurent Destailleur
9392cf2832 Update translation for tr_TR 2012-07-25 17:39:17 +02:00
Laurent Destailleur
105e91dfea Fix: Redirect after delete to correct page 2012-07-25 15:03:06 +02:00
Regis Houssin
e3a3dd0454 Fix: it's for margin module 2012-07-25 12:53:02 +02:00
Laurent Destailleur
126979efe1 Fix: All "isset" must not be replaced by "GETPOST". If isset is used to 
know if value is defined (and not to know if value is null), we must
keep the isset.
 2012-07-25 12:25:45 +02:00
Laurent Destailleur
75e9d93e69 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-25 12:21:04 +02:00
Laurent Destailleur
dce9b96260 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/lib/repair.lib.php
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-07-25 12:20:45 +02:00
Regis Houssin
7d2f7e9800 Fix: strict mode crazy 2012-07-25 11:46:33 +02:00
Laurent Destailleur
ea54523181 Checkstyle 2012-07-25 11:40:23 +02:00
Laurent Destailleur
b63820c013 Checkstyle 2012-07-25 11:37:43 +02:00
Laurent Destailleur
7d08bd45d6 Checkstyle 2012-07-25 11:35:34 +02:00
Laurent Destailleur
de621f0567 Fix: Restore compatibility. Try to isolate "charges" feature with 
a condition (i did not understand what it means and goal, i'm afraid
other users should not understand too).
 2012-07-25 11:32:48 +02:00
Laurent Destailleur
758d613908 Fix: Checkstyle 2012-07-25 11:29:45 +02:00
Laurent Destailleur
276e32dc22 Fix: Products with no prices not visible 2012-07-25 11:27:25 +02:00
Laurent Destailleur
b47ced7507 Fix: syntax error 2012-07-25 10:56:30 +02:00
Regis Houssin
e12604cb71 Fix: avoid warning and strict mode story 2012-07-25 09:09:56 +02:00
Regis Houssin
8e953a6858 Fix: external modules workflow compatibility 2012-07-24 20:18:37 +02:00
Regis Houssin
f8f50a722d Fix: patch of Terry (language) 2012-07-24 18:38:35 +02:00
Regis Houssin
65e183c8c9 Merge pull request #258 from FHenry/develop 
Develop
 2012-07-24 09:15:36 -07:00
Regis Houssin
8219ab9ec0 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-24 17:53:43 +02:00
Regis Houssin
c6cd17cf3f Fix: strict mode... far away 2012-07-24 17:52:46 +02:00
FHenry
b3ca737662 remove useless parameters 2012-07-24 17:33:26 +02:00
Laurent Destailleur
24c54ccaf1 Start to work on bug export 2012-07-24 16:19:46 +02:00
FHenry
a2b6abcb85 Fix nb mailling message receive according toher status than error or not 
send
 2012-07-24 14:33:27 +02:00
FHenry
8f2efa4879 Add syslog for debug 2012-07-24 14:25:21 +02:00
FHenry
3892c2ceca Usubscribe mailling module 
- Correct indentation
 2012-07-24 13:24:22 +02:00
FHenry
6fc9bf5143 Correct mail tag __UNSUSCRIBE__ to __UNSUBSCRIBE__ 2012-07-24 10:18:17 +02:00
Regis Houssin
812d02ebe0 Fix: strict mode and $mesgs 2012-07-23 22:04:06 +02:00
Regis Houssin
a4f35bbfd5 Fix: uniformize $mesgs 2012-07-23 21:45:22 +02:00
Regis Houssin
2035eb0b14 Fix: strict mode mini 2012-07-23 21:40:34 +02:00
Regis Houssin
eba0db736e Fix: try to use $mesgs (array) for stock all messages and 
$_SESSION['dol_message'] for specific message when a page is reloading
 2012-07-23 21:31:10 +02:00
Regis Houssin
d5ff308992 Fix: declare $mesg and $mesgs in main.inc.php 
Fix: strict mode be back
 2012-07-23 20:52:55 +02:00
Regis Houssin
9cf088560f Fix: syntax error 2012-07-23 16:47:16 +02:00
Regis Houssin
fb23364511 Fix: uniformize code 2012-07-23 16:10:54 +02:00
Laurent Destailleur
b63505ff15 Better fix 2012-07-23 11:10:18 +02:00
Regis Houssin
01ab1aa66f Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/core/modules/modCommissions.class.php
 2012-07-23 11:07:53 +02:00
Regis Houssin
3fe8b5bc58 Change-Id: Ia9f609c8a1264d245ff5074b981305f7d1792aef 2012-07-23 11:01:52 +02:00
Regis Houssin
bf807c27e5 Fix: uniformize code 2012-07-23 11:01:36 +02:00
Laurent Destailleur
7a8224c4d5 Normalize code 2012-07-23 10:55:29 +02:00
Laurent Destailleur
ea93e62e91 Fix: Checkstyle 2012-07-23 10:46:09 +02:00
Laurent Destailleur
f07c416f76 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-23 10:38:02 +02:00
Regis Houssin
0301e35a44 Merge pull request #256 from marcosgdf/task-195 
Completed Task #195
 2012-07-23 01:37:37 -07:00
Regis Houssin
6e41d645f0 Merge pull request #251 from cbattarel/commissions 
basic commissions management module
 2012-07-23 01:37:09 -07:00
Laurent Destailleur
087cf87722 New: Add state into substitution vars 2012-07-23 10:29:58 +02:00
Regis Houssin
a109d5f32b Fix: bug #467 2012-07-23 10:29:26 +02:00
Laurent Destailleur
1c17767dda Fix: Send instructions must be into core page. 2012-07-22 23:22:40 +02:00
Laurent Destailleur
0eb9b105c9 Fix: Translation missing 2012-07-22 23:07:25 +02:00
Laurent Destailleur
68e619fb00 Fix: escape for create command 2012-07-22 21:50:08 +02:00
Marcos García
568db22649 Renamed fk_methode_commande to fk_input_method 2012-07-22 16:58:37 +02:00
Laurent Destailleur
8080ee4565 Fix: dol_syslog at wrong place. 2012-07-22 16:57:15 +02:00
Laurent Destailleur
970d946e5b Fix: sql injection for create database 2012-07-22 16:53:32 +02:00
Marcos García
e6a192ba87 Renamed fk_demand_reason to fk_input_reason 2012-07-22 16:53:02 +02:00
Marcos García
9eb9fe6d2c Moved bookmark translations from other.lang to bookmarks.lang, also 
removed unused translations

Conflicts:
	htdocs/langs/tr_TR/bookmarks.lang
 2012-07-22 16:44:16 +02:00
Laurent Destailleur
474a67a4a4 Fix: picto 2012-07-22 16:11:23 +02:00
Laurent Destailleur
0d6baa4288 Qual: Enhance codesniffer setup 2012-07-22 14:08:05 +02:00
Laurent Destailleur
c41c5bf797 New: Add help on feature to use it with caution 2012-07-22 13:36:28 +02:00
Laurent Destailleur
72d9f7348c Fix: Missing lang loading 2012-07-22 12:13:53 +02:00
Laurent Destailleur
66ea44886b Fix: Permissions when using web services. 2012-07-22 02:33:21 +02:00
Laurent Destailleur
db4c6bd289 New: After first install, warning are visible onto mandatory setup 
not configured. Show also total number of activated modules.
 2012-07-22 01:03:19 +02:00
Christophe Battarel
b8fa4468ce add commissions module 2012-07-20 16:21:35 +02:00
Regis Houssin
fafd79a0f8 Fix: uniformize code (in progress) 2012-07-20 09:57:50 +02:00
Marcos García
9f3f3703e3 Fixed Catalan typos too 2012-07-19 23:44:36 +02:00
Marcos García
7b478dbb35 Contracts box name wasn't being translated 2012-07-19 23:44:28 +02:00
Marcos García
6039c6f420 Added missing translation and fixed some typos 2012-07-19 23:44:02 +02:00
Marcos García
8233a26422 Fixed some spanish & catalan translations 2012-07-19 23:43:41 +02:00
Regis Houssin
b121a01ef8 Merge pull request #247 from cbattarel/marges 
Margin module
 2012-07-19 10:46:24 -07:00
Marcos García
44a6236b7d Replaced "Seconds" for "seconds" 
Conflicts:
	htdocs/admin/proxy.php
 2012-07-19 19:43:15 +02:00
Raphaël Doursenaud
4f0d43bbc8 French wording 
Réception -> Traitement en cours
 2012-07-19 19:33:05 +02:00
Raphaël Doursenaud
bba9aa4bb4 French spelling 
Chiffre d'affaire -> Chiffre d'affaires
 2012-07-19 19:32:57 +02:00
Raphaël Doursenaud
04a975fbad Text: Chiffrer 2012-07-19 19:32:43 +02:00
Marcos García
319cf18b3b The tab Documents of the Contracts module wasn't being translated 2012-07-19 19:29:43 +02:00
simnandez
7f33e41113 Trad: Better translation 2012-07-19 19:29:30 +02:00
Laurent Destailleur
fb9bf3ddac Fix: Restore menu entry [ bug #455 ] Impossible de crer une facture fournisseur 2012-07-19 18:23:10 +02:00
Laurent Destailleur
69ca9cf7d4 [ bug #445 ] Hex escaping in descriptions 2012-07-19 18:03:25 +02:00
Christophe Battarel
98a2cf547e correct module description and image 2012-07-19 16:27:08 +02:00
Christophe Battarel
8e8fd72459 correct margin infos display on order 2012-07-19 16:25:40 +02:00
Christophe Battarel
34132de71d add charges to supplier prices 2012-07-19 15:36:25 +02:00
Laurent Destailleur
f5b58b6f12 Fix: Missing fields into insert from webservice 2012-07-19 14:26:02 +02:00
Christophe Battarel
55d547348a margin management for invoices 2012-07-19 11:07:50 +02:00
Christophe Battarel
c8e211c864 add missing include 2012-07-19 10:48:01 +02:00
Christophe Battarel
d32091120b margin management for orders 2012-07-19 10:26:26 +02:00
Christophe Battarel
b5c92c7b46 correction in getlinesarray 2012-07-19 10:15:59 +02:00
Christophe Battarel
019b857784 correct display of margin resume table 2012-07-19 09:55:43 +02:00
simnandez
5b3c50dad2 Trad: Add missing translation 2012-07-19 09:13:39 +02:00
Marcos García
98dfa8cd2e Fixed bug https://doliforge.org/tracker/?func=detail&aid=456&atid=246&group_id=144 2012-07-19 09:12:41 +02:00
Laurent Destailleur
1d89c172d0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-07-18 22:41:06 +02:00
Christophe Battarel
9a7935075c correct margin informations when buy_price at zero 2012-07-18 17:29:32 +02:00
Christophe Battarel
8e2fee02df correct default definition for buy_price_ht in migration script 2012-07-18 17:17:00 +02:00
Christophe Battarel
f0f52270a5 adapt to new structure 2012-07-18 17:13:29 +02:00
Christophe Battarel
efba33eb13 adapt to new module structure 2012-07-18 17:00:56 +02:00
Christophe Battarel
411bb993b5 correct path to price.lib.php 2012-07-18 16:49:45 +02:00
Christophe Battarel
bd05495375 correct syntax error 2012-07-18 16:45:34 +02:00
Christophe Battarel
34022de1de correction of syntax error in tpl 2012-07-18 16:43:02 +02:00
Christophe Battarel
c5fe895dce adaptation to new module structure 2012-07-18 16:17:33 +02:00
Christophe Battarel
c12c8bd0bb update margin modules to core module 2012-07-18 16:13:29 +02:00
Christophe Battarel
3844a77395 correct typing bugs 2012-07-18 16:06:36 +02:00
Christophe Battarel
50c2a65b6a add margin infos to templates 2012-07-18 16:01:54 +02:00
Christophe Battarel
1de9dc15bf add margin module 2012-07-18 15:52:15 +02:00
Christophe Battarel
c0ac8c9ae1 fetch margin infos on line object 2012-07-18 15:50:37 +02:00
Christophe Battarel
316f6ce09c add margin infos to commonobject.class.php 2012-07-18 15:26:33 +02:00
Christophe Battarel
58262034cf add extra parameters to control combo in form_thirdparty like in select_company 2012-07-18 15:22:45 +02:00
Christophe Battarel
0cdf208f3d trigger change event when updating item value 2012-07-18 15:17:04 +02:00
Christophe Battarel
122fc5eaa7 update propales for margins 2012-07-18 15:15:54 +02:00
Christophe Battarel
a37707f96f updata database for margin module 2012-07-18 11:39:41 +02:00
Laurent Destailleur
ba25905926 New: [ task #454 ] Add "No category" into filters on category 
combo for product list
 2012-07-18 00:20:33 +02:00
Laurent Destailleur
9116db986f Fix: Restore button to edit products. Fix: the template to use for notes is dolibarr_notes. 2012-07-17 19:45:22 +02:00
Laurent Destailleur
7d9a4f2441 Make code simpler 2012-07-17 19:24:50 +02:00
Laurent Destailleur
73b17dc4c5 New: Make things more clear. 2012-07-17 15:28:34 +02:00
Laurent Destailleur
0021f7d98e New: Use a better format for workflow array: 
- allow more complex permissions/conditions
- allow to define order of options
- can define workflow option not using two modules (can use only one, of
threee or more...)
 2012-07-17 15:27:36 +02:00
Laurent Destailleur
86c59a2460 Better translation 2012-07-17 15:03:04 +02:00
Laurent Destailleur
1831b46bae Fix: Do not show if module disabled 2012-07-17 14:30:10 +02:00
Laurent Destailleur
393f407341 Update turkish language files 2012-07-17 02:33:14 +02:00
Laurent Destailleur
d07e68e12f Fix: Combo list of warehouse not saved. 
Fix: Validate of shipment in error
when using not predefined products.
 2012-07-17 01:22:19 +02:00
Laurent Destailleur
06926e626a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-07-13 17:19:11 +02:00
Regis Houssin
7122b91203 Merge pull request #242 from simnandez/develop 
Fix: Bad local taxes if price base type is TTC
 2012-07-13 07:29:12 -07:00
Regis Houssin
4f458c01f4 Fix: missing entity filter 2012-07-13 16:23:47 +02:00
Laurent Destailleur
035b2d201b Fix: Translation 2012-07-13 16:17:30 +02:00
Laurent Destailleur
a953dbd01c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-07-13 16:13:24 +02:00
simnandez
b8338425f4 Trad: Add missing translations 2012-07-13 15:46:42 +02:00
Laurent Destailleur
ae08c49d13 Fix: due date and unit price into web service 2012-07-13 15:32:38 +02:00
simnandez
606674d8c8 Fix: Bad local taxes if price base type is TTC 
Conflicts:
	htdocs/core/lib/price.lib.php
 2012-07-13 15:28:25 +02:00
Regis Houssin
f16d204ca2 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-13 14:45:12 +02:00
Regis Houssin
221ecafe07 Fix: use click2dial only for phone tel 2012-07-13 14:45:00 +02:00
Laurent Destailleur
3fafecffbc Fix: field not saved into invoice creation 2012-07-13 14:06:51 +02:00
Regis Houssin
a1c86f52d7 Fix: strict mode holidays 2012-07-13 11:40:06 +02:00
Regis Houssin
77b9718473 Fix: strict mode street 2012-07-13 10:15:47 +02:00
Regis Houssin
94b7aed116 Fix: strict mode avenue 2012-07-12 19:14:13 +02:00
Laurent Destailleur
5a57070f6f Fix: Works whatever is number of lines into invoice 2012-07-12 18:12:02 +02:00
Laurent Destailleur
ee8b80813a Fix: Date not converted correctly when using web service 2012-07-12 17:07:56 +02:00
Laurent Destailleur
bea1a50e2c Fix: Phone not saved when using web service 2012-07-12 14:36:08 +02:00
Laurent Destailleur
f7eebc0502 Fix: Phone not saved when using web service 2012-07-12 11:58:44 +02:00
Regis Houssin
e1b0d183e4 Fix: add commonorder and commoninvoice classes 2012-07-11 18:13:41 +02:00
Regis Houssin
e18d3c6e18 Fix: strict mode again 2012-07-11 15:55:56 +02:00
Regis Houssin
6935598ced Fix: optimization 2012-07-11 12:05:43 +02:00
Regis Houssin
5e020cd178 Fix: use array for external module 2012-07-11 11:23:32 +02:00
Regis Houssin
b53d108c50 Fix: uniformize code 2012-07-11 10:14:56 +02:00
Regis Houssin
ff0668e908 Fix: strict mode way 2012-07-10 22:10:12 +02:00
Regis Houssin
28ccc43125 Fix: avoid another warning 2012-07-10 20:45:07 +02:00
Regis Houssin
71ad968c03 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-10 18:57:38 +02:00
Regis Houssin
4291db4a93 Fix: strict mode 2012-07-10 18:57:27 +02:00
Regis Houssin
b4617ee6cb Fix: bad test 2012-07-10 18:57:09 +02:00
Laurent Destailleur
73c331a8e1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-07-10 17:52:09 +02:00
Laurent Destailleur
df31ae2b0e New: Add canadian provinces 2012-07-10 17:51:29 +02:00
Laurent Destailleur
d5e8c2bfbb Merge pull request #238 from simnandez/develop 
Trad: Add missing translations
 2012-07-10 07:29:33 -07:00
Regis Houssin
60dc11872e Fix: for multicompany transverse mode 2012-07-10 13:35:22 +02:00
Regis Houssin
226caf0152 Fix: and again, and again, and again... (strict mode) 2012-07-10 13:20:53 +02:00
Regis Houssin
6da69208d4 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-10 11:46:18 +02:00
Regis Houssin
41144643eb Fix: avoid warning php strict mode 2012-07-10 11:45:38 +02:00
Laurent Destailleur
20c1e29d72 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-07-10 11:09:49 +02:00
Laurent Destailleur
6f02fc841d Renamed type 2012-07-10 11:07:40 +02:00
Regis Houssin
41789458c5 Fix: warning again and again... 2012-07-09 18:09:44 +02:00
Regis Houssin
7fac86a5af Fix: avoid warnings 2012-07-09 12:54:27 +02:00
Regis Houssin
66b2f630ac Fix: big avoid strict mode errors 2012-07-09 12:31:21 +02:00
Regis Houssin
1f98c2cfc4 Fix: add possibility to use strict mode for debugging 2012-07-09 10:24:33 +02:00
Regis Houssin
1842fd3058 Fix: restore parameters 2012-07-09 10:10:21 +02:00
Regis Houssin
cd7bf41ae0 Fix: php 5.4 strict mode warning 2012-07-09 10:08:56 +02:00
Regis Houssin
7fe53c4dcf Fix: object already defined in constructor 2012-07-08 23:26:28 +02:00
Regis Houssin
07ddd75b99 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-08 23:22:36 +02:00
Regis Houssin
887f210618 Fix: avoid warning with php 5.4 and strict mode 2012-07-08 23:22:22 +02:00
Regis Houssin
320fe741cb Fix: avoid warning with php 5.4 and strict mode 2012-07-08 22:43:06 +02:00
Laurent Destailleur
be04878d4d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-07-08 16:54:27 +02:00
Laurent Destailleur
f09dfe8864 Fix: removed warning 2012-07-08 16:54:08 +02:00
Regis Houssin
10160d99a7 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-08 15:51:02 +02:00
Regis Houssin
65e0f18449 Fix: view image object 2012-07-08 15:50:27 +02:00
Laurent Destailleur
d0943be80d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-07-08 14:30:27 +02:00
Laurent Destailleur
fb1034c8a7 Fix: sort in ecm module 2012-07-08 14:30:05 +02:00
Regis Houssin
c25254e7d1 Fix: doc 2012-07-08 14:22:11 +02:00
Regis Houssin
2804ef2252 New: classify billed order if invoice billed (workflow 
manager)
 2012-07-08 14:18:40 +02:00
Laurent Destailleur
c9a2c70110 Fix: must use utf8 2012-07-08 13:57:51 +02:00
Laurent Destailleur
9c5e98aad7 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-07-08 13:30:39 +02:00
Laurent Destailleur
616f8ddaa8 New: Add a repair function to restore data into ecm_directories table 
that was not sanitized.
 2012-07-08 13:30:21 +02:00
Regis Houssin
b56d1ac735 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-08 13:19:56 +02:00
Regis Houssin
d1e80afe62 Fix: move "classify billed propal with order" in workflow manager 2012-07-08 13:19:13 +02:00
Laurent Destailleur
fad501d777 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-07-08 12:43:11 +02:00
Laurent Destailleur
0d12536b56 Fix: ecm 2012-07-08 12:42:33 +02:00
Regis Houssin
680fd32d23 Fix: missing parameters 2012-07-08 12:24:13 +02:00
Regis Houssin
3ca844b3df Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-08 12:19:12 +02:00
Regis Houssin
69ebda8ddb Fix: regression corrected 2012-07-08 12:18:29 +02:00
Laurent Destailleur
d0f7acb4e1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-07-07 20:12:23 +02:00
Laurent Destailleur
1e25ccac3e Update translation 2012-07-07 19:47:27 +02:00
Regis Houssin
05b7dfd97b Fix: compatibility with multicompany and transverse mode 2012-07-07 15:21:52 +02:00
Regis Houssin
714fe81abf Fix: getpost error 2012-07-07 12:50:56 +02:00
Regis Houssin
fa8841c53f Fix: missing object 2012-07-07 12:26:46 +02:00
Regis Houssin
7e2469618e Change-Id: I5f8bcf59cf2fc0d902edb4d61f8c20a2880765a2 2012-07-07 12:21:09 +02:00
Regis Houssin
ba45953223 Fix: more bugs with multicompany 2012-07-07 11:01:05 +02:00
Regis Houssin
1c545c4161 Fix: problem with template 2012-07-07 11:00:53 +02:00
Regis Houssin
5ad84406a2 Fix: security 2012-07-07 07:58:59 +02:00
Regis Houssin
ca62c3dba8 Fix: compatibility with multicompany 2012-07-06 20:50:24 +02:00
Regis Houssin
3bfd9182e0 Fix: uniformize code 2012-07-06 13:43:59 +02:00
Laurent Destailleur
d5060adf9d Fix: Error if curl not available 2012-07-06 11:35:03 +02:00
Laurent Destailleur
2500faa65d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-07-06 11:17:01 +02:00
Laurent Destailleur
6c433db348 New: Update turkish translation 2012-07-06 11:14:45 +02:00
Regis Houssin
9fa6f43643 Fix: bad link and uniformize code 2012-07-06 10:22:37 +02:00
Regis Houssin
dfe7b9ecbb Fix: price field is obsolete 2012-07-06 09:52:20 +02:00
Regis Houssin
46d2c1f730 Fix: wrong links 2012-07-05 16:04:03 +02:00
Laurent Destailleur
f9cef80942 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-07-05 15:48:02 +02:00
Laurent Destailleur
059c5bf632 New: Add ext ref 2012-07-05 15:44:01 +02:00
Regis Houssin
1968a8079a Fix: wrong link 2012-07-05 15:39:32 +02:00
Regis Houssin
83a228265c New: add possibility to use hooks for view linked objects block 2012-07-05 15:02:11 +02:00
Regis Houssin
ed3439d8ee Fix: add test if curl is installed 2012-07-04 17:00:29 +02:00
Regis Houssin
30989fc6c3 Fix: lines delimiter 2012-07-04 16:55:14 +02:00
Regis Houssin
293eab7676 New: add possibility to hide vat only if null 2012-07-04 16:52:08 +02:00
Laurent Destailleur
59bd8ada73 New: Show root install param only if required. 2012-07-04 10:23:59 +02:00
Laurent Destailleur
571041e5d5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-07-04 10:22:51 +02:00
Laurent Destailleur
957270783e Comments 2012-07-04 10:21:39 +02:00
Regis Houssin
cc4b2bf69c New: add box activity 2012-07-04 09:07:15 +02:00
Regis Houssin
454aa69697 Fix: missing images files filter 2012-07-03 21:13:09 +02:00
Regis Houssin
1c97934f6d Fix: test if ckeditor is enable 2012-07-03 16:42:04 +02:00
simnandez
a305b7d555 Trad: Add missing translations 2012-07-03 15:43:08 +02:00
Regis Houssin
4a0dad9524 Fix: missing shipping linked object box 2012-07-02 22:41:45 +02:00
Regis Houssin
0bb3aced2f Fix: access problem if thirdparty module is disable 2012-07-02 20:04:28 +02:00
Regis Houssin
9c2f1a7544 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-02 19:31:00 +02:00
Regis Houssin
6f1651309e Fix: global converting lines delimiter 2012-07-02 19:30:37 +02:00
Laurent Destailleur
24ede26dd7 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-07-02 18:37:53 +02:00
Laurent Destailleur
6769cbbd2c Increase size of ref for products 2012-07-02 17:47:16 +02:00
Regis Houssin
897d59d8fa Fix: converting lines delimiter 2012-07-02 17:20:20 +02:00
Regis Houssin
d593878c78 Fix: big problem with linked elements 2012-07-02 17:07:37 +02:00
Regis Houssin
95c30de0b9 Fix: wrong sql request 2012-07-02 16:12:55 +02:00
Regis Houssin
c69fa495fa Fix: compatibility with multicompany 2012-07-02 15:42:35 +02:00
Regis Houssin
761f841735 Fix: missing contract reference 2012-07-02 10:37:39 +02:00
Regis Houssin
96bd81d387 Fix: sql request error 2012-07-02 10:14:01 +02:00
Laurent Destailleur
e300bb0611 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-30 01:48:58 +02:00
Laurent Destailleur
b3f99e946f Merge pull request #234 from defrance69/patch-6 
Update develop
 2012-06-29 03:38:26 -07:00
Regis Houssin
a96ab9a587 Fix: missing parameters ! 2012-06-29 10:08:48 +02:00
Regis Houssin
a26e03367b New: remove linked elements invalid 2012-06-29 09:35:20 +02:00
Laurent Destailleur
efbd0a2533 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-28 22:58:44 +02:00
Laurent Destailleur
a30b366b2b Fix: Can't modifiy accountancy code sell 2012-06-28 20:01:50 +02:00
Laurent Destailleur
4176287094 Fix: Panicum module for supplier accountancy code 2012-06-28 19:51:25 +02:00
Laurent Destailleur
732a98d9bb New: Show company in contact box 2012-06-28 09:43:30 +02:00
Laurent Destailleur
3242f2fb6c Fix: Removed warnings 2012-06-27 23:54:31 +02:00
Laurent Destailleur
8d3a03ab18 Qual: Normalize code 2012-06-27 23:46:25 +02:00
Laurent Destailleur
693deca816 Fix: doxygen 2012-06-27 23:45:58 +02:00
Regis Houssin
1755c34208 Fix: add ckeditor create div option with dolibarr_mailings toolbar 2012-06-27 16:36:25 +02:00
Laurent Destailleur
339e944b32 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-27 13:25:53 +02:00
Laurent Destailleur
ef81408dc0 Fix: Missing include 2012-06-27 13:25:13 +02:00
Regis Houssin
2334e5814d Merge pull request #235 from jfefe/develop 
Fix : use lastname to test contact ldap synchro (not name)
 2012-06-27 02:37:24 -07:00
Laurent Destailleur
2ab416889a First change to use native date functions instead of adodb 2012-06-27 10:58:51 +02:00
Laurent Destailleur
aa649c167d Fix: Bad hour 2012-06-27 01:40:25 +02:00
Laurent Destailleur
87efb2cbb0 Add log 2012-06-27 00:41:57 +02:00
Laurent Destailleur
787f423448 Fix: Removed warning. Fix compatibility. 2012-06-26 23:11:46 +02:00
jfefe
e2b4a69c89 Fix : use lastname to test contact ldap synchro (not name) 2012-06-26 13:11:04 +02:00
Laurent Destailleur
3b9d7c0125 New: Add webservice for thirdparty creation and list. 2012-06-25 13:06:26 +02:00
Laurent Destailleur
9669deb737 Turkish translation 2012-06-24 19:59:24 +02:00
Laurent Destailleur
4a98dbe9a5 Fix: Remove warning 2012-06-24 19:43:38 +02:00
Laurent Destailleur
018cafe92c Fix: Add an unsecape function to decode javascript escape 
encoding. This also fix ecm for cyrillic chars.
 2012-06-24 19:32:19 +02:00
Laurent Destailleur
0a75367a74 New: Auto ecm for third parties 2012-06-24 17:49:52 +02:00
Laurent Destailleur
db4008850b Fix: missing include 2012-06-23 22:25:40 +02:00
Laurent Destailleur
9a36956619 New: Can filter list of proposal, order or invoice on sales 
representative
 2012-06-23 20:48:50 +02:00
Laurent Destailleur
f2de43b771 New: Can filter list of proposal, order or invoice on sales 
representative
 2012-06-23 20:39:20 +02:00
Laurent Destailleur
9e4af7c5a7 Fix: group by not complete 2012-06-23 20:29:35 +02:00
Laurent Destailleur
6e29a098c0 Fix: fckeditor ko on linux distrib 2012-06-23 20:17:51 +02:00
Laurent Destailleur
a34ce201b1 Normalize themes 2012-06-23 15:44:02 +02:00
Laurent Destailleur
6c6e542fc0 Fix: Bad style 2012-06-23 15:17:04 +02:00
Laurent Destailleur
4792727ca6 Fix: Label was not translated 2012-06-23 15:01:08 +02:00
BENKE Charles
63493a6d1f Update develop 2012-06-21 12:30:22 +03:00
Laurent Destailleur
90569e264c Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/master.inc.php
 2012-06-20 23:34:08 +02:00
Laurent Destailleur
f52cb1b571 Fix: We must not define language var if parm not defined. 2012-06-20 23:31:02 +02:00
Regis Houssin
c041feec6a Fix: missing not empty test 2012-06-20 22:23:43 +02:00
Laurent Destailleur
cb0cd9c7fe 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:54:36 +02:00
Laurent Destailleur
c273f9f698 Fix: escape double quotes into dol_html_escapetag 
New: Passwords not reset into install page.
 2012-06-17 23:27:17 +02:00
Regis Houssin
2e22ac895f Fix: change smtps for have the same email structure of phpmail 2012-06-17 18:43:30 +02:00
Laurent Destailleur
492cf03989 Fix: Removed warning 2012-06-17 17:44:38 +02:00
Regis Houssin
4e1418a6a6 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-16 08:22:08 +02:00
Laurent Destailleur
90bfea882a Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-16 00:08:03 +02:00
Laurent Destailleur
7e46ddd5b0 Fix: Permissions for click2dial tab 2012-06-16 00:07:24 +02:00
Regis Houssin
4db07c3d34 Fix: avoid empty email address 2012-06-15 16:54:13 +02:00
Regis Houssin
cf7872497e New: add EXTERNAL_USERS_ARE_AUTHORIZED for bypass security access for 
external users
 2012-06-15 16:53:44 +02:00
simnandez
cedde3ef83 Fix: [ bug #427 ] Bad links to wiki help in certains menus 2012-06-15 16:13:18 +02:00
simnandez
cf85f6708e Fix: [ bug #427 ] Bad links to wiki help in certains menus 2012-06-15 15:43:00 +02:00
Laurent Destailleur
18c5588c5e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-06-15 11:24:28 +02:00
Laurent Destailleur
4f1d6d7328 Fix: missing a return into clean_url function 2012-06-15 11:24:09 +02:00
Regis Houssin
c6d703de54 Fix: convert lines delimiters 2012-06-15 11:20:09 +02:00
Regis Houssin
a7e45ae10d Fix: missing urlfrom 2012-06-15 11:18:44 +02:00
Laurent Destailleur
44f31bf21c 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:16:17 +02:00
Laurent Destailleur
81eadcd426 Fix: Avoid warning if param is empty 2012-06-15 10:05:28 +02:00
Laurent Destailleur
c592bc88b8 Fix: Init 2012-06-15 02:17:00 +02:00
Laurent Destailleur
6f8ad124a1 New: Can correct stock of a warehouse from warehouse card. 2012-06-15 02:16:35 +02:00
Laurent Destailleur
bfee1630a0 Typo 2012-06-15 01:09:25 +02:00
Laurent Destailleur
db910c8c6f Update logo 2012-06-15 00:59:58 +02:00
Laurent Destailleur
d8ee62101a Fix: function dol_nboflines_bis 2012-06-15 00:15:30 +02:00
Laurent Destailleur
1ddbc12258 Fix: No link if not found into table 2012-06-14 22:56:14 +02:00
Laurent Destailleur
a7d27fc711 Fix: Update was broken 2012-06-14 22:47:45 +02:00
Laurent Destailleur
8d01ba75c9 Fix: Provide a solution for backup when mysqldump is not available 2012-06-14 22:33:27 +02:00
Regis Houssin
1155b0097b New: add advanced rights 2012-06-14 20:11:54 +02:00
Regis Houssin
4f67488bd3 New: add possibility to hide unauthorized buttons 2012-06-14 20:11:43 +02:00
Laurent Destailleur
ec621d2dcb Fix: Bad calculation of nb of line. Fix: Bad position of lines into pdf_soleil 2012-06-14 19:58:35 +02:00
Laurent Destailleur
3fe6ed9a7d Fix: Messy source address 2012-06-14 17:50:32 +02:00
Laurent Destailleur
c1c94abcd3 Fix: Menu list was empty into menu editor. 2012-06-14 16:48:02 +02:00
Laurent Destailleur
66740071fd Fix: Use order date for stats, not valid date. 2012-06-14 14:30:58 +02:00
Laurent Destailleur
a1bd60a614 Fix: No call of any login method. 2012-06-14 14:08:29 +02:00
Regis Houssin
515d8278bc Fix: wrong method 2012-06-14 09:44:27 +02:00
Regis Houssin
159206d52c Fix: $id and $rowid conflict 2012-06-14 09:27:16 +02:00
Regis Houssin
7644fa96dc Fix: uniformize code and add specific rights 2012-06-13 21:48:59 +02:00
Regis Houssin
0d6004588e Fix: adjust user rights and change status icon 2012-06-13 21:48:38 +02:00
Laurent Destailleur
6cd03f9ccd Fix: typo error 2012-06-13 20:13:57 +02:00
Laurent Destailleur
864589f4cf Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-13 11:33:37 +02:00
Laurent Destailleur
daad1877a8 New: Add link to third party into sells and purchase journal. 2012-06-13 11:32:09 +02:00
Regis Houssin
6246228544 New: add extraparams, hooks and extrafields for emailing card 2012-06-13 09:28:59 +02:00
Regis Houssin
315fba37fc Fix: restore broken feature (hooks) 2012-06-13 09:28:48 +02:00
Regis Houssin
df28f09286 Fix: mutualize ckeditor parameters 2012-06-12 23:13:25 +02:00
Laurent Destailleur
a23df4f407 Qual: Removed deprecated var 
New: Can add global js
 2012-06-12 18:35:29 +02:00
Regis Houssin
302c0bb778 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-11 22:39:26 +02:00
Regis Houssin
06ef4ea4c4 Fix: missing end parenthesis 2012-06-11 22:38:52 +02:00
Regis Houssin
38b0b5b39d Merge pull request #226 from defrance69/patch-5 
if day of week < 7 display 2 times the day : 3 days 3 days
 2012-06-11 13:05:26 -07:00
Regis Houssin
5009867181 Merge pull request #225 from simnandez/develop 
Fix: Bad link to propal list into stadistics and dashboard boxes
 2012-06-11 13:02:56 -07:00
Regis Houssin
774be84c54 Merge pull request #220 from GPCsolutions/supplier-orders-box 
New box showing the latest supplier orders.
 2012-06-11 13:02:01 -07:00
Regis Houssin
fee5a0894c Merge pull request #221 from GPCsolutions/pgsql 
Fix first activation of some modules on PgSQL
 2012-06-11 13:00:37 -07:00
Regis Houssin
bf379fc242 Fix: uniformize code 2012-06-11 21:45:59 +02:00
Laurent Destailleur
0739942b7e Can add more text into title shown by getNomUrl 2012-06-11 19:28:04 +02:00
Regis Houssin
e0109c019d Fix: update jquery-cookie plugin 2012-06-11 17:26:48 +02:00
Laurent Destailleur
8c5f0f6811 New: Update mailman mailing-list subscription. 2012-06-11 01:34:51 +02:00
Laurent Destailleur
a1cd073640 Fix: Translation key 2012-06-10 22:02:14 +02:00
Laurent Destailleur
9a3e3e8e18 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-10 21:55:46 +02:00
Laurent Destailleur
98676ddaa1 Qual: Enhance mailmanspip module. 
New: When a member is validated, we can subscribe to mailing-lists
according to its type.
 2012-06-10 21:49:19 +02:00
Regis Houssin
cc18dab5c9 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:10 +02:00
Laurent Destailleur
b7abad95d8 Doxygen 2012-06-10 13:22:28 +02:00
Laurent Destailleur
ae10eb0360 Doxygen 2012-06-10 13:19:20 +02:00
Laurent Destailleur
7147994fd6 Fix: Checkstyle 2012-06-10 13:17:53 +02:00
Laurent Destailleur
c774d94bc9 Fix: Checkstyle 2012-06-10 13:15:24 +02:00
Laurent Destailleur
37f7c98e50 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-10 13:08:56 +02:00
defrance69
2540f727c0 if day of week < 7 display 2 times the day : 3 days 3 days 
add the 's' if they are many days
 2012-06-10 13:42:19 +03:00
simnandez
530743e8b4 Fix: Bad link to propal list into stadistics and dashboard boxes 2012-06-10 11:10:18 +02:00
Regis Houssin
af38a2fab7 Fix: bad parameters, use global 2012-06-10 10:29:43 +02:00
Laurent Destailleur
ddf274e2c1 Fix: translation 2012-06-09 19:44:35 +02:00
Laurent Destailleur
50719271c0 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-09 19:33:52 +02:00
Laurent Destailleur
e6cd400bc3 Qual: List of elements must be into a page called "list.php". 2012-06-09 19:16:31 +02:00
Regis Houssin
b51cd362b0 Fix: problem with external modules and uniformize code 2012-06-09 18:40:36 +02:00
Laurent Destailleur
85e7e5eddd Fxi: Removed checkstyles errors 2012-06-09 13:54:05 +02:00
Laurent Destailleur
fd0450457d New: Can insert links into elements lines. Also reported into PDF. 2012-06-09 13:16:55 +02:00
Laurent Destailleur
931b1d3ab7 Fix: Removed non greek sentences 2012-06-09 12:37:40 +02:00
Laurent Destailleur
1a3a045af6 Fix: No alpha here, this breaks ability to submit html content with 
images or links.
 2012-06-09 12:33:51 +02:00
Laurent Destailleur
655c317645 Fix: Turkish translation 2012-06-09 00:22:41 +02:00
Laurent Destailleur
394e044fa8 Fix: Missing translation key 2012-06-09 00:18:47 +02:00
Laurent Destailleur
158930eb7b Fix: function is loaded once and not overwritten if loaded 
by another ajax page. So if we need inputok/ko and pageyes/no to be
different according to ajax calls (to have several confirm box
loaded from different ajax parts of page, we must place such variables
outside of function. For this $useglobalvars must be set to 1.
 2012-06-08 23:48:53 +02:00
Laurent Destailleur
1022c73c24 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-08 22:17:14 +02:00
Regis Houssin
f4135d3758 Fix: delete or rename a document product dir 2012-06-08 21:40:27 +02:00
Regis Houssin
355cb988b7 Fix: missing oldcopy during update 2012-06-08 21:40:15 +02:00
Laurent Destailleur
62766288c8 Fix: Another fix for var not initialized 2012-06-08 21:39:44 +02:00
Laurent Destailleur
59e39b5d91 Fix: A lot of pb into javascript. Javascripts code for same feature was 
not inserted always at same place (sometinmes at low level, and
sometimes at high level). This was creating conflict into javascript.
 2012-06-08 21:33:12 +02:00
Laurent Destailleur
85f31fc0cb Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-08 20:37:14 +02:00
Regis Houssin
513e3b8ae7 Fix: remove deprecated code can cause warning 2012-06-08 18:18:59 +02:00
Regis Houssin
e6c6d6cf84 Fix: avoid warning 2012-06-08 18:17:03 +02:00
Regis Houssin
bd6f5c4ca7 Fix: use template for best visibility 2012-06-08 18:03:00 +02:00
Regis Houssin
d9e3a941de Fix: conflict with anothers dialog box 2012-06-08 17:06:22 +02:00
Regis Houssin
1fc102825a Fix: bad option name 2012-06-08 11:47:34 +02:00
Regis Houssin
92b02a0084 Fix: add iframe transport for compatibility with all browser 2012-06-08 11:35:32 +02:00
Laurent Destailleur
8a4a74a1bf Look: Add more space 2012-06-07 20:58:26 +02:00
Laurent Destailleur
5c553878c7 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-06 23:13:06 +02:00
Laurent Destailleur
b120eb9a15 Fix: Confirm box not opened 2012-06-06 23:12:33 +02:00
Laurent Destailleur
f575dd4ae5 Fix: bad error management 2012-06-06 23:06:17 +02:00
Regis Houssin
d0161087cb Fix: problem with external module 2012-06-06 23:02:02 +02:00
simnandez
b96fb07cbf [ task #104 ] Possibilité de facturer plusieurs commandes 2012-06-06 18:02:47 +02:00
Raphaël Doursenaud
a29301d8b5 Indent 2012-06-06 16:35:58 +02:00
Raphaël Doursenaud
2a8cc5ad60 Fix a bug preventing module enablement with PostgreSQL 2012-06-06 16:30:52 +02:00
Regis Houssin
4d2a77a657 Fix: missing search in alternative root directory 2012-06-06 14:04:19 +02:00
Laurent Destailleur
23dea40504 Fxi: Bad permission check 2012-06-05 23:32:13 +02:00
Laurent Destailleur
9a7382de1b Fix: Exclude temp file 2012-06-05 23:31:46 +02:00
Laurent Destailleur
5ab3512914 Fix: Missing permission check 2012-06-05 23:12:40 +02:00
Laurent Destailleur
eb3484d6b6 No need of compatibility mode 2012-06-05 12:52:25 +02:00
Laurent Destailleur
07a6ee67e2 Minor perf enhancement 2012-06-05 12:42:32 +02:00
Laurent Destailleur
14719d1b7a Compatibility mode 2012-06-05 12:34:34 +02:00
Laurent Destailleur
dadc36ad18 Fix for PHP < 5.3 2012-06-05 12:27:42 +02:00
Laurent Destailleur
50f3e480c9 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-05 12:11:45 +02:00
Laurent Destailleur
b6fb117f78 Fix if tz is UTC. 2012-06-05 12:11:20 +02:00
Raphaël Doursenaud
29bfc2f310 Fixed supplier url in supplier orders' box 2012-06-04 18:05:19 +02:00
Raphaël Doursenaud
0f410996f7 New box showing the latest supplier orders. 2012-06-04 17:37:38 +02:00
Laurent Destailleur
044ca3062b Fix: Use wrong handler. Make install fails. 2012-06-04 02:13:59 +02:00
Regis Houssin
ed50c65631 Fix: date format error 2012-06-03 23:53:58 +02:00
Regis Houssin
93e3c3e3f3 Fix: merge array of hookmanager errors 2012-06-03 23:53:32 +02:00
Laurent Destailleur
dfb697d794 Prepare ajax for ecm module. 2012-06-02 18:55:04 +02:00
Laurent Destailleur
88c5d0f6e9 USe html & not xml 2012-06-02 14:56:36 +02:00
Laurent Destailleur
3d73952376 Look: Reduce login table pad 2012-06-02 14:07:38 +02:00
Laurent Destailleur
df45c51336 Fix: Solve error Method Not Implemented 2012-06-01 21:15:14 +02:00
Laurent Destailleur
7bc803ca9e Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-01 20:51:55 +02:00
Laurent Destailleur
6147377e16 Fix: Try a fix for the _FILES escape problem. 2012-06-01 20:51:31 +02:00
Raphaël Doursenaud
38740fb70f Fixed a bug in interventions' list navigation 
The navigation arrows were referencing "index.php" file thus
preventing navigation between pages.
The actual name of the file is "list.php".
 2012-06-01 11:21:56 +02:00
Laurent Destailleur
61ed269044 Fix: restore broken feature. File upload/delete was ko with linux and 
windows.
Note also that strisplashes should never be used anywhere in the code,
because strislashes is nor a HTML escape, nor a javascrip escape, nor a
shell or PHP escape function. If stripslashes is used somewhere, this
means there is a bug somewhere else.

upload/delete using the standard feature (not fileupload) works
correctly with that on linux/windows.
 2012-06-01 10:16:42 +02:00
Laurent Destailleur
f11508a09e Fix: an url must be with url escape format. 2012-06-01 10:12:28 +02:00
Regis Houssin
84cf35d8f2 Fix: Multi-line function call not indented correctly 2012-06-01 08:05:45 +02:00
Regis Houssin
6c8db0aa2d Fix: Protected member variable must not be prefixed with an underscore 2012-06-01 07:59:45 +02:00
Regis Houssin
e9994c683a Fix: clear file name send by php 2012-06-01 07:11:00 +02:00
Raphaël Doursenaud
6c963fc591 Fixed a bug preventing invoice sorting by authors 2012-06-01 03:07:05 +02:00
Laurent Destailleur
9985355f9e Merge pull request #215 from simnandez/develop 
Trad: Add translation
 2012-05-31 18:04:32 -07:00
Laurent Destailleur
8f5a95255d Checkstyle 2012-06-01 02:32:17 +02:00
Laurent Destailleur
93ced076ac Checkstyle 2012-05-31 21:25:22 +02:00
Regis Houssin
2ad1cf0665 Fix: more clean code for new version of jQuery fileupload 2012-05-31 21:11:36 +02:00
Regis Houssin
274734b828 Fix: stock message in session and reload the page for avoid url problem 
with jQuery fileupload
 2012-05-31 21:11:26 +02:00
Regis Houssin
248f0e9d08 Fix: reload page after file upload completed 2012-05-30 23:14:35 +02:00
Regis Houssin
6c5237f94e Fix: add max file size 2012-05-30 22:44:44 +02:00
Regis Houssin
1e77ff069a Fix: replace Bootstrap version by jQueryUI version 2012-05-30 22:13:23 +02:00
Laurent Destailleur
1929c1784d Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-05-30 21:41:52 +02:00
Laurent Destailleur
d9efb88d35 Fix: Can edit emailing even when validated. 2012-05-30 21:40:32 +02:00
Simnandez
5a1001f006 Trad: Add translation 2012-05-30 18:00:37 +02:00
juanjo
c24b901dd6 [ task #104 ] Possibilité de facturer plusieurs commandes. Init works 2012-05-30 14:48:23 +02:00
Regis Houssin
85e3407559 Fix: Unescape a file submitted by upload. PHP escape char " (%22) and 
char ' (%27) into $FILES
Before= Capture d\'écran.doc  After= Capture d'écran.doc
 2012-05-30 13:58:20 +02:00
Laurent Destailleur
17b50e02b7 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-05-30 12:43:50 +02:00
Laurent Destailleur
c2db3265ec Fix: Regression with quot management. Try a better fix. 2012-05-30 12:43:23 +02:00
Laurent Destailleur
705c152f7a Fix: js not escaped 2012-05-30 12:33:31 +02:00
Regis Houssin
1ea7e53273 Works on jQuery fileupload upgrade (Todo: css problem) 2012-05-30 11:57:00 +02:00
Laurent Destailleur
6d245e6f31 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-05-30 11:22:20 +02:00
Laurent Destailleur
fb4d62c34a Fix: Some fix into the canvas for companies. 2012-05-30 11:21:42 +02:00
Regis Houssin
a5b0de15ac Fix: can't delete a files with quote 2012-05-30 08:30:25 +02:00
Regis Houssin
a486da1b0e Fix: restore files for template engine 2012-05-30 07:43:06 +02:00
Laurent Destailleur
ebf77e8c92 A better fix to remove files from document list 2012-05-30 04:11:00 +02:00
Laurent Destailleur
3c98daaf09 More fix for canvas features 2012-05-30 03:46:06 +02:00
Laurent Destailleur
cd1c5f6aaf Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-05-30 03:03:23 +02:00
Laurent Destailleur
8481af9ee4 Fix: Try to fix several bugs into canvas feature. 2012-05-30 03:02:44 +02:00
Regis Houssin
b5246add8d Fix: big problem with files upload and more compatible with external 
modules
 2012-05-30 00:07:06 +02:00
Laurent Destailleur
763e2a96a4 Revert "Revert "Fix: Return empty image instead of error when file not found."" 
This reverts commit b99d3a70ae.
 2012-05-30 00:05:42 +02:00
Laurent Destailleur
b99d3a70ae Revert "Fix: Return empty image instead of error when file not found." 
This reverts commit b266a19300.
 2012-05-30 00:05:08 +02:00
Laurent Destailleur
18d24c3f78 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-05-30 00:00:05 +02:00
Laurent Destailleur
b266a19300 Fix: Return empty image instead of error when file not found. 2012-05-29 23:59:43 +02:00
Laurent Destailleur
3fc3292142 Fix: delete of documents is done by page of element, not by the view 
wrapper.
 2012-05-29 23:50:13 +02:00
Regis Houssin
ef111dda47 New: update jQuery and jQuery UI 2012-05-29 22:57:12 +02:00
Laurent Destailleur
446ae46557 Removed deprecated strings 2012-05-29 22:22:59 +02:00
Laurent Destailleur
dc4d4ae50c Update de_de translation (manual translation) 2012-05-29 22:16:54 +02:00
Laurent Destailleur
ba77757146 Fix: Restore unix line ending 2012-05-29 21:48:44 +02:00
Laurent Destailleur
1cc3cb842e Merge pull request #212 from defrance69/patch-4 
Update htdocs/comm/fiche.php
 2012-05-29 12:44:57 -07:00
Regis Houssin
08f87515af Fix: clone object before all treatment 2012-05-29 09:55:29 +02:00
Laurent Destailleur
7213ae09fe Checkstyle 2012-05-29 00:08:00 +02:00
Laurent Destailleur
d52d063d98 Fix: Avoid to have a special php module. 2012-05-28 22:39:04 +02:00
Laurent Destailleur
d008225bef Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-05-28 22:10:01 +02:00
Laurent Destailleur
57c8797459 Fix: Subscription must use company name when type is "moral" 2012-05-28 22:09:36 +02:00
defrance69
33a8a3f468 Update htdocs/comm/fiche.php 2012-05-26 12:13:07 +03:00
Regis Houssin
516be43404 Fix: jquery fileupload broken feature 2012-05-25 20:56:05 +02:00
Laurent Destailleur
2c21700933 Checkstyle 2012-05-25 11:54:19 +02:00
Laurent Destailleur
513413da16 Checkstyle 2012-05-25 11:53:53 +02:00
Laurent Destailleur
f2c1346cb7 Fix: Removed warning 2012-05-24 23:22:45 +02:00
Laurent Destailleur
eca1223949 Indent 2012-05-24 16:58:14 +02:00
Laurent Destailleur
c207080527 Error management 2012-05-24 00:26:39 +02:00
Laurent Destailleur
6b2faf02d9 Checkstyle 2012-05-23 23:34:00 +02:00
Laurent Destailleur
c87af887ea Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-05-23 23:24:32 +02:00
Laurent Destailleur
ed93e5cc7c Qual: Serious clean of code of formconfirm method. This also solve bugs 
of ecm module when using ajax.
 2012-05-23 23:23:57 +02:00
Laurent Destailleur
7801749874 Fix: Bad action reset 
Qual: Removed useless code
 2012-05-23 17:49:41 +02:00
Laurent Destailleur
5c995a421c Merge pull request #210 from FHenry/develop 
Correct start date and end date to be midnight rather than midday
 2012-05-23 05:37:08 -07:00
Laurent Destailleur
1fec3b56d9 Fix: Permissions to see project 
Conflicts:
	htdocs/projet/fiche.php
 2012-05-23 14:34:44 +02:00
Laurent Destailleur
c6c9861bff Fix: bug on projects visibility for external users 2012-05-23 13:09:36 +02:00
Raphaël Doursenaud
e1767d1337 Trim payment amounts 
This allows to ignore trailing characters that may triggers a warning because the payment looks greater than what's
required
 2012-05-23 12:03:02 +02:00
Laurent Destailleur
1aa442977c Fix: extrafield repair was using bad hardcoded values. 2012-05-23 11:48:52 +02:00
Laurent Destailleur
81be50b91b Fix: [ bug #411 ] Can't modify most properties 2012-05-23 11:21:51 +02:00
Laurent Destailleur
82dda362c5 Fix: [ bug #409 ] List of vat rates for supplier prices must use the 
seller country.
 2012-05-23 10:50:38 +02:00
Laurent Destailleur
dc16085d57 Fix: No hard coded precision. Second param must be 'MU' (we want a 
unit price so 'MU'. If unit price was on 4 decimal, we must keep 4
decimals once vat rate was changed)
 2012-05-23 02:31:38 +02:00
Regis Houssin
8eb73aaa33 Fix: convert line delimiters 2012-05-22 19:26:33 +02:00
Regis Houssin
8f3ead5cfc Fix: round ttc with 2 decimal 2012-05-22 19:25:51 +02:00
Regis Houssin
d7d26b9375 Fix: bad sql result name 2012-05-22 19:11:41 +02:00
Regis Houssin
e8fd068cb0 Fix: reinstanciate object 2012-05-22 18:48:56 +02:00
Regis Houssin
01f1674231 New: add product admin page for mass conversion 2012-05-22 18:35:14 +02:00
FHenry
dfebf31c02 Correct strat date and end date to be midnight rather than midday 2012-05-22 12:54:13 +02:00
Laurent Destailleur
2a3db5a3ac Fix: new self is not compatible with most version of PHP. Also result is 
not predicable as it depends on PHP version.
 2012-05-21 20:31:02 +02:00
Laurent Destailleur
2b0cfb04af Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-05-21 20:18:32 +02:00
Laurent Destailleur
c1547b6ad0 Fix: Translation of payment term/cond 2012-05-21 20:17:58 +02:00
Regis Houssin
9cf2ea492c Fix: broken features with external module 2012-05-21 18:44:09 +02:00
juanjo
a6b0242f8a [ task #407 ] Manage PDF hidden items 2012-05-21 17:12:57 +02:00
Regis Houssin
77eb5d4287 Merge pull request #208 from simnandez/develop 
Develop
 2012-05-21 07:42:23 -07:00
juanjo
dbdd3f5e8a [ task #407 ] Manage PDF hidden items 2012-05-21 16:23:52 +02:00
juanjo
9b70ac1be3 [ bug #399 ] Bad calculation of local taxes in update line products 2012-05-21 16:21:09 +02:00
juanjo
b2ad2decad [ task #407 ] Manage PDF hidden items 2012-05-21 16:20:19 +02:00
FHenry
63f6707a7b correct bug #410 
Conflicts:
	htdocs/comm/mailing/cibles.php
 2012-05-21 16:16:24 +02:00
Regis Houssin
5f835bed7e Fix: broken features 2012-05-21 15:45:44 +02:00
Laurent Destailleur
fe48342aaf Fix: Check for duplicate must ignore spaces before and after 2012-05-21 10:37:03 +02:00
Laurent Destailleur
2ffa73660a Better error management 2012-05-21 09:21:03 +02:00
Laurent Destailleur
8b2a17bbf0 Perf: One request instead of two. 2012-05-21 00:36:59 +02:00
Laurent Destailleur
545eaa15c6 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-05-21 00:10:55 +02:00
Laurent Destailleur
864ca3090a Fix: [ bug #405 ] Late icon always displayed on comm/propal.php 2012-05-21 00:08:55 +02:00
defrance69
80e717af7e Update htdocs/fichinter/class/fichinter.class.php 2012-05-18 15:36:05 +03:00
Regis Houssin
34e2320e61 Fix: use $mysoc object and clean code 2012-05-18 09:03:24 +02:00
Laurent Destailleur
1252d7bf2c Fix: Missing name 2012-05-16 17:04:00 +02:00
Laurent Destailleur
4d06b0bff3 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-05-16 12:33:47 +02:00
Laurent Destailleur
0cbe83aaed Fix: W3C 2012-05-16 12:33:10 +02:00
Laurent Destailleur
c500a9db33 Merge pull request #202 from simnandez/develop 
Trad: Add missing translations
 2012-05-15 12:14:30 -07:00
Laurent Destailleur
1c7e3d1097 Fix: cancel not supported 2012-05-15 20:39:04 +02:00
juanjo
857b0e6199 Trad: Add missing translations 2012-05-15 16:19:12 +02:00
Laurent Destailleur
c48e0e6996 Merge pull request #200 from GPCsolutions/develop 
Develop
 2012-05-15 02:39:21 -07:00
Laurent Destailleur
e0b6bee540 New: Add timezone string from browser. 2012-05-15 01:41:12 +02:00
Laurent Destailleur
e7138bce4e Fix: daylight depends also on year (not only month and day) 2012-05-15 00:48:59 +02:00
Laurent Destailleur
bd26c9e465 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-05-14 20:46:35 +02:00
Laurent Destailleur
4a9baa590c Fix: Bad timezone function. Daylight was not used. 2012-05-14 16:46:48 +02:00
Laurent Destailleur
2a7cf9c6f6 Fix: bad translation 2012-05-14 14:41:26 +02:00
Cédric Salvador
673f57edae Fix: error in syslog call 2012-05-14 11:46:42 +02:00
Laurent Destailleur
89836cea29 Fix: var init 2012-05-14 01:39:59 +02:00
Laurent Destailleur
55e21b85c7 Fix: delete go back to list. 2012-05-13 19:52:19 +02:00
Laurent Destailleur
5541c2b693 Fix: Exclude nltechno modules from demo 2012-05-13 19:13:41 +02:00
Laurent Destailleur
51e8ebd664 Fix: Clean sql 2012-05-13 18:08:03 +02:00
Laurent Destailleur
a87cefa64d Fix: pgsql 2012-05-13 17:38:04 +02:00
Laurent Destailleur
c4daa904c4 Fix: W3C 2012-05-13 17:37:53 +02:00
Laurent Destailleur
cf03228053 Fix: syntax error in name of pgsql util proc. 
Fix: Add a proc to fix pgsql problems.
 2012-05-13 16:42:59 +02:00
Laurent Destailleur
acef702c27 Fix: pgsql compatibility not complete. 
New: Move convert sql functions as static.
New: Add phpunit tests for database drivers.
 2012-05-13 14:30:11 +02:00
Laurent Destailleur
4277087f76 Fix: Missing log when error 2012-05-13 14:27:51 +02:00
Laurent Destailleur
57adc5e76a Fix: Style 2012-05-12 20:58:36 +02:00
Laurent Destailleur
5be544264b Fix: Missing lang 2012-05-12 18:30:49 +02:00
Laurent Destailleur
64c7ae1667 Fix: hour reported is not user hour. To fix this, we show both hour 
"server and user" but only if it differs.
 2012-05-12 16:27:20 +02:00
Laurent Destailleur
28febe728b Fix: Pb with backtopage 2012-05-12 15:53:57 +02:00
Laurent Destailleur
9a2f05b87a Fix: SQL error 2012-05-12 15:27:22 +02:00
Laurent Destailleur
04ee415879 Fix: [ bug #404 ] Impossible d'ajouter un contact lorsque le module LDAP 
est actif (erreur Array 1)
 2012-05-12 12:32:24 +02:00
Laurent Destailleur
13ea9c91fd Fix: Synchro with group not done when editing group only of a user. 2012-05-11 12:47:15 +02:00
Laurent Destailleur
61a6105c98 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-05-11 12:11:23 +02:00
Laurent Destailleur
3ab6ffdd0e Fix: A lot of fix for LDAP synchro 2012-05-11 12:10:47 +02:00
Regis Houssin
ddf0f3521f Fix: [Bug #403] Insertion Image via l'éditeur WISIWIG plante 2012-05-11 10:14:15 +02:00
Laurent Destailleur
4977cfd44f Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-05-10 23:02:40 +02:00
Laurent Destailleur
dc904ddf5f Fix: vat rates 2012-05-10 23:02:05 +02:00
Regis Houssin
8ec51c2a6b Fix: fetch object for hookmanager 2012-05-10 19:30:10 +02:00
Laurent Destailleur
63ce05b939 New: Localize for NL 2012-05-10 00:35:20 +02:00
Laurent Destailleur
62a1dd1912 Fix: escape html tag value 2012-05-09 18:48:16 +02:00
Laurent Destailleur
d0c0a0a42c Fix: Bad warning 2012-05-09 18:16:09 +02:00
Laurent Destailleur
8823f9234f Fix: Bad warning 2012-05-09 17:58:38 +02:00
Laurent Destailleur
7c78c894de Fix: Not escaped html value 2012-05-09 17:44:52 +02:00
Laurent Destailleur
cc2ce60312 Fix: Validate broken, missing warning on bad email. 2012-05-09 17:15:44 +02:00
Laurent Destailleur
34f433ee4b Uniformize code 2012-05-09 17:14:46 +02:00
Laurent Destailleur
30c8fcd0e1 Fix: regression sql error 2012-05-09 16:45:15 +02:00
Laurent Destailleur
aa6eb25f85 Qual: Uniformize code 2012-05-09 16:40:54 +02:00
Laurent Destailleur
8cc55ae0df Fix: Warning GETPOST with alpha and int must be used ONLY if content is 
not a free text.
 2012-05-09 16:18:59 +02:00
Laurent Destailleur
923562c520 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-05-09 16:03:48 +02:00
Laurent Destailleur
f995d0d9cb Fix: Missing extrafields 
New: Can resiliate/edit member status from list.
 2012-05-09 16:03:15 +02:00
Laurent Destailleur
c8d72ef92a Fix: Failed to delete member 2012-05-09 15:22:09 +02:00
Laurent Destailleur
60b37d6b43 Fix: style 2012-05-09 14:50:28 +02:00
Regis Houssin
b2022b3b74 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-05-09 12:46:28 +02:00
Regis Houssin
fb2cd3d842 Fix: more compatibility with multicompany 2012-05-09 12:45:19 +02:00
simnandez
d226534ba0 Fix:[ bug #399 ] Bad calculation of local taxes in update line products 2012-05-09 12:12:14 +02:00
Laurent Destailleur
a3216ee0c6 Fix: Checkstyle 2012-05-09 02:39:30 +02:00
Laurent Destailleur
6ed75123d8 Fix: checkstyle 2012-05-09 00:28:02 +02:00
Laurent Destailleur
f8d7591d6d Fix: Load lang 2012-05-08 22:58:54 +02:00
Laurent Destailleur
c01fae04e4 Qual: Uniformize management of alt directories. 2012-05-08 22:49:03 +02:00
Laurent Destailleur
161846be77 Fix: [ bug #397 ] Product VAT is not coming from buying price 2012-05-08 22:10:07 +02:00
Laurent Destailleur
a772fff5ed Fix: update price for pgsql 2012-05-08 21:59:02 +02:00
Laurent Destailleur
dc09960143 New: Add bank account on payment list of invoice card. 2012-05-08 15:43:58 +02:00
Laurent Destailleur
aa9648288c Uniformize order of fileds 2012-05-08 15:01:20 +02:00
Laurent Destailleur
a7c4a88b07 Look: Minor look enhancements 2012-05-08 15:00:46 +02:00
Laurent Destailleur
a83fd529af Fix: bad br 2012-05-07 20:56:36 +02:00
Laurent Destailleur
774bf30e4c Fix: corrupted extra tables. 2012-05-07 20:55:14 +02:00
Laurent Destailleur
0737748e48 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-05-07 18:59:17 +02:00
Regis Houssin
c2f6a267d8 Merge pull request #197 from GPCsolutions/typo 
Fix: Typo
 2012-05-07 09:30:53 -07:00
Raphaël Doursenaud
6fd60ff174 Fix: Typo 2012-05-07 18:27:23 +02:00
Laurent Destailleur
16b1655ad5 Fix: Width of gantt chart 2012-05-07 18:00:53 +02:00
Laurent Destailleur
2f081f2bd5 Too shadow with IE 2012-05-07 17:19:46 +02:00
Laurent Destailleur
8c6570718d Fix: Better fix for gant view 2012-05-07 17:11:40 +02:00
Laurent Destailleur
c904e3e4b3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-05-07 17:07:13 +02:00
Regis Houssin
bfb102db18 Fix: add MAIN_HIDE_LEFT_MENU 2012-05-07 17:05:15 +02:00
Laurent Destailleur
792c0a33f3 Fix: Works with checkbox htdocs/core/class/html.form.class.php 2012-05-07 17:04:35 +02:00
Regis Houssin
f6aadae900 Merge pull request #196 from GPCsolutions/typo 
Typo: instantanée ne prend qu'un n.
 2012-05-07 07:52:54 -07:00
Regis Houssin
412cbf2dfd Fix: wrong permission 2012-05-07 11:15:14 +02:00
Laurent Destailleur
d5f0c487ad Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-05-07 10:36:45 +02:00
Laurent Destailleur
a8307a32fd New: Switch ecm module to use ajax by default. 2012-05-07 10:08:11 +02:00
Regis Houssin
af7dc508cd Fix: [Bug #384] Gantt doesn't display beyond 20 tasks 2012-05-07 09:58:44 +02:00
Laurent Destailleur
f5592bcc32 Fix: Removed warning and fix pb with extra fields. 2012-05-06 21:05:02 +02:00
Laurent Destailleur
d60061f682 Fix: pagecode when using postgresql 
Conflicts:
	htdocs/support/inc.php
 2012-05-06 15:36:53 +02:00
Laurent Destailleur
8b07aa3623 Fix: log must be before request 2012-05-06 15:33:39 +02:00
Laurent Destailleur
eb541ceaa9 Fix: foreign key on non existing field 2012-05-06 15:33:33 +02:00
Laurent Destailleur
7c94b21211 Comments 2012-05-06 15:32:23 +02:00
Laurent Destailleur
ad26cff69f Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-05-06 02:33:15 +02:00
Laurent Destailleur
b4f83d33a6 Merge pull request #180 from GPCsolutions/typo 
Typo
 2012-05-05 17:32:51 -07:00
Laurent Destailleur
e9fb0f427c New: Add customer invoice ref on invoices 2012-05-06 02:27:09 +02:00
Laurent Destailleur
50944a71db Checkstyle 2012-05-06 00:45:15 +02:00
Laurent Destailleur
6599f2d755 Checkstyle 2012-05-06 00:15:03 +02:00
Laurent Destailleur
d47a78479e Fix: several fixes 2012-05-05 23:59:14 +02:00
Laurent Destailleur
d2672c4b39 Fix: setStatut works for user class 2012-05-05 20:22:46 +02:00
Laurent Destailleur
f7263d1773 Fix: Do not lose filter 2012-05-05 20:07:34 +02:00
Laurent Destailleur
29c7c109fa New: Can filter on user contact 2012-05-05 19:41:38 +02:00
Laurent Destailleur
143e524db6 New: Can filter on contact 2012-05-05 17:45:17 +02:00
Laurent Destailleur
85f01691a0 Qual: Lists must be into a page list and not into same page than record. 
New: Add filter on contact into list.
 2012-05-05 17:28:52 +02:00
Laurent Destailleur
f924fdf711 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-05-05 13:38:54 +02:00
Laurent Destailleur
70a2f45c35 Fix: for new eldy theme 2012-05-05 13:32:31 +02:00
Regis Houssin
00b65d42e4 Fix: [bug #385] Can't delete a task 2012-05-05 09:28:06 +02:00
Regis Houssin
3bc9e378ab Fix: [Bug #388] Can't modify products after moving with arrows 2012-05-05 09:20:01 +02:00
Regis Houssin
0c6d7c56d3 Fix: bad parameters 2012-05-05 09:02:13 +02:00
Laurent Destailleur
93252b941b Fix: % must be sprintf format. 2012-05-05 03:02:46 +02:00
Laurent Destailleur
436726e520 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-05-05 02:57:04 +02:00
Laurent Destailleur
9913e87410 New: Add more payment conditions 2012-05-05 02:56:38 +02:00
Laurent Destailleur
7e839daa6a Fix: Manual fix of italian language 2012-05-05 02:53:30 +02:00
Laurent Destailleur
75cefe53cf Fix: Set payment term 2012-05-04 18:30:35 +02:00
Regis Houssin
12b6d6c0ef Fix: MultiCompany compatibility for public page 2012-05-04 13:21:00 +02:00
Laurent Destailleur
8b9200732e Fix: optimize for print 2012-05-04 13:13:12 +02:00
Laurent Destailleur
05c015836a Fix: filter on status 2012-05-03 22:58:12 +02:00
Laurent Destailleur
498be67ac1 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-05-03 22:12:13 +02:00
Laurent Destailleur
a6f8fc4af4 Fix: Bad cr 2012-05-03 22:11:36 +02:00
Regis Houssin
1b350fafd1 Fix: missing entity field in contract 
Fix: multicompany compatibility
 2012-05-03 18:42:46 +02:00
simnandez
c4d17076f6 Trad: add missing translations 2012-05-02 18:30:39 +02:00
simnandez
5e2b034031 Trad: Add missing trans 2012-05-02 18:10:25 +02:00
Laurent Destailleur
bd724c9d70 Fix: Use de_De language for de_de, not de_at 2012-05-02 17:36:27 +02:00
Laurent Destailleur
5c7bc05920 Merge pull request #190 from simnandez/develop 
New: Add translation
 2012-05-02 07:33:34 -07:00
Laurent Destailleur
dd2859a5ad Fix: Missing picto 2012-05-02 13:41:34 +02:00
Laurent Destailleur
ffada89b25 Fix: IE 2012-05-02 13:39:30 +02:00
Laurent Destailleur
e671e234ca Fix: W3C 2012-05-02 11:57:32 +02:00
Laurent Destailleur
74b115877d Fix: Middle 2012-05-02 10:19:42 +02:00
Laurent Destailleur
64ee9b8065 Fix: Missing translation 2012-05-02 00:17:33 +02:00
Laurent Destailleur
c2d357b51e Minor fix 2012-05-02 00:03:11 +02:00
Laurent Destailleur
3a05649df1 Qual: Top menus use div only now. Menu manager eldy and auguria does not 
differs.
First work to align eldy theme to dolibarr theme.
 2012-05-01 23:40:23 +02:00
Laurent Destailleur
4618b9b9c5 Better error management 2012-05-01 23:15:01 +02:00
Laurent Destailleur
03718e0f23 Fix: Clean database to allow constraints 2012-05-01 15:29:53 +02:00
Laurent Destailleur
fbab99b28e Fix: [ bug #378 ] status for order i, process is "waiting for reception" 2012-05-01 15:08:54 +02:00
Laurent Destailleur
7bbacaece7 Fix: missing global 2012-05-01 14:09:58 +02:00
simnandez
511ecb3e52 New: Add translation 2012-04-30 19:30:13 +02:00
Laurent Destailleur
e04e40b38a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-04-30 17:47:50 +02:00
Laurent Destailleur
c99f407add New: Add translation 2012-04-30 17:47:15 +02:00
Regis Houssin
84f17d0127 Merge pull request #189 from simnandez/develop 
Fix: Url to wiki, div message, variable more clear
 2012-04-30 07:59:34 -07:00
Regis Houssin
18c081a7ac New: add external theme with a module 2012-04-30 16:51:45 +02:00
simnandez
23a956c47b Fix: Url to wiki, div message, variable more clear 2012-04-30 16:23:43 +02:00
Laurent Destailleur
8898b9a3b0 Fix: Firstname/Lastname lost 2012-04-30 16:08:34 +02:00
Laurent Destailleur
d804683b32 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-04-30 15:18:24 +02:00
Laurent Destailleur
fecab54f43 Checkstyle 2012-04-30 15:17:50 +02:00
Laurent Destailleur
a2246b1465 Checkstyle 2012-04-30 15:03:58 +02:00
Regis Houssin
73487a6aec Fix: replace mktime() by dol_now() 2012-04-30 15:01:25 +02:00
Laurent Destailleur
1227642db0 Checkstyle 2012-04-30 15:01:20 +02:00
Regis Houssin
79f2781bdb Merge pull request #188 from FHenry/develop 
Develop
 2012-04-30 05:33:48 -07:00
Laurent Destailleur
19ce632d7a Removed duplicate file 2012-04-30 14:13:16 +02:00
FHenry
fca02bf918 Remove space 2012-04-30 13:53:16 +02:00
FHenry
dc42e16ff1 Secure URL use to CheckRead and Unsubcribe with security key in 
configuration screen
 2012-04-30 13:49:29 +02:00
FHenry
7aada2c442 correct debug code and alfa 2012-04-30 13:13:10 +02:00
FHenry
4fd00c50be Feature Clone project (357) 
Fix variable date property name, to be compliant with varaible naming
convention (create)
Add feature to shift task date when change project start date (option)
Add project start/end date on Project->Task View
 2012-04-30 13:13:09 +02:00
simnandez
5713a93c27 [ task #297 ] Add a installer for external modules 
Adaptation to changes in dol_uncompress function. More clear and
accurate messages.
 2012-04-30 12:19:11 +02:00
Laurent Destailleur
8b953026fd Look: minor change 2012-04-30 09:57:57 +02:00
Laurent Destailleur
29fdb33406 Fix: Removed warnings 2012-04-30 09:36:10 +02:00
Laurent Destailleur
4132b51936 Fix: Regression 2012-04-29 21:40:13 +02:00
Laurent Destailleur
5499c91712 New: Monaco is like France for default vat calculation 
Qual: More phpunit tests
 2012-04-29 11:42:30 +02:00
Laurent Destailleur
96a90e2e7a Fix: Overwritting code is not role of a template but of a module. 
Code is now working as a module change. Also it is faster (no need to
make a failed include when module is not installed) and support
alternative directory.
 2012-04-29 11:00:28 +02:00
Laurent Destailleur
5c46c3bcbb Fix: Class not deleted after move. 2012-04-29 10:32:37 +02:00
Regis Houssin
c962e515d5 Merge pull request #186 from grandoc/develop 
to use specific tpl within his own theme
 2012-04-28 10:06:39 -07:00
Laurent Destailleur
b9133410c2 Qual: Uniformize code. 2012-04-28 18:49:01 +02:00
Laurent Destailleur
edb3178def Fix: Bad declaration of error_reporting 2012-04-28 18:47:54 +02:00
Laurent Destailleur
ead6b387d9 Fix: Use same algo to scan modules than admin/modules page 2012-04-28 18:38:15 +02:00
Grand Philippe
922703879f to use specific tpl within his own theme 2012-04-28 18:24:52 +02:00
Laurent Destailleur
7977897fd8 Fix: dol_uncompress function now works with all PHP and OS. Use PHP 
native code. Only zip is supported. This is enough, modules must be zip
and only zip (tgz not more allowed).
 2012-04-28 18:21:51 +02:00
Laurent Destailleur
7b5aedeb3e Fix: Var can't be static 2012-04-28 18:04:55 +02:00
Laurent Destailleur
5e252bcb04 Fix: Removed warning 2012-04-28 17:59:08 +02:00
Laurent Destailleur
e411852c39 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-04-28 17:01:48 +02:00
Laurent Destailleur
ff06360071 Fix: Overwritting code is not role of a template but of a module. 
Code is now working as a module change. Also it is faster (no need to
make a failed include when module is not installed) and support
alternative directory.
 2012-04-28 17:01:25 +02:00
Laurent Destailleur
a862b5d5c3 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 16:58:32 +02:00
Laurent Destailleur
25441e57f4 Bookmarks should use menu style 2012-04-28 16:40:15 +02:00
Laurent Destailleur
8ea079ed96 New: Prepare change to allow usage of print sheet for any purpose (not 
only
memeber module).
Qual: Remove duplicate declaration of version.
 2012-04-28 16:37:58 +02:00
Laurent Destailleur
ef94ea5c26 Fix: Keep feature as hidden feature because when enabled, it is a 
security hole (every worm can modify/edit data calling public urls).
 2012-04-28 15:50:52 +02:00
Laurent Destailleur
84a0d93475 New: Can add a link or tooltip on fields into dictionnaries. 2012-04-28 14:52:53 +02:00
Regis Houssin
e543bc1ac4 New: add Savant pure php template engine 2012-04-27 15:18:32 +02:00
Regis Houssin
fc468e4409 Fix: change files name 2012-04-27 11:57:36 +02:00
Regis Houssin
8dccd3cfea Merge pull request #185 from grandoc/develop 
to use personal contacts.tpl within personal theme, and fix error for js...
 2012-04-27 02:53:37 -07:00
Grand Philippe
b34ecf757d to use personal contacts.tpl within personal theme, and fix error for js file 2012-04-27 11:40:11 +02:00
Regis Houssin
3d272a2a3e Merge pull request #183 from grandoc/develop 
add jquery plugin, and uniformize code
 2012-04-27 02:36:04 -07:00
Regis Houssin
2a155bb8b9 Merge pull request #184 from FHenry/doli_develop 
Feature Clone project (357) and other tricks
 2012-04-27 02:32:16 -07:00
Grand Philippe
a8d12a7c48 to use personal contacts.tpl within personal theme 2012-04-27 11:13:59 +02:00
FHenry
1aece03b6b Set same space than develop branch 2012-04-27 11:09:53 +02:00
Grand Philippe
834a6f9d02 add jquery plugin, and uniformize code 2012-04-27 11:04:29 +02:00
FHenry
073e06ab8f Feature Clone project (357) and other tricks 
Fix variable date property name, to be compliant with variable naming
convention (create)
Add feature to shift task date when change project start date (option)
Add project start/end date on Project->Task View
 2012-04-27 11:03:01 +02:00
simnandez
67ba805d90 [ task #297 ] Add a installer for external modules 2012-04-27 09:11:03 +02:00
Raphaël Doursenaud
27ff111e51 Typo: instantanée ne prend qu'un n. 2012-04-26 15:47:21 +02:00
Raphaël Doursenaud
9237d7b8ee Fix: typo in unset 2012-04-26 15:32:34 +02:00
Regis Houssin
8cf1da4ddb Fix: mac os compatibility 2012-04-26 15:02:29 +02:00
Regis Houssin
b48f2ae1f9 New: update jquery datatables with 1.9.1 2012-04-26 13:28:24 +02:00
Regis Houssin
1dd12db306 Todo: Use hookmanager for external modules 2012-04-26 10:54:39 +02:00
simnandez
429851cb49 Fix: Bad include 2012-04-26 10:52:10 +02:00
Regis Houssin
0ad2c4a027 Fix: problem of line break between label and description when 
using fckeditor
 2012-04-26 10:30:18 +02:00
Regis Houssin
ff6624f5f1 Merge pull request #177 from simnandez/develop 
[ task #297 ] Add a installer for external modules. Init works
 2012-04-25 09:29:20 -07:00
Regis Houssin
071cef15bf Merge pull request #175 from grandoc/develop 
Prepair to display receiptdocument within a custom place and uniformize ...
 2012-04-25 09:27:03 -07:00
Regis Houssin
bd0464b4db Merge pull request #174 from FHenry/develop 
Remove Eclipse Warning (Undeclare variable)
 2012-04-25 09:26:40 -07:00
Grand Philippe
078c0d0743 to use personal contacts.tpl within personal theme 2012-04-25 17:09:02 +02:00
simnandez
25df346bd3 [ task #297 ] Add a installer for external modules 2012-04-25 16:52:35 +02:00
simnandez
5b7ff51ffc [ task #297 ] Add a installer for external modules. Init works 2012-04-25 12:41:00 +02:00
FHenry
07bff417e8 remove useless line 2012-04-24 16:15:46 +02:00
FHenry
5ed77c8d40 Rename global variable from MAIN_SOCIETE_UNSUBSCRIBE to 
MAILING_EMAIL_UNSUBSCRIBE to be reliable on dolibarr implementation
 2012-04-22 11:19:04 +02:00
Grand Philippe
559c7974e9 shipping receipt modele can be used from a custom directory 2012-04-22 10:02:12 +02:00
Grand Philippe
c190d4ddf8 fix : shipping specimen is displayed, and shipping modele can be used from custom place 2012-04-22 09:28:39 +02:00
Grand Philippe
04f2b04dcf try to fix : shipping specimen model not displayed 2012-04-22 00:41:13 +02:00
Laurent Destailleur
afb79d5d2c Fix: [ bug #367 ] "Multi-tiers" fonctionality inverted in project 
contacts.
 2012-04-21 19:45:25 +02:00
Laurent Destailleur
80de63d5a3 Fix: [ bug #372 ] Upgrade error from 3.1.0 to 3.2.0 Beta 2012-04-21 19:45:04 +02:00
Grand Philippe
bc3f121d5a fix : receipt specimen was not displayed 2012-04-21 18:40:37 +02:00
Grand Philippe
078d01b4ee Prepair to display receiptdocument within a custom place and uniformize code 2012-04-21 18:31:20 +02:00
Laurent Destailleur
c74b34969b Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-04-21 18:30:15 +02:00
Laurent Destailleur
c7b8184844 Add more sources 2012-04-21 18:22:57 +02:00
Laurent Destailleur
26d5392e34 Add more sources 2012-04-21 18:22:10 +02:00
Laurent Destailleur
3afbd182b4 Fix: Missing css style 2012-04-21 12:30:39 +02:00
Laurent Destailleur
dca1c715d4 Fix: Try a fix for the lost mainmenu session. 2012-04-20 22:52:57 +02:00
FHenry
07fc51b7ff Remove Eclipse variable warning 2012-04-20 15:54:37 +02:00
FHenry
668bec3775 Remove Eclipse Warning (Undeclare variable) 2012-04-20 15:48:48 +02:00
Laurent Destailleur
f1cc8c05f2 Fix: Can clone a proposal 2012-04-20 14:09:38 +02:00
Laurent Destailleur
c42a854a87 Fix: wrong encoding of special chars 2012-04-20 14:09:30 +02:00
Laurent Destailleur
c691de6046 Fix: Field must be reset after adding. 2012-04-20 13:55:14 +02:00
Laurent Destailleur
4b8eeead2c Fix: Add hidden option to restore lost feature. 2012-04-20 13:55:06 +02:00
Laurent Destailleur
334adf7ae2 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:54:57 +02:00
Laurent Destailleur
062170b484 Fix: textarea field was not detected 2012-04-20 13:54:50 +02:00
Laurent Destailleur
5b4b7f33ea Fix: Missing translation 2012-04-20 13:54:42 +02:00
Laurent Destailleur
afc53fefe9 Change to help to fight the mainmenu lost bug. 2012-04-20 13:07:53 +02:00
Laurent Destailleur
62fa57da52 Fix: Bad url syntax 2012-04-20 12:45:14 +02:00
Laurent Destailleur
dc97e757ff Fix: left menu for home menu 2012-04-20 12:44:52 +02:00
Laurent Destailleur
fd5f0fb2d8 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:24:47 +02:00
Laurent Destailleur
716b605d27 Fix: bad case of construct key word 2012-04-20 09:48:00 +02:00
Laurent Destailleur
010f19d531 Fix: upload dir 2012-04-20 09:45:16 +02:00
simnandez
68b98e2e2a Fix: [ bug #370 ] Filter in accountancy -> suppliers_bills 2012-04-20 09:32:39 +02:00
simnandez
04b5ffcf64 Fix: [ bug #370 ] Filter in accountancy -> suppliers_bills 2012-04-20 09:32:32 +02:00
simnandez
90ecb566d8 Fix: [ bug #368 ] Product list 2012-04-20 09:32:24 +02:00
Regis Houssin
41b29b03b5 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-04-18 18:54:10 +02:00
Laurent Destailleur
d957076955 Update xcache and xtrigger info pages 2012-04-18 15:16:34 +02:00
Laurent Destailleur
658911b8c9 Qual: Move embeded style into css files. Add more styles. 2012-04-18 14:27:31 +02:00
Laurent Destailleur
2670f356f1 Fix: no mainmenu nor leftmenu into public pages 2012-04-18 13:04:05 +02:00
Regis Houssin
46234024c8 Fix: Bug #369 2012-04-18 12:42:41 +02:00
Laurent Destailleur
4ac9947772 Fix: project info are not lost when submiting actions on tasks 2012-04-18 12:15:14 +02:00
Laurent Destailleur
a15ab9c4c5 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-04-18 11:52:16 +02:00
Laurent Destailleur
2332a5a133 Fix: left was used for right style 
Fix: Difference between menu and search box was lost.
 2012-04-18 11:51:45 +02:00
FHenry
300b0e02da Fix: Bug #362 and clean code 2012-04-18 11:16:15 +02:00
Laurent Destailleur
b18dbaded9 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-04-18 01:17:50 +02:00
Laurent Destailleur
d906d8af16 Fix: Restore broken feature 2012-04-18 01:01:46 +02:00
Regis Houssin
a1ac69f614 New: add Amarok theme (experimental) 2012-04-17 11:50:25 +02:00
Laurent Destailleur
dc547cfa7d Look: Uniformize look 2012-04-17 11:40:08 +02:00
Laurent Destailleur
4be802597d Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-04-17 10:28:11 +02:00
Laurent Destailleur
220d7a2c33 Fix: eldy theme still works without css3 2012-04-17 10:27:42 +02:00
Regis Houssin
65b9d6281d Merge pull request #168 from grandoc/develop 
update approve function
 2012-04-16 03:20:00 -07:00
Laurent Destailleur
66531ea539 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/fourn/commande/index.php
 2012-04-16 12:03:33 +02:00
Laurent Destailleur
9114fec4ed Doxygen 2012-04-16 12:01:32 +02:00
Regis Houssin
6c3e88e43a Fix: missing field change name 2012-04-16 11:52:27 +02:00
Laurent Destailleur
9e0cd530bc New: Add date approve into log view. 2012-04-16 11:43:19 +02:00
Regis Houssin
a03b216c63 Fix: remove unnecessary function 2012-04-16 11:39:51 +02:00
Laurent Destailleur
48542b8625 Fix: Must use tms date 2012-04-16 11:39:26 +02:00
Regis Houssin
258a06a281 Fix: increase size of "body" field 2012-04-16 11:20:56 +02:00
Laurent Destailleur
f7acd0f5c3 Fix: Bad path for instal.lock 2012-04-16 11:07:09 +02:00
Grand Philippe
30c5160007 update approve function 2012-04-16 09:50:02 +02:00
Laurent Destailleur
b315bf3e3a Fix: Generate donation document 2012-04-16 01:23:53 +02:00
Laurent Destailleur
f9e2fe0440 Fix: date must be quoted 2012-04-15 19:22:43 +02:00
Laurent Destailleur
b23bbc2432 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/projet/class/task.class.php
 2012-04-15 18:49:09 +02:00
Laurent Destailleur
9a70541084 Fix: Missing migration field 
Fix: Date must be quoted
 2012-04-15 18:41:38 +02:00
Regis Houssin
48543a0d2f Fix: sorry it's ok 2012-04-15 18:33:14 +02:00
Laurent Destailleur
58f9cc2f7b Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-04-15 18:19:21 +02:00
Regis Houssin
de20b6b70e Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-04-15 18:19:04 +02:00
Laurent Destailleur
ef79c1ba21 Fix: commit at wrong place 2012-04-15 18:18:46 +02:00
Regis Houssin
057103902b Fix: you can not delete project document folder in delete task method 2012-04-15 18:17:55 +02:00
Regis Houssin
f85eced62d Merge pull request #167 from grandoc/develop 
fix : trad
 2012-04-15 08:58:38 -07:00
Laurent Destailleur
0f8156ebcf Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-04-15 17:56:30 +02:00
Laurent Destailleur
4f1f25b89c Fix: numbering when reset is on was wrong for past dates 2012-04-15 17:55:45 +02:00
FHenry
bf8389144a correct bug 364 2012-04-15 17:51:05 +02:00
FHenry
d66eb5bb23 Corect bug #364 2012-04-15 17:50:50 +02:00
FHenry
cac4d0da6b Correct bug 363 2012-04-15 17:50:40 +02:00
FHenry
d7ae9db463 Correct bug #363 2012-04-15 17:50:26 +02:00
Grand Philippe
d79c8a3fa1 change from cloture to approve and complete function approve 2012-04-15 16:49:49 +02:00
Grand Philippe
548bbe78e6 Merge remote-tracking branch 'dolibarr/develop' into develop 2012-04-15 16:32:45 +02:00
Laurent Destailleur
8562cb677d Fix: Restore lost fix into tcpdf 2012-04-15 15:46:50 +02:00
Laurent Destailleur
269a4a8ba8 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-04-15 15:25:14 +02:00
Grand Philippe
f218aa0ec6 fix : trad 2012-04-15 12:27:10 +02:00
Regis Houssin
161e39794e Fix: security update for multicompany 2012-04-15 11:30:06 +02:00
Regis Houssin
a2f363c24b Fix: right access error 2012-04-15 10:09:32 +02:00
Regis Houssin
f0f74a7d92 Fix: disable php display errors with $dolibarr_main_prod 2012-04-15 09:30:40 +02:00
Regis Houssin
6a3587adb5 Merge pull request #165 from grandoc/develop 
try to fix create issue...but not enought
 2012-04-14 23:27:36 -07:00
Laurent Destailleur
c4c2b4ee7f Fix: PHP 5.4 2012-04-14 20:21:06 +02:00
Laurent Destailleur
df13921ed4 Germany data not complete. 2012-04-14 19:31:10 +02:00
Grand Philippe
5858ef3bf1 try to fix create issue...but not enought 2012-04-14 19:10:15 +02:00
Laurent Destailleur
ebc9cc2ad7 Fix: Some bug into rpm and debian packaging. 2012-04-14 15:41:34 +02:00
Laurent Destailleur
0d42b96b98 Fix: licence pb with fedora 2012-04-14 15:41:03 +02:00
Regis Houssin
e49df57667 Fix: compatibility with php 5.4 and E_STRICT mode 2012-04-14 15:04:46 +02:00
Laurent Destailleur
c876b6f2be Fix: debian epiphany and iceweasel browsers. 2012-04-14 03:20:10 +02:00
Laurent Destailleur
45e61b1a10 Fix: logo size was too large. 2012-04-14 02:54:07 +02:00
Regis Houssin
ad5770ac21 Fix: not set delivery date during create 2012-04-13 19:13:48 +02:00
Regis Houssin
f2c5e1f984 Merge pull request #163 from grandoc/develop 
uniformise code and fix rights
 2012-04-13 06:36:14 -07:00
Grand Philippe
980fa86857 uniformise code and fix rights 2012-04-13 14:02:53 +02:00
Regis Houssin
026ee8ddb7 New: add possibility to define a page break, its very important for 
internal and external modules (milestone)
 2012-04-12 20:52:41 +02:00
Regis Houssin
a2fc719a22 Merge pull request #162 from FHenry/develop 
correct bug #360
 2012-04-12 02:17:54 -07:00
FHenry
adce88c4d1 correct bug #360 2012-04-12 11:02:11 +02:00
Regis Houssin
578e13cfc6 Fix: missing date fields 2012-04-12 10:52:53 +02:00
Regis Houssin
4077ed9817 Fix: missing fields fk_user_valid and fk_user_cloture 2012-04-12 10:03:55 +02:00
Laurent Destailleur
dd4d684490 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-04-12 00:02:17 +02:00
Laurent Destailleur
14ad919109 Fix: Avoid fall of funtion if not defined 2012-04-11 17:30:51 +02:00
Regis Houssin
025a38cb60 Merge pull request #161 from grandoc/develop 
trad missing
 2012-04-11 08:19:39 -07:00
Regis Houssin
c2d162d4c6 Fix: add Monaco VAT rates 2012-04-11 16:52:55 +02:00
Grand Philippe
cf9d1b10b5 trad missing 2012-04-11 16:33:04 +02:00
Regis Houssin
6964a0a0c2 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-04-11 16:28:20 +02:00
Regis Houssin
68e5229e9b Fix: missing langs object 2012-04-11 16:26:45 +02:00
Laurent Destailleur
11c174e209 New: Can export supplier ref 
New: Add profid6
 2012-04-11 15:27:03 +02:00
Laurent Destailleur
0faa5d9196 Fix: this must not be used inside static classes 2012-04-11 14:44:54 +02:00
Laurent Destailleur
7daea97ebb Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-04-11 14:38:13 +02:00
Laurent Destailleur
0cb1e4fe7c New: Add supplier ref on supplier orders 2012-04-11 14:37:36 +02:00
Laurent Destailleur
f4cd202a29 Use correct function 2012-04-11 13:29:45 +02:00
Laurent Destailleur
f1d1b0972f Bad comment 2012-04-11 13:29:23 +02:00
FHenry
4e759b15fe Correction Bug #358 2012-04-11 10:03:57 +02:00
FHenry
ba499c0b40 Merge remote-tracking branch 'origin/develop' into develop 2012-04-11 08:42:10 +02:00
Regis Houssin
97f4a74ad0 Merge pull request #157 from FHenry/develop 
Add __MAILTOEMAIL__ and configutation gobal varialbe of Check Read and
 2012-04-10 23:23:42 -07:00
Regis Houssin
83135225c3 Merge pull request #159 from grandoc/develop 
Develop
 2012-04-10 23:18:07 -07:00
Grand Philippe
c78723a3e8 to add delivery date 2012-04-10 19:43:44 +02:00
Grand Philippe
c8dd3b4801 to add delivery date 2012-04-10 17:21:28 +02:00
Grand Philippe
06761d9753 uniformise code 2012-04-10 15:41:27 +02:00
FHenry
c59f01a70d trad FR 2012-04-10 14:39:12 +02:00
FHenry
cec2a5e7f9 Translation ES 2012-04-10 14:38:32 +02:00
FHenry
2749117aba Add __MAILTOEMAIL__ and configutation gobal varialbe of Check Read and 
unsubscribe in Admin part
 2012-04-10 14:32:54 +02:00
Laurent Destailleur
e3b9a3a023 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-04-10 12:40:24 +02:00
Laurent Destailleur
bc8d9d9d87 Fix: Removed warning 2012-04-10 12:38:10 +02:00
Regis Houssin
02d2872ac5 Fix: invert emetteur and problem with long phone number 2012-04-10 12:35:14 +02:00
Regis Houssin
42c3c6a02d Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-04-10 12:04:58 +02:00
Regis Houssin
f5097dd605 Fix: missing company logo and invert from to ! 2012-04-10 12:04:14 +02:00
Laurent Destailleur
caf2ad85ed Fix: bad link 2012-04-10 11:18:01 +02:00
Laurent Destailleur
6618c4e658 Fix: W3C 2012-04-10 11:00:42 +02:00
Laurent Destailleur
0b808b42f9 Fix: translation 2012-04-10 10:55:20 +02:00
Regis Houssin
98f7186d03 Fix: best practice 2012-04-10 08:46:23 +02:00
Laurent Destailleur
37ce5d9fca 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:25:52 +02:00
Laurent Destailleur
1571134f7d Revert "Fix: security" 
This reverts commit 380a8109e8.
 2012-04-10 01:04:18 +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
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
380a8109e8 Fix: security 2012-04-09 22:32:20 +02:00
Laurent Destailleur
1ec9125ff9 Move to 3.3 alpha 2012-04-09 16:51:17 +02:00
Laurent Destailleur
60e9bc9e8e Fix: Rounding 2012-04-09 01:20:33 +02:00
Laurent Destailleur
2d9ed89a8d Fix: Back page to list of contacts 2012-04-09 01:02:36 +02:00
Laurent Destailleur
d9b12f4802 Fix: rounding 2012-04-08 23:31:54 +02:00
Laurent Destailleur
70202f2c0c New logo 2012-04-08 23:30:56 +02:00
Laurent Destailleur
6da82e03be Uniformize code 2012-04-08 23:18:36 +02:00
Laurent Destailleur
557d5e775a Fix: log 2012-04-08 14:21:42 +02:00
Laurent Destailleur
8b15847742 New: Add link to dolistore into help message 2012-04-08 14:14:56 +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
5817b16923 Fix: W3C 2012-04-08 12:14:27 +02:00
Laurent Destailleur
a2825eb209 Fix: [ bug #318 ] Journal des achats 2012-04-08 01:58:33 +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
Laurent Destailleur
ad953f05c8 Fix: late/not late switch dos not loose parameters. 2012-04-07 14:01:40 +02:00
Regis Houssin
507e809613 Merge pull request #156 from viniciusvgn/develop 
Updates: Tax Brasil and link to filter only those bills late
 2012-04-07 01:41:03 -07: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
Vinicius Nogueira
78c5fc8cff Add Tax: Brasil 
Zero rate for the invoices to suppliers can be fulfilled.
 2012-04-07 01:45:48 -03: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
Laurent Destailleur
3c19b91174 Fix: Restore broken feature 2012-04-07 01:03:55 +02:00
Vinicius Nogueira
510cf06610 Add: Added link to filter only those bills late. 
Added link to filter only Those bills late or show all invoices from
suppliers, so there was this link for customer invoices, this link is
extremely important for the operator.
 2012-04-06 19:34:30 -03:00
Laurent Destailleur
b429df9d11 Fix: pgsql 2012-04-07 00:30:36 +02:00
Laurent Destailleur
fd26400339 Fix: Can't create contract 2012-04-07 00:22:44 +02:00
Laurent Destailleur
37bff53fb5 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-04-06 23:39:13 +02:00
Laurent Destailleur
a4d4d2f33a Fix: Delete setup for old not compatible theme 2012-04-06 23:38:52 +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
533d862470 Fix: wrong var name and multi-line function call not indented correctly 2012-04-06 08:34:33 +02:00
Laurent Destailleur
ca8acdd5f0 Bad char 2012-04-06 00:45:31 +02:00
Laurent Destailleur
066f6cfb50 Update language files 2012-04-06 00:44:02 +02:00
Laurent Destailleur
8f836d82cb Fix: Better fix 2012-04-06 00:36:21 +02:00
Laurent Destailleur
3d3b939c4c Merge pull request #145 from viniciusvgn/develop 
Fix: Problem Loading The Type of Payment
 2012-04-05 15:20:23 -07:00
Laurent Destailleur
4cc13064db Fix: W3C 2012-04-05 21:15:09 +02:00
Laurent Destailleur
0438bee3e2 Fix: Bad name 2012-04-05 21:03:47 +02:00
Laurent Destailleur
befaf655aa Fix: Disable feature by default. Need option MAIN_SOCIETE_UNSUBSCRIBE to 
enable because feature is a security hole.
 2012-04-05 21:02:00 +02:00
Laurent Destailleur
66b001653c Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-04-05 20:36:24 +02:00
Laurent Destailleur
00a1e999f4 Fix: The prof id was not always visible and not at correct place for 
some countries.
 2012-04-05 20:33:40 +02:00
Regis Houssin
a22259907b Fix: possibility to custom helpdoc image 2012-04-05 20:12:11 +02:00
Regis Houssin
75859e6cd6 Fix: avoid warning 2012-04-05 19:25:58 +02:00
Regis Houssin
0a9882bef8 Merge pull request #155 from defrance69/develop 
Update htdocs/product/index.php
 2012-04-05 09:54:26 -07:00
Regis Houssin
ede06796e0 Merge pull request #154 from simnandez/develop 
Fix: Sanitize data
 2012-04-05 09:50:55 -07:00
simnandez
a8b0493531 Fix: Sanitize data 2012-04-05 16:20:37 +01:00
FHenry
6d9d0c60e2 . 2012-04-05 16:50:00 +02:00
FHenry
6f7773d7e2 Correction lien desincription et mailto:email 2012-04-05 16:45:41 +02:00
Regis Houssin
4c9cc63f17 Merge pull request #152 from grandoc/develop 
Prepair to display within a custom place
 2012-04-05 05:54:30 -07:00
Grand Philippe
df132198df Prepair to display within a custom place 2012-04-05 14:49:51 +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
defrance69
8cfed3ff3f Update htdocs/product/index.php 2012-04-05 14:01:15 +03:00
Grand Philippe
a66c18c4f8 Prepair to display within a custom place 2012-04-05 13:00:09 +02:00
Regis Houssin
601a4c20fa Merge pull request #150 from grandoc/develop 
Prepair to display within a custom place
 2012-04-05 02:53:52 -07:00
Grand Philippe
d3068e0ba5 Prepair to display within a custom place 2012-04-05 11:46:56 +02:00
Regis Houssin
b30669a5d6 Fix: missing $langs 2012-04-05 11:07:16 +02:00
Laurent Destailleur
03cfec7904 Fix: Add missing sao polo for brazil 2012-04-05 00:13:06 +02:00
Laurent Destailleur
d30cd86dcd Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-04-04 21:45:07 +02:00
Laurent Destailleur
a98439aeba Fix: install process 2012-04-04 21:44:35 +02:00
Laurent Destailleur
4b3d2cc273 Fix: Removed warning 2012-04-04 20:37:36 +02:00
Laurent Destailleur
e084dc306e Fix: When run from command line, script must return return code 2012-04-04 20:37:16 +02:00
Laurent Destailleur
b3c66fc123 Fix: Removed warning 2012-04-04 20:18:39 +02:00
Laurent Destailleur
cbe2e3c15c Preapre 3.2.0 2012-04-04 17:54:11 +02:00
Regis Houssin
cd170db28b Merge pull request #149 from grandoc/develop 
prepair to use within custom place
 2012-04-04 08:52:38 -07:00
Grand Philippe
922b4ae511 prepair to use within custom place 2012-04-04 17:48:47 +02:00
Laurent Destailleur
4e65d12a0f Fix: The draft view must be at same place for all pages. We will have to 
discuss to move all or not later.
 2012-04-04 17:43:32 +02:00
Laurent Destailleur
5e4af76585 Fix: Add cache directive for all export types 2012-04-04 17:42:50 +02:00
Laurent Destailleur
a6bbe1032d Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-04-04 17:37:20 +02:00
Laurent Destailleur
58d6aafa62 Prepare code for module 2012-04-04 17:25:06 +02:00
simnandez
7bf0d77e5c Fix: Sanitize data 2012-04-04 15:53:59 +01:00
simnandez
4a34a34ea5 Trad: Add link to promote dolicloud and dolibox into about page. 2012-04-04 15:38:25 +01:00
FHenry
5bfff3920f Module e-maillling : Correctif et evolution Accusé de lecture et 
desinscription
 2012-04-04 15:23:32 +02:00
Regis Houssin
c57063878d New: add workflow module part for external modules 2012-04-04 09:29:05 +02:00
Vinicius Nogueira
4be4538028 Trans: Added line that was missing 2012-04-03 23:45:00 -03:00
Vinicius Nogueira
665fe60f62 Trans: PT-BR Update 2012-04-03 20:11:35 -03:00
Vinicius Nogueira
4f22baf1d1 Revert "Revert "alt"" 
This reverts commit 5eb8735fba17847e36c9074985d5bf06f3feae64.
 2012-04-03 20:11:34 -03:00
Vinicius Nogueira
a7b71c2e48 Revert "alt" 
This reverts commit d0be911b2ea0d16dcaa5704d580122a2bdd11b68.
 2012-04-03 20:11:34 -03:00
Vinicius Nogueira
0246ebb38f alt 2012-04-03 20:11:34 -03:00
Regis Houssin
14b6173d87 Fix: add width and minimum height of cells parameters 2012-04-03 18:01:27 +02:00
Regis Houssin
d7c8f4d5c3 Fix: compatibility with external modules 2012-04-03 17:09:05 +02:00
FHenry
872f580b37 Just comment and Log change 2012-04-03 23:03:26 +08:00
Laurent Destailleur
2eced65db9 Fix: Use cache only if we ask it 2012-04-03 16:41:39 +02:00
Raphaël Doursenaud
55fbbc85a5 Agenda export: Tweaked HTTP headers for Google Agenda import 2012-04-03 17:27:48 +08:00
Vinicius Nogueira
da50a6dacc Trans: Update Contacts/Address 2012-04-03 17:26:41 +08:00
Vinicius Nogueira
cd201028a6 Trans: PT-BR Update 2012-04-03 17:26:41 +08:00
Vinicius Nogueira
4110f250a7 New: Box Status and Box Drafts changed position 
Show all Status and give the possibility to filter only one, and Drafts
position of the box changed to a better visualization
 2012-04-03 17:26:40 +08:00
Regis Houssin
cde000e9ce Fix: sharing code 2012-04-03 17:24:31 +08:00
Laurent Destailleur
bb67c95c3d Uniformize code 2012-04-02 20:08:08 +02:00
Laurent Destailleur
84057d46cc Checkstyle 2012-04-02 18:37:37 +02:00
Laurent Destailleur
289a2afee9 Checkstyle 2012-04-02 18:29:08 +02:00
Laurent Destailleur
5ba7d88c36 Fix: Error when url is too long 2012-04-02 13:28:22 +02:00
Laurent Destailleur
96b369e9db Fix: Duplicate fields 2012-04-02 13:10:22 +02:00
Laurent Destailleur
58e35b307c New: Add option MEMBER_MIN_AMOUNT to force subscription never lower than 
value
 2012-04-02 12:32:55 +02:00
Laurent Destailleur
c014709090 Fix: Bad date format 2012-04-02 10:50:20 +02:00
Laurent Destailleur
440a3305f5 Fix: search on ref 2012-04-02 10:43:19 +02:00
Laurent Destailleur
233af62e16 Qual: Uniformize code. 
Fix: This also fix pb in filters.
 2012-04-02 10:26:06 +02:00
Laurent Destailleur
46251db167 Qual: Use a shared function to define logo heigth. 
Qual: Add more phpunit tests
Fix: This also solve overlapping logos.
 2012-04-01 23:57:15 +02:00
Laurent Destailleur
cf68414b21 Checkstyle 2012-04-01 20:38:22 +02:00
Laurent Destailleur
e2e51ecc30 Checkstyle 2012-04-01 20:31:39 +02:00
Laurent Destailleur
fbe6fe7ac4 Checkstyle 2012-04-01 20:26:25 +02:00
Laurent Destailleur
674cea6c90 Fix: Do not show warning on paid invoices 2012-04-01 19:46:22 +02:00
Laurent Destailleur
7379fd1553 New: Add link to back statement on bank line card. 2012-04-01 15:23:04 +02:00
Laurent Destailleur
aae8a65466 Fix: scrollbar 2012-03-31 18:34:42 +02:00
Laurent Destailleur
79291ff610 Fix: Trans 2012-03-31 18:34:28 +02:00
Laurent Destailleur
2dcd966046 Add link to promote dolicloud and dolibox into about page. 2012-03-31 16:24:34 +02:00
Laurent Destailleur
c77bc5adf5 Doxygen 2012-03-31 15:42:33 +02:00
Laurent Destailleur
ea7e4c6f8a Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-31 14:22:18 +02:00
Laurent Destailleur
39630db91a New: Add filter to search on suplier ref 2012-03-31 14:21:36 +02:00
Regis Houssin
ae2bf52d05 Fix: add member ID in substitution method 2012-03-31 10:14:45 +02:00
Laurent Destailleur
485363eefa Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-30 00:55:16 +02:00
Laurent Destailleur
d8c975da3d More fields into import of products 2012-03-30 00:54:41 +02:00
simnandez
f2e7afafd3 Fix: Sanitize data 2012-03-29 17:04:10 +01:00
simnandez
78e2d85e66 Trad: Fix missing translation 2012-03-29 11:48:02 +01:00
simnandez
f14d294925 Fix: Sanitize data 2012-03-29 11:41:11 +01:00
simnandez
ae37a5bf86 Trad: Fix missing translation for products attributs 2012-03-29 10:19:52 +01:00
Regis Houssin
97cbaf0c06 Update htdocs/adherents/admin/adherent.php 2012-03-29 11:58:35 +03:00
simnandez
a0cae7709c Fix: Sanitize data 2012-03-29 09:54:48 +01:00
simnandez
2e7ce7647b Fix: Sanizite data 2012-03-29 08:38:38 +01:00
Laurent Destailleur
3659191d83 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-28 20:13:15 +02:00
Laurent Destailleur
ec542f5ee5 New: Support tags into header and footer into ODT templates 2012-03-28 20:12:25 +02:00
Regis Houssin
b204ad5b84 Fix: multicompany compatibility 2012-03-29 01:42:05 +08:00
simnandez
956eb11172 Fix: Sanitize data 2012-03-28 16:49:36 +01:00
Laurent Destailleur
0370e06c84 Perf: Reduce nb of requests 2012-03-28 17:34:58 +02:00
Laurent Destailleur
fbfff99b80 Fix: Can delete a paiement if bank line was deleted. 2012-03-28 17:26:53 +02:00
Regis Houssin
973146ee46 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-28 16:16:51 +02:00
Laurent Destailleur
a8e37427bb Fix: Set date supplier invoice 2012-03-28 16:10:00 +02:00
Regis Houssin
d8d9062606 Fix: duplicate end tag and rename form parts 2012-03-28 16:03:04 +02:00
simnandez
3b8694432c Fix: Sanitize data 2012-03-28 09:57:02 +01:00
Laurent Destailleur
3e7136459f Fix: Reorder boxes 2012-03-28 02:57:49 +02:00
Laurent Destailleur
daf2a19396 New: Add signature at end of predefined email text 2012-03-28 00:56:12 +02:00
Laurent Destailleur
0c225372d6 Fix: Sanitize data 2 2012-03-27 18:36:32 +02:00
Laurent Destailleur
28cf1345e0 Fix: Sanitize data 2012-03-27 18:33:34 +02:00
Regis Houssin
6b415931b1 Merge pull request #136 from simnandez/develop 
Fix: Uniformize code
 2012-03-27 01:08:12 -07:00
Laurent Destailleur
02624c8170 Checkstyle 2012-03-27 10:01:12 +02:00
Laurent Destailleur
78ae7dc075 Checkstyle 2012-03-27 09:59:28 +02:00
simnandez
c7bfb82999 Fix: Uniformize code 2012-03-27 08:56:37 +01:00
Laurent Destailleur
325d055fbb Try a checkstyle fix 2012-03-27 09:46:00 +02:00
Laurent Destailleur
52f4f72e6f Checkstyle 2012-03-26 22:39:43 +02:00
Laurent Destailleur
66c2d24b9e Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-26 22:29:19 +02:00
Laurent Destailleur
f52a07eee5 Minor look fix, fix into ecm module when dir does not exists 2012-03-26 18:23:08 +02:00
Laurent Destailleur
e6efef9e5c Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-26 10:00:17 +02:00
Laurent Destailleur
e33b0dc01a Uniformize code with filemanager module 2012-03-26 09:57:52 +02:00
Regis Houssin
d7d5681b4b Fix: avoid phpunit warning 2012-03-26 08:18:03 +02:00
Laurent Destailleur
ffc0b2b44c Update ecm 2012-03-26 03:09:35 +02:00
Laurent Destailleur
350fcf52a9 Fix: W3C 2012-03-26 00:36:50 +02:00
Laurent Destailleur
1abe113627 Fix style 2012-03-26 00:27:14 +02:00
Laurent Destailleur
efc1c19737 New: Add option to move JNotify message position at bottom 
Work on ajax ecm module.
 2012-03-26 00:14:42 +02:00
Laurent Destailleur
74c39a10a2 Work on ajax ecm module 2012-03-25 22:47:37 +02:00
Laurent Destailleur
7d14ce2386 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-25 14:26:48 +02:00
Laurent Destailleur
693d0441b3 Fix: json emulated function now support utf8 char. 2012-03-25 14:25:32 +02:00
Grand Philippe
b3e55e179f first step to use fichinter within a custom place 2012-03-24 18:15:07 +01:00
Laurent Destailleur
8e745c88c5 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-24 15:21:09 +01:00
Laurent Destailleur
39ded746dc Work on ecm module using ajax 2012-03-24 15:20:49 +01:00
Regis Houssin
cf7170c14d Fix: set to null if empty 2012-03-24 22:18:11 +08:00
Regis Houssin
30fb26296d Fix: add check array in GETPOST 
New: update multiselect with a fork
 2012-03-24 21:20:22 +08:00
Regis Houssin
0aa40b0503 Fix: add multiselectarray() method and jQuery multiselect plugin 2012-03-24 19:52:28 +08:00
Regis Houssin
83272dfd69 Fix: compatibility with edit in place 2012-03-23 21:22:47 +01:00
Regis Houssin
d5aad28768 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/comm/mailing/fiche.php
 2012-03-23 20:06:11 +01:00
Regis Houssin
8c7f405ac9 Fix: uniformize code 2012-03-23 20:03:57 +01:00
Laurent Destailleur
187dc0d762 Work on epxerimental feature MAIN_ECM_TRY_JS 2012-03-23 19:43:25 +01:00
Regis Houssin
ffc6812241 Fix: avoid php strict mode warning 2012-03-23 18:19:50 +01: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
f5bd5677de Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-23 09:59:38 +01:00
Regis Houssin
1bcbe02562 Fix: wrong original values 2012-03-23 09:15:14 +01:00
Regis Houssin
de16037b93 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-23 09:03:58 +01:00
Regis Houssin
77623a9c1b Fix: compatibility with ckeditor 2012-03-23 09:03:36 +01:00
Laurent Destailleur
8317ee1ece Prepare code for 6 professional id. 2012-03-23 00:51:38 +01:00
Laurent Destailleur
ebaad9ded8 Fix permission vision 2012-03-23 00:27:12 +01:00
Laurent Destailleur
6b2c141083 Uniformize page name. 2012-03-23 00:08:34 +01: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
Laurent Destailleur
38ca31cf77 Doxygen 2012-03-22 09:34:06 +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
e0a89592bf Remove useless sentence with pgsql 2012-03-21 22:29:54 +01:00
Laurent Destailleur
f37e3956b8 Prepare code to allow usage of ajax in ecm module 2012-03-21 21:32:36 +01:00
Laurent Destailleur
ee1c507190 Add id on field 2012-03-21 21:31:10 +01:00
Laurent Destailleur
fb6f3504e2 Qual: removed useless code 2012-03-21 21:30:08 +01:00
Laurent Destailleur
3ef88384b8 New: Add parameter unaccent 2012-03-21 15:58:04 +01:00
Laurent Destailleur
b098838b6f Fix: Bad error management when enabling/disabling modules 2012-03-21 13:50:59 +01:00
Laurent Destailleur
89c906dde6 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-21 12:51:09 +01:00
Laurent Destailleur
ab6c1a5160 Qual: Add new PHPUnit test and fix bugs the test show me 2012-03-21 12:33:51 +01:00
Regis Houssin
33bf32073f Fix: add more debug log 2012-03-21 11:17:52 +01:00
Regis Houssin
1aa71803ce Fix: add begin/commit/rollback 2012-03-21 10:08:49 +01:00
Regis Houssin
2341e6c881 Fix: add log for debug phpunit error 2012-03-21 09:47:55 +01:00
Regis Houssin
95aa484e44 Fix: move in constructor 2012-03-21 08:53:49 +01:00
Regis Houssin
aae57a9f98 Fix: remove deprecated method 2012-03-21 02:24:09 +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
Laurent Destailleur
c0013a4581 Fix: When using a disabled user, web service must be forbidden 2012-03-20 17:18:20 +01:00
Laurent Destailleur
6d7aba45de Regenerate password is disbaled for disabled users 2012-03-20 17:03:10 +01:00
Regis Houssin
b83026f883 Fix: for multicompany category sharing 2012-03-20 22:46:57 +08: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
Regis Houssin
507e9af5cb Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-20 14:42:53 +01:00
Regis Houssin
b7af14393c Fix: for multicompany category sharing 2012-03-20 14:42:43 +01:00
Laurent Destailleur
845fe95128 Return specific code for duplicate 2012-03-20 13:51:50 +01:00
Laurent Destailleur
4690944216 checkstyle 2012-03-20 12:46:57 +01:00
Regis Houssin
82cff13b66 Fix: missing type of category 2012-03-20 12:26:02 +01:00
Regis Houssin
dea518875d Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-20 11:59:53 +01:00
Regis Houssin
2967c2357e Fix: compatibility with multicompany 2012-03-20 11:59:18 +01:00
Laurent Destailleur
fc18414228 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-20 09:23:32 +01:00
Laurent Destailleur
97f0095251 PDF are better with all PDF sizes 2012-03-20 09:22:41 +01:00
Regis Houssin
ca341a1bb9 Fix: the truncation is really blocking, especially if you can view all 2012-03-20 08:54:33 +01:00
Laurent Destailleur
18aecbaa9e Add test to work with old FPDF. 2012-03-20 01:42:18 +01:00
Laurent Destailleur
e7d07c0a91 New: add supplier ref on supplier invoice. 2012-03-19 22:26:24 +01:00
Laurent Destailleur
d5c6c99493 checkstyle 2012-03-19 22:07:23 +01:00
Laurent Destailleur
4295699e0c Qual: Uniformize code and filename 2012-03-19 22:06:28 +01:00
Laurent Destailleur
0f87181c2a Add log info 2012-03-19 22:02:22 +01:00
Laurent Destailleur
b583e71552 Look: Increase tab size. Reduce size of css. Removed a non pretty line. 2012-03-19 18:54:12 +01:00
Laurent Destailleur
3383d314c9 Doxygen 2012-03-19 17:18:11 +01:00
Laurent Destailleur
5759523c7a Qual: removed useless tests 2012-03-19 16:16:04 +01:00
Laurent Destailleur
336d18edd7 Missing ; 2012-03-19 16:06:36 +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
Laurent Destailleur
99d740fd2f New: [ task #285 ] Add search filter on project in tasks list. 2012-03-19 14:44:27 +01:00
Laurent Destailleur
0b71aceb90 New: Each user can remove/add its own boxes. 2012-03-19 14:06:21 +01:00
Laurent Destailleur
d6588a53a1 Fix: Missing global 2012-03-19 11:22:59 +01:00
Laurent Destailleur
088947857e Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-19 10:46:41 +01:00
Laurent Destailleur
5e3e5cc5f7 Fix: rss example was deprecated 2012-03-19 10:46:16 +01:00
Regis Houssin
aefd43db2c Fix: rename deprecated field for avoid conflict 2012-03-19 10:17:24 +01:00
Laurent Destailleur
e4a5b6e24e Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-18 23:45:58 +01:00
Laurent Destailleur
fe9b244a38 Fix: Removed HTML5 warnings 2012-03-18 23:42:53 +01:00
Laurent Destailleur
e1d59b73a9 Fix: Removed warnings 2012-03-18 22:51:11 +01:00
Regis Houssin
3afb2878c2 Fix: broken indentation 2012-03-18 20:45:01 +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
ed41e03589 Qual: Fix a ton of CheckStyle errors 2012-03-18 19:23:01 +01:00
Laurent Destailleur
7c4ef2fbf7 Qual: Move some class as private 2012-03-18 17:47:17 +01:00
Laurent Destailleur
2086d4f3fa Add TODO comments 2012-03-18 17:31:36 +01:00
Laurent Destailleur
1fd5a0d755 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-18 17:17:10 +01:00
Regis Houssin
579df2b131 Add TODO 2012-03-18 15:30:01 +01:00
Regis Houssin
b82ff3f759 Fix: missing parameter 2012-03-18 15:22:15 +01:00
Regis Houssin
f66236af81 Fix: check only POST 2012-03-18 15:20:25 +01:00
Regis Houssin
05a5a0fc9a Fix: bypass GETPOST check with ckeditor 2012-03-18 15:15:11 +01:00
Regis Houssin
370979f6c6 Fix: for compatibility 2012-03-18 14:40:42 +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
23d523158a Doxygen 2012-03-18 12:51:13 +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
55af663784 More space between boxes 2012-03-18 03:48:12 +01:00
Laurent Destailleur
96e9e088e3 Doxygen 2012-03-18 02:22:54 +01:00
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
9ed46d9892 Fix: Navigation arrows were missing 2012-03-18 01:25:08 +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
d87f14b7ce Fix: minor change 2012-03-17 23:38:44 +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
c41fd9c314 Fix: test with auguria 2012-03-17 18:38:34 +01:00
Regis Houssin
bd4b24f1eb Fix: add <br> for default note tab 2012-03-17 18:27:31 +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
1ddcd5ffb0 Prepare to allow to define nb of lines fox each box 2012-03-17 14:59:45 +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
Laurent Destailleur
88a1a0f06d fix: Checkstyle 2012-03-17 14:03:31 +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
Regis Houssin
5e43b326fe Try to avoid phpunit error 2012-03-17 09:08:54 +01:00
Regis Houssin
da4a29462e Fix: php unit test error 2012-03-17 08:50:09 +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
Laurent Destailleur
4806f2ad54 New: Add webservice to get all product ids. 2012-03-16 23:06:38 +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
81a97edf9c Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-16 18:37:16 +01:00
Regis Houssin
205f884ec0 Fix: try to use div title with show/hide effect 2012-03-16 18:36:32 +01:00
Laurent Destailleur
826a5f80e9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-03-16 18:36:03 +01:00
Laurent Destailleur
aa195b9ecf New: Add web service to list product. Not stable yet. 2012-03-16 18:35:39 +01:00
Regis Houssin
8ab71288a6 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-16 17:40:41 +01:00
Regis Houssin
ccf1665837 Fix: missing status after set draft 2012-03-16 17:37:18 +01:00
Regis Houssin
5de859d14b Fix: missing colspan if view line number is active 2012-03-16 17:26:19 +01:00
Regis Houssin
fb38bba794 Merge pull request #133 from simnandez/develop 
Trad: Add ca_ES and es_ES missing translations
 2012-03-16 09:01:27 -07:00
Regis Houssin
b862b37731 New: update CKEditor to 3.6.2 2012-03-16 16:56:18 +01:00
simnandez
017701b3f1 Trad: Add ca_ES and es_ES missing translations 2012-03-16 16:33:27 +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
5a0ee19a0b Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-16 14:33:03 +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
e27bdac81a Fix: Restore correct name of field. 2012-03-16 13:27:03 +01:00
Laurent Destailleur
a0f6d5824d Fix: Better warning message. To lock install, recommanded solution is having an install.lock file, not deleting directory. 2012-03-16 11:23:53 +01:00
Regis Houssin
1622a86d71 New: possibility to view/edit notes in invoice card 2012-03-16 11:12:59 +01:00
Laurent Destailleur
7e69c79a29 Comments 2012-03-16 11:08:04 +01:00
Regis Houssin
0df083a8d8 Fix: update security 2012-03-16 10:55:29 +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
6ae4292563 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-16 09:36:21 +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
simnandez
00474e119f Fix: Bad departement name 2012-03-16 09:15:29 +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