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

1103 Commits

Author SHA1 Message Date
Laurent Destailleur
e06bad5112 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2022-12-21 21:15:00 +01:00
Laurent Destailleur
8d2dde99ae Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-21 20:57:13 +01:00
Laurent Destailleur
3b87aadc48 Debug v17 2022-12-16 12:59:47 +01:00
stickler-ci
70b6b3d82d Fixing style errors. 2022-12-14 15:21:42 +00:00
Gauthier PC portable 024
1a16e41ce3 FIX : Can't see all time spent by all user 2022-12-14 16:04:35 +01:00
Sébastien Prud'homme
ed89005941 Fix #23019 Impossible to add task times to an existing draft invoice 2022-12-14 11:45:40 +01:00
Laurent Destailleur
e603fdcfe5 FIX calculation of unit price for timespen invoice mode 1 line per user 2022-12-14 11:34:56 +01:00
Laurent Destailleur
50c76110bb Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2022-12-14 11:19:12 +01:00
Milen Karaganski
811e24fd7c Change to define unit price from timespent data instead from the user hourly rate 2022-12-10 21:15:00 +02:00
Milen Karaganski
ee7e394ebf FIX|Fix [#23075] 
Wrong invoice unit price when billing Project task spent time
 2022-12-08 20:22:41 +02:00
stickler-ci
0db8a0b831 Fixing style errors. 2022-12-08 09:34:48 +00:00
atm-lena
9fef8b7dc2 FIX Search List Alias Name 2022-12-07 10:11:57 +01:00
Laurent Destailleur
363bfd1a48 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-11-29 01:24:39 +01:00
Laurent Destailleur
2a8ad9ed50
Merge pull request #22963 from atm-steve/new_list_for_task_time 
NEW Filter on task time
 2022-11-29 00:26:31 +01:00
Laurent Destailleur
732d13f798
Merge pull request #20776 from Easya-Solutions/new-task-list-filter-category-customer 
NEW customer category filter on task list
 2022-11-26 10:39:38 +01:00
lvessiller-opendsi
126a29ec02
Update list.php 
rename const MAIN_SEARCH_CATEGORY_CUSTOMER_ON_LISTS
 2022-11-26 10:38:36 +01:00
Eric
bafa1a1ee8
Update time.php 2022-11-26 01:29:36 +01:00
Eric Seigne
89101a2862 fix #23005: change lire to creer (rights) 2022-11-26 01:26:58 +01:00
atm-steve
8d879eb8f5 feat: add name alias column 2022-11-25 10:24:44 +01:00
atm-steve
e7096509b5 add project label and ref columns 2022-11-23 12:19:07 +01:00
Laurent Destailleur
e3aa438d2a FIX deletion of a line of time spent 2022-11-17 02:50:30 +01:00
Laurent Destailleur
9d9799c12e Fix show thirdparty if it exists only 2022-11-14 11:39:03 +01:00
Frédéric FRANCE
754881a6ef strftime is deprecated in php 8.1 2022-10-31 10:42:40 +01:00
Laurent Destailleur
f0e51d4a28 Debug v17 - use of 'mode' for user list and filter on categories 2022-10-31 08:22:53 +01:00
Laurent Destailleur
1f9424a4b3 Clean code/options 2022-10-25 11:34:31 +02:00
Laurent Destailleur
330a1199e4 Look and feel v17 2022-10-21 15:08:54 +02:00
Laurent Destailleur
1d21d73400 NEW Add date event (!= date project) and location on event organization 2022-10-21 13:19:21 +02:00
Laurent Destailleur
332df184bf
Merge pull request #22591 from rycks/13.0_19912_add_default_payment_terms_to_invoices 
close #19912 : add default payment terms to invoice
 2022-10-15 10:38:37 +02:00
Eric Seigne
3400db5503 fix #19912: add default informations from customer to new invoices 2022-10-14 22:11:56 +02:00
lvessiller
5ed6b78abb FIX resove conflicts 2022-10-14 09:42:50 +02:00
Laurent Destailleur
f516a4b052 FIX filter on categories 2022-10-11 03:48:00 +02:00
Laurent Destailleur
ae4f8b23d5 Standardize code for action buttons Delete 2022-10-10 11:39:50 +02:00
Laurent Destailleur
77301c50ee Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-08 02:55:55 +02:00
ksar
95ce5c19dd
FIX #22482 
Preserve \r\n strings in task notes
 2022-10-06 14:36:53 +02:00
Alexandre SPANGARO
5d19588037 Use isModEnabled 2022-09-25 06:13:47 +02:00
NextGestion
97aae20edc Fixer erreur dans Liste des adhérents + erreur dans Temps consommé 2022-09-15 18:34:26 +00:00
Laurent Destailleur
08aa34b8db Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-15 18:31:45 +02:00
Laurent Destailleur
e0e9701830 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-15 18:30:42 +02:00
Atm-Gregr
7d4c7e0f6b stickler 2022-09-13 14:28:57 +02:00
Atm-Gregr
4f9c273c64 retours 2022-09-13 14:19:28 +02:00
Atm-Gregr
527cfadf0f nl2br like on the card 2022-09-12 16:31:00 +02:00
Atm-Gregr
3c5f3f7b85 fix 2022-09-12 16:28:06 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Frédéric France
bb58f3a18f use isModEnabled 2022-08-31 22:38:53 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Frédéric France
e71692e745 fix php8 warnings 2022-08-31 22:02:31 +02:00
Laurent Destailleur
60dd3577ec Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-26 13:15:37 +02:00
Laurent Destailleur
da2641bcb2 Clean code 2022-07-26 12:54:19 +02:00
Laurent Destailleur
5903a9f87f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-07-26 12:24:24 +02:00
Laurent Destailleur
d65ea8c333 Debug v16 2022-07-26 11:05:00 +02:00
Laurent Destailleur
d0e74fbbeb Sync transifex 2022-07-26 10:54: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
atm-lena
46075188b2 Tasks List Search : several same lines 2022-07-21 15:59:46 +02:00
Laurent Destailleur
5e4eb58a43 FIX phpv8 2022-07-21 11:09:35 +02:00
Laurent Destailleur
3079ab2737 FIX phpv8 2022-07-21 10:59:15 +02:00
Laurent Destailleur
f1ffb56f4a
Merge pull request #21334 from Quatadah/dolicloud-qnasdami-clone-button-on-task 
clone button on tasks
 2022-07-19 03:14:13 +02:00
Quatadah Nasdami
2f6e9ea839 done 2022-07-11 16:28:28 +02:00
Laurent Destailleur
da03175c07
Merge branch 'develop' into dev_19763 2022-07-07 23:06:22 +02:00
Laurent Destailleur
b7a99463a6
Merge pull request #21341 from fboitel/NEW#21000 
NEW #21000
 2022-07-07 22:06:59 +02:00
Laurent Destailleur
a871aa8f85
Merge pull request #21382 from fboitel/NEW#20650 
NEW #20650 Checkbox column on left for lists
 2022-07-07 21:48:51 +02:00
Christian Foellmann
4c5e05e411 fix page titles 
Conflicts:
	htdocs/compta/bank/annuel.php
	htdocs/contact/list.php
	htdocs/product/stock/movement_list.php
	htdocs/user/list.php
 2022-07-06 19:19:08 +02:00
Laurent Destailleur
76e3c10c06
Revert "fix page titles" 2022-07-06 15:56:04 +02:00
Florian HENRY
eab3541ca5 better sql request 2022-07-03 13:07:25 +02:00
Florian HENRY
1216294667 new: Add thirdparty column to task time list 2022-07-03 13:02:42 +02:00
Florian HENRY
a6fd9203fa on going 2022-07-03 00:26:01 +02:00
Christian Foellmann
89d1389e2d fix page titles 2022-06-27 12:48:04 +02:00
Faustin
c387f1d57a NEW #20650 completing checkcolumn on left for task list 2022-06-25 19:01:52 +02:00
Faustin
08ba39f704 NEW 21000 Added columns 'alias_name' on supplier order list 2022-06-21 19:25:38 +02:00
Faustin
57d2a0352e NEW 21000 Added columns 'alias_name' on tasks list 2022-06-21 18:30:23 +02:00
Quatadah Nasdami
a8b6dd56a8 Merge branch 'dolicloud-qnasdami-clone-button-on-task' of https://github.com/Quatadah/dolibarr into dolicloud-qnasdami-clone-button-on-task 2022-06-21 13:34:03 +02:00
Quatadah Nasdami
629ece0473 adding clone button on task 2 2022-06-21 13:33:55 +02:00
Quatadah Nasdami
11c3e68c57
Merge branch 'Dolibarr:develop' into dolicloud-qnasdami-clone-button-on-task 2022-06-21 13:24:26 +02:00
Quatadah Nasdami
aebdb0eaa1 adding clone button 2022-06-21 13:22:59 +02:00
Laurent Destailleur
eeff8fdc0d Debug v16 2022-06-20 02:10:27 +02:00
HENRY Florian
770abb73f6
Merge branch 'Dolibarr:develop' into dev_19763 2022-06-18 11:54:44 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Laurent Destailleur
e991c614d3 Debug v16 2022-06-14 14:48:15 +02:00
Laurent Destailleur
862ca7cf04 Debug v16 2022-06-14 14:39:32 +02:00
Frédéric FRANCE
38b18a68d7
Merge branch 'develop' into useismodenabled 2022-06-10 10:07:41 +02:00
Frédéric France
5dcfc28913 use isModEnabled function 2022-06-09 22:41:59 +02:00
Laurent Destailleur
2ad7c0df74
Merge pull request #21178 from Quatadah/fix19860 
FIX  #19860
 2022-06-09 12:51:19 +02:00
stickler-ci
fb86cea3fc Fixing style errors. 2022-06-09 10:09:49 +00:00
NASDAMI Quatadah
8a48cd5989 Fixing bug 2022-06-09 12:05:23 +02:00
Laurent Destailleur
0bb7defa88 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/langs/en_US/errors.lang
	htdocs/projet/card.php
 2022-06-01 16:04:11 +02:00
Laurent Destailleur
64a683c8e7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/projet/tasks/task.php
 2022-05-31 14:33:19 +02:00
Laurent Destailleur
b43159db6d
Merge branch 'develop' into dev_19763 2022-05-24 22:07:50 +02:00
kamel
192f273e27 FIX: Fix show errors in card 2022-05-24 15:02:35 +02:00
lvessiller
0de33fccd8 NEW rename categoriesArr varibale 2022-05-23 12:23:16 +02:00
lvessiller
89af598c4f NEW MAIN_SEARCH_CATEGORY_CUSTOMER_ON_LISTS const to show category customer filter 2022-05-23 11:57:35 +02:00
lvessiller
75ff04b2fe NEW separate categories filters 2022-05-20 15:38:33 +02:00
lvessiller
3e09fb60c6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into new-task-list-filter-category-customer 2022-05-20 15:36:26 +02:00
Laurent Destailleur
86d34af4b0 Fix deprecated code 2022-05-18 11:38:56 +02:00
Laurent Destailleur
04f64dd252 Look and feel v16 2022-05-16 18:54:50 +02:00
Laurent Destailleur
c3c29393c1 Look and feel v16 2022-05-16 18:00:59 +02:00
Florian HENRY
b9d78da4f6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763 2022-05-13 09:09:31 +02:00
Laurent Destailleur
23665c3f6b Tooltip 2022-05-11 10:02:59 +02:00
Laurent Destailleur
1c4c7201fc Trans 2022-05-11 09:53:23 +02:00
Florian HENRY
112c8826b7 finish invoice per product line 2022-05-11 09:06:26 +02:00
Florian HENRY
54d6916a20 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763 2022-05-11 08:26:44 +02:00