lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
111,188 Commits 43 Branches 150 Tags 886 MiB
3e930f92b8
Commit Graph

98610 Commits

Author SHA1 Message Date
Laurent Destailleur
da8a9e6082
Merge pull request #20625 from Easya-Solutions/new-inventory-category-field 
NEW Can use products categories to make inventory
 2022-07-24 22:06:55 +02:00
Laurent Destailleur
adde84a508
Merge pull request #21232 from defrance/patch-207 
php V8 warning
 2022-07-24 20:32:22 +02:00
Laurent Destailleur
d622bfd774
Update modulehelp.php 2022-07-24 20:32:06 +02:00
Laurent Destailleur
db0ef784cd
Merge pull request #21450 from Easya-Solutions/new-mail-template-substitute-project-title 
NEW substitue project title in mail template
 2022-07-24 20:28:37 +02:00
Laurent Destailleur
25d01b2be5
Merge pull request #21502 from Easya-Solutions/new-comm-action-card-hook-formconfirm 
NEW hook formConfirm on action comm card
 2022-07-24 20:23:40 +02:00
Laurent Destailleur
40d31d9b8b Update combinations.php 2022-07-24 20:18:10 +02:00
This Charlène
f9cce93fc9 fix php 8 warning (and error) 2022-07-24 20:17:54 +02:00
This Charlène
69626875fc PHP - cannot use a scalar as an array warning 
generate an error :  cannot use a scalar as an array warning (even on php V7)
 2022-07-24 20:16:59 +02:00
Laurent Destailleur
44ae25b4cd
Merge pull request #21534 from defrance/patch-216 
Some Fix on Variant module
 2022-07-24 20:15:56 +02:00
Laurent Destailleur
083b785ec8
Update combinations.php 2022-07-24 20:13:48 +02:00
Laurent Destailleur
54c24dd74a
Merge pull request #21554 from defrance/patch-217 
fix php 8 warning (and error)
 2022-07-24 20:11:07 +02:00
Laurent Destailleur
a02c0f55fb Debug v16 2022-07-24 19:58:11 +02:00
Laurent Destailleur
60117bbaee Debug v16 2022-07-24 19:45:37 +02:00
Laurent Destailleur
e465c0f34b Debug v16 2022-07-24 19:05:55 +02:00
Laurent Destailleur
fe7346a9c6 Hide var not usefull and dangerous 2022-07-24 18:31:55 +02:00
Laurent Destailleur
dd29018987 Fix bad table name 2022-07-24 18:27:15 +02:00
Laurent Destailleur
394bfed965 Debug v16 2022-07-24 17:39:01 +02:00
Laurent Destailleur
40ae516034 Debug v16 2022-07-24 17:37:02 +02:00
Laurent Destailleur
89999d0138 Fix update description of skills 2022-07-24 17:31:30 +02:00
Laurent Destailleur
432468950b CSS 2022-07-24 17:16:39 +02:00
marc
c31a924812 The return code 0 is not an error but the serveur refuse to execute the request 2022-07-24 16:50:08 +02:00
Laurent Destailleur
68234c4097 Fix css z-index of dialog 2022-07-24 16:40:33 +02:00
Marc
adb30b6acd
Merge branch 'Dolibarr:develop' into develop 2022-07-24 16:33:22 +02:00
Laurent Destailleur
89f7e5ad30 Fix export of website. allowed_in_frames must be an int 2022-07-24 16:08:27 +02:00
Laurent Destailleur
e9892fdc32 css 2022-07-24 15:47:55 +02:00
Laurent Destailleur
99f632b3ff Add transaction db missing 2022-07-24 15:40:55 +02:00
Laurent Destailleur
481bd93ab8 Fix var_dump 2022-07-24 15:12:08 +02:00
Laurent Destailleur
e7161edffe Fix missing @ in dolEval 2022-07-24 15:11:00 +02:00
Laurent Destailleur
2503b37bdd Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-24 14:33:55 +02:00
Laurent Destailleur
4b562121ec Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-24 14:33:02 +02:00
Laurent Destailleur
af73f2b683 Fix php8 2022-07-24 14:32:35 +02:00
Laurent Destailleur
0bcc03cd5d css 2022-07-24 14:32:13 +02:00
Laurent Destailleur
a945c89041 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-24 14:30:55 +02:00
Laurent Destailleur
c3016c6175 Fix php8 2022-07-24 13:44:47 +02:00
marc
3ebf64de63 Fix #21536 
API Invoice Delete doesn't raise exception in some case
 2022-07-24 11:57:42 +02:00
