lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
102,552 Commits 43 Branches 150 Tags 886 MiB
d9907fe074
Commit Graph

2933 Commits

Author SHA1 Message Date
Laurent Destailleur
e62ed28701 Debug v14 2021-06-26 15:39:52 +02:00
Laurent Destailleur
7e7800c110 Fix phpcs 2021-06-14 20:37:21 +02:00
Laurent Destailleur
347c6ae8a8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/projet/class/project.class.php
	htdocs/projet/list.php
 2021-06-14 20:13:27 +02:00
Laurent Destailleur
d154ec2344 FIX Collector to create lead was broken 2021-06-14 20:06:52 +02:00
Laurent Destailleur
a79afeaf02 Add info to allow debug of email collector 2021-06-14 19:58:12 +02:00
Laurent Destailleur
f8f951977c Debug v14 2021-06-14 01:33:01 +02:00
Laurent Destailleur
34cebe6aa3 Look and feel v14 2021-06-14 01:11:39 +02:00
Laurent Destailleur
756786f717 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/fourn/facture/card.php
	htdocs/holiday/list.php
	htdocs/paybox/admin/paybox.php
	htdocs/paypal/admin/paypal.php
	htdocs/product/price.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/permonth.php
	htdocs/projet/activity/perweek.php
	htdocs/stripe/admin/stripe.php
 2021-06-11 19:05:05 +02:00
Laurent Destailleur
4fd9d36eb9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/price.php
 2021-06-11 18:46:51 +02:00
Laurent Destailleur
65f8405ca4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-11 18:44:45 +02:00
Laurent Destailleur
6bf9a72dab Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-11 18:44:37 +02:00
Laurent Destailleur
a8f11fec31
Update perweek.php 2021-06-11 18:12:39 +02:00
Laurent Destailleur
057d91698f
Update perday.php 2021-06-11 18:11:55 +02:00
Laurent Destailleur
0315f45198
Update permonth.php 2021-06-11 18:10:57 +02:00
Marc de Lima Lucio
3f72f9b544 FIX: project time spent by month: quote mismatch in SQL query to assign to check task assigment 2021-06-10 23:29:37 +02:00
Marc de Lima Lucio
96656ff148 FIX: project time spent by day/week: quote mismatch is SQL query to assign to check task assigment 2021-06-10 23:26:33 +02:00
Laurent Destailleur
85a8a66545
Merge pull request #17856 from FHenry/dev_fix_imagnethumbnail_project_files 
fix: #17827
 2021-06-10 12:18:21 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Florian HENRY
71dbb8733d fix: #17827 2021-06-08 20:18:31 +02:00
Laurent Destailleur
fa4786a3f6 Fix permission 2021-06-08 16:19:21 +02:00
Laurent Destailleur
1e657b8621 Fix value of showoncombobox 2021-06-05 15:14:10 +02:00
Laurent Destailleur
673eb73d0a
Merge branch 'develop' into dev_1 2021-05-25 19:55:31 +02:00
Laurent Destailleur
3dfb22b05e
Update task.class.php 2021-05-25 19:54:09 +02:00
Laurent Destailleur
a0418fc17d FIX CWE-269 huntr - download of files of project 2021-05-21 18:53:09 +02:00
Givriz
0c5a934e10 Compatibility phpv8 2021-05-20 17:40:44 +02:00
Laurent Destailleur
a829d8cedc css 2021-05-18 16:31:59 +02:00
Laurent Destailleur
f3803bab91 Responsive 2021-05-18 16:28:30 +02:00
Laurent Destailleur
7569275d28 Fix generation of invoice 2021-05-18 13:36:07 +02:00
Laurent Destailleur
2ef713bd5f
Merge branch 'develop' into look_feel_user_author_list 2021-05-18 12:27:30 +02:00
Laurent Destailleur
7b9161ec63
Merge pull request #17644 from bb2a/thirdparty_infos_list 
Add popup thirdparty info in list
 2021-05-18 12:15:51 +02:00
