lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
95,041 Commits 43 Branches 150 Tags 886 MiB
13.0
Commit Graph

6525 Commits

Author SHA1 Message Date
Christian Foellmann
fb7ed3afc1 optimize mail templates edit screen 2020-10-05 15:20:27 +02:00
Laurent Destailleur
5c3b83b82e Show small image in setup page 2020-10-05 14:06:14 +02:00
Aurélien
bdd095f6bb
translate livraison2delivery => change folder, filename and class ref into all dependencies #14697 2020-10-05 13:59:59 +02:00
Laurent Destailleur
cfc3c01815 Factorize code to know if a parameter is used to store a secret 2020-10-05 12:13:06 +02:00
Laurent Destailleur
62177edab1 NEW Can force the antivirus from conf file or autoprepend ini setup. 2020-10-05 05:00:59 +02:00
Laurent Destailleur
07e1646b3a Minor fixes 2020-10-04 19:09:25 +02:00
Laurent Destailleur
aeb895b1c6 CSS 2020-10-04 18:43:56 +02:00
Laurent Destailleur
c2fed95dc4 FIX #14877 2020-10-02 19:54:06 +02:00
Laurent Destailleur
03ede71989 Clean code 2020-10-02 16:15:24 +02:00
Frédéric FRANCE
16ff15b48c
fix 2020-10-02 00:29:36 +02:00
Frédéric FRANCE
b78e506e39
add files 2020-10-02 00:25:44 +02:00
Frédéric FRANCE
7afb62c55d
Merge remote-tracking branch 'upstream/develop' into ecm_extrafields 2020-10-02 00:24:48 +02:00
Frédéric FRANCE
f057488ae3
add extrafields on ecm 2020-10-02 00:21:13 +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
Laurent Destailleur
82da38df65 Removed dead code 2020-09-29 19:57:10 +02:00
Laurent Destailleur
8b2ba8cbba Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/bom/bom_card.php
	htdocs/core/class/ldap.class.php
	htdocs/core/lib/files.lib.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/admin.lang
 2020-09-29 13:28:22 +02:00
Laurent Destailleur
1f8f2c0cc3 NEW Add 2 rules for emailcollector: Message send/not sent from Dolibarr 2020-09-29 13:13:47 +02:00
Laurent Destailleur
4cf6e483ca Fix export of various payments. 2020-09-28 18:49:20 +02:00
Laurent Destailleur
4a7df01339 Fix the MAIN_EXTERNAL_SMTP_SPF_STRING_TO_ADD should be 
MAIN_EXTERNAL_MAIL_SPF_STRING_TO_ADD
 2020-09-27 19:31:54 +02:00
Laurent Destailleur
e495d0459e Look and feel v13 2020-09-27 17:53:17 +02:00
Laurent Destailleur
1b83b55995 Fix to exclude possible sql injection 2020-09-25 17:11:54 +02:00
Laurent Destailleur
3c6dda9dd5 Clean code 2020-09-25 10:27:30 +02:00
Laurent Destailleur
d6ce6bb47f Standardize code 2020-09-25 10:05:59 +02:00
Laurent Destailleur
ed2dd3f55f Clean code 2020-09-24 22:02:10 +02:00
Laurent Destailleur
64c8053b67 Fix restrict extension of files 2020-09-24 21:09:58 +02:00
Laurent Destailleur
ca7b9efec2 Add missing token 2020-09-24 17:08:31 +02:00
Laurent Destailleur
f066da1811 Minor security fixes 2020-09-24 16:19:24 +02:00
Laurent Destailleur
09c6761dae NEW Include the tag editor of page as a popup into website editor 2020-09-23 16:36:19 +02:00
Laurent Destailleur
e4bd75dbdc Enhancement for #14589 2020-09-22 16:26:53 +02:00
Laurent Destailleur
288fd5566f FIX #14776 2020-09-22 16:02:00 +02:00
Laurent Destailleur
cda101238d Fix #yogosha4543 2020-09-20 21:17:27 +02:00
Laurent Destailleur
ab94224d0c
Merge pull request #14668 from OPEN-DSI/email_smtp_allow_auto_signed 
NEW : Email configuration - Allow auto signed certificat when smtp ssl activated
 2020-09-20 17:56:23 +02:00
