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

2342 Commits

Author SHA1 Message Date
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Frédéric FRANCE
2d92e6006c
fix warnings 2021-10-23 07:04:13 +02:00
Florian HENRY
bb4eb2feea Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_php8 2021-10-22 23:38:44 +02:00
Florian HENRY
1f1e01aa88 fix php 8 warning 2021-10-22 23:38:35 +02:00
Frédéric FRANCE
46c4f28478
fix multiple warnings 2021-10-22 22:15:59 +02:00
Laurent Destailleur
b66155de4b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/list.php
	htdocs/filefunc.inc.php
 2021-10-17 13:30:13 +02:00
Laurent Destailleur
8bdece7101 CSS 2021-10-16 21:43:48 +02:00
Laurent Destailleur
f2757a63a1 Clean code 2021-10-16 20:06:58 +02:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Laurent Destailleur
f8010dfcbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/reception/list.php
	htdocs/takepos/pay.php
 2021-10-16 13:01:03 +02:00
Laurent Destailleur
33761f9de3
Merge pull request #18917 from FHenry/NEW_dev_filter_from_dt_to_dt_actionlist 
NEW:Add filter from date to date into action/evt list
 2021-10-11 11:51:48 +02:00
Laurent Destailleur
874731af84 The 'action=delete&file=...' has been replaced with 
'action=deletefile&file=...' to avoid confusion with deletion of object
lines.
 2021-10-10 21:11:48 +02:00
lvessiller
be4a00213c FIX optional visibility on create card 2021-10-08 15:58:08 +02:00
Florian HENRY
f52e2be10e NEW:Add filter from date to date into action/evt list 2021-10-06 16:23:11 +02:00
Laurent Destailleur
157112758b Fix phpcs 2021-09-30 20:14:59 +02:00
Laurent Destailleur
673a2982a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/card.php
 2021-09-30 16:32:40 +02:00
Laurent Destailleur
ed264182c6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
	htdocs/takepos/receipt.php
 2021-09-30 16:28:42 +02:00
Laurent Destailleur
bb6399e12a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
 2021-09-30 16:21:36 +02:00
Laurent Destailleur
d4cc60640b Clean code 2021-09-27 15:41:58 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
 2021-09-20 17:15:12 +02:00
Laurent Destailleur
1f76165e46 Fix do not show link on objects for object with existing hard link field 2021-09-19 01:35:42 +02:00
Laurent Destailleur
96436cac3d FIX unprivileged user can attach agenda with leave. 2021-09-19 00:50:23 +02:00
Laurent Destailleur
d760686239 Fix case of newtoken() 2021-09-18 22:24:00 +02:00
Laurent Destailleur
8bdc53f469 Fix Add action classify as sensitive actions 2021-09-18 20:49:24 +02:00
Laurent Destailleur
675a30d500 Fix phpcs 2021-09-17 19:42:41 +02:00
Laurent Destailleur
3d9be1437a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/list.php
	htdocs/fourn/paiement/list.php
	htdocs/projet/tasks/time.php
 2021-09-17 12:29:58 +02:00
Laurent Destailleur
b546f21ef4 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 13.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2021-09-17 12:21:25 +02:00
Julien Gainza
65c4a21898 FIX move fetch_optionnal into $ac_static->fetch() 2021-09-13 16:35:13 +02:00
Laurent Destailleur
fa28621709 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/list.php
 2021-09-09 16:11:29 +02:00
Laurent Destailleur
5406e3d34e Fix phpcs 2021-09-09 16:06:16 +02:00
Laurent Destailleur
5d5b7c3af4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/peruser.php
	htdocs/main.inc.php
 2021-09-09 15:15:26 +02:00
Regis Houssin
52419f28c5 FIX add DISTINCT 2021-09-07 12:38:15 +02:00
Regis Houssin
4aaaa8e21a FIX multicompany transverse mode compatibility 2021-09-07 12:10:35 +02:00
Julien Gainza
9d89e48d15 Fix : Add extrafields on API "get events list" 2021-09-06 15:55:33 +02:00
Laurent Destailleur
248e68aada Code comment 2021-09-03 13:39:08 +02:00
Laurent Destailleur
4810db3dbf
Merge pull request #18498 from GurvanKervern/undefVars2 
Undef vars2
 2021-09-01 18:36:26 +02:00
