Commit Graph

7763 Commits

Author SHA1 Message Date
Yannick Warnier
c3bb76340f Improve extended quaterly VAT report 2015-06-30 15:41:00 -05:00
Laurent Destailleur
ce6039f7f6 NEW Replace category edition page on members with new select2 component. 2015-06-27 23:01:05 +02:00
Laurent Destailleur
55cb103ab0 Maxi debug of new module leave requests 2015-06-27 13:01:44 +02:00
Laurent Destailleur
b6efa5ed11 NEW Can upload files on leave requests. Use more standard permissions. 2015-06-27 11:45:23 +02:00
Laurent Destailleur
ceb9955efc Merge branch 'develop-patch43' of https://github.com/aspangaro/dolibarr into aspangaro-develop-patch43
Conflicts:
	htdocs/contact/list.php
2015-06-27 02:27:34 +02:00
Laurent Destailleur
6faf6eeb4f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-27 02:21:43 +02:00
Laurent Destailleur
b3d1df3786 Merge pull request #3109 from hregis/develop_new
New: Possibility to add javascript in main login page with
2015-06-27 02:19:50 +02:00
Laurent Destailleur
bae8ed2356 uniformize code 2015-06-27 02:19:46 +02:00
Regis Houssin
c05bf7e977 New: Possibility to add javascript in main login page with
"getLoginPageOptions" hook
2015-06-26 19:37:37 +02:00
Laurent Destailleur
0fe0c989ca Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-26 17:36:54 +02:00
Laurent Destailleur
2bc6d6dd4c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-26 17:26:12 +02:00
Laurent Destailleur
5584acddbd Content of popup tooltip on contact and login link 2015-06-26 17:21:03 +02:00
Laurent Destailleur
8f691138e8 NEW Can edit Background color for Top menu and Background color for
table title line (works only with theme menu eldy).
2015-06-26 16:21:09 +02:00
Laurent Destailleur
936c46d219 Better error/setup messages. 2015-06-26 13:18:40 +02:00
aspangaro
9d2e964b00 Fix: print_liste_field_titre(''); 2015-06-26 06:23:29 +02:00
Raphaël Doursenaud
d6e48670e7 Allow replacing the address block
Since ba2c0a2651 changed the default hook mode
from addreplace to output, this is needed to still be allowed to replace
the displayed address from a hook
2015-06-25 11:13:23 +02:00
Laurent Destailleur
1485ead215 Fix: MARGIN_TYPE == 2 is "using PMP price" so i remove a duplicate
option to get same behaviour.
2015-06-24 21:36:28 +02:00
Florian HENRY
daab394c81 add extrafields into import product 2015-06-24 12:40:56 +02:00
Laurent Destailleur
0780c84012 Fix missing payment mode into export invoice profile 2015-06-23 23:58:04 +02:00
Laurent Destailleur
bdba8f1f38 Fix courrent outstanding amount not visible 2015-06-23 23:33:25 +02:00
Laurent Destailleur
040a643ee9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/expensereport/card.php
	htdocs/projet/element.php
2015-06-23 18:34:39 +02:00
Laurent Destailleur
a23e2511b9 Removed useless tab 2015-06-23 18:11:21 +02:00
Laurent Destailleur
27cc7ef2b3 Time spent 2015-06-23 10:13:08 +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
5a8e763099 Uniformize code for hooks
Uniformize page name societe.php into list.php
2015-06-22 15:48:48 +02:00
Laurent Destailleur
a27212644e NEW Can add project search on left menu search area 2015-06-22 11:55:21 +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
230fd7a7e4 Debug withdraw module 2015-06-21 17:05:49 +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
a3a5b0d9b0 Upgrade jquery and jquery-ui to last stable version 2015-06-21 00:06:37 +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
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
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
bbce287892 Fix: Pdf merge tool must see only pdf files 2015-06-19 16:05:04 +02:00
Laurent Destailleur
b3c1ebf30a Debug price per customer 2015-06-19 12:13:05 +02:00
Laurent Destailleur
bfc8ccd761 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-19 11:19:23 +02:00
Laurent Destailleur
20da120a49 Merge tab to upload photo and other files to same tab. This reduce
duplicate code and avoid users to be lost.
2015-06-19 11:19:13 +02:00
Laurent Destailleur
b39d100e53 Merge pull request #3067 from All-3kcis/patch-1
FIX complete function ordersupplier_prepare_head() so a module can remove tabs
2015-06-19 11:16:15 +02:00
Laurent Destailleur
d99fd37f3d Merge pull request #3061 from marcosgdf/bug-timezone-2
Corrected Timezone detection by using jstz external library
2015-06-19 11:13:50 +02:00
Laurent Destailleur
b5cc7ae1c8 Work on merge tab photos and attached files 2015-06-19 00:52:58 +02:00
All-3kcis
c96c528d3e Correction complete_head
Ajout de la fonction complete_head_from_modules() pour supprimer les onglets si besoin.
2015-06-18 15:16:28 +02:00
Laurent Destailleur
7507a71121 Lenght of fields 2015-06-18 14:47:33 +02:00
Marcos García de La Fuente
1e05262884 Corrected Timezone detection by using jstz external library 2015-06-16 21:19:58 +02:00
Laurent Destailleur
fb1a3f3ea3 Rename alternative name 2015-06-16 12:04:11 +02:00