Commit Graph

72690 Commits

Author SHA1 Message Date
ptibogxiv
2aa2cd331e
Update type.php 2019-01-24 19:26:36 +01:00
ptibogxiv
7197f43c3a
manage statut type 2019-01-24 19:23:01 +01:00
ptibogxiv
634810b8b3
NEW conditionnal add member button by statut 2019-01-24 18:40:41 +01:00
Laurent Destailleur
f9686c47af Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/fr_FR/members.lang
	htdocs/langs/fr_FR/stocks.lang
	htdocs/website/index.php
2019-01-23 19:22:42 +01:00
Laurent Destailleur
278b3e0b08 Fix css 2019-01-23 15:30:54 +01:00
Laurent Destailleur
ad54a2b8af Fix website edit of virtualhost 2019-01-23 15:06:28 +01:00
Laurent Destailleur
e33f102dc2 FIX Edit of virtualhost 2019-01-23 14:57:43 +01:00
Laurent Destailleur
e860d664d7 Fix substitution of __REF_CLIENT__ 2019-01-23 11:54:20 +01:00
Laurent Destailleur
bb1e7ee0a1 Fix transifex 2019-01-22 19:54:47 +01:00
Laurent Destailleur
c5686df035 Sync transifex 2019-01-22 18:16:08 +01:00
Laurent Destailleur
eefa57bf6b Sync transifex 2019-01-22 18:15:47 +01:00
Laurent Destailleur
ccbec3d29f Fix typo 2019-01-22 16:27:23 +01:00
Laurent Destailleur
51bdf5f949 Fix trans 2019-01-22 16:06:20 +01:00
Laurent Destailleur
8104b7fa2d look and feel v10 2019-01-22 15:40:51 +01:00
Laurent Destailleur
8fba387673 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-22 10:39:18 +01:00
Laurent Destailleur
3cca0df28e Support getFormatedCustomerRef into contract list 2019-01-22 10:39:06 +01:00
Laurent Destailleur
f153a4c152
Merge pull request #10380 from aspangaro/10.0_phpcs
Phpcs Ignore Alert Generic.CodeAnalysis.UnusedFunctionParameter
2019-01-21 23:42:12 +01:00
Laurent Destailleur
eba8a8f34d
Merge pull request #10376 from atm-maxime/fix_extrafields_computed
Compute value of computed extrafield on fetch, not on show
2019-01-21 23:41:06 +01:00
Laurent Destailleur
df01974633
Merge pull request #10389 from grandoc/new_branch_22_01_2019
update with html5 compliant code
2019-01-21 23:33:47 +01:00
Philippe GRAND
e671c6705c update with html5 compliant code 2019-01-21 22:37:42 +01:00
Philippe GRAND
218636271a update with html5 compliant code 2019-01-21 22:36:14 +01:00
Philippe GRAND
be97ad0e3e update with html5 compliant code 2019-01-21 22:04:42 +01:00
Philippe GRAND
7734c4f61b update with html5 compliant code 2019-01-21 22:02:11 +01:00
Philippe GRAND
1f3be71d8b update with html5 compliant code 2019-01-21 21:22:12 +01:00
Philippe GRAND
1741e77996 update with html5 compliant code 2019-01-21 21:19:42 +01:00
Philippe GRAND
9ce73dfa71 update with html5 compliant code 2019-01-21 21:15:53 +01:00
Philippe GRAND
f045cf353b update with html5 compliant code 2019-01-21 21:13:42 +01:00
Philippe GRAND
35ceb805dd update with html5 compliant code 2019-01-21 21:06:36 +01:00
Laurent Destailleur
fbf5a1c056 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-21 20:48:19 +01:00
Laurent Destailleur
0ae3aeff12 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-21 20:47:52 +01:00
Laurent Destailleur
3cf81d14e3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-21 20:47:44 +01:00
Laurent Destailleur
a4017fa823 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-21 20:47:22 +01:00
Laurent Destailleur
6f553db93d Remove bad text 2019-01-21 20:47:07 +01:00
Laurent Destailleur
8284bd0577 Remove useless class 2019-01-21 18:12:25 +01:00
Laurent Destailleur
d38ed67a3c
Merge pull request #10383 from grandoc/new_branch_21_01_2019
update with html5 compliant code
2019-01-21 18:05:40 +01:00
Laurent Destailleur
976d945735
Merge pull request #10379 from torvista/objectline_etc
Change of aligns etc to CSS for HTML5 validation
2019-01-21 18:04:58 +01:00
Laurent Destailleur
42743027d4
Merge branch 'develop' into objectline_etc 2019-01-21 18:04:48 +01:00
Laurent Destailleur
9c3a0bb14e
Merge pull request #10382 from frederic34/patch-2
add missing global $conf in bonprelevement class
2019-01-21 18:03:10 +01:00
Laurent Destailleur
0df1d2e2f7
Merge pull request #10384 from atm-florian/9.0
fix php warning
2019-01-21 18:02:50 +01:00
Laurent Destailleur
a928f3a9d7
Update dolresource.class.php 2019-01-21 18:02:43 +01:00
Laurent Destailleur
b1a4e3abd5 To be sure table is dropped 2019-01-21 16:44:51 +01:00
Laurent Destailleur
daa2fccd73 Fix delete of ticket 2019-01-21 16:42:34 +01:00
torvista
62abf82297 remove dev comment 2019-01-21 16:32:02 +01:00
torvista
9b1cf648dc more validation fixes 2019-01-21 16:19:31 +01:00
torvista
827c836e6e Whne multicurrency in use, the Add button colspan is incorrect (6 instead of 5) since it is incrementing colspan in addition to a previous incrment in the title bar.
This corrects the table.
2019-01-21 16:18:39 +01:00
torvista
3cca072e26 correction of missing " 2019-01-21 16:16:21 +01:00
Laurent Destailleur
8950720fb5 NEW Add getFormatedCustomerRef and getFormatedSupplierRef methods 2019-01-21 15:22:35 +01:00
Laurent Destailleur
4b3876d8e8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-21 14:46:45 +01:00
Laurent Destailleur
35c08e4842 Exclude lib for php 5.6 2019-01-21 14:45:33 +01:00
Maxime Kohlhaas
23438b1f48 Compute extrafields after having set all others 2019-01-21 14:40:33 +01:00