Laurent Destailleur
38c0e93285 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/public/project/index.php
 2021-09-01 17:52:04 +02:00
Laurent Destailleur
443827ff42 FIX #18531 2021-09-01 17:10:26 +02:00
lvessiller
163b12925a FIX stickler-ci 2021-08-31 18:37:34 +02:00
lvessiller
6c2cf4377a NEW can enable/disable external calendar by default 2021-08-31 18:14:16 +02:00
Gurvan Kervern
39fcc53fa7
Update peruser.php 2021-08-29 00:51:01 +08:00
Laurent Destailleur
fb8723d884
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons 
replace remaining SubmitCancel buttons
 2021-08-28 18:39:06 +02:00
Laurent Destailleur
a5bb833a0a
Update peruser.php 2021-08-28 17:39:23 +02:00
Laurent Destailleur
64c4e25c02 Fix warning 2021-08-28 05:40:07 +02:00
Laurent Destailleur
aab6281ba6 Clean code 2021-08-28 05:38:40 +02:00
Laurent Destailleur
1b859fe723 Fix warning 2021-08-28 05:24:53 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
stickler-ci
601cc865fb Fixing style errors. 2021-08-25 10:54:09 +00:00
GurvanKervern
d34e44e55c Fix undef vars 3 
To remove PHP8 warnings
 2021-08-25 18:02:57 +08:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +02:00
Laurent Destailleur
22339a3ed3
Merge pull request #18451 from cfoellmann/PR/form-buttons-function 
improve forms - buttonsSaveCreate()
 2021-08-24 15:26:03 +02:00
Laurent Destailleur
dc006b0ebb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-08-23 19:44:02 +02:00
Laurent Destailleur
8485fee5f9 Cast numeric into on sql request 2021-08-23 19:33:24 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Christian Foellmann
d706c3b1ec use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination 2021-08-20 14:41:30 +02:00
Laurent Destailleur
3ee4a6556a
Merge branch 'develop' into undefined 2021-08-19 13:43:32 +02:00
stickler-ci
172b672437 Fixing style errors. 2021-08-19 10:19:25 +00:00
Gurvan Kervern
476dfc289e
Update index.php 2021-08-19 18:16:47 +08:00
Laurent Destailleur
7af265db8a
Update card.php 2021-08-18 22:03:16 +02:00
Laurent Destailleur
1df2aeb233
Update card.php 2021-08-18 22:01:53 +02:00
stickler-ci
88b0408e42 Fixing style errors. 2021-08-18 13:57:19 +00:00
Gurvan Kervern
ab95c5f463
Update index.php 2021-08-18 21:55:00 +08:00
Gurvan Kervern
2d35106e0b
Update card.php 2021-08-18 17:52:21 +08:00
Laurent Destailleur
84073c6373
Merge branch 'develop' into patch-169 2021-08-17 19:31:30 +02:00
Laurent Destailleur
23083427e8 NEW Can use the result_mode of mysqli driver. Save memory for list count 2021-08-16 22:36:30 +02:00
Laurent Destailleur
06a0d922cc NEW Can use the result_mode of mysqli driver. Save memory for list count 2021-08-16 22:01:58 +02:00
stickler-ci
af1f29bb16 Fixing style errors. 2021-08-16 11:22:49 +00:00
Gurvan Kervern
9f1ced1fd0 fix warnings 6 
Removing PHP8 warnings
 2021-08-16 19:06:38 +08:00
Gurvan Kervern
b0ea9fed0a fix warnings 1 
Removing all PHP8 warnings from error logs
 2021-08-16 18:05:29 +08:00
Francis Appels
68482c637b Update actioncomm.class 
Property contactid should be contact_id
 2021-08-06 18:45:25 +02:00
