Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
40,052 Commits 36 Branches 189 Tags
abc96b51fa815cd039f340984927e14b768aeead
Commit Graph

1200 Commits

Author SHA1 Message Date
Laurent Destailleur
8e313ef32d Fix: Can add ban record but was not possible to delete 2013-11-23 16:17:20 +01:00
Laurent Destailleur
64031f92fa Fix: Problem with W3C and wrapping of some title lines. 2013-11-23 14:50:13 +01:00
Florian Henry
f852c9a5bb Fix [ bug #1145 ] Agenda button list type do not display 2013-11-22 14:43:15 +01:00
Florian Henry
7f950d8b45 Fix user pram_ihm, display tab and allow modify button only is user 
right allow it is OK
 2013-11-21 12:28:51 +01:00
Laurent Destailleur
69f0d596ba Fix: Pagination 2013-11-18 12:20:53 +01:00
Laurent Destailleur
4356496ee8 Qual: File is not a class of a module 2013-11-18 00:20:05 +01:00
Laurent Destailleur
48570f599a Fix: form is not allowed into a table. This break some javascript and 
make some browsers crazy.
 2013-11-17 23:25:25 +01:00
Laurent Destailleur
c324f6a9a3 Merge pull request #1295 from FHenry/develop 
Display customer code (according setting) into list
 2013-11-15 05:05:36 -08:00
Laurent Destailleur
b3a1d695cd Qual: Better message for total of buying price 
Fix: Little debug of add link feature. Link was broken because of
missing http, fix W3C making output wrong with some browsers.
 2013-11-15 11:43:16 +01:00
Florian Henry
fe0006c71d Merge from dev 2013-11-13 21:34:02 +01:00
Florian Henry
a8e31ad956 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/lib/company.lib.php

Change-Id: Iec6a98430bfd500defda256862a1ed7869ef407a
 2013-11-13 21:33:12 +01:00
Laurent Destailleur
588a30fa80 Fix: Bad status 2013-11-13 21:14:11 +01:00
Florian Henry
652d7db0b4 Get Status from getLibStatus ! 2013-11-13 17:26:29 +01:00
Florian Henry
6d8871b4cf Add filter on show_contact company.lib.php 2013-11-13 17:02:30 +01:00
Raphaël Doursenaud
1fc2e495ba Moved unreachable statement 2013-11-08 14:42:28 +01:00
Raphaël Doursenaud
b6eecb0394 Developer documentation fix 2013-11-07 22:14:43 +01:00
Raphaël Doursenaud
8e1fd7a083 PHP doesn't know reals, use float 2013-11-07 21:48:46 +01:00
Raphaël Doursenaud
e514b50d7e Typo fix 2013-11-07 21:48:45 +01:00
Raphaël Doursenaud
c845124b92 Object type is lowercase 2013-11-07 21:47:13 +01:00
Raphaël Doursenaud
01ea84a917 Static members are not always strings 
Update method documentation to reflect the mixed type expected
 2013-11-07 21:47:13 +01:00
Raphaël Doursenaud
d5ab0723ba Timestamp is not a type 
Timestamps are integers so let's document this correctly
 2013-11-07 21:47:13 +01:00
Laurent Destailleur
b2308ba65c Merge pull request #1284 from GPCsolutions/links 
Links
 2013-11-06 17:15:49 -08:00
Laurent Destailleur
4a29431b69 New: Add hidden option MAIN_SECURITY_HASH_ALGO to choose hash function 2013-11-06 16:32:25 +01:00
Cédric Salvador
039bd5b4c8 checkstyle 2013-11-06 10:20:11 +01:00
Cédric Salvador
b9c36e6e0a checkstyle 2013-11-06 10:20:11 +01:00
Cédric Salvador
b158e8bb74 translations 2013-11-06 10:19:17 +01:00
Cédric Salvador
b625b1843e add a field for label input 2013-11-06 10:19:17 +01:00
Cédric Salvador
28bfb10dbd UI 2013-11-06 10:19:16 +01:00
Cédric Salvador
3529f5238b display links 2013-11-06 10:17:18 +01:00
Cédric Salvador
e8e3752626 link creation in dol_add_file_process 2013-11-06 10:17:17 +01:00
Grand Philippe
a14de0c035 fix : language 2013-11-05 15:29:33 +01:00
Laurent Destailleur
b18e125143 Merge pull request #1279 from aspangaro/skype 
Task 157 : add a Skype button
 2013-11-05 05:33:33 -08:00
Laurent Destailleur
223e50276c Fix: Info tab was wrong with interventions 2013-11-05 14:24:37 +01:00
Laurent Destailleur
922929fffb Fix: Missing column 
Fix: Line was not added correctly
Fix: Missing message
 2013-11-05 11:17:54 +01:00
aspangaro
8fd021bf36 Merge branch 'upstream/develop' 2013-11-04 21:44:58 +01:00
aspangaro
d79ba9695a Task 157 : Add a skype button 2013-11-04 21:41:36 +01:00
Laurent Destailleur
32983b79ee Sec: Add option to salt password 2013-11-04 10:47:24 +01:00
Laurent Destailleur
e5fd19ffc0 Add option to salt hash passwords 2013-11-04 10:45:43 +01:00
Laurent Destailleur
692aa66cad Fix: Tons of bug with new field planned_workload 2013-10-30 21:44:04 +01:00
Laurent Destailleur
b3a0510407 Fix: Allow text input for hour. 2013-10-30 11:57:32 +01:00
Laurent Destailleur
5b3ba85669 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2013-10-29 18:07:12 +01:00
Laurent Destailleur
70342c09b8 Fix: Better management of using ajax for upload form (to solve problem 
when enabling ajax jquery multifile upload in some cases).
New: Add option to use a specific mask for uploaded filename
 2013-10-29 17:52:13 +01:00
Laurent Destailleur
c81bb60384 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/public/cron/cron_run_jobs.php
 2013-10-27 02:33:03 +02:00
Laurent Destailleur
483138d195 Comments 2013-10-23 13:38:18 +02:00
Grand Philippe
c773f21c2c fix wrong call name 2013-10-19 12:50:18 +02:00
Laurent Destailleur
df930d08b2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-10-18 14:03:35 +02:00
Laurent Destailleur
33b4c9fad7 Fix: Bug into xcal decode 2013-10-18 10:38:59 +02:00
Laurent Destailleur
bf3ca7a0f0 Fix: Avoid syntax error 2013-10-18 01:20:25 +02:00
Laurent Destailleur
bd06ee1abe Prototyping for other table outputs (div or datatable) 2013-10-17 18:37:08 +02:00
Laurent Destailleur
de97cd1812 Fix: json 2013-10-11 18:33:21 +02:00