lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
91,219 Commits 43 Branches 150 Tags 886 MiB
scrutinizer-patch-1
Commit Graph

1427 Commits

Author SHA1 Message Date
iouston
83b4f41eb5
Update document.php 
add 2 hidden options for set a default field sort and a default order on a document page
 2019-10-14 15:15:34 +02:00
Frédéric FRANCE
bb21d048f4
keep a copy of object for trigger 2019-10-12 22:08:11 +02:00
Frédéric FRANCE
f253315c8d
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-08 18:30:58 +02:00
Laurent Destailleur
43a70e5548 Clean code to use the new $extrafields->attributes array 2019-10-08 09:28:50 +02:00
Frédéric FRANCE
b78187c1eb
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-08 00:07:27 +02:00
Laurent Destailleur
c83f40fc7e Debug contact by default 2019-10-07 15:42:37 +02:00
Laurent Destailleur
c6c498fd67
Merge pull request #11829 from atm-florian/dev_contactdefault 
NEW : Address/Contact by default on third parties
 2019-10-07 15:27:58 +02:00
Laurent Destailleur
b9a92546b6
Update card.php 2019-10-07 15:20:52 +02:00
Frédéric FRANCE
ec8569dd85
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-06 15:56:21 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
stickler-ci
bc32d684a4 Fixing style errors. 2019-10-04 16:12:33 +00:00
florian HENRY
2d3dd9ed3c Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-10-04 18:10:16 +02:00
Frédéric FRANCE
98023353fe
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-03 17:21:31 +02:00
Laurent Destailleur
b60ee4c18c css 2019-10-03 09:58:49 +02:00
Frédéric FRANCE
feaa5e2bd0
json query path 2019-10-02 22:15:24 +02:00
Frédéric FRANCE
3afb4355a8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-02 18:59:18 +02:00
Laurent Destailleur
24570f7165 Look and feel v11. Picto are fontawesome. 2019-10-02 18:14:41 +02:00
Frédéric FRANCE
aca9d92db8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 22:03:33 +02:00
Frédéric FRANCE
872a1f42eb
list contacts with all fields 2019-10-01 20:51:49 +02:00
Frédéric FRANCE
010b2723b6
work on migration script 2019-10-01 20:14:06 +02:00
florian HENRY
d48f0fa791 resolve conflixt 2019-10-01 18:07:59 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Frédéric FRANCE
0c9956ab96
work on socpeople list 2019-10-01 00:37:10 +02:00
Frédéric FRANCE
420d972280
work on socpeople list 2019-10-01 00:35:08 +02:00
Frédéric FRANCE
be051e0f9d
work on socpeople list 2019-10-01 00:10:33 +02:00
Frédéric FRANCE
b87610adcc
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-30 19:34:35 +02:00
Frédéric FRANCE
258424416e
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-30 07:49:52 +02:00
Frédéric FRANCE
1b151da776
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-29 11:28:54 +02:00
Frédéric FRANCE
6c8dc75c96
socialnetworks for thirdparties 2019-09-29 11:20:23 +02:00
Laurent Destailleur
6966651d51 Standardize code to use dolSqlDateFilter 2019-09-28 13:22:05 +02:00
Frédéric FRANCE
cea3669ffa
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-28 00:35:14 +02:00
florian HENRY
f1d098adcc fix remove error dispplaying 2019-09-27 20:15:11 +02:00
florian HENRY
885d958e63 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-27 20:12:09 +02:00
Laurent Destailleur
6858dce344 Rename table for categorie of warehouses 2019-09-27 13:28:28 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Frédéric FRANCE
af63ac4051
work on contact 2019-09-14 13:31:26 +02:00
Frédéric FRANCE
79bd426363
work on user 2019-09-14 12:52:55 +02:00
Frédéric FRANCE
1cd59cc16a
work on user 2019-09-14 11:26:31 +02:00
Frédéric FRANCE
62922884fe
specimens 2019-09-12 18:12:28 +02:00
Frédéric FRANCE
9f3c54e5a5
definitions 2019-09-12 18:04:24 +02:00
Frédéric FRANCE
bd4c9a64a8
wip 2019-09-07 14:48:25 +02:00
florian HENRY
dff7be59c8 mostlyDone 2019-09-06 09:22:53 +02:00
florian HENRY
d50114df64 mostlyDone 2019-09-06 09:20:18 +02:00
Laurent Destailleur
f893854986 Fix remove warnings 2019-09-05 14:24:13 +02:00
Laurent Destailleur
1828872bd1 Removed deprecated properties 2019-09-05 13:39:33 +02:00
Laurent Destailleur
3f121f07cc Removed deprecated properties 2019-09-05 13:38:38 +02:00
florian HENRY
6c20fbafdf add trigger files 2019-09-03 17:04:42 +02:00
florian HENRY
d811de4da2 let only triggers part 2019-09-02 22:01:48 +02:00
florian HENRY
405c92640c on going 2019-09-02 14:47:32 +02:00
Laurent Destailleur
a040d7eccc Fix bad link 2019-09-02 04:39:45 +02:00
Laurent Destailleur
621dd83a7f Fix bad link 2019-09-02 04:38:36 +02:00
Laurent Destailleur
ac7d0b5eb6 Fix scrutinizer 2019-09-02 04:12:48 +02:00
Laurent Destailleur
999db7ed41 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/salaries/card.php
	htdocs/compta/sociales/class/chargesociales.class.php
	htdocs/takepos/invoice.php
 2019-08-26 16:49:25 +02:00
