Commit Graph

87573 Commits

Author SHA1 Message Date
jove@bisquerra.com
76f3724191 NEW: Appearance tab in TakePOS with more visual parameters 2020-07-01 22:34:35 +02:00
Laurent Destailleur
226c907e35 FIX Use of office365 TLS with SMTPs method. 2020-07-01 17:00:52 +02:00
Laurent Destailleur
b8ea58f18c Fix phpcs 2020-06-30 16:15:10 +02:00
Laurent Destailleur
4baa00ba89 Fix phpcs 2020-06-30 13:20:46 +02:00
Laurent Destailleur
88cf904ced Fix edit of tag of website 2020-06-30 02:50:58 +02:00
Laurent Destailleur
146c521efd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/filefunc.inc.php
2020-06-29 18:06:42 +02:00
Laurent Destailleur
bb74804b74 NEW Add option TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT 2020-06-29 17:58:04 +02:00
Laurent Destailleur
2d0d2e0019 FIX CSS 2020-06-29 16:02:08 +02:00
Laurent Destailleur
3d8d55a531 Fix bad path in import section 2020-06-29 14:42:09 +02:00
Laurent Destailleur
b64fc7dc3f FIX Avoid warning when creating a module with already existing files 2020-06-29 14:37:36 +02:00
Laurent Destailleur
5b3670f300 FIX SQL syntax error when editing extrafields
Conflicts:
	htdocs/core/lib/security.lib.php
2020-06-29 14:28:53 +02:00
Laurent Destailleur
7c5b0be6a3 FIX SQL syntax error when editing extrafields 2020-06-29 13:48:00 +02:00
Laurent Destailleur
8bb11039dc Clean code 2020-06-29 09:56:04 +02:00
Laurent Destailleur
7c4e737668 Clean code 2020-06-29 09:53:55 +02:00
Laurent Destailleur
68b4866438 Trans 2020-06-29 09:43:39 +02:00
Laurent Destailleur
eb30f6ed1a Prepare 12.0.1 2020-06-29 09:15:49 +02:00
Laurent Destailleur
600a24346a Some people are missing this table 2020-06-28 22:09:17 +02:00
Laurent Destailleur
a5893db106 FIX upload documents into manual ECM was reported a permission error 2020-06-28 22:05:55 +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
70efaa4235 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-28 21:48:02 +02:00
Laurent Destailleur
95729e2375 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
2020-06-28 21:47:43 +02:00
Laurent Destailleur
8dee17446d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/company.lib.php
2020-06-28 21:46:08 +02:00
Laurent Destailleur
aab1358b0d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-28 21:43:46 +02:00
Laurent Destailleur
b47ae06973 Clean code 2020-06-28 21:43:34 +02:00
Laurent Destailleur
b35550a3dd
Merge pull request #14122 from TobiasSekan/CommonListForLeaveLog
New: Common list behavior for leave log
2020-06-28 21:30:49 +02:00
Laurent Destailleur
aa91bada07
Merge pull request #14114 from atm-maxime/new_project_task_progress_filter
NEW filter on progress column in task list
2020-06-28 21:22:33 +02:00
Laurent Destailleur
1194c61857
Merge pull request #14125 from ATM-Consulting/10.0_FIX_pgsql_on_company.lib.php_2
FIX 10.0 - fatal with postgreSQL
2020-06-28 21:20:20 +02:00
Laurent Destailleur
a7871b4453
Merge pull request #14105 from hregis/11.0_bug
NEW Support for Samba4 AD
2020-06-28 21:19:35 +02:00
Laurent Destailleur
b725aca8aa
Merge branch 'develop' into 11.0_bug 2020-06-28 21:19:11 +02:00
Laurent Destailleur
cf899364f3
Merge pull request #14116 from aspangaro/12p1
FIX: SQL Problem in customer invoice list
2020-06-28 21:13:17 +02:00
Laurent Destailleur
df7996a8eb
Merge pull request #14126 from OPEN-DSI/fix-import-upload-file
FIX upload file in import module
2020-06-28 21:13:00 +02:00
Laurent Destailleur
d98c54c445
Merge pull request #14132 from aspangaro/12p2
FIX: SQL Problem in supplier invoice list
2020-06-28 21:11:56 +02:00
Laurent Destailleur
08b3cc5033
Merge pull request #14133 from aspangaro/12p3
FIX: SQL Problem in social contribution list
2020-06-28 21:11:35 +02:00
Laurent Destailleur
a11f7d1070
Update list.php 2020-06-28 21:11:25 +02:00
Laurent Destailleur
3fa98a4f01
Merge pull request #14135 from OPEN-DSI/new-export-societe-contact-region
NEW add region in export companies and contacts
2020-06-28 21:09:56 +02:00
Laurent Destailleur
8f409f4c58
Merge pull request #14137 from TobiasSekan/CommonListMonthlyLeaveView
NEW: Common behavior for monthly leave list view
2020-06-28 21:09:27 +02:00
Laurent Destailleur
b3fdb9f168
Merge pull request #14136 from atm-gauthier/10.0_getpost_extrafields_date
FIX : $_POST must be GETPOST
2020-06-28 21:08:46 +02:00
Laurent Destailleur
0aa08edb38
Merge pull request #14139 from OPEN-DSI/new-societe-card-set-sales-representative
NEW can edit and set sales representatives directly on thirdparty card
2020-06-28 21:08:24 +02:00
Laurent Destailleur
4dfd016504
Merge pull request #14140 from fappels/12_missing_translate
Fix missing translate key
2020-06-28 21:07:49 +02:00
Laurent Destailleur
2de1433818 FIX #14142 2020-06-28 21:05:36 +02:00
Laurent Destailleur
518c126abf NEW Add a page to list Stock at a given date. 2020-06-28 20:31:07 +02:00
Laurent Destailleur
a3ae7a76b8 WIP Stock at date 2020-06-28 19:35:24 +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
41c6155922 Hiden useless entry 2020-06-27 14:44:38 +02:00
Laurent Destailleur
d5324ff3db Fix template 2020-06-27 14:41:11 +02:00
Laurent Destailleur
781f571a15 Fix template 2020-06-27 14:38:40 +02:00
Laurent Destailleur
5a4ed34c0d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-27 03:28:44 +02:00
Laurent Destailleur
4d01030fd9 Fix phpcs 2020-06-27 02:00:42 +02:00
Laurent Destailleur
90bcc64547 Fix phpcs 2020-06-27 01:59:08 +02:00