lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
70,154 Commits 43 Branches 150 Tags 886 MiB
69379dc2bb
Commit Graph

5077 Commits

Author SHA1 Message Date
Philippe GRAND
42fe2b78de clean and update code 2018-08-07 10:44:26 +02:00
Juanjo Menent
b8efe3b239
Merge pull request #9172 from grandoc/new_branch_28_07_2018 
standardize
 2018-08-02 11:27:02 +02:00
Philippe GRAND
892174cbf8 standardize 2018-07-29 10:29:12 +02:00
Philippe GRAND
36ea20b7d4 standardize 2018-07-28 18:03:14 +02:00
Philippe GRAND
9cc40fcb21 standardize 2018-07-28 17:26:56 +02:00
Philippe GRAND
f17275845d standardize 2018-07-28 14:29:28 +02:00
Frédéric FRANCE
8312d95174
trim trailing 2018-07-26 18:22:16 +02:00
Frédéric FRANCE
a0a5d33641
test include 2018-07-26 17:30:53 +02:00
Laurent Destailleur
dc2fec8f57 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-24 19:37:04 +02:00
Regis Houssin
20a1ffe810 FIX field is autoincrement but not "rowid" 2018-07-24 12:15:54 +02:00
Laurent Destailleur
ccd7332647 Fix default value of joinfile when creating a new email template 2018-07-24 01:46:14 +02:00
Philippe GRAND
3297554102 clean and update code 2018-07-23 17:45:38 +02:00
Laurent Destailleur
e9fccec055 Fix website deletion 2018-07-22 16:56:11 +02:00
Laurent Destailleur
41605ed4a7 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2018-07-16 11:29:47 +02:00
Laurent Destailleur
35ed89a517 Fix scrutinizer 2018-07-16 10:11:52 +02:00
Laurent Destailleur
1e775ffa6e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-13 09:12:01 +02:00
Laurent Destailleur
c27dd8d301 Fix phpcs 2018-07-13 09:11:46 +02:00
Laurent Destailleur
e4be3ab954 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-13 09:09:51 +02:00
Laurent Destailleur
b203421ac6 Fix log 2018-07-11 10:54:42 +02:00
Laurent Destailleur
2e36e5afa5 Some fix with dolistore api 2018-07-11 10:47:55 +02:00
Laurent Destailleur
f3de1af601 Finish webdav experimental module 2018-07-10 14:56:04 +02:00
Laurent Destailleur
5f52dfa873 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-10 14:02:40 +02:00
Laurent Destailleur
44626a3a48 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-07-10 13:57:24 +02:00
Laurent Destailleur
8184eff66c Fix for #9079 2018-07-09 15:25:14 +02:00
Laurent Destailleur
45d1a14c8e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-06 16:10:37 +02:00
Laurent Destailleur
05ed721a8c Fix name of constant for module TICKET 2018-07-06 13:09:07 +02:00
Laurent Destailleur
12c43d7722 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-03 12:33:17 +02:00
Laurent Destailleur
cfb41d4329 FIX: If module workflow disabled, we must disable autoclassification too 2018-07-03 11:43:50 +02:00
Laurent Destailleur
982a1ffbaf NEW Automatic position of scroll when creating an extrafield 2018-06-30 14:22:05 +02:00
Laurent Destailleur
df96c5ca81
Merge pull request #8796 from defrance/patch-113 
introduce serial and document for holiday module
 2018-06-30 02:09:28 +02:00
Laurent Destailleur
f6774de773 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-30 02:00:46 +02:00
Laurent Destailleur
1ff8788ff7
Merge pull request #9016 from yolocodefrench/develop 
ajout de la gestion des comptes bancaires des tiers via l'api
 2018-06-30 01:26:08 +02:00
Laurent Destailleur
e4388e63fa
Merge pull request #8891 from inoveaconseil/develop 
NEW: ADD url to see the last version of a external module
 2018-06-30 01:17:10 +02:00
Laurent Destailleur
fba9caab5d
Merge pull request #8944 from bafbes/abb7008 
New: Option to see line numbers in modules page
 2018-06-29 20:05:19 +02:00