Laurent Destailleur
d08ed9fbcf FIX column jabberid missing 2019-08-26 16:19:39 +02:00
Laurent Destailleur
386f929fe3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/lib/website.lib.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
 2019-08-15 23:39:02 +02:00
Laurent Destailleur
64e52789d6 FIX #11591 FIX #11592 2019-08-15 20:39:47 +02:00
Laurent Destailleur
d7a41c6b72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2019-08-01 12:54:27 +02:00
Regis Houssin
2c29f041a0 FIX move sql request in INNER JOIN 2019-07-25 18:28:52 +02:00
Regis Houssin
5a82b2bc34 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0_ldap 2019-07-25 18:17:01 +02:00
Laurent Destailleur
a46bfc7a29 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/project.lib.php
 2019-07-25 17:54:14 +02:00
ptibogxiv
c219b62b10
Update contact.class.php 2019-07-24 13:23:24 +02:00
ptibogxiv
ba60e99b45
Update card.php 2019-07-24 13:22:41 +02:00
Regis Houssin
f45175cc9b FIX missing filter by current contact 2019-07-24 09:28:11 +02:00
ptibogxiv
f959341aa8
Update card.php 2019-07-23 14:30:12 +02:00
ptibogxiv
57db12ccdb
Update card.php 2019-07-23 14:10:13 +02:00
ptibogxiv
cc10f5e684
Update card.php 2019-07-23 14:06:51 +02:00
ptibogxiv
46d0137d30
FIx display civility in contact card 2019-07-23 14:04:54 +02:00
Laurent Destailleur
adfbd62f8b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-14 00:44:35 +02:00
Regis Houssin
4dab57b494 FIX phpcs 2019-07-13 11:24:25 +02:00
Regis Houssin
b7df4a2cd0 FIX this function can not be private 2019-07-13 11:21:07 +02:00
Laurent Destailleur
bf71731fc9 Fix phpcs 2019-06-19 22:28:33 +02:00
Nicolas ZABOURI
b6bd4119d9 FIX travis Public underscore in load_ldap_info 2019-06-19 09:12:01 +02:00
Laurent Destailleur
525598f6aa Fix scrutinizer warnings 2019-06-18 20:01:28 +02:00
Laurent Destailleur
5f0fbcea9a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/contact/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
 2019-06-02 11:49:33 +02:00
Laurent Destailleur
f2088a084f Fix error management 2019-05-31 11:53:30 +02:00
Laurent Destailleur
c1a0e9385f
Merge pull request #11219 from frederic34/patch-2 
dol_print_object_info return void
 2019-05-21 22:38:39 +02:00
Laurent Destailleur
5f23cf7e2a CSS 2019-05-19 13:51:47 +02:00
Frédéric FRANCE
c8027ccf1a
Update agenda.php 2019-05-19 09:15:10 +02:00
florian HENRY
0787eee9b8 fix :email collector for event creation 2019-05-18 18:42:46 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button 
NEW : look and feel title button
 2019-05-18 16:04:47 +02:00
John BOTELLA
f296093f8d fix travis 2019-05-10 15:52:46 +02:00
Sof
2154b4a654
FIX : Typo 
$seearch_cti = $search_cti
 2019-04-28 12:09:59 +02:00
