Commit Graph

618 Commits

Author SHA1 Message Date
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
3769861a8a NEW VAT can be modified during add of line 2023-01-10 21:46:11 +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
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
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
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
124a969127 Debug v17 2022-10-31 15:35:00 +01:00
Thomas Negre
02942e844e Fix propal page reload : use thirdparty values 2022-10-27 15:26:40 +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
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
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
Frédéric France
3a3dad6fb8 Merge remote-tracking branch 'upstream/develop' into pr/dolibit-ut/22136 2022-09-28 20:23:40 +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
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
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
04f84ffd44 update code toward php8 compliance 2022-09-24 14:36:58 +02:00
Laurent Destailleur
91bdaae898 Look and feel v17 2022-09-15 03:08:33 +02:00
Frédéric France
705b436494 replace other deprecated 2022-09-10 14:03:47 +02:00
Frédéric France
da8617e3ff Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv 2022-09-08 18:59:23 +02:00
Laurent Destailleur
ee05abaa27 Clean code 2022-09-08 15:13:16 +02:00
Laurent Destailleur
aa9036a0f5 Clean code 2022-09-08 15:05:51 +02:00
Laurent Destailleur
6b3095ae9a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-08 14:10:28 +02:00
Frédéric France
07e761d115 Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv 2022-09-07 20:37:29 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Laurent Destailleur
31fcfc5aa5 Fix conflict in workflow due to new feature 2022-09-07 17:15:34 +02:00
Laurent Destailleur
46925dc9c4 CSS 2022-09-07 17:02:08 +02:00