Laurent Destailleur
fb84608586
Clean sql
2021-03-30 03:37:54 +02:00
Laurent Destailleur
50de0777e4
Look and feel v14
2021-03-27 12:45:57 +01:00
Laurent Destailleur
d9108362ba
War against $_POST
2021-03-25 16:59:47 +01:00
Laurent Destailleur
047471c220
Remove $_POST war
2021-03-24 19:06:44 +01:00
Laurent Destailleur
15440917b1
Fix #ygosha5698
2021-03-22 11:30:18 +01:00
Frédéric FRANCE
d20e8798e8
fix warning
2021-03-19 17:14:05 +01:00
Laurent Destailleur
d83d005284
FIX #yogosha5674
2021-03-19 12:44:59 +01:00
Frédéric FRANCE
bd44658cbd
fix php8 warning
2021-03-18 23:09:13 +01:00
Laurent Destailleur
c17e1ac67b
Merge pull request #16816 from frederic34/patch-24
...
fix php8 warning
2021-03-18 23:05:35 +01:00
Laurent Destailleur
172cb02b4a
Merge pull request #16814 from frederic34/patch-22
...
fix php8 warning
2021-03-18 22:50:31 +01:00
Frédéric FRANCE
a400559342
fix php8 warning
2021-03-18 22:44:58 +01:00
Frédéric FRANCE
0d67f68174
Update card.php
2021-03-18 22:36:17 +01:00
Frédéric FRANCE
181436f279
fix php8 warning
2021-03-18 22:31:41 +01:00
Frédéric FRANCE
ba33bc8eac
fix php8 warning
2021-03-18 22:29:08 +01:00
Alexandre SPANGARO
6960f0dc25
Uniformize translation
2021-03-16 04:22:55 +01:00
Laurent Destailleur
cc10106a21
Fix protection on int
2021-03-14 12:20:23 +01:00
Laurent Destailleur
5b74fefb60
Fix look and feel v13
2021-03-09 17:01:20 +01:00
stickler-ci
47dd477c61
Fixing style errors.
2021-03-04 09:36:17 +00:00
lmarcouiller
e94f703f5d
Fix #16523 : return to backward compatibility
2021-03-04 10:33:18 +01:00
lmarcouiller
500f192a05
Fix #16523 : New column Contact assigned
2021-03-04 10:15:41 +01:00
Laurent Destailleur
f5406d487b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/class/html.formmail.class.php
htdocs/core/lib/product.lib.php
htdocs/product/stock/productlot_card.php
test/phpunit/SecurityTest.php
2021-02-26 12:53:06 +01:00
Laurent Destailleur
1a521bcc99
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/contact/class/contact.class.php
2021-02-26 10:27:55 +01:00
Laurent Destailleur
5c0fba26e2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-02-26 10:25:55 +01:00
Laurent Destailleur
549136efeb
Removed useless log
2021-02-26 10:25:30 +01:00
Laurent Destailleur
99a17cadb7
Fix sql syntax
2021-02-26 10:25:08 +01:00
Laurent Destailleur
8e8efce7d1
Fix sql syntax
2021-02-26 10:23:53 +01:00
Florian Mortgat
d59ee06438
FIX 11.0 - $this->socid injected in query without checking for empty value
2021-02-25 14:51:57 +01:00
Frédéric FRANCE
3b6d01ffae
code syntax contact directory
2021-02-23 21:16:15 +01:00
Laurent Destailleur
f6080d45fa
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-22 16:21:26 +01:00
Laurent Destailleur
912f9f9bdb
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/contact/card.php
htdocs/core/actions_massactions.inc.php
2021-02-22 15:54:24 +01:00
Laurent Destailleur
c010cab47e
Fix translation of default value for contacts
2021-02-22 15:51:00 +01:00
Laurent Destailleur
60ae50abb3
Merge pull request #16270 from frederic34/patch-3
...
fix unknown variable
2021-02-11 23:00:36 +01:00
Frédéric FRANCE
ac40067e88
fix unknown variable
2021-02-11 22:11:16 +01:00
Frédéric FRANCE
bcac4386d6
doxygen
2021-02-11 21:26:21 +01:00
Laurent Destailleur
8a13ad2f26
Close #16075
2021-01-27 19:31:30 +01:00
Laurent Destailleur
6d0cbd3ee5
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-23 17:32:49 +01:00
Laurent Destailleur
7e8d06e8b8
Fix update default contact type
2021-01-22 14:10:08 +01:00
Laurent Destailleur
e1b6f33894
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/card.php
htdocs/contact/class/contact.class.php
htdocs/langs/fr_FR/stocks.lang
htdocs/modulebuilder/template/myobject_list.php
2021-01-22 13:40:00 +01:00
Laurent Destailleur
93ca27d808
FIX #16041
2021-01-22 13:17:27 +01:00
Laurent Destailleur
cf11f356e8
Fix load of data are not complete
2021-01-22 10:51:47 +01:00
Frédéric FRANCE
177b87da0d
Merge remote-tracking branch 'upstream/develop' into codesyntax
2021-01-16 17:58:01 +01:00
Frédéric FRANCE
f1685ba1b1
code syntax
2021-01-16 14:24:47 +01:00
Anthony Berton
df5e6a2519
picto
2021-01-14 08:56:38 +01:00
Florian HENRY
d856b0149d
Merge branch '13_backport' into develop
2021-01-12 10:08:12 +01:00
Florian HENRY
2be924d5d8
fix js bulkemail
2021-01-12 10:01:32 +01:00
Florian HENRY
8adfe54949
bulk email management
2021-01-07 17:33:57 +01:00
Florian HENRY
5c53a963e2
bulk email management
2021-01-07 17:23:02 +01:00
kamel
c2489dd313
FIX : Fix the display on the 'contact by default' on the contact card
2021-01-06 11:07:25 +01:00
Laurent Destailleur
8baa4c67ae
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-04 12:34:09 +01:00
Laurent Destailleur
b0738643fb
FIX Solve problem with TZ
2021-01-03 18:42:45 +01:00
Florian HENRY
806b40662f
merge develop
2020-12-28 21:15:25 +01:00
Laurent Destailleur
a6eb14f68b
Merge pull request #15585 from cfoellmann/fckeditor-notes
...
NEW Can toggle FCKeditor on public/private notes
2020-12-27 15:06:35 +01:00
Florian HENRY
f03574d061
bank ok
2020-12-24 14:56:26 +01:00
Florian HENRY
055a2b6fec
on goung
2020-12-23 23:44:38 +01:00
Florian HENRY
26d3ea2227
on going
2020-12-23 23:32:50 +01:00
Frédéric FRANCE
4664ac1a1c
socialnetworks links
2020-12-12 17:00:23 +01:00
Laurent Destailleur
05a560c2e3
Fix warning
2020-12-04 20:43:11 +01:00
Laurent Destailleur
0d4121c5bd
Fix warning
2020-12-04 12:01:41 +01:00
Scrutinizer Auto-Fixer
6df4954b20
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-12-01 01:41:19 +00:00
Christian Foellmann
f801dd7d66
PR toggle FCKeditor on public/private notes
2020-11-30 16:39:14 +01:00
Laurent Destailleur
00ad6df395
Fight against $_POST
2020-11-30 14:47:07 +01:00
Givriz
dca4cf5987
Feature : ajout de la class "button-cancel"
...
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
2020-11-23 15:12:52 +01:00
Laurent Destailleur
f6d6efa288
CSS
2020-11-22 13:23:56 +01:00
Damien BENOIT
ebd64d5e57
Merge pull request #5 from Dolibarr/develop
...
Update fork
2020-11-20 13:53:43 +01:00
Frédéric FRANCE
cac91211c9
remove deprecated
2020-11-19 21:27:20 +01:00
Givriz
c48129e279
Ajout de la class "button-save"
...
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
2020-11-19 20:23:38 +01:00
Florian HENRY
b16af0a7c3
fix deprecated warning php 7.4
2020-11-11 15:43:36 +01:00
Laurent Destailleur
6536208a14
Merge pull request #15322 from OPEN-DSI/new-list-include-array-extra-fields-with-langfile
...
NEW include tpl for loading lang file for extra fields in list
2020-11-10 14:42:21 +01:00
Laurent Destailleur
da6c6c9e0a
Clean code
2020-11-08 14:39:20 +01:00
Laurent Destailleur
2c6e4b3fea
Merge pull request #15313 from frederic34/patch-10
...
doxygen
2020-11-06 18:46:00 +01:00
lvessiller
4ddff7173f
NEW include tpl for loading lang file for extra fields in list
2020-11-06 12:19:45 +01:00
Laurent Destailleur
ed8a0093ff
Debug v13
2020-11-05 22:25:14 +01:00
stickler-ci
d87749e5a6
Fixing style errors.
2020-11-05 19:31:42 +00:00
Frédéric FRANCE
0c56664c4f
Update card.php
2020-11-05 20:30:09 +01:00
Frédéric FRANCE
9d1756e499
doxygen
2020-11-05 14:48:41 +01:00
Scrutinizer Auto-Fixer
ab25e047c0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 17:51:30 +00:00
Scrutinizer Auto-Fixer
7f52920716
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Laurent Destailleur
a24071492e
Start fix for php8 compatibility
2020-10-30 05:56:07 +01:00
Frédéric FRANCE
e546e56b22
Update contact.class.php
2020-10-28 20:50:33 +01:00
Frédéric FRANCE
5a01d91492
Update contact.class.php
2020-10-27 20:48:13 +01:00
Frédéric FRANCE
0a024f285d
Update contact.class.php
2020-10-27 20:13:01 +01:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end
2020-10-27 18:19:31 +01:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉
2020-10-23 20:08:35 +02:00
Frédéric FRANCE
9a470fa42d
replace deprecated
2020-10-22 22:50:03 +02:00
Frédéric FRANCE
8fd4101876
Fix upload photo
2020-10-17 20:43:34 +02:00
Laurent Destailleur
7838ca32ba
Fix sql injection reported by Jason Nordenstam
2020-10-14 01:52:53 +02:00
Scrutinizer Auto-Fixer
1512521d91
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-07 13:01:28 +00:00
Laurent Destailleur
e3542c6d4f
Merge pull request #14848 from TobiasSekan/ShowCategoryInListOnlyWithRights
...
NEW Show category filter on lists only when user have rights to read categories
2020-10-06 12:29:10 +02:00
Laurent Destailleur
a0722f2a30
Merge pull request #14862 from TobiasSekan/UseObjectFieldsOnContactList
...
NEW Use object field of contact in contact list (internal)
2020-10-01 19:27:49 +02:00
Laurent Destailleur
7b3a7c9921
Add token on all url with action=delete
2020-10-01 10:50:54 +02:00
Laurent Destailleur
f442dac2c9
Add token on most GET url for admin action
2020-09-30 15:13:28 +02:00
Sekan, Tobias
8d2cd144ce
fix removed fields
2020-09-30 11:52:22 +02:00
Sekan, Tobias
6c46b2e8de
Address feedback
2020-09-30 11:45:29 +02:00
stickler-ci
ce8d240d8f
Fixing style errors.
2020-09-29 13:06:23 +00:00
Sekan, Tobias
c8e11f9eae
Use object fileds on contact list
2020-09-29 14:59:16 +02:00
Sekan, Tobias
2bf15b3a92
Show category filter only on rights to read it
2020-09-28 10:42:49 +02:00
Laurent Destailleur
d53e7266d2
Update agenda.php
2020-09-27 18:34:35 +02:00
Florian HENRY
f9d4a4d2ba
Merge branch 'develop' into fix_eventcreation
2020-09-27 17:58:05 +02:00
Tobias Sekan
a72519f353
Merge branch 'develop' into PreselectThirpartyOnNewFromList
2020-09-23 09:09:42 +02:00
Florian HENRY
1efec17228
remove commented code since 3 years
2020-09-21 11:53:09 +02:00
Florian HENRY
0adca0a660
fix event creation same on all page
2020-09-21 11:43:08 +02:00
Laurent Destailleur
216b3c885d
Fix escaping
2020-09-20 01:30:36 +02:00
Laurent Destailleur
2d38644ae1
Sanitize sortfield
2020-09-18 17:13:01 +02:00
Laurent Destailleur
cf8e8ee68b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/card.php
htdocs/core/lib/functions.lib.php
htdocs/document.php
2020-09-18 14:54:20 +02:00
Laurent Destailleur
0b2aa2b01d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2020-09-18 14:48:40 +02:00
Laurent Destailleur
07556e061d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/contact/card.php
htdocs/core/lib/functions.lib.php
htdocs/document.php
2020-09-18 14:46:23 +02:00
Tobias Sekan
b2a953ed5b
Merge branch 'develop' into PreselectThirpartyOnNewFromList
2020-09-18 12:21:41 +02:00
Sekan, Tobias
eac9e54e0b
fix more different button visibility
2020-09-18 11:48:53 +02:00
Laurent Destailleur
b35db6b9dd
Clean code managing canvas
2020-09-18 06:02:52 +02:00
Laurent Destailleur
c4b5f5a249
Maxi clean of code
2020-09-18 01:29:17 +02:00
Laurent Destailleur
9a758b7edd
FIX #yogosha4483
2020-09-17 14:31:25 +02:00
Laurent Destailleur
bfbb217607
Fix GETPOST on 'action'
2020-09-16 19:39:50 +02:00
atm-lena
3182537566
FIX - Send mail from contact : select mail model
2020-09-16 17:19:25 +02:00
Laurent Destailleur
5c31593d43
Add date of birth in candidatures
2020-09-16 00:47:44 +02:00
Laurent Destailleur
64b28020c8
Look and feel v13
2020-09-11 13:14:14 +02:00
Scrutinizer Auto-Fixer
c263c8a76c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-08 19:27:28 +00:00
Scrutinizer Auto-Fixer
b78ff67d7e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-07 08:18:17 +00:00
Laurent Destailleur
0f68854baa
Merge pull request #14591 from TobiasSekan/AvoidUseCurlyBracesOnContactList
...
FIX Avoid use of curly braces on contact list (PHP 7.4+)
2020-08-31 16:13:33 +02:00
Sekan, Tobias
8b40d17868
avoid use of curly braces on contact list
2020-08-31 08:10:06 +02:00
Laurent Destailleur
ad87e753b4
Clean trim on GETPOST (already included inside GETPOST when not 'none'
2020-08-28 21:27:50 +02:00
Laurent Destailleur
a265bec7ca
NEW Events in agenda for contact
...
FIX Saving contacts of an events
2020-08-23 02:38:56 +02:00
Laurent Destailleur
0381cf5665
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop
...
Conflicts:
htdocs/core/modules/modPaymentByBankTransfer.class.php
htdocs/filefunc.inc.php
2020-08-14 11:08:53 +02:00
Laurent Destailleur
00804c1020
Complete fix for #14146
2020-08-07 15:19:26 +02:00
Laurent Destailleur
940b4e7bea
Fix #14413
2020-08-07 12:49:21 +02:00
Laurent Destailleur
4c1aa25b32
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/admin/adherent_emails.php
htdocs/core/tpl/extrafields_list_search_title.tpl.php
htdocs/product/traduction.php
2020-08-04 13:51:11 +02:00
Laurent Destailleur
2076d18825
FIX Param of fetch_name_optionals_label must be object->table_element
2020-08-04 12:47:09 +02:00
Laurent Destailleur
805ad6f5fe
Several fixes
2020-08-02 22:44:37 +02:00
Laurent Destailleur
d9818405c6
Fix regression for v13
2020-08-02 22:30:23 +02:00
kkhelifa-opendsi
fe0f77b967
Merge branch 'develop' into stcommcontact
2020-07-31 16:41:17 +02:00
Laurent Destailleur
2687666579
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-29 13:54:12 +02:00
Laurent Destailleur
8045cff888
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/expedition/class/expedition.class.php
2020-07-29 13:53:09 +02:00
Laurent Destailleur
930ae84dac
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/contact/list.php
htdocs/core/lib/pdf.lib.php
2020-07-29 13:50:31 +02:00
Laurent Destailleur
ab4b1b1f29
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-07-29 13:48:18 +02:00
Laurent Destailleur
4a291f181f
Fix regression
2020-07-29 13:47:04 +02:00
lvessiller
8ee5b16e89
FIX redirect on contact card from main search
2020-07-29 12:00:22 +02:00
Laurent Destailleur
7d3039d41f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/user/card.php
2020-06-06 23:04:55 +02:00
Laurent Destailleur
19405d5f5b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/langs/en_US/admin.lang
2020-06-06 23:02:05 +02:00
Laurent Destailleur
30ea9a497d
Merge pull request #14030 from atm-maxime/fix_contact_update_socialnetworks
...
Fix #14027 : emptying social network value on contact wasn't working
2020-06-06 21:57:32 +02:00
Laurent Destailleur
b386400365
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-06 21:52:55 +02:00
florian HENRY
7115bd7033
better fix
2020-06-04 20:14:19 +02:00
Maxime Kohlhaas
f6e0ed08e2
Fix #14027 : emptying social network value on contact wasn't working
2020-06-04 00:30:17 +02:00
florian HENRY
c655720b78
fix travis
2020-06-01 10:51:50 +02:00
florian HENRY
2337d75d92
better fix for #13968
2020-06-01 10:43:57 +02:00
Frédéric FRANCE
2085ac73e7
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-23 18:34:58 +02:00
Laurent Destailleur
493becde8b
Update list.php
2020-05-23 13:39:06 +02:00
Laurent Destailleur
15de6194c4
Update list.php
2020-05-23 13:38:59 +02:00
gael.langlais
af5de05a31
Change some curly braces #13929
2020-05-23 13:38:50 +02:00
Frédéric FRANCE
b41ac00b98
add new rule
2020-05-21 15:05:19 +02:00
Frédéric FRANCE
f5688b2eec
add new rule
2020-05-21 01:52:25 +02:00
Laurent Destailleur
ff8d22a80d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/expedition/class/expedition.class.php
scripts/cron/cron_run_jobs.php
2020-05-18 15:57:01 +02:00
Maxime Kohlhaas
baa502a224
Fix third merge issue with contact roles
2020-05-18 10:54:25 +02:00
Laurent Destailleur
af46108cc4
Look and feel v12
2020-05-17 13:34:16 +02:00
Laurent Destailleur
4584fa1aa6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/asset/list.php
htdocs/compta/bank/list.php
htdocs/contrat/services_list.php
htdocs/core/lib/date.lib.php
htdocs/expensereport/list.php
htdocs/fichinter/list.php
htdocs/holiday/list.php
htdocs/projet/tasks/list.php
htdocs/supplier_proposal/list.php
htdocs/user/list.php
2020-05-11 19:43:06 +02:00
Maxime Kohlhaas
1a9afe6b20
Fix missing hook params for printFieldListValue
2020-05-08 01:40:25 +02:00
kamel
218fbfc70b
Correction pour validation Stickler CI / stickler-ci
2020-04-27 18:06:50 +02:00
kamel
28d330996c
Correction pour validation Stickler CI / stickler-ci
2020-04-27 18:01:07 +02:00
kamel
4dd42496fa
Correction pour validation Stickler CI / stickler-ci
2020-04-27 17:48:05 +02:00
kamel
9cb90cb384
NEW: Add prospect status managment for the contact with managment of custom icon
2020-04-27 17:35:14 +02:00
stickler-ci
fdc0543b4d
Fixing style errors.
2020-04-27 12:16:24 +00:00
Laurent Destailleur
1c70e49695
Merge branch 'develop' into 12.0_a23
2020-04-27 14:14:13 +02:00
Tobias Sekan
5d9432e4d0
fix style
2020-04-24 14:02:54 +02:00
Tobias Sekan
cab4f35438
fix missing vcard values
2020-04-24 14:01:08 +02:00
Laurent Destailleur
72c6ac1c72
Complete #13708 , normalization of code
2020-04-23 13:21:39 +02:00
Laurent Destailleur
496d8f354f
Look and feel v12
2020-04-22 17:59:54 +02:00
Laurent Destailleur
acc7c371cb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/vcard.php
htdocs/core/boxes/box_birthdays.php
htdocs/core/boxes/box_birthdays_members.php
htdocs/core/lib/date.lib.php
2020-04-20 16:10:19 +02:00
Laurent Destailleur
b8e68a5ef7
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-04-20 16:06:31 +02:00
gauthier
b72651fdfd
FIX : we must export company mail address on contact vcard only if contact email address is empty
2020-04-20 15:59:44 +02:00
Laurent Destailleur
16e46c672c
Clean code
2020-04-20 15:06:27 +02:00
Laurent Destailleur
96d087c99d
Fix clean event report
2020-04-13 02:59:33 +02:00
Laurent Destailleur
d7784887d1
More font awesome picto
2020-04-12 14:58:50 +02:00
Laurent Destailleur
0845f0bcd3
Merge pull request #13523 from bb2a/patch-2
...
add in default search
2020-04-10 12:12:28 +02:00
Scrutinizer Auto-Fixer
444c293c01
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00:00
Laurent Destailleur
4ff503d20a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/list.php
htdocs/supplier_proposal/list.php
2020-04-10 02:07:51 +02:00
Laurent Destailleur
7fe8c7eab3
FIX #11855
2020-04-10 01:37:04 +02:00
Laurent Destailleur
cbbd2399c0
Update list.php
2020-04-09 19:50:24 +02:00
Anthony Berton
da1b8f8c44
Update list.php
2020-04-08 08:56:10 +02:00
Alexandre SPANGARO
c3e5cf901d
Work on split module fournisseur
2020-03-24 22:20:25 +01:00
Laurent Destailleur
5f255a6c14
A new way to navigate between pages in list is available
2020-03-17 03:24:24 +01:00
Laurent Destailleur
33c5db9cc3
Prepare code for the new pagination possibility
2020-03-13 13:07:11 +01:00
Laurent Destailleur
7907e85f60
Merge pull request #13153 from bb2a/patch-16
...
MAJ MAIN_FIRST_TO_UPPER LOW first uppercase letter of a lowercase chain
2020-02-21 18:11:45 +01:00
Laurent Destailleur
e73d83767c
Fix phpcs
2020-02-20 12:35:48 +01:00
Anthony Berton
298853138a
Update contact.class.php
2020-02-20 12:17:55 +01:00
Laurent Destailleur
f109864670
NEW Add a profil to import contact categories
...
Load roles of contact only when required
2020-02-19 13:22:24 +01:00
Scrutinizer Auto-Fixer
fd48877dc6
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-18 22:47:25 +00:00
Laurent Destailleur
a6b0fec90b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/exports/class/export.class.php
2020-02-17 12:35:34 +01:00
Laurent Destailleur
504a67daee
FIX duplicate class name into some log lines
2020-02-17 12:34:00 +01:00
Laurent Destailleur
1904ae0e82
FIX Type of contact for event does not exists and not supported
...
FIX Type of contact not saved when creating a contact
FIX SQL Overload in default contact trigger.
FIX Trigger name PROPAL_SUPPLIER_TRIGGER into PROPOSAL_SUPPLIER_TRIGGER
Conflicts:
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-02-17 12:25:51 +01:00
Laurent Destailleur
a02f5cde92
FIX Type of contact for event does not exists and not supported
...
FIX Type of contact not saved when creating a contact
FIX SQL Overload in default contact trigger.
FIX Trigger name PROPAL_SUPPLIER_TRIGGER into PROPOSAL_SUPPLIER_TRIGGER
2020-02-17 12:21:07 +01:00
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
