Commit Graph

3587 Commits

Author SHA1 Message Date
Laurent Destailleur
ae44c4c7f5 Disable duplicate feature with emailing module and field "unsubscribe
requested"
2018-10-24 02:00:43 +02:00
John BOTELLA
d9965d1986 Fix travis messages 2018-10-23 17:18:30 +02:00
Frédéric FRANCE
570ee200d8
Merge remote-tracking branch 'upstream/develop' into fixpdf 2018-10-22 20:19:28 +02:00
Laurent Destailleur
f65df9e541 NEW Add option PDF_DISABLE_MYCOMPANY_LOGO to disable logo on PDF 2018-10-22 20:06:03 +02:00
Frédéric FRANCE
042118fe38
fix it 2018-10-19 18:35:16 +02:00
Frédéric FRANCE
c811d5a371
fix new pdf 2018-10-19 18:20:06 +02:00
Laurent Destailleur
fecb6e49c6
Merge pull request #9014 from atm-john/NEW_PDF_DOCUMENT_COLUMN_new_files
Experimental new pdf documents  using new column system
2018-10-19 15:51:54 +02:00
Frédéric FRANCE
6c85fbbc30
add log and comment 2018-10-18 21:47:10 +02:00
Laurent Destailleur
550a66d338
Merge pull request #9772 from ptibogxiv/patch-76
NEW move ticket dictionary in API /setup
2018-10-16 21:39:30 +02:00
Philippe GRAND
729ff0b9bb Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-16 14:20:11 +02:00
Laurent Destailleur
6d4d8a0342 Dolibarize data privacy policy module 2018-10-15 14:05:54 +02:00
Maxime Kohlhaas
c66823d72f Fix numbering of supplier credit notes (issue #9624) 2018-10-14 17:07:38 +02:00
Philippe GRAND
effd11e1f9 translation 2018-10-13 12:42:01 +02:00
Philippe GRAND
94ea438881 Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-13 12:40:28 +02:00
Laurent Destailleur
e5cc4ae61b Code comment 2018-10-13 12:00:59 +02:00
Philippe GRAND
30630ff368 fix typo 2018-10-13 11:58:19 +02:00
Laurent Destailleur
5d2f34dc1e
Merge pull request #9715 from inoveaconseil/datapolicies
Dolibarization DataPolicies
2018-10-09 16:03:14 +02:00
Inovea Conseil
768ab66d1f Datapolicies 2018-10-09 14:40:15 +02:00
Philippe GRAND
bba6669f03 Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018 2018-10-09 08:47:26 +02:00
Laurent Destailleur
a0ba01321b Fix phpcs 2018-10-06 12:50:32 +02:00
Philippe GRAND
61daff6cb6 Standardize code 2018-10-06 12:34:51 +02:00
Laurent Destailleur
e24117e75b Fix position of modules is string on 2 digits 2018-10-06 11:57:53 +02:00
Laurent Destailleur
d1dde0ffac Include rgpd module with name DataPolicies 2018-10-06 02:51:47 +02:00
Laurent Destailleur
fd859d3162 Add a component to select lang into a web site 2018-10-03 18:40:54 +02:00
Laurent Destailleur
771922f427 Use 2 distinct left menu entries for leads and projects 2018-10-01 18:56:47 +02:00
Laurent Destailleur
1dfbb22bf8
Merge branch 'develop' into new_branch_13_09_2018 2018-10-01 02:20:16 +02:00
Frédéric FRANCE
c8ddf18558
Update mod_codeclient_monkey.php 2018-09-30 23:02:52 +02:00
Laurent Destailleur
aaa5efc77e Clean Take pos module 2018-09-28 22:06:04 +02:00
Laurent Destailleur
492b9c1a03 Fix phpcs 2018-09-28 18:03:53 +02:00
Laurent Destailleur
47da95fbbf Fix dependency of module 2018-09-28 13:50:37 +02:00
Laurent Destailleur
f990719daa Add experimental module TakePOS 2018-09-28 13:31:41 +02:00
Laurent Destailleur
a88dcfd1e4 Fix phpcs 2018-09-28 02:24:11 +02:00
Laurent Destailleur
60c74a6255
Merge pull request #9582 from grandoc/new_branch_21_09_2018
Standardize and update code from New branch 21 09 2018
2018-09-27 10:07:15 +02:00
Laurent Destailleur
26d20d0b76
Merge pull request #8729 from atm-quentin/NEW_rights_ignoring_min_price
NEW Advanced permission to ignore price min
2018-09-27 09:57:49 +02:00
Philippe Grand
031b3b44c5
Merge branch 'develop' into new_branch_13_09_2018 2018-09-27 09:42:58 +02:00
Philippe Grand
b7304e3d82
Merge branch 'develop' into new_branch_21_09_2018 2018-09-27 09:29:26 +02:00
Philippe GRAND
2799bd175d Translated comment 2018-09-23 21:35:43 +02:00
Laurent Destailleur
e277670a70
Merge pull request #9573 from grandoc/new_branch_20_09_2018
Standardize and update code from New branch 20 09 2018
2018-09-23 15:35:42 +02:00
Philippe GRAND
3464afe391 Update comment 2018-09-21 15:12:17 +02:00
Philippe Grand
870f504633
Update doc_generic_usergroup_odt.modules.php 2018-09-21 14:34:30 +02:00
Philippe Grand
0bcec6c923
Update doc_generic_user_odt.modules.php 2018-09-21 14:33:48 +02:00
Philippe Grand
2afaccf099
Update mod_ticket_universal.php 2018-09-21 14:32:31 +02:00
Philippe GRAND
9fab0a1d45 Update comments 2018-09-21 14:16:22 +02:00
Philippe GRAND
de6fca0844 fix merging 2018-09-21 14:09:12 +02:00
Philippe GRAND
48c3a1e1bc fix merging 2018-09-21 14:06:55 +02:00
Philippe Grand
d5003c9d3c
Merge branch 'develop' into new_branch_21_09_2018 2018-09-21 13:55:04 +02:00
Laurent Destailleur
7ece28ffd3 Trans 2018-09-21 11:48:01 +02:00
Frédéric FRANCE
7434b076d8
correct link to setup modulebuilder 2018-09-21 11:12:19 +02:00
Philippe Grand
239be3b58c
Merge branch 'develop' into new_branch_20_09_2018 2018-09-21 10:12:48 +02:00
Laurent Destailleur
8cfe5d7252
Merge pull request #9569 from grandoc/new_branch_19_09_2018
Missing translation
2018-09-21 09:50:18 +02:00
Laurent Destailleur
f7392871dd
Merge pull request #9579 from frederic34/patch-9
remove warning Line exceeds 500 characters
2018-09-21 09:40:28 +02:00
Philippe GRAND
bde8d8ae0e Comment and typo 2018-09-21 09:32:50 +02:00
Philippe GRAND
f59ac8dda5 Merge remote-tracking branch 'origin/new_branch_20_09_2018' into new_branch_21_09_2018 2018-09-21 09:07:17 +02:00
Laurent Destailleur
5bd538fb2c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/core/modules/modStripe.class.php
	htdocs/filefunc.inc.php
	htdocs/projet/element.php
2018-09-20 23:43:34 +02:00
Frédéric FRANCE
042555e716
remove warning Line exceeds 500 characters 2018-09-20 20:44:17 +02:00
Laurent Destailleur
4ba057528f Fix permissionss 2018-09-20 19:37:28 +02:00
Laurent Destailleur
36b8958c59 Move Stripe menu transactions and charges from develop to experimental 2018-09-20 19:35:13 +02:00
Philippe GRAND
e1a03c49cf Standardize and update code 2018-09-20 17:19:42 +02:00
Philippe GRAND
85ff212498 Standardize and update code 2018-09-20 17:11:29 +02:00
Philippe GRAND
e64fbd9522 Standardize and update code 2018-09-20 17:02:32 +02:00
Philippe GRAND
8225e039d9 Standardize and update code 2018-09-20 16:58:34 +02:00
Philippe GRAND
2adfdab771 Standardize and update code 2018-09-20 15:14:59 +02:00
Philippe GRAND
92a484dcd9 Standardize and update code 2018-09-20 15:07:43 +02:00
Philippe GRAND
7eda9c846c Standardize and update code 2018-09-20 15:01:03 +02:00
Philippe GRAND
b7a4311802 Standardize and update code 2018-09-20 14:56:40 +02:00
Philippe GRAND
b1fa12e1e3 Standardize and update code 2018-09-20 14:51:09 +02:00
Philippe GRAND
49fe6d3b79 Standardize and update code 2018-09-20 14:43:54 +02:00
Philippe GRAND
7c92157636 Standardize and update code 2018-09-20 14:25:53 +02:00
Philippe GRAND
7903a64c36 Standardize and update code 2018-09-20 14:23:09 +02:00
Philippe GRAND
11f254cd14 Standardize and update code 2018-09-20 14:19:52 +02:00
Philippe GRAND
cf8e12ced2 Standardize and update code 2018-09-20 14:15:39 +02:00
Philippe GRAND
12b56d17ba Standardize and update code 2018-09-20 14:11:59 +02:00
Philippe GRAND
0b4a0ac667 Standardize and update code 2018-09-20 14:09:25 +02:00
Philippe GRAND
4bd0af7a88 Standardize and update code 2018-09-20 14:05:57 +02:00
Philippe GRAND
bb0a830b78 Standardize and update code 2018-09-20 13:56:18 +02:00
Philippe GRAND
c0dc4f3a48 Standardize and update code 2018-09-20 13:52:57 +02:00
Philippe GRAND
7b50935e49 Standardize and update code 2018-09-20 13:44:45 +02:00
Philippe GRAND
a14c520910 Standardize and update code 2018-09-20 13:41:26 +02:00
Philippe GRAND
88bf2dee64 Standardize and update code 2018-09-20 13:36:00 +02:00
Philippe GRAND
7ffcc2e63f Standardize and update code 2018-09-20 13:32:41 +02:00
Philippe GRAND
cbda62b1ca Standardize and update code 2018-09-20 12:30:38 +02:00
Philippe GRAND
803505b6b7 Standardize and update code 2018-09-20 12:27:06 +02:00
Philippe GRAND
d091f5e16f Standardize and update code 2018-09-20 12:21:49 +02:00
Philippe GRAND
50073fe98d Standardize and update code 2018-09-20 12:16:31 +02:00
Philippe GRAND
bd87b1381d Standardize and update code 2018-09-20 12:14:30 +02:00
Philippe GRAND
d2d40ef0a3 Standardize and update code 2018-09-20 12:12:37 +02:00
Philippe GRAND
4b51227ca9 Standardize and update code 2018-09-20 12:10:13 +02:00
Philippe GRAND
5979db7733 Standardize and update code 2018-09-20 12:07:23 +02:00
Philippe GRAND
32beccc3be Standardize and update code 2018-09-20 12:02:23 +02:00
Philippe GRAND
67147582af Standardize and update code 2018-09-20 12:00:10 +02:00
Philippe GRAND
d5a3411fbc Standardize and update code 2018-09-20 11:28:54 +02:00
Philippe GRAND
08325d40ce Standardize and update code 2018-09-20 11:18:02 +02:00
Philippe GRAND
0222ea7e8c Standardize and update code 2018-09-20 09:19:17 +02:00
Philippe GRAND
1adc4bad9e Standardize and update code 2018-09-20 09:17:25 +02:00
Philippe GRAND
46d7385c54 Standardize and update code 2018-09-20 09:13:49 +02:00
Philippe GRAND
9b3dba4a56 Standardize and update code 2018-09-20 09:04:30 +02:00
Philippe GRAND
06ad6e7196 Standardize and update code 2018-09-20 09:04:12 +02:00
Philippe GRAND
9a487169c8 Standardize and update code 2018-09-20 09:03:52 +02:00
Philippe GRAND
ad84340bf5 Standardize and update code 2018-09-20 09:03:26 +02:00
Philippe GRAND
52533a0210 Standardize and update code 2018-09-19 16:43:37 +02:00