Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
118,804 Commits 36 Branches 189 Tags
86971c7b863c1b891c30f901b5ed3751eeaa720d
Commit Graph

124 Commits

Author SHA1 Message Date
Laurent Destailleur
cd960d30df Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-08-27 16:01:05 +02:00
Laurent Destailleur
5c03db3b05 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-08-27 15:58:48 +02:00
Laurent Destailleur
3b6b9661fa Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-08-27 15:57:45 +02:00
VESSILLER
ebed2211b6 FIX reception odt dir output path 2023-08-23 11:24:09 +02:00
Philippe GRAND
2e1bb760a9 Update code for php8 compliance 2022-12-10 16:04:01 +01:00
Laurent Destailleur
2dffe3748d Debug v17 - Fix missing delete picto on ODT setup 2022-11-18 13:41:27 +01:00
Philippe GRAND
7dfd7d73cc update code towards php8 compliance 2022-10-06 16:47:29 +02:00
Philippe GRAND
118e4aed3a update code towards php8 compliance 2022-10-06 10:09:19 +02:00
Laurent Destailleur
dc30cb19b5 Merge pull request #22456 from grandoc/new_branch_29_09_2022 
update code toward php8
 2022-10-04 18:10:01 +02:00
Laurent Destailleur
395312737b Merge pull request #22406 from aspangaro/17p6 
Use isModEnabled
 2022-10-04 18:01:59 +02:00
Philippe GRAND
95cb38b52f update code towards php8 compliance 2022-10-03 11:36:06 +02:00
Philippe GRAND
a7ae62e0b7 update code toward php8 2022-09-29 12:11:50 +02:00
Laurent Destailleur
98ed321514 Merge branch 'develop' into 17p6 2022-09-28 20:55:43 +02:00
Frédéric France
c7ee2f413c min php version is 7.0 2022-09-27 20:48:47 +02:00
Alexandre SPANGARO
c464cd7d37 Use isModEnabled 2022-09-25 22:52:42 +02:00
Laurent Destailleur
3e246f4399 NEW Add option "Show price on the generated documents for receptions" 2022-09-23 09:21:07 +02:00
Laurent Destailleur
39e3162a81 FIX use short unit in squille PDF 2022-09-23 08:34:53 +02:00
Frédéric France
17fa3b327e fix usage of getDolGlobalInt 2022-09-14 21:33:43 +02:00
lmarcouiller
14a3bc7360 Fix : php 8.1 warnings 2022-09-09 12:26:17 +02:00
Frédéric France
86a7a7c8bb use isModEnabled 2022-08-23 20:05:09 +02:00
Frédéric FRANCE
7f60a34799 use isModEnabled 2022-08-19 18:07:21 +02:00
Philippe GRAND
16c5558329 add translation 2022-08-02 12:27:25 +02:00
Laurent Destailleur
8ee30e067f Rename var 2022-06-20 02:23:37 +02:00
Laurent Destailleur
e97f021380 Fix #yogosha11295 2022-06-19 19:02:16 +02:00
Laurent Destailleur
08a942dca8 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-06-17 14:52:51 +02:00
Faustin
ef959ecddd FIX#21093 2022-06-11 00:18:38 +02:00
Laurent Destailleur
324721ac1e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/tpl/list_print_total.tpl.php
	htdocs/fichinter/list.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2022-05-22 12:54:40 +02:00
Maxime Kohlhaas
bf39a259ba Fix PDF watermark over PDF text 2022-05-22 00:05:03 +02:00
Laurent Destailleur
d9dbfd063b Debug v16 2022-05-20 23:34:58 +02:00
Laurent Destailleur
ee6131612a Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
 2022-05-20 23:28:01 +02:00
Laurent Destailleur
308e7a3d9b Fix scrutinizer 2022-05-18 12:40:44 +02:00
Laurent Destailleur
177e8c17fb Fix scrutinizer 2022-05-18 11:23:21 +02:00
lvessiller
978db41f37 FIX qty received label in Squille PDF model 2022-05-17 15:50:45 +02:00
Laurent Destailleur
2690f4459f NEW Enhance the import. Can use 'auto' for the ref (import of orders) 2022-04-04 13:17:45 +02:00
Laurent Destailleur
dee5d8f9e8 Standardize name of button 2022-02-18 13:45:28 +01:00
Laurent Destailleur
0037ee2254 Fix ckeditor plugins 2022-01-01 19:37:53 +01:00
Laurent Destailleur
10e126eb69 Clean code on pdf templates 2021-12-02 10:43:44 +01:00
Laurent Destailleur
962ac263ba Fix look and feel v15 2021-11-27 15:29:48 +01:00
Laurent Destailleur
88a482c615 Fix phpcs 2021-10-06 18:40:32 +02:00
Laurent Destailleur
b4cfe35138 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-05 13:39:46 +02:00
Laurent Destailleur
b11dbf069e FIX Bad use of a forced contact of another company on PDF/ODT documents 2021-10-05 13:11:54 +02:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +02:00
Laurent Destailleur
7aeb652c66 Better sanitizing, fix phpcs 2021-06-29 18:22:36 +02:00
Laurent Destailleur
25c6b64b1e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/modules/delivery/doc/pdf_storm.modules.php
	htdocs/core/modules/reception/doc/pdf_squille.modules.php
	htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
	htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
 2021-06-29 15:58:26 +02:00
Francis Appels
88f7ca9214 Fix MAIN_GENERATE_RECEPTION_WITH_PICTURE 2021-06-24 12:27:39 +02:00
Francis Appels
dc9e71084b Fix missing posYAfterImage for nexy for espadon and squille 2021-06-24 12:15:29 +02:00
Philippe GRAND
057e78d8c3 internationalization 2021-06-20 11:40:54 +02:00
Philippe GRAND
b07d2f257a internationalization 2021-06-20 11:37:51 +02:00
Laurent Destailleur
e3e2dfd764 Fix generation of ODT (test if temporary directory is writable) 2021-06-20 05:11:46 +02:00
Laurent Destailleur
8b9af8f5ab Responsive 2021-06-13 01:27:04 +02:00