Laurent Destailleur
b3dd51b790 Fix warnings 2020-09-20 16:46:29 +02:00
Laurent Destailleur
216b3c885d Fix escaping 2020-09-20 01:30:36 +02:00
Laurent Destailleur
2c660504bb Fix escape 2020-09-19 23:11:38 +02:00
Laurent Destailleur
54c0f742b1 Fix escape 2020-09-19 21:19:04 +02:00
Laurent Destailleur
b1985950a6 Use POST to make the ajax set/del constant 2020-09-19 12:50:47 +02:00
Laurent Destailleur
b7a97b2c81 Prepare for fix 2020-09-19 01:45:40 +02:00
Laurent Destailleur
2d38644ae1 Sanitize sortfield 2020-09-18 17:13:01 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Laurent Destailleur
937d656f46 Fix #yogosha4515 2020-09-17 23:02:09 +02:00
Laurent Destailleur
5744b1e0a3 Fix #yogosha4512 2020-09-17 21:34:31 +02:00
Laurent Destailleur
a895cdcdf8 Fix dol_string_nohtmltag: the decode of entity must be done before split 2020-09-17 21:09:16 +02:00
Laurent Destailleur
9a758b7edd FIX #yogosha4483 2020-09-17 14:31:25 +02:00
Laurent Destailleur
2f100fdf79 Fix alpha into alphanohtml 2020-09-17 12:53:58 +02:00
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
Laurent Destailleur
52c9e7230f
Merge pull request #14734 from inoveaconseil/NEW_Scope_Oauth_Google 
New scope oauth google
 2020-09-16 00:55:10 +02:00
Laurent Destailleur
c152f8d76f
Merge branch 'develop' into patch-4 2020-09-16 00:52:16 +02:00
Frédéric FRANCE
070f9a0c89
uniformise scan_dir to scandir in admin supplier payments 2020-09-15 16:32:32 +02:00
Laurent Destailleur
51963f4c2a css 2020-09-15 13:48:48 +02:00
Laurent Destailleur
5ca8141cd8 Typo 2020-09-15 12:09:48 +02:00
Laurent Destailleur
9a9b7ecb95 CSS 2020-09-15 12:07:15 +02:00
Laurent Destailleur
3dfa9acbef CSS 2020-09-15 11:18:57 +02:00
stickler-ci
b39b9e4227 Fixing style errors. 2020-09-14 13:19:26 +00:00
Nicolas
ee4e209e7c NEW Oauth SCOPE for Admin SDK 2020-09-14 15:12:57 +02:00
kkhelifa-opendsi
1f5f784b75
Merge branch 'develop' into email_smtp_allow_auto_signed 2020-09-14 10:25:15 +02:00
stickler-ci
3de5e0f957 Fixing style errors. 2020-09-14 02:30:37 +00:00
Scrutinizer Auto-Fixer
73915d51c8 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-14 02:30:04 +00:00
Laurent Destailleur
59bc8ee07c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/stats/byproperties.php
	htdocs/adherents/stats/geo.php
	htdocs/admin/system/dolibarr.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/tpl/objectline_title.tpl.php
	htdocs/langs/en_US/admin.lang
	htdocs/product/class/product.class.php
 2020-09-14 02:49:19 +02:00
Laurent Destailleur
a4fb16b4f3 Add a warning to warn about security leak 2020-09-14 00:03:49 +02:00
Laurent Destailleur
7d25de5713 Enhance setup page for email setup 2020-09-12 15:39:14 +02:00
stickler-ci
97e74642ce Fixing style errors. 2020-09-11 12:26:14 +00:00
Sekan, Tobias
0a0eed289e cleanup workflow page + bugfixes 2020-09-11 14:15:10 +02:00
Laurent Destailleur
b8fe2188a6 Standardize code around model_pdf 2020-09-10 01:49:09 +02:00
Laurent Destailleur
803efa7acc Add hidden constant until feature is reliable 2020-09-09 15:39:47 +02:00
Laurent Destailleur
3aa921fd0a
Merge pull request #14665 from TobiasSekan/NewCommonFilterForModuleOverview 
NEW Add common list function for available app/module page
 2020-09-09 15:36:46 +02:00
Sekan, Tobias
37141b577a fix sticker CI, better names, add missing comapres 2020-09-09 08:34:13 +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
kamel
ccff18e2a5 NEW : Email configuration - Allow auto signed certificat when ssl activated 2020-09-08 14:48:50 +02:00
Laurent Destailleur
86ed4dfa2b Debug hidden option MAIN_USE_EXPENSE_IK 2020-09-08 11:51:36 +02:00
stickler-ci
2569c792e7 Fixing style errors. 2020-09-08 08:13:56 +00:00
Sekan, Tobias
650bb54051 add common list function for module overview 2020-09-08 10:07:34 +02:00
Laurent Destailleur
198b8d8d2b debugbar ok with php5.6 2020-09-08 02:59:49 +02:00
Laurent Destailleur
1a67b4efeb Debug 2020-09-08 02:11:09 +02:00
Laurent Destailleur
c95e54843c Update lib debugbar 
Update php-parallel-lint
 2020-09-07 21:00:40 +02:00
