Commit Graph

55400 Commits

Author SHA1 Message Date
Laurent Destailleur
cc2c31d940 Fix typo 2017-12-12 16:31:59 +01:00
Laurent Destailleur
247c380d18 Several fixes 2017-12-12 16:11:40 +01:00
Laurent Destailleur
3f5bfa21c3 Merge pull request #7945 from mistraloz/patch-4
Fix #7921 : For invoice with "/" in ref
2017-12-12 15:00:07 +01:00
Laurent Destailleur
f886aac75a Merge pull request #7944 from lampi87/develop
public holiday in austria
2017-12-12 14:59:23 +01:00
Laurent Destailleur
676e5a1bca Merge pull request #7943 from aspangaro/7.0-b4
FIX : Various payment
2017-12-12 14:54:44 +01:00
Laurent Destailleur
1ad7ec5ad1 Test on bad entity 2017-12-12 13:23:39 +01:00
Laurent Destailleur
06e63615e3 complete api detection 2017-12-12 13:05:22 +01:00
Laurent Destailleur
e9eeb59068 Revert "Add invoice label in supplier invoice web service"
This reverts commit 8b288d99ff.
2017-12-12 11:45:12 +01:00
Laurent Destailleur
8b288d99ff Add invoice label in supplier invoice web service 2017-12-12 11:43:53 +01:00
Laurent Destailleur
af1028576d Fix on search all (trim search + search from smartphone). 2017-12-12 11:31:30 +01:00
Laurent Destailleur
1251807f54 Fix several pb in links to projects on create page 2017-12-12 10:37:51 +01:00
Laurent Destailleur
9314dcb046 Fix regression 2017-12-12 10:13:48 +01:00
Laurent Destailleur
118b6ce140 Code comment 2017-12-12 03:10:54 +01:00
Laurent Destailleur
9880ef7364 Fix module website 2017-12-12 01:40:34 +01:00
Laurent Destailleur
48aada6090 Export of website 2017-12-11 21:27:43 +01:00
Laurent Destailleur
6f3c839d65 Fix error management 2017-12-11 18:58:08 +01:00
Laurent Destailleur
dbefb93e0f Error management 2017-12-11 18:25:23 +01:00
Laurent Destailleur
bb7c03906e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/societe/list.php
2017-12-11 15:25:09 +01:00
Laurent Destailleur
48499fb506 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-12-11 15:21:22 +01:00
Laurent Destailleur
f2e429e28f Fix file integrity checker (exclude files excluded from package) 2017-12-11 15:03:34 +01:00
Laurent Destailleur
1593792cdd Fix loading data after first install 2017-12-11 14:56:12 +01:00
Mistral Oz - LWEP
7cd785d59a Fix #7921 : For invoice with "/" in ref
Fix #7921 : For invoice with "/" in ref
2017-12-11 14:47:07 +01:00
Laurent Destailleur
8189be0ac4 Fix warning 2017-12-11 14:17:26 +01:00
Laurent Destailleur
7efbcfa1e9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-12-11 13:50:49 +01:00
Laurent Destailleur
338f8d978a Fix generation of doc in modulebuilder 2017-12-11 13:50:26 +01:00
Laurent Destailleur
acf2d2ee9a Fix scrutinizer reported bugs 2017-12-11 11:48:11 +01:00
Alexander Lampret
46aeb7068c public holiday in austria 2017-12-11 10:51:58 +01:00
Alexandre SPANGARO
7b935a96bf FIX : Various payment 2017-12-11 07:03:37 +01:00
Laurent Destailleur
066e04f33d Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2017-12-11 00:22:05 +01:00
Laurent Destailleur
dbd96d1ac7 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/actions_sendmails.inc.php
	htdocs/loan/card.php
	htdocs/loan/class/loan.class.php
2017-12-10 21:46:23 +01:00
Laurent Destailleur
d836d68801 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-12-10 21:29:35 +01:00
Laurent Destailleur
4017d09613 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-12-10 21:28:36 +01:00
Laurent Destailleur
fd85088a6c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-12-10 21:27:03 +01:00
Laurent Destailleur
1d9d8980a9 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-12-10 21:16:49 +01:00
Laurent Destailleur
e640831653 Merge pull request #7553 from atm-maxime/new_menu_expense_holidays
Add detailed menus in HRM module
2017-12-10 21:15:51 +01:00
Laurent Destailleur
c6c248fa28 Merge pull request #7930 from aspangaro/7.0-7
Fix : Accountancy some cleaning
2017-12-10 21:10:30 +01:00
Laurent Destailleur
d3150ede42 Merge pull request #7942 from delcroip/fixDeleteSalaries
fix: unable to remove salaries, plus correct default rights management
2017-12-10 21:09:15 +01:00
Laurent Destailleur
f18edd5787 Update security.lib.php 2017-12-10 21:08:13 +01:00
Laurent Destailleur
7e69a31dd6 Merge pull request #7941 from atm-maxime/fix_errmsg_stockneg
Fix display error message when stock not enough on invoice validation #7846
2017-12-10 21:05:23 +01:00
Laurent Destailleur
f7b663379a Fix PHP 7.2 2017-12-10 21:04:59 +01:00
Laurent Destailleur
3415ce4664 Merge pull request #7938 from aspangaro/7.0-b3
FIX : Debug various_payment
2017-12-10 20:59:45 +01:00
Laurent Destailleur
e01195f4f1 Merge pull request #7935 from aspangaro/7.0-b1
FIX : v7 sql error on init database
2017-12-10 20:58:05 +01:00
Laurent Destailleur
e4725f4248 FIX #7933 2017-12-10 20:55:51 +01:00
Laurent Destailleur
7d553f58f5 Debug website module 2017-12-10 20:34:35 +01:00
patrick Delcroix
033016da7f fix: unable to remove salaries, plus correct default rights management 2017-12-10 20:02:26 +01:00
Maxime Kohlhaas
12d0928244 Fix display error message when stock not enough on invoice validation 2017-12-10 19:59:56 +01:00
Laurent Destailleur
748aee9a54 Fix javascript error 2017-12-10 19:54:04 +01:00
Laurent Destailleur
d701a7617b Fix province nadorgg into nador 2017-12-10 19:04:21 +01:00
Laurent Destailleur
2dae21259e Fix the switch show more/less 2017-12-10 19:03:18 +01:00
Laurent Destailleur
e1f0483b23 Fix grabber of url when url is on second level dir. More phpunits 2017-12-10 17:59:19 +01:00