Commit Graph

48193 Commits

Author SHA1 Message Date
aspangaro
fae0a99a97 Merge remote-tracking branch 'Upstream/develop' into develop-37 2015-06-23 06:17:29 +02:00
Laurent Destailleur
460c926f98 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-22 22:32:00 +02:00
Laurent Destailleur
4db562c9e7 Tags are shown as thumbs into card. 2015-06-22 22:31:44 +02:00
Laurent Destailleur
afc4529f7f Merge pull request #3080 from open-minds/develop
Remove useless filter for "text" parameter of boxes content
2015-06-22 20:32:08 +02:00
Laurent Destailleur
bfa0f0d576 Minor look enhancement 2015-06-22 17:20:06 +02:00
Laurent Destailleur
cac7b1f49f NEW Add hooks on list of members to allow an external module to add more
fields into list view.
2015-06-22 16:34:25 +02:00
Laurent Destailleur
5a8e763099 Uniformize code for hooks
Uniformize page name societe.php into list.php
2015-06-22 15:48:48 +02:00
Laurent Destailleur
ea8279cf09 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-22 12:00:09 +02:00
Laurent Destailleur
a27212644e NEW Can add project search on left menu search area 2015-06-22 11:55:21 +02:00
aspangaro
134cea194d Debug 2015-06-22 06:53:43 +02:00
Laurent Léonard
ba64486e68 Remove useless filter for "text" parameter of boxes content
This filter doesn't allow to display "0" value and is not applied to the similar "text2" parameter.
2015-06-22 02:53:28 +02:00
Laurent Destailleur
6e1a5ca401 Merge pull request #3078 from aspangaro/develop-patch38
Fix: Accountancy list: Use print_liste_field_titre
2015-06-21 23:30:49 +02:00
Laurent Destailleur
5975536fcf Support type of leave. 2015-06-21 23:25:01 +02:00
aspangaro
e0ae7bd430 Merge remote-tracking branch 'Upstream/develop' into develop-37 2015-06-21 21:09:55 +02:00
Laurent Destailleur
7d1d1caf30 Debug withdraw module 2015-06-21 17:09:00 +02:00
Laurent Destailleur
230fd7a7e4 Debug withdraw module 2015-06-21 17:05:49 +02:00
aspangaro
390c670c5c Merge remote-tracking branch 'Upstream/develop' into develop-38 2015-06-21 14:35:45 +02:00
aspangaro
2ab454e757 Presentation 2015-06-21 14:32:00 +02:00
Laurent Destailleur
2612585d1c Merge pull request #3073 from atm-alexis/develop
FIX hide product category if it's not enable
2015-06-21 11:53:11 +02:00
Laurent Destailleur
8710065ca0 Merge pull request #3072 from atm-maximep/new_set_amount_for_withdraws
NEW : Set amount for withdraws requests
2015-06-21 11:52:23 +02:00
Juanjo Menent
35a9e164dc Merge pull request #3076 from aspangaro/develop-patch36
Review ER : remove fk_c_tva and add  option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT
2015-06-21 10:57:17 +02:00
aspangaro
0f450edfcd Debug 2015-06-21 08:32:37 +02:00
aspangaro
0934860ce5 Accountancy list: Use print_liste_field_titre 2015-06-21 08:26:42 +02:00
aspangaro
f0a3057221 Fix: ER button set_paid & merge with old option setPaid 2015-06-21 08:07:06 +02:00
aspangaro
20582b9ea5 Merge remote-tracking branch 'Upstream/develop' into develop-36 2015-06-21 07:31:43 +02:00
Laurent Destailleur
d780c03651 Fix default buttone 2015-06-21 03:47:16 +02:00
Laurent Destailleur
4f1538f502 Introduce table llx_c_holiday_type 2015-06-21 03:19:15 +02:00
Laurent Destailleur
e0d1cbeb16 Introduce table llx_c_holiday_type 2015-06-21 00:07:03 +02:00
Laurent Destailleur
a3a5b0d9b0 Upgrade jquery and jquery-ui to last stable version 2015-06-21 00:06:37 +02:00
Laurent Destailleur
825369230f Finishment of look 2015-06-20 23:33:13 +02:00
Laurent Destailleur
2c5ef858d0 NEW Filter "active" by default on user list.
Fix label of permission of project module
2015-06-20 20:35:57 +02:00
Laurent Destailleur
40d17add22 Fix missing print 2015-06-20 19:42:07 +02:00
Laurent Destailleur
87b4381d47 Update jflot plugin 2015-06-20 19:17:50 +02:00
Laurent Destailleur
1cb9d3b2eb Fix nohover for lines to add lines 2015-06-20 17:40:36 +02:00
Laurent Destailleur
a6a027f5c4 Fix several pb with javascript 2015-06-20 17:24:34 +02:00
Laurent Destailleur
c2568020a5 Fix IBAN class is uppercase 2015-06-20 17:23:41 +02:00
Laurent Destailleur
32626c5ae6 Fix js refresh with autocomplete 2015-06-20 17:23:28 +02:00
Laurent Destailleur
ba5d6318ef Debug the integrity check feature. 2015-06-20 14:24:22 +02:00
Laurent Destailleur
a7ce414d23 Fix translation 2015-06-20 14:15:32 +02:00
aspangaro
0ff97da1ea Review ER : remove fk_c_tva and add option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT 2015-06-20 09:06:20 +02:00
Laurent Destailleur
2895241420 Update theme with 3.8 2015-06-19 17:03:35 +02:00
Laurent Destailleur
bbce287892 Fix: Pdf merge tool must see only pdf files 2015-06-19 16:05:04 +02:00
Alexis Algoud
d0999e5458 FIX hide category if it's not enable 2015-06-19 14:30:23 +02:00
maxime peyrot
f99a127a57 NEW : Enter amount for withdraws requests 2015-06-19 13:45:14 +02:00
Laurent Destailleur
2785bf7520 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-19 12:13:39 +02:00
Laurent Destailleur
b3c1ebf30a Debug price per customer 2015-06-19 12:13:05 +02:00
Laurent Destailleur
694481ae5e Merge pull request #3071 from aspangaro/develop-patch35
Review accountancy
2015-06-19 11:29:01 +02:00
Laurent Destailleur
5376c771d7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-19 11:27:59 +02:00
Laurent Destailleur
ad395ef176 Merge branch 'aspangaro-develop-patch34' into develop 2015-06-19 11:27:29 +02:00
Laurent Destailleur
01fbee0e06 Merge branch 'develop-patch34' of https://github.com/aspangaro/dolibarr
into aspangaro-develop-patch34

Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
2015-06-19 11:27:15 +02:00