Laurent Destailleur
b1e45aef46 Debug opensurvey. Look and feel v13. Removed deprecated properties. 2020-09-07 12:04:50 +02: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
lvessiller
27c754e6c8 NEW add send context for ticket 2020-09-02 15:33:18 +02:00
Laurent Destailleur
4110f1df05 Responsive 2020-08-31 19:21:33 +02:00
Laurent Destailleur
0d4f7cb485 Fix responsive and title of reports 2020-08-30 17:42:49 +02:00
Laurent Destailleur
6293f76692 Debug 2020-08-29 06:17:26 +02:00
Laurent Destailleur
b721930b3b
Merge pull request #14568 from atm-lena/NEW_AgendaEvent_Remind 
Agenda Remind (Part 1)
 2020-08-29 05:19:21 +02:00
Laurent Destailleur
983a3c59c8 css 2020-08-29 01:11:08 +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
04ad25d90f NEW Add the workflow interaction close intervention on closing ticket 2020-08-28 19:07:17 +02:00
Laurent Destailleur
50b791cfca Fix css 2020-08-28 17:41:15 +02:00
Laurent Destailleur
741489fdc0 FIX #14564 2020-08-27 19:52:05 +02:00
Laurent Destailleur
2abdfe08d7 FIX Email collector decode subject 
FIX Cloning email collector clone also rules and operations
 2020-08-27 18:27:05 +02:00
atm-lena
5856033892 Replace "agenda_send" and "event_push" to "actioncomm_send" 2020-08-27 11:15:08 +02:00
atm-lena
1267e914dc Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind 2020-08-26 15:16:53 +02:00
Laurent Destailleur
23bb67873f NEW Can edit the list of sending email profiles. 2020-08-25 19:40:17 +02:00
atm-lena
6a94c0f52f Add model type mail 2020-08-25 16:43:57 +02:00
Laurent Destailleur
21633e3d39 css 2020-08-24 17:10:27 +02:00
Laurent Destailleur
b600478a5a Work on recruitment module 2020-08-23 22:11:16 +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
220fc6db98 Work on recruitment module 2020-08-21 13:00:12 +02:00
Laurent Destailleur
461c37c4a8 Clean code 2020-08-21 01:28:40 +02:00
Laurent Destailleur
3ebcd191bd NEW Add filter rules "is answer" and "is not answer" in email collector 2020-08-20 20:16:38 +02:00
Laurent Destailleur
3281d5ec17
Merge pull request #14451 from josemariagomezroncero/patch-7 
Bug, this option disable topic input.
 2020-08-19 14:38:51 +02:00
Laurent Destailleur
4edf190264
Update mails_templates.php 2020-08-19 14:38:02 +02:00
Laurent Destailleur
afe8f76a4a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/stock.php
 2020-08-18 15:41:57 +02:00
Laurent Destailleur
d4a502629e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/admin/stock.php
	htdocs/core/lib/ajax.lib.php
 2020-08-18 15:35:34 +02:00
Laurent Destailleur
d21bda604d FIX Setup of stock increase/decrease 2020-08-18 15:27:17 +02:00
Laurent Destailleur
2f18ab0ea9 Debug generation of document for warehouse 2020-08-18 14:55:56 +02:00
Laurent Destailleur
6ce9d573e2 Trans 2020-08-18 14:13:36 +02:00
Laurent Destailleur
0172b76ea3 Add class reposition on some buttons 2020-08-18 14:05:35 +02:00
Laurent Destailleur
58e25768a7 NEW Add PDF document templates for warehouses (list of stock) 2020-08-18 14:02:36 +02:00
Laurent Destailleur
e3beec3e1f Fix css 2020-08-17 20:57:44 +02:00
Laurent Destailleur
bd65e5612f Fix duplicate id 2020-08-17 20:06:01 +02:00
Laurent Destailleur
75d368b706 Better translation of option 2020-08-17 14:08:52 +02:00
Laurent Destailleur
657e6a2037 No warning 2020-08-16 23:14:53 +02:00
Laurent Destailleur
4c0785e996 FIX #14469 2020-08-16 23:13:27 +02:00
Alexandre SPANGARO
3c35b20b54 Dict - Insert number 41 2020-08-16 22:17:28 +02:00
Alexandre SPANGARO
27c36713d3 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-08-16 22:10:02 +02:00
josemariagomezroncero
134bd11f47
Update mails_templates.php 2020-08-14 21:19:51 +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
josemariagomezroncero
308dea92b3
Bug, this option disable topic input. 
Bug, MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES disable topic input. We need the subject for email for save.
 2020-08-10 20:40:11 +02:00
