Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
112,817 Commits 36 Branches 189 Tags
30ec5dfd75849bed3a2bf044a266a94bbdf91933
Commit Graph

112817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adnan RIHAN
30ec5dfd75 FIX TakePOS receipt preview in admin #25648 
Receipt preview in admin shows header and footer repeating themselves because in preview, $constFreeText equals TAKEPOS_HEADER (as there is no $_SESSION['takeposterminal'] defined).

Back compatibility for #25648
 2023-08-19 17:27:06 +02:00
Laurent Destailleur
5c36c23cdb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-08-10 10:54:08 +02:00
Laurent Destailleur
17de0d845f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-08-10 10:52:49 +02:00
Laurent Destailleur
f89c026f3f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-08-10 10:51:43 +02:00
Laurent Destailleur
b0c2ccafcd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2023-08-10 10:47:05 +02:00
Laurent Destailleur
d3fc152001 Merge 2023-08-10 10:46:44 +02:00
Laurent Destailleur
e8fd551043 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2023-08-10 10:43:44 +02:00
Laurent Destailleur
34b3113bb7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2023-08-10 10:41:20 +02:00
am97
954c54ad3f Fix SQL syntax error (#25562) 
Single quotes are needed to indicate that 'project' and 'external' are strings, otherwise the requests fail
 2023-08-09 12:50:14 +02:00
Laurent Destailleur
90854dc2bf FIX Use the wrong logo size on PDF 2023-07-30 19:53:56 +02:00
Laurent Destailleur
b44ddaa696 FIX Use the wrong logo size on PDF 2023-07-30 18:04:03 +02:00
JC Prieto
f4cec5283a FIX: Update mouvementstock.class.php (#25396) 
* FIX: Update mouvementstock.class.php

If first character change to upper case, some external modules don't show its origin in mouvements.

* Update mouvementstock.class.php

More elegant.
We don't need to change to upper case (line 978) and then to lower case (line 980). It is only necessary when creating a new class (line 983)
The module name and url are in lower case.
 2023-07-24 19:41:00 +02:00
Maxime Kohlhaas
d343358006 Fix missing hyphen (#25446) 2023-07-24 12:38:07 +02:00
Maxime Kohlhaas
286895bcda Fix : set_as_client can't use prospect/customer value if disabled (#25380) 2023-07-23 22:49:41 +02:00
Laurent Destailleur
18d0c72f0b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-07-22 14:15:28 +02:00
Laurent Destailleur
ce6b2d06db FIX #25223 2023-07-22 14:14:04 +02:00
Laurent Destailleur
908706e3d9 Fix phpcs 2023-07-20 12:09:13 +02:00
Laurent Destailleur
f169e10e8b Merge branch '15.0' of github.com:Dolibarr/dolibarr into 16.0 2023-07-20 11:31:22 +02:00
Laurent Destailleur
adf199e67c Fix php syntax error 2023-07-20 11:30:39 +02:00
Laurent Destailleur
692439d320 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-07-20 01:08:13 +02:00
Laurent Destailleur
7cfba58722 Fix conflict 2023-07-20 01:07:37 +02:00
Laurent Destailleur
b55be51b4f Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/lib/agenda.lib.php
 2023-07-19 01:50:18 +02:00
Laurent Destailleur
8fb316c5dc Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/product/card.php
 2023-07-19 01:48:02 +02:00
Laurent Destailleur
63f112aea0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/compta/bank/bankentries_list.php
	htdocs/product/card.php
	htdocs/projet/activity/perday.php
 2023-07-19 01:46:22 +02:00
atm-gauthier
88a8bcdb22 FIX : We should always be able to filter on action type no matter if we can't read actions of others (#24462) 2023-07-16 12:14:18 +02:00
atm-steve
b307ecea40 FIX display project tasks list columns (#24557) 
* fix: display columns

* fix fix

* fix: IDE
 2023-07-16 12:02:14 +02:00
Alexandre SPANGARO
5ef0ebb543 FIX #24508 Label not reported when creating a supplier invoice template (#25340) 2023-07-12 17:07:22 +02:00
Regis Houssin
76d6a30d48 FIX to avoid wrong path of file (#25320) 2023-07-12 16:30:34 +02:00
lvessiller-opendsi
9044952f5c FIX dol_print_error parameters on ticket fetch method (#25318) 2023-07-12 14:32:45 +02:00
Laurent Destailleur
53ebd4b255 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-07-10 03:20:41 +02:00
Laurent Destailleur
b080c2699b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-07-10 03:18:49 +02:00
Laurent Destailleur
2182cb6f16 Fix css 2023-07-10 02:27:01 +02:00
Laurent Destailleur
9288084ae0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-07-06 22:08:04 +02:00
Laurent Destailleur
fbe7b8b71c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-07-06 22:06:37 +02:00
Laurent Destailleur
ebb1504fde Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-07-06 22:05:15 +02:00
Laurent Destailleur
a5fe2ab0e5 Merge pull request #25291 from atm-greg/Fix_13.0_bankentries_label_for_suppliers_payments 
fix bankentries label for supplier payments
 2023-07-06 22:03:40 +02:00
atm-greg
dccaf116a2 fix bankentries label for supplier payments 2023-07-06 12:03:16 +02:00
Laurent Destailleur
684194ce0b Fix migration 2023-07-05 22:11:07 +02:00
Laurent Destailleur
4e1d9f13ea Fix migration 2023-07-05 22:10:35 +02:00
Laurent Destailleur
924ba40c23 Fix migration 2023-07-05 22:09:34 +02:00
Laurent Destailleur
c61e4b0e25 Better migration code 2023-07-05 22:07:49 +02:00
Laurent Destailleur
d432620708 Fix pgsql regression 2023-07-05 22:03:38 +02:00
Laurent Destailleur
ee4ccdc05a Merge pull request #25282 from rycks/16.0_add_emailcollector_tms 
fix #25275: tms default timestamp
 2023-07-05 21:42:44 +02:00
Laurent Destailleur
316838afb3 Merge pull request #25278 from rycks/13.0_add_emailcollector_tms 
fix #25275: tms default timestamp
 2023-07-05 18:56:31 +02:00
Laurent Destailleur
72c64d4a1f Merge pull request #25281 from rycks/15.0_add_emailcollector_tms 
fix #25275: tms default timestamp
 2023-07-05 18:56:21 +02:00
Laurent Destailleur
6cd4b2c7da Merge pull request #25280 from rycks/14.0_add_emailcollector_tms 
fix #25275: tms default timestamp
 2023-07-05 18:56:15 +02:00
Eric Seigne
72de19dd29 fix #25275: tms default timestamp 2023-07-05 17:57:13 +02:00
Eric Seigne
770ecceea0 fix #25275: tms default timestamp 2023-07-05 17:54:15 +02:00
Eric Seigne
e6e915a5f1 fix #25275: tms default timestamp 2023-07-05 17:35:25 +02:00
Eric Seigne
3477930db2 fix #25275: tms default timestamp 2023-07-05 17:34:04 +02:00