Commit Graph

73322 Commits

Author SHA1 Message Date
florian HENRY
eba4be2335 ad missing files 2019-02-12 17:03:47 +01:00
florian HENRY
5b5f96bafb NEW : measuring unit dictionnary and product size/unit import 2019-02-12 16:58:11 +01:00
Laurent Destailleur
04950a5c91 Trans 2019-02-12 16:29:37 +01:00
Laurent Destailleur
26168f0de5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-12 15:50:33 +01:00
Laurent Destailleur
a0c1e5ed84 Fix unique key in accounting_account 2019-02-12 15:43:24 +01:00
Laurent Destailleur
843f7bea8d
Merge pull request #10546 from frederic34/patch-20
Update index.php
2019-02-12 13:46:33 +01:00
Laurent Destailleur
17bb5a3c4b
Merge pull request #10545 from frederic34/patch-18
Update consumption.php
2019-02-12 13:45:49 +01:00
Laurent Destailleur
aa206e5d7c
Update consumption.php 2019-02-12 13:45:38 +01:00
Laurent Destailleur
46941d4c20
Merge pull request #10539 from frederic34/patch-17
Update paiement.php
2019-02-12 13:43:09 +01:00
Laurent Destailleur
74f468dc91
Merge pull request #10535 from atm-quentin/FIX_multiple_sending_form
FIX on chrome you can send multiple form if you click more than once …
2019-02-12 13:42:37 +01:00
Laurent Destailleur
205152501e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	.travis.yml
	htdocs/public/payment/newpayment.php
2019-02-12 13:39:39 +01:00
Laurent Destailleur
00eb95b660 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-12 13:36:32 +01:00
Laurent Destailleur
53a8f1cd3b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-02-12 13:36:05 +01:00
Laurent Destailleur
3e1b75e916
Merge pull request #10541 from grandoc/new_branch_10_02_2019
update with html5 compliant code
2019-02-12 13:35:27 +01:00
Laurent Destailleur
580356ac95
Merge pull request #10537 from frederic34/GenericFunctionsFunctionCallArgumentSpacing
GenericFunctionsFunctionCallArgumentSpacing
2019-02-12 13:34:01 +01:00
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing 2019-02-12 13:33:39 +01:00
Laurent Destailleur
e8fc72ecf4
Merge pull request #10538 from frederic34/html5boxes
replace html align by class in boxes
2019-02-12 13:32:42 +01:00
Laurent Destailleur
7874aa374c
Merge pull request #10534 from OPEN-DSI/fix-margin-agents2
Fix calcul margin by seller and parameters send (filters)
2019-02-12 13:31:56 +01:00
Laurent Destailleur
b1088f556f
Merge pull request #10536 from grandoc/new_branch_09_02_2019
language internationalization
2019-02-12 13:28:56 +01:00
Laurent Destailleur
6f6a767255
Merge pull request #10520 from aspangaro/develop
NEW: Add subledger in various payment
2019-02-12 13:20:58 +01:00
Laurent Destailleur
04b0216277
Merge pull request #10548 from aspangaro/7.0_accountancy_multicomp_movement
FIX: Accountancy - Add transaction with multicompany use only the first entity
2019-02-12 13:19:00 +01:00
Laurent Destailleur
3daa8b0731
Merge pull request #10550 from frederic34/patch-21
continue is ambiguous in outer loop for php 7.3
2019-02-12 13:18:34 +01:00
Laurent Destailleur
031999047b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-12 13:18:05 +01:00
Laurent Destailleur
65f5cb4302 Doc 2019-02-12 13:17:40 +01:00
Laurent Destailleur
1c3520d040
Merge pull request #10552 from ATM-Nicolas/fix_default_fontawesome_signout_icon
FIX : Default sign out icon if not using Font Awesome 5
2019-02-12 13:12:58 +01:00
Laurent Destailleur
f42d07d6da
Merge pull request #10529 from frederic34/patch-2
desactivate button on click to avoid multiple clicks
2019-02-12 13:12:30 +01:00
Laurent Destailleur
d225b1be8b
Merge pull request #10532 from atm-maxime/fix_purchase_journal
Fix wrong column name in purchase journal
2019-02-12 13:11:45 +01:00
Laurent Destailleur
9070e5fe01
Merge pull request #10543 from ka7/spelling_1
spelling fixes
2019-02-12 13:10:18 +01:00
Laurent Destailleur
9dc2a1f148
Update productaccount.php 2019-02-12 12:51:52 +01:00
Laurent Destailleur
53b2100dbb
Update productaccount.php 2019-02-12 12:50:36 +01:00
ATM-Nicolas
4e35ebe52a FIX : Default sign out icon if not using Font Awesome 5 2019-02-12 10:43:00 +01:00
Laurent Destailleur
65b5e7a26d Update copyright 2019-02-12 04:16:43 +01:00
Laurent Destailleur
4476a1038b Update lib 2019-02-12 04:04:57 +01:00
Laurent Destailleur
771cd476ee Update ckeditor 2019-02-12 03:57:16 +01:00
Laurent Destailleur
8ca939d2c1 Update tcpdf to 6.2.26 2019-02-12 03:32:22 +01:00
Laurent Destailleur
f69f574eff Upgrade lib escpos-php 2019-02-12 03:28:17 +01:00
Laurent Destailleur
5450a09b7c Add link to resource 2019-02-12 01:33:03 +01:00
Laurent Destailleur
456a76cb11 Fix suffix 2019-02-12 01:11:37 +01:00
Frédéric FRANCE
a16ff4e368
Update OLE.php 2019-02-11 22:29:59 +01:00
Laurent Destailleur
90061c11e5 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-11 22:24:44 +01:00
Laurent Destailleur
f288ba466f Fix non need to exclude 2019-02-11 22:24:34 +01:00
Laurent Destailleur
930bd13664 Merge 2019-02-11 21:26:12 +01:00
Laurent Destailleur
ebedcd03d0 Try to ignore error with php 7.3 2019-02-11 21:22:48 +01:00
Laurent Destailleur
a62bccaf24 Fix phpcs 2019-02-11 19:19:05 +01:00
Laurent Destailleur
cb329766d9 Doc 2019-02-11 19:17:39 +01:00
Laurent Destailleur
f0e56abac7 NEW Module ticket is available as a stable module 2019-02-11 19:16:37 +01:00
Laurent Destailleur
9353cf976d Fix translation 2019-02-11 18:44:43 +01:00
Laurent Destailleur
8014d72dd5 progress before status 2019-02-11 18:12:27 +01:00
Laurent Destailleur
9b8a13cfe6 Dolibarrize module ticket 2019-02-11 15:41:07 +01:00
Laurent Destailleur
5c01ec158d Fix regression 2019-02-11 15:40:33 +01:00