Laurent Destailleur
537b58b446 Introduce workaround to allow integrator to suggest list of modules in 
old style by default instead of kanban style #14075
 2020-08-08 02:34:22 +02:00
Laurent Destailleur
71a6cf1207 Fix permission on type of email templates must depends on user perms. 
Conflicts:
	htdocs/admin/mails_templates.php
 2020-08-07 14:39:30 +02:00
Laurent Destailleur
5e90286a2e Fix permission on type of email templates must depends on user perms. 2020-08-07 14:38:03 +02:00
Laurent Destailleur
6fd433167f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/CMailFile.class.php
 2020-08-07 11:59:55 +02:00
Laurent Destailleur
edd19419ad Add protection to allow only jpg and png as image file 2020-08-06 17:39:36 +02:00
Laurent Destailleur
61e194bb6d Add protection to allow only jpg and png as image file 2020-08-06 17:37:00 +02:00
Laurent Destailleur
c2b03e49e1 Fix logo not visible in setup page 2020-08-06 17:28:57 +02:00
Laurent Destailleur
aa696d8343 Show warning in kanban view 2020-08-03 15:17:37 +02:00
Laurent Destailleur
fb811a1656 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/database-tables.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/langs/fr_FR/withdrawals.lang
	htdocs/societe/class/societe.class.php
 2020-08-03 14:44:01 +02:00
Laurent Destailleur
b6a3938921 FIX Size of image on the help popup of modules 2020-08-03 14:32:42 +02:00
Laurent Destailleur
55f3a8b4f8 Fix col size too large by migrating to dynamic format on tables 2020-08-03 11:37:55 +02:00
Laurent Destailleur
4afdfdda53 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/card.php
 2020-08-02 22:42:17 +02:00
Laurent Destailleur
c35a103694 Fix phpcs 2020-08-02 22:40:17 +02:00
Laurent Destailleur
d9818405c6 Fix regression for v13 2020-08-02 22:30:23 +02:00
Laurent Destailleur
7297950308
Merge pull request #13759 from OPEN-DSI/stcommcontact 
NEW: Add prospect status managment for the contact with managment of custom icon
 2020-08-02 22:01:00 +02:00
Laurent Destailleur
be34a2c607 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/cashdesk.lang
	htdocs/product/stock/list.php
 2020-08-02 16:06:51 +02:00
kkhelifa-opendsi
fe0f77b967
Merge branch 'develop' into stcommcontact 2020-07-31 16:41:17 +02:00
Laurent Destailleur
f80b54e573 Debug setup of receipt printer module 2020-07-31 13:44:55 +02:00
Laurent Destailleur
d4e21538db FIX Debug setup of receipt printer module 2020-07-31 13:40:36 +02:00
Laurent Destailleur
81cb5501bc Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/database-tables.php
 2020-07-28 10:32:27 +02:00
Laurent Destailleur
45eca85bae Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/admin/tools/dolibarr_export.php
 2020-07-28 10:29:14 +02:00
Laurent Destailleur
d46d34915e FIX Checkbox "drop table" was not checked when using php method for dump 2020-07-28 10:23:09 +02:00
Laurent Destailleur
4e4f0a4575 Use same case for all sql files 2020-07-28 09:44:48 +02:00
Laurent Destailleur
fef180cf86 Fix scrutinizer errors 2020-07-28 02:54:37 +02:00
Laurent Destailleur
91a50038ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/fiche-stat.php
 2020-07-27 19:35:34 +02:00
Laurent Destailleur
9798bb1b30 Fix responsive 2020-07-27 02:29:16 +02:00
Laurent Destailleur
0011e09248 FIX Setup of clicktodial hang on smartphone 2020-07-27 02:29:11 +02:00
Laurent Destailleur
8cd4636de7 Fix responsive 2020-07-27 02:27:27 +02:00
Laurent Destailleur
2e19da3e6a FIX Setup of clicktodial hang on smartphone 2020-07-27 02:25:09 +02:00
Laurent Destailleur
353e99c26a Fix look and feel 2020-07-26 19:43:55 +02:00
Laurent Destailleur
378c45fe5c Fix look and feel 2020-07-26 19:21:47 +02:00
Laurent Destailleur
f17942675d Look and feel 2020-07-26 18:34:50 +02:00
Laurent Destailleur
195ad9e5fb Fix exclude .back files 2020-07-24 10:21:20 +02:00
Laurent Destailleur
3109d9c16a Look and feel v13 2020-07-24 09:58:39 +02:00
Laurent Destailleur
afbeb026ab Trans 2020-07-24 09:56:14 +02:00
Laurent Destailleur
aefb1483e3 NEW Can change size of logo on PDF documents 2020-07-24 03:36:44 +02:00
Laurent Destailleur
895fe63d3b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-24 01:53:51 +02:00
Laurent Destailleur
34a9eee7a6 Minor fix in translation 2020-07-24 01:50:57 +02:00
Laurent Destailleur
a46f4df147 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/clicktodial.php
 2020-07-24 00:15:56 +02:00
