Laurent Destailleur
74d3912763
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
2020-02-11 16:52:58 +01:00
Laurent Destailleur
918e570e7a
FIX Picture of contact not visible in tooltip
2020-02-10 12:56:08 +01:00
Laurent Destailleur
cffc56b80b
Declaration of property fields of thirdparties
2020-02-08 11:32:38 +01:00
Tobias Sekan
efcd4d0c63
Fix unset gender property in contact class
2020-02-05 12:34:29 +01:00
Tobias Sekan
24c305dc7f
Fix unset gender property in contact class
2020-02-04 09:00:31 +01:00
Laurent Destailleur
d60ce8a2c3
Fix showoncombobox
2020-01-30 20:02:40 +01:00
Laurent Destailleur
ea53e0b44e
Fix showoncombobox
2020-01-30 20:00:41 +01:00
Laurent Destailleur
3f79c00542
Merge branch 'develop' into actioncomm_category
2020-01-15 14:21:06 +01:00
Frédéric FRANCE
2ebad186b7
doxygen
2020-01-07 10:54:19 +01:00
Frédéric FRANCE
90235d0528
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-31 13:57:40 +01:00
Laurent Destailleur
9a08a6bf6d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/categories/traduction.php
htdocs/compta/facture/class/facture.class.php
htdocs/contact/card.php
htdocs/core/modules/modSociete.class.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/langs/en_US/products.lang
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
htdocs/margin/tabs/thirdpartyMargins.php
2019-12-23 14:13:26 +01:00
VESSILLER
e59514600b
FIX contact card state address selected after filling address
2019-12-23 12:10:51 +01:00
Laurent Destailleur
ed6d4ae824
Look and feel v11
2019-12-21 14:08:37 +01:00
Laurent Destailleur
be8075881c
Clean dead code
2019-12-20 11:15:15 +01:00
Laurent Destailleur
9f86cd8824
Debug v11
2019-12-20 11:14:16 +01:00
Laurent Destailleur
f44b85f557
Fix $_SESSION['newtoken'] must be newToken()
2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
c8baaa2995
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-16 12:06:25 +00:00
Frédéric FRANCE
57055bad03
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-13 14:36:00 +01:00
stickler-ci
ffde746479
Fixing style errors.
2019-12-12 16:22:07 +00:00
Anthony Berton
21a28e4bb4
Update contact.class.php
2019-12-12 17:20:20 +01:00
Laurent Destailleur
ce47de453e
Fix HTML5
2019-12-12 10:31:08 +01:00
Frédéric FRANCE
4c5c6b6ff1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-03 17:56:43 +01:00
Scrutinizer Auto-Fixer
36a74cd160
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-03 10:17:29 +00:00
Laurent Destailleur
92070fa491
Fix name of variable $trigger_name into $triggersendname
2019-12-02 09:38:16 +01:00
Frédéric FRANCE
25ed2b930f
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-01 16:10:37 +01:00
Norbert Penel
073274072f
FIX #12558
2019-12-01 10:47:25 +01:00
Frédéric FRANCE
b2912e688b
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-27 22:54:05 +01:00
Frédéric FRANCE
4c4ae5b6e1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-26 08:10:40 +01:00
Frédéric FRANCE
aa12ec1f67
Update agenda.php
2019-11-25 23:58:53 +01:00
Laurent Destailleur
849449517f
Fix responsive
2019-11-20 13:31:38 +01:00
Frédéric FRANCE
d182eee4bf
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-19 23:26:00 +01:00
Laurent Destailleur
5d7a1f1265
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/card.php
htdocs/core/class/extrafields.class.php
htdocs/langs/en_US/stocks.lang
2019-11-19 19:02:14 +01:00
Frédéric FRANCE
2e5f539b2a
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-18 17:45:52 +01:00
atm-greg
99f93dbbf5
fix bad getpost
2019-11-18 14:33:01 +01:00
Laurent Destailleur
2689f7515c
Fix pb with colspan and extrafields.
...
Fix remove empty id
2019-11-16 14:38:05 +01:00
Frédéric FRANCE
a3e092b227
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-14 09:21:26 +01:00
Laurent Destailleur
171b94fc5c
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
...
Scrutinizer Auto-Fixes
2019-11-14 08:50:24 +01:00
Laurent Destailleur
86094613e8
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4
...
Scrutinizer Auto-Fixes
2019-11-14 08:50:06 +01:00
Frédéric FRANCE
446c66da62
use class CONST
2019-11-14 08:15:39 +01:00
Scrutinizer Auto-Fixer
b40ecc3933
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
8a527631a0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:02 +00:00
Laurent Destailleur
6afc84fe72
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-12 10:20:55 +01:00
Laurent Destailleur
944a15d06b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-11-12 10:20:16 +01:00
Laurent Destailleur
f8e8d15606
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-11-12 10:19:01 +01:00
Scrutinizer Auto-Fixer
c85e54b08c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-12 08:46:08 +00:00
Scrutinizer Auto-Fixer
812d0af1d9
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-08 14:51:54 +00:00
Frédéric FRANCE
35751a80ab
100% centpercent
2019-11-05 21:24:41 +01:00
Laurent Destailleur
1aef1c60dd
Merge pull request #11867 from frederic34/socialnetworks
...
NEW add socialnetworks dictionary
2019-11-04 21:10:22 +01:00
Laurent Destailleur
11500fb8d9
FIX confusion between permto... and permisstionto...
2019-11-04 15:33:49 +01:00
Frédéric FRANCE
569c543ca0
search
2019-11-03 22:34:57 +01:00
Frédéric FRANCE
872f58f261
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-11-03 21:48:24 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid
...
replace deprecated user->societe_id by user->socid
2019-11-02 13:34:21 +01:00
Laurent Destailleur
45c77b4560
Renaming some libelle into label
2019-11-02 12:59:38 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid
2019-11-01 21:39:20 +01:00
Laurent Destailleur
2d9135b6ad
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expedition/card.php
htdocs/holiday/list.php
2019-11-01 21:06:06 +01:00
Laurent Destailleur
e3b5be7475
All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
...
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
2019-11-01 12:52:03 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid
2019-10-31 20:46:31 +01:00
stickler-ci
d46f519438
Fixing style errors.
2019-10-30 19:07:50 +00:00
Frédéric FRANCE
f7747ed00a
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-30 20:06:43 +01:00
Laurent Destailleur
5947973388
Merge pull request #12245 from OPEN-DSI/fix-contact-card-select-state
...
FIX contact card state address selected after filling addresss
2019-10-30 02:59:36 +01:00
Laurent Destailleur
350e01a5a3
Update card.php
2019-10-30 02:59:24 +01:00
Laurent Destailleur
66a288a343
Merge pull request #12235 from frederic34/scopeindent
...
clean indent
2019-10-30 02:57:59 +01:00
Laurent Destailleur
248016cd5d
Merge pull request #12241 from frederic34/contactphone
...
Contactphone
2019-10-30 02:52:11 +01:00
Laurent Destailleur
15d0d6e271
FIX #12258
2019-10-30 02:39:51 +01:00
VESSILLER
bc3be12756
FIX contact card state address selected after filling addresss from thirdparty
2019-10-28 10:32:46 +01:00
Frédéric FRANCE
8a7a7ad0c8
Update contact.class.php
2019-10-28 08:16:43 +01:00
Frédéric FRANCE
6e03e0ba83
Update contact.class.php
2019-10-28 08:08:59 +01:00
Frédéric FRANCE
043a71442f
contact phone
2019-10-27 20:06:16 +01:00
Maxime Kohlhaas
fced9ec690
Fix missing contact fetch on card
2019-10-27 12:04:01 +01:00
Frédéric FRANCE
a1f0245c79
clean indent in compta, contact directory
2019-10-26 18:13:20 +02:00
Frédéric FRANCE
a43e6f96b5
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-25 08:12:54 +02:00
Laurent Destailleur
6855f588b5
Use dolGetStatus
2019-10-24 16:38:06 +02:00
Laurent Destailleur
b88968520b
Move code of extrafields to the new architecture
2019-10-22 17:08:37 +02:00
Laurent Destailleur
84c8b6b5d1
FIX #12198
2019-10-22 15:23:23 +02:00
Laurent Destailleur
f9c86256dc
FIX #12198
2019-10-22 15:21:41 +02:00
Frédéric FRANCE
9ec7836387
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-20 16:37:18 +02:00
Laurent Destailleur
d79114c1f8
Clean code
2019-10-20 15:16:40 +02:00
Frédéric FRANCE
f4540dddb8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-17 20:24:04 +02:00
Laurent Destailleur
f85899742b
Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
...
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-17 17:48:42 +02:00
Laurent Destailleur
5a5f4c3d72
Look and feel v11
2019-10-17 16:59:26 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-16 20:00:01 +02:00
Laurent Destailleur
e07e01580d
Replace deprecated code with new one
2019-10-16 03:34:32 +02:00
Frédéric FRANCE
d1d9b1ed85
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-15 09:39:57 +02:00
Laurent Destailleur
2ed96c9e5f
Fix scrutinizer
2019-10-15 02:54:19 +02:00
Laurent Destailleur
3038a49818
Merge pull request #12117 from iouston/patch-7
...
NEW: Add 2 hidden options to set the default sorting (sort and order) on document page
2019-10-14 21:23:13 +02:00
Laurent Destailleur
e5e94f5e7a
Update document.php
2019-10-14 21:23:08 +02:00
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
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