Laurent Destailleur
b6dbe45242 Fix permissions on page to move position of file 2021-05-18 01:58:54 +02:00
Anthony Berton
58db723502 thirdparty info popup list 2021-05-17 23:27:33 +02:00
Anthony Berton
0b7f474dd3 look_feel user author in list 2021-05-17 18:04:21 +02:00
Laurent Destailleur
1c95e2b7c7 FIX #17453 2021-05-03 14:58:29 +02:00
Laurent Destailleur
e6729355b8 Look and feel v14 2021-04-30 17:56:42 +02:00
Laurent Destailleur
655056ed31 Debug v14 2021-04-29 12:10:55 +02:00
Laurent Destailleur
18e911a636 FIX dol_print_date for %a and %b with some Timezone 2021-04-28 20:44:22 +02:00
Laurent Destailleur
9579533f4f
Merge pull request #17346 from dolibit-ut/patch-296 
Update element.php
 2021-04-27 01:23:59 +02:00
Laurent Destailleur
d138e7410b Clean code 2021-04-26 19:12:23 +02:00
Laurent Destailleur
389b71bc7e Clean API 2021-04-25 19:21:48 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
UT from dolibit
53a89180d9
Update element.php 
merging by
- if (!empty($conf->facture->enabled))
- if (!empty($conf->loan->enabled))
 2021-04-20 11:22:12 +02:00
Laurent Destailleur
e71e5d533d Fix HTML5 2021-04-19 21:30:25 +02:00
Laurent Destailleur
1a6df3f3cc
Merge pull request #17335 from dolibit-ut/patch-291 
Update comment.php
 2021-04-19 20:21:08 +02:00
Laurent Destailleur
26d49c6e23
Merge pull request #17336 from dolibit-ut/patch-292 
Update contact.php
 2021-04-19 20:18:51 +02:00
Laurent Destailleur
7b0ed67181
Merge pull request #17337 from dolibit-ut/patch-293 
Update document.php
 2021-04-19 20:18:42 +02:00
Laurent Destailleur
0b634b2a77
Merge pull request #17338 from dolibit-ut/patch-294 
Update element.php
 2021-04-19 20:18:06 +02:00
UT from dolibit
b8fbfd5078
Update index.php 
new:  $help_url
add  DE:Modul_Projekte
" " => ' '
llxHeader('', $title, $help_url);
 2021-04-19 18:24:19 +02:00
stickler-ci
8437761bb6 Fixing style errors. 2021-04-19 16:15:07 +00:00
UT from dolibit
0f8ef61d34
Update element.php 
$title / $help_url / llxHeader   " " => ' '
add  DE:Modul_Projekte
llxHeader('', $title, $help_url);
 2021-04-19 18:13:06 +02:00
stickler-ci
8db9b5bb22 Fixing style errors. 2021-04-19 16:10:55 +00:00
UT from dolibit
b78f85b959
Update document.php 
$title / $help_url " " => ' '
add  DE:Modul_Projekte
 2021-04-19 18:08:36 +02:00
stickler-ci
6fff8baac5 Fixing style errors. 2021-04-19 16:07:19 +00:00
UT from dolibit
a886725b1c
Update contact.php 
$title / $help_url    " "  =>  ' '
add   DE:Modul_Projekte
 2021-04-19 18:05:18 +02:00
UT from dolibit
00eda15ac6
Update comment.php 
$title = $langs->trans('CommentPage');

llxHeader('', $title, '');
 2021-04-19 17:58:14 +02:00
Laurent Destailleur
ce9d707040
Merge pull request #17269 from bb2a/picto_massactions 
Next picto mass actions
 2021-04-16 20:40:19 +02:00
Laurent Destailleur
9eaf836c8e
Merge pull request #17281 from altairisfr/warehouses_in_project 
Warehouses in project
 2021-04-16 20:29:21 +02:00
altairis-noe
2e340c61cc preselect project when warehouse created from there 2021-04-15 10:31:18 +02:00
altairis-noe
3fe0eb54c7 association of warehouses to projects 2021-04-15 09:59:08 +02:00
Anthony Berton
a612831e28 next_change 2021-04-14 14:45:55 +02:00
Laurent Destailleur
9154e07689 Fix picto for tags 2021-04-14 12:33:53 +02:00
Laurent Destailleur
dcf460e248 Use css on img_picto 2021-04-14 12:28:01 +02:00
Anthony Berton
707bf5adca picto_mass_actions 2021-04-14 10:20:34 +02:00
Laurent Destailleur
97292d6843 Fix phpcs 2021-04-13 20:28:25 +02:00
Laurent Destailleur
358bb87ae2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/projet/card.php
	htdocs/public/payment/newpayment.php
	htdocs/societe/list.php
	htdocs/ticket/document.php
 2021-04-13 20:19:05 +02:00