Laurent Destailleur
0890b15077 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-07-24 00:06:30 +02:00
Laurent Destailleur
c6c1830e70 FIX ClickToDial tab of users has disappeared 2020-07-24 00:06:18 +02:00
Laurent Destailleur
e5a16c530d FIX Can go on page even when module disabled 2020-07-23 23:57:12 +02:00
Laurent Destailleur
9a506ff9b3 css 2020-07-20 03:29:22 +02:00
Laurent Destailleur
8d26329653 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/lib/price.lib.php
	htdocs/projet/activity/perday.php
 2020-07-19 02:24:26 +02:00
Laurent Destailleur
f26a64fb88 FIX If using a rounding step, localtax1+2 not included in total 2020-07-19 01:47:17 +02:00
Laurent Destailleur
16d486e211 FIX Setup of currency limit and accuracy 2020-07-19 01:03:37 +02:00
Laurent Destailleur
32410b59c4 Code comment 2020-07-19 00:02:02 +02:00
Laurent Destailleur
96729769f7 Standardize Agenda view 2020-07-08 18:06:14 +02:00
Laurent Dinclaux
f2adc3de4f Fix Dolibarr/dolibarr#14181. Limits and accuracy form not saving modified values 2020-07-07 18:03:11 +11:00
Laurent Destailleur
4fd970af28 Fix phpcs 2020-07-07 01:29:31 +02:00
Alexandre SPANGARO
59ee22537d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-07-06 03:24:27 +02:00
Laurent Destailleur
344098fe23 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/actions_fetchobject.inc.php
	htdocs/langs/fr_FR/contracts.lang
	htdocs/langs/fr_FR/loan.lang
	htdocs/langs/fr_FR/stocks.lang
 2020-07-05 13:01:00 +02:00
Laurent Destailleur
1c19c97cf2 FIX missing setup of extrafields for MO 
FIX all extrafields cleared after update of one of them
FIX Update of extrafields date
FIX Update of extrafiels on draft object
FIX Sql type
Fix trans on BOM
 2020-07-04 16:14:53 +02:00
Laurent Destailleur
26c6e2d92e Clean code 2020-07-02 03:34:28 +02:00
Laurent Destailleur
ab88890f3a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-28 21:48:28 +02:00
Laurent Destailleur
d22a0f702e WIP Stock at date 2020-06-28 17:34:30 +02:00
Laurent Destailleur
194b92e70f Fix load of menu when 'perm' or 'enabled' is '0'. 2020-06-27 15:27:09 +02:00
Laurent Destailleur
b6c1cdad7c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/element.php
 2020-06-24 09:59:08 +02:00
Laurent Destailleur
d05c60baf0 Fix css 2020-06-23 14:33:34 +02:00
Laurent Destailleur
501fd2f7a3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/takepos/admin/receipt.php
 2020-06-21 20:48:41 +02:00
Laurent Destailleur
ccc55dcb1e Debug Receipt printer module and reduce duplicate translation key 2020-06-20 15:19:19 +02:00
atm-quentin
e3d94d44ab NEW hide closed contract lines 2020-06-16 10:45:49 +02:00
Laurent Destailleur
6f12488e30 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
 2020-06-07 19:55:48 +02:00
Laurent Destailleur
d1dba53f61 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/admin/modules.php
	htdocs/install/mysql/migration/repair.sql
 2020-06-07 19:40:17 +02:00
Laurent Destailleur
42d44e996f Fix link to setup page 2020-06-07 13:50:58 +02:00
Laurent Destailleur
f2e54b9ad5 Fix link to setup page 2020-06-07 13:49:49 +02:00
Laurent Destailleur
4169aa716c FIX can install module even if (x) was appended during download. 2020-06-07 00:23:20 +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
cbafbe16a2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/supplier/index.php
	htdocs/admin/mails_templates.php
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formticket.class.php
	htdocs/langs/en_US/admin.lang
 2020-06-06 23:00:24 +02:00
Laurent Destailleur
da672c8776 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/admin/translation.php
	htdocs/core/class/html.formfile.class.php
	htdocs/societe/card.php
 2020-06-06 11:57:31 +02:00
