Commit Graph

1276 Commits

Author SHA1 Message Date
Laurent Destailleur
d44be341a5 NEW Add property 'noteditable' in modulebuilder 2019-03-17 01:45:46 +01:00
Laurent Destailleur
6ae36ce6a7 Work on BOM 2019-03-12 19:20:01 +01:00
Frédéric FRANCE
b47a54c652 update doc in commonobject class 2019-03-09 18:05:48 +01:00
Laurent Destailleur
a426c8e9bf Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/filefunc.inc.php
	htdocs/install/upgrade2.php
	htdocs/product/class/product.class.php
2019-03-07 11:16:24 +01:00
gauthier
598d1fc914 FIX : extrafields always visible on view mode 2019-03-05 16:53:36 +01:00
Laurent Destailleur
ca9449c70e Work on BOM 2019-03-04 14:01:30 +01:00
Frédéric FRANCE
9b165f6b3f add visibility 2019-02-27 20:45:07 +01:00
Frédéric FRANCE
5a4ac82880 Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-27 08:23:29 +01:00
Frédéric FRANCE
c89e4d79b8 wip 2019-02-25 22:27:04 +01:00
Alexandre SPANGARO
acb9cfe07a NEW: Add LinkedIn field 2019-02-25 09:07:58 +01:00
Frédéric FRANCE
1e43f8e54a PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Frédéric FRANCE
970392adb8 Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Laurent Destailleur
a6dde3d6bd Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
Laurent Destailleur
9f7dfe2921 Merge pull request #10481 from frederic34/psr2forloop
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
2019-02-03 19:11:07 +01:00
Laurent Destailleur
e309261140 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-03 18:19:58 +01:00
Frédéric FRANCE
80a12fcd1c psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
03701fa091 psr2 2019-02-02 18:25:01 +01:00
Laurent Destailleur
ebe30f7a0e FIX error report not returned 2019-02-01 19:19:23 +01:00
Frédéric FRANCE
f5b2cf75f2 Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-02-01 18:31:44 +01:00
Laurent Destailleur
eb3621839a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/members.lang
	htdocs/langs/fr_FR/members.lang
2019-02-01 15:14:19 +01:00
Laurent Destailleur
ae81bbac93 Better var name 2019-02-01 13:49:07 +01:00
Laurent Destailleur
b14a16a119 Code comment 2019-02-01 13:48:09 +01:00
Laurent Destailleur
849b3b640b Code comment 2019-02-01 13:41:23 +01:00
Laurent Destailleur
648eea3a70 Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Laurent Destailleur
3198f9fbbe Merge pull request #10441 from aspangaro/10.0_email
Move my email to the new one
2019-01-30 14:59:58 +01:00
Laurent Destailleur
3d218cadb7 FIX last_main_doc var not saved
Conflicts:
	htdocs/core/class/commonobject.class.php
2019-01-29 19:03:45 +01:00
Laurent Destailleur
9ef93bceca FIX last_main_doc var not saved 2019-01-29 18:40:47 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
Frédéric FRANCE
b10558bacd Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
4f9f0fd7b5 Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1 Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +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
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
42743027d4 Merge branch 'develop' into objectline_etc 2019-01-21 18:04:48 +01:00
Laurent Destailleur
8950720fb5 NEW Add getFormatedCustomerRef and getFormatedSupplierRef methods 2019-01-21 15:22:35 +01:00
Maxime Kohlhaas
23438b1f48 Compute extrafields after having set all others 2019-01-21 14:40:33 +01:00
Maxime Kohlhaas
f50de03585 Merge branch 'develop' of github.com:atm-maxime/dolibarr into fix_extrafields_computed 2019-01-21 14:36:23 +01:00
torvista
07b2bb6715 Swap of align/valign/border/width for css
Removal of type="text/javascript"
2019-01-20 23:36:39 +01:00
Maxime Kohlhaas
c0b0d5484c Compute value of computed extrafield on fetch, not on show 2019-01-19 17:14:56 +01:00
Philippe GRAND
29fdad144d update with html5 compliant code 2019-01-19 12:40:17 +01:00
Laurent Destailleur
3d4879c538 Code comment 2019-01-06 05:16:50 +01:00
Laurent Destailleur
8b380489f2 Update commonobject.class.php
Conflicts:
	htdocs/core/class/commonobject.class.php
2019-01-02 19:55:51 +01:00
Laurent Destailleur
85d60b93d6 Update commonobject.class.php 2019-01-02 19:53:59 +01:00
Günter Lukas
2857447aee Update commonobject.class.php 2018-12-30 00:20:38 +01:00
ldestailleur
7b91c14cb3 FIX sql error when resetting payment mode / term 2018-12-28 23:14:41 +01:00
ldestailleur
2fef2b633a FIX sql error when resetting payment mode / term 2018-12-28 23:13:39 +01:00
Laurent Destailleur
35debd06fb List of events show user firstname by default 2018-12-23 01:28:36 +01:00