Commit Graph

58076 Commits

Author SHA1 Message Date
Frédéric FRANCE
6fc444e045
we can see what we are doing 2018-04-24 12:08:17 +02:00
Frédéric FRANCE
5f4e2dc565
variant on services 2018-04-24 11:01:17 +02:00
Laurent Destailleur
271e50ccf4 CSS 2018-04-24 10:06:13 +02:00
Laurent Destailleur
fb8ad77378 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2018-04-23 23:09:53 +02:00
Laurent Destailleur
fdb3a11f34 FIX extrafields price and double were lost during a failed post. 2018-04-23 22:56:40 +02:00
Laurent Destailleur
0a5e606937 FIX extrafields price and double were lost during a failed post. 2018-04-23 22:53:57 +02:00
Laurent Destailleur
f95e5078c1 FIX Can't edit option PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY 2018-04-23 21:33:49 +02:00
Laurent Destailleur
315d5bad39 FIX Error in ContractLigne not return to Contract 2018-04-23 15:07:50 +02:00
Laurent Destailleur
7065d16d85 FIX Error in ContractLigne not return to Contract 2018-04-23 10:35:11 +02:00
Laurent Destailleur
743f3d60f5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-22 20:59:42 +02:00
Laurent Destailleur
e9a2894727 Fix PSR2 2018-04-22 20:59:29 +02:00
Laurent Destailleur
54979bf3b3
Merge pull request #8660 from grandoc/new_branch_22_04_2018
update code
2018-04-22 20:30:59 +02:00
Laurent Destailleur
6aa2ca7462
Merge pull request #8659 from aspangaro/8.0-a24
Fix Accountancy
2018-04-22 20:30:42 +02:00
Laurent Destailleur
ffa8b7379b
Merge pull request #8658 from ptibogxiv/patch-26
fix getcountry
2018-04-22 20:29:31 +02:00
Laurent Destailleur
32511422ab Fix PSR2 2018-04-22 20:08:29 +02:00
Laurent Destailleur
e834eff049 FIX #8650 2018-04-22 20:03:24 +02:00
Laurent Destailleur
ac89951acd
Merge pull request #8647 from fmarcet/develop
New: Add same parameters on 'printFieldListTitle' hooks
2018-04-22 19:35:09 +02:00
Laurent Destailleur
68a0b45141
Merge pull request #8648 from grandoc/new_branch_20_04_2018
clean and update code
2018-04-22 19:31:46 +02:00
Laurent Destailleur
69adf73f4f Clean code from $var = True 2018-04-22 19:27:37 +02:00
Laurent Destailleur
fec9303d18 Remove useless $var 2018-04-22 18:51:03 +02:00
Laurent Destailleur
46e448a086 Fix default agenda view 2018-04-22 17:57:20 +02:00
Laurent Destailleur
06cbc19103 Add meta generator in install pages 2018-04-22 12:10:53 +02:00
Laurent Destailleur
f83369d268 Remove travis warnings 2018-04-22 11:27:26 +02:00
Laurent Destailleur
769a1f507b Debug asset module 2018-04-22 11:26:59 +02:00
Philippe GRAND
05f4e3c68e update code 2018-04-22 11:14:01 +02:00
Alexandre SPANGARO
034f7d56e4 Invert credit debit 2018-04-22 06:49:04 +02:00
Alexandre SPANGARO
d8e7c98a8d Add nature "inventory" & hide in ventilation journal 2018-04-22 05:56:31 +02:00
Laurent Destailleur
a0152f8e7a Better template 2018-04-21 16:07:40 +02:00
Laurent Destailleur
06e51703b1 Clean constructors 2018-04-21 16:01:05 +02:00
Laurent Destailleur
912d5c53f2 Standardize code 2018-04-21 15:54:05 +02:00
Laurent Destailleur
411949a6bb Optimize constructors 2018-04-21 15:08:46 +02:00
Laurent Destailleur
394b988a4e FIX key in getEntity for supplier proposals 2018-04-21 14:41:31 +02:00
Laurent Destailleur
98cb95cc41 Fix deprecated labels 2018-04-21 13:19:12 +02:00
Laurent Destailleur
c81c744aaf Clean deprecated var 2018-04-21 13:14:58 +02:00
Laurent Destailleur
9eeaf5c3eb dol_syslog now strftime instead of dol_print_date 2018-04-21 12:22:21 +02:00
Laurent Destailleur
ccd9aa8059 Fight against dolibarr warnings 2018-04-21 12:16:12 +02:00
Philippe GRAND
a8c7be3fb5 Typo 2018-04-21 12:14:51 +02:00
Laurent Destailleur
c30b0da07d Clean code 2018-04-21 12:12:46 +02:00
Philippe GRAND
3856d64b63 update code 2018-04-21 12:07:19 +02:00
Philippe GRAND
410d1ee07d Merge remote-tracking branch 'upstream/develop' into new_branch_20_04_2018 2018-04-21 12:05:50 +02:00
Laurent Destailleur
cef9782179 Clean defined constant at begin of pages 2018-04-21 12:00:55 +02:00
Philippe GRAND
4e9c77a738 Merge remote-tracking branch 'upstream/develop' into new_branch_20_04_2018 2018-04-21 11:46:03 +02:00
Laurent Destailleur
cca4b1cbf5 NEW Optimize load of hooks classes (save 1-5Kb of memory) 2018-04-21 11:24:45 +02:00
ptibogxiv
f5ef0441fd
fix for customer rereive and charge with sources 2018-04-21 11:23:02 +02:00
Laurent Destailleur
cc5d54faa5 Doc 2018-04-21 01:41:38 +02:00
ptibogxiv
f0c572717f
fix getcountry
note: stripe account may just be call with customer not card or source
2018-04-21 01:08:22 +02:00
Laurent Destailleur
f6743484dd Better support of option COMPANY_AQUARIUM_CLEAN_REGEX 2018-04-21 00:58:42 +02:00
Laurent Destailleur
1031fcd796 logs 2018-04-21 00:37:05 +02:00
Laurent Destailleur
9b57dadc18 css 2018-04-21 00:05:14 +02:00
Laurent Destailleur
6afd4e67e9 Fix error in sources->retrieve when a stripeaccount is defined 2018-04-20 23:46:56 +02:00