2
0
forked from Wavyzz/dolibarr
Commit Graph

8155 Commits

Author SHA1 Message Date
Laurent Destailleur
fa62595ed1 Merge pull request #25537 from atm-thibaultf/FIX_reload_linked_objects_on_propal_closeas
FIX_reload_linked_objects_on_propal_closeas
2023-08-09 13:32:54 +02:00
atm-sami
76f0a57e91 FIX propal list : warning if product module is not enabled (#25583) 2023-08-08 20:23:53 +02:00
atm-thibaultf
67e938bdfa FIX_reload_linked_objects_on_propal_closeas 2023-08-02 11:52:03 +02:00
Laurent Destailleur
e01f05cf96 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-07-02 21:16:50 +02:00
Laurent Destailleur
8d91ffcd22 Fix separator 2023-07-02 21:15:29 +02:00
Florian HENRY
505ea31c30 FIX: TVA calc option must be the same on update line as on create line 2023-06-29 16:50:21 +02:00
Laurent Destailleur
00431c1ece Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-06-16 01:09:56 +02:00
Laurent Destailleur
f5ee615c9f FIX default value for condition of payment on proposal 2023-06-15 13:19:52 +02:00
Laurent Destailleur
2695dd2e7a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/comm/propal/card.php
2023-06-10 12:11:57 +02:00
Laurent Destailleur
71d064e8db Fix phpcs 2023-06-10 12:06:30 +02:00
Jean
e1939d1c06 FIX #20304 propaldates update 2023-06-10 09:55:47 +02:00
Laurent Destailleur
9743bbde60 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-05-16 19:46:09 +02:00
Laurent Destailleur
584131140d Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-05-16 19:43:47 +02:00
Laurent Destailleur
7e6666038c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-05-16 19:43:23 +02:00
stickler-ci
2c97b66c24 Fixing style errors. 2023-05-16 14:57:46 +00:00
avolani
79cacf58c2 Update propal.class.php
Fix IDs on created proposal lines when cloning so the hook createFrom has all the clone infos
2023-05-16 16:53:58 +02:00
Laurent Destailleur
685995cf01 Debug v17 2023-05-12 13:06:36 +02:00
stickler-ci
d25b226796 Fixing style errors. 2023-05-11 09:50:17 +00:00
Noé Courtier
4ad585facc FIX: Add Missing rights check on holiday calendar 2023-05-11 11:41:58 +02:00
Laurent Destailleur
9674d234ba FIX On company change, we must reuse the company parameters 2023-05-10 22:05:43 +02:00
Laurent Destailleur
a3a9d1ac9f Fix SQL error 2023-05-10 18:56:17 +02:00
Florian HENRY
77e52007e4 fix: add field in sql the is use in line 1463 and remove undeclare varible 2023-05-05 19:09:28 +02:00
Laurent Destailleur
3af71d5ded Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-04-08 14:44:01 +02:00
Adrien Raze
1d59cdc41b FIX : Add the possibility to events oxwner to check their events from the list when the perm "Read the actions (events or tasks) of others" is not active 2023-04-03 10:13:11 +02:00
Laurent Destailleur
ec61e638a9 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-03-31 02:50:22 +02:00
Laurent Destailleur
dfd0bd8107 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-31 02:48:17 +02:00
Laurent Destailleur
5ba48f9746 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-03-27 18:08:51 +02:00
Laurent Destailleur
520280479c Merge pull request #24197 from glu000/16.0-issue-23966-2
FIX  #[23799] - External users are not able to create events - correction
2023-03-27 08:30:41 +02:00
Gilles Lengy
885b767a1f FIX|Fix #24298 No error or 0.00 instead of NULL in database anymore when emptying an extrafield of type price on a propal card 2023-03-22 20:26:19 +01:00
Laurent Destailleur
80678cfcb9 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-03-13 10:30:37 +01:00
Guenter Lukas
914096bd0a update 2023-03-13 08:45:29 +01:00
Laurent Destailleur
f6b8cd0208 Merge branch '16.0' into 16.0-issue-23799 2023-03-12 17:47:02 +01:00
Laurent Destailleur
5ec52548ab For countries using the 2nd or 3rd tax, we force
MAIN_NO_INPUT_PRICE_WITH_TAX to disable input/edit of lines using the
price including tax (because 2nb and 3rd tax not yet taken into
account).
Work In Progress to support all taxes into unit price entry when
MAIN_UNIT_PRICE_WITH_TAX_IS_FOR_ALL_TAXES is set.
2023-03-11 20:37:01 +01:00
Laurent Destailleur
1cf3cc4813 Merge pull request #24144 from frederic34/patch-8
Fix translation
2023-03-10 19:14:17 +01:00
bomuux
a655faf08d Update document.php 2023-03-10 14:53:37 +01:00
bomuux
d92f6bb4fb Update contact.php 2023-03-10 14:53:25 +01:00
bomuux
60000b7d37 Update note.php 2023-03-10 14:53:09 +01:00
bomuux
efcaa0780a Update note.php 2023-03-10 14:52:56 +01:00
bomuux
12e9e3c3eb Update document.php 2023-03-10 14:52:38 +01:00
bomuux
a1d339aa68 Update contact.php 2023-03-10 14:52:25 +01:00
Laurent Destailleur
c7431b83ec Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-03-10 13:14:13 +01:00
Laurent Destailleur
7a59c0ef4b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-10 13:03:11 +01:00
Frédéric FRANCE
2863481629 Update list.php 2023-03-07 10:26:21 +01:00
Laurent Destailleur
89810f97c1 Merge pull request #23941 from ATM-Consulting/FIX_propalestats_SQL_unknown_column_fk_soc
FIX: SQL error "unknown column p.fk_soc"
2023-03-03 13:41:32 +01:00
Laurent Destailleur
925cd10cee Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-03-03 13:30:02 +01:00
Laurent Destailleur
51a890bf1a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-03 12:30:02 +01:00
Laurent Destailleur
59f2644d46 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-03 12:29:35 +01:00
Nicolas
50d4f2d90f FIX select for task in event card 2023-03-03 12:00:24 +01:00
GregM
87fa075ce0 Fix 16.0 propalestats 2023-03-03 10:20:45 +01:00
Laurent Destailleur
7994825086 Update list.php 2023-03-02 13:39:08 +01:00