Commit Graph

2841 Commits

Author SHA1 Message Date
Laurent Destailleur
80df9434db Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-02-21 02:37:22 +01:00
Laurent Destailleur
4af4f89fa6 Fix syntax error 2023-02-20 18:27:54 +01:00
Laurent Destailleur
eaa0e5eb3e CSS 2023-02-19 02:39:39 +01:00
Laurent Destailleur
2168578f2e Fix inline css 2023-02-18 14:00:25 +01:00
Laurent Destailleur
53c8329b50 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-17 17:11:23 +01:00
Laurent Destailleur
1ac4e6f458 Fix phpunit 2023-02-17 16:52:00 +01:00
Laurent Destailleur
cfd9e7ed62 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-17 16:17:06 +01:00
atm-florian
c3e42f1961 Propale stats: replace old-style joins with inner joins 2023-02-17 16:12:06 +01:00
atm-florian
e212019ddf FIX: SQL error "unknown column p.fk_soc" because ANSI-92 joins take precedence over ANSI-89 joins
cf. https://stackoverflow.com/questions/4065985/mysql-unknown-column-in-on-clause
2023-02-17 00:10:00 +01:00
Juanjo Menent
670ae506e3 Fix: Bad assignation for external users access 2023-02-15 10:47:25 +01:00
Frédéric FRANCE
ae48571135 use user->hasRight 2023-02-14 22:56:12 +01:00
marcusdeangabriel
77087ed700
Merge branch 'Dolibarr:develop' into PROPALE_MODIFY_MARGIN_RATES 2023-02-13 09:36:08 +01:00
Frédéric FRANCE
8a5e983d7e clean code 2023-02-06 22:21:54 +01:00
mgabriel
b8cd507287 As suggested by Dolibarr, removed PROPALE_MODIFY_MARGIN_RATES as not needed. 2023-02-06 10:06:23 +01:00
marcusdeangabriel
f974295a45
Merge branch 'Dolibarr:develop' into PROPALE_MODIFY_MARGIN_RATES 2023-02-06 09:10:43 +01:00
Frédéric FRANCE
b238830c82 keep original label 2023-02-05 23:19:56 +01:00
Frédéric FRANCE
473690f49b fix for double tooltip 2023-02-04 22:09:18 +01:00
Frédéric FRANCE
04610763aa Merge remote-tracking branch 'upstream/develop' into ajaxtooltip 2023-02-04 18:31:40 +01:00
Laurent Destailleur
1f195a3be5 Fix #yogosha14963 2023-02-04 14:04:25 +01:00
Frédéric FRANCE
41dd574b16 clean js 2023-02-02 22:59:54 +01:00
mgabriel
99e5c89484 In CodingPhpTest::testPHP, found a GETPOST that uses 'none' as a parameter which is not allowe. 2023-02-02 10:20:02 +01:00
stickler-ci
35ce7352e8 Fixing style errors. 2023-02-02 08:09:57 +00:00
mgabriel
895957e89d Modify margin rates in offers like VAT rates. 2023-02-02 08:41:08 +01:00
Frédéric FRANCE
8d71b81013 ajax tooltip on propal 2023-02-01 20:58:40 +01:00
stickler-ci
482c842895 Fixing style errors. 2023-01-23 20:15:00 +00:00
UT from dolibit
0c30837f15
Update list.php 2023-01-23 21:09:34 +01:00
Laurent Destailleur
0f475783de Enhance method getKanbanView 2023-01-18 22:27:52 +01:00
Laurent Destailleur
80d46a22f1 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-18 21:36:57 +01:00
Laurent Destailleur
cd5009d8a4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-01-18 21:21:49 +01:00
Laurent Destailleur
283ad1abcf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-18 20:54:16 +01:00
Laurent Destailleur
2a299068ad Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-18 20:45:44 +01:00
stickler-ci
4ee0ede6d8 Fixing style errors. 2023-01-18 08:53:28 +00:00
Noé Courtier
d344e108c9 FIX: Errors Handling for CreateFrom Hooks 2023-01-18 09:44:23 +01:00
Laurent Destailleur
48161b8400 Debug v17. Bad param for selection of project 2023-01-17 13:50:23 +01:00
Laurent Destailleur
d1fb24bff7
Merge pull request #23438 from leninrivas/patch-10
NEW constant PROPALE_ADDON_NOTE_PUBLIC_DEFAULT
2023-01-13 23:22:04 +01:00
Laurent Destailleur
5a4611732d
Merge pull request #23482 from lamrani002/kanbanpropal
NEW kanban mode for list of proposal commande
2023-01-11 20:26:05 +01:00
Laurent Destailleur
577ef4a8a1
Merge pull request #23501 from aspangaro/18a4
Use isModEnabled()
2023-01-11 10:29:37 +01:00
Alexandre SPANGARO
8f5edcab02 Use isModEnabled() 2023-01-11 06:11:41 +01:00
Laurent Destailleur
e50a56290c Fix warning 2023-01-10 23:49:31 +01:00
Laurent Destailleur
3769861a8a NEW VAT can be modified during add of line 2023-01-10 21:46:11 +01:00
Laurent Destailleur
ac5a07fee8 Debug v17 2023-01-10 17:27:19 +01:00
Lamrani Abdel
86ad9118f3 kanban mode for list of proposal commande 2023-01-10 11:14:14 +01:00
Lenin Rivas
5be0bf1736
FIX line brak public note default 2023-01-06 13:17:19 -05:00
Lenin Rivas
cc6f42f926
Add new constant PROPALE_ADDON_NOTE_PUBLIC_DEFAULT
Add constant default public note
2023-01-06 12:34:45 -05:00
Laurent Destailleur
ba08457171 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-06 16:55:41 +01:00
Laurent Destailleur
98b37d6648 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-01-06 16:53:03 +01:00
Laurent Destailleur
2755e3dad7 Fix typo 2023-01-06 15:53:25 +01:00
mgabriel
a7de5e4c72 Added &$arrayfields to $parameters so that hooks can manipulate list columns. 2023-01-05 11:59:43 +01:00
Laurent Destailleur
9aa6e59f9b Look and feel v18 2023-01-05 04:04:16 +01:00
Laurent Destailleur
43a0ccce2b Clean code 2023-01-04 11:37:24 +01:00
Laurent Destailleur
85d91c82e8 Fix warning 2023-01-03 17:38:05 +01:00
Laurent Destailleur
67144020c6 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-02 20:24:13 +01:00
stickler-ci
59ed7b9f96 Fixing style errors. 2023-01-02 11:52:34 +00:00
Amael
658753d242
Merge branch '17.0' into Amael-PE-FIX-23334 2023-01-02 12:47:45 +01:00
Laurent Destailleur
e523c04ce7 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-31 14:25:11 +01:00
Laurent Destailleur
751f79b672 Debug v17 2022-12-31 14:21:16 +01:00
Laurent Destailleur
3ca8e8c493 Fix warning 2022-12-31 13:47:09 +01:00
Laurent Destailleur
cdb9aa5ba0 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-30 13:29:06 +01:00
Laurent Destailleur
54936c916c Fix MO hang when no thirdparties are set 2022-12-30 13:27:12 +01:00
Laurent Destailleur
9319f56599 Fix css 2022-12-30 03:10:37 +01:00
Laurent Destailleur
6824f82cc8 Fix warnings 2022-12-28 13:58:23 +01:00
Laurent Destailleur
77d6b9510b Clean code 2022-12-28 13:04:11 +01:00
Laurent Destailleur
dbc5f5742f Clean code 2022-12-28 12:05:30 +01:00
stickler-ci
50e2545bea Fixing style errors. 2022-12-25 23:41:03 +00:00
Amael
58d3cdb13c
FIX #23334 Implement a price equivalent in propal
Implement a price equivalent when dealing with minimum prices and foreign currencies. 
Added in comm/propal/card.php as it was done in command/card.php for add and update.
2022-12-26 00:31:38 +01:00
Josep Lluís
ca95d26f17
NEW option filter in proposals
NEW option filter for NoSalesRepresentativeAffected in proposals list
2022-12-21 14:21:16 +01:00
Laurent Destailleur
50c76110bb Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2022-12-14 11:19:12 +01:00
Laurent Destailleur
62b0447c7b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-14 11:02:23 +01:00
Laurent Destailleur
64de591770 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-14 10:20:47 +01:00
stickler-ci
0db8a0b831 Fixing style errors. 2022-12-08 09:34:48 +00:00
atm-lena
fbf7f8b8bc FIX Propal List : alias name / Company display 2022-12-08 08:47:33 +01:00
atm-lena
9fef8b7dc2 FIX Search List Alias Name 2022-12-07 10:11:57 +01:00
Laurent Destailleur
291cb1908d
Merge pull request #23081 from FHenry/dev_PropalResetIPSignOnBAckToDraft
fix: propal when back to draft delete ip and name of web sign
2022-12-06 21:06:22 +01:00
Laurent Destailleur
a0e53a402d Fix reponsive 2022-12-02 19:23:12 +01:00
Florian HENRY
ab8a61aeaa fix: propal when back to draft delete ip and name of web sign 2022-12-02 11:59:47 +01:00
Florian HENRY
8ddc4c8db6 FIX: propal and order stats broken on Tag+User(retricted customer list) 2022-12-01 14:28:00 +01:00
Laurent Destailleur
bb46cdb0af Fix regression sql error 2022-11-27 21:10:37 +01:00
Maxime Kohlhaas
8c597543e1 Fix : use count() in lists - part 1 2022-11-26 00:54:49 +01:00
Laurent Destailleur
f79e52bc85 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-22 13:42:17 +01:00
Laurent Destailleur
322124690c Fix sql syntax error 2022-11-21 14:47:31 +01:00
Laurent Destailleur
e775707c23 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-18 01:08:56 +01:00
Laurent Destailleur
b8e5b10cac Default field 2022-11-17 02:29:30 +01:00
Laurent Destailleur
c11d69dd21 Fix typo in tooltip 2022-11-17 02:26:02 +01:00
Laurent Destailleur
6684b3c96b Fix balance of columns 2022-11-17 02:13:01 +01:00
Laurent Destailleur
2dc6fe9785
Merge pull request #22865 from FliyFly/bugErrorCode
Fix(Scrutinizer) add public
2022-11-16 11:22:19 +01:00
FLIO
73db58a700 Fix(Scrutinizer) add public 2022-11-15 17:10:04 +01:00
Laurent Destailleur
7238575a6d Clean code and add context information for onlineSign 2022-11-14 22:40:42 +01:00
Laurent Destailleur
886fa7a812 Fix phpcs 2022-11-11 14:57:02 +01:00
Laurent Destailleur
08985fbe62
Merge pull request #22792 from noec764/14_FIX_Add_Missing_LibStatut_Hooks
FIX: Add Missing "LibStatut" hooks in propal, commande, facture
2022-11-09 15:39:43 +01:00
stickler-ci
89876d8d52 Fixing style errors. 2022-11-08 15:24:05 +00:00
Noé Courtier
73b857c1b3 FIX: Add Missing "LibStatut" hook in propal, commande, facture 2022-11-08 16:21:32 +01:00
Laurent Destailleur
1984feeae1
Merge pull request #22681 from bb2a/FIX---/td-in-if-to-MAIN_CHECKBOX_LEFT_COLUMN
FIX - </td> in if to MAIN_CHECKBOX_LEFT_COLUMN
2022-11-02 00:38:28 +01:00
Laurent Destailleur
88273690c5 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/card.php
2022-11-02 00:24:08 +01:00
Laurent Destailleur
bc2e226ef8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/societe/class/societe.class.php
2022-11-02 00:19:23 +01:00
Laurent Destailleur
c28e6a46e2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/install/step5.php
2022-11-02 00:15:21 +01:00
Laurent Destailleur
8e9be8f40f
Update card.php 2022-11-01 23:33:08 +01:00
Laurent Destailleur
4f38cfc435
Merge pull request #22714 from frederic34/strftimedeprecated
strftime is deprecated in php 8.1
2022-11-01 20:04:05 +01:00
Laurent Destailleur
c07ce8ae95
Merge pull request #22716 from hregis/new_add_constant_to_bypass_valideted_status
FIX use existing PROPAL_SKIP_ACCEPT_REFUSE for massaction
2022-11-01 20:00:42 +01:00
Laurent Destailleur
124a969127 Debug v17 2022-10-31 15:35:00 +01:00
Regis Houssin
b7293632cf FIX use existing PROPAL_SKIP_ACCEPT_REFUSE instead 2022-10-31 14:58:38 +01:00
Laurent Destailleur
1e76422a50 NEW Show picto and color into combo for selection of tags 2022-10-31 13:00:41 +01:00
Regis Houssin
88152eccda NEW add constant PROPAL_BYPASS_VALIDATED_STATUS 2022-10-31 12:30:01 +01:00
Frédéric FRANCE
754881a6ef strftime is deprecated in php 8.1 2022-10-31 10:42:40 +01:00
Thomas Negre
02942e844e Fix propal page reload : use thirdparty values 2022-10-27 15:26:40 +02:00
Anthony Berton
04cba0307d Propal list and third 2022-10-26 19:15:55 +02:00
Laurent Destailleur
b15f0093cc
Merge branch 'develop' into fix_missing_hook_parameters 2022-10-25 17:19:38 +02:00
Laurent Destailleur
81813225aa Look and feel v17 2022-10-24 01:25:50 +02:00
Laurent Destailleur
003df66f6a Clean code 2022-10-22 02:32:43 +02:00
Laurent Destailleur
f87ec74b9f Replace LEFT JOIN with EXISTS 2022-10-22 00:22:54 +02:00
Laurent Destailleur
d9c2528b62 Clean code 2022-10-21 23:49:45 +02:00
Laurent Destailleur
330a1199e4 Look and feel v17 2022-10-21 15:08:54 +02:00
Regis Houssin
8856c5c3d6 FIX merge error 2022-10-18 10:52:14 +02:00
Regis Houssin
0e63591604 FIX avoid warning (php8) missing hook parameters 2022-10-18 10:45:48 +02:00
Laurent Destailleur
e3ad177abc
Merge pull request #22603 from hregis/fix_use_propal_instead_propale
FIX use propal instead propale
2022-10-17 23:48:13 +02:00
lvessiller
2d181f01be NEW rename MAIN_LIST_ALLOW_NOTES by MAIN_LIST_HIDE_NOTES 2022-10-17 11:37:09 +02:00
Laurent Destailleur
2484fefa4d Fix deprecated 2022-10-16 21:01:05 +02:00
Regis Houssin
514cc76fe2 FIX use propal instead propale 2022-10-16 16:44:34 +02:00
Richard Franks
d3b0c190d5 Sorted Proposal not saving ref_ext 2022-10-14 09:44:49 +01:00
Laurent Destailleur
ae4f8b23d5 Standardize code for action buttons Delete 2022-10-10 11:39:50 +02:00
Laurent Destailleur
63109d2844
Merge pull request #22182 from frederic34/pr/dolibit-ut/22136
sample deprecated function
2022-10-06 12:20:15 +02:00
Laurent Destailleur
395312737b
Merge pull request #22406 from aspangaro/17p6
Use isModEnabled
2022-10-04 18:01:59 +02:00
Laurent Destailleur
51c299ffbb NEW Add hidden option MAIN_EMAIL_SUPPORT_ACK 2022-10-01 13:26:11 +02:00
Laurent Destailleur
98ed321514
Merge branch 'develop' into 17p6 2022-09-28 20:55:43 +02:00
Frédéric France
3a3dad6fb8 Merge remote-tracking branch 'upstream/develop' into pr/dolibit-ut/22136 2022-09-28 20:23:40 +02:00
lmarcouiller
91d0eefd92 Fix : php 8.1 warnings 2022-09-27 11:22:20 +02:00
Alexandre SPANGARO
a415fcfe4c Use isModEnabled 2022-09-25 23:06:42 +02:00
Alexandre SPANGARO
8c14377ecc Use isModEnabled 2022-09-25 22:52:16 +02:00
Alexandre SPANGARO
ef94f2af70 Use isModEnabled 2022-09-25 22:45:10 +02:00
Laurent Destailleur
acaf066d1d
Merge pull request #22011 from SylvainLegrand/PR_Option_for_input_of_customer_or_supplier_references
Add an option to manage input size for customer / supplier references
2022-09-25 18:48:55 +02:00
Laurent Destailleur
2a98ff313e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-25 17:12:25 +02:00
Laurent Destailleur
f5e5de1eba Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-09-25 17:12:03 +02:00
Laurent Destailleur
86091c3fde Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-25 17:01:44 +02:00
Alexandre SPANGARO
d06fef47f8 Use isModEnabled 2022-09-25 15:28:36 +02:00
Laurent Destailleur
118b975f91 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-09-25 11:56:05 +02:00
Alexandre SPANGARO
fc9e6c541e Use isModEnabled 2022-09-25 06:30:33 +02:00
Alexandre SPANGARO
bcd5043eb2 Use isModEnabled 2022-09-25 06:13:14 +02:00
Alexandre SPANGARO
49f1afccca Use isModEnabled 2022-09-25 06:09:29 +02:00
Alexandre SPANGARO
58ac8d196c Use isModEnabled 2022-09-25 06:01:40 +02:00
priojk
33291b7cc7 FIX #21799 inactive companies cannot be selected 2022-09-24 17:19:52 +02:00
Philippe GRAND
fb9db96ecc update code toward php8 compliance 2022-09-24 14:37:57 +02:00
Philippe GRAND
04f84ffd44 update code toward php8 compliance 2022-09-24 14:36:58 +02:00
Laurent Destailleur
a87aa30e75 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-23 18:53:18 +02:00
Anthony Berton
fdef117f63 FIX - php V8 propal index last draft 2022-09-21 18:11:00 +02:00
Laurent Destailleur
6fb9a4713c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-21 01:30:40 +02:00
Laurent Destailleur
91bdaae898 Look and feel v17 2022-09-15 03:08:33 +02:00
Regis Houssin
a3a973466f FIX broken feature, wrong fk_parent_line after cloning object 2022-09-13 15:16:17 +02:00
Laurent Destailleur
a11a33a804 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-09-11 22:21:18 +02:00
Frédéric France
705b436494 replace other deprecated 2022-09-10 14:03:47 +02:00
Alexandre SPANGARO
6b4bd6c09e FIX #21859 - Don't show html balise on list for private/public note 2022-09-09 15:56:17 +02:00
Frédéric France
1c2a89f52d Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv 2022-09-09 08:09:12 +02:00