Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
72,480 Commits 36 Branches 189 Tags
84ec39f043c3d807519b8e4cb1570a01eb47d848
Commit Graph

1859 Commits

Author SHA1 Message Date
Laurent Destailleur
d72e5a3646 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-10 17:34:23 +01:00
Laurent Destailleur
6db0e909d6 Fix pagination 2017-02-08 18:41:23 +01:00
Laurent Destailleur
31c3398b7f Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/modules.php
 2017-02-08 10:59:05 +01:00
Laurent Destailleur
afa68a1418 Fix label for late 2017-02-07 00:45:14 +01:00
Laurent Destailleur
39151d7a74 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-22 12:14:18 +01:00
Laurent Destailleur
65f7de8f64 Fix css and look 5.0 2017-01-22 12:13:32 +01:00
Laurent Destailleur
412be59f78 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-01-20 12:09:39 +01:00
Laurent Destailleur
bb95f139a8 Fix responsive 2017-01-17 20:04:41 +01:00
Marcos García de La Fuente
e0cbcadd98 In case Model for document generation is not defined, the criteria to select the model is now: 
1. Model for the object
 2. Custom default module
 3. Hardcoded default module
 2017-01-16 21:16:05 +01:00
Laurent Destailleur
4ecd657f34 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-16 00:02:43 +01:00
Laurent Destailleur
d14e4dbaba Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on 2017-01-15 20:49:20 +01:00
Laurent Destailleur
7aad6683fa Add cast to remove scrutinizer warning 2017-01-03 10:50:37 +01:00
Laurent Destailleur
9e44eb0d15 Fix return code REST similar for all api with POST 2016-12-23 02:08:22 +01:00
aspangaro
23aea440d6 Fix: Travis 2016-12-19 06:04:54 +01:00
Regis Houssin
3e15ae3da7 Fix: wrong name 2016-12-18 10:33:20 +01:00
Laurent Destailleur
60b8582aa9 Fix more then 30 security defects 2016-12-18 01:44:26 +01:00
Laurent Destailleur
9fd48df839 Fix minor bug on subscription pages 2016-12-17 19:21:48 +01:00
Laurent Destailleur
6c4f15df63 Fix lot of fix in css look to match v5 rules. 2016-12-11 16:11:42 +01:00
Laurent Destailleur
7d5c708043 Fix size of field for member list 2016-12-11 02:31:59 +01:00
aspangaro
cd39b1c6f0 Fix: Field comments not registered in new member public form & presentation 2016-12-08 00:12:54 +01:00
Laurent Destailleur
761a795294 Maxi debug on REST APIs 2016-12-05 13:31:29 +01:00
Laurent Destailleur
bd8f923cee Several fixes in filter on lists 2016-11-29 22:52:16 +01:00
Laurent Destailleur
2c9edd4205 Maxi debug on list. Fix responsive design. 2016-11-27 13:49:46 +01:00
Laurent Destailleur
e4a8342aef Fix div-table-form balance on all lists (solve responsive design) 2016-11-27 11:41:10 +01:00
Laurent Destailleur
16ce156631 Fix responsive design 2016-11-25 18:32:52 +01:00
Laurent Destailleur
dd27a52a85 Fix several problems on new REST API on project/tasks 2016-11-19 16:08:27 +01:00
Laurent Destailleur
c23ba508f7 Fix type int of subscription 2016-11-13 18:19:52 +01:00
BENKE Charlie
448cd8c38a subscription never filled with "yes" 2016-11-11 12:57:59 +01:00
Laurent Destailleur
59291be6e0 NEW Can filter on status on objects on the "statistics" page. 2016-11-03 19:50:04 +01:00
Laurent Destailleur
7fa9692458 Uniformize code. Generalize option MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE. 2016-11-02 12:48:50 +01:00
Laurent Destailleur
ff6f5eea6f Fix travis errors 2016-10-26 10:47:47 +02:00
Laurent Destailleur
7d182c286c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/step1.php
	htdocs/projet/tasks/time.php
 2016-10-26 10:40:03 +02:00
Laurent Destailleur
43bf372cf7 Fix doxygen 2016-10-25 21:15:25 +02:00
Laurent Destailleur
f67863e1aa NEW Can use any filter on all REST API to list. 2016-10-25 19:15:47 +02:00
Laurent Destailleur
c976044d70 Merge pull request #5910 from aspangaro/5.0-p28 
Better presentation for member edit card
 2016-10-24 03:20:24 +02:00
aspangaro
cdb8224c1a Better presentation for member edit card 2016-10-22 07:19:55 +02:00
Raphaël Doursenaud
b6b4c8a053 Add deprecated property explicitly 
Remove properties inherited from CommonObject
Add type hinting to existing properties
 2016-10-17 18:57:07 +02:00
Xebax
ae249a964b FIX #5849 Verification du champ Societe sur une modification adherent 2016-10-16 13:19:36 +02:00
Laurent Destailleur
d27dea8320 NEW Can rename uploaded or generated files on all "documents" tabs. 2016-10-14 18:09:24 +02:00
Laurent Destailleur
45a808e034 NEW Generation of document is available on member card 2016-10-03 00:08:47 +02:00
Laurent Destailleur
d953d3795f FIX #5803 2016-09-28 17:53:49 +02:00
Laurent Destailleur
d39d7d92c9 Uniformize code. 2016-09-26 02:13:58 +02:00
Laurent Destailleur
100312aac2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/adherents/class/cotisation.class.php
 2016-09-26 01:32:50 +02:00
Laurent Destailleur
ac2c685e7d Fix bad commit 2016-09-26 01:13:55 +02:00
Xebax
d05c8d32b1 Add Subscriptions to the REST API. 2016-09-25 17:40:45 +02:00
Xebax
cd11ccbedb Add Members to the REST API. 2016-09-25 17:40:29 +02:00
aspangaro
2dbeeedd14 Move tab menu for subscription in member.lib 
Move all pages for subscription member in adherent/subscription (Card / Info / List)
Rename llx_cotisation in llx_subscription
Rename all db field cotisation in subscription
Rename class Cotisation in class Subscription
 2016-09-24 06:48:40 +02:00
philippe grand
6fd14128ba fix : bad name 2016-09-08 16:37:30 +02:00
Juanjo Menent
612db4f66d Merge pull request #5673 from aspangaro/5.0-p5 
Fix: Presentation on member card
 2016-08-31 02:09:28 +02:00
aspangaro
e2a92f304d Presentation on member card 2016-08-29 22:07:21 +02:00