atm-quentin
2bc93b9748 NEW public note and private note in contact list sall 2019-04-16 16:19:36 +02:00
ATM john
07e6ce5460 Appli function to links 2019-04-15 21:33:31 +02:00
John BOTELLA
7372e8c610 Appli function to links 2019-04-15 15:47:36 +02:00
Laurent Destailleur
84050c888f Fix set of civility label 2019-04-11 18:04:18 +02:00
Laurent Destailleur
9337e48072
Merge branch 'develop' into patch-147 2019-04-11 17:54:29 +02:00
ptibogxiv
42b1ab10d1
Update contact.class.php 2019-04-11 17:04:40 +02:00
ptibogxiv
1f017d4d06
Update contact.class.php 2019-04-11 17:03:07 +02:00
Laurent Destailleur
d7f980fda0 NEW Add picto of deletion on mass action combo lists 2019-04-09 01:22:59 +02:00
Laurent Destailleur
54714bc755 Deprecated property ->fk_departement is now ->state_id everywhere. 2019-04-05 20:06:13 +02:00
Laurent Destailleur
1b2826f476 Look and feel v10 2019-03-29 13:26:26 +01:00
ptibogxiv
013b8a61ec
ADD cilivity label in fetch contact / API 2019-03-29 12:11:50 +01:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Laurent Destailleur
4f9981063f Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing 2019-03-02 18:26:50 +01:00
Laurent Destailleur
56d921ea52 CSS 2019-03-02 12:57:07 +01:00
Frédéric FRANCE
49cbaed569
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-27 14:21:15 +01:00
Laurent Destailleur
825705179c Fix phpcs 2019-02-27 12:49:44 +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
Laurent Destailleur
4634312306 Fix phpcs 2019-02-27 04:18:25 +01:00
Laurent Destailleur
61b7564664 Fix syntax error 2019-02-27 02:29:14 +01:00
Laurent Destailleur
6373e1db84
Merge branch 'develop' into 10.0_linkedin 2019-02-27 01:16:21 +01:00
Frédéric FRANCE
c89e4d79b8
wip 2019-02-25 22:27:04 +01:00
Josep Lluís
f6fc9190f3
Add no_email field in contact list 
Add no_email field in contact list
 2019-02-25 19:41:40 +01:00
Alexandre SPANGARO
2da1447a0b Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin 2019-02-25 09:12:04 +01:00
Alexandre SPANGARO
acb9cfe07a NEW: Add LinkedIn field 2019-02-25 09:07:58 +01:00
Frédéric FRANCE
42a1387218
wip 2019-02-25 00:56:48 +01:00
Frédéric FRANCE
167a857f4c
replace html code by html5 in contact 2019-02-24 14:47:47 +01:00
Laurent Destailleur
86c9dbc218
Merge branch 'develop' into new_branch_14_02_2019 2019-02-19 13:26:35 +01:00
Sof
be4cd0572a
Update card.php 2019-02-17 20:09:46 +01:00
Philippe Grand
f2b057f376
Update consumption.php 2019-02-15 10:46:37 +01:00
Philippe Grand
b301ed0040
Update consumption.php 2019-02-15 10:44:04 +01:00
Philippe Grand
a9407f3b4e
Update consumption.php 
following the remark of Frédéric France
 2019-02-15 09:35:38 +01:00
Frédéric FRANCE
7412a624c6
update html5 contact list 2019-02-14 21:26:39 +01:00
Philippe GRAND
bd031bd294 update with html5 compliant code 2019-02-14 17:02:17 +01:00
Frédéric FRANCE
55d4037de1
Update card.php 2019-02-13 23:57:27 +01:00
Laurent Destailleur
f1500281ef Fix phpcs 2019-02-12 19:00:50 +01:00
Laurent Destailleur
aa206e5d7c
Update consumption.php 2019-02-12 13:45:38 +01:00
Frédéric FRANCE
9893e8d752
Update consumption.php 2019-02-10 23:37:12 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
96de1b175c
clean missing spaces in the last merge 2019-02-02 08:51:30 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-02-01 18:31:44 +01:00
ATM-Nicolas
2cbb58c2eb Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_contact_related_item_tab 2019-02-01 10:54:42 +01:00
ATM-Nicolas
f432a874e6 NEW : Contact related items tab 2019-02-01 10:51:28 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +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
Josep Lluís
60d3cced37 FIX: delete all contact categories 
Delete all contact categories is not necessary on contact card.
Current function setCategories will do it when necessary.