Laurent Destailleur
75e9f1bf9a
Update modules.php 2018-06-29 20:05:12 +02:00
STAGIAIRE-PC\Pierre
19eaa3df66 ajout de la modification dans la base de données 2018-06-27 11:29:46 +02:00
STAGIAIRE-PC\Pierre
a94eeaa500 adding the possibility to personnalize ent_to_end and ustrd of a bank levy 2018-06-27 10:53:45 +02:00
Regis Houssin
48ad03c56d Fix: remove unused and blocking field 2018-06-27 09:33:21 +02:00
Laurent Destailleur
9f1cfbdb72
For better compatibility 2018-06-25 12:25:43 +02:00
Regis Houssin
a6729b0bd1 Fix: change field name and remove obsolete data 2018-06-25 09:10:24 +02:00
Laurent Destailleur
2520ebcfae Fix line 2018-06-24 18:56:49 +02:00
Philippe GRAND
41a0175827 clean and upsdate code 2018-06-18 14:17:43 +02:00
Laurent Destailleur
910652eb6d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/admin.lang
 2018-06-13 23:07:30 +02:00
Laurent Destailleur
4c2af6fc70 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/html.form.class.php
 2018-06-13 23:04:08 +02:00
Laurent Destailleur
03b6bec8b8 Fix email template for test 2018-06-13 17:03:46 +02:00
Abbes Bahfir
74d92dd91f New: Optiopn to see line numbers in modules page 2018-06-11 23:10:40 +01:00
gauthier
baf9d4a806 FIX : If we enable 3 steps for supplier order approbation, we must not delete all fourn rights def. 2018-06-08 17:11:59 +02:00
Laurent Destailleur
f28a6e59c8 Look and feel v8 2018-06-05 16:30:16 +02:00
Laurent Destailleur
7cb66e8e0c Fix reset of filters 2018-06-05 10:04:57 +02:00
Laurent Destailleur
87d073b5cd Fix conflict with external ticketsup module 2018-06-04 21:49:29 +02:00
Inovea Conseil
0f9fa09d3f
Fix after the comment 2018-05-31 09:13:18 +02:00
Mavyre
e59a91bdae
Stopped using AJAX for the synchro 2018-05-30 21:12:28 +02:00
Inovea Conseil
e0c1e33012 NEW: ADD url to see the last version of a external module 2018-05-30 00:20:31 +02:00
Frédéric FRANCE
67e0abdd66
loadlangs 2018-05-26 18:52:14 +02:00
Frédéric FRANCE
f53f7bbf40
loadlangs 2018-05-26 18:41:16 +02:00
Laurent Destailleur
7f77f1bd5a
Merge pull request #8825 from atm-florian/develop_advtrgtml 
new : add adv targt emailing amdin with main feature level 1
 2018-05-25 11:10:51 +02:00
Laurent Destailleur
de84f0e687 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/filefunc.inc.php
 2018-05-21 23:35:09 +02:00
Laurent Destailleur
afa57fd66d Fix syntax error 2018-05-21 23:33:20 +02:00
Laurent Destailleur
69141c9493 Fix PSR True->true and GETPOST file name for local checksum check 2018-05-21 22:24:27 +02:00
Laurent Destailleur
c141c3ecfd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-21 19:35:26 +02:00
Laurent Destailleur
05c2f206ff Fix missing lang 2018-05-21 19:35:12 +02:00
florian HENRY
22cdbffb0a new : add adv targt emailing amdin with main feature level 1 2018-05-21 10:58:16 +02:00
Laurent Destailleur
f211cfaf0c
Merge pull request #8777 from grandoc/new_branch_11_05_2018 
clean and update code
 2018-05-18 12:20:22 +02:00
Laurent Destailleur
d52305cef8 NEW Add entry for the GDPR contact 2018-05-15 11:50:42 +02:00
Laurent Destailleur
94ccb44673 Fix bad url wor external subscription page 2018-05-12 11:02:44 +02:00
Philippe GRAND
edbe32ea0c clean and update code 2018-05-11 22:31:17 +02:00
Philippe GRAND
e5d8dec2f9 clean and update code 2018-05-11 12:18:45 +02:00
BENKE Charlene
e3963c3518
Create holiday.php 2018-05-07 22:48:43 +02:00
Laurent Destailleur
95bd249ec6
Merge pull request #8740 from grandoc/new_branch_04_05_2018 
Clean and update code
 2018-05-05 13:49:54 +02:00
Laurent Destailleur
e9008e9461
Merge pull request #8734 from grandoc/new_branch_03_05_2018 
clean and update code
 2018-05-05 13:28:47 +02:00
