Commit Graph

58801 Commits

Author SHA1 Message Date
Laurent Destailleur
df59a595de Fix link to files 2017-03-25 01:29:19 +01:00
Laurent Destailleur
aa9d991923 Fix css 2017-03-25 01:03: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
720a820ee4 border-bottom not required. 2017-03-25 00:04:21 +01:00
BENKE Charlie
db76a05d0c Update list.php 2017-03-24 23:53:32 +01:00
Laurent Destailleur
6b33a755ba Add more log on tableDnD 2017-03-24 23:52:06 +01:00
BENKE Charlie
3aff053828 Update list.php 2017-03-24 23:40:34 +01:00
BENKE Charlie
94a1fc19fa display total line for all total line 2017-03-24 23:39:25 +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
023ef0b0f4 Merge pull request #6560 from aspangaro/5.0-p3
Fix : Missing picture for module multicurrency in md theme
2017-03-24 22:48:42 +01:00
Laurent Destailleur
6f3231745e Merge pull request #6564 from tiaris/devcamp
bug 6563 installation issue with
2017-03-24 22:47:50 +01:00
Laurent Destailleur
b420b288ca Merge pull request #6559 from aspangaro/5.0-p2
Fix : missing language file in salaries index
2017-03-24 22:44:46 +01:00
Laurent Destailleur
00b96d909c Merge pull request #6558 from aspangaro/5.0-p1
Fix : Missing language file in accountancy configuration
2017-03-24 22:44:30 +01:00
Laurent Destailleur
71378028f4 Merge pull request #6562 from defrance/patch-92
error on install
2017-03-24 22:44:11 +01:00
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
d1a988a0be Fix document_preview is possible on files with + chars inside. 2017-03-24 17:32:38 +01:00
jean
cdb1de7596 bug 6563 installation issue with
doctemplates/usergroups/template_usergroups.odt
2017-03-24 16:48:44 +01:00
fappels
f8ae4325a0 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2017-03-24 15:34:44 +01:00
BENKE Charlie
80f78e66bb error on install 2017-03-24 15:30:46 +01:00
fappels
e75dea4f8d Merge remote-tracking branch 'refs/remotes/Dolibarr/5.0' into 5.0 2017-03-24 14:39:06 +01:00
Alexandre SPANGARO
ef0caa71e2 Fix : Missing picture for module multicurrency in md theme 2017-03-24 06:50:07 +01:00
Alexandre SPANGARO
35da94bbc2 Fix : missing language file in salaries index 2017-03-24 06:38:26 +01:00
Alexandre SPANGARO
6116145d8a Fix : Missing language file in accountancy configuration 2017-03-24 06:23:40 +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
22b4d0c276 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-03-23 21:23:28 +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