Conflicts:
	htdocs/contact/card.php
 2019-01-03 13:00:06 +01:00
Laurent Destailleur
62ba4ba2cb
Merge pull request #10291 from joseplluis/patch-5 
FIX: delete all contact categories
 2019-01-03 12:58:11 +01:00
Josep Lluís
932e5ef0b5
FIX: delete all contact categories 
Delete all contact categories is not necessary on contact card.
Current function setCategories will do it when necessary.
 2019-01-02 08:37:26 +01:00
Regis Houssin
4a1d8567b1 FIX replace deprecated "fieldLabel()" with "Form::editfieldkey" 
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
 2018-12-25 08:52:10 +01:00
Laurent Destailleur
25b93fdd3e
Merge pull request #10188 from AlainRnet/patch-7 
Update vcard.php
 2018-12-15 16:01:38 +01:00
Laurent Destailleur
f55db6dd84 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/resources/dbmodel/dolibarr_schema.mwb
 2018-12-15 14:09:16 +01:00
Laurent Destailleur
611ccc4a9a
Merge branch 'develop' into fieldlabel 2018-12-14 15:42:01 +01:00
Laurent Destailleur
0c3165a79a
Merge branch 'develop' into email-contact-card 2018-12-14 15:26:15 +01:00
Laurent Destailleur
5dabefe227 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-13 20:49:55 +01:00
Laurent Destailleur
4a61c1b6ed FIX lang not loaded 2018-12-11 13:25:09 +01:00
Laurent Destailleur
b47e7b2267 Work on new unsubscribe process 2018-12-11 09:49:46 +01:00
Laurent Destailleur
3213b3be07 Standardize code: Move jabberid into social network module 2018-12-11 09:17:02 +01:00
AlainRnet
cce133caea
Update vcard.php 
update from vcard 2.1 to vcard 3.0
 2018-12-06 00:29:51 +01:00
Laurent Destailleur
6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
 2018-12-01 19:23:06 +01:00
Laurent Destailleur
cb9ada2119 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/product/price.php
 2018-12-01 18:19:45 +01:00
ATM John BOTELLA
474228cbd6 FIX #8741 2018-12-01 17:01:11 +01:00
Philippe GRAND
3df83d7cf3 fix scrutinizer issue : The variable seems only to be defined at a later point 2018-12-01 15:45:02 +01:00
Laurent Destailleur
1d2c2a23ef Fix look and feel v8 2018-11-25 11:57:19 +01:00
Frédéric FRANCE
12dcda7e02
Merge remote-tracking branch 'upstream/develop' into fieldlabel 2018-11-15 22:01:36 +01:00
Laurent Destailleur
01e7b5747d FIX user param is null not 0 when not defined 
FIX properties email_xx were not set
 2018-11-12 15:27:59 +01:00
Laurent Destailleur
5a7cb95b72 FIX filter on entity must be done as soon as we don't search on rowid. 2018-11-12 14:49:08 +01:00
Frédéric FRANCE
09efde4901
Merge remote-tracking branch 'upstream/develop' into fieldlabel 2018-11-09 18:13:59 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
François J
7c2256a4a7 Fix X-Dolibarr-TRACKID header: set to 'conXXX' where XXX is contact ID. 2018-11-09 09:33:27 +01:00
Laurent Destailleur
b45ead7038
Merge pull request #9970 from OPEN-DSI/search-contact-by-town 
New Search Contact by Town
 2018-11-08 19:55:51 +01:00
François J
afdefa56bd New Search Contact by Town 
Adding the missing SQL condition to filter contact list by user requested town
 2018-11-07 15:34:07 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
François J
2dd69c3735 Hide buttons when action is presend email 2018-11-06 16:51:48 +01:00
François J
29c71b31fe [New] Add Presend form & Actions to send emails to Contact card 
Add ability to send email to contact from the Contact card. Functionality was copied and adapted from the Third Party card.
 2018-11-06 16:40:39 +01:00