Laurent Destailleur
634e58b7c9 Look and feel v8 2018-05-04 18:24:00 +02:00
Philippe GRAND
b5f222f45a Clean and update code 2018-05-04 14:14:04 +02:00
Philippe GRAND
f3a70a40d7 clean and update code 2018-05-03 21:27:52 +02:00
Laurent Destailleur
24518803fc Clean code 2018-05-02 19:15:16 +02:00
Laurent Destailleur
dfe6e4bfc1 Doxygen 2018-05-02 19:08:59 +02:00
Laurent Destailleur
2f2d17926d Sort list 2018-05-01 20:52:25 +02:00
Laurent Destailleur
c3b5664fb5 Fix sort order of email templates 2018-05-01 16:24:40 +02:00
Laurent Destailleur
55f982e504 Removed deprecated FPDI option and reorganise PDF setup page 2018-04-30 09:28:24 +02:00
Laurent Destailleur
e168240ab0 Debug module DAV 2018-04-29 18:32:15 +02:00
Laurent Destailleur
c376cc5779
Merge pull request #8686 from grandoc/new_branch_26_04_2018 
clean code
 2018-04-27 11:39:32 +02:00
Laurent Destailleur
cee4df9b27
Merge pull request #8667 from grandoc/new_branch_23_04_2018 
clean code
 2018-04-27 09:46:55 +02:00
Laurent Destailleur
69db960a92 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/activity/perweek.php
 2018-04-26 18:33:02 +02:00
Philippe GRAND
966419254d clean code 2018-04-26 15:44:15 +02:00
Philippe GRAND
502c837e04 Merge remote-tracking branch 'upstream/develop' into new_branch_23_04_2018 2018-04-26 15:36:15 +02:00
Laurent Destailleur
83b762b681 FIX CVE-2018-9019 2018-04-25 16:01:06 +02:00
Laurent Destailleur
ae412f228d NEW Experimental DAV module provides a public and private directory 2018-04-25 12:22:02 +02:00
Philippe GRAND
458dc42692 clean and update code 2018-04-25 11:50:58 +02:00
Philippe GRAND
c22ef109ac clean and add new code 2018-04-24 17:42:13 +02:00
Philippe GRAND
bf1e5bc618 Merge remote-tracking branch 'upstream/develop' into new_branch_23_04_2018 2018-04-24 17:31: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
Philippe GRAND
9e9d52a662 clean and update code 2018-04-23 16:23:30 +02:00
Philippe GRAND
bcf5c5d78a clean code 2018-04-23 16:04:52 +02:00
Laurent Destailleur
32511422ab Fix PSR2 2018-04-22 20:08:29 +02:00
Laurent Destailleur
ac89951acd
Merge pull request #8647 from fmarcet/develop 
New: Add same parameters on 'printFieldListTitle' hooks
 2018-04-22 19:35:09 +02:00
Laurent Destailleur
68a0b45141
Merge pull request #8648 from grandoc/new_branch_20_04_2018 
clean and update code
 2018-04-22 19:31:46 +02:00
Laurent Destailleur
69adf73f4f Clean code from $var = True 2018-04-22 19:27:37 +02:00
Laurent Destailleur
769a1f507b Debug asset module 2018-04-22 11:26:59 +02:00
Laurent Destailleur
ccd9aa8059 Fight against dolibarr warnings 2018-04-21 12:16:12 +02:00
Philippe GRAND
410d1ee07d Merge remote-tracking branch 'upstream/develop' into new_branch_20_04_2018 2018-04-21 12:05:50 +02:00
Laurent Destailleur
cef9782179 Clean defined constant at begin of pages 2018-04-21 12:00:55 +02:00
Philippe GRAND
53efccd98e Merge remote-tracking branch 'upstream/develop' into new_branch_20_04_2018 2018-04-20 16:46:53 +02:00
Laurent Destailleur
38d200d8a6 Fix left menu 2018-04-20 13:23:34 +02:00
Philippe GRAND
1ebdcae538 clean and update code 2018-04-20 11:30:40 +02:00
Philippe GRAND
33505411a7 clean and update code 2018-04-20 11:17:45 +02:00
Ferran Marcet
6ced1a3264 New: Add same parameters on 'printFieldListTitle' hooks 2018-04-20 10:38:16 +02:00
Laurent Destailleur
788fd62205
Merge pull request #8636 from hregis/develop_pgsql 
Fix: avoid Warning: A non-numeric value encountered + wrong var name
 2018-04-20 01:20:19 +02:00
