lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
77,082 Commits 43 Branches 150 Tags 886 MiB
6512435f9f
Commit Graph

1329 Commits

Author SHA1 Message Date
Laurent Destailleur
032aa869e4 FIX Can't insert if there is extrafields mandatory on another entity. 
FIX Can't set default value of extrafield of type varchar
 2019-03-21 12:14:15 +01:00
Laurent Destailleur
4c85068a85 FIX Can't insert if there is extrafields mandatory on another entity. 2019-03-21 11:53:04 +01:00
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
Günter Lukas
1cf786acff
Fix #10278 
Fix #10278
 2019-01-22 00:09:36 +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
Laurent Destailleur
44a6644969 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-18 21:55:53 +01:00
Laurent Destailleur
89068ffef1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/adherents/subscription.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/langs/es_ES/companies.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/product/stock/product.php
	htdocs/user/card.php
 2018-12-18 21:55:14 +01:00
Laurent Destailleur
f2318716ec FIX Error reported when creation of thirdparty from member fails 2018-12-18 21:27:16 +01:00
Laurent Destailleur
27f8096afa
Merge branch 'develop' into PR_NEW_reception 2018-12-15 12:50:31 +01:00
Laurent Destailleur
9fb672d51b
Merge pull request #10127 from atm-florian/develop_scrunitizer 
fix scrunitizer
 2018-12-14 17:28:34 +01:00
Laurent Destailleur
8c9f81807f
Merge pull request #9702 from bafbes/abb80027 
New : Link to create new element on linked fields
 2018-12-14 11:01:39 +01:00
Laurent Destailleur
42de7da334
Update commonobject.class.php 2018-12-14 11:01:27 +01:00
Laurent Destailleur
3213b3be07 Standardize code: Move jabberid into social network module 2018-12-11 09:17:02 +01:00
florian HENRY
faf7ea345f fix https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/core/class/commonobject.class.php?selectedAuthors%5B0%5D=florian.henry%40atm-consulting.fr&orderField=path&order=asc&honorSelectedPaths=0 2018-12-01 15:23:46 +01:00
ATM John BOTELLA
c6f4879575 Fix issue from scrutinizer 2018-12-01 12:04:34 +01:00
Laurent Destailleur
e020597ba7 Fix deletion for class build with modulebuilder 2018-11-19 21:11:26 +01:00
Laurent Destailleur
39621ec686 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-11-19 20:07:51 +01:00
Laurent Destailleur
8191df4857
Merge pull request #9962 from atm-john/fix_extrafield_view 
FIX hidden extrafield
 2018-11-19 18:37:18 +01:00
atm-ph
129034ba76 Fix new params has been added not optional 2018-11-19 15:46:30 +01:00
Laurent Destailleur
6d640ab83c Fix feature to drag and drop rows of table (not generic) 2018-11-15 19:58:06 +01:00
John BOTELLA
500bb7bc96 best conditions testing 2018-11-13 10:20:34 +01:00
John BOTELLA
4f7be36249 fix extrafield hidden 2018-11-07 09:14:29 +01:00
Regis Houssin
9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_email

Conflicts:
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
 2018-10-30 18:29:28 +01:00
Laurent Destailleur
2c3cd7a668 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modSyslog.class.php
 2018-10-30 15:32:09 +01:00
Maxime Kohlhaas
b68b8fe412 Fix changing currency in a doc was recalculating amounts in company currency #9801 2018-10-28 11:02:51 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
03b93781a0
Merge pull request #9848 from bafbes/abb80038 
New : parameter for getnomurl in field specification
 2018-10-24 01:53:19 +02:00
Laurent Destailleur
d5285ca359
Update commonobject.class.php 2018-10-24 01:53:07 +02:00
atm-quentin
04eb9ca167 fix dont change num version 2018-10-23 17:06:21 +02:00
atm-quentin
96d0bb8f2e FIX adapt develop 2018-10-23 14:31:58 +02:00
atm-quentin
8442b405b2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception 2018-10-23 10:27:46 +02:00
Abbes Bahfir
7e7473e7df New : parameter for getnomurl in field dpecification 2018-10-23 01:25:38 +01:00
Abbes Bahfir
5bac6a92e6 Fix:empty value instead of 0 for empty links 2018-10-23 00:03:34 +01:00
Laurent Destailleur
6a6a8ae14b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-19 14:29:22 +02:00
Laurent Destailleur
5a1a5548df Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/product/index.php
	htdocs/product/list.php
	htdocs/societe/class/societe.class.php
 2018-10-19 14:27:15 +02:00
Laurent Destailleur
762d82f2fe Move declaration into common 2018-10-19 13:38:05 +02:00
atm-ph
72dd182b1f Fix list from 'Contacts/Addresses' on company may show duplicate value for extrafields 2018-10-16 18:22:43 +02:00
Laurent Destailleur
ded5c4c3dd Social network module 2018-10-12 11:02:03 +02:00
atm-quentin
7ad4a7e384 NEW creation facture fourn depuis reception 2018-10-09 16:26:40 +02:00
atm-quentin
c6ab79bad3 NEW note, contact and lines on card 2018-10-08 16:54:33 +02:00
Abbes Bahfir
f0d8a5da9a Fix: Reminder : TODO Add Javascript code to add input fields contents to new elements urls 2018-10-08 12:39:59 +01:00
Abbes Bahfir
7d25311ce5 New : Link to create new element on linked fields 2018-10-08 10:59:01 +01:00
atm-quentin
6a8092dfae NEW entete reception card 2018-10-05 16:21:50 +02:00
Frédéric FRANCE
2af15ee932
Update commonobject.class.php 2018-09-30 17:59:04 +02:00
Laurent Destailleur
f667270d4d Add option to not load all object and fix so linkedObjectsIds has same 
content than linkedObjects
 2018-09-28 17:38:29 +02:00
Laurent Destailleur
9630c7b5c7
Merge pull request #9614 from grandoc/new_branch_25_09_2018 
Add some code comment
 2018-09-27 09:31:19 +02:00
Laurent Destailleur
2b8ccc0c81 FIX Link template invoice to contract 2018-09-27 01:53:12 +02:00
Laurent Destailleur
9123329800 FIX Link template invoice to contract 2018-09-26 23:44:27 +02:00
Philippe GRAND
746d73b8e6 Add some code comment 2018-09-25 17:26:57 +02:00
Laurent Destailleur
61f5a2e899
Merge pull request #9533 from frederic34/trimParameters 
trimParameters function
 2018-09-18 15:04:32 +02:00
Laurent Destailleur
0bf540b3c1 Fix regression in edition of date 2018-09-17 09:17:11 +02:00