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

47937 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jfefe
46ce77c571 Refactor function to use it into API 
New function checkUserAccessToObject() is a piece of restrictedArea() function.
 2015-05-03 14:41:51 +02:00
aspangaro
c502dabd76 Merge remote-tracking branch 'Upstream/develop' into develop-ER_project 2015-05-03 14:31:15 +02:00
aspangaro
c6306260c5 Fix: ER Search mode doesn't work 2015-05-03 14:25:37 +02:00
aspangaro
da272c6aac ER Typo 2015-05-03 14:24:20 +02:00
Laurent Destailleur
0479bd5a59 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/modAdherent.class.php
 2015-05-03 13:00:39 +02:00
Francis Appels
2b32dc4ba8 Apply correct tabulation 2015-05-03 11:51:54 +02:00
Francis Appels
cb75d0778a Fix doc errors 2015-05-03 11:09:33 +02:00
Juanjo Menent
6b9d5be3c2 Merge pull request #2745 from frederic34/patch-9 
Typo
 2015-05-03 11:01:32 +02:00
Juanjo Menent
edbef3d1da Merge pull request #2746 from frederic34/patch-10 
Typo
 2015-05-03 11:01:17 +02:00
Juanjo Menent
3966b6dfde Merge pull request #2747 from aspangaro/develop-accountancy_patch1 
Accountancy - Add key language & prepare journal for expense report
 2015-05-03 11:00:48 +02:00
Juanjo Menent
ea80386152 Merge pull request #2751 from aspangaro/develop-selectmonth 
New: Add option to show long or short (by default) label in select_month()
 2015-05-03 10:58:45 +02:00
Francis Appels
fee4c4e0e2 Fix: add newline at eof 2015-05-03 10:26:12 +02:00
Francis Appels
f9ece24f95 Fix: Member card header/footer text 2015-05-03 10:09:31 +02:00
Francis Appels
ffe7671549 Fix label L7163 X spacing 2015-05-03 10:08:32 +02:00
Francis Appels
f9908c48cb Add datamatrix en qrcode barcodes 2015-05-03 10:07:04 +02:00
Francis Appels
96dfdfeb73 New tcpdf barcode label printing class 
New tcpdf barcode label printing class and add parameters to printsheet
for using this class.
Add parameter to modules_xxx.php functions to pass printing templete
class to use
 2015-05-03 10:05:59 +02:00
Francis Appels
701c85620b Extend sticker classes from abstract class 
Extend member and printsheet sticker printer classes from new abstract
commonsticker generator
 2015-05-03 10:00:11 +02:00
Francis Appels
2fd4bf1012 Add commonstickergenerator class 
Common abstract class for sticker printing.
Creates contracts for write_file and addSticker methods
 2015-05-03 09:54:37 +02:00
aspangaro
be302ce5ae New: ER Add filter on amounts 2015-05-03 08:10:22 +02:00
aspangaro
55eecf3f25 ER add price format in total of list 2015-05-03 07:05:19 +02:00
aspangaro
6dfd125872 Spaces 4 : Stop Shouting ! 2015-05-03 06:25:50 +02:00
aspangaro
7062dc7b2e Spaces 3 : the darkside 2015-05-03 06:20:34 +02:00
aspangaro
3a5f6db571 Spaces 2 : return of the vilains 2015-05-03 06:18:21 +02:00
aspangaro
9aa336e0d0 Spaces !!! 2015-05-03 06:16:28 +02:00
aspangaro
8163563753 New: Add option to show long or short (by default) label in select_month() 2015-05-03 06:12:02 +02:00
jfefe
31e5b4786a Fix : verify access method 
Now we can use tag '@class' into PHPDoc block of method or class.

By example: @class  DolibarrApiAccess {@requires user,external}
 2015-05-03 01:54:04 +02:00
jfefe
fa494369b8 New : API key authentication 
One key is stored by user when login API method is called. Each API request must have api_key parameter
 2015-05-02 23:54:35 +02:00
jfefe
8027759304 Work on authentication 2015-05-02 18:14:51 +02:00
jfefe
65ff78f61a Don't expose API if module disabled 2015-05-02 15:31:21 +02:00
jfefe
4ccb04590e Add API admin page 2015-05-02 15:27:19 +02:00
jfefe
4bce903c63 Add field into user table to store API key 2015-05-02 15:26:45 +02:00
jfefe
23e423404b Add API htaccess file for Apache webserver 2015-05-02 15:25:48 +02:00
aspangaro
315e9239ac Merge remote-tracking branch 'Upstream/develop' into develop-accountancy2 2015-05-02 06:45:53 +02:00
aspangaro
1174c67b07 Accountancy - Add key language & prepare journal for expense report 2015-05-02 06:42:06 +02:00
Frédéric FRANCE
d8af7a45f8 Typo 2015-05-01 19:10:47 +02:00
Frédéric FRANCE
e3f980e32c Typo 2015-05-01 18:44:27 +02:00
Juanjo Menent
6f6ff6697a Merge pull request #2742 from aspangaro/develop-ER_badge 
New: ER add badge on tab document
 2015-05-01 16:24:47 +02:00
Juanjo Menent
300d6532a1 Merge pull request #2740 from aspangaro/develop-devcamp 
Fix: ER Typo on variable $_SERVER, correct Link & traduce button
 2015-05-01 16:24:32 +02:00
jfefe
1536cd430d Missing PHPDOC for REST API working for thirdparties 
These tags are very important for REST API. Please have a look at https://github.com/Luracast/Restler/blob/master/ANNOTATIONS.md
 2015-05-01 16:16:31 +02:00
jfefe
d406830e06 NEW : add an explorer for REST API consultation & documentation 2015-05-01 16:13:58 +02:00
jfefe
30c901c266 Begin REST API implementation with thirdparty classes and methods needed. 
Work in progress !
 2015-05-01 16:12:30 +02:00
Raphaël Doursenaud
31a8e38d37 Allow exporting projects without a third party 
FIX #2729

Conflicts:
	htdocs/core/modules/modProjet.class.php
 2015-05-01 16:01:57 +02:00
Raphaël Doursenaud
93937fe7f3 Allow exporting projects without a third party 
FIX #2729
 2015-05-01 15:58:36 +02:00
Raphaël Doursenaud
a6b0f6cfac Allow exporting projects without a third party 
FIX #2729
 2015-05-01 15:56:39 +02:00
Juanjo Menent
6309d2133f Merge pull request #2731 from GPCsolutions/dolibarr-2729 
Allow exporting projects without a third party
 2015-05-01 15:55:40 +02:00
jfefe
b503b16f07 NEW : add restler framework 
First step to build REST API into Dolibarr
 2015-05-01 15:42:05 +02:00
jfefe
f6c93525a6 Require restler/framework into composer.json 2015-05-01 14:03:32 +02:00
aspangaro
b0eee2976c New: ER add badge on tab document 2015-05-01 08:46:37 +02:00
aspangaro
b03a9dffeb Fix : ER Correct Link 2015-05-01 07:18:19 +02:00
aspangaro
95058607a4 Fix : ER Typo on all variable $_SERVER & traduce of button "Edit" not works 2015-05-01 07:13:04 +02:00