Laurent Destailleur
505531c9d6
Merge pull request #21552 from spooky360/15.0 
FIX : fourn/commande/card.php Added "$object" parameter to $formfile->showdocuments call
 2022-07-24 11:39:00 +02:00
Florian HENRY
c342d0cde9 fix: display message only if change 2022-07-24 11:37:42 +02:00
Laurent Destailleur
336960453f
Merge pull request #21555 from FHenry/15_fix_message_only_when_updtae 
fix: display message only if change (with emballage on)
 2022-07-24 11:36:39 +02:00
Laurent Destailleur
9463f24a73 Better fix 2022-07-24 11:35:56 +02:00
Laurent Destailleur
fbf70beedb
Merge pull request #21557 from emheyarssi/15.0.2 
Fix #21449
 2022-07-24 11:35:24 +02:00
Laurent Destailleur
cf0a1d1e14 Merge 2022-07-24 11:26:10 +02:00
Laurent Destailleur
252c581ea6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-24 11:23:52 +02:00
Laurent Destailleur
f20aaee731 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/product/inventory/inventory.php
 2022-07-24 11:22:00 +02:00
Laurent Destailleur
58923ec3d7 Merge 2022-07-24 11:21:02 +02:00
Laurent Destailleur
e9c42bf715 Add option ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
 2022-07-24 11:15:44 +02:00
Laurent Destailleur
f93a4ce0c0
Merge pull request #21560 from aspangaro/14p35 
FIX Accountancy - Label of VAT account is empty
 2022-07-24 11:13:44 +02:00
Laurent Destailleur
147b7516dd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-24 11:10:23 +02:00
Laurent Destailleur
8c5554a6e6 Add option ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE 2022-07-24 11:09:59 +02:00
Laurent Destailleur
c7fd9f5a3a Trans 2022-07-24 10:57:46 +02:00
Laurent Destailleur
5358d88864 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-24 00:07:41 +02:00
Laurent Destailleur
11640d05b4
Merge pull request #21556 from defrance/patch-218 
PHP V8 warning fix
 2022-07-24 00:05:27 +02:00
Laurent Destailleur
32c43e6bde
Merge pull request #21558 from fappels/16_fix_mo 
Add missing require for MoLine
 2022-07-24 00:03:59 +02:00
Laurent Destailleur
c4e317a977
Merge pull request #21562 from bugness-chl/tmp-fix-20476-develop 
FIX #20476 migration 13.0.x to 14.0.x + discrepancy between MySQL and PostgreSQL
 2022-07-24 00:03:44 +02:00
Laurent Destailleur
8e1d80e294
Merge pull request #21564 from FHenry/15_fix_21553 
fix: #21553 fourn prod Id is required to find packaging value
 2022-07-24 00:01:40 +02:00
Laurent Destailleur
274b0ff6b8 Remove useless test 2022-07-24 00:01:03 +02:00
Laurent Destailleur
da519f3ab5 Fix bad constructor 2022-07-23 23:55:57 +02:00
Florian HENRY
3af167db6c fix: #21553, fourn prod Id is required to find emballage value 2022-07-23 13:54:07 +02:00
Chl
b4d4c42cfb FIX #20476 discrepancy between MySQL & PostgreSQL default value 2022-07-22 21:10:23 +02:00
Chl
50e1597ef1 FIX #20476 migration postgresql 13.0.x to 14.0.x packaging type 2022-07-22 21:09:19 +02:00
Laurent Destailleur
7275ac1511 Trans 2022-07-22 20:14:25 +02:00
Laurent Destailleur
56a8912c9b Fix do not erase global option when configuring ticket 2022-07-22 19:47:59 +02:00
Laurent Destailleur
ca323f99ba Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-22 19:37:55 +02:00
Laurent Destailleur
8c8db25dd9 Fix trans 2022-07-22 19:37:27 +02:00
Laurent Destailleur
16c087e04c Clean htmlentities 2022-07-22 19:25:15 +02:00
Chl
1dec64e320 FIX #20476 migration postgresql 13.0.x to 14.0.x packaging type 
Taken from ff35bf8d47
 2022-07-22 19:17:03 +02:00
Laurent Destailleur
24f8e9c401 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-22 18:09:38 +02:00
Laurent Destailleur
3761c920eb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/modules/modPartnership.class.php
	htdocs/modulebuilder/template/core/modules/modMyModule.class.php
 2022-07-22 17:43:35 +02:00
