Commit Graph

87618 Commits

Author SHA1 Message Date
Laurent Destailleur
fce81a4bf1 Rename var and fix position of checkbox 2020-07-03 01:30:53 +02:00
Laurent Destailleur
c80f1c470f
Merge pull request #13788 from simicar29/dev-replenish
NEW: Add option to include products without alert in replenish
2020-07-03 01:06:20 +02:00
Laurent Destailleur
6b3eeebe87
Merge branch 'develop' into dev-replenish 2020-07-03 01:03:35 +02:00
Laurent Destailleur
94188af270
Merge pull request #14056 from atm-quentin/NEW_filter_on_event_tab
NEW multiselect type and date to date filter
2020-07-03 00:57:44 +02:00
Laurent Destailleur
1f466f3846
Update company.lib.php 2020-07-03 00:57:15 +02:00
Laurent Destailleur
f85d240dcf
Merge pull request #14145 from oscim/patch-41
Update project.class.php
2020-07-03 00:39:45 +02:00
Laurent Destailleur
751174a983
Merge pull request #14156 from Tim-Otte/fix-proposals-urgent
FIX: Hotfix for "Call to a member function getNomUrl() on null in comm/propal/card.php"
2020-07-03 00:32:03 +02:00
Laurent Destailleur
cae55da399
Merge pull request #14160 from OPEN-DSI/new-societe-get-sales-representatives-order-by
NEW add order by lastname and firstname by default
2020-07-03 00:29:38 +02:00
Laurent Destailleur
a08e4bdf3f
Merge pull request #14163 from atm-quentin/FIX_line_reorder_rank_develop
NEW get all child recursively
2020-07-03 00:28:32 +02:00
Laurent Destailleur
a44f5376da
Update commonobject.class.php 2020-07-03 00:27:30 +02:00
Laurent Destailleur
bc1006e875
Merge pull request #14159 from Je2fb/develop
FIX #14143 DynamicPrice
2020-07-03 00:25:38 +02:00
Laurent Destailleur
8109145fe3
Merge pull request #14162 from laurantines/develop
Update list.php in Adherents
2020-07-03 00:24:54 +02:00
Laurent Destailleur
70b58b5755
Merge pull request #14169 from ksar-ksar/develop
FIX : Correct ModuleBuilder left menu
2020-07-03 00:20:59 +02:00
Laurent Destailleur
91266babea
Merge pull request #14170 from andreubisquerra/master
NEW: Appearance tab in TakePOS with more visual parameters
2020-07-03 00:19:35 +02:00
Laurent Destailleur
b1123ab9d1
Merge pull request #14173 from defrance/patch-153
better look & feel icon on dropdown
2020-07-03 00:13:29 +02:00
BENKE Charlene
b3396a6454
better look & feel icon on dropdown 2020-07-02 14:40:56 +02:00
Laurent Destailleur
cfcb40dd2a Fix scrutinizer errors 2020-07-02 03:48:32 +02:00
Laurent Destailleur
6b16f64928 Fix properties used that does not exists 2020-07-02 03:39:47 +02:00
Laurent Destailleur
ca769a3c62 Fix scrutinizer errors 2020-07-02 03:37:01 +02:00
Laurent Destailleur
26c6e2d92e Clean code 2020-07-02 03:34:28 +02:00
andreubisquerra
452cca503a
Fixes 2020-07-02 00:11:17 +02:00
andreubisquerra
9e4d7627f3
Fix travis 2020-07-01 22:55:00 +02:00
andreubisquerra
d2a78b8aa4
Update appearance.php 2020-07-01 22:44:18 +02:00
jove@bisquerra.com
76f3724191 NEW: Appearance tab in TakePOS with more visual parameters 2020-07-01 22:34:35 +02:00
ksar
04171e583b
Merge pull request #1 from ksar-ksar/ksar-ksar-patch-1
FIX : Correct ModuleBuilder left menu
2020-07-01 22:20:57 +02:00
ksar
22448b19f4
FIX : Correct ModuleBuilder left menu 2020-07-01 22:19:10 +02:00
Laurent Destailleur
226c907e35 FIX Use of office365 TLS with SMTPs method. 2020-07-01 17:00:52 +02:00
quentin
d2a364eea8 NEW get all child recursively 2020-07-01 14:10:43 +02:00
quentin
39651953b3 FIX refacto 2020-07-01 14:04:41 +02:00
quentin
267aa7605b Merge remote-tracking branch 'dolibarr/develop' into NEW_filter_on_event_tab 2020-07-01 14:00:49 +02:00
laurantines
a34c6ec7b0
Update list.php in Adherents
Add Address in search
2020-07-01 13:12:52 +02:00
lvessiller
caa3661eeb NEW add order by lastname and firstname by default in get sales representatives 2020-07-01 09:16:44 +02:00
Laurent Destailleur
b8ea58f18c Fix phpcs 2020-06-30 16:15:10 +02:00
Tim Otte
94a1d71fba Hotfix for an error in v12 2020-06-30 15:20:30 +02:00
Tim Otte
b36463a38a
Merge pull request #4 from Dolibarr/develop
Merging changes since last PR
2020-06-30 15:13:44 +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
oscim
eb22947c07
Update project.class.php
Fix order of delete extra prev table of project
2020-06-29 14:01:48 +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