Laurent Destailleur
505543e18e Fix #yogosha6704 2021-07-26 00:37:47 +02:00
Laurent Destailleur
062c39c40d Fix html entities when we should not 2021-07-21 01:40:45 +02:00
BENKE Charlene
29bdbe02f2
Update index.php 2021-07-19 10:21:18 +02:00
Laurent Destailleur
3bc896be57 Debug v14 2021-07-07 02:07:35 +02:00
Laurent Destailleur
48435eb911 Fix navigation links 2021-07-07 01:58:06 +02:00
Laurent Destailleur
ff94c60cc7 Fix GETPOST with restricthtml 2021-07-07 01:45:31 +02:00
Laurent Destailleur
312968eeac Clean code 2021-06-22 11:38:02 +02:00
Laurent Destailleur
05c0bc4fac css 2021-06-22 10:44:49 +02:00
Laurent Destailleur
aca190d977 Fix css 2021-06-21 12:46:24 +02:00
Laurent Destailleur
ab2e50ef49 Fix css 2021-06-21 12:46:03 +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
7b31ef0ff3 Fix warnings 2021-06-10 00:00:49 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
fa4786a3f6 Fix permission 2021-06-08 16:19:21 +02:00
Laurent Destailleur
f55be9fd3a
Merge pull request #17689 from DorianVabre/dev_EventOrganizer_suggest 
new: working on conference or booth object and event type #FoundationFunding
 2021-06-04 13:12:32 +02:00
Laurent Destailleur
2caaa52e85 Doc 2021-05-27 02:52:51 +02:00
Laurent Destailleur
4f61286ae2 Small perf fix 2021-05-27 02:36:16 +02:00
Dorian Vabre
fe6b25ede6 fix on $value 2021-05-26 09:48:13 +02:00
Frédéric FRANCE
9e3de39245
fix status/percent 
in sql it is a.datep as dp, not datep
 2021-05-25 23:00:21 +02:00
Frédéric FRANCE
332d8c9105
fix warnings 2021-05-25 22:24:46 +02:00
Dorian Vabre
fe272d3292 wip name of contact to add on ics file 2021-05-21 16:01:44 +02:00
Dorian Vabre
720a368b29 link ics ok (todo: add name of speaker) 2021-05-20 17:24:27 +02:00
Dorian Vabre
307ab92bc0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganizer_suggest 2021-05-20 16:13:42 +02:00
Laurent Destailleur
a8d36a3a55 Debug v14 2021-05-19 13:56:13 +02:00
Laurent Destailleur
c2cb055b0a Fix look and feel v14 2021-05-18 14:00:29 +02:00
Laurent Destailleur
b6dbe45242 Fix permissions on page to move position of file 2021-05-18 01:58:54 +02:00
Dorian Vabre
e31d8f89f5 wip filter 2021-05-10 17:13:57 +02:00
Dorian Vabre
c85b75924f wip on adding a filter for the ics file + fix on class name 2021-05-10 16:57:48 +02:00
Laurent Destailleur
9973085613 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/comm/propal/card.php
	htdocs/compta/bank/releve.php
	htdocs/compta/paiement/rapport.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/reception/card.php
	htdocs/societe/societecontact.php
 2021-05-03 19:36:49 +02:00
Florian HENRY
9278228e20 FIX: create event from contact card preselect contact correctly 2021-05-03 18:08:49 +02:00
Laurent Destailleur
1c95e2b7c7 FIX #17453 2021-05-03 14:58:29 +02:00
Laurent Destailleur
4926ac1e24 Fix make protected method not visible 2021-04-28 15:25:06 +02:00
Laurent Destailleur
539954f760 Clean code 2021-04-27 01:12:40 +02:00
Laurent Destailleur
d2b91e934a Clean code 2021-04-27 01:09:46 +02:00
Laurent Destailleur
f54d14bfd6 Add method checkValForAPI to clean data from API input 2021-04-27 01:05:14 +02:00
Laurent Destailleur
d138e7410b Clean code 2021-04-26 19:12:23 +02:00
Laurent Destailleur
fd2d317b4a Fix #yogosha5881 2021-04-25 15:55:36 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
Laurent Destailleur
61df76dd9a Fix pb in date format %a %b when using a negative timezone 
Enhance date management and unit tests.
 2021-04-19 12:48:08 +02:00
Laurent Destailleur
a74b237a7b Add a schedule dtask to send reminder by email on date due. 2021-04-19 10:35:19 +02:00
Laurent Destailleur
9154e07689 Fix picto for tags 2021-04-14 12:33:53 +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
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
Alexandre SPANGARO
80c6458faa Work on split module fournisseur 2021-04-11 22:25:45 +02:00
Laurent Destailleur
91fc78ac9c FIX #17192 - With tz < 0, event is show in bad day on calendar views 
Conflicts:
	htdocs/comm/action/index.php
 2021-04-11 16:18:16 +02:00