Frédéric FRANCE
42a9abad56
remove fieldlabel and add fieldeditkey 2018-10-27 17:45:29 +02: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
277655b911 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-24 13:31:31 +02:00
Laurent Destailleur
30a2004d53 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-24 13:30:54 +02:00
gauthier
036f70860e FIX : wrong occurence number of contract on contact card, we must only count externals 2018-10-24 10:17:21 +02:00
Philippe GRAND
9551cb12f5 Standardize and update code 2018-10-13 09:59:33 +02:00
Laurent Destailleur
ded5c4c3dd Social network module 2018-10-12 11:02:03 +02:00
Philippe GRAND
83db36f9b2 Standardize code 2018-10-06 12:11:48 +02:00
Laurent Destailleur
62b31df069 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/rssparser.class.php
	htdocs/langs/en_US/boxes.lang
 2018-09-27 12:55:25 +02:00
Laurent Destailleur
98b1e13ed7 Work on module socialnetworks 2018-09-26 16:55:46 +02:00
Laurent Destailleur
e39e54503e Fix responsive 2018-09-25 12:54:24 +02:00
Laurent Destailleur
ad6895aa2e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-24 10:23:09 +02:00
Laurent Destailleur
39e9029e41
Update contact.class.php 2018-09-23 15:44:44 +02:00
ptibogxiv
77dd516023
fix number mailing for a contact / multicompany 2018-09-22 14:45:15 +02:00
Frédéric FRANCE
a4fd8c4b75
reduce complexity of contact class 2018-09-16 19:19:45 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 21:29:41 +02:00
Frédéric FRANCE
f02b2f0239
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-09 13:35:58 +02:00
Frédéric FRANCE
a3fa13994b
replace select_date 2018-09-09 09:36:12 +02:00
Frédéric FRANCE
2b62c4ca8f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-08 10:50:27 +02:00
Philippe GRAND
3c06527a7b Merge remote-tracking branch 'upstream/develop' into new_branch_03_09_2018 2018-09-06 09:50:12 +02:00
Frédéric FRANCE
4cbfa2073a
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-05 21:02:16 +02:00
Laurent Destailleur
4ac67e6409 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-05 20:31:10 +02:00
Frédéric FRANCE
4e619dd0ed
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-05 18:51:21 +02:00
Laurent Destailleur
51901108ad FIX #9412 2018-09-05 14:26:12 +02:00
Philippe GRAND
11d75573be Standardize and update code 2018-09-05 12:21:13 +02:00
Laurent Destailleur
ab8155f170 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
 2018-09-04 21:35:43 +02:00
Laurent Destailleur
4a7bec2c04 Fix fax not required as visible by default on list 2018-09-04 09:48:30 +02:00
Frédéric FRANCE
2a9ef8dc05
move phpcs:ignore 2018-09-02 22:05:19 +02:00
Frédéric FRANCE
35232b753a
move phpcs:ignore 2018-09-02 20:37:12 +02:00
Frédéric FRANCE
61c4e9831f
move phpcs:ignore 2018-09-02 18:18:10 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Laurent Destailleur
2db84a679e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/index.php
 2018-08-28 02:35:45 +02:00
Laurent Destailleur
534eadb7a2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-28 01:35:43 +02:00
atm-ph
eb4e42bc40 Fix datec and tms missing in fetch method for API 2018-08-26 18:08:10 +02:00
Philippe GRAND
215677c972 Standardize and update code 2018-08-23 18:17:09 +02:00
Philippe GRAND
504b0e3d16 Update and standardize code 2018-08-22 18:34:50 +02:00
Philippe GRAND
29f15b4ae6 Update and standardize code 2018-08-22 10:51:55 +02:00
Philippe GRAND
a669830427 Update and standardize code 2018-08-22 10:37:16 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-21 20:57:58 +02:00
Laurent Destailleur
db3c17668e Fix coding style 2018-08-21 19:08:11 +02:00
Philippe GRAND
c48211ad70 Update and standardize code 2018-08-17 19:31:22 +02:00
Frédéric FRANCE
39462742e2
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-16 08:17:55 +02:00
Frédéric FRANCE
a0a6afc224
return comment 2018-08-14 12:23:10 +02:00
Frédéric FRANCE
3210181a3d
rule for private function is different 2018-08-14 10:21:34 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function 2018-08-13 17:26:32 +02:00
Laurent Destailleur
9fc5d39d07 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:36 +02:00
Laurent Destailleur
12e21b4886 FIX update extrafields 2018-08-12 16:29:26 +02:00
Philippe GRAND
948647f3f9 comment translation 2018-08-04 14:17:51 +02:00
florian HENRY
5d19361782 fix: keep context filter on contact list on change column displayed 2018-07-31 11:39:54 +02:00
Regis Houssin
3e5271967b FIX missing entity field 2018-07-08 12:11:22 +02:00
Laurent Destailleur
5de650435a Fix filter on country/zip 2018-06-28 14:06:23 +02:00
Laurent Destailleur
06342ff80c FIX contextpage on contact list 2018-06-23 12:06:17 +02:00
Laurent Destailleur
27a27e02a1 Fix css 2018-06-22 22:53:53 +02:00
Laurent Destailleur
4a5fd35e11 Look and feel v8 2018-06-13 22:57:41 +02:00
Laurent Destailleur
6e62727c37 Fix scrutinizer bug 2018-06-06 18:18:50 +02:00
Laurent Destailleur
29ee5dffc4 Clean code 2018-06-04 12:55:55 +02:00
Frédéric FRANCE
30a3b95368
loadlangs 2018-05-26 20:32:23 +02:00
Regis Houssin
2906358383 Fix: use "socpeople" instead "societe" 2018-04-27 10:42:10 +02:00
Laurent Destailleur
461ae46cc4 FIX When on a high page and searching for a small result, list was not 
visible.
 2018-04-24 11:37:57 +02:00