Laurent Destailleur
6d8b5bcfac Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-07-22 17:39:08 +02:00
Laurent Destailleur
d9f7a3efd1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/product/inventory/inventory.php
 2022-07-22 17:38:24 +02:00
Laurent Destailleur
50af2747a2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-07-22 17:35:03 +02:00
Yoan Mollard
edb2e95aaf Fixed labels for permission errors 2022-07-22 17:33:04 +02:00
Anthony Berton
36c0936856 FIX - php8 migration 2022-07-22 17:32:28 +02:00
lmarcouiller
bac8efd4c8 Fix : PHP 8.1 warnings 2022-07-22 17:32:18 +02:00
Alexandre SPANGARO
e9ae888fc7 FIX Accountancy - Label of VAT account is empty 2022-07-22 16:01:39 +02:00
Francis Appels
43ea5f73e3 Add missing require for MoLine 2022-07-22 13:41:24 +02:00
stickler-ci
42809c62d2 Fixing style errors. 2022-07-22 09:05:51 +00:00
This Charlène
bd0b28d30a
fix special_code PHP V8 by adding on addline fct 2022-07-22 11:00:06 +02:00
This Charlène
762cea2416
php V8 fix warning 2022-07-22 10:51:45 +02:00
Florian HENRY
0ee6e92dc0 fix: display message only if change 2022-07-22 10:51:28 +02:00
This Charlène
c7c07ef778
fix php 8 warning (and error) 2022-07-22 10:35:54 +02:00
spooky360
5d75ea015b
Added "$object" parameter to $formfile->showdocuments call 
Added "$object" parameter to $formfile->showdocuments call in order to use the $object reference on the showDocuments hook called inside showdocuments function.
Otherwise, the hook is called with a null reference.
 2022-07-22 09:51:57 +02:00
lvessiller
1f28734a83 FIX resolve conflicts 2022-07-22 08:50:50 +02:00
marc
a7b593026b Fix #21449 2022-07-22 00:55:14 +02:00
Laurent Destailleur
5466fd0562
Merge pull request #21476 from atm-kevin/FIX_Perms_Absence 
FIX permissions création d'absence
 2022-07-21 16:54:43 +02:00
Laurent Destailleur
a0698bbdf5
Merge pull request #21532 from ymollard/bugfix-perms 
Fix labels for permission errors
 2022-07-21 16:51:00 +02:00
Laurent Destailleur
ed0b4dfb85
Merge pull request #21537 from Hystepik/develop#2 
Fix : PHP 8.1 warnings
 2022-07-21 16:46:24 +02:00
Laurent Destailleur
393db04724
Merge pull request #21538 from bb2a/FIX 
FIX - php8 migration
 2022-07-21 16:44:33 +02:00
Laurent Destailleur
983d809549
Merge pull request #21541 from comaiteseb/16.0 
16.0
 2022-07-21 16:43:55 +02:00
Laurent Destailleur
4079afee81
Merge pull request #21542 from comaiteseb/develop 
correction warning php Undefined property: stdClass:: in /space/www/d…
 2022-07-21 16:20:27 +02:00
Laurent Destailleur
0c524f17f1
Merge pull request #21546 from Quatadah/template01 
#NEW template
 2022-07-21 16:18:56 +02:00
atm-lena
46075188b2 Tasks List Search : several same lines 2022-07-21 15:59:46 +02:00
Quatadah Nasdami
82eaf4524a adding second template 2022-07-21 15:01:53 +02:00
lvessiller
4376afcb32 NEW project label insted of title in substitue variables 2022-07-21 14:41:22 +02:00
Quatadah Nasdami
1701982ab5 pushing first tempalte 2022-07-21 14:36:18 +02:00
lvessiller
c7d6e8278c Merge branch 'develop' of github.com:Dolibarr/dolibarr into new-mail-template-substitute-project-title 2022-07-21 14:20:21 +02:00
Laurent Destailleur
14c8b4b826 FIX doleval with @ 2022-07-21 12:52:30 +02:00
Laurent Destailleur
1f25452d65 FIX doleval with @ 2022-07-21 12:51:58 +02:00
lmarcouiller
df6da726ca Fix ; scrutinizer bug 2022-07-21 11:10:43 +02:00
lmarcouiller
17cf336383 Fix : PHP 8.1 warnings 2022-07-21 11:10:22 +02:00
Laurent Destailleur
b4c8fbdec2 Fix remove "use Stripe\" 2022-07-21 11:09:42 +02:00