Laurent Destailleur
b75700cc0b Fix virtualstock activation when MRP module is on 2020-06-05 10:27:34 +02:00
Laurent Destailleur
630525b59c css 2020-06-05 02:22:16 +02:00
Laurent Destailleur
71cb17b58b css 2020-06-02 20:58:56 +02:00
Laurent Destailleur
3755c7d25b css 2020-06-02 20:58:18 +02:00
gauthier
68bb552dcc FIX : Tickets mail models doesn't work 2020-06-02 17:06:49 +02:00
Laurent Destailleur
8dbc0ff040 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/prelevement.php
	htdocs/admin/system/phpinfo.php
	htdocs/modulebuilder/index.php
 2020-05-31 00:31:14 +02:00
Laurent Destailleur
8146e4fdbd Fix tooltip 2020-05-30 02:17:10 +02:00
Laurent Destailleur
156f09729e Debug module Payment by credit transfer 2020-05-30 02:10:41 +02:00
Laurent Destailleur
0a8b90c4e8 Debug module Payment by credit transfer 2020-05-30 02:10:02 +02:00
Laurent Destailleur
b9051bbe22 Fix admin report 2020-05-29 09:50:38 +02:00
Laurent Destailleur
9224061aed Fix test to upload a file 2020-05-29 03:20:44 +02:00
Laurent Destailleur
5a9d968a75 Fix MAIN_BUGTRACK_ENABLELINK and MAIN_HELP_DISABLELINK setting 2020-05-29 00:02:03 +02:00
Laurent Destailleur
f8b92e507c Clean code 2020-05-28 19:10:06 +02:00
Laurent Destailleur
cf924e11e9
Merge pull request #13825 from bb2a/Add-option-in-stock-for-affect-warehouse- 
NEW Add option to define a default warehouse at user level
 2020-05-28 18:41:54 +02:00
Laurent Destailleur
2f0a5b2634
Merge pull request #13976 from OPEN-DSI/new_ticket_public_notify_new_message 
NEW Ticket message notifications when edited from public interface
 2020-05-28 17:31:26 +02:00
Laurent Destailleur
32aecb553b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2020-05-28 11:44:58 +02:00
Laurent Destailleur
45615081ec FIX Bad use/detetion of text/html when forging template email. 2020-05-28 11:41:48 +02:00
Laurent Destailleur
a2a15ceb5b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/demandes.php
	htdocs/core/class/html.form.class.php
 2020-05-27 23:07:18 +02:00
Laurent Destailleur
e37e45f984 Debug credit transfer 2020-05-27 22:35:55 +02:00
Laurent Destailleur
264c1d6491 List website into combo sorted by position, ref fields 2020-05-27 14:50:10 +02:00
Anthony Berton
9efcc631d7
Merge branch 'develop' into Add-option-in-stock-for-affect-warehouse- 2020-05-27 14:47:20 +02:00
kamel
fe8eddac5e [NEW] Ticket message notifications from public interface 
Can send an email when a new message is added from public interface

 close issue #12181
 2020-05-27 11:39:06 +02:00
Laurent Destailleur
2d30d33303 NEW Can filter on container type, language and tags in the list of pages 
of website module.
 2020-05-26 12:25:41 +02:00
Laurent Destailleur
40816c02ce
Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-25 22:40:59 +02:00
Laurent Destailleur
056206098b CSS 2020-05-25 12:51:17 +02:00
Laurent Destailleur
9e77dc0a26 CSS 2020-05-25 12:50:29 +02:00
Frédéric FRANCE
e5402988d9
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-24 17:58:18 +02:00
Laurent Destailleur
fd61214b97 Merge 2020-05-24 01:06:45 +02:00
Laurent Destailleur
ef17ed2f87 Look and feel v12 2020-05-24 00:01:52 +02:00
Frédéric FRANCE
174ddc5fd4
prepare new rule 2020-05-23 21:07:47 +02:00
Frédéric FRANCE
5aa84c64d0
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:54:33 +02:00
Laurent Destailleur
c2b2e17b58
Merge pull request #13917 from atm-quentin/NEW_showfullarbo_in_getnomurl 
NEW conf to allow show full arbo in warehouse getnomurl
 2020-05-23 15:05:08 +02:00
Frédéric FRANCE
85625a46bb
add new rule 2020-05-21 09:35:30 +02:00
Frédéric FRANCE
ee6fadd0d5
add new rule 2020-05-21 01:41:27 +02:00
Laurent Destailleur
346082b153 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-19 19:59:24 +02:00
atm-quentin
d61cef28d7 NEW conf to allow show full arbo in getnomurl 2020-05-19 11:16:04 +02:00
Laurent Destailleur
b3a17c8da4 Look and feel v12 2020-05-19 04:21:38 +02:00
Laurent Destailleur
88c40633d5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-18 15:57:29 +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
Laurent Destailleur
756c1fd73d Fix tooltip message 2020-05-18 15:26:04 +02:00
Laurent Destailleur
bd564486ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-17 20:03:09 +02:00
Laurent Destailleur
75ac377352 Fix tar command 2020-05-16 04:26:43 +02:00
Laurent Destailleur
24f4a0be1f exclude other log files 2020-05-16 04:24:23 +02:00
Laurent Destailleur
762ca96203 FIX #13841 2020-05-15 18:28:15 +02:00
Laurent Destailleur
a865dc7232
Merge pull request #13762 from indelog/rappaygroupmod 
NEW possibilty to group payments by mode and show their subtotal
 2020-05-14 16:55:37 +02:00
