Commit Graph

11120 Commits

Author SHA1 Message Date
Laurent Destailleur
88017f5707 Merge pull request #6369 from atm-florian/dev_replace_extrefield_checkboxByMultiSelect
NEW : change render extrafields checkbox list for multiselectarray
2017-03-31 18:12:58 +02:00
Laurent Destailleur
cab944a1a1 Merge pull request #6602 from aspangaro/6.0-multijournal
New : [FP17] Accounting multi-journals
2017-03-31 17:45:10 +02:00
Laurent Destailleur
7bcd4d74ef Merge pull request #6617 from dolibarr95/patch-9
Display mobile icon
2017-03-31 17:43:01 +02:00
Laurent Destailleur
01a74a8d23 Work on 6.0 look and feel 2017-03-31 17:41:20 +02:00
Laurent Destailleur
979bcd3a9b NEW Can add a background image on login page 2017-03-31 11:40:31 +02:00
Laurent Destailleur
18e1e5b780 NEW Add "depends on" and "required by "into module informations 2017-03-30 15:54:48 +02:00
Laurent Destailleur
8e70c4a0b7 Work on 6.0 new look and feel 2017-03-30 15:39:50 +02:00
Laurent Destailleur
aca1c1944d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/install/mysql/data/llx_c_action_trigger.sql
2017-03-30 12:02:27 +02:00
Laurent Destailleur
141ef91dea Fix default auto events 2017-03-30 11:53:58 +02:00
Laurent Destailleur
f01815519a Fix trigger of automatic events 2017-03-30 11:25:28 +02:00
Laurent Destailleur
78cc976e9f Work on module builder 2017-03-30 10:40:15 +02:00
dolibarr95
1489847a74 Display mobile icon
Display a specific icon when mobile
2017-03-30 09:49:34 +02:00
Laurent Destailleur
4df8dcf980 Work on module modBlockedLog and modModuleBuilder 2017-03-29 21:50:15 +02:00
Laurent Destailleur
fbca800246 FIX Detection of color brightness 2017-03-29 11:46:13 +02:00
Laurent Destailleur
1d6e760fc8 FIX Notification sending was broken. 2017-03-29 11:44:14 +02:00
Laurent Destailleur
54b03a3552 Work on 6.0 new look and feel 2017-03-29 11:03:13 +02:00
Laurent Destailleur
4fa5448aab FIX Detection of color brightness 2017-03-29 10:34:33 +02:00
Alexandre SPANGARO
06c2f04927 Finish work on multijournal admin part
Need harmonization on rights
2017-03-29 06:32:26 +02:00
Laurent Destailleur
e416ea275e Work on 6.0 look and feel 2017-03-28 21:04:38 +02:00
Laurent Destailleur
e8e7732820 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2017-03-28 17:41:41 +02:00
Laurent Destailleur
31bde1ae74 Code for 6.0 new look and feel 2017-03-28 17:12:15 +02:00
Laurent Destailleur
b5b0eba470 Several enhancement for 6.0 2017-03-28 12:47:48 +02:00
Alexandre SPANGARO
fc2b9a858b New : [FP17] Add multijournals in accountancy admin 2017-03-28 06:35:03 +02:00
Laurent Destailleur
219bcb0d54 Work on 6.0 features. 2017-03-27 22:44:50 +02:00
Alexandre SPANGARO
aa924bf010 Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal
# Conflicts:
#	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-03-27 22:35:06 +02:00
Laurent Destailleur
f843f8a93d Start to move search bar before table titles 2017-03-27 00:48:50 +02:00
Laurent Destailleur
8c2b70c4a7 Fix filechecker 2017-03-25 20:51:02 +01:00
Laurent Destailleur
292bcae592 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-25 00:05:04 +01:00
Laurent Destailleur
6b33a755ba Add more log on tableDnD 2017-03-24 23:52:06 +01:00
Laurent Destailleur
278bbf184c Merge pull request #6546 from aspangaro/6.0-new_bank_direct_input
New : Add Various payment submodule linked to the accountancy to replace free input in bank
2017-03-24 22:52:39 +01:00
Laurent Destailleur
df17de9d48 Merge pull request #6543 from laudeco/feature/expenseNoteFusionPdf
add 'fusion pdf' in mass action of expense report
2017-03-24 22:50:54 +01:00
Laurent Destailleur
d1a988a0be Fix document_preview is possible on files with + chars inside. 2017-03-24 17:32:38 +01:00
Laurent Destailleur
38660418b4 Include preview of pdf into dol_banner 2017-03-23 22:27:44 +01:00
Laurent Destailleur
664380d304 Css enhancement 2017-03-23 21:24:57 +01:00
Laurent Destailleur
f241bfefd0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-23 20:20:59 +01:00
Laurent Destailleur
be0d5bee78 Fix phpcs 2017-03-23 20:07:46 +01:00
Laurent Destailleur
eb145faffd Replace parameter mixte with textselect 2017-03-23 19:57:45 +01:00
Laurent Destailleur
d1c29bf698 Merge pull request #6552 from defrance/patch-91
NEW : introducing "mixte" mode for select_duration
2017-03-23 19:54:33 +01:00
Laurent Destailleur
3cc312d485 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/main.lang
2017-03-23 19:48:34 +01:00
Laurent Destailleur
3adb43c6e5 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/boxes/box_produits.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/langs/en_US/bills.lang
	htdocs/product/class/product.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
2017-03-23 12:52:19 +01:00
Laurent Destailleur
7df9c25e60 Several fixes on multicurrency 2017-03-23 12:44:20 +01:00
Laurent Destailleur
fec3a89aa5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-23 11:38:46 +01:00
Laurent Destailleur
996cb9d3f1 NEW Add function ajax_autoselect 2017-03-23 11:16:30 +01:00
Laurent Destailleur
0a35d17207 CSS enhancement 2017-03-23 10:59:13 +01:00
BENKE Charlie
7999cb9a46 introducing "mixte" mode for select_duration
If 'select' then input hour and input min is a combo,
if 'text' input hour is in text and input min is a text, 
if 'mixte' input hour is in text and input min is a combo
2017-03-21 23:48:06 +01:00
Laurent Destailleur
ee8112dde7 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/projet/class/project.class.php
2017-03-21 19:20:14 +01:00
Laurent Destailleur
acdfd6ab9e css enhancement 2017-03-21 18:23:58 +01:00
Laurent Destailleur
e7a45a7f6a NEW Use html5 type "number" on select field for year and duration. 2017-03-21 17:50:43 +01:00
Laurent Destailleur
1e63b98731 Fix responsive 2017-03-21 17:06:27 +01:00
Laurent Destailleur
a0fe79a113 Fix duplicate include. 2017-03-21 16:46:12 +01:00