Laurent Destailleur
16e27a445b Sort type of email template combo list 2018-04-19 20:42:03 +02:00
Laurent Destailleur
17dd96ef31 Fix filter on email template 2018-04-19 20:17:54 +02:00
Laurent Destailleur
1389ce9e48 FIX Template of modules not enabled must not be visible 2018-04-19 20:12:43 +02:00
Laurent Destailleur
8acc752195 Debug ticket module 2018-04-19 14:44:21 +02:00
Laurent Destailleur
8aab183567 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-19 14:00:18 +02:00
Laurent Destailleur
6b3e5e2085 FIX sanitize setup params 2018-04-18 12:19:23 +02:00
Laurent Destailleur
5d121b2d3a FIX CVE-2018-10092 2018-04-18 11:58:36 +02:00
Regis Houssin
eaecf7190a Fix: avoid Warning: A non-numeric value encountered + wrong var name 2018-04-18 08:34:48 +02:00
Laurent Destailleur
0d0da234b1 Lowercase NULL, TRUE, FALSE according to PSR2 2018-04-16 13:51:16 +02:00
Laurent Destailleur
72de21537c Clean code 2018-04-15 20:09:09 +02:00
Laurent Destailleur
77b686500c css 2018-04-14 21:07:20 +02:00
Laurent Destailleur
ecfabc6633 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-04-13 23:18:39 +02:00
Laurent Destailleur
32ff8ae132 Fix link 2018-04-13 18:02:25 +02:00
Laurent Destailleur
ace55ba569 Debug usage of extrafields for ticket module 2018-04-12 23:17:46 +02:00
Laurent Destailleur
698f5c165a
Merge pull request #8430 from atm-florian/dev_mailtouser 
NEW : Can select from the user list into send form email (For field to and CC)
 2018-04-11 17:55:40 +02:00
Laurent Destailleur
ea35a445a1
Merge branch 'develop' into 8.0-a15 2018-04-11 13:17:12 +02:00
Laurent Destailleur
aa01afc0d5 Fix direct link on transifex using new search url 2018-04-09 13:57:09 +02:00
Laurent Destailleur
0475cb8018 FIX Permission for bookkeeper 2018-04-09 10:51:58 +02:00
Laurent Destailleur
6529043182 Clean code 2018-04-08 10:49:59 +02:00
Laurent Destailleur
98b9f6bb47 DAV module 2018-04-07 19:12:41 +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
Alexandre SPANGARO
741a14993a NEW Add file number in accountant card and update export filename 2018-04-07 06:21:49 +02:00
Laurent Destailleur
1a321e19c8 FIX XSS in company setup page 2018-04-06 19:12:13 +02:00
Laurent Destailleur
b412f0b76b Better interaction to setup email 2018-04-06 16:38:47 +02:00
Laurent Destailleur
85d4f7115b Better position of the substitution tooltip for emails 2018-04-06 16:16:08 +02:00
Laurent Destailleur
6c409b2670 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-05 18:08:19 +02:00
Laurent Destailleur
b59d8a6473
Merge pull request #8501 from ATM-Consulting/develop_atm 
NEW: send mails from project card
 2018-04-05 16:39:06 +02:00
Laurent Destailleur
ab27b105c0
Merge pull request #8490 from hregis/7.0_bug6 
FIX limit access of email template page to internal users
 2018-04-05 16:11:04 +02:00
Laurent Destailleur
eeb2d5a4da Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/cron/list.php
 2018-04-05 13:24:36 +02:00
Laurent Destailleur
1b1a8f7e81 Fix trigger name 2018-04-05 13:21:00 +02:00
florian HENRY
cc0fb830b8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser 2018-04-05 10:53:17 +02:00
Laurent Destailleur
8595d7621b Fix POST mut use method POST no GET 2018-04-02 23:30:23 +02:00
Laurent Destailleur
fba40575f7 Remove dead code 2018-04-02 16:39:48 +02:00
Regis Houssin
c720345e6d Fix: better test 2018-04-01 11:47:10 +02:00
Regis Houssin
20e80a58a8 Fix: limit access to internal users 2018-04-01 11:43:39 +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
3aff363998 NEW: mail templates for projects 2018-03-28 17:08:26 +02:00
Laurent Destailleur
8102ae6705 Work on setup for vat of product payments 2018-03-25 18:25:52 +02:00
Laurent Destailleur
8a3e6a0750 More logical setup behavior 2018-03-25 17:53:32 +02:00
florian HENRY
ffbeb17ec2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser 2018-03-25 17:19:27 +02:00
Laurent Destailleur
7363ae17ee Move setup of email for module module into email templates 2018-03-23 16:09:46 +01:00
florian HENRY
e2e1fae5e6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser 2018-03-21 22:58:33 +01:00
Laurent Destailleur
517301f014 Work on subscription reminder 2018-03-21 16:40:09 +01:00
florian HENRY
dc6f4c1f4d NEW : option to send email to salaries 2018-03-21 11:48:30 +01:00