Laurent Destailleur
61f1a57e2f
Merge pull request #13850 from andreubisquerra/master 
TakePOS Auto Order improvements
 2020-05-14 16:18:28 +02:00
Laurent Destailleur
2c1e1f43dc
Merge pull request #13879 from frederic34/patch-4 
Update dolistore.class.php
 2020-05-14 16:00:36 +02:00
Laurent Destailleur
7c01b54d73 Fix version on module list 2020-05-14 15:42:37 +02:00
Laurent Destailleur
ae0e6e4dc8 FIX dol_concatdesc to escape < 
Better help
 2020-05-14 14:30:36 +02:00
Laurent Destailleur
bcaa83eeec FIX dol_concatdesc to escape < 
Better help
 2020-05-14 14:10:04 +02:00
Frédéric FRANCE
366ae2f116
Update dolistore.class.php 2020-05-12 18:44:26 +02:00
Laurent Destailleur
734a8ba312 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-12 15:27:00 +02:00
Laurent Destailleur
0544434482 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-05-12 15:26:11 +02:00
Laurent Destailleur
b6afd86354 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-05-12 15:25:59 +02:00
Laurent Destailleur
4cf99585f8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-12 15:24:15 +02:00
Laurent Destailleur
45caa02929
Merge pull request #13854 from bb2a/user-hide-inactive-in-config-module-users 
NEW Add option to hide all inactive users into combo list of users.
 2020-05-12 03:18:21 +02:00
Laurent Destailleur
7be47097e9
Merge pull request #13867 from frederic34/patch-4 
Only add empty select if no multiselect
 2020-05-12 03:00:10 +02:00
Frédéric FRANCE
4d50ba5e37
Fix dolistore search with csrf active 2020-05-11 20:42:47 +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
Frédéric FRANCE
3a46d5a3dd
Update agenda_other.php 2020-05-11 18:46:54 +02:00
Laurent Destailleur
a83af075aa Fix responsive 2020-05-11 00:35:05 +02:00
Laurent Destailleur
fe241ea321 Fix removed not reliabled info in PHP info 2020-05-09 21:49:12 +02:00
Anthony Berton
3644a718d8 1 2020-05-09 01:02:51 +02:00
Laurent Destailleur
42ee755ea5 Look and feel v12 2020-05-08 02:52:55 +02:00
Maxime Kohlhaas
1a9afe6b20 Fix missing hook params for printFieldListValue 2020-05-08 01:40:25 +02:00
DEMAREST Maxime (Indelog)
889e5db4fb Fix use Form::selectyesno() for added options in admin/compta.php 2020-05-06 13:55:38 +02:00
DEMAREST Maxime (Indelog)
128ec6fd78 Add include various payments and loans in accounting report 
For simplified accouning, behaviour not enable by default and must be
  enabed in simplified accounting module admin page (or by global
  settings ACCOUNTING_REPORTS_INCLUDE_VARPAY and
  ACCOUNTING_REPORTS_INCLUDE_LOAN).
 2020-05-06 12:58:41 +02:00
Laurent Destailleur
a8222c2651 Look and feel v12 2020-05-06 05:10:42 +02:00
Laurent Destailleur
247acdd274 Fix position of custom groups of modules 2020-05-06 03:47:28 +02:00
Anthony Berton
2ccbc59bdb Update stock.php 2020-05-06 00:57:11 +02:00
Anthony Berton
c6d2a1faf3 Add options 
Add options in module stock
 2020-05-06 00:48:00 +02:00
Laurent Destailleur
07178fb6c0 Fix look and feel 2020-05-05 20:52:50 +02:00
Laurent Destailleur
ded0526ca1
Merge pull request #13738 from bb2a/patch-6 
links color for table title line is equal to Text color for table title line
 2020-05-05 18:12:07 +02:00