Laurent Destailleur
fe57ba2116 Fix phpcs 2021-04-13 20:00:36 +02:00
Laurent Destailleur
ce18d416e6
Merge pull request #17222 from aspangaro/13p31 
FIX Write right on document
 2021-04-13 16:18:48 +02:00
Laurent Destailleur
ee07796131
Update card.php 2021-04-13 15:39:34 +02:00
Laurent Destailleur
de73c0adb2
Update card.php 2021-04-13 15:38:51 +02:00
stickler-ci
6ab0de145b Fixing style errors. 2021-04-13 08:33:57 +00:00
Robin
d6caa057f2 FIX: project visibility field with two option 
If two option of disabled visibility are add on constant, combo is not display
 2021-04-13 10:23:05 +02:00
Alexandre SPANGARO
44133166de Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-12 21:35:03 +02:00
Alexandre SPANGARO
4b9bf40a8f move include_once to include when it's a tpl 2021-04-12 21:25:58 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Laurent Destailleur
81487d76b2 Clean code of ol deprecated option 2021-04-12 15:37:26 +02:00
Alexandre SPANGARO
8d72448f43 Add right supplier_order 2021-04-12 09:47:16 +02:00
Alexandre SPANGARO
1ef89b8e7a Add right supplier_invoice 2021-04-12 08:59:25 +02:00
Alexandre SPANGARO
87cc1b2601 Add right supplier_invoice 2021-04-12 07:37:34 +02:00
Alexandre SPANGARO
ce7c5a0c7b Work on split module fournisseur 2021-04-11 04:24:21 +02:00
Laurent Destailleur
0bc93d437e css 2021-04-10 14:21:03 +02:00
Laurent Destailleur
5be6ed3996 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/projet/activity/perweek.php
 2021-04-10 14:02:12 +02:00
Laurent Destailleur
cb57546d99 NEW Can hide columns "time consumed" on timesheet per week. 2021-04-10 13:53:23 +02:00
Laurent Destailleur
95a5296d45 NEW Can hide columns "time consumed" on timesheet per week. 2021-04-10 13:29:24 +02:00
Laurent Destailleur
667481acd5 Fix #yogosha5832 - Missin test on permission for /index routes on APIs 2021-04-08 19:05:28 +02:00
UT from dolibit
baf8c47ceb
Create index.html 2021-04-07 20:48:49 +02:00
Laurent Destailleur
12e847ade1 Fix color of reports. Fix include_once into include. 2021-04-06 22:18:32 +02:00
stickler-ci
f5aa199c94 Fixing style errors. 2021-04-06 15:03:07 +00:00
Gauthier PC portable 024
04cb8453f0 FIX : we can't update task if closed project because of wrong test with PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE conf 2021-04-06 16:59:00 +02:00
Laurent Destailleur
92da23945b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/13.0.0-14.0.0.sql
 2021-04-02 22:51:14 +02:00
Laurent Destailleur
25e32c4fcd
Merge branch 'develop' into dev_EventOrganisation 2021-04-02 22:43:10 +02:00
Laurent Destailleur
e0cb175208 Doxygen 2021-04-02 21:49:21 +02:00
Florian HENRY
88b481e5a8 keep tab project 2021-04-02 11:25:14 +02:00
Florian HENRY
73d7eefdcf Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-31 20:09:44 +02:00
Florian HENRY
c3f4e5e2d5 better attendded woth project tabs 2021-03-31 20:09:13 +02:00
Laurent Destailleur
625ade1a53 Clean log 2021-03-31 12:41:44 +02:00
Laurent Destailleur
be6bb3a756 FIX #yogosha5746 - next step (work in progress) 2021-03-30 19:12:07 +02:00
Laurent Destailleur
6e422d26f3 FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
Laurent Destailleur
6c98276ead FIX #yogosha5782 2021-03-30 11:26:49 +02:00
Laurent Destailleur
d61f61ab45 Clean $_GET 2021-03-30 03:55:17 +02:00
Laurent Destailleur
fb84608586 Clean sql 2021-03-30 03:37:54 +02:00