Laurent Destailleur
053be7a63c FIX #17192 - With tz < 0, event is show in bad day on calendar views 2021-04-11 16:02:52 +02:00
Laurent Destailleur
fe7654c067 Complete doc 2021-04-09 13:34:19 +02:00
Laurent Destailleur
de7c3f5e0c
Merge pull request #17139 from OPEN-DSI/fix_00001 
FIX: Fix when add or modify ressources on events with duplicate entries
 2021-04-08 15:50:00 +02:00
kamel
fcc27e9177 Corrections 2021-04-07 09:49:20 +02:00
Laurent Destailleur
12e847ade1 Fix color of reports. Fix include_once into include. 2021-04-06 22:18:32 +02:00
kamel
c44522594a FIX: Fix when add or modify ressources on events with duplicate entries 2021-04-06 16:04:30 +02:00
Florian HENRY
73d7eefdcf Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-31 20:09:44 +02:00
Laurent Destailleur
6e422d26f3 FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
Laurent Destailleur
ce5bea7b34 FIX #yogosha5751 2021-03-29 22:43:39 +02:00
Florian HENRY
a8b486c7b9 fix error translation 2021-03-26 19:00:56 +01:00
Laurent Destailleur
a1366da130 FIX #yogosha5715 2021-03-23 03:45:17 +01:00
Laurent Destailleur
e06b8bb586 Look and feel v14 2021-03-23 03:20:23 +01:00
Laurent Destailleur
ca1715df96 Add some protection for SQL injection 2021-03-22 13:31:06 +01:00
Laurent Destailleur
15440917b1 Fix #ygosha5698 2021-03-22 11:30:18 +01:00
Laurent Destailleur
1e402f9ea2
Merge pull request #16754 from frederic34/patch-13 
fix php8 warnings
 2021-03-17 16:55:54 +01:00
Laurent Destailleur
9cbb2e8d42
Merge pull request #16755 from frederic34/patch-14 
fix php7 php8 warning
 2021-03-17 16:52:07 +01:00
Laurent Destailleur
8de1b4c94e Factorize code 2021-03-17 11:34:19 +01:00
Frédéric FRANCE
11a6961c13
fix php8 warning 2021-03-16 23:02:28 +01:00
Frédéric FRANCE
ff690861c4
fix php8 warnings 2021-03-16 22:50:14 +01:00
Laurent Destailleur
e00e6cfd9a
Merge pull request #16721 from aspangaro/14a25 
Translation "Generated documents"
 2021-03-16 10:25:31 +01:00
Alexandre SPANGARO
6960f0dc25 Uniformize translation 2021-03-16 04:22:55 +01:00
Alexandre SPANGARO
4fd24c6855 Translation "Generated documents" 2021-03-16 04:04:18 +01:00
Laurent Destailleur
7d1e18f5ab
Merge pull request #16625 from FHenry/dev_EventOrganisation 
new: working on conference or booth object and event type #FoundationFunding
 2021-03-15 11:37:57 +01:00
Laurent Destailleur
a46bbb83f8
Merge pull request #16678 from frederic34/patch-32 
fix php8 warnings
 2021-03-15 10:54:23 +01:00
Frédéric FRANCE
5d99dfea50
fix php8 warning 2021-03-15 08:08:05 +01:00
Frédéric FRANCE
1e85e8f37d
fix php8 warnings 2021-03-15 00:53:34 +01:00
Frédéric FRANCE
67abd6d1d6
go back actioncomm create after create project 2021-03-12 17:05:11 +01:00
Florian HENRY
862926316a working on list 2021-03-11 19:09:42 +01:00
Laurent Destailleur
c3a047ee06 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/class/api_agendaevents.class.php
 2021-03-08 19:31:47 +01:00
Laurent Destailleur
2f0c4038fb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/action/class/api_agendaevents.class.php
	htdocs/compta/sociales/card.php
	htdocs/societe/consumption.php
 2021-03-08 19:27:34 +01:00