Laurent Destailleur
5e4ef9266e Fix update template to use for notifications 2020-05-04 20:30:02 +02:00
stickler-ci
ef3f121c88 Fixing style errors. 2020-05-03 08:51:50 +00:00
Anthony Berton
44bafb7225
Update ihm.php 2020-05-03 10:46:48 +02:00
Laurent Destailleur
cc4a9ed10d
Merge pull request #13768 from TobiasSekan/MeasuringDirectoryToolTip 
NEW tooltip for Unit_type and scale in "Dictionary setup - Measuring Units"
 2020-05-01 22:36:04 +02:00
Laurent Destailleur
75dd5f268f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/core/lib/sendings.lib.php
 2020-05-01 22:00:00 +02:00
Laurent Destailleur
160009630f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/tools/dolibarr_export.php
 2020-05-01 21:57:28 +02:00
Laurent Destailleur
aab9a2ff75 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-01 21:03:38 +02:00
Laurent Destailleur
b41b22996f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/utils.class.php
	htdocs/core/lib/files.lib.php
 2020-05-01 21:03:16 +02:00
Laurent Destailleur
385f998254 Fix restore param --quick 2020-05-01 21:01:40 +02:00
Laurent Destailleur
82ace4b4ef FIX Several pb in export of documents 
FIX Must escape shell
FIX Must exclude logs and some dirs for compressed backup
FIX gzip and bzip2 must use option -f
 2020-04-30 11:52:30 +02:00
Tobias Sekan
56dee72b66
add tooltip for unit_type and scale (admin) 2020-04-29 13:30:14 +02:00
stickler-ci
2cf5f12a62 Fixing style errors. 2020-04-28 07:18:45 +00:00
DEMAREST Maxime (Indelog)
740b2c9228 NEW possibilty to group payments by mode and show their subtotal 
This add two params (PAYMENTS_REPORT_GROUP_BY_MOD and
PAYMENTS_FOURN_REPORT_GROUP_BY_MOD) for payments and supplier payments
to group them by mode and get subtotals for each mode. Add the
corresponding configuration options on admin page fore each payments and
supplier payments.
 2020-04-28 09:01:00 +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
Laurent Destailleur
1c70e49695
Merge branch 'develop' into 12.0_a23 2020-04-27 14:14:13 +02:00
Laurent Destailleur
4c605283f5 Fix phpcs 2020-04-27 00:09:21 +02:00
Laurent Destailleur
c0821a8ed6 Fix phpcs 2020-04-27 00:02:31 +02:00
Laurent Destailleur
31157931a9 Fix phpcs 2020-04-26 23:52:23 +02:00
Laurent Destailleur
b20d85b198 Fix phpcs 2020-04-26 23:06:52 +02:00
Laurent Destailleur
6caa872280 Enable more PHPCS rules 2020-04-25 19:27:42 +02:00
Laurent Destailleur
068a890c36 Enable more PHPCS rules 2020-04-25 19:13:20 +02:00
Laurent Destailleur
3090eb578b Look and feel v12 2020-04-25 17:43:12 +02:00
Scrutinizer Auto-Fixer
1bf5745286 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-25 11:52:07 +00:00
Laurent Destailleur
6b114a31ce Look and feel v12 2020-04-25 03:00:41 +02:00
Scrutinizer Auto-Fixer
548f3007cf Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-23 16:55:10 +00:00
Laurent Destailleur
3170060c65 Help show format of price 2020-04-22 18:34:52 +02:00
Laurent Destailleur
52c8e3aff1 Look and feel v12 2020-04-22 18:30:25 +02:00
Laurent Destailleur
496d8f354f Look and feel v12 2020-04-22 17:59:54 +02:00
Laurent Destailleur
536ab95207 FIX: The "test smtp connectivity" failed on page to setup mass emailing 
Conflicts:
	htdocs/admin/mails.php
 2020-04-21 12:50:20 +02:00
Laurent Destailleur
16e46c672c Clean code 2020-04-20 15:06:27 +02:00
Laurent Destailleur
2922d16ca2 Look and feel v12 2020-04-20 14:46:02 +02:00
Laurent Destailleur
4bbe307b41 Look and feel v12 2020-04-19 15:34:53 +02:00
ATM john
c334a931de Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-04-16 20:29:54 +02:00
Laurent Destailleur
5254a94038 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ldap.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/index.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/expedition/list.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/list.php
	htdocs/loan/list.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/list.php
 2020-04-16 15:58:59 +02:00
Laurent Destailleur
855ac5467c FIX setup of suggested payment mode on proposals and orders 2020-04-16 15:40:16 +02:00
Scrutinizer Auto-Fixer
d021559b16 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-15 22:42:57 +00:00
Laurent Destailleur
e26124bf84 Clean code to make option TICKET_NOTIFICATION_EMAIL_TO easier to 
understand
 2020-04-15 12:57:33 +02:00
Laurent Destailleur
c93681ed33 Responsive 2020-04-15 11:51:43 +02:00