Rui Strecht
1bc8035f94 Fix minor merge issue 2018-04-18 10:31:10 +01:00
Laurent Destailleur
7256edc831 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-18 03:28:50 +02:00
Laurent Destailleur
bbfc4a3e17 NEW Look and feel v8 - Show Picto "+" on all links "Add record" 2018-04-18 03:26:15 +02:00
Juanjo Menent
9ae28d2bc2 Fix: zip not filter 2018-04-17 10:43:25 +02:00
Laurent Destailleur
8fbde88872 Look and feel v8 2018-04-15 17:37:49 +02:00
Laurent Destailleur
be965bdbab Clean code 2018-04-13 13:28:48 +02:00
Laurent Destailleur
1521b0595b Clean code 2018-04-13 11:03:03 +02:00
All-3kcis
880fa55dd5 display user-friendly filesize 2018-04-12 15:29:22 +02:00
Laurent Destailleur
1feee6378f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-11 14:45:52 +02:00
Laurent Destailleur
0d15d8e0ad Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/user/card.php
 2018-04-11 14:45:11 +02:00
Laurent Destailleur
804703c9c9 Fix regression 2018-04-11 14:43:16 +02:00
Laurent Destailleur
560038fa18 Fix regression in update contact 2018-04-11 14:38:56 +02:00
Laurent Destailleur
21c65f812a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-11 13:21:20 +02:00
atm-greg
7cdc1c8bef Fix #8259 can't update contact birthday with REST API 2018-04-11 07:08:40 +02:00
Laurent Destailleur
7108f68db9 Remove old deprecated hook insertExtraFields. Triggers must be used for 
action on CRUD events.
 2018-04-10 12:03:01 +02:00
Laurent Destailleur
d46a8eb8f0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/company.php
 2018-04-07 12:30:30 +02:00
Laurent Destailleur
0abcf5694c Fix message of discount 2018-04-06 20:18:36 +02:00
Laurent Destailleur
1a321e19c8 FIX XSS in company setup page 2018-04-06 19:12:13 +02:00
Laurent Destailleur
956fc2376d FIX #8483 2018-04-06 12:27:55 +02:00
Laurent Destailleur
9d9f3ddf85
Merge pull request #8502 from ATM-Marc/NEW_create_from_list 
NEW: generalize use of button to create new element from list
 2018-04-05 16:40:15 +02:00
Laurent Destailleur
43f8834b28 Uniformize code with the new module builder framework 2018-03-31 18:48:27 +02:00
Marc de Lima Lucio
0366e645d5 NEW: generalize button to create object from list, for most of the lists 2018-03-30 16:54:38 +02:00
Regis Houssin
dec0164ff9 Fix: differentiate "card", "contact" and "agenda 2018-03-27 19:12:01 +02:00
Laurent Destailleur
e2cbf903ba Remove deprecated code 2018-03-16 10:33:23 +01:00
Laurent Destailleur
eb5d5d07ec Remove the old deprecated code of doActions in canvas. The doActions of 
hooks are already available and are better.
 2018-03-16 09:58:46 +01:00