Commit Graph

74028 Commits

Author SHA1 Message Date
Laurent Destailleur
b7066d92cc More info 2019-03-04 20:37:03 +01:00
Laurent Destailleur
e974a3b2b3 Add more info 2019-03-04 20:36:05 +01:00
Laurent Destailleur
1cfbf5f551 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/security.php
2019-03-04 20:18:23 +01:00
Laurent Destailleur
c95c8b4dcb Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/login/functions_dolibarr.php
2019-03-04 20:17:16 +01:00
Laurent Destailleur
54b9681257 More log to help debug 2019-03-04 20:15:31 +01:00
Laurent Destailleur
15138aa543 FIX error on setup of password if pass generators have a .old file. 2019-03-04 20:00:36 +01:00
Laurent Destailleur
1d6028dfb0 FIX PHPUnit 2019-03-04 19:38:52 +01:00
Laurent Destailleur
ff9b6c2f04 Module ticket 2019-03-04 19:19:20 +01:00
Laurent Destailleur
4a582485b9 Debug module ticket 2019-03-04 19:19:09 +01:00
Laurent Destailleur
0d49f27831 Code style 2019-03-04 17:36:45 +01:00
Laurent Destailleur
68bb95079a Ignore 2 rules 2019-03-04 17:36:03 +01:00
Laurent Destailleur
69794f5293 Fix phpcs 2019-03-04 17:31:50 +01:00
Laurent Destailleur
bb9a64fd07 Fix phpcs 2019-03-04 17:25:13 +01:00
Laurent Destailleur
06a40726bb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-04 16:29:23 +01:00
Laurent Destailleur
27402f432a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/don/class/don.class.php
	htdocs/product/stock/card.php
	htdocs/theme/eldy/style.css.php
2019-03-04 16:29:16 +01:00
Laurent Destailleur
c3b08a604f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-04 16:20:57 +01:00
Laurent Destailleur
07dca25b96 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-04 16:20:49 +01:00
Laurent Destailleur
acaf5cabef
Merge pull request #10332 from ATM-Nicolas/fix_check_picture_name
FIX : Check for old picture name if the new one was not found
2019-03-04 16:20:29 +01:00
Laurent Destailleur
4a260cce49
Merge pull request #10732 from futurehousestore/futurehousestore-patch-1
Show full product names on product list
2019-03-04 16:13:49 +01:00
Laurent Destailleur
3b48808916
Update list.php 2019-03-04 16:13:38 +01:00
Laurent Destailleur
4446b80a23
Merge pull request #10733 from ptibogxiv/patch-136
Fixe date on fetch don.class.php
2019-03-04 16:11:29 +01:00
Laurent Destailleur
ea68f28c55
Merge pull request #10730 from frederic34/html5-accountancy
replace html by html5 in accountancy
2019-03-04 16:10:47 +01:00
Laurent Destailleur
79e15610e3
Merge pull request #10729 from frederic34/html5-contrat
replace html by html5 in contrat
2019-03-04 16:10:35 +01:00
Laurent Destailleur
1b041ba0f3
Merge pull request #10728 from frederic34/html5-margin
Html5 margin
2019-03-04 16:10:25 +01:00
Laurent Destailleur
442a56b0be
Merge pull request #10727 from frederic34/html5-loan
replace html by html5 in loan
2019-03-04 16:10:12 +01:00
Laurent Destailleur
6200cb10e9
Merge pull request #10725 from frederic34/patch-2
phpcs fix
2019-03-04 16:04:35 +01:00
Laurent Destailleur
cff6cd9662
Merge pull request #10731 from andreubisquerra/master
Add Order Notes to TakePOS
2019-03-04 16:02:26 +01:00
Laurent Destailleur
6538971be0
Merge pull request #10734 from ptibogxiv/patch-138
Fixe date on fetch adherent.class.php
2019-03-04 15:59:10 +01:00
Laurent Destailleur
a5cc799fc2
Merge pull request #10735 from ptibogxiv/patch-137
Fixe date on fetch don.class.php
2019-03-04 15:58:46 +01:00
Laurent Destailleur
63d14b16c9 FIX The notes was also copied on invoice 2019-03-04 14:56:39 +01:00
Laurent Destailleur
db13e54724 FIX The notes was also copied on invoice 2019-03-04 14:54:59 +01:00
Laurent Destailleur
1686b7b1db FIX label of bank account 2019-03-04 14:42:00 +01:00
Laurent Destailleur
fe5cb57df8 FIX label of bank account 2019-03-04 14:41:20 +01:00
Laurent Destailleur
99e79d1750 Fix regression with private property 2019-03-04 14:11:07 +01:00
Laurent Destailleur
ca9449c70e Work on BOM 2019-03-04 14:01:30 +01:00
Laurent Destailleur
d8259f94e1 Work on BOM module 2019-03-04 13:40:16 +01:00
Laurent Destailleur
925def5390 Work on BOM module 2019-03-04 13:37:00 +01:00
Laurent Destailleur
7b7ff33fdf Work on BOM module 2019-03-04 13:30:43 +01:00
Laurent Destailleur
a46b7f5202 Work of BOM module 2019-03-04 12:49:22 +01:00
Laurent Destailleur
1c775b7b68 Work of BOM module 2019-03-04 12:46:07 +01:00
Laurent Destailleur
dd9a4a8cbc CSS 2019-03-04 12:29:36 +01:00
Laurent Destailleur
34c179ab2b Fix responsive 2019-03-04 10:42:09 +01:00
ptibogxiv
d18b1dd9dc
Update don.class.php 2019-03-03 22:36:34 +01:00
ptibogxiv
dd172f04d5
Fixe date on fetch adherent.class.php 2019-03-03 21:51:32 +01:00
ptibogxiv
c05552e1cc
Fixe date on fetch don.class.php
v 10
2019-03-03 21:42:28 +01:00
ptibogxiv
ad18077567
Fixe date on fetch don.class.php 2019-03-03 21:38:06 +01:00
Laurent Destailleur
d502d10da4 CSS 2019-03-03 21:05:33 +01:00
Laurent Destailleur
16d13b223a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-03 20:43:35 +01:00
Laurent Destailleur
526bd1d02e Fix number format 2019-03-03 17:36:43 +01:00
futurehousestore
b710a41707
Update list.php
Display full product name
2019-03-03 16:23:10 +00:00