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
Laurent Destailleur
c962b89495
NEW hook getnomurltooltip is replaced with hook getNomUrl more powerfull
2018-03-15 20:46:55 +01:00
Laurent Destailleur
78b0585798
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/taxes.php
2018-03-12 19:09:57 +01:00
Laurent Destailleur
55d3e72463
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/contact/class/contact.class.php
htdocs/societe/card.php
2018-03-12 19:02:30 +01:00
Maxime Kohlhaas
c008853842
Fix #8057
2018-03-10 23:05:33 +01:00
Inovea Conseil
5d1e54c6fd
Add phone search
2018-03-09 23:48:50 +01:00
Laurent Destailleur
b4446764f8
Clean code of deprecated usage
2018-02-21 14:48:25 +01:00
Laurent Destailleur
c4130730cb
Clean code around fetch_optionals()
2018-02-20 19:38:18 +01:00
Laurent Destailleur
7f9d6a5458
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/paybox/newpayment.php
htdocs/public/payment/newpayment.php
htdocs/public/paypal/newpayment.php
htdocs/public/stripe/newpayment.php
2018-01-31 20:25:24 +01:00
Laurent Destailleur
de0a8ba71f
Fix extrafields
2018-01-31 14:01:58 +01:00
Laurent Destailleur
e9f8c7ba01
Fix edit of extrafields "link" corrupts the data definition
2018-01-31 10:51:40 +01:00
Laurent Destailleur
d6317a26d2
Fix for multicompany
2018-01-30 15:48:09 +01:00
Rui Strecht
a13866f091
Changed MAIN_SHOW_REGION_IN_STATE to MAIN_SHOW_REGION_IN_STATE_SELECT for clarity
2018-01-25 16:14:39 +00:00
Rui Strecht
496ac644eb
Updated label and added new translation for label
2018-01-25 16:10:04 +00:00
Laurent Destailleur
b8688a46d3
Update contact.class.php
2018-01-15 11:30:11 +01:00
Regis Houssin
20ad3b0e80
Fix: if $entity is empty '' the isset return true !!
2018-01-12 10:39:15 +01:00
Regis Houssin
93d5c818c5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_multicompany
2018-01-12 10:35:22 +01:00
Laurent Destailleur
f93f9e1a73
Fix regression
2018-01-11 20:39:23 +01:00
Regis Houssin
157e118cba
Fix: broken feature
2018-01-11 10:47:40 +01:00
Laurent Destailleur
4316793638
Merge pull request #8047 from hregis/develop_multicompany
...
Fix: some bugs with multicompany sharing
2018-01-11 01:07:17 +01:00
Laurent Destailleur
af6b84ba3a
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/contact/document.php
htdocs/product/list.php
2018-01-11 01:03:13 +01:00
Regis Houssin
4683a35532
Fix: wrong image path with multicompany sharing
2018-01-10 12:52:30 +01:00
Regis Houssin
bd1acca2cd
Fix: wrong entity with multicompany thirdparty sharing
2018-01-10 12:38:12 +01:00
Regis Houssin
0f51aa15d8
Fix: avoid Warning: A non-numeric value encountered
2018-01-10 10:52:30 +01:00
Frédéric FRANCE
0fae2ba8ca
correct merge
2017-12-29 20:41:39 +01:00
Laurent Destailleur
6676178435
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/list.php
htdocs/contrat/card.php
2017-12-28 09:56:40 +01:00
Laurent Destailleur
31b5d9df52
Merge pull request #7985 from atm-arnaud/FIX_search_contact_list
...
FIX search on contact list
2017-12-28 07:07:47 +01:00
Laurent Destailleur
eab44f62b1
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_builddoc.inc.php
htdocs/core/class/html.form.class.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
htdocs/core/tpl/admin_extrafields_edit.tpl.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/notes.tpl.php
htdocs/main.inc.php
htdocs/product/inventory/tpl/inventory.tpl.php
htdocs/societe/tpl/linesalesrepresentative.tpl.php
2017-12-21 14:35:33 +01:00
Laurent Destailleur
6a62e13960
FIX security vulnerability reported by ADLab of Venustech
2017-12-21 13:32:16 +01:00
arnaud
ae7f8c3fe4
FIX search on contact list
2017-12-21 12:01:30 +01:00
Laurent Destailleur
f504716501
Fix sync contact - external user
2017-12-19 16:16:31 +01:00
Laurent Destailleur
af1028576d
Fix on search all (trim search + search from smartphone).
2017-12-12 11:31:30 +01:00
florian HENRY
94285ae494
factorization of extrafeild into list
2017-11-27 15:24:29 +01:00
Laurent Destailleur
836f6bf3c9
Fix search filter when using extrafields 'links'
2017-11-12 12:39:23 +01:00
Laurent Destailleur
d1860b87f8
NEW Add a confirmation for all mass action 'delete'
2017-11-11 16:34:11 +01:00
Laurent Destailleur
1b28c45e2c
PERF Links in getNomUrl use only one tag a instead of 2.
2017-11-02 15:19:14 +01:00
Laurent Destailleur
d569218162
Fix 'separate' extrafields must be visible by default.
...
Sandardize name of list pages (must end with _list.php)
2017-10-29 11:23:20 +01:00
Laurent Destailleur
202712be94
Work on module builder
2017-10-25 22:02:07 +02:00
Scrutinizer Auto-Fixer
165741517e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-13 11:28:26 +00:00
Laurent Destailleur
8c5cf9ea45
Fix date output
2017-10-12 18:04:47 +02:00
Laurent Destailleur
85606126a9
Standardize code for events
2017-10-04 12:58:13 +02:00
Laurent Destailleur
a501a20487
NEW Search filters in lists are restored when using "back to list"
2017-10-03 16:00:52 +02:00
Laurent Destailleur
f007f9e7e5
NEW Add new property visible dy default on lists on extrafields
2017-09-29 13:26:44 +02:00
Laurent Destailleur
6bdfa99fc2
FIX The backtopage
2017-09-27 20:07:01 +02:00
Laurent Destailleur
fdc1aa2a03
NEW Move contacts of a thirdparty on tab Contacts/Addresses
2017-09-27 19:56:03 +02:00
Regis Houssin
f550e27579
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-09-18 12:15:01 +02:00
Laurent Destailleur
291a0d46e6
Fix edit of categories
2017-09-18 01:39:39 +02:00
Regis Houssin
7f57f737b3
New: Ping ldap server before ldap_connect for avoid waiting
2017-09-15 18:02:52 +02:00
Laurent Destailleur
5e34b121dd
Add more robust php unit to detect not escaped sql. Fix not escaped sql
2017-09-15 15:41:07 +02:00
Laurent Destailleur
0873260b8a
USe second parameter in GETPOST
2017-09-15 10:50:50 +02:00
Laurent Destailleur
724817139d
Start remove $GLOBALS
2017-09-12 19:49:07 +02:00
Laurent Destailleur
a4665e17d4
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/expensereport/index.php
htdocs/compta/facture/class/facture-rec.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/societe/class/societe.class.php
htdocs/societe/list.php
2017-09-12 13:26:25 +02:00
Regis Houssin
c1c75208ec
Fix: missing parameters for filter and sort (contact list)
2017-09-09 09:46:21 +02:00
Laurent Destailleur
259cca0230
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/admin/mails_templates.php
2017-09-08 13:30:54 +02:00
Laurent Destailleur
bde293af22
Fix filter on extrafield with type sellist
2017-09-07 15:34:25 +02:00
Laurent Destailleur
9304df21a0
Clean code
2017-09-04 13:17:18 +02:00
Laurent Destailleur
c573df4f0e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/card.php
2017-08-26 22:33:56 +02:00
Laurent Destailleur
98f5fbab5d
Fix error on contact/address not linked on thirdparty
2017-08-25 13:50:45 +02:00
Laurent Destailleur
fa752348c8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/various_payment/index.php
htdocs/contact/list.php
htdocs/langs/en_US/errors.lang
2017-08-02 17:56:09 +02:00
Laurent Destailleur
5b1f5b0f20
Fix translation done twice into field title of array
2017-08-02 13:31:53 +02:00
Laurent Destailleur
ec27eb5b1e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/list.php
htdocs/societe/list.php
2017-07-27 02:09:40 +02:00
Laurent Destailleur
537a6ae622
Add id and import id
2017-07-27 02:05:11 +02:00
Laurent Destailleur
7e0a165131
Fix some pb in search using phone
2017-07-26 20:33:25 +02:00
Laurent Destailleur
f106ff7e76
Fix var init
2017-07-13 23:52:02 +02:00
Laurent Destailleur
2870798d07
Fix remove warnings
2017-07-13 00:35:10 +02:00
AlainRnet
8c287c02ca
Update card.php
...
Limitation of the number of characters that is not limited in the third card as described here: https://www.dolibarr.fr/forum/5-bugs-sur-la-version-cvs-ou-demo/59229-taille-limitee-de-l-adesse-mail-des-contacts
2017-07-10 21:39:25 +02:00
Laurent Destailleur
e93cefbbf0
FIX #6985
2017-06-11 10:37:58 +02:00
Laurent Destailleur
7c0de18ac1
Fix code comment
2017-06-10 12:56:28 +02:00
Laurent Destailleur
b441c62e1d
Fix syntax error
2017-06-08 14:55:12 +02:00
Laurent Destailleur
b1f93ccb0c
Fix security
2017-06-08 14:33:46 +02:00
Laurent Destailleur
543630e487
Fix missing count of nb of columns into lists
2017-06-08 14:14:06 +02:00
Regis Houssin
2b36135641
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-07 20:14:03 +02:00
Laurent Destailleur
1820649175
Maxi debug of v6
2017-06-07 19:28:31 +02:00
Regis Houssin
bfd6116e5b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2017-06-06 15:03:36 +02:00
Laurent Destailleur
02b5d9e6f7
FIX #6945
2017-06-06 10:53:53 +02:00
Regis Houssin
5c5663c5ae
New: getEntity function use true $shared value by default
2017-05-30 18:50:54 +02:00
Laurent Destailleur
e5fe629a0e
NEW Extrafields support formulas to be computed using PHP expressions
2017-05-24 22:48:44 +02:00
Laurent Destailleur
2da50f1eca
Look and feel v6
2017-05-23 01:32:19 +02:00
Laurent Destailleur
0cd030d856
NEW Introduce mass actions on contacts
2017-05-23 00:13:07 +02:00
Laurent Destailleur
b3dc73e611
Look and feel v6
2017-05-21 02:43:51 +02:00
Laurent Destailleur
68e333879f
Fix var not sanitized
2017-05-16 13:27:32 +02:00
Laurent Destailleur
fa290c34fa
Fix against SQL injection. Add phpunit to detect missing escapement.
2017-05-12 16:55:11 +02:00
Laurent Destailleur
e5c898e0d6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
build/makepack-dolibarr.pl
htdocs/fichinter/list.php
htdocs/product/list.php
htdocs/projet/tasks/list.php
2017-05-10 00:48:27 +02:00
Laurent Destailleur
6d01bd712d
FIX Better sanitizing of search all parameter.
2017-05-09 19:36:10 +02:00
Laurent Destailleur
26a9999fbf
Support of preview for pdf with several pages
2017-04-12 11:38:55 +02:00
Laurent Destailleur
2446cb5431
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/facture.php
htdocs/compta/facture/fiche-rec.php
htdocs/contact/list.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/facture/card.php
htdocs/societe/list.php
htdocs/user/document.php
2017-04-11 11:43:54 +02:00
Marcos García de La Fuente
2057613ad9
FIX #6675 Restricted user with no agenda permissions can see a button to create appointment in thirdparty contact list
...
Close #6675
2017-04-09 15:18:02 +02:00
Laurent Destailleur
be439f6252
Work on look and feel v6
2017-04-07 16:16:44 +02:00
Laurent Destailleur
d99b0461c7
Extrafields multilanguage support.
2017-04-03 10:56:28 +02:00
Laurent Destailleur
8e70c4a0b7
Work on 6.0 new look and feel
2017-03-30 15:39:50 +02:00
Laurent Destailleur
54b03a3552
Work on 6.0 new look and feel
2017-03-29 11:03:13 +02:00
Laurent Destailleur
f843f8a93d
Start to move search bar before table titles
2017-03-27 00:48:50 +02:00
Laurent Destailleur
d1a988a0be
Fix document_preview is possible on files with + chars inside.
2017-03-24 17:32:38 +01:00
Laurent Destailleur
fb88eaf2a4
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-02-23 02:55:50 +01:00
Laurent Destailleur
e981e719a1
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/comm/action/card.php
2017-02-23 02:54:40 +01:00
Laurent Destailleur
daf1dbb3a1
FIX #6453
2017-02-22 14:09:19 +01:00
BENKE Charlie
692dd0b5db
contact email not display on tooltip
...
field not initialised
2017-02-15 01:22:20 +01:00
Gustavo Novaro
5a7c20e897
Code style
...
var to public
2017-02-08 17:13:54 -03:00
Laurent Destailleur
fbbf8cd8a4
Fix bad side effect of uniformizing a constant name.
2017-02-01 15:47:08 +01:00
Laurent Destailleur
9a9b31c9c0
Fix cancel button + logic to close project when setting opp to WON/LOST.
2017-02-01 13:25:16 +01:00
Regis Houssin
e2e4403869
Fix: avoid numeric errors
2017-01-23 12:20:44 +01:00
Laurent Destailleur
b0e9f31474
Fix responsive
2017-01-22 12:43:25 +01:00
Laurent Destailleur
65f7de8f64
Fix css and look 5.0
2017-01-22 12:13:32 +01:00
Laurent Destailleur
d14e4dbaba
Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on
2017-01-15 20:49:20 +01:00
Laurent Destailleur
c42b48636a
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/commande/class/api_commande.class.php
htdocs/core/class/CMailFile.class.php
htdocs/societe/class/api_contact.class.php
2017-01-12 11:06:24 +01:00
Laurent Destailleur
70e6c2d41f
Fix bad count of nb of contacts in statistics
2017-01-10 00:42:28 +01:00
Laurent Destailleur
8fb9a55d8a
Complete work on dol_banner
2016-12-19 16:35:40 +01:00
Laurent Destailleur
1fdbcf4c0f
Fix missing page to match new reorg of agenda events (done for
...
thirdparty but not complete for contact)
2016-12-19 16:22:41 +01:00
Laurent Destailleur
fc401a9c68
Fix more security fixes
2016-12-18 17:27:06 +01:00
Laurent Destailleur
f762c98a37
Fix html not balanced
2016-12-18 11:27:22 +01:00
BENKE Charlie
c2dc140024
Cleaning code
2016-12-15 11:09:03 +01:00
Laurent Destailleur
1a842d8366
Fix translation
2016-12-05 13:45:57 +01:00
Laurent Destailleur
bd8f923cee
Several fixes in filter on lists
2016-11-29 22:52:16 +01:00
Laurent Destailleur
2c9edd4205
Maxi debug on list. Fix responsive design.
2016-11-27 13:49:46 +01:00
Laurent Destailleur
16ce156631
Fix responsive design
2016-11-25 18:32:52 +01:00
Laurent Destailleur
341e014a3d
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/don/document.php
2016-11-08 11:36:31 +01:00
Laurent Destailleur
f5d76ac0c7
Fix count of contact was not complete
2016-11-06 17:20:21 +01:00
Laurent Destailleur
7fa9692458
Uniformize code. Generalize option MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE.
2016-11-02 12:48:50 +01:00
Laurent Destailleur
ef03f59e50
Uniformize code
2016-11-02 12:16:46 +01:00
Laurent Destailleur
0ae5a3799c
Fix html
2016-10-24 12:42:37 +02:00
Laurent Destailleur
d27dea8320
NEW Can rename uploaded or generated files on all "documents" tabs.
2016-10-14 18:09:24 +02:00
Laurent Destailleur
46ce1d3a69
Uniformize code
2016-09-18 16:11:30 +02:00
Josep Lluís
1b05be0305
Minor fix: incorrect key translations
...
"Post" key doesn't exist: Changed to "PostOrFunction"
"Email" key doesn't exist: Changed to "EMail"
"DateCreate" changed to "DateCreateShort" in $arrayfields (with the same key in print_liste_field_titre function)
2016-09-16 17:07:01 +02:00
Laurent Destailleur
9ff1809f85
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/list.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/card.php
htdocs/product/stock/class/productlot.class.php
htdocs/theme/eldy/style.css.php
2016-09-12 02:05:38 +02:00
Laurent Destailleur
1fbf233f95
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contact/list.php
htdocs/contrat/list.php
htdocs/expedition/list.php
htdocs/expensereport/list.php
htdocs/fichinter/list.php
htdocs/fourn/commande/list.php
htdocs/product/reassort.php
htdocs/product/reassortlot.php
htdocs/product/stock/list.php
htdocs/societe/list.php
htdocs/supplier_proposal/list.php
htdocs/theme/eldy/style.css.php
2016-09-12 01:50:38 +02:00
Laurent Destailleur
25c5f40bf1
Add css on picto status
2016-09-10 19:44:55 +02:00
Ferran Marcet
b5db70342b
Fix: Search all is lost on lists when pagination or when the columns are sorted
2016-09-09 13:58:41 +02:00
BENKE Charlie
197c891fa4
use getnomUrl of society instead 'handmade' url;
2016-09-08 16:24:27 +02:00
Laurent Destailleur
aba8304086
Fix code not reachable
2016-08-31 19:44:45 +02:00
Laurent Destailleur
fac28f9589
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/sociales/charges.php
htdocs/core/boxes/modules_boxes.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
2016-08-28 02:40:20 +02:00
aspangaro
b52648674d
Uniformize presentation on contact
2016-08-10 15:01:43 +02:00
Laurent Destailleur
3f87b0c225
NEW Show photo of contacts on thirdparty card.
2016-08-06 00:04:24 +02:00
Laurent Destailleur
eb546cb4d4
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-08-02 18:18:39 +02:00
Laurent Destailleur
176b52f305
Fix No modify trigger must be called during creation
2016-08-02 17:55:13 +02:00
Laurent Destailleur
f0c75388cb
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/api_commande.class.php
htdocs/compta/facture/class/api_invoice.class.php
htdocs/product/class/api_product.class.php
htdocs/societe/class/api_contact.class.php
htdocs/societe/class/api_thirdparty.class.php
2016-08-02 17:43:12 +02:00
Laurent Destailleur
75b909ce93
Fix missing transaction in update_perso function
2016-08-02 16:55:32 +02:00
Laurent Destailleur
b267402df6
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/main.lang
htdocs/societe/rib.php
2016-08-01 15:15:32 +02:00
Laurent Destailleur
a6147ee73b
Miscellaneous fixes
2016-07-30 14:49:29 +02:00
Laurent Destailleur
5a8c08e6cc
Merge pull request #5481 from defrance/patch-12
...
NEW Add hook "getnomurltooltip" to replace tooltips on getNomUrl functions
2016-07-20 18:23:35 +02:00
BENKE Charlie
282def1930
add feature on other dolibarr element
2016-07-16 18:00:53 +02:00
Laurent Destailleur
0f4f4ea61c
FIX #5482 #5485
2016-07-15 14:22:49 +02:00
Laurent Destailleur
c787e7f2a1
FIX Clear of filter should also reset categories and extrafields filter
...
FIX Filter on categories should depends on context
2016-07-13 12:03:30 +02:00
Laurent Destailleur
cdafd45877
FIX Clear of filter should also reset categories and extrafields filter
...
FIX Filter on categories should depends on context
2016-07-13 12:02:45 +02:00
Laurent Destailleur
5db6bcd4a8
Fix contextpage lost on submitting form or sorting
2016-06-07 14:06:00 +02:00
Laurent Destailleur
22d6d9497e
Fix ambiguous test on ldap return of getAttributes
2016-05-29 11:20:12 +02:00
Maxime Kohlhaas
df4d016684
New add stats on contacts
2016-04-23 13:06:46 +02:00
Laurent Destailleur
4958c13691
Merge pull request #5069 from atm-maxime/new_contact_gender
...
New contact gender according to civility
2016-04-22 19:11:54 +02:00
Laurent Destailleur
366db31a9e
Make css more simple
2016-04-22 13:38:44 +02:00
Maxime Kohlhaas
7dd8eba29e
New contact gender according to civility
2016-04-22 10:30:13 +02:00
Laurent Destailleur
08c379ad58
Fix submit photo is no more hidden on smartphone.
2016-04-19 19:15:31 +02:00
Laurent Destailleur
5b55af4d66
NEW Mutualize code: Use one call of function "addThumbs", when possible,
...
to generate thumbs files instead of several call of "vignette" function.
2016-04-09 14:12:21 +02:00
Laurent Destailleur
43165bab02
FIX Filter/search on extrafields on lists
...
Conflicts:
dev/skeletons/skeleton_list.php
htdocs/projet/list.php
htdocs/societe/list.php
2016-04-04 16:22:26 +02:00
Laurent Destailleur
592a041bc5
FIX Filter/search on extrafields on lists
2016-04-04 16:02:29 +02:00
Laurent Destailleur
e1bec46a34
FIX The include file for action on files should not be a template file
...
but an action include file.
2016-04-02 14:16:16 +02:00
Laurent Destailleur
0d9a86db3f
Minor lool enhancement
2016-03-30 00:06:55 +02:00
Laurent Destailleur
2e5cc98e59
Fix into badges visibility
2016-03-29 20:06:01 +02:00
BENKE Charlie
34fb67fe99
Add contact photo
2016-03-26 18:12:03 +01:00
BENKE Charlie
962f0e33f7
Add : photo on contact
2016-03-26 18:05:09 +01:00
Laurent Destailleur
91caea5707
Code was corrupted with very bad commits. I restore files manually.
2016-03-25 15:53:44 +01:00
Laurent Destailleur
a2e9832c8d
Revert "Corrected non-static usages of Form::multiselectarray function"
...
This reverts commit 0a53cdd88f .
2016-03-25 15:34:43 +01:00
Laurent Destailleur
630f5a632d
Revert "Corrected non-static usages of Form::selectarray function"
...
This reverts commit 87cd6e1e40 .
2016-03-25 15:34:37 +01:00
Laurent Destailleur
26de415b77
Revert commit that break compatibility of 100% of modules
2016-03-25 15:24:57 +01:00
Marcos García de La Fuente
89bd173c2f
NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate
2016-03-21 21:51:29 +01:00
Marcos García de La Fuente
5a046125db
Missing changes from previous commits
2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
4d78932fe8
NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions
2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
0a53cdd88f
Corrected non-static usages of Form::multiselectarray function
2016-03-20 14:15:18 +01:00
Marcos García de La Fuente
87cd6e1e40
Corrected non-static usages of Form::selectarray function
2016-03-20 14:15:17 +01:00
Laurent Destailleur
ba4f5c8648
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-19 19:26:57 +01:00
Josep Lluís
31fa9221dd
Change of wrong key "Firsname" translation
...
Change of wrong key "Firsname" to "Firstname" for translation
2016-03-18 16:47:28 +01:00
Laurent Destailleur
5eef373ed6
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/compta/bank/search.php
htdocs/user/card.php
2016-03-18 14:56:44 +01:00
Laurent Destailleur
fb625f0ca7
FIX #4812
2016-03-18 13:58:06 +01:00
Laurent Destailleur
3a58613e45
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/listbyyear.php
htdocs/accountancy/journal/bankjournal.php
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/projet/activity/index.php
2016-03-02 23:40:11 +01:00
Laurent Destailleur
a3d4340b82
Fix useless truncation
2016-02-29 15:30:52 +01:00
Laurent Destailleur
b31fd917ab
Always show email field into popup of contact
2016-02-29 13:28:20 +01:00
Laurent Destailleur
449d44419d
Fix: When module shipment is on, a contact of order is also contact of
...
shipment
2016-02-24 11:17:47 +01:00
Laurent Destailleur
9c8d69eaa9
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
2016-02-19 04:46:11 +01:00
BENKE Charlie
9fd22722ff
left a space between clone and $object
2016-02-18 15:18:47 +01:00
BENKE Charlie
30a6b546b1
containing function prefer use text values instead numeric
2016-02-15 09:23:36 +01:00
Laurent Destailleur
bc33b19d7d
NEW Can change dynamically number of records visible into lists.
2016-02-11 20:24:15 +01:00
Laurent Destailleur
6662c1b5e1
NEW Can select dynamicaly number of lines to show on page on product,
...
shipment, contact, orders, thirdparties
Fix can make a shipment for product not predefined in multiwarehouse
mode
2016-02-10 23:37:34 +01:00
Laurent Destailleur
0ae8a3398d
Fix sql error when extrafields on contact
2016-02-05 10:56:45 +01:00
phf
7b456d23f0
FIX if we add extrafield on socpeople we got sql error on the list of contact
2016-02-03 22:53:15 +01:00
Laurent Destailleur
d85f7be1f5
FIX #4423
2016-02-03 02:06:12 +01:00
Laurent Destailleur
dcbad8bb15
Fix delete of image
2015-12-21 17:32:20 +01:00
Laurent Destailleur
db7a98f0ef
Fix: When a payment mode was disabled, it was not visible on old
...
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
2015-12-21 13:56:59 +01:00
Laurent Destailleur
ba3c8de785
Update doc comment to make things cleaner to avoid confusion between old
...
deprecated doActions of canvas and doActions of triggers.
2015-12-17 14:01:22 +01:00
Laurent Destailleur
374480043e
Add maxwidth300 on combo list for users and sale representatives
2015-12-06 00:37:58 +01:00
Laurent Destailleur
fcdb3af708
Merge pull request #4106 from aspangaro/develop-skype
...
New: Better integration of skype for dolibarr 3.9
2015-11-28 16:31:35 +01:00
aspangaro
d12e3ca91f
Finish work on better integration of skype
2015-11-28 14:43:16 +01:00
Laurent Destailleur
88e76dcf64
Fix utf8 encoded twice
2015-11-28 14:40:23 +01:00
philippe grand
42ed3d2bb7
[Qual] Uniformize code
2015-11-18 16:05:41 +01:00
Laurent Destailleur
59a79442b0
Enhance code for select field list feature.
...
Add gender and employee on user list.
2015-11-11 17:05:18 +01:00
Laurent Destailleur
3ba194f638
NEW Can select fields to show into the contact list
2015-11-03 15:32:16 +01:00
Frédéric FRANCE
8a07efb995
Update list.php
2015-10-31 11:25:59 +01:00
Laurent Destailleur
1b8234d9fe
Bette behaviour for blind people
2015-10-25 11:09:50 +01:00
Laurent Destailleur
537a13e2f4
NEW Show which fields are used for search when doing a generic search
...
from the quick search form.
2015-10-17 00:14:36 +02:00
Laurent Destailleur
45a2156d71
Uniformize code and add more fields selectable for list of thirdparties
2015-10-16 23:03:20 +02:00
Laurent Destailleur
d1d6c72d7d
NEW Uniformize way of working for search filters. One filter per object.
2015-10-16 22:21:26 +02:00
Laurent Destailleur
87c12717a7
NEW The thirdparties tabs, the contacts tabs and the members tabs are
...
now presented using a new top banner, saving space and using a same way
to show address, status and navigation arrows.
2015-10-16 20:16:28 +02:00
Laurent Destailleur
b3491ef4e5
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/admin/facture_cust_extrafields.php
htdocs/compta/facture/admin/facturedet_cust_extrafields.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/card.php
2015-10-16 10:12:36 +02:00
Laurent Destailleur
b43047bc2f
Use the new banner on all tabs of contacts
2015-10-15 14:13:31 +02:00
Raphaël Doursenaud
6c2b46f939
Fix #3728 Properly remove last category
2015-10-15 10:15:37 +02:00
Laurent Destailleur
bd48ad265d
The new banner tab is also on user card now
2015-10-11 15:21:21 +02:00
Laurent Destailleur
6ec77e2ca0
New banner card on contact card.
2015-10-11 12:27:04 +02:00
Laurent Destailleur
61d739635e
Uniformize code and css for tables. Filters must be implemented
...
following example in test_arrays.php.
2015-10-09 12:30:16 +02:00
Laurent Destailleur
f54a1ca367
CSS enhancement
2015-10-06 01:03:31 +02:00
Laurent Destailleur
68d4a9fc63
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/societe/list.php
2015-10-04 20:57:00 +02:00
Laurent Destailleur
c2cc9711f7
FIX Thirdparty is missing on card
2015-10-04 20:01:08 +02:00
Laurent Destailleur
2236d47da2
Merge pull request #3658 from frederic34/optioncss
...
Optioncss not kept in list
2015-10-04 19:56:59 +02:00
frederic34
7f86797f73
Add contact photo
2015-10-04 17:25:46 +02:00
frederic34
f2d7523091
Optioncss
2015-10-04 12:31:32 +02:00
frederic34
9a021e6de4
Optioncss not kept in list
2015-10-04 10:45:57 +02:00
Laurent Destailleur
c0c0cc2415
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/interventions.lang
htdocs/theme/md_exp/style.css.php
2015-10-03 14:28:31 +02:00
Laurent Destailleur
996c9ca2ba
FIX Can't change state on a contact
2015-10-03 12:21:27 +02:00
Raphaël Doursenaud
f0466ba313
FIX #3607 Better categories setting and unsetting
...
This allows triggering CATEGORY_LINK and CATEGORY_UNLINK each time.
2015-09-30 18:47:02 +02:00
Laurent Destailleur
62792c08eb
Merge pull request #3591 from GPCsolutions/inherited
...
[Qual] Cleanup of inherited class properties
2015-09-26 11:23:59 +02:00
Juanjo Menent
6999ad0a4f
Merge pull request #3587 from GPCsolutions/fiche_titre
...
[Qual] Replaced deprecated function calls.
2015-09-26 08:39:22 +02:00
Raphaël Doursenaud
67ddb6c94e
[Qual] Cleanup of inherited class properties
2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
631ee83745
[Qual] Replaced deprecated print_fiche_titre()
2015-09-24 18:34:58 +02:00
Raphaël Doursenaud
dabfad1529
[Qual] Replaced deprecated print_titre()
2015-09-24 18:27:13 +02:00
Raphaël Doursenaud
9f2545b95d
[Qual] Replaced deprecated dol_clone by native clone
2015-09-24 17:24:40 +02:00
Laurent Destailleur
36632593c0
Fix SQL injections #3300
2015-09-12 11:36:19 +02:00
Laurent Destailleur
5bc74ad6ea
Fix SQL injections #3300
2015-09-12 11:23:44 +02:00
aspangaro
1756862a65
Typo
2015-09-06 07:56:43 +02:00
Laurent Destailleur
c06abac49e
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/salaries/index.php
htdocs/contact/class/contact.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/geturl.lib.php
htdocs/core/lib/pdf.lib.php
2015-08-30 21:20:50 +02:00
Laurent Destailleur
17b69e16d2
Fix remove a bad log reporting error when not
2015-08-29 13:45:23 +02:00
Laurent Destailleur
d90b342cc9
Fix use dedicated escapment function
2015-08-20 14:34:08 +02:00
Laurent Destailleur
fc8a822f1d
Merge remote-tracking branch 'origin/3.7' into develop
2015-08-13 04:03:23 +02:00
Gauthier
cc8eac67d9
FIX : Display country name instead of country id (display country id makes no sense on vcard files)
2015-07-29 12:29:33 +02:00
Laurent Destailleur
85f344a23e
Fix bad link
...
Fix missing css
2015-07-19 23:39:07 +02:00
Laurent Destailleur
cb98d6cb93
Merge remote-tracking branch 'origin/3.8' into develop
2015-07-19 15:32:20 +02:00
Laurent Destailleur
2f2b0df6f8
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/contact/exportimport.php
htdocs/contact/info.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/core/modules/modSociete.class.php
htdocs/core/tpl/document_actions_pre_headers.tpl.php
htdocs/langs/fr_FR/categories.lang
htdocs/main.inc.php
htdocs/product/reassort.php
htdocs/projet/list.php
htdocs/societe/info.php
2015-07-19 12:26:31 +02:00
Laurent Destailleur
2bb1945a2f
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/prelevement/class/rejetprelevement.class.php
htdocs/compta/sociales/class/paymentsocialcontribution.class.php
htdocs/contact/exportimport.php
htdocs/contact/ldap.php
htdocs/contact/perso.php
htdocs/contact/vcard.php
htdocs/core/class/commonobject.class.php
htdocs/product/reassort.php
htdocs/projet/liste.php
htdocs/societe/consumption.php
htdocs/societe/info.php
2015-07-19 12:04:30 +02:00
Laurent Destailleur
fbc0b5b313
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/contact/vcard.php
htdocs/societe/consumption.php
2015-07-19 11:38:44 +02:00
Laurent Destailleur
8d7c1f8d4c
Fix: [ bug #2570 ] [Contacts] Page should not process if ID is invalid
2015-07-19 11:21:21 +02:00
aspangaro
d9dd9ff688
Merge remote-tracking branch 'Upstream/3.8' into 3.8-1
2015-07-16 12:25:37 +02:00
aspangaro
59e88590e0
Move my address email to new one
2015-07-15 20:30:33 +02:00
Regis Houssin
e6e39ae003
Fix: wrong translation
2015-07-14 17:28:19 +02:00
Laurent Destailleur
1fb40565f4
Fix bad parameters of function select_date
2015-07-12 12:50:24 +02:00
phf
f0f4d83664
FIX translate Jabberid on contact page with edit view
2015-07-08 12:33:37 +02:00
phf
c87328b362
FIX : contact country had wrong display if the country dont have translate
2015-07-02 17:00:37 +02:00
Laurent Destailleur
4a1dfa60a5
Uniformize code
2015-06-30 13:14:19 +02:00
Laurent Destailleur
ceb9955efc
Merge branch 'develop-patch43' of https://github.com/aspangaro/dolibarr into aspangaro-develop-patch43
...
Conflicts:
htdocs/contact/list.php
2015-06-27 02:27:34 +02:00
Laurent Destailleur
0fe0c989ca
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-06-26 17:36:54 +02:00
Laurent Destailleur
5584acddbd
Content of popup tooltip on contact and login link
2015-06-26 17:21:03 +02:00
aspangaro
9d2e964b00
Fix: print_liste_field_titre('');
2015-06-26 06:23:29 +02:00
Laurent Destailleur
040a643ee9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/expensereport/card.php
htdocs/projet/element.php
2015-06-23 18:34:39 +02:00
Laurent Destailleur
a23e2511b9
Removed useless tab
2015-06-23 18:11:21 +02:00
aspangaro
f973a1fb43
Typo "cibility"
2015-06-14 20:15:22 +02:00
Laurent Destailleur
6263e90ddb
More info on contact popup
2015-06-14 17:38:28 +02:00
Raphaël Doursenaud
6465e58032
Added tag/categories management to contact card
...
Contact part of #2571
2015-06-11 14:50:13 +02:00
Laurent Destailleur
df60754e52
Merge pull request #2708 from GPCsolutions/deprecated
...
Deprecated
2015-06-05 15:44:08 +02:00
Laurent Destailleur
b98999c9d9
Can't delete a project
2015-06-05 15:41:27 +02:00
Raphaël Doursenaud
3f9270ea78
Qual: added deprecation hinting
...
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
2015-06-01 11:00:11 +02:00
Laurent Destailleur
01aad8516d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/adherents/list.php
htdocs/compta/dons/card.php
htdocs/compta/dons/class/don.class.php
htdocs/contact/list.php
htdocs/contrat/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/security.lib.php
htdocs/main.inc.php
htdocs/product/stock/massstockmove.php
htdocs/public/test/test_arrays.php
htdocs/public/test/test_forms.php
htdocs/societe/societe.php
2015-05-31 03:30:38 +02:00
phf
087b026f54
Add fetch extrafields in contact's fetch function
2015-05-26 12:40:49 +02:00
Laurent Destailleur
cb0b0fba7c
Merge pull request #2897 from atm-ph/fix_37_create_contact
...
FIX : create contact with extrafiel is null when it is require
2015-05-25 19:28:17 +02:00
Laurent Destailleur
11d4a945b0
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/adherents/liste.php
htdocs/comm/propal.php
htdocs/compta/facture.php
htdocs/contact/list.php
htdocs/contrat/liste.php
htdocs/product/liste.php
2015-05-25 18:08:23 +02:00
Laurent Destailleur
a33809a526
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/adherents/liste.php
htdocs/comm/propal.php
htdocs/compta/facture.php
2015-05-25 17:46:42 +02:00
phf
7b163d3b29
FIX : create contact with extrafiel is null when it is require
2015-05-25 17:36:36 +02:00
Raphaël Doursenaud
becc240b92
Include Categories class whenever Categorie::TYPE is used
2015-05-23 23:35:49 +02:00
Raphaël Doursenaud
ee808cdfd7
Added types constants to categories
2015-05-23 18:52:31 +02:00
Laurent Destailleur
6f5a30638c
NEW On page to see/edit contact of an ojbect, the status of contact is
...
visible (for both external and internal users).
2015-05-22 12:21:36 +02:00
Raphaël Doursenaud
a7f6bbd316
Properly escape untrusted data to prevent HTML injection.
...
First pass for #2857
2015-05-20 17:34:00 +02:00
Laurent Destailleur
bf883e1576
Minor cosmetic changes
...
Fix permissions and CRLF
2015-05-15 02:34:57 +02:00
tysauron
84935336ee
Update list.php
...
Bug pagination du bas quand recherche
2015-05-13 17:04:35 +02:00
Raphaël Doursenaud
859d1b0df9
[Qual] Fixed HTML input form checked attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
2015-05-07 14:21:14 +02:00
jfefe
25812f0071
Add picto for commercial pages titles
2015-04-18 23:17:44 +02:00
jfefe
3825b89ead
Change companies and product title picto
2015-04-18 23:13:48 +02:00
Marcos García de La Fuente
e2e6049c7f
Copyright
2015-04-18 20:50:03 +02:00
Marcos García de La Fuente
dc790ff586
NEW: Feature request: A page to merge two thirdparties into one #2613
2015-04-18 20:41:09 +02:00
Laurent Destailleur
6fa0234409
Uniformize code
2015-04-07 03:00:11 +02:00
frederic34
fe6227e93f
Typo
2015-03-31 08:45:36 +02:00
frederic34
bab04258e0
Add document tab for contact
2015-03-30 18:15:29 +02:00
aspangaro
d69f066735
QUAL: Traduce terms + remove <center>
2015-03-15 14:04:07 +01:00
Laurent Destailleur
ef14e4e7ed
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/fourn/class/fournisseur.product.class.php
2015-02-28 03:11:15 +01:00
Laurent Destailleur
4bde7e9f51
Fix: Missing error management
2015-02-26 14:25:30 +01:00
Laurent Destailleur
6d3834b3b9
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/index.php
htdocs/projet/class/project.class.php
test/phpunit/BankAccountTest.php
2015-02-23 14:59:24 +01:00
Laurent Destailleur
1ca4e377d5
Merge remote-tracking branch 'origin/3.6' into 3.7
2015-02-20 23:47:09 +01:00
Laurent Destailleur
e3713c8b6d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/admin/tools/eaccelerator.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
2015-02-19 00:01:26 +01:00
Laurent Destailleur
4963555669
Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-misc
Conflicts:
htdocs/barcode/codeinit.php
2015-02-18 22:54:02 +01:00
braito4
ca64763440
Update note.php
...
Error in the security check
2015-02-17 18:09:16 +01:00
Laurent Destailleur
e3885d6d73
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/lib/tax.lib.php
2015-02-10 21:36:38 +01:00
Laurent Destailleur
ddb95e5765
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/comm/mailing/fiche.php
htdocs/compta/paiement/liste.php
htdocs/contact/class/contact.class.php
htdocs/core/lib/tax.lib.php
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/langs/en_US/agenda.lang
htdocs/webservices/server_contact.php
2015-02-10 21:33:43 +01:00
Marcos García de La Fuente
530186c59d
PHPDoc and misc fixes for several folders
2015-02-10 13:32:00 +01:00
Arnaud Aujon
65efa7ddf7
FIXED #1824 Add ref_ext for Contact webservices
...
Add possibility to use ref_ext to reference contact using webservice, field was present but not saved and not used to fetch object
2015-02-05 14:28:16 +01:00
frederic34
736bee565c
Tooltip everywhere
2015-01-30 16:40:33 +01:00
frederic34
f4161b457b
Add dol_escape_htmltag and start to adapt boxes
2015-01-22 00:23:55 +01:00
frederic34
1b0dd671b3
Add tooltip in getNomUrl link
2015-01-20 21:40:33 +01:00
frederic34
60661ae948
Add some "classfortooltip"
2015-01-09 00:07:54 +01:00
Laurent Destailleur
d72d056e02
Enhance look for contacts forms of thirdparties.
2014-12-30 21:04:02 +01:00
Laurent Destailleur
634a9d8402
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2014-12-07 19:19:48 +01:00
Laurent Destailleur
c35018be5f
Fixed: Translations
2014-12-07 18:24:45 +01:00
aspangaro
c4c69e191b
Replace <center> tags
2014-11-25 20:13:43 +01:00
Laurent Destailleur
34306359a4
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2014-11-22 15:54:14 +01:00
Laurent Destailleur
9ddb76ca12
Merge pull request #2042 from frederic34/patch-9
...
#1664 Can't sort by mobile phones in contact list
2014-11-22 15:53:55 +01:00
Laurent Destailleur
d3e216c19a
Clear compatible with all browsers
2014-11-22 15:53:37 +01:00
Frédéric FRANCE
db99b7f09a
#1665 Can't clear sort filter on contacts list
2014-11-17 23:49:39 +01:00
Frédéric FRANCE
264794ec8c
#1664 Can't sort by mobile phones in contact list
2014-11-17 23:46:30 +01:00
Laurent Destailleur
c186f13218
Fix: Param $action was not defined.
...
A better fix must be done later be removing useless hooks that are
duplicate with triggers.
2014-11-15 19:04:21 +01:00
Laurent Destailleur
445f696d28
Fix: Pb of object with wrong type.
2014-11-15 18:24:38 +01:00
Laurent Destailleur
81f0d953e3
Fix: Bad test
2014-11-12 10:05:40 +01:00
aspangaro
acbbe823e8
Typo
2014-11-06 20:04:51 +01:00
aspangaro
df5d34266c
Lost button
2014-11-02 15:26:20 +01:00
Laurent Destailleur
4b34455f0a
Fix permissions
2014-10-17 15:01:56 +02:00
Laurent Destailleur
f08759a17e
Fix: area to generate doc must use half size not onethird.
...
Fix: Missing maxwidthonsmartphone.
Fix: Missing backtopage
Fix: Missing translation key
2014-10-12 11:59:52 +02:00
Regis Houssin
a2446e51db
New: add context "globalcard" for declaring only once all cards
2014-10-06 07:20:58 +02:00
Laurent Destailleur
97eec37f1c
Uniformize code: property "nom" for thirdparty is aliased into "name"
...
everywhere.
2014-10-04 17:20:17 +02:00
Laurent Destailleur
166853dd56
Fix: miscellaneous bugs
2014-10-03 12:15:21 +02:00
Laurent Destailleur
cd4c81d15d
Uniformize code.
2014-09-28 16:31:37 +02:00
Laurent Destailleur
ec95aacd52
Uniformize code for error reporting after a hook.
2014-09-28 03:41:32 +02:00
Laurent Destailleur
14ab409ca9
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/admin/stock.php
htdocs/admin/system/index.php
htdocs/comm/fiche.php
htdocs/core/lib/admin.lib.php
htdocs/core/lib/holiday.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/login/functions_forceuser.php
htdocs/core/login/functions_http.php
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/filefunc.inc.php
htdocs/holiday/define_holiday.php
htdocs/opensurvey/fonctions.php
htdocs/societe/canvas/actions_card_common.class.php
test/phpunit/CompanyBankAccountTest.php
test/phpunit/ExportTest.php
test/phpunit/FactureTest.php
test/phpunit/FunctionsLibTest.php
test/phpunit/PropalTest.php
test/phpunit/SocieteTest.php
test/phpunit/WebservicesInvoicesTest.php
test/phpunit/WebservicesThirdpartyTest.php
2014-09-28 02:14:32 +02:00
Laurent Destailleur
e8b7c9c6bd
Fix: doxygen
2014-09-27 16:00:11 +02:00
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
aspangaro
b22aef3521
Qual: Renamed all files & links "liste.php" into "list.php"
2014-09-18 20:33:37 +02:00
Laurent Destailleur
83447243ae
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
build/debian/get-orig-source.sh
htdocs/product/class/product.class.php
htdocs/societe/soc.php
2014-09-15 22:58:39 +02:00
Laurent Destailleur
f264e25514
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/adherents/liste.php
htdocs/compta/bank/bankid_fr.php
htdocs/holiday/index.php
htdocs/opensurvey/list.php
2014-09-13 19:10:05 +02:00
Laurent Destailleur
8dd9358214
Fix: SQL injection
2014-09-13 19:04:25 +02:00
aspangaro
f774ff487b
Merge branch 'Upstream/develop'
2014-08-18 11:56:49 +02:00
Laurent Destailleur
18b44ccfae
Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into
...
aspangaro-develop-favorite
Conflicts:
htdocs/core/class/html.form.class.php
2014-08-14 01:04:15 +02:00
Laurent Destailleur
98f140962a
Merge remote-tracking branch 'origin/3.6' into develop
2014-08-13 19:25:55 +02:00
Laurent Destailleur
6c316d0cda
Merge remote-tracking branch 'origin/3.5' into 3.6
2014-08-13 19:23:45 +02:00
aspangaro
1a87d98357
Qual: Renamed table llx_c_civilite into llx_c_civility
...
field civilite into label in the same table and field civilite into civility in other table
2014-08-12 06:03:27 +02:00
aspangaro
0738103da8
Renamed llx_c_pays to llx_c_country & field "libelle" to "label"
2014-08-10 13:37:39 +02:00
Maxime Kohlhaas
3499c69b7d
Fix : search contact by phone was mistaking phone pro and phone perso
2014-08-06 08:54:22 +02:00
Marcos García de La Fuente
434bb1bec7
Migrated old message notifications to the """new""" system
2014-07-20 00:10:40 +02:00
Laurent Destailleur
6a19cc614a
Merge pull request #1737 from GPCsolutions/accessibility
...
Accessibility
2014-07-16 15:15:03 +02:00
Marcos García de La Fuente
ec661d0c6c
Removed index.php and replaced them with blank index.html as it is more appropriate
2014-07-12 23:18:57 +02:00
Raphaël Doursenaud
f1853c435b
More labels and autofocus for thirdparty and contact forms
2014-07-12 12:04:39 +02:00
KreizIT
c5bb55064f
Fix: [ bug #1469 ] Triggers CONTACT_MODIFY and CONTACT_DELETE duplicates error message
2014-07-04 17:10:19 +02:00
Laurent Destailleur
e496823778
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
.travis.yml
ChangeLog
htdocs/fourn/commande/fiche.php
htdocs/install/mysql/migration/3.5.0-3.6.0.sql
htdocs/product/stock/replenish.php
2014-07-04 14:14:40 +02:00
Laurent Destailleur
7ee1388582
Merge remote-tracking branch 'origin/3.5' into 3.6
2014-07-04 12:22:10 +02:00
Laurent Destailleur
57b546650a
Fix: Hide title of event when agenda module disabled.
2014-06-30 19:03:52 +02:00
Marcos García de La Fuente
56abf1cd72
Removed duplicated SQL error logging
2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
88cd5dec40
More substitutions
2014-06-13 01:42:00 +02:00
Marcos García de La Fuente
7e7958cf73
Removed SQL errors as they are logged by the database handler
2014-06-12 13:49:05 +02:00
Marcos García de La Fuente
9fbd7806f0
More substitutions
2014-06-12 11:31:53 +02:00
Raphaël Doursenaud
c48c3a9d91
Qual: remove PHP closing tag (again)
...
These were reintroduced by careless merge
2014-05-26 13:51:25 +02:00
Laurent Destailleur
55f93018a6
Fix: We must never use 'alpha' as second parameter of GETPOST when field
...
is a "free text". We can use it only for special field we are sure it
contains only alphabetical caracters and only alphabetical chars.
2014-05-10 02:21:04 +02:00
Juanjo Menent
a652e2c90a
Qual: Use GETPOST instead superglobal variables
2014-05-09 16:36:18 +02:00
Jean-François VIAL
4bcb80960a
escape all $id used in sql queries
2014-05-06 00:06:54 +02:00
Laurent Destailleur
63100c9c06
Properties "civilite_id" were renamed into "civility_id".
2014-05-05 00:23:09 +02:00
Raphaël Doursenaud
f8f502d013
Removed closing php tag
...
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
c02fbcf293
Clean code.
2014-05-03 02:57:46 +02:00
Florian HENRY
596be3ae44
Trad contact card
2014-04-29 09:43:16 +02:00
Laurent Destailleur
e5012a1670
Fix: Bad parameter type
2014-04-28 04:27:49 +02:00
Laurent Destailleur
f7fe25e408
Uniformize code to prepare mass update
2014-02-27 10:37:23 +01:00
Laurent Destailleur
46e9b5d550
Merge branch 'develop' of https://github.com/grandoc/dolibarr into
...
grandoc-develop
Conflicts:
htdocs/langs/ar_SA/admin.lang
htdocs/langs/el_GR/admin.lang
htdocs/langs/es_ES/admin.lang
htdocs/langs/nl_NL/admin.lang
htdocs/langs/tr_TR/admin.lang
2014-02-10 01:30:48 +01:00
Laurent Destailleur
70ab096b79
More simple specimen for test
2014-02-08 12:58:27 +01:00
Grand Philippe
1855ba556a
fix misspelled words
2014-02-05 17:53:30 +01:00
Laurent Destailleur
1b88ab2355
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/contact/class/contact.class.php
2014-01-31 10:12:41 +01:00
Laurent Destailleur
c5d5d6a8d6
A better fix to have default statut to enabled when created an address.
2014-01-30 18:17:52 +01:00
simnandez
17581dd6d6
Fix: Default status into contact creation must be Actif
2014-01-30 12:21:58 +01:00
simnandez
ee72a9a4e6
Fix: Default status into contact creation must be Actif
2014-01-30 12:20:36 +01:00
Alexis Algoud
b2477b6764
Regression in contact form on Note field
...
It's seems to be a regression to Note field in 3.3 instead of public and private Note introduced in 3.4 (and confirmed in the class -> Note / / deprecated)
2014-01-27 10:36:59 +01:00
Laurent Destailleur
8d916215cc
New: Add new hook function addMoreActionsButtons to allow a module to
...
add/replace action buttons into an element.
2014-01-24 12:51:01 +01:00
Laurent Destailleur
1fd67807ce
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-18 01:13:29 +01:00
Grand Philippe
938f31f383
Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1.
2014-01-12 21:45:52 +01:00
Laurent Destailleur
23eb0f3770
Qual: Mutualize code for actions of editing notes
...
New: Add button 'cancel' to cancel edition of a note (private or public)
2014-01-11 13:33:30 +01:00
Laurent Destailleur
fbeb61861a
Start to remove too low level permission. Philisophy of dolibarr is
...
having a minum of permission. Starting to include one permission for
each field we manage should not be into core.
Also activation of "skype" field in a future should probably be
rewritten to support as several communication id (chat, skype,
hanghout) with only one feature.
2013-12-14 20:58:03 +01:00
Laurent Destailleur
eaf151d7f5
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/.gitignore
htdocs/contact/fiche.php
2013-12-14 03:13:46 +01:00
Laurent Destailleur
d7bb138f43
Fix: Missing status 4 and 5
2013-12-02 22:12:57 +01:00
Laurent Destailleur
0ff9533786
Missing css
2013-12-02 20:30:15 +01:00
Raphaël Doursenaud
f71b39b1c3
Added missing class member
2013-11-27 15:20:37 +01:00