Laurent Destailleur
f05dfdbc81
Merge pull request #6569 from defrance/patch-93
...
Display totalLine if one of total field are present
2017-03-24 22:43:43 +01:00
BENKE Charlie
2b1c29316f
Display totalLine if one of total field are present
2017-03-24 22:13:58 +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
cb0eb26faa
Fix phpunit
2017-03-23 20:37:04 +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
b189e3e394
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-03-23 20:12:25 +01:00
Laurent Destailleur
be0d5bee78
Fix phpcs
2017-03-23 20:07:46 +01:00
Laurent Destailleur
2062047dea
Merge pull request #6555 from atm-gauthier/5.0_fix_originid_on_supplierorder
...
FIX : origin & origin id on supplier order line
2017-03-23 20:03:58 +01:00
Laurent Destailleur
32f05aa89f
Merge pull request #6554 from atm-gauthier/5.0_fix_units_on_supplierproposal
...
FIX : forgotten fk_unit field on llx_supplier_propaldet
2017-03-23 20:00:10 +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
4bc2864a6f
Better board for open items
2017-03-23 19:26:28 +01:00
Laurent Destailleur
6ab94ddbe7
Fix translation
2017-03-23 19:26:02 +01:00
Laurent Destailleur
c4b6378751
Fix english translation
2017-03-23 16:46:00 +01:00
Laurent Destailleur
53a04703d6
Uniformize code
2017-03-23 16:10:38 +01:00
Laurent Destailleur
22247271f6
CSS enhancement
2017-03-23 13:19:00 +01:00
Laurent Destailleur
e72f0076ed
Remove border-bottom useless
2017-03-23 13:06:38 +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
gauthier
a790ef9f7c
FIX : origin & origin id on supplier order line
2017-03-23 12:35:43 +01:00
gauthier
0730f84cf6
FIX : param php doc
2017-03-23 12:14:09 +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
Laurent Destailleur
917ef1e01e
Uniformize code
2017-03-22 20:34:01 +01:00
gauthier
6cecab4c92
FIX : forgottent fk_unit field on llx_supplier_propaldet
2017-03-22 16:43:12 +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
61031f1633
FIX Missing total on project overview.
2017-03-21 19:10:43 +01:00
Laurent Destailleur
acdfd6ab9e
css enhancement
2017-03-21 18:23:58 +01:00
Laurent Destailleur
0775f7bae0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-21 18:00:29 +01:00
Laurent Destailleur
9a13dc92ab
bottom-border useless
2017-03-21 18:00:11 +01:00
Laurent Destailleur
e6637422d5
Fix with on smartphone
2017-03-21 17:58:41 +01:00
Laurent Destailleur
559232a4d7
bottom-border useless
2017-03-21 17:57:58 +01:00
Laurent Destailleur
b0a75da2ac
Fix css
2017-03-21 17:50:52 +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
e7e51d9e4f
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/projet/class/project.class.php
2017-03-21 17:19:30 +01:00
Laurent Destailleur
43e70830ed
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-03-21 17:18:41 +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
Laurent Destailleur
b5e646daa0
NEW Show by default README.md file found into root dir of ext module.
2017-03-21 16:43:09 +01:00
Laurent Destailleur
a5c11dc840
NEW Add function dolMd2Html
2017-03-21 16:03:13 +01:00
Laurent Destailleur
4457bc33cd
Fix english translation
2017-03-21 14:23:55 +01:00
Laurent Destailleur
e2e76b40da
FIX list of projects
...
Conflicts:
htdocs/core/boxes/box_project.php
2017-03-21 13:43:48 +01:00
Laurent Destailleur
36630b9404
FIX Picto of project on dol_banner and box
...
Conflicts:
htdocs/core/boxes/box_project.php
2017-03-21 13:43:05 +01:00
Laurent Destailleur
68257283e4
Enhance select list
2017-03-21 13:39:42 +01:00
Laurent Destailleur
95da2f5d54
NEW Add font-awesome css.
2017-03-21 13:38:21 +01:00
Laurent Destailleur
aa71710a74
FIX list of projects
2017-03